gentoo resync : 06.04.2022

23 files changed, 322 insertions, 918 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 355e9bb6ec07..f00bc5cb3613 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index c56cb8005328..2bc1a4091f7e 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -9,5 +9,5 @@ EBUILD bind-tools-9.16.18.ebuild 3411 BLAKE2B 807ef0b010a90ac23c7df0303d1ca6a901
 EBUILD bind-tools-9.16.21.ebuild 3411 BLAKE2B 807ef0b010a90ac23c7df0303d1ca6a9013854b2646d9724f07421e749e3a89c1a7934df46a5f339095950fe382f84548f0b964e7d850f9c9edab17f31fa35d8 SHA512 7efea06b5792ed8a61b8f9eed76fa1dbd9ed308831ef2c235a7a7ded2cc549330159d2455396329ed4b25cacfb5574939e5c1f16df527e696130ce1d62b8dba9
 EBUILD bind-tools-9.16.22.ebuild 3423 BLAKE2B a281882b59088e033cf90c97882778b6e680dea00e9801c09e37c6fd01ee699a56ecc1efbc2a9eb1e035cf0fb0f5703b63e7fe95289c52f63f85fe4511a4f0b4 SHA512 06dec8bd8fd6595be35eb1cd45030a93f83fcffc2eb3461870c9b8e6fa21f0dd4fc8062d7302f9d23e3ca38515faa6a801bcabd988f0585021d6eaafaedd2185
 EBUILD bind-tools-9.16.25.ebuild 3430 BLAKE2B 9ada7340be99524687fa0d1d3370b628f6d1f5c693eef48b1244ff2ee73032f638fdbcd425aa70287b392f6fb90f2eedb40d0d23d779089613347fc1d5fba436 SHA512 a3f44254adeea24d7940d0533356ae1c84529681e2c5a114d9c6235c29b8126860d6f8ff749e20a4524787f4f6c3f5e629367eb84420285da24c662a0a83d73b
-EBUILD bind-tools-9.16.27.ebuild 3423 BLAKE2B 7a30b4add13a95d710c5e2db938e50b782504a28f99783e8322a209a09340ba83067ff06dea1a12a97e85c4f9f3f68f311bd1f2976511f41ba48b43cd48196c7 SHA512 bb4b63c546c36ef10756ee9f95387f9080a5c59941d48da5298c300be982d012ce4701026f1094765a690616453dd02a14511739d4872683a86316970cd6a043
+EBUILD bind-tools-9.16.27.ebuild 3620 BLAKE2B 43fe2108014829574d1e4d4d88b80237690d26592f61b859d38dda0fe4212da02e5b6959cde406aa9b9a42b253512f56d9b4de36f23ed5dc4207c849766853d4 SHA512 b94d4fb99a74d7c55852102bf07113c5ba4b8646db505eda7c0acc94887a3b1390b0c9dc4c9f3f7e3ba9982c815f58867ce2af38e20ab20669f46e69768a8136
 MISC metadata.xml 424 BLAKE2B cb17be35f118db8adb22f75f4b52fce963eb58b7c502cb090fb8ca7a269820e85f77aaa63a880b42f319482000ef43fff82f77c61ed68cb4e21180c2bae66db6 SHA512 a39b3205586616deb59191c2b9d3251cc424e3184f0ff98b0db3251732d96b45d8e6c37e59116917ee17c51b37a048457031b3504329472f0033e360fbd56b1a
