sys-user/tcpdump: fix up that last commit.

diff --git a/sys-user/tcpdump/Manifest b/sys-user/tcpdump/Manifest
index a8b5791709ef5c2ad43fc9cf491a7309ecec12c8..6e62587c544dadaf7591b8d9c76d34d4f937972b 100644 (file)
--- a/sys-user/tcpdump/Manifest
+++ b/sys-user/tcpdump/Manifest
@@ -1,3 +1,3 @@
-EBUILD tcpdump-0.ebuild 378 SHA256 6fa4b4c2e856bd8fb786d66417da036ae38352b76ce9c2da12be8f905cf85211 SHA512 5ff9324de5f4263dd99a339bed01771ee58c3b2c42a67939258ba04e0136fbdff51f7f83ad5cbf5151ddb46d79230653a5f4eb188e92a8043d48eb6f829a611d WHIRLPOOL e11293b5d649736304d72a025c3d55f5db21ce57c6d9045051d92b003c072f41987e54f1e6f46ae3f178fc4b278f0ca5c64b768fc9f216a2b09e49ae7a7ed687
-EBUILD tcpdump-1.ebuild 202 SHA256 b07a14f801289293fd9a8a6999102c2779e36ad2eb3d28fcdee2faea4befd210 SHA512 160f2f4311c89bed02ec966761a74d02ed92d3fb79252d981065e1baa35546763ebdcf55b5d794ddf193428f57187f1a19b038dec7f6bac30da7958778441e7c WHIRLPOOL edf68f30b36932a5aad6ab590be75def05d20375d60ab8c8481238bcc823d979753028e075559392c48cbc0bb574cbaa59f0cf47681a8385de4b4aacbc25fd89
+EBUILD tcpdump-0.ebuild 202 SHA256 b07a14f801289293fd9a8a6999102c2779e36ad2eb3d28fcdee2faea4befd210 SHA512 160f2f4311c89bed02ec966761a74d02ed92d3fb79252d981065e1baa35546763ebdcf55b5d794ddf193428f57187f1a19b038dec7f6bac30da7958778441e7c WHIRLPOOL edf68f30b36932a5aad6ab590be75def05d20375d60ab8c8481238bcc823d979753028e075559392c48cbc0bb574cbaa59f0cf47681a8385de4b4aacbc25fd89
+EBUILD tcpdump-1.ebuild 378 SHA256 6fa4b4c2e856bd8fb786d66417da036ae38352b76ce9c2da12be8f905cf85211 SHA512 5ff9324de5f4263dd99a339bed01771ee58c3b2c42a67939258ba04e0136fbdff51f7f83ad5cbf5151ddb46d79230653a5f4eb188e92a8043d48eb6f829a611d WHIRLPOOL e11293b5d649736304d72a025c3d55f5db21ce57c6d9045051d92b003c072f41987e54f1e6f46ae3f178fc4b278f0ca5c64b768fc9f216a2b09e49ae7a7ed687

 MISC metadata.xml 533 SHA256 f0a9810780f90804554690040776736f8f95d79fb5225d1df8f9e1b94f2a94f2 SHA512 3303989855dc26af76cd2fd5ad93fcb70d5484886a122c72a2c71f7dc2070b23bf8c25a46180a4ebc6ffb6537e2b78354e8f24a1167a831a7498475b12712827 WHIRLPOOL e6e19f8dc8e0e88382e11e20c1a68e418469297dad2b34e98998e44eeeb6c374c012c39b1ce6f38c0614e3f360696864247daa0ebf5107b0bff61f994f7088a7
 MISC metadata.xml 533 SHA256 f0a9810780f90804554690040776736f8f95d79fb5225d1df8f9e1b94f2a94f2 SHA512 3303989855dc26af76cd2fd5ad93fcb70d5484886a122c72a2c71f7dc2070b23bf8c25a46180a4ebc6ffb6537e2b78354e8f24a1167a831a7498475b12712827 WHIRLPOOL e6e19f8dc8e0e88382e11e20c1a68e418469297dad2b34e98998e44eeeb6c374c012c39b1ce6f38c0614e3f360696864247daa0ebf5107b0bff61f994f7088a7

diff --git a/sys-user/tcpdump/tcpdump-0.ebuild b/sys-user/tcpdump/tcpdump-0.ebuild
index 9b49db07809abe8e68c8a7e6dfb0f12b2c9a51ee..09d118924b04a15124bb92bdbffc40154ba5f94e 100644 (file)
--- a/sys-user/tcpdump/tcpdump-0.ebuild
+++ b/sys-user/tcpdump/tcpdump-0.ebuild
@@ -5,12 +5,6 @@ EAPI=6
 
 SYS_USER_UID=103
 SYS_USER_UID_IMPORTANT=true
 
 SYS_USER_UID=103
 SYS_USER_UID_IMPORTANT=true

-
-# This "new version" of the tcpdump user has a non-default
-# shell. The existing user should be modified to have the
-# new shell value upon upgrading.
-SYS_USER_SHELL=/bin/sh
-

 inherit sys-user
 
 KEYWORDS="~amd64 ~x86"
 inherit sys-user
 
 KEYWORDS="~amd64 ~x86"

diff --git a/sys-user/tcpdump/tcpdump-1.ebuild b/sys-user/tcpdump/tcpdump-1.ebuild
index 09d118924b04a15124bb92bdbffc40154ba5f94e..9b49db07809abe8e68c8a7e6dfb0f12b2c9a51ee 100644 (file)
--- a/sys-user/tcpdump/tcpdump-1.ebuild
+++ b/sys-user/tcpdump/tcpdump-1.ebuild
@@ -5,6 +5,12 @@ EAPI=6
 
 SYS_USER_UID=103
 SYS_USER_UID_IMPORTANT=true
 
 SYS_USER_UID=103
 SYS_USER_UID_IMPORTANT=true

+
+# This "new version" of the tcpdump user has a non-default
+# shell. The existing user should be modified to have the
+# new shell value upon upgrading.
+SYS_USER_SHELL=/bin/sh
+

 inherit sys-user
 
 KEYWORDS="~amd64 ~x86"
 inherit sys-user
 
 KEYWORDS="~amd64 ~x86"