gentoo resync : 20.03.2022

19 files changed, 671 insertions, 23 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 2bed30c9e3a8..b5c4dd6e675e 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 0bbd38808b85..c56cb8005328 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -3,9 +3,11 @@ DIST bind-9.16.18.tar.xz 5023512 BLAKE2B 7766c1e6ab30ae42f0ba49d96fe0e2675e79aa0
 DIST bind-9.16.21.tar.xz 5057816 BLAKE2B bc7de285b45084a4904aee7c5c3042c7a2075968f19ed76b932c976f86f60bc8bf0d6cce8889a9adf7e807c8151bd6088ef1b2b00460a4d1cff7a74bb2221d43 SHA512 2cb71e50600fd7409ca7b7e2e9cf4ef6668b07faad7980ac8060e6a76f30a315182d75534ad1dcfb740c225cdf727b2bd6aa9ceb24ab77ffff09b7b5d6eaca2d
 DIST bind-9.16.22.tar.xz 5059000 BLAKE2B c4853a8be268f9666f3677adf2e64c6d74f7df44d2dc05df544cead38c6c3b86489d25a66ccea6ce8ca89fa525a1848fe93a8aaa6bb1ee090aa189bf6aad40f3 SHA512 586fb4d5a656d6539033dcdfdd230b36465a2d2e6ada651c1f1548d062a9050e7a962af87e2a56931fe24c65586d29012d4a041dcddbb28f42b4d01fe291d9d1
 DIST bind-9.16.25.tar.xz 5086780 BLAKE2B cb62d0d4e25f508f1a77fae6a11ff144d2436346c45a936d572df4c843cd72ec81cffacd0a81dcb74eb73b8bca7d0762a5746baadda36f260b79b72eade24d18 SHA512 e43c0e59159d3a5642db051f3982d8767fb726426380c32960fefe4b9afd05708ed8f7e80a98b803a580b048e1a368c888e2dd5695fa5fcd7b8b75574a27cb62
+DIST bind-9.16.27.tar.xz 5084340 BLAKE2B 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf SHA512 5c71f228db83aa8cc9e65466d6e5afca4a9f80c693358111a003fe09e1a14522175eb2b6a0f11e2a2cd4fdba01f2ae315de52e394a441b3861ca2a011e02af62
 EBUILD bind-tools-9.16.15.ebuild 3404 BLAKE2B 366a20661af50d30017201916c796e8ffda13d6621909e2df2e28e5834623699c5e27d7b3e12f603b2b9eeb5ac5b38e06f67b5c1750a57dfb3b2f645795b3097 SHA512 53cdf632ed2c18e4f39692d35c5d51fff1d1c944d576365f287a5f0176c24df090430342f601efbf59301faa6a7f512f69e112fef481d3cf70ac6addff5f3631
 EBUILD bind-tools-9.16.18.ebuild 3411 BLAKE2B 807ef0b010a90ac23c7df0303d1ca6a9013854b2646d9724f07421e749e3a89c1a7934df46a5f339095950fe382f84548f0b964e7d850f9c9edab17f31fa35d8 SHA512 7efea06b5792ed8a61b8f9eed76fa1dbd9ed308831ef2c235a7a7ded2cc549330159d2455396329ed4b25cacfb5574939e5c1f16df527e696130ce1d62b8dba9
 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
 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
