gentoo resync : 25.09.2021

15 files changed, 198 insertions, 266 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 6b9dc85257b2..c1af50f684e1 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 0b4e1ef0b120..61e966ec514c 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -8,6 +8,6 @@ AUX dnscrypt-proxy.socket 517 BLAKE2B 959f3c38af826607a297b04c7c3284bb97588c8a8e
 DIST dnscrypt-proxy-2.0.45.tar.gz 2721610 BLAKE2B cddeafec2a2fa8179b722a1b4fe8527bcb3991f5d9e04e31667ea8c38deda5b8c9a3c3a3c16e4e2f5d1bfdb5f8d540c6d61273c34df27f4a78215736b240846f SHA512 becfe3c2d4567725e6b7e973647163e32dd2eaae361087bb05c90b6ddc3b0db0891c2725f6b5c255b8965990832bad53bd6ef137be54a342f46594f3633fe47a
 DIST dnscrypt-proxy-2.1.0.tar.gz 6248378 BLAKE2B 6b0db8eae8bd380634a86ee2026fb6a3f64d0874a77633f9b8ef46bd37601ebf8d9163516b5ccc371d5354023d5c5c542384718aa885dd1f99809a7b98df5de2 SHA512 201a2741f4703872901fa9c045323444d2939d662316e0026f7aa33c7136e45a564225106884ed80522be5247e128c70ced176c83333ddaacc66dc0f87c74029
 EBUILD dnscrypt-proxy-2.0.45.ebuild 2832 BLAKE2B 1f4f1532670c887f22fd04cbaef47abcafc658d29a66ee2e662d030e1c9fad54c558d7ee4546af940fc72b7e4d7b0f22d7d71466899264726fdc8fca5a641d2f SHA512 ec71d789ef81d3dd5b90fa5b8dc436242525c6d95b2ebd12e6ae1a653da69a5bc403f19753566c992c205a94214caccf2ba8c6fc41b8e1a5e0d422f4d512b4db
-EBUILD dnscrypt-proxy-2.1.0.ebuild 2834 BLAKE2B 0dea9e93e1dfb235c2f4f0a9ce6b73a955ab874382265af0bf08cd93cc19d00e0be2e25a397d49869490388fa1db83a3c2def2bae57198a20d88a4c3ff83fb49 SHA512 842fa4c8f2b27dacf47b4e5963a136156e64210b3a274a5299665aa8c8fe7123f5abeae009ef5a2e55b6f45b9d8a5ccaa7246e016c9150b9e781e379803ba7f3
+EBUILD dnscrypt-proxy-2.1.0.ebuild 2833 BLAKE2B 736cc68e0f8d7d98aa4d3a98dbcd64a56138b91921e8a899f5c3bf7622840ddfd2b5e9350c63576e337f54a4b5386385eb87058fa1cdfea3dcee652819acec1e SHA512 35bac5465c345aa6558d3882d73c053b08b920286ed86ac9417a927ad5cdaad130c32c5d12a74d19243f6bf7d344725631ce918e0ade59feac3812d6aa62af05
 EBUILD dnscrypt-proxy-9999.ebuild 2837 BLAKE2B ada23235d56488fdb8339b0ee00cc19f309f7dc15687baadf9e677c28d38c3498062a1c3cec607739228471f7ffc6ce293d495c989a99fdac3d9d9ae75bd3145 SHA512 7a8ecb736fd88a4fdafc58f3dcf5f32e4c1e8b91cb29029f5258ebb61b15ae222836d2a277820f8326c0639daed8aae5250fb562a695ab46b67d480f858926ea
 MISC metadata.xml 619 BLAKE2B b8c10931edf8899ef018fc5f9605d3aad94ec2a48cce361ff04f2048d4e8cfd8de1ebff181fb968822e498d85178e3ed412726d3321f06a240eafbfc55b85b3b SHA512 268ab4c1a07bc15039c382586a575cecce6797bc452b635d7ebbd1806f789b8c154eb75164f58e8d9c87f0add8f99000c9dc75959328ad24f0f2c63bf6bd2f1d
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild
index 62f6800aef87..8266eb0e7c1f 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 else
 	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 4df3ba4c89be..a0a3b3d6a05e 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -4,6 +4,8 @@ AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e467441
 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
