gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /net-dns
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
57 files changed, 1510 insertions, 690 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index bb6aea80aadb..73e9f1f9c208 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 d9b732703d66..86e645ae71a3 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,3 +1,7 @@
 DIST bind-9.16.6.tar.xz 3228368 BLAKE2B 0c2265fe0e006679733a4f7610b0c33bb8e2bd32caf26dca8cfedbea0e08df9e7665cbbbf5321199bd2e30b97ad5b0146ae4e8a9a78abadbe6d067bbd1ad8a3a SHA512 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0
+DIST bind-9.16.7.tar.xz 3241476 BLAKE2B ed11be4cb11cf0b77dfefd4284bdbe2d0e8dfd4c8b46e2966f3f0afc60a5df2ff3545a10209ede65f55f7d5dab3ed10945b98908c1b6bf35723c89c6d940a001 SHA512 176c84657e8a7b10a7ca93c939ca6a7fcdefb22f9200c3f01be59bcd8990dee27b8dc0970299225bcbe0f1aa8f49a67c80c4a9853895ffbcd685adb9674e7768
+DIST bind-9.16.8.tar.xz 3253744 BLAKE2B 013c61d7298f334aae0165fa0ddaf4eb8fc22021b161f3a53843b4860456c133f1f33316387fcf2d7267a992844de44467eaec70c8064c77f9baef00f37fb98f SHA512 803af842b4f83c16556036f3a2a52b4aeab4781bafb35385b786a3331cf17ef6148c23928f6903fd371337ba92870d7a8548f5d178b805d160d0af34af45fee7
 EBUILD bind-tools-9.16.6.ebuild 3466 BLAKE2B 1786c2879f7b615bc778f9568cb6ce7811795df506b4b8a82cb0cb3075b001b2f9be7777a402f189b5f6f4654a82545be0c962d9217d146406e60e6f93c4f49b SHA512 252aee7f5cd2613b56db26d20c99dbcef7d2d3d370572ba057fb1e6161b1fa94de6877c1b7d70c306e523afeffef0d7fd5910f9bcb580266bef8fd5df6642d3e
+EBUILD bind-tools-9.16.7.ebuild 3474 BLAKE2B 2739fbec818922cc5e15e0bc10b9b08625814eb67083f9d07b0c967f69dc28d0fee4f84ea0352a10471bfecf5bf0070648cc4deea6c1219675feb12cde7b13b9 SHA512 050cc5eeffb6dd5ee81f1007a99e88fc457f833f648b743a568c4ae77d0d98a08d58e5a5b8362f7fc858fc92d41f7a822854997e53229226a28a30d0346311f5
+EBUILD bind-tools-9.16.8.ebuild 3474 BLAKE2B 2739fbec818922cc5e15e0bc10b9b08625814eb67083f9d07b0c967f69dc28d0fee4f84ea0352a10471bfecf5bf0070648cc4deea6c1219675feb12cde7b13b9 SHA512 050cc5eeffb6dd5ee81f1007a99e88fc457f833f648b743a568c4ae77d0d98a08d58e5a5b8362f7fc858fc92d41f7a822854997e53229226a28a30d0346311f5
 MISC metadata.xml 533 BLAKE2B d04998d5522ccca610384cf5d46f955831d4fdd9da02266680aed6ed680bdd1bd92262fb0c31f6b0c27b15f1b987058c13260d43bb4313b23e5bd288e5f812e9 SHA512 ba16d092633db22a6f419ef4dfdacf3a1c3037dcbe764bbf525f5708f74a1d6857de5cb8fd740dc7309f085360dc3222f949476fd3e2ebb6a8dbce4fb6c08ab4
