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

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 73 insertions, 3 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/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)
+}