gentoo resync : 17.07.2021

16 files changed, 123 insertions, 291 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b4f49076cd66..605c464f5cf2 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index a37085ec1759..4d12d9ed9634 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -17,5 +17,5 @@ DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 2fef7e1be8a427b2c426c2af58bf4c22795e64
 DIST djbdns-1.05-test28.diff.xz 22072 BLAKE2B fff6c13220adfa056a0ac5942ff9385d83b75f8622adaebab65f557a2ca8d014fe3c255fe55ba9afca56b24880b7cd28597b26b5bcc3bbbd3ef9f581b67004fd SHA512 7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9
 EBUILD djbdns-1.05-r33.ebuild 3671 BLAKE2B a1316a82339046ec5560d0b1b458fbbaf202d7e8ebcfbccd9568ddf7fa5cbe84a827fd2b9e3720567fbb8cf27bbe50e51867425a9b249b1d8830501120487671 SHA512 5f73d51ada1789dd96c372b5ca9a587031136fcf60a72e0ecac7a0481a73f52394016723f98dcf6a16f7e7af4f0e4d9626678db77aa16fde067349d334c0287e
-EBUILD djbdns-1.05-r35.ebuild 3569 BLAKE2B 6f602fa7d150737f3d41f5a4f6d121bb58135ca194220902413a7849d0c33bd6062927b3bee6855fa40a291541737694538d7b1c44719c2722a70ad22d38d5e9 SHA512 3247af298946d5a746e24b5643de79b962d525669bc72498dd72b1ce51c58b36185313480421cb0d4c37765ceb00f35a12fc457cbb3fe1db32d0ca0e34c46044
+EBUILD djbdns-1.05-r35.ebuild 3565 BLAKE2B 042fd688e007c1cf25403283d657cae13b7d335995ec4df44ff3e0d2a8eaaf88c66bceecbc388eea7ffa7fde3ccc2a12dcd0f6b5ee0dab2eea6fcfde7d6ec9f1 SHA512 8ab1fbecd6ee931dca4f8752ec57c63249c0b1c7fd70fe423f34b5d9dc396f7b49d139e5baa1dffad87db10f21d5b804cef9a56c72b85d7280bc370e00e287f4
 MISC metadata.xml 244 BLAKE2B c21c7a6cd7f859220baee98b22912e06955a7d63b4fc954a40507126ef6cb30659a3b7e89e798bb7d074814810f9625d3979ed2ac8877e213dc378da841bc786 SHA512 125b00b9e85650a6dcc365871f9f8be44d85cde4b938a66f7d96b6dc0237a1cae68b30be1ee16d7850998fc31be35eaf459df1bb7d9ea169904854b532f37bab
diff --git a/net-dns/djbdns/djbdns-1.05-r35.ebuild b/net-dns/djbdns/djbdns-1.05-r35.ebuild
index 8cc9d5c60aac..6b06f4f1eebe 100644
--- a/net-dns/djbdns/djbdns-1.05-r35.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r35.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 51c1d764cd29..e2c3a85295b0 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,15 +1,8 @@
 AUX getdns-1.4.2-stubby.service.patch 568 BLAKE2B f2e605116f924b109bf2cd734c8eb79314aeb02b0e30e2fd8d62117b44a74f20e64b1b527253a09525ad9ab26aa2a64a51940773064de87e295d1831dfe9e51b SHA512 67c88787d48662d5c555cd2cdff5916a2211aaf45a13b41e0a909d703dcbc66cb3de834cc94b7c3d292d16a99d024b07098b4e0bb1c790e48201ca9ffb598bd2
 AUX getdns-1.7.0-docdir.patch 769 BLAKE2B d6eabd639382b1fdaefb344c440dabbdcd5a61e5999a31d8565c994baf80bb9a05efad6cd54dd5dd871c4d6c4b05febb9302a68c8bb36184b5d024c5f6fcfd30 SHA512 7eb0895ca0707f396a326469b3ecf09e43cb52f7d83e2288570f88b13cc884770a2aa634f8f0128ee38c2f4ea43074e80797ae8c07788dcca66706af2cd050b7
 AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c
