gentoo xmass resync : 25.12.2021

19 files changed, 274 insertions, 591 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index d9d5cf8d753f..2b37647d1825 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index be71deaad364..d6c53e9df6d8 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,6 +1,2 @@
-DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1 SHA512 54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6
-EBUILD ldns-utils-1.7.1.ebuild 1444 BLAKE2B f2d897b11e13ef176b3400ac418329583c8d77ab9a15e3cf1135d49fb1c6233f147375d0eee79bf9baea0f5d548dc1b3fc1382c95560022ce8585d0d96014d70 SHA512 be92ebb6aeeea36326a5293d485014d08b2b56ff07072e99983aee4215719ac8db9f76cf27616d1e29245b43920351593a570267f8b728e096dc8a785060a2b1
-EBUILD ldns-utils-1.8.0-r1.ebuild 1734 BLAKE2B c832ed898eca34469a936fc8d9a3d74622e96ef2b2d5739219302b78b9bc7a74b19ff5e1cd910a6fb74df378c8a852f1fc883849ddc7216dd9754465ee359d94 SHA512 ff154d66c1d35d4915374306c40c57da7b9476f96f71c9eadfb3ef01416a40f1534d12e06c23be2c5f27819cd66fc3076cc688c5a03047c6fa4f67558c7890a9
-EBUILD ldns-utils-1.8.0-r2.ebuild 629 BLAKE2B da54536bfe1678ff9bd6433bb3908e701b87238bb6d8a10aec5fb602d61013561b384a71a2b7fb325ca19796342922ecad46509b5aadc1701243c2b2acbc9cca SHA512 9f8a250d5f0aa8b40b7a75ef8696b99c7fd297bc591a76d682e8a54b6cb180b27b9bf6e77bb81bc9ef43b2d7c451c8a9282151c02d42ef05e11b57af8a734c71
-MISC metadata.xml 849 BLAKE2B 3e5b25a17b5b317e38b857d2e4a65212c9300505832926c3a2fcbd5468fca0bbc3c5fd2260d678ed1c7b1b55b33150fd059f4ed80907c34083e92f00ba22b574 SHA512 9fcf62af1b836fd9f8dbe4406f0ffc8d6bb0bbe9005bbef9e558097b50a11c0c126e66e16faa6be3ca21bcfe55243a536808cbf408fa953e7f46417a068b5043
+EBUILD ldns-utils-1.8.0-r3.ebuild 391 BLAKE2B 851349e3cfec86bcdbafe6f550dc0582c08a79464d2826616ad606b1e117cc254b72aa92ae4d27767c67106d22d8798121212c7493989cb892961bd369d371e7 SHA512 1c35c6545f379b7d365abf97e40585982d8df0b44fc202cc3e64b679e8305d4e57cbdc8245a983f49daee4961a57bae0546bc3832097a2b1719cc7fa20fc13a6
+MISC metadata.xml 532 BLAKE2B f5ba3420ebe50311a12f4be60b7f6d63d1fbe8b28927a5cf6d410a477dff5e94aeba509b6aab244ca7f1774892ef7e57b7cdd93398aca2b9a89c4071e964d621 SHA512 6d2086663622f8f16df57948db7a4cd94c136940e9db05eafe253b3c114549b41ee9a28f54a9229ff6f1135f2a42bdf46041f22501d4586547729379c98c33fe
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
deleted file mode 100644
index b0313d3adfbd..000000000000
--- a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${P/-utils}
-
-DESCRIPTION="Set of utilities to simplify various dns(sec) tasks"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
-
-REQUIRED_USE="
-	ecdsa? ( ssl )
-	ed25519? ( ssl )
-	ed448? ( ssl )
-	dane? ( ssl )
-	gost? ( ssl )
-"
-
-DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,ed25519?,ed448?,gost?]
-	examples? ( net-libs/libpcap )"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# >=openssl-1.1.0 required for dane-ta
-	if has_version "<dev-libs/openssl-1.1.0" ; then
-		local dane_ta_usage="--disable-dane-ta-usage"
-	else
-		local dane_ta_usage=""
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--with-drill \
-		$(use_with ssl) \
-		$(use_with examples) \
-		$(use_enable dane) \
-		$(use_enable ecdsa) \
-		$(use_enable ed25519) \
-		$(use_enable ed448) \
-		$(use_enable gost) \
-		$(use_enable ssl sha2) \
-		$dane_ta_usage
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	#cd "${S}"/drill
-	emake DESTDIR="${D}" install-drill
-	dodoc drill/{ChangeLog.22-nov-2005,README,REGRESSIONS}
-
-	if use examples; then
-		emake DESTDIR="${D}" install-examples
-		newdoc examples/README README.examples
-	fi
-}
diff --git a/net-dns/ldns-utils/ldns-utils-1.8.0-r1.ebuild b/net-dns/ldns-utils/ldns-utils-1.8.0-r1.ebuild
deleted file mode 100644
index b7516aaa9282..000000000000
--- a/net-dns/ldns-utils/ldns-utils-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P=${P/-utils}
-
-DESCRIPTION="Set of utilities to simplify various dns(sec) tasks"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
-
-REQUIRED_USE="
-	ecdsa? ( ssl )
-	ed25519? ( ssl )
-	ed448? ( ssl )
-	dane? ( ssl )
-	gost? ( ssl )
-"
-
-DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,ed25519?,ed448?,gost?]
-	examples? ( net-libs/libpcap )"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# backport https://github.com/NLnetLabs/ldns/commit/bc9d017f6fd8b6b5d2ff6e4489a2931d0aab8184
-	sed -i 's/AC_SUBST(VERSION_INFO.*/AC_SUBST(VERSION_INFO, [5:0:2])/' "${S}"/configure.ac || die 'could not patch configure.ac'
-
-	default
-}
-
-src_configure() {
-	eautoreconf
-
-	# >=openssl-1.1.0 required for dane-ta
-	if has_version "<dev-libs/openssl-1.1.0" ; then
-		local dane_ta_usage="--disable-dane-ta-usage"
-	else
-		local dane_ta_usage=""
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--with-drill \
-		$(use_with ssl) \
-		$(use_with examples) \
-		$(use_enable dane) \
-		$(use_enable ecdsa) \
-		$(use_enable ed25519) \
-		$(use_enable ed448) \
-		$(use_enable gost) \
-		$(use_enable ssl sha2) \
-		$dane_ta_usage
-
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	#cd "${S}"/drill
-	emake DESTDIR="${D}" install-drill
-	dodoc drill/{ChangeLog.22-nov-2005,README,REGRESSIONS}
-
-	if use examples; then
-		emake DESTDIR="${D}" install-examples
-		newdoc examples/README README.examples
-	fi
-}
diff --git a/net-dns/ldns-utils/ldns-utils-1.8.0-r2.ebuild b/net-dns/ldns-utils/ldns-utils-1.8.0-r3.ebuild
index 6c68aaf2613b..4b70f566cf04 100644
--- a/net-dns/ldns-utils/ldns-utils-1.8.0-r2.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.8.0-r3.ebuild
@@ -11,15 +11,5 @@ HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
 
