gentoo resync : 08.01.2021

8 files changed, 27 insertions, 134 deletions

diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 9717de9653f1..9ec9942c0ad5 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,16 +1,12 @@
 AUX iperf-2.0.12-ipv6.patch 856 BLAKE2B 321ef3f9f9d87243a32f9f0d0c43083670ef3737758a19138d7d18009fc6456c45fa0b0457048a84ef919576c16ae9155146a9599cb582272cb1c7a3af91a4c0 SHA512 199aee88020c7dc579ba2cbc31cdc049c883211a4a2f58d84c0a07ba6a8d0169c5f4652eb0d89db3b0176b65cb3eb19c1897caf3e414df3b9beedaa51a3f458f
 AUX iperf-2.0.14a.patch 4317 BLAKE2B 96b5894040b22c3e842b815cfe816fdcfda7b397aac6c72e9ef9d8d6d65eaff314054ad1e5c1510b9afb6dcb96051028abfebda23a9a04f5b49eaf380a4d5105 SHA512 cbe1701972b3b51ed10e448e0a769b3fac835b3e4459c81face294b21ec778d7a306c0e5ff284ea22a4b9d2fe51060f2c077b3aa96d43484ac095909da998e19
-AUX iperf-3.0.5-flags.patch 1323 BLAKE2B 14a7c9a889d5dd370553de7151f4103ba638559ee1111a2f8b4c479edd4af454652989843c8444dffcbb72206dd530cfe7204a80bba3123219f81b95acd8f1f5 SHA512 d5e106b9b6fdc704e1e8d5c87f767a912a3e643994b51f09fee34fffcf9007b3eb91adcf3b87e04f90c994e29691dff0e400fb2f13a94e68c58183a39d833403
 AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059b05b56ff66a6d93086b3100aa36db30d2e8efd3914eda148a61c379d6c35a73fd64f74d1e3d7 SHA512 49d79507064de54fbf1c5d11315b7c7be24a854968687ae0de7e0ee34c947495f4c98a5b629d68afcd414fd91cc759cda59c4f367c68137ff6e7bc4a214a6551
 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1
 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
-DIST iperf-3.6.tar.gz 602406 BLAKE2B 791355c52e587bae01560e14448b92c3e4e070afc4f311964d2577ea790886777ca1512ea349d105a83f312f795800c01e13c53b700511df14bcf2a7c28f5dda SHA512 0a1c8fd9b33369a2a018423cf33e63cfe7202ae411996f467199ae5b834ff7977d0e5c7e342f4f1b7d90c1c156453daa4dac9f94d11bb581d6d43c807538206d
 DIST iperf-3.9.tar.gz 627100 BLAKE2B c09018dc066612c61076ed4c53dd93b4dba766fbcbc359eb402055dcaa90af63e2df2b6c67ba8a0a72a17648014240dc5b355084e69550afed4d59257a224de8 SHA512 3da0939bed576a7c14baa03c996e6f407f20bfe58c4b3a36a66e74f41bd5442c0b23ab18c8eb1f2f37fd47449af533b61b658d810c68707b2b06d28894ac2035
