gentoo resync : 15.06.2021

33 files changed, 623 insertions, 215 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index e4d4dd69d450..8905948664ab 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 6beba8441faa..65a4e00e181a 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -10,5 +10,5 @@ AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d950383
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.16.15.tar.xz 5025688 BLAKE2B 8b0723d46f812793f5a52b1ddacf21fe28e183ef8cd166eadf0af163280021fce7c0a6a560d28dacbc6dd4642e41eb5424b4de2c5ff1049a5cfa5d52e3df5beb SHA512 30dad6e2144b3ac53ef0a2d1ed3c8342120f148fc0eb6409113a6d5ed3444eecb917915fdf39c26fd223396fc1e873410a50da305f0b870864f7fbbdccec8033
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.16.15.ebuild 10944 BLAKE2B bb8fcb29e3909febd30c7e5a29ec61c597ce3af26ce88cde7e5fa4a3b0aa8c13374fea0c6606c5e52227987138dff9c812dbd3e5a2858981f9b13b39aadfb075 SHA512 44fedc1dc6ac165bc490accdd7e3b81db1a1f9cd7641520846500fdf6eb86d5e9190594790189d1253cc7586b7b0c4284cc8fb00de0f0f06c22937464e6881a3
+EBUILD bind-9.16.15.ebuild 10943 BLAKE2B 95cad163085f994fb9b19c998d27afe28a0690a9f2292a8226f019a74008198fd9d30f6ed9490c12b9267be94576a6724cc765946fb6dc2438af695d0a07c5a4 SHA512 8f71bbecf3bdc96f87a4540cba0759b5174da67478b50c1d67054ed4e338521d39ca738064a3f71da36ae9bed1faa27e25447ed3582ae9a19821ffd2a9d3fe93
 MISC metadata.xml 973 BLAKE2B 9e2cd4d34c8cd9f6bc860c667d2440e7916dfa7ca343e578d7c089b3f45db3b1fbdd79d14ccf1af7fc25115316c42304dc635f1aec78d47eee1fec5c1a09aa43 SHA512 87ee75e39604d9839f849763f2b1675e6d13835dc482bcecd729e6c8416ef90d76edd8e5c5ec87b9e4eb0aa416fb7dc74143bc29cbce02ac3a83eaaa5a88f012
diff --git a/net-dns/bind/bind-9.16.15.ebuild b/net-dns/bind/bind-9.16.15.ebuild
index 9fab32caeb82..d4149f3a69aa 100644
--- a/net-dns/bind/bind-9.16.15.ebuild
+++ b/net-dns/bind/bind-9.16.15.ebuild
@@ -35,7 +35,7 @@ LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 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
+IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
 json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib"
 # sdb-ldap - patch broken
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 6683c384e09a..f4ef07776626 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,8 +1,9 @@
+AUX dnsdist-1.6.0-gcc11-missing-include.patch 687 BLAKE2B 451ff9444ddedfd819b9a138a16ff9a9813fbeb9f26d4d624b8d0614b9460a05b529dd1f8393cf11c340bd48324ee63f8f3ea0dd78cf3c8497dc8f7108aaab9c SHA512 696be859ab657f66ea17eb6e6cca642e1e33f42d218d99556e4c7edfa6ddc2f7050c4d53e782bbdec7cb49580df290f124c9159d931c47eabf84ed3e3f8f63d8
 AUX dnsdist.conf.example 524 BLAKE2B e9d140129dfbd276d1fb927d73bee4e4c29920ae70d587765ea5d432f02694b1a8583340c2e14e191bbdf5ddd5b921274cb2336c3520839d7cfe6f399a4d6c26 SHA512 385bee5725d927feb50fc0f40cd48cd365a495e39c0d947aa53dc454d84b7fe3806cd1d206056c96d111e7251db2cda27570ff8154c70bed145d37bc7d1db01d
 AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e46744160298456c86a9d9bbf65d1a339c0c13db4c796efb7c3adba01110882542fe501c735c9dd190f92 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f
 AUX dnsdist.initd 1337 BLAKE2B e2619182674439be6942a0a936208326c12cfc2839bba4fd6a2ca3653ac6083458ebf2b644d2db63c187ed33ba2bef3437680714bb76dfc7632e1b62149a6f6a SHA512 99e38a58c97dd206ea82ffc783102feaa28f74bec5e03c1790e2db0f428f8228eec43617b2c951f22320e10dbd42ddfbf40650fed28608428f9c48eec3640a8d
 DIST dnsdist-1.5.1.tar.bz2 1068061 BLAKE2B 1c0fdd181b62b96fcd433581715cea9dc204fcdd2f65efd26a5293cc9c17d904e0937b51ba33d2dc01ecc8044f491ba2c6c8720c0816587fa5082da73108783e SHA512 68fe5f55fd081ed80a620933af9f8310be0e21c86ba449a9c557975b5c83f4b64e3002e6032dc002582d081e70e1ec2ff080c5d8389fd46a9896bdafd5a41f9f
 DIST dnsdist-1.6.0.tar.bz2 1328707 BLAKE2B d093142875882cacaa456d76d42e703e45577c32a0e5d5024fb372180d2bdd4ff0c82546142f6c2c01904bdd15407f0a39dc1d658e04e171cffe386cfc1e943d SHA512 f6a1676c431d5622af075bc184c9f82b4ea0bb40ec84797a8fe835804f91bc0a93a745495f193bb52f3a5204ec0e98ed41bc206c997d1f5b13e872bb31747b0f
 EBUILD dnsdist-1.5.1-r100.ebuild 2294 BLAKE2B f8e88f0caba126be55c3ad6524be37321da60dba6f50e0cc07be0a70eb5897f35f361090fb1319ed2c08dd7fc38684d12c517ba782deeb3b54c8585d11f77dd9 SHA512 d65e938918fbd2b35a807d48cbe8466a2c6c705b3b18147bd4a79e77f7fd4775835c1ce8b05feaa7f7d4c24e92338a44197e2902db5b39b8451a518689749268
-EBUILD dnsdist-1.6.0.ebuild 2289 BLAKE2B ec1dc414c75e92a4ed971a1dfc371b456766d70cac863d70e33ddb36048f78ebb9e58ecd22fa325609bba6dd2622131f07837c56476a90f9accbb568dc81dec7 SHA512 b09f04f1a4cb602137f75ee5e3085c4f834cd8cfb11ed874b22900e99f90803132830fcac469184158529d357a4785948e5148200f2446704da5d2565cd4b3fd
+EBUILD dnsdist-1.6.0.ebuild 2269 BLAKE2B 1a23ebd28849897dd3d62a312be60222da8b9048cb32ad21214b726b24fffa4bd43c4bc104fa4f367b4e07af51933b3c0c885f03e163f90a459ca91524aaf35d SHA512 8466bc936352defae74c6a9d4f19c970399b251b0eeb3f0fd59f3e2e922f88576be257006ff9e69c54a19d1aaa64ac2498ad2ad7c8329eedbfd4e382345929de
 MISC metadata.xml 1130 BLAKE2B fead1e2f8167ad41c84c3b03ab49d1ebfed6725adf55e4db2b23d099b12e01023742e8fd6e60799946f5a3ba7fb97fe29106efd3eca7dafbb1405e6ff30b97c0 SHA512 b987d96fd24ed1092f1f419c35cedd53502b4013efbfb6bf729dc5c721b96de0b2a701435593d679d452ba390e9f8e136f8658d6758f2b92c3fd02dfd40ec056
diff --git a/net-dns/dnsdist/dnsdist-1.6.0.ebuild b/net-dns/dnsdist/dnsdist-1.6.0.ebuild
index 3340f22db784..84866fb8314e 100644
--- a/net-dns/dnsdist/dnsdist-1.6.0.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.6.0.ebuild
@@ -26,12 +26,12 @@ RDEPEND="acct-group/dnsdist
 	acct-user/dnsdist
 	>=dev-libs/boost-1.35:=
 	dev-libs/libedit:=
+	>=dev-libs/protobuf-3:=
 	dnscrypt? ( dev-libs/libsodium:= )
 	dnstap? ( dev-libs/fstrm:= )
 	doh? ( www-servers/h2o:=[libh2o] )
 	lmdb? ( dev-db/lmdb:= )
 	regex? ( dev-libs/re2:= )