-REQUIRED_USE="
-	ecdsa? ( ssl )
-	ed25519? ( ssl )
-	ed448? ( ssl )
-	dane? ( ssl )
-	gost? ( ssl )
-"
-
-RDEPEND=">=net-libs/ldns-1.8.0-r3[dane?,ecdsa?,ed25519?,ed448?,gost?]
-	examples? ( >=net-libs/ldns-1.8.0-r3[examples(-)] )"
+RDEPEND=">=net-libs/ldns-1.8.0-r3"
diff --git a/net-dns/ldns-utils/metadata.xml b/net-dns/ldns-utils/metadata.xml
index a9f2606f4927..0fdb9aa842a6 100644
--- a/net-dns/ldns-utils/metadata.xml
+++ b/net-dns/ldns-utils/metadata.xml
@@ -11,11 +11,4 @@
   level API which allows a programmer to (for instance) create or sign
   packets.
   </longdescription>
-  <use>
-    <flag name="dane">Enable DNS-based Authentication of Named Entities (DANE) support</flag>
-    <flag name="ecdsa">Enable ECDSA support</flag>
-    <flag name="ed25519">Enable ED25519 support</flag>
-    <flag name="ed448">Enable ED448 support</flag>
-    <flag name="gost">Enable GOST support</flag>
-  </use>
 </pkgmetadata>
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index c07113da7ffc..7d0f3241a8ec 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -3,5 +3,5 @@ AUX opendnssec-use-system-trang.patch 618 BLAKE2B 32e1b6784f1666e0485e6109af40b0
 AUX opendnssec.confd 393 BLAKE2B 47f83e11292c01cb999fae36dbea2d0b45cb970493bfbab43c43682fe26e574e12bbe7f7096e71ff7bd0b8b49827f13e4de858a38868706fa769cc92ceb1f307 SHA512 17bd24efef9bd6b7a907c75126809a6012db23a6c8547169c41dbc62fc91775331f445905282bc6c2ef13357f92eccab5008d4605419d98acdb723806b63a924
 AUX opendnssec.initd 1854 BLAKE2B 358bcf513123f7a38b7795f142f56e6a186062d1ad80bb70bee46ba7ebe7a137b4d2830a6c27ae690add23e0296ed2bd3a7a5d7ee88e1ee7ee3a8a9631306916 SHA512 75bce27c152b55ba2ba7d0770c6f2149493ef4b145f2257328e7e4b6865ad2d644695a688c3e06be02705ac42752e031846551b80b560e19a73e595e5ad15def
 DIST opendnssec-2.1.10.tar.gz 1142027 BLAKE2B 063650744ffd1c6d6d3b702400c9617883394c6794743f7d61bd63f7bdaf688a3f2a80f47612e561a133a5689dad8b5f7392eec69779d1dc5632a121d9a41c8f SHA512 c7fdbf1c3867d7b53ac11ab5cb5e636af4595dbee8d704429c7fb84cc3a6b2082ed490c33aad7747d4ee1a2c580afcf24a260bc3ed29eaf5e9d337004045b82d
