gentoo resync : 20.03.2021

4 files changed, 3 insertions, 128 deletions

diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest
index b9a4d5011fa0..a7c1be72e301 100644
--- a/net-analyzer/tcptrace/Manifest
+++ b/net-analyzer/tcptrace/Manifest
@@ -1,10 +1,6 @@
 AUX tcptrace-6.6.7-_DEFAULT_SOURCE.patch 315 BLAKE2B b2024c742405be706c0ff6dfb8c54d3926f2443fb4c62bb37756ad9dbf0010e145421f684eb4ce04cde621f32aa3a6da22e37b5336868647d0bdf4755002c805 SHA512 d20a36a0ca57991f333d783db2442f14fcf06b1e88936b527edcf2973d82dbc88514eae5e051197d7dc4ce25f16bc10799bb91f5baf4a98076c22f60fecb2065
 AUX tcptrace-6.6.7-cross-compile.patch 1348 BLAKE2B f38a64ed02c45482db7b0fb18865c9584481f5875a9703cf010db603f977bf1bc7696391d3c135060f2b9160b76ebd8986c4a17091b4634e757772b690977377 SHA512 ea5f8d5352f1eb4059c0284abbce9ff9b6df78ac8c7cb17a2aa138fa912cb4197f09b8e43e91bd04b980b6d73e1670deb7e9a3b1386eaaede61a7bdb0f410d1e
 DIST tcptrace-6.6.7.tar.gz 3773308 BLAKE2B cae5816cb25c33f71c316d14de3c18ff26f0e7452375a962b88c4818ca7c43425e7298e788bd8cb43f2e22ac7dc9b89ed1921b7bd70d0e8befab3ee791453fb1 SHA512 3638770c342aea6c71aa556e758ed22e1fd44730f6c652cf82d3861eb1c31b186952c660071bd1df45020b80eaf9dd090a4ff58c979cc907eb8154dcb7b9b432
-DIST tcptrace_6.6.7-4.1.diff.gz 29161 BLAKE2B 83768d0a6f14525f20b484421181078a3cf7ac3adeada3cf02a7441530593632743c6e515dd8738f5a4692422d97f4eb718dda076a234489096a10defb97dd5f SHA512 2f6dfeb8e15faa0151bdbb18194587e51de040f63117eb1b469a826091d5c1e5eb41a306bdc94e89ce993d0d04ec31324e5f7eea0a1a52852e07ee80006b2087
-DIST tcptrace_6.6.7-5.debian.tar.xz 6236 BLAKE2B 21d35b625fdc7b94c29b2be595ac39488578f08c53e5dde98953bbebaa2d8d96de968b746dd107ea78365a77f1fe7aa5abfeb3aeef4473c9020587f93066000c SHA512 6265d0bfb25f256c8f356cda731c48f869fe3e9d9504ed6afd0e98a3c2caf5dbcff73373c338be111712713b9a501fae886bb06723796103bac4dec5d8fcfaf6
 DIST tcptrace_6.6.7-6.debian.tar.xz 6056 BLAKE2B a46a8a8a8f804066486566bccd10e33dc372a1fc30f37f401913c2b3038cf917891472e93a509cac8bdd2928d473c3ce21d0c4048c96ae54967fc48780384221 SHA512 82eebc2e297130cbafab0bb1757402d8b210885320ded1cd9b7ff064248d145c93196820564d4d1d7f1b1f7391cc5f734a0e0bf6275ddcae106d0bd540e32b61