-AUX stubby.initd-r1 636 BLAKE2B 1f8e96c0b844837af8d46f12c80750979be3e763bd7ac08b956f69a8fd4fd9cdf018cc666e1fc47a324ee3960e358489e01b8da6d7d09cae8dffe9cff1b38b90 SHA512 556c35dbcdc157668308e502895519e73fa723074bc8cb1d7cbfd762e0831a584be67a9204744dad17ff4ffaaf9b97b67ed60acfc6ef56e44e240c51d2f783b0
 AUX stubby.initd-r2 685 BLAKE2B d079db5129c02d7b4bdbfdd28733426b39f9e094e76f14e5a32b948f40717faa1886f9093059ddca9e4cd58e6621e06ff75ff94ef713338b1e0335785274f954 SHA512 11b9a6d1a60543ed6e897c87b9c78c72a241388486f1d389918f5a11176a208d885e641fe304bd2ca91284861e37422b8c387ebc8aaa820093b3e70d31b28cf1
 AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b934f9b9b9f9001a41ebaf148d266272529c594a79eb27c0b99ff9f30d4c519f91128d35b4ea87eb22 SHA512 c4f1de3789debd1d51a47499960b6f688bc594b4beb01062a55c5623a6ceb07d03705e4f411c9a0cc88442af223120b29c46a9dc72c600477d3e598f9c02c805
-DIST getdns-1.5.1.tar.gz 1075728 BLAKE2B fd6ac52a302ecf22cc913d8de6f93f9ab125429d0eb9d6e233f23b84bb2e242573cd93997f88b4d1a2493273691dab897efc8509a0e3f03f6fddcb9d3b53ecb6 SHA512 4013cb4f00cc87164380c22dc6f82a4fd54702769c28eeb7cfcb13fb35ef41e32916c36a1aa2f6ef05f008da97bea5c7ed849aedc6ae7050c285f9589a9817b0
-DIST getdns-1.5.2.tar.gz 1091088 BLAKE2B c5f32af794f3c710c0f84027d38ca393c72a438905c5e2fe49f2d20477e3f90f855d280f43d0ef7d204fa67d95ebdb960ce86d934e26c1ef3030f263f98ec7f4 SHA512 42e56264578f59e94d0a7315cd9cb1720f24c7a9abbaa09e1b42c274d15d1082ad4a036fa3c10573cf4d0ee6d868b6fcedf3a7cd64b53bdabd9d45542e479ca4
-DIST getdns-1.6.0-beta.1.tar.gz 669637 BLAKE2B cab019c38a0e7268a3ffef7ffd6b52ab3565bbf0b4ea4e897d60cfc0885ee7d32d8bd22e58f24b554e03d4297945d4eaa915aff254f43d4e82455f1070923d46 SHA512 b36d05b09b5ab7c384fdb93820bc6ad253e9a44da9c7ea38c735882e56e03eaba1793ea22068d03867ed2ade71682686a359b1b0a821eed4a5f3bebeeaeeb7e2
 DIST getdns-1.7.0.tar.gz 690885 BLAKE2B 25e81c01c5da0a5494dc25077257f8f98210b442b7ca65c895aa2a40af180e840aa53205ae84ed242cbd6c55f8830caf255db9d7f607dde39f118ab7494a7072 SHA512 d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6