diff --git a/net-dns/bind-tools/bind-tools-9.16.7.ebuild b/net-dns/bind-tools/bind-tools-9.16.7.ebuild
new file mode 100644
index 000000000000..f365183f1078
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.16.7.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps doc gssapi idn ipv6 libedit libressl 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 )
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	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="${EPREFIX}"/usr
+		$(use_with idn libidn2)
+		$(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-tools/bind-tools-9.16.8.ebuild b/net-dns/bind-tools/bind-tools-9.16.8.ebuild
new file mode 100644
index 000000000000..f365183f1078
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.16.8.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps doc gssapi idn ipv6 libedit libressl 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 )
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	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="${EPREFIX}"/usr
+		$(use_with idn libidn2)
+		$(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 cc7652f2c58f..c266a3981d40 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -10,8 +10,11 @@ AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f
 AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.16.6.tar.xz 3228368 BLAKE2B 0c2265fe0e006679733a4f7610b0c33bb8e2bd32caf26dca8cfedbea0e08df9e7665cbbbf5321199bd2e30b97ad5b0146ae4e8a9a78abadbe6d067bbd1ad8a3a SHA512 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0
+DIST bind-9.16.7.tar.xz 3241476 BLAKE2B ed11be4cb11cf0b77dfefd4284bdbe2d0e8dfd4c8b46e2966f3f0afc60a5df2ff3545a10209ede65f55f7d5dab3ed10945b98908c1b6bf35723c89c6d940a001 SHA512 176c84657e8a7b10a7ca93c939ca6a7fcdefb22f9200c3f01be59bcd8990dee27b8dc0970299225bcbe0f1aa8f49a67c80c4a9853895ffbcd685adb9674e7768
+DIST bind-9.16.8.tar.xz 3253744 BLAKE2B 013c61d7298f334aae0165fa0ddaf4eb8fc22021b161f3a53843b4860456c133f1f33316387fcf2d7267a992844de44467eaec70c8064c77f9baef00f37fb98f SHA512 803af842b4f83c16556036f3a2a52b4aeab4781bafb35385b786a3331cf17ef6148c23928f6903fd371337ba92870d7a8548f5d178b805d160d0af34af45fee7
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.16.6-r2.ebuild 11015 BLAKE2B f33043400501d72dc1f85cdf5c45c9a5b27851d112f21e99c2cc59e31b7b699099c82e13ae08d9331c4f6ac9cfc0d599d42f0162df7bfdd580c525b58c49b53c SHA512 d4454404172a98224d2323dc46e590b61f792b9c6341037d5d3ac03731baba6f8d011c2c2e2c66428734ae836285e076b49531fa7d6d32cb92d0321948cad962
+EBUILD bind-9.16.6-r2.ebuild 11008 BLAKE2B ea5db5f1b88dd84aa95715da3ec5ba7e99b87297de0c4258c9fc779bd00a27ab62e7e05cb63580b47acd5712e9829de40c880691b8b0fd10ecd0ade35be31686 SHA512 2f0650a78c15b897fc49311c1be8414301ff4c201d4ae915fdc30ddf8ad9eb689ef686c0776082565c6dded39f4d1d745664371439d1157a588a1f14c562e5e2
 EBUILD bind-9.16.6-r3.ebuild 11451 BLAKE2B 52b77e388192b61161aadd29a4ff13017d306fc8294ef384d3c363d5fbacce92f0e16c58f86da1b62019bdb35e6095fa5c220483929f472fb360525e89d12a37 SHA512 588292ba1e449d51921df439b03247706a0219a5937d4e5595c4ab97262fbab2b53f10f6ced5beb9cf5a92150847b28a355c7fd74d6d921358832e517d1cdeb1
-EBUILD bind-9.16.6.ebuild 10766 BLAKE2B 83963e592f2ab27789a0f4642ba5dd9d2cd6dab28e444b502962d140694293c4ef7d7bf60c68e709093fd2e9cf34af3f28b3768683e2bde20aaf208abbedefa2 SHA512 5de5ce0d73fba42a52c9e516682f50878033e4a9cdc6866f9b7d159efb640feb29b2643b43bc4542a5e2b46349ba2e11593dac9d767eb37d4ad5dd9e45ba5f2d
+EBUILD bind-9.16.7.ebuild 11282 BLAKE2B ffd8df0249b8968906ba16975e6b70319bb057349fc461b7243793732d58cfeba08a5bda6d85c20bc52ed88b8f4f795f25c176ff48d12b67baae4b4bce87c326 SHA512 7d03e3579c0c35e8707f4741d709e193f500cea89fdaf8bfc444af8403045c92492b8da5cb4903516e0c8ed556db0fc4253d10b8e8503c74bc0c5e86f7b599af
+EBUILD bind-9.16.8.ebuild 11311 BLAKE2B 7dfde032c57478972f648032942bde4892e4d4380700d262db66f3c7b87d4d255cd349e43a9f4c76341443dafe4460811ff48d5741c2e7ab12381907e882adf0 SHA512 fad96b05379e320fd94c722c81cdec6a5771f4abadcf4cb29e962a209dbb54fe9dbac19df2305a5ba408bca187d1c470aa1ad8f43f9c70518b36a103e5100817
 MISC metadata.xml 1043 BLAKE2B 3bf699db16f6883700e32e5f0debc534fa2d763aca0cf8fe3878dedcbb110410d88c2dbb69b4d4df09df62943416de3aaed7d53a2371d004b8c19a2a5a609bc1 SHA512 137093eabcbda1feb7cdac0cb0b2eeb808a47062b4e8d114874ee4019847ecbf5996c7b19055981a5ebffd099b5a96ce6ada919719017d83f93bc679334845b9
diff --git a/net-dns/bind/bind-9.16.6-r2.ebuild b/net-dns/bind/bind-9.16.6-r2.ebuild
index 4f12a967f86b..8cd0020481e1 100644
--- a/net-dns/bind/bind-9.16.6-r2.ebuild
+++ b/net-dns/bind/bind-9.16.6-r2.ebuild
@@ -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 libressl lmdb mysql odbc postgres python selinux static-libs
diff --git a/net-dns/bind/bind-9.16.6.ebuild b/net-dns/bind/bind-9.16.7.ebuild
index 2e010f7f8f29..ec4ec4afa718 100644
--- a/net-dns/bind/bind-9.16.6.ebuild
+++ b/net-dns/bind/bind-9.16.7.ebuild
@@ -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 libressl lmdb mysql odbc postgres python selinux static-libs
@@ -41,8 +41,9 @@ urandom 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="
-	?? ( geoip geoip2 )
 	postgres? ( dlz )
 	berkdb? ( dlz )
 	mysql? ( dlz )
@@ -63,7 +64,7 @@ DEPEND="
 	postgres? ( dev-db/postgresql:= )
 	caps? ( >=sys-libs/libcap-2.1.0 )
 	xml? ( dev-libs/libxml2 )
-	geoip? ( >=dev-libs/geoip-1.4.6 )
+	geoip? ( dev-libs/libmaxminddb )
 	geoip2? ( dev-libs/libmaxminddb )
 	gssapi? ( virtual/krb5 )
 	json? ( dev-libs/json-c:= )
@@ -83,6 +84,10 @@ RDEPEND="${DEPEND}
 
 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"
@@ -140,9 +145,18 @@ bind_configure() {
 		$(use_with zlib)
 		"${@}"
 	)
-
-	use geoip && myeconfargs+=( --enable-geoip )
-	use geoip2 && myeconfargs+=( --with-maxminddb )
+	# 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
diff --git a/net-dns/bind/bind-9.16.8.ebuild b/net-dns/bind/bind-9.16.8.ebuild
new file mode 100644
index 000000000000..2c16964d6892
--- /dev/null
+++ b/net-dns/bind/bind-9.16.8.ebuild
@@ -0,0 +1,389 @@
+# Copyright 1999-2020 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_{6..9} )
+
+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 ~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 libressl lmdb mysql odbc postgres python selinux static-libs
+urandom 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
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+	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="${EPREFIX}"/usr
+		--without-cmocka
+		$(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)
+		$(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
+
+	# don't create /var/run
+	rmdir "${ED}"/var/run || die
+
+	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-r13 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 "${FILESDIR}"/named.conf
+
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if use urandom; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a
+			echo
+		fi
+		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
+
+	if use urandom; then
+		mknod ${CHROOT}/dev/urandom c 1 9 || die
+		chmod 0666 ${CHROOT}/dev/urandom || die
+	else
+		mknod ${CHROOT}/dev/random c 1 8 || die
+		chmod 0666 ${CHROOT}/dev/random || die
+	fi
+
+	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 a346b192e0dc..73059a618b72 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -1,4 +1,6 @@
 AUX c-ares-1.12.0-remove-tests.patch 422 BLAKE2B 37b7a7a85f053d6a2231b46ca244ffb449bb011fb3567bfdd601dd7e598e72bf70ffb209ddaf23cb3a2b06f2bc38ff34e1a6bec7cbfafd2d25516f1a24780ace SHA512 53a9c126183c811b1f68c12014e4123d250447925ded472ff1fb6b57d254730206becd4182692ad5958b14ba0b929a2713df6988c0306872b046aa49bd70e743
 DIST c-ares-1.16.1.tar.gz 1374637 BLAKE2B 0d87538f5d6cac5b6b9c92d6ba5525af0e580e6506bee9270318f0951aaccdc7e135b446381e8150241d367789ccf2f73dbb333d45de4dbb5a87af05483063a8 SHA512 4ac2a5d5c6da74eb1d6155c4eadc7127ab1b53a8d13caec41bd6172db5417a79f3ab022e77ba37d8b13da6893d7ced5fd8baf5cc3950a4154b4de8743ad31471
+DIST c-ares-1.17.1.tar.gz 1518701 BLAKE2B 31dac21ecae231e2a201dc1ba954c1a0663a06f93eb8e7e033ca3c6d385f53e07af0b04854739f1ee8a7f0693f67f620143e152ef092b49342c62279a0480905 SHA512 b11887bcc9274d368088e1a8b6aca62414f20675cf0bc58e948f54fa04c327c39dd23cefe7509eec6397db14b550a3f6b77f5c18b3d735b3eef48ce2da1dcd00
 EBUILD c-ares-1.16.1.ebuild 988 BLAKE2B 10888b2bef7f28d894619b3b1613f8e848fef68ce34e1c288ea3d375778e99531005d1b4cf9b24e9f7a64bfe94bea93cfed87dd6faf85d0e743af6d53a1bc54a SHA512 ead0865956916fa988e035a0bf552580df2bb76fffee7ec069835096173a551513858446aedf1511554ca7d0b3f58b570a7c640e1da05e4d3e043389e32ce359
+EBUILD c-ares-1.17.1.ebuild 910 BLAKE2B 9069f856c3a9c9f078b67833213bf1e6d513210f7e4293116ed5f769143b16916a368cafbc21bdaa71cbf58f42ca39becabefc062eff2e7a33b9179976560f46 SHA512 4031bd5ad88921d3da8a6d34cc9d51e4a374ee0c7102589d8035703388c24d64b4cb87535c12ba6b52a696a1e63a6b4e6744844d34bb969c35e299bb85826675
 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.17.1.ebuild b/net-dns/c-ares/c-ares-1.17.1.ebuild
new file mode 100644
index 000000000000..b631620709e2
--- /dev/null
+++ b/net-dns/c-ares/c-ares-1.17.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="C library that resolves names asynchronously"
+HOMEPAGE="https://c-ares.haxx.se/"
+SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+IUSE="static-libs"
+
+# Subslot = SONAME of libcares.so.2
+SLOT="0/2"
+
+DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ares_build.h
+)
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-nonblocking \
+		--enable-symbol-hiding \
+		--disable-tests \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index dc398466bfbb..9df110c5cd4c 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 1555 BLAKE2B 63f0c6b33b6ad1b8e98b0b9eace7f4a97791fbb59391e24d024914b62e8c9ea5a8b91d30f8af5764517b5c3a716b6cb6d597c05f0e288b3c1a9cb62c90975dff SHA512 fe06dbcab32adec9d4aac73a85f0ce123926cca165d07d300975722b5d66c07f46209bb94b0bb4640831ad3969fe284837540c7fd21a2672b7f9ffea83da5d2b
+EBUILD ddclient-3.9.1.ebuild 1562 BLAKE2B 794aee9b51e1380f0b6b8063e033a53803db76daad761cbde224e7955c6c9b94642c4c4aa1a2ac6313104d36c3e750105cd916741d599acc224d5c6502d570ae SHA512 d40f8c1a5172c24e9e0bab90f598715ef10368340d73dc78f920be4bb11c3bca43649a25b25aee4f5ccd6c017339313e262901107035ae7f73d7c96678ea8739
 MISC metadata.xml 999 BLAKE2B 03fc5ec95eaabd6a8c15006f04ffa5e1c9d809719629319a8f919237a1d7359d8ea82ffa29b2796099eafd7ee152e81b544971734f1d751bf8f61e2cb51c1f0c SHA512 f70662793b7eca94703847084e4c0882ab6a6ec891383bd012c03afbb26c7b252db5adfdfaa9937dce1988b1c88bcd91f1a7a3c318b1fe3a5a6479d74de4a6b0
diff --git a/net-dns/ddclient/ddclient-3.9.1.ebuild b/net-dns/ddclient/ddclient-3.9.1.ebuild
index 8cdf7b8d9a91..eb32b5024e2b 100644
--- a/net-dns/ddclient/ddclient-3.9.1.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.1.ebuild
@@ -9,7 +9,7 @@ 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 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="examples iproute2"
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index f73361c802c8..88ed59623006 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,10 +1,8 @@
 AUX dnsdist.conf.example 524 BLAKE2B e9d140129dfbd276d1fb927d73bee4e4c29920ae70d587765ea5d432f02694b1a8583340c2e14e191bbdf5ddd5b921274cb2336c3520839d7cfe6f399a4d6c26 SHA512 385bee5725d927feb50fc0f40cd48cd365a495e39c0d947aa53dc454d84b7fe3806cd1d206056c96d111e7251db2cda27570ff8154c70bed145d37bc7d1db01d
 AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e46744160298456c86a9d9bbf65d1a339c0c13db4c796efb7c3adba01110882542fe501c735c9dd190f92 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f
-AUX dnsdist.initd 1338 BLAKE2B 47ccfdabcff27bd58ef1afffd19cdbe72e88d5a597f7026188aef7f8183daedf84c3f774a98de40868558be16e974d3cd6761341f8da74f046c243a8fd827b34 SHA512 681dbd4366437878eaeea7c8003bf6aaf4b88d160c54e3f102b5a8e6f23f2e7d1f815ab25c75330a553aba159d83bca70d87b51a93ea5c4a84262519c589ea3d
-DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010 SHA512 c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad
-DIST dnsdist-1.4.0.tar.bz2 1044479 BLAKE2B 79aef57ed2b1036f222e8bcfdf615c3221c9dfdbc8fd3f80d778fb050f74bc200958b4d605dcadd5c23ac6c4b5b1a36048108cd85394920e99d6037177b81342 SHA512 c9450e97325d8ad8c8c3a395412c46ea8053cbe1ebe73329a1618212ba29bdf2f8da908ae2b90c314b5aab613387f42363e3a5322b1a36f60190fb48e1c425c5
+AUX dnsdist.initd 1337 BLAKE2B e2619182674439be6942a0a936208326c12cfc2839bba4fd6a2ca3653ac6083458ebf2b644d2db63c187ed33ba2bef3437680714bb76dfc7632e1b62149a6f6a SHA512 99e38a58c97dd206ea82ffc783102feaa28f74bec5e03c1790e2db0f428f8228eec43617b2c951f22320e10dbd42ddfbf40650fed28608428f9c48eec3640a8d
 DIST dnsdist-1.5.0.tar.bz2 1067645 BLAKE2B de07de8f862a633d8eb11ccf632e01c2ce779a35ef61ba2fcf932894d692f2f3edfd638ce77f178bbfbfc1115d8e76f5522e10061fcf61650170a5b59d5cc9ca SHA512 df6f8caae001f152f0d264176c570778842979484d16e4199afe0e2591006392444245dd8ce23287cdcf9613e2c40a9e3564f5236e5f5a6fd67b89d6ea0d9ed4
-EBUILD dnsdist-1.3.3-r1.ebuild 2646 BLAKE2B fdeae74f8a6f4aecd7fdd2ef0d25d2f1df238c98fe566f44455c7b951ca970d64cb3de43baa4dffa02e8c85db055916fe5c69bb5ee74bcffbfd6bb7d08a9465c SHA512 ba4a486dafd0cb5fc19a0263317646478d090ca4b872c75cc8bdc4ddca7da12956ed68cc8fc2c46d657785b00f1d85f885046781bc2f1621626540562d5a7ac6
-EBUILD dnsdist-1.4.0.ebuild 2373 BLAKE2B b61a275f984088a7ddd621c3441141af2cca5b0e640dbd0a8cd21d185b4e8be42dcfa8d777d4c34ace06cdf746778264cccb28e70434de214e0d5307ce0fbe6b SHA512 1baf3fba9a7f89c67f57d70199493d91d807669a07b323dd76481cd65eb42fb86c5224ca01e12d67e0ca528a41094702ff0f76933aa480158e8c98f7a2f22e75
+DIST dnsdist-1.5.1.tar.bz2 1068061 BLAKE2B 1c0fdd181b62b96fcd433581715cea9dc204fcdd2f65efd26a5293cc9c17d904e0937b51ba33d2dc01ecc8044f491ba2c6c8720c0816587fa5082da73108783e SHA512 68fe5f55fd081ed80a620933af9f8310be0e21c86ba449a9c557975b5c83f4b64e3002e6032dc002582d081e70e1ec2ff080c5d8389fd46a9896bdafd5a41f9f
 EBUILD dnsdist-1.5.0.ebuild 2332 BLAKE2B ba846827f5ef97652808b37c57c014a9a70c8acce6bbbf9609c4655b50d46b0535260bf3edd264b79f4876908833aa98083a02621d3427274c709b7ca20dd81d SHA512 68a5d7b6ab7d9a96fd973afe6346fd172d1f4794d747d040081e22468a3c40cee45d1837e68263aec3a4f46b7ef363c9ab71a048cc5e1acee8295f0900f2119c
-MISC metadata.xml 1213 BLAKE2B c4fe0c3ae740de6b996c8f54f48234a84a4f54cdef743a88fe9730c86ade3d7ccad0118ba0b8f17422fd57a91d2fa13999e7bcb855ffc70394ab3591e01f33d5 SHA512 eb88f1f798d82348e4f633382d3f422d4adf592dfdba878ccab9bdec9228805b5c41f9c5122904cd9d6374b5583a1de0ef3316585c88abada86c0ccb2fbb242a
+EBUILD dnsdist-1.5.1.ebuild 2332 BLAKE2B ba846827f5ef97652808b37c57c014a9a70c8acce6bbbf9609c4655b50d46b0535260bf3edd264b79f4876908833aa98083a02621d3427274c709b7ca20dd81d SHA512 68a5d7b6ab7d9a96fd973afe6346fd172d1f4794d747d040081e22468a3c40cee45d1837e68263aec3a4f46b7ef363c9ab71a048cc5e1acee8295f0900f2119c
+MISC metadata.xml 1130 BLAKE2B fead1e2f8167ad41c84c3b03ab49d1ebfed6725adf55e4db2b23d099b12e01023742e8fd6e60799946f5a3ba7fb97fe29106efd3eca7dafbb1405e6ff30b97c0 SHA512 b987d96fd24ed1092f1f419c35cedd53502b4013efbfb6bf729dc5c721b96de0b2a701435593d679d452ba390e9f8e136f8658d6758f2b92c3fd02dfd40ec056
diff --git a/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
deleted file mode 100644
index 493fd0f5e4c1..000000000000
--- a/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git"
-
-if [[ ${PV} = 9999 ]]; then
-	ADDITIONAL_ECLASSES="autotools git-r3"
-fi
-
-inherit eutils flag-o-matic user ${ADDITIONAL_ECLASSES}
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	S="${WORKDIR}/${P}/pdns/dnsdistdist"
-else
-	SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="dnscrypt? ( ssl )
-		gnutls? ( ssl )"
-
-RDEPEND="
-	>=dev-libs/boost-1.35:=
-	dev-libs/libedit:=
-	fstrm? ( dev-libs/fstrm:= )
-	luajit? ( dev-lang/luajit:= )
-	!luajit? ( >=dev-lang/lua-5.1:= )
-	remote-logging? ( >=dev-libs/protobuf-3:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		dev-libs/libsodium:=
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-[[ ${PV} == 9999 ]] && DEPEND+="
-	app-text/pandoc
-	dev-util/ragel
-	dev-python/virtualenv
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		$(use_enable dnscrypt) \
-		$(use_enable fstrm) \
-		$(use luajit && echo "--with-lua=luajit" || echo "--with-lua=lua" ) \
-		$(use_enable regex re2) \
-		$(use_with remote-logging protobuf) \
-		$(use_with snmp net-snmp) \
-		$(use_enable ssl libsodium) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_enable gnutls && use_enable !gnutls libssl;} || echo "--disable-gnutls --disable-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		if [ ${PV} == "1.3.3" ]; then
-			sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-		fi
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_preinst() {
-	enewgroup dnsdist
-	enewuser dnsdist -1 -1 -1 dnsdist
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}
diff --git a/net-dns/dnsdist/dnsdist-1.4.0.ebuild b/net-dns/dnsdist/dnsdist-1.5.1.ebuild
index dae9b523e363..b36be988dc3b 100644
--- a/net-dns/dnsdist/dnsdist-1.4.0.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic user
+inherit eutils flag-o-matic
 
 DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
 HOMEPAGE="https://dnsdist.org"
@@ -19,7 +19,8 @@ REQUIRED_USE="dnscrypt? ( ssl )
 		gnutls? ( ssl )
 		doh? ( ssl !gnutls )"
 
-RDEPEND="
+RDEPEND="acct-group/dnsdist
+	acct-user/dnsdist
 	>=dev-libs/boost-1.35:=
 	dev-libs/libedit:=
 	dnscrypt? ( dev-libs/libsodium:= )
@@ -74,11 +75,6 @@ src_install() {
 	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
 }
 
-pkg_preinst() {
-	enewgroup dnsdist
-	enewuser dnsdist -1 -1 -1 dnsdist
-}
-
 pkg_postinst() {
 	elog "dnsdist provides multiple instances support. You can create more instances"
 	elog "by symlinking the dnsdist init script to another name."
diff --git a/net-dns/dnsdist/files/dnsdist.initd b/net-dns/dnsdist/files/dnsdist.initd
index 554c43b0150a..f1670c613388 100644
--- a/net-dns/dnsdist/files/dnsdist.initd
+++ b/net-dns/dnsdist/files/dnsdist.initd
@@ -31,9 +31,8 @@ start() {
 
 	ebegin "Starting dnsdist (${DNSDIST_INSTANCE})"
 	start-stop-daemon --start --exec $DNSDIST --pidfile ${PIDFILE} \
-		-b -m -- --supervised -u ${DNSDIST_USER} -g 
-${DNSDIST_GROUP} \
-		-C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS}
+		-b -m -- --supervised -u ${DNSDIST_USER} \
+		-g ${DNSDIST_GROUP} -C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS}
 	eend $?
 }
 
diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml
index d42d77d511da..52ecd48eab08 100644
--- a/net-dns/dnsdist/metadata.xml
+++ b/net-dns/dnsdist/metadata.xml
@@ -10,7 +10,6 @@
 	</longdescription>
 	<use>
 		<flag name="dnscrypt">Enable the ability to act as a DNSCrypt server</flag>
-		<flag name="fstrm">Enable support for fstrm via <pkg>dev-libs/fstrm</pkg></flag>
 		<flag name="regex">Enable support for regular expression matching via <pkg>dev-libs/re2</pkg></flag>
 		<flag name="remote-logging">Enable support for remote logging via <pkg>dev-libs/protobuf</pkg></flag>
 		<flag name="ssl">Enable support for and encrypted client-server communication via <pkg>dev-libs/libsodium</pkg></flag>
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index e8a1ffd4df2e..ba0c64f67d5f 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -6,5 +6,5 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8
 DIST dnsmasq-2.81.tar.xz 510648 BLAKE2B 07861888df11f6e2e02d1b80f4e82a407b558ddb34e016f7bda5cb449ee870db000683264b2e36987ece16d50ab773f239bf12dd3468b9529ae4dccd77ecb8ee SHA512 85550c9782fef9b0710d0e233523ed1fe26e877a8bc53fcea3f7cf1fb17c3a79c46f284a99dab2bdaf6a107ea3f1a71cec476ab6d4e1b936da6591aaef42c88e
 DIST dnsmasq-2.82.tar.xz 509904 BLAKE2B 4df3778b2ec6775a6147f66d53b8dd7068d97872c6e5d3a16716faeb0ca489331560c77d6fa9cc913af0d7e0320a6ef463c690bb9e3fdbd8c266ed273e5a5403 SHA512 faf36efdaa3abe84994e46aea018b0a324218d42814baac056ca635f6d03f1301e7b4d958f92b272a8e3a7ac358f3a4e2606129a217587b471aedb3ce23e903b
 EBUILD dnsmasq-2.81.ebuild 4662 BLAKE2B 09eae0e81f63cfccdc78288c3816f1aa70441730c5bdb8318021bd729fe89f9dff0ba0e2a121bb08cba3be7db617bf575654cb17b9ed87e7f240747837ce63e3 SHA512 92407c5cc1f50619fdb7ab9b84ba502d3da21c7fc47c4b8b736e03c57fc681f75c0e3edac939c7ac772e92a9d39cd07a17e6487d532c81fca1c97b27d965ffc1
-EBUILD dnsmasq-2.82.ebuild 4482 BLAKE2B b60bdb75a2903a98b2c760e3cad7b8cf72c3b648790a55157fed29c35748604f2516a86a188cc3fd3431a8a5c68848c24fa78e8f64786ce9b28382dcf46b8186 SHA512 70902fbcde12372c91ada94d20185245244edbe8e3fe839b9601d98e7580b966e8f3f80afc0bca3ed95f76216d5332bd4c9c169df7a540f8c3ca31dc1b1e938a
+EBUILD dnsmasq-2.82.ebuild 4474 BLAKE2B 61fdf8e296ca108a53b27bbb6b29576714a39c986a4869f3c0b80d5da16f2397b68af6e1542f08c7246f4a43cba0e992fab2af8fe4d90b51a2cc3673de0e228b SHA512 f5d15e6ea01f60915fd0c403977232bfc2d104a435e2376710bf41845765d3e0cdffb0703e5ab859b2302d059d2d14236e46ad4ec310108a91ba16ba1762d657
 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.82.ebuild b/net-dns/dnsmasq/dnsmasq-2.82.ebuild
index 985a1eb48e05..338ba1de1149 100644
--- a/net-dns/dnsmasq/dnsmasq-2.82.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.82.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
 IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
diff --git a/net-dns/dnssec-validator/Manifest b/net-dns/dnssec-validator/Manifest
index d37e6515fed2..4f765101bfe8 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.ebuild 1423 BLAKE2B 0381189199d06e47a57509710fc116ebeff264d28fca09618930e02f397ee8b68a8d95a82944e731f52b500c87a85db2190f4e3b31f9d1d221f0709889aec7a2 SHA512 0ed2dacc6153088482dbaff631f93ca93d00cb584039fe7633d8ac9b03eaa2696759c927d06236757e579d4ddef2c3cd893b92b69254dbf1e73603f5ddf8cab3
+EBUILD dnssec-validator-2.2.3.ebuild 1430 BLAKE2B c84e68ed7736062742a54c5a5a943f04c2d6530ecb426786d726fd02656079c8c47e7b04caed410f50bca8f88cfb3dd998ff7ac1797126b9a563f3f365ee2d83 SHA512 b8b3e802abd035f6114a67346f346d791cee61ac3ee0b3a29be1f3c513fd8976152ad98c5ff6d7fc726635da763181862819fdf16ece210dc719176f2604fdff
 MISC metadata.xml 798 BLAKE2B 50d4cacfbbb5365e56e569dd0bad78b5c39c725f6dafd88567178aec43e6cbf1a0dfd303dc886551ce2c079730ca77bb0de1d4b01c0cf954afdd619d2b356d74 SHA512 d8b2d3c8fc121598f2a236159751b0666d8ab75d400fce99389299ad7ef9d6c95327047331f8414d133ae808d916e6b5fe93724fdb0b9d55c06073beffb61f74
diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild
index aa9cff550d40..42ab6d5081c3 100644
--- a/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild
+++ b/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/dnssec-tools-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="dlv +ipv6 +nsec3 static-libs +threads"
 
 RDEPEND=">=dev-libs/openssl-1.1.0:0"
diff --git a/net-dns/https_dns_proxy/Manifest b/net-dns/https_dns_proxy/Manifest
index 4352db24efd5..515cd6f8a254 100644
--- a/net-dns/https_dns_proxy/Manifest
+++ b/net-dns/https_dns_proxy/Manifest
@@ -1,2 +1,4 @@
-EBUILD https_dns_proxy-9999.ebuild 550 BLAKE2B 0dd31ab4f50f1b554ec77d13c7113a676c0af16eb3d42b63b3c742e290b306fb31c5da39084241ae00e23a0a33cd3ca661cc6fb216ffd8420d20a35dec09119d SHA512 393be334481c39e72b5ad2f14890433ec7e7c0bcb42ba47a0b0c2693c7aabc5432cc9acd068a9ac3bbfafd008f01d138e89f54890deb56f47d264dd598577669
-MISC metadata.xml 260 BLAKE2B 897c54de6400658926860fee21bb812ad0f6b0e262bc8c1244669d34aad0f6814edf8eba6662a506c84d9da089df24d0867688a1257aa014eae02a2ce191defa SHA512 aa56c6b36e38232389e84250b453d720facf94aaecc1894c665715d32ba42a75cbf3e0845d0eeca4dcdb05d0289b8f6f1b5c863bb6f99cfec17b4ec3f583b728
+DIST https_dns_proxy-0_pre20200925.tar.gz 16270 BLAKE2B 2677f63662d030fa1b6955f819eb6cbab6916356aa06ede13c4942824ea5c9c88f93d5c53fe725989ec668b3152c8242755279752abb1ed9941b57b83d137191 SHA512 8d0bc083447eaf5973a3ed3efbd7946c62fcabca7286266d2ac445aa522a11bff41201f54e1acb49483957a7f488578cfbb7053cd0cc83ca42c4146eab4e44ca
+EBUILD https_dns_proxy-0_pre20200925.ebuild 883 BLAKE2B 4e41bece350bb5a17cc83555eed6f80b2eef1ce76883174d64bddbb1fd71435b37fbfd4a6627e87d78fa7d4233303d02a0e1711ce461b43e22a4d1dcf46b78dd SHA512 8b342caa96a6d95f4189a2bf7deb6898d7909362c13ea8a34aa697e527b71801cf797879eb27121299f8e5af687d35b5da09fe05696b6dfd3f4b8e0f9d21d679
+EBUILD https_dns_proxy-9999.ebuild 883 BLAKE2B 4e41bece350bb5a17cc83555eed6f80b2eef1ce76883174d64bddbb1fd71435b37fbfd4a6627e87d78fa7d4233303d02a0e1711ce461b43e22a4d1dcf46b78dd SHA512 8b342caa96a6d95f4189a2bf7deb6898d7909362c13ea8a34aa697e527b71801cf797879eb27121299f8e5af687d35b5da09fe05696b6dfd3f4b8e0f9d21d679
+MISC metadata.xml 462 BLAKE2B 2efd0b2282163808360a0f12ba1cef797e4f3403ffa6a202d0b5c1cd10dab9b91b8bca44e1604d64aeeb4bd84f727f354a555f76c3e4853fd8ebfe42b77041cd SHA512 6b2a5c39baabc2c0f25f85a21882771f228ef37e857ec0d4138cb466a050791706a06569f64929272bf19607b4f44dc2ed8f40e49dc59f948ee239d0add11456
diff --git a/net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild b/net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild
new file mode 100644
index 000000000000..d2ca352cd24f
--- /dev/null
+++ b/net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/aarond10/https_dns_proxy.git"
+	inherit git-r3
+else
+	MY_COMMIT="2d9285e2b94bce21c588c8160f8fac660806987a"
+	SRC_URI="https://github.com/aarond10/https_dns_proxy/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_COMMIT}"
+fi
+
+DESCRIPTION="A lightweight DNS-over-HTTPS proxy"
+HOMEPAGE="https://github.com/aarond10/https_dns_proxy"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/libev
+	net-dns/c-ares
+	net-misc/curl[http2,ssl]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_GTest=ON
+		-DCLANG_TIDY_EXE=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dobin "${BUILD_DIR}"/https_dns_proxy
+}
diff --git a/net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild b/net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild
index 4952e64d90ee..d2ca352cd24f 100644
--- a/net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild
+++ b/net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild
@@ -1,27 +1,40 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit git-r3 cmake-utils
+EAPI=7
+inherit cmake
 
-DESCRIPTION="A lightweight DNS-over-HTTPS proxy."
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/aarond10/https_dns_proxy.git"
+	inherit git-r3
+else
+	MY_COMMIT="2d9285e2b94bce21c588c8160f8fac660806987a"
+	SRC_URI="https://github.com/aarond10/https_dns_proxy/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_COMMIT}"
+fi
+
+DESCRIPTION="A lightweight DNS-over-HTTPS proxy"
 HOMEPAGE="https://github.com/aarond10/https_dns_proxy"
-EGIT_REPO_URI="https://github.com/aarond10/${PN}.git"
-SRC_URI=""
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
-DEPEND="dev-libs/libev
+RDEPEND="
+	dev-libs/libev
 	net-dns/c-ares
-	>=net-misc/curl-7.53.0[http2,ssl]
-	"
-RDEPEND="${DEPEND}"
+	net-misc/curl[http2,ssl]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_GTest=ON
+		-DCLANG_TIDY_EXE=OFF
+	)
+	cmake_src_configure
+}
 
 src_install() {
-	cmake-utils_src_install
-	exeinto /usr/bin
-	doexe "${S}_build/https_dns_proxy"
+	cmake_src_install
+	dobin "${BUILD_DIR}"/https_dns_proxy
 }
diff --git a/net-dns/https_dns_proxy/metadata.xml b/net-dns/https_dns_proxy/metadata.xml
index 99a1bb6c7e38..b314b6132a18 100644
--- a/net-dns/https_dns_proxy/metadata.xml
+++ b/net-dns/https_dns_proxy/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">wrouesnel/dns-over-https-proxy</remote-id>
+		<remote-id type="github">aarond10/dns-over-https-proxy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index 68ec89fffb7b..797fb6819fd5 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -4,4 +4,4 @@ DIST idnkit-1.0-src.tar.gz 432823 BLAKE2B 4e96bed174ea704ec0eb5c6655cb65145ed808
 DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
 EBUILD idnkit-1.0-r2.ebuild 1035 BLAKE2B f1c1f0b78d45d8dd324e496211188a33be3f12e2293df7d835e5ad6ceb71b5c6393398ba046f9cce15af060ff5211658ad348e676bb8417ab3b2fb6df8115415 SHA512 183fd2b7f6330de7e79b073caf961c5388a7c46a91d9d516c8ef9c634a88089122c0c6541bc3ad64318e13eb7904cbaebc8fce58dd3a2c21276f48defc81c3a0
 EBUILD idnkit-2.3.ebuild 643 BLAKE2B ec94f1145235e470b19c76164ea36bb6a16afcda1d07e6185705a5c0f444fd2112ea50b941035f359aa1733be78bd5c61427d56c41174d4b3044af8f569025d3 SHA512 90a412e9f5f03bca123092352db5e321e8894bbb8787dace3ffd8110791f2317ab997209693e5626033bdb072f1b4c6904d8350d6265458708869ddf52a63f6f
