gentoo resync : 16.09.2020

21 files changed, 478 insertions, 136 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 3afa399281e8..4b52a0e3d21f 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 44c61750cb27..87392dfbae4a 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,4 +1,5 @@
 AUX 10bind.env 27 BLAKE2B e5ddb2daced1b9430cb8e4b691bc0f1164f71a6e2032fa4efd18b629a6aeb971336d5eaa38c6474a3143cb34691c22d4564ebb010d9efd00cf6e2634daa8e68c SHA512 8ae5326b158b8a3eeaab667c84dd712fefd25d10832598783fa497285183cbdee554796c22d32fec54cd00461469f29ed473a730304a00aacdf06c1bb6c33d55
+AUX bind-9.16.6-bug-741162.patch 1137 BLAKE2B 426e3091e0d6c002ce081adc264d9e4ec5e3d803b881d39662fe7d6ea687f2851a65e6b28bf6d1c3ceeac27277aceaae7df800cf8f1c2b621db83351dee59cc1 SHA512 e6c09d10df3fbd1edcab27f9fbeaaca8474b663cef933b537a803417242d4588d71fb960ede96f1c424be472aacaf248fd8c8338a2e5513080e9f53b6777caf4
 AUX generate-rndc-key.sh 183 BLAKE2B 33f2297745ef8e5aed09107cee6d0017d3870ea9db249a17850ae7a55f613b03a136bc61b8ac4526858178a0f8713eabda6c5f30917415f9a3ad6b34668f45ab SHA512 6c611120185c1a61b2b6da228efc28302ebd36c819b97793920543ce2cfff4da84f43ec53ddd072f008b04c7087cc19108c4279cb962d12a7e073b47235d14ee
 AUX localhost.zone-r3 426 BLAKE2B d34cf12d484c6bb705d3bd8bfbf93514e504497a99da983f6176234239cc664131502744f3cd743d938dec0309f0d8df2c1d0c5325b5cb61023ed192d32bbedd SHA512 979d8693046033c24490dca536f0d649795bbdf57eed32017b32d07d7d3c51b35197e4edd79d8258074a1bf14b71376472ba6ae749f62ceaf74d7a6a0559fa89
 AUX named.cache-r3 3316 BLAKE2B 09a17fbb29f2122a61c7e17a8dfc8eef3b0fdaa94e8dbe17a0b188946fe8017c65599fbb84c0f88123f0e0f17faae2b9a1ffbc0ee17bcf62c1cbf34f064b9c36 SHA512 3608f29d356bf853145e14c1f81fdccf7090f63e95573234221711b7b6084fbc806817c41daa5d6072a4955a714f9e1cbd6cdcabd7cd1833c3e5f8387bc1ba20
@@ -9,5 +10,6 @@ AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d950383
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.16.6.tar.xz 3228368 BLAKE2B 0c2265fe0e006679733a4f7610b0c33bb8e2bd32caf26dca8cfedbea0e08df9e7665cbbbf5321199bd2e30b97ad5b0146ae4e8a9a78abadbe6d067bbd1ad8a3a SHA512 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
+EBUILD bind-9.16.6-r1.ebuild 10954 BLAKE2B 90aa875a56e9332e124fb05c0520879d94e04762b31757b948296960ad3e53fabc2f74eff7cebe43df63f8b5b38db75ccbf779db0711f3ce630a99ddad2dedb6 SHA512 5a4f106469ca8d5745eb5dcfef78ddde666d916e52ebdc8c0b053b22974430bc17d49fb6dd706e247cdccc5bef60e2102df0c993c4abbb6d0ee043a9bf8cf93f
 EBUILD bind-9.16.6.ebuild 10766 BLAKE2B 83963e592f2ab27789a0f4642ba5dd9d2cd6dab28e444b502962d140694293c4ef7d7bf60c68e709093fd2e9cf34af3f28b3768683e2bde20aaf208abbedefa2 SHA512 5de5ce0d73fba42a52c9e516682f50878033e4a9cdc6866f9b7d159efb640feb29b2643b43bc4542a5e2b46349ba2e11593dac9d767eb37d4ad5dd9e45ba5f2d
 MISC metadata.xml 1043 BLAKE2B 3bf699db16f6883700e32e5f0debc534fa2d763aca0cf8fe3878dedcbb110410d88c2dbb69b4d4df09df62943416de3aaed7d53a2371d004b8c19a2a5a609bc1 SHA512 137093eabcbda1feb7cdac0cb0b2eeb808a47062b4e8d114874ee4019847ecbf5996c7b19055981a5ebffd099b5a96ce6ada919719017d83f93bc679334845b9
