Version bump, bring back USE='readpcap'

Package-Manager: portage-2.2.0_alpha165/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 80 insertions, 8 deletions

diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index 1e2d2746c808..a0eca7fc6f3e 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nfdump
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.31 2012/11/05 12:53:20 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.32 2013/03/07 10:36:30 pinkbyte Exp $
+
+*nfdump-1.6.9 (07 Mar 2013)
+
+  07 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> +nfdump-1.6.9.ebuild,
+  metadata.xml:
+  Version bump, bring back USE='readpcap'
 
   05 Nov 2012; Jeroen Roovers <jer@gentoo.org> nfdump-1.6.8.ebuild:
   USE=nftrack requires net-analyzer/rrdtool.
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 9548622044d1..4ba0106b587a 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -4,15 +4,21 @@ Hash: SHA256
 DIST nfdump-1.6.5.tar.gz 786526 SHA256 3980bad06c73ceabf71c89200e689750a0bc571e8b69f17b76bfd44f8daa08fb SHA512 129d9a41b2a657298f57676672f71bd44e55fa325a6e39440144661add886ffb4ae170e0b1fd1d73f0376d8ac068e2ba9708698f5ecc15feb37677a95fde30e1 WHIRLPOOL d45ad144d2cb82d827a301447eb671576a3b97d03824836f58bd7aa8b42cd108cdc08548460d1b3a3b3706011e61fd86881069b2e63039345fa21212b2cc9d44
 DIST nfdump-1.6.6.tar.gz 651348 SHA256 32e74310c2ca1a622dcca5dd63d0bed40e13d851ba62fff249887682ed77e485 SHA512 3323fa39974725005c0930b9447e623b387dc9288ae7cdf9a39dc5c79218c7aaacceead4ca9c2c740df3e948a26581ac0bf0d4a4e6e34cd47b36bf901d881865 WHIRLPOOL 3c7eec7208524bada0bc66587155a774fba2187126cb80e18cf52ac0b2fd60fd90ec64d0fa4cb0a43cb8ec94d973ce218fa3d76c77e19a91f9f57bbde8de00cd
 DIST nfdump-1.6.8.tar.gz 672158 SHA256 4b2306d7a26f2f81228e7d3bbeb06df42e903dec9b351c770c474bd97d74a8d6 SHA512 58c46ad01d48d48cb8b79d046f7be772c6e16a99b6f483a577a473190ea8795c7849a8ca120f1bfaf28e2962f6c399f9e39db9e050f7f7a7884bd1a71e3a1a59 WHIRLPOOL a6241c9a3921d827bec2dfbd78fe84bd8522310469fc921a2ac542c7eb2197ac7da5388e9e0487d715647c57bb7d9c1be89a4df6d975124bb8cd18d6a4837256
