gentoo resync : 27.10.2018

4 files changed, 18 insertions, 12 deletions

diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 529411d676a7..f8487c267544 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -14,7 +14,7 @@ EBUILD iperf-2.0.12.ebuild 752 BLAKE2B 72acd92d2cb33a31953cd024efe80b65527ec1808
 EBUILD iperf-2.0.9.ebuild 695 BLAKE2B 25720f5cd6b51839994ad64b099e13cb22b2347154e9cae057506ef40d0e1dcd54ef2c2e4c42f8e1efef2a093b26eed41695be04e80a69f2c2701d139e9e0c9a SHA512 21438d1baed959f6203d23a62a0040ae2ceb289ffaa5b56a1e5d3a542d31d743041d5d6bd7c057c4bbb63086545a62bc7546996d90cde951bd2e4e116c948b7e
 EBUILD iperf-2.99999.99999.ebuild 714 BLAKE2B 084ab539cbc2937bcdeb0aa0cf8932e630c1ff4bfd828649f528240dd75800497b770690cb059bc829c6a80ad106485ca748e70887a32f74b065cd146e5c2033 SHA512 0a55b9adacba8a42e7ab42d78e5af49fc03d5ab5409ced8ea35e8a61afe1a2c3eccf098916615157f2cef057f6e2e6f8c548bc8e6b6b495b47ca9d84be7b0f30
 EBUILD iperf-3.1.3.ebuild 888 BLAKE2B 5e9d333b068de8320118a8253d85482efdbb232704f5ee193212fb7854b77820cbdbe1ff4cb77cc8941a07f5079143128743653e357ba1477c84ad607200eef3 SHA512 2dd6dfd2affb6d429c2a91f674e52390e1039c98df381e1ceb93f837b85631a27b615a7713d39c3797a8f873465c568214d717f92010f473792c17ff91683999
-EBUILD iperf-3.5.ebuild 924 BLAKE2B 8c75107d844f00d4ddd50c4bff0c85748db724b54e0ffd273f6faf4f509b733a7ca014390ca0755f7ef65c1a3ddfb62f1681629bc7e20722feb892bbf4359d36 SHA512 ec4a8c4d8d77a3e0343e87cd430a53169a5892c729effb88ad2f4acf8bfa1a66cb65dd1aec8970a4c7b89c911f48563e297e094acedad045b061150123e81feb
-EBUILD iperf-3.6.ebuild 924 BLAKE2B 8c75107d844f00d4ddd50c4bff0c85748db724b54e0ffd273f6faf4f509b733a7ca014390ca0755f7ef65c1a3ddfb62f1681629bc7e20722feb892bbf4359d36 SHA512 ec4a8c4d8d77a3e0343e87cd430a53169a5892c729effb88ad2f4acf8bfa1a66cb65dd1aec8970a4c7b89c911f48563e297e094acedad045b061150123e81feb
-EBUILD iperf-3.99999.99999.ebuild 723 BLAKE2B 938e5f3ee26410c5914d036992f386ddba66dde5994fb8f039ba10975941f054f1b6b656861240e120d5d17f15155800587ba224c418a741fa2319559a02e505 SHA512 4cde5fabfb9aab82c50c4ced937abf8da0dda5fbe40fd70d1ceb7bbcf56732d6555e5fc07e76d74bd270cdb0790d2ae24403c8ae2c8f59c622a2ce4137b4b37c
+EBUILD iperf-3.5.ebuild 1002 BLAKE2B f8a05469d2772f67559f2f4a09fb225b99fc27a84edb0dff12f945bd20a6996ed646dc16a4a0e9f03e69175ca29664bbf84b5a508f4c0d5e099e94435b890364 SHA512 f9610e0701a08a2e91591b42c48f66de0ffa265f0d6a9a30684046a90ea9e4d2ffe7584d90e5ed63dea945c045f10dc37b5ede1b545a50eafb12568147d17dcf
+EBUILD iperf-3.6.ebuild 1002 BLAKE2B f8a05469d2772f67559f2f4a09fb225b99fc27a84edb0dff12f945bd20a6996ed646dc16a4a0e9f03e69175ca29664bbf84b5a508f4c0d5e099e94435b890364 SHA512 f9610e0701a08a2e91591b42c48f66de0ffa265f0d6a9a30684046a90ea9e4d2ffe7584d90e5ed63dea945c045f10dc37b5ede1b545a50eafb12568147d17dcf
+EBUILD iperf-3.99999.99999.ebuild 801 BLAKE2B 765ba8ce4ef65d758d9e2e810e9c9751f114c50aa982e9fb0e4f51715e1c59e812f543411ac2e501daff0d7c7f754370aa9b2931fbe8715c1ce5466c4310bfc9 SHA512 19be0032e7db5ff49aa0087317c183dcb629b97c3a27b7250501ca5cf8580053b6a6aa90a80506e35076e870faddb27e0c4f99581c9ece028e296a594310b405
 MISC metadata.xml 469 BLAKE2B b85e0e29a4d36b1dc3757d9388aa8d4f563596c59a239694ca23a4863068e11c96b2ea72c71c9539c164be36698649f88666f0b3ddbf723f8c0d324721b1aee9 SHA512 5a153502b0b521fd82c5e096c80be2de09e2cfb17e638fe1a265e9cecb3eed109b4973541d0f326e7a181cb6b9051314478fac1087b476d712a954b848c53580
diff --git a/net-misc/iperf/iperf-3.5.ebuild b/net-misc/iperf/iperf-3.5.ebuild
index 3eb759c70f2d..75c8a88d69d8 100644
--- a/net-misc/iperf/iperf-3.5.ebuild
+++ b/net-misc/iperf/iperf-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,11 @@ SRC_URI="${HOMEPAGE}archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-IUSE="sctp static-libs"
+IUSE="libressl sctp static-libs"
 
-DEPEND="sctp? ( net-misc/lksctp-tools )"
+DEPEND="!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sctp? ( net-misc/lksctp-tools )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P/_/}
diff --git a/net-misc/iperf/iperf-3.6.ebuild b/net-misc/iperf/iperf-3.6.ebuild
index 3eb759c70f2d..75c8a88d69d8 100644
--- a/net-misc/iperf/iperf-3.6.ebuild
+++ b/net-misc/iperf/iperf-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,11 @@ SRC_URI="${HOMEPAGE}archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-IUSE="sctp static-libs"
+IUSE="libressl sctp static-libs"
 
-DEPEND="sctp? ( net-misc/lksctp-tools )"
+DEPEND="!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sctp? ( net-misc/lksctp-tools )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P/_/}
diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild
index 605135d8e2e8..27de50197b1e 100644
--- a/net-misc/iperf/iperf-3.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-3.99999.99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,11 @@ EGIT_REPO_URI="${HOMEPAGE}"
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS=""
-IUSE="profiling sctp static-libs"
+IUSE="libressl profiling sctp static-libs"
 
-DEPEND="sctp? ( net-misc/lksctp-tools )"
+DEPEND="!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sctp? ( net-misc/lksctp-tools )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P/_/}