Old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 9 insertions, 139 deletions

diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index 432afbaaa446..69e57afb6609 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nfdump
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.39 2014/07/05 10:51:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.40 2014/07/05 13:19:37 jer Exp $
+
+  05 Jul 2014; Jeroen Roovers <jer@gentoo.org> -nfdump-1.6.9.ebuild,
+  -nfdump-1.6.10_p1.ebuild:
+  Old.
 
   05 Jul 2014; Agostino Sarubbo <ago@gentoo.org> nfdump-1.6.12.ebuild:
   Stable for x86, wrt bug #515278
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 11951c475d04..bed5ca25521e 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -3,28 +3,14 @@ Hash: SHA256
 
 AUX nfdump-1.6.12-test-dep.patch 172 SHA256 6016750b078f0b489b3b9abfd256861a2b2add63ebd387f339cbd0271acbada2 SHA512 7a430b093adad1b06c181a0ebfef80f80d4a0767a3843b7f4b0fb5e9fec52c5349ef09c29841dcd8f54def750bd21166c6bdab7e687950ec54b3d8ae57209631 WHIRLPOOL 5ee39e487217ceff5784bda3407cc28d2ca16bbb4b070d7f3bd907b88515b95381a6e3b0c6f2aae0d8c3e752d8337bec670ad5c96543282f5d45f1f099172508
 DIST minilzo-2.07.tar.gz 60009 SHA256 b706cf02e8af2716a56830ca067cf2d7c0e305c776cb26bd760cd157ce73c928 SHA512 ff1604ab6e273208aa72218367c7acd6f262965ee8fa62091346851099df237af9e9fe61c29638b922ce020d5d6463a18b93a899299c0d96745135aad839c816 WHIRLPOOL 66ec8d7a87a75e218f052a30fc7afcd05f906a91641b85b83bcda79356819c390a71ceb9d71f1015e82791e1bd62f4f69cce68f3e4250dd6323a7a7d47b3c72a
-DIST nfdump-1.6.10p1.tar.gz 579429 SHA256 0633b71762534ad5a4352a01c3e3ab00f6ee75492045794fd4453fcdd5c0143f SHA512 da8c971b0c0bafa9e5bce98b32515a01265203401303ddefd45ca469af4eb6190f59dee7d3c5314bd0cffcdd0bcf44a4f4a73c786b7adaf7c9732efa6852405a WHIRLPOOL 2ec8f9809862e45b2bfd551d910a551043546e464ea9de79b6ec2f13ad304fb48be11a3845d6608e01c79e63ea15648c222938f715d269752053b88c046dda91
 DIST nfdump-1.6.12.tar.gz 733604 SHA256 4b597c3c948b2ac1a4b0b11ffbdc5c8bab8835f14718ad0f7896daeaf7b89204 SHA512 4ff61c14746f34f47588545e58e4e2fa679cc107192cb81d4ece1b7e18ad9ae1d3ce7663b90a302a64a3cc72cdd55718a446c5323ac100ed5fc3601931d866ad WHIRLPOOL 7acbc624868802e73f1d67f0984bdbfd67e9c3d14679fde360be7fefbeeac18d884930802abb156b2a283796f690588c4a46bc12a3287f791b9c6e87f04b02ed
-DIST nfdump-1.6.9.tar.gz 686587 SHA256 734943ab872d3642575add5db64ef5755f85a0a9600b120d5ee09bea4ef98dbc SHA512 07cf0bbcd001b38cc6791774d3797944256ba51513f1d97a18532248a13ad1dd0892bd75c6665aab769e1afaf99cb9e83372b79f0e814dd1e6156000eb720aa6 WHIRLPOOL b70b24dbdb4aa774d6cfcdef9c27835be14da5f06db3367e8f297f4dd702fe80c49888305cfdbe61953cb212f13e9f02de8735bcaa3ea5e63441be7074fcbc5c
-EBUILD nfdump-1.6.10_p1.ebuild 1464 SHA256 0d33d341da535a650a974354810462724d42924e988499f4aafc079a131b4e54 SHA512 ef0ba1bbe167091b440d142841d6be7a4cada9235fc9d8f996f0d27bef48193e2450dfa680fc84fc1dd806697e8ed1bb13d5f34d95af5cc415ad1119efd440cb WHIRLPOOL f7d401f7da74bd4f572cee04d1e52dcafc6638ed673bed6ed9374b44b513ef3350008879b734428a732395eb92dcb9ba9e5a893f224ffb01945ce00acd4ef995
 EBUILD nfdump-1.6.12.ebuild 1647 SHA256 e0d519e0a498d43a0f64d9a93bedbfe6c0c6b78c34a5ab536e46704e8536d749 SHA512 b929cc8e13a6cc7f63494f8220c3027806f3e74b1d2f88b3fc12cfae2e55a384bf4c571d65c01189a7d4d3f6497a2b3a8d86b7ed9adce2713b33f9e29a45b567 WHIRLPOOL f391ab0488d1e93f03075fd48a65e0350c42723908df4ce1a3976d466730e53cdec5cd0d24bde34eba2a1c4fc5000645e3f83b0c52770c8c2381041757b94835