-EBUILD getdns-1.5.1.ebuild 1829 BLAKE2B 1b98cf3a49cb0aa8dd24faa08702a7f92e810b1142ce285c07f8ad46db9da383786ccf64822a026231f95a755d0ab28a42a29f7bb014aaa687af21836fff00e4 SHA512 8f883b33c97371fa82b5699ac28beaa6d3fd03c2904ba974b16d352f2561ab5967e7d1c7dadad904b0c121e37384d7f0f48adf5784120ed11adca96680793227
-EBUILD getdns-1.5.2-r2.ebuild 2027 BLAKE2B c538bbd971332f280f1a1ef538d8f7a39fe46ad2cc2c9c8762c3d7e7dbf6224de7534c5a98dd093afa751630ef86f197a1582d1e5a4038cc74a425ba17e0c951 SHA512 97576f96435a75a8e51ae9a600f1329e924124b5d220766168e255a9e944a74a543181c20a27e4cc0f618d2cef47e555eef951b54aede0a536579a88a7acdcd5
-EBUILD getdns-1.6.0_beta1-r2.ebuild 2030 BLAKE2B bb96fe0fa12f242604f63add83ee05ace04d3d7686a51e7daa17c009bd745a8e7c31e070aa0fea88c66cd0321b1b954ef0b665ef5b7b45b9b412539c76e70c36 SHA512 d08b2a2c7b135578e07b08338a2a3a135e82e042b8d02263e4c93f9e42350c4dcb8be1c9a2bea0e9f09d968c1789902cdb425f7f61be7cf1f8620edc678958fa
-EBUILD getdns-1.7.0.ebuild 2205 BLAKE2B 285d36c359549142a8038426220cc5a8b55a536ea92a56ba4982d51e7badfcfa9f738fbb1391d01a3cd940e6be6db1ab38004eef696ece5953f0f5f0d1b110af SHA512 c56e15e027e77f28d99ada24268a581079b75e4998bd76335574345d86d2c27eb93762f2c3d47d596f2f76f58a29ee0f9657ce7ce9e3c20a88967b7158fcc80d
-MISC metadata.xml 823 BLAKE2B 6f036445b01fd8b4c4a0ddac2f04ed45cb980dc31ca5aa5a25b5da8272541ab7b8d6b6d9fcd8b3d122de378a71b2e8f1dffa158da6a0db84d7e61b9e6f8d134b SHA512 2ac45a84c1d38e601cc9a1bb2af25a4843b8b43902736fce9fe8fba7fb6a2f6b98c020e4a76c8443526c51af7f91602daa01e84e69fe29bc838ad79eb147ded2
+EBUILD getdns-1.7.0.ebuild 2204 BLAKE2B 116183bd38d48b081e2ced7f848b7d6041836f3b0252feb6bfb63a4684ff471daac34ef73ac9c313f8b5de658d1e283430678471264234545f2d53bf5f399850 SHA512 f80e4c56c358af1d40b90db57e4f8fe456a92edfa36ec0cddd9248ee2d494008525cf509bc986bcf6ff0586b980bdd222b6231f9b8488ca05a8142b4a0ce49b5
+MISC metadata.xml 745 BLAKE2B 9cb2fc16135f99e9d57f767fbfa621d1ebe4fe1544b7aa27d38abb874868f641cc47bcf4fb5dae852110bca97ed7f5ceb8afd79faa9577350f986e83c83a4ca3 SHA512 fa3dcfa3e3e8b05f41d428c028171f74fbd7120bb16b10802f176a8a03baaba7cfc079f5d02125ad5602b03d3f6588fc47c4638a75d614a32e70ec8069db4ca4
diff --git a/net-dns/getdns/files/stubby.initd-r1 b/net-dns/getdns/files/stubby.initd-r1
deleted file mode 100644
index e6b799919e28..000000000000
--- a/net-dns/getdns/files/stubby.initd-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-stubby_opts="-C ${STUBBY_CONFIG_FILE:-/etc/stubby/stubby.yml} -v ${STUBBY_LOGLEVEL:-5}"
-command="capsh"
-command_args="--inh=cap_net_bind_service --user=stubby -- -c '/usr/bin/stubby -g ${stubby_opts} >>/var/log/stubby.log 2>&1'"
-pidfile="/var/run/stubby/stubby.pid"
-name="DNS Privacy Daemon"
-
-depend()
-{
-	provide dns
-	need localmount net
-	after bootmisc
-	use logger
-}
-
-start_pre()
-{
-	checkpath -d -m 1755 -o stubby:stubby /var/run/stubby
-	checkpath -f -m 0644 -o stubby:stubby /var/log/stubby.log
-}
diff --git a/net-dns/getdns/getdns-1.5.1.ebuild b/net-dns/getdns/getdns-1.5.1.ebuild
deleted file mode 100644
index 9333b5ff65f1..000000000000
--- a/net-dns/getdns/getdns-1.5.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps systemd user tmpfiles
-
-DESCRIPTION="Modern asynchronous DNS API"
-HOMEPAGE="https://getdnsapi.net/"
-SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +getdns-query +getdns-server-mon +idn libev libevent libuv static-libs stubby +threads +unbound"
-
-# https://bugs.gentoo.org/661760
-# https://github.com/getdnsapi/getdns/issues/407
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/libbsd:=
-	dev-libs/libyaml:=
-	idn? ( net-dns/libidn2:= )
-	dev-libs/openssl:0=
-	libev? ( dev-libs/libev:= )
-	libevent? ( dev-libs/libevent:= )
-	libuv? ( dev-libs/libuv:= )
-	unbound? ( >=net-dns/unbound-1.4.16:= )
-"
-RDEPEND="
-	${DEPEND}
-	stubby? ( sys-libs/libcap:= )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
-
-src_configure() {
-	econf \
-		--runstatedir=/var/run \
-		$(use_enable static-libs static) \
-		$(use_with getdns-query getdns_query) \
-		$(use_with getdns-server-mon getdns_server_mon) \
-		$(use_with idn libidn2) \
-		$(use_with libev) \
-		$(use_with libevent) \
-		$(use_with libuv) \
-		$(use_with stubby) \
-		$(use_with threads libpthread) \
-		$(use_with unbound libunbound) \
-		--without-libidn \
-		--with-piddir=/var/run/stubby
-}
-
-src_install() {
-	default
-	if use stubby; then
-		newinitd "${FILESDIR}"/stubby.initd-r1 stubby
-		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/stubby.logrotate stubby
-		systemd_dounit "${S}"/stubby/systemd/stubby.service
-		dotmpfiles "${S}"/stubby/systemd/stubby.conf
-	fi
-}
-
-pkg_postinst() {
-	if use stubby; then
-		enewgroup stubby
-		enewuser stubby -1 -1 -1 stubby
-		fcaps cap_net_bind_service=ei /usr/bin/stubby
-	fi
-}
diff --git a/net-dns/getdns/getdns-1.5.2-r2.ebuild b/net-dns/getdns/getdns-1.5.2-r2.ebuild
deleted file mode 100644
index 805ea4a5e29b..000000000000
--- a/net-dns/getdns/getdns-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps systemd user tmpfiles
-
-DESCRIPTION="Modern asynchronous DNS API"
-HOMEPAGE="https://getdnsapi.net/"
-SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv nettle static-libs stubby +threads +unbound"
-
-REQUIRED_USE="gnutls? ( nettle )"
-
-# https://bugs.gentoo.org/661760
-# https://github.com/getdnsapi/getdns/issues/407
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/libbsd:=
-	dev-libs/libyaml:=
-	idn? ( net-dns/libidn2:= )
-	!gnutls? ( dev-libs/openssl:0= )
-	gnutls? ( net-libs/gnutls:0=[dane] )
-	libev? ( dev-libs/libev:= )
-	libevent? ( dev-libs/libevent:= )
-	libuv? ( dev-libs/libuv:= )
-	nettle? ( dev-libs/nettle:0= )
-	unbound? ( >=net-dns/unbound-1.4.16:= )
-"
-RDEPEND="
-	${DEPEND}
-	stubby? ( sys-libs/libcap:= )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
-
-src_configure() {
-	econf \
-		--runstatedir=/var/run \
-		$(use_enable static-libs static) \
-		$(use_with getdns-query getdns_query) \
-		$(use_with getdns-server-mon getdns_server_mon) \
-		$(usex gnutls '--with-gnutls' '' '' '') \
-		$(use_with idn libidn2) \
-		$(use_with libev) \
-		$(use_with libevent) \
-		$(use_with libuv) \
-		$(use_with nettle) \
-		$(use_with stubby) \
-		$(use_with threads libpthread) \
-		$(use_with unbound libunbound) \
-		--without-libidn \
-		--with-piddir=/var/run/stubby
-}
-
-src_install() {
-	default
-	if use stubby; then
-		newinitd "${FILESDIR}"/stubby.initd-r1 stubby
-		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/stubby.logrotate stubby
-		systemd_dounit "${S}"/stubby/systemd/stubby.service
-		dotmpfiles "${S}"/stubby/systemd/stubby.conf
-	fi
-}
-
-pkg_postinst() {
-	if use stubby; then
-		enewgroup stubby
-		enewuser stubby -1 -1 -1 stubby
-		fcaps cap_net_bind_service=ei /usr/bin/stubby
-	fi
-}
diff --git a/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild b/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild
deleted file mode 100644
index ab3972e67e66..000000000000
--- a/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-_SRCURI_P="${P/%_beta1/-beta.1}"
-
-inherit cmake fcaps systemd tmpfiles
-
-DESCRIPTION="Modern asynchronous DNS API"
-HOMEPAGE="https://getdnsapi.net/"
-SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby +unbound"
-
-S="${WORKDIR}/${_SRCURI_P}"
-
-# https://bugs.gentoo.org/661760
-# https://github.com/getdnsapi/getdns/issues/407
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/libbsd
-	dev-libs/libyaml
-	dev-libs/openssl:=
-	idn? ( net-dns/libidn2:= )
-	gnutls? (
-		net-libs/gnutls:0=[dane,openssl]
-		dev-libs/nettle:0=
-	)
-	libev? ( dev-libs/libev:= )
-	libevent? ( dev-libs/libevent:= )
-	libuv? ( dev-libs/libuv:= )
-	>=net-dns/unbound-1.5.9:=
-"
-RDEPEND="
-	${DEPEND}
-	stubby? (
-		acct-group/stubby
-		acct-user/stubby
-		sys-libs/libcap
-	)
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_RUNSTATEDIR=/var/run
-		-DBUILD_DOXYGEN=$(usex doc)
-		-DBUILD_GETDNS_QUERY=$(usex getdns-query)
-		-DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon)
-		-DBUILD_STUBBY=$(usex stubby)
-		-DENABLE_STATIC=$(usex static-libs)
-		-DENABLE_UNBOUND_EVENT_API=$(usex unbound)
-		-DUSE_GNUTLS=$(usex gnutls)
-		-DUSE_LIBEV=$(usex libev)
-		-DUSE_LIBEVENT2=$(usex libevent)
-		-DUSE_LIBIDN2=$(usex idn)
-		-DUSE_LIBUV=$(usex libuv)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if use stubby; then
-		newinitd "${FILESDIR}"/stubby.initd-r2 stubby
-		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/stubby.logrotate stubby
-		systemd_dounit "${S}"/stubby/systemd/stubby.service
-		dotmpfiles "${S}"/stubby/systemd/stubby.conf
-	fi
-}
-
-pkg_postinst() {
-	if use stubby; then
-		fcaps cap_net_bind_service=ei /usr/bin/stubby
-	fi
-}
diff --git a/net-dns/getdns/getdns-1.7.0.ebuild b/net-dns/getdns/getdns-1.7.0.ebuild
index 39b9a79e1866..0be2dffb7beb 100644
--- a/net-dns/getdns/getdns-1.7.0.ebuild
+++ b/net-dns/getdns/getdns-1.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby test +unbound"
 
 S="${WORKDIR}/${_SRCURI_P}"
