gentoo resync : 21.06.2020

5 files changed, 16 insertions, 19 deletions

diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index c791ac41daaa..8f18d5b5c39a 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -12,7 +12,7 @@ EBUILD iperf-2.0.13.ebuild 743 BLAKE2B f4b9a4c6829ee8633c462cbfe5e1461ee3ec2d7b8
 EBUILD iperf-2.0.14a.ebuild 809 BLAKE2B 5a675f50e83bff8d761c2925401ec1d134ac42da79b7d13eb0ca6b8e48786b9d579592400a08e8df22e35360d2067f3fbdb3f805c2f38490462d0ac7f3da5db8 SHA512 d78c211a9de6db728b9456d34825076004ea71cc0fbbed53c63f0de62383c3385230ecef15f2670bf7802d6e01ad50ea6e1a087bc61dd60812ff409a5e8aec87
 EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 6d99e56fcace17bebff7791c0f642d76b5723126091fb7e2583510a5e685c47b168252ed3cc2f0589da0093064425ff6317dc35e4c1ed5a3edbba1bcd87e7d94 SHA512 7f50ca3896efa0d65e69711cd8dd1ce532e3481cb3da77a7522cf66171f46c29195d0c12b396c1c69a1af3c8133ce454ad3e7b8562759f8fa282d886b905ac28
 EBUILD iperf-3.6.ebuild 1014 BLAKE2B 803a8ddecb82cb8cd33b5e16c53db46d8fc6d8b4ba8bf6ed0412a2be9ee0ba4f97cea7b576a3ea989f04fe1eddd3cceb0066e8d0882c85f19861cc13eead41f3 SHA512 09d1d479b898ffc662fc6108908bcf84a596365f13017597246a3476ec02195ca69c49a6d3d053b771040d6289d3a36add2c328ed6ec007bb0f973b1b58dc2a5
-EBUILD iperf-3.7.ebuild 985 BLAKE2B 98d50eb4b100aef861017fe6cce8ff3513598095941e139df5d0f7fd7c59b5425cce4906e0d946b8ee6cba36214b827fde3f95dd4032cb55ac47a9a2c1d9eba3 SHA512 40ce051b5e9fa0f94245e9ac41da13d6f953d499158df675d042e3b5a0b994d6c7321caeaacafd40877982b30f825eb7c17d931764a106ff4d1d572bddb9b571
-EBUILD iperf-3.8.1.ebuild 975 BLAKE2B 9179c5b3879ca15b110dfbafd9f3bd308abd1362c891c5afa494dbd55805be513c98a23ccd390ed7161a99f071ae44013e87a1daa8db7a91d9b89bf4ee18eb8a SHA512 2aaf7b025a881a58f72b1903fb53998cb9f1b890276d6ef980c20b437d44f9ce65018af456c41cb49f032f92b101eac8e3562bd2ef04c352802d14843e9b57a3
-EBUILD iperf-3.99999.99999.ebuild 831 BLAKE2B 14b3ad32e35b19fd52f3f4dd31d09e4de30300d200a46e3e32edbfac2ed70a0c93ef2270483327583d61bbb456b61ea73f34c0307c3435c2168f9c442ff24c2d SHA512 aa529bc4e36feff38054349e61338d1152bbfa379ca0eea9d77f8b339ce53ab5c93e10ced57ffc40d1515c95b87532f7548434468c56e5a059a5a873c176b1de
-MISC metadata.xml 544 BLAKE2B 8713c1d580ce8846e9d6d6c3920b473511808a2c9f14fe7b321964d45a72538905dcd18d3ed95f4f67580987b83db2d80cc00437b27d122281d7251778a21a2c SHA512 2a950c2d89b316964f0feb58f58748a1455a9e465e5fc0d0fbb1b4946c5571cf919c3ddcd3ba6040f79521d14cc76ac7ea9e97a7daf0f4f5b74425b2d78f422b
+EBUILD iperf-3.7.ebuild 947 BLAKE2B f292caa6b05da89f13a0465ce03a04158cd94cb626607bb62dd119af16f9ba08bf714acd1f91a948c857aa66e5f21023bcac1fef8d635171f5393ec407d6f068 SHA512 1bece2a1ce119fa2b2bf9c34f1093f61b233726539bc885c6d078a0ed2641cb009b7a521bbad0eeb958e11bc569249efb0adfce8db2af7cb6cbfa833ec4f64ea
+EBUILD iperf-3.8.1.ebuild 937 BLAKE2B 6ceb1d1d47cfe96fb2cbb74ae4a1f422eaf4260d90c162abdb6cbbbb674d80e989b6787c1978917dbb5318f1ce7e8e28fdd1b39caeddfb5421a0e4f966600a25 SHA512 50eefade254d88d80fcbbade5a26918087704b7f8c715d40303602921ca9bc04ab562472180e3f6ba60881f083ffcc3c9a53346cc747b0963fa756ebfc935851
+EBUILD iperf-3.99999.99999.ebuild 801 BLAKE2B 6c697e6a3693d5be60eb35ce1a271d1cf4842037e17f3a7279e76dccdf9db2547c3a222ad5d3074126d1bf522d2f06d6fa1b9f4251c1d9fa4635e727ed6ac476 SHA512 0709b7db179b7ae4ceca704ecc3c162ffabb89d6df9bd3d4f44f2d95b7b24e8b26cf89e1f06278d9dbaa55379d607307f334d441a4eae9ca3ecc474855d93357
+MISC metadata.xml 455 BLAKE2B 63c2a5eb313e525820e470ca060751f9f7486147d30b59fc135cfbc1235814df004b1d0cb741842ce2380ff69e938d0105ef5a37a794c1b523b246a0c75e2613 SHA512 36ebc27e7e4b2a3577a4c532b19d0b1e61a3261a59510453689772d568972796b32acafc161f9dc8483602105ea804fbb43e9a445fd44e7869278c19cba42b93
diff --git a/net-misc/iperf/iperf-3.7.ebuild b/net-misc/iperf/iperf-3.7.ebuild
index 1f4e52a28f0c..d4df9907c185 100644
--- a/net-misc/iperf/iperf-3.7.ebuild
+++ b/net-misc/iperf/iperf-3.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 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 ~m68k-mint"
-IUSE="libressl profiling sctp static-libs"
+IUSE="libressl sctp static-libs"
 
 DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