diff --git a/net-dns/bind/bind-9.16.6-r1.ebuild b/net-dns/bind/bind-9.16.6-r1.ebuild
new file mode 100644
index 000000000000..4cce9cdc72a8
--- /dev/null
+++ b/net-dns/bind/bind-9.16.6-r1.ebuild
@@ -0,0 +1,379 @@
+# 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 eutils autotools toolchain-funcs flag-o-matic multilib db-use systemd
+
+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
+
+REQUIRED_USE="
+	?? ( geoip geoip2 )
+	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/geoip-1.4.6 )
+	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=(
+	# should fix https://bugs.gentoo.org/741162 taken from:
+	# https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/4073
+	"${FILESDIR}/bind-9.16.6-bug-741162.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)
+		"${@}"
+	)
+
+	use geoip && myeconfargs+=( --enable-geoip )
+	use geoip2 && myeconfargs+=( --with-maxminddb )
+
+	# 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
+	systemd_dotmpfilesd "${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() {
+	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/bind/files/bind-9.16.6-bug-741162.patch b/net-dns/bind/files/bind-9.16.6-bug-741162.patch
new file mode 100644
index 000000000000..9cc030c82b36
--- /dev/null
+++ b/net-dns/bind/files/bind-9.16.6-bug-741162.patch
@@ -0,0 +1,31 @@
+commit 56d2cf6f1ef008ab6cb50545af9b1d8a5c1ece81
+Author: Ondřej Surý <ondrej@isc.org>
+Date:   Mon Aug 24 10:15:07 2020 +0200
+
+    Print diagnostics on dns_name_issubdomain() failure in fctx_create()
+    
+    Log diagnostic message when dns_name_issubdomain() in the fctx_create()
+    when the resolver is qname minimizing and forwarding at the same time.
+    
+    (cherry picked from commit 0a22024c270a38a54f0d51621a046b726df158c0)
+
+diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
+index 8a36693a9a..b37e756c53 100644
+--- a/lib/dns/resolver.c
++++ b/lib/dns/resolver.c
+@@ -5122,7 +5122,14 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type,
+ 
+ 	log_ns_ttl(fctx, "fctx_create");
+ 
+-	INSIST(dns_name_issubdomain(&fctx->name, &fctx->domain));
++	if (!dns_name_issubdomain(&fctx->name, &fctx->domain)) {
++		dns_name_format(&fctx->domain, buf, sizeof(buf));
++		UNEXPECTED_ERROR(__FILE__, __LINE__,
++				 "'%s' is not subdomain of '%s'", fctx->info,
++				 buf);
++		result = ISC_R_UNEXPECTED;
++		goto cleanup_fcount;
++	}
+ 
+ 	fctx->qmessage = NULL;
+ 	result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER,
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 0a7606202b57..10dcbc5ca9b0 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -4,9 +4,7 @@ AUX dnscrypt-proxy.initd 667 BLAKE2B fba1075bd738fc86b50f37bc25e3ef7f54416d5d85c
 AUX dnscrypt-proxy.logrotate 105 BLAKE2B 892cc2acb621bb2c653f4545ac1c58777cc048b9a2f954eac7d92fdf6109b529884d20e4bc14af6aa6cde4d6e0dcac33347216de33e915f5d1ba850fda361602 SHA512 ef5f9886d7c49334e642fa6b0abd748fcff05e171493998559539f7f48f0241607d4923c7b30ed81b2bae1037ae28e49072170000a5b4cbeb6fb77e9dc3a6546
 AUX dnscrypt-proxy.service 1198 BLAKE2B a457e57e2b91e6725fa3a515a2754fc7f39fc3349602861eae8c8747e8cd811440df48f9029da514cd43a4d32a5f001ad6385354c754d0ea36c4a227a5c1f980 SHA512 11769c47ecd44169dd3aab26574a710c07e74f465417081b283f3f2f8b7f64ef77a24359555bc6b94144d38481661bac6087a7f79190bfb67c593e700b2202e5
 AUX dnscrypt-proxy.socket 517 BLAKE2B 959f3c38af826607a297b04c7c3284bb97588c8a8ea88e4502bb464eb791a88f7940f2131701ef071187910302b7c564aee928f1862eb15640c448179a54f066 SHA512 1f3776e37a9583771997f270983bc9430adf089631a94e52cd5f9dba07228584ecc149f37cf51f08b2c7f877d3e9aa430f98cf8d996d0f4cf3545c2c9ac0537d