new file mode 100644
index 000000000000..cb9733acbe8c
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.16.27.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps doc gssapi idn ipv6 libedit readline xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+COMMON_DEPEND="
+	dev-libs/libuv:=
+	caps? ( sys-libs/libcap )
+	dev-libs/openssl:=
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/libidn2:= )
+	gssapi? ( virtual/krb5 )
+	libedit? ( dev-libs/libedit )
+	!libedit? (
+		readline? ( sys-libs/readline:= )
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# sphinx required for man-page and html creation
+BDEPEND="
+	doc? ( dev-python/sphinx )
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--without-python
+		--without-libjson
+		--without-zlib
+		--without-lmdb
+		--without-maxminddb
+		--disable-geoip
+		--with-openssl="${ESYSROOT}"/usr
+		$(use_with idn libidn2 "${ESYSROOT}"/usr)
+		$(use_with xml libxml2)
+		$(use_with gssapi)
+		$(use_with readline)
+		$(use_enable caps linux-caps)
+		AR="$(type -P $(tc-getAR))"
+	)
+
+	# bug 607400
+	if use libedit ; then
+		myeconfargs+=( --with-readline=-ledit )
+	elif use readline ; then
+		myeconfargs+=( --with-readline=-lreadline )
+	else
+		myeconfargs+=( --without-readline )
+	fi
+
+	# bug 344029
+	append-cflags "-DDIG_SIGCHASE"
+
+	# to expose CMSG_* macros from sys/sockets.h
+	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
+
+	# localstatedir for nsupdate -l, bug 395785
+	tc-export BUILD_CC
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+	local AR=$(tc-getAR)
+
+	emake AR="${AR}" -C lib/
+	emake AR="${AR}" -C bin/delv/
+	emake AR="${AR}" -C bin/dig/
+	emake AR="${AR}" -C bin/nsupdate/
+	emake AR="${AR}" -C bin/dnssec/
+	emake -C doc/man/ man $(usev doc)
+}
+
+src_install() {
+	local man_dir="${S}/doc/man"
+	local html_dir="${man_dir}/_build/html"
+
+	dodoc README CHANGES
+
+	cd "${S}"/bin/delv || die
+	dobin delv
+	doman ${man_dir}/delv.1
+
+	cd "${S}"/bin/dig || die
+	dobin dig host nslookup
+	doman ${man_dir}/{dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate || die
+	dobin nsupdate
+	doman ${man_dir}/nsupdate.1
+	if use doc; then
+		docinto html
+		dodoc ${html_dir}/nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+		revoke settime signzone verify; do
+		dobin dnssec-"${tool}"
+		doman ${man_dir}/dnssec-"${tool}".8
+		if use doc; then
+			docinto html
+			dodoc ${html_dir}/dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index a92c1a9cf85f..e9b5d2d006d5 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -13,10 +13,12 @@ DIST bind-9.16.18.tar.xz 5023512 BLAKE2B 7766c1e6ab30ae42f0ba49d96fe0e2675e79aa0
 DIST bind-9.16.21.tar.xz 5057816 BLAKE2B bc7de285b45084a4904aee7c5c3042c7a2075968f19ed76b932c976f86f60bc8bf0d6cce8889a9adf7e807c8151bd6088ef1b2b00460a4d1cff7a74bb2221d43 SHA512 2cb71e50600fd7409ca7b7e2e9cf4ef6668b07faad7980ac8060e6a76f30a315182d75534ad1dcfb740c225cdf727b2bd6aa9ceb24ab77ffff09b7b5d6eaca2d
 DIST bind-9.16.22.tar.xz 5059000 BLAKE2B c4853a8be268f9666f3677adf2e64c6d74f7df44d2dc05df544cead38c6c3b86489d25a66ccea6ce8ca89fa525a1848fe93a8aaa6bb1ee090aa189bf6aad40f3 SHA512 586fb4d5a656d6539033dcdfdd230b36465a2d2e6ada651c1f1548d062a9050e7a962af87e2a56931fe24c65586d29012d4a041dcddbb28f42b4d01fe291d9d1
 DIST bind-9.16.25.tar.xz 5086780 BLAKE2B cb62d0d4e25f508f1a77fae6a11ff144d2436346c45a936d572df4c843cd72ec81cffacd0a81dcb74eb73b8bca7d0762a5746baadda36f260b79b72eade24d18 SHA512 e43c0e59159d3a5642db051f3982d8767fb726426380c32960fefe4b9afd05708ed8f7e80a98b803a580b048e1a368c888e2dd5695fa5fcd7b8b75574a27cb62
+DIST bind-9.16.27.tar.xz 5084340 BLAKE2B 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf SHA512 5c71f228db83aa8cc9e65466d6e5afca4a9f80c693358111a003fe09e1a14522175eb2b6a0f11e2a2cd4fdba01f2ae315de52e394a441b3861ca2a011e02af62
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.16.15-r2.ebuild 11016 BLAKE2B 3709d824ac8ada3ad5cb246cab344a8f657503e6fea99f1b5f309e2ef519756c366dea3dc444b46c6686749c7c9477b6da6cedcb65d1aa87edd6fbce2fa2a3af SHA512 dd16ca87cc5e379ce441173e1a20b3a2f88fcf8f884ee2cd14bf0c353ef758ca668351dcb59def7e1c84e368caf8fb884abce0fbec6f0327f07a29caaa3687c1
+EBUILD bind-9.16.15-r2.ebuild 11017 BLAKE2B 336926584ebc0401669219e0632aba501ba9c0de035e71d6ecfd9e86e7d8b5dd9ca76aba485c31323fa0dd67ee7ce4f8ed74fc1bfe10fd61254c3a62a73f731d SHA512 84f72f93b81dc78d1ca686869e66d7d4fcbc87b833c00b95ff7ea3b9843da15f6614c7a9c3eba85e4e47c52e660709ce2994c28a7218a811c47bcaf3b7a2950f
 EBUILD bind-9.16.18.ebuild 10974 BLAKE2B 042fca55d17c4cb7ec7b0a0ba54318858de0a89cbbcccae13c13655f96ecec54d3206a9559253abe45bd65365b3a636e8cbff218cf6a191920c284ac42ab0873 SHA512 b5aae1a3435486da93c2835c342345d8109a7dea5130cf091d0b40641aa73b64a5a09a5026df72541ab76dbd8616c972ec2059d7410ef2a1c0b0f2c3e843de6a
 EBUILD bind-9.16.21.ebuild 10974 BLAKE2B 042fca55d17c4cb7ec7b0a0ba54318858de0a89cbbcccae13c13655f96ecec54d3206a9559253abe45bd65365b3a636e8cbff218cf6a191920c284ac42ab0873 SHA512 b5aae1a3435486da93c2835c342345d8109a7dea5130cf091d0b40641aa73b64a5a09a5026df72541ab76dbd8616c972ec2059d7410ef2a1c0b0f2c3e843de6a
-EBUILD bind-9.16.22-r1.ebuild 11063 BLAKE2B 8c11e3694cac941c209ed9120aff57fad02b694025bc9d8d2606205197c4e78539ed778b738ccc686d09fccd7a1e7c35b46aa042891620895d52083b19fa571f SHA512 4923ac9dc70724e249be495540aadc1b7d570b006d6eb319351380b251ed6fc5290b4e539391947ea6561d72412dfeaece06d2724429aea248c0a89f102cba09
+EBUILD bind-9.16.22-r1.ebuild 11064 BLAKE2B ed59967573ef2800d4ab9d4b39148fdf8955d9ff563e716fbd24beabb4e70879aae65d86c232518b23c7966cd2c947634fd34da434671e75f67e6561c1f9fed6 SHA512 645cc70ceca88297810d37bda4e948c3b797cf383b6860adda987d66349866efadafc18e680b44259c76f5d6fa8d6ca9c148fb2e1164c62bd192c7e569546636
 EBUILD bind-9.16.25.ebuild 11071 BLAKE2B bcc7d40db548d1dd8fe329c438a77179dfefa02dc60d5a6a3b57eaa9a727a9893a558c203a89071789eff406c752a164b6c2e13b2b865355ffe760a6a945231e SHA512 a134a3cb7985adad6fd8dbfd164520c2e0e18865a14c43a9317c243dc96ff273a9405719d32ccb2cc61260f8d3c4b57b6e91a5817d17471bc7360bb42c830a5b
+EBUILD bind-9.16.27.ebuild 11064 BLAKE2B 4e5e79182da064b77a303a57f58b7db6223bde5e74a7654e74033a3cc1bb3cff36df8c7610609978c4cb3c13b1112161ae4ee4131f050ed68603ece4de99d4df SHA512 db04923a03b5d45d22ffefeaf32226d1c50657cda47ed65552e821eb4f84cf450765fade46d849c2e26360bfbb1017922cd8a85fb5d30c567d5939694b2a2093
 MISC metadata.xml 974 BLAKE2B a2d3d119e1632c8c5565f0bdedd807c7eaab97f721c34e585ed19483db9b9e25ef364d1950d416acf1c7342cef8d763357c3a4e464b0704013e4a4b66788e6c7 SHA512 0255ae6a504d4f36fb7fe8b14b25328810bc500f610b4dcdb04a79d34a3dcb0ea8eb0a2298c1f69679d8679d89125cb34fc46be2897dbcb408827d718a9eb9d1
diff --git a/net-dns/bind/bind-9.16.15-r2.ebuild b/net-dns/bind/bind-9.16.15-r2.ebuild
index 257ef4e4f60b..116d93a61f50 100644
--- a/net-dns/bind/bind-9.16.15-r2.ebuild
+++ b/net-dns/bind/bind-9.16.15-r2.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
 
 # Re dlz/mysql and threads, needs to be verified..
@@ -33,7 +33,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 # -berkdb by default re bug 602682
 IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
 json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib"
diff --git a/net-dns/bind/bind-9.16.22-r1.ebuild b/net-dns/bind/bind-9.16.22-r1.ebuild
index 73012655db87..ce69b6e210bc 100644
--- a/net-dns/bind/bind-9.16.22-r1.ebuild
+++ b/net-dns/bind/bind-9.16.22-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
 
 # Re dlz/mysql and threads, needs to be verified..
@@ -33,7 +33,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 # -berkdb by default re bug 602682
 IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
 json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib"
diff --git a/net-dns/bind/bind-9.16.27.ebuild b/net-dns/bind/bind-9.16.27.ebuild
new file mode 100644
index 000000000000..0f01fefa50f5
--- /dev/null
+++ b/net-dns/bind/bind-9.16.27.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-r1 autotools toolchain-funcs flag-o-matic db-use systemd tmpfiles
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+# -berkdb by default re bug 602682
+IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
+json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+# Upstream dropped the old geoip library, but the BIND configuration for using
+# GeoIP remained the same.
+REQUIRED_USE="
+	postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	dnsrps? ( dlz )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	acct-group/named
+	acct-user/named
+	berkdb? ( sys-libs/db:= )
+	dev-libs/openssl:=[-bindist(-)]
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )
+	postgres? ( dev-db/postgresql:= )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( dev-libs/libmaxminddb )
+	geoip2? ( dev-libs/libmaxminddb )
+	gssapi? ( virtual/krb5 )
+	json? ( dev-libs/json-c:= )
+	lmdb? ( dev-db/lmdb )
+	zlib? ( sys-libs/zlib )
+	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/ply[${PYTHON_USEDEP}]
+	)
+	dev-libs/libuv:=
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	sys-process/psmisc"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/ldap-library-path-on-multilib-machines.patch"
+)
+
+# bug 479092, requires networking
+# bug 710840, cmocka fails LDFLAGS='-Wl,-O1'
+#RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+	eautoreconf
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	bind_configure --without-python
+	use python && python_foreach_impl python_configure
+}
+
+bind_configure() {
+	local myeconfargs=(
+		AR="$(type -P $(tc-getAR))"
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir=/etc/bind
+		--localstatedir=/var
+		--with-libtool
+		--enable-full-report
+		--without-readline
+		--with-openssl="${ESYSROOT}"/usr
+		--without-cmocka
+		# Removed in 9.17, drags in libunwind dependency too
+		--disable-backtrace
+		$(use_enable caps linux-caps)
+		$(use_enable dnsrps)
+		$(use_enable dnstap)
+		$(use_enable fixed-rrset)
+		# $(use_enable static-libs static)
+		$(use_with berkdb dlz-bdb "${ESYSROOT}"/usr)
+		$(use_with dlz dlopen)
+		$(use_with dlz dlz-filesystem)
+		$(use_with dlz dlz-stub)
+		$(use_with gssapi)
+		$(use_with json json-c)
+		$(use_with ldap dlz-ldap)
+		$(use_with mysql dlz-mysql)
+		$(use_with odbc dlz-odbc)
+		$(use_with postgres dlz-postgres)
+		$(use_with lmdb)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+		"${@}"
+	)
+	# This is for users to start to migrate back to USE=geoip, rather than
+	# USE=geoip2
+	if use geoip ; then
+		myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip )
+	elif use geoip2 ; then
+		# Added 2020/09/30
+		# Remove USE=geoip2 support after 2020/03/01
+		ewarn "USE=geoip2 is deprecated; update your USE flags!"
+		myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip )
+	else
+		myeconfargs+=( --without-maxminddb --disable-geoip )
+	fi
+
+	# bug #158664
+#	gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+python_configure() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	bind_configure --with-python
+	popd >/dev/null || die
+}
+
+src_compile() {
+	default
+	use python && python_foreach_impl python_compile
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake
+	popd >/dev/null || die
+}
+
+src_install() {
+	default
+
+	dodoc CHANGES README
+
+	if use doc; then
+		docinto misc
+		dodoc -r doc/misc/
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dodoc -r doc/arm/
+
+		docinto contrib
+		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+		# some handy-dandy dynamic dns examples
+		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null || die
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r3 named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r14 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die
+	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	revoke settime signzone verify; do
+		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
+		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
+	done
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	use python && python_foreach_impl python_install
+
+	# bug 450406
+	dosym named.cache /var/bind/root.cache
+
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+	dosym ../../var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn} /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	dotmpfiles "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+python_install() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_scriptinto /usr/sbin
+	python_doscript dnssec-{checkds,coverage}
+	python_optimize
+	popd >/dev/null || die
+}
+
+pkg_postinst() {
+	tmpfiles_process named.conf
+
+	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
+		einfo "Using /dev/urandom for generating rndc.key"
+		/usr/sbin/rndc-confgen -a
+		chown root:named /etc/bind/rndc.key || die
+		chmod 0640 /etc/bind/rndc.key || die
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT} || die
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
+	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
+
+	chown root:named \
+		${CHROOT} \
+		${CHROOT}/var/{bind,log/named} \
+		${CHROOT}/run/named/ \
+		${CHROOT}/etc/bind \
+		|| die
+
+	mknod ${CHROOT}/dev/null c 1 3 || die
+	chmod 0666 ${CHROOT}/dev/null || die
+
+	mknod ${CHROOT}/dev/zero c 1 5 || die
+	chmod 0666 ${CHROOT}/dev/zero || die
+
+	mknod ${CHROOT}/dev/urandom c 1 9 || die
+	chmod 0666 ${CHROOT}/dev/urandom || die
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/ || die
+		cp -a /var/bind ${CHROOT}/var/ || die
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		if use geoip; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+		elif use geoip2; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
+		fi
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index d9c59616d574..70176f88a008 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -1,5 +1,5 @@
 DIST c-ares-1.17.2.tar.gz 1538276 BLAKE2B c6f5ad65ca75f8467b624daf3caaee2f35d6e4714ce46ebe1bbf79447feecf8615915b00fa5e7bd1e97c6232864e06c53a792fbadf36a5399883529769273e24 SHA512 f625e0ef8508af6475d3e83b51ab29be8a4878e2a87e7f518bea046b76a74bfde7043ca6ec2a9e714c898ab9e5d4a5a678c3347a9f9eb68980438f7ca8ae3fc8
 DIST c-ares-1.18.1.tar.gz 1560165 BLAKE2B c03a572726c6bbb24a3e4773673d0c87f4833bb9582aed57a424eea8c965beb6e232f502b61922b124d37403d91ebfefe0db7373673fc22e0d752c4e5036eb07 SHA512 1276ec0799916019f8c0af6b55a139701bd15e0ca4a00811d07963893978bc96c107b980f0fd49f81aa70bc8b3b8cd671195ba357c390772d4c2c5643c50c5a5
