Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 101 insertions, 6 deletions

diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index 971e2e434a43..14b0d1eb143d 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/netperf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.71 2014/10/29 09:40:30 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.72 2015/07/25 08:26:32 jer Exp $
+
+*netperf-2.7.0 (25 Jul 2015)
+
+  25 Jul 2015; Jeroen Roovers <jer@gentoo.org> +netperf-2.7.0.ebuild,
+  +files/netperf-2.7.0-includes.patch:
+  Version bump.
 
   29 Oct 2014; Jeroen Roovers <jer@gentoo.org> -netperf-2.5.0-r1.ebuild:
   Old.
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index 7a805eb60799..a33aa54275f4 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -4,15 +4,18 @@ Hash: SHA256
 AUX netperf-2.2-conf 103 SHA256 9dce33f9552ce91ed5dbf57f44bd3d64a83aeb67ed9a41952a6c69601a10e340 SHA512 88a0d19c59a054071f472e62e6afd8c5fe37a77802dedea3adc82df0701f280c0ad8b5410e7fab74302861bc45920d38d576cfea1d8baa01cd5739801acb3b60 WHIRLPOOL 30bb26aab461eb024e80fdbb663ea334f0112d7bb1c6d6d4c83ccd017efab4a945a1ed2f6073a122de7a9e6888a4fd11787744ce8d236f22ab3b88a93ad61eb2
 AUX netperf-2.2-init 433 SHA256 82df403bbf2dcb0086f4e7563b7ac678b65f8f7b5411312abadaa1594af659b7 SHA512 8151488c05001f2475201f3ebff3213d8a5afef5f75a2b726bae363c688f6c2363a756a9514921bffaf9eb7d7405114d27c8e5b98d3f53eb3a52db75a5236760 WHIRLPOOL 995662769c2ea31bcd0b45c987dddcec536f9df69d4f6d6c062123e30834dc96c482627592ce9b97811548a9edcfb6660aef0cdfb844ae49ff4ec92ec02e0b39
 AUX netperf-2.6.0-log-dir.patch 261 SHA256 c5449f723cc26e3ebada62d954e5b8dbad3b0996db18401c816fa756905eedbb SHA512 108ab43c36041df5051cb1a130d33e42589c020dac296230a325ee4e1805ea2b3bbcb5cd1438cd4abe4d922ff5536410be9364eaad9044a3181c9acdc7b91bb6 WHIRLPOOL 197919f1204465ad813849ab6b6f4ee24f7fe2f5aaf7072ab6f4159a5713163041dffa6e721a066552b0b7746b353b84255a0aceca478993ee229f37dbbb20fd
+AUX netperf-2.7.0-includes.patch 468 SHA256 dcd9ca94d89cf6624d52b9dd8aa7e68d7ac47032ce964049d0faa591731f6270 SHA512 aec77b7a97e83a93d847f0935bd599d7497b3b749bb0cdb722d96cb49535b3eef9b7b9f60388f5cb2de726b4084abd9cd48614d73bc63b34c7bc0fcfffb0fd3f WHIRLPOOL cd740bf0a4a3029f63b44ff0f33e55ae4e7c09a897ff5eb4770269a36c342be7c8c0c77f7a55eb0c277fdc75890a3ca8cd0bc83ad5dcca3b0305f489491ec3c8
 AUX netperf-fix-scripts.patch 819 SHA256 2dd29e6134f769cfff036945ebbb63e6f10338c95a1d5705c374f63c2d81ac30 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a WHIRLPOOL eaf301c87e6fd04fbeb6bc2eb33f69036f885dfc8025257a0494d15bb201472d8e2e2b806e01f4634c5f52e3dd43c0f8a13d3b8010b84129ccb808c3ea68a2f0
 DIST netperf-2.6.0.tar.bz2 1032953 SHA256 cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a SHA512 b3921d2e887088b14a8bbe5ace9b1cc0c8b29951eeaa7857ce3f324933397c8ff6b56eeacfe755181ce1a56c982fe431955f6db55bd20f2343324e22ee23c9b3 WHIRLPOOL b602c8660bae59648cbbe9eed47ee9d86b0ae714bc0c2906e80a14d0ce18951f125f3331f90acd776850b04506e37030545084677f6be512477ea37f76d972e7
+DIST netperf-2.7.0.tar.bz2 1024430 SHA256 842af17655835c8be7203808c3393e6cb327a8067f3ed1f1053eb78b4e40375a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad WHIRLPOOL 66c81e418750d67bfa15d6f1e3cd7a3a65f1168ebb080263cf70e0f3fe023a8128bfc559249268ec8e597ef3db5acdf5509861f12f8f49c6b2586e679014e34a
 EBUILD netperf-2.6.0-r1.ebuild 1783 SHA256 ed5d725ee9383b4326246c73936a5211b8d63d4978f83312f0136fa146f823f0 SHA512 3d88d05fd77a75ab2c375a85ae9639fcde42efdca44c1c45a5fb3cf9fad9ed964b1ff3f96b12efc0881bc9ceba11ea4162fc561bbca28528123237d9e5cffac1 WHIRLPOOL 058965d2d4c973c96740c1bf0230f2f7208b82b34a485038932db2171d7fc1b12483f57d208fdab20733100743fff450986c5853508c9ce8b9b4d2e809f3e003