diff --git a/net-dns/bind-tools/bind-tools-9.16.27.ebuild b/net-dns/bind-tools/bind-tools-9.16.27.ebuild
index cb9733acbe8c..a928124efddb 100644
--- a/net-dns/bind-tools/bind-tools-9.16.27.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.27.ebuild
@@ -54,6 +54,10 @@ src_prepare() {
 	# Disable tests for now, bug 406399
 	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
 
+	# Do not disable thread local storage on Solaris, it works with our
+	# toolchain, and it breaks further configure checks
+	sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die
+
 	# bug #220361
 	rm aclocal.m4 || die
 	rm -rf libtool.m4/ || die
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index cb3dcca2a363..89bf2e6c40e1 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,8 +1,9 @@
+AUX pdns-recursor-4.6.1-parseACL.patch 550 BLAKE2B 9475e2bb256827dcab48bc3d93d56924a848f1a2ad12b57433ed16cc85c1914a91b9604609c3f803fc9c1f4e835566fad0bf320ec43968dd42092c24e8b7c75c SHA512 0650d904c5d11bb495015c952e872209de1c245e0e2d023895d2a87e6095a1cd03b70cd21aeccdf83dfeaec3cde49114a1f26bc470f71ffc5e3d43a3010bdc3b
+AUX pdns-recursor-4.6.2-parseACL.patch 711 BLAKE2B 95e5a602909b0d293b50304d21844e1c14a14b1278d2cd90cecf216e18e4bd683a752dcf7bd5b22bacceb85ec8ff4be25d768c4db65b5a0bffc67891d4e98fc4 SHA512 fbeeebb6901162f03a7af092ee6ef9b7d18e42f3589437bc93cdc637ac48677a48840b457a86b1317d6d9af86a2271cbe22cd46b43dc5c9979bb4f2ade6ef4b7
 AUX pdns-recursor-r2 1426 BLAKE2B 4407525f88d6e4299acdaa015e13866b70b2f697493218953c515e00af1476df7b8dbc87f6a39c50743d78b7f8efd2d3446e1a387f98ac4191cea2c04e10c175 SHA512 2f4d8458f6224a42103d28937d69228092c74c9c8c958833b292acf8959df1e617eafc13b65b95cf6eb4e06fb4fa7f23906c28b583865b6885949daaac12799e
-DIST pdns-recursor-4.4.7.tar.bz2 1404116 BLAKE2B 42808634fe20735ba0a933a20b7c4dfae0c32b25976e713be46dddfcdf03599b2b29ca8407781ac304fcb004f8a8a29856dc70aeb468f4e773ee5e5a9d1e7631 SHA512 eb4008ec65e42e10d9fc4d0e0fc6c4d4716224f04f530649d88adbc505ea2a8b570bfd738455f9c769e6c242e7996905c7cc457e9f685b06e5d0f73fdffd30a7
-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.7.ebuild 2009 BLAKE2B 2ac02e0feb23ea88dd1a3cb11501b936df84e479ed6a12d091dc6969d541ed11172a5b62ee60fadf543904c79acbb9c55501cbce3e613fbee6ae5eaab26b9725 SHA512 e61b5b4daa36c405397827d522cc70d9923c9f4294b551b485759f549448b00b0613356a769696240c8a7f9dafbce8645b51b96200c2321f7c5f51ac49b4000f
-EBUILD pdns-recursor-4.5.7.ebuild 1882 BLAKE2B 9bac176affd6cb7cdacf908de6b1ffb36615606102840d0c52053f21863a62ff69f3d2cc2756c68b46278b17f6498f07909a6b6c6fec1dd751a8a713c2b58eb5 SHA512 7a51c74ea284045cf6872db7a4ba9b697d1416972a405273411b3fa1c0b220e78849651e5df8f08077de95882a376b331079dd83b8f1a8d450c3665f3583ce3d
-EBUILD pdns-recursor-4.6.0-r1.ebuild 1944 BLAKE2B 5ab6b6c6d3e65d6b2b269fbb236c36290269c1cc8229950702000855c89c8f4bfcd21e8c7be72f52b2c8911d6e08db4d3783acdbf05212d70124aac347d1983c SHA512 4049bf95a163552acd3f466d57ea75dfbfd14b7e564690268a50a6354577130ca78dae6a8e47f5f9d946e27d855bf5fa042b7e015899c9a86ca127ed02176c28
-MISC metadata.xml 1009 BLAKE2B a35c31c4e5478addf07b90464caf1068c7780801f2da35023fb8226e2d64b055378b8020e4dedc9b7795cf8df94500cfd116ebb3196ee27f1ebe83befb453e89 SHA512 2b0ea758d5ab725c1142c9e5abf66fcb7c7fb7916f76a0871e975624de415ba48fbd2a45bcff4afc4cf19bb40f978f1093b4db356e83d8312fda860565d28497
+DIST pdns-recursor-4.6.1.tar.bz2 1541000 BLAKE2B fede4f654cd9900780df8dcc39585e95d8b0536c6d14476fde6f33a2d307144f50fb7b51bf6e0c950dcaff74120a101effee0c92cf15c4acedfa94a2682b0c5c SHA512 b595dd382bb4bff5cd47bff854952c8ee40bedeafe4236f935c8eceeca7ac97e8668b884e1ec0ce490ce535fab10d161ffc53ca395c0bb02ffcf6005a692674b
+DIST pdns-recursor-4.6.2.tar.bz2 1552587 BLAKE2B 3e7fe59ebe9d776c012304fc1bf6ed723c1c15df0aaedcaa8ac538741e81c5b6ebac2528e763e1395a0ea383904e4a902319509580938caae85b3aef947cfc3d SHA512 20779a065720162f0a6223a4d92deeef7911892bb8aa1929f9c6a8a6ccd2f8756e7bd35c877dbf945bb7627a2a7d40626d02f0008c2e8a602b424d36c110fddc
+EBUILD pdns-recursor-4.6.1-r1.ebuild 2086 BLAKE2B 80f87f1c82906388f40d4e749953383e275607f41524e597e326d422bd8076862da4977abe4a10d088416ed673e99f3655e67bb0e722f27ae13040ba2ab73d5f SHA512 c60d6e5bc4f93d050195951f1bce3ba9d119a037347d173b59a5d632b8c5e3fdda1e95f293c2d1f817bd87e8db6db09abf83a9beae123daebc12873fbaf48c09
+EBUILD pdns-recursor-4.6.1.ebuild 2027 BLAKE2B cd9b9f81e013eae71d479b0383a8d5c2de50c62f4892939afc788cbfec3215089761da9c29a7a97a52d0cd15bf7482cf81423a34b84aefe0de1c90fd0fd63f19 SHA512 880e31f327b1ffe4dcd93314864b35247c4263481ffe9602db43bc16268288cfceccd1bcfd599e69d49bf7f74a1fd9d1e482a3ccf1d3e369691f7bf4725be33c
+EBUILD pdns-recursor-4.6.2.ebuild 2086 BLAKE2B 80f87f1c82906388f40d4e749953383e275607f41524e597e326d422bd8076862da4977abe4a10d088416ed673e99f3655e67bb0e722f27ae13040ba2ab73d5f SHA512 c60d6e5bc4f93d050195951f1bce3ba9d119a037347d173b59a5d632b8c5e3fdda1e95f293c2d1f817bd87e8db6db09abf83a9beae123daebc12873fbaf48c09
+MISC metadata.xml 930 BLAKE2B 997ed7f557ddae9d8a5b3f92396cb5acb9cde67de5cc750c4c3b051635557ff22fcdd94400a95cc7e5328ccca9786fe3b780c81d57f785865a18e68701916d00 SHA512 3415ed721ad143cae712ee309ba9f3057273b8e594617fe12382bd316cad7dc6e2ed66d660d9c13fa3db993852c85f21d1ea1c0367e595dd5bbf782add225cd1
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch
new file mode 100644
index 000000000000..594fc8eca609
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch
@@ -0,0 +1,13 @@
+diff --git i/pdns_recursor.cc w/pdns_recursor.cc
+index 1700a9fde..ed09f2680 100644
+--- i/pdns_recursor.cc
++++ w/pdns_recursor.cc
+@@ -4844,7 +4844,7 @@ void parseACLs()
+ 
+   auto allowFrom = parseACL("allow-from-file", "allow-from");
+ 
+-  if(allowFrom->size() == 0) {
++  if(allowFrom == nullptr || allowFrom->size() == 0) {
+     if(::arg()["local-address"]!="127.0.0.1" && ::arg().asNum("local-port")==53)
+       g_log<<Logger::Warning<<"WARNING: Allowing queries from all IP addresses - this can be a security risk!"<<endl;
+     allowFrom = nullptr;
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch
new file mode 100644
index 000000000000..ee58e055f09a
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch
@@ -0,0 +1,24 @@
+--- a/pdns_recursor.cc
++++ b/pdns_recursor.cc
+@@ -4775,8 +4775,6 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const
+       result->addMask(line);
+     }
+     g_log<<Logger::Info<<"Done parsing "<<result->size()<<" "<<aclSetting<<" ranges from file '"<<::arg()[aclFile]<<"' - overriding '"<<aclSetting<<"' setting"<<endl;
+-
+-    return result;
+   }
+   else if(!::arg()[aclSetting].empty()) {
+     vector<string> ips;
+@@ -4790,11 +4788,9 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const
+       g_log<<Logger::Info<<*i;
+     }
+     g_log<<Logger::Info<<endl;
+-
+-    return result;
+   }
+ 
+-  return nullptr;
++  return result;
+ }
+ 
+ void parseACLs()
diff --git a/net-dns/pdns-recursor/metadata.xml b/net-dns/pdns-recursor/metadata.xml
index 593db831ec21..f36a13ab15c8 100644
--- a/net-dns/pdns-recursor/metadata.xml
+++ b/net-dns/pdns-recursor/metadata.xml
@@ -16,7 +16,6 @@ nameserver performance.
 </longdescription>
 <use>
 	<flag name="dnstap">Enable support for dnstap</flag>
