4 files changed, 2 insertions, 111 deletions
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index ec551e18b181..7e74600accdf 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -3,10 +3,5 @@ AUX tcpflow-1.5.2-gentoo.patch 1344 BLAKE2B 2b795f920d9605f53f81b03dd125dc52c6cf
 DIST be13_api-20170924.tar.gz 75724 BLAKE2B a5257346b9c0740d9758543fe7772c960e1941735abefe4d24d347631b35d1511fde8eb5a58dbb2824c54e78ee0d686a2549ceea2c1dc91e05ef92899c8b3c2d SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4
 DIST dfxml-20170921.tar.gz 163616 BLAKE2B 17214d15596a136efb2afc7246ee0f5696620b5aac7c2d78e37764f51487ff816de5a7c0f59e7484d358a8cd8eab34841716970cd859f0ce868ac29c8532754c SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1
 DIST tcpflow-1.5.2.tar.gz 788545 BLAKE2B b3995cf0f4bedce207dcac19de3d57920231cab75df030da1cf93fb815999de602fd1e3f0955c82effff88f9a3945a891c3b3f0e08449cf366de4bb8269a6452 SHA512 e060779c78f79ba6efdf5f9d8ff490823ff06051a7089247b8155c03f487776fa1896e487e8dca1d5842b617fc5d9056e043f01ac3276edeec1d394ed24bc7e9
-DIST tcpflow_1.4.5+repack1-1.debian.tar.xz 11144 BLAKE2B 1188e259406b5bf4feaa95b6a6805217564f71f377b6ae5baa707453da4f0d9bf15c7fdfe1fea0a9c4586e5c24f9b4cea8fd5226a97d762d9f5969d3381d4bbb SHA512 ed2c491595a3d5382ca79fe945467639af3d99658d002353f90e07aa6b1a955e57ab0fbbc3fadf964e9d6d3dba4fd327a02c1b07d6a239efdf90b365928b2a1e
-DIST tcpflow_1.4.5+repack1-4.debian.tar.xz 12228 BLAKE2B a7c1725d2a82a6ef63800c3bf8fe4d99fd81566fe3b1dbd77238337784954e3161fae868b2a915a9fa2ce580a81d726b6359f905953a952e500f811e9e38c4b5 SHA512 27d8a7a735b06c35cc2985cb26a129a490fc2236eedeede21977afe4c3096a6fde3ea18de1aaa3a1c6a56bc36d332b1e8bd4c7be933d5b031509a69cae189b18
-DIST tcpflow_1.4.5+repack1.orig.tar.gz 725962 BLAKE2B 282849bded34acc79ece4b06c72d5ed05ada07bb2e1a5e6e15dd7c6c46f8f1e57b5bfb018b1a23bdd543d0664b3bd5a3f756342fd657930a77c1ab8307358421 SHA512 fed8589957e3c790b5b6837b9b578d5dcbde316122ed6b3d4f908d1d73f23c6ed8a11720ee0510e878eaa7a6c559a2f35e7df2c77e3cb1f2810040adf7ac2b85
-EBUILD tcpflow-1.4.5_p1-r1.ebuild 1119 BLAKE2B 47a36a5f641e96a2a16afc41c02468ea83b93b425b7c6f1e7f3382321119d3459cbe7e1c9e4a42e02a73fe205d9da21f7afe596c543f6d5879bc5d0fa2b0bbbe SHA512 bbaaf72e7ab163093392d1c4c690281f84100209f4084f351c60823bbbf94e7787530dc75120123ff4a7f4439de06d1a1c815a97185f0735753444d374d8506b
-EBUILD tcpflow-1.4.5_p4-r1.ebuild 1132 BLAKE2B 431b20f5779a0cb828d321069300f12348f75f47d75dd9d2fd7411bebe956f0f40085ff1a0e33fd5036bc919881d07972506ae2dea4362c6f63713eb433d0c33 SHA512 e781ef6618cbd549828bf426c2fdd9511b037d149f45279d54da658b48b5e6302e62b278e9fe36782cf458e2a335263507efb3be8134d698900c4530455a1bfa
-EBUILD tcpflow-1.5.2-r1.ebuild 1571 BLAKE2B 7fef6a92a455d62a4e253a7e1c25b0b2c92b61c5be950f4c76079cdcec4a1d120e1ebc8726b9d2c608b781d701b0070d299fa866bafd71ca073ac800d023d7b1 SHA512 a3005f38a0998dddb0136dbba1b686afa019a93c1c44ea311eb78cc21583ee663f89b99a00f6b3278d6e689b754f043f5d0e7286cd4bfcd48fa716cad61a5a96
+EBUILD tcpflow-1.5.2-r1.ebuild 1568 BLAKE2B 30369bf01dd72a0b231152be69678a2fe5d55101bdee0cb7db6449f622354386dc8a194a205f113281563293b05c930e14fd401e650dceab0e04b1f4c0c28be7 SHA512 d240db703d05ba81626161868315dc11cd599aec886236c54bafbbd67cc45127df65239a13b50d7c7551d7aefff4935c95eeeea33a92ed9add566618691f534d
 MISC metadata.xml 360 BLAKE2B e69d4aa24b5949bff690f0dd8e735d85e975424fec366d7952232a9efd223c163b57684eadde0ddaee26cb0a763e09b64ef7b6361e97611e2369eb1b037d7341 SHA512 32d3c4b5fabd54d1c6c1db15d8af755a6c83725f1d52f5be2ffd7e9975113d200581da4e4a735d823bdf5d12408c8306cc08ef08721ce924f04e137a7da8fa08
