Version bump. Remove testing cruft.

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

4 files changed, 80 insertions, 11 deletions

diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index 149937baf6d2..1e7fe840b943 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/netperf
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.46 2010/12/01 00:38:44 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.47 2011/07/30 15:40:08 jer Exp $
+
+*netperf-2.5.0 (30 Jul 2011)
+
+  30 Jul 2011; Jeroen Roovers <jer@gentoo.org> netperf-2.4.5-r1.ebuild,
+  +netperf-2.5.0.ebuild:
+  Version bump. Remove testing cruft.
 
 *netperf-2.4.5-r1 (01 Dec 2010)
 
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index 266d30d5cd5b..e23b96d53491 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX netperf-2.2-conf 103 RMD160 3eb1f40f8547c15cf04f15670c47a5f3c24b9fab SHA1 6a1412637c5707851fd365b41009d79d83261972 SHA256 9dce33f9552ce91ed5dbf57f44bd3d64a83aeb67ed9a41952a6c69601a10e340
 AUX netperf-2.2-init 434 RMD160 6e4337b3d82103f722cbe8f347287f46edf0e2ff SHA1 de8c9736649932e0a2e5527a91cf4e148415774b SHA256 96e944e8f62d06abdc883b3ba34504c4320d9aa5a711c41fb552eb6c61565d0f
 AUX netperf-2.4.0-gcc41.patch 538 RMD160 06dab7d42752c93861049f1d2b0a879289c4ebd7 SHA1 21a66fd44fceedc4fb050bfa48e870568f4f918e SHA256 a4d74b9855b0e991b4353e8e7e18b4024cc0c46cec153db6db1f551ac2115705
@@ -7,7 +10,16 @@ AUX netperf-fix-scripts.patch 1424 RMD160 2af14567498baa6a0c71699e7f841e36e92861
 DIST netperf-2.4.4-svn_trunk_20071205.patch.bz2 7077 RMD160 b677dc447a953a75521f865110975a4127a10fd9 SHA1 e82679e0de8095f31ea51451fcef862e0f2485d5 SHA256 77c2eda5c5b31ff8d6821e28ae88f43b77771bc82b8d2111280e990dca8ed3ec
 DIST netperf-2.4.4.tar.gz 1155970 RMD160 562a14f6856908e65141f36e022dbeace048ba0d SHA1 a84a98e4e23cb8654a42ff9a5545048bc1d2abe1 SHA256 ed983395e448e3e7d8e279b194eb40e5c800443d8de0e6ec92ea480f4ff53fdc
 DIST netperf-2.4.5.tar.gz 1238976 RMD160 dc72b29800359fc401a3368b04b6361760d65fa6 SHA1 67cdb984fd60244e454ac48ef02628e2d1f023d0 SHA256 b1c7e5e13c18d36d2cccefebf2ca3b6adc87d0feae9785523fea07f7b3b522c0
+DIST netperf-2.5.0.tar.bz2 1025246 RMD160 a1057554360e1cbaa2aef3ad7a1d9b6cf8e2f096 SHA1 e639887332775de93d72b9af4fa71dcbaab22235 SHA256 8594bc4ea4427c721a89d9901ae0327cd849eece681d2270b58e9395d25a06d0
 EBUILD netperf-2.4.4.ebuild 1914 RMD160 9ccc04e23e2abf7a91baa4f6ec59fbe7d060a423 SHA1 dd797bcf7bda9dc34e262b9eef46202e528aaa88 SHA256 224e202b40b8b5a0b00333daef397e12d1b58ee95a54cc98ab2bbe05aa216b5d
-EBUILD netperf-2.4.5-r1.ebuild 1686 RMD160 6a203a65ea0a0930ef66e785314b469c854e2f4b SHA1 712f37fb2b90a25e8ea8caba133c771134207fc3 SHA256 0a428afcbc8843d96f17674798393d21202dc50a19e9f89524eb36d83c025955
-MISC ChangeLog 6683 RMD160 491d4981b2ce5bb266a3cea9e87cb47082068e37 SHA1 d8abd3d141a69811ed6f17a927afecc238b90631 SHA256 cd9b5a17355d1a294eb31b08762254a22715e2f71b89d99bca7a08a0bed6f94d
+EBUILD netperf-2.4.5-r1.ebuild 1520 RMD160 e08418c470762c8c4fead267e0cef8afc47a4d89 SHA1 172b4a27e41971be5816e8f2dbf91dc50fb64034 SHA256 90de70141e0054bdb585d83f5ec36151e484326b6ab29a9cacd6fcc51286357d
+EBUILD netperf-2.5.0.ebuild 1616 RMD160 1f2ba876ac5a32c665bdfcf3d80e47b007cce4ac SHA1 abbee352802be0a8ff4497f589a77492904251e0 SHA256 81737c5884cf15e9199a69064bc6dc7b5c74cd7560fbe8b94b469c17978fa382
+MISC ChangeLog 6849 RMD160 57b161ed26b64968c759692f38fc4eac4f975ac5 SHA1 5b8dff12845ff65ea9979f23244e91e98847b55a SHA256 4101dd117dd3413c4b0bfb2583fa3660ffdf5b825090c6cbca075a808313d82f
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk40Jd4ACgkQVWmRsqeSphNjzwCfYXJLz6dAdKp+A5wpzFRuwNoh
+YdIAmwRVfkjUXIaZ3WD8rP1jCibaA2gK
+=yn0l
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/netperf/netperf-2.4.5-r1.ebuild b/net-analyzer/netperf/netperf-2.4.5-r1.ebuild
index d75caad1da53..1e25102fe706 100644
--- a/net-analyzer/netperf/netperf-2.4.5-r1.ebuild
+++ b/net-analyzer/netperf/netperf-2.4.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.5-r1.ebuild,v 1.1 2010/12/01 00:38:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.5-r1.ebuild,v 1.2 2011/07/30 15:40:08 jer Exp $
 
 EAPI="2"
 
@@ -19,11 +19,6 @@ DEPEND=">=sys-apps/sed-4"
 RDEPEND="!sci-mathematics/snns"
 
 src_prepare() {
-cp -av src/netserver.c{,.orig}
-#	sed -i src/netserver.c \
-#		-e '/^#define DEBUG_LOG_FILE/s:/tmp/:/var/log/:' \
-#		-e 's:sizeof(netperf_response) - 7:MAXSPECDATA:g'
-
 	epatch \
 		"${FILESDIR}"/${PN}-fix-scripts.patch \
 		"${FILESDIR}"/${P}-netserver.patch
diff --git a/net-analyzer/netperf/netperf-2.5.0.ebuild b/net-analyzer/netperf/netperf-2.5.0.ebuild
new file mode 100644
index 000000000000..eeb20d284241
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.5.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 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.ebuild,v 1.1 2011/07/30 15:40:08 jer 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="!sci-mathematics/snns"
+
+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
+}