-DIST dnscrypt-proxy-2.0.43.tar.gz 2279744 BLAKE2B f06892bc14da2be2e97dfb5d233420cf3726e359ccd0658d4309981291a12a7cac7a7592d11717a9466144bd5cb9d9a4e1b6ba8877a8b5c539783749588a10a1 SHA512 a1d14756d6be6450683a44adae197aa582df2556dda588debdadd0903b5993a4dc579880479f138ec3690045aeab833a19f23b2555a403930d26d4a5bc90ed5f
 DIST dnscrypt-proxy-2.0.44.tar.gz 2279842 BLAKE2B 90f156914dd29ab5baa2eb02ed2992583999a6688d09a532f8c7c1ec6d285bd39893f66726da928f295056fd66cd756f4332f1ed21284ffa3d357ce355a08625 SHA512 009e2b669c1d6f6cd6b41f5e04d08735587f420dacdea8d422a3c12a62614c1ce1963deebca3af1f956070abd9ff5df9182cb27e31fa0fac8a95478739445801
-EBUILD dnscrypt-proxy-2.0.43.ebuild 2845 BLAKE2B 0ccc6dff79fa94a1d4551a6f96247d19bc2a416297ccd6bdf40d0f6ef82e96d6878f52a78af405f1c936a1d9b6ff77c0f329ca815080a5ddbc35da80f01c8503 SHA512 be46f29a4efdf62a62b6293f1aa2b420ce52c6adeb9dbad219257f2cbfb146a35fa185acd6f4b9af90405565d5bfb2b39f970d12d6921795431bc477174e6df0
 EBUILD dnscrypt-proxy-2.0.44.ebuild 2842 BLAKE2B df98833edc111d3b2ee8304eddbf5ca002ee4f787ad09985f0b8e1f5edb5d2b27ef2f457aaa481198a8c42267e700892a7a910552a4ee7b333726a217768d755 SHA512 db0f3e0abb5cfbc76493c57ec29d6833c360f1a9a929ababc9a95e25c48ccd2a7ded9874177e14d1f078729d58ee23136122034644e6cbebc1485ff5df93b4f9
 EBUILD dnscrypt-proxy-9999.ebuild 2838 BLAKE2B e163d4d89bd9d66036ea6f454439a55f6b9bbf1fd859b0410c508880c063243a1b2e24f129ab94b06c79a0395d6bfa5705bd0e59169e66c15b6177f36652c3a4 SHA512 8e12277cf798a6aba9dd55ac8f35a9218a13b2ca4b06cf91e3255e6b09ef5be14209559f64574fb4454af455d152227ec7ce981bf4c3cad8fe1d045c99105af5
 MISC metadata.xml 618 BLAKE2B 5289dcd30374f9bedf43f71df91f80ca017c12474e22bcab3f5cd763e80e65174503c7d02bc4313ed927b0cc28dd8531526ce1435f56a929e45ed9c87f5f634a SHA512 78edb67c2f21c0b00eeff5d70298b187b7a0ac41845c10e2524da0d3b3e5127958f62796d53ec79e1d4565d46d7dd8b94e42753451c75f81687bacd0be5d00d5
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.43.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.43.ebuild
deleted file mode 100644
index bfc4fef8eb03..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.43.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/DNSCrypt/${PN}"
-
-inherit fcaps go-module systemd
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-else
-	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
-
-LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="pie"
-
-BDEPEND=">=dev-lang/go-1.13"
-
-RDEPEND="
-	acct-group/dnscrypt-proxy
-	acct-user/dnscrypt-proxy
-"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-
-PATCHES=( "${FILESDIR}"/config-full-paths-r11.patch )
-
-src_compile() {
-	pushd "${PN}" >/dev/null || die
-	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
-	popd >/dev/null || die
-}
-
-src_test() {
-	cd "${PN}" || die
-	go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests"
-}
-
-src_install() {
-	pushd "${PN}" >/dev/null || die
-
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins example-{blacklist.txt,whitelist.txt}
-	doins example-{cloaking-rules.txt,forwarding-rules.txt}
-
-	popd >/dev/null || die
-
-	insinto /usr/share/dnscrypt-proxy
-	doins -r "utils/generate-domains-blacklists/."
-
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
-	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
-
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-	go-module_pkg_postinst
-
-	if ! use filecaps; then
-		ewarn "'filecaps' USE flag is disabled"
-		ewarn "${PN} will fail to listen on port 53"
-		ewarn "please do one the following:"
-		ewarn "1) re-enable 'filecaps'"
-		ewarn "2) change port to > 1024"
-		ewarn "3) configure to run ${PN} as root (not recommended)"
-		ewarn
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "Using systemd socket activation may cause issues with speed"
-		elog "latency and reliability of ${PN} and is discouraged by upstream"
-		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
-		elog "It is disabled by default for new installations"
-		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
-		elog
-
-	fi
-
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver 127.0.0.1"
-	elog
-	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
-}
diff --git a/net-dns/dnssec-root/Manifest b/net-dns/dnssec-root/Manifest
index 7e5edd4810dc..4a9bb703f171 100644
--- a/net-dns/dnssec-root/Manifest
+++ b/net-dns/dnssec-root/Manifest
@@ -2,4 +2,4 @@ DIST icannbundle-20181220.pem 13026 BLAKE2B 36f760c69e8e22036d7d927071be25508b69
 DIST root-anchors-20181220.p7s 4182 BLAKE2B 3d7d881f5ef066a3ff937cf638941f783e9b65834a13ba0efce766b59e8f469826718cea9e8968ca64e216b7ef1f1b4d7b73c3110ff2d65667a28e071cd52859 SHA512 af96358bbb7847fe7c30452f566771480a38a99f192775168ab8672332381958ffa6d2f4870f539e3957b6ecf62e0e3a80b1cffbd579beb3be6941ffba3f6fa9
 DIST root-anchors-20181220.xml 690 BLAKE2B 548fd62073542f527e0b05c09ed1e668baafbb3cf7ca8afd1a32b67dd43d8958cef5005729c1bc11c2b1d0ddea48ca4db69a10b049f2e8a05536b93fff15e911 SHA512 e3adfaa4f8c9751599b8062787f4c3a81d3fa1478411f138f227c0cc972c7262bcf85578d333d36352da3628211b7d8ec4416528814a8937078dc393ce195f32
 EBUILD dnssec-root-20181220-r1.ebuild 2777 BLAKE2B ca4294540eb0b14c8f72d71857837f8652a1c7a8a6d1e6a094d429d518af60fb5d47382b837ace953dd64f70ddcedda9a500205e192d6d599fd242ab79dca5ff SHA512 39b013b100b553ea5d8034f9edd0fda36f9db4784f49f7e76884c71269152c917e2da4d5d7f0d386b52a2d57d068c6cfad69caa353be327db8d702b4ddc601a8
