fixed instalation of the example scripts and fixed the scripts

(Portage version: 2.1.2-r5)

6 files changed, 128 insertions, 5 deletions

diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index cb0805a40383..00336d1e1f1d 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,6 +1,12 @@
 # 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.30 2006/10/31 23:18:10 jokey Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.31 2007/01/29 20:05:05 humpback Exp $
+
+*netperf-2.4.2-r1 (29 Jan 2007)
+
+  29 Jan 2007; Gustavo Felisberto <humpback@gentoo.org>;
+  -netperf-2.4.2.ebuild, +netperf-2.4.2-r1.ebuild:
+  Example scripts where not being installed.
 
 *netperf-2.4.2 (01 Nov 2006)
 
diff --git a/net-analyzer/netperf/files/digest-netperf-2.2.4 b/net-analyzer/netperf/files/digest-netperf-2.2.4
index c04c639e9b47..7dfa4734e50e 100644
--- a/net-analyzer/netperf/files/digest-netperf-2.2.4
+++ b/net-analyzer/netperf/files/digest-netperf-2.2.4
@@ -1 +1,3 @@
 MD5 0ba938bc65dac4989639a40fdf892952 netperf-2.2pl4.tar.gz 823686
+RMD160 14361e4d41a026c5311a1f50d7f5f012d722a202 netperf-2.2pl4.tar.gz 823686
+SHA256 9bad966cd55f0078e0f2c1ee7b1497df5dc0a7b030a3db4f6404d3f775842c74 netperf-2.2pl4.tar.gz 823686
diff --git a/net-analyzer/netperf/files/digest-netperf-2.3 b/net-analyzer/netperf/files/digest-netperf-2.3
index a7aa74a04cec..f438155cc8d1 100644
--- a/net-analyzer/netperf/files/digest-netperf-2.3
+++ b/net-analyzer/netperf/files/digest-netperf-2.3
@@ -1 +1,3 @@
 MD5 df61b8db5e38d58cdf81748635614d33 netperf-2.3.tar.gz 835407