-	<flag name="protobuf">Enable support for <pkg>dev-libs/protobuf</pkg>.</flag>
 	<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag>
 </use>
 </pkgmetadata>
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.5.7.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.6.1-r1.ebuild
index cf3bf318576d..fff451a76927 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.5.7.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug dnstap snmp sodium systemd test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -23,8 +23,12 @@ DEPEND="${LUA_DEPS}
 	systemd? ( sys-apps/systemd:0= )
 	snmp? ( net-analyzer/net-snmp )
 	sodium? ( dev-libs/libsodium:= )
+	elibc_glibc? (
+		arm? ( >=sys-libs/glibc-2.34 )
+		x86? ( >=sys-libs/glibc-2.34 )
+	)
 	dev-libs/openssl:=
-	>=dev-libs/boost-1.35:="
+	>=dev-libs/boost-1.35:=[context]"
 RDEPEND="${DEPEND}
 	!<net-dns/pdns-2.9.20-r1
 	acct-user/pdns
@@ -33,9 +37,15 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-parseACL.patch
+)
+
 pkg_setup() {
 	lua-single_pkg_setup
 	filter-flags -ftree-vectorize
+	append-lfs-flags
+	append-cppflags -D_TIME_BITS=64
 }
 
 src_configure() {
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.6.0-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.6.1.ebuild
index 076ff5c64a8c..174f5e949b3f 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.6.0-r1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.6.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 ~arm x86"
 IUSE="debug dnstap snmp sodium systemd test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -23,6 +23,10 @@ DEPEND="${LUA_DEPS}
 	systemd? ( sys-apps/systemd:0= )
 	snmp? ( net-analyzer/net-snmp )
 	sodium? ( dev-libs/libsodium:= )
+	elibc_glibc? (
+		arm? ( >=sys-libs/glibc-2.34 )
+		x86? ( >=sys-libs/glibc-2.34 )
+	)
 	dev-libs/openssl:=
 	>=dev-libs/boost-1.35:="
 RDEPEND="${DEPEND}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.7.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild
index 6233a790ac76..fff451a76927 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.4.7.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,23 +13,22 @@ 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 )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug dnstap snmp sodium systemd test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 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:= )
+	elibc_glibc? (
+		arm? ( >=sys-libs/glibc-2.34 )
+		x86? ( >=sys-libs/glibc-2.34 )
+	)
 	dev-libs/openssl:=