-EBUILD opendnssec-2.1.10-r1.ebuild 6707 BLAKE2B 9d772453d31f360501fa387b09acdba92bde112ac0d7b1af8e240756b6bcbb2de2493e6811722166f3fbcfdd44d74291465021a69f8ea9a8141e09f7234ebfb7 SHA512 d06a78373199d72be526f626f5717bc946d8f0fdd99c4806b4d34925e4231c3c02cb05cfbd7c58f531a9176f6322686daacd7122620ec90aaa9eee4ff9e761e1
+EBUILD opendnssec-2.1.10-r2.ebuild 6713 BLAKE2B bca71841ff652322bbe742d51962d307169abb245ad996c76f2ec2452510fc06bfdf5b3f4251ea1af43f23ff2b7eb40029062a311b4826d60835ff69cf573bc3 SHA512 7fa9c8b42c79c3b56686456e04a071b405b2870430b373f29b0f30edbaba0e4fdf36d665830deb1d0cc4b2bd319a1ee371362177cd9b0f69af9c20cee8de5e19
 MISC metadata.xml 718 BLAKE2B c6369b0a0f4df6fba454e7101d5254dcbd6b2294f9f6227d21d7f1defa04bde31809883d715b44c939fc9192447138d79b1955dc4964d17b0e8fc8341ab032aa SHA512 1b5144f8aca23a9798dd45a32b91fbdb37be1832d3d7b73bbafb3a3b4a7e003a00016ba84094fd662d9c0db5fe1b032a6a3e389b8c921c32fea61e5b0cd30c44
diff --git a/net-dns/opendnssec/opendnssec-2.1.10-r1.ebuild b/net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild
index 210d41c8d872..771b0a19985f 100644
--- a/net-dns/opendnssec/opendnssec-2.1.10-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-lang/perl
 	dev-libs/libxml2
 	dev-libs/libxslt
