gentoo resync : 04.08.2018

3 files changed, 2 insertions, 78 deletions

diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index cad0a4ca48ad..9db300a11e26 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -6,6 +6,5 @@ AUX netperf-2.7.0-inline.patch 974 BLAKE2B 4e3174761db0b72656e22e361841bbb887da6
 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.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
-EBUILD netperf-2.7.0-r1.ebuild 1877 BLAKE2B c117075369a78b86c82e0edd569696a23c267b57f971baa2d37bbf12e2235904f1e53290e59a796657a46fda64e0b57b355680c17d7332b238011ef1d1a9f152 SHA512 a1cbc73bf527e97afdfa88b3644d2f459138363fc8232a5a657b502214fd0d3eb0b48579831df7c56c07ec954b41724ee7cd1555a74d9229ff796cb50e7c7e6f
-EBUILD netperf-2.7.0-r2.ebuild 1920 BLAKE2B 786d469ad8be710d5e1df43469e9a9a3e0dcc4b82295d1cad84fed00ca40a16ab6535e410d38ccbeb9d01d1bac72a4a11a01d14aeed37e3fcfc390cfb4963d7c SHA512 0dfc5521c78b597ea0f2f481ff198c1c735fd15a3b49f07bf9df6f1232ce2627bb1e99adcd68f844b0fbf25638c4002a92aba6f7aa747b0c6fc9ddbe22e50627
+EBUILD netperf-2.7.0-r2.ebuild 1919 BLAKE2B 21aae85ceff1b2d4728ee3a984c28796b2848e7a65de9513cd5a088ac9e747aa65370f6700ddf7f3f2f09c20b322fd3590e4894cb4459b5301cecebb84bf74f3 SHA512 b511f47c363bf844415c281fe664b7b96898eefbadcaf87189933a83dd17e349e7ddd7f8af2ee9a91c0cfb6919bdbec4a2b63a25829cfdf3817812661ce1a734
 MISC metadata.xml 775 BLAKE2B 7f097a5c5390a88319c63497486a12367b5b89ac7979e22271581f6c9b6eaa5c69209f4d3cc82c57e8a3b0d0c0469378cd73579447c56d9991379af46b7fca1d SHA512 c1aaecd84a7fe73d798842ed1c117357809069f3f8c30a6920abf6641c46a5885e170dcecf7f2172d376b7f010e6dd07c47e233f15289c5de432550f1d05845e
diff --git a/net-analyzer/netperf/netperf-2.7.0-r1.ebuild b/net-analyzer/netperf/netperf-2.7.0-r1.ebuild
deleted file mode 100644
index f1fa2ad05ae9..000000000000
--- a/net-analyzer/netperf/netperf-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-
-HOMEPAGE="http://www.netperf.org/"
-LICENSE="netperf"
-SLOT="0"
-IUSE="demo sctp"
-
-DEPEND=">=sys-apps/sed-4"
-
-pkg_setup() {
-	enewuser netperf
-	enewgroup netperf
-}
-
-src_prepare() {
-	eapply \
-		"${FILESDIR}"/${PN}-fix-scripts.patch \
-		"${FILESDIR}"/${PN}-2.6.0-log-dir.patch \
-		"${FILESDIR}"/${PN}-2.7.0-includes.patch \
-		"${FILESDIR}"/${PN}-2.7.0-space.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
-
-	eapply_user
-}
-
-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.7.0-init netperf
-	newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
-
-	keepdir /var/log/${PN}
-	fowners netperf:netperf /var/log/${PN}
-	fperms 0755 /var/log/${PN}
-
-	# 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 435bed3f65b2..99c1d045b092 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"