-	>=dev-libs/boost-1.35:="
+	>=dev-libs/boost-1.35:=[context]"
 RDEPEND="${DEPEND}
 	!<net-dns/pdns-2.9.20-r1
 	acct-user/pdns
@@ -38,9 +37,15 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-parseACL.patch
+)
+
 pkg_setup() {
 	lua-single_pkg_setup
 	filter-flags -ftree-vectorize
+	append-lfs-flags
+	append-cppflags -D_TIME_BITS=64
 }
 
 src_configure() {
@@ -55,7 +60,6 @@ src_configure() {
 		$(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/Manifest b/net-dns/pdns/Manifest
index 22a52393d6dd..f699d1c27cb4 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,15 +1,5 @@
 AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf403453422888e2cb44fa4fed7891241919a39c8c6f539a61de032654650a45ea548a6983777ea1bfe029e817f2c315 SHA512 ac16f8d528d6138d3c2cbf997fd8fbb467d388aa63eb6ed4e7780a3dad11ea885b91252ff0809b1d2cf7d5200814b8963aab890af84741ea86d35b2f5955a7ea
-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.2.tar.bz2 1266572 BLAKE2B 9bd3d391e32c4040cc916003a45d47784ea309dd43a326919e2ca5415e1a1c542d5937cf1570951a4100a524a933aa9c0114ef8e28957f64acb6f7a7fa18e237 SHA512 0a183d8c0bb517799afa0f9382e3c06ad3c6e9c871b7912073a860364ca97dc121be2372080100677db10601c8ef96ad56b10787c02a9a9ede82f8a1cc904c6e
-DIST pdns-4.5.3.tar.bz2 1265929 BLAKE2B 49425dd65bc2ea1ceaba5349db828b8e7e0031f7327bc867235fe293a107cebae69f734731a21369616ce2a5121309490556ba7838a91a9cabb74a6f0d4e42c0 SHA512 9708f69ed045c801e5cbc5d62f57532ad461f1e9e4574fe2b5d5f72e8534587cfc28f55afaaa1a52f59d7feb8331a683b3f5db7e896d01002996321598550607
-DIST pdns-4.6.0.tar.bz2 1299604 BLAKE2B 832e2dfb2a66fafd40d096193aad30feae8b751585199e9e4c9092e6bc02f478b617be1997df4bff58ce0a9b69100654bfafc062c4bf96ffad230132de9ce5d0 SHA512 bbe64ad01fed0ea93cec90d47b2fe71228b9298999f14456dd4b5617929c0e370b5b7cb568deeb17cbf3fd42873bb8c986e655ddda8c7b93b4591361ddef2397
-EBUILD pdns-4.4.1-r2.ebuild 4436 BLAKE2B 5f18c374a9c1c2d714009889e476d28257357f110b08550d1d0840d569c81c3d6995c47f635ddc105fa2df9fd069df12f1305f0626a11527ba974d71ba97fcc1 SHA512 76c9c2fe7af62ef4c2b307a121b4998dba25a3311187a289105a22ceb92ca9c319ba1aa86879f7353f9c338b262f9ba38400ae65365e3c14575d55ec01e6af61
-EBUILD pdns-4.4.2-r1.ebuild 4445 BLAKE2B 83d2fa6d4a2c01d3e730829ee6fa4050ef16ee38d9dfad5db0562d84319477acac78b184d4a7e0d43501d47007596ebe8508101b3bbb149b01b3a40bf144b4cd SHA512 b6736e29211e068bd94a6acd204f40be61e0970ceb0b0076428b81fc51473d84251ebba40058e0e7aa323405c0f221da4969a2a75620d5a1f40be85b24f7b9b9
-EBUILD pdns-4.5.2-r2.ebuild 4264 BLAKE2B e685fc2c69f3626e2465daccc36b51c224230938c482c583c893aff21e93f7d51f9ebd9e1ea18c2d1e1591bedab844853ce6b186ed27395411176b8aa9768dc2 SHA512 8161d213fa3e960981899e269f1974ca49d50b62f2ecc0e92e0d760ea2b6bd4e245f1e98958b3806624d0f6edce80b0fb92f3f2780c04ba3ca07dfa57b7ee54b
-EBUILD pdns-4.5.2-r3.ebuild 4373 BLAKE2B 229d4d37aafe8d4d1d7413ad44db7305198cf1d2d2a5e2cae00e9f7e7c33798ec7b62dea3daa2aa0703385078f9a0c6f46674b28ac48530dd0a87374596b912b SHA512 07f6d483960ca9c47db843c7138fe77f7bbfb39cc84d463ad41c90ea3872e8edc4442f4276dd1a7e2f3f3cf21cd87ea32cfdc3f532427f253ce86eb4fc08a9fd
-EBUILD pdns-4.5.3-r1.ebuild 4373 BLAKE2B 229d4d37aafe8d4d1d7413ad44db7305198cf1d2d2a5e2cae00e9f7e7c33798ec7b62dea3daa2aa0703385078f9a0c6f46674b28ac48530dd0a87374596b912b SHA512 07f6d483960ca9c47db843c7138fe77f7bbfb39cc84d463ad41c90ea3872e8edc4442f4276dd1a7e2f3f3cf21cd87ea32cfdc3f532427f253ce86eb4fc08a9fd
-EBUILD pdns-4.6.0-r1.ebuild 4373 BLAKE2B 229d4d37aafe8d4d1d7413ad44db7305198cf1d2d2a5e2cae00e9f7e7c33798ec7b62dea3daa2aa0703385078f9a0c6f46674b28ac48530dd0a87374596b912b SHA512 07f6d483960ca9c47db843c7138fe77f7bbfb39cc84d463ad41c90ea3872e8edc4442f4276dd1a7e2f3f3cf21cd87ea32cfdc3f532427f253ce86eb4fc08a9fd
-MISC metadata.xml 1112 BLAKE2B 1f422022f67b5667b7b2be3947316580c339738e624ddef0b7a7331cc8490633a054d96411892435f7982db74c7ff6c1b9702eb6c526d7e15afcd76049f040e9 SHA512 e9efc6f8ec5039249fa7d965ce1d4ef2c666813b554dba3fd289d326b4074df03555c4d5aee41101701a18e0b14166d3b3e340f55752a88acf2fbd6b16c8be79
+DIST pdns-4.6.1.tar.bz2 1315530 BLAKE2B 18676fac07667215babce3687d2ed9f108cad56a3a099907feac7eb86ba771bcd6319eb687ff826c5288590e6cdf3babe6c6c867a892d290351017c5bfb10198 SHA512 02ecb4e182ac4976f9d788b351b70988ec56cc034631f482e539ec9c420bba231c4597b2f76a4b511c5aaa58ee097ad9de4e4b29b191af65eaf5033269ae7087
+EBUILD pdns-4.6.1.ebuild 4420 BLAKE2B 7a85d32f4646c6a91187885184094c155322a8b5ba47954c15ce600b96a9846fe32f3d5fc362d36daee0ed298c185097d5c8ab1a02fd8dedc7dad4e1795d3683 SHA512 12ba08350b8255a395eaebcba671cd6ce70f46069fc1e962033d982691e39d9b995cc53e5a700cafff46bbdd485509afe5e4a72086a357656477c538ed046b4f
+MISC metadata.xml 1033 BLAKE2B 25e9c4711dd3f5113aba4edb7d0b8aeed9fd63344633c0889110899a5e2a8021908c585d2817a88c121eadde0d55b449404ea2b4e83ac7c85b270cd3c34513c0 SHA512 0b8ca219f5246165e35d8c2c43ccf95fc55ebc4df09568941fad377e3fa4c52a7312623c61fc87b72f9841246ee2ccb600317edf5c6514582db2d67272130f22
diff --git a/net-dns/pdns/files/pdns-4.4.1-boost-1.76.patch b/net-dns/pdns/files/pdns-4.4.1-boost-1.76.patch
deleted file mode 100644
index 0e440020541f..000000000000
--- a/net-dns/pdns/files/pdns-4.4.1-boost-1.76.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 42cec1e5948e828fb2b941107c4fce9ec847f9a8 Mon Sep 17 00:00:00 2001
-From: Peter van Dijk <peter.van.dijk@powerdns.com>
-Date: Fri, 23 Apr 2021 15:40:43 +0200
-Subject: [PATCH] boost 1.76 containers: use standard exceptions
-
-(cherry picked from commit 311f26839819062ced8697686372b6c6b2210bdf)
----
- pdns/Makefile.am              | 3 ++-
- pdns/dnsdistdist/Makefile.am  | 2 +-
- pdns/recursordist/Makefile.am | 3 ++-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/pdns/Makefile.am b/pdns/Makefile.am
-index 237a48f501f..f073f052600 100644
---- a/pdns/Makefile.am
-+++ b/pdns/Makefile.am
-@@ -6,7 +6,8 @@ AM_CPPFLAGS += \
- 	$(LIBEDIT_CFLAGS) \
- 	$(LIBCRYPTO_INCLUDES) \
- 	$(SYSTEMD_CFLAGS) \
--	$(YAML_CFLAGS)
-+	$(YAML_CFLAGS) \
-+	-DBOOST_CONTAINER_USE_STD_EXCEPTIONS
- 
- AM_CXXFLAGS = \
- 	-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/net-dns/pdns/metadata.xml b/net-dns/pdns/metadata.xml
index ba9ffd40f318..aa39421d3798 100644
--- a/net-dns/pdns/metadata.xml
+++ b/net-dns/pdns/metadata.xml
@@ -13,7 +13,6 @@ standards documents. Furthermore, PowerDNS interfaces with almost any database.
 <use>
 	<flag name="lua-records">Enable LUA records.</flag>
 	<flag name="mydns">Making it possible to use a MyDNS MySQL database with PowerDNS (not recommended for new deployments).</flag>
-	<flag name="protobuf">Enable support for <pkg>dev-libs/protobuf</pkg>.</flag>
 	<flag name="remote">Use a generic socket or pipe as a backend (via JSON RPC requests).</flag>
 	<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag>
 	<flag name="tinydns">Use a TinyDNS CDB database as backend.</flag>
diff --git a/net-dns/pdns/pdns-4.4.1-r2.ebuild b/net-dns/pdns/pdns-4.4.1-r2.ebuild
deleted file mode 100644
index a6ae91957e48..000000000000
--- a/net-dns/pdns/pdns-4.4.1-r2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2022 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}"/${P}-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.4.2-r1.ebuild b/net-dns/pdns/pdns-4.4.2-r1.ebuild
deleted file mode 100644
index 235248bb3944..000000000000
--- a/net-dns/pdns/pdns-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2022 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-r2.ebuild b/net-dns/pdns/pdns-4.5.2-r2.ebuild
deleted file mode 100644
index a3efc10cb356..000000000000
--- a/net-dns/pdns/pdns-4.5.2-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 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"
-
-# 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 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 )"
-RDEPEND="${DEPEND}
-	acct-user/pdns
-	acct-group/pdns"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-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) \
-		${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-r3.ebuild b/net-dns/pdns/pdns-4.5.2-r3.ebuild
deleted file mode 100644
index ed0d736ca687..000000000000
--- a/net-dns/pdns/pdns-4.5.2-r3.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2022 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 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 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 )"
-RDEPEND="${DEPEND}
-	acct-user/pdns
-	acct-group/pdns"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	lua-single_pkg_setup
-	append-lfs-flags
-	append-cppflags -D_TIME_BITS=64
-}
-
-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) \
-		${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.3-r1.ebuild b/net-dns/pdns/pdns-4.5.3-r1.ebuild
deleted file mode 100644
index ed0d736ca687..000000000000
--- a/net-dns/pdns/pdns-4.5.3-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2022 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 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 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 )"
-RDEPEND="${DEPEND}
-	acct-user/pdns
-	acct-group/pdns"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	lua-single_pkg_setup
-	append-lfs-flags
-	append-cppflags -D_TIME_BITS=64
-}
-
-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) \
-		${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.6.0-r1.ebuild b/net-dns/pdns/pdns-4.6.1.ebuild
index ed0d736ca687..c9114681d24b 100644
--- a/net-dns/pdns/pdns-4.6.0-r1.ebuild
+++ b/net-dns/pdns/pdns-4.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # other possible flags:
 # db2: we lack the dep
@@ -36,7 +36,8 @@ DEPEND="${LUA_DEPS}
 	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 )"
