Version bump. Fixed parallel build issue, bug #240746, thank Diego E. 'Flameeyes' Pettenò for report.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 62 insertions, 3 deletions

diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index dad15ccd78a4..08aae09fc97c 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nfdump
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.6 2008/11/01 01:04:57 robbat2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.7 2009/05/11 16:12:38 pva Exp $
+
+*nfdump-1.5.8 (11 May 2009)
+
+  11 May 2009; Peter Volkov <pva@gentoo.org> +nfdump-1.5.8.ebuild,
+  +files/nfdump-1.5.8-parallel.patch:
+  Version bump. Fixed parallel build issue, bug #240746, thank Diego E.
+  'Flameeyes' Pettenò for report.
 
 *nfdump-1.5.7 (01 Nov 2008)
 
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 6a9e60fbba0d..8536e3c19ecc 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,6 +1,9 @@
+AUX nfdump-1.5.8-parallel.patch 700 RMD160 27b2bf1daf4495f6e9da74eb7c03e98d2a9c6e9e SHA1 a3e23dc5c920025fc29286eaa40bc646187d79ec SHA256 3a6a9b15905ccb16fb402a98cb5cd4a62c965fa106533c3e401ef4de27234782
 DIST nfdump-1.5.1.tar.gz 224199 RMD160 6d7695441f7a31dffd3a06609aef7cf8f04bb61b SHA1 57af33c197ddb85e687d31d5d15324b9be7cfc4e SHA256 0552311f4efffcafda55bbefb273fa2ff2f2c89b7b6815df0bc1dbe75e82b089
 DIST nfdump-1.5.7.tar.gz 324603 RMD160 c0a3fb6f0692e891a1f98a2779ef19146dffced7 SHA1 74965ba1b0bdb8e789ec8fb3d546d0520b2e9774 SHA256 d3890848ca6502391c6d2798b7d06c712d916fdcee38dfe0006a6bb3830bb5b5
+DIST nfdump-1.5.8.tar.gz 331279 RMD160 3b91874088cec70eae697fa45f9e8c2832da43b9 SHA1 73a18f3eabb7f928d8ed9c2a305914c953f9457e SHA256 3fbfb874377316cf322cf13cfab667207fe78e0910bbc82ba012e3a77c00de36
 EBUILD nfdump-1.5.1.ebuild 672 RMD160 b4057a31ad083659cdbbc25bea688030c2b017f2 SHA1 3c8b3b837677c44ca4c050e75cd696384e41a292 SHA256 c32f2d1f7184f5004a95ff6db43977c59668bf38852ed6db3ce9c355d543bc10
 EBUILD nfdump-1.5.7.ebuild 670 RMD160 1046a51444247a3b2588eaa74825ee40d934ab8a SHA1 a511085d522a8af3e16ded80a6d6d3a1bb45a901 SHA256 1aca33ef4bcc2ca03306e038c85dd3f5a3207407b3fea0a94ca204c469a0ddf1
-MISC ChangeLog 892 RMD160 c8d83f4ecda74646610cd345ee949bf5d10dfaae SHA1 748cb70379abadb85a660904dd341d4eda795b60 SHA256 ed9f24c3b31d0832681a0f522706b296cc7b8aca9b5b96647fd497979561e2ef
+EBUILD nfdump-1.5.8.ebuild 642 RMD160 cb32ccd14ef6f9f5ee69015b18da4de4d13b60fe SHA1 ac0a36a0c7796aa45ae06cbbf5f1019633f367c6 SHA256 2f84d53576e019e171af123233e283f0888a166aa5c4974fbac28ab99332376f
+MISC ChangeLog 1130 RMD160 01e5d2bfebd08ef9a3ed76ec94aaacdd8d8f4bd5 SHA1 7612225404da3bfb4d65fda1542e66324367f190 SHA256 25203c5fcb353a3b1dd544d75cf1e0fcd82df6df9e2f450b5096ffe58d65d44b
 MISC metadata.xml 264 RMD160 9932bc701e342fb75ec3f93f47a0b4dee717c2cb SHA1 5b931abdcd491ee4d105ed36e1b396f094673970 SHA256 56215caf652f53a3c52f4de2028cdbbab84b2047cdac42291d1269e701430170
diff --git a/net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch b/net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch
new file mode 100644
index 000000000000..cdd238777af9
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.5.8-parallel.patch
@@ -0,0 +1,22 @@
+=== modified file 'Makefile.in'
+--- Makefile.in	2009-05-11 15:55:07 +0000
++++ Makefile.in	2009-05-11 15:57:22 +0000
+@@ -78,7 +78,7 @@
+ sfcapd: $(SFCAPD_OBJ)
+ 	$(CC) $(CFLAGS) -o $@ $(SFCAPD_OBJ) $(LDFLAGS) $(LIBS)
+ 
+-nftest: nftest.o $(COMMON_OBJ) $(FILTER_OBJ)
++nftest: nftest.o grammar.h $(COMMON_OBJ) $(FILTER_OBJ)
+ 	$(CC) $(CFLAGS) $(INCS) -o $@ nftest.o $(COMMON_OBJ) $(FILTER_OBJ) $(LDFLAGS) $(LIBS)
+ 
+ nfgen: nfgen.o
+@@ -90,7 +90,7 @@
+ nfprofile: $(NFPROF_OBJ)
+ 	$(CC) $(CFLAGS) $(INCS) -o $@ $(NFPROF_OBJ) $(LDFLAGS) $(LIBS) $(RRD_LIBS)
+ 
+-nfreplay: $(NFRPLY_OBJ)
++nfreplay: $(NFRPLY_OBJ) grammar.h
+ 	$(CC) $(CFLAGS) $(INCS) -o $@ $(NFRPLY_OBJ) $(LDFLAGS) $(LIBS)
+ 
+ nfexpire: $(NFEXPR_OBJ)
+
diff --git a/net-analyzer/nfdump/nfdump-1.5.8.ebuild b/net-analyzer/nfdump/nfdump-1.5.8.ebuild
new file mode 100644
index 000000000000..a46358e6ec73
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.5.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.5.8.ebuild,v 1.1 2009/05/11 16:12:38 pva Exp $
+
+EAPI=2
+inherit 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="~x86"
+IUSE=""
+
+DEPEND="sys-devel/flex"
+RDEPEND="dev-lang/perl"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-parallel.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README || die
+}