gentoo resync : 07.07.2018

5 files changed, 2 insertions, 152 deletions

diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index cf969eb335a9..b857dc318630 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -1,15 +1,11 @@
 AUX netperf-2.2-conf 103 BLAKE2B 330afd42dc9d4ecacf6d0a4e2d5fdb620100c5d664df4238edb01c3e3e191f96d045af5e22e0c4ec18d1c34265828badf1a55478a8e51a0e7bbe906249c0abb5 SHA512 88a0d19c59a054071f472e62e6afd8c5fe37a77802dedea3adc82df0701f280c0ad8b5410e7fab74302861bc45920d38d576cfea1d8baa01cd5739801acb3b60
-AUX netperf-2.2-init 434 BLAKE2B e320c63f02801316342b505b181d06bbcb87e0bb329eae3acad50c60fb11d3a07dc3dbc94e1f10daf8085e84f8feb41a2e6a24a4491674912f2ec0655f46b1c3 SHA512 ec09907d7e3bf9c38e6d142dd605c71620b790ece71685a347906fe1de103a6317345ab9181a618a14173380b155ceaa6a629fe3e33b571f038bde9074dfc112
 AUX netperf-2.6.0-log-dir.patch 261 BLAKE2B a0d4aeb9137bd9d33ee63e0a7eb704b0a18d3f50add352e9bfc2c483ecffbd4749c37412b17f8f9d84b8f59a0b6afd647a01d415e3ffe6f018a7bffdd706466f SHA512 108ab43c36041df5051cb1a130d33e42589c020dac296230a325ee4e1805ea2b3bbcb5cd1438cd4abe4d922ff5536410be9364eaad9044a3181c9acdc7b91bb6
 AUX netperf-2.7.0-includes.patch 468 BLAKE2B 5e566c665d2d95b11015c9d38f10ec2b849251c8be321edf6decda7052b315e60d4525ab421373751f0966cbca970bfafd31ddeee8ec398cdf051a41eec1d0ff SHA512 aec77b7a97e83a93d847f0935bd599d7497b3b749bb0cdb722d96cb49535b3eef9b7b9f60388f5cb2de726b4084abd9cd48614d73bc63b34c7bc0fcfffb0fd3f
 AUX netperf-2.7.0-init 440 BLAKE2B 368f56d7b2d7b2648368ba745add3dd98dd43ee028897cd6cb324affcbaf16a8637615a1ac416d32f035a23d7510a0ca962285292c5bb935ec8abdde259b0d0e SHA512 ed5a56d77f47aa01545be64104decc2893179c80094c50bb023b96b751cb5aa34ec8f18d606b0570bef47037bedf415250d9b55157f5e24c97e246f6f9643a36
 AUX netperf-2.7.0-inline.patch 974 BLAKE2B 4e3174761db0b72656e22e361841bbb887da6f26fa8e48d14934e658c42e3cf36b4e237d6a9e89f659258dae539879482d90727cb5a6aefb957c118af26c1a0c SHA512 9b9c542724456b49ea51c29d6b807edf938db105adfff57a06a9fdc76c5259019450d9ee674ea4e797b973542ea43377ee83332d391bcf14913e395a76a3d76c
 AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f782455876766399e7edc5625cd6ff0c740c3268aee4443d844ef6b28da69144c039bfdc63519a7279d2cc1ad433 SHA512 e39bfcec70da00fa886b1f8389f54eca6bac83fc8ff48a72427fcd30c3f605e4ec2d01d2f7161ae0fa26bd56283c03593caf756db7d808f0e3e4d3a90d50f1fc
 AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a
-DIST netperf-2.6.0.tar.bz2 1032953 BLAKE2B c13e6c49b975273e2de97a32e1fbcc2265639b450b532f67aa07cf34a86ae23a34c1e4f90ad1d51c49e8aae5fdfcf97671bcd5969a0fd1bfc4333dd37021da88 SHA512 b3921d2e887088b14a8bbe5ace9b1cc0c8b29951eeaa7857ce3f324933397c8ff6b56eeacfe755181ce1a56c982fe431955f6db55bd20f2343324e22ee23c9b3
 DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