+	tinydns? ( >=dev-db/tinycdb-0.77 )
+	elibc_glibc? ( x86? ( >=sys-libs/glibc-2.34 ) )"
 RDEPEND="${DEPEND}
 	acct-user/pdns
 	acct-group/pdns"
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 34dcd87c392a..437834275b3c 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -10,7 +10,11 @@ AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a7
 DIST unbound-1.13.1.tar.gz 5976957 BLAKE2B 5fabb9205773a1983842e41cf7a4d6c3878fa8beb7c8ccc71ae1edf7738cb9506c3d7bb32cf887b305317ca695bf876d9f5bf9aeb0129b0e9e926d437b3e6eb3 SHA512 f4d26dca28dbcc33a5e65a55147fa01077c331292e88b6a87798cb6c3d4edb0515015d131fd893c92b74d22d9998a640f0adce404e6192d61ebe69a6a599287c
 DIST unbound-1.13.2.tar.gz 6127915 BLAKE2B 71806edc86b323ff1f9f2d7bd3f699b15da2cd1cfefe9ca6008d74915dd6c7b45690026fb0244531ae563a3ca1b142f21fc8aed97ba4bb0015d8ab9196ff045a SHA512 1e89441446e7a25c6a49bded645f8b348c1758c3be54e3a986041cb1f00c45d152fd469dc52666fb820574db9d51b16f1627dc8afcb9519508d4833ca358191a
 DIST unbound-1.14.0.tar.gz 6152326 BLAKE2B ceccfbcbc16370153005f32d19be44bd41a4ac935cb7b9a90128d604c9874b06cc7de8b92dc34585d7957f0ad90ce2f441c2ed092c9307bcf4335f8d99eb8bd3 SHA512 57f91d898b0a5d42e6a2ff1ccaec474f04dd5ad3c98e7eb7aa8d5eaa23b587f3077cf7eddf4df38f537c6d387028f12c2518ff13b7249aa7a1155cd6532a46b5