-EBUILD c-ares-1.17.2.ebuild 1646 BLAKE2B 4b256e6fd8642b2e08ea5eea9d386aa48adef0d972124cee10c2a631d1aabb96eb83705dbd0b76072eac147fcba2257be7116dafd0afb0b30d488b9a5d425028 SHA512 7691c1b7e12c2b1695cb17f14804720445f95b61653880927274ece48edaefb2208678c88abacb6d3bf88c2cb4ddd3a3e393fc1c7439efed08f9ca8a5383b52c
-EBUILD c-ares-1.18.1.ebuild 1654 BLAKE2B 64b56aacfd7f07bd50fd47a79451b88c3dc278f021e63b92bc00a24207ecddb0230a6b38b63310836c1eb724e9321959c1a65e57be20deb502fab74bc52f4190 SHA512 6850dcf7123fd26e1971bbd76c1fba2381bd0cf5fd747ce3bf23b5a87b7c72ff0b1422ac3ebecd10c52701a125263d02b99122bc4f0abc8fa6cae5045cc42381
+EBUILD c-ares-1.17.2.ebuild 1636 BLAKE2B 957cfedf11d1622afaa924dd10610aa2dc3c59f654a19da07fa98d31213f074ab97936543980bd6c3dd2f72b5145c79fe85e08ec1b77eda4c7324dcdfd840365 SHA512 f87322f2a0291633b3d4b7aa99f9d0b66ada23033a5bfe955b34438693c5408dcfb25722c6cfde0657aeff4080c4e8ff0a76e9db9a0423d8206a38d36ece1782
+EBUILD c-ares-1.18.1.ebuild 1644 BLAKE2B 413930a00c2c7ce9d80db3477572a2dc0d7bbfba31cfc42ef49fb027c7a5d135aef152a318593fb14154fce76820a961fbbddbf913b8d608d401f865f92a88d4 SHA512 97af9246f9a499ddecbeafed86c23c3b0abff06390bf28d92577cc296d755cad9b9ea47cdafb2f4df0034798023ac3302747ce0fe93b658d0e791e7a642301bf
 MISC metadata.xml 340 BLAKE2B 9193fb644d2dc9bd9e81cdbbc9f8f7617a99a2c6bfcbd4f61a08b2ecec349f9cdd572a5fe55e1704744e4b17a2e81cd49ee46838cef22856f25012b35714ffb6 SHA512 1d6b287e44ac9e60db23b074af2f8cf7894133138e28c15ae300b37f0ceedf4d57b604a1d05f711f46d9db7b6519a597a00b725f8bf151d386bf5670b42bbf4e
