gentoo resync : 25.08.2020

3 files changed, 22 insertions, 19 deletions

diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 9a66f676fbe8..f230333963ad 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,6 +1,6 @@
 AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
-EBUILD tcpdump-4.9.3-r1.ebuild 1926 BLAKE2B c29eba2ce6fb0ad870181b11f425a1890795f15f9b2a605cfa1f74fe845178fdc0f918640d0801187b5a599419d18967ccc502f9fd4aea0db79a73be5c1451d1 SHA512 05e260dfed29e697c8cb61e0a1400cab7b48706f55fb2c18f2b5e7f09f3055d4f006cddb3cd7147f151d501cf2072f2433f1d4df49c246c08c6afeef9e62bf12
+EBUILD tcpdump-4.9.3-r1.ebuild 1879 BLAKE2B 65e3958ba8cad7dc7b7d2b77d6010e8f839c89fdb0d2fae5c15b338dab2d1b6f2758b86bfa94e72589a7578b3f3a7f299ba298a15414ee4847f014f9047915c9 SHA512 caada4ddb50725f408d1559b8d53c1ac8c996a5eee4ca41d645731f378c35ff7b1d74e75e7c728bb546c5c678d984015f702e5ba350048540f77cfc3fab56e1f
 EBUILD tcpdump-4.9.3.ebuild 1938 BLAKE2B 3fbeee3f62778f3347d509c2daa7a70ece06f40e3a8d37b85f3a67f53a6c3ed1eaa09bc52b48239db0c51739ad2f94239f9ebe11ed9c1e4bc2dbde8b8eff94b9 SHA512 f627bd6a18482bbc70724491eb69acfbba095d5193bfee673da5f275ce8b40383450776aa1e22444595116df42bc5b6d23a2ffd16a5b94cbc3144253f64e104a
-EBUILD tcpdump-9999.ebuild 2267 BLAKE2B ba2e463b49d4d716709e5914e37bb84877ea954e59ae7ffdc59919221c76bc9811a7ec28cc23ff571373433456ea90522b8b2b59ad785ef235039c5783df1b65 SHA512 2c8c2f0346504873fd6f879e15b49b44d112cf780c75becf7bd862add84ca59a3613c996aa78bf34bad0c0163c278f12978b39c2b32c0d3b75994859116510ae
+EBUILD tcpdump-9999.ebuild 2195 BLAKE2B ca86179ed2e7c1011ad249593cb2dbef59d2c509c217d630b5915a199798460ca89fb636471588b84761806d1bc8c2415c76a1fa67a91416973e99258e046415 SHA512 cb1ecf623008bff818de460ea6c83cceb6a41e336dfa9d3ef6e9d05699574e18fb892c1d3eb85f2b176362cc24ec3cadda495b552959944ce4295cdd598f254b
 MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild
index 8374b080d4e2..e23d799be4ba 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic toolchain-funcs user
+inherit autotools user
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
 HOMEPAGE="
@@ -20,8 +20,8 @@ IUSE="+drop-root libressl smi ssl samba suid test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	drop-root? ( sys-libs/libcap-ng )
 	net-libs/libpcap
+	drop-root? ( sys-libs/libcap-ng )
 	smi? ( net-libs/libsmi )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
@@ -30,12 +30,14 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	drop-root? ( virtual/pkgconfig )
 	test? (
 		>=net-libs/libpcap-1.9.1
 		dev-lang/perl
 	)
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-libdir.patch
+)
 
 pkg_setup() {
 	if use drop-root || use suid; then
@@ -44,14 +46,15 @@ pkg_setup() {
 	fi
 }
 
-src_configure() {
-	if use drop-root; then
-		append-cppflags -DHAVE_CAP_NG_H
-		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
-	fi
+src_prepare() {
+	default
+	eautoreconf
+}
 
+src_configure() {
 	econf \
 		$(use_enable samba smb) \
+		$(use_with drop-root cap-ng) \
 		$(use_with drop-root chroot '') \
 		$(use_with smi) \
 		$(use_with ssl crypto "${ESYSROOT}/usr") \
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index ac642f4be7b4..b0c0a0baa597 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic toolchain-funcs user
+inherit autotools git-r3 user
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
 EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
@@ -32,9 +32,11 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:= )
 	)
 "
+BDEPEND="
+	drop-root? ( virtual/pkgconfig )
+"
 DEPEND="
 	${RDEPEND}
-	drop-root? ( virtual/pkgconfig )
 	test? (
 		>=net-libs/libpcap-1.9.1
 		dev-lang/perl
@@ -52,22 +54,20 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
-
 	sed -i -e '/^eapon1/d;' tests/TESTLIST || die
 
 	# bug 630394
 	sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
+
+	default
+
+	eautoreconf
 }
 
 src_configure() {
-	if use drop-root; then
-		append-cppflags -DHAVE_CAP_NG_H
-		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
-	fi
-
 	econf \
 		$(use_enable samba smb) \
+		$(use_with drop-root cap-ng) \
 		$(use_with drop-root chroot '') \
 		$(use_with smi) \
 		$(use_with ssl crypto "${ESYSROOT}/usr") \