+DIST unbound-1.14.0.tar.gz.asc 833 BLAKE2B 21df47fba46db82ce8fcbf9f39e8e16f8d5ece493dbdc8fe8cad749e3f8e1af164c4280f9722d9f507199ae59a851925a7856bc9e11926b05f253b4342b06383 SHA512 5f77f33040bd783c8d67a50cb5a97435842203e6c2152f40994fba772777db60f01ab76156aa95a477ee50ae22f4227162cdd1fc0e4ae388c6b47f91ac9a5b95
+DIST unbound-1.15.0.tar.gz 6163470 BLAKE2B e67756fb28aac784431484e5f834cbe3864a0ec021a8c9eb3124a6d5732fea99a073815a624210e43e50b3b59ce943c5cc6a4e5e1c743b91f5803e2dcf5c9870 SHA512 c5dab305694c14f64e05080700bb52f6e6bf5b76f15e1fde34e35c932cb3ffed0de2c03b570cf4bfe18165cb10e82e67ee9b12c6583295380f88c2c03800cc1f
+DIST unbound-1.15.0.tar.gz.asc 833 BLAKE2B 166cbb1caf14fb4a4375d609c740e7305ed4ee19c1e307caf1e780eb3f53e86db2d34b3f21e1d0c5f1496eac9211ce795c085ab9944f66f9a2f54d08479254db SHA512 123818a855689ee3d402fd8f4b5a4646c08d5602e4544ce872d132c4c0de4a79c9efcc2d49324bf58ab06521f02deef795d89bdf632eee758e6ec36b408ea54a
 EBUILD unbound-1.13.1-r3.ebuild 6088 BLAKE2B a59345ef64e907346092bff8160a41fe00b0a02c123e920cb177161e9093bef6017f41ee7ce41edde432ac21aefeeb2d5e87500aeffdabc04031f29309299e4d SHA512 632ff673ff3076bf80a29bff1fce1eaef334571d11d1acb27a5ce562ade71bd0fb5bebe5f9a236fad38c9dcf2655aee29e022465714163483380435b7103a7f1