diff --git a/net-dns/getdns/metadata.xml b/net-dns/getdns/metadata.xml
index eef66059a1eb..9c8f002f154a 100644
--- a/net-dns/getdns/metadata.xml
+++ b/net-dns/getdns/metadata.xml
@@ -13,6 +13,5 @@
 		<flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> support</flag>
 		<flag name="libev">Enable <pkg>dev-libs/libev</pkg> support</flag>
 		<flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
-		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> as crypto backend</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 5b41b1eb53fe..fe462a6d7284 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -4,7 +4,9 @@ AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11
 DIST knot-2.9.8.tar.xz 1194284 BLAKE2B c4329e5b2fc499851112d008af10c1a73bbe50cd07a4b5af984e99f389606b6f11c0b321dc26c14f872eb7cc70a99290a033f9aa9ff23a2b3694427605ffc704 SHA512 8104c3bdef2db4a79d6cd0fa4a30be1aa6edfa01363b97738d873445198cd031b4f5ab581d1a5277de49a8a042bb5340334be0579ceefa4b614e34c2cd454904
 DIST knot-3.0.4.tar.xz 1347928 BLAKE2B c97df0c04dbd6b96d2f2805a2bbb07bc3fd0ac64160619a55fdf93ac02e6d3f797dfae43ac8bc79450c59c88e0a521911517577ea19d67bb41186cfcd07dd743 SHA512 d674faaafcbe882539d28e53f1cd6cdda61ca8065f66dc0b9127f249f34b59a9d3d1ac206799c2974a2d38264842a2387db35f814bd05f3eaeac0b35b90b21ac
 DIST knot-3.0.6.tar.xz 1333296 BLAKE2B 74ee1133dbf954234c4b07a29986cb91363256f3450b3d270f6d458d723e89bd1f7434881aa51632f02c369a16ca461e8ab892c34a2cf2ed612aa9040c91d535 SHA512 f1bfb0bc3a4cf622a68562409e71c8b84ee628a5452b48e172148bcac9cd0827b60a0c060075b80a086ca65da958d2d63e33ef7e373ab300b50089d06af3e5d0
