gentoo resync : 04.05.2021

30 files changed, 59 insertions, 88 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b827e85621c2..a3b33695198b 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 1f14d391b663..88f38c31476c 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,5 +1,5 @@
 DIST bind-9.16.12.tar.xz 5017756 BLAKE2B e48fe94432a93df1f7f61b2d7ecb596e82a156deab3ee8dd3f5f11139028d42f839c483200ca6954076dfb68e768353a0ceb0d360d9e1dff3e36cf5ad06e8c43 SHA512 001613bd3c8bfc73d60bf3c053b233233a981132206e1ae5847820c5416ba0d65b0e026817ea3a718c7d3745c28a8de8dd9fb4355344955bead7bc2e1433e074
 DIST bind-9.16.13.tar.xz 5028340 BLAKE2B 7208d6361f84472a5549fd8d521878b1481c0930b1181fa79c99b9f7e7d3f736c120f0ca416e9aecca77015568428551937ee77449f441e9cd881779123e51b7 SHA512 1f3c8f54dd2c9e18cd9b67cfebb645d0a8e8f566add07fc4690cb8820bf81640c33b2b0685cb8be095e0f9ac84b2cf78176aea841a30c27d547b569b8353b07b
-EBUILD bind-tools-9.16.12.ebuild 3456 BLAKE2B 577787845f7cd50c9e13b9d61ed0635ab504f58c26ccdc04639793f9aee427369baa57e44d10fe23454f3cfa072abba1156ad2042827d1e93bbd05cebcdb50e8 SHA512 735208c923d7f2c6d751318138a0ba7f95692073cc41ebb9f875cc6c96faa6a9a37fd38b43376b8c015a3dcaa9f7d81146bb3e36ce69722282048717f48a2e10
-EBUILD bind-tools-9.16.13.ebuild 3581 BLAKE2B 62ed8b481120428e6af21bd8e03953c1e9b4e421e566c0dae9f0d165e4285e00c37fa601ddd9dcb62b8c68b5e9a50bc709690f42ccb6c954b65c23127d176796 SHA512 318772ae3fecc7e49c2a3731ceea7648c1ae4bd9fa901533847a3af330081b731592e09d7966cbe53d34d56506c9b3c0436287bfddb66a4c684fb574ee7b3ec5
+EBUILD bind-tools-9.16.12.ebuild 3397 BLAKE2B beb66258b1045a35f74a7dfd4f52bb453ad5698a3fc2c61ae0d4e9276adca1ee7112d8e680f251c47861119cce6b48ef57b2f513c87d1d0b37c7e81e3e745774 SHA512 d4dfc28973e12410e1e41f8922239adc6e7efe7638b3486d2b48fb2aaee23e389efd22d2a2757e2f597df3d89419e521c765b0e641687e5eea9d1a7a73231db3
+EBUILD bind-tools-9.16.13.ebuild 3522 BLAKE2B 5e8e389e6325da5b3a69a86e54139b4785898f3019f68d0caa48ad8b3fb02bf37bc8a1840c2f3bf86da4ffb44dbd6a258ffb2507692b39e7b51f8fa4e5bf2fea SHA512 278e11cb5a52660cd14ddd029c622f8dd3739f24252ce0945a3cb8b99ca8f213ed819ea873600b0220c49073d8081340993461cd8efc9df925d952df3770bf2f
 MISC metadata.xml 423 BLAKE2B 210c34f4faa1fa53d06d31b1bb401711c82102eeb319739ac85dd80d118a2cf6af7b3145e31a942b41afa56633265e5e950183e9421d9885a8278d55374ad889 SHA512 74d175fa11c79732223d09f91a8ead2d32140a508e05a45a897c85704a4c016701b4147f1c590eb3982eb01bcb14f33f51582b51564504505080e18953983b85
diff --git a/net-dns/bind-tools/bind-tools-9.16.12.ebuild b/net-dns/bind-tools/bind-tools-9.16.12.ebuild
index 2020b8a84d1e..18d30a0f166f 100644
--- a/net-dns/bind-tools/bind-tools-9.16.12.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.12.ebuild
@@ -17,14 +17,13 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
+IUSE="+caps doc gssapi idn ipv6 libedit readline xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
 COMMON_DEPEND="
 	dev-libs/libuv:=
 	caps? ( sys-libs/libcap )
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:=
 	xml? ( dev-libs/libxml2 )
 	idn? ( net-dns/libidn2:= )
 	gssapi? ( virtual/krb5 )