-MISC metadata.xml 449 BLAKE2B a4d0bb439c17b336bc45bb943266a63b12eebb8c16346d6bb50f2a5af10dc7470150d75dd77ee3503f28f4886335efedacd3629874f89322b71d4b23520e7857 SHA512 f4006edfc6d2283d607a3ed38afb76843b4eeb891739f706f1398de845d711203176e2e97b8583b109fb3a26dc5c7b79dd05adff6196db56d7f37873f006b895
+MISC metadata.xml 362 BLAKE2B 1fe72826bff07ec16390a67529eaa770332ebab559fda7d08ac0a5ff6077af64441390ed2aef1e3f5618ae9ea0271538f91196eed580aab2a7afd06fab8413ac SHA512 9f29773d521a77bd9049b1cdc7748814ba389184a5a4b69946ad8f47c3a74526c26787e90abbb4bca19eb9d20067cce1fa7de35c30246da7b45015049125aeb0
diff --git a/net-dns/dnssec-root/metadata.xml b/net-dns/dnssec-root/metadata.xml
index 9484e0fc3438..c9701593d29d 100644
--- a/net-dns/dnssec-root/metadata.xml
+++ b/net-dns/dnssec-root/metadata.xml
@@ -9,5 +9,4 @@
 		<email>whissi@gentoo.org</email>
 		<name>Thomas Deutschmann</name>
 	</maintainer>