+DIST knot-3.0.7.tar.xz 1334788 BLAKE2B 0ac740b25912ae84714e078963880c27082f8d0e668f0df3b04a6a8a3588d0ffaf0ded9f6e3dd64cf9bc0b08673219e32ac3ffb86f64b9ea97cb61ab9cb545d4 SHA512 89e17cd2bc5a07b05ccd11cfd58481078eff4076a537d1623ed575c1ab87eac87ce949c12dc35eb15dc7e4358a405c19a6660b4da9abc230077a251792f196bd
 EBUILD knot-2.9.8.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
 EBUILD knot-3.0.4.ebuild 1892 BLAKE2B 0b9a056538b2b5c179a461e3824b208dd6163bd27c5397159a3dffb71620053a3578d3c6f2f49919c1c69af52d362ea07cec26c466f5a2fb3ca78c6ce90ab42b SHA512 d1f68b21197355d902468a008c2f49289fb5b0e2a562887d78ad8329d5895bea3f301e8729dc2f4b57ae209d05c93e38d1fb389ba9fa708f60d32d183a9cd6f5
 EBUILD knot-3.0.6.ebuild 1892 BLAKE2B 0b9a056538b2b5c179a461e3824b208dd6163bd27c5397159a3dffb71620053a3578d3c6f2f49919c1c69af52d362ea07cec26c466f5a2fb3ca78c6ce90ab42b SHA512 d1f68b21197355d902468a008c2f49289fb5b0e2a562887d78ad8329d5895bea3f301e8729dc2f4b57ae209d05c93e38d1fb389ba9fa708f60d32d183a9cd6f5
