Version bump. Remove testing cruft.

(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

3 files changed, 66 insertions, 9 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/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
+}