diff --git a/net-dns/bind-tools/bind-tools-9.16.13.ebuild b/net-dns/bind-tools/bind-tools-9.16.13.ebuild
index 54919a230682..c72ec358ddba 100644
--- a/net-dns/bind-tools/bind-tools-9.16.13.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.13.ebuild
@@ -17,14 +17,13 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
+IUSE="+caps doc gssapi idn ipv6 libedit readline xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
 COMMON_DEPEND="
 	dev-libs/libuv:=
 	caps? ( sys-libs/libcap )
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:=
 	xml? ( dev-libs/libxml2 )
 	idn? ( net-dns/libidn2:= )
 	gssapi? ( virtual/krb5 )
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 2cab48dbb5f2..ec3e4e9005cc 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -11,6 +11,6 @@ AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826b
 DIST bind-9.16.12.tar.xz 5017756 BLAKE2B e48fe94432a93df1f7f61b2d7ecb596e82a156deab3ee8dd3f5f11139028d42f839c483200ca6954076dfb68e768353a0ceb0d360d9e1dff3e36cf5ad06e8c43 SHA512 001613bd3c8bfc73d60bf3c053b233233a981132206e1ae5847820c5416ba0d65b0e026817ea3a718c7d3745c28a8de8dd9fb4355344955bead7bc2e1433e074
 DIST bind-9.16.13.tar.xz 5028340 BLAKE2B 7208d6361f84472a5549fd8d521878b1481c0930b1181fa79c99b9f7e7d3f736c120f0ca416e9aecca77015568428551937ee77449f441e9cd881779123e51b7 SHA512 1f3c8f54dd2c9e18cd9b67cfebb645d0a8e8f566add07fc4690cb8820bf81640c33b2b0685cb8be095e0f9ac84b2cf78176aea841a30c27d547b569b8353b07b
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.16.12.ebuild 11361 BLAKE2B 28ceffbe13e3e8b1ae72b45b3202f5d4e9a63edb7334fd9d577d49c3642f1e521b7bc8dabdf229c87313063c6b0f4e7578f903d748df2fad1e247507ca237dc7 SHA512 9b5dd53fa798e14e2ddeef10cfc8bfcda32acfb93466addafbe28aed651624dfa9fdae0f41864d728f021f055e9efc6d48741cc48f149142f5aef39afc949d22
-EBUILD bind-9.16.13.ebuild 11368 BLAKE2B 6c6884fc514183aaf130425486ef28209209a40b5efa6b0c50f0168abd469fb3e98b8a78f3cfb4a70069185228a7ba77ce1058b4bb33740a1ecd95bec134c510 SHA512 ae037062d678a58f7bed84b2619d47de4bf1c4dded37a2a6e0da0e708c232d72dc71bd8ca3a754f9ac53a9fee422345847f5e44fde0baa0c1ae9e5fd707431c9
+EBUILD bind-9.16.12.ebuild 11302 BLAKE2B 0e5051b0375ac90020db59cb5ddc6449b0dc01dbf89de03cd3efba1d8627176dd2b88453232f861c2782c0e4a592737fae42aa81b723fb61d510e5d1cf93a992 SHA512 73f7e77233891aa02ed56170a6f412b7f97a0d7f1ad974155d2ef4e1e99ba0814563b310c5910cfd889192e34ba4877974bf69f07850963045820fefdc05701b
+EBUILD bind-9.16.13.ebuild 11309 BLAKE2B cad994c0565750e989c5b1ae6db90c801025cf79f46ef3fa5e49bdeb1d1e0eab4426d343595b7ec1de806efcfc1fccd1f55d449b20ba73a53a70f9edae4ba496 SHA512 455acec471388d17f759d24f8c82a9f432c155421aaa1de7ddf597cdd929be7b4fa7b976208ab620b976b321ee447b2f8658433ea69ba4e8624840261c593996
 MISC metadata.xml 1043 BLAKE2B 3bf699db16f6883700e32e5f0debc534fa2d763aca0cf8fe3878dedcbb110410d88c2dbb69b4d4df09df62943416de3aaed7d53a2371d004b8c19a2a5a609bc1 SHA512 137093eabcbda1feb7cdac0cb0b2eeb808a47062b4e8d114874ee4019847ecbf5996c7b19055981a5ebffd099b5a96ce6ada919719017d83f93bc679334845b9
diff --git a/net-dns/bind/bind-9.16.12.ebuild b/net-dns/bind/bind-9.16.12.ebuild
index 01ba68b8dcbb..629ba6fe9814 100644
--- a/net-dns/bind/bind-9.16.12.ebuild
+++ b/net-dns/bind/bind-9.16.12.ebuild
@@ -36,7 +36,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
-json ldap libressl lmdb mysql odbc postgres python selinux static-libs
+json ldap lmdb mysql odbc postgres python selinux static-libs
 urandom xml +zlib"
 # sdb-ldap - patch broken
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
@@ -57,8 +57,7 @@ DEPEND="
 	acct-group/named
 	acct-user/named
 	berkdb? ( sys-libs/db:= )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:=[-bindist]
 	mysql? ( dev-db/mysql-connector-c:0= )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
diff --git a/net-dns/bind/bind-9.16.13.ebuild b/net-dns/bind/bind-9.16.13.ebuild
index c324a5a4b3c8..6021c5351d5d 100644
--- a/net-dns/bind/bind-9.16.13.ebuild
+++ b/net-dns/bind/bind-9.16.13.ebuild
@@ -36,7 +36,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
-json ldap libressl lmdb mysql odbc postgres python selinux static-libs
+json ldap lmdb mysql odbc postgres python selinux static-libs
 urandom xml +zlib"
 # sdb-ldap - patch broken
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
@@ -57,8 +57,7 @@ DEPEND="
 	acct-group/named
 	acct-user/named
 	berkdb? ( sys-libs/db:= )
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:=[-bindist]
 	mysql? ( dev-db/mysql-connector-c:0= )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 1f205dbf1648..14f37b93957d 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -6,7 +6,7 @@ AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b9
 DIST getdns-1.5.1.tar.gz 1075728 BLAKE2B fd6ac52a302ecf22cc913d8de6f93f9ab125429d0eb9d6e233f23b84bb2e242573cd93997f88b4d1a2493273691dab897efc8509a0e3f03f6fddcb9d3b53ecb6 SHA512 4013cb4f00cc87164380c22dc6f82a4fd54702769c28eeb7cfcb13fb35ef41e32916c36a1aa2f6ef05f008da97bea5c7ed849aedc6ae7050c285f9589a9817b0
 DIST getdns-1.5.2.tar.gz 1091088 BLAKE2B c5f32af794f3c710c0f84027d38ca393c72a438905c5e2fe49f2d20477e3f90f855d280f43d0ef7d204fa67d95ebdb960ce86d934e26c1ef3030f263f98ec7f4 SHA512 42e56264578f59e94d0a7315cd9cb1720f24c7a9abbaa09e1b42c274d15d1082ad4a036fa3c10573cf4d0ee6d868b6fcedf3a7cd64b53bdabd9d45542e479ca4
 DIST getdns-1.6.0-beta.1.tar.gz 669637 BLAKE2B cab019c38a0e7268a3ffef7ffd6b52ab3565bbf0b4ea4e897d60cfc0885ee7d32d8bd22e58f24b554e03d4297945d4eaa915aff254f43d4e82455f1070923d46 SHA512 b36d05b09b5ab7c384fdb93820bc6ad253e9a44da9c7ea38c735882e56e03eaba1793ea22068d03867ed2ade71682686a359b1b0a821eed4a5f3bebeeaeeb7e2