-EBUILD unbound-1.13.2-r1.ebuild 6115 BLAKE2B 5a512adf26837b1620104205c22ff0a5823f3988d755ce03ad0e138125ffd247edefd9f467cfd47f01514ece74a28ee7aacf45b7dd59ef211be0fc5eb6bb98b3 SHA512 0614e7410328c18e8535dd78e7c02b3fe0d4005095aea001bb79e19d095cc8b8dfc22c9e73647596cbe3835aab32d7391f8d89f1f63edef01f22365c6b38e753
-EBUILD unbound-1.14.0.ebuild 6119 BLAKE2B b116d221aacecd067268e3c15de1f7ed9d588a2d3a6df7cb6447e92224c77454d5604e6acd00ac561234d2307b4a2babd4b19e60b88e6821b815ccd28d05eafa SHA512 2b8e8db6b2201fcf00d1932a07c4298924c5e69abb5f5c17057a350762db0b78a561455ac085f264d3290a760671438c49dde50a9a4af4750829c8bcab53a8b3
+EBUILD unbound-1.13.2-r1.ebuild 6119 BLAKE2B 9fd3134031787cf87bc4a6f2948a6fce93805a363d7cb828fa4c8731872d4679b02d2fc8de79266cb5fd2e375bd75c36528b77c200443e498db0a1aacac4f923 SHA512 e296ef9d32b32e5872c51664602011b895b98f7809340c77daf12db18f57cae796dc67db2f71e086f54cd595d586cf349435fe5c615993531061b28fdd78b282
+EBUILD unbound-1.14.0-r1.ebuild 6332 BLAKE2B d42509d073111cb24390522afc68bafcce9b4a9c1a3cbcf48db72ce7e3ae7bd81d9f46a8a59f03daebdade722705713fb6d4059cf5792e76d49a3eec63a0fc11 SHA512 ff4235f6aebfb1b6b4a62e6bf0a445d8a7c8fc5b605a91de8db5c4e55504e3b516c51f7ecd4dbf4c1d6b0b82ff62643436c90aa0f19208dfdc319e0275a12f5c
+EBUILD unbound-1.15.0.ebuild 6332 BLAKE2B d42509d073111cb24390522afc68bafcce9b4a9c1a3cbcf48db72ce7e3ae7bd81d9f46a8a59f03daebdade722705713fb6d4059cf5792e76d49a3eec63a0fc11 SHA512 ff4235f6aebfb1b6b4a62e6bf0a445d8a7c8fc5b605a91de8db5c4e55504e3b516c51f7ecd4dbf4c1d6b0b82ff62643436c90aa0f19208dfdc319e0275a12f5c
 MISC metadata.xml 1593 BLAKE2B d262cac4efcdc37b123fa3098212f0d3b0e948cadd5afab491696568b8c83e2f72844f482ba10b27fec2d319de2a7b8c7befe58302296808ab521cfe5af091cd SHA512 38bbc03a0263d83b7aa8ad08e0032d158612a3820667a4c8c19e3e0073f9f644792bfc5acc6b2f7ae658abc36a321f844d5dd14d13adfb6b0173e86387ddebc2