-EBUILD iperf-2.0.13.ebuild 733 BLAKE2B 0478c8a8372a9addc365507fbef725842032f11a7d4a5ef8b2f66d0d85b1dbd16ff1296b88d894cfde6c615ac3743067850aa63ef93823b8d1f255190a127b08 SHA512 7c9e755bb87475142756ada69dbc44248446576ba0de64a69ba9207d4e5de4614557b8127eec745d03c6bce90285e67819b90aba5c91b026a31ef67b103a1f3b
-EBUILD iperf-2.0.14a.ebuild 863 BLAKE2B cee6dcc3daf33132305acfffd2f7a366b43feecf47794a747750f0eb86fd6339971466ebf09e5361a552ed641b2e8c40e1267ed6c6451d701e427ec494c6e92c SHA512 e33d133e23586a916691ed89956fe354fdd9e153dbb6087450716f6d05216dc9be64e09289b5aea0bcf24b2f8a35ff5dbaf3903310e8ca3cf55c4fc3fb8802e6
-EBUILD iperf-2.99999.99999.ebuild 729 BLAKE2B 7fbe549c0035bdc6accaccfc53a2f02a84b41ec12693a2a36a9eba172c6007dd6651a4f3cdd0121979e80d2b09dce90a3211390bf91f4dd3a18e37d831a81bbc SHA512 b444c695aa9b2ca0e498dc392dab7e56fbe95b075ca6c935508e8c654808fbead3caa73952d55438be38d7ca4a3ebddaf82841bdabd753e8610b84deadeba4b1
-EBUILD iperf-3.6.ebuild 1004 BLAKE2B cbe38230df4ee246dacfb0ca07cdfa2fb3887edc29ca106d87cc39e013682bfad690ef6a5a56b2d640758dd275c252126ac4f294a9e937bae9bcd8896ed91372 SHA512 0f3f0070eb6c21ff64a42ff1d21cf7b8dc1c739d1bf06d07495a32e43c4ba1fb85b40b13c1c1c292bdb665eaa3c0fc806ac85a96fefb280dbbf42ae98449e2da
-EBUILD iperf-3.9-r1.ebuild 979 BLAKE2B 061cea3307d243d91460f9f2fe5c3bc3bf3177b4267e67bc166b7264a7743f88101e619f51aca7d8ceffb885f569421b3b54ff0c0a9a2de9739deb6c18509e00 SHA512 4293b938d98a5720d158d63ff4b73fd01de37a98ab48ccc42d0569f889d75b7b93615dbdc54fc04f99823cc401ef632f0e9e7e038293115ea615de788d218888
-EBUILD iperf-3.99999.99999.ebuild 801 BLAKE2B 6c697e6a3693d5be60eb35ce1a271d1cf4842037e17f3a7279e76dccdf9db2547c3a222ad5d3074126d1bf522d2f06d6fa1b9f4251c1d9fa4635e727ed6ac476 SHA512 0709b7db179b7ae4ceca704ecc3c162ffabb89d6df9bd3d4f44f2d95b7b24e8b26cf89e1f06278d9dbaa55379d607307f334d441a4eae9ca3ecc474855d93357
+EBUILD iperf-2.0.14a.ebuild 860 BLAKE2B fbbabc49ddb3d4b65306ce6c900a62f6242651cf1368dac0dc1ede1acd2d07f108973eb05c55491436838502c74124af7dcc4ce06f054dd90bcb6c53042eeae5 SHA512 176d966c356dcef6a7ed792446b9814ced18bf745d7927f05bccbb10729302e430612ab594f24ac6b89e3a53226495c7ca866b2e5bb513a41bf7700896aab55f
+EBUILD iperf-2.99999.99999.ebuild 674 BLAKE2B ca210a0f4320ed023c91d6e764b836bd87dde603944626fa5a65ff59ef7e7a6c1a469c5135f4e75499256992ee54762132f7939bf617a8d5cd2e4312143f3741 SHA512 1b2259028c491938224af5ddcdecaccff0f8a72e603a46c068a7bf1e5b030c101e3f933ed71c62e2bc471c8d3278adc400a6968f9496bb034c54798ce0984252
+EBUILD iperf-3.9-r1.ebuild 972 BLAKE2B b5ef4d92222f61fed88b9579e109b4f429916065bac12e0704e06e04ae88c0289f7cdf8a24e2e98dda2db56fb0a6ce214aa929c2fe6179582f4932e442cfd663 SHA512 57ddd35949dfbb4878391b364331d89dab2dd3e6ce97c529b385822a322a4ae34094c558e4ee0e362ea8f183574372504536e8a359cd9121d66acbbcabdf4e9e
+EBUILD iperf-3.99999.99999.ebuild 797 BLAKE2B 7a617faeec980c5f3cd46e6416b0c28fe2d4eb5233937925072426621b8c064a6f666f40b73e168e29eea11c1ff4ce051f40ca7d6b358d20b5a7180dad7ac011 SHA512 93168f91782c5575be57075ea114cf3c7594f14ec8a405b62e654b949615966bdf3364366b7a769f7306197a22a073999de446f65729a5a963924fec29834465
 MISC metadata.xml 569 BLAKE2B 66b45104e695c19a4c0e9bb804e75c2f5236d7b9e6b6741df3ab40669c79374a7b01b080c3d99b21f522fd48554713cc44af543c661168aaa0a0989c8dbffeab SHA512 5c67ca8f97c48097ff3e1f8c2a738deebf2357c15f82e19f9b695da6892240a78e3fd2af265b9ebaa2f706e46d09bfc99401f0538ceebef448a911db3197b4ab
