Old.

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

4 files changed, 9 insertions, 114 deletions

diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index 060b9781cf28..558fd432124a 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,10 @@
 # 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.21 2012/02/21 17:10:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.22 2012/02/21 17:20:40 jer Exp $
+
+  21 Feb 2012; Jeroen Roovers <jer@gentoo.org> -nfdump-1.6.2.ebuild,
+  -nfdump-1.6.3_p1.ebuild:
+  Old.
 
   21 Feb 2012; Jeroen Roovers <jer@gentoo.org> nfdump-1.6.5.ebuild:
   Remove testing cruft.
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index aa79eba6c1d0..cb4f30b47b9e 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -2,19 +2,15 @@
 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
 EBUILD nfdump-1.6.5.ebuild 1463 RMD160 ea3d0217b6b226ca33f279780be02809f32d5418 SHA1 c6482801cb94416f3ac6a0e48cfbe60703480804 SHA256 4c79f8838f035b5740710179629f4647d8d7ed6ee344f52ffc5cc7f3f516eb23
-MISC ChangeLog 3198 RMD160 f53310ea1c9b4a50e2a2a5cba13c53740d85e149 SHA1 2b0b77f27e729aa14f2cba7051e7e26526dee82c SHA256 adfc662b75045aac7f7d7b8e74e6bc23b03cea68d56b5bf572ab368a3f2166b2
+MISC ChangeLog 3302 RMD160 b40c2365f4bf43017bed23138f5619e8459d1bc8 SHA1 760aadec7c9a4a27869f268ddec42ddcde3e5140 SHA256 bd191f3562f681491d84b35d8a5115e95c20b082a3601342682e33ae0a8a367f
 MISC metadata.xml 672 RMD160 2cc5cad8ddda5833a01978d7f88aa035aef3b105 SHA1 3964c522dfd999385f44c1c6a0ef3a13ef393290 SHA256 5bc59bc7a5a8f8f0da16de87446c72ee2e1b7ff0dd704640269292e70d9fbf45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9Dz/cACgkQVWmRsqeSphOYuQCdElDFWVt3cNIvTZzzbbChbv3B
-Vs8AniwNOR33B4fVFbLiBeN4dNRBbyi/
-=Xwcm
+iEYEARECAAYFAk9D0nMACgkQVWmRsqeSphOR1ACePkCGVqDFwJuncCneaLSjMOVS
+wekAniFEvLoD+6DW7fq8GjzCkULQVMYm
+=sxpb
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nfdump/nfdump-1.6.2.ebuild b/net-analyzer/nfdump/nfdump-1.6.2.ebuild
deleted file mode 100644
index 91975b89390d..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.2.ebuild,v 1.1 2011/04/19 23:56:13 jer 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="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"
-
-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
-	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) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/net-analyzer/nfdump/nfdump-1.6.3_p1.ebuild b/net-analyzer/nfdump/nfdump-1.6.3_p1.ebuild
deleted file mode 100644
index 3ddb9ec33f03..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.3_p1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.3_p1.ebuild,v 1.1 2011/06/06 12:05:44 jer Exp $
-
-EAPI=2
-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"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-	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) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README || die
-}