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

(Portage version: 2.1.2_rc1-r1)

5 files changed, 63 insertions, 7 deletions

diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index 566154ea99d1..cb0805a40383 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/netperf
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.29 2006/06/05 17:44:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.30 2006/10/31 23:18:10 jokey Exp $
+
+*netperf-2.4.2 (01 Nov 2006)
+
+  01 Nov 2006; Markus Ullmann <jokey@gentoo.org> netperf-2.2.4.ebuild,
+  netperf-2.3.ebuild, -netperf-2.4.0_rc2.ebuild, -netperf-2.4.0_rc3.ebuild,
+  -netperf-2.4.0.ebuild, -netperf-2.4.0-r1.ebuild, +netperf-2.4.2.ebuild:
+  Version bump and SRC_URI udate wrt bug #152704 thanks to Francisco Javier
+  for reporting
 
   05 Jun 2006; Peter Volkov <pva@gentoo.org> netperf-2.4.0-r1.ebuild:
   Fixed eutils inheritance as we use epatch.
diff --git a/net-analyzer/netperf/files/digest-netperf-2.4.2 b/net-analyzer/netperf/files/digest-netperf-2.4.2
new file mode 100644
index 000000000000..ee2e682a79f0
--- /dev/null
+++ b/net-analyzer/netperf/files/digest-netperf-2.4.2
@@ -0,0 +1,3 @@
+MD5 c747042975c2965b2cd45ebf8525c5f8 netperf-2.4.2.tar.gz 1161450
+RMD160 f942a001deb480e281a6fc962f13eda146dce77d netperf-2.4.2.tar.gz 1161450
+SHA256 844ba97e745a0b9f37afc7daa323cafcef00108cd0254667da0a00558eb323a7 netperf-2.4.2.tar.gz 1161450
diff --git a/net-analyzer/netperf/netperf-2.2.4.ebuild b/net-analyzer/netperf/netperf-2.2.4.ebuild
index 53f478f3510d..e6444ed74125 100644
--- a/net-analyzer/netperf/netperf-2.2.4.ebuild
+++ b/net-analyzer/netperf/netperf-2.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.2.4.ebuild,v 1.17 2005/07/16 19:42:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.2.4.ebuild,v 1.18 2006/10/31 23:18:10 jokey Exp $
 
 inherit flag-o-matic
 
@@ -12,7 +12,7 @@ else
 fi
 
 DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
-SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.netperf.org/netperf/archive/${MY_P}.tar.gz"
 HOMEPAGE="http://www.netperf.org/"
 LICENSE="netperf"
 SLOT="0"
diff --git a/net-analyzer/netperf/netperf-2.3.ebuild b/net-analyzer/netperf/netperf-2.3.ebuild
index cc2686c588eb..acb9faea0b46 100644
--- a/net-analyzer/netperf/netperf-2.3.ebuild
+++ b/net-analyzer/netperf/netperf-2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.3.ebuild,v 1.9 2005/07/16 19:42:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.3.ebuild,v 1.10 2006/10/31 23:18:10 jokey Exp $
 
 inherit flag-o-matic
 
@@ -12,7 +12,7 @@ else
 fi
 
 DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
-SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.netperf.org/netperf/archive/${MY_P}.tar.gz"
 HOMEPAGE="http://www.netperf.org/"
 LICENSE="netperf"
 SLOT="0"
diff --git a/net-analyzer/netperf/netperf-2.4.2.ebuild b/net-analyzer/netperf/netperf-2.4.2.ebuild
new file mode 100644
index 000000000000..414a9da85910
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.4.2.ebuild
@@ -0,0 +1,45 @@
+# 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.2.ebuild,v 1.1 2006/10/31 23:18:10 jokey Exp $
+
+WANT_AUTOCONF="latest"
+inherit eutils flag-o-matic autotools
+
+MY_P=${P/_rc/-rc}
+
+DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
+#SRC_URI="ftp://ftp.netperf.org/netperf/experimental/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.netperf.org/netperf/${MY_P}.tar.gz"
+KEYWORDS="~x86 ~sparc ~ia64 ~alpha ~amd64 ~ppc64 ~ppc ~ppc-macos"
+
+HOMEPAGE="http://www.netperf.org/"
+LICENSE="netperf"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.4.0-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
+}