-MISC ChangeLog 10250 SHA256 5d025bcd9389e3dbe25010ca31144d3257d8f6e3fb75cad0d333960350545090 SHA512 82c59fc3806e9265f21ca881f797044628fef41c4fe9462e680d9107e4cfebe469d45ad30f585967074f4dfdda2845007ed81ebd7ef8dd621c29a5441ecda712 WHIRLPOOL 8f17782fbf4f5fd6ffcd09d5128ccae91311677460bdda7d4c32e486039d8f7bb4cdde889a6eb405df2bf75341a5a66e042862d3014b158c9e73b630e083f3fe
+EBUILD netperf-2.7.0.ebuild 1840 SHA256 67c52e834d9926b925c6703e6e768cc48a74127c671a290edc737b810a1e62d7 SHA512 ae706d9a989be45ebf73d1191a67738ee8801c7cb0a9d5919d1130e533e148326d2f8885030ea1839a2cd9cbe0189e32ed68b701c521ec54eb46f6c355592298 WHIRLPOOL 8e555fce1e865861c00345906093ea659dc84e3aa90a4c14692ef1f1cc81a0dd3059ae1b8a9204c7c20b446829275bcbd7ceb4566a193c01d1d85dba93ae32e2
+MISC ChangeLog 10406 SHA256 526c3eff24ed9f2f0c19e644def228b125b9e4927c8f1112cdf1680c0fecab69 SHA512 3e7c21a4d2532f6099b7dc4471fb6d1980f3c91448f02798e799a7e82a8843e66c17b8199b79f0386fee5f177a743aef2924b94bd17cc03e31dd4fa323f5569b WHIRLPOOL 3b1dda403052008ea7e1ca1f3adf42667dc29dc5eef255c9389e71ad4892d8cb48d52463893cce0180eff1223316b4c21326594a86add9e7a79a2001e8488574
 MISC metadata.xml 320 SHA256 6eed60337859b545349520e6129046903f8bc2d0a88f6fd766e2eefa7ff37c9c SHA512 d4e3e554fcf15505996ba787a0f25764a1579a5e363baba742c131f8874ba48b8e4991fb5c7ad7f5a2f3d3469ede3823cb4745787a7c4ca24e2b2826917177e9 WHIRLPOOL beece57646dca4b5bdf342129266ed690658885f6e7aea3c8cc3d6485a2fe54e91208a487bfbc97764230173888f10ad71985c99f377e2ca9586f8f81564f433
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRQtg8ACgkQVWmRsqeSphM50wCdFLG7hkh9L29c/xVuFfbxwYWE
-MYMAn1jRNuqx121bMylyO26764zl7fiy
-=r8x0
+iEYEAREIAAYFAlWzSDkACgkQVWmRsqeSphOd8ACdEWojxMXGrrutKzlRBHlwq2hE
+TboAnjMK+oF6Gm1IVmBmpb5aTQElUiAi
+=3XGE
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/netperf/files/netperf-2.7.0-includes.patch b/net-analyzer/netperf/files/netperf-2.7.0-includes.patch
new file mode 100644
index 000000000000..63c3cea40f4e
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.7.0-includes.patch
@@ -0,0 +1,22 @@
+--- a/src/net_uuid.c
++++ b/src/net_uuid.c
+@@ -28,6 +28,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <fcntl.h>
++#include <unistd.h> /* read(), close() */
+ 
+ #if defined(HAVE_INTTYPES_H)
+ #include <inttypes.h>
+--- a/src/netlib.c
++++ b/src/netlib.c
+@@ -81,6 +81,9 @@
+ #include <endian.h>
+ #endif
+ 
++#if defined(HAVE_SENDFILE)
++#include <sys/sendfile.h> /* sendfile() */
++#endif
+ 
+ #ifndef WIN32
+  /* at some point, I would like to get rid of all these "sys/"
diff --git a/net-analyzer/netperf/netperf-2.7.0.ebuild b/net-analyzer/netperf/netperf-2.7.0.ebuild
new file mode 100644
index 000000000000..004c306b402f
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.7.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.7.0.ebuild,v 1.1 2015/07/25 08:26:32 jer Exp $
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more"
+SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+HOMEPAGE="http://www.netperf.org/"
+LICENSE="netperf"
+SLOT="0"
+IUSE="demo sctp"
+
+DEPEND=">=sys-apps/sed-4"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-fix-scripts.patch \
+		"${FILESDIR}"/${PN}-2.6.0-log-dir.patch \
+		"${FILESDIR}"/${PN}-2.7.0-includes.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 \
+		|| die
+
+	# netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’
+	# nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’
+	append-cppflags -D_GNU_SOURCE
+}
+
+src_configure() {
+	econf \
+		$(use_enable demo) \
+		$(use_enable sctp)
+}
+
+src_install () {
+	default
+
+	# 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 || die
+}