-	net-libs/ldns[ed25519,ed448]
+	net-libs/ldns[ed25519(+),ed448(+)]
 	mysql? (
 		dev-db/mysql-connector-c:0=
 		dev-perl/DBD-mysql
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 637c7f4990b0..564e330f0043 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -5,10 +5,12 @@ DIST pdns-recursor-4.4.7.tar.bz2 1404116 BLAKE2B 42808634fe20735ba0a933a20b7c4df
 DIST pdns-recursor-4.5.5.tar.bz2 1472089 BLAKE2B 408bd0d11b0945de15fe22b290b127a9b7f9f053359a0269fb9e478ae536ed5c4b5ad3b5fa8b15d7786fdd0cdd8721d5a5cb66d46f816105e37ecd9fc9557854 SHA512 7df2e89eea55e870724370753b39d867e2b32fc8bcbdb3efaefa824917b16b9d382817dce7d551dc16d8ad0b0c04b3021cba310b47de969fe54c395eafe7706b
 DIST pdns-recursor-4.5.6.tar.bz2 1474500 BLAKE2B 9d1f0ce83b4d57d6443cf0107d76c4408aee019b571d807167429b56ce543809732610b0ca1f2d406224de33d1bcb747e00b572178ef6748282dc6a62fcafe78 SHA512 43c866a29bd72175bad71450dc20678183f6b11f60d54a174627501be52c79dc91819196be63e6859af086f42cc7297d7a3a6100088a2efe3c99eb8f5fd73e71
 DIST pdns-recursor-4.5.7.tar.bz2 1475537 BLAKE2B e58a28ed1ca2a9ae69436f9367e83f046ed5bc47bfd13783bd7c956f917c4a6d9c93a9a8e1c4df55ad42bc6ba024faca936fefdaffb2125e4f6635c5e6a20b19 SHA512 dc4a2a129039f79440420c285c37fd11536f2c0b74a39da74560eb782f1ad881839831e97f2a803b1812f128e899ad7c460fada42a831994b21f301f8892e60a
+DIST pdns-recursor-4.6.0.tar.bz2 1549434 BLAKE2B 3834c3cf58d99ba03b9e2c325a35e7bdc29a6da3fc77998b44a875033a1ce9a538762f21270754c0207be175a2b9f06d06677822a7dffd7f57fe510425772f96 SHA512 ca7e7a4aed904a68f4dcb25e62393d44cbe5a1b64b76882b086e3dcfc08face8d399d2652aeb3c03d8a68b2c9531e78223b815256d7d9e82777621aba8ad068b
 EBUILD pdns-recursor-4.4.5.ebuild 2009 BLAKE2B 2ac02e0feb23ea88dd1a3cb11501b936df84e479ed6a12d091dc6969d541ed11172a5b62ee60fadf543904c79acbb9c55501cbce3e613fbee6ae5eaab26b9725 SHA512 e61b5b4daa36c405397827d522cc70d9923c9f4294b551b485759f549448b00b0613356a769696240c8a7f9dafbce8645b51b96200c2321f7c5f51ac49b4000f
 EBUILD pdns-recursor-4.4.6.ebuild 2011 BLAKE2B e7b7a322ac34dc9c09ca150973aeee17642c76ec9910cd9fd0c8678fb8a85c23c19e89ff4336a8723b2d4350bb5cb79f7cb234056dcc12ba36d5a428b0cbfffd SHA512 011b7d7dffc0d27e4f4cdcb31f0fb4cbabdeeca82f112aa3fc39cf1a47eb569e65f7e6870e41dab7194eed5175e52f746299a79ebef264e8f028f212c7cabb90
-EBUILD pdns-recursor-4.4.7.ebuild 2011 BLAKE2B e7b7a322ac34dc9c09ca150973aeee17642c76ec9910cd9fd0c8678fb8a85c23c19e89ff4336a8723b2d4350bb5cb79f7cb234056dcc12ba36d5a428b0cbfffd SHA512 011b7d7dffc0d27e4f4cdcb31f0fb4cbabdeeca82f112aa3fc39cf1a47eb569e65f7e6870e41dab7194eed5175e52f746299a79ebef264e8f028f212c7cabb90
+EBUILD pdns-recursor-4.4.7.ebuild 2009 BLAKE2B 2ac02e0feb23ea88dd1a3cb11501b936df84e479ed6a12d091dc6969d541ed11172a5b62ee60fadf543904c79acbb9c55501cbce3e613fbee6ae5eaab26b9725 SHA512 e61b5b4daa36c405397827d522cc70d9923c9f4294b551b485759f549448b00b0613356a769696240c8a7f9dafbce8645b51b96200c2321f7c5f51ac49b4000f
 EBUILD pdns-recursor-4.5.5.ebuild 1882 BLAKE2B 9bac176affd6cb7cdacf908de6b1ffb36615606102840d0c52053f21863a62ff69f3d2cc2756c68b46278b17f6498f07909a6b6c6fec1dd751a8a713c2b58eb5 SHA512 7a51c74ea284045cf6872db7a4ba9b697d1416972a405273411b3fa1c0b220e78849651e5df8f08077de95882a376b331079dd83b8f1a8d450c3665f3583ce3d
 EBUILD pdns-recursor-4.5.6.ebuild 1883 BLAKE2B 2ecec2518d4676d838dbdb0cc41a8c0dfd551b15e87ea212594bff2a0d1507746b592684339cf21c08257501c632d157e3edb5ab79b55221c658deae2a83096a SHA512 a26b2d6eb3c97bd485c4e56b93f719e01752c7f5c14019d436260e514cc77ceb644526c210c0ad96cd329e8a0daae862671944501f305ff7a2b59b7c3188fa80
-EBUILD pdns-recursor-4.5.7.ebuild 1883 BLAKE2B 2ecec2518d4676d838dbdb0cc41a8c0dfd551b15e87ea212594bff2a0d1507746b592684339cf21c08257501c632d157e3edb5ab79b55221c658deae2a83096a SHA512 a26b2d6eb3c97bd485c4e56b93f719e01752c7f5c14019d436260e514cc77ceb644526c210c0ad96cd329e8a0daae862671944501f305ff7a2b59b7c3188fa80
+EBUILD pdns-recursor-4.5.7.ebuild 1882 BLAKE2B 9bac176affd6cb7cdacf908de6b1ffb36615606102840d0c52053f21863a62ff69f3d2cc2756c68b46278b17f6498f07909a6b6c6fec1dd751a8a713c2b58eb5 SHA512 7a51c74ea284045cf6872db7a4ba9b697d1416972a405273411b3fa1c0b220e78849651e5df8f08077de95882a376b331079dd83b8f1a8d450c3665f3583ce3d
+EBUILD pdns-recursor-4.6.0.ebuild 1883 BLAKE2B 2ecec2518d4676d838dbdb0cc41a8c0dfd551b15e87ea212594bff2a0d1507746b592684339cf21c08257501c632d157e3edb5ab79b55221c658deae2a83096a SHA512 a26b2d6eb3c97bd485c4e56b93f719e01752c7f5c14019d436260e514cc77ceb644526c210c0ad96cd329e8a0daae862671944501f305ff7a2b59b7c3188fa80
 MISC metadata.xml 1009 BLAKE2B a35c31c4e5478addf07b90464caf1068c7780801f2da35023fb8226e2d64b055378b8020e4dedc9b7795cf8df94500cfd116ebb3196ee27f1ebe83befb453e89 SHA512 2b0ea758d5ab725c1142c9e5abf66fcb7c7fb7916f76a0871e975624de415ba48fbd2a45bcff4afc4cf19bb40f978f1093b4db356e83d8312fda860565d28497
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.7.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.7.ebuild
index dc546d8cd6ca..6233a790ac76 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.4.7.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug dnstap protobuf snmp sodium systemd test"
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	dnstap? ( protobuf )"
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.5.7.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.5.7.ebuild
index 391869be2aec..cf3bf318576d 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.5.7.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.5.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug dnstap snmp sodium systemd test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.6.0.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.6.0.ebuild
new file mode 100644
index 000000000000..391869be2aec
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.6.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug dnstap snmp sodium systemd test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}
+	dnstap? ( dev-libs/fstrm )
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
+		$(use_with sodium libsodium) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 96513d33da2d..1afb98091acc 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -2,9 +2,11 @@ AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf40345342288
 AUX pdns-4.4.1-boost-1.76.patch 830 BLAKE2B b74f9deece5c1bd71f6c3df571f288cbab01c567be4236bb3f94187e076fef461d8cc45e2bbe905adb83cbc785f00f91d191e30745ce42325d902b36f73c9b06 SHA512 0ab0a02d30ee5c8aa0b906c1a58e94b7e8aba8e382f963b528b52c926f000ccf00687a0445e0de5b3ab875910e4affd1f1697d4cab7a4e72d558790abd85112d
 AUX pdns-r1 2815 BLAKE2B cd607cb30a94540eca9cfa2defb7c996f6e151875fcaad8ad3357261937868bc346962f1080ad45a0ef38c2dfc126eb11e41837ee0784f677d1e7c071589a057 SHA512 4c0442d8d92d95268d4971f80782d2772e2a22c43da00566a9328c79a834e4355b2610d133034351d7137ed6cd7fda300f3db8093b09d5852cea44d983de1e39
 DIST pdns-4.4.1.tar.bz2 1276990 BLAKE2B 9771cf3273ab7e8ab4607a91563bfe0dc3f4532b5420861d816eacd2798d66de3a1eb824c191264f9106ec47bd6003d99108b8df678190055948779b9b3b070f SHA512 a6f31972f77ded8ecfb523e8810dd90e5b7aa628746fee2a9a0daae2a7935800f111ce8617ffd71d5ce3881947d4ffc36c9cb37996a7bcc514536bb4abe1f79e
