gentoo resync : 05.12.2021

29 files changed, 338 insertions, 407 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 72ecbba14556..c3d040b51348 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index a07423a35f96..c53ac496b305 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -3,5 +3,5 @@ AUX ddclient.initd-r6 584 BLAKE2B 6f1c9ddf862e50013208adbbd77f471ed03faf59381ed3
 AUX ddclient.service-r1 235 BLAKE2B 204793b269c65d7ed77f89c1d5f191298a7b03f44dc22526331fe28585ad1abc2c19fb3f2c65df1dd32bd20f3f121bf2f7d936ed42831067fc232024383c768a SHA512 1bcceae10d8076cb3fa5cb0215c0eaf17588e943d802c40cf5334f125a3697b103646bc393ba4db90845ad8e6ff1d4301b86afba5609ecb3bff98a5623f09195
 AUX ddclient.tmpfiles 149 BLAKE2B 0ad955937dd6cf714530429ffb423e0acc7033bdf7e2486a99d50d055edb85adff869209631cdfd8c2aa49263c31817868b765e7af27e222ad9f0b19bf439d74 SHA512 13c6e541ff23575d799eee943b8e10e277e5073732cd7c9705c23ee557bd99978435c0fe8b546fa3122a60cfb0499e27853e1968f0c1e0225890b68ae678e0c7
 DIST ddclient-3.9.1.tar.gz 63469 BLAKE2B 8ae6543353d96f76d926117ae53d74da6e8bc8f116fa15b8b0d39bc29a4c334bfc3d673b8f1c57139213b91414d1b9a2063fde9e1015f03fb76ba70a60956a7e SHA512 a8a4d6cb94e4239a7b7b4fc7d9ebef703cbd6c45fc3394b644694a053b5b8aa8d109410b5b8b3676a5f30b18474d24c7feb16c65c30b28bd7d941d8a214b1346
-EBUILD ddclient-3.9.1.ebuild 1561 BLAKE2B baa30b6b674fcea5a89d0abcfd5b82d9ddd9e56dae2ab6adf145c2480dd40477be8acc7890c69488b99ca5e7236555b4f740dd03646d68f30e14b589561ddd20 SHA512 391189e3d39d957d2cfda076aceaa15cfe1d77d82fdedea3ccedf1047e03e4698199c93bc4f3583672bec5bc3c587ff679b5790c84ff0260f3592e5582596e4b
+EBUILD ddclient-3.9.1-r1.ebuild 1618 BLAKE2B 054cb6f60baddf6101d8b32c2b62d9ed62e81c7663e3a4638fbec148d7d87f8a3c262b7f16c1e386677426002d2db94e792ae9706150325b4b9abd9249b137fd SHA512 82a38117eab432b37c601ff0cced35df412d00e7efc05553a5faa622a576a0a972857a62e71d37b8bb1b18a3dc8aac54fc29aa3a5d00a2155bcba8a140ea65ef
 MISC metadata.xml 1000 BLAKE2B 28df95575f44a75929dfc2de78e536063ce69f0f4f07969806f480bd0ea2265161bbbe8a24e7184ab52ebaa0844669add27ebbb7fe328f260c8308d0f86eec09 SHA512 dc10cbf83b521998cf70bed8d8ee90294c00506a846931a0bb3ab080bdbf64237c3b0a0df5d41f1e33e43c8e148dabaead4ddfd820d68a79217e1157a7b2a0fb
diff --git a/net-dns/ddclient/ddclient-3.9.1.ebuild b/net-dns/ddclient/ddclient-3.9.1-r1.ebuild
index 35ab76e4bda1..c22af983db9b 100644
--- a/net-dns/ddclient/ddclient-3.9.1.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,10 +9,10 @@ DESCRIPTION="Perl client used to update dynamic DNS entries"
 HOMEPAGE="https://ddclient.net/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="examples iproute2"
+IUSE="examples iproute2 selinux"
 
 RDEPEND="
 	acct-group/ddclient
@@ -25,6 +25,7 @@ RDEPEND="
 	virtual/perl-Digest-SHA
 	virtual/perl-JSON-PP
 	iproute2? ( sys-apps/iproute2 )