diff --git a/net-dns/c-ares/c-ares-1.17.2.ebuild b/net-dns/c-ares/c-ares-1.17.2.ebuild
index b9c32e39b2f5..631a0a16598d 100644
--- a/net-dns/c-ares/c-ares-1.17.2.ebuild
+++ b/net-dns/c-ares/c-ares-1.17.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="C library that resolves names asynchronously"
 HOMEPAGE="https://c-ares.haxx.se/"
diff --git a/net-dns/c-ares/c-ares-1.18.1.ebuild b/net-dns/c-ares/c-ares-1.18.1.ebuild
index 25030c0afdae..ba4436c724a9 100644
--- a/net-dns/c-ares/c-ares-1.18.1.ebuild
+++ b/net-dns/c-ares/c-ares-1.18.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="C library that resolves names asynchronously"
 HOMEPAGE="https://c-ares.haxx.se/"
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index c53ac496b305..bd25280a01db 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-r1.ebuild 1618 BLAKE2B 054cb6f60baddf6101d8b32c2b62d9ed62e81c7663e3a4638fbec148d7d87f8a3c262b7f16c1e386677426002d2db94e792ae9706150325b4b9abd9249b137fd SHA512 82a38117eab432b37c601ff0cced35df412d00e7efc05553a5faa622a576a0a972857a62e71d37b8bb1b18a3dc8aac54fc29aa3a5d00a2155bcba8a140ea65ef
+EBUILD ddclient-3.9.1-r2.ebuild 1618 BLAKE2B df9c01a08d4304721d2871fa4954168df0f1aa164ea3f2d12709f794110724209d4eae2de861381dafe86282178f15024e363bf87989f88bdaf4ada3cc9d2f78 SHA512 8aa21cb06d101dd366ae5896b2a90b4e6114e18c20d70e8eb7e7ead9f9783085be4c1b2a42f013e18d6084186c9540270008e5aa68ea328d1a4b80dbaeabf122
 MISC metadata.xml 1000 BLAKE2B 28df95575f44a75929dfc2de78e536063ce69f0f4f07969806f480bd0ea2265161bbbe8a24e7184ab52ebaa0844669add27ebbb7fe328f260c8308d0f86eec09 SHA512 dc10cbf83b521998cf70bed8d8ee90294c00506a846931a0bb3ab080bdbf64237c3b0a0df5d41f1e33e43c8e148dabaead4ddfd820d68a79217e1157a7b2a0fb
