Version bump (bug #481022 by Alexandr Tiurin).

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

5 files changed, 20 insertions, 142 deletions

diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index 79e617d8ccb5..aa3ffada5366 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nfdump
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.34 2013/06/25 12:49:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.35 2013/08/14 12:48:31 jer Exp $
+
+*nfdump-1.6.10_p1 (14 Aug 2013)
+
+  14 Aug 2013; Jeroen Roovers <jer@gentoo.org> -nfdump-1.6.5.ebuild,
+  -nfdump-1.6.6.ebuild, -nfdump-1.6.8.ebuild, +nfdump-1.6.10_p1.ebuild:
+  Version bump (bug #481022 by Alexandr Tiurin).
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> nfdump-1.6.9.ebuild:
   Stable for amd64, wrt bug #470536
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index c226e977bc79..69750cbb080d 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,30 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST nfdump-1.6.5.tar.gz 786526 SHA256 3980bad06c73ceabf71c89200e689750a0bc571e8b69f17b76bfd44f8daa08fb SHA512 129d9a41b2a657298f57676672f71bd44e55fa325a6e39440144661add886ffb4ae170e0b1fd1d73f0376d8ac068e2ba9708698f5ecc15feb37677a95fde30e1 WHIRLPOOL d45ad144d2cb82d827a301447eb671576a3b97d03824836f58bd7aa8b42cd108cdc08548460d1b3a3b3706011e61fd86881069b2e63039345fa21212b2cc9d44
-DIST nfdump-1.6.6.tar.gz 651348 SHA256 32e74310c2ca1a622dcca5dd63d0bed40e13d851ba62fff249887682ed77e485 SHA512 3323fa39974725005c0930b9447e623b387dc9288ae7cdf9a39dc5c79218c7aaacceead4ca9c2c740df3e948a26581ac0bf0d4a4e6e34cd47b36bf901d881865 WHIRLPOOL 3c7eec7208524bada0bc66587155a774fba2187126cb80e18cf52ac0b2fd60fd90ec64d0fa4cb0a43cb8ec94d973ce218fa3d76c77e19a91f9f57bbde8de00cd
-DIST nfdump-1.6.8.tar.gz 672158 SHA256 4b2306d7a26f2f81228e7d3bbeb06df42e903dec9b351c770c474bd97d74a8d6 SHA512 58c46ad01d48d48cb8b79d046f7be772c6e16a99b6f483a577a473190ea8795c7849a8ca120f1bfaf28e2962f6c399f9e39db9e050f7f7a7884bd1a71e3a1a59 WHIRLPOOL a6241c9a3921d827bec2dfbd78fe84bd8522310469fc921a2ac542c7eb2197ac7da5388e9e0487d715647c57bb7d9c1be89a4df6d975124bb8cd18d6a4837256
+DIST nfdump-1.6.10p1.tar.gz 579429 SHA256 0633b71762534ad5a4352a01c3e3ab00f6ee75492045794fd4453fcdd5c0143f SHA512 da8c971b0c0bafa9e5bce98b32515a01265203401303ddefd45ca469af4eb6190f59dee7d3c5314bd0cffcdd0bcf44a4f4a73c786b7adaf7c9732efa6852405a WHIRLPOOL 2ec8f9809862e45b2bfd551d910a551043546e464ea9de79b6ec2f13ad304fb48be11a3845d6608e01c79e63ea15648c222938f715d269752053b88c046dda91
 DIST nfdump-1.6.9.tar.gz 686587 SHA256 734943ab872d3642575add5db64ef5755f85a0a9600b120d5ee09bea4ef98dbc SHA512 07cf0bbcd001b38cc6791774d3797944256ba51513f1d97a18532248a13ad1dd0892bd75c6665aab769e1afaf99cb9e83372b79f0e814dd1e6156000eb720aa6 WHIRLPOOL b70b24dbdb4aa774d6cfcdef9c27835be14da5f06db3367e8f297f4dd702fe80c49888305cfdbe61953cb212f13e9f02de8735bcaa3ea5e63441be7074fcbc5c
-EBUILD nfdump-1.6.5.ebuild 1468 SHA256 9676ae737423a3fcf498302ce1256339ff7c4459c51b5c8c34fbbe7b8ea06a98 SHA512 b30ed5ebbdb195b128722ab1ce05efcc81ab430f99834eea866da25ac05075d11608bff491058f82df791f033d7ecd1992400b0366da76c3245006b051b733d0 WHIRLPOOL 2200ce63aa97c67739800521e97e9d151a0ce7f3e7f94d3e6e9668af139ff002e2976bab16e62c4a0f8ca5c2ce55e2d0d636daa62b240e889b3e2b172679e8a6
-EBUILD nfdump-1.6.6.ebuild 1481 SHA256 a0ec9ac971d3a3213eb840fb72a75c73ba5850b080333628e9438a64f6c171a8 SHA512 6c1c9c207e6619e51a77f694a43f19f326babb5d9e0d35020ea14fb143eed6f3d183a1ce3d48820da1411492af0a899bb3063d77f7055dd6702107506f6cbda8 WHIRLPOOL 5772df116358c11ff936a3e75dad2a5c0d1e7234143b48b3c701378c403a0f2ef8af9cecef4ba9a0f21cce28a6cba78a4ec6fae5996ad1a874e3d16c70ad960c
-EBUILD nfdump-1.6.8.ebuild 1540 SHA256 4c87738fb1e8cf53760433318ca980c5eb22a15c880d3889efc6afb354ffa0a7 SHA512 8ab20aa0b67d315d470435c5060adfd0c065c4e82e3cf78570e75e596acd8187d988f24fec6b5c15d463f3e1f4465adb99a0bdace18c9c1de70e2f9a842caf4a WHIRLPOOL a121a1dff3c4951618f1b8beab294f8e337f0d5f289fbff7edda60c09a1b3b72d69bfe5933ed797258f082e1857bfccb2d7a50008d5296d94c9d5b9255242c7a
+EBUILD nfdump-1.6.10_p1.ebuild 1464 SHA256 0d33d341da535a650a974354810462724d42924e988499f4aafc079a131b4e54 SHA512 ef0ba1bbe167091b440d142841d6be7a4cada9235fc9d8f996f0d27bef48193e2450dfa680fc84fc1dd806697e8ed1bb13d5f34d95af5cc415ad1119efd440cb WHIRLPOOL f7d401f7da74bd4f572cee04d1e52dcafc6638ed673bed6ed9374b44b513ef3350008879b734428a732395eb92dcb9ba9e5a893f224ffb01945ce00acd4ef995
 EBUILD nfdump-1.6.9.ebuild 1458 SHA256 4d58754575d1eb34ec567058dcb665d988ef1054849368fc56e83b2debce3d1a SHA512 41387a440b7ec857938e9287f3008d0fde8be1dfeaaf76013d7a3ae747ed4f21665bd9da83da83d53fad86f9f04c5c860409876cbf58be189721299000be4864 WHIRLPOOL 5379dbf3f654d5afdfd3b868d39803aeae0f65444bbfbde9dcf528c6d91afd24fd30ef1165ce7a70a64a67fd5a6cbd55f310034fea08f81f94b97d3161012b8f
-MISC ChangeLog 4775 SHA256 fdd4e9a02db7ad1344e7aa23bebc21b3d434bb0ce798ef776dadcdf656c8608f SHA512 065f2def5176efc770d326c9c8251c90d7c4ee7d61d991d4e630c38d748fea17f8a28b066c55d1d53356a4324a977c0c9a7a0ba7e634d0495743c5bed73a949f WHIRLPOOL 3a97a936a6857901a2b2e230663a9b7485e87926e3be8233df02f3d927189dd95ba2d355bb1990f08fb58194b2dd04a1cab234d8596bd60a5c0dd878dc5d8209
+MISC ChangeLog 4999 SHA256 06c5d8f59600dda0be80a69e18a25b6e5f0715cf234922e06d8f896242922f7b SHA512 a340df3f20cbe5e5e539a1569d12d6407ac4c78a4c61c112f7e99fe6aee86b13953581de77b5a678549434501b0630a0ae7a0c93af0e39a66ef058392a19dd74 WHIRLPOOL 193432fcdfe8ca04c301386068856fde80852181cb2979b0f15a21148c761fa6295eed8da7bd3bb781667ecb7f4d01419f159e08e9432cdeb45d5e7426bcf111
 MISC metadata.xml 731 SHA256 3bb173957579a6070cd6eb51731f2f196314e0d4b83e989425ad3af4f4d4b027 SHA512 a85786a81254c27b0823055a15c8c8d12722aaca35329f9072da15da0d48eb0f528f37a25241f1095b7fb2aec16f67a4be3f06cfba6e78b5860da34fb044329f WHIRLPOOL ce811c0eac09ae59766d098362b129ec880044bbba6f540cc560c882f4bab1c147fe1b2ba48f6a0b38a437a2de704eb8b0164587817aefad2adc46362ca2766e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRyZHxAAoJELp701BxlEWfkYYQAIaFDVhtvteFWdmSh24QbIzc
-UpZxj8X6icnbNZnV7EeINBKMbTfSmeq2S5ZMfiGSDYFUoCVpQyeioXTP8aPyvZm+
-rWJYUdExcSikgoutcJxloX+AvPhlmXTF1N8xsdzvPCqWGpHqITR3oXJzVjuqv27P
-1TuXN//pYizOhpiGzAkBVcJtYT2q+3eS2i5FFdjuRVLorwXlOH0hVPOyo/fJFlh/
-5JRdMsiCNvgvvl6Ut4NBrDd345UWqiO6U+GmOW37AZgV0eQ2ChJ2Axs7CwpOyEM1
-XEJ+yail9aFG6lp6igDUj7FQfOWEZGxOTGVajapkvr+fox+IhmWTgTDVFhkbLtXb
-pviEq/3W8mveoVm4u6hlDup022DukZgSfp+YI4iRdC6bmgDEuqagiYxn3V8mecbd
-+iRt/k5QnEMbBSmnY3/1V/J9Ams6mxxAIAIIGBauljfFmbRqtAL0t25nPaHBD/tW
-Kj8+DYdZGdPZfWlH4jA0zMOKgcz1nt6vX8RmZzlW59mdZkGeMzw0QmtFwUeA6f7K
-xQkl5l/Fq9vYG5cHEiQTSTY8CqKeZU17dzKymavC7PBCEdv+3m0BBQNFOTASorXg
-RayBpwX3h3kKeCUBJqrmR/5q9kthbQdUhY+Y+kyYH2J6VyBCyCDgWOQDMMUwX9wI
-xYW2kE3ZdRUOZ0EeLoka
-=Zhnf
+iEYEAREIAAYFAlILfKEACgkQVWmRsqeSphPHGACfRLT2Y7Zd3L0NRd6j9ToQcG9+
+4rgAni9i0R7/I6TezXh87KFXk0cBK7F8
+=R3S7
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nfdump/nfdump-1.6.8.ebuild b/net-analyzer/nfdump/nfdump-1.6.10_p1.ebuild
index 5f4b15d2be99..a32db5024c31 100644
--- a/net-analyzer/nfdump/nfdump-1.6.8.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.10_p1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.8.ebuild,v 1.2 2012/11/05 12:53:20 jer Exp $
+# $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=4
+EAPI=5
 inherit autotools eutils
 
 MY_P="${P/_/}"
@@ -13,16 +13,14 @@ 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 nftrack sflow"
+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 )
 "
-#	readpcap? ( net-libs/libpcap )"
 DEPEND="
 	${CDEPEND}
 	sys-devel/flex
@@ -57,5 +55,6 @@ src_configure() {
 		$(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.5.ebuild b/net-analyzer/nfdump/nfdump-1.6.5.ebuild
deleted file mode 100644
index e203d82be7e8..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.4 2012/04/05 21:23:32 phajdan.jr 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() {
-	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) \
-}
diff --git a/net-analyzer/nfdump/nfdump-1.6.6.ebuild b/net-analyzer/nfdump/nfdump-1.6.6.ebuild
deleted file mode 100644
index 8431e3b93557..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.6.ebuild,v 1.4 2012/10/31 16:53:49 ago 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
-	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_enable sflow) \
-		$(use_enable debug devel) \
-		$(use_enable compat15)
-		# $(use_enable readpcap) \
-}