+	selinux? ( sec-policy/selinux-ddclient )
 "
 
 src_prepare() {
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 488fc6e7fbcc..d8e11e7243e3 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,7 +1,7 @@
 AUX dnscrypt-proxy-2.0.45-config-full-paths.patch 4260 BLAKE2B 04eca789643722cef51198228ae7a35d75dc66bc1f882ccb5919330789105272bfd1d61e31ae2276fb6d94b05777096138f23026262c26436ae4ab2f2376e2ec SHA512 9e4991cecfd11b07d3a83fbe5c885a89e917ae92e335d261c96ed0b086bf04d051ff5179037999b91cd773e7d9f58f5f04aea85958e496c314694da37ff151ca
 AUX dnscrypt-proxy-2.1.0-config-full-paths.patch 3569 BLAKE2B 67650961f1e63021aa8b48d52beaf4a117c99f0edae80c3643ac462c937fbbbd64970ddec9261d07ddfc2fc3f715e97c0082cef1eeea55065bbfd390993fc1ac SHA512 e04f693cac2431113b8b4b22d2573f642d073bd5d8ea9abd3408dfb44694e3ebab13dbf9c18a45bd6d7312194a58e1fdb371b6ff881e578ad833f12268304600
 AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179a7e2103fdf716711912987961969619e6b6e6b2e201253e90f828ffa5eb011c0870c112a028c4cfd89ce5 SHA512 25ccbc09df7b51bc0fa4587f7a715429ba11517c64db53086dd09df24470da71b81dbacebe227bd41d1f9576b4560dc58729969eb7b33aa233ec6a6a07d573ab
-AUX dnscrypt-proxy.initd 667 BLAKE2B fba1075bd738fc86b50f37bc25e3ef7f54416d5d85cf3e6d088be0707164007b1ff9c01ac2b0a583724f726cde41a96cd77c8beab11082dbc7b5c03a05c8cf95 SHA512 89677b8718c1a45a6d8b1a0501dc5c4ff8c02793181ac84316fe5488807726bc66b40849c2f91da817862997628b3456926f5efc6ede9c25bf3f5e6533fb88ee
+AUX dnscrypt-proxy.initd 639 BLAKE2B a3d35908a5716ae8ce92a2eacbda99175578d631449a841608ad93f19ae3841ace7feef27c60c75911ea68bc7bd039b0e057bac7b7ba61762418e5a52ddc608f SHA512 f48ba140968a73160e11e137e6d1b3a03ccec96596a91fd2878a0d40b749d4cccca5d2db30fdfff1f75ce42a7a20ac5f8fdef7f282ba26bd1a875905c6751d2b
 AUX dnscrypt-proxy.logrotate 105 BLAKE2B 892cc2acb621bb2c653f4545ac1c58777cc048b9a2f954eac7d92fdf6109b529884d20e4bc14af6aa6cde4d6e0dcac33347216de33e915f5d1ba850fda361602 SHA512 ef5f9886d7c49334e642fa6b0abd748fcff05e171493998559539f7f48f0241607d4923c7b30ed81b2bae1037ae28e49072170000a5b4cbeb6fb77e9dc3a6546
 AUX dnscrypt-proxy.service 1198 BLAKE2B a457e57e2b91e6725fa3a515a2754fc7f39fc3349602861eae8c8747e8cd811440df48f9029da514cd43a4d32a5f001ad6385354c754d0ea36c4a227a5c1f980 SHA512 11769c47ecd44169dd3aab26574a710c07e74f465417081b283f3f2f8b7f64ef77a24359555bc6b94144d38481661bac6087a7f79190bfb67c593e700b2202e5
 AUX dnscrypt-proxy.socket 517 BLAKE2B 959f3c38af826607a297b04c7c3284bb97588c8a8ea88e4502bb464eb791a88f7940f2131701ef071187910302b7c564aee928f1862eb15640c448179a54f066 SHA512 1f3776e37a9583771997f270983bc9430adf089631a94e52cd5f9dba07228584ecc149f37cf51f08b2c7f877d3e9aa430f98cf8d996d0f4cf3545c2c9ac0537d
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
index ce1d1175d707..c1cb90040a20 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/bin/dnscrypt-proxy"
@@ -7,7 +7,7 @@ command_args="${DNSCRYPT_PROXY_OPTS:--config /etc/dnscrypt-proxy/dnscrypt-proxy.
 command_user="${DNSCRYPT_PROXY_USER:-dnscrypt-proxy}:${DNSCRYPT_PROXY_GROUP:-dnscrypt-proxy}"
 pidfile="/run/${RC_SVCNAME}.pid"
 retry="SIGTERM/5/SIGTERM/5/SIGKILL/5"
-start_stop_daemon_args="--background --make-pidfile"
+command_background="yes"
 
 depend() {
 	use logger net
diff --git a/net-dns/ez-ipupdate/Manifest b/net-dns/ez-ipupdate/Manifest
index f88471cc2c7e..0f26c13bb950 100644
--- a/net-dns/ez-ipupdate/Manifest
+++ b/net-dns/ez-ipupdate/Manifest
@@ -7,5 +7,5 @@ AUX ez-ipupdate.initd 2555 BLAKE2B ecec692326933d924687cf6a33a5a3b2973e5272e0f5a
 AUX ez-ipupdate.service 363 BLAKE2B 9ec7a686fe9b4cf2cebd4c858b3b7c83c7e1913d356e01d83b7f680f98df99b0edff179efc2d4015b98a3b95ef00fcbea46077bf514a92a6bfcc388e0148b6ce SHA512 d8822278f9c32419fd95a37ee7523ce83bbbd5d0e43dd9869b076ffd837121ca2f5ee07ebd66bb6942ac9a2bf1c07025877781b2ed049945bcaee4e04a039022
 DIST ez-ipupdate_3.0.11b8-13.3.diff.gz 154094 BLAKE2B ae82ca990937c60d7f572c132883099dc3c25e3c1ce905e880b921bc48230c64bb1cf01f877cd8948704dfbf7f89312abb5f0be9fea1be13a3ee1262aad337f8 SHA512 bef3c344a3c16f224cc3c6e662213713bb1123b4e47347d83d01d632c5ca0b09e7f0e5a989b3987655759ac901307c8dd6768fab3056c8878c0adcf78b0d5fb9
 DIST ez-ipupdate_3.0.11b8.orig.tar.gz 81975 BLAKE2B a5f6e0f301f3eb2e26b4af2f0ec4839efbb254514a08315a66bf3f5ed07b045178dab0e5a3814fb06ff9d1733dceb23168d90ca50905f2e3896f90581cdfff7d SHA512 85de91cde25d176374ade7128e8932a4e015cd04beb8d5b71bf540e2f59b6c409d1c8bd0ff7c50734b87ecc19a74a7b1da3e646a8c8787badcae4feb9dba7864
-EBUILD ez-ipupdate-3.0.11.13.3_beta8-r4.ebuild 3210 BLAKE2B 0f86cb659a94e3a54229716c57e412d48f0727730919a6502d89fff859f723cb9cf9314129ca088b0fb2131aa1ba3a2c95871fba4029b145d6e3881a6f0a0018 SHA512 a0b28fd7e124ec14e124f05469390eaf4c935555f8c5dbbdf839098d6a55c7660cab11ff08e3e610b1ec1a9582f4dc341af6bbd1c4b27f59bcc861904825883a
+EBUILD ez-ipupdate-3.0.11.13.3_beta8-r4.ebuild 3217 BLAKE2B 7332bbdde0c29d0c3c32d82e3e8d3c2ec49f7a43444f341e78ee85669c09ef6198fbf78760daa1e18ae56a0fc4730aba296ae0d14c1e76aeac0e18d742c26d53 SHA512 0934c4cfc8aec89030410ae1d502131dda386c1bd094d658c7f2606a8ad67d95ee713635c47aabf18d2006fa68889fbb838dfb6d51466c7562e45bdda0b1e6eb
 MISC metadata.xml 405 BLAKE2B 9127cf8ab134c00a64feb9e28b91d2f11a8afa92af40499bdb47cb8da783610af2d7c1e84b58344d05e9792a2770d3e95a77e1edf7e866a963ee277ca73956b7 SHA512 99e9556d6c6f63571903f53102005050ca7d256f7adf837395cec5ec8e3f300021b309ca253bfacb5102ab646c7e51bf2f53824ff9198368e1b96550f633e532
diff --git a/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r4.ebuild b/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r4.ebuild
index 4a1e50900053..b98258116c54 100644
--- a/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r4.ebuild
+++ b/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r4.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
 
 RDEPEND="
 	acct-group/ez-ipupd
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 3decb9ac8f7a..498af9c09d61 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,10 +1,8 @@
 AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e05dbd44c8b8c5c87a01d500d5ac328fdee1cae3f9dd126448a8b82b979e13a4ff5285fa48b983d5 SHA512 58c4186e57ebd00b86dae34d5d208ed8801c0376da40cccb23b3d4542a7ee04a1003a12a4b89347b76a384b50eae4a61f96164bf22ec987ce05b1c65691659e7
 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
 DIST knot-3.1.3.tar.xz 1407576 BLAKE2B 03cde89e32ac2440e721157db1af9b9cbb40ad2d8d813b0d8bc26fe1feb28f59055a3cbe287d50adb13f5190ce3ed532521189997d03b4fe9e4264f309032e23 SHA512 537013e914c3f00615a384c92da06c40bb33871e7dbd28e987280d62d91df42026774cfe0596ac72a218dafa650d8d600b1d831dd0a5c28a9fd796c5cd799838
-EBUILD knot-3.1.1.ebuild 1960 BLAKE2B 9ef73f3a96942f80ad9ffc0d4522fab355e4e341b990bca04ad9b2be33fb02cb074a8504194075ec2886e0cb2840c1788b197384c2aa9094ffc763cd5f5f0373 SHA512 abd011f2f5dc355b87ec74aa111f795378008154b881c899229ae9761086e88d922fabfde28cf702e116ac5967cc45a79e2423d03811eea2a32f3ce71d3bf9de
-EBUILD knot-3.1.2.ebuild 1960 BLAKE2B 9ef73f3a96942f80ad9ffc0d4522fab355e4e341b990bca04ad9b2be33fb02cb074a8504194075ec2886e0cb2840c1788b197384c2aa9094ffc763cd5f5f0373 SHA512 abd011f2f5dc355b87ec74aa111f795378008154b881c899229ae9761086e88d922fabfde28cf702e116ac5967cc45a79e2423d03811eea2a32f3ce71d3bf9de
+DIST knot-3.1.4.tar.xz 1408656 BLAKE2B 637371e5cc9aa0b880fda96d1d61f9e168cc96c244551b17381a1641a8b6ace7cac7ac6b7cf40fb2e86ac8f606be8d1342e548e5cadd64770610b2a5aa35f1f0 SHA512 307667a12b989fee443832d4642fc927231f38f0331439c8c7196c489d196245eca368d96a36fe49639b773f652f7cb80bf0c16bc1ad107e11b47b70e1f04060
 EBUILD knot-3.1.3.ebuild 1960 BLAKE2B ddc73a188149520aa83f0f4ab09e2530d970a75a3ad43fca967f641dd584d6c2b5c9bc054a959a9117ad243ff5f8f1986f2a39b23aec7172b5f05ce19f8bcaba SHA512 f5ff45b173fea526541effe6be9a75fe3b9963c088e5ef220bd8195063e024c564e551f6a24bcdad5c96bd784fab97ff5c76793ba062f83b6adfac0c859543f4
+EBUILD knot-3.1.4.ebuild 1960 BLAKE2B ddc73a188149520aa83f0f4ab09e2530d970a75a3ad43fca967f641dd584d6c2b5c9bc054a959a9117ad243ff5f8f1986f2a39b23aec7172b5f05ce19f8bcaba SHA512 f5ff45b173fea526541effe6be9a75fe3b9963c088e5ef220bd8195063e024c564e551f6a24bcdad5c96bd784fab97ff5c76793ba062f83b6adfac0c859543f4
 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
deleted file mode 100644
index b4082a371f4a..000000000000
--- a/net-dns/knot/knot-3.1.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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/knot/knot-3.1.1.ebuild b/net-dns/knot/knot-3.1.4.ebuild
index b4082a371f4a..4b7058faa52a 100644
--- a/net-dns/knot/knot-3.1.1.ebuild
+++ b/net-dns/knot/knot-3.1.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic systemd
 
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 6d99818acdff..bc915fd7342d 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,3 +1,6 @@
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
+DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1 SHA512 54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6
 EBUILD ldns-utils-1.7.1.ebuild 1444 BLAKE2B f2d897b11e13ef176b3400ac418329583c8d77ab9a15e3cf1135d49fb1c6233f147375d0eee79bf9baea0f5d548dc1b3fc1382c95560022ce8585d0d96014d70 SHA512 be92ebb6aeeea36326a5293d485014d08b2b56ff07072e99983aee4215719ac8db9f76cf27616d1e29245b43920351593a570267f8b728e096dc8a785060a2b1
+EBUILD ldns-utils-1.8.0-r1.ebuild 1734 BLAKE2B c832ed898eca34469a936fc8d9a3d74622e96ef2b2d5739219302b78b9bc7a74b19ff5e1cd910a6fb74df378c8a852f1fc883849ddc7216dd9754465ee359d94 SHA512 ff154d66c1d35d4915374306c40c57da7b9476f96f71c9eadfb3ef01416a40f1534d12e06c23be2c5f27819cd66fc3076cc688c5a03047c6fa4f67558c7890a9
+EBUILD ldns-utils-1.8.0-r2.ebuild 636 BLAKE2B 1745bf9dd3bb6e61fed48cb529d0012dd0f1384f59ab1100eb716a9dfadf706487918933f05120c752e64f0964a3988abf2f3f4b83cdc316127f48bfb0c9505b SHA512 9cc9a28b42c3843beaa8341e7025d69d3b7165a77f8b7d7d92bddc7c1a99746d7115a9876d35fb86589ec703cea1b727f86ce644d7af8d8729d4d33f9069ac7e
 MISC metadata.xml 849 BLAKE2B 3e5b25a17b5b317e38b857d2e4a65212c9300505832926c3a2fcbd5468fca0bbc3c5fd2260d678ed1c7b1b55b33150fd059f4ed80907c34083e92f00ba22b574 SHA512 9fcf62af1b836fd9f8dbe4406f0ffc8d6bb0bbe9005bbef9e558097b50a11c0c126e66e16faa6be3ca21bcfe55243a536808cbf408fa953e7f46417a068b5043
diff --git a/net-dns/ldns-utils/ldns-utils-1.8.0-r1.ebuild b/net-dns/ldns-utils/ldns-utils-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..b7516aaa9282
--- /dev/null
+++ b/net-dns/ldns-utils/ldns-utils-1.8.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P=${P/-utils}
+
+DESCRIPTION="Set of utilities to simplify various dns(sec) tasks"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
+
+REQUIRED_USE="
+	ecdsa? ( ssl )
+	ed25519? ( ssl )
+	ed448? ( ssl )
+	dane? ( ssl )
+	gost? ( ssl )
+"
+
+DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,ed25519?,ed448?,gost?]
+	examples? ( net-libs/libpcap )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# backport https://github.com/NLnetLabs/ldns/commit/bc9d017f6fd8b6b5d2ff6e4489a2931d0aab8184
+	sed -i 's/AC_SUBST(VERSION_INFO.*/AC_SUBST(VERSION_INFO, [5:0:2])/' "${S}"/configure.ac || die 'could not patch configure.ac'
+
+	default
+}
+
+src_configure() {
+	eautoreconf
+
+	# >=openssl-1.1.0 required for dane-ta
+	if has_version "<dev-libs/openssl-1.1.0" ; then
+		local dane_ta_usage="--disable-dane-ta-usage"
+	else
+		local dane_ta_usage=""
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--with-drill \
+		$(use_with ssl) \
+		$(use_with examples) \
+		$(use_enable dane) \
+		$(use_enable ecdsa) \
+		$(use_enable ed25519) \
+		$(use_enable ed448) \
+		$(use_enable gost) \
+		$(use_enable ssl sha2) \
+		$dane_ta_usage
+
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	#cd "${S}"/drill
+	emake DESTDIR="${D}" install-drill
+	dodoc drill/{ChangeLog.22-nov-2005,README,REGRESSIONS}
+
+	if use examples; then
+		emake DESTDIR="${D}" install-examples
+		newdoc examples/README README.examples
+	fi
+}
diff --git a/net-dns/ldns-utils/ldns-utils-1.8.0-r2.ebuild b/net-dns/ldns-utils/ldns-utils-1.8.0-r2.ebuild
new file mode 100644
index 000000000000..3dc600717c87
--- /dev/null
+++ b/net-dns/ldns-utils/ldns-utils-1.8.0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${P/-utils}
+
+DESCRIPTION="Set of utilities to simplify various dns(sec) tasks"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
+
+REQUIRED_USE="
+	ecdsa? ( ssl )
+	ed25519? ( ssl )
+	ed448? ( ssl )
+	dane? ( ssl )
+	gost? ( ssl )
+"
+
+RDEPEND=">=net-libs/ldns-1.8.0-r3[dane?,ecdsa?,ed25519?,ed448?,gost?]
+	examples? ( >=net-libs/ldns-1.8.0-r3[examples(-)] )"
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index e1854896089e..0a3a868f8510 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,8 +1,5 @@
 AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d06251b07ee2fd3ecbac16347d633644f30dc7428e5bdf9747b0a4d51d7541601d3fbd4be6f9f746693f SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501