-EBUILD getdns-1.5.1.ebuild 2117 BLAKE2B 53bb33b39a76628391a2d553253ee7b8fa64b7aa37632d45990965344156014cfdfe0b1c5ba9a5de4ee256c609405cbc3f82bdda57a3324c50fbf6d22d6db814 SHA512 f9760cf1a26057c5933ed8a832763c59ba68334be9ad5ea9f3dba6b5b6ff42b0f40d75a84fd27c95afdea789d342b115951b59c5da20606a06a4c524de30171a
-EBUILD getdns-1.5.2-r2.ebuild 2255 BLAKE2B 34813f3aec39e41d7b603bc743b070d01d86425cd04f8ae83da7f5208c1fe1eb9e4be7996f335a40475d9f7cd2031d324f1d4232e7f9c7adb36cfbff10e88cc6 SHA512 e47d9d1950ec135f374f74759130a26b72ab86d24e1c77c4f30b8666d36f4ee4b9e9b21d36d8c9ab1d38471bc07910727d3d94e54dc630f7507e586390fcfefe
+EBUILD getdns-1.5.1.ebuild 1829 BLAKE2B 1b98cf3a49cb0aa8dd24faa08702a7f92e810b1142ce285c07f8ad46db9da383786ccf64822a026231f95a755d0ab28a42a29f7bb014aaa687af21836fff00e4 SHA512 8f883b33c97371fa82b5699ac28beaa6d3fd03c2904ba974b16d352f2561ab5967e7d1c7dadad904b0c121e37384d7f0f48adf5784120ed11adca96680793227
+EBUILD getdns-1.5.2-r2.ebuild 2027 BLAKE2B c538bbd971332f280f1a1ef538d8f7a39fe46ad2cc2c9c8762c3d7e7dbf6224de7534c5a98dd093afa751630ef86f197a1582d1e5a4038cc74a425ba17e0c951 SHA512 97576f96435a75a8e51ae9a600f1329e924124b5d220766168e255a9e944a74a543181c20a27e4cc0f618d2cef47e555eef951b54aede0a536579a88a7acdcd5
 EBUILD getdns-1.6.0_beta1-r2.ebuild 2030 BLAKE2B bb96fe0fa12f242604f63add83ee05ace04d3d7686a51e7daa17c009bd745a8e7c31e070aa0fea88c66cd0321b1b954ef0b665ef5b7b45b9b412539c76e70c36 SHA512 d08b2a2c7b135578e07b08338a2a3a135e82e042b8d02263e4c93f9e42350c4dcb8be1c9a2bea0e9f09d968c1789902cdb425f7f61be7cf1f8620edc678958fa
 MISC metadata.xml 823 BLAKE2B 6f036445b01fd8b4c4a0ddac2f04ed45cb980dc31ca5aa5a25b5da8272541ab7b8d6b6d9fcd8b3d122de378a71b2e8f1dffa158da6a0db84d7e61b9e6f8d134b SHA512 2ac45a84c1d38e601cc9a1bb2af25a4843b8b43902736fce9fe8fba7fb6a2f6b98c020e4a76c8443526c51af7f91602daa01e84e69fe29bc838ad79eb147ded2
diff --git a/net-dns/getdns/getdns-1.5.1.ebuild b/net-dns/getdns/getdns-1.5.1.ebuild
index 87cc0fa7363f..9333b5ff65f1 100644
--- a/net-dns/getdns/getdns-1.5.1.ebuild
+++ b/net-dns/getdns/getdns-1.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc +getdns-query +getdns-server-mon +idn libev libevent libressl libuv static-libs stubby +threads +unbound"
+IUSE="doc +getdns-query +getdns-server-mon +idn libev libevent libuv static-libs stubby +threads +unbound"
 
 # https://bugs.gentoo.org/661760
 # https://github.com/getdnsapi/getdns/issues/407
