net-analyzer/tcpflow: Version bump.

Package-Manager: portage-2.2.20.1

3 files changed, 54 insertions, 24 deletions

diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index 155045d6012c..2a4ad3c31b41 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -1,3 +1,4 @@
-DIST tcpflow-1.3.0.tar.gz 220055 SHA256 bd150e432292419b16af45fa951254b19d830709a1c931032ed475049af0b040 SHA512 4812bb4060535f6258496fec1fa5d9489e2832aa342ebb6f00e0717468d74463761637d5198951401d115f6d9c985475f56a435229070fa30f4fbc581f0c5587 WHIRLPOOL 98f50ad1f4882ce3d22d22975b646f48dac12833654d6acbc272626a1cb0e3b262a4e68236bf39073ef7602fcc7cb43efb9e4bd2b3668dcc7cb564af90122ab8
 DIST tcpflow_1.4.4+repack1-3.debian.tar.xz 12244 SHA256 e006b5c6288bbc46e01a8488f7bf448ddd97ac454fe906764ddc3c03696b1a4b SHA512 720f080e2ebb481d64c05b7f4629fb25d6a5c069ce7901959de1f5ad38af0b68ae51469d1df070021a21154e8cec960e8b077f6235e1eb6a476bae252627fd3a WHIRLPOOL 632047fad5f439c78c1d8fe6e39f97058073ac5ff707ff5719372a803e1ff01145202bb894f49e6ad9861b255a0ef04be7fefd76f2c4d34afc2d2c99e41d66e0
 DIST tcpflow_1.4.4+repack1.orig.tar.gz 525060 SHA256 3269742db7acc51ce0ae8bfbe3dfe536654694e276032555f1e825c6f463711f SHA512 d44d060dc7a373137bacca7d38a782d5059ae8b0aa3d92df221955e4af88413f1bba464132c0a3e04d12005a2f54c6252b59e6608154f7ede0a1d3b8d608c1f1 WHIRLPOOL d5646c6fffec95a68624a20f0ce2f086f03cb28a7df529e68636c28c16bc5ebdd81b5edce769d495209f3eb0fb1167fe3b241912c2497cffd99d4e668406acbd
+DIST tcpflow_1.4.5+repack1-1.debian.tar.xz 11144 SHA256 b917e994ac1cd64cb63f719700b0a9862359779286cab89c9c29f73e64ec2d5b SHA512 ed2c491595a3d5382ca79fe945467639af3d99658d002353f90e07aa6b1a955e57ab0fbbc3fadf964e9d6d3dba4fd327a02c1b07d6a239efdf90b365928b2a1e WHIRLPOOL 0854405a429bd2f7276b18acc204e5ac5cfde1bbd4a8f5308e6bf667355eb1ea8a98c52b30a5a24aacb4f8f7b8469e75c2c49fc5f187aa87b869fad9c91d025c
+DIST tcpflow_1.4.5+repack1.orig.tar.gz 725962 SHA256 1d9b4ce2dd85adc1c608f34ada576b7f5b6d51c686ae6b870c3c277049a24af0 SHA512 fed8589957e3c790b5b6837b9b578d5dcbde316122ed6b3d4f908d1d73f23c6ed8a11720ee0510e878eaa7a6c559a2f35e7df2c77e3cb1f2810040adf7ac2b85 WHIRLPOOL 8743e20cea0fbee37c9ee050e8bbe02871e8a32dba2bbed922b912de457aa4eaf5cd21e8828a08eb3eafbf8d3897541230fc37bc4a15f7126e6b8adfb9fea860
diff --git a/net-analyzer/tcpflow/tcpflow-1.3.0.ebuild b/net-analyzer/tcpflow/tcpflow-1.3.0.ebuild
deleted file mode 100644
index 8f119aacb542..000000000000
--- a/net-analyzer/tcpflow/tcpflow-1.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
-HOMEPAGE="https://github.com/simsong/tcpflow"
-SRC_URI="mirror://github/simsong/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="net-libs/libpcap
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/coreutils )"
-
-src_prepare() {
-	sed -i -e 's:`md5 -q \(.*\)`:`md5sum \1 | cut -f1 -d" "`:' tests/*.sh || die
-}
diff --git a/net-analyzer/tcpflow/tcpflow-1.4.5_p1.ebuild b/net-analyzer/tcpflow/tcpflow-1.4.5_p1.ebuild
new file mode 100644
index 000000000000..0214c07800cf
--- /dev/null
+++ b/net-analyzer/tcpflow/tcpflow-1.4.5_p1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
+HOMEPAGE="https://github.com/simsong/tcpflow http://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
+}