+DIST dnsdist-1.6.1.tar.bz2 1328069 BLAKE2B a9e9c0cb35ebc2ecd93d7fa0d6d3961b02d711da2df56240335786a5d2e529d4a7e8716f578b6e935edd3bc79dfed767d358b9feaff32dd9cd65993ef0b97b71 SHA512 68e114eeb1a7ae8a4ce52a7de31095c46d0ba8f572676a8ef1e858b97da199c04ec88656c7642160ba07b7db325cc2a49cd91794da8dd2e81a5301d089c34f90
 EBUILD dnsdist-1.5.1-r100.ebuild 2294 BLAKE2B f8e88f0caba126be55c3ad6524be37321da60dba6f50e0cc07be0a70eb5897f35f361090fb1319ed2c08dd7fc38684d12c517ba782deeb3b54c8585d11f77dd9 SHA512 d65e938918fbd2b35a807d48cbe8466a2c6c705b3b18147bd4a79e77f7fd4775835c1ce8b05feaa7f7d4c24e92338a44197e2902db5b39b8451a518689749268
 EBUILD dnsdist-1.6.0.ebuild 2269 BLAKE2B 1a23ebd28849897dd3d62a312be60222da8b9048cb32ad21214b726b24fffa4bd43c4bc104fa4f367b4e07af51933b3c0c885f03e163f90a459ca91524aaf35d SHA512 8466bc936352defae74c6a9d4f19c970399b251b0eeb3f0fd59f3e2e922f88576be257006ff9e69c54a19d1aaa64ac2498ad2ad7c8329eedbfd4e382345929de
+EBUILD dnsdist-1.6.1.ebuild 2201 BLAKE2B 6cc3f47e8790d6a3f657b6bacb0bcd61a850f5f4fdb6fe87222a83e3a7081c1d6ccf514e4bca62cfe4ec5f240f53ba32494d88ab40038c00f26be861908b63ae SHA512 78b30965e4e89cfd241a83f40c9379d3093df0caabf75d6d0d78b8f72ef0e8882b76744f7c6ff9bc6bba4194a8ac501ba2ae38893ce898ae2771707e03e86fd1
 MISC metadata.xml 1131 BLAKE2B 6e5955ebbb27298cc8e1be2afdec0a04cd29c99196586937c0fb518f0bfaf87d0a0cd369bd4fcb3c6815cd4fb7fad306b1c9982fb85df7f36d2f6220355a74e7 SHA512 3cca5ac1fa28c0efa56372a58271c6f8cb491e47dc16926e786b4174edfc14116ee0ea83e338f82fd01e58222e998e1d105e37763f4d7c1c4a8313503d7da085