-	remote-logging? ( >=dev-libs/protobuf-3:= )
 	snmp? ( net-analyzer/net-snmp:= )
 	ssl? (
 		gnutls? ( net-libs/gnutls:= )
@@ -44,9 +44,9 @@ RDEPEND="acct-group/dnsdist
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	default
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-gcc11-missing-include.patch
+)
 
 src_configure() {
 	econf \
@@ -57,7 +57,6 @@ src_configure() {
 		$(use_enable dnstap) \
 		$(use_with lmdb ) \
 		$(use_with regex re2) \
-		$(use_with remote-logging protobuf) \
 		$(use_with snmp net-snmp) \
 		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
 		$(use_enable systemd) \
diff --git a/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch b/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch
new file mode 100644
index 000000000000..6e549b2450ee
--- /dev/null
+++ b/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/790719
+https://github.com/hhoffstaette/portage/blob/master/net-dns/dnsdist/files/dnsdist-1.6.0-add-missing-include.patch
+
+From: Kees Monshouwer <mind04@monshouwer.org>
+Date: Tue, 11 May 2021 10:27:01 +0200
+Subject: [PATCH] add missing includes (Fedora 34, gcc 11.1 / clang 12)
+
+[HH: reduced to necessary patch for dnsdist]
+---
+ lock.hh      | 1 +
+ 1 file changed, 1 insertions(+)
+
+diff --git a/lock.hh b/lock.hh
+index 09299d7979d..0644502f871 100644
+--- a/lock.hh
++++ b/lock.hh
+@@ -20,6 +20,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ #pragma once
++#include <mutex>
+ #include <shared_mutex>
+ 
+ class ReadWriteLock
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 14f37b93957d..51c1d764cd29 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,4 +1,5 @@
 AUX getdns-1.4.2-stubby.service.patch 568 BLAKE2B f2e605116f924b109bf2cd734c8eb79314aeb02b0e30e2fd8d62117b44a74f20e64b1b527253a09525ad9ab26aa2a64a51940773064de87e295d1831dfe9e51b SHA512 67c88787d48662d5c555cd2cdff5916a2211aaf45a13b41e0a909d703dcbc66cb3de834cc94b7c3d292d16a99d024b07098b4e0bb1c790e48201ca9ffb598bd2
+AUX getdns-1.7.0-docdir.patch 769 BLAKE2B d6eabd639382b1fdaefb344c440dabbdcd5a61e5999a31d8565c994baf80bb9a05efad6cd54dd5dd871c4d6c4b05febb9302a68c8bb36184b5d024c5f6fcfd30 SHA512 7eb0895ca0707f396a326469b3ecf09e43cb52f7d83e2288570f88b13cc884770a2aa634f8f0128ee38c2f4ea43074e80797ae8c07788dcca66706af2cd050b7
 AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c
 AUX stubby.initd-r1 636 BLAKE2B 1f8e96c0b844837af8d46f12c80750979be3e763bd7ac08b956f69a8fd4fd9cdf018cc666e1fc47a324ee3960e358489e01b8da6d7d09cae8dffe9cff1b38b90 SHA512 556c35dbcdc157668308e502895519e73fa723074bc8cb1d7cbfd762e0831a584be67a9204744dad17ff4ffaaf9b97b67ed60acfc6ef56e44e240c51d2f783b0
 AUX stubby.initd-r2 685 BLAKE2B d079db5129c02d7b4bdbfdd28733426b39f9e094e76f14e5a32b948f40717faa1886f9093059ddca9e4cd58e6621e06ff75ff94ef713338b1e0335785274f954 SHA512 11b9a6d1a60543ed6e897c87b9c78c72a241388486f1d389918f5a11176a208d885e641fe304bd2ca91284861e37422b8c387ebc8aaa820093b3e70d31b28cf1
@@ -6,7 +7,9 @@ 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
+DIST getdns-1.7.0.tar.gz 690885 BLAKE2B 25e81c01c5da0a5494dc25077257f8f98210b442b7ca65c895aa2a40af180e840aa53205ae84ed242cbd6c55f8830caf255db9d7f607dde39f118ab7494a7072 SHA512 d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6
 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
+EBUILD getdns-1.7.0.ebuild 2205 BLAKE2B 285d36c359549142a8038426220cc5a8b55a536ea92a56ba4982d51e7badfcfa9f738fbb1391d01a3cd940e6be6db1ab38004eef696ece5953f0f5f0d1b110af SHA512 c56e15e027e77f28d99ada24268a581079b75e4998bd76335574345d86d2c27eb93762f2c3d47d596f2f76f58a29ee0f9657ce7ce9e3c20a88967b7158fcc80d
 MISC metadata.xml 823 BLAKE2B 6f036445b01fd8b4c4a0ddac2f04ed45cb980dc31ca5aa5a25b5da8272541ab7b8d6b6d9fcd8b3d122de378a71b2e8f1dffa158da6a0db84d7e61b9e6f8d134b SHA512 2ac45a84c1d38e601cc9a1bb2af25a4843b8b43902736fce9fe8fba7fb6a2f6b98c020e4a76c8443526c51af7f91602daa01e84e69fe29bc838ad79eb147ded2
diff --git a/net-dns/getdns/files/getdns-1.7.0-docdir.patch b/net-dns/getdns/files/getdns-1.7.0-docdir.patch
new file mode 100644
index 000000000000..e674a3b2b81d
--- /dev/null
+++ b/net-dns/getdns/files/getdns-1.7.0-docdir.patch
@@ -0,0 +1,15 @@
+https://github.com/getdnsapi/getdns/pull/509
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1101,9 +1101,8 @@ endif ()
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man)
+ 
+-set(docdir share/doc/getdns)
+-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir})
+-install(FILES spec/index.html DESTINATION ${docdir}/spec)
++install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
++install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+ install(CODE "message(\"\
diff --git a/net-dns/getdns/files/stubby.initd-r1 b/net-dns/getdns/files/stubby.initd-r1
index e6b799919e28..e6b799919e28 100755..100644
--- a/net-dns/getdns/files/stubby.initd-r1
+++ b/net-dns/getdns/files/stubby.initd-r1
diff --git a/net-dns/getdns/files/stubby.initd-r2 b/net-dns/getdns/files/stubby.initd-r2
index 69e76c0acfdf..69e76c0acfdf 100755..100644
--- a/net-dns/getdns/files/stubby.initd-r2
+++ b/net-dns/getdns/files/stubby.initd-r2
diff --git a/net-dns/getdns/getdns-1.7.0.ebuild b/net-dns/getdns/getdns-1.7.0.ebuild
new file mode 100644
index 000000000000..39b9a79e1866
--- /dev/null
+++ b/net-dns/getdns/getdns-1.7.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+_SRCURI_P="${P/%_beta1/-beta.1}"
+
+inherit cmake fcaps systemd tmpfiles
+
+DESCRIPTION="Modern asynchronous DNS API"
+HOMEPAGE="https://getdnsapi.net/"
+SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby test +unbound"
+
+S="${WORKDIR}/${_SRCURI_P}"
+
+# https://bugs.gentoo.org/661760
+# https://github.com/getdnsapi/getdns/issues/407
+# (As of 1.7.0, seems to need network)
+RESTRICT="test"
+#RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/libbsd
+	dev-libs/libyaml
+	dev-libs/openssl:=
+	idn? ( net-dns/libidn2:= )
+	gnutls? (
+		net-libs/gnutls:0=[dane,openssl]
+		dev-libs/nettle:0=
+	)
+	libev? ( dev-libs/libev:= )
+	libevent? ( dev-libs/libevent:= )
+	libuv? ( dev-libs/libuv:= )
+	test? ( dev-libs/check )
+	>=net-dns/unbound-1.5.9:=
+"
+RDEPEND="
+	${DEPEND}
+	stubby? (
+		acct-group/stubby
+		acct-user/stubby
+		sys-libs/libcap
+	)
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.2-stubby.service.patch"
+	"${FILESDIR}/${PN}-1.7.0-docdir.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_RUNSTATEDIR=/var/run
+		-DBUILD_DOXYGEN=$(usex doc)
+		-DBUILD_GETDNS_QUERY=$(usex getdns-query)
+		-DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon)
+		-DBUILD_STUBBY=$(usex stubby)
+		-DENABLE_STATIC=$(usex static-libs)
+		-DBUILD_TESTING:BOOL=$(usex test)
+		-DENABLE_UNBOUND_EVENT_API=$(usex unbound)
+		-DUSE_GNUTLS=$(usex gnutls)
+		-DUSE_LIBEV=$(usex libev)
+		-DUSE_LIBEVENT2=$(usex libevent)
+		-DUSE_LIBIDN2=$(usex idn)
+		-DUSE_LIBUV=$(usex libuv)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use stubby; then
+		newinitd "${FILESDIR}"/stubby.initd-r2 stubby
+		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/stubby.logrotate stubby
+		systemd_dounit "${S}"/stubby/systemd/stubby.service
+		dotmpfiles "${S}"/stubby/systemd/stubby.conf
+	fi
+}
+
+pkg_postinst() {
+	if use stubby; then
+		fcaps cap_net_bind_service=ei /usr/bin/stubby
+	fi
+}
diff --git a/net-dns/hash-slinger/Manifest b/net-dns/hash-slinger/Manifest
index a8b0e97617db..f2d607461b5b 100644
--- a/net-dns/hash-slinger/Manifest
+++ b/net-dns/hash-slinger/Manifest
@@ -1,3 +1,3 @@
-DIST hash-slinger-3.0.tar.gz 38056 BLAKE2B e72bbddf587225c86ccf7b5c76a48bdece2bf1925a496ae930e9a4973ae47992fea5ca6c0e9e594a1170c0bdbbb3c8712c492c870c8c2e8f523ce247e4e2a4a4 SHA512 7528f267669cdc0c18e1d00c27fff96d915b3143c5534a09c834df3e140035159feeeb8b177528e89cd25265560d0734ef1af94d2f9d28fef47d7ca391e84516
-EBUILD hash-slinger-3.0.ebuild 1234 BLAKE2B d781e3d32bf8d575bc189934d4a8e855447ebd60eef583c25d324483b9d3c8ececaeb0f1a53191ff99231044529d1e4e33c47bceed5f2d12a811242df74418a7 SHA512 5d3c585efe099106080c7e1eaf904285014e97a52ca81ee58368ee37fa78af864039a2486013850734f29e77838265d835c1481f9c5859283447a378d0557306
-MISC metadata.xml 488 BLAKE2B e51e5da837d62c1fefc50f59a31bc8464e1cfdaf770130562b20ad33c8f9b8b5bc604e508eaa5b9087fe59e25fdd3993f5fedc062f0a75ad6ad723234e7e5f6f SHA512 d7d812a2e7a32bd659135bddc88f74b3f882237eba39d96d67ef8a5a53656c64090bfa4535a104e0581c82f2d8e6c69357a314cf8750cb4dd1a5fb421cb3251e
+DIST hash-slinger-3.1.tar.gz 38224 BLAKE2B 35d60b648704e1aa96fbec000ff07c06a31a1f45c58f708fdad1bab464849d4de60963acde9f2c26eb4304454ed1406f698c8007dbf471794f16f26b8ebdb080 SHA512 04ad33b718f716cfd08bd52ee50db81372b7dc13895695e1b23cf904306166b73e388285c7cce8a0a0e5003e783bc61dea4c9ede7a44f22c16e24e2411c7f427
+EBUILD hash-slinger-3.1.ebuild 1167 BLAKE2B a511f5882fd1fbb7c65b78ab317a1f83e077e6a7ce81041d0c5a72d7b3cebe7569708ccab8b2065b284bff16ebb3569d867bf1bfa751f3b0e34fb197b0411a5b SHA512 b278f9532a1603908d3a32fddfd3d754619220788b5d4a3a6343e6cf5ccc23aeedcd643ac88c2308624d53c3b48af4b0c15c3bd9cb806a41c1fcb95575de0112
+MISC metadata.xml 512 BLAKE2B 6038437e45983e453f8738a081665affeb3a7293e0abe727fa7e61f91b9e1a6cb27f799037079b9ae49a94a38c082e48f984c5735988102bd8b5665ab37adb32 SHA512 126df24bc6c1129888d66dc1ecae7b6cf86a3b1f7589a09c08312b89f2edf6f3ed6257c7e78bcc0bb7cfe8cfffdc819c1b725c0f7302152f7f542c79eb04f4de
diff --git a/net-dns/hash-slinger/hash-slinger-3.0.ebuild b/net-dns/hash-slinger/hash-slinger-3.1.ebuild
index 41fb6b403e4e..2f14f5b8fea7 100644
--- a/net-dns/hash-slinger/hash-slinger-3.0.ebuild
+++ b/net-dns/hash-slinger/hash-slinger-3.1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit python-single-r1
 
 DESCRIPTION="Various tools to generate DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY"
 HOMEPAGE="https://github.com/letoams/hash-slinger"