+DIST pdns-4.4.2.tar.bz2 1273410 BLAKE2B 71c6bdf9e6253babb69e221b7fbc9e500dc92cdd8ba14a1ec2b22986355663f66ddb72579dde42eb4532206263e74a874ea1ce23b3407a019c30b9ca10a2f04a SHA512 cf96a55179f19f75972bcd636b858c9d112662d0007b8895deeea7737f6f348d4318ecb5d2c2e77f66d1af82575a0f9a3207e16da1e70fc8bb316226f9252205
 DIST pdns-4.5.1.tar.bz2 1274965 BLAKE2B 8b1f91b425f02af5a1f6b8a22fe5e689fb9854686058c7ae2dbac5fe29c9562f9a4fff829fe6b7aad595e1fe2a55af19d09d4b002ec8f88115887cb8a74d042b SHA512 428be2bea0d39613fe31def9116c0d3dbfc95eac953ca058df088f06a971a5a1a49067f83c99719af2657e7abcf2e7c471311bd26a1ebf1bae2bd70e1a823fca
 DIST pdns-4.5.2.tar.bz2 1266572 BLAKE2B 9bd3d391e32c4040cc916003a45d47784ea309dd43a326919e2ca5415e1a1c542d5937cf1570951a4100a524a933aa9c0114ef8e28957f64acb6f7a7fa18e237 SHA512 0a183d8c0bb517799afa0f9382e3c06ad3c6e9c871b7912073a860364ca97dc121be2372080100677db10601c8ef96ad56b10787c02a9a9ede82f8a1cc904c6e
 EBUILD pdns-4.4.1-r1.ebuild 4434 BLAKE2B b8c4b2cac53e10b6946f725f11a196bf493778d23d5c477017174b12582903857d042d17ba433562f2facaed744bc7ca410e16813e037225c4ead8ea589a1412 SHA512 f01f4269774b4a089bed02059f3978b0b385aa7e8f60ad888c6bdcd660e7ccce722cfa599b5e7a1b580918b82e8228d79bfd882715951ff1a2899d1447cad07f
+EBUILD pdns-4.4.2.ebuild 4443 BLAKE2B 01fdd8fdd7934d128577e72e21368483f9de515a934485985f1da423d49512f981074ff6ec46ea475fea28c0fc1b6cfd2d5b2c731928e2f7eccf7bc275b31f00 SHA512 b5a8ca2bfee440b3c9942d650e4c52cb296888bb38ffd5fe30fd27356c41f02a015bebe5dca0e1e31a8a685563b2c071aa2087fd8620b126145aa1c72054182d
 EBUILD pdns-4.5.1.ebuild 4262 BLAKE2B a8147ef384ec84d649777dc8518005e485d6c545723a23781a390eb1458febc09493a5c963ec6a1a5ae5acde8d25a99abed4bb450656bc6d5d932345c5f43e7d SHA512 7e7a13149ccaf8babf9170fd8848d5539ffa330d0fc328595d1cc679fbb6267d15b8ff77d8589063a7741f44bb0b0de5af7cf8fdf0629ac30da6a2d0d7289a62
-EBUILD pdns-4.5.2.ebuild 4263 BLAKE2B eed3e10fdf31bde3829996fac97a546b32b8a7d577b950f4ad75a1165f049fd11c0d5f48860e1e9bd33962efc6a16d5cd844ae207126544adb5a7346461c5e0f SHA512 d2834f32e60ed30058aac76f2af2c66601af07db860db87eaa54d79072f56ed24fcf8d2145a846790b0b4abf46a4e03309939ff68e60864bdfe00f11fc95bb23
+EBUILD pdns-4.5.2.ebuild 4262 BLAKE2B a8147ef384ec84d649777dc8518005e485d6c545723a23781a390eb1458febc09493a5c963ec6a1a5ae5acde8d25a99abed4bb450656bc6d5d932345c5f43e7d SHA512 7e7a13149ccaf8babf9170fd8848d5539ffa330d0fc328595d1cc679fbb6267d15b8ff77d8589063a7741f44bb0b0de5af7cf8fdf0629ac30da6a2d0d7289a62
 MISC metadata.xml 1112 BLAKE2B 1f422022f67b5667b7b2be3947316580c339738e624ddef0b7a7331cc8490633a054d96411892435f7982db74c7ff6c1b9702eb6c526d7e15afcd76049f040e9 SHA512 e9efc6f8ec5039249fa7d965ce1d4ef2c666813b554dba3fd289d326b4074df03555c4d5aee41101701a18e0b14166d3b3e340f55752a88acf2fbd6b16c8be79