@@ -24,7 +24,6 @@ S=${WORKDIR}/${P/_/}
 src_configure() {
 	use sctp || export ac_cv_header_netinet_sctp_h=no
 	econf \
-		$(use_enable profiling) \
 		$(use_enable static-libs static)
 }
 
diff --git a/net-misc/iperf/iperf-3.8.1.ebuild b/net-misc/iperf/iperf-3.8.1.ebuild
index cb655f6b4782..eaf20a65cee9 100644
--- a/net-misc/iperf/iperf-3.8.1.ebuild
+++ b/net-misc/iperf/iperf-3.8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 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 ~m68k-mint"
-IUSE="libressl profiling sctp static-libs"
+IUSE="libressl sctp static-libs"
 
 DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
@@ -25,7 +25,6 @@ DOCS="README.md RELNOTES.md"
 
 src_configure() {
 	econf \
-		$(use_enable profiling) \
 		$(use_enable static-libs static) \
 		$(use_with sctp)
 }
diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild
index f50078047e0e..14dfc1e065cd 100644
--- a/net-misc/iperf/iperf-3.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-3.99999.99999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils git-r3 ltprune
+EAPI=7
+inherit autotools git-r3
 
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
 HOMEPAGE="https://github.com/esnet/iperf/"
@@ -11,26 +11,28 @@ EGIT_REPO_URI="https://github.com/esnet/iperf/"
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS=""
-IUSE="libressl profiling sctp static-libs"
+IUSE="libressl sctp static-libs"
 
 DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	sctp? ( net-misc/lksctp-tools )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+"
 S=${WORKDIR}/${P/_/}
+DOCS="README.md RELNOTES.md"
 
 src_configure() {
-	use sctp || export ac_cv_header_netinet_sctp_h=no
 	econf \
-		$(use_enable profiling) \
-		$(use_enable static-libs static)
+		$(use_enable static-libs static) \
+		$(use_with sctp)
 }
 
 src_install() {
 	default
 	newconfd "${FILESDIR}"/iperf.confd iperf3
 	newinitd "${FILESDIR}"/iperf3.initd iperf3
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
index 6941792a1185..a18ccf22423a 100644
--- a/net-misc/iperf/metadata.xml
+++ b/net-misc/iperf/metadata.xml
@@ -10,7 +10,4 @@
 <remote-id type="github">esnet/iperf</remote-id>
 <remote-id type="sourceforge">iperf</remote-id>
 </upstream>
-<use>
-<flag name='profiling'>Install profiled iperf3 binary iperf3_profile</flag>
-</use>
 </pkgmetadata>