-SRC_URI="https://people.redhat.com/pwouters/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/letoams/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
@@ -19,7 +18,6 @@ IUSE="ipsec +openpgp +ssh"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND=""
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -35,13 +33,17 @@ RDEPEND="
 
 src_install() {
 	local tools tool
+
 	tools="tlsa"
+
 	use ssh	&& tools+=" sshfp"
 	use openpgp && tools+=" openpgpkey"
 	use ipsec && tools+=" ipseckey"
+
 	for tool in $tools ; do
 		doman ${tool}.1
 		python_doscript ${tool}
 	done
+
 	dodoc BUGS CHANGES README
 }
diff --git a/net-dns/hash-slinger/metadata.xml b/net-dns/hash-slinger/metadata.xml
index 33d872e2ba1e..e2488e911def 100644
--- a/net-dns/hash-slinger/metadata.xml
+++ b/net-dns/hash-slinger/metadata.xml
@@ -5,6 +5,7 @@
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="ipsec">Enable support for IPSECKEY records (ipseckey)</flag>
 		<flag name="openpgp">Enable support for OPENPGPKEY records (openpgpkey)</flag>
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 4a534b3394ae..5b41b1eb53fe 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -3,6 +3,8 @@ AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc3
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
 DIST knot-2.9.8.tar.xz 1194284 BLAKE2B c4329e5b2fc499851112d008af10c1a73bbe50cd07a4b5af984e99f389606b6f11c0b321dc26c14f872eb7cc70a99290a033f9aa9ff23a2b3694427605ffc704 SHA512 8104c3bdef2db4a79d6cd0fa4a30be1aa6edfa01363b97738d873445198cd031b4f5ab581d1a5277de49a8a042bb5340334be0579ceefa4b614e34c2cd454904
 DIST knot-3.0.4.tar.xz 1347928 BLAKE2B c97df0c04dbd6b96d2f2805a2bbb07bc3fd0ac64160619a55fdf93ac02e6d3f797dfae43ac8bc79450c59c88e0a521911517577ea19d67bb41186cfcd07dd743 SHA512 d674faaafcbe882539d28e53f1cd6cdda61ca8065f66dc0b9127f249f34b59a9d3d1ac206799c2974a2d38264842a2387db35f814bd05f3eaeac0b35b90b21ac
+DIST knot-3.0.6.tar.xz 1333296 BLAKE2B 74ee1133dbf954234c4b07a29986cb91363256f3450b3d270f6d458d723e89bd1f7434881aa51632f02c369a16ca461e8ab892c34a2cf2ed612aa9040c91d535 SHA512 f1bfb0bc3a4cf622a68562409e71c8b84ee628a5452b48e172148bcac9cd0827b60a0c060075b80a086ca65da958d2d63e33ef7e373ab300b50089d06af3e5d0
 EBUILD knot-2.9.8.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
 EBUILD knot-3.0.4.ebuild 1892 BLAKE2B 0b9a056538b2b5c179a461e3824b208dd6163bd27c5397159a3dffb71620053a3578d3c6f2f49919c1c69af52d362ea07cec26c466f5a2fb3ca78c6ce90ab42b SHA512 d1f68b21197355d902468a008c2f49289fb5b0e2a562887d78ad8329d5895bea3f301e8729dc2f4b57ae209d05c93e38d1fb389ba9fa708f60d32d183a9cd6f5
+EBUILD knot-3.0.6.ebuild 1892 BLAKE2B 0b9a056538b2b5c179a461e3824b208dd6163bd27c5397159a3dffb71620053a3578d3c6f2f49919c1c69af52d362ea07cec26c466f5a2fb3ca78c6ce90ab42b SHA512 d1f68b21197355d902468a008c2f49289fb5b0e2a562887d78ad8329d5895bea3f301e8729dc2f4b57ae209d05c93e38d1fb389ba9fa708f60d32d183a9cd6f5
 MISC metadata.xml 1707 BLAKE2B 6eeedcb9dea44ad97afe8ed57bc529ea23bfa93c72163c566cc527a0284addbaea3f2fed4804853c8fb0431f38691356eae305c32f7e4a1256ef634894ce2a44 SHA512 e555e86949c2671b21e7e62a7aa346417f36ca9953fa45c5a4d1a0a4d46aec8bb4dde6c07121e1f5ebe12116756f3f7daf27455305b9158577f060c6237d047a