diff --git a/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild
deleted file mode 100644
index ce8b561465f6..000000000000
--- a/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
-HOMEPAGE="https://github.com/simsong/tcpflow https://packages.qa.debian.org/t/tcpflow.html"
-SRC_URI="
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1.orig.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-SLOT="0"
-IUSE="cairo test"
-
-RDEPEND="
-	app-forensics/afflib
-	dev-libs/boost
-	dev-libs/openssl:=
-	net-libs/http-parser:=
-	net-libs/libpcap
-	sys-libs/zlib
-	cairo? (
-		x11-libs/cairo
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( sys-apps/coreutils )
-"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${WORKDIR}"/debian/patches/*.patch
-
-	mv -f README{.md,} || die
-
-	sed -i -e 's:`md5 -q \(.*\)`:`md5sum \1 | cut -f1 -d" "`:' tests/*.sh || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(usex cairo --enable-cairo=true --enable-cairo=false) \
-		--without-o3
-}
diff --git a/net-analyzer/tcpflow/tcpflow-1.4.5_p4-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.4.5_p4-r1.ebuild
deleted file mode 100644
index e29648afaeb5..000000000000
--- a/net-analyzer/tcpflow/tcpflow-1.4.5_p4-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
-HOMEPAGE="https://github.com/simsong/tcpflow https://packages.qa.debian.org/t/tcpflow.html"
-SRC_URI="
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1.orig.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-SLOT="0"
-IUSE="cairo test"
-
-RDEPEND="
-	app-forensics/afflib
-	dev-libs/boost
-	dev-libs/openssl:=
-	net-libs/http-parser:=
-	net-libs/libpcap
-	sys-libs/zlib
-	cairo? (
-		x11-libs/cairo
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( sys-apps/coreutils )
-"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-
-	eapply "${WORKDIR}"/debian/patches/*.patch
-
-	mv -f README{.md,} || die
-
-	sed -i -e 's:`md5 -q \(.*\)`:`md5sum \1 | cut -f1 -d" "`:' tests/*.sh || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(usex cairo --enable-cairo=true --enable-cairo=false) \
-		--without-o3
-}
diff --git a/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild
index bf0aeffb4aab..1b29c9fe64b0 100644
--- a/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild
+++ b/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 SLOT="0"
 IUSE="cairo test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"