Version bump. Add IUSE=nftrack by Vadim Kuznetsov (bug #406637).

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 86 insertions, 14 deletions

diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index 28aa560a4222..a0f214fd1f21 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,15 @@
 # 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.27 2012/06/04 12:10:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.28 2012/10/29 04:12:42 jer Exp $
+
+  29 Oct 2012; Jeroen Roovers <jer@gentoo.org> +nfdump-1.6.8.ebuild,
+  metadata.xml:
+  Version bump. Add IUSE=nftrack by Vadim Kuznetsov (bug #406637).
+
+*nfdump-1.6.8 (29 Oct 2012)
+
+  29 Oct 2012; Jeroen Roovers <jer@gentoo.org> +nfdump-1.6.8.ebuild:
+  Version bump.
 
   04 Jun 2012; Jeroen Roovers <jer@gentoo.org> nfdump-1.6.6.ebuild:
   Add virtual/yacc dependency.
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 41739fc5672e..d57648c7e131 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST nfdump-1.6.5.tar.gz 786526 RMD160 3bb33720965dc9d680eb3e74de327f1b2bdb84b1 SHA1 1d93a78afc043e51c8b39e69e7642bbdba88b5d6 SHA256 3980bad06c73ceabf71c89200e689750a0bc571e8b69f17b76bfd44f8daa08fb
-DIST nfdump-1.6.6.tar.gz 651348 RMD160 63d5aec9e7f6d2ee151a88451e52ac86263996e4 SHA1 f7a30c69419222f1527684fb46f02ae757b3dac0 SHA256 32e74310c2ca1a622dcca5dd63d0bed40e13d851ba62fff249887682ed77e485
-EBUILD nfdump-1.6.5.ebuild 1468 RMD160 fe48114ebff6a220fc295b0086d1a4b8aa107534 SHA1 72a5b3e8ba3f161816bb5174e45982e6452e1f71 SHA256 9676ae737423a3fcf498302ce1256339ff7c4459c51b5c8c34fbbe7b8ea06a98
-EBUILD nfdump-1.6.6.ebuild 1483 RMD160 6953e98762a3556b0753f02b6afcb0c8fa74d541 SHA1 53e4ad5c1d93987b545b5e30863a57ebb430fdbf SHA256 2f53c2efdc655f0ecac3af6292ebf1dc2d287fe44b3365bf42148c83b03b7085
-MISC ChangeLog 3810 RMD160 78228f728af16a340e0641406ccf9d2a4cf65f1c SHA1 4d0464bfae0eb097378117be991dbd3ab3fd95be SHA256 c53546ce20cc8c0c23d080bf0855db29832aa9fdbed8f427b8ad86b74684e124
-MISC metadata.xml 672 RMD160 2cc5cad8ddda5833a01978d7f88aa035aef3b105 SHA1 3964c522dfd999385f44c1c6a0ef3a13ef393290 SHA256 5bc59bc7a5a8f8f0da16de87446c72ee2e1b7ff0dd704640269292e70d9fbf45
+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
+EBUILD nfdump-1.6.5.ebuild 1468 SHA256 9676ae737423a3fcf498302ce1256339ff7c4459c51b5c8c34fbbe7b8ea06a98 SHA512 b30ed5ebbdb195b128722ab1ce05efcc81ab430f99834eea866da25ac05075d11608bff491058f82df791f033d7ecd1992400b0366da76c3245006b051b733d0 WHIRLPOOL 2200ce63aa97c67739800521e97e9d151a0ce7f3e7f94d3e6e9668af139ff002e2976bab16e62c4a0f8ca5c2ce55e2d0d636daa62b240e889b3e2b172679e8a6
+EBUILD nfdump-1.6.6.ebuild 1483 SHA256 2f53c2efdc655f0ecac3af6292ebf1dc2d287fe44b3365bf42148c83b03b7085 SHA512 43b7e2d20d47cf5c427f9632d1413133f32589ee84432bafa2ce64a32750a232f6a2ef336ad4242aad0fc699796e057d210efb3ba0275cbd7aa73cfaa4313b59 WHIRLPOOL b8a80e0d60a106e6b33db8d24d9af16d0702ff4ccbf1fa064416aadda84eb2b6afbac9da297b34913531d603bec8c41a38060b649645fb2bce4096cdd5306dd0
+EBUILD nfdump-1.6.8.ebuild 1489 SHA256 dbc7249007004fe1ad10e3052d26f33827e09516f0842771846fd6e57a315e6b SHA512 38427291a3d82e52e3a1bb15f9c3ccd8132b806d6bb5b871a326b6a3f8b927de03c9c451330b9d80a38a309414bc26dcc34c0d0ac35d26de0bcead04960d3131 WHIRLPOOL dde7694659503dc1bb1814887f096396a57c843bce29a75cee4a9b4c718514c7efa11e403445ca1a8c50835e94446ded279db5c49840bba25b12a7ff742ca5bf
+MISC ChangeLog 4078 SHA256 d11b4d9aca34d1dee0371329bf867476262781185f17c3e780eabcbe7893195b SHA512 61d12b147c366f089a1ac7186b9d39c34c82546342b7434b8276480826831b08a67af622953ad4c0108607f19554ee94b736cfcf68e838a2b059c6871e495f68 WHIRLPOOL 3e6bf4705f440888017692e4db7dadb9bcd806ce7221a4631fceeee2928588229dc98d365708cfc958a658ad646aabf7089ff286405632b9d6c343df3a0b5b07
+MISC metadata.xml 738 SHA256 85ee5c57041ec21251dc54f4ec649255a2fc6b006642923231db5faafd12c3be SHA512 ce01433a60911dc10f44be55499ae0e427bbd0be5d1656ed9ef560897e7455cf011e336aa75e21996203867df479b62850ccfd846727f857140b94687084af94 WHIRLPOOL 1ad3876278082fb7de49974900b072ab51407b883fa26a6089400a8cdac1a4807ff84288332dd78c205060258b28451f1fe3f96eb335fa9939b6f257eea68f82
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/MpcUACgkQVWmRsqeSphMS0gCfTs04L6sXgvxsm7kFsBmJkM5u
-5+4An1fFFqMajzEsQHl18hxnyCXzyyKM
-=fFZ8
+iEYEAREIAAYFAlCOAjwACgkQVWmRsqeSphPU/wCcDH370KsknX0ejNRWIIWNvIbL
+h/4AoICt1TRU+4wVVvDLKKS+e4efXWEL
+=yzkz
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
index 527afc53bd98..111793109bae 100644
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/metadata.xml
@@ -3,11 +3,12 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
+  <!--<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>
-  <!--<flag name='readpcap'>Build nfcapd collector to read from pcap file instead ofnetwork data</flag>-->
+  <flag name='nftrack'>Build nfprofile used by PortTracker</flag>
   <flag name='sflow'>Build sflow collector sfcpad</flag>
-  <flag name='compat15'>Enable read support for nfdump data files created with nfdump 1.5.x</flag>
 </use>
 <longdescription>The nfdump tools collect and process netflow data on the command line</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/nfdump/nfdump-1.6.8.ebuild b/net-analyzer/nfdump/nfdump-1.6.8.ebuild
new file mode 100644
index 000000000000..625686311e44
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.8.ebuild,v 1.1 2012/10/29 04:12:43 jer Exp $
+
+EAPI=4
+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"
+# Fails to build readpcap:
+# https://sourceforge.net/tracker/?func=detail&aid=2996582&group_id=119350&atid=683752
+IUSE="compat15 debug ftconv nfprofile nftrack sflow"
+
+CDEPEND="
+	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
+	nfprofile? ( 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_enable compat15) \
+		$(use_enable debug devel) \
+		$(use_enable nftrack) \
+		$(use_enable sflow)
+}