+EBUILD knot-3.0.7.ebuild 1892 BLAKE2B 0b9a056538b2b5c179a461e3824b208dd6163bd27c5397159a3dffb71620053a3578d3c6f2f49919c1c69af52d362ea07cec26c466f5a2fb3ca78c6ce90ab42b SHA512 d1f68b21197355d902468a008c2f49289fb5b0e2a562887d78ad8329d5895bea3f301e8729dc2f4b57ae209d05c93e38d1fb389ba9fa708f60d32d183a9cd6f5
 MISC metadata.xml 1707 BLAKE2B 6eeedcb9dea44ad97afe8ed57bc529ea23bfa93c72163c566cc527a0284addbaea3f2fed4804853c8fb0431f38691356eae305c32f7e4a1256ef634894ce2a44 SHA512 e555e86949c2671b21e7e62a7aa346417f36ca9953fa45c5a4d1a0a4d46aec8bb4dde6c07121e1f5ebe12116756f3f7daf27455305b9158577f060c6237d047a
diff --git a/net-dns/knot/knot-3.0.7.ebuild b/net-dns/knot/knot-3.0.7.ebuild
new file mode 100644
index 000000000000..ff2ab85cf4eb
--- /dev/null
+++ b/net-dns/knot/knot-3.0.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="High-performance authoritative-only DNS server"
+HOMEPAGE="https://www.knot-dns.cz/"
+SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+KNOT_MODULES=(
+	"+cookies"
+	"+dnsproxy"
+	"dnstap"
+	"geoip"
+	"+noudp"
+	"+onlinesign"
+	"+queryacl"
+	"+rrl"
+	"+stats"
+	"+synthrecord"
+	"+whoami"
+)
+IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
+
+RDEPEND="
+	acct-group/knot
+	acct-user/knot
+	dev-db/lmdb
+	dev-libs/libedit
+	dev-libs/userspace-rcu:=
+	dev-python/lmdb
+	net-libs/gnutls:=
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c:=
+	)
+	geoip? ( dev-libs/libmaxminddb:= )
+	idn? (
+		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
+		libidn2? ( net-dns/libidn2:= )
+	)
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	local u
+	local my_conf=(
+		--with-storage="${EPREFIX}/var/lib/${PN}"
+		--with-rundir="${EPREFIX}/var/run/${PN}"
+		$(use_enable fastparser)
+		$(use_enable dnstap)
+		$(use_enable doc documentation)
+		$(use_enable utils utilities)
+		--enable-systemd=$(usex systemd)
+		$(use_with idn libidn)
+	)
+
+	for u in "${KNOT_MODULES[@]#+}"; do
+		my_conf+=("$(use_with ${u} module-${u})")
+	done
+
+	econf "${my_conf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
+
+	default
+
+	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
+
+	newinitd "${FILESDIR}/knot.init" knot
+	if use systemd; then
+		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index b5c229403dbf..9b56a9b3f651 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -6,5 +6,5 @@ AUX opendnssec-use-system-trang.patch 618 BLAKE2B 32e1b6784f1666e0485e6109af40b0
 AUX opendnssec.confd 393 BLAKE2B 47f83e11292c01cb999fae36dbea2d0b45cb970493bfbab43c43682fe26e574e12bbe7f7096e71ff7bd0b8b49827f13e4de858a38868706fa769cc92ceb1f307 SHA512 17bd24efef9bd6b7a907c75126809a6012db23a6c8547169c41dbc62fc91775331f445905282bc6c2ef13357f92eccab5008d4605419d98acdb723806b63a924
 AUX opendnssec.initd 1854 BLAKE2B 358bcf513123f7a38b7795f142f56e6a186062d1ad80bb70bee46ba7ebe7a137b4d2830a6c27ae690add23e0296ed2bd3a7a5d7ee88e1ee7ee3a8a9631306916 SHA512 75bce27c152b55ba2ba7d0770c6f2149493ef4b145f2257328e7e4b6865ad2d644695a688c3e06be02705ac42752e031846551b80b560e19a73e595e5ad15def
 DIST opendnssec-2.0.3.tar.gz 1103355 BLAKE2B b64e729003de86e4139efaad60c9feae9f4e19c16a29fdced55d66f5896c4b7d76c4b8c57a8330d55c0c03e87de1ebe6ec49ef9d1b6e215be963680d2c805579 SHA512 4745a9ac317cc65d6f5b14be640687efd5fde2149541f692fb607a458378d27e903f175023c1aa16a777d17cef9cc68f1a84e7e7cdb233466d26756721b34424