-MISC metadata.xml 290 BLAKE2B 9b8f414f2eb140cd1c4c9b290bbd4f3d36e58649b68a9ed478ba55661df34bd1f8e1ea9c6d132e2edc4365bb8d4abd5f78d9b0f24e588d548354f63057da0b78 SHA512 5ae703d1a74d5fe45ac66f8f4922b754999932112931b8ba1f46d4a2e769a5d7130b4a418bf687d857a89f20e287d85e384236848c0e01747d0aa1c1ea350492
+MISC metadata.xml 246 BLAKE2B 053eb1eb0345156eb262d7eb10e70636fda57808641af19b715d4d323f19127491fe53e1dc7028454bc4af3f5ed282acd8d8632617b65c2003382193716510ca SHA512 02003cbc53a83f024e07311dc98a6255bcaa23c879f9b7da1263261e323c678bcb80fb0f9c3025076eafedaa0a85a52a98e963d37a692e8902bb9c6d68b54390
diff --git a/net-dns/idnkit/metadata.xml b/net-dns/idnkit/metadata.xml
index 568bd4ccbd6d..7fd8a766eda4 100644
--- a/net-dns/idnkit/metadata.xml
+++ b/net-dns/idnkit/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="liteonly">Compile and install lite library only</flag>
 </use>
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index d8af6f8b2ce6..29014fec5ea6 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,8 +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-2.8.5.tar.xz 1209076 BLAKE2B 7454499745caa04a9454f023bed0ce6d8ccc54fc2c264aada72a842c39b056a91caee908eb1b036fe77b97d8cea4f03b9afcd084a69846a2632e717f7c3591fd SHA512 f45e62816ddc1f534e724d2fa71831100efc01b415ec2ea8301d02cf44d8f104a248deccdb706ebad6853404aee2a209c2bf51b07076aa69340af6812e5a79de
-DIST knot-2.9.6.tar.xz 1188412 BLAKE2B 95b165bf37079fbda91cc8e81b8a4a5e662d53bf5efdf9a96cfd59646fe246f0c59e2438d42f9566dcf6dbe675400d450e131f66bfa88769b1c3fcf55b09d849 SHA512 95164a8ec913b3e3f01355d7f41f08caf6048c39317e63b2968e2bf8cf2ed08791ea0136b1e721add07f183b81a241ab2c2b8779c44368079d8eac082f49e368
-EBUILD knot-2.8.5.ebuild 1887 BLAKE2B 7eb58953ff6217a867692a88112fadfbccab09822786c9bcc5a3b049f9ad300d7406edca1122c326a2127811dc8af7c74de0625174ff1968645e91cf54c9ecc4 SHA512 c9e51d696c0e0d50b5b40ac76cd950eb7ca21a7a679f1655440d7a77af46aeec59697d12a84b8becf0f0de1a1a4e425bc4af4e51331a83e9fd724aab92b467bb
-EBUILD knot-2.9.6.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
+DIST knot-2.9.7.tar.xz 1188904 BLAKE2B f20355f211db316a1e39321a1200130e2af4e895eff92eca36c93d5b8f78fcd9dd8fa1ec25edf7a0fa9bae4aa2a92b2fca890be1da4134b894792235de0b546e SHA512 399b48491c000aa3f16b87b1e313f2ea5fe369d19da0c81222ed43ca155bf4d4d1a561ef84bc08844eaf24d3dd07ded9a6ec3d831dd5f6ffb174ae773ae12931
+DIST knot-3.0.2.tar.xz 1313864 BLAKE2B f2ff8c75a9b239b924af2eecc5e5afed27030fc9be6e112a4f61479f40247396c1d2905f58329fa84907c6ce796bc9a56d6f8e1cc83b737e15713844e0add32f SHA512 677de7a80688d4820d56c020af1bb1da97546f44a616e2d72d7e0301fca4a7ab682994cf66e8c37403e65ddb45ea3e0eb37b3304739c1239364115588c589699
+EBUILD knot-2.9.7.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
+EBUILD knot-3.0.2.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
 MISC metadata.xml 1677 BLAKE2B 89c3190781cf6b6d6217c84dd45f78ebd86695e9c224c7fa7f5112b246b95b982fb025c6c30b065d59b11f3acdcabda8e92b0da001cf1a7ad3e67ee9b2207d3c SHA512 d1e480d3e5d422b94a952a8fd0a679052d24724cccdda0bf13808f1a6b47b129a1db6ad17a0a42d9a6d315e9cbe64293a1a22077b7affc36862313ff8715d9e1