-EBUILD tcptrace-6.6.7_p4_p1.ebuild 1482 BLAKE2B bdb5cbfdefd511b1a25e5c9ad5419a3da024c45b66fba910ef4878e7c1ce049344c0a69f9d3a3598a3c834e99d1196400c6a002a93dc7263b7dc20bfa68131c0 SHA512 3d9fd141afe03bc7f729ab47871d6c55f3c7ea7ff3a2e50a2f3855e2b964a2559e9e12917f45d13a5ca53556114bad0ce4288f3ff01f60a28ee5e2f36b883888
-EBUILD tcptrace-6.6.7_p5.ebuild 1250 BLAKE2B 786c6ff2d34b2155830acb942d3a37731335ccc81642ab9c43118ea39e3ac01df8cfdb7824c67ce1994cd93572f9cf6b34d75ffe0bce12fa14c9ac3ab05b4a37 SHA512 3ec354b314768b594e3b31eef8df45d41af4faa84db0b0100c30bebfca2e5078eadacad0481da923dac53956f3b385b69ed0d285ae0726382ae4e410756c71ac
-EBUILD tcptrace-6.6.7_p6.ebuild 1250 BLAKE2B f61f5bbfebe1a66782042c56cab408f77b2798e8b78850a31a968751f42507ae9c9fe4b0a70fea5c74fee9df111c8cf63a117f900d588211894eb538f4e3d728 SHA512 bf523deb713bc0abb6df55bbc02dee5cc41c2b77dccf464b0c3881fcf1f025fd3c0ca6c8e9a504e32bd54ba3be8e9141dc4b3c9db0718eddd5c8347a53d2fe8e
+EBUILD tcptrace-6.6.7_p6.ebuild 1247 BLAKE2B 56e12c7951701d56ddbd5302bab3cf6c483d962cf79c144ad1488c998cdb27e0026a8602f1100c80f8b921bf5454c5877df345ece9f5b652a6f9f28880ce740c SHA512 b78443aae2c40aa7d9276ecae12496af52c0939f346562062968619c05ed97d6b680fe64ad79d0bce3688403d031594975d8f28868b19e951527256e5bcb0490
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
deleted file mode 100644
index 9e42190df0b0..000000000000
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic versionator
-
-TT_DEB_MAJOR=$(get_version_component_range 4)
-TT_DEB_MAJOR=${TT_DEB_MAJOR/p}
-TT_DEB_MINOR=$(get_version_component_range 5)
-TT_DEB_MINOR=${TT_DEB_MINOR/p}
-TT_VER=$(get_version_component_range 1-3)
-
-DESCRIPTION="A Tool for analyzing network packet dumps"
-HOMEPAGE="http://www.tcptrace.org/"
-SRC_URI="
-	http://www.tcptrace.org/download/${PN}-${TT_VER}.tar.gz
-	http://www.tcptrace.org/download/old/6.6/${PN}-${TT_VER}.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${TT_VER}-${TT_DEB_MAJOR}.${TT_DEB_MINOR}.diff.gz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-
-S=${WORKDIR}/${PN}-${TT_VER}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-${TT_VER}-cross-compile.patch
-	eapply "${WORKDIR}"/${PN}_${TT_VER}-${TT_DEB_MAJOR}.${TT_DEB_MINOR}.diff
-
-	eapply_user
-
-	append-cppflags -D_DEFAULT_SOURCE
-
-	eautoreconf
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS}"
-}
-
-src_install() {
-	dobin tcptrace xpl2gpl
-
-	newman tcptrace.man tcptrace.1
-	dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Note: tcptrace outputs its graphs in the xpl (xplot)"
-		elog "format. Since xplot is unavailable, you will have to"
-		elog "use the included xpl2gpl utility to convert it to"
-		elog "the gnuplot format."
-	fi
-}
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild
deleted file mode 100644
index acb7c415420a..000000000000
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A Tool for analyzing network packet dumps"
-HOMEPAGE="http://www.tcptrace.org/"
-SRC_URI="
-	http://www.tcptrace.org/download/${P/_p*}.tar.gz
-	http://www.tcptrace.org/download/old/6.6/${P/_p*}.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${P/_p*}-cross-compile.patch
-	"${FILESDIR}"/${P/_p*}-_DEFAULT_SOURCE.patch
-)
-S=${WORKDIR}/${P/_p*}
-
-src_prepare() {
-	default
-
-	eapply \
-		$(awk '{ print "'"${WORKDIR}"'/debian/patches/" $0; }' < "${WORKDIR}"/debian/patches/series)
-
-	eautoreconf
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS}"
-}
-
-src_install() {
-	dobin tcptrace xpl2gpl
-
-	newman tcptrace.man tcptrace.1
-	dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Note: tcptrace outputs its graphs in the xpl (xplot)"
-		elog "format. Since xplot is unavailable, you will have to"
-		elog "use the included xpl2gpl utility to convert it to"
-		elog "the gnuplot format."
-	fi
-}
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
index f08f5f8fd7de..a96afb76f58e 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 
 DEPEND="
 	net-libs/libpcap