diff --git a/net-dns/pdns/pdns-4.4.2.ebuild b/net-dns/pdns/pdns-4.4.2.ebuild
new file mode 100644
index 000000000000..20d36e3033f3
--- /dev/null
+++ b/net-dns/pdns/pdns-4.4.2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit autotools lua-single
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+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}
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.35:=
+	lua-records? ( >=net-misc/curl-7.21.3 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
+	sodium? ( dev-libs/libsodium:= )
+	tinydns? ( >=dev-db/tinycdb-0.77 )
+	protobuf? ( dev-libs/protobuf )"
+RDEPEND="${DEPEND}
+	acct-user/pdns
+	acct-group/pdns"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+S="${WORKDIR}"/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.1-boost-1.76.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local dynmodules="pipe bind" # the default backends, always enabled
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	#use oracle && dynmodules+=" goracle oracle"
+	use postgres && dynmodules+=" gpgsql"
+	use remote && dynmodules+=" remote"
+	use sqlite && dynmodules+=" gsqlite3"
+	use tinydns && dynmodules+=" tinydns"
+	use geoip && dynmodules+=" geoip"
+	#use xdb && dynmodules+=" xdb"
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-modules= \
+		--with-dynmodules="${dynmodules}" \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable lua-records) \
+		$(use_enable test unit-tests) \
+		$(use_enable tools) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		$(use_with protobuf) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	newinitd "${FILESDIR}"/pdns-r1 pdns
+
+	keepdir /var/empty
+
+	if use doc; then
+		docinto html
+		dodoc -r codedocs/html/.
+	fi
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	local old
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 3.2 || continue
+
+		echo
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/powerdns"
+		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
+
+		break
+	done
+
+	if use postgres; then
+		for old in ${REPLACING_VERSIONS}; do
+			ver_test ${old} -lt 4.1.11-r1 || continue
+
+			echo
+			ewarn "PowerDNS 4.1.11 contains a security fix for the PostgreSQL backend."
+			ewarn "This security fix needs to be applied manually to the database schema."
+			ewarn "Please refer to the official security advisory for more information:"
+			ewarn
+			ewarn "  https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-06.html"
+
+			break
+		done
+	fi
+}
diff --git a/net-dns/pdns/pdns-4.5.2.ebuild b/net-dns/pdns/pdns-4.5.2.ebuild
index e7f30951d52c..66c6adee6b61 100644
--- a/net-dns/pdns/pdns-4.5.2.ebuild
+++ b/net-dns/pdns/pdns-4.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # other possible flags:
 # db2: we lack the dep
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index c00d4d1ce0f3..14b3e8892785 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -7,11 +7,8 @@ AUX unbound-r1.initd 3901 BLAKE2B d8db1b5342781566f57d801d077aec20d7911a39d5a453
 AUX unbound.service 247 BLAKE2B d986319f9b43600d4f6443f50e214efd39fd20be6a7067b55f98b82cb5d2c12c85b7db2a3c9ced0caf3db303f1ff0fd4eff511dbede3ab101e4b558681872351 SHA512 7904225d0e9fb3ea5b97521ed24f24fcc4db650cfff8523b896ddd9edfccbd61e817775ad0449acf30d02dba5f714d633b60cace6010d472f438df7c22381dfc
 AUX unbound.socket 101 BLAKE2B 4885d311873d7f3e5daf1c0a63798b13761b7c0bfb1bead0bde11bc2a2a994d55670c992b42ea1b4bbee98d04a12f4e7e7517bd0e9caa74d8cac2d1dc0c33274 SHA512 935ab3bd5bc3d3347e44c20482aa19396d243b89f2dbc7bf9f89b16a2559715866e16dfd9f5c4866222d8ee968f158a773475d94629f0ef9fa9b8fd23f0fbc2e
 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
 DIST unbound-1.13.2.tar.gz 6127915 BLAKE2B 71806edc86b323ff1f9f2d7bd3f699b15da2cd1cfefe9ca6008d74915dd6c7b45690026fb0244531ae563a3ca1b142f21fc8aed97ba4bb0015d8ab9196ff045a SHA512 1e89441446e7a25c6a49bded645f8b348c1758c3be54e3a986041cb1f00c45d152fd469dc52666fb820574db9d51b16f1627dc8afcb9519508d4833ca358191a