-	<longdescription>This package distributes the ICANN DNSSEC root key</longdescription>
 </pkgmetadata>
diff --git a/net-dns/dnsviz/Manifest b/net-dns/dnsviz/Manifest
index 00e808c83db2..29b1df9f6af0 100644
--- a/net-dns/dnsviz/Manifest
+++ b/net-dns/dnsviz/Manifest
@@ -1,5 +1,5 @@
 AUX dnsviz-0.8.2-add-ed448-support.patch 6452 BLAKE2B 77f12acf3bd4224200f677b24899c56061a9d99d03de681bfa117869a7af4148faa30004a200cd6bb968ce53b67d1d3b72a0374e441ebc9ae96e22c3a88b9c95 SHA512 d2e60d7270267dac1237b8d32ae2a5b603972a9e9901eee03cf7d51e004f3d2aba911b3032f710f4b293b308b3507dfa74eede0e2a653b6c86b90123c9b847ad
 DIST dnsviz-0.8.2.tar.gz 404265 BLAKE2B c4ba6b5a7d6fee7c8e2cba0c90f29560152dd4beed1ef4d80a6a3bf9f81646ee8f0d61c38329233e300f2b434cb5d9e9d2a926dc72997ae68ff0a57e147bafcf SHA512 5414d9bda6c0bf5fdc5a84a09cb5833619110702749b12f87d63f5149de473f4bd1b6960c506c60ec5fc5ff82d789536cee70a299ff13c960a45776de2916c80
-EBUILD dnsviz-0.8.2-r1.ebuild 1731 BLAKE2B 0a4c8990500142c456f82fd177e63d08597f4ac4eaa4865b618ac03743fc1ec950b0bf035ec3d79f0565848b29b481285e76bfaa8d57a42f07f45ee0ecff3886 SHA512 5c800d8be346f2d7996fac14ef5fbc76ecb275b61b784bde622df3de8d52a39fd635b2a0290955354d1c5ebac33effa11586abf78df32d8d3292082b8721da71
-EBUILD dnsviz-0.8.2.ebuild 1408 BLAKE2B ff5fa7495e31ee1d10e3891a6f3465ad9f9e20a3d3f8fbdc37ad161eed6669961922c5362d0793b4043858ab9b82e07a973fa455409acd349d5c701594c45e26 SHA512 04b4f2b950065a7442bd4cccd36147b8689303f9a9bb8c6763da1b0df49cbd44720c221c35a6e0be38a83a6a83c15db0dab3c4e642fe11a863d8a924936045ad
+EBUILD dnsviz-0.8.2-r1.ebuild 1718 BLAKE2B 51a7c39f8eb65e73992636a7abb64c08ebbad430ba7856b3f6355e52360351701f7098bebf87aa42bb6c5398777707e40b2ccfff512e37d4fbdec08759a7b97c SHA512 5d1263df453b16919b2ef900e61aa05532436bd68adb8780324834544ad937f84737976df832ebd48b383bd080cd968ecbe3aec8fc33b55c4f3bc20dc3803e21
+EBUILD dnsviz-0.8.2.ebuild 1395 BLAKE2B 4b0ce01b65565162b761482e9e10640a37ccd1869c75f1dee695829dab6dfda6f4b8235abe07796a43e295fb0b24d96f329a39355f8ebef8869773d6d70008c2 SHA512 4a5a51429d9361124d8392d780ea43dc1412fe880d14a98fabf5e9f0d73b9cacbc5fe2aae3206994a6ad8d8842d17694de1262142bf647aac6bb6fcc6a3a962b
 MISC metadata.xml 799 BLAKE2B dc78a89bd168c950054144b3e3569fb9db9a9d423612d1bdb5eb56c6422e92de7d8bfb148c4d43784bddb811e3a2ab46a98875bef76c8c7198ed40aac9c02263 SHA512 87c3f080a01cc3b3524bde90e153c4cc0eae9c0c98c482ceffde452520e70bc2f84500aa8c8425086090ad81ea3cae5b489286256d3875875358836ca5b87a35