+DIST nfdump-1.6.9.tar.gz 686587 SHA256 734943ab872d3642575add5db64ef5755f85a0a9600b120d5ee09bea4ef98dbc SHA512 07cf0bbcd001b38cc6791774d3797944256ba51513f1d97a18532248a13ad1dd0892bd75c6665aab769e1afaf99cb9e83372b79f0e814dd1e6156000eb720aa6 WHIRLPOOL b70b24dbdb4aa774d6cfcdef9c27835be14da5f06db3367e8f297f4dd702fe80c49888305cfdbe61953cb212f13e9f02de8735bcaa3ea5e63441be7074fcbc5c
 EBUILD nfdump-1.6.5.ebuild 1468 SHA256 9676ae737423a3fcf498302ce1256339ff7c4459c51b5c8c34fbbe7b8ea06a98 SHA512 b30ed5ebbdb195b128722ab1ce05efcc81ab430f99834eea866da25ac05075d11608bff491058f82df791f033d7ecd1992400b0366da76c3245006b051b733d0 WHIRLPOOL 2200ce63aa97c67739800521e97e9d151a0ce7f3e7f94d3e6e9668af139ff002e2976bab16e62c4a0f8ca5c2ce55e2d0d636daa62b240e889b3e2b172679e8a6
 EBUILD nfdump-1.6.6.ebuild 1481 SHA256 a0ec9ac971d3a3213eb840fb72a75c73ba5850b080333628e9438a64f6c171a8 SHA512 6c1c9c207e6619e51a77f694a43f19f326babb5d9e0d35020ea14fb143eed6f3d183a1ce3d48820da1411492af0a899bb3063d77f7055dd6702107506f6cbda8 WHIRLPOOL 5772df116358c11ff936a3e75dad2a5c0d1e7234143b48b3c701378c403a0f2ef8af9cecef4ba9a0f21cce28a6cba78a4ec6fae5996ad1a874e3d16c70ad960c
 EBUILD nfdump-1.6.8.ebuild 1540 SHA256 4c87738fb1e8cf53760433318ca980c5eb22a15c880d3889efc6afb354ffa0a7 SHA512 8ab20aa0b67d315d470435c5060adfd0c065c4e82e3cf78570e75e596acd8187d988f24fec6b5c15d463f3e1f4465adb99a0bdace18c9c1de70e2f9a842caf4a WHIRLPOOL a121a1dff3c4951618f1b8beab294f8e337f0d5f289fbff7edda60c09a1b3b72d69bfe5933ed797258f082e1857bfccb2d7a50008d5296d94c9d5b9255242c7a
-MISC ChangeLog 4404 SHA256 94a01a218127f95759dd624034bb27bee5de610a002c75b36c5d33ba0a99cc72 SHA512 d2e21d6b643030be78837b3c5f10f8c1057f5309fea7cefea1c94352ce094803e5dce4e362910cc4538935500de6d0d8cbab2fe78b66d6b3f7e3d8ba231afecb WHIRLPOOL cdd86346796f0fdf671c8ddc73d1a60bc35801bd6386b65a5736438cae2eb7b71b364ea0c56c6bace2bbe3583c9244c18ff76f0b2204a991e49582752d73fc48
-MISC metadata.xml 738 SHA256 85ee5c57041ec21251dc54f4ec649255a2fc6b006642923231db5faafd12c3be SHA512 ce01433a60911dc10f44be55499ae0e427bbd0be5d1656ed9ef560897e7455cf011e336aa75e21996203867df479b62850ccfd846727f857140b94687084af94 WHIRLPOOL 1ad3876278082fb7de49974900b072ab51407b883fa26a6089400a8cdac1a4807ff84288332dd78c205060258b28451f1fe3f96eb335fa9939b6f257eea68f82
+EBUILD nfdump-1.6.9.ebuild 1465 SHA256 6cc8c957c9e99b7820aa4fb4076b7831d0a22e75094d15ffece224ba5d13b862 SHA512 88f8c35122420b4b16811191689e1c051a93821324fb6d8a6e263b9220d7b89678c654736d807ced7f9e1f2daf48524203eef1b2a2ce6f48e0f2b50c70d818a5 WHIRLPOOL 10bb0189c92252061805973d8548e63bfa681f34e69fb49c9a0091f31a9926c1156778a7d4ec63f07fb5f3d340691c495ddd022a7e46e2772c6a8d098c07568b
+MISC ChangeLog 4569 SHA256 001a2f22ee6c6c151ead2af942007106043eec5dddeb6665855b80fa2cfde874 SHA512 4f4d7d067fd8c56880dc51f57ea94c4d9ba52f9754a512a804e9ce336bc71f52a3f2b9327e0d3e3a26a0f4c77b614d36c2a831fbdad22efc385b8ca01f822877 WHIRLPOOL b8610bd6f6c2704ff3de9af4268ad46a379405cb71880c60d4075d630f0d6655d8f22919eb33e5cbb2f3c7f4bb98184863722f66795dae9f30f5782d288e3eed
+MISC metadata.xml 731 SHA256 3bb173957579a6070cd6eb51731f2f196314e0d4b83e989425ad3af4f4d4b027 SHA512 a85786a81254c27b0823055a15c8c8d12722aaca35329f9072da15da0d48eb0f528f37a25241f1095b7fb2aec16f67a4be3f06cfba6e78b5860da34fb044329f WHIRLPOOL ce811c0eac09ae59766d098362b129ec880044bbba6f540cc560c882f4bab1c147fe1b2ba48f6a0b38a437a2de704eb8b0164587817aefad2adc46362ca2766e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCXtsEACgkQVWmRsqeSphNQOQCfRMrdRKrmQA2eKuxUHuj8efXe
-hzYAnj7cSQoCHJHxD+zPW+7xRBEpWcnR
-=+xMl
+iQEcBAEBCAAGBQJROG2sAAoJECo/aRed9267qaMIAJClySK+68XBa517vquN/FmL
+oPYMJXsBA88f8LqMj5PHXYOzvWplosFhyUJtQGZMSunWTRH1uhdMwTmo22k2GMqF
+7IkHPFXBa+EofU5nRxZef7GBL8MvuCC2qG0NlM4vYdR1aQDax2xh6RgBX6elFpm7
+C0nXcofXzSD1rRa4ol3pMVfGjVWVfDSnB4dvOLX9uSasPKKPRj7dO89dailb+yyA
+YEIL0Rylva9ft4bYsomtvDZvPkFH0wNKKW0+uPF5ui/CjyA+NmU0qnR2oELGnsPN
+300UumRKW6/JFnwrMPgeLijvf+iNE5lOcZQ4XN9qCMeEfV6fODG4r4B35jH5VcQ=
+=xbwF
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
index 111793109bae..5204c2aa2aab 100644
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
-  <!--<flag name='readpcap'>Build nfcapd collector to read from pcap file instead ofnetwork data</flag>-->
+  <flag name='readpcap'>Build nfcapd collector to read from pcap file instead ofnetwork data</flag>
   <flag name='compat15'>Enable read support for nfdump data files created with nfdump 1.5.x</flag>
   <flag name='ftconv'>Build the flow-tools to nfdump converter</flag>
   <flag name='nfprofile'>Build nfprofile used by NfSen</flag>