-EBUILD opendnssec-2.0.3-r1.ebuild 6772 BLAKE2B 3504ea046ae454d4b8ef71cc3c59c1a557e64504664b9368676617ca057502cf7cfdf6522482ab3081558307232a744dc3ace782254e253e89cfefa2ee22ee22 SHA512 fcfd24a3da0b1e83ec1d70fef0a6d8c461c2eb020b429460d4e5e45443778485059bfc5cdea2ce30764a4bfd6c12456706135ab7afbe20c6905bce0b249344f6
+EBUILD opendnssec-2.0.3-r2.ebuild 6846 BLAKE2B aee3a4fb1f3037143d7f08726f2f3bdeb8c737a710b051faf33c669ddd6b4e79b35449635fffe46472fd4f1b45cfd3e0c192ed05a18b2a3ff1b7e6e24d664b12 SHA512 c443bcfffee145b1a71d629de68ec08ae68e3f6fa670ac48e179348f5bee8e91ec07a8d3dfe8b7fff3d6b8765e6bfca812a3617365a726a14bd5104157704d73
 MISC metadata.xml 717 BLAKE2B a78c51d08bd665681b9977050e8337fbe95adface07632923e7bfa7f5ca9cbef0443bf8ada06480b862219720d71669220eeeca21d06edf68ba3452667faa861 SHA512 203b2e6d467ecd5832d7a56a9d31d37f6427c6cf3d9ad45d4b18d4b9b3f74ac53dcfb03bea0bd2c68d34a9474992216c198173e65c8f7edc00f61ead434c2b1d
diff --git a/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild b/net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild
index eea0ece708cc..17efc48d4904 100644
--- a/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild
@@ -5,11 +5,13 @@ EAPI=7
 
 MY_P="${P/_}"
 PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit autotools user
+
+inherit autotools
 
 DESCRIPTION="An open-source turn-key solution for DNSSEC"
 HOMEPAGE="https://www.opendnssec.org/"
 SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
@@ -18,6 +20,8 @@ IUSE="debug doc +mysql readline +signer sqlite test ${PKCS11_IUSE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	acct-group/opendnssec
+	acct-user/opendnssec
 	dev-lang/perl
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -34,7 +38,9 @@ RDEPEND="
 		dev-perl/DBD-SQLite
 	)
 "
+
 DEPEND="${RDEPEND}"
+
 BDEPEND="
 	doc? ( app-doc/doxygen )
 	test? (
@@ -55,8 +61,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-openssl1.1.patch"
 )
 
-S="${WORKDIR}/${MY_P}"
-
 DOCS=( MIGRATION NEWS )
 
 check_pkcs11_setup() {
@@ -125,9 +129,6 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	enewgroup opendnssec
-	enewuser opendnssec -1 -1 -1 opendnssec
-
 	# pretend does not preserve variables so we need to run this once more
 	check_pkcs11_setup
 }
