gentoo resync : 11.02.2018

3 files changed, 3 insertions, 51 deletions

diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest
index 927b7c4b28bb..50894099ae22 100644
--- a/net-analyzer/tcptrace/Manifest
+++ b/net-analyzer/tcptrace/Manifest
@@ -1,6 +1,5 @@
 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
-EBUILD tcptrace-6.6.7-r2.ebuild 1028 BLAKE2B b45bd98f2e72f91d1caa90aaea71e143c8bac603867c207e5fbfb6cbed0ce238eaae60d35a7af46747b8e86462e7a9a2b6fa827554fde5561aee95161b7a0df2 SHA512 cc29ad6fa8921d7f34ba073993d96cdb44f4d5fa203758c44b457b2ed6271958df592711cc33c2d8a0127e573249c4da897c48a279d8d8bb0d9fafee19e6af30
-EBUILD tcptrace-6.6.7_p4_p1.ebuild 1483 BLAKE2B db7816a4c6ef7d7e7ef3de1a701e1df2fdfa9da4c581abfda9b7a73e719d3f370fa86872eb846bff630566b426c35bdcdb4043c94f805035a363152e30b3e196 SHA512 aa66451f74d56e68ea4e1cad736d3ebb9e0efd2ad9c4fe9be9045c24d0f6e310ef45f7bd20c0edfba2d8b8c9d6553f723bc3b696893cde58fc4d021a6644e3ad
+EBUILD tcptrace-6.6.7_p4_p1.ebuild 1482 BLAKE2B bdb5cbfdefd511b1a25e5c9ad5419a3da024c45b66fba910ef4878e7c1ce049344c0a69f9d3a3598a3c834e99d1196400c6a002a93dc7263b7dc20bfa68131c0 SHA512 3d9fd141afe03bc7f729ab47871d6c55f3c7ea7ff3a2e50a2f3855e2b964a2559e9e12917f45d13a5ca53556114bad0ce4288f3ff01f60a28ee5e2f36b883888
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7-r2.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7-r2.ebuild
deleted file mode 100644
index c00386bbbde0..000000000000
--- a/net-analyzer/tcptrace/tcptrace-6.6.7-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A Tool for analyzing network packet dumps"
-HOMEPAGE="http://www.tcptrace.org/"
-SRC_URI="
-	http://www.tcptrace.org/download/${P}.tar.gz
-	http://www.tcptrace.org/download/old/6.6/${P}.tar.gz
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
-	eautoreconf
-	append-cppflags -D_BSD_SOURCE
-}
-
-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_p4_p1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
index e0a0ede25bfe..9e42190df0b0 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 
 DEPEND="
 	net-libs/libpcap