Version bump, plus mark 2.3 stable on amd64

(Portage version: 2.0.51.19)

5 files changed, 59 insertions, 3 deletions

diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index cd2b66dd178c..7eb50eab9aaa 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/netperf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.22 2005/04/01 13:53:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.23 2005/04/05 20:19:47 agriffis Exp $
+
+*netperf-2.4.0_rc2 (05 Apr 2005)
+
+  05 Apr 2005; Aron Griffis <agriffis@gentoo.org> netperf-2.3.ebuild,
+  +netperf-2.4.0_rc2.ebuild:
+  Version bump, plus mark 2.3 stable on amd64
 
   01 Apr 2005; Aron Griffis <agriffis@gentoo.org> netperf-2.3.ebuild:
   stable on ia64
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index b6fbbfc56b7f..cb825180f159 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -1,3 +1,5 @@
+MD5 81d9843ff36891d671b6e4858a42d596 2.3 765
+MD5 1769a3a304100c53961160783948895f netperf-2.4.0_rc2.ebuild 1414
 MD5 f8a37e68d90a811791bec5c24e653378 netperf-2.3.ebuild 1397
 MD5 8e4293bf35bf5b25f607ce5d6869b9e5 netperf-2.2.4.ebuild 1398
 MD5 b8e615d975490263f3b0bfae9c6d1c9a ChangeLog 2610
@@ -6,4 +8,5 @@ MD5 5b39a4d1bbad0a785afc512f8a35e87d files/netperf-2.2alpha.diff 686
 MD5 201084fb8da044398f8a0459f1e7c4b5 files/digest-netperf-2.3 63
 MD5 f7a086a9cdee9e3d6ed0e8976b678dbf files/netperf-2.2-conf 103
 MD5 35791611e593b4e8cefdfd56031e759d files/netperf-2.2-init 434
+MD5 5b8fcf5721bc37329f6af346c347f2ba files/digest-netperf-2.4.0_rc2 70
 MD5 787949efbc227966fa6a5609799cbf97 files/digest-netperf-2.2.4 66
diff --git a/net-analyzer/netperf/files/digest-netperf-2.4.0_rc2 b/net-analyzer/netperf/files/digest-netperf-2.4.0_rc2
new file mode 100644
index 000000000000..c4edc910b967
--- /dev/null
+++ b/net-analyzer/netperf/files/digest-netperf-2.4.0_rc2
@@ -0,0 +1 @@
+MD5 703ab87109ff26e99c0d6280d140de1b netperf-2.4.0-rc2.tar.gz 1462328
diff --git a/net-analyzer/netperf/netperf-2.3.ebuild b/net-analyzer/netperf/netperf-2.3.ebuild
index 2de9c5ff2898..95dc54b60a94 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
 # 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.6 2005/04/01 13:53:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.3.ebuild,v 1.7 2005/04/05 20:19:47 agriffis Exp $
 
 inherit flag-o-matic
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/${MY_P}.tar.gz"
 HOMEPAGE="http://www.netperf.org/"
 LICENSE="netperf"
 SLOT="0"
-KEYWORDS="x86 sparc ia64 alpha ~amd64 ~ppc64 ~ppc ~ppc-macos"
+KEYWORDS="x86 sparc ia64 alpha amd64 ~ppc64 ~ppc ~ppc-macos"
 
 IUSE="ipv6"
 
diff --git a/net-analyzer/netperf/netperf-2.4.0_rc2.ebuild b/net-analyzer/netperf/netperf-2.4.0_rc2.ebuild
new file mode 100644
index 000000000000..f7fce8cf15d3
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.4.0_rc2.ebuild
@@ -0,0 +1,46 @@
+# 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.1 2005/04/05 20:19:47 agriffis 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="ipv6"
+
+DEPEND="virtual/libc >=sys-apps/sed-4"
+
+src_compile() {
+	econf $(use_enable ipv6) || die
+	emake || die
+}
+
+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
+	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}-2.2-init netperf
+	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}-2.2-conf netperf
+
+	# documentation and example scripts
+	dodoc AUTHORS ChangeLog COPYING NEWS README Release_Notes doc/netperf.pdf
+	mkdir ${D}/usr/share/doc/${PF}/examples
+	mv ${D}/usr/bin/*_script ${D}//usr/share/doc/${PF}/examples
+}