diff --git a/net-dns/knot/knot-2.9.6.ebuild b/net-dns/knot/knot-2.9.7.ebuild
index 2cc9e9753dfc..2cc9e9753dfc 100644
--- a/net-dns/knot/knot-2.9.6.ebuild
+++ b/net-dns/knot/knot-2.9.7.ebuild
diff --git a/net-dns/knot/knot-2.8.5.ebuild b/net-dns/knot/knot-3.0.2.ebuild
index d9559bbada82..2cc9e9753dfc 100644
--- a/net-dns/knot/knot-2.8.5.ebuild
+++ b/net-dns/knot/knot-3.0.2.ebuild
@@ -79,10 +79,7 @@ src_configure() {
 src_compile() {
 	default
 
-	if use doc; then
-		emake -C doc html
-		HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-	fi
+	use doc && emake -C doc html
 }
 
 src_test() {
@@ -90,6 +87,8 @@ src_test() {
 }
 
 src_install() {
+	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
+
 	default
 
 	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index b6d47c7a6207..822301913332 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,6 +1,4 @@
 AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d06251b07ee2fd3ecbac16347d633644f30dc7428e5bdf9747b0a4d51d7541601d3fbd4be6f9f746693f SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501
-DIST libidn-1.35.tar.gz 4169217 BLAKE2B 809f9e854a4f2fcd3b2d5f7cdb34e2c68a0f00f5fcffc9002ead2d2d3dcee38022b3288f29716437f65f09e259e35cc98679d9c9d943423190cebb76fcbc94fa SHA512 782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09
 DIST libidn-1.36.tar.gz 4557804 BLAKE2B 562ea97cba7970e3f3bd1557ba9e25e4180cca1b5cb8f66539f7830baf195cd36dc513c50e2475829af42d420e3d3b73a1c002acb06579c8b8b3879dcc8f95b2 SHA512 0d66e10bf7a8de4b27f692a427d2c8e901b8bed73b0a36268d8f939205df81f6a30f0634fd3b87370d4e81c1327c0b10391fa122a0a5459c32a3541b8a2149ad
-EBUILD libidn-1.35.ebuild 2629 BLAKE2B e3f8b2e80132c1590e222bee5b8d2ade62f7a6a8bf2c301ad9535394bbe1ffcaad7b8d713437a834ec049336ba7b44eba4412c2e4ae9f8b23af83b95b7083762 SHA512 7548a82b6e35b2f5bdc1653a637938eb95e75afd76832ae8f117325209c8159b858f158529860e12f9158a5df651b8dc676868982dcbd56bd9f092fa648861c7
-EBUILD libidn-1.36.ebuild 2650 BLAKE2B 8c8bd834548de8a6359ceec33753125e57c163199386d88f3d41cdeff7ad11b56ba3fc3d4a5b7c26996f0abc9333f4e16165943c1a04564196389ec9af3fa1f6 SHA512 37ae0f0a95dc4f5865f5ac6084af716c0d6246a2465fc37e6724b668a10bd2a8802aeaad8842ab71c5e9bf7c96f08735c0171c4875a91671af368ef54d2d8779
-MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
+EBUILD libidn-1.36.ebuild 2634 BLAKE2B 5f0b48cdbb94a75f991ff25b22572744434e95aba7288bc7f26cd040f2e4ed6c7971798a33eacae503f84c6535ffecece603f3ad87248533dff8bc9b3721f965 SHA512 790a94bfce214e29f975c391d1efddc1ad598970b9b0c1fcb7c522d7fb7ae97204df527e132feffaf0aaf808fbcf28799dbe40a0676fc0bced55e42c8e85821c
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/net-dns/libidn/libidn-1.35.ebuild b/net-dns/libidn/libidn-1.35.ebuild
deleted file mode 100644
index 448eff85d7ee..000000000000
--- a/net-dns/libidn/libidn-1.35.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal libtool ltprune
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation"
-HOMEPAGE="https://www.gnu.org/software/libidn/"
-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 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs java mono nls static-libs"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
-COMMON_DEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	mono? ( >=dev-lang/mono-0.95 )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? (
-		>=sys-devel/gettext-0.17
-	)
-	java? (
-		>=virtual/jdk-1.5
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	nls? (
-		>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
-	)
-	java? (
-		>=virtual/jre-1.5
-	)
-"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# bundled, with wrong bytecode
-	rm "${S}/java/${P}.jar" || die
-
-	elibtoolize  # for Solaris shared objects
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} GJDOC=javadoc \
-	econf \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_enable mono csharp mono) \
-		$(use_enable nls) \
-		$(use_enable static-libs 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"
-}
-
-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
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-dns/libidn/libidn-1.36.ebuild b/net-dns/libidn/libidn-1.36.ebuild
index b21166f2731e..8e8470641b95 100644
--- a/net-dns/libidn/libidn-1.36.ebuild
+++ b/net-dns/libidn/libidn-1.36.ebuild
@@ -10,8 +10,8 @@ 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs java mono nls static-libs"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs java mono nls"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
 COMMON_DEPEND="
@@ -44,17 +44,21 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} GJDOC=javadoc \
-	econf \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_enable mono csharp mono) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--disable-valgrind-tests \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-packager-bug-reports="https://bugs.gentoo.org" \
-		--with-packager-version="r${PR}" \
+	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() {
diff --git a/net-dns/libidn/metadata.xml b/net-dns/libidn/metadata.xml
index f8bd6f3f34f9..0319eec4c8be 100644
--- a/net-dns/libidn/metadata.xml
+++ b/net-dns/libidn/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index d27ed7d13e01..db33ffcd1978 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,5 +1,3 @@
 DIST libidn2-2.3.0.tar.gz 2164993 BLAKE2B 3c103831c39fa3fd0340c9c45f3f683483207ade9cadc8d85b046a698f75bbe5ce6829de69a5cb238404d243b7a39ef44d69ea4ea80c22b813eafbacae615a8b SHA512 a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187
-DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
 EBUILD libidn2-2.3.0.ebuild 1333 BLAKE2B fa4a5db80cc64bd152e02fdd09bb85fa9489db66da519eb589a505551221d64ebf3e7a4bd3f2c7b443579dde67a0ab884d17df550f47e4dcb3ad228e98ed81c1 SHA512 c5ab7b390c0bb222b5a60f9b3b5d37ec0aec815355d1d426a08d76842da30580dd908add70b57bb7ef748a474394cd0c35def8509a958f6550a10c6fa6449d87
-EBUILD libidn2-99999.ebuild 1442 BLAKE2B c1db5af134d7becaeae848a0fdb03034aeab024a336b90f312033efe336d80d1dee1a3b35f82863b149093944d94a02b0178eb6284468442a7535139649308c6 SHA512 f9ed63fe4a2a39d6bcdafa10da2c0f83bfcc9d190331c83997488d489e1866a9f23e3112d472b6077f13cbca1dbe4e54b3a7020877d6e335c4530568cd994c9a
-MISC metadata.xml 298 BLAKE2B 10b6250e87ec67fff437294893f9ac1a0c923b6c2bf69bc0462698632fbed280538f547a920cba9e8a1175534ad35a5a5d8d0d48f6824c378c46d34f91787712 SHA512 fb859efba7ea8f760f3d3f341496feeda5f8af633f40d4785ea738037017eae89060555447ae29abe69c0acc6f911a323aaa94dfc39f34e6aa9996af506372c0
+MISC metadata.xml 461 BLAKE2B 5529fce3c73a3d581d04cca1f25cbf1c552eadea79f068ceb8f379d4cf1e2adaaa827705193d894fa7c208902d8fcab66855222ce223734904a346395f72081a SHA512 ade0286770074952c4baac2c2b13bccc64918049e1c6283a12b0698164c539108e7e025c3cd82fd9b7d4c538db3a668363797fd46e92b86b2eb46c128dff7ba3
diff --git a/net-dns/libidn2/libidn2-99999.ebuild b/net-dns/libidn2/libidn2-99999.ebuild
deleted file mode 100644
index 8b64b763df11..000000000000
--- a/net-dns/libidn2/libidn2-99999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools git-r3 multilib-minimal toolchain-funcs
-
-DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
-EGIT_REPO_URI="https://gitlab.com/libidn/libidn2.git/"
-SRC_URI="mirror://gnu/libunistring/libunistring-0.9.10.tar.gz"
-
-LICENSE="GPL-2+ LGPL-3+"
-SLOT="0/2"
-KEYWORDS=""
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/libunistring[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-util/gengetopt
-	sys-apps/help2man
-"
-S=${WORKDIR}/${P/a/}
-
-src_unpack() {
-	git-r3_src_unpack
-	unpack ${A}
-}
-
-src_prepare() {
-	mv "${WORKDIR}"/libunistring-0.9.10 unistring || die
-
-	AUTORECONF=: sh bootstrap \
-		--gnulib-srcdir=gnulib --no-bootstrap-sync --no-git --skip-po \
-	|| die
-
-	default
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
-		# reason in the Makefile)
-		sed -i -e '/^TMPDIR = /d' Makefile.in || die
-		export TMPDIR="${T}"
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		$(use_enable static-libs static) \
-		--disable-doc \
-		--disable-gcc-warnings \
-		--disable-gtk-doc
-}
-
-multilib_src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-dns/libidn2/metadata.xml b/net-dns/libidn2/metadata.xml
index 87360eddc9b2..a07f73b1289e 100644
--- a/net-dns/libidn2/metadata.xml
+++ b/net-dns/libidn2/metadata.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
-<upstream>
-<remote-id type="cpe">cpe:/a:libidn2_project:libidn2</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libidn2_project:libidn2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index fe3fb2846639..8876726a4ddb 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -3,9 +3,9 @@ AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1d
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
 DIST nsd-4.2.4.tar.gz 1148826 BLAKE2B e2508c225d0bebeb9134c6eb3f00dfaf00d2de1a545cf9719b3bf04de8cf4a173ed744ebe5ff50a7062f5fb3135f4e476b9111736442fa358eb6ce20faac8406 SHA512 5d4f546a2a4484b182c65d3337d44596e935bca074c0eda2947b9d128a56db08a00240c6ec9ce22bc9a436e009c00c3283c4a5cbd1163ca4a429eaa92ec54208
-DIST nsd-4.3.1.tar.gz 1173582 BLAKE2B 4766beefa9578bf11de9c8aeb4d0729b248893f36ffa72c699a134d0dcf758a247f8a9e31e8da182db982a8717f6cd737e95dac236420b18d34d7dc38bff0e57 SHA512 58b6e964795d6c796b547e1134cef954e5f4adf4e976db830ff7900892327154dab2a607ceadbb99072d6e5495d62c808c8fb8c94359ae93f636d11925c0d261
 DIST nsd-4.3.2.tar.gz 1177939 BLAKE2B 3c1eac9065c5c8aae3b0a98d43cdbc5d757712656efc7ed912b51b91f4b3b84672a15de8476eba40642d766abd9499bbdeaf71aa6e6720a67ac83a1ed0ea274c SHA512 0423aeddc7f60e04718b6ee0954fbdc274576b6ef61472324256e5db696f41e47899b645cbc4d6d8cc2a7dd00190b72f3ef0476c4640dbb80d36ec39f1c9f5c8
+DIST nsd-4.3.3.tar.gz 1181082 BLAKE2B 611027e015f89a6aef0bc9e0b74242e683a1475f5cd2a79dc16a30011989c33a4d3bd21aced24dc6040469a304414b7e775261b097beb007e06c3c025dbf2b9e SHA512 5e7e2037e0939af20af137c913943904e36cf7da517292d40dbbd4f7ebc878b0e97acd7f6cbbaaebbb525a84f6d6ae9e82c34df9c8482075653c4802777a9fa6
 EBUILD nsd-4.2.4.ebuild 3013 BLAKE2B ea358a487f8e18f40a6d5018c04994607c9f7a66e53b31ea70eb24e0386ae15d8e7ac7c0c7196980241420a5de90fd30c980b03f30914febbe725608341fde6a SHA512 52b615e9b4676a35ebf0d3b413ed703c10b65f860adbdc490f9624d31e898dcee34fd01efc8d294b83a517ac54ddd713ab010fb296ade398a1ce4257f0054d01
-EBUILD nsd-4.3.1.ebuild 3015 BLAKE2B e9be556ca875cf52a3f01887d5468388625378356d93ae3a94008d39fb0b8ae68fb06bbe5b328511ff5d633b6130a733bdec8ba6ded8c022f6cc75e8c8393499 SHA512 eda0d29c58cc70eb019767431ec3d32f6e663a0029b02bf4bbabf9b45168f6bfb1620f96e2d23c750760355a95b512afac338d705ab7c11df0b1bfab958c9139
 EBUILD nsd-4.3.2.ebuild 3015 BLAKE2B e9be556ca875cf52a3f01887d5468388625378356d93ae3a94008d39fb0b8ae68fb06bbe5b328511ff5d633b6130a733bdec8ba6ded8c022f6cc75e8c8393499 SHA512 eda0d29c58cc70eb019767431ec3d32f6e663a0029b02bf4bbabf9b45168f6bfb1620f96e2d23c750760355a95b512afac338d705ab7c11df0b1bfab958c9139
+EBUILD nsd-4.3.3.ebuild 3015 BLAKE2B e9be556ca875cf52a3f01887d5468388625378356d93ae3a94008d39fb0b8ae68fb06bbe5b328511ff5d633b6130a733bdec8ba6ded8c022f6cc75e8c8393499 SHA512 eda0d29c58cc70eb019767431ec3d32f6e663a0029b02bf4bbabf9b45168f6bfb1620f96e2d23c750760355a95b512afac338d705ab7c11df0b1bfab958c9139
 MISC metadata.xml 1082 BLAKE2B c44a5b7b9cb5ad52ebc55dd52a584cd8b0700977a19d541df1b415164250e390941ef35a0e8633a975e6cbae402719d8c5fe7d452dde5623223b01a7ec4320ac SHA512 a66e71346c6742c77ce38ca73f600dde471f3256928bab79f2015cb88c2f3237a4d69f7b9127ea90c58f584b60b8b676416b0704761ee1455479644fd2cd5a8d
diff --git a/net-dns/nsd/nsd-4.3.1.ebuild b/net-dns/nsd/nsd-4.3.3.ebuild
index b6ca20a489b4..b6ca20a489b4 100644
--- a/net-dns/nsd/nsd-4.3.1.ebuild
+++ b/net-dns/nsd/nsd-4.3.3.ebuild
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index a53d5bcbe1b6..b38984e9b588 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,9 +1,7 @@
 DIST openresolv-3.10.0.tar.xz 20296 BLAKE2B 2e4fc22aebeb345fcdcc5395603a183a978e2ea24a4b419d76ab41e5179b640e3a317d5f1ef36bc6901d933b20daaca615489c785a41d76a89abc938c20e2723 SHA512 f28fc43887f18f6cbdcdabbb48777fc704ed653e77f34caf349b5c4e5f5f6e7686242ea9f2617f2f65d40d14c794ce28cffee0ec5e5c7b8a19566f3bd72e9ec5
 DIST openresolv-3.11.0.tar.xz 20552 BLAKE2B 5564ecac60124fa391a13979da533c4f7cf99601acc896cb5d3cc029bff15ef48ea36e867a0fc6d1e6e475a7536660fbd819120b3066dd2aadc12abf0e16c8ff SHA512 09708b8a1abf7de926f75a1825d4243be6e59fc1de7cc3d7ab7f5a317e11175bd24af03bff2c878ccc54c96913feed27630765647c70fec8a9f9aa7370744e24
 DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51aa6ff5b44fdfe08e96ccc78ae1d84f2115e5d59940e7e1cedf7e4fe7dc36a461839bcef8fc2c5b2e21242e441f36 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e
-DIST openresolv-3.9.2.tar.xz 20200 BLAKE2B 25cb56fd85114c3866207a3bf83d1295eb135f1746f141d8cb8f0fb18cdd96e184ad3fbb47d1f65ce4193b57da61e918ca4306a502eaba650ca438589be9a29b SHA512 2f88ccbb53c6e830eeb7dd53666ee72b9fa30f38324766e1d1734896bc9b7f531e42e234c882b921c79604a3bde2877db2681bab9dd8c590f02779da908d0649
 EBUILD openresolv-3.10.0.ebuild 1046 BLAKE2B 0d2d2c8b93a27d02d1dc3ce6321c550dd99e98c50cacc55b6357f7b12e4aed44468e17c8c6c41bebce7f183616f506adcfc76867a51f7208a65dd94f2cfe2e73 SHA512 03a64836140098e17b58eb63ffa87a60175eaa5f3e0d21faf7bacf6ae38a20a7282180852eb53d32fb7d65c85cc7ed84d8f4efde9aa15fa5dd02da66e90cc6d7
 EBUILD openresolv-3.11.0.ebuild 1062 BLAKE2B 538be446ae6edf9228ddfd1153ad0f44fcbe54ee71f335146502ce1bf545ce95a1a435ba015e0ea805a7608977809714fdc9808bdf98fa3691c7218569ffd043 SHA512 05d4e01fc8877fb161dd7d3c5ac758a2e73819d2163b979af183be7e65739a176fb8c716d5623d5c7df2e05a3b33c0d822e8ed9f7a9f9a2224fa56b83289d7e3
 EBUILD openresolv-3.9.0.ebuild 988 BLAKE2B 9eeaa5bb03ff5da326a9c421364216eb0c89f4e2d3ca9f5df64c3a036cd1006393c705ce1761a6f963849d4b896b1101ebc60b7bbee3fa6aaa8d17c19680a570 SHA512 b490a9558d670c224bc714d5b6b8b4b2f00025c6629e6750d2a460188f375c7571ef39ab67aeff369cb7d7a129b34e4f339522ed8db80dee102d6503f0f3b11c
-EBUILD openresolv-3.9.2.ebuild 1034 BLAKE2B 192b98ad3b90077a8ac9766bef6376af62ef875e8a50735ae6b261b89873390855e13fede12540f4d8f460eab26f3007cad52e3fd3bf68c8d73e6b04209d4d76 SHA512 4bc67276c583ea3d3977adff12020ee34b12e735c5c136e44decac970e9290004f188c50c1e0759dbca4d1ecebd4c3b5a30d394a43c5baee9c39fc8798542eb6
 MISC metadata.xml 396 BLAKE2B 225458f3e84955b1864d1d3fb1e33d1621d59ca00860da438d2e4d1e5cb07db50a8910bc25c7372491ef637b03f264073c881ae157691a25665f10c176d02ca8 SHA512 125584791b7eedd8077834628835c5f03c891cc7d0cb498a8a8a356b72dd57edf680b019e416bc4f38ae6647dc6075a59b61d6fdbb98c392ec1f63fa66eee370
diff --git a/net-dns/openresolv/openresolv-3.9.2.ebuild b/net-dns/openresolv/openresolv-3.9.2.ebuild
deleted file mode 100644
index 763dc738699d..000000000000
--- a/net-dns/openresolv/openresolv-3.9.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A framework for managing DNS information"
-HOMEPAGE="https://roy.marples.name/projects/openresolv"
-SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-resolvconf )"
-
-src_configure() {
-	local myeconfargs=(
-		--prefix="${EPREFIX}"
-		--rundir="${EPREFIX}"/var/run
-		--libexecdir="${EPREFIX}"/lib/resolvconf
-	)
-	econf "${myeconfargs[@]}"
-}
-
-pkg_config() {
-	if [[ ${ROOT} != / ]]; then
-		eerror "We cannot configure unless \$ROOT=/"
-		return 1
-	fi
-
-	if [[ -n "$(resolvconf -l)" ]]; then
-		einfo "${PN} already has DNS information"
-	else
-		ebegin "Copying /etc/resolv.conf to resolvconf -a dummy"
-		resolvconf -a dummy </etc/resolv.conf
-		eend $? || return $?
-		einfo "The dummy interface will disappear when you next reboot"
-	fi
-}
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 0d26e299c43c..0bfa888c21cf 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,7 +1,9 @@
-AUX pdns-recursor-4.3.1-boost-1.73.0.patch 4563 BLAKE2B 81f5f33939f9937b78235c3ff3859f09ac162350f8b855c28e0235e0ca414716c03d0866c13d055ac55d8896c11c6c1b149b5f29baa105be7b3338c06081a886 SHA512 8dd57a7423cdf4b33c59dece2ee63829c9d88ee60635a7441c6e17e0fac5762319b5c913ed4454f38926c0b3cc9489a9d12360b35f3c632607cd26f7b7b2018b
+AUX pdns-recursor-4.3.5-boost-1.73.0.patch 2071 BLAKE2B fdf1477fe0af5d943223c589aba3b4469b52b353542fb167ceb352248ff88871b2e329b087c4d7c3abebcdf9b8a0084fe5516a086927454166c4ac4beca2d296 SHA512 22871d24190699d7b3e79b04d235af2b44b4bca24d3a26630966650aee2b6c399fe3c6a73d0125fe3430248aea13f5b8057b127251686307c7f0c735a8034d41
 AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
-DIST pdns-recursor-4.3.3.tar.bz2 1357853 BLAKE2B fa57776bbdb77d1f13f04fdd1fb5ceb07539f851704dc627443a7c814d6640b1e7890333b6d7214a201f5d3f83a54a7840adb6450ffb7696e58722625b7c57c5 SHA512 285f12d3cb2edaca7507dd9dad1356b60076d43af678458346489562ea8933a01d61d2430d5282b6afd213839ee684ad83e5f523c9a272f382d74ccc238bd9d5
-DIST pdns-recursor-4.3.4.tar.bz2 1359380 BLAKE2B b55829b843f3abc9394bcb943c223b24684ebe67854fbde8590aded09a8ef18d8b15d1e2ebe1b88d24833b8782266b1ce853d98c0ce510e115e8d16ce900ece2 SHA512 cfc34f42ed95c7fd2be1ab7ba172672e5e1db96b4ced171c1eae7bd60fb7db482aed928028811b133d326550de35c506a8fc480b12ae39ab7fa142408e0b42d8
-EBUILD pdns-recursor-4.3.3.ebuild 1948 BLAKE2B 55673baa5e17e3ea95e049bd6901a86b657e55ef8e7980acb52a902642da29b33d4d4b7c87e40d454d7e66692757820faf59cd87ce0d86adb07c5a9082f261de SHA512 3f5e5e8d8fdce3eaba2410a2d953ca6ba84ee8008a3c7ca106843691705b31fc51eb84c0591420bc8b31e911463a9a301f01bd21b507ecf062daf9a9b52ac36b
-EBUILD pdns-recursor-4.3.4.ebuild 1950 BLAKE2B 3d4ca29820d37d1bd97f1d247a2384a4cbc59747eccec10d8851fc12dba7401fb4a0b2b5cb0995205d9c69e9cde11e28ac927923f82e9341c4f920c88827cf2c SHA512 b2c36166659af410264681fc2c0c55e258bf6c03bff1a95f7917f8da709f20a7606a89de2a886eb240f7be7b190036e76505c5a094ff50367e140961736e0d31
+DIST pdns-recursor-4.3.5.tar.bz2 1341930 BLAKE2B 8f81182cb5283e6b8f459c5d23281d20cba02d22cec8776fdab67d452834b82945f467186c98784519d2c79d9df8438b174fc644fb11d68d04f9f636e51a5551 SHA512 2d39e6016000951c0beca38b26c41664b57c059dee762d7499f34e599ed6c2653af73edb31ba5a8d35f749534f24c0d85b6aedf4c35dc8a05777ffebd1b25851
+DIST pdns-recursor-4.4.0.tar.bz2 1395544 BLAKE2B 3e963a0e481db0d96813d5aa43e231548d765ecf7c18ce777ab3e1fb4b057722b257ec59ae95bf5cb11cb2f9114eb0e087aebecd4b19b96519e9a1e9cf6bb307 SHA512 06ec7788510b656ee8e08e54d989d8789685a3acb8b11172aff5de21bff493227368bbfca8203c56853da97d209facc4d88005b4b565a5986788a1b5f16a9fb6
+DIST pdns-recursor-4.4.1.tar.bz2 1395506 BLAKE2B 20a7b9612d03b96b92bab91b0281b08750221da06c56936c81fb4e1dccf83ca00f73bb7446523cd2a693b2774ee46ab673428cfdb4fc3f1702ef1e690a1112de SHA512 e5bdcf7f9b0095bd7169d605536e45beaa675cb9ac6e58280bf725535f1d3274dd4872418461ca5e216b310472ec08b8153c6da46d6ecf9ce545feb6ab3cd235
+EBUILD pdns-recursor-4.3.5.ebuild 1941 BLAKE2B 29f7cae51b6726ac94e401c5f5b69ffc00e9bc9117f437972229f5f565f82f67db0c0a5898ff01605ba6151e7d62f67b337f374bf2bf949fe18a3f637ec7572a SHA512 c05357a560c132f75b992e522e3375dc9188c84ee984f754633ba7de57fb4ed96b461e101aab46498c73ecc4b9b7163be99f5a1e26aea323a9332972625f4a3e
+EBUILD pdns-recursor-4.4.0.ebuild 1993 BLAKE2B fb5f48241f025472bf31ed9f8a88f932fd6ad99cbc5c319fbbe06a16d948b4bcf7c3789d91250d34f7d985e800636f577a6b62af1f5fad83c19ad87667843c35 SHA512 09aaa3837515a802fc52e94cd25439f594bb27267479e185a99f6ecb5033c146f6856f45aa8d7ad867cdb6a9893c3fc211595c737ee4c54edddd771bc42a0a6c
+EBUILD pdns-recursor-4.4.1.ebuild 1993 BLAKE2B fb5f48241f025472bf31ed9f8a88f932fd6ad99cbc5c319fbbe06a16d948b4bcf7c3789d91250d34f7d985e800636f577a6b62af1f5fad83c19ad87667843c35 SHA512 09aaa3837515a802fc52e94cd25439f594bb27267479e185a99f6ecb5033c146f6856f45aa8d7ad867cdb6a9893c3fc211595c737ee4c54edddd771bc42a0a6c
 MISC metadata.xml 1008 BLAKE2B 1c82fd9262358bcf1ff0f8503bc8dfe9b640023133ca48711bc576df00312312b5e37a36ff10aac561ef1c71e20f64c5f0a4c431c60ca029220732fba0ee1bf9 SHA512 2deab5a88c42d3416b3da5b6d9d3ed9b2db0a5dcb3d8b7fc4c7a13b2219fd7df786bfef42ff5e3d7c2b40058592e892f380d126a0254013534e66e65499e7105
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch
deleted file mode 100644
index 02b8df751ef9..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 71246536642590e8e8b21c11307ec4bd0e165066 Mon Sep 17 00:00:00 2001
-From: Remi Gacogne <remi.gacogne@powerdns.com>
-Date: Tue, 28 Apr 2020 17:51:47 +0200
-Subject: [PATCH] Replace boost's placeholders with the ones from the std
- namespace
-
-Boost 1.73 moved boost::bind placeholders to the placeholders
-namespace which did not exist before 1.60, let's switch to
-std::bind and std::placeholders instead of doing per-version handling.
----
- pdns/ixfrdist-web.cc |  2 +-
- pdns/webserver.cc    |  6 +++---
- pdns/ws-auth.cc      |  4 ++--
- pdns/ws-recursor.cc  | 12 ++++++------
- 4 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/webserver.cc b/webserver.cc
-index eafd3059a0..b47cc6d7e0 100644
---- a/webserver.cc
-+++ b/webserver.cc
-@@ -107,7 +107,7 @@ static void bareHandlerWrapper(WebServer::HandlerFunction handler, YaHTTP::Reque
- 
- void WebServer::registerBareHandler(const string& url, HandlerFunction handler)
- {
--  YaHTTP::THandlerFunction f = boost::bind(&bareHandlerWrapper, handler, _1, _2);
-+  YaHTTP::THandlerFunction f = std::bind(&bareHandlerWrapper, handler, std::placeholders::_1, std::placeholders::_2);
-   YaHTTP::Router::Any(url, f);
- }
- 
-@@ -179,7 +179,7 @@ void WebServer::apiWrapper(WebServer::HandlerFunction handler, HttpRequest* req,
- }
- 
- void WebServer::registerApiHandler(const string& url, HandlerFunction handler, bool allowPassword) {
--  HandlerFunction f = boost::bind(&WebServer::apiWrapper, this, handler, _1, _2, allowPassword);
-+  HandlerFunction f = std::bind(&WebServer::apiWrapper, this, handler, std::placeholders::_1, std::placeholders::_2, allowPassword);
-   registerBareHandler(url, f);
- }
- 
-@@ -196,7 +196,7 @@ void WebServer::webWrapper(WebServer::HandlerFunction handler, HttpRequest* req,
- }
- 
- void WebServer::registerWebHandler(const string& url, HandlerFunction handler) {
--  HandlerFunction f = boost::bind(&WebServer::webWrapper, this, handler, _1, _2);
-+  HandlerFunction f = std::bind(&WebServer::webWrapper, this, handler, std::placeholders::_1, std::placeholders::_2);
-   registerBareHandler(url, f);
- }
- 
-diff --git a/ws-recursor.cc b/ws-recursor.cc
-index cd8997309f..a074460c2f 100644
---- a/ws-recursor.cc
-+++ b/ws-recursor.cc
-@@ -382,9 +382,9 @@ static void apiServerCacheFlush(HttpRequest* req, HttpResponse* resp) {
-   DNSName canon = apiNameToDNSName(req->getvars["domain"]);
-   bool subtree = (req->getvars.count("subtree") > 0 && req->getvars["subtree"].compare("true") == 0);
- 
--  int count = broadcastAccFunction<uint64_t>(boost::bind(pleaseWipeCache, canon, subtree));
--  count += broadcastAccFunction<uint64_t>(boost::bind(pleaseWipePacketCache, canon, subtree));
--  count += broadcastAccFunction<uint64_t>(boost::bind(pleaseWipeAndCountNegCache, canon, subtree));
-+  int count = broadcastAccFunction<uint64_t>(std::bind(pleaseWipeCache, canon, subtree));
-+  count += broadcastAccFunction<uint64_t>(std::bind(pleaseWipePacketCache, canon, subtree));
-+  count += broadcastAccFunction<uint64_t>(std::bind(pleaseWipeAndCountNegCache, canon, subtree));
-   resp->setBody(Json::object {
-     { "count", count },
-     { "result", "Flushed cache." }
-@@ -512,7 +512,7 @@ RecursorWebServer::RecursorWebServer(FDMultiplexer* fdm)
-   d_ws->bind();
- 
-   // legacy dispatch
--  d_ws->registerApiHandler("/jsonstat", boost::bind(&RecursorWebServer::jsonstat, this, _1, _2), true);
-+  d_ws->registerApiHandler("/jsonstat", std::bind(&RecursorWebServer::jsonstat, this, std::placeholders::_1, std::placeholders::_2), true);
-   d_ws->registerApiHandler("/api/v1/servers/localhost/cache/flush", &apiServerCacheFlush);
-   d_ws->registerApiHandler("/api/v1/servers/localhost/config/allow-from", &apiServerConfigAllowFrom);
-   d_ws->registerApiHandler("/api/v1/servers/localhost/config", &apiServerConfig);
-@@ -664,7 +664,7 @@ void AsyncServerNewConnectionMT(void *p) {
- void AsyncServer::asyncWaitForConnections(FDMultiplexer* fdm, const newconnectioncb_t& callback)
- {
-   d_asyncNewConnectionCallback = callback;
--  fdm->addReadFD(d_server_socket.getHandle(), boost::bind(&AsyncServer::newConnection, this));
-+  fdm->addReadFD(d_server_socket.getHandle(), std::bind(&AsyncServer::newConnection, this));
- }
- 
- void AsyncServer::newConnection()
-@@ -743,5 +743,5 @@ void AsyncWebServer::go() {
-   auto server = std::dynamic_pointer_cast<AsyncServer>(d_server);
-   if (!server)
-     return;
--  server->asyncWaitForConnections(d_fdm, boost::bind(&AsyncWebServer::serveConnection, this, _1));
-+  server->asyncWaitForConnections(d_fdm, std::bind(&AsyncWebServer::serveConnection, this, std::placeholders::_1));
- }
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch
new file mode 100644
index 000000000000..40a6ae565847
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch
@@ -0,0 +1,47 @@
+From 71246536642590e8e8b21c11307ec4bd0e165066 Mon Sep 17 00:00:00 2001
+From: Remi Gacogne <remi.gacogne@powerdns.com>
+Date: Tue, 28 Apr 2020 17:51:47 +0200
+Subject: [PATCH] Replace boost's placeholders with the ones from the std
+ namespace
+
+Boost 1.73 moved boost::bind placeholders to the placeholders
+namespace which did not exist before 1.60, let's switch to
+std::bind and std::placeholders instead of doing per-version handling.
+---
+ pdns/ixfrdist-web.cc |  2 +-
+ pdns/webserver.cc    |  6 +++---
+ pdns/ws-auth.cc      |  4 ++--
+ pdns/ws-recursor.cc  | 12 ++++++------
+ 4 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/webserver.cc b/webserver.cc
+index eafd3059a0..b47cc6d7e0 100644
+--- a/webserver.cc
++++ b/webserver.cc
+@@ -107,7 +107,7 @@ static void bareHandlerWrapper(WebServer::HandlerFunction handler, YaHTTP::Reque
+ 
+ void WebServer::registerBareHandler(const string& url, HandlerFunction handler)
+ {
+-  YaHTTP::THandlerFunction f = boost::bind(&bareHandlerWrapper, handler, _1, _2);
++  YaHTTP::THandlerFunction f = std::bind(&bareHandlerWrapper, handler, std::placeholders::_1, std::placeholders::_2);
+   YaHTTP::Router::Any(url, f);
+ }
+ 
+@@ -179,7 +179,7 @@ void WebServer::apiWrapper(WebServer::HandlerFunction handler, HttpRequest* req,
+ }
+ 
+ void WebServer::registerApiHandler(const string& url, HandlerFunction handler, bool allowPassword) {
+-  HandlerFunction f = boost::bind(&WebServer::apiWrapper, this, handler, _1, _2, allowPassword);
++  HandlerFunction f = std::bind(&WebServer::apiWrapper, this, handler, std::placeholders::_1, std::placeholders::_2, allowPassword);
+   registerBareHandler(url, f);
+ }
+ 
+@@ -196,7 +196,7 @@ void WebServer::webWrapper(WebServer::HandlerFunction handler, HttpRequest* req,
+ }
+ 
+ void WebServer::registerWebHandler(const string& url, HandlerFunction handler) {
+-  HandlerFunction f = boost::bind(&WebServer::webWrapper, this, handler, _1, _2);
++  HandlerFunction f = std::bind(&WebServer::webWrapper, this, handler, std::placeholders::_1, std::placeholders::_2);
+   registerBareHandler(url, f);
+ }
+ 
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.3.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild
index bffba0080a4c..3859c9821d6b 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.3.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild
@@ -37,7 +37,7 @@ BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}"/${P/_/-}
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-boost-1.73.0.patch
+	"${FILESDIR}"/${P}-boost-1.73.0.patch
 )
 
 pkg_setup() {
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.0.ebuild
index cb9a0daba0e2..6e6a0b941303 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.4.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.0.ebuild
@@ -36,10 +36,6 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-boost-1.73.0.patch
-)
-
 pkg_setup() {
 	filter-flags -ftree-vectorize
 }
@@ -47,6 +43,9 @@ pkg_setup() {
 src_configure() {
 	econf \
 		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
 		--with-lua=$(usex luajit luajit lua) \
 		$(use_enable debug verbose-logging) \
 		$(use_enable systemd) \
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.1.ebuild
new file mode 100644
index 000000000000..6e6a0b941303
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug dnstap libressl luajit protobuf snmp sodium systemd"
+REQUIRED_USE="dnstap? ( protobuf )"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	dnstap? ( dev-libs/fstrm )
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-lua=$(usex luajit luajit lua) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_with sodium libsodium) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 4de5ad6afb59..6e33030dd873 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,8 +1,6 @@
 AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf403453422888e2cb44fa4fed7891241919a39c8c6f539a61de032654650a45ea548a6983777ea1bfe029e817f2c315 SHA512 ac16f8d528d6138d3c2cbf997fd8fbb467d388aa63eb6ed4e7780a3dad11ea885b91252ff0809b1d2cf7d5200814b8963aab890af84741ea86d35b2f5955a7ea
 AUX pdns-4.3.0-boost-1.73-compatibility.patch 2676 BLAKE2B 9b6a5e56915abc80fb354f0bf68732270823fb2b5a2d603bfd0f1a24bb346d44ea137de3e835018327f4216ea3e6288d625493540598e9c15ac719441d01f001 SHA512 306a1c14479b1078a4025efacaa893b2ef3a2f64f7dd5d06a2a18e3a23098f810f8fbb9f443015d6071c1e794a13c75f581b0da78ddd5e4737886a1419cf250c
 AUX pdns-r1 2535 BLAKE2B 4e718bbba73b20a86dd11acc07ce91d259d82a3fc3e6133cac0d7fb2b24d2b5ff3e3596d00c4289017845c7a1751d0a43e83ba67e4b8e55e10aca892ba3d3aea SHA512 5ebc7cd236195543e67db5ed2c831ff6a1b9bdba5a72c179df72f84e4ade2dfc962a988ab02a7b893c62a7c3d8df7a15e2de3ae02413ff296a6404a7937eb8de
-DIST pdns-4.3.0.tar.bz2 1211536 BLAKE2B 3291597c4f0c39e23f793b128ef26b1ce3dc77640ddf6979242ab291b0e2780ae5c19b18591ea90f5282810044959feca265a245e27eca1f2ebacbdeeb8a3785 SHA512 0734dbfb83a2e5080dc54cfc016ceb3e1f7e15a2de2f33392b2f3c995357fa97f9e87ff21e969f148c3e881165471d3058eb2b9cf632117ebce0d7818e025fe2
 DIST pdns-4.3.1.tar.bz2 1216876 BLAKE2B 0449835d104ec430329dc88087b489e29f1e1fa0c2a22af8715883a0a80d73f3a4848df207abbf986b946c640c4f1d35a1c8335f13f96a00915e4a40bcbecc9f SHA512 e61e23544f1e57c1ec3a85b4edbc3ff3e8e831410237afdc8896e9f34602774c1dc8bd02eb7440e765262fcc988f98e47b6f1b7945427b1f4a59dd6b84b9437e
-EBUILD pdns-4.3.0.ebuild 4610 BLAKE2B e9780e7d468a487f822c695a9cb590aa687ac1c7cdb40cdab1927ae3f22a273012141bff264320df0cb94060cf474ff2e47b9ff4657c034aa47b0c305032eec0 SHA512 3ba103d2a7ae26e524e56ae7bd01d4f260d9b511eeaf1f46e72c489594a5eb1bcc2ce213f21c0fca518c89841b25ecf0a1a60bc913ff3a60ae8632ef31aaeaf1
 EBUILD pdns-4.3.1.ebuild 4617 BLAKE2B 3d3422c4aaafe2ab67c78e4fb48bee96a8892ae31dc2149651457fdde860958ebd58b996a69a639c9902939f4dc490142f4ce2577e83d565fad96d111bf4da7f SHA512 90a6ac58a451ed37989a4b80d4eb3a1268965cfadb9d4a9437b9b0bf08aecad9c09adb8ef2cac5ea3528d09d04e3a789eadd4d808d254668d3549b530203f6cb
 MISC metadata.xml 1111 BLAKE2B 5a55e94593f1c010f9ee71fa2d3bc887a0eddc8627db36a1792b911a1cfe3fa3d5a33923b95d18a02f36097717d76ed2aae711c2deb793625b1186090ad072c8 SHA512 c010bbd0daa87980a4d9f164fc3d15239251890e56c63b1165d55a92b9c0f24e5f141439bdfc13b4efa4483e0fc199cd6107e2f152d26d4ca954f4c3d0cc4913
diff --git a/net-dns/pdns/pdns-4.3.0.ebuild b/net-dns/pdns/pdns-4.3.0.ebuild
deleted file mode 100644
index 91ef4052527a..000000000000
--- a/net-dns/pdns/pdns-4.3.0.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib
-
-DESCRIPTION="The PowerDNS Daemon"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# other possible flags:
-# db2: we lack the dep
-# oracle: dito (need Oracle Client Libraries)
-# xdb: (almost) dead, surely not supported
-
-IUSE="debug doc geoip ldap libressl luajit lua-records mydns mysql postgres protobuf remote sodium sqlite systemd tools tinydns test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="mydns? ( mysql )"
-
-RDEPEND="
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:=
-	!luajit? ( dev-lang/lua:= )
-	luajit? ( dev-lang/luajit:= )
-	lua-records? ( >=net-misc/curl-7.21.3 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
-	sqlite? ( dev-db/sqlite:3 )
-	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
-	sodium? ( dev-libs/libsodium:= )
-	tinydns? ( >=dev-db/tinycdb-0.77 )
-	protobuf? ( dev-libs/protobuf )"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	acct-user/pdns
-	acct-group/pdns"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/${P/_/-}
-
-PATCHES=( "${FILESDIR}"/${P}-boost-1.73-compatibility.patch )
-
-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-modules= \
-		--with-dynmodules="${dynmodules}" \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		--with-lua=$(usex luajit luajit lua) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable lua-records) \
-		$(use_enable test unit-tests) \
-		$(use_enable tools) \
-		$(use_enable systemd) \
-		$(use_with sodium libsodium) \
-		$(use_with protobuf) \
-		${myconf}
-}
-
-src_compile() {
-	default
-	use doc && emake -C codedocs codedocs
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
-
-	fperms 0700 /etc/powerdns
-	fperms 0600 /etc/powerdns/pdns.conf
-
-	# set defaults: setuid=pdns, setgid=pdns
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
-		"${D}"/etc/powerdns/pdns.conf
-
-	newinitd "${FILESDIR}"/pdns-r1 pdns
-
-	keepdir /var/empty
-
-	if use doc; then
-		docinto html
-		dodoc -r codedocs/html/.
-	fi
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/dnsdomain2.schema
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "PowerDNS provides multiple instances support. You can create more instances"
-	elog "by symlinking the pdns init script to another name."
-	elog
-	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
-	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
-
-	if use ldap ; then
-		echo
-		ewarn "The official LDAP backend module is only compile-tested by upstream."
-		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
-	fi
-
-	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/s6-dns/Manifest b/net-dns/s6-dns/Manifest
index 578ec2147b56..94d24d47012f 100644
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@@ -3,9 +3,11 @@ DIST s6-dns-2.3.0.0.tar.gz 76476 BLAKE2B 6896bf534d872aac19dd6b2ad819d7aee6d5273
 DIST s6-dns-2.3.0.1.tar.gz 77836 BLAKE2B 55f83152eea3e3c8f2d774d6330aadcb73ec9b7d1ca4b87d1093fb9ab216ac1ad130bc9437ff30311451b06f820720fec902ac40e9e8d63f9d605cbf13448edf SHA512 69ae32f9b4ff22a5d38e3a2c950357d8c8032a649c1d81e4a4e5f474ae5c1bb1072555baa1a34f955293aa0f66a93f51f2cc8efd8aa56704b906e0b0979f8157
 DIST s6-dns-2.3.0.2.tar.gz 77885 BLAKE2B 354a44d47f4fbc964c41999a442f730a738be361bc9633502c3c54f38d25060c58ef2ecfea764f1f5d3243a2e24f92e8b54abfaf61f76f7d155f93a53de2d1db SHA512 fec0edf852423bf8f717fcdc3c00c8f38e7bab4d9a03d14e6e81ad3f175b5db57be44409761bbd990f56f81c3ae8e0aa76ab8c5b65fec823a0ce392bf41cdf33
 DIST s6-dns-2.3.1.1.tar.gz 78171 BLAKE2B 0949a48a0c48a8c3ffa27794309efa4489cd15102b3a7c29a6dfbbe22cebd0d207417fbe687160266fcda6ff04174b538d7844ef7811e06f8c8bd9a91e4d013e SHA512 e69ee16cb16139d344255adc4bb92bd73003464925bbd2df893e3b922add155308b547274a66e3f20a5d3c0310c8fadc877b656753299ff9a269b4e25c26f7a9
+DIST s6-dns-2.3.3.0.tar.gz 83398 BLAKE2B dc4408a608324bdecd363c8a7a92d878983075e93af66905e4315e34e8d1fb1fdecc78fcd7e56fabdfdcbdcda81cc39bc93044730a0bafed26df40ca70110a71 SHA512 f711ff3f7ea7ae2eecf46b6742f61e970aed8776fcaa4f7902da0864c97f71296bc1651c08ff6f98d6474ccb0ee904c2d7497d7a1d28d48db8df78865b2a9e79
 EBUILD s6-dns-2.2.0.1.ebuild 1316 BLAKE2B e413614e39b05f07c616d83e5f3d7998ad33948bd67d96eb4653e1c81865b33209fe9efb16dc5731fd093f7ee87eb662974475426b9d8cc7b7590c879e8d09ad SHA512 a0153e3c80f54fd744dc5e1412672857280e3204da461e8eb75e2c06133a9d4162eccec950ebed272061a1614e00e04ce8024be8ac1a001ae0e57187ff064557
 EBUILD s6-dns-2.3.0.0.ebuild 1316 BLAKE2B 2c9dfe840307a11cf193077abc5011df5b01f455e1e0d8f5080061d8019c0824d12923c9182c8a6b3e84ab09fa0d7add2a8e99a9c9f27f8a3a74265042768a0b SHA512 61865257ed9b3e1321bd9aa0694cba91dc12402a76ed8db9c24f7d99566b4e060120d070122af7eb24cb13d7353f8ad16b8de252f39b5cd9e447dea67582ea73
 EBUILD s6-dns-2.3.0.1.ebuild 1211 BLAKE2B e74799d0b902714589cdb91b305ca8ea69939dd13f69cde242ac17292225f66802c89b421a6c2dc6f543a20b1f174d0c675b077a0150e2bc6a29f5e89fe1b243 SHA512 670fc13663ec03faf9f86ce6f4777730341c19783b6671249debfc0ac3594a1e2d33967f7b041778ff69388c7b56554ef679e246b0e6cd172a50c1b98b828342
 EBUILD s6-dns-2.3.0.2.ebuild 1096 BLAKE2B 53389e651100b3171221f91b34d7b728a3a85986c37cb284436eda902bcf99a52ae9c460f38b71c049654b8cd3dde05b1479c9b2c4aaa50e057fef111489de1c SHA512 30935ee14fcd1e63f248e2093c89ee11e65cfdafa6143d36eb0034de08072556b0993b46f7d08d2a6b9d84da024f84303b6b90e97170f425a43eb09946bc4a12
 EBUILD s6-dns-2.3.1.1.ebuild 1096 BLAKE2B 25dce0059e773e0f43a0fce14826851711a25380414bb83039940c2a6e6cc464dce9d0dd6950d4e266dfb038c50426728232ec076843a5f93c4dd63296f757a7 SHA512 59470d1c20fdd791ee7d31e4b0af021b4c3f7718a2e62d8466948e85638f533183b92795de765a710375d718975f905a22ae92f209ed84be529f6214c97e1a0c
+EBUILD s6-dns-2.3.3.0.ebuild 1096 BLAKE2B f7d0bed25ea1145d1d6be735422c9cd1da5dc7be3ee265a66e581fa662b6fee577d4ce10b117676a869d936fcb3fd966c8e27d774d5c98492ec323ce44a32a6a SHA512 7b56afabfb9be8dd3d48f04740a893126720a5315623c7761b05eecd033f350805121ac16ae5a6c0a8df4b49c33abd596c4d172a7276fcd3f4b6038856034db2
 MISC metadata.xml 434 BLAKE2B e3d888f7fcec185687045f1a5ba7da4fdd481dc2d5f7727be63c9b013ceb0c82e337ff843447810d4a26af7b957c9249efbdb110f565188c906748e4aa33ee84 SHA512 da245c4a5afc048f3010be4fe77901917b0687d84bdd7c764883c9df48abad24ae6711330b1d7f4fdc468ae7c26a148e67fd4f6674068ab7def5eb8f2117bae8
diff --git a/net-dns/s6-dns/s6-dns-2.3.3.0.ebuild b/net-dns/s6-dns/s6-dns-2.3.3.0.ebuild
new file mode 100644
index 000000000000..879134405322
--- /dev/null
+++ b/net-dns/s6-dns/s6-dns-2.3.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Suite of DNS client programs and libraries for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-libs/skalibs-2.9.3.0:=[static-libs?]"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index b9e4765edb37..1272aaac8b59 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -9,6 +9,9 @@ AUX unbound.socket 101 BLAKE2B 4885d311873d7f3e5daf1c0a63798b13761b7c0bfb1bead0b
 AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a73b0c6148f4df336c4c07e8da19320df6bedb49cb6884da565543f78456d38dc3000ca2a1abde84816be SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3
 DIST unbound-1.10.1.tar.gz 5729334 BLAKE2B 7ca4f23c12a551bc6e5d6ec32f19ca0f54526b9a4c868ced8f31cfd31dec23f8240b78f0c00d2cc6f9aa21f6c1b98697c85ef3ebd804a838a5a082893fe98094 SHA512 d07f3ac0e751c17a3ff7d99518c22529cf6856861218564a2ca073422905525cb9ddaf76c9600187946fadb7324343bcd85c34ff06bd322e0ea621a2d258bb85
 DIST unbound-1.11.0.tar.gz 5900967 BLAKE2B 3119bbcd78fa19c610937215abc64abcc1ca96ba42b6753a1e36fef501f68971ac2ee0cb9bde377e0b257c57f505aeac2315a6bf031626874d30967b0a5eb46a SHA512 511e787c5f9647286b07028702a8909390e0e6eafe7224459d5f1eee8a8dfb09c71e33f291e30851dc57411123b91dfe0e124787109a7e4afdf6f3b02768e7cd
+DIST unbound-1.12.0.tar.gz 5918399 BLAKE2B b3dccecb1fd019f36e47c62583348a375f5eed7c84094c48def1ff9e73dc283911a2a9b318c8a4be45f5cd4bfb17f26722a9b900aa1980f49790cc55f6412d1d SHA512 90d99bc65e9ba62e50a7809dbf1e98889d0fc9fd50cf3cc99b726c67bcaeda0c2bc176d09f84771adb9796833b595591462f96e949d6969a47d6898d8fae3479
 EBUILD unbound-1.10.1-r1.ebuild 5424 BLAKE2B 85fe1509a5c82edf8985ce6cfa80325db99959566a7f63b9407d3c19311d420e98cfb29674538325740b485b48351a2e7621f6afdeb13c4f3152bff8c880b996 SHA512 8d65dadb63f9a70ee72e7cbadfc45a5921d4ec886540d01cab588696b0bbf7b30d502bcef1c0ae38d0e554979ca9cbe90bb7444ed00e87defb687640f9ea0546
 EBUILD unbound-1.11.0.ebuild 6003 BLAKE2B 5e92333ca334d085b994fd9dcfc4b9eb97c0355b130472dd434b6a892bcde8439ae33f4413f8aa5e9e6867891750e152c28892a88f9d88e5848f20ebcee459b0 SHA512 4d6061372950b54091b0fae9c1e2d8eb93b75a60a081d0f8431239457bd5311bdb78109f55e08779c50cab4a8bc0f07281f95d51b8b1dd83f4eac03b40b6e2b7
-MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
+EBUILD unbound-1.12.0-r1.ebuild 6077 BLAKE2B a5ceec5a6ddab8e9ea44e15d1e0bb8bd59886f7ca2acb94b4b9c4776fa703332d5bfbbaff9fdda2bc0666116400b03ed7ed2d6846018f1765a61821c23229efd SHA512 165f5e8fa81ae7792f50255e8f94c56808b0c6e50cd0c50a273a806378a09c00a1ae47a2c7ac2003b64b754f47e68e0c111e939e59fde26baf861f624f7b4912
+EBUILD unbound-1.12.0.ebuild 6008 BLAKE2B dd27e2b8d4d1c320af8e268ae5f0d9f95d26782137bfb11deebe44533904da8716d894bfacdcd3bbd187c0d1d52d9e6a57a330f75ced2cb3d1b802f705bc352e SHA512 df2940e7037f61717bc8c53a6ce386d189b4bffbb4a8881074798718087ab78e10e5c840070f629432f2ca328727b585ba2695703f9572ba5913fe8ad461d415
+MISC metadata.xml 1444 BLAKE2B ff1a69e8795fc834ba6b365ee389743bc8d2a2e82375a07c757ad6fcf5cad4cbfec321bba6ce4f8e505414a5cdce09e8257f97eb1fe199bc1fb911a769f7a6b5 SHA512 a96d5847589f861d2d3e7a416e5af0dafc0940a60f997456bf6a3a9c09e3e2910a8fe9474474e81b907cd9093525125539ad93345f84dbf6d10454a3aa5cbf4f
diff --git a/net-dns/unbound/metadata.xml b/net-dns/unbound/metadata.xml
index 64f0e795d58b..4976f3c88f93 100644
--- a/net-dns/unbound/metadata.xml
+++ b/net-dns/unbound/metadata.xml
@@ -29,6 +29,7 @@
     <flag name="ecdsa">Enable ECDSA support</flag>
     <flag name="ecs">Enable EDNS client subnet support</flag>
     <flag name="gost">Enable GOST support</flag>
+    <flag name="http2">Enable HTTP/2 support for DoH<pkg>net-libs/nghttp2</pkg></flag>
     <flag name="redis">Enable cache db backend which uses <pkg>dev-libs/hiredis</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/net-dns/unbound/unbound-1.12.0-r1.ebuild b/net-dns/unbound/unbound-1.12.0-r1.ebuild
new file mode 100644
index 000000000000..bd4fc88d4d23
--- /dev/null
+++ b/net-dns/unbound/unbound-1.12.0-r1.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND="acct-group/unbound
+	acct-user/unbound
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	http2? ( net-libs/nghttp2 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+	"${FILESDIR}"/${PN}-1.10.1-find-ar.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		$(use_with http2 libnghttp2) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	fowners root:unbound /etc/unbound/var
+	fperms 0770 /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED}/etc/unbound/unbound.conf" \
+		|| die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0770 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then
+		einfo "Trying to create unbound control key ..."
+		if ! unbound-control-setup &>/dev/null ; then
+			ewarn "Failed to create unbound control key!"
+		fi
+	fi
+
+	if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then
+		einfo ""
+		einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+		einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
+		einfo "and run"
+		einfo ""
+		einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
+		einfo ""
+		einfo "as root to create it initially before starting unbound for the first time after enabling this."
+		einfo ""
+	fi
+
+	# Our user is not available on prefix
+	use prefix && return
+
+	local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null
+	if [ $? -ne 0 ] ; then
+		ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!"
+		ewarn "Run the following commands to restore default permission:"
+		ewarn ""
+		ewarn "    chown root:unbound ${EPREFIX}/etc/unbound/var"
+		ewarn "    chmod 0770 ${EPREFIX}/etc/unbound/var"
+	else
+		# Cleanup -- no reason to die here!
+		rm -f "${_perm_check_testfile}"
+	fi
+}
diff --git a/net-dns/unbound/unbound-1.12.0.ebuild b/net-dns/unbound/unbound-1.12.0.ebuild
new file mode 100644
index 000000000000..30cafd751b15
--- /dev/null
+++ b/net-dns/unbound/unbound-1.12.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND="acct-group/unbound
+	acct-user/unbound
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+	"${FILESDIR}"/${PN}-1.10.1-find-ar.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	fowners root:unbound /etc/unbound/var
+	fperms 0770 /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED}/etc/unbound/unbound.conf" \
+		|| die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0770 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then
+		einfo "Trying to create unbound control key ..."
+		if ! unbound-control-setup &>/dev/null ; then
+			ewarn "Failed to create unbound control key!"
+		fi
+	fi
+
+	if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then
+		einfo ""
+		einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+		einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
+		einfo "and run"
+		einfo ""
+		einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
+		einfo ""
+		einfo "as root to create it initially before starting unbound for the first time after enabling this."
+		einfo ""
+	fi
+
+	# Our user is not available on prefix
+	use prefix && return
+
+	local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null
+	if [ $? -ne 0 ] ; then
+		ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!"
+		ewarn "Run the following commands to restore default permission:"
+		ewarn ""
+		ewarn "    chown root:unbound ${EPREFIX}/etc/unbound/var"
+		ewarn "    chmod 0770 ${EPREFIX}/etc/unbound/var"
+	else
+		# Cleanup -- no reason to die here!
+		rm -f "${_perm_check_testfile}"
+	fi
+}
diff --git a/net-dns/valtz/Manifest b/net-dns/valtz/Manifest
index ae103cc995cb..c7c7eb9835d9 100644
--- a/net-dns/valtz/Manifest
+++ b/net-dns/valtz/Manifest
@@ -2,5 +2,7 @@ AUX add-support-for-srv-records.patch 2565 BLAKE2B 8e858bbb93991ccdb033318dec6c8
 AUX allow-underscores-in-records.patch 1561 BLAKE2B 7aba9fc4ca4f0b25d1bed1f7dbe524073b1b16b701a4c3d7830fd20e40af1983284a640a7c4ad913e9d8b2b27a864225989b0a8e7e9ec55c5d56841e65d837a3 SHA512 c23aaadab40863710b0ff9de964ab639c4dec2ef5aec0bf2fb402e7631436081012e80302aac5dbc81611b127fc2a6b549b7bb433d0220f012a7ae39fa0a0381
 AUX fix-generic-records-support.patch 1165 BLAKE2B e164ea03315bbbb0d9641f66a37c22a97a4f8e05f4dae86af542619b3299ad764417a40718e944bf10e6119419fad29beff55b947b00e601f86a5297cc2826fa SHA512 0613180930e526feeffa4367d1bf3e0050d2dcffe2181464b9084a1223ec4482c23890868aa761ae1a046da67b16f61761026fd2194c44bdaf6c4c5c556e3e62
 DIST valtz-0.7.tgz 10638 BLAKE2B f6c8c476f523bc72531dd6537a7ed096b4fe15122db8ac8398b6ce325e8d61aecd3ef496c6102127bb8df4c8e0651201826ed4ccf79fd47616b6e083967412c4 SHA512 173e9f04399f8011b565ddfa7ad542c87af03da1b829d40b616271a993a282a1a3f54fb434db4837fb9ee4c3eb66a39f70ebf5ff5f13aff9c6fccfeabb3a3df7
+DIST valtz-0.8.tar.xz 9644 BLAKE2B f5a102931fdd58e9ac85ff09f93243f76268cf3fd7c8cd3853b463115d292250293ca17e430ce93d0e7e5b78d90805126e24538b2f10bbf314a9ca0dbfd54d9f SHA512 87ad87445fb68b962b43e1d4cd08f155bdd3fe83480134dc141371bec87a2facce7f45381df655921e2875bb77c24bfb184487d8055f18a3acff50d8f4fa5c71
 EBUILD valtz-0.7-r3.ebuild 575 BLAKE2B 7fd7cdd50df24786611af4da7dcc86e7bcbf1fcce6c31de44092cac87aeff92406d52aa75aa61393a9c9b69d4277452edc1f52ab82d56262a893747678f7ca38 SHA512 aaca95ea3315239811cc6cc31d078af6195364a018e663b3f247829f73f3962bf8e55a4b63469349ab45e33d47295d15a64b5f6eae4982a694a39e2338bec96f
+EBUILD valtz-0.8.ebuild 448 BLAKE2B 9cf16ba539e2abd6dc932b31c548e694285d36c0862d4e549b882ed773c18508965e09d1dd3b2cc5a09377e58c029355b10802827aefdb1980268a42aeb430d4 SHA512 cdec3924b6a7a5ded8c8d4936bdff2c0981f9ea1042a0c411fb7b357f3c783a71d5170b82b5b0af2e5a5f659ed58e44a0fae1e85dad4d2a7088315d875dae0e6
 MISC metadata.xml 425 BLAKE2B 4d19148fc299036fffdd0c0c5b2dbbd35ee256071c36fad39a3595a95cc560466e10d680cf720c6b2a51d7304d21d734b7039c3fbc74f304cc9d5c8293ece42e SHA512 028d54f6c591f211acc6ae3605158053516e17424db39e34b8cf01706619421f65efbbb422e0bdfad88be4b1f539672782ad754201499ae3a40deb00c05c0ab4
diff --git a/net-dns/valtz/valtz-0.8.ebuild b/net-dns/valtz/valtz-0.8.ebuild
new file mode 100644
index 000000000000..b98620fc1489
--- /dev/null
+++ b/net-dns/valtz/valtz-0.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Validation tool for tinydns-data zone files"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
+HOMEPAGE="http://michael.orlitzky.com/code/valtz.xhtml"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+
+src_install() {
+	dobin valtz
+	doman valtz.1
+	dodoc AUTHORS README CHANGES
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /net-dns
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)