diff --git a/net-analyzer/nfdump/nfdump-1.6.9.ebuild b/net-analyzer/nfdump/nfdump-1.6.9.ebuild
new file mode 100644
index 000000000000..89a3b144e5d5
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.9.ebuild,v 1.1 2013/03/07 10:36:30 pinkbyte Exp $
+
+EAPI=5
+inherit autotools eutils
+
+MY_P="${P/_/}"
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="http://nfdump.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nfdump/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
+
+CDEPEND="
+	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
+	nfprofile? ( net-analyzer/rrdtool )
+	nftrack? ( net-analyzer/rrdtool )
+	readpcap? ( net-libs/libpcap )
+"
+DEPEND="
+	${CDEPEND}
+	sys-devel/flex
+	virtual/yacc
+"
+RDEPEND="
+	${CDEPEND}
+	dev-lang/perl
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if use ftconv; then
+		sed -e '/ftbuild.h/d' -i bin/ft2nfdump.c || die
+		sed \
+			-e 's:lib\(/ftlib.h\):include\1:' \
+			-e 's:libft.a:libft.so:' \
+			\-i configure.in || die
+	fi
+	sed -i bin/Makefile.am -e '/^AM_CFLAGS/d' || die
+	eautoreconf
+}
+
+src_configure() {
+	# --without-ftconf is not handled well #322201
+	econf \
+		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+		$(use nfprofile && echo --enable-nfprofile) \
+		$(use nftrack && echo --enable-nftrack) \
+		$(use_enable compat15) \
+		$(use_enable debug devel) \
+		$(use_enable readpcap) \
+		$(use_enable sflow)
+}