@@ -22,8 +22,7 @@ DEPEND="
 	dev-libs/libbsd:=
 	dev-libs/libyaml:=
 	idn? ( net-dns/libidn2:= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	libev? ( dev-libs/libev:= )
 	libevent? ( dev-libs/libevent:= )
 	libuv? ( dev-libs/libuv:= )
@@ -74,11 +73,4 @@ pkg_postinst() {
 		enewuser stubby -1 -1 -1 stubby
 		fcaps cap_net_bind_service=ei /usr/bin/stubby
 	fi
-
-	if has_version '<dev-libs/libressl-2.7.0'; then
-		ewarn "BEWARE: dev-libs/libressl prior to 2.7 does NOT check TLS certificates."
-		if use stubby; then
-			ewarn "You will NOT be able to use strict profile in Stubby."
-		fi
-	fi
 }
diff --git a/net-dns/getdns/getdns-1.5.2-r2.ebuild b/net-dns/getdns/getdns-1.5.2-r2.ebuild
index 62a0514b8c10..805ea4a5e29b 100644
--- a/net-dns/getdns/getdns-1.5.2-r2.ebuild
+++ b/net-dns/getdns/getdns-1.5.2-r2.ebuild
@@ -79,11 +79,4 @@ pkg_postinst() {
 		enewuser stubby -1 -1 -1 stubby
 		fcaps cap_net_bind_service=ei /usr/bin/stubby
 	fi
-
-	if has_version '<dev-libs/libressl-2.7.0'; then
-		ewarn "BEWARE: dev-libs/libressl prior to 2.7 does NOT check TLS certificates."
-		if use stubby; then
-			ewarn "You will NOT be able to use strict profile in Stubby."
-		fi
-	fi
 }
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 50ac51223182..077bf9ad734e 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,3 +1,3 @@
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-EBUILD ldns-utils-1.7.1.ebuild 1476 BLAKE2B 3394248b15bd9111b06f44836692f55bff86d5b1db7d021e2f204d5e17db9513151198e3a014bfad5528c2f41445960dea9481d891486000328e847e11861153 SHA512 a0fd24e05a4b72ef64d54204066ef87302c761e412dbab4272c6b50962af9de2b7cd41e60c2df6200f63d00025b24070037d0de8014a0712fe0275cbf51c1a37
+EBUILD ldns-utils-1.7.1.ebuild 1444 BLAKE2B f2d897b11e13ef176b3400ac418329583c8d77ab9a15e3cf1135d49fb1c6233f147375d0eee79bf9baea0f5d548dc1b3fc1382c95560022ce8585d0d96014d70 SHA512 be92ebb6aeeea36326a5293d485014d08b2b56ff07072e99983aee4215719ac8db9f76cf27616d1e29245b43920351593a570267f8b728e096dc8a785060a2b1
 MISC metadata.xml 848 BLAKE2B a31c8bfb2c5a90add80c4f608cdbd02e3bf15126726ed92203425b166ae01cf8240fa040d98ba44991cd315bdb388664692eca5820fc807cf3fddefc7663ffb4 SHA512 6ce3c5421c6e739f0c15a5b7e9120638cddc78fa3d9c2f564acfccd4c98bb3034512ce1a68422ba0ef7896750c1a41e273f2960d9d1f0ffc21c9028342482366
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
index 969fdba5b692..b0313d3adfbd 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ S=${WORKDIR}/${MY_P}
 
 src_configure() {
 	# >=openssl-1.1.0 required for dane-ta
-	if has_version "<dev-libs/openssl-1.1.0" || has_version dev-libs/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-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 1fab6b4ad785..51b4571f2061 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -5,7 +5,7 @@ AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d7
 DIST nsd-4.3.4.tar.gz 1182467 BLAKE2B 10c06be9df393774627a42a7cf254202fe9800e7cd5048d392fbf90a65321a4596e742165b1157b3a0ce0645a80ae5425f7d43eb0a453077e45bff06d52347d4 SHA512 fe332caecfd3c6bb8ae1a92fec26984a7953e5e462515e8622c1079b217c962728e841826cdf7899f47f9ac24af1dd383f8ba7981541b05a2338cd288c40b0a7
 DIST nsd-4.3.5.tar.gz 1184220 BLAKE2B 0ded84d9a0c25b86af6c05a7ab3ffb680177142b79a96f952cdeb92d87d9d0f306fb3c864b8f3cb769b05b0a863a7470df9407e6f3f5f0bc9a32891185d32b6f SHA512 bd031da779ff7b9b53fb4ea4d038a51f3b8f7b59a2927f674def46ca775f30afa059b471fed7d8ebcd2b7d02968945972b98856198eafbc4263d3064dae01029
 DIST nsd-4.3.6.tar.gz 1197835 BLAKE2B 943ae0700a2f49fffa9414f1d2718fef5e6a2f181373cc0a17ebe04433bce22d3863c8f17bd4d0412264503a80720d6dea9ce0d3ad6305f54dc3a2496118c90f SHA512 d87837b483ab37fde5d3eae7dca4c9e2672a718a1f49847db13232358108a5e0d6395c07d3fac72092a949d3c9861cd1dbed3e9bd0342ba6cbe7ca32feba09d0
-EBUILD nsd-4.3.4.ebuild 3109 BLAKE2B 7af915c66086aefe78f666fc2aaa4df0bc8dfd99e58f1290baff441348cd69ef7fb377c0dc4ab0b1d1b9f456bf8eef2aff1813570affc3d4b6d2b833d904d294 SHA512 1db683c09d190c652c9ca9435e19d72f0ea881929b905938d54a8972da4c2584f19759a484fe0d6355be6c5428a4a1c387de902f562c5b9106908f06f97dff51
-EBUILD nsd-4.3.5.ebuild 3111 BLAKE2B 06f6a907ef17566e5150bb3362da143a3ffdf4b1b0df1f2494319ebc5ce5f02acc6e14c6494530af1e7b0ba31533b788dd7a8c4cb4529e35e2c8044f1d8edb30 SHA512 a9f62f66876f39265cacb807674a896797a2d505b660fb20af4755cde445d81edcb34263e4afbc778a5d57c36a3d5169162084f182809795892d706465dc3d07
-EBUILD nsd-4.3.6.ebuild 3111 BLAKE2B 06f6a907ef17566e5150bb3362da143a3ffdf4b1b0df1f2494319ebc5ce5f02acc6e14c6494530af1e7b0ba31533b788dd7a8c4cb4529e35e2c8044f1d8edb30 SHA512 a9f62f66876f39265cacb807674a896797a2d505b660fb20af4755cde445d81edcb34263e4afbc778a5d57c36a3d5169162084f182809795892d706465dc3d07
+EBUILD nsd-4.3.4.ebuild 3049 BLAKE2B d84f9df0a35e63354adaf78ac2b579a79db4e31626105907b85d1c376713b51b4e8e017a37ea90eac9fda4276a53aa568360a45888feeeae02e4a53d848b78ea SHA512 a1acc0e770919a4165d7c98fbf750e12f711c4f7da11e01dfa645c8ac541f9c21e134cf065797e89a5e4d709e7575759688780a794add1044ceaa85cb911e498
+EBUILD nsd-4.3.5.ebuild 3051 BLAKE2B afc4b9d56ae956f6849ac89a83f5492af4f13b95a2117bba8f80bfcbe3e80aea24e84f80c06e7f8fea3bd2f8e9fb0d03dbc645aa57d3b99e207cdffde8d10384 SHA512 13df4a616e144d059757bd4cf9fa4fa642edf8d160dd5014c3cc2694c32004079c352a97ccb50b2283d1d8a4ac429b2246ca5514f56cddd2f3d923b3424b8e8a
+EBUILD nsd-4.3.6.ebuild 3051 BLAKE2B afc4b9d56ae956f6849ac89a83f5492af4f13b95a2117bba8f80bfcbe3e80aea24e84f80c06e7f8fea3bd2f8e9fb0d03dbc645aa57d3b99e207cdffde8d10384 SHA512 13df4a616e144d059757bd4cf9fa4fa642edf8d160dd5014c3cc2694c32004079c352a97ccb50b2283d1d8a4ac429b2246ca5514f56cddd2f3d923b3424b8e8a
 MISC metadata.xml 1160 BLAKE2B bd724c7485cbabe2738d0439b442c28858f66200acd237ec2a79f0b583fe4fbd0c82a68efd3af277a4e7d5333fc371b8150cea742373100d5b3667cb7d161145 SHA512 8576175fa8c53b3f7c2c588fb467ca633f6a628c90d7c08cb0d9414a5e721ab57c29c012f8021a7710aeac9be8d4d1ccd69acd6cb7309804460638ca6b51aa1d
diff --git a/net-dns/nsd/nsd-4.3.4.ebuild b/net-dns/nsd/nsd-4.3.4.ebuild
index 1b91a3af2521..21733815a1e3 100644
--- a/net-dns/nsd/nsd-4.3.4.ebuild
+++ b/net-dns/nsd/nsd-4.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64 x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
+IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -31,8 +31,7 @@ RDEPEND="
 	libevent? ( dev-libs/libevent )
 	munin? ( net-analyzer/munin )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		dev-libs/openssl:0=
 	)
 	systemd? ( sys-apps/systemd )
 "
diff --git a/net-dns/nsd/nsd-4.3.5.ebuild b/net-dns/nsd/nsd-4.3.5.ebuild
index 4ec0d9ca8c8b..729d48122082 100644
--- a/net-dns/nsd/nsd-4.3.5.ebuild
+++ b/net-dns/nsd/nsd-4.3.5.ebuild
@@ -17,7 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
+IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -31,8 +31,7 @@ RDEPEND="
 	libevent? ( dev-libs/libevent )
 	munin? ( net-analyzer/munin )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		dev-libs/openssl:0=
 	)
 	systemd? ( sys-apps/systemd )
 "
