Old.

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

3 files changed, 8 insertions, 73 deletions

diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index ca24124254e7..971e2e434a43 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/netperf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.70 2014/10/29 09:30:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.71 2014/10/29 09:40:30 jer Exp $
+
+  29 Oct 2014; Jeroen Roovers <jer@gentoo.org> -netperf-2.5.0-r1.ebuild:
+  Old.
 
   29 Oct 2014; Agostino Sarubbo <ago@gentoo.org> netperf-2.6.0-r1.ebuild:
   Stable for sparc, wrt bug #517128
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index e0493513ab0f..7a805eb60799 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -5,26 +5,14 @@ AUX netperf-2.2-conf 103 SHA256 9dce33f9552ce91ed5dbf57f44bd3d64a83aeb67ed9a4195
 AUX netperf-2.2-init 433 SHA256 82df403bbf2dcb0086f4e7563b7ac678b65f8f7b5411312abadaa1594af659b7 SHA512 8151488c05001f2475201f3ebff3213d8a5afef5f75a2b726bae363c688f6c2363a756a9514921bffaf9eb7d7405114d27c8e5b98d3f53eb3a52db75a5236760 WHIRLPOOL 995662769c2ea31bcd0b45c987dddcec536f9df69d4f6d6c062123e30834dc96c482627592ce9b97811548a9edcfb6660aef0cdfb844ae49ff4ec92ec02e0b39
 AUX netperf-2.6.0-log-dir.patch 261 SHA256 c5449f723cc26e3ebada62d954e5b8dbad3b0996db18401c816fa756905eedbb SHA512 108ab43c36041df5051cb1a130d33e42589c020dac296230a325ee4e1805ea2b3bbcb5cd1438cd4abe4d922ff5536410be9364eaad9044a3181c9acdc7b91bb6 WHIRLPOOL 197919f1204465ad813849ab6b6f4ee24f7fe2f5aaf7072ab6f4159a5713163041dffa6e721a066552b0b7746b353b84255a0aceca478993ee229f37dbbb20fd
 AUX netperf-fix-scripts.patch 819 SHA256 2dd29e6134f769cfff036945ebbb63e6f10338c95a1d5705c374f63c2d81ac30 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a WHIRLPOOL eaf301c87e6fd04fbeb6bc2eb33f69036f885dfc8025257a0494d15bb201472d8e2e2b806e01f4634c5f52e3dd43c0f8a13d3b8010b84129ccb808c3ea68a2f0
-DIST netperf-2.5.0.tar.bz2 1025246 SHA256 8594bc4ea4427c721a89d9901ae0327cd849eece681d2270b58e9395d25a06d0 SHA512 e06d1a90aa89786b189c5dca2bb85991315975a9f1c9f1236c79938fd3299cf6374d93ec5a6de8791c5f7ce9d73bee4482949d08e1d5487a523a6d006c42448b WHIRLPOOL 276de22c022fe3bbadbcb1350577a4643450fb2548694a7a519f49e99a907aafb9bb9ff5d114c18b7313dfb46b9663de6cacbe41bd6cf6ec8a127685bbfbf7f0
 DIST netperf-2.6.0.tar.bz2 1032953 SHA256 cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a SHA512 b3921d2e887088b14a8bbe5ace9b1cc0c8b29951eeaa7857ce3f324933397c8ff6b56eeacfe755181ce1a56c982fe431955f6db55bd20f2343324e22ee23c9b3 WHIRLPOOL b602c8660bae59648cbbe9eed47ee9d86b0ae714bc0c2906e80a14d0ce18951f125f3331f90acd776850b04506e37030545084677f6be512477ea37f76d972e7
-EBUILD netperf-2.5.0-r1.ebuild 1592 SHA256 6d0816a420e0f9ff1cb2418c446e352e16c8eec3fe03a016dfa07af0399ce05b SHA512 224dc539dc4f88512a3c0a437c52c009dc1fe823c376ce30a16398608fdb48a322cf3e1082d0bc516e35e99914f50b60a16efbf480ca93f3976c624e898713fe WHIRLPOOL c97361d98bde5f23ad2307003e9bea4367cc752ed662a62f30a35585bef384e31af2646a126f77bbebb06e2273b2fb77d2916fa7888bce73eb9cb06e68266fad
 EBUILD netperf-2.6.0-r1.ebuild 1783 SHA256 ed5d725ee9383b4326246c73936a5211b8d63d4978f83312f0136fa146f823f0 SHA512 3d88d05fd77a75ab2c375a85ae9639fcde42efdca44c1c45a5fb3cf9fad9ed964b1ff3f96b12efc0881bc9ceba11ea4162fc561bbca28528123237d9e5cffac1 WHIRLPOOL 058965d2d4c973c96740c1bf0230f2f7208b82b34a485038932db2171d7fc1b12483f57d208fdab20733100743fff450986c5853508c9ce8b9b4d2e809f3e003