-DIST libidn-1.37.tar.gz 2603177 BLAKE2B 2f55644b8e521ae75638e6b660f7a7e457957b783bfa359de497a475f70372d46557d9abd1263588cf8aecbaa713f24e5baf460b4aa663d3ead7326f296a58dc SHA512 198a5b2f0db3ad076e3726dda7f197835dd93a126ee796c138185abd09ee2f828042225dd570fa19b58b3e81b120daf929f348a55f9a536c546dd3311c29e27c
-DIST libidn-1.37.tar.gz.sig 488 BLAKE2B 449e2222becc9c3714463c9875a625ef017aad9c188c2487ea3c7677a56c7821f02ac39404581bb033a23860e8b07251efabefd85a1f2be91461f2bd27162869 SHA512 6fc3543d32d2a2b730ee22c04098420200292c95582a625cbd05729b3df40f87faa35aaceb9fa45245fa891971a10f47281f490eb7bc3099910e349c643360a2
 DIST libidn-1.38.tar.gz 2681263 BLAKE2B 92059e87554338a3565ee4b517fa1ba7bd3e9d57d8be7d71aee377220f50b597e529469c6ddc7c9e7c25b9e83c76f652457256dd32249c3e1cd97df8867723a1 SHA512 5e59b2263fde44d1463b47b516347b17a4e3e3696ebba66ab5fe464d567e2ec81f769fa7cf72ed51cfb501e32221813bb375373713a47e2f599fc6122850e419
 DIST libidn-1.38.tar.gz.sig 488 BLAKE2B 3a5a5f3d79f2f01019d71e2b20b7daf264c71ed21ec922733c03ed42e0acd0bb6c2758ca7095b7fc52025d01c784eb539e53408ae663ac2bcdcc8e92ba11f342 SHA512 9caf0f9633f607861e94d6efe30383181db67e6fb437903b6c1ff1758363824afc1b01458f845d2bf11c8f2ec01708ba98da54a43a6e2429978caa0f41166ffe
