gentoo resync : 28.04.2021

3 files changed, 20 insertions, 20 deletions

diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index 9ba9a9f69c6c..d37121cccec6 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -2,9 +2,9 @@ AUX netperf-2.2-conf 103 BLAKE2B 330afd42dc9d4ecacf6d0a4e2d5fdb620100c5d664df423
 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-inline.patch 902 BLAKE2B d31b677da87044cc87779013e3c12b88ea82e93e7bc7c06d113acf785207861ae84c2ac232b6731d65a623b1b5d8b6f41477d40951030a84b996e3029abb5970 SHA512 0defbdc27edbd32a615f335f79380d8f9bdc03a400b8f18a12e1c61a5c7b2d05449c2ec040b80dece7f337e9a447f270b34b85fb81ed49b16d3277531bda0bbf
 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-r2.ebuild 1943 BLAKE2B 09ab67995b1b46e7d1295aad62e05765c84ccde2bbd8cda9b24794942719b41f0c56a1167a2c2f3330186f53b23e4a33ac0bb34bc4874677d72d3534f5344026 SHA512 b1dacc7084488ca34af4771d9d6c3b07c43b003625c66108df54ef775410e2ec9fbbf452572c0920fa13e4b9b6aba3e0ed3dd24e78e12de8390a3aa3571caaf3
+EBUILD netperf-2.7.0-r2.ebuild 1898 BLAKE2B 6910a1658dc4576594b8df29a0fc4280cde378832330afe791fec3c1b50c58b0669a2a29f1c08a39573ca0d27076b4b5bdfac79b3b89b7238f43929add57873c SHA512 1e7bf240e650e62a2b7e59570a1aa04ea67e79e6895a9b88b6ae1ad24df44c44d224dac6456e2ab4ffa43efe511c8329ceb127574343a655587ca0e31aba8f47
 MISC metadata.xml 855 BLAKE2B 20c4b64a1abe9e4f83a56e759b9d7cfb161886dd06a4672dc96828a80d3f91c064665138a87c263815c217091a869e7ced811fca059405bf047de337814c52a5 SHA512 628efc289da10094d7fab1c0c47e8acd67260fffc036e2d4eaa1430e1b91fd2610d681134211cff4dcd5f84858199a4bbf36aaaa73f3e507bef1114a64b4e588
diff --git a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
index eb8c09b84695..eb89d34f3e8b 100644
--- a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
+++ b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
@@ -1,6 +1,6 @@
 # Copyright Seblu 2015
---- a/src/netlib.c	2015-08-04 20:30:43.449468815 +0200
-+++ b/src/netlib.c	2015-08-04 20:31:40.317792002 +0200
+--- a/src/netlib.c
++++ b/src/netlib.c
 @@ -3997,11 +3997,7 @@
    }
  }
diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
index ac656a889e76..6a56ebb79e3c 100644
--- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic user
+EAPI=7
+
+inherit flag-o-matic user
 
 DESCRIPTION="Network performance benchmark"
 SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
@@ -13,7 +14,13 @@ LICENSE="netperf"
 SLOT="0"
 IUSE="demo sctp"
 
-DEPEND=">=sys-apps/sed-4"
+PATCHES=(
+	"${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
+	"${FILESDIR}"/${PN}-2.7.0-inline.patch
+)
 
 pkg_setup() {
 	enewuser netperf
@@ -21,13 +28,6 @@ pkg_setup() {
 }
 
 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 \
-		"${FILESDIR}"/${PN}-2.7.0-inline.patch
-
 	# Fixing paths in scripts
 	sed -i \
 		-e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
@@ -39,7 +39,7 @@ src_prepare() {
 		doc/examples/udp_stream_script \
 		|| die
 
-	eapply_user
+	default
 }
 
 src_configure() {
@@ -57,10 +57,10 @@ src_configure() {
 src_install() {
 	default
 
-	# move netserver into sbin as we had it before 2.4 was released with its
+	# 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
+	mv "${ED}"/usr/{bin,sbin}/netserver || die
 
 	# init.d / conf.d
 	newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf
@@ -73,6 +73,6 @@ src_install() {
 	# 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
+	# Scripts no longer get installed by einstall
+	cp doc/examples/*_script "${ED}"/usr/share/doc/${PF}/examples || die
 }