Version bump. Fix building against net-analyzer/flow-tools[-static-libs] (bug #405157).

Package-Manager: portage-2.2.0_alpha88/cvs/Linux x86_64

3 files changed, 69 insertions, 6 deletions

diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index be6ca555f155..157f1a3384b6 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nfdump
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.19 2011/06/06 12:05:44 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.20 2012/02/21 16:34:20 jer Exp $
+
+*nfdump-1.6.5 (21 Feb 2012)
+
+  21 Feb 2012; Jeroen Roovers <jer@gentoo.org> +nfdump-1.6.5.ebuild:
+  Version bump. Fix building against net-analyzer/flow-tools[-static-libs] (bug
+  #405157).
 
 *nfdump-1.6.3_p1 (06 Jun 2011)
 
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 4271daaf3ae2..0f03e927daa0 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -4,15 +4,17 @@ Hash: SHA1
 DIST nfdump-1.6.1.tar.gz 495643 RMD160 af26aef45e937b633c349cd6a551c34bf8cf8827 SHA1 d00cd84eb0f6ff23928c3c2c09665e5633f5114d SHA256 d0585d3963288b708f2be6081f673d9935acc8bb5f25255286786eedf31edafd
 DIST nfdump-1.6.2.tar.gz 469358 RMD160 69ff28a7d2ea7a05978611762ced9554ab0d9f34 SHA1 9632b4f3b18bf540dc3d5022641913e0ef49b467 SHA256 c69bbb5fb401161e5e20b848b47eff4a280d5c8d5f2c7f0943ea0b821b5742b0
 DIST nfdump-1.6.3p1.tar.gz 598839 RMD160 2c1add5268b04109a33a63b9b5a308bc9ca3b661 SHA1 865e30c10808a4875f220f20e8cb322e5524e476 SHA256 68838379013e15b6f296ef06912f6ea5a649df697d2efb1a852f3189ad671749
+DIST nfdump-1.6.5.tar.gz 786526 RMD160 3bb33720965dc9d680eb3e74de327f1b2bdb84b1 SHA1 1d93a78afc043e51c8b39e69e7642bbdba88b5d6 SHA256 3980bad06c73ceabf71c89200e689750a0bc571e8b69f17b76bfd44f8daa08fb
 EBUILD nfdump-1.6.1-r2.ebuild 1439 RMD160 31c456544634531c7a94aa9d5b2773cf95dbaa0d SHA1 006ac029a14d2f7e42859c0b3243aa426fa8013e SHA256 81aeb8f20f550d96b1037aceeaf43d8027e2918f9fc67f1d2ce05cceb59a4c61
 EBUILD nfdump-1.6.2.ebuild 1433 RMD160 fef4cc7053486755a899cca463111d9fcc6db564 SHA1 8b412a5d84f5cbec42f63e3d35ad6dd753deb63d SHA256 3b6843de08041a2f7b1d33cf7f901f0f63ae6e716074023e2423bca6e4c305c9
 EBUILD nfdump-1.6.3_p1.ebuild 1478 RMD160 8baaadbc7d510ab61e444b9c0bf36ccadc143ddc SHA1 bde6386f4ca0e5481f17c969d81641aa093bded3 SHA256 e70873f35a3530f4a2c365ae6d1c9f6c769d5f97f178ca0b87978582b7eb2dd4
-MISC ChangeLog 2914 RMD160 1c534f6b4886acee5cbf0be03dc847b2e5394c00 SHA1 88d70c7d2ce00f76f8262968047822f7871c771a SHA256 5aff00a48d084d58298317d93aacbee6567f5bec91a19dd5c0920349437cec6c
+EBUILD nfdump-1.6.5.ebuild 1490 RMD160 7f0f33cb5ee950c0a4df68d36cfd254a4d2162f3 SHA1 14499713678ed31bb1f5e580942c3a2129a001c1 SHA256 181a9a361df5742863d9439b223dc84e677331a2b5a3700baae2e896ef2ddcf2
+MISC ChangeLog 3105 RMD160 088182dbeca1a9f81a9d8237986d483f7e1d78b7 SHA1 a113ef3e6235113a20d5539bc2f8bb51f6b0030e SHA256 343a45f11e07d4e20c7d022e37cea31848dea4431277cde1f7e0614986b50b6e
 MISC metadata.xml 672 RMD160 2cc5cad8ddda5833a01978d7f88aa035aef3b105 SHA1 3964c522dfd999385f44c1c6a0ef3a13ef393290 SHA256 5bc59bc7a5a8f8f0da16de87446c72ee2e1b7ff0dd704640269292e70d9fbf45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3swqEACgkQVWmRsqeSphPcIwCdH16d7S3Zb8zd9xRXus27mEry
-YWwAn0LEtKSEblgwT7jqSVi517ZKW1eC
-=b3fs
+iEYEARECAAYFAk9Dx5IACgkQVWmRsqeSphOv6QCfaFjdLJNq2KJRTKDt/cBySnbb
+bUMAn2DJUUysgDtU3Xr4NXcH81fAAcmL
+=hwXd
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nfdump/nfdump-1.6.5.ebuild b/net-analyzer/nfdump/nfdump-1.6.5.ebuild
new file mode 100644
index 000000000000..728c2beddd2c
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.5.ebuild
@@ -0,0 +1,55 @@
+# 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.5.ebuild,v 1.1 2012/02/21 16:34:20 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 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"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+cp -av configure.in{,.org}
+	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 sflow) \
+		$(use_enable debug devel) \
+		$(use_enable compat15)
+		# $(use_enable readpcap) \
+}