-EBUILD libidn-1.37.ebuild 2806 BLAKE2B 84db394eee3598c9f893f23427f5e6994db2518de33c230d1db557eaf422b0411ccec7117ed7bbd265d1e7b183918933a9b31a73db874a222a7b67e1f240ea7d SHA512 48aadb15f08f65e09c698d7089be7f874d64eeae9421cbe4b58107115a9bb3178b2652f0a170cede42c0530a10659a2d934ba9a6750c8635daaa4ee0f24f9307
-EBUILD libidn-1.38-r1.ebuild 2754 BLAKE2B d74ad077646f3317f8c28d80f805a7e6441b517a5e680775af199f01e5765b9e9724081a90410436a958d7045d1be0cf7a353d32341b3adad66ab0261a1e3ea8 SHA512 f2908e91fd5753cc0fff4e00d563f019c57eb2f27a3fffec23030bc5a6870a44576be058b1912d9583918d0a844b508076167a5084d0a29e77ce24f69490781c
+EBUILD libidn-1.38-r1.ebuild 2748 BLAKE2B 80231521033c24922ae36b13e3fea7ae08c59ddb9632d548ba42d047f9389905dd91e44da6f0832933f6f5c918f00df45ae134b50706ae2d8521ed3c0d746b28 SHA512 ecdabd9f43e4ca50909b805fabd90116c748200271ec80e369ff390df873e2073fa2e10b71abdc0f5780d2f4227aa439c4a609957d77eb064206489d60668117
 MISC metadata.xml 348 BLAKE2B 3544235744acafa4218a8f6f4893b4dd0ba39e63c905c92aeffd50b5d6e33f68cbc8e9dc70287a04b0dbda40fcc1d92b158da5e295952553d00272940b23b27b SHA512 245f7bd50af03462e8876c12ff86d3827acee15d767361704eb60f0bda13098191f7259eb16f6b031d3c9cfe32a7819944cf9854bbe4524e1c8d8922130ff04e