@@ -200,6 +201,9 @@ src_install() {
 		"${ED}"/usr/share/opendnssec/db/convert_* \
 		"${ED}"/usr/share/opendnssec/db/1.4-2.0_db_convert/convert_* || die
 
+	# create directories
+	keepdir /var/lib/opendnssec/{,enforcer,signconf,signed,signer,unsigned}
+
 	# fix permissions
 	fowners root:opendnssec /etc/opendnssec
 	fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 7206d3108d97..2798ad8d273a 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -2,7 +2,7 @@ AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf40345342288
 AUX pdns-4.4.1-boost-1.76.patch 830 BLAKE2B b74f9deece5c1bd71f6c3df571f288cbab01c567be4236bb3f94187e076fef461d8cc45e2bbe905adb83cbc785f00f91d191e30745ce42325d902b36f73c9b06 SHA512 0ab0a02d30ee5c8aa0b906c1a58e94b7e8aba8e382f963b528b52c926f000ccf00687a0445e0de5b3ab875910e4affd1f1697d4cab7a4e72d558790abd85112d
 AUX pdns-r1 2815 BLAKE2B cd607cb30a94540eca9cfa2defb7c996f6e151875fcaad8ad3357261937868bc346962f1080ad45a0ef38c2dfc126eb11e41837ee0784f677d1e7c071589a057 SHA512 4c0442d8d92d95268d4971f80782d2772e2a22c43da00566a9328c79a834e4355b2610d133034351d7137ed6cd7fda300f3db8093b09d5852cea44d983de1e39
 DIST pdns-4.4.1.tar.bz2 1276990 BLAKE2B 9771cf3273ab7e8ab4607a91563bfe0dc3f4532b5420861d816eacd2798d66de3a1eb824c191264f9106ec47bd6003d99108b8df678190055948779b9b3b070f SHA512 a6f31972f77ded8ecfb523e8810dd90e5b7aa628746fee2a9a0daae2a7935800f111ce8617ffd71d5ce3881947d4ffc36c9cb37996a7bcc514536bb4abe1f79e
-DIST pdns-4.5.0-rc2.tar.bz2 1266366 BLAKE2B 9081f8cce94ababb0165c64756d3d8065730607950f974fb0a0219732774f925ba6b8f93cd22dc7c76d49e0179d4cd678216aa3feefd09b7235695e1de3fddcf SHA512 7b98c469e13a9d4878e9f1b11e16dffa9d8ab690e8f538a285a59f226cac629f3ec2bded025d77c6f8aacf8a04ff9ee43e9057d832475388b3620cde55b0d2a2
+DIST pdns-4.5.0.tar.bz2 1267077 BLAKE2B 62e0d90db3f6fd7566184a80519c95d89e3360c28450ef4fd9bdaba3f0bc38a517827ef4bacfa66a3ac7ffb2654b31a9d81406dd3ae35b0ceb34c79f2c18ac29 SHA512 7643cbd08e7cf6c2f5911784222b1e1f686153f4c8c4d5e0ee756a5c08b4fe52b617a948ef7f258ceddc45f31331c68a10034176fbd07cb2e2ba38174e54a17f
 EBUILD pdns-4.4.1-r1.ebuild 4429 BLAKE2B e530739c8ce95a3099792a6cad1ea2c2e3d2e99f851e9a766f2e35da9491f4bfea6ca7715fea57044c293e80fb3f7770917cc243c241911bde87625a10891f14 SHA512 7738879bbf4dc54acff95dbafdba2eef075f025df74a38984072750fffeb0d6ee7652e02a5783d4ccb416d658d3cbeafbec24369ce8befc0c16650dcefbe6bc0
-EBUILD pdns-4.5.0_rc2.ebuild 4261 BLAKE2B d53acbdaf0a9ed86fdf73584a7ffa5a8130a1e675125012a5b31359004b6ab8287d2949fca7c564d598d867faf48cd0ffe9420dd22934e385184d4429d8cd406 SHA512 584af45d783e50b35516d68b14dac18f6b035b0b72c49d3b7d61b3a5bd876d720820d37060493f1baf77bc40faa58b8f502a22539e66c5f39096c68d687c60ce
+EBUILD pdns-4.5.0.ebuild 4258 BLAKE2B 0ac75cefd60a8e7947265a16ce9cf5f0611166d31c2373770b276ddf4fdc284f0a83d488fd8ea7f8cb3b731e4032eeeab8e07b8959b41a750a79be95b1bf0ae5 SHA512 77809ef2a8cd48f57c272ad9260751fa13088c4a42c660623b00246165c48ff888f3f6a2591e8dab6485eb13675d6171be2d8e96f2fe7efe1f8721140137b8f0
 MISC metadata.xml 1111 BLAKE2B 5a55e94593f1c010f9ee71fa2d3bc887a0eddc8627db36a1792b911a1cfe3fa3d5a33923b95d18a02f36097717d76ed2aae711c2deb793625b1186090ad072c8 SHA512 c010bbd0daa87980a4d9f164fc3d15239251890e56c63b1165d55a92b9c0f24e5f141439bdfc13b4efa4483e0fc199cd6107e2f152d26d4ca954f4c3d0cc4913
diff --git a/net-dns/pdns/pdns-4.5.0_rc2.ebuild b/net-dns/pdns/pdns-4.5.0.ebuild
index 0333a674c4fa..c45db0959c30 100644
--- a/net-dns/pdns/pdns-4.5.0_rc2.ebuild
+++ b/net-dns/pdns/pdns-4.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="" # ~amd64
+KEYWORDS="~amd64"
 
 # other possible flags:
 # db2: we lack the dep