gentoo resync : 25.08.2020

3 files changed, 2 insertions, 78 deletions

diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index d70844a27ed8..839499f0a541 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,7 +1,5 @@
 AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf8491998760e4a62ac8908300e28c43500812d37d2512f9d63fcd175b93c1b384e03e9570e741dd95dea09ead017a014a4b62b3449833fe9b248 SHA512 3d035736c0656f6ace85b45af595866e06c8464641023e9d1606c288e598cde18eb96b1be8300514f6f31bc83756ae76b436402666036456571201ca38fe5026
-DIST tcpreplay-4.3.2.tar.xz 747268 BLAKE2B 27cad902785975f9c7fbfb8abef24ae95fbc8812e0a4fabd3b1ecf74bb9f0a99cdb0c37db72c433296d3cebba89d0bbc90e944195e585bf2d1c2d93ef234c4f6 SHA512 641dd636d9c5c30637d0103f8b21da3ce234f9e3ed7ab4d2b20d004fc4a14301672dcd678b2d5e0eb90d55a97bcb0c4c67f31c790a5aa3c509a92d1142c5b7b9
 DIST tcpreplay-4.3.3.tar.xz 748220 BLAKE2B 2de09f75e6bb6035fc25f34f41d9ce2ccbb961d7464a9a6dae16ec417d629e4819593fd781d95075293ffa3a3db7c4a50ae8667c4e7d07c0b425361027c8df06 SHA512 110d7768a176d2126766829466a209cdd983afcf0c988f7e128baa5057b3ac1dc918fcaeb168a2e6654429100a146afcbdafcda8c3d67adf6b17892a48689a02
-EBUILD tcpreplay-4.3.2.ebuild 1847 BLAKE2B d438b6303817d166b800843f3d5f137d69cac8229e37b71d9ff863d9e800c6191284c1bef9d4ad35187864897ad08d8c0a7d96022b55dea909c8164bb918d23a SHA512 e45fa5f14b253b14aba41edf70ea3108ea0be0d6fc17b6a601a7131f247071bfa7001518c78e95cb73203aef0758140e30e11d81e7821f94961cf1e7dfe287c9
-EBUILD tcpreplay-4.3.3.ebuild 1849 BLAKE2B 944b39e6b8cbfc08ba57f670fe5ab1b8b19517eb1f10f9f186d7c399a5938e4e7bae9e0af248e4e9508ba112d3dfb68bd930f5d70e5b4369d23c287f4eb240da SHA512 7c847b68d153654afd26a1979c57270585f24617695d0e8e5ea760f31110712b96dd2c5e4a24aaddba3bbec314622858014287ee2e411d8d253569cbf2407ca1
+EBUILD tcpreplay-4.3.3.ebuild 1847 BLAKE2B d438b6303817d166b800843f3d5f137d69cac8229e37b71d9ff863d9e800c6191284c1bef9d4ad35187864897ad08d8c0a7d96022b55dea909c8164bb918d23a SHA512 e45fa5f14b253b14aba41edf70ea3108ea0be0d6fc17b6a601a7131f247071bfa7001518c78e95cb73203aef0758140e30e11d81e7821f94961cf1e7dfe287c9
 EBUILD tcpreplay-999999.ebuild 1809 BLAKE2B 196a27e64b132ffa5440aa7b540c4939d62dda5191ddc169a85b198f87d84cfcb15f26404e1c335ead442efa8a0cd70f795bceb3fa25736d525accaa42b448dd SHA512 2690427a1bcec51a564bf8dd6bac157a5bfa2dd27fe9c884c37b89b23963fe791a720c703cc4421d9955e8697f2209152e041302aeb767b40dfb052e7b0cfffd
 MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
deleted file mode 100644
index a5ce8388372c..000000000000
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 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"
-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"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
-IUSE="debug pcapnav +tcpdump"
-
-DEPEND="
-	>=sys-devel/autogen-5.18.4[libopts]
-	dev-libs/libdnet
-	>=net-libs/libpcap-0.9
-	tcpdump? ( net-analyzer/tcpdump )
-	pcapnav? ( net-libs/libpcapnav )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=(
-	docs/{CHANGELOG,CREDIT,HACKING,TODO}
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch
-)
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
-		src/common/sendpacket.c || die
-	sed -i \
-		-e 's|@\([A-Z_]*\)@|$(\1)|g' \
-		-e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
-		-e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
-		src/Makefile.am || die
-
-	eautoreconf
-}
-
-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) \
-		--enable-dynamic-link \
-		--enable-local-libopts \
-		--enable-shared \
-		--with-libdnet \
-		--with-testnic2=lo \
-		--with-testnic=lo
-}
-
-src_test() {
-	if [[ ! ${EUID} -eq 0 ]]; then
-		ewarn "Some tests were disabled due to FEATURES=userpriv"
-		ewarn "To run all tests issue the following command as root:"
-		ewarn " # make -C ${S}/test"
-		emake -j1 -C test tcpprep
-	else
-		emake -j1 test || {
-			ewarn "Note that some tests require eth0 iface to be up." ;
-			die "self test failed - see ${S}/test/test.log" ; }
-	fi
-}
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild
index d27b84b1c383..a5ce8388372c 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild
@@ -10,7 +10,7 @@ LICENSE="BSD GPL-3"
 SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~sparc x86"
 IUSE="debug pcapnav +tcpdump"
 
 DEPEND="