gentoo resync : 28.04.2021

3 files changed, 35 insertions, 29 deletions

diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 839499f0a541..fefde39b6731 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,5 +1,5 @@
 AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf8491998760e4a62ac8908300e28c43500812d37d2512f9d63fcd175b93c1b384e03e9570e741dd95dea09ead017a014a4b62b3449833fe9b248 SHA512 3d035736c0656f6ace85b45af595866e06c8464641023e9d1606c288e598cde18eb96b1be8300514f6f31bc83756ae76b436402666036456571201ca38fe5026
 DIST tcpreplay-4.3.3.tar.xz 748220 BLAKE2B 2de09f75e6bb6035fc25f34f41d9ce2ccbb961d7464a9a6dae16ec417d629e4819593fd781d95075293ffa3a3db7c4a50ae8667c4e7d07c0b425361027c8df06 SHA512 110d7768a176d2126766829466a209cdd983afcf0c988f7e128baa5057b3ac1dc918fcaeb168a2e6654429100a146afcbdafcda8c3d67adf6b17892a48689a02
-EBUILD tcpreplay-4.3.3.ebuild 1847 BLAKE2B d438b6303817d166b800843f3d5f137d69cac8229e37b71d9ff863d9e800c6191284c1bef9d4ad35187864897ad08d8c0a7d96022b55dea909c8164bb918d23a SHA512 e45fa5f14b253b14aba41edf70ea3108ea0be0d6fc17b6a601a7131f247071bfa7001518c78e95cb73203aef0758140e30e11d81e7821f94961cf1e7dfe287c9
-EBUILD tcpreplay-999999.ebuild 1809 BLAKE2B 196a27e64b132ffa5440aa7b540c4939d62dda5191ddc169a85b198f87d84cfcb15f26404e1c335ead442efa8a0cd70f795bceb3fa25736d525accaa42b448dd SHA512 2690427a1bcec51a564bf8dd6bac157a5bfa2dd27fe9c884c37b89b23963fe791a720c703cc4421d9955e8697f2209152e041302aeb767b40dfb052e7b0cfffd
+EBUILD tcpreplay-4.3.3.ebuild 1924 BLAKE2B 0eec7595c24499e9d2dd603d097613f3b1ca59a28c096d7ec8a9231be16ddd1e5d2ce8a56cb41086c6baf3fb08ff56d890b8aec553082e0c7272b49f8dd32285 SHA512 521491bb8e182f93ffa83bc50448e45f178881889af50371f6a770a9815b572d48721ba6b480c64d81fad2f8d2f90e772ea055adc990b98fbd99cc681e86afd9
+EBUILD tcpreplay-999999.ebuild 1875 BLAKE2B acf0bc3fb3e2d84f598d8ed6e13c42bfc642da1aedf8036362e52ab0bc7709beb81d9e57517d26b2b9507ec1cf89c577b0c40993f8faa63babcfaa2d11dbdc6e SHA512 be4c895b20ee5898dc182fdf8f45de64bb9c28fb4b581c07ad29a1f03d3ed953f6bc2e6b596fac66a6290a83dcdfdab17fb01de0042b82cdae86deefcf6be062
 MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild
index a5ce8388372c..3df344d41601 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild
@@ -1,36 +1,39 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools flag-o-matic
 
-DESCRIPTION="utilities for editing and replaying previously captured network traffic"
+inherit autotools
+
+DESCRIPTION="Utilities for editing and replaying previously captured network traffic"
 HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
-LICENSE="BSD GPL-3"
 SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz"
+S="${WORKDIR}"/${P/_/-}
 
+LICENSE="BSD GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~sparc x86"
 IUSE="debug pcapnav +tcpdump"
 
-DEPEND="
+# libpcapnav for pcapnav-config
+BDEPEND="
+	net-libs/libpcapnav
 	>=sys-devel/autogen-5.18.4[libopts]
+"
+DEPEND="
 	dev-libs/libdnet
 	>=net-libs/libpcap-0.9
-	tcpdump? ( net-analyzer/tcpdump )
 	pcapnav? ( net-libs/libpcapnav )
+	tcpdump? ( net-analyzer/tcpdump )
 "
 RDEPEND="${DEPEND}"
 
-DOCS=(
-	docs/{CHANGELOG,CREDIT,HACKING,TODO}
-)
+DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch
 )
 
-S=${WORKDIR}/${P/_/-}
-
 src_prepare() {
 	default
 
@@ -50,8 +53,8 @@ src_configure() {
 	# By default it uses static linking. Avoid that, bug 252940
 	econf \
 		$(use_enable debug) \
-		$(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
-		$(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
+		$(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \
+		$(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \
 		--enable-dynamic-link \
 		--enable-local-libopts \
 		--enable-shared \
diff --git a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild b/net-analyzer/tcpreplay/tcpreplay-999999.ebuild
index 9e2776949df2..52407c59ac72 100644
--- a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-999999.ebuild
@@ -1,35 +1,38 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools flag-o-matic git-r3
 
-DESCRIPTION="utilities for editing and replaying previously captured network traffic"
+inherit autotools git-r3
+
+DESCRIPTION="Utilities for editing and replaying previously captured network traffic"
 HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
-LICENSE="BSD GPL-3"
 EGIT_REPO_URI="https://github.com/appneta/tcpreplay"
+S="${WORKDIR}"/${P/_/-}
 
+LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug pcapnav +tcpdump"
 
-DEPEND="
+# libpcapnav for pcapnav-config
+BDEPEND="
+	net-libs/libpcapnav
 	>=sys-devel/autogen-5.18.4[libopts]
+"
+DEPEND="
 	dev-libs/libdnet
 	>=net-libs/libpcap-0.9
-	tcpdump? ( net-analyzer/tcpdump )
 	pcapnav? ( net-libs/libpcapnav )
+	tcpdump? ( net-analyzer/tcpdump )
 "
 RDEPEND="${DEPEND}"
-DOCS=(
-	docs/{CHANGELOG,CREDIT,HACKING,TODO}
-)
+
+DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch
 )
 
-S=${WORKDIR}/${P/_/-}
-
 src_prepare() {
 	default
 
@@ -49,8 +52,8 @@ src_configure() {
 	# By default it uses static linking. Avoid that, bug 252940
 	econf \
 		$(use_enable debug) \
-		$(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
-		$(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
+		$(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \
+		$(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \
 		--disable-local-libopts \
 		--enable-dynamic-link \
 		--enable-shared \