diff --git a/net-dns/nsd/nsd-4.3.6.ebuild b/net-dns/nsd/nsd-4.3.6.ebuild
index 4ec0d9ca8c8b..729d48122082 100644
--- a/net-dns/nsd/nsd-4.3.6.ebuild
+++ b/net-dns/nsd/nsd-4.3.6.ebuild
@@ -17,7 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
+IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -31,8 +31,7 @@ RDEPEND="
 	libevent? ( dev-libs/libevent )
 	munin? ( net-analyzer/munin )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		dev-libs/openssl:0=
 	)
 	systemd? ( sys-apps/systemd )
 "
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 95bdedc96374..84e275f4fb1d 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,6 +1,6 @@
 AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
 DIST pdns-recursor-4.4.2.tar.bz2 1396763 BLAKE2B f8dad7694ac13ed8d824ddaf613d1a001452ab2c08fcbb0e00d2b2258464b754809746b89998b818c44866f9e4b22c87c1cebf2da852fb7b6247ac6b9fd4b99d SHA512 31fdf62d87e5ee8f9570c6b738339bc8cc65c43800f18c7fb49aa5c53fc9ad76a1ddf02cc44f7129e06b41700b5cb3768ff8f81cc521c28147ea6538c73f8781
 DIST pdns-recursor-4.4.3.tar.bz2 1398743 BLAKE2B d9429ef22bb2b196e42da91332332b38dee9220d490c8adda686b0bc144e0981ea4418973f4304d6d964ef8f6ac4adcde4bd3e6d6b208c620440eab1b11a7fc0 SHA512 bac69cbaabc1b0de0def681e07f7e77954e0d487732cb46dc722f7869576a8a477a4011f78c9cc66b5e9b45455eb81534602b2834dc1ad42b85f5f2801915cbb
-EBUILD pdns-recursor-4.4.2-r100.ebuild 2002 BLAKE2B 9edb0aa92f545c91b1eadf5426ad3652e522b0b7e35a9ae5ea22c4632fa5907a475b873c6caa99b9beede497b298709c5fbebc4c5c6e68841c140ed719729497 SHA512 f9bb8eba62146a30e0bb8b2abdddfcfac9cc4766f3009686f56fc978dd625cda49ea4d5b1e294a1a20b82ceb4d64ee68542aea2daa98305c2c4328700f0d1f72
-EBUILD pdns-recursor-4.4.3.ebuild 2070 BLAKE2B cd2177eac66fda358eb0af7179ebd4eff4c5073045cc89eeb8cfe66784c53bfa7d49e4c99e61dd4f11950fbaa4897f126f3e8f15c0f2692419a67f7da01a36ff SHA512 3838a0f71be851a32fb608dfb501f5f07b91b66b4dfdb9e17a94316cc2cb46809de91406178509a19442f8ae921dccac19f0e5db1e54436425d51a5af3401121
+EBUILD pdns-recursor-4.4.2-r100.ebuild 1943 BLAKE2B 399a16bbf1255ddf34affacb8d19fe3175aab3b93fbd00844fc4cab88152a40a52dba708f292c21299b7805e48ed7af9f3f7262596f5fd397ff4d7b4f0d53d9c SHA512 4798d926465bc53fb38dc28b83c3d1e5a444307933575119938a65761f303d141c31d3e89aad53458421dee3e0c764275022a6ecb45241833f038e75fdcc17b8
+EBUILD pdns-recursor-4.4.3.ebuild 2011 BLAKE2B e7b7a322ac34dc9c09ca150973aeee17642c76ec9910cd9fd0c8678fb8a85c23c19e89ff4336a8723b2d4350bb5cb79f7cb234056dcc12ba36d5a428b0cbfffd SHA512 011b7d7dffc0d27e4f4cdcb31f0fb4cbabdeeca82f112aa3fc39cf1a47eb569e65f7e6870e41dab7194eed5175e52f746299a79ebef264e8f028f212c7cabb90
 MISC metadata.xml 1008 BLAKE2B 1c82fd9262358bcf1ff0f8503bc8dfe9b640023133ca48711bc576df00312312b5e37a36ff10aac561ef1c71e20f64c5f0a4c431c60ca029220732fba0ee1bf9 SHA512 2deab5a88c42d3416b3da5b6d9d3ed9b2db0a5dcb3d8b7fc4c7a13b2219fd7df786bfef42ff5e3d7c2b40058592e892f380d126a0254013534e66e65499e7105
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.2-r100.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.2-r100.ebuild
index 45019235e81e..59d7eaeaa9d4 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.4.2-r100.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.2-r100.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE="debug dnstap libressl protobuf snmp sodium systemd"
+IUSE="debug dnstap protobuf snmp sodium systemd"
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	dnstap? ( protobuf )"
 
@@ -27,8 +27,7 @@ DEPEND="${LUA_DEPS}
 	systemd? ( sys-apps/systemd:0= )
 	snmp? ( net-analyzer/net-snmp )
 	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
+	dev-libs/openssl:=
 	>=dev-libs/boost-1.35:="
 RDEPEND="${DEPEND}
 	!<net-dns/pdns-2.9.20-r1
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.3.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.3.ebuild
index 312ff4250bd2..dc546d8cd6ca 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.4.3.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug dnstap libressl protobuf snmp sodium systemd test"
+IUSE="debug dnstap protobuf snmp sodium systemd test"
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	dnstap? ( protobuf )"
 RESTRICT="!test? ( test )"
@@ -28,8 +28,7 @@ DEPEND="${LUA_DEPS}
 	systemd? ( sys-apps/systemd:0= )
 	snmp? ( net-analyzer/net-snmp )
 	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