diff --git a/net-misc/iperf/files/iperf-3.0.5-flags.patch b/net-misc/iperf/files/iperf-3.0.5-flags.patch
deleted file mode 100644
index 9c11c282c339..000000000000
--- a/net-misc/iperf/files/iperf-3.0.5-flags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-* Do not inject -g
-* Do not make a profiled build
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES         = libiperf.la                                   # Build and install an iperf library
- bin_PROGRAMS            = iperf3                                        # Build and install an iperf binary
--noinst_PROGRAMS         = t_timer t_units t_uuid iperf3_profile         # Build, but don't install the test programs and a profiled version of iperf3
-+noinst_PROGRAMS         = t_timer t_units t_uuid         # Build, but don't install the test programs and a profiled version of iperf3
- include_HEADERS         = iperf_api.h # Defines the headers that get installed with the program
- 
- 
-@@ -37,14 +37,13 @@
- 
- # Specify the sources and various flags for the iperf binary
- iperf3_SOURCES          = main.c
--iperf3_CFLAGS           = -g
-+iperf3_CFLAGS           =
- iperf3_LDADD            = libiperf.la
--iperf3_LDFLAGS          = -g
-+iperf3_LDFLAGS          =
- 
- # Specify the sources and various flags for the profiled iperf binary. This
- # binary recompiles all the source files to make sure they are all profiled.
--iperf3_profile_SOURCES  = main.c \
--						  $(libiperf_la_SOURCES)
-+iperf3_profile_SOURCES  = main.c
- 
- iperf3_profile_CFLAGS   = -pg -g
- iperf3_profile_LDADD    = libiperf.la
diff --git a/net-misc/iperf/iperf-2.0.13.ebuild b/net-misc/iperf/iperf-2.0.13.ebuild
deleted file mode 100644
index 865bc2202da2..000000000000
--- a/net-misc/iperf/iperf-2.0.13.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
-HOMEPAGE="https://sourceforge.net/projects/iperf2/"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 threads debug"
-
-DOCS="INSTALL README"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.12-ipv6.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable debug debuginfo) \
-		$(use_enable ipv6) \
-		$(use_enable threads)
-}
-
-src_install() {
-	default
-	dodoc doc/*
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-misc/iperf/iperf-2.0.14a.ebuild b/net-misc/iperf/iperf-2.0.14a.ebuild
index 6c6936429add..8e383190aae1 100644
--- a/net-misc/iperf/iperf-2.0.14a.ebuild
+++ b/net-misc/iperf/iperf-2.0.14a.ebuild
@@ -2,23 +2,25 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
 HOMEPAGE="https://sourceforge.net/projects/iperf2/"
 SRC_URI="mirror://sourceforge/${PN}2/${PN}-2.0.13.tar.gz"
+S="${WORKDIR}/${PN}-2.0.13"
 
 LICENSE="HPND"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 threads debug"
 
-DOCS="INSTALL README"
+DOCS=( "INSTALL" "README" )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.12-ipv6.patch
 	"${FILESDIR}"/${P}.patch
 )
-S=${WORKDIR}/${PN}-2.0.13
 
 src_configure() {
 	econf \
@@ -33,6 +35,7 @@ src_compile() {
 
 src_install() {
 	default
+
 	dodoc doc/*
 	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.99999.99999.ebuild
index 5d1c5b42d4a4..a4087a924a8e 100644
--- a/net-misc/iperf/iperf-2.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-2.99999.99999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
@@ -10,13 +11,9 @@ EGIT_REPO_URI="https://git.code.sf.net/p/iperf2/code"
 
 LICENSE="HPND"
 SLOT="2"
-KEYWORDS=""
 IUSE="ipv6 threads debug"
 
-DOCS="INSTALL README"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.12-ipv6.patch
-)
+DOCS=( "INSTALL" "README" )
 
 src_configure() {
 	econf \
@@ -31,6 +28,7 @@ src_compile() {
 
 src_install() {
 	default
+
 	dodoc doc/*
 	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
diff --git a/net-misc/iperf/iperf-3.6.ebuild b/net-misc/iperf/iperf-3.6.ebuild
deleted file mode 100644
index 15805e3908a0..000000000000
--- a/net-misc/iperf/iperf-3.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf/"
-SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="libressl sctp static-libs"
-
-DEPEND="!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sctp? ( net-misc/lksctp-tools )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/_/}
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0.5-flags.patch )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	use sctp || export ac_cv_header_netinet_sctp_h=no
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	newconfd "${FILESDIR}"/iperf.confd iperf3
-	newinitd "${FILESDIR}"/iperf3.initd iperf3
-	prune_libtool_files
-}
diff --git a/net-misc/iperf/iperf-3.9-r1.ebuild b/net-misc/iperf/iperf-3.9-r1.ebuild
index 05b4323e7917..d53aca6f6b77 100644
--- a/net-misc/iperf/iperf-3.9-r1.ebuild
+++ b/net-misc/iperf/iperf-3.9-r1.ebuild
@@ -7,10 +7,11 @@ inherit systemd
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
 HOMEPAGE="https://github.com/esnet/iperf/"
 SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_/}"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="libressl sctp static-libs"
 
 DEPEND="
@@ -18,11 +19,9 @@ DEPEND="
 	libressl? ( dev-libs/libressl:0= )
 	sctp? ( net-misc/lksctp-tools )
 "
-RDEPEND="
-	${DEPEND}
-"
-S=${WORKDIR}/${P/_/}
-DOCS="README.md RELNOTES.md"
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.md" "RELNOTES.md" )
 
 src_configure() {
 	econf \
@@ -32,6 +31,7 @@ src_configure() {
 
 src_install() {
 	default
+
 	newconfd "${FILESDIR}"/iperf.confd iperf3
 	newinitd "${FILESDIR}"/iperf3.initd iperf3
 	systemd_dounit contrib/iperf3.service
diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild
index 14dfc1e065cd..d209c9b4ed3d 100644
--- a/net-misc/iperf/iperf-3.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-3.99999.99999.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools git-r3
 
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
 HOMEPAGE="https://github.com/esnet/iperf/"
 EGIT_REPO_URI="https://github.com/esnet/iperf/"
+S="${WORKDIR}/${P/_/}"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS=""
 IUSE="libressl sctp static-libs"
 
 DEPEND="
@@ -18,11 +19,9 @@ DEPEND="
 	libressl? ( dev-libs/libressl:0= )
 	sctp? ( net-misc/lksctp-tools )
 "
-RDEPEND="
-	${DEPEND}
-"
-S=${WORKDIR}/${P/_/}
-DOCS="README.md RELNOTES.md"
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.md" "RELNOTES.md" )
 
 src_configure() {
 	econf \
@@ -32,6 +31,7 @@ src_configure() {
 
 src_install() {
 	default
+
 	newconfd "${FILESDIR}"/iperf.confd iperf3
 	newinitd "${FILESDIR}"/iperf3.initd iperf3
 	find "${ED}" -name '*.la' -delete || die