-EBUILD unbound-1.13.0-r4.ebuild 5997 BLAKE2B 71c2346478513cca62bb52f72f28a58e90e9976ea39213420b19c8d8e5665a14889f95ce872030a13bdd15cca86bc8cdbd488a9802798ee21506d771ce90e6cb SHA512 a985a96c7359bdc9c7e10b52f83a1158f1a092a384194780b7b6f9335d8e83ea0a3c228b7d912372219cbd8ab6d1ad593e2b070bdb197335dcadfa896dfa9e47
-EBUILD unbound-1.13.0-r5.ebuild 6048 BLAKE2B 2a8e24f6dbe2d4d6913308e03d2c52368570d9396328f58ab0eedcb754adc12c03138f81c220b8225934f6d92c2f2a5f5c07547f2d52cd4c25eea89c76fa60e2 SHA512 e5da3d935ff2c98affb300a96dfc9555e0a56454246f1c6ccf6800d988871ed19128ddb02a595d41ed551274be88d571549edc2074addf997f58139c2c3d16f4
-EBUILD unbound-1.13.1-r2.ebuild 6043 BLAKE2B c945879e1938887f99a513d00ed76f3bad9e4b98e16cab132e7587c885f330bbaa9b167c024d34e7e524aa99b3c81a509bb84c36ada1bff5ec29b8f1457880d8 SHA512 7e9c405b21f143105654357c909da068769650555ae680c67eca67d0e841ca4fc6e0aee1580966666e89f8a711e710aa727e642a63d81202b25db6a9d8d3da41
+EBUILD unbound-1.13.1-r3.ebuild 6088 BLAKE2B a59345ef64e907346092bff8160a41fe00b0a02c123e920cb177161e9093bef6017f41ee7ce41edde432ac21aefeeb2d5e87500aeffdabc04031f29309299e4d SHA512 632ff673ff3076bf80a29bff1fce1eaef334571d11d1acb27a5ce562ade71bd0fb5bebe5f9a236fad38c9dcf2655aee29e022465714163483380435b7103a7f1
 EBUILD unbound-1.13.2-r1.ebuild 6121 BLAKE2B 9eb2fa4b978bfcd7b97ba800925d928bcf02353d956e6178d340e3449a57413f8b2c58c3741b9a9b4d19d9dcf630e811a4e9528e0563f657b70c5b7c39fde5fd SHA512 6edcdc6d1ee9f6e1b7d674068e7b36092c077c4ef55c56d6238a1f20f43cc7718f742219c2e728378063045d62859f893275649aa1de2c08147a2f8ac1323386
 MISC metadata.xml 1593 BLAKE2B d262cac4efcdc37b123fa3098212f0d3b0e948cadd5afab491696568b8c83e2f72844f482ba10b27fec2d319de2a7b8c7befe58302296808ab521cfe5af091cd SHA512 38bbc03a0263d83b7aa8ad08e0032d158612a3820667a4c8c19e3e0073f9f644792bfc5acc6b2f7ae658abc36a321f844d5dd14d13adfb6b0173e86387ddebc2
