gentoo resync : 04.05.2021

3 files changed, 14 insertions, 18 deletions

diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 707153b0f513..16b2d985095f 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,5 +1,5 @@
 AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-EBUILD ldns-1.7.1-r1.ebuild 2743 BLAKE2B afae1f5a1ae8c87c3e815bc38860deda37361c3a5a91104f5ab1dc8210f4854bd80016309d98e6303c97caa78fe5d577a6280957317c371c1dc2680623489469 SHA512 986db8ecf063ce1fc2ecf68b06688c5e33c8a73ebdfceb11fca4d694101bc857f648b3d6e5c5bccb8f597d264ccc2c3452af89bd6ef1c2a113608e0b65bf6f1a
-EBUILD ldns-1.7.1-r2.ebuild 2803 BLAKE2B d18f0e45a9ce0aa47f3041f20025348dfeb6bd033ab5ab36790660bc633d7d02e9f16dfcbb4b7591ba5351013d1cea33bb6c4f17d17bd10627134c3b2b68e34d SHA512 e852b19bc473d07b829bc97d0fae8fa43a6821fe28ccffff39969f2e73c4bf53c473c819e168fd2ca6f84d2b024e36a2c068eb52512f44b9c9ef9fea9a18d432
+EBUILD ldns-1.7.1-r1.ebuild 2605 BLAKE2B ec52b3b1f3aec79772249009b4f252ef0cb15f60843a05922bac6d37083412916b744442c66a83cb0f74a6d933d8e85787e58a9c1dc8ece769960c1f0eae8f9a SHA512 0026d1b4f3314117a084b8b289c0c67690e5059242a3c22fa32fffeb7e24b0b19e6ab3fcb8f9959c51fc39d85501e50721c75d2fed3e82f25c469675a49b9728
+EBUILD ldns-1.7.1-r2.ebuild 2619 BLAKE2B db380f6bf0cff98f854aa65341fb356f94a96140dff1a57914dae8a59135d24baf32bd4d5842db262c08c47b889a6650518eca9226fc7c477297f5c9b35fe2cd SHA512 3d1c99e62d814d1825be19469a5b7cdf17943c03022ae2842bbad979f26540eb43075e149e4f499e617dac04ae6f54dfd7a1b2c1f7acafe989c332f0d2b19fa2
 MISC metadata.xml 932 BLAKE2B 263b5d8d54aed15ae710d6f3d60ebe1683699c8aef9fd34fe5865ee5d1aa046ae40be8c1239b2ee3f7df57a8f8f6de57b7b693e2c4d7680fc8cfa269bd3cd832 SHA512 40c5a002f31a00ff586f3af4b1f112760a589aeec5846e5335bf39c6a6b2fd0e248dfcd62c1f4956f81f710db1f9998e0dd7b84acd658252d7006c8100631ae7
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index 78a9e8a8dfe1..95e2628a1d8e 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/3"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
+IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -20,16 +20,15 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	ecdsa? (
-		!libressl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}] )
+		>=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}]
 	)
 	ed25519? (
-		!libressl? ( >=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}] )
+		>=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}]
 	)
 	ed448? (
-		!libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}] )
+		>=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}]
 	)
-	!libressl? ( >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	>=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
@@ -48,7 +47,7 @@ pkg_setup() {
 
 multilib_src_configure() {
 	# >=openssl-1.1.0 required for dane-ta
-	if has_version "<dev-libs/openssl-1.1.0" || use libressl; then
+	if has_version "<dev-libs/openssl-1.1.0"; then
 		local dane_ta_usage="--disable-dane-ta-usage"
 	else
 		local dane_ta_usage=""
diff --git a/net-libs/ldns/ldns-1.7.1-r2.ebuild b/net-libs/ldns/ldns-1.7.1-r2.ebuild
index 9e872b955a93..ee8acea2dae4 100644
--- a/net-libs/ldns/ldns-1.7.1-r2.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r2.ebuild
@@ -12,28 +12,25 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
+IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
-	ed25519? ( !libressl )
-	ed448? ( !libressl )
 "
 
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	ecdsa? (
-		!libressl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}] )
+		>=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}]
 	)
 	ed25519? (
-		!libressl? ( >=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}] )
+		>=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}]
 	)
 	ed448? (
-		!libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}] )
+		>=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}]
 	)
-	!libressl? ( >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	>=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
@@ -52,7 +49,7 @@ pkg_setup() {
 
 multilib_src_configure() {
 	# >=openssl-1.1.0 required for dane-ta
-	if has_version "<dev-libs/openssl-1.1.0" || use libressl; then
+	if has_version "<dev-libs/openssl-1.1.0"; then
 		local dane_ta_usage="--disable-dane-ta-usage"
 	else
 		local dane_ta_usage=""