diff --git a/net-dns/dnsdist/dnsdist-1.6.1.ebuild b/net-dns/dnsdist/dnsdist-1.6.1.ebuild
new file mode 100644
index 000000000000..a883f49ab1c1
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.6.1.ebuild
@@ -0,0 +1,80 @@
+# 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="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="https://dnsdist.org"
+
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+		dnscrypt? ( ssl )
+		gnutls? ( ssl )
+		doh? ( ssl !gnutls )"
+
+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:= )
+	snmp? ( net-analyzer/net-snmp:= )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+	systemd? ( sys-apps/systemd:0= )
+	${LUA_DEPS}
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/dnsdist \
+		--with-lua="${ELUA}" \
+		$(use_enable doh dns-over-https) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_with lmdb ) \
+		$(use_with regex re2) \
+		$(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) \
+		$(use_enable test unit-tests)
+		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+			-i "${S}/configure"
+}
+
+src_install() {
+	default
+
+	insinto /etc/dnsdist
+	doins "${FILESDIR}"/dnsdist.conf.example
+
+	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_postinst() {
+	elog "dnsdist provides multiple instances support. You can create more instances"
+	elog "by symlinking the dnsdist init script to another name."
+	elog
+	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
+	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
+}
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index b0af23c5d4b5..ecd6eb85f11f 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -2,5 +2,7 @@ AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
 DIST knot-3.1.1.tar.xz 1402352 BLAKE2B d6f9d29de153b5bdea8a294ae3d65131a0bdcc339ecdc507a9e1429a9cc50752e91f14ea84a7446de76869c6f129d571e9b6b4f9b048618941c4f4c0d667dbff SHA512 44c2973025e752f73ebd6bc78dad5c48c1c1432b62ec3b6d75b5876af4dd21aeed94f78523ef85cd6a986ff27789143a0a67450819c0b75ffa627d06b98e1b0b
+DIST knot-3.1.2.tar.xz 1406684 BLAKE2B a849bf651357e462c5a0afb16e42bcd85bb310980c83b4c642bcf99ddfd17a59e5f5fd5f9fd58b21bcac2e287c57351b3b09cf3f4054ef51243b5226bf0bcc88 SHA512 e72f249f6291980cc69f90dca54cd8ba3ffbc617a1e69e441a48bdcbf46afb9fc202bbb1f88a93887fd264ddb59ad42ff6765c9bd0c1fa4789f035a902a3907a
 EBUILD knot-3.1.1.ebuild 1960 BLAKE2B 9ef73f3a96942f80ad9ffc0d4522fab355e4e341b990bca04ad9b2be33fb02cb074a8504194075ec2886e0cb2840c1788b197384c2aa9094ffc763cd5f5f0373 SHA512 abd011f2f5dc355b87ec74aa111f795378008154b881c899229ae9761086e88d922fabfde28cf702e116ac5967cc45a79e2423d03811eea2a32f3ce71d3bf9de
+EBUILD knot-3.1.2.ebuild 1960 BLAKE2B 9ef73f3a96942f80ad9ffc0d4522fab355e4e341b990bca04ad9b2be33fb02cb074a8504194075ec2886e0cb2840c1788b197384c2aa9094ffc763cd5f5f0373 SHA512 abd011f2f5dc355b87ec74aa111f795378008154b881c899229ae9761086e88d922fabfde28cf702e116ac5967cc45a79e2423d03811eea2a32f3ce71d3bf9de
 MISC metadata.xml 1708 BLAKE2B ff4a36469ebff05b5cceb5c07b1aa7d2d2a81850e7f091dd74db3ee4566a54cd8928190800df21952bc21afc4bc4de6c4a36dcdb807e489a36588a27c6e9fa20 SHA512 50f3a9709a5e38e0968a2daf78f5799ea73d4f424375e8a3e03150b0d38f6cf5e2e35bca629256c1f48b03ab70eb270408f811880484761fa4fa2fc2b10b2e68
diff --git a/net-dns/knot/knot-3.1.2.ebuild b/net-dns/knot/knot-3.1.2.ebuild
new file mode 100644
index 000000000000..b4082a371f4a
--- /dev/null
+++ b/net-dns/knot/knot-3.1.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic 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 ~riscv ~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
+
+	if use riscv; then
+		append-libs -latomic
+	fi
+
+	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/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 955562c7c45d..e7d2cf140c3c 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,12 +1,6 @@
 AUX pdns-recursor-r2 1426 BLAKE2B 4407525f88d6e4299acdaa015e13866b70b2f697493218953c515e00af1476df7b8dbc87f6a39c50743d78b7f8efd2d3446e1a387f98ac4191cea2c04e10c175 SHA512 2f4d8458f6224a42103d28937d69228092c74c9c8c958833b292acf8959df1e617eafc13b65b95cf6eb4e06fb4fa7f23906c28b583865b6885949daaac12799e
-DIST pdns-recursor-4.4.4.tar.bz2 1399645 BLAKE2B 2ef2a59b9c402ab9d9b59d6b89e85b7103dbd9cdcc6147d08f09b85209cb2e298ff539dcb24895a4711f4e7c55c398d0307f237b22d1bdadaf01ec3925af0e8f SHA512 de8ac38d77a4700cd9dd64aad2ba7d1a97057683ace34f1dc3b2e9680faef5637ce7cedb66ceb0b7701f7ff6ef80cbee653549302805b30f9a6defa3a4e8e830
 DIST pdns-recursor-4.4.5.tar.bz2 1400394 BLAKE2B a373d15987860bd6b890e5aa5900f28623ff763a711e527b05c3de950c7fbec186dc5e085100008a8ee89bab24140b0f993357349ec04d968e7f386156cdefbc SHA512 21f4172bb8908cfb53e8d457533a85940b13da6733c2da3972b587e64a0f6d52bfd52b85d5d65769c33dd479ce89b6306bdd105c120ab99b32963e7f0cfbc2e2
-DIST pdns-recursor-4.5.2.tar.bz2 1464834 BLAKE2B 88acd7a6edecf8188b366a9fcff0eaf1b71429df8aad4dbcf157be39901b56ee3c9a9d55bf55bb060bcbb59f68b3ff8987788f4186a7122787874f895be1e751 SHA512 02a9f725c7528f91eb45409b32ffa06cb7fca1f0151907efcd8b75100942e98f593858543df15423413d69c9fd433bad3c8bad0a84f8144af07c637f22a86d5e
-DIST pdns-recursor-4.5.4.tar.bz2 1466655 BLAKE2B 35438eb8dc08990058924d4603e1f7fe2f74f8b2c61e96a82d6972a95f7b3cb43188fa10fa2dc70b699611057a21ba9f78eb3840976ce222c82ea32bdc374bb1 SHA512 403276ab06519a05154fca47fb7270d0199e770f1049a0503a0a1421f2d6fb7df6e9d5359d48348608d6b784e18ac815dd523051b7312f46ad4b510b608af7ab
 DIST pdns-recursor-4.5.5.tar.bz2 1472089 BLAKE2B 408bd0d11b0945de15fe22b290b127a9b7f9f053359a0269fb9e478ae536ed5c4b5ad3b5fa8b15d7786fdd0cdd8721d5a5cb66d46f816105e37ecd9fc9557854 SHA512 7df2e89eea55e870724370753b39d867e2b32fc8bcbdb3efaefa824917b16b9d382817dce7d551dc16d8ad0b0c04b3021cba310b47de969fe54c395eafe7706b
-EBUILD pdns-recursor-4.4.4.ebuild 2009 BLAKE2B 2ac02e0feb23ea88dd1a3cb11501b936df84e479ed6a12d091dc6969d541ed11172a5b62ee60fadf543904c79acbb9c55501cbce3e613fbee6ae5eaab26b9725 SHA512 e61b5b4daa36c405397827d522cc70d9923c9f4294b551b485759f549448b00b0613356a769696240c8a7f9dafbce8645b51b96200c2321f7c5f51ac49b4000f
-EBUILD pdns-recursor-4.4.5.ebuild 2011 BLAKE2B e7b7a322ac34dc9c09ca150973aeee17642c76ec9910cd9fd0c8678fb8a85c23c19e89ff4336a8723b2d4350bb5cb79f7cb234056dcc12ba36d5a428b0cbfffd SHA512 011b7d7dffc0d27e4f4cdcb31f0fb4cbabdeeca82f112aa3fc39cf1a47eb569e65f7e6870e41dab7194eed5175e52f746299a79ebef264e8f028f212c7cabb90
-EBUILD pdns-recursor-4.5.2.ebuild 1882 BLAKE2B 9bac176affd6cb7cdacf908de6b1ffb36615606102840d0c52053f21863a62ff69f3d2cc2756c68b46278b17f6498f07909a6b6c6fec1dd751a8a713c2b58eb5 SHA512 7a51c74ea284045cf6872db7a4ba9b697d1416972a405273411b3fa1c0b220e78849651e5df8f08077de95882a376b331079dd83b8f1a8d450c3665f3583ce3d
-EBUILD pdns-recursor-4.5.4.ebuild 1882 BLAKE2B 9bac176affd6cb7cdacf908de6b1ffb36615606102840d0c52053f21863a62ff69f3d2cc2756c68b46278b17f6498f07909a6b6c6fec1dd751a8a713c2b58eb5 SHA512 7a51c74ea284045cf6872db7a4ba9b697d1416972a405273411b3fa1c0b220e78849651e5df8f08077de95882a376b331079dd83b8f1a8d450c3665f3583ce3d
-EBUILD pdns-recursor-4.5.5.ebuild 1883 BLAKE2B 2ecec2518d4676d838dbdb0cc41a8c0dfd551b15e87ea212594bff2a0d1507746b592684339cf21c08257501c632d157e3edb5ab79b55221c658deae2a83096a SHA512 a26b2d6eb3c97bd485c4e56b93f719e01752c7f5c14019d436260e514cc77ceb644526c210c0ad96cd329e8a0daae862671944501f305ff7a2b59b7c3188fa80
+EBUILD pdns-recursor-4.4.5.ebuild 2009 BLAKE2B 2ac02e0feb23ea88dd1a3cb11501b936df84e479ed6a12d091dc6969d541ed11172a5b62ee60fadf543904c79acbb9c55501cbce3e613fbee6ae5eaab26b9725 SHA512 e61b5b4daa36c405397827d522cc70d9923c9f4294b551b485759f549448b00b0613356a769696240c8a7f9dafbce8645b51b96200c2321f7c5f51ac49b4000f
+EBUILD pdns-recursor-4.5.5.ebuild 1882 BLAKE2B 9bac176affd6cb7cdacf908de6b1ffb36615606102840d0c52053f21863a62ff69f3d2cc2756c68b46278b17f6498f07909a6b6c6fec1dd751a8a713c2b58eb5 SHA512 7a51c74ea284045cf6872db7a4ba9b697d1416972a405273411b3fa1c0b220e78849651e5df8f08077de95882a376b331079dd83b8f1a8d450c3665f3583ce3d
 MISC metadata.xml 1009 BLAKE2B a35c31c4e5478addf07b90464caf1068c7780801f2da35023fb8226e2d64b055378b8020e4dedc9b7795cf8df94500cfd116ebb3196ee27f1ebe83befb453e89 SHA512 2b0ea758d5ab725c1142c9e5abf66fcb7c7fb7916f76a0871e975624de415ba48fbd2a45bcff4afc4cf19bb40f978f1093b4db356e83d8312fda860565d28497
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.4.ebuild
deleted file mode 100644
index 6233a790ac76..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.4.4.ebuild
+++ /dev/null
@@ -1,88 +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 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 ~arm x86"
-IUSE="debug dnstap protobuf snmp sodium systemd test"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	dnstap? ( protobuf )"
-RESTRICT="!test? ( test )"
-
-DEPEND="${LUA_DEPS}
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	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 protobuf) \
-		$(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-recursor/pdns-recursor-4.4.5.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.5.ebuild
index dc546d8cd6ca..6233a790ac76 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.4.5.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.5.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.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.5.2.ebuild
deleted file mode 100644
index cf3bf318576d..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.5.2.ebuild
+++ /dev/null
@@ -1,82 +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 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-recursor/pdns-recursor-4.5.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.5.4.ebuild
deleted file mode 100644
index cf3bf318576d..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.5.4.ebuild
+++ /dev/null
@@ -1,82 +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 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-recursor/pdns-recursor-4.5.5.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.5.5.ebuild
index 391869be2aec..cf3bf318576d 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.5.5.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.5.5.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/Manifest b/net-dns/pdns/Manifest
index 80786ab82f23..fc93b1e1a54b 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -4,5 +4,5 @@ AUX pdns-r1 2815 BLAKE2B cd607cb30a94540eca9cfa2defb7c996f6e151875fcaad8ad335726
 DIST pdns-4.4.1.tar.bz2 1276990 BLAKE2B 9771cf3273ab7e8ab4607a91563bfe0dc3f4532b5420861d816eacd2798d66de3a1eb824c191264f9106ec47bd6003d99108b8df678190055948779b9b3b070f SHA512 a6f31972f77ded8ecfb523e8810dd90e5b7aa628746fee2a9a0daae2a7935800f111ce8617ffd71d5ce3881947d4ffc36c9cb37996a7bcc514536bb4abe1f79e
 DIST pdns-4.5.1.tar.bz2 1274965 BLAKE2B 8b1f91b425f02af5a1f6b8a22fe5e689fb9854686058c7ae2dbac5fe29c9562f9a4fff829fe6b7aad595e1fe2a55af19d09d4b002ec8f88115887cb8a74d042b SHA512 428be2bea0d39613fe31def9116c0d3dbfc95eac953ca058df088f06a971a5a1a49067f83c99719af2657e7abcf2e7c471311bd26a1ebf1bae2bd70e1a823fca
 EBUILD pdns-4.4.1-r1.ebuild 4429 BLAKE2B e530739c8ce95a3099792a6cad1ea2c2e3d2e99f851e9a766f2e35da9491f4bfea6ca7715fea57044c293e80fb3f7770917cc243c241911bde87625a10891f14 SHA512 7738879bbf4dc54acff95dbafdba2eef075f025df74a38984072750fffeb0d6ee7652e02a5783d4ccb416d658d3cbeafbec24369ce8befc0c16650dcefbe6bc0
-EBUILD pdns-4.5.1.ebuild 4258 BLAKE2B 0ac75cefd60a8e7947265a16ce9cf5f0611166d31c2373770b276ddf4fdc284f0a83d488fd8ea7f8cb3b731e4032eeeab8e07b8959b41a750a79be95b1bf0ae5 SHA512 77809ef2a8cd48f57c272ad9260751fa13088c4a42c660623b00246165c48ff888f3f6a2591e8dab6485eb13675d6171be2d8e96f2fe7efe1f8721140137b8f0
+EBUILD pdns-4.5.1.ebuild 4257 BLAKE2B c86c1137f85366afba129ad5eea1366bd96f79fff28d17c48c1ed13d1b4ae19c4e9298bb89a34aba92b5933c875a80656d787093037d626f1c1040e7dcf42391 SHA512 3fe3a0fac082408291033f1b09b43aa36f124630ea0ab7f84ea166289c3d7d875500cf04102c747da9c17482b4cc9d9b2d604c69d300b75b3e078e1c229f8d3a
 MISC metadata.xml 1112 BLAKE2B 1f422022f67b5667b7b2be3947316580c339738e624ddef0b7a7331cc8490633a054d96411892435f7982db74c7ff6c1b9702eb6c526d7e15afcd76049f040e9 SHA512 e9efc6f8ec5039249fa7d965ce1d4ef2c666813b554dba3fd289d326b4074df03555c4d5aee41101701a18e0b14166d3b3e340f55752a88acf2fbd6b16c8be79
diff --git a/net-dns/pdns/pdns-4.5.1.ebuild b/net-dns/pdns/pdns-4.5.1.ebuild
index c45db0959c30..263adb888113 100644
--- a/net-dns/pdns/pdns-4.5.1.ebuild
+++ b/net-dns/pdns/pdns-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"
+KEYWORDS="amd64"
 
 # other possible flags:
 # db2: we lack the dep