-EBUILD nfdump-1.6.9.ebuild 1458 SHA256 4d58754575d1eb34ec567058dcb665d988ef1054849368fc56e83b2debce3d1a SHA512 41387a440b7ec857938e9287f3008d0fde8be1dfeaaf76013d7a3ae747ed4f21665bd9da83da83d53fad86f9f04c5c860409876cbf58be189721299000be4864 WHIRLPOOL 5379dbf3f654d5afdfd3b868d39803aeae0f65444bbfbde9dcf528c6d91afd24fd30ef1165ce7a70a64a67fd5a6cbd55f310034fea08f81f94b97d3161012b8f
-MISC ChangeLog 5590 SHA256 14947aa4ef900dee9e6f1d70c8a83a3bfc19f0f33313650947c43bee6906493a SHA512 7a9e42e0d61d94fd32866f4d2523e9079c7961ab52aca2e742e1338bdca6a524f1ce251fd22041c25a966516e8e6514e682fa6a16aa4df2972870795b8263ad8 WHIRLPOOL 49e06dd6838ed37e72ce08489981d63de3d07dc354a612420692ce2cc5c691e2d59a5f6fc50af48697f9a423d3852077b497036d636540e4f85c571df0dbb218
+MISC ChangeLog 5695 SHA256 80a8f2559a18c9dd001c0bb9bd6130c02222b8062597a191368edfc3dfd0974b SHA512 b69f076dd5e35027fb12bc527cb63e119bdcac148588f4b4ea8da0a64422d41cfa226d7ab9b640145fd1780e1b44485d81058d873161a819f3e2994a9d649324 WHIRLPOOL f16e85b0f6bc079e579f3dfa6de178f3c2d97b55a0c412c279bc9499c059495cddb4ab1459ce1463879681ce8e401a90762cf547959d945ab655c48443235b3f
 MISC metadata.xml 731 SHA256 3bb173957579a6070cd6eb51731f2f196314e0d4b83e989425ad3af4f4d4b027 SHA512 a85786a81254c27b0823055a15c8c8d12722aaca35329f9072da15da0d48eb0f528f37a25241f1095b7fb2aec16f67a4be3f06cfba6e78b5860da34fb044329f WHIRLPOOL ce811c0eac09ae59766d098362b129ec880044bbba6f540cc560c882f4bab1c147fe1b2ba48f6a0b38a437a2de704eb8b0164587817aefad2adc46362ca2766e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTt9i9AAoJELp701BxlEWf57oP/R6I1wBfyYYAQTRftzme2BzC
-fv3cZXWGcfk0YaNGVR5Aq7kUFEruMTEvNyUvZufswT/L1v/dRvPpcSdzr+VYgjPe
-X/iLGEnPYjamKMdmaSsBZ6fTklQdV7OiAZ9gne+wVqOknqMeNaL0+PH+CudlkhtM
-Su0yvSvwoYDam8Rb+QxK2Wh2i/2sAq+KFefu0GRMKSiQc/dljG/EwM7+zfQz1wRN
-BganxORl1pHnvyNXgDyHHsOkvDpLMStNIzaLpWP4DWzAEPLpGvuUxTOaUc3feD1X
-foqp69gzDoojvccjcV2i4NYy6JSoNuAH5OIGFF6OTeRryUDo+eP5K5zcnbeXW6pI
-/YLDpBdjCTeJy9E+2lr7Oue1plkduppjfaxmIycDVMz/Ej2X10+vTtJ+TbjfC2EN
-dNGNssKJvulNX0iMtf318I8YLBajiXy3w6XCn4tEsfo4+TtwHO613+G/uFqw9BMC
-96A6z9LbrIbspm8XY7QLBo9bdEVME4P3IoWVdXzJEzRQ2xxhRKsmRYGk31/r0cDP
-zEwg+v5J7p6cLK0DQFUF3kNsPOmuy12kEvPBpDKIz6EgnB3D8x3J3g7pvd9NtCul
-yhCsacX++19yWQg04hm7VBS9WYFG4KUoIBxlSfXSr5nEXLzcsV9GSeu8uB0jtCh/
-tq3f1tspJpi87R1iS9VL
-=vbix
+iEYEAREIAAYFAlO3+2oACgkQVWmRsqeSphO/DQCfTmL+d77poGP3o9dmvsIYMFLA
+rBoAn2cpqa1ISsVXFd7WUrmW27LfTDKd
+=icB+
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nfdump/nfdump-1.6.10_p1.ebuild b/net-analyzer/nfdump/nfdump-1.6.10_p1.ebuild
deleted file mode 100644
index a32db5024c31..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.10_p1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.10_p1.ebuild,v 1.1 2013/08/14 12:48:31 jer Exp $
-
-EAPI=5
-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"
-IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
-
-CDEPEND="
-	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
-	nfprofile? ( net-analyzer/rrdtool )
-	nftrack? ( 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 nftrack && echo --enable-nftrack) \
-		$(use_enable compat15) \
-		$(use_enable debug devel) \
-		$(use_enable readpcap) \
-		$(use_enable sflow)
-}
diff --git a/net-analyzer/nfdump/nfdump-1.6.9.ebuild b/net-analyzer/nfdump/nfdump-1.6.9.ebuild
deleted file mode 100644
index 80dcf4246c92..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.9.ebuild,v 1.3 2013/06/25 12:49:59 ago Exp $
-
-EAPI=5
-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"
-IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
-
-CDEPEND="
-	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
-	nfprofile? ( net-analyzer/rrdtool )
-	nftrack? ( 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 nftrack && echo --enable-nftrack) \
-		$(use_enable compat15) \
-		$(use_enable debug devel) \
-		$(use_enable readpcap) \
-		$(use_enable sflow)
-}