diff --git a/net-dns/unbound/unbound-1.13.2-r1.ebuild b/net-dns/unbound/unbound-1.13.2-r1.ebuild
index 8b892a13ee54..52208581e7b2 100644
--- a/net-dns/unbound/unbound-1.13.2-r1.ebuild
+++ b/net-dns/unbound/unbound-1.13.2-r1.ebuild
@@ -111,12 +111,12 @@ multilib_src_configure() {
 		--disable-rpath \
 		--enable-event-api \
 		--enable-ipsecmod \
-		--with-libevent="${EPREFIX}"/usr \
-		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
+		--with-libevent="${ESYSROOT}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/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
+		--with-ssl="${ESYSROOT}"/usr \
+		--with-libexpat="${ESYSROOT}"/usr
 
 		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
 		# $(use_enable debug lock-checks) \
diff --git a/net-dns/unbound/unbound-1.14.0.ebuild b/net-dns/unbound/unbound-1.14.0-r1.ebuild
index 127dcb9a51ac..5d8427f124b1 100644
--- a/net-dns/unbound/unbound-1.14.0.ebuild
+++ b/net-dns/unbound/unbound-1.14.0-r1.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig
 
 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"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz
+	verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc )"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/unbound.net.asc
 
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
@@ -52,6 +54,7 @@ BDEPEND="virtual/pkgconfig
 		dev-util/splint
 		app-text/wdiff
 	)
+	verify-sig? ( sec-keys/openpgp-keys-unbound )
 "
 
 DEPEND="${CDEPEND}"
@@ -111,12 +114,12 @@ multilib_src_configure() {
 		--disable-rpath \
 		--enable-event-api \
 		--enable-ipsecmod \
-		--with-libevent="${EPREFIX}"/usr \
-		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
+		--with-libevent="${ESYSROOT}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/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
+		--with-ssl="${ESYSROOT}"/usr \
+		--with-libexpat="${ESYSROOT}"/usr
 
 		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
 		# $(use_enable debug lock-checks) \
diff --git a/net-dns/unbound/unbound-1.15.0.ebuild b/net-dns/unbound/unbound-1.15.0.ebuild
new file mode 100644
index 000000000000..5d8427f124b1
--- /dev/null
+++ b/net-dns/unbound/unbound-1.15.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig
+
+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
+	verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc )"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/unbound.net.asc
+
+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 +tfo 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:= )
+	systemd? ( sys-apps/systemd )
+"
+
+BDEPEND="virtual/pkgconfig
+	python? ( dev-lang/swig )
+	test? (
+		|| (
+			net-libs/ldns[examples(-)]
+			net-dns/ldns-utils[examples(-)]
+		)
+		dev-util/splint
+		app-text/wdiff
+	)
+	verify-sig? ( sec-keys/openpgp-keys-unbound )
+"
+
+DEPEND="${CDEPEND}"
+
+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) \
+		$(use_enable tfo tfo-client) \
+		$(use_enable tfo tfo-server) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--with-libevent="${ESYSROOT}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${ESYSROOT}"/usr \
+		--with-libexpat="${ESYSROOT}"/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
+}