diff --git a/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild b/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild
index aaee35f2902a..e3d0dfa3d9f1 100644
--- a/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild
+++ b/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC"
 HOMEPAGE="https://dnsviz.net/"
@@ -54,10 +54,9 @@ pkg_postinst() {
 
 	# Warn about extra requirements for >=OpenSSL 1.1.0
 	if has_version '=dev-libs/openssl-1.1*'; then
-	   echo
-	   ewarn "With OpenSSL version 1.1.0 and later,the OpenSSL GOST Engine"
-	   ewarn "is necessary to validate DNSSEC signatures with algorithm 12"
-	   ewarn "(GOST R 34.10-2001) and digests of type 3 (GOST R 34.11-94)"
-	   ewarn "OpenSSL GOST Engine can be get from --> dev-libs/gost-engine"
+		ewarn "With OpenSSL version 1.1.0 and later,the OpenSSL GOST Engine"
+		ewarn "is necessary to validate DNSSEC signatures with algorithm 12"
+		ewarn "(GOST R 34.10-2001) and digests of type 3 (GOST R 34.11-94)"
+		ewarn "OpenSSL GOST Engine can be get from --> dev-libs/gost-engine"
 	fi
 }
diff --git a/net-dns/dnsviz/dnsviz-0.8.2.ebuild b/net-dns/dnsviz/dnsviz-0.8.2.ebuild
index 8a8cbadb11a8..5a2421a3a1de 100644
--- a/net-dns/dnsviz/dnsviz-0.8.2.ebuild
+++ b/net-dns/dnsviz/dnsviz-0.8.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC"
 HOMEPAGE="https://dnsviz.net/"
@@ -38,10 +38,9 @@ pkg_postinst() {
 
 	# Warn about extra requirements for >=OpenSSL 1.1.0
 	if has_version '=dev-libs/openssl-1.1*'; then
-	   echo
-	   ewarn "With OpenSSL version 1.1.0 and later,the OpenSSL GOST Engine"
-	   ewarn "is necessary to validate DNSSEC signatures with algorithm 12"
-	   ewarn "(GOST R 34.10-2001) and digests of type 3 (GOST R 34.11-94)"
-	   ewarn "OpenSSL GOST Engine can be get from --> dev-libs/gost-engine"
+		ewarn "With OpenSSL version 1.1.0 and later,the OpenSSL GOST Engine"
+		ewarn "is necessary to validate DNSSEC signatures with algorithm 12"
+		ewarn "(GOST R 34.10-2001) and digests of type 3 (GOST R 34.11-94)"
+		ewarn "OpenSSL GOST Engine can be get from --> dev-libs/gost-engine"
 	fi
 }
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 9a9f842f984d..b6d47c7a6207 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -2,5 +2,5 @@ AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d
 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 2643 BLAKE2B 822bb50ce325d59fc5348d472467e3b666492de83b6fb16e966e74271b63d7e1730975dcde3cc704b4c03c2b5bfafea6fd0ec451aa0f977b28e5b18cc89ca627 SHA512 72d2fa30acaafbe163e15b77e917d8cd76cfa20a81590666237d7afafece8a3542aab3b65d5172f47f6b3f775c3138f30c0a29b8beac3577ca0be25e9349fed2
+EBUILD libidn-1.36.ebuild 2650 BLAKE2B 8c8bd834548de8a6359ceec33753125e57c163199386d88f3d41cdeff7ad11b56ba3fc3d4a5b7c26996f0abc9333f4e16165943c1a04564196389ec9af3fa1f6 SHA512 37ae0f0a95dc4f5865f5ac6084af716c0d6246a2465fc37e6724b668a10bd2a8802aeaad8842ab71c5e9bf7c96f08735c0171c4875a91671af368ef54d2d8779
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/net-dns/libidn/libidn-1.36.ebuild b/net-dns/libidn/libidn-1.36.ebuild
index fc8669f60225..b21166f2731e 100644
--- a/net-dns/libidn/libidn-1.36.ebuild
+++ b/net-dns/libidn/libidn-1.36.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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"
+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"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 3f7ba2663171..a53d5bcbe1b6 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,7 +1,9 @@
 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.9.0.ebuild 1051 BLAKE2B a65dd7f686d9f2c77f0fa80be46d7fdc0bdc3c1f60f1e55b6d063c565ee1b229b27b79218c3021ac4984c75d44eee4bcb354500a8cfdb212f46252a9648d1c3c SHA512 e4d046ace895fc5323dad10e1aa267d486744d493a53c987399bd4d91fcfa3e3cfaf3527c4467da12c685f7dc76bf1c60325b4a9a690b7d7b1ae07b62a14216a