diff --git a/net-dns/libidn/libidn-1.37.ebuild b/net-dns/libidn/libidn-1.37.ebuild
deleted file mode 100644
index 4d58cba26c07..000000000000
--- a/net-dns/libidn/libidn-1.37.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libidn.asc
-inherit elisp-common java-pkg-opt-2 libtool mono-env multilib-minimal verify-sig
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation"
-HOMEPAGE="https://www.gnu.org/software/libidn/"
-SRC_URI="mirror://gnu/libidn/${P}.tar.gz
-	verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig )"
-
-LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
-SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs java mono nls"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
-
-COMMON_DEPEND="
-	mono? ( >=dev-lang/mono-0.95 )
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-BDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	nls? ( >=sys-devel/gettext-0.17 )
-	verify-sig? ( app-crypt/openpgp-keys-libidn )
-"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Bundled and with wrong bytecode
-	rm "${S}/java/${P}.jar" || die
-
-	# For Solaris shared objects
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local -x GJDOC=javadoc
-
-	local args=(
-		$(multilib_native_use_enable java)
-		$(multilib_native_use_enable mono csharp mono)
-		$(use_enable nls)
-		--disable-static
-		--disable-valgrind-tests
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}"
-		--with-packager-bug-reports="https://bugs.gentoo.org"
-		--with-packager-version="r${PR}"
-		--with-packager="Gentoo"
-	)
-
-	ECONF_SOURCE="${S}" econf "${args[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		use emacs && elisp-compile "${S}"/src/*.el
-		use java && use doc && emake -C java/src/main/java javadoc
-	fi
-}
-
-multilib_src_test() {
-	# Only run libidn specific tests and not gnulib tests (bug #539356)
-	emake -C tests check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_newjar java/${P}.jar ${PN}.jar
-
-		rm -r "${ED}"/usr/share/java || die
-
-		use doc && java-pkg_dojavadoc "${S}"/doc/java
-	fi
-}
-
-multilib_src_install_all() {
-	if use emacs; then
-		# *.el are installed by the build system
-		elisp-install ${PN} "${S}"/src/*.elc
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
-	else
-		rm -r "${ED}/usr/share/emacs" || die
-	fi
-
-	einstalldocs
-
-	if use doc ; then
-		dodoc -r doc/reference/html/
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-dns/libidn/libidn-1.38-r1.ebuild b/net-dns/libidn/libidn-1.38-r1.ebuild
index 26ee757f4411..bd18e0463e20 100644
--- a/net-dns/libidn/libidn-1.38-r1.ebuild
+++ b/net-dns/libidn/libidn-1.38-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls"
 
 DEPEND="mono? ( >=dev-lang/mono-0.95 )
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index b7a4ccb749b8..e372af5599ba 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1,10 +1,7 @@
-AUX opendnssec-drop-privileges-2.0.x.patch 813 BLAKE2B 231537d3f8f40e1524eb76212abb7e00d965acaa39717de2c72e9d7ec93f866150510d971ba465f7a48c3eb588f1a78631ed33beef0ebe1fb369472f73062d80 SHA512 425eb123452183b4e4a3e87e9a71afa81684fe4af9c111d1bad3433ee640907cf3caa1065711f67286bb0336fd8d82e3f4bfeef94e3ff620bcbdaf960d4137b8
-AUX opendnssec-fix-localstatedir-2.0.x.patch 1161 BLAKE2B 28469aaad2878cdb1f58f247db0e7b9603ec9fab35ec9ded597dfba50889cd30e474cdaf2f0397e75147cb0374c049d9863f95f961eccce47a7e4874dae48fcc SHA512 1d07f2108238c041041c96b4efaaec1e75740ed54fbd6390fa45f5ccf7f631c1e8d4400bb9cb95023c8909ae10abc3c93aaa137f954921af75825c06a6d94d9a
-AUX opendnssec-fix-run-dir-2.0.x.patch 1188 BLAKE2B c11d3e120dac17f4d9bb24c561cf67e33806c906391e0033677e1ecfa423ddae563cb20680a73b8dec4c50e0b1fd2dbc0cf0adb82c77e67f50a5f4a40e26a871 SHA512 293c2ceb336623ed52028ca3144c4249eaf426dd2eb84890be9f1ed53e27d4ff5fd6a699d41426ca57d6362c2f83dd8b3556691da2815235f72e69ab4ef45165
-AUX opendnssec-openssl1.1.patch 1823 BLAKE2B e94d97755bde512efa87751f99655903a9b9627d0a4896294f643d89adbf7aa6fa1a0edf9098d0d2a1fc059aeaf2e19f6c814807b9fd2716fdf98401e3c15b06 SHA512 17dac7598339ba5a8d1459c93c837344d926cd939b830502040e5c41514bb6261d25486dbfce5e2d9994c01d990dbf88108563aab1b04b02c6a69ba988503a73
+AUX opendnssec-fix-run-dir-2.1.x.patch 1364 BLAKE2B be870fded9a3dfadfe2b131c7bf0dca3e8ec3b89f0baae469148e8c9ef81ceac1f6ace024373536fa34fa1fa31aa23b432ee97fce7d79c7324aee84eaa3014ec SHA512 c476a5808d914e2056c75d49a3297f4c9a6f9f20882734af21208d563d3a1f9b1aca387ea53159a7c91e6faacc38280ba7b72a3bd3d4a6dd7b4ffb3cfd749b33
 AUX opendnssec-use-system-trang.patch 618 BLAKE2B 32e1b6784f1666e0485e6109af40b06373fbdc974f90bf3a3d6fc564d7c69728151afc5a9f793c96a3be77593bb2679af9dee4456bf69e89367fa459f8b70435 SHA512 316b89a2c6ba56c4fe45d00ad1bc31316fa20ba7177a2cc0979c23f11aba4234cd2f0b8972f98e4f14be9535b704fdc3177a514a41c489eb43016f8ff878795c
 AUX opendnssec.confd 393 BLAKE2B 47f83e11292c01cb999fae36dbea2d0b45cb970493bfbab43c43682fe26e574e12bbe7f7096e71ff7bd0b8b49827f13e4de858a38868706fa769cc92ceb1f307 SHA512 17bd24efef9bd6b7a907c75126809a6012db23a6c8547169c41dbc62fc91775331f445905282bc6c2ef13357f92eccab5008d4605419d98acdb723806b63a924
 AUX opendnssec.initd 1854 BLAKE2B 358bcf513123f7a38b7795f142f56e6a186062d1ad80bb70bee46ba7ebe7a137b4d2830a6c27ae690add23e0296ed2bd3a7a5d7ee88e1ee7ee3a8a9631306916 SHA512 75bce27c152b55ba2ba7d0770c6f2149493ef4b145f2257328e7e4b6865ad2d644695a688c3e06be02705ac42752e031846551b80b560e19a73e595e5ad15def
-DIST opendnssec-2.0.3.tar.gz 1103355 BLAKE2B b64e729003de86e4139efaad60c9feae9f4e19c16a29fdced55d66f5896c4b7d76c4b8c57a8330d55c0c03e87de1ebe6ec49ef9d1b6e215be963680d2c805579 SHA512 4745a9ac317cc65d6f5b14be640687efd5fde2149541f692fb607a458378d27e903f175023c1aa16a777d17cef9cc68f1a84e7e7cdb233466d26756721b34424
-EBUILD opendnssec-2.0.3-r2.ebuild 6846 BLAKE2B aee3a4fb1f3037143d7f08726f2f3bdeb8c737a710b051faf33c669ddd6b4e79b35449635fffe46472fd4f1b45cfd3e0c192ed05a18b2a3ff1b7e6e24d664b12 SHA512 c443bcfffee145b1a71d629de68ec08ae68e3f6fa670ac48e179348f5bee8e91ec07a8d3dfe8b7fff3d6b8765e6bfca812a3617365a726a14bd5104157704d73
+DIST opendnssec-2.1.10.tar.gz 1142027 BLAKE2B 063650744ffd1c6d6d3b702400c9617883394c6794743f7d61bd63f7bdaf688a3f2a80f47612e561a133a5689dad8b5f7392eec69779d1dc5632a121d9a41c8f SHA512 c7fdbf1c3867d7b53ac11ab5cb5e636af4595dbee8d704429c7fb84cc3a6b2082ed490c33aad7747d4ee1a2c580afcf24a260bc3ed29eaf5e9d337004045b82d
+EBUILD opendnssec-2.1.10.ebuild 6691 BLAKE2B f9cd99406b5408b5ce2e06635912c1d8fd6f279b4325264852809b21ba5a379f577bb004575cdcf09a18598e4985b280ea52a58fb492aa6ceae17452f771bacc SHA512 b6052b62fcfe746326b20792641feda1d299f8e312578402bf779f6b30fbc866a961b0f800ae80e6fa2ade66612a02211c65d0993e176e25337a105a85c568b8
 MISC metadata.xml 718 BLAKE2B c6369b0a0f4df6fba454e7101d5254dcbd6b2294f9f6227d21d7f1defa04bde31809883d715b44c939fc9192447138d79b1955dc4964d17b0e8fc8341ab032aa SHA512 1b5144f8aca23a9798dd45a32b91fbdb37be1832d3d7b73bbafb3a3b4a7e003a00016ba84094fd662d9c0db5fe1b032a6a3e389b8c921c32fea61e5b0cd30c44
diff --git a/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch
deleted file mode 100644
index f3adc487dee9..000000000000
--- a/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur opendnssec-2.0.1.orig/conf/conf.xml.in opendnssec-2.0.1/conf/conf.xml.in
---- opendnssec-2.0.1.orig/conf/conf.xml.in	2016-07-21 16:15:27.000000000 +0200
-+++ opendnssec-2.0.1/conf/conf.xml.in	2016-08-23 15:21:09.633384446 +0200
-@@ -36,12 +36,10 @@
- 	</Common>
- 
- 	<Enforcer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<Datastore><SQLite>@OPENDNSSEC_STATE_DIR@/kasp.db</SQLite></Datastore>
- 		<!--The enforcer interval parameter is no long used in 2.0 and will be deprecated in 2.1 -->
-@@ -60,12 +58,10 @@
- 	</Enforcer>
- 
- 	<Signer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/signer</WorkingDirectory>
- 		<WorkerThreads>4</WorkerThreads>
diff --git a/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch
deleted file mode 100644
index 5940c2f050e6..000000000000
--- a/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur opendnssec-2.0.1.orig/Makefile.am opendnssec-2.0.1/Makefile.am
---- opendnssec-2.0.1.orig/Makefile.am	2016-07-21 16:15:00.000000000 +0200
-+++ opendnssec-2.0.1/Makefile.am	2016-08-23 14:01:50.618393034 +0200
-@@ -30,12 +30,12 @@
- 
- install-data-hook:
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signer
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/enforcer
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signer
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/enforcer
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
- 
diff --git a/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch
deleted file mode 100644
index 5ea9c80f2ba7..000000000000
--- a/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur opendnssec-2.0.1.orig/m4/opendnssec_common.m4 opendnssec-2.0.1/m4/opendnssec_common.m4
---- opendnssec-2.0.1.orig/m4/opendnssec_common.m4	2016-07-21 16:15:00.000000000 +0200
-+++ opendnssec-2.0.1/m4/opendnssec_common.m4	2016-08-23 14:42:35.033460972 +0200
-@@ -17,7 +17,7 @@
- OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
- OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
- OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"
--OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
-+OPENDNSSEC_PID_DIR="${destdir}/run/opendnssec"
- 
- AC_SUBST([OPENDNSSEC_BIN_DIR])
- AC_SUBST([OPENDNSSEC_SBIN_DIR])
-diff -ur opendnssec-2.0.1.orig/Makefile.am opendnssec-2.0.1/Makefile.am
---- opendnssec-2.0.1.orig/Makefile.am	2016-08-23 14:40:10.009951791 +0200
-+++ opendnssec-2.0.1/Makefile.am	2016-08-23 14:43:20.377870776 +0200
-@@ -36,8 +36,6 @@
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
- 
- docs:
- 	(cd libhsm; $(MAKE) doxygen)
diff --git a/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.1.x.patch b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.1.x.patch
new file mode 100644
index 000000000000..87560e090e82
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.1.x.patch
@@ -0,0 +1,24 @@
+diff -ur opendnssec-2.1.10.orig/m4/opendnssec_common.m4 opendnssec-2.1.10/m4/opendnssec_common.m4
+--- opendnssec-2.1.10.orig/m4/opendnssec_common.m4	2021-09-10 09:11:17.000000000 -1000
++++ opendnssec-2.1.10/m4/opendnssec_common.m4	2021-11-27 14:18:26.430202347 -1000
+@@ -17,7 +17,7 @@
+ OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
+ OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
+ OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"
+-OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
++OPENDNSSEC_PID_DIR="${destdir}/run/opendnssec"
+ 
+ AC_SUBST([OPENDNSSEC_BIN_DIR])
+ AC_SUBST([OPENDNSSEC_SBIN_DIR])
+diff -ur opendnssec-2.1.10.orig/Makefile.am opendnssec-2.1.10/Makefile.am
+--- opendnssec-2.1.10.orig/Makefile.am	2021-09-10 09:11:17.000000000 -1000
++++ opendnssec-2.1.10/Makefile.am	2021-11-27 14:19:02.685418411 -1000
+@@ -38,8 +38,6 @@
+ 	$(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
+ 	$(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
+ 	$(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/opendnssec/signed
+-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
+-	$(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/run/opendnssec
+ 
+ docs:
+ 	(cd libhsm; $(MAKE) doxygen)
diff --git a/net-dns/opendnssec/files/opendnssec-openssl1.1.patch b/net-dns/opendnssec/files/opendnssec-openssl1.1.patch
deleted file mode 100644
index b81068c4b9fd..000000000000
--- a/net-dns/opendnssec/files/opendnssec-openssl1.1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/signer/src/wire/tsig-openssl.c
-+++ b/signer/src/wire/tsig-openssl.c
-@@ -126,7 +126,11 @@ static void
- cleanup_context(void *data)
- {
-     HMAC_CTX* context = (HMAC_CTX*) data;
-+#ifdef HAVE_SSL_NEW_HMAC
-+    HMAC_CTX_free(context);
-+#else
-     HMAC_CTX_cleanup(context);
-+#endif
- }
- 
- static void
-@@ -146,8 +150,13 @@ static void*
- create_context()
- {
-     HMAC_CTX* context;
-+#ifdef HAVE_SSL_NEW_HMAC
-+    CHECKALLOC(context = HMAC_CTX_new());
-+    HMAC_CTX_reset(context);
-+#else
-     CHECKALLOC(context = (HMAC_CTX*) malloc(sizeof(HMAC_CTX)));
-     HMAC_CTX_init(context);
-+#endif
-     context_add_cleanup(context);
-     return context;
- }
---- a/m4/acx_ssl.m4	2016-10-14 09:40:13.000000000 -0400
-+++ b/m4/acx_ssl.m4	2019-02-18 13:52:49.861127549 -0500
-@@ -35,12 +35,21 @@
-             if test x_$ssldir = x_/usr/sfw; then
-                 SSL_LIBS="$SSL_LIBS -R$ssldir/lib";
-             fi
--            AC_CHECK_LIB(crypto, HMAC_CTX_init,, [
--                    AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required])
--            ])
-+            save_LIBS=$LIBS
-+            AC_CHECK_LIB(crypto, HMAC_CTX_reset, [
-+                    AC_DEFINE_UNQUOTED([HAVE_SSL_NEW_HMAC], [], [Define if you have the SSL libraries with new HMAC related functions.])
-+            ], [
-+                    AC_CHECK_LIB(crypto, HMAC_CTX_init,, [
-+                            AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required])
-+                    ])
-+            ] )
-+            SSL_LIBS="$SSL_LIBS -lcrypto";
-+            LIBS="$SSL_LIBS $LIBS"
-             AC_CHECK_FUNCS([EVP_sha1 EVP_sha256])
-+            LIBS=$saveLIBS
-         fi
-         AC_SUBST(HAVE_SSL)
-+        AC_SUBST(HAVE_SSL_NEW_HMAC)
-         AC_SUBST(SSL_INCLUDES)
-         AC_SUBST(SSL_LIBS)
-     fi
diff --git a/net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild b/net-dns/opendnssec/opendnssec-2.1.10.ebuild
index 17efc48d4904..fc1cc54c2d14 100644
--- a/net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.1.10.ebuild
@@ -45,6 +45,8 @@ BDEPEND="
 	doc? ( app-doc/doxygen )
 	test? (
 		app-text/trang
+		dev-libs/softhsm:*
+		dev-util/cunit
 	)
 "
 
@@ -54,11 +56,8 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-fix-localstatedir-2.0.x.patch"
-	"${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch"
-	"${FILESDIR}/${PN}-drop-privileges-2.0.x.patch"
+	"${FILESDIR}/${PN}-fix-run-dir-2.1.x.patch"
 	"${FILESDIR}/${PN}-use-system-trang.patch"
-	"${FILESDIR}/${PN}-openssl1.1.patch"
 )
 
 DOCS=( MIGRATION NEWS )
@@ -69,11 +68,7 @@ check_pkcs11_setup() {
 
 	if use softhsm; then
 		PKCS11_LIB=softhsm
-		if has_version ">=dev-libs/softhsm-1.3.1"; then
-			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
-		else
-			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		fi
+		PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm2.so
 		elog "Building with SoftHSM PKCS#11 library support."
 	fi
 	if use opensc; then
@@ -119,8 +114,7 @@ pkg_pretend() {
 		eerror ""
 		eerror "   emerge \"<net-dns/opendnssec-2\""
 		eerror ""
-		eerror "See https://github.com/opendnssec/opendnssec/blob/2.0/master/MIGRATION"
-		eerror "for details."
+		eerror "See /usr/share/doc/opendnssec-2.1.10/MIGRATION* for details."
 		eerror ""
 		die "Please upgrade to version >=1.4.10 first for proper db migraion"
 	fi
@@ -140,8 +134,10 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--enable-installation-user=opendnssec \
+		--enable-installation-group=opendnssec \
+		--localstatedir="${EPREFIX}/var/lib" \
 		--without-cunit \
-		--localstatedir="${EPREFIX}/var" \
 		--disable-static \
 		--with-enforcer-database=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
 		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
@@ -230,7 +226,7 @@ pkg_postinst() {
 				ewarn ""
 				ewarn "You are upgrading from version 1.4."
 				ewarn ""
-				ewarn "A migration is needed from 1.4 to 2.0."
+				ewarn "A migration is needed from 1.4 to 2.x."
 				ewarn "For details see /usr/share/doc/${P}/MIGRATION*"
 				ewarn ""
 				ewarn "For your convenience the mentioned migration scripts and README"
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index fc93b1e1a54b..96513d33da2d 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -3,6 +3,8 @@ AUX pdns-4.4.1-boost-1.76.patch 830 BLAKE2B b74f9deece5c1bd71f6c3df571f288cbab01
 AUX pdns-r1 2815 BLAKE2B cd607cb30a94540eca9cfa2defb7c996f6e151875fcaad8ad3357261937868bc346962f1080ad45a0ef38c2dfc126eb11e41837ee0784f677d1e7c071589a057 SHA512 4c0442d8d92d95268d4971f80782d2772e2a22c43da00566a9328c79a834e4355b2610d133034351d7137ed6cd7fda300f3db8093b09d5852cea44d983de1e39
 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 4257 BLAKE2B c86c1137f85366afba129ad5eea1366bd96f79fff28d17c48c1ed13d1b4ae19c4e9298bb89a34aba92b5933c875a80656d787093037d626f1c1040e7dcf42391 SHA512 3fe3a0fac082408291033f1b09b43aa36f124630ea0ab7f84ea166289c3d7d875500cf04102c747da9c17482b4cc9d9b2d604c69d300b75b3e078e1c229f8d3a
+DIST pdns-4.5.2.tar.bz2 1266572 BLAKE2B 9bd3d391e32c4040cc916003a45d47784ea309dd43a326919e2ca5415e1a1c542d5937cf1570951a4100a524a933aa9c0114ef8e28957f64acb6f7a7fa18e237 SHA512 0a183d8c0bb517799afa0f9382e3c06ad3c6e9c871b7912073a860364ca97dc121be2372080100677db10601c8ef96ad56b10787c02a9a9ede82f8a1cc904c6e
+EBUILD pdns-4.4.1-r1.ebuild 4434 BLAKE2B b8c4b2cac53e10b6946f725f11a196bf493778d23d5c477017174b12582903857d042d17ba433562f2facaed744bc7ca410e16813e037225c4ead8ea589a1412 SHA512 f01f4269774b4a089bed02059f3978b0b385aa7e8f60ad888c6bdcd660e7ccce722cfa599b5e7a1b580918b82e8228d79bfd882715951ff1a2899d1447cad07f
+EBUILD pdns-4.5.1.ebuild 4262 BLAKE2B a8147ef384ec84d649777dc8518005e485d6c545723a23781a390eb1458febc09493a5c963ec6a1a5ae5acde8d25a99abed4bb450656bc6d5d932345c5f43e7d SHA512 7e7a13149ccaf8babf9170fd8848d5539ffa330d0fc328595d1cc679fbb6267d15b8ff77d8589063a7741f44bb0b0de5af7cf8fdf0629ac30da6a2d0d7289a62
+EBUILD pdns-4.5.2.ebuild 4263 BLAKE2B eed3e10fdf31bde3829996fac97a546b32b8a7d577b950f4ad75a1165f049fd11c0d5f48860e1e9bd33962efc6a16d5cd844ae207126544adb5a7346461c5e0f SHA512 d2834f32e60ed30058aac76f2af2c66601af07db860db87eaa54d79072f56ed24fcf8d2145a846790b0b4abf46a4e03309939ff68e60864bdfe00f11fc95bb23
 MISC metadata.xml 1112 BLAKE2B 1f422022f67b5667b7b2be3947316580c339738e624ddef0b7a7331cc8490633a054d96411892435f7982db74c7ff6c1b9702eb6c526d7e15afcd76049f040e9 SHA512 e9efc6f8ec5039249fa7d965ce1d4ef2c666813b554dba3fd289d326b4074df03555c4d5aee41101701a18e0b14166d3b3e340f55752a88acf2fbd6b16c8be79
diff --git a/net-dns/pdns/pdns-4.4.1-r1.ebuild b/net-dns/pdns/pdns-4.4.1-r1.ebuild
index 7c16111f6db6..e3e705627079 100644
--- a/net-dns/pdns/pdns-4.4.1-r1.ebuild
+++ b/net-dns/pdns/pdns-4.4.1-r1.ebuild
@@ -43,7 +43,7 @@ RDEPEND="${DEPEND}
 	acct-group/pdns"
 
 BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen[dot] )"
 
 S="${WORKDIR}"/${P/_/-}
 
diff --git a/net-dns/pdns/pdns-4.5.1.ebuild b/net-dns/pdns/pdns-4.5.1.ebuild
index 263adb888113..66c6adee6b61 100644
--- a/net-dns/pdns/pdns-4.5.1.ebuild
+++ b/net-dns/pdns/pdns-4.5.1.ebuild
@@ -42,7 +42,7 @@ RDEPEND="${DEPEND}
 	acct-group/pdns"
 
 BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen[dot] )"
 
 S="${WORKDIR}"/${P/_/-}
 
diff --git a/net-dns/pdns/pdns-4.5.2.ebuild b/net-dns/pdns/pdns-4.5.2.ebuild
new file mode 100644
index 000000000000..e7f30951d52c
--- /dev/null
+++ b/net-dns/pdns/pdns-4.5.2.ebuild
@@ -0,0 +1,161 @@
+# 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"
+
+# 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/unbound/Manifest b/net-dns/unbound/Manifest
index c2c9a0c03ff7..c00d4d1ce0f3 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -13,5 +13,5 @@ DIST unbound-1.13.2.tar.gz 6127915 BLAKE2B 71806edc86b323ff1f9f2d7bd3f699b15da2c
 EBUILD unbound-1.13.0-r4.ebuild 5997 BLAKE2B 71c2346478513cca62bb52f72f28a58e90e9976ea39213420b19c8d8e5665a14889f95ce872030a13bdd15cca86bc8cdbd488a9802798ee21506d771ce90e6cb SHA512 a985a96c7359bdc9c7e10b52f83a1158f1a092a384194780b7b6f9335d8e83ea0a3c228b7d912372219cbd8ab6d1ad593e2b070bdb197335dcadfa896dfa9e47
 EBUILD unbound-1.13.0-r5.ebuild 6048 BLAKE2B 2a8e24f6dbe2d4d6913308e03d2c52368570d9396328f58ab0eedcb754adc12c03138f81c220b8225934f6d92c2f2a5f5c07547f2d52cd4c25eea89c76fa60e2 SHA512 e5da3d935ff2c98affb300a96dfc9555e0a56454246f1c6ccf6800d988871ed19128ddb02a595d41ed551274be88d571549edc2074addf997f58139c2c3d16f4
 EBUILD unbound-1.13.1-r2.ebuild 6043 BLAKE2B c945879e1938887f99a513d00ed76f3bad9e4b98e16cab132e7587c885f330bbaa9b167c024d34e7e524aa99b3c81a509bb84c36ada1bff5ec29b8f1457880d8 SHA512 7e9c405b21f143105654357c909da068769650555ae680c67eca67d0e841ca4fc6e0aee1580966666e89f8a711e710aa727e642a63d81202b25db6a9d8d3da41
-EBUILD unbound-1.13.2.ebuild 6074 BLAKE2B 709a9b334c44506258949a94472117fe325912f6e6e2fa6112f15d3a99baaee0bdca302a03ab1caa827dc6cc59a0f526b5597ceb2415f946de0188c69f30ac85 SHA512 70c1ee11d1c6dd9a3fabc94e07212f8ef7fb5c2fe711c7e2158d09c18b1aa6190a2a6e0be0838f29ecc8f31189ff2e8563fb1368cfebc0866f108619480226e6
+EBUILD unbound-1.13.2-r1.ebuild 6121 BLAKE2B 9eb2fa4b978bfcd7b97ba800925d928bcf02353d956e6178d340e3449a57413f8b2c58c3741b9a9b4d19d9dcf630e811a4e9528e0563f657b70c5b7c39fde5fd SHA512 6edcdc6d1ee9f6e1b7d674068e7b36092c077c4ef55c56d6238a1f20f43cc7718f742219c2e728378063045d62859f893275649aa1de2c08147a2f8ac1323386
 MISC metadata.xml 1593 BLAKE2B d262cac4efcdc37b123fa3098212f0d3b0e948cadd5afab491696568b8c83e2f72844f482ba10b27fec2d319de2a7b8c7befe58302296808ab521cfe5af091cd SHA512 38bbc03a0263d83b7aa8ad08e0032d158612a3820667a4c8c19e3e0073f9f644792bfc5acc6b2f7ae658abc36a321f844d5dd14d13adfb6b0173e86387ddebc2
diff --git a/net-dns/unbound/unbound-1.13.2.ebuild b/net-dns/unbound/unbound-1.13.2-r1.ebuild
index 4e61650bf380..affd90fd1da6 100644
--- a/net-dns/unbound/unbound-1.13.2.ebuild
+++ b/net-dns/unbound/unbound-1.13.2-r1.ebuild
@@ -38,18 +38,23 @@ CDEPEND="acct-group/unbound
 	)
 	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
-	redis? ( dev-libs/hiredis:= )"
+	redis? ( dev-libs/hiredis:= )
+	systemd? ( sys-apps/systemd )
+"
 
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
+BDEPEND="virtual/pkgconfig
 	python? ( dev-lang/swig )
 	test? (
-		net-dns/ldns-utils[examples]
+		|| (
+			net-libs/ldns[examples(-)]
+			net-dns/ldns-utils[examples(-)]
+		)
 		dev-util/splint
 		app-text/wdiff
 	)
-	systemd? ( sys-apps/systemd )"
+"
+
+DEPEND="${CDEPEND}"
 
 RDEPEND="${CDEPEND}
 	net-dns/dnssec-root