Version bump. Added missed USE flags, bug #279455, thank Ronny Boesger and Alexander Zubkov for report/job.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 63 insertions, 2 deletions

diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index 7053167c42df..52e477a1c840 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nfdump
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.8 2009/07/09 15:10:29 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.9 2010/05/06 09:10:36 pva Exp $
+
+*nfdump-1.6.1 (06 May 2010)
+
+  06 May 2010; Peter Volkov <pva@gentoo.org> +nfdump-1.6.1.ebuild:
+  Version bump. Added missed USE flags, bug #279455, thank Ronny Boesger and
+  Alexander Zubkov for report/job.
 
   09 Jul 2009; Peter Volkov <pva@gentoo.org>
   files/nfdump-1.5.8-parallel.patch:
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
index d28a55c1db65..194d2b1f16ce 100644
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/metadata.xml
@@ -2,5 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+<use>
+  <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='sflow'>Build sflow collector sfcpad</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.1.ebuild b/net-analyzer/nfdump/nfdump-1.6.1.ebuild
new file mode 100644
index 000000000000..59d1798a0fb6
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.1.ebuild,v 1.1 2010/05/06 09:10:36 pva Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="http://nfdump.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nfdump/${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="ftconv nfprofile sflow"
+
+CDEPEND="
+	ftconv? ( sys-libs/zlib
+		net-analyzer/flow-tools )
+	nfprofile? ( net-analyzer/rrdtool )"
+#	readpcap? ( net-libs/libpcap )"
+DEPEND="${CDEPEND}
+	sys-devel/flex"
+RDEPEND=${CDEPEND}"
+	dev-lang/perl"
+
+src_prepare() {
+	if use ftconv; then
+		sed '/ftbuild.h/d' -i bin/ft2nfdump.c || die
+		sed 's:lib\(/ftlib.h\):include\1:' -i configure.in || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	#	$(use_enable readpcap) \
+	econf \
+		$(use_enable ftconv) \
+		$(use_with ftconv ftpath="/usr") \
+		$(use_enable nfprofile) \
+		$(use_enable sflow)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README || die
+}