diff --git a/net-dns/ddclient/ddclient-3.9.1-r1.ebuild b/net-dns/ddclient/ddclient-3.9.1-r2.ebuild
index c22af983db9b..b7461a66f5c5 100644
--- a/net-dns/ddclient/ddclient-3.9.1-r1.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd tmpfiles
 
diff --git a/net-dns/dnssec-validator/Manifest b/net-dns/dnssec-validator/Manifest
index 461378a00e3b..439247a7da9e 100644
--- a/net-dns/dnssec-validator/Manifest
+++ b/net-dns/dnssec-validator/Manifest
@@ -1,4 +1,4 @@
 AUX dnssec-validator-2.2.3-ldflags.patch 955 BLAKE2B b6cf8f7e812d4ed14dfafde00afabdd30f2fb54ae604613d0f43520eb683e5f19113477421d9aba86ecc7f89a2706f12c713c19a3690bd93bb7c284123b08a71 SHA512 dfa88f661318b0f3406ce984455b3890ddc891ec2e4ac20ce5eb46d47b22014b001f447fbf69ac1a5d2a3239dfe4d6a330040d768ef4b1ad3ee4923ca06f95d0
 DIST dnssec-tools-2.2.3.tar.gz 42941393 BLAKE2B b7b6a54113fb5cf030bd60e18f5446b02d1ceba3564ac854b0305225672545e802fecfa1169dc81e68ffe195533e06082dc22500a51b48965aa9c0fc32c915ed SHA512 fd2467f116f77089bddf9311706f356957f4ae735d827d393534e4001b621c9dfc904ff3d4da698d37e8e97b1be9448ab2fd5455c124656399aac30f1f642baf