+	dev-libs/openssl:=
 	>=dev-libs/boost-1.35:="
 RDEPEND="${DEPEND}
 	!<net-dns/pdns-2.9.20-r1
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 7c3dd22442b1..e67fa4530dc4 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -2,6 +2,6 @@ AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf40345342288
 AUX pdns-r1 2535 BLAKE2B 4e718bbba73b20a86dd11acc07ce91d259d82a3fc3e6133cac0d7fb2b24d2b5ff3e3596d00c4289017845c7a1751d0a43e83ba67e4b8e55e10aca892ba3d3aea SHA512 5ebc7cd236195543e67db5ed2c831ff6a1b9bdba5a72c179df72f84e4ade2dfc962a988ab02a7b893c62a7c3d8df7a15e2de3ae02413ff296a6404a7937eb8de
 DIST pdns-4.4.0.tar.bz2 1270854 BLAKE2B 2c855197d0b5f8fc141e4fa19268e68b9114353c7f89157023b9cd6b9559e788b55a9b0eeebea55d4ba0a206229d9c032f0c84c40ffd91c7277eb611a4bc966a SHA512 e7f35539915ee7945b537cfedae72e2b83c86b39c5e44a9268b8a086f44b30a33a64e0b65aad140ba02c349cedaa12820226578dea87c9b666dc75f8bd15c1f6
 DIST pdns-4.4.1.tar.bz2 1276990 BLAKE2B 9771cf3273ab7e8ab4607a91563bfe0dc3f4532b5420861d816eacd2798d66de3a1eb824c191264f9106ec47bd6003d99108b8df678190055948779b9b3b070f SHA512 a6f31972f77ded8ecfb523e8810dd90e5b7aa628746fee2a9a0daae2a7935800f111ce8617ffd71d5ce3881947d4ffc36c9cb37996a7bcc514536bb4abe1f79e
-EBUILD pdns-4.4.0-r100.ebuild 4568 BLAKE2B ca51eeb442b0b5ac26895054a7f2c3b3aac259603395a5559d5818939381bd43b779c9f0b1b12b1c6a8b324f9a3fb3c234dc288fa6ece8d39ada1ac428d915bf SHA512 d4c28910496ef58f369f49c68ad41b06be57e7bdde70068e8b3ce7bcc49d680335cf869e9a2d7418c6f61d1b1f3339cebda81d1ba8c6075504a95ee1b82f4495
-EBUILD pdns-4.4.1.ebuild 4570 BLAKE2B 3f0d748720e831d619c2d660a60a6b278121de43fe54e463c20562a144c04cec040996fb13fd9e483dfbeb8e514453afe3f5d1ce520125eb9680756fa75f5362 SHA512 488068a943403167b1c1d72e79e7368ac25cfe074d2b0a67529acc61ac047e7d7207af5db5c9e442d6d2f4f0a08a3282c6864a787cbc9bab4dcd77194f78d494
+EBUILD pdns-4.4.0-r100.ebuild 4509 BLAKE2B 856dc394f10dc1061beb849d3750039032cb2948dddf31eb58ccdd4e5b292d469ee612f43203406c5e9f13320e8a35a7f164c7f0dd3987088d10e3f48c09c027 SHA512 1af31ad6a37da79847e341bac25d90b106da6c42e2455be511f22ff74b09577dcef4fc6a929a1c031803e11f3a91ab8a3f77373f69eb0215c46aa6453d81130b
+EBUILD pdns-4.4.1.ebuild 4511 BLAKE2B 14eadd8df8088ec14c598db7c0b08a514e15ab08a0c6f234c1f23308911088d5a2ac3bf5bc9e43dde560cfd26722fb2dc0e6d70da0975e7249e495ce24dcd874 SHA512 8022eecf1bd6152fd9b367a9c6a1bf36ffeb9007a65ba235c43dab6849a60b1938f13c153a14cd743d64abe3e52095e0874f10ee1a645d168f6c8688ad9c44c2
 MISC metadata.xml 1111 BLAKE2B 5a55e94593f1c010f9ee71fa2d3bc887a0eddc8627db36a1792b911a1cfe3fa3d5a33923b95d18a02f36097717d76ed2aae711c2deb793625b1186090ad072c8 SHA512 c010bbd0daa87980a4d9f164fc3d15239251890e56c63b1165d55a92b9c0f24e5f141439bdfc13b4efa4483e0fc199cd6107e2f152d26d4ca954f4c3d0cc4913
diff --git a/net-dns/pdns/pdns-4.4.0-r100.ebuild b/net-dns/pdns/pdns-4.4.0-r100.ebuild
index afffc022f8d5..b37e0944e77c 100644
--- a/net-dns/pdns/pdns-4.4.0-r100.ebuild
+++ b/net-dns/pdns/pdns-4.4.0-r100.ebuild
@@ -20,15 +20,14 @@ KEYWORDS="amd64 x86"
 # oracle: dito (need Oracle Client Libraries)
 # xdb: (almost) dead, surely not supported
 
-IUSE="debug doc geoip ldap libressl lua-records mydns mysql postgres protobuf remote sodium sqlite systemd tools tinydns test"
+IUSE="debug doc geoip ldap lua-records mydns mysql postgres protobuf remote sodium sqlite systemd tools tinydns test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	mydns? ( mysql )"
 
 DEPEND="${LUA_DEPS}
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
+	dev-libs/openssl:=
 	>=dev-libs/boost-1.35:=
 	lua-records? ( >=net-misc/curl-7.21.3 )
 	mysql? ( dev-db/mysql-connector-c:= )
diff --git a/net-dns/pdns/pdns-4.4.1.ebuild b/net-dns/pdns/pdns-4.4.1.ebuild
index 5e50badd2298..d0dea33b39fc 100644
--- a/net-dns/pdns/pdns-4.4.1.ebuild
+++ b/net-dns/pdns/pdns-4.4.1.ebuild
@@ -20,15 +20,14 @@ KEYWORDS="~amd64 ~x86"
 # oracle: dito (need Oracle Client Libraries)
 # xdb: (almost) dead, surely not supported
 
-IUSE="debug doc geoip ldap libressl lua-records mydns mysql postgres protobuf remote sodium sqlite systemd tools tinydns test"
+IUSE="debug doc geoip ldap lua-records mydns mysql postgres protobuf remote sodium sqlite systemd tools tinydns test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	mydns? ( mysql )"
 
 DEPEND="${LUA_DEPS}
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
+	dev-libs/openssl:=
 	>=dev-libs/boost-1.35:=
 	lua-records? ( >=net-misc/curl-7.21.3 )
 	mysql? ( dev-db/mysql-connector-c:= )
