Version bump and SRC_URI udate wrt bug #152704 thanks to Francisco Javier for reporting

(Portage version: 2.1.2_rc1-r1)
 (Signed Manifest commit)

9 files changed, 53 insertions, 186 deletions

diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index 75fd5a269798..5e3a5f64f20b 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -1,18 +1,58 @@
-MD5 1aed1df21113195b935c3106c846d36a ChangeLog 3772
-MD5 787949efbc227966fa6a5609799cbf97 files/digest-netperf-2.2.4 66
-MD5 201084fb8da044398f8a0459f1e7c4b5 files/digest-netperf-2.3 63
-MD5 1ee55df152ab363e932c73e6155604b1 files/digest-netperf-2.4.0 66
-MD5 d1003e470e50fab722c6c21548d94129 files/digest-netperf-2.4.0-r1 244
-MD5 5b8fcf5721bc37329f6af346c347f2ba files/digest-netperf-2.4.0_rc2 70
-MD5 9c2b856854f3542c3e0a3595d4fb59ca files/digest-netperf-2.4.0_rc3 70
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX netperf-2.2-conf 103 RMD160 3eb1f40f8547c15cf04f15670c47a5f3c24b9fab SHA1 6a1412637c5707851fd365b41009d79d83261972 SHA256 9dce33f9552ce91ed5dbf57f44bd3d64a83aeb67ed9a41952a6c69601a10e340
 MD5 f7a086a9cdee9e3d6ed0e8976b678dbf files/netperf-2.2-conf 103
+RMD160 3eb1f40f8547c15cf04f15670c47a5f3c24b9fab files/netperf-2.2-conf 103
+SHA256 9dce33f9552ce91ed5dbf57f44bd3d64a83aeb67ed9a41952a6c69601a10e340 files/netperf-2.2-conf 103
+AUX netperf-2.2-init 434 RMD160 6e4337b3d82103f722cbe8f347287f46edf0e2ff SHA1 de8c9736649932e0a2e5527a91cf4e148415774b SHA256 96e944e8f62d06abdc883b3ba34504c4320d9aa5a711c41fb552eb6c61565d0f
 MD5 35791611e593b4e8cefdfd56031e759d files/netperf-2.2-init 434
+RMD160 6e4337b3d82103f722cbe8f347287f46edf0e2ff files/netperf-2.2-init 434
+SHA256 96e944e8f62d06abdc883b3ba34504c4320d9aa5a711c41fb552eb6c61565d0f files/netperf-2.2-init 434
+AUX netperf-2.2alpha.diff 686 RMD160 203388398899846302e56e2eb61125927ac8bbfd SHA1 33a10c81d628f332b38ecb7504ae41d054624893 SHA256 fc813ca378e65c2f20337cad1a0312559eb880055cf9fb1a8c6d6d1b4aaadedf
 MD5 5b39a4d1bbad0a785afc512f8a35e87d files/netperf-2.2alpha.diff 686
+RMD160 203388398899846302e56e2eb61125927ac8bbfd files/netperf-2.2alpha.diff 686
+SHA256 fc813ca378e65c2f20337cad1a0312559eb880055cf9fb1a8c6d6d1b4aaadedf files/netperf-2.2alpha.diff 686
+AUX netperf-2.4.0-gcc41.patch 538 RMD160 06dab7d42752c93861049f1d2b0a879289c4ebd7 SHA1 21a66fd44fceedc4fb050bfa48e870568f4f918e SHA256 a4d74b9855b0e991b4353e8e7e18b4024cc0c46cec153db6db1f551ac2115705
 MD5 9805e626f32fd2b450eff1b5176c75c8 files/netperf-2.4.0-gcc41.patch 538