-EBUILD dnssec-validator-2.2.3-r1.ebuild 1431 BLAKE2B ea44c6355acdf9bb92c8cc71b053f4df5e88ed8089c0e4e2055b32266bf518a3fc4debc5e570bc2feef39cf5263e9635b6928d14bd0bb683617c018fcc4c16b2 SHA512 f4f4d65849cc6df55f99a658b7dd41d3eaf07e9056f12d902ff82224c13b41d4d051db30ade68dbd08773d722f3f367f9b31af84f344bf0c5f38c15f1f765ae0
+EBUILD dnssec-validator-2.2.3-r2.ebuild 1430 BLAKE2B 778d9c5a4a38863218c7e23e16bf278a212c25cbec5a46c434c09098ed71acb7fb400eaf9819edf0b12a6513aee10c4b716b29fd14008b4416f1c54f24c2449b SHA512 d3134d58e78abb31548466ce7d416bf7bb73a135ea4008fcb47c7d8d26e7dafdead6f66f09513b72cce83b3d288a6ae0d513590d5bb1d727f3d98e634ce0e590
 MISC metadata.xml 799 BLAKE2B 4ac1f462a58554bda552b98f466924efa9048e04c2468444e05b2b12d9b601731d393f74cc978477a9ee22e8b4961cbea8fd2127dcc492bfdba81491816b00a6 SHA512 121bd337d9b878f8eab84329ddee6b5d63362a58782c89972d73adf5cd0e0477f515c6abb4e5727b58fb30481ba1876eb1fe685c1313aed6ac5d6c7c6868b809
diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2.3-r1.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.2.3-r2.ebuild
index 0b7c043c0726..ca5e3e389089 100644
--- a/net-dns/dnssec-validator/dnssec-validator-2.2.3-r1.ebuild
+++ b/net-dns/dnssec-validator/dnssec-validator-2.2.3-r2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Tools to ease the validation of DNSSEC related technologies"
 HOMEPAGE="https://www.dnssec-tools.org/"
 SRC_URI="https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/dnssec-tools-${PV}.tar.gz"
+S="${WORKDIR}/DNSSEC-Tools-dnssec-tools-${PV}/dnssec-tools/validator"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,8 +21,6 @@ DEPEND="${RDEPEND}"
 # Tests fail due "Cannot create context: -7"
 RESTRICT="test"
 