diff --git a/net-dns/resolv_wrapper/Manifest b/net-dns/resolv_wrapper/Manifest
index 43e89e4bce22..ee48bceb261d 100644
--- a/net-dns/resolv_wrapper/Manifest
+++ b/net-dns/resolv_wrapper/Manifest
@@ -3,5 +3,5 @@ DIST resolv_wrapper-1.1.6.tar.gz 38276 BLAKE2B 4b1c79a342b74f33063ba480b1706a107
 DIST resolv_wrapper-1.1.7.tar.gz 45148 BLAKE2B d1b860187bfa3be6eadd848abc458d5c9e3c4c4048a70b37d7548caf2604bda51f8a3606487fb95d682ab39e06f63f29b85de981ae32527997799fa5d72befab SHA512 531a7734f40d8a7cb3da4618eebbb4530657ad2cdcf3c1cd48f3ae1dcf55fc003205e44745fc3f70704060ae0c6a2516919c61fd10223ff56d90a47a3c59b3c0
 EBUILD resolv_wrapper-1.1.5.ebuild 658 BLAKE2B d08b85542d7f12ac823968a30608f70a8d288f6967e5180e3e47345bde26caf5f9e97436793752dc82eadeb1566c78852a6a78cd5284f4b9ad962312ebab0969 SHA512 836c969b74b0f5aa9d37500f655d00fa1307c7a21d88b0a2ba90eebe2dd7c89a5b3927ef41d1aa5dba0b9031f7264dee1e488f44919350bef11129a59ed48656
 EBUILD resolv_wrapper-1.1.6.ebuild 664 BLAKE2B decc50a1b1a35010953fb0cfe98c3a35c1968c285f3b20f7a446456b6a834a6ffd02224ff4721eba7a3cc2e95ac8f58ed720cdb5ba35fe974dc2d7ae7d01c615 SHA512 056ff258de0cb3671316834fec593c5ecdf3ec47d72c9141df8dfbb12a0331a850fa5d252cf4f1dde836e895f0f5b6bb2ab10a64dab4d98303a7345a89e914e1
-EBUILD resolv_wrapper-1.1.7.ebuild 801 BLAKE2B b56cb13860ca6ff97248e4e7b7e0f5d37795c92a0c663a462bcdc5df979c31a74986af31944e7fd7d9639b5412a75e77a8d4aec5fdc670e44e377bfb4522d9ff SHA512 158c39da6a0a54b4de4ddd69e865703a9ca4a017d9cae29123bbcde66d460e3d66a14778c6db1da1c4fa3b4c1e7f2fa8bbb1245691f641a29116d5841d3a30be
+EBUILD resolv_wrapper-1.1.7.ebuild 800 BLAKE2B afb0f400f6bad5c0c8e69b8fac3b2b1dc94fbc1b4c3c31c2644861164fa7861d52c5a118748cb9d4ad8b3cd2c40de9e552b315ce724c0a162b354c89f3f2077f SHA512 3528cf715e84a548eb5b55130055e8b4de4514a9511085335d1eaf35931ece15e871bbaa18a261240db6576e919530c47217a5a49782791ee639546cde2dbe1a
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
index 5ccbe31fda31..c7480d982a78 100644
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 596d1e487ff6..8dc07e766353 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -9,7 +9,7 @@ AUX unbound.socket 101 BLAKE2B 4885d311873d7f3e5daf1c0a63798b13761b7c0bfb1bead0b
 AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a73b0c6148f4df336c4c07e8da19320df6bedb49cb6884da565543f78456d38dc3000ca2a1abde84816be SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3
 DIST unbound-1.13.0.tar.gz 5950063 BLAKE2B 742eed33845079452a942837a64e80f89ec7ec73459d0045c70ff83d3ba982fae6bade9feb56ef6faa9fca4859222ea00ac587c65c8ad722bef4a6b66a276ade SHA512 d4f3c5a7df5d46f8b1ee32b61e68bdc0d63030820d236ecc51bc3ac356d15248acb9a5e0b6009e1936b03b751e8dd05a071a95ab239fdbbbb308442a59642ad5
 DIST unbound-1.13.1.tar.gz 5976957 BLAKE2B 5fabb9205773a1983842e41cf7a4d6c3878fa8beb7c8ccc71ae1edf7738cb9506c3d7bb32cf887b305317ca695bf876d9f5bf9aeb0129b0e9e926d437b3e6eb3 SHA512 f4d26dca28dbcc33a5e65a55147fa01077c331292e88b6a87798cb6c3d4edb0515015d131fd893c92b74d22d9998a640f0adce404e6192d61ebe69a6a599287c
-EBUILD unbound-1.13.0-r1.ebuild 6141 BLAKE2B 42d4a3bf38f9ac4f45ad3a8e0c751ca4bf67f08425abf6fadb5d2c2da64b1c1ee918cea967976570c7acfaa1944c39315709011b3b79a3ce7159ff6b13aa1a95 SHA512 8d608e0aa716ce57196ad933a9fdaf19887b88e365baa3a3cd41d0c1cbb913c9357ff539c297c81e37326416af28907d877c5f403cf9632e9edf65d7a4b299ec
-EBUILD unbound-1.13.0.ebuild 6090 BLAKE2B 1de398046a1a5758b5b2904b98ee20ee77a497af530071bbff12e7239fc60af19a0ed9ce176f7285deea4127a39005f1a6c3c87d36ccc24f4e3320c8840ada6b SHA512 54532861ef0b0820a60f9927edc65be0bb0a4306783b8f66c5ada6a4db78892258b7f303e7e4ebd2c4300950382ae3d5aa97b916ee10d0306779545084b018ba
-EBUILD unbound-1.13.1.ebuild 6141 BLAKE2B 1227d3ee7b066c31036e07bb65e347b8f5fa913a211230db32f8eae4cf29b6e30b3608a27893a571d0a759559e3491ab427c7239758a046cc0ba08ecec93aec7 SHA512 372656961e6046144eaf0b6e020fdeaf8e72b7223d0e17f1f29e478ba0daa8714b83d527c3866f78e8a72e0afdf27f69de8bea3f42caccc90df11ffa804362fa
+EBUILD unbound-1.13.0-r1.ebuild 6039 BLAKE2B f496adc2c5507cbce6c5e16569301d4765fed5852cf010f2fc681513980f8f1b585a6b9ea0e3e08b08645f394b65f7bb2a24ba05fb46639f52c16ba4995fb04e SHA512 789c840a56f37a1216ca684cff09a899a5b66fae0b938c8286c8212f272d06640f3830d4b1ab70fd4d3b8ee669f39cf96ed3204ae61359cf07da85ab44319f80
+EBUILD unbound-1.13.0.ebuild 5988 BLAKE2B f841b1a89b16a9b0b1e596b58f3baf071b96af3184dff8cb35dd4ce94d294004e7149afd17461a8855b4f055f5a9165351c702f0dbb280b953541319801df0a1 SHA512 bcf12c7a00008f731b2f3f8a2531a6530741931fcfcab17bc254dcfbed12cbfdb1d61a77cc95ce04972e392dcf0d5d12427563788768820caa64af1b7df80a20
+EBUILD unbound-1.13.1.ebuild 6039 BLAKE2B f496adc2c5507cbce6c5e16569301d4765fed5852cf010f2fc681513980f8f1b585a6b9ea0e3e08b08645f394b65f7bb2a24ba05fb46639f52c16ba4995fb04e SHA512 789c840a56f37a1216ca684cff09a899a5b66fae0b938c8286c8212f272d06640f3830d4b1ab70fd4d3b8ee669f39cf96ed3204ae61359cf07da85ab44319f80
 MISC metadata.xml 1530 BLAKE2B 122d80d5cfbe76db026eae05c5e04b05f83e081713ac31c1d35d4677fa44eda03629fd964f0aa7fd5f9d16ff70913ebc83fddc5ee8c3c22df9bc7c5fc1b99e22 SHA512 4b9f0e48a871e0f4fa86b85bea5639aa6ab7778da2a32845f4ed95def7f0432f8a314d43f9e4f00a145b10d4a4250f6574a31a3e443545abc716e421f1b64bd0
