fixed instalation of the example scripts and fixed the scripts

Package-Manager: portage-2.1.2-r5

7 files changed, 155 insertions, 28 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/Manifest b/net-analyzer/netperf/Manifest
index 5e3a5f64f20b..0fb8c1b3a057 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -17,8 +17,12 @@ AUX netperf-2.4.0-gcc41.patch 538 RMD160 06dab7d42752c93861049f1d2b0a879289c4ebd
 MD5 9805e626f32fd2b450eff1b5176c75c8 files/netperf-2.4.0-gcc41.patch 538
 RMD160 06dab7d42752c93861049f1d2b0a879289c4ebd7 files/netperf-2.4.0-gcc41.patch 538
 SHA256 a4d74b9855b0e991b4353e8e7e18b4024cc0c46cec153db6db1f551ac2115705 files/netperf-2.4.0-gcc41.patch 538
-DIST netperf-2.2pl4.tar.gz 823686
-DIST netperf-2.3.tar.gz 835407
+AUX netperf-fix-scripts.patch 4213 RMD160 c53e22378127c0954af4e0fc36944abc789536a7 SHA1 8c81f020911b329f8332a69c0d13cb45fa33fbcd SHA256 042b32a1d1bbc7369c75a708216146cff689148a9cb456b41bbdbf8bc9be5fd1
+MD5 f1d9d93127a2f3d0ab2e10778dd053ad files/netperf-fix-scripts.patch 4213
+RMD160 c53e22378127c0954af4e0fc36944abc789536a7 files/netperf-fix-scripts.patch 4213
+SHA256 042b32a1d1bbc7369c75a708216146cff689148a9cb456b41bbdbf8bc9be5fd1 files/netperf-fix-scripts.patch 4213
+DIST netperf-2.2pl4.tar.gz 823686 RMD160 14361e4d41a026c5311a1f50d7f5f012d722a202 SHA1 4b766fb9d68a2c71092ebdde288b439d07afa4f6 SHA256 9bad966cd55f0078e0f2c1ee7b1497df5dc0a7b030a3db4f6404d3f775842c74
+DIST netperf-2.3.tar.gz 835407 RMD160 9de3fe14a1ff1d1a81a2140e9126d61d6376d9be SHA1 b4ae9c90a9351e024319f8bbc064aecf6a18e63b SHA256 7a0aebd365b8ebe53d796d3d701f153d2a73c37f81afd535a4d858e4380e7700
 DIST netperf-2.4.2.tar.gz 1161450 RMD160 f942a001deb480e281a6fc962f13eda146dce77d SHA1 9fdcea0840fa4baa3b2b2408221617880ee09a15 SHA256 844ba97e745a0b9f37afc7daa323cafcef00108cd0254667da0a00558eb323a7
 EBUILD netperf-2.2.4.ebuild 1332 RMD160 b8d3cacef308281beb144f9c05e981a05c1525d0 SHA1 82c0e77717d2e6ca95c727dab0403e6a6b175f2b SHA256 4950b7b7a2a176f7f439c7651b52735a0009ebbbeb5d515ff7cab1e00ed89cdd
 MD5 6993fef4879d6355c8269e1b95a62754 netperf-2.2.4.ebuild 1332
@@ -28,31 +32,31 @@ EBUILD netperf-2.3.ebuild 1331 RMD160 9ed2001cb5301c7b62c35196518c10b59f71ddaf S
 MD5 bc80b627149ec96c627b87ce10f24a5a netperf-2.3.ebuild 1331
 RMD160 9ed2001cb5301c7b62c35196518c10b59f71ddaf netperf-2.3.ebuild 1331
 SHA256 4e77b9c39684e09f5ddb78ce867546d73e19f4eb360949c18999b8c815be6400 netperf-2.3.ebuild 1331