-EBUILD netperf-2.6.0-r1.ebuild 1666 BLAKE2B 30d4e0257d2c633d4650c42ee71d8848371074f61d71c1dc84d0b94d9a44553269224b1c11d26754c372b5db299445efd98aea6da3312cd7406f58f06fba2c24 SHA512 59808e4719f87cdff58a090c8669f481d4c850a08ed8023e5fd4be837b23f7faa7b99c8f91dca300586e1d70cc20d1a727c433fe264b26c6b68916b9f0e68194
 EBUILD netperf-2.7.0-r1.ebuild 1877 BLAKE2B c117075369a78b86c82e0edd569696a23c267b57f971baa2d37bbf12e2235904f1e53290e59a796657a46fda64e0b57b355680c17d7332b238011ef1d1a9f152 SHA512 a1cbc73bf527e97afdfa88b3644d2f459138363fc8232a5a657b502214fd0d3eb0b48579831df7c56c07ec954b41724ee7cd1555a74d9229ff796cb50e7c7e6f
-EBUILD netperf-2.7.0-r2.ebuild 1924 BLAKE2B 79d4095a72c5a0c49f89b4a64e378dc56d51832123edfeacf6ef098d181be693f04d9e27ea4500922d1aa670e30c8f36dcc843fd7cef3740a9c3d0ff86ddbe62 SHA512 eadbec36ac38e99e0d8897fbb536125448a95ab2ce221ee25b4c5236bc997d553941b30f15ce5db7a5a5cd010f1fba8cca823c631783ad5f08fbfb345a243ea9
-EBUILD netperf-2.7.0.ebuild 1727 BLAKE2B b53213319cb0d24dc783d595d5938ad247dcf29d52acf63d045df6a9112f735dd8e08e04f3fb26fbeef3c2ecf44cdbd2d91b3fbd4086971347fdb003b99cde2f SHA512 71cc28a007eb990c0325ab9592f5f7478ffd2b7484cc2ab4da4cab06e1f7971f1688b401b2951f7dde5dd3b1bea2cf58340b1e592b3d0738509cb48cab0da716
+EBUILD netperf-2.7.0-r2.ebuild 1921 BLAKE2B c2bbe4ed891f75bbae93b535705802e505843ce4fb9ce1e119f08b9a1ea112d803b5fbd4af272360eeaeb70512d5bb524949df663ced9139dec74f4293407d3a SHA512 6e4a2b2779fbe8d551e886c42e9e977efe143ab3d7e504bb287c47fed2e17dbfe6943aecee4c4b4bcd7aa1d485bd5466aefd47118d5e589a32866a013aafed7d
 MISC metadata.xml 775 BLAKE2B 7f097a5c5390a88319c63497486a12367b5b89ac7979e22271581f6c9b6eaa5c69209f4d3cc82c57e8a3b0d0c0469378cd73579447c56d9991379af46b7fca1d SHA512 c1aaecd84a7fe73d798842ed1c117357809069f3f8c30a6920abf6641c46a5885e170dcecf7f2172d376b7f010e6dd07c47e233f15289c5de432550f1d05845e
diff --git a/net-analyzer/netperf/files/netperf-2.2-init b/net-analyzer/netperf/files/netperf-2.2-init
deleted file mode 100644
index cd2fb35cdd27..000000000000
--- a/net-analyzer/netperf/files/netperf-2.2-init
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-#
-# init.d script for net-analyzer/netperf's netserver
-#
-
-depend() {
-    use net
-}
-
-start() {
-    ebegin 'Starting netperf server (netserver)'
-    start-stop-daemon --start --quiet --user nobody \
-        --exec /usr/sbin/netserver -- ${NETSERVER_ARGS} >/dev/null
-    eend $?
-}
-
-stop() {
-    ebegin 'Stopping netperf server (netserver)'
-    start-stop-daemon --stop --quiet --exec /usr/sbin/netserver
-    eend $?
-}
diff --git a/net-analyzer/netperf/netperf-2.6.0-r1.ebuild b/net-analyzer/netperf/netperf-2.6.0-r1.ebuild
deleted file mode 100644
index 869d878465b5..000000000000
--- a/net-analyzer/netperf/netperf-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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}"/${P}-log-dir.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
-}
diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
index 5d78d14f20a2..a0d87cf67300 100644
--- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
@@ -6,7 +6,7 @@ inherit eutils flag-o-matic user
 
 DESCRIPTION="Network performance benchmark"
 SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
-KEYWORDS="alpha ~amd64 arm64 ~hppa ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="alpha ~amd64 arm64 ~hppa ia64 ppc ppc64 sparc x86"
 
 HOMEPAGE="http://www.netperf.org/"
 LICENSE="netperf"
diff --git a/net-analyzer/netperf/netperf-2.7.0.ebuild b/net-analyzer/netperf/netperf-2.7.0.ebuild
deleted file mode 100644
index 7c1622c9fe97..000000000000
--- a/net-analyzer/netperf/netperf-2.7.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-}