diff --git a/net-dns/unbound/unbound-1.13.0-r1.ebuild b/net-dns/unbound/unbound-1.13.0-r1.ebuild
index 30b267d44391..473024caee76 100644
--- a/net-dns/unbound/unbound-1.13.0-r1.ebuild
+++ b/net-dns/unbound/unbound-1.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
@@ -27,15 +27,14 @@ CDEPEND="acct-group/unbound
 	acct-user/unbound
 	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
-	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
-	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
 	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
 	dnstap? (
 		dev-libs/fstrm[${MULTILIB_USEDEP}]
 		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
 	)
 	ecdsa? (
-		!libressl? ( dev-libs/openssl:0[-bindist] )
+		dev-libs/openssl:0[-bindist]
 	)
 	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-dns/unbound/unbound-1.13.0.ebuild b/net-dns/unbound/unbound-1.13.0.ebuild
index a8e0c81179f1..7719cd597bc3 100644
--- a/net-dns/unbound/unbound-1.13.0.ebuild
+++ b/net-dns/unbound/unbound-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86"
-IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
@@ -27,15 +27,14 @@ CDEPEND="acct-group/unbound
 	acct-user/unbound
 	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
-	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
-	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
 	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
 	dnstap? (
 		dev-libs/fstrm[${MULTILIB_USEDEP}]
 		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
 	)
 	ecdsa? (
-		!libressl? ( dev-libs/openssl:0[-bindist] )
+		dev-libs/openssl:0[-bindist]
 	)
 	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-dns/unbound/unbound-1.13.1.ebuild b/net-dns/unbound/unbound-1.13.1.ebuild
index 094e98544292..473024caee76 100644
--- a/net-dns/unbound/unbound-1.13.1.ebuild
+++ b/net-dns/unbound/unbound-1.13.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
@@ -27,15 +27,14 @@ CDEPEND="acct-group/unbound
 	acct-user/unbound
 	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
-	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
-	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
 	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
 	dnstap? (
 		dev-libs/fstrm[${MULTILIB_USEDEP}]
 		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
 	)
 	ecdsa? (
-		!libressl? ( dev-libs/openssl:0[-bindist] )
+		dev-libs/openssl:0[-bindist]
 	)
 	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-dns/updatedd/Manifest b/net-dns/updatedd/Manifest
index 8ffc331b80e5..ac5ab2c662bc 100644
--- a/net-dns/updatedd/Manifest
+++ b/net-dns/updatedd/Manifest
@@ -5,5 +5,5 @@ AUX set-socket-timeouts-for-ipserv.patch 1001 BLAKE2B 0a2d769313f49bd198338af4ec
 AUX updatedd-2.6-options.patch 385 BLAKE2B 35a85ad990250a799d512bbb5494ac22acdee4567056ab09c92ccb4ff9641cf05d5a4e6cd3a768b6cd05f377f587a60c5203a3972737b3b8d414708662635ded SHA512 e509e177d0147cc047d8272051541f132a6b64beabff14db9fc7936e780b61947653cd9c501f76877c869ebbbcb052fc263d539ee42bba8eb46c47a6b24eac33
 DIST updatedd_2.6.tar.gz 667104 BLAKE2B 7cae9eab63c0dcf97203d5cd10527cbe8f937f048a2508983feb26d44755189af0789c0b741b41dad51abaad51e3e3aa1e3e77328094b04734552bb33e14cdf0 SHA512 f8a83dfc612d4f0dfc7ffabb9934fbfc236a21f7bbd38355dd1234e45cf5fa616c1cc48036a29a2b82195c0b9d1f9b6bb3b78a3acc8f28c1c65b87f27f2b832f
 EBUILD updatedd-2.6-r5.ebuild 672 BLAKE2B 96dc853d6c689137c707179884575a135fc345b6972b318829318d9c4d7d6e18858cc4592b803217835bca8b7d193f465586dc14f6308897b59e44cd40e90441 SHA512 bf69c39898c1666d23f58d98c12b0e8e45addaf0dc588115f51862f04546ea3132a4026f46833a98419d41292db856447cc1481ae9ac2d3984f569e053666d03
-EBUILD updatedd-2.6-r6.ebuild 712 BLAKE2B 142414fbdf843bd57a3647556dc5f2bd031181e55bcd20db0055036ac92d5c63ff0522aca2634fb48a59610efa4046a382c51079171c63c89aa2ebf33f5e9f6a SHA512 526e95da992850e6860789502d52d3bf10a457aae82f05286d52ccac95707fd40b72d5602eef5795ce5c1824b251fb8eccb7005aace94c14e53de685484535bc
+EBUILD updatedd-2.6-r6.ebuild 709 BLAKE2B d2829d0ea4b0f8a88ea86b395aee9102c5f4e598373db6cdf68522eed7bc1dc26d0f440e99d81245a106b3605ebd55b0fe57ecacbff3c499545240f325bf7b29 SHA512 c1bf1f98fd49f8ae5a8168c736bb64efe7b15c376c26129a35656b8214cd045e38284551dac229e8a770c23aa1f792d9ec6d9f99e71871bb20d47421ac1626d1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/updatedd/updatedd-2.6-r6.ebuild b/net-dns/updatedd/updatedd-2.6-r6.ebuild
index d352c43644a3..d55cae76e39c 100644
--- a/net-dns/updatedd/updatedd-2.6-r6.ebuild
+++ b/net-dns/updatedd/updatedd-2.6-r6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://savannah.nongnu.org/download/updatedd/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE=""
 
 DEPEND=""