+RMD160 06dab7d42752c93861049f1d2b0a879289c4ebd7 files/netperf-2.4.0-gcc41.patch 538
+SHA256 a4d74b9855b0e991b4353e8e7e18b4024cc0c46cec153db6db1f551ac2115705 files/netperf-2.4.0-gcc41.patch 538
+DIST netperf-2.2pl4.tar.gz 823686
+DIST netperf-2.3.tar.gz 835407
+DIST netperf-2.4.2.tar.gz 1161450 RMD160 f942a001deb480e281a6fc962f13eda146dce77d SHA1 9fdcea0840fa4baa3b2b2408221617880ee09a15 SHA256 844ba97e745a0b9f37afc7daa323cafcef00108cd0254667da0a00558eb323a7
+EBUILD netperf-2.2.4.ebuild 1332 RMD160 b8d3cacef308281beb144f9c05e981a05c1525d0 SHA1 82c0e77717d2e6ca95c727dab0403e6a6b175f2b SHA256 4950b7b7a2a176f7f439c7651b52735a0009ebbbeb5d515ff7cab1e00ed89cdd
+MD5 6993fef4879d6355c8269e1b95a62754 netperf-2.2.4.ebuild 1332
+RMD160 b8d3cacef308281beb144f9c05e981a05c1525d0 netperf-2.2.4.ebuild 1332
+SHA256 4950b7b7a2a176f7f439c7651b52735a0009ebbbeb5d515ff7cab1e00ed89cdd netperf-2.2.4.ebuild 1332
+EBUILD netperf-2.3.ebuild 1331 RMD160 9ed2001cb5301c7b62c35196518c10b59f71ddaf SHA1 701526aca1027a28715ff0f7fa0ea37898e7ac45 SHA256 4e77b9c39684e09f5ddb78ce867546d73e19f4eb360949c18999b8c815be6400
+MD5 bc80b627149ec96c627b87ce10f24a5a netperf-2.3.ebuild 1331
+RMD160 9ed2001cb5301c7b62c35196518c10b59f71ddaf netperf-2.3.ebuild 1331
+SHA256 4e77b9c39684e09f5ddb78ce867546d73e19f4eb360949c18999b8c815be6400 netperf-2.3.ebuild 1331
+EBUILD netperf-2.4.2.ebuild 1290 RMD160 fab966a95a154ee785034574dbddff015da77bb1 SHA1 e08b63aff796af4abc6ac7f853df87c309e42867 SHA256 0507fe79f507adb020412f70bf73b1fa1ae4114fa76e57c308cf571d70c103a0
+MD5 d95b666fd12d5632b4c8815cc5900bc3 netperf-2.4.2.ebuild 1290
+RMD160 fab966a95a154ee785034574dbddff015da77bb1 netperf-2.4.2.ebuild 1290
+SHA256 0507fe79f507adb020412f70bf73b1fa1ae4114fa76e57c308cf571d70c103a0 netperf-2.4.2.ebuild 1290
+MISC ChangeLog 4118 RMD160 bee3de914a51b0c74aa568488861d7295f8ab837 SHA1 f84fbc2d278154c7d847720c66d268c01b1da821 SHA256 e75fa3fc5eee95c31e0f26c72b026913c152d59d32ac48f75e945115c77d472c
+MD5 6935284e86b8af1da94771a4590f0a07 ChangeLog 4118
+RMD160 bee3de914a51b0c74aa568488861d7295f8ab837 ChangeLog 4118
+SHA256 e75fa3fc5eee95c31e0f26c72b026913c152d59d32ac48f75e945115c77d472c ChangeLog 4118
+MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
-MD5 8cff92ac02087bc24cdebec08eb62a3a netperf-2.2.4.ebuild 1353
-MD5 6d14aac9d803bf952c9a70094e39495c netperf-2.3.ebuild 1351
-MD5 9dcd3f7424f3291a1cf34e6f8d3b7b47 netperf-2.4.0-r1.ebuild 1349
-MD5 906e80bd9cf0afb06622cd91dd59d9f8 netperf-2.4.0.ebuild 1246
-MD5 ab7b8d7bbb3c51fce8949fe3cfb2d6a4 netperf-2.4.0_rc2.ebuild 1273
-MD5 4ef631e53d11899c995f7a35094d956f netperf-2.4.0_rc3.ebuild 1273
+RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159
+SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 metadata.xml 159
+MD5 787949efbc227966fa6a5609799cbf97 files/digest-netperf-2.2.4 66
+RMD160 c67c5d19666c0449a18fca0166eb2948a502a4c6 files/digest-netperf-2.2.4 66
+SHA256 bd39d26a60096d50cefc9c20140ded836ec1eed0454daf59c1e18f151e6ee089 files/digest-netperf-2.2.4 66
+MD5 201084fb8da044398f8a0459f1e7c4b5 files/digest-netperf-2.3 63
+RMD160 30065117d78125403cdf1f4db0ef3ca6fa437a2b files/digest-netperf-2.3 63
+SHA256 df775fe33992b18abeadfaba067d98c9f9d7fab84a6d24dcc86ac19d70fbeb21 files/digest-netperf-2.3 63
+MD5 d79ce6ca713b91cef32cadfda6a595b5 files/digest-netperf-2.4.2 244
+RMD160 826e499426b4c6220d03e49dc828eb997155e735 files/digest-netperf-2.4.2 244
+SHA256 f6a29be73ce2b032bda38b1049b1288e5583b366765db74313fe64aec9fdd5de files/digest-netperf-2.4.2 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFR+fyz974XjDVpbkRAjIAAJ9NIdjkz7YpFtMjFhw9k7nkoxsOvwCeMqHv
+B0mBgY3BB7taeWGiRpAUf2s=
+=jz/L
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/netperf/files/digest-netperf-2.4.0 b/net-analyzer/netperf/files/digest-netperf-2.4.0
deleted file mode 100644
index 0c8604ae1ad5..000000000000
--- a/net-analyzer/netperf/files/digest-netperf-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d43e757ca7fafcfac99274f046d46bca netperf-2.4.0.tar.gz 1511378
diff --git a/net-analyzer/netperf/files/digest-netperf-2.4.0-r1 b/net-analyzer/netperf/files/digest-netperf-2.4.0-r1
deleted file mode 100644
index 7e957e9e25f6..000000000000
--- a/net-analyzer/netperf/files/digest-netperf-2.4.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d43e757ca7fafcfac99274f046d46bca netperf-2.4.0.tar.gz 1511378
-RMD160 733cadf498a49267420d2648bfbaff56e4d54bbd netperf-2.4.0.tar.gz 1511378
-SHA256 7dcdd2b72f24a15a32f78525399a5be945b8aa2876b7546a39c1473c24d465e4 netperf-2.4.0.tar.gz 1511378
diff --git a/net-analyzer/netperf/files/digest-netperf-2.4.0_rc2 b/net-analyzer/netperf/files/digest-netperf-2.4.0_rc2
deleted file mode 100644
index c4edc910b967..000000000000
--- a/net-analyzer/netperf/files/digest-netperf-2.4.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 703ab87109ff26e99c0d6280d140de1b netperf-2.4.0-rc2.tar.gz 1462328
diff --git a/net-analyzer/netperf/files/digest-netperf-2.4.0_rc3 b/net-analyzer/netperf/files/digest-netperf-2.4.0_rc3
deleted file mode 100644
index 5119ff49930d..000000000000
--- a/net-analyzer/netperf/files/digest-netperf-2.4.0_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 685d0bd24dc1fef1351654499231bfab netperf-2.4.0-rc3.tar.gz 1506983
diff --git a/net-analyzer/netperf/netperf-2.4.0-r1.ebuild b/net-analyzer/netperf/netperf-2.4.0-r1.ebuild
deleted file mode 100644
index cc6dc7b2e078..000000000000
--- a/net-analyzer/netperf/netperf-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.0-r1.ebuild,v 1.2 2006/06/05 17:44:32 pva Exp $
-
-inherit eutils flag-o-matic autotools
-
-MY_P=${P/_rc/-rc}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
-if [[ ${PV} == *_* ]]; then
-	SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/experimental/${MY_P}.tar.gz"
-else
-	SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/${MY_P}.tar.gz"
-fi
-HOMEPAGE="http://www.netperf.org/"
-LICENSE="netperf"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ia64 ~alpha ~amd64 ~ppc64 ~ppc ~ppc-macos"
-
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gcc41.patch
-	eautoconf
-}
-
-src_install () {
-	einstall || die
-
-	# move netserver into sbin as we had it before 2.4 was released with its
-	# autoconf goodness
-	dodir /usr/sbin
-	mv ${D}/usr/{bin,sbin}/netserver || die
-
-	# init.d / conf.d
-	newinitd ${FILESDIR}/${PN}-2.2-init netperf
-	newconfd ${FILESDIR}/${PN}-2.2-conf netperf
-
-	# documentation and example scripts
-	dodoc AUTHORS ChangeLog COPYING NEWS README Release_Notes doc/netperf.pdf
-	dodir /usr/share/doc/${PF}/examples
-	mv ${D}/usr/bin/*_script ${D}/usr/share/doc/${PF}/examples
-}
diff --git a/net-analyzer/netperf/netperf-2.4.0.ebuild b/net-analyzer/netperf/netperf-2.4.0.ebuild
deleted file mode 100644
index d670fbb89b83..000000000000
--- a/net-analyzer/netperf/netperf-2.4.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.0.ebuild,v 1.2 2005/07/16 19:42:29 swegener Exp $
-
-inherit flag-o-matic
-
-MY_P=${P/_rc/-rc}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
-if [[ ${PV} == *_* ]]; then
-	SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/experimental/${MY_P}.tar.gz"
-else
-	SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/${MY_P}.tar.gz"
-fi
-HOMEPAGE="http://www.netperf.org/"
-LICENSE="netperf"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ia64 ~alpha ~amd64 ~ppc64 ~ppc ~ppc-macos"
-
-IUSE=""
-
-src_install () {
-	einstall || die
-
-	# move netserver into sbin as we had it before 2.4 was released with its
-	# autoconf goodness
-	dodir /usr/sbin
-	mv ${D}/usr/{bin,sbin}/netserver || die
-
-	# init.d / conf.d
-	newinitd ${FILESDIR}/${PN}-2.2-init netperf
-	newconfd ${FILESDIR}/${PN}-2.2-conf netperf
-
-	# documentation and example scripts
-	dodoc AUTHORS ChangeLog COPYING NEWS README Release_Notes doc/netperf.pdf
-	dodir /usr/share/doc/${PF}/examples
-	mv ${D}/usr/bin/*_script ${D}/usr/share/doc/${PF}/examples
-}
diff --git a/net-analyzer/netperf/netperf-2.4.0_rc2.ebuild b/net-analyzer/netperf/netperf-2.4.0_rc2.ebuild
deleted file mode 100644
index 24f31e76cf71..000000000000
--- a/net-analyzer/netperf/netperf-2.4.0_rc2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.0_rc2.ebuild,v 1.3 2005/07/16 19:42:29 swegener Exp $
-
-inherit flag-o-matic
-
-MY_P=${P/_rc/-rc}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
-if [[ ${PV} == *_* ]]; then
-	SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/experimental/${MY_P}.tar.gz"
-else
-	SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/${MY_P}.tar.gz"
-fi
-HOMEPAGE="http://www.netperf.org/"
-LICENSE="netperf"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ia64 ~alpha ~amd64 ~ppc64 ~ppc ~ppc-macos"
-
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_install () {
-	einstall || die
-
-	# move netserver into sbin as we had it before 2.4 was released with its
-	# autoconf goodness
-	dodir /usr/sbin
-	mv ${D}/usr/{bin,sbin}/netserver || die
-
-	# init.d / conf.d
-	newinitd ${FILESDIR}/${PN}-2.2-init netperf
-	newconfd ${FILESDIR}/${PN}-2.2-conf netperf
-
-	# documentation and example scripts
-	dodoc AUTHORS ChangeLog COPYING NEWS README Release_Notes doc/netperf.pdf
-	dodir /usr/share/doc/${PF}/examples
-	mv ${D}/usr/bin/*_script ${D}/usr/share/doc/${PF}/examples
-}
diff --git a/net-analyzer/netperf/netperf-2.4.0_rc3.ebuild b/net-analyzer/netperf/netperf-2.4.0_rc3.ebuild
deleted file mode 100644
index 2d59606fc7c8..000000000000
--- a/net-analyzer/netperf/netperf-2.4.0_rc3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.0_rc3.ebuild,v 1.3 2005/07/16 19:42:29 swegener Exp $
-
-inherit flag-o-matic
-
-MY_P=${P/_rc/-rc}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
-if [[ ${PV} == *_* ]]; then
-	SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/experimental/${MY_P}.tar.gz"
-else
-	SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/${MY_P}.tar.gz"
-fi
-HOMEPAGE="http://www.netperf.org/"
-LICENSE="netperf"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ia64 ~alpha ~amd64 ~ppc64 ~ppc ~ppc-macos"
-
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_install () {
-	einstall || die
-
-	# move netserver into sbin as we had it before 2.4 was released with its
-	# autoconf goodness
-	dodir /usr/sbin
-	mv ${D}/usr/{bin,sbin}/netserver || die
-
-	# init.d / conf.d
-	newinitd ${FILESDIR}/${PN}-2.2-init netperf
-	newconfd ${FILESDIR}/${PN}-2.2-conf netperf
-
-	# documentation and example scripts
-	dodoc AUTHORS ChangeLog COPYING NEWS README Release_Notes doc/netperf.pdf
-	dodir /usr/share/doc/${PF}/examples
-	mv ${D}/usr/bin/*_script ${D}/usr/share/doc/${PF}/examples
-}