diff --git a/net-dns/knot/knot-3.0.6.ebuild b/net-dns/knot/knot-3.0.6.ebuild
new file mode 100644
index 000000000000..ff2ab85cf4eb
--- /dev/null
+++ b/net-dns/knot/knot-3.0.6.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="High-performance authoritative-only DNS server"
+HOMEPAGE="https://www.knot-dns.cz/"
+SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+KNOT_MODULES=(
+	"+cookies"
+	"+dnsproxy"
+	"dnstap"
+	"geoip"
+	"+noudp"
+	"+onlinesign"
+	"+queryacl"
+	"+rrl"
+	"+stats"
+	"+synthrecord"
+	"+whoami"
+)
+IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
+
+RDEPEND="
+	acct-group/knot
+	acct-user/knot
+	dev-db/lmdb
+	dev-libs/libedit
+	dev-libs/userspace-rcu:=
+	dev-python/lmdb
+	net-libs/gnutls:=
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c:=
+	)
+	geoip? ( dev-libs/libmaxminddb:= )
+	idn? (
+		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
+		libidn2? ( net-dns/libidn2:= )
+	)
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	local u
+	local my_conf=(
+		--with-storage="${EPREFIX}/var/lib/${PN}"
+		--with-rundir="${EPREFIX}/var/run/${PN}"
+		$(use_enable fastparser)
+		$(use_enable dnstap)
+		$(use_enable doc documentation)
+		$(use_enable utils utilities)
+		--enable-systemd=$(usex systemd)
+		$(use_with idn libidn)
+	)
+
+	for u in "${KNOT_MODULES[@]#+}"; do
+		my_conf+=("$(use_with ${u} module-${u})")
+	done
+
+	econf "${my_conf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
+
+	default
+
+	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
+
+	newinitd "${FILESDIR}/knot.init" knot
+	if use systemd; then
+		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index 70e69bb9b58e..5c5cb4f4a0b8 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -1,8 +1,11 @@
 AUX deadwood 475 BLAKE2B 1f5f669b22011bf38e077d21278ebfbff72ba45782b863044d868f3a46256192fa1041db8ee6fe5ff5ac15285caacceb8222d2fb1dce1c617c41baea1da7fe15 SHA512 ea01c5cd9494a9dd5c8146f0de84c6bd4df3ba2221b52b87886892cbc13aad21f273ea1d056c3dd88ae5e15c1f6f820f9fe4b1dd4c9ae7082d7f7f78b3f8813e
 AUX maradns-3.5.0005-flags.patch 793 BLAKE2B 65a6cf4e0b77e19431e9c243bbb9a790ffbe064a66bf20747779c5401ba6e47b4b6cf21a73843ca8e259f296e5d2fca70dcd801fd45b3d3e2b7e784e9557cf24 SHA512 940b18ebfbcd7b8b83e505dd9e597599febd0ffb9c1b8d1e6bdc5749031c53e514467a9d62fd7d6e02d99d4226e09c87cc8124e5fb19a5c735dac25f99d4bfb5
+AUX maradns-3.5.0020-flags-ipv6.patch 3899 BLAKE2B 9a4bcca0f453b85a6f8c2fa2ce1731a6c454be01a39818eeaec0d06fa5e95d8a3f4b8e52262fc9ee4b45c7fd24231fc501cf9ff4327c9aadfefd1346f9a285ea SHA512 2d50ce4e0678f7303a7b48e31b0b175b494ef0ebf4ad623ff934f33d631a245663970b98df08f2ff68cb6a86a660cc47f9e4d0b55cd5cccacb1c18c66a75ac9d
 AUX maradns.service.in 159 BLAKE2B 2ecd43d92a6c804fd713c0e1e22a18049ab410ccb0b92ec9ffe7621605e1dfea65c880369d0530e59cf061f6fb402cd83175f38be27b43d82b65a7175434e648 SHA512 0de3b9141b8266cb6443b8a7fcb6243782059d2ea45b89421158ded607413eb491542c279f2a9b4455e9396e6ba20e46aed8f46eba3b04e5bd428f335c4b9582
 AUX maradns2 481 BLAKE2B 486711875cc3ad29066cbe52d16fb29c6ba35473ec0ffe63fb8039e208e90009900faf8f93c9c43ae80fe0b618202b2aff5cd2302af253a4d38d7d6486c8bc05 SHA512 e893020a934c5927b772189c034469055cd0d8a8ab3e066fe063e30999be6a6679e7b95c2761dec1326cec37fe5261541fbb27e9be796681764c75252b10e90b
 AUX zoneserver2 483 BLAKE2B fcae510c7d5719df0b018976052fb0b6ccb3af1324b607ccfb93a3e5d822d1ee5460424f2b05e1f2b3f09f7d445242f58f55abbc5ba88adeb25861c3eae29e90 SHA512 dc5dd43b043417002fce4c3d6c2e5417bc68fae7a0ac4db03f7cb382d348ed6b2c7042c38ffc2db3a4c36abf734e9d34124042a4077090bd7947241aab955ab7
 DIST maradns-3.5.0005.tar.xz 5351412 BLAKE2B c6b1c4fb93cb507045b3c09574d7ce30b0af92301e157216b4a5bbd2ed74ceb829ef4d11cd08048c7a685a09cdd4178cf3fc4e7b2465820d26d3a5c1b96f4a5e SHA512 2e7008ff6217929008292dde60d96eb2ec0499a170e1b5bda5fcfb27300d2ce6cecd8b3e2a2d4b09ff32b803f9f435230378e6b2e41e7b63c42653d8c931151d
+DIST maradns-3.5.0020.tar.xz 7154452 BLAKE2B 4d193c06620332b90f4a004e787f9cbe61cd48adcee1dd667ecf0383c0fb81f5b7cae40ee953f077b2ccf060d7429863f741cf942c34c862d6c56092bc40600b SHA512 3478ccdc82d5be45826072f91c1b00c491f21f69bcce169cfeb3dfdd00e0012a9def884d711daa41ea18dce52e069dbb4c31e1e37ecda418565b5d8d6a0ea4d4
 EBUILD maradns-3.5.0005.ebuild 2410 BLAKE2B a6703a7856b9344dfa5c17df257f8cdcf46013498c2acfb46a02bf2d2923692e9d9b9288b7ba3d15fe77a8fdd67ba444fc3283e3e43f01c97fff82a971fd928e SHA512 d09cddab2a6e4af7cdfbd48ce99b16a1759baf34c85376fd3ed16629c545abfa353eb95a074ce73f8af44ef8ed631daa128b3bc23bcb9b4ed39afec9bc0f86d6
+EBUILD maradns-3.5.0020.ebuild 2578 BLAKE2B 851a523dc89dcca6ec7a03aa717c36c7d12c3799e57beee16317440d916a6e6bf7ed81e05a8ba100fedceeac20e72081160c1f539e0ae028eaec7204a1448e53 SHA512 0493e2b92f656b75b0aab556980915144b5179f5540862a6b2dda7e35f493f3e8bb6234a2507377302fce916d62f913361699881d44b4436e7a67f01d04e49f8
 MISC metadata.xml 650 BLAKE2B de0597fe89738d9455f42c28ccb868f222170d4c554d46d8f266923f832ebc8e2eeb10b14481c361a0c03ec31e448684d61fbf4bf8f960935d6f7abe550b21b1 SHA512 119586844787fd28975f10a6546f3f28e9d99ef09f08293b24502fd5d5898724f35c6f2f31c68862eb5ec8fe6a3bee2f4f4d61581369430231f720777f20b153
