Version bump. Drop useless MY_P. Block sci-mathematics/snns (bug #248322). Drop autotools since the gcc41 patch is no longer needed, incidentally fix maintainer-mode (bug #255896). Drop unused flag-o-matic. Depend on sed.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 70 insertions, 16 deletions

diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index 68c4e96d53c1..02569a1721e8 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/netperf
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.42 2008/03/31 21:30:53 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.43 2009/08/26 00:49:05 jer Exp $
+
+*netperf-2.4.5 (26 Aug 2009)
+
+  26 Aug 2009; Jeroen Roovers <jer@gentoo.org> netperf-2.4.4.ebuild,
+  +netperf-2.4.5.ebuild:
+  Version bump. Drop useless MY_P. Block sci-mathematics/snns (bug #248322).
+  Drop autotools since the gcc41 patch is no longer needed, incidentally fix
+  maintainer-mode (bug #255896). Drop unused flag-o-matic. Depend on sed.
 
   31 Mar 2008; Markus Meier <maekke@gentoo.org> netperf-2.4.4.ebuild:
   amd64 stable, bug #209035
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index eb2803f3e6d2..37d8c4d4345f 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -1,6 +1,3 @@
------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
@@ -8,13 +5,8 @@ AUX netperf-CVE-2007-1444.patch 2112 RMD160 d77d8e4cb6da9d639e2a6420413c2bff01b4
 AUX netperf-fix-scripts.patch 1424 RMD160 2af14567498baa6a0c71699e7f841e36e92861ae SHA1 50b129028a76a9bcb2dcaba0b2a8a63ccbc9ffcf SHA256 16668469ac82bda63c2e9c17431c983368b04c328c4cdc2ab1f973ba22f3c354
 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
-EBUILD netperf-2.4.4.ebuild 1875 RMD160 a09f791557db745dec77b3b5d40d3e75e284445e SHA1 3e1c0eb4c1c6cc06438d31ac4644806e09ff994b SHA256 6baf8b88f21683350f9f215cf896e4833bf3ae515e739e88ae072033b5252033
-MISC ChangeLog 5909 RMD160 48cb389ea4ea9501e42d0458a93a2196199290ad SHA1 880d286f8355d55601b9ff684b4559059211a77a SHA256 7c4e6aecb821d7355dadbb0ee120e9f0c00c562eddb0e36b73911ce1b83db5d8
+DIST netperf-2.4.5.tar.gz 1238976 RMD160 dc72b29800359fc401a3368b04b6361760d65fa6 SHA1 67cdb984fd60244e454ac48ef02628e2d1f023d0 SHA256 b1c7e5e13c18d36d2cccefebf2ca3b6adc87d0feae9785523fea07f7b3b522c0
+EBUILD netperf-2.4.4.ebuild 1905 RMD160 18cbb060762461167360092de4f1b26b8a789ac2 SHA1 286c148463070494bd8a73d9098122ddb83da53f SHA256 103a61a1950695e91c8f63c5fc0dc655392a4279eddd90b96476c77ccf8ca0f6
+EBUILD netperf-2.4.5.ebuild 1570 RMD160 794ce807f99fbd6a892f25078f7add8fdb9b6462 SHA1 f65a342af0a0a104064a65704e92a161dfa93384 SHA256 d03e7e387b8d860bfacedf3a98638811dddb2cfb8e30872ab788b155f91bbc7d
+MISC ChangeLog 6259 RMD160 bec608d7b0d2668a460be21c68934221d80be4d1 SHA1 db975a2e20a03c54624262a95b6b5da511f6de38 SHA256 451bf9d90f48c37cae8a56e6fd945a6c311d1361b9706f0f77253b640f099a43
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkfxWFQACgkQkKaRLQcq0GKxugCfVxPAPpuUw1r56rcvql6c4PnQ
-juQAniuO3meQMpvt0v1cAFczpnoaHB9w
-=4O8P
------END PGP SIGNATURE-----
diff --git a/net-analyzer/netperf/netperf-2.4.4.ebuild b/net-analyzer/netperf/netperf-2.4.4.ebuild
index 92c77f64ffb1..2388615e7393 100644
--- a/net-analyzer/netperf/netperf-2.4.4.ebuild
+++ b/net-analyzer/netperf/netperf-2.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.4.ebuild,v 1.7 2008/03/31 21:30:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.4.ebuild,v 1.8 2009/08/26 00:49:05 jer Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -17,6 +17,8 @@ LICENSE="netperf"
 SLOT="0"
 IUSE=""
 
+RDEPEND="!sci-mathematics/snns"
+
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
diff --git a/net-analyzer/netperf/netperf-2.4.5.ebuild b/net-analyzer/netperf/netperf-2.4.5.ebuild
new file mode 100644
index 000000000000..9eedb4da2420
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.4.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 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.ebuild,v 1.1 2009/08/26 00:49:05 jer Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
+SRC_URI="ftp://ftp.netperf.org/netperf/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~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 's:^\(#define DEBUG_LOG_FILE "\)/tmp/netperf.debug:\1/var/log/netperf.debug:' src/netserver.c
+	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 () {
+	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 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
+}