-EBUILD openresolv-3.9.2.ebuild 1097 BLAKE2B f64842286737d4551140728da7a54090ce14b8bce3f471c07ce38a6bdd5919ff5b47d70816298e28a4491754e23310a5b54d766d96ef6c71065671cfe478d887 SHA512 55cc9dc93231bd98b29c3ec12032266a23cd11fbdef244d558f55c0c9fc49c2e30737cc9ce6bde2f8128050005f7dd049964c6002917af54a702cf4d3b078556
+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.11.0.ebuild b/net-dns/openresolv/openresolv-3.11.0.ebuild
new file mode 100644
index 000000000000..45ba61bc2c8d
--- /dev/null
+++ b/net-dns/openresolv/openresolv-3.11.0.ebuild
@@ -0,0 +1,42 @@
+# 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
+}
+
+DOCS=( LICENSE README.md )
diff --git a/net-dns/openresolv/openresolv-3.9.0.ebuild b/net-dns/openresolv/openresolv-3.9.0.ebuild
index dde233146880..bf2ea346e270 100644
--- a/net-dns/openresolv/openresolv-3.9.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.0.ebuild
@@ -12,8 +12,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="selinux"
 
-DEPEND="!net-dns/resolvconf-gentoo
-	!<net-dns/dnsmasq-2.40-r1"
 RDEPEND="selinux? ( sec-policy/selinux-resolvconf )"
 
 src_configure() {
diff --git a/net-dns/openresolv/openresolv-3.9.2.ebuild b/net-dns/openresolv/openresolv-3.9.2.ebuild
index 7efc80a0a9a3..763dc738699d 100644
--- a/net-dns/openresolv/openresolv-3.9.2.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.2.ebuild
@@ -12,8 +12,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="selinux"
 
-DEPEND="!net-dns/resolvconf-gentoo
-	!<net-dns/dnsmasq-2.40-r1"
 RDEPEND="selinux? ( sec-policy/selinux-resolvconf )"
 
 src_configure() {
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index d5c2872a940d..0d26e299c43c 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,7 +1,7 @@
 AUX pdns-recursor-4.3.1-boost-1.73.0.patch 4563 BLAKE2B 81f5f33939f9937b78235c3ff3859f09ac162350f8b855c28e0235e0ca414716c03d0866c13d055ac55d8896c11c6c1b149b5f29baa105be7b3338c06081a886 SHA512 8dd57a7423cdf4b33c59dece2ee63829c9d88ee60635a7441c6e17e0fac5762319b5c913ed4454f38926c0b3cc9489a9d12360b35f3c632607cd26f7b7b2018b
 AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
-DIST pdns-recursor-4.3.2.tar.bz2 1354549 BLAKE2B 253f9a6ec3b7bfb4d3a97953c9f65458b479bdaa20fcc28d980a1cf4c1f15f80ad35251687bb5410f14268be79de4bbcec8bc36663a0a8eb51894fa6e4242547 SHA512 d1ca566dc8785fda3764838a0ea598acc4106b6261ebdbbe43fc6a6e4a82c375f7ef3f6d23fbd9b216067eb9cf56fcae6d460bfc7957ba4c201d466ad15d75d7
 DIST pdns-recursor-4.3.3.tar.bz2 1357853 BLAKE2B fa57776bbdb77d1f13f04fdd1fb5ceb07539f851704dc627443a7c814d6640b1e7890333b6d7214a201f5d3f83a54a7840adb6450ffb7696e58722625b7c57c5 SHA512 285f12d3cb2edaca7507dd9dad1356b60076d43af678458346489562ea8933a01d61d2430d5282b6afd213839ee684ad83e5f523c9a272f382d74ccc238bd9d5
-EBUILD pdns-recursor-4.3.2.ebuild 1948 BLAKE2B 55673baa5e17e3ea95e049bd6901a86b657e55ef8e7980acb52a902642da29b33d4d4b7c87e40d454d7e66692757820faf59cd87ce0d86adb07c5a9082f261de SHA512 3f5e5e8d8fdce3eaba2410a2d953ca6ba84ee8008a3c7ca106843691705b31fc51eb84c0591420bc8b31e911463a9a301f01bd21b507ecf062daf9a9b52ac36b
+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
 MISC metadata.xml 1008 BLAKE2B 1c82fd9262358bcf1ff0f8503bc8dfe9b640023133ca48711bc576df00312312b5e37a36ff10aac561ef1c71e20f64c5f0a4c431c60ca029220732fba0ee1bf9 SHA512 2deab5a88c42d3416b3da5b6d9d3ed9b2db0a5dcb3d8b7fc4c7a13b2219fd7df786bfef42ff5e3d7c2b40058592e892f380d126a0254013534e66e65499e7105
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.4.ebuild
index bffba0080a4c..cb9a0daba0e2 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.2.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug dnstap libressl luajit protobuf snmp sodium systemd"
 REQUIRED_USE="dnstap? ( protobuf )"
 
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 3df89f6783d8..b07c33423680 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -10,5 +10,5 @@ AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a7
 DIST unbound-1.10.1.tar.gz 5729334 BLAKE2B 7ca4f23c12a551bc6e5d6ec32f19ca0f54526b9a4c868ced8f31cfd31dec23f8240b78f0c00d2cc6f9aa21f6c1b98697c85ef3ebd804a838a5a082893fe98094 SHA512 d07f3ac0e751c17a3ff7d99518c22529cf6856861218564a2ca073422905525cb9ddaf76c9600187946fadb7324343bcd85c34ff06bd322e0ea621a2d258bb85
 DIST unbound-1.11.0.tar.gz 5900967 BLAKE2B 3119bbcd78fa19c610937215abc64abcc1ca96ba42b6753a1e36fef501f68971ac2ee0cb9bde377e0b257c57f505aeac2315a6bf031626874d30967b0a5eb46a SHA512 511e787c5f9647286b07028702a8909390e0e6eafe7224459d5f1eee8a8dfb09c71e33f291e30851dc57411123b91dfe0e124787109a7e4afdf6f3b02768e7cd
 EBUILD unbound-1.10.1-r1.ebuild 5424 BLAKE2B 85fe1509a5c82edf8985ce6cfa80325db99959566a7f63b9407d3c19311d420e98cfb29674538325740b485b48351a2e7621f6afdeb13c4f3152bff8c880b996 SHA512 8d65dadb63f9a70ee72e7cbadfc45a5921d4ec886540d01cab588696b0bbf7b30d502bcef1c0ae38d0e554979ca9cbe90bb7444ed00e87defb687640f9ea0546
-EBUILD unbound-1.11.0.ebuild 6006 BLAKE2B f19c8bfd9228fda50ab49684216acb9ea732d0b77965b6f71f6fc82c77e8ad3e52b4b8184e93c7665494e75ab90168e0b28170f5d541d4b5cfe10c74820d71cb SHA512 d463d822409131369181aec153b307deb7d2bf276bc5026e92b3371e74874ebb32b632e336ca4cee0ed31c256428319c57b2afb0e365e8142f81b950a2b805e1
+EBUILD unbound-1.11.0.ebuild 6005 BLAKE2B 266bfe78fc35e0a814ea702685ec7ba833aba636adff28b4586fca80f0333d48657c709c64cbb681b8a99b7e01757f2c22034ebca7124b15a0aee63e45fd5069 SHA512 f56324207be1326b41bb7aa5db37d16a32017ef60bc95ae3135811bdbd47c5e98a2e9b5105dc827be8f8ed129ba3e2227dc1e3881ad1a1a30bfedbab6475b06c
 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/unbound-1.11.0.ebuild b/net-dns/unbound/unbound-1.11.0.ebuild
index d4036a14013c..6152a8247d14 100644
--- a/net-dns/unbound/unbound-1.11.0.ebuild
+++ b/net-dns/unbound/unbound-1.11.0.ebuild
@@ -13,7 +13,7 @@ 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"
+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 )"