diff --git a/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch b/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch
new file mode 100644
index 000000000000..4582dec4f56a
--- /dev/null
+++ b/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch
@@ -0,0 +1,113 @@
+From 0a2159798edffdbc0fdba67b2ae4aeca118a2516 Mon Sep 17 00:00:00 2001
+From: Victor Kustov <ktrace@yandex.ru>
+Date: Mon, 31 May 2021 22:47:55 +0300
+Subject: [PATCH] fix
+
+---
+ build/Makefile.linux | 52 ++++++++++++++++++++++----------------------
+ configure            |  4 ++--
+ 2 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/build/Makefile.linux b/build/Makefile.linux
+index 965c7fb..62c20b9 100644
+--- a/build/Makefile.linux
++++ b/build/Makefile.linux
+@@ -24,48 +24,48 @@ EXECS=server/maradns
+ # end the Solaris section
+ # Non-Solaris version of "M"
+ V="VERSION=$(VERSION)"
+-Q="DEFINES=-DSELECT_PROBLEM"
++Q="$(LDFLAGS) DEFINES=-DSELECT_PROBLEM"
+ 
+ # Debug
+ 
+ FLAGS = -O2 -Wall -DSELECT_PROBLEM
+-M="CC=$(CC) $(FLAGS)"
+-D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
++M="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)"
++D="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DDEBUG -DTHREADS"
+ #FLAGS = -g
+ 
+ all: 
+-	cd libs ; make $(M) ; cd ../dns ; make $(M) ; \
+-	cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \
+-	cd ../qual ; make $(M) ; cd ../server ; \
++	cd libs ; $(MAKE) $(M) ; cd ../dns ; $(MAKE) $(M) ; \
++	cd ../rng ; $(MAKE) $(M) ; cd ../parse ; $(MAKE) $(M) ; \
++	cd ../qual ; $(MAKE) $(M) ; cd ../server ; \
+ 	make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
+-	cd ../tools ; make $(M) ; \
+-	cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \
+-	cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
++	cd ../tools ; $(MAKE) $(M) ; \
++	cd ../deadwood-*/src/ ; $(MAKE)  $(M) ; \
++	cd ../../tcp ; $(MAKE) $(M) $(V) ; cat ../00README.FIRST
+ 
+ debug: 
+-	cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \
+-	cd ../dns ; make $(D) ; cd ../rng ; make $(D) ; \
+-	cd ../parse ; make $(D) ; cd ../qual ; make $(D) ; \
++	cd libs ; $(MAKE) $(D) DEBUG="-DDEBUG -DTHREADS" ; \
++	cd ../dns ; $(MAKE) $(D) ; cd ../rng ; $(MAKE) $(D) ; \
++	cd ../parse ; $(MAKE) $(D) ; cd ../qual ; $(MAKE) $(D) ; \
+ 	cd ../server ; \
+ 	make $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \
+-	cd ../tools ; make $(D) ; \
+-	cd ../tcp ; make $(D) $(V) ; cat ../00README.FIRST
++	cd ../tools ; $(MAKE) $(D) ; \
++	cd ../tcp ; $(MAKE) $(D) $(V) ; cat ../00README.FIRST
+ 
+ clean:
+ 	rm -f $(OBJECTS) core $(EXECS) ; \
+-	cp build/Makefile.w Makefile ; cd dns ; make clean ; \
+-	cd ../libs ; make clean ; cd ../parse ; make clean ; \
+-	cd ../qual ; make clean ; \
+-	cd ../server ; make clean ; \
++	cp build/Makefile.w Makefile ; cd dns ; $(MAKE) clean ; \
++	cd ../libs ; $(MAKE) clean ; cd ../parse ; $(MAKE) clean ; \
++	cd ../qual ; $(MAKE) clean ; \
++	cd ../server ; $(MAKE) clean ; \
+ 	cp Makefile.recursive Makefile ; \
+-	cd ../test ; make clean ; \
+-	cd ../tools ; make clean ; \
+-	cd misc ; make clean ; \
+-	cd ../../utf8 ; make clean ; \
+-	cd ../tcp ; make clean ; \
+-	cd ../rng ; make clean ; \
+-	cd ../sqa ; make clean ; \
+-	cd ../deadwood-*/src ; make clean ; \
++	cd ../test ; $(MAKE) clean ; \
++	cd ../tools ; $(MAKE) clean ; \
++	cd misc ; $(MAKE) clean ; \
++	cd ../../utf8 ; $(MAKE) clean ; \
++	cd ../tcp ; $(MAKE) clean ; \
++	cd ../rng ; $(MAKE) clean ; \
++	cd ../sqa ; $(MAKE) clean ; \
++	cd ../deadwood-*/src ; $(MAKE) clean ; \
+ 	# ; cd .. ; find . -type d | grep .deps | xargs rm -fr ; find . -name '*.o' | xargs rm
+ 
+ strip:
+diff --git a/configure b/configure
+index 9e98ac8..fedbd87 100755
+--- a/configure
++++ b/configure
+@@ -174,14 +174,14 @@ if [ -z "$IPV6" ] ; then
+ 	cp tcp/Makefile.authonly tcp/Makefile
+ 	cp dns/Makefile.authonly dns/Makefile
+ 	cp tools/Makefile.authonly tools/Makefile
++	DEADWOOD_DIR=$( echo deadwood-* )
++	cp $DEADWOOD_DIR/src/Makefile.noipv6 $DEADWOOD_DIR/src/Makefile
+ else
+ 	cp server/Makefile.ipv6 server/Makefile
+ 	cp qual/Makefile.nothreads qual/Makefile
+ 	cp tcp/Makefile.ipv6 tcp/Makefile
+ 	cp dns/Makefile.authonly dns/Makefile
+ 	cp tools/Makefile.ipv6 tools/Makefile
+-	DEADWOOD_DIR=$( echo deadwood-* )
+-	cp $DEADWOOD_DIR/src/Makefile.ipv6 $DEADWOOD_DIR/src/Makefile
+ fi
+ 
+ echo
+-- 
+2.26.3
+
diff --git a/net-dns/maradns/maradns-3.5.0020.ebuild b/net-dns/maradns/maradns-3.5.0020.ebuild
new file mode 100644
index 000000000000..6bf474750b66
--- /dev/null
+++ b/net-dns/maradns/maradns-3.5.0020.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="A security-aware DNS server"
+HOMEPAGE="https://maradns.samiam.org"
+SRC_URI="https://maradns.samiam.org/download/${PV%.*}/${PV}/${P}.tar.xz"
+
+# The GPL-2 covers the init script, bug 426018.
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE="examples ipv6"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl"
+DEPEND="
+	acct-group/maradns
+	acct-user/duende
+	acct-user/maradns"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flags-ipv6.patch
+)
+
+src_prepare() {
+	default
+	python_fix_shebang tools/bind2csv2.py
+}
+
+src_configure() {
+	tc-export CC
+	./configure \
+		$(usex ipv6 --ipv6 "") || die "Failed to configure"
+}
+
+src_install() {
+	# Install the MaraDNS and Deadwood binaries
+	dosbin server/maradns
+	dosbin tcp/zoneserver
+	dosbin deadwood-${PV}/src/Deadwood
+	dobin tcp/{getzone,fetchzone}
+	dobin tools/{askmara,askmara-tcp,duende,bind2csv2.py,csv1tocsv2.pl}
+
+	# MaraDNS docs, manpages, misc
+	docompress -x /usr/share/doc/${PF}/maradns.gpg.key
+	dodoc {CHANGELOG,COPYING,SUPPORT,maradns.gpg.key}
+	dodoc doc/en/{QuickStart,faq.*,*.md,README}
+	dodoc -r doc/en/{text,webpage,tutorial}
+	docinto deadwood
+	dodoc deadwood-${PV}/doc/{*.txt,*.html,CHANGELOG,Deadwood-HOWTO}
+	dodoc -r deadwood-${PV}/doc/internals
+
+	# Install examples (optional)
+	if use examples ; then
+		docinto examples
+		dodoc doc/en/examples/example_*
+	fi
+
+	# Install manpages
+	doman doc/en/man/*.[1-9]
+	doman deadwood-${PV}/doc/{Deadwood,Duende}.1
+
+	# Example configurations.
+	insinto /etc/maradns
+	newins doc/en/examples/example_full_mararc mararc_full.dist
+	newins doc/en/examples/example_csv2 example_csv2.dist
+	newins deadwood-${PV}/doc/dwood3rc-all dwood3rc_all.dist
+	keepdir /etc/maradns/logger
+
+	# Init scripts.
+	newinitd "${FILESDIR}"/maradns2 maradns
+	newinitd "${FILESDIR}"/zoneserver2 zoneserver
+	newinitd "${FILESDIR}"/deadwood deadwood
+
+	# systemd unit
+	# please keep paths in sync!
+	sed -e "s^@bindir@^${EPREFIX}/usr/sbin^" \
+		-e "s^@sysconfdir@^${EPREFIX}/etc/maradns^" \
+		"${FILESDIR}"/maradns.service.in > "${T}"/maradns.service \
+		|| die "failed to create the maradns.service file (sed)"
+
+	systemd_dounit "${T}"/maradns.service
+}
+
+pkg_postinst() {
+	elog "Examples of configuration files can be found in the"
+	elog "/etc/maradns directory, feel free use it like:"
+	elog "     cp /etc/maradns/mararc{_full.dist,}"
+	elog "and edit /etc/maradns/mararc as described in man mararc."
+}
diff --git a/net-dns/ndu/Manifest b/net-dns/ndu/Manifest
index 3c539dbadaeb..b3fa6a98e014 100644
--- a/net-dns/ndu/Manifest
+++ b/net-dns/ndu/Manifest
@@ -1,4 +1,5 @@
 AUX ndu-0.4-binary-locations.patch 426 BLAKE2B 6d8c5648b0c25129c87e73f3ac47f2baf699890fcf0023dbe801e7c3cfb4f32ca15287e5a70b9b7829364956a89ab9d04bc6088291890c1e4e949972823a76ed SHA512 58e248d48491759c33ae2ee2d57fdca38b718104606c05d965bc7b555cfd72388a906efd692d789d999fe782878e173438cc22f1091d278eed8b4322ec6f6294
+AUX ndu-0.4-fix-pointer-comparison-with-0.patch 657 BLAKE2B b3b912c0aa474d8ff2a9763947892b807fbb96221d6bc78ac7cbdf2049f5c36131172ff590a482587c03eee492a76ee19ae34f18d341fa5ed55edbf2966a04cd SHA512 d33f3f8ff4d467eaa6e3f55c736e65abe4de2442b94c57afa90cbc93d88e246ef6de6090ae2d51a9d2357c79ae3d8afad77f237e0ac2b7a0ccc9246b0b40fe2e
 DIST ndu-0.4.tar.gz 16118 BLAKE2B 7355d1d091f4b0865e3692b80a0dd4734e3e13464757adb1b9d712545ff4f827b828070f0bd027b077acb99c8d4ccd2ed645b3c7f114bfac65707ae7853ea3f2 SHA512 cf401f89f1d6ae66c5440e6ef43f1c78e071d13dd2b1d816f1c3bfd2a0b2d7d7a9d2be9025b3d88f3fbd186ff610ac92858e13b4e47b23b9088f91f3e1a40f39
-EBUILD ndu-0.4-r4.ebuild 1731 BLAKE2B c6a2f0d424b223faf2f0972ee55e6a01652185ccf4b9836fbe70ae001788f54183244beadcf0adf829d4d6891cbcf3fa8f882e2ae3f4f38fb55642bd37af3613 SHA512 fd0a396c008888f8d3a3cbbb78ca679dfb30de73972b8a4986f677fd58d0c64f501bfcf70ead4989d179205d8180d810446bd9ecdd442576b7739f932eed15cc
+EBUILD ndu-0.4-r4.ebuild 1787 BLAKE2B a598991619fa65433b569c0f122faeabbdc1300f7a80c3ace9c5df5f522463a17da711bc74782a48c363085844a53208bdd764b3ef51a75bafb806191be81fa5 SHA512 df4925aaa880b20325aba5fa116637dee87fa56aadf169236f088e136071c8b6b932e1a84baa4aa96f5f05344b55d581bd7f9aa82d40b87b3b56f18df48608ef
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-dns/ndu/files/ndu-0.4-fix-pointer-comparison-with-0.patch b/net-dns/ndu/files/ndu-0.4-fix-pointer-comparison-with-0.patch
new file mode 100644
index 000000000000..1d7a40d7aed4
--- /dev/null
+++ b/net-dns/ndu/files/ndu-0.4-fix-pointer-comparison-with-0.patch
@@ -0,0 +1,26 @@
+From 5df37d4e6a22a67671a4b74c68e725a9001fbac1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 15 Jun 2021 02:38:33 +0000
+Subject: [PATCH] Fix pointer comparison with 0
+
+Closes: https://bugs.gentoo.org/786276
+---
+ src/ndu.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ndu.cpp b/src/ndu.cpp
+index 558ee45..8d3b353 100644
+--- a/src/ndu.cpp
++++ b/src/ndu.cpp
+@@ -404,7 +404,7 @@ public:
+ 		{
+ 			// see if file is a reverse file
+ 			// if the zone ends in .in-addr.arpa
+-			if(strstr(name->pchar(), IN_ADDR_ARPA) > 0)
++			if(strstr(name->pchar(), IN_ADDR_ARPA) != 0)
+ 			{
+ 				zoneType = 1;
+ 			}
+-- 
+2.32.0
+
diff --git a/net-dns/ndu/ndu-0.4-r4.ebuild b/net-dns/ndu/ndu-0.4-r4.ebuild
index c63454d29b29..c8510ed983e7 100644
--- a/net-dns/ndu/ndu-0.4-r4.ebuild
+++ b/net-dns/ndu/ndu-0.4-r4.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
@@ -12,13 +12,14 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 RDEPEND="sys-apps/ed" # dnstouch calls ed to do the dirty work
 
 src_prepare() {
 	default
+
 	eapply "${FILESDIR}"/${P}-binary-locations.patch
+	eapply "${FILESDIR}"/${P}-fix-pointer-comparison-with-0.patch
 
 	# match our bind config
 	sed -e 's|0.0.127.in-addr.arpa|127.in-addr.arpa|g' -i ndu.conf || die
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 57c17ce63165..1ca2b69975c2 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,8 +1,10 @@
-AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
-DIST pdns-recursor-4.4.2.tar.bz2 1396763 BLAKE2B f8dad7694ac13ed8d824ddaf613d1a001452ab2c08fcbb0e00d2b2258464b754809746b89998b818c44866f9e4b22c87c1cebf2da852fb7b6247ac6b9fd4b99d SHA512 31fdf62d87e5ee8f9570c6b738339bc8cc65c43800f18c7fb49aa5c53fc9ad76a1ddf02cc44f7129e06b41700b5cb3768ff8f81cc521c28147ea6538c73f8781
+AUX pdns-recursor-r2 1426 BLAKE2B 4407525f88d6e4299acdaa015e13866b70b2f697493218953c515e00af1476df7b8dbc87f6a39c50743d78b7f8efd2d3446e1a387f98ac4191cea2c04e10c175 SHA512 2f4d8458f6224a42103d28937d69228092c74c9c8c958833b292acf8959df1e617eafc13b65b95cf6eb4e06fb4fa7f23906c28b583865b6885949daaac12799e
 DIST pdns-recursor-4.4.3.tar.bz2 1398743 BLAKE2B d9429ef22bb2b196e42da91332332b38dee9220d490c8adda686b0bc144e0981ea4418973f4304d6d964ef8f6ac4adcde4bd3e6d6b208c620440eab1b11a7fc0 SHA512 bac69cbaabc1b0de0def681e07f7e77954e0d487732cb46dc722f7869576a8a477a4011f78c9cc66b5e9b45455eb81534602b2834dc1ad42b85f5f2801915cbb
+DIST pdns-recursor-4.4.4.tar.bz2 1399645 BLAKE2B 2ef2a59b9c402ab9d9b59d6b89e85b7103dbd9cdcc6147d08f09b85209cb2e298ff539dcb24895a4711f4e7c55c398d0307f237b22d1bdadaf01ec3925af0e8f SHA512 de8ac38d77a4700cd9dd64aad2ba7d1a97057683ace34f1dc3b2e9680faef5637ce7cedb66ceb0b7701f7ff6ef80cbee653549302805b30f9a6defa3a4e8e830
 DIST pdns-recursor-4.5.1.tar.bz2 1463138 BLAKE2B 863cddbe4001b32cf457dc489bd39ad7b045f19183b1d13bc31bfd7fa28cc6e7e69755216715e0fd75fd0d724de20f7b89c89017fc42dff35de4e45e9351af75 SHA512 0cfbc95e3e84a2ab2cd88ee638b0ff26f5f35b64754086483555df28f045d64b5fdfab3e8c430c0b4e97dc4eda624226c37ec0f50902ffe5f84882d814e8051e
-EBUILD pdns-recursor-4.4.2-r100.ebuild 1943 BLAKE2B 399a16bbf1255ddf34affacb8d19fe3175aab3b93fbd00844fc4cab88152a40a52dba708f292c21299b7805e48ed7af9f3f7262596f5fd397ff4d7b4f0d53d9c SHA512 4798d926465bc53fb38dc28b83c3d1e5a444307933575119938a65761f303d141c31d3e89aad53458421dee3e0c764275022a6ecb45241833f038e75fdcc17b8
+DIST pdns-recursor-4.5.2.tar.bz2 1464834 BLAKE2B 88acd7a6edecf8188b366a9fcff0eaf1b71429df8aad4dbcf157be39901b56ee3c9a9d55bf55bb060bcbb59f68b3ff8987788f4186a7122787874f895be1e751 SHA512 02a9f725c7528f91eb45409b32ffa06cb7fca1f0151907efcd8b75100942e98f593858543df15423413d69c9fd433bad3c8bad0a84f8144af07c637f22a86d5e
 EBUILD pdns-recursor-4.4.3.ebuild 2009 BLAKE2B 2ac02e0feb23ea88dd1a3cb11501b936df84e479ed6a12d091dc6969d541ed11172a5b62ee60fadf543904c79acbb9c55501cbce3e613fbee6ae5eaab26b9725 SHA512 e61b5b4daa36c405397827d522cc70d9923c9f4294b551b485759f549448b00b0613356a769696240c8a7f9dafbce8645b51b96200c2321f7c5f51ac49b4000f
-EBUILD pdns-recursor-4.5.1.ebuild 1893 BLAKE2B 1210686544fc58dfdde1d931ccd8e7757684b89a8dd1368c67e2466f508293178c80a92ef0550b9e037cee77dbb33be49053a3ace5a0debc3353812c0ddab96d SHA512 845010f783223095ce06793621906d1996dc6206ff77fd78c88951664a019aa719c601330a570236dbd3556ce03f9353930a8076aca69cfb04980b359bb8ecb5
+EBUILD pdns-recursor-4.4.4.ebuild 2011 BLAKE2B e7b7a322ac34dc9c09ca150973aeee17642c76ec9910cd9fd0c8678fb8a85c23c19e89ff4336a8723b2d4350bb5cb79f7cb234056dcc12ba36d5a428b0cbfffd SHA512 011b7d7dffc0d27e4f4cdcb31f0fb4cbabdeeca82f112aa3fc39cf1a47eb569e65f7e6870e41dab7194eed5175e52f746299a79ebef264e8f028f212c7cabb90
+EBUILD pdns-recursor-4.5.1.ebuild 1883 BLAKE2B 2ecec2518d4676d838dbdb0cc41a8c0dfd551b15e87ea212594bff2a0d1507746b592684339cf21c08257501c632d157e3edb5ab79b55221c658deae2a83096a SHA512 a26b2d6eb3c97bd485c4e56b93f719e01752c7f5c14019d436260e514cc77ceb644526c210c0ad96cd329e8a0daae862671944501f305ff7a2b59b7c3188fa80
+EBUILD pdns-recursor-4.5.2.ebuild 1883 BLAKE2B 2ecec2518d4676d838dbdb0cc41a8c0dfd551b15e87ea212594bff2a0d1507746b592684339cf21c08257501c632d157e3edb5ab79b55221c658deae2a83096a SHA512 a26b2d6eb3c97bd485c4e56b93f719e01752c7f5c14019d436260e514cc77ceb644526c210c0ad96cd329e8a0daae862671944501f305ff7a2b59b7c3188fa80
 MISC metadata.xml 1008 BLAKE2B 1c82fd9262358bcf1ff0f8503bc8dfe9b640023133ca48711bc576df00312312b5e37a36ff10aac561ef1c71e20f64c5f0a4c431c60ca029220732fba0ee1bf9 SHA512 2deab5a88c42d3416b3da5b6d9d3ed9b2db0a5dcb3d8b7fc4c7a13b2219fd7df786bfef42ff5e3d7c2b40058592e892f380d126a0254013534e66e65499e7105
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-r2 b/net-dns/pdns-recursor/files/pdns-recursor-r2
index 01ce79167bbc..0ca3dfc18782 100644
--- a/net-dns/pdns-recursor/files/pdns-recursor-r2
+++ b/net-dns/pdns-recursor/files/pdns-recursor-r2
@@ -1,12 +1,18 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+get_config_option() {
+	awk -v option="${1}" -F = '$1 == option { print $2 }' "${PDNS_CONFIG}"
+}
+
 PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}"
 
 PDNS_CONFIG="${PDNS_CONFIGDIR}/recursor.conf"
-PDNS_CHROOTDIR="$( awk -F = '$1 == "chroot" { print $2 }' "${PDNS_CONFIG}" )"
-PDNS_SOCKETDIR="$( awk -F = '$1 == "socket-dir" { print $2 }' "${PDNS_CONFIG}" )"
+PDNS_CHROOTDIR="$( get_config_option chroot )"
+PDNS_SOCKETDIR="$( get_config_option socket-dir )"
+PDNS_SETUID="$( get_config_option setuid )"
+PDNS_SETGID="$( get_config_option setgid )"
 [ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run/pdns-recursor"
 
 name="PowerDNS Recursor"
@@ -31,7 +37,7 @@ depend() {
 }
 
 start_pre() {
-	checkpath --directory --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
+	checkpath --directory --owner "${PDNS_SETUID:-root}:${PDNS_SETGID:-root}" --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
 }
 
 ping() {
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.2-r100.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.4.ebuild
index 59d7eaeaa9d4..dc546d8cd6ca 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.4.2-r100.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.4.ebuild
@@ -13,10 +13,11 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug dnstap protobuf snmp sodium systemd"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug dnstap protobuf snmp sodium systemd test"
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	dnstap? ( protobuf )"
+RESTRICT="!test? ( test )"
 
 DEPEND="${LUA_DEPS}
 	protobuf? (
@@ -52,6 +53,7 @@ src_configure() {
 		$(use_enable debug verbose-logging) \
 		$(use_enable systemd) \
 		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
 		$(use_with sodium libsodium) \
 		$(use_with protobuf) \
 		$(use_with snmp net-snmp)
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.5.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.5.1.ebuild
index dc9c75ab0e85..391869be2aec 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.5.1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.5.1.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"
 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.5.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.5.2.ebuild
new file mode 100644
index 000000000000..391869be2aec
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.5.2.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 2b5ad585cefd..0fc0214719da 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,7 +1,5 @@
 AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf403453422888e2cb44fa4fed7891241919a39c8c6f539a61de032654650a45ea548a6983777ea1bfe029e817f2c315 SHA512 ac16f8d528d6138d3c2cbf997fd8fbb467d388aa63eb6ed4e7780a3dad11ea885b91252ff0809b1d2cf7d5200814b8963aab890af84741ea86d35b2f5955a7ea
-AUX pdns-r1 2535 BLAKE2B 4e718bbba73b20a86dd11acc07ce91d259d82a3fc3e6133cac0d7fb2b24d2b5ff3e3596d00c4289017845c7a1751d0a43e83ba67e4b8e55e10aca892ba3d3aea SHA512 5ebc7cd236195543e67db5ed2c831ff6a1b9bdba5a72c179df72f84e4ade2dfc962a988ab02a7b893c62a7c3d8df7a15e2de3ae02413ff296a6404a7937eb8de
-DIST pdns-4.4.0.tar.bz2 1270854 BLAKE2B 2c855197d0b5f8fc141e4fa19268e68b9114353c7f89157023b9cd6b9559e788b55a9b0eeebea55d4ba0a206229d9c032f0c84c40ffd91c7277eb611a4bc966a SHA512 e7f35539915ee7945b537cfedae72e2b83c86b39c5e44a9268b8a086f44b30a33a64e0b65aad140ba02c349cedaa12820226578dea87c9b666dc75f8bd15c1f6
+AUX pdns-r1 2815 BLAKE2B cd607cb30a94540eca9cfa2defb7c996f6e151875fcaad8ad3357261937868bc346962f1080ad45a0ef38c2dfc126eb11e41837ee0784f677d1e7c071589a057 SHA512 4c0442d8d92d95268d4971f80782d2772e2a22c43da00566a9328c79a834e4355b2610d133034351d7137ed6cd7fda300f3db8093b09d5852cea44d983de1e39
 DIST pdns-4.4.1.tar.bz2 1276990 BLAKE2B 9771cf3273ab7e8ab4607a91563bfe0dc3f4532b5420861d816eacd2798d66de3a1eb824c191264f9106ec47bd6003d99108b8df678190055948779b9b3b070f SHA512 a6f31972f77ded8ecfb523e8810dd90e5b7aa628746fee2a9a0daae2a7935800f111ce8617ffd71d5ce3881947d4ffc36c9cb37996a7bcc514536bb4abe1f79e
-EBUILD pdns-4.4.0-r100.ebuild 4509 BLAKE2B 856dc394f10dc1061beb849d3750039032cb2948dddf31eb58ccdd4e5b292d469ee612f43203406c5e9f13320e8a35a7f164c7f0dd3987088d10e3f48c09c027 SHA512 1af31ad6a37da79847e341bac25d90b106da6c42e2455be511f22ff74b09577dcef4fc6a929a1c031803e11f3a91ab8a3f77373f69eb0215c46aa6453d81130b
-EBUILD pdns-4.4.1.ebuild 4509 BLAKE2B 856dc394f10dc1061beb849d3750039032cb2948dddf31eb58ccdd4e5b292d469ee612f43203406c5e9f13320e8a35a7f164c7f0dd3987088d10e3f48c09c027 SHA512 1af31ad6a37da79847e341bac25d90b106da6c42e2455be511f22ff74b09577dcef4fc6a929a1c031803e11f3a91ab8a3f77373f69eb0215c46aa6453d81130b
+EBUILD pdns-4.4.1.ebuild 4328 BLAKE2B 12da4dca63939766d5511fc8de7a1fd746fa27089062db72c88663ea465ed00aab3214fbab324088b6a04300838f99f23a212209e9cd3d4f4ef266833175a0e3 SHA512 07cd6c982308d7dec13a676de3baa2781216e5a92417741faa2736f627c83c8af6016c4b6f427593ed86f2d76bc224473501284a4daaa2d51d2e0c16efa8a801
 MISC metadata.xml 1111 BLAKE2B 5a55e94593f1c010f9ee71fa2d3bc887a0eddc8627db36a1792b911a1cfe3fa3d5a33923b95d18a02f36097717d76ed2aae711c2deb793625b1186090ad072c8 SHA512 c010bbd0daa87980a4d9f164fc3d15239251890e56c63b1165d55a92b9c0f24e5f141439bdfc13b4efa4483e0fc199cd6107e2f152d26d4ca954f4c3d0cc4913
diff --git a/net-dns/pdns/files/pdns-r1 b/net-dns/pdns/files/pdns-r1
index 4c5241e5155f..eeff5a08f634 100644
--- a/net-dns/pdns/files/pdns-r1
+++ b/net-dns/pdns/files/pdns-r1
@@ -1,15 +1,21 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+get_config_option() {
+	awk -v option="${1}" -F = '$1 == option { print $2 }' "${PDNS_CONFIG}"
+}
+
 PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}"
 PDNS_STOP_TIMEOUT="${PDNS_STOP_TIMEOUT:-10}"
 
 [ "${RC_SVCNAME}" != "pdns" ] && PDNS_INSTANCE="${RC_SVCNAME#pdns[.-]}" || PDNS_INSTANCE=""
 
 PDNS_CONFIG="${PDNS_CONFIGDIR}/pdns${PDNS_INSTANCE:+-${PDNS_INSTANCE}}.conf"
-PDNS_CHROOTDIR="$( awk -F = '$1 == "chroot" { print $2 }' "${PDNS_CONFIG}" )"
-PDNS_SOCKETDIR="$( awk -F = '$1 == "socket-dir" { print $2 }' "${PDNS_CONFIG}" )"
+PDNS_CHROOTDIR="$( get_config_option chroot )"
+PDNS_SOCKETDIR="$( get_config_option socket-dir )"
+PDNS_SETUID="$( get_config_option setuid )"
+PDNS_SETGID="$( get_config_option setgid )"
 [ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run/pdns"
 
 name="PowerDNS Authoritative Server${PDNS_INSTANCE:+ (${PDNS_INSTANCE})}"
@@ -22,7 +28,7 @@ description_ping="Ping the PowerDNS instance"
 description_monitor="Starts in foreground with logging and console enabled"
 
 command="/usr/sbin/pdns_server"
-command_args="--config-dir=${PDNS_CONFIGDIR}${PDNS_INSTANCE:+ --config-name=${PDNS_INSTANCE}}"
+command_args="--config-dir=${PDNS_CONFIGDIR}${PDNS_INSTANCE:+ --config-name=${PDNS_INSTANCE}} --write-pid=yes"
 command_args_foreground="--daemon=no"
 command_args_background="--daemon=yes"
 yesno ${rc_verbose} || command_args_background="${command_args_background} >/dev/null 2>&1"
@@ -42,6 +48,10 @@ status() {
 	_ping || return 32
 }
 
+start_pre() {
+	checkpath --directory --owner "${PDNS_SETUID:-root}:${PDNS_SETGID:-root}" --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
+}
+
 stop() {
 	default_stop || return
 	_ping || return 0
diff --git a/net-dns/pdns/pdns-4.4.0-r100.ebuild b/net-dns/pdns/pdns-4.4.0-r100.ebuild
deleted file mode 100644
index b37e0944e77c..000000000000
--- a/net-dns/pdns/pdns-4.4.0-r100.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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 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 )"
-
-S="${WORKDIR}"/${P/_/-}
-
-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."
-
-	if use ldap ; then
-		echo
-		ewarn "The official LDAP backend module is only compile-tested by upstream."
-		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
-	fi
-
-	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.4.1.ebuild b/net-dns/pdns/pdns-4.4.1.ebuild
index b37e0944e77c..9fbdd03b8c85 100644
--- a/net-dns/pdns/pdns-4.4.1.ebuild
+++ b/net-dns/pdns/pdns-4.4.1.ebuild
@@ -130,12 +130,6 @@ pkg_postinst() {
 	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."
 
-	if use ldap ; then
-		echo
-		ewarn "The official LDAP backend module is only compile-tested by upstream."
-		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
-	fi
-
 	local old
 	for old in ${REPLACING_VERSIONS}; do
 		ver_test ${old} -lt 3.2 || continue
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 8dc07e766353..2bd85ec040fb 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -11,5 +11,5 @@ DIST unbound-1.13.0.tar.gz 5950063 BLAKE2B 742eed33845079452a942837a64e80f89ec7e
 DIST unbound-1.13.1.tar.gz 5976957 BLAKE2B 5fabb9205773a1983842e41cf7a4d6c3878fa8beb7c8ccc71ae1edf7738cb9506c3d7bb32cf887b305317ca695bf876d9f5bf9aeb0129b0e9e926d437b3e6eb3 SHA512 f4d26dca28dbcc33a5e65a55147fa01077c331292e88b6a87798cb6c3d4edb0515015d131fd893c92b74d22d9998a640f0adce404e6192d61ebe69a6a599287c
 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
+EBUILD unbound-1.13.1.ebuild 6035 BLAKE2B 2ceef3dda29cf2441b2002b9e14e9b1a5caec65f697eab6e1b5863977d8bc0a1c2012269b45852329d54296446c8be60d4b44e0b7e87e6d58898216ff1f93be1 SHA512 c4a737ae4cea22efcd69f4e991787c7c4893bafe83af81440641842318784166aaf8866db9947ab0438965782bc5421bb12e17f9bda0030be20f279e0d2daa68
 MISC metadata.xml 1530 BLAKE2B 122d80d5cfbe76db026eae05c5e04b05f83e081713ac31c1d35d4677fa44eda03629fd964f0aa7fd5f9d16ff70913ebc83fddc5ee8c3c22df9bc7c5fc1b99e22 SHA512 4b9f0e48a871e0f4fa86b85bea5639aa6ab7778da2a32845f4ed95def7f0432f8a314d43f9e4f00a145b10d4a4250f6574a31a3e443545abc716e421f1b64bd0
diff --git a/net-dns/unbound/unbound-1.13.1.ebuild b/net-dns/unbound/unbound-1.13.1.ebuild
index 473024caee76..164de69e0b1e 100644
--- a/net-dns/unbound/unbound-1.13.1.ebuild
+++ b/net-dns/unbound/unbound-1.13.1.ebuild
@@ -13,7 +13,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"
+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 )"