-MISC ChangeLog 10169 SHA256 4f954a3a2cc22c855f5d1da3d485a8b7d3ff28bd66f3d575d788331893925ba6 SHA512 6386e93069dfa62d47bffb8d7b9af8ab6524bc6357ac130537b0970180f0eec50d8c2157b5407c9080e72a891a355de5c91620eaf0d2d414834345ec6970f042 WHIRLPOOL ba3221b3e5c4aad71ab8393934ce4613c9667d56164bc8741bdbc892db3f42ae6b615470e32e65aab896eb12e8e5ebbd4a5c43af6007319afc280e06e2631b68
+MISC ChangeLog 10250 SHA256 5d025bcd9389e3dbe25010ca31144d3257d8f6e3fb75cad0d333960350545090 SHA512 82c59fc3806e9265f21ca881f797044628fef41c4fe9462e680d9107e4cfebe469d45ad30f585967074f4dfdda2845007ed81ebd7ef8dd621c29a5441ecda712 WHIRLPOOL 8f17782fbf4f5fd6ffcd09d5128ccae91311677460bdda7d4c32e486039d8f7bb4cdde889a6eb405df2bf75341a5a66e042862d3014b158c9e73b630e083f3fe
 MISC metadata.xml 320 SHA256 6eed60337859b545349520e6129046903f8bc2d0a88f6fd766e2eefa7ff37c9c SHA512 d4e3e554fcf15505996ba787a0f25764a1579a5e363baba742c131f8874ba48b8e4991fb5c7ad7f5a2f3d3469ede3823cb4745787a7c4ca24e2b2826917177e9 WHIRLPOOL beece57646dca4b5bdf342129266ed690658885f6e7aea3c8cc3d6485a2fe54e91208a487bfbc97764230173888f10ad71985c99f377e2ca9586f8f81564f433
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUULPMAAoJELp701BxlEWfLioQAJxpfEpSbcVL7T//qbXPFWkI
-vqD9MALZGkEXj665jdNEOs0WX2uF+rpomhvpYDo41YuuLb7+AcblwK0IPm6/7lJs
-NFEdriF2jHn+CmgYEDfiPvjLZD76MDjN6ZeYKv8haBBWhiqw4mo959NJMT3+fJZU
-iwVYlLYDGETKxWQsLbXGwq7jxkqKn4ghnSAhsufASxqdNp5cevfyLvJVSSwzmpXo
-3RSCCocK892oAVL0n5mHbWx2sdp1AacRhEaDpjxXpd6A7cwS7gCnOTy4xRg7sYKU
-uZ8mttAz3tjQxQTCH44r8/qW1pVYgXlr130ijpW1+nFWwSSF9Pnl9Qi7r55b17zq
-/iLQJa7EjvNq642z/p80B64fdFNDoAjHFxjCv+c6Qb5oDLU6/IgoQO7EVnvXO1TI
-21YYxXjetDdMCl69mHB/GgYL12PiiltygJCo5/o8dx3Krh8I0LCo/JCfzmNMYCr4
-WGyV1fhkQt7DucLNYEpzsW0zs4nq5PgCbeBTFOGvNMIkjYJnPPpAjxEXTRHhPjrM
-ADyCLNOvcHdZOR07NtTP/5nzg6DeZrYi4AM6t1xxxZc99IGeq9wC25zjRpsBUjyu
-PGILnFKccpxLXluA+Q8FhjDETRnunqQdIorprXffuzZ7FoDgHOIEeEQEGsjGAuh9
-CgjfuMawJOUiyxLvTsFf
-=RoJ+
+iEYEAREIAAYFAlRQtg8ACgkQVWmRsqeSphM50wCdFLG7hkh9L29c/xVuFfbxwYWE
+MYMAn1jRNuqx121bMylyO26764zl7fiy
+=r8x0
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/netperf/netperf-2.5.0-r1.ebuild b/net-analyzer/netperf/netperf-2.5.0-r1.ebuild
deleted file mode 100644
index 20f27d22cc07..000000000000
--- a/net-analyzer/netperf/netperf-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.5.0-r1.ebuild,v 1.8 2014/08/10 20:59:26 slyfox Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more"
-SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-HOMEPAGE="http://www.netperf.org/"
-LICENSE="netperf"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND=""
-
-src_prepare() {
-	sed -i src/netserver.c \
-		-e '/^#define DEBUG_LOG_FILE_DIR/s:"/tmp/":"/var/log/":' \
-		-e 's:sizeof(netperf_response) - 7:MAXSPECDATA:g' \
-		|| die
-
-	epatch "${FILESDIR}"/${PN}-fix-scripts.patch
-
-	# Fixing paths in scripts
-	sed -i -e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
-			doc/examples/sctp_stream_script \
-			doc/examples/tcp_range_script \
-			doc/examples/tcp_rr_script \
-			doc/examples/tcp_stream_script \
-			doc/examples/udp_rr_script \
-			doc/examples/udp_stream_script
-}
-
-src_install () {
-	default
-
-	# 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 NEWS README Release_Notes
-	dodir /usr/share/doc/${PF}/examples
-	#Scripts no longer get installed by einstall
-	cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples
-}