-S="${WORKDIR}/DNSSEC-Tools-dnssec-tools-${PV}/dnssec-tools/validator"
-
 PATCHES=(
 	# Users LDFLAGS are not respected
 	# See https://github.com/DNSSEC-Tools/DNSSEC-Tools/pull/9
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 774af74442cd..97ab1d7168aa 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -5,7 +5,9 @@ AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae6
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
 DIST nsd-4.3.8.tar.gz 1225840 BLAKE2B 19d014f130844aab5b7c6224658c6e5a4a7d8d337ceb11e1641bceb367fe76b46be146c703296a12cec834020992eabec0e1ee8f3cb6211333ac8c4c7029fef5 SHA512 aec892f85a6757bfdf537c6f0b4bc3d60c564b3062b582af14df800b24261edc96bedcd0b6649444a46b198b9018397e356b919a871364032c8a2db6256b9268
 DIST nsd-4.3.9.tar.gz 1222919 BLAKE2B 0b317c246f66476e95727d763bf7444cde14936c8a87036843458b89f8c79790130995db3f0f9ff33d8bfda756cf3ae4724b07f97ee2996f05a2dcd1c14bc0e5 SHA512 de170cbaf6e0be0a20941d9d6b2102a7dddb59a320c30566238447d5740e4497f751f54488f36c2b89f2c3cff6e3101df31a36d0d2d66db8d77cfb6e86124f32
+DIST nsd-4.4.0.tar.gz 1226433 BLAKE2B 8ead662c2ad87e9cfd9424898758cb7a7e6adc3c419583e0a4c3ced4d6bb8ae5005266af621ee4c138a06215652b60b65f075a875b6473dc92d1bef414901be1 SHA512 0fa32337246ccdaf9d6fe4257792cef8b6ce6de086fdee1024983da7b90a77b9039061cee87a2e0ad7eddf195411c57f4777469d973f2bdc10d3a51ee96d90bc
 EBUILD nsd-4.3.8.ebuild 3049 BLAKE2B 3499602d7adbc789ceab25cf46d5006c3744589872774fb9a019d9353a457e221ba11e2c05e74c737f214b08f38abe2a85fcf3e4247896aea5ebc4d296f81f8f SHA512 d1be9bac66251d7f1a37b0ed62d162cbce93a5b483ebff88de50c3f1c87b6f20235874303a18ab26ae731a235fe7f4fb245e09f07272bdd3a0a8704c5c8e8796
 EBUILD nsd-4.3.9.ebuild 3093 BLAKE2B 443b5593181d0a5586c715b8c78887f5ffb0fb9e9b525f8af0d2786bb4912562fce74d258a71df34342c0692cd98be1ee3e2ebd11e11f1feb2c37709dd94fce4 SHA512 ff61b9bc7e9f9cfd24de1f4a9abb8dd810937bd7cba48f185f1f50160624ad9ba2e906dd8bd90d91e9a81d70bb8616e1de803c7ab743f3886fa8765c740d580a
+EBUILD nsd-4.4.0.ebuild 3166 BLAKE2B e7d9f5a1208e13456c0a29095e4e2e1132c5d03b2bd3d498079313e8ece39b77f69a65917d9117a811d79f2578debf3c1d5fb6fbfe6b607f2eea062518860109 SHA512 fe6e353bd410ed2f00eca4581ec0c23c1a9b033f6bd01fe03b177c93d5e441d329e3e15a8c566fba184a6d10f6433049373729a1101d137745784720747b83b5
 EBUILD nsd-9999.ebuild 3166 BLAKE2B e7d9f5a1208e13456c0a29095e4e2e1132c5d03b2bd3d498079313e8ece39b77f69a65917d9117a811d79f2578debf3c1d5fb6fbfe6b607f2eea062518860109 SHA512 fe6e353bd410ed2f00eca4581ec0c23c1a9b033f6bd01fe03b177c93d5e441d329e3e15a8c566fba184a6d10f6433049373729a1101d137745784720747b83b5
 MISC metadata.xml 1161 BLAKE2B 6037692448c406d47a6e38ad0bf7be0c9b308c27815739efdaf71895e4c7de7f17c6d3eeb81270a5cde6435523db2bdca13c6ee48d7e912222cca0c15f6fc879 SHA512 001d819aee1e6bcccf443a957597bcc28754060d5cf682d5d4ccdc5e2962b654d831671b4866659ec47345f789d0b443e1e54bdea9a4e1905a5fdb7fb87efffb
diff --git a/net-dns/nsd/nsd-4.4.0.ebuild b/net-dns/nsd/nsd-4.4.0.ebuild
new file mode 100644
index 000000000000..a41057e6300d
--- /dev/null
+++ b/net-dns/nsd/nsd-4.4.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="An authoritative only, high performance, open source name server"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
+LICENSE="BSD"
+SLOT="0"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git"
+else
+	# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
+	MY_PV="${PV/_beta/b}"
+	MY_PV="${MY_PV/_rc/rc}"
+	MY_P="${PN}-${MY_PV}"
+
+	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+fi
+IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
+
+RDEPEND="
+	acct-group/nsd
+	acct-user/nsd
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
+	libevent? ( dev-libs/libevent )
+	munin? ( net-analyzer/munin )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	systemd? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+	# Fix the paths in the munin plugin to match our install
+	"${FILESDIR}"/nsd_munin_.patch
+)
+
+src_prepare() {
+	default
+	# Required to get correct pkg-config macros with USE="systemd"
+	# see bugs #663618 and #758050
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-largefile
+		--enable-pie
+		--enable-relro-now
+		--enable-tcp-fastopen
+		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
+		--with-logfile="${EPREFIX}"/var/log/nsd.log
+		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
+		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
+		--with-xfrdir="${EPREFIX}"/var/db/nsd
+		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
+		--with-zonesdir="${EPREFIX}"/var/lib/nsd
+		$(use_enable bind8-stats)
+		$(use_enable bind8-stats zone-stats)
+		$(use_enable dnstap)
+		$(use_enable ipv6)
+		$(use_enable minimal-responses)
+		$(use_enable mmap)
+		$(use_enable nsec3)
+		$(use_enable ratelimit)
+		$(use_enable root-server)
+		$(use_enable runtime-checks checking)
+		$(use_enable systemd)
+		$(use_with libevent)
+		$(use_with ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
+
+	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
+
+	# install munin plugin and config
+	if use munin ; then
+		exeinto /usr/libexec/munin/plugins
+		doexe contrib/nsd_munin_
+		insinto /etc/munin/plugin-conf.d
+		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
+	fi
+
+	systemd_dounit "${FILESDIR}"/nsd.service
+
+	# remove the /run directory that usually resides on tmpfs and is
+	# being taken care of by the nsd init script anyway (checkpath)
+	rm -r "${ED}"/run || die "Failed to remove /run"
+
+	keepdir /var/db/${PN}
+}
+
+pkg_postinst() {
+	# database directory, writable by nsd for database updates and zone transfers
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
+
+	# zones directory, writable by nsd for zone file updates (nsd-control write)
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
+}
diff --git a/net-dns/resolvconf-symlink/Manifest b/net-dns/resolvconf-symlink/Manifest
index af0018e77f61..eb55a0ff5c2d 100644
--- a/net-dns/resolvconf-symlink/Manifest
+++ b/net-dns/resolvconf-symlink/Manifest
@@ -1,2 +1,2 @@
-EBUILD resolvconf-symlink-0.ebuild 1566 BLAKE2B 15ab6f926250d2e4f626d7905549e38ff03e0e3fe158a675619f91a0499a035893b64bfdaf1b8efcd9e4c04545bc636f545436b0f8ded08eca1b9193baf8a5db SHA512 d83b94fbb432ffe004a01ce6ee6f62f62fa5af58e00aed217f365621c932da85bc0ceaa6faaddac7d828a22d134401f1ccc946bc7f7206bd74ce8704b4350cb0
-MISC metadata.xml 388 BLAKE2B 9e0adc96c9476da28eab0bf5d72dfd014b8c274c0e407efe083ed3a623e615de8afc00c3e052c6ec3bc759fe2f871afe4d51ffbb02aa28d19ab5b8d82a822657 SHA512 1a0f814059334cee1fc05baf3320c66c6730f4d53ec889545084a05cfa799494c54b9e1e047476f9a2dfd2cc25186bd2b1f7f5731fc3c7cb9011bf9f204feff6
+EBUILD resolvconf-symlink-0.ebuild 1609 BLAKE2B eb65aee36d912cc5c22ce48be7c5691a68fab3f16134c10416bed2ee1a54439f21abe64ddb4515c1bf0ef4706011ba186bee364ac0018f6f2fe9ad8bbc12a663 SHA512 28f2e715d801488ee5ad34e9f6e63750ab546fbfdb46278dc8c6b1a0e8c9f2ceb5e68d28c018affa56f3df2f583a5f1671a6740dcb03d67efbbd122bf48de1f2
+MISC metadata.xml 412 BLAKE2B 573ec609cd5c55d76ecf18837090d70cdc679eb9e781bff7b812f4138af84b353004842d50571183fa99dd1e7e287dbbb2d409769d3642fa4d90d744583f46cc SHA512 2a738a8cbaabfbdd17168f71c8be20aa9bd2240db340ededf46ed4ac9f295b3684a171e1696cd7bf59cb37b2843e93ea0f330243cbf134eb79cf5829236a40d7
diff --git a/net-dns/resolvconf-symlink/metadata.xml b/net-dns/resolvconf-symlink/metadata.xml
index 11cc45f2e4f5..2c89bdd7abe6 100644
--- a/net-dns/resolvconf-symlink/metadata.xml
+++ b/net-dns/resolvconf-symlink/metadata.xml
@@ -5,6 +5,7 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="symlink">Actually replace /etc/resolv.conf with a
 			symlink. Without this flag, the ebuild is a no-op.</flag>
diff --git a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
index d0c26696f14e..fae0e1958df1 100644
--- a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
+++ b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~m68k ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+symlink"
 
 pkg_preinst() {