+RMD160 9de3fe14a1ff1d1a81a2140e9126d61d6376d9be netperf-2.3.tar.gz 835407
+SHA256 7a0aebd365b8ebe53d796d3d701f153d2a73c37f81afd535a4d858e4380e7700 netperf-2.3.tar.gz 835407
diff --git a/net-analyzer/netperf/files/digest-netperf-2.4.2 b/net-analyzer/netperf/files/digest-netperf-2.4.2-r1
index ee2e682a79f0..ee2e682a79f0 100644
--- a/net-analyzer/netperf/files/digest-netperf-2.4.2
+++ b/net-analyzer/netperf/files/digest-netperf-2.4.2-r1
diff --git a/net-analyzer/netperf/files/netperf-fix-scripts.patch b/net-analyzer/netperf/files/netperf-fix-scripts.patch
new file mode 100644
index 000000000000..d8e3e2f2cc44
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-fix-scripts.patch
@@ -0,0 +1,111 @@
+diff -u doc/examples.ori/arr_script doc/examples/arr_script
+--- doc/examples.ori/arr_script	2007-01-29 20:01:45.000000000 +0000
++++ doc/examples/arr_script	2007-01-29 20:01:16.000000000 +0000
+@@ -10,8 +10,8 @@
+   TOLERANCE=15
+   MAX_RETRIES=3
+ 
+-  NETPERF="/usr/local/netperf/netperf"
+-  NETPERF="./netperf"
++#  NETPERF="/usr/local/netperf/netperf"
++  NETPERF="/usr/bin/netperf"
+ 
+   NPROC_LIST=""
+   RR_SIZES=""
+diff -u doc/examples.ori/packet_byte_script doc/examples/packet_byte_script
+--- doc/examples.ori/packet_byte_script	2007-01-29 20:01:45.000000000 +0000
++++ doc/examples/packet_byte_script	2007-01-29 20:01:16.000000000 +0000
+@@ -22,7 +22,7 @@
+ fi
+ 
+ # where is netperf
+-NETPERF_CMD=${NETPERF_CMD:=/opt/netperf/netperf}
++NETPERF_CMD=${NETPERF_CMD:=/usr/bin/netperf}
+ 
+ # at what port will netserver be waiting? If you decide to run
+ # netserver at a differnet port than the default of 12865, then set
+diff -u doc/examples.ori/sctp_stream_script doc/examples/sctp_stream_script
+--- doc/examples.ori/sctp_stream_script	2007-01-29 20:01:45.000000000 +0000
++++ doc/examples/sctp_stream_script	2007-01-29 20:01:16.000000000 +0000
+@@ -24,7 +24,7 @@
+ # where the programs are
+ #NETHOME=/usr/local/netperf
+ #NETHOME="/opt/netperf"
+-NETHOME=.
++NETHOME=/usr/bin/
+ 
+ # at what port will netserver be waiting? If you decide to run
+ # netserver at a differnet port than the default of 12865, then set
+diff -u doc/examples.ori/snapshot_script doc/examples/snapshot_script
+--- doc/examples.ori/snapshot_script	2007-01-29 20:01:45.000000000 +0000
++++ doc/examples/snapshot_script	2007-01-29 20:01:16.000000000 +0000
+@@ -37,7 +37,7 @@
+ #
+ # where is netperf installed, there are a few possible places:
+ 
+-NETPERF_CMD=${NETPERF_CMD:=/opt/netperf/netperf}
++NETPERF_CMD=${NETPERF_CMD:=/usr/bin/netperf}
+ 
+ 
+ # there should be no more than two parms passed
+Only in doc/examples: .svn
+diff -u doc/examples.ori/tcp_range_script doc/examples/tcp_range_script
+--- doc/examples.ori/tcp_range_script	2007-01-29 20:01:45.000000000 +0000
++++ doc/examples/tcp_range_script	2007-01-29 20:01:16.000000000 +0000
+@@ -43,7 +43,7 @@
+ # where is netperf, and are there any "constant" options such as 
+ # the netserver port number
+ #NETHOME=/usr/etc/net_perf
+-NETHOME="."
++NETHOME="/usr/bin"
+ NETPERF=$NETHOME/netperf $PORT
+ 
+ # How accurate we want the estimate of performance: 
+diff -u doc/examples.ori/tcp_rr_script doc/examples/tcp_rr_script
+--- doc/examples.ori/tcp_rr_script	2007-01-29 20:01:45.000000000 +0000
++++ doc/examples/tcp_rr_script	2007-01-29 20:01:16.000000000 +0000
+@@ -25,7 +25,7 @@
+ # where the programs are
+ #NETHOME=/usr/local/netperf
+ #NETHOME="/opt/netperf"
+-NETHOME=.
++NETHOME="/usr/bin"
+ 
+ # at what port will netserver be waiting? If you decide to run
+ # netserver at a differnet port than the default of 12865, then set
+diff -u doc/examples.ori/tcp_stream_script doc/examples/tcp_stream_script
+--- doc/examples.ori/tcp_stream_script	2007-01-29 20:01:45.000000000 +0000
++++ doc/examples/tcp_stream_script	2007-01-29 20:01:16.000000000 +0000
+@@ -24,7 +24,7 @@
+ # where the programs are
+ #NETHOME=/usr/local/netperf
+ #NETHOME="/opt/netperf"
+-NETHOME=.
++NETHOME="/usr/bin"
+ 
+ # at what port will netserver be waiting? If you decide to run
+ # netserver at a different port than the default of 12865, then set
+diff -u doc/examples.ori/udp_rr_script doc/examples/udp_rr_script
+--- doc/examples.ori/udp_rr_script	2007-01-29 20:01:45.000000000 +0000
++++ doc/examples/udp_rr_script	2007-01-29 20:01:16.000000000 +0000
+@@ -22,7 +22,7 @@
+ 
+ #NETHOME=/usr/local/netperf
+ #NETHOME="/opt/netperf"
+-NETHOME="."
++NETHOME="/usr/bin"
+ 
+ # at what port will netserver be waiting? If you decide to run
+ # netserver at a differnet port than the default of 12865, then set
+diff -u doc/examples.ori/udp_stream_script doc/examples/udp_stream_script
+--- doc/examples.ori/udp_stream_script	2007-01-29 20:01:45.000000000 +0000
++++ doc/examples/udp_stream_script	2007-01-29 20:01:16.000000000 +0000
+@@ -19,7 +19,7 @@
+ 
+ #NETHOME=/usr/local/netperf
+ #NETHOME="/opt/netperf"
+-NETHOME="."
++NETHOME="/usr/bin"
+ 
+ # at what port will netserver be waiting? If you decide to run
+ # netserver at a differnet port than the default of 12865, then set
diff --git a/net-analyzer/netperf/netperf-2.4.2.ebuild b/net-analyzer/netperf/netperf-2.4.2-r1.ebuild
index 414a9da85910..abeb76fa5e4a 100644
--- a/net-analyzer/netperf/netperf-2.4.2.ebuild
+++ b/net-analyzer/netperf/netperf-2.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.2-r1.ebuild,v 1.1 2007/01/29 20:05:05 humpback Exp $
 
 WANT_AUTOCONF="latest"
 inherit eutils flag-o-matic autotools
@@ -23,6 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-2.4.0-gcc41.patch
+	epatch ${FILESDIR}/${PN}-fix-scripts.patch
 	eautoconf
 }
 
@@ -41,5 +42,6 @@ src_install () {
 	# 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
+	#Scripts no longer get installed by einstall
+	cp doc/examples/*_script ${D}/usr/share/doc/${PF}/examples
 }