-EBUILD netperf-2.4.2.ebuild 1290 RMD160 fab966a95a154ee785034574dbddff015da77bb1 SHA1 e08b63aff796af4abc6ac7f853df87c309e42867 SHA256 0507fe79f507adb020412f70bf73b1fa1ae4114fa76e57c308cf571d70c103a0
-MD5 d95b666fd12d5632b4c8815cc5900bc3 netperf-2.4.2.ebuild 1290
-RMD160 fab966a95a154ee785034574dbddff015da77bb1 netperf-2.4.2.ebuild 1290
-SHA256 0507fe79f507adb020412f70bf73b1fa1ae4114fa76e57c308cf571d70c103a0 netperf-2.4.2.ebuild 1290
-MISC ChangeLog 4118 RMD160 bee3de914a51b0c74aa568488861d7295f8ab837 SHA1 f84fbc2d278154c7d847720c66d268c01b1da821 SHA256 e75fa3fc5eee95c31e0f26c72b026913c152d59d32ac48f75e945115c77d472c
-MD5 6935284e86b8af1da94771a4590f0a07 ChangeLog 4118
-RMD160 bee3de914a51b0c74aa568488861d7295f8ab837 ChangeLog 4118
-SHA256 e75fa3fc5eee95c31e0f26c72b026913c152d59d32ac48f75e945115c77d472c ChangeLog 4118
+EBUILD netperf-2.4.2-r1.ebuild 1386 RMD160 f1de8132946b369db24ac08a8f292497b5b21282 SHA1 29722a247ba8e795bfab9018ca40907fbcd3941f SHA256 5e1e7966d87859f1600d155a9b5b99e0fb1afdf73f3bbc2e514c768747aabb07
+MD5 3daf03fb3b11635175610aeeb7077840 netperf-2.4.2-r1.ebuild 1386
+RMD160 f1de8132946b369db24ac08a8f292497b5b21282 netperf-2.4.2-r1.ebuild 1386
+SHA256 5e1e7966d87859f1600d155a9b5b99e0fb1afdf73f3bbc2e514c768747aabb07 netperf-2.4.2-r1.ebuild 1386
+MISC ChangeLog 4308 RMD160 7a6f66c6a0acc6ebcf8fbd4844935e704c7c97ad SHA1 98d371aac5586e44e9bebb33b394aef7a419682a SHA256 2ec9a053ed3cc8097534a6133f510822c036770aabb440bfc5863af55963941e
+MD5 6781f54fd942b1af58faa5f919e34739 ChangeLog 4308
+RMD160 7a6f66c6a0acc6ebcf8fbd4844935e704c7c97ad ChangeLog 4308
+SHA256 2ec9a053ed3cc8097534a6133f510822c036770aabb440bfc5863af55963941e ChangeLog 4308
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159
 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 metadata.xml 159
-MD5 787949efbc227966fa6a5609799cbf97 files/digest-netperf-2.2.4 66
-RMD160 c67c5d19666c0449a18fca0166eb2948a502a4c6 files/digest-netperf-2.2.4 66
-SHA256 bd39d26a60096d50cefc9c20140ded836ec1eed0454daf59c1e18f151e6ee089 files/digest-netperf-2.2.4 66
-MD5 201084fb8da044398f8a0459f1e7c4b5 files/digest-netperf-2.3 63
-RMD160 30065117d78125403cdf1f4db0ef3ca6fa437a2b files/digest-netperf-2.3 63
-SHA256 df775fe33992b18abeadfaba067d98c9f9d7fab84a6d24dcc86ac19d70fbeb21 files/digest-netperf-2.3 63
-MD5 d79ce6ca713b91cef32cadfda6a595b5 files/digest-netperf-2.4.2 244
-RMD160 826e499426b4c6220d03e49dc828eb997155e735 files/digest-netperf-2.4.2 244
-SHA256 f6a29be73ce2b032bda38b1049b1288e5583b366765db74313fe64aec9fdd5de files/digest-netperf-2.4.2 244
+MD5 b33ee64edcaf7d128f83e071d3a37b8b files/digest-netperf-2.2.4 244
+RMD160 4782686527864406540d267a05789dce4e0416c4 files/digest-netperf-2.2.4 244
+SHA256 b58838f811e86f50099de80f78216170ad2e2b3dcf8f1c757d26026fdbf330f5 files/digest-netperf-2.2.4 244
+MD5 13c31b6b9ee5d9cae9101bfd7ba3ab44 files/digest-netperf-2.3 235
+RMD160 92c63ff2534a1b6a36085477f9437c426f59e24a files/digest-netperf-2.3 235
+SHA256 6dd809033e680d55feb3357f527b94aafe25f933182cdba3b6a7f0143c2e9c76 files/digest-netperf-2.3 235
+MD5 d79ce6ca713b91cef32cadfda6a595b5 files/digest-netperf-2.4.2-r1 244
+RMD160 826e499426b4c6220d03e49dc828eb997155e735 files/digest-netperf-2.4.2-r1 244
+SHA256 f6a29be73ce2b032bda38b1049b1288e5583b366765db74313fe64aec9fdd5de files/digest-netperf-2.4.2-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFR+fyz974XjDVpbkRAjIAAJ9NIdjkz7YpFtMjFhw9k7nkoxsOvwCeMqHv
-B0mBgY3BB7taeWGiRpAUf2s=
-=jz/L
+iD8DBQFFvlN+8zY1VwezZiERApQrAKCNi/aQ0Hq6DgGGxJ0ZZR3Ky2hRjQCeMH3G
+AnnOmjGxdnalYCcK6lpQsnY=
+=h7zg
 -----END PGP SIGNATURE-----
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
 }