diff --git a/net-dns/unbound/unbound-1.13.0-r4.ebuild b/net-dns/unbound/unbound-1.13.0-r4.ebuild
deleted file mode 100644
index 22dc5675ff0b..000000000000
--- a/net-dns/unbound/unbound-1.13.0-r4.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
-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 python redis selinux static-libs systemd test threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# Note: expat is needed by executable only but the Makefile is custom
-# and doesn't make it possible to easily install the library without
-# the executables. MULTILIB_USEDEP may be dropped once build system
-# is fixed.
-
-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}]
-	>=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? (
-		dev-libs/openssl:0[-bindist(-)]
-	)
-	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( dev-libs/hiredis:= )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)
-	systemd? ( sys-apps/systemd )"
-
-RDEPEND="${CDEPEND}
-	net-dns/dnssec-root
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
-	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
-	"${FILESDIR}"/${PN}-1.10.1-find-ar.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# required for the python part
-	multilib_copy_sources
-}
-
-src_configure() {
-	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable gost) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_enable ecdsa) \
-		$(use_enable ecs subnet) \
-		$(multilib_native_use_enable redis cachedb) \
-		$(use_enable static-libs static) \
-		$(use_enable systemd) \
-		$(multilib_native_use_with python pythonmodule) \
-		$(multilib_native_use_with python pyunbound) \
-		$(use_with threads pthreads) \
-		$(use_with http2 libnghttp2) \
-		--disable-flto \
-		--disable-rpath \
-		--enable-event-api \
-		--enable-ipsecmod \
-		--enable-tfo-client \
-		--enable-tfo-server \
-		--with-libevent="${EPREFIX}"/usr \
-		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
-		--with-pidfile="${EPREFIX}"/run/unbound.pid \
-		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
-		--with-ssl="${EPREFIX}"/usr \
-		--with-libexpat="${EPREFIX}"/usr
-
-		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
-		# $(use_enable debug lock-checks) \
-		# $(use_enable debug alloc-checks) \
-		# $(use_enable debug alloc-lite) \
-		# $(use_enable debug alloc-nonregional) \
-}
-
-multilib_src_install_all() {
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound-r1.initd unbound
-	newconfd "${FILESDIR}"/unbound-r1.confd unbound
-
-	systemd_dounit "${FILESDIR}"/unbound.service
-	systemd_dounit "${FILESDIR}"/unbound.socket
-	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
-	systemd_dounit "${FILESDIR}"/unbound-anchor.service
-
-	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
-
-	# bug #315519
-	dodoc contrib/unbound_munin_
-
-	docinto selinux
-	dodoc contrib/selinux/*
-
-	exeinto /usr/share/${PN}
-	doexe contrib/update-anchor.sh
-
-	# create space for auto-trust-anchor-file...
-	keepdir /etc/unbound/var
-	fowners root:unbound /etc/unbound/var
-	fperms 0770 /etc/unbound/var
-	# ... and point example config to it
-	sed -i \
-		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
-		"${ED}/etc/unbound/unbound.conf" \
-		|| die
-
-	# Used to store cache data
-	keepdir /var/lib/${PN}
-	fowners root:unbound /var/lib/${PN}
-	fperms 0770 /var/lib/${PN}
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then
-		einfo "Trying to create unbound control key ..."
-		if ! unbound-control-setup &>/dev/null ; then
-			ewarn "Failed to create unbound control key!"
-		fi
-	fi
-
-	if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then
-		einfo ""
-		einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
-		einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
-		einfo "and run"
-		einfo ""
-		einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
-		einfo ""
-		einfo "as root to create it initially before starting unbound for the first time after enabling this."
-		einfo ""
-	fi
-
-	# Our user is not available on prefix
-	use prefix && return
-
-	local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null
-	if [ $? -ne 0 ] ; then
-		ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!"
-		ewarn "Run the following commands to restore default permission:"
-		ewarn ""
-		ewarn "    chown root:unbound ${EPREFIX}/etc/unbound/var"
-		ewarn "    chmod 0770 ${EPREFIX}/etc/unbound/var"
-	else
-		# Cleanup -- no reason to die here!
-		rm -f "${_perm_check_testfile}"
-	fi
-}
diff --git a/net-dns/unbound/unbound-1.13.0-r5.ebuild b/net-dns/unbound/unbound-1.13.0-r5.ebuild
deleted file mode 100644
index 599a521515cc..000000000000
--- a/net-dns/unbound/unbound-1.13.0-r5.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
-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 python redis selinux static-libs systemd test threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# Note: expat is needed by executable only but the Makefile is custom
-# and doesn't make it possible to easily install the library without
-# the executables. MULTILIB_USEDEP may be dropped once build system
-# is fixed.
-
-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}]
-	>=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? (
-		dev-libs/openssl:0[-bindist(-)]
-	)
-	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( dev-libs/hiredis:= )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)
-	systemd? ( sys-apps/systemd )"
-
-RDEPEND="${CDEPEND}
-	net-dns/dnssec-root
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
-	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
-	"${FILESDIR}"/${PN}-1.10.1-find-ar.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# required for the python part
-	multilib_copy_sources
-}
-
-src_configure() {
-	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable gost) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_enable ecdsa) \
-		$(use_enable ecs subnet) \
-		$(multilib_native_use_enable redis cachedb) \
-		$(use_enable static-libs static) \
-		$(use_enable systemd) \
-		$(multilib_native_use_with python pythonmodule) \
-		$(multilib_native_use_with python pyunbound) \
-		$(use_with threads pthreads) \
-		$(use_with http2 libnghttp2) \
-		--disable-flto \
-		--disable-rpath \
-		--enable-event-api \
-		--enable-ipsecmod \
-		--enable-tfo-client \
-		--enable-tfo-server \
-		--with-libevent="${EPREFIX}"/usr \
-		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
-		--with-pidfile="${EPREFIX}"/run/unbound.pid \
-		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
-		--with-ssl="${EPREFIX}"/usr \
-		--with-libexpat="${EPREFIX}"/usr
-
-		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
-		# $(use_enable debug lock-checks) \
-		# $(use_enable debug alloc-checks) \
-		# $(use_enable debug alloc-lite) \
-		# $(use_enable debug alloc-nonregional) \
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	systemd_dounit contrib/unbound.service
-	systemd_dounit contrib/unbound.socket
-}
-
-multilib_src_install_all() {
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound-r1.initd unbound
-	newconfd "${FILESDIR}"/unbound-r1.confd unbound
-
-	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
-	systemd_dounit "${FILESDIR}"/unbound-anchor.service
-
-	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
-
-	# bug #315519
-	dodoc contrib/unbound_munin_
-
-	docinto selinux
-	dodoc contrib/selinux/*
-
-	exeinto /usr/share/${PN}
-	doexe contrib/update-anchor.sh
-
-	# create space for auto-trust-anchor-file...
-	keepdir /etc/unbound/var
-	fowners root:unbound /etc/unbound/var
-	fperms 0770 /etc/unbound/var
-	# ... and point example config to it
-	sed -i \
-		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
-		"${ED}/etc/unbound/unbound.conf" \
-		|| die
-
-	# Used to store cache data
-	keepdir /var/lib/${PN}
-	fowners root:unbound /var/lib/${PN}
-	fperms 0770 /var/lib/${PN}
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then
-		einfo "Trying to create unbound control key ..."
-		if ! unbound-control-setup &>/dev/null ; then
-			ewarn "Failed to create unbound control key!"
-		fi
-	fi
-
-	if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then
-		einfo ""
-		einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
-		einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
-		einfo "and run"
-		einfo ""
-		einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
-		einfo ""
-		einfo "as root to create it initially before starting unbound for the first time after enabling this."
-		einfo ""
-	fi
-
-	# Our user is not available on prefix
-	use prefix && return
-
-	local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null
-	if [ $? -ne 0 ] ; then
-		ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!"
-		ewarn "Run the following commands to restore default permission:"
-		ewarn ""
-		ewarn "    chown root:unbound ${EPREFIX}/etc/unbound/var"
-		ewarn "    chmod 0770 ${EPREFIX}/etc/unbound/var"
-	else
-		# Cleanup -- no reason to die here!
-		rm -f "${_perm_check_testfile}"
-	fi
-}
diff --git a/net-dns/unbound/unbound-1.13.1-r2.ebuild b/net-dns/unbound/unbound-1.13.1-r3.ebuild
index 4e6c754e33c2..899aeefb9daf 100644
--- a/net-dns/unbound/unbound-1.13.1-r2.ebuild
+++ b/net-dns/unbound/unbound-1.13.1-r3.ebuild
@@ -45,7 +45,10 @@ BDEPEND="virtual/pkgconfig"
 DEPEND="${CDEPEND}
 	python? ( dev-lang/swig )
 	test? (
-		net-dns/ldns-utils[examples]
+		|| (
+			net-libs/ldns[examples(-)]
+			net-dns/ldns-utils[examples(-)]
+		)
 		dev-util/splint
 		app-text/wdiff
 	)