gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-dns
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
78 files changed, 1600 insertions, 526 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 0ed36bfc6c2b..e6f29f274ca8 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 0ed16f7f4b8b..bfde7c7c3a1d 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -7,7 +7,9 @@ AUX avahi-0.7-python3.patch 2810 BLAKE2B 523515d5d324e5b74d60abbdbc88469fec55ce3
 AUX avahi-0.7-qt5.patch 6033 BLAKE2B 10c7879f6e28942a32497c84dcf523f742cb13112d9e9c23f74967c2d6c05e6f463406716c144edc1bd4588c8c76693473765d9d678f6517c4a57615d0364b91 SHA512 cd8b900a5a068add3b7aa9080491938d469795c26e1a1869ee581b95d877ded4d120cb4db768fb4d97535a72e66c3fabf6617cdca2c9bdb50ff54e24d17b1f51
 AUX avahi-0.7-remove-empty-avahi_discover.patch 2593 BLAKE2B 0fddfd46a3fc3e66960e7c2b6028e825e703e2e3f5b3d672dc204e37b87d101bffa285857c5dc41c69fc03bb3e7935fdec774492a31d4ce59ed9b06c4a0a20f4 SHA512 7bdd2ec5f16fb2850a78c983d35ca1d76b6e0d45eb17267213d3fb95b07d213f042bfa9ae07fd16b6334cc4459c5e87ae28942db69cb1987a074d6e787f19f70
 DIST avahi-0.7.tar.gz 940047 BLAKE2B 8299577bf27ee65fad5d743dbf94202b148a6fc86825cae303f94c44482eea07cf6570d970ca286e81a787d6a64598b7123f2ac17a259ddc50ef431b9c94b530 SHA512 61f656da7614d8cca1862180038f571db3474c84f05db4d3509f614cdbf8b1a1047661b7e24d63682d5b48ed1bfa1b08b3c9e6dbe9222bcd62d99bc168a11abe
-EBUILD avahi-0.7-r2.ebuild 5259 BLAKE2B f730b961de58a8df4ab0ba9f2d35f7461d6c12291a349884fe62ffab205c3dbf9c9e0cc4fc9a4edd3f741533ea02e27024f5bf5794345d6619bad6f11835019b SHA512 0e5be607cce829fa4fc6280a005c6a2cfe0f9649439735c763a9a931aac26253d7987705a130835cd9c6a25bd5d9f47021f02c85eb86d223db73021b9a5bf45b
+DIST avahi-0.8.tar.gz 953319 BLAKE2B ddede1b8790ff3057ea5f4bb710e95578229e078a7abac83121e043017dda1ab3d971c723f920fdd4f3d98b88bd2cf21f9645bec1b7bbd2ea194cb399a5f5b46 SHA512 27bba9a551152dfc7e721f326042e7bfce55d227044a6cbaee04d6fb0e3f59c36e159c2b7a4dd42d1c955cdf37cc1c303e91991c08928bbded91d796e9a22abe
+EBUILD avahi-0.7-r2.ebuild 5260 BLAKE2B 6f90b55386b45cc491790ecea1f858ecfc682880cf463ff142a6ca921838b45a667d8cf453ce621b8532d108d64d97a840fd37cf9db4c6689f925381f3b301af SHA512 564eb6e982eb5d5750a2011187c340b54bbfc78f7d5e928b5841f0a54c98b54af0fa22c8cbacb7809ecc5f5259b93a858b27e9145f0cf0ba2b12574dcef05c75
 EBUILD avahi-0.7-r4.ebuild 5215 BLAKE2B 0d387cb0af825bd7813bdf0f99bdfbc83dc8f7f69a4c0e374bf0ff51522074453197f659019395cb4efcc50719b56c6206eade55c7ce28e075d70c48a140e2aa SHA512 ac32afae86f2347d0961978b8189345e0bb2ff9feda118f2075be148d8dcdb02da591ed5e93d417a2d8a050e206fb2ba6729e8f22422bed7bc052791c8587556
 EBUILD avahi-0.7-r5.ebuild 5337 BLAKE2B 315366bd28af27c4b3c718dbad3fde275a141831fa42b0c6bee76338295846d5ad7ab7964b41c8fec66b2c2fd22c2fa82aaaf2413b3fbf6bcf8719c1b7fe9c57 SHA512 69da22a77a5d3da0232a03a3f8ef09d9dcfe31e3c6fc0d9fc14cbe94affe6891d41607d9ae2d42b4c818a13813ada698dcd80c1ffb4c79357f8801fae355664f
-MISC metadata.xml 935 BLAKE2B 890b4a3ab97241ba254dcf68b97a6a8b2ae4af914dc2348b8eb9d6c3182c1d2dfbd5eca8dac009e30f4662b88001c159ac5479a100bfc48a956ac2d603b6343e SHA512 7d2114e25574532405b5ff6db66b833aef68772d5b699d8885e9f1005a1785298e5b71288a858572a1270c6a4d9d2ad98aac7f79f4df6713dea79778280c82d8
+EBUILD avahi-0.8-r2.ebuild 5449 BLAKE2B f483042160766dd30df2e95f305bae5bda4467f2e18c2c0a9c35da4cf405bd4c6b03bc5fa49698a78671036e1b7ca344ac0c4fb7262099074ae0be5ceefa256a SHA512 0615d12dfcd747456fdc9696da4733b11f5c245bb65a3a4f2abf4f527c95af02d3aaabef80093f97727a9e629d984c4172bd1703aaa4eccfbafb99225031b058
+MISC metadata.xml 1381 BLAKE2B 8cb0652562c645d37af7992e3c7aef13b2188b0f3747ff08c79a3da42b004e848690b2587253e9aab17ffb90c72bdd5de6f055310499b26f22a6e125d1ac4a39 SHA512 6ba95a2a869bffeb5df08db973b4154749f668500b004fb6f0a08f829ab1528e8366ba6cc0a0c005055e84d361432f62998eea944085c312d7c7adfe4c7b6af7
diff --git a/net-dns/avahi/avahi-0.7-r2.ebuild b/net-dns/avahi/avahi-0.7-r2.ebuild
index 7455288a1d55..90fbd6a1d881 100644
--- a/net-dns/avahi/avahi-0.7-r2.ebuild
+++ b/net-dns/avahi/avahi-0.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 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="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/avahi/avahi-0.8-r2.ebuild b/net-dns/avahi/avahi-0.8-r2.ebuild
new file mode 100644
index 000000000000..6f09403c3f26
--- /dev/null
+++ b/net-dns/avahi/avahi-0.8-r2.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="gdbm"
+inherit autotools flag-o-matic multilib-minimal mono-env python-r1 systemd
+
+DESCRIPTION="System which facilitates service discovery on a local network"
+HOMEPAGE="http://avahi.org/"
+SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
+IUSE="autoipd bookmarks +dbus doc gdbm gtk gtk2 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux systemd test"
+
+REQUIRED_USE="
+	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
+	mono? ( dbus )
+	howl-compat? ( dbus )
+	mdnsresponder-compat? ( dbus )
+	systemd? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/libdaemon
+	dev-libs/libevent:=[${MULTILIB_USEDEP}]
+	dev-libs/expat
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] )
+	qt5? ( dev-qt/qtcore:5 )
+	gtk2? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+	gtk?  ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	kernel_linux? ( sys-libs/libcap )
+	introspection? ( dev-libs/gobject-introspection:= )
+	mono? (
+		dev-lang/mono
+		gtk2? ( dev-dotnet/gtk-sharp:2 )
+	)
+	python? (
+		${PYTHON_DEPS}
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
+	)
+	bookmarks? (
+		${PYTHON_DEPS}
+		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	acct-user/avahi
+	acct-group/avahi
+	acct-group/netdev
+	autoipd? (
+		acct-user/avahi-autoipd
+		acct-group/avahi-autoipd
+	)
+	${DEPEND}
+	selinux? ( sec-policy/selinux-avahi )
+"
+BDEPEND="
+	dev-util/glib-utils
+	doc? ( app-doc/doxygen )
+	app-doc/xmltoman
+	dev-util/intltool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h )
+
+# These patches do not apply cleanly but may need to be re-instated.
+# I'll leave them commented out for now.
+#PATCHES=(
+#	"${FILESDIR}/${PN}-0.7-qt5.patch"
+#	"${FILESDIR}/${PN}-0.7-CVE-2017-6519.patch"
+#	"${FILESDIR}/${PN}-0.7-remove-empty-avahi_discover.patch"
+#	"${FILESDIR}/${PN}-0.7-python3.patch"
+#	"${FILESDIR}/${PN}-0.7-python3-unittest.patch"
+#	"${FILESDIR}/${PN}-0.7-python3-gdbm.patch"
+#)
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+	use python || use bookmarks && python_setup
+}
+
+src_prepare() {
+	default
+
+	if ! use ipv6; then
+		sed -i \
+			-e "s/use-ipv6=yes/use-ipv6=no/" \
+			avahi-daemon/avahi-daemon.conf || die
+	fi
+
+	sed -i \
+		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
+		doxygen_to_devhelp.xsl || die
+
+	eautoreconf
+
+	# bundled manpages
+	multilib_copy_sources
+}
+
+src_configure() {
+	# those steps should be done once-per-ebuild rather than per-ABI
+	use sh && replace-flags -O? -O0
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-monodoc
+		--disable-python-dbus
+		--disable-qt3
+		--disable-qt4
+		--disable-static
+		--enable-manpages
+		--enable-glib
+		--enable-gobject
+		--enable-xmltoman
+		--localstatedir="${EPREFIX}/var"
+		--with-distro=gentoo
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable dbus)
+		$(use_enable gdbm)
+		$(use_enable gtk2 gtk)
+		$(use_enable gtk  gtk3)
+		$(use_enable howl-compat compat-howl)
+		$(use_enable mdnsresponder-compat compat-libdns_sd)
+		$(use_enable nls)
+		$(multilib_native_use_enable autoipd)
+		$(multilib_native_use_enable doc doxygen-doc)
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable mono)
+		$(multilib_native_use_enable python)
+		$(multilib_native_use_enable test tests)
+	)
+
+	if use python; then
+		myconf+=(
+			$(multilib_native_use_enable dbus python-dbus)
+			$(multilib_native_use_enable introspection pygobject)
+		)
+	fi
+
+	if use mono; then
+		myconf+=( $(multilib_native_use_enable doc monodoc) )
+	fi
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# used by daemons only
+			--disable-libdaemon
+			--with-xml=none
+		)
+	fi
+
+	myconf+=( $(multilib_native_use_enable qt5) )
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	multilib_is_native_abi && use doc && emake avahi.devhelp
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+	use bookmarks && use python && use dbus && use gtk2 || \
+		rm -f "${ED}"/usr/bin/avahi-bookmarks
+
+	# https://github.com/lathiat/avahi/issues/28
+	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
+	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doxygen/html/.
+		insinto /usr/share/devhelp/books/avahi
+		doins avahi.devhelp
+	fi
+
+	# The build system creates an empty "/run" directory, so we clean it up here
+	rmdir "${ED}"/run || die
+}
+
+multilib_src_install_all() {
+	if use autoipd; then
+		insinto /lib/rcscripts/net
+		doins "${FILESDIR}"/autoipd.sh
+
+		insinto /lib/netifrc/net
+		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
+	fi
+
+	dodoc docs/{AUTHORS,NEWS,README,TODO}
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	if use autoipd; then
+		elog
+		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
+		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
+		elog
+	fi
+
+	systemd_reenable avahi-daemon.service
+}
diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
index dab8c0571291..0832dd78f287 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -6,15 +6,14 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
-		<flag name="autoipd">Build and install the IPv4LL (RFC3927) network address
-		configuration daemon</flag>
-		<flag name="bookmarks">Install the avahi-bookmarks application (requires
-		<pkg>dev-python/twisted-core</pkg> and <pkg>dev-python/twisted-web</pkg>)</flag>
+		<flag name="autoipd">Build and install the IPv4LL (RFC3927) network address configuration daemon</flag>
+		<flag name="bookmarks">Install the avahi-bookmarks application (requires <pkg>dev-python/twisted</pkg>)</flag>
 		<flag name="howl-compat">Enable compat libraries for howl</flag>
-		<flag name="gtk3">Build the avahi-ui-gtk3 library, and use gtk3 for the
-		avahi utilities under USE=utils</flag>
-		<flag name="mdnsresponder-compat">Enable compat libraries for
-		mDNSResponder</flag>
+		<flag name="gtk"  restrict="&lt;net-dns/avahi-0.8-r2">Use gtk2 for the avahi utilities (overridden by USE=gtk3) and build the avahi-ui library</flag>
+		<flag name="gtk3" restrict="&lt;net-dns/avahi-0.8-r2">Use gtk3 for the avahi utilities (overrides USE=gtk) and build the avahi-ui-gtk3 library</flag>
+		<flag name="gtk2" restrict="&gt;=net-dns/avahi-0.8-r2">Use gtk2 for the avahi utilities (overridden by USE=gtk) and build the avahi-ui library</flag>
+		<flag name="gtk"  restrict="&gt;=net-dns/avahi-0.8-r2">Use gtk3 for the avahi utilities (overrides USE=gtk2) and build the avahi-ui-gtk3 library</flag>
+		<flag name="mdnsresponder-compat">Enable compat libraries for mDNSResponder</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">lathiat/avahi</remote-id>
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index e5e80095c106..c62e58cf07a1 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,7 +1,9 @@
+DIST bind-9.14.11.tar.gz 6310200 BLAKE2B 90fccfa24f576b3e028b947a1c9b6ca05c03175675e9573129068534f1e7cfb89a46f7de21b6ad1fabc7bb68d56997c4bf8a2309dd5f29b52fc61d4d271bd131 SHA512 ec34254d6fe5d72c704ba743d1af5582f2ea6b79363f132013ea9ebebed72c74a3ea9ae8a7978ca2b28f908ef848b9c2961cec85254b7d88680c269233b40524
 DIST bind-9.14.8.tar.gz 6403140 BLAKE2B 45cb06ce8564880d501c63d25c7af8567184e4e4293e01886620cf655449c972ab55c77c7aded07838c61557bc56d9edac26097715c1121fcfb6b606d7a29365 SHA512 eb52760982ebd246e6e1945684771193fc7364324a6d6a95a0cae33afa0a4fa24ffe8313b5f9094420c7c2ec932b1b1a9fb19f6e673ff3c5583ab5e3ff04eb6a
 DIST bind-9.14.9.tar.gz 6296339 BLAKE2B 65496ab94a83ddd1c519df4519373aa77858c6d66efed9342e962cd61943b12e9ecb2f74132015b3f835d0368d1cc59be23e0db92d4780f9f367c0d0fe8c3ada SHA512 aa6b1273f06fc16c842b7012a4d09cb65325a44ee88fea8bea8264ffa907ef4a6f8d5e09384599b2d6f5cea66c0dc220765c245814f54b2f09a5b6e65f97964b
-DIST bind-9.16.0.tar.xz 4533976 BLAKE2B f9892258a10a2423b4b26ae78927109c03ca39440f1d93d5d29369b666ef2ad8a8be72079f78a8b464f1e897b4d6c6511de280bba3f4e98fdf9604e9d1366c78 SHA512 6f836fe4cb12d3e2e3a871f69e5b249b2bae6ae1dc542395c79cc974ca95aa595e963b6716a38f6c9d5cb3c54ec606fcd932412a6fbe596651123ac1379dd010
-EBUILD bind-tools-9.14.8.ebuild 3126 BLAKE2B dfa5d646d9df053b9996039ad19c6ecc618872f0d6fa64892e9ec524984bdafb0b7ce9dd5fc0ecacd31bfa20037e450d5d4268bc08b8171f3a03cb168e09e32e SHA512 78df03681f88832c85b8c4a253bbef4cd5aec8ab6ba8f426cd694e913abc66d5453b448788949130fc579ed32440f254902e2c8ad060b0b7a19448dbcf642a11
-EBUILD bind-tools-9.14.9.ebuild 3135 BLAKE2B 1c7913c93f7ad9716ee109ebbb28235103927cf51db7d94a99349d2534d3ad987593ee94b7a44b1ace94022c5b9a39b38af53f6b0b86c27d825090e5d4e52645 SHA512 f7169f6babe5181da116e9931727200c08b7fda61feecceec20a497ec5c4bcfa52502a389eb410e090d05e86c54a9b3740d06bc9ee25e1f0d29f461a68838a69
-EBUILD bind-tools-9.16.0-r1.ebuild 3153 BLAKE2B df9e8ff13cd9e7449ebcc7033c30f976065628ca412a37d174ec747d3b23afbc2dea5a1c5518987cb7dd15eaaef2d4ad59522ac95f6a08a13f4d6fd94855bf98 SHA512 e696ced858360945ea88df80a95a06a8093198c1117ce7362fe6a175dc6df5f79c370d72be5fc7cdcc1f354fb8cafc52f72c0c9eaa56934d538137d00d755dc6
+DIST bind-9.16.1.tar.xz 4541768 BLAKE2B 4a2697c5317b2e186e57ef6613bdaedddb0f371c5a3d6a18b93c8e20de553eaa4d81d567e49b5ea395506e1d8aee729dcfa10896ed6dc8fee268d9ed5c7670d8 SHA512 9a1e8987f312b09a16c2ee0fd1d1eb8e4951b8dbcf3c0d51a1a1fb179a261028239ab2bebc3e559592cc766de57a26ba37b27621a0c5e1711d36c2416f0a0c26
+EBUILD bind-tools-9.14.11.ebuild 3131 BLAKE2B 112a3438c465ee190a48162de12262c72be3d7e632d3a9f7072956571365216cb72dff0d8828bb0fed64533c37325786070203b72e2ab8b2cf35ff17f81574ca SHA512 e8eb7b1b8ee08d6aeabc62df4f86315068c161693aba50a7a5363f869ab09866914bf13739e9574e8106bdd09b2d580aba832f1099903bf1dffc0cfcdced8b22
+EBUILD bind-tools-9.14.8.ebuild 3123 BLAKE2B b835f6a2f94f61506b32c27d20d3971141f2f4edbd0a57aa77900375cfbbce52337aeda9fbc042daabc884117bf946b5ea8b7c2b656ef016d52faaab119eff58 SHA512 fa4804481455dd2852284ac0c9f0c50f3348b8a786ac4b45b441265c023d72c61f6a9ad6b2a5627376a4e8eaeed8c8c5d521098f6186c73a2b955aba50010d05
+EBUILD bind-tools-9.14.9.ebuild 3131 BLAKE2B 112a3438c465ee190a48162de12262c72be3d7e632d3a9f7072956571365216cb72dff0d8828bb0fed64533c37325786070203b72e2ab8b2cf35ff17f81574ca SHA512 e8eb7b1b8ee08d6aeabc62df4f86315068c161693aba50a7a5363f869ab09866914bf13739e9574e8106bdd09b2d580aba832f1099903bf1dffc0cfcdced8b22
+EBUILD bind-tools-9.16.1.ebuild 3149 BLAKE2B 447f8836c020b27c6a11715572ba0cd1038207e2bf2cd01e34bf00a2dd9403f8108892bc1bd899376979c64d8803af280acc5ac6e35f6f4b8033f32c118ba903 SHA512 ffdce682e5cf47da43ad16e705c2282397b1d9ab0bca22d810d818b129532c68d8b8baf4de1db1bc3dc6b2fcbf987ed49938bc93eb7d88775602b2921703d85d
 MISC metadata.xml 423 BLAKE2B 6424fc07b8bba765fa045750b1de629ae57a7004ef10839a3069dab45f20e01e6b50ae755e344f77130edc639aee17c9320dcbb64ed5289fb86a9fb129967617 SHA512 1ec81bf782ad0014c890349248d8ec0302c1940fb13953754ee03f8ea907b0edae79b436e7983982e8f273d04112c8263c416b06e973eba22ac179dd9c68f649
diff --git a/net-dns/bind-tools/bind-tools-9.14.11.ebuild b/net-dns/bind-tools/bind-tools-9.14.11.ebuild
new file mode 100644
index 000000000000..b4e1f595e910
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.14.11.ebuild
@@ -0,0 +1,137 @@
+# 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.gz"
+
+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="
+	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}"
+
+BDEPEND="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
+		--with-openssl="${EPREFIX}"/usr
+		$(use_with idn libidn2)
+		$(use_with xml libxml2)
+		$(use_with gssapi)
+		$(use_with readline)
+		$(use_enable caps linux-caps)
+	)
+
+	# 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/
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	cd "${S}"/bin/delv || die
+	dobin delv
+	doman delv.1
+
+	cd "${S}"/bin/dig || die
+	dobin dig host nslookup
+	doman {dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate || die
+	dobin nsupdate
+	doman nsupdate.1
+	if use doc; then
+		docinto html
+		dodoc nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+		revoke settime signzone verify; do
+		dobin dnssec-"${tool}"
+		doman dnssec-"${tool}".8
+		if use doc; then
+			docinto html
+			dodoc dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind-tools/bind-tools-9.14.8.ebuild b/net-dns/bind-tools/bind-tools-9.14.8.ebuild
index 215b109028d5..e179fdad3264 100644
--- a/net-dns/bind-tools/bind-tools-9.14.8.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
 
 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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
 
diff --git a/net-dns/bind-tools/bind-tools-9.14.9.ebuild b/net-dns/bind-tools/bind-tools-9.14.9.ebuild
index 8868521f0f3a..b4e1f595e910 100644
--- a/net-dns/bind-tools/bind-tools-9.14.9.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
 
 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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
 
diff --git a/net-dns/bind-tools/bind-tools-9.16.0-r1.ebuild b/net-dns/bind-tools/bind-tools-9.16.1.ebuild
index 0e49a3df65d7..430038762701 100644
--- a/net-dns/bind-tools/bind-tools-9.16.0-r1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.1.ebuild
@@ -16,7 +16,7 @@ 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 2ca85a7aba7e..f71b95db1ee0 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -8,11 +8,13 @@ AUX named.conf-r8 4020 BLAKE2B beb900a89be0f2acc1b08a8d29443c87b098e5ac1f1de9c63
 AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f5bae6c2313485808b99a1a46fc10431913d187ed67cc1e6bad019a9192638bc7fdf97c951e2326ce SHA512 68fa7c8963ac59349de3d05972c07aa0123b7bebbe0ba9604463ccfd1b377c2babe01eed4745cbe0f7d3831d1b47c2fa620f8092c67465fb771cae4932b0861a
 AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
+DIST bind-9.14.11.tar.gz 6310200 BLAKE2B 90fccfa24f576b3e028b947a1c9b6ca05c03175675e9573129068534f1e7cfb89a46f7de21b6ad1fabc7bb68d56997c4bf8a2309dd5f29b52fc61d4d271bd131 SHA512 ec34254d6fe5d72c704ba743d1af5582f2ea6b79363f132013ea9ebebed72c74a3ea9ae8a7978ca2b28f908ef848b9c2961cec85254b7d88680c269233b40524
 DIST bind-9.14.8.tar.gz 6403140 BLAKE2B 45cb06ce8564880d501c63d25c7af8567184e4e4293e01886620cf655449c972ab55c77c7aded07838c61557bc56d9edac26097715c1121fcfb6b606d7a29365 SHA512 eb52760982ebd246e6e1945684771193fc7364324a6d6a95a0cae33afa0a4fa24ffe8313b5f9094420c7c2ec932b1b1a9fb19f6e673ff3c5583ab5e3ff04eb6a
 DIST bind-9.14.9.tar.gz 6296339 BLAKE2B 65496ab94a83ddd1c519df4519373aa77858c6d66efed9342e962cd61943b12e9ecb2f74132015b3f835d0368d1cc59be23e0db92d4780f9f367c0d0fe8c3ada SHA512 aa6b1273f06fc16c842b7012a4d09cb65325a44ee88fea8bea8264ffa907ef4a6f8d5e09384599b2d6f5cea66c0dc220765c245814f54b2f09a5b6e65f97964b
-DIST bind-9.16.0.tar.xz 4533976 BLAKE2B f9892258a10a2423b4b26ae78927109c03ca39440f1d93d5d29369b666ef2ad8a8be72079f78a8b464f1e897b4d6c6511de280bba3f4e98fdf9604e9d1366c78 SHA512 6f836fe4cb12d3e2e3a871f69e5b249b2bae6ae1dc542395c79cc974ca95aa595e963b6716a38f6c9d5cb3c54ec606fcd932412a6fbe596651123ac1379dd010
+DIST bind-9.16.1.tar.xz 4541768 BLAKE2B 4a2697c5317b2e186e57ef6613bdaedddb0f371c5a3d6a18b93c8e20de553eaa4d81d567e49b5ea395506e1d8aee729dcfa10896ed6dc8fee268d9ed5c7670d8 SHA512 9a1e8987f312b09a16c2ee0fd1d1eb8e4951b8dbcf3c0d51a1a1fb179a261028239ab2bebc3e559592cc766de57a26ba37b27621a0c5e1711d36c2416f0a0c26
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.14.8.ebuild 11356 BLAKE2B 52e18616d623f3f68b0162535f623ee0fd1ac59d2d322a3495b041434ca3a4e0d3aaa64f085907b17a274778174a1228329724df44f3a44a57356bde2d2a09fb SHA512 d8d0a17ee96751ff00ac4fcd753643262d53434edbef5d93591098b3d090769be6a92e6995c65e08c257eab2735544e4851ec8bc2666a62061dcf86ae5207647
-EBUILD bind-9.14.9.ebuild 11364 BLAKE2B 270b21cd9c0689c8cb6c1fb8f32ad4cee8ba7e13ff59bee673f7a36e371eee448a21f97fc7569c09e1abb33f60d772b74f84a016482dcbda2e74077afc263dee SHA512 bf3af82ae06e2dab24ea347b1bce6ff8ee7bdfe90f593f70c8673ad44db120b321be98b5205daf9f4aa4b5576eb390c1f12da0692b752233431ecd7dabfa0a08
-EBUILD bind-9.16.0.ebuild 11333 BLAKE2B 5b5daee221936dd519f250dfd29f1beeccd4a03596963efbe80c41b93560348300024767abbd90e423c4d011cd6b94826e35116acb6429e58cbcef4ca936d16c SHA512 c4dd55e2d9be84577a3cade90c40f04edb9aae40e9dc973d74a3cc71f1aeba8b32844480e0a51f39130f4266c6d6c4a8bb0c94358a24a3d2e97260ddd6d9b8fd
+EBUILD bind-9.14.11.ebuild 11360 BLAKE2B de639a334f5f44e73d24fb3fc7cbfe08d9990e64f4efcd03ad6da2ade7adb9480c1538f572cdcd080533d57eb85d33c375cc262004946f1b4ff7959b516ccdb3 SHA512 ba89c0de1b98c6e2334caaecf5c7eb99e7fc8e1b96568ad75274d0015b574d58390b451b06f77cfe4eb657b6a7b7b78cedc3da7283257c6785fc231753d4f50b
+EBUILD bind-9.14.8.ebuild 11353 BLAKE2B ad192b5823ca915511b4a12325b3585ad6cd518f4d969b22fd91222628215b112f504d3df5c5ce9b0d3e7c6136b9153f8e7c6d4f5398a6c80660c373d6e61aa0 SHA512 df8f92513d2d53a3977ee2b270273a79ecff104ed21ec70309a5141d81611c2ab15e0504a4f23bd3ea122caa0a92d53257373b6f265873b2dee8783f61ee2df1
+EBUILD bind-9.14.9.ebuild 11360 BLAKE2B de639a334f5f44e73d24fb3fc7cbfe08d9990e64f4efcd03ad6da2ade7adb9480c1538f572cdcd080533d57eb85d33c375cc262004946f1b4ff7959b516ccdb3 SHA512 ba89c0de1b98c6e2334caaecf5c7eb99e7fc8e1b96568ad75274d0015b574d58390b451b06f77cfe4eb657b6a7b7b78cedc3da7283257c6785fc231753d4f50b
+EBUILD bind-9.16.1.ebuild 11294 BLAKE2B 06d14cae8126c687da12020a5d4ae58a6e377279752b1163c5b9372789cd6e2e6555e9626e78d33682f22617de56bf7aa4f3ffdab472c3ed7aa054a07e806139 SHA512 bb1ec283371ed4af23f8277a118d67f0ab608ce313b93d73bdf1c01577c493a525d98c11862c39e1b40f33021ed52a1b788e871ededb73dacbeeec24ee9cda68
 MISC metadata.xml 1043 BLAKE2B c4b1341082f3bd13a93ea378f61608a65ac7f904273932dcdbcf2a73ea8b4c7610ced855ed4a3fb61c7b02044db23bd0effda02d71b3114c7b4017c06784ac31 SHA512 879eca4059049ced098da9afe6aec250d174fabbc701e55ca6c22cfdf050b7c49289113a7e9ad99fa90685ca62c5f672201e04c7f0c766b55d780e26f8da59a2
diff --git a/net-dns/bind/bind-9.14.11.ebuild b/net-dns/bind/bind-9.14.11.ebuild
new file mode 100644
index 000000000000..99596a751354
--- /dev/null
+++ b/net-dns/bind/bind-9.14.11.ebuild
@@ -0,0 +1,378 @@
+# 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,7} )
+
+inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user 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.gz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+#	sdb-ldap? (
+#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
+#	)"
+
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# -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} )"
+# sdb-ldap? ( dlz )
+
+DEPEND="!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}]
+	)"
+#	sdb-ldap? ( net-nds/openldap )
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	sys-process/psmisc"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/bind-9.14.8-mysql8-bool.patch
+)
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_prepare() {
+	default
+
+	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir) -ldl"
+
+	# Adjusting PATHs in manpages
+	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
+		sed -i \
+			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+			"${i}" || die "sed failed, ${i} doesn't exist"
+	done
+
+#	if use dlz; then
+#		# sdb-ldap patch as per  bug #160567
+#		# Upstream URL: http://bind9-ldap.bayour.com/
+#		# New patch take from bug 302735
+#		if use sdb-ldap; then
+#			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+#			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
+#			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
+#			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
+#		fi
+#	fi
+
+	# 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
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir=/etc/bind
+		--localstatedir=/var
+		--with-libtool
+		--enable-full-report
+		--without-readline
+		--with-openssl="${EPREFIX}"/usr
+		$(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 libjson)
+		$(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 python)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+	)
+
+	use geoip && myeconfargs+=( --with-geoip )
+	use geoip2 && myeconfargs+=( --with-geoip2 )
+
+	# 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
+}
+
+src_install() {
+	default
+
+	dodoc CHANGES README
+
+	if use doc; then
+		dodoc doc/arm/Bv9ARM.pdf
+
+		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}.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
+
+	if use python; then
+		install_python_tools() {
+			dosbin bin/python/dnssec-{checkds,coverage}
+		}
+		python_foreach_impl install_python_tools
+
+		python_replicate_script "${ED}/usr/sbin/dnssec-checkds"
+		python_replicate_script "${ED}/usr/sbin/dnssec-coverage"
+	fi
+
+	# 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}
+
+	dodir /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"
+}
+
+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/bind-9.14.8.ebuild b/net-dns/bind/bind-9.14.8.ebuild
index 71849d180edf..ee7bb3065f41 100644
--- a/net-dns/bind/bind-9.14.8.ebuild
+++ b/net-dns/bind/bind-9.14.8.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
 
 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -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.14.9.ebuild b/net-dns/bind/bind-9.14.9.ebuild
index 1a057167b9ee..99596a751354 100644
--- a/net-dns/bind/bind-9.14.9.ebuild
+++ b/net-dns/bind/bind-9.14.9.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
 
 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -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.0.ebuild b/net-dns/bind/bind-9.16.1.ebuild
index 323f6fe4642d..9628c36243ac 100644
--- a/net-dns/bind/bind-9.16.0.ebuild
+++ b/net-dns/bind/bind-9.16.1.ebuild
@@ -36,7 +36,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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -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
@@ -53,7 +53,6 @@ REQUIRED_USE="
 	ldap? ( dlz )
 	dnsrps? ( dlz )
 	python? ( ${PYTHON_REQUIRED_USE} )"
-# sdb-ldap? ( dlz )
 
 DEPEND="!libressl? ( dev-libs/openssl:=[-bindist] )
 	libressl? ( dev-libs/libressl:= )
@@ -73,8 +72,8 @@ DEPEND="!libressl? ( dev-libs/openssl:=[-bindist] )
 	python? (
 		${PYTHON_DEPS}
 		dev-python/ply[${PYTHON_USEDEP}]
-	)"
-#	sdb-ldap? ( net-nds/openldap )
+	)
+	dev-libs/libuv:="
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index a490b9aa99b9..f79fd562ac33 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -2,7 +2,7 @@ AUX c-ares-1.12.0-remove-tests.patch 422 BLAKE2B 37b7a7a85f053d6a2231b46ca244ffb
 DIST c-ares-1.13.0.tar.gz 1446797 BLAKE2B 9d7daaad8e35242f110ee8b4abf20619e46beb3fcf49a1b6d7df596fd4129b56cb92f4aeba10845aeb6ed4f4d789ac11745ddc87803ca5bf27fed1aebdb4286c SHA512 4a7942e754673f5b8d55a7471e31b0f390e8324b14c12077580c956147fad4d165c7fe8a3190199b1add95c710ceeb1a7957706d4f0d6299d39c5dddc719bd9d
 DIST c-ares-1.14.0.tar.gz 1335940 BLAKE2B d62a0b6d5ea4a2926ff8f2f719d267f9a0c97fa9756b80fcf7c97822f3dd7a1ce9587d9db0ea5217f052f54f5858c68e71c78c33f32fe60df81f456cd9719ac6 SHA512 30cd3f8c4eea15f994b2ceb44d84e506858f69f624e651e39bb4db523fea9ad5e8906b75abf07131ae364be19172274ed4053059669091f21ce4463cdbb857bf
 DIST c-ares-1.15.0.tar.gz 1347687 BLAKE2B c4028bb2840af23274b79c73600bfcf73a348c7ab63ae3c215829e0fe2cf149f4ad38a3ec657c3997bad818ced3cacaed0579dd0dd2ef42eaffd074bdc4f22ed SHA512 a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50
-EBUILD c-ares-1.13.0.ebuild 975 BLAKE2B 4de234bbe1e9d1ddfd1e4756db8fbcbd135cbee626c1367d7c41b30cd88bf51889f8de7f5d83353a62f02488f8a91adb2a0b0f22a3544da16b84919022741fd9 SHA512 9b27aa2e58a75f2c795bd930e89f778463685e9c238afa51944fd4ecc09af4b6ca9e0562a3e691f2c3c0f1cc3de6bbf53e31d04ef9e11cdc2df0f0620b2187d4
-EBUILD c-ares-1.14.0.ebuild 987 BLAKE2B c189fa6f1dbddb62584fec0848c77333c2404d961f565ce70aabc410daa2cb387169032524b9a91672c87d466625277af277ea114f7172cee8dba7a5c3bfebf5 SHA512 3854d9fd22d7868dcfe87ca2fa2d6a6c0bdf26101d99f15c2eca406c5e2c05137853b23e816bcc4c1866926aa884af31630d00900645ed3b388468571dbb404d
-EBUILD c-ares-1.15.0.ebuild 984 BLAKE2B cddfceb88f30cc2506843602cced01be447d82c5d599c340e194dcc0a0fa4632c2d5ca21dc3ae0bd40d76b4903d39e8650f0d492cbc4f3bbf1f932e635d8af22 SHA512 f81e972d2cb4eac718b610eace32125e6d9b6b0db137a061a77d4b6747963b582a10658f79511ca96fa6b9bcdfd1033f78f84ab6b4902fdd8fd673e0736e0f38
+EBUILD c-ares-1.13.0.ebuild 974 BLAKE2B 0e9b50022def2e41acd61928b086fab3b77fa966131e3b09c48b6facebe5cb122dcc61e44421c3c9bb016c3fc00d4bff445ee163b8ba56f012ff2c7798b0c0ac SHA512 fe9ffaf09ca0f06e8ac033feab35d4f201a086d30a75ed1f1d38d364d79980d5277a5b1eb2dd678fc67b00973555563e1b49bdf6075807c4581804fd08973805
+EBUILD c-ares-1.14.0.ebuild 983 BLAKE2B e626899e3caba69343c8455b1e9c8d9d6905ac03548a8c1b86cc8d6fc76bbe33f395881ff173d95aadb05627803e7b3d05b4ebb648aa6676345cbb0d9172ec2e SHA512 9af3795654dbdcdb15a5337c932b59a96485a859aedd5667fd8b274742998210af6bb9e7c56666135d599484bfba5be67ba8c7b93d1ce7204baf0fb00554b236
+EBUILD c-ares-1.15.0.ebuild 981 BLAKE2B 4d20cf42383b320b43d75de1d62346d19027b2f9e4dbc055184034985ba4945a9699bf08ff94e49f648c1df57c62e316b46e26a6ca8755d4542db41a4b057407 SHA512 64f0df8e932e2963c3ad6b613d3f821b19cf5b16f363c634890ab081129278eea971b770a7076fcc624887acb08aa01798e9430265b7ce9ee69b44124653ff22
 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.13.0.ebuild b/net-dns/c-ares/c-ares-1.13.0.ebuild
index 9477cdd1ff07..695730eeb126 100644
--- a/net-dns/c-ares/c-ares-1.13.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.13.0.ebuild
@@ -10,7 +10,7 @@ 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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 # Subslot = SONAME of libcares.so.2
diff --git a/net-dns/c-ares/c-ares-1.14.0.ebuild b/net-dns/c-ares/c-ares-1.14.0.ebuild
index 3e621769f26f..00d4c05f1ef9 100644
--- a/net-dns/c-ares/c-ares-1.14.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.14.0.ebuild
@@ -10,7 +10,7 @@ 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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 # Subslot = SONAME of libcares.so.2
diff --git a/net-dns/c-ares/c-ares-1.15.0.ebuild b/net-dns/c-ares/c-ares-1.15.0.ebuild
index 27a3aae31e73..dfb6b071710e 100644
--- a/net-dns/c-ares/c-ares-1.15.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.15.0.ebuild
@@ -10,7 +10,7 @@ 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+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
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index 8652f07972f6..2ec3bcc7ec6a 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.0.tar.gz 59018 BLAKE2B b9b58108d9f124fcd5a72cc57bfb0e6a5bc2e115edc27a1d5950a929670d67d5c703b09f51e7e82e977ccfb544d115da177b0ac8dc06a76a800aa207cde5a42d SHA512 ae314c96a37dd90256d6acf62f4a4523b72f540194131e351a032239b00b4520351f6549d3b20a9209fe49ccc6de7ce158ffa8635d341066ea71b789dc667438
-EBUILD ddclient-3.9.0-r3.ebuild 1490 BLAKE2B ba428bcb794f0087ae3d92095a05a49ec52307c03edc1bb771df008839fcfe86d841d1822d80b21bab0cadcdf3a5132d46672370ff45548ef893d4c1aa4c687b SHA512 78df67a5422d438c1fbac07b2d49849799f0ba8d07194ece93f23320f7d33c45aa52207f454793b8943b76f003421a57f97d2574e861b36b39b178d42633080a
+EBUILD ddclient-3.9.0-r3.ebuild 1491 BLAKE2B 081c440e79719d02f666439026ee97534b2aa0d391d8901e3d38256e65618d5fd32d998ca5d4cb027d9fc888c7d540f0fb07879bbb1f663ea1e637b72679f09a SHA512 ccb99b8d8e0b72fd4f3b15b764d6975b22de3e15b274fd8d50dc1024da27cce4e638b9c0ec1530e2e325560e61fd8645016b09b466188414d526330e64442fc1
 MISC metadata.xml 999 BLAKE2B 03fc5ec95eaabd6a8c15006f04ffa5e1c9d809719629319a8f919237a1d7359d8ea82ffa29b2796099eafd7ee152e81b544971734f1d751bf8f61e2cb51c1f0c SHA512 f70662793b7eca94703847084e4c0882ab6a6ec891383bd012c03afbb26c7b252db5adfdfaa9937dce1988b1c88bcd91f1a7a3c318b1fe3a5a6479d74de4a6b0
diff --git a/net-dns/ddclient/ddclient-3.9.0-r3.ebuild b/net-dns/ddclient/ddclient-3.9.0-r3.ebuild
index 539a6e306351..e9bb2440f64f 100644
--- a/net-dns/ddclient/ddclient-3.9.0-r3.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.0-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Perl client used to update dynamic DNS entries"
 HOMEPAGE="https://sourceforge.net/projects/ddclient/"
 SRC_URI="mirror://sourceforge/ddclient/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="examples iproute2"
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 71b26c23a34d..cc6fd26499fd 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,18 +1,17 @@
 AUX config-full-paths-r10.patch 2487 BLAKE2B a0c7ff420a9000903ec8fdf446c463ef367db2ec934147817f08c12277d5e1704db7c7ec89ec068a5cdc26f88eb794f8caf6d9eb318764783ad62e22ce9a2798 SHA512 15a8af5fff20d9f9d7931faf40d2f9ff1a960a764d7330287af65290e85e986892f0b94a6b311e8ae0be60be3b78caa10c71e438275f20d44706850c2a61d407
+AUX config-full-paths-r11.patch 3971 BLAKE2B f0d819a673bf50516331f305f46c90c89bc0a527f00b47db109ce567fa91121ea012ee820804a66bc5e70a53ba113a5eb2e394551beddf65200e0f2fe6b5fd6d SHA512 8fa35ff68c8b9cbc760bfd8e3f72b0e7ab4818b9d01f94ccfc91fc677281352641b219281632750b2c44ec1848d8a32b40e5e08d47ac94e0e4e87f1b23cdde1c
 AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179a7e2103fdf716711912987961969619e6b6e6b2e201253e90f828ffa5eb011c0870c112a028c4cfd89ce5 SHA512 25ccbc09df7b51bc0fa4587f7a715429ba11517c64db53086dd09df24470da71b81dbacebe227bd41d1f9576b4560dc58729969eb7b33aa233ec6a6a07d573ab
 AUX dnscrypt-proxy.initd 667 BLAKE2B fba1075bd738fc86b50f37bc25e3ef7f54416d5d85cf3e6d088be0707164007b1ff9c01ac2b0a583724f726cde41a96cd77c8beab11082dbc7b5c03a05c8cf95 SHA512 89677b8718c1a45a6d8b1a0501dc5c4ff8c02793181ac84316fe5488807726bc66b40849c2f91da817862997628b3456926f5efc6ede9c25bf3f5e6533fb88ee
 AUX dnscrypt-proxy.logrotate 105 BLAKE2B 892cc2acb621bb2c653f4545ac1c58777cc048b9a2f954eac7d92fdf6109b529884d20e4bc14af6aa6cde4d6e0dcac33347216de33e915f5d1ba850fda361602 SHA512 ef5f9886d7c49334e642fa6b0abd748fcff05e171493998559539f7f48f0241607d4923c7b30ed81b2bae1037ae28e49072170000a5b4cbeb6fb77e9dc3a6546
 AUX dnscrypt-proxy.service 1198 BLAKE2B 14db1a48f94b07622e0f52d8510e6c1634013e66ab5e5cdd7ddf7c0cde4441fd78b71134e4cfb6f122ba4a191ec032d54e92b1be97e4bd49af61a873431ea002 SHA512 c7dfe482a8ea17cb67681b92ac65a2d2d58d2be364351d131b0b689905d80390c5df794f6c7fb944bd508f69af72af96d36c1b7f7c5c70af7ee636423ab77e11
 AUX dnscrypt-proxy.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36
 DIST dnscrypt-proxy-2.0.33.tar.gz 2723092 BLAKE2B 26ed819f264c1a536b2e47d9ffa412097eba5c9597ad2a5e7ff7a485ad660aeb882c5ce527bb072a5f7b5782387ce1b72cc74400973f9cebd66a50bd2308d830 SHA512 5c6eb655aa70457889253cbf630e7e37011a461a7f181f0a667694d53146ad9dee88bbbf80c7db3187bba0054af2a63b7b5be1a229800b2566a9758e9d047429
-DIST dnscrypt-proxy-2.0.34.tar.gz 2741556 BLAKE2B 81e3c5b1de70cf81882725b1d1f9bfb0b687dbac6ce408c70178ac7107c6c4fc6fbee4a05deb775519aef82c2added5cec9e264a73af1b6eca1524ecd973c381 SHA512 b48bbedbd5fea5514669ff5593ecd0aee083979c3030fe775558441ee2c398206eba786b9497022c3fab08fe7ee49dcc5205303629834f8fe65d7246e3352381
-DIST dnscrypt-proxy-2.0.35.tar.gz 2740595 BLAKE2B a64d1771979179f6b2387473c6ac21705b30263572550efd4ffb8ef008e67a74878ab4e72bbb4f29528c4c13dfaf4654f7625671579cb90c3b784ab4299f7ec0 SHA512 41e3c0646e215da3ce00e9ff9f22a4d3468b6589c424343ce0649c5a47cdbce26c2d9ffc3abf61c35d85eda964c499877d6f13619ce2308fe045a0272b1ca0e9
-DIST dnscrypt-proxy-2.0.36.tar.gz 2814470 BLAKE2B d1483d1c0550d9493129fd7b9969d45ab5225b09cfa6c2e10c60d9df963742664a1fa75720561e1e883c4688077ee1e2de84669f527271c8c5455e435ea2daf8 SHA512 b1e3ed2a0226eaf35980b9f1125e0794640bcd837f99b8f2a0346498770305f04e27f13ccf97f01f0639285ef35f63cbbf72e9f2b419d592b615f6b07cdf7f2d
 DIST dnscrypt-proxy-2.0.39.tar.gz 2814424 BLAKE2B 59be804a9c9641dd43e6b49e95c58c7d20dfdc940f2279a47a9ced707d1bbe64b1864c65feab2cada6c12945567ffd93478bd0a8129d40ea65c0fef50e5e90e4 SHA512 d4eacd8d1989b99d9932d66ef609948558af26f9db1fc37acd6b5609e2a410d20828e32f2b79f2f9fbdf822998af641aec20128e4c58233663929106e29d8e24
+DIST dnscrypt-proxy-2.0.41.tar.gz 2323421 BLAKE2B 572a0ad15df6c40d1738b296972584f5d8fe382ca3c0a05b4fc74e986e767a058227dda2127c843127bc0b90e8b7bbe17a5eaee42175f0b77e21160ac63f7a88 SHA512 26be163daa03633f2d76f1121fb1987e0155613bd84cbb2aad2ba0eedbd35ec0b393d1c1a0aaba47968b3a08bd0273ad929a164695ce35d2ebe05ce3b5f5dfd1
+DIST dnscrypt-proxy-2.0.42.tar.gz 2324442 BLAKE2B 8444eca1fc2bfc6029c1848bbeb77697b9b9c228c1bd0d17ed357b73667524c7052b33410a92847743533c3712f749fd93dbac46a81da48dae367e2a515cad8c SHA512 093b07ee8eb44c1264e6ea4b60ad32e0221b1b02c1d61f142b1fbf37dc5181533cc3c5d6e7468d0f7488611de4620947684269da9f08f21da0aa501ba70be711
 EBUILD dnscrypt-proxy-2.0.33.ebuild 2844 BLAKE2B 102fbbd728941229fcb8b24352e0877332bc325d0e0ad02d98636a557ce1f12c0e94d662db90b51ce324313d9393e8d7b31ee630b495a9e75d757b346ce8f7a7 SHA512 65f477eb5c9676ed2dea9d9806a19fdaeacfe43cf4aefbc8397ee6588915578b159b525975713671b202693c44040d19817258c41628f03e98f481fe5ff23347
-EBUILD dnscrypt-proxy-2.0.34.ebuild 2683 BLAKE2B ca235eaf06453f1e0ac7b8791373255b66e482d13081ce8e4d99045ecb3e836e60fbd858825213ed4ff23e213e5da21974bc7126ad933a22d9a3951a1eb25c5a SHA512 77174dbde156c9f01f5030d733692d49fd0ae606ade1ea2527c2a4eb67b0723a33a9a57d4708473f72629ae29bea491f841643d77b0fd790f7b5cf9a8e8f196f
-EBUILD dnscrypt-proxy-2.0.35.ebuild 2683 BLAKE2B ca235eaf06453f1e0ac7b8791373255b66e482d13081ce8e4d99045ecb3e836e60fbd858825213ed4ff23e213e5da21974bc7126ad933a22d9a3951a1eb25c5a SHA512 77174dbde156c9f01f5030d733692d49fd0ae606ade1ea2527c2a4eb67b0723a33a9a57d4708473f72629ae29bea491f841643d77b0fd790f7b5cf9a8e8f196f
-EBUILD dnscrypt-proxy-2.0.36.ebuild 2683 BLAKE2B ca235eaf06453f1e0ac7b8791373255b66e482d13081ce8e4d99045ecb3e836e60fbd858825213ed4ff23e213e5da21974bc7126ad933a22d9a3951a1eb25c5a SHA512 77174dbde156c9f01f5030d733692d49fd0ae606ade1ea2527c2a4eb67b0723a33a9a57d4708473f72629ae29bea491f841643d77b0fd790f7b5cf9a8e8f196f
-EBUILD dnscrypt-proxy-2.0.39.ebuild 2683 BLAKE2B beca491cacda52fa30fab664f949fa024f754d41d90b0551d325452669f2c3d83c01c29448d6c069d2e80fcab7fa0865e14ba2d168da653edc49a869bc656e50 SHA512 212e1e714de89b035c7233a09776a940fe113d8262418492457fa77effe81aed941edecf1933ea29b9308b12367979a5f517ed6556b07a66bcda44ec1b39f3ea
-EBUILD dnscrypt-proxy-9999.ebuild 2683 BLAKE2B ca235eaf06453f1e0ac7b8791373255b66e482d13081ce8e4d99045ecb3e836e60fbd858825213ed4ff23e213e5da21974bc7126ad933a22d9a3951a1eb25c5a SHA512 77174dbde156c9f01f5030d733692d49fd0ae606ade1ea2527c2a4eb67b0723a33a9a57d4708473f72629ae29bea491f841643d77b0fd790f7b5cf9a8e8f196f
-MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
+EBUILD dnscrypt-proxy-2.0.39.ebuild 2714 BLAKE2B 19bb5336fb627f2d3a054881d0b03e58bf9bd0d60b042e5d6f3a08ecf971cf46e293970f83ec02e74c45d1a819a6275f4b4ced7331533b1ba4161612d463d73b SHA512 12cd927c191f742a661ec3029a95843371661899c49729e6945d486ac5447e07fe6621277de9d3342dfdd258ca7c9693b4ebdbb5e928e3f02451d505523021a2
+EBUILD dnscrypt-proxy-2.0.41.ebuild 2716 BLAKE2B 15a136a2378267022e8f0a8dd1e7a992f0e60e79ed3e4217706ce0cd0cb7d74a2068bd8734fbdfbbcde711d0ef29b4b3bdfbcfd11124f0c1576bbd73fe52fe09 SHA512 6077db640017c2a2e5f8ce6b38ab46d53a54740be1ca95b4ca84f374f4d202fe74c7353dbce4705e283c816adec5a6eeecc5ec1af9348bcf69d30d1fd47c9867
+EBUILD dnscrypt-proxy-2.0.42.ebuild 2723 BLAKE2B f9f046764c708094dc47498b88f16e592f6f5384848b12200e5785cd7a0be0700b52ae0fcd2f179f833bc3f228454b090f96b5c16ec9ff3d331147f959962a53 SHA512 d0ddfda5147712861095ddeb45ce8e88aed38e2687637576b7d30eccda3a68794fbea1f4cc5687795b862341e8607633bfa0c3d17818b0a4463c8739855cc7b9
+EBUILD dnscrypt-proxy-9999.ebuild 2716 BLAKE2B 15a136a2378267022e8f0a8dd1e7a992f0e60e79ed3e4217706ce0cd0cb7d74a2068bd8734fbdfbbcde711d0ef29b4b3bdfbcfd11124f0c1576bbd73fe52fe09 SHA512 6077db640017c2a2e5f8ce6b38ab46d53a54740be1ca95b4ca84f374f4d202fe74c7353dbce4705e283c816adec5a6eeecc5ec1af9348bcf69d30d1fd47c9867
+MISC metadata.xml 847 BLAKE2B a75805eb34aff94fa0e786397fce79a516f230ecd0e6dd62f10b7f917ee55bbc771c120e11495df5c6e11847f84b33e999628ca6da1ad57fbfa43a18f629897b SHA512 acd053787fb7a0e2c89c7f70fc7e24eccc945b9eb3083276b3683685674d995650f252d00400ee064e6d548855aa389b66d2d652dc5e0c787cb8a1248490c358
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild
deleted file mode 100644
index 3d902b82aaef..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/jedisct1/${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 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/jedisct1/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-r10.patch )
-
-src_compile() {
-	pushd "${PN}" >/dev/null || die
-	go build -buildmode="$(usex pie pie default)" || die
-	popd >/dev/null || die
-}
-
-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/jedisct1/${PN}/wiki"
-}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.39.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.39.ebuild
index df2231142205..99b2bf98d0e5 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.39.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.39.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 else
 	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 ~x86"
 fi
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
@@ -34,7 +34,7 @@ PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
 
 src_compile() {
 	pushd "${PN}" >/dev/null || die
-	go build -buildmode="$(usex pie pie default)" || die
+	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
 	popd >/dev/null || die
 }
 
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.36.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
index 3d902b82aaef..b5bda3db325f 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.36.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.41.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGO_PN="github.com/jedisct1/${PN}"
+EGO_PN="github.com/DNSCrypt/${PN}"
 
 inherit fcaps go-module systemd
 
@@ -30,11 +30,12 @@ RDEPEND="
 "
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+PATCHES=( "${FILESDIR}"/config-full-paths-r11.patch )
 
 src_compile() {
 	pushd "${PN}" >/dev/null || die
-	go build -buildmode="$(usex pie pie default)" || die
+	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
 	popd >/dev/null || die
 }
 
@@ -95,5 +96,5 @@ pkg_postinst() {
 	elog
 	elog "nameserver 127.0.0.1"
 	elog
-	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
 }
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.42.ebuild
index 3d902b82aaef..0f6de969f21f 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.42.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGO_PN="github.com/jedisct1/${PN}"
+EGO_PN="github.com/DNSCrypt/${PN}"
 
 inherit fcaps go-module systemd
 
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 else
 	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
@@ -30,11 +30,12 @@ RDEPEND="
 "
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+PATCHES=( "${FILESDIR}"/config-full-paths-r11.patch )
 
 src_compile() {
 	pushd "${PN}" >/dev/null || die
-	go build -buildmode="$(usex pie pie default)" || die
+	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
 	popd >/dev/null || die
 }
 
@@ -95,5 +96,5 @@ pkg_postinst() {
 	elog
 	elog "nameserver 127.0.0.1"
 	elog
-	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
 }
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index 3d902b82aaef..b5bda3db325f 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGO_PN="github.com/jedisct1/${PN}"
+EGO_PN="github.com/DNSCrypt/${PN}"
 
 inherit fcaps go-module systemd
 
@@ -30,11 +30,12 @@ RDEPEND="
 "
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+PATCHES=( "${FILESDIR}"/config-full-paths-r11.patch )
 
 src_compile() {
 	pushd "${PN}" >/dev/null || die
-	go build -buildmode="$(usex pie pie default)" || die
+	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
 	popd >/dev/null || die
 }
 
@@ -95,5 +96,5 @@ pkg_postinst() {
 	elog
 	elog "nameserver 127.0.0.1"
 	elog
-	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
 }
diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch
new file mode 100644
index 000000000000..b7489fa2985c
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/config-full-paths-r11.patch
@@ -0,0 +1,106 @@
+From c6a126931297b8256c06ea5c85229a721768f15e Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Wed, 25 Mar 2020 13:38:31 -0700
+Subject: [PATCH] config paths
+
+---
+ dnscrypt-proxy/example-dnscrypt-proxy.toml | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/dnscrypt-proxy/example-dnscrypt-proxy.toml b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+index 778de5c..5eaffb1 100644
+--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
++++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
+@@ -142,7 +142,7 @@ keepalive = 30
+ 
+ ## log file for the application
+ 
+-# log_file = 'dnscrypt-proxy.log'
++# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
+ 
+ 
+ ## Use the system logger (syslog on Unix, Event Log on Windows)
+@@ -399,7 +399,7 @@ cache_neg_max_ttl = 600
+   ## Path to the query log file (absolute, or relative to the same directory as the config file)
+   ## On non-Windows systems, can be /dev/stdout to log to the standard output (also set log_files_max_size to 0)
+ 
+-  # file = 'query.log'
++  # file = '/var/log/dnscrypt-proxy/query.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -425,7 +425,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Path to the query log file (absolute, or relative to the same directory as the config file)
+ 
+-  # file = 'nx.log'
++  # file = '/var/log/dnscrypt-proxy/nx.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -460,7 +460,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'blocked.log'
++  # log_file = '/var/log/dnscrypt-proxy/blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -488,7 +488,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'ip-blocked.log'
++  # log_file = '/var/log/dnscrypt-proxy/ip-blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -516,7 +516,7 @@ cache_neg_max_ttl = 600
+ 
+   ## Optional path to a file logging whitelisted queries
+ 
+-  # log_file = 'whitelisted.log'
++  # log_file = '/var/log/dnscrypt-proxy/whitelisted.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -585,7 +585,7 @@ cache_neg_max_ttl = 600
+ 
+   [sources.'public-resolvers']
+   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
+-  cache_file = 'public-resolvers.md'
++  cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
+   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   prefix = ''
+ 
+@@ -593,7 +593,7 @@ cache_neg_max_ttl = 600
+ 
+   [sources.'relays']
+   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/relays.md', 'https://download.dnscrypt.info/resolvers-list/v2/relays.md']
+-  cache_file = 'relays.md'
++  cache_file = '/var/cache/dnscrypt-proxy/relays.md'
+   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   refresh_delay = 72
+   prefix = ''
+@@ -603,7 +603,7 @@ cache_neg_max_ttl = 600
+   # [sources.quad9-resolvers]
+   # urls = ['https://www.quad9.net/quad9-resolvers.md']
+   # minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN'
+-  # cache_file = 'quad9-resolvers.md'
++  # cache_file = '/var/cache/dnscrypt-proxy/quad9-resolvers.md'
+   # prefix = 'quad9-'
+ 
+   ## Another example source, with resolvers censoring some websites not appropriate for children
+@@ -611,7 +611,7 @@ cache_neg_max_ttl = 600
+ 
+   #  [sources.'parental-control']
+   #  urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md']
+-  #  cache_file = 'parental-control.md'
++  #  cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
+   #  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+ 
+ 
+-- 
+2.26.0
+
diff --git a/net-dns/dnscrypt-proxy/metadata.xml b/net-dns/dnscrypt-proxy/metadata.xml
index a53696d4406a..4319f7f3675b 100644
--- a/net-dns/dnscrypt-proxy/metadata.xml
+++ b/net-dns/dnscrypt-proxy/metadata.xml
@@ -2,9 +2,17 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>sam@cmpct.info</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		dnscrypt-proxy provides local service which can be used directly as your
 		local resolver or as a DNS forwarder, encrypting and authenticating
@@ -12,6 +20,6 @@
 		to upstream servers.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">jedisct1/dnscrypt-proxy</remote-id>
+		<remote-id type="github">DNSCrypt/dnscrypt-proxy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 745a3a8f2695..1aaefb1cecf6 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,3 +1,4 @@
+AUX dnsmasq-2.80-cve-2019-14834.patch 1514 BLAKE2B 24aad94e0a324007c782337b94ee88dc61fdb3e23b06717a4f09255dfcadfa9091c211994d5b842a898692bd5302d96a2b2c4c2a551863a1f0bd7ff7a62c3df4 SHA512 1cb0148d93388c09762d770719dc842aa0b04c0770fb82ae6f3de4cf7c2742055cf54f1915d93bfaac543ccccd48d66fd6191758f0541ba8c30936af97b96296
 AUX dnsmasq-2.80-linux-headers-5.2.patch 696 BLAKE2B 10f39e0e7eab2f6d4b621bd33d558a93ff310c9800d0a8db3ff280f77556d0e9e05287d50e14f95661aaf56c2456939605bf0541fc0bd2d96b0d27d9f14cb85a SHA512 5a46deec52d18fe231c0f794c39ce97414c9fb0a1e26fda5e1d3c350a6c00652d193d1e4f55b14adbaa61a23c97683cde172711e8934b271b33ee9d4e0889135
 AUX dnsmasq-2.80-nettle-3.5.patch 1494 BLAKE2B e65092e18f8fbaa3b0f8be637b18ec976da1a1752b621ce1e1337bdc85e529ccf4bb21988296cae6574e8ff26983c32731656a751631455713afd93c0f7ea41d SHA512 df64088b22f996ff228fce18dd05b329d9fdf7b02290bc3992546004394e662be7bc416dc718ea866341403234eb20efd5bbf1eec96df1cb6ab099ebfd3fdee4
 AUX dnsmasq-init-dhcp-r3 721 BLAKE2B 94a7542419e2c931149edbd5a5167c7fcbe0233e48f3ed854dfe26090b596c4f2549e37d2680bfceb1c6d21f475012f81a2102bde85e7cd609979e555dbcfa3d SHA512 f7a64fb84a7877b5ec629f9ed92419799913b8f2f73594c510aedc083d72c5c1862da7e5aed4485102c3b89ca7217bcca88e7cdde82f5a65d4cd4bb19017c2fe
@@ -6,5 +7,5 @@ AUX dnsmasq.confd-r1 170 BLAKE2B 84d5cdb15236c9e1c83fa53d0e401df90e86c6687cc88f9
 AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f9002a3426c05632896a5f94a84ada168d672cb38e236cbde72b59201c970e348ba052dff655be1a9a57b4 SHA512 b59b299849487dcdfc18ab30ded0605e2df4876cb778b2d1cd03b740406a5580001028eb33f1ecf0dc910f393c58b7cad7c28801aa4641c3fa376e3dac997abf
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
 DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068
-EBUILD dnsmasq-2.80-r1.ebuild 4785 BLAKE2B 160e80bba3296fab50cdcff099b4b2aa1ec5dc7332895bc4bad36a97a9a3bc0a1cc1a00ba2f90a743ca7fbbc09c9576e6a11200a8a1a4974344a80e2ac08477c SHA512 87ee450195e6032ffa5f651133863cb1d6e49a1f1d877b7981f5a3e0f353f275332e54dc1f4bcb4d686ace3174cddf22ebf5eccd6d2ab1f7c01da653ac389ac9
+EBUILD dnsmasq-2.80-r2.ebuild 4831 BLAKE2B 6f9d26f373d551c7e623126daac06236dfd28a6bb1e8b240ce7cc67e925d1613463e2c8e95549aaad04566712ab697a57f039593dd94feb3e96768074831d90f SHA512 ded0f38b712acb054ebb2ddf13defbb79a162857d0432f781dad8d2aa63a115a6367fa679f2d39563a8f189b549060d119fec98f9832300e61339f03031b6efb
 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.80-r2.ebuild
index 21ac335b7b86..b1920a182914 100644
--- a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.80-r2.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 ~sh 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"
@@ -56,6 +56,7 @@ REQUIRED_USE="dhcp-tools? ( dhcp )
 PATCHES=(
 	"${FILESDIR}/dnsmasq-2.80-nettle-3.5.patch"
 	"${FILESDIR}/dnsmasq-2.80-linux-headers-5.2.patch"
+	"${FILESDIR}/dnsmasq-2.80-cve-2019-14834.patch"
 )
 
 use_have() {
diff --git a/net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch b/net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch
new file mode 100644
index 000000000000..a44ceabece71
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch
@@ -0,0 +1,39 @@
+Fix memory leak in helper.c
+
+Thanks to Xu Mingjie <xumingjie1995@outlook.com> for spotting this.
+
+author: Simon Kelley <simon@thekelleys.org.uk>	
+commit-url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=69bc94779c2f035a9fffdb5327a54c3aeca73ed5
+diff --git a/src/helper.c b/src/helper.c
+index 33ba120..c392eec 100644 (file)
+--- a/src/helper.c
++++ b/src/helper.c
+@@ -80,7 +80,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
+   pid_t pid;
+   int i, pipefd[2];
+   struct sigaction sigact;
+-
++  unsigned char *alloc_buff = NULL;
++  
+   /* create the pipe through which the main program sends us commands,
+      then fork our process. */
+   if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1)
+@@ -186,11 +187,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
+       struct script_data data;
+       char *p, *action_str, *hostname = NULL, *domain = NULL;
+       unsigned char *buf = (unsigned char *)daemon->namebuff;
+-      unsigned char *end, *extradata, *alloc_buff = NULL;
++      unsigned char *end, *extradata;
+       int is6, err = 0;
+       int pipeout[2];
+ 
+-      free(alloc_buff);
++      /* Free rarely-allocated memory from previous iteration. */
++      if (alloc_buff)
++       {
++         free(alloc_buff);
++         alloc_buff = NULL;
++       }
+       
+       /* we read zero bytes when pipe closed: this is our signal to exit */ 
+       if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1))
diff --git a/net-dns/dnssec-root/Manifest b/net-dns/dnssec-root/Manifest
index a6a49c13c33e..1e9edbdae08b 100644
--- a/net-dns/dnssec-root/Manifest
+++ b/net-dns/dnssec-root/Manifest
@@ -1,5 +1,5 @@
 DIST icannbundle-20181220.pem 13026 BLAKE2B 36f760c69e8e22036d7d927071be25508b6906838f0f468900385d5a3b9ce301c5688f9bdcab471abc5445a14bfbbe34ecb39ca131b01d9e6bbebcc3f1481241 SHA512 6a8b8bec6d104d31253a8acafc1694a095714537a39a4dc53a379ac900c83715f85d75ea7322de430557691ff31ec95ae5104f47b050da3568dd68377c2d5767
 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 2787 BLAKE2B 048263642587cdc1a07a722504f94304ecbcdf8c94cb88edc22a3eb79645fa465d72874c5f529bbd32a0b8d69455f5e153f99320bdbdb49abdd778dfe985e743 SHA512 84bb2c034834ec69457767985c7b54af97a118e45423878d5b94cf20c5e5b9b2c0469ccbb7a7070014309118a191179c7019262dc8c48ba6beb0cd67e8849638
+EBUILD dnssec-root-20181220-r1.ebuild 2783 BLAKE2B d9b7f08cd02a52e5042be6b5ad9a740a364b4aae1a7c9839c904bfbdd44f18146c6a1ac2b98c58881056fa53c655815279fe905218072a6f9915df24aa8b6d9e SHA512 6b08898f4bcbc53da850bd414c0760db745a6181a2b9e56b6ea3362832603b061e0b45e575c1e25cf93f4a5c8095e671c713a6d00a2a2684f89ae17644e1eb72
 MISC metadata.xml 449 BLAKE2B a4d0bb439c17b336bc45bb943266a63b12eebb8c16346d6bb50f2a5af10dc7470150d75dd77ee3503f28f4886335efedacd3629874f89322b71d4b23520e7857 SHA512 f4006edfc6d2283d607a3ed38afb76843b4eeb891739f706f1398de845d711203176e2e97b8583b109fb3a26dc5c7b79dd05adff6196db56d7f37873f006b895
diff --git a/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild b/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild
index 9c33658f21cd..11cc3150096d 100644
--- a/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild
+++ b/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-${P
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE=""
 
 BDEPEND=">=dev-perl/XML-XPath-1.420.0"
diff --git a/net-dns/hash-slinger/Manifest b/net-dns/hash-slinger/Manifest
index a1617e5c451e..fc114951db39 100644
--- a/net-dns/hash-slinger/Manifest
+++ b/net-dns/hash-slinger/Manifest
@@ -1,7 +1,3 @@
-DIST hash-slinger-2.6.tar.gz 34864 BLAKE2B 4bd66a30ce0f6f57676d8c8691a38743b2b4263fc600b9a3756f1ff4676477bd61a4b20df082227a3437ca2bcbb1ad4e44643f8a87cda0a1123dab8fafa26140 SHA512 1e5d67ed2ef8eae910927fbd7419928d87ba31a91ca43a1c163b05f725da96a50d30e1539c4c55a68a22f0e2c9a2f7c7101fbdcfb5fc903e87fe4c22e20f33af
-DIST hash-slinger-2.7.tar.gz 37684 BLAKE2B e8758251c51139723778ca0db271cbc730e19bba25fad3f7f784f06774ce52038f520c11b526fffd30570854112f0e7b184f6d05e4d20847ac2c014bc66151f8 SHA512 b1b3e46c4cdd8b983b55156c9bcc58afc973c2503cde48283e98306e381753547f425bfaee68707ae10b2e31b71d01485b34e4a9841c9ce2048f9551f23d0976
 DIST hash-slinger-3.0.tar.gz 38056 BLAKE2B e72bbddf587225c86ccf7b5c76a48bdece2bf1925a496ae930e9a4973ae47992fea5ca6c0e9e594a1170c0bdbbb3c8712c492c870c8c2e8f523ce247e4e2a4a4 SHA512 7528f267669cdc0c18e1d00c27fff96d915b3143c5534a09c834df3e140035159feeeb8b177528e89cd25265560d0734ef1af94d2f9d28fef47d7ca391e84516
-EBUILD hash-slinger-2.6-r1.ebuild 1134 BLAKE2B 847ed4050abe46205af470afa9dc1fa6f11992580a78db290e497a08295964400f4e2244a8ccd57acda2b809df3f1ae630898912a958bc18d266abfc3a107297 SHA512 f136b8a267c3b1ecc3d33a06cd654c8250bd2b32522bf396cb4194843f4177b9c5dba9b0736e4d6fec328c5078206141db88f104ed089fb15ed62ed17fdd3b7f
-EBUILD hash-slinger-2.7-r2.ebuild 1139 BLAKE2B 6ddb2733e7eda7bdf3306e7dcc98e1b2b5a4c4c856c93fe60956f9008f94106d04e9fb18b600daa86a6ffbe9d47f5080c1fbd87920b24b98510f5f3023eee6ef SHA512 487bec780b16892e676d8eb502e8d4bda59f07deb9d235c0d87b9f58a18d25d04a21171183f4ba1993b831b92eaa91d296f998500fd416577a565a0e7235f898
 EBUILD hash-slinger-3.0.ebuild 1234 BLAKE2B cd2fc1f39dea8bef75ad3a6f004fbd3b4006f994a5a3059b19c253acdfe7d0d370daf64eeb274942b74eaa794e7617def4d404bd2f0055becefbb8efdf0a9f65 SHA512 fe5a5731f6d0d3b1f3a3aa547b84fb4e5c1e298fde59961275168a838f36d56427031cf1c495460674c86912e1f27cee98f496282bf0daf42ce4c970b5ffbe45
 MISC metadata.xml 488 BLAKE2B e51e5da837d62c1fefc50f59a31bc8464e1cfdaf770130562b20ad33c8f9b8b5bc604e508eaa5b9087fe59e25fdd3993f5fedc062f0a75ad6ad723234e7e5f6f SHA512 d7d812a2e7a32bd659135bddc88f74b3f882237eba39d96d67ef8a5a53656c64090bfa4535a104e0581c82f2d8e6c69357a314cf8750cb4dd1a5fb421cb3251e
diff --git a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
deleted file mode 100644
index a5e14629412a..000000000000
--- a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY"
-HOMEPAGE="https://people.redhat.com/pwouters/hash-slinger/"
-SRC_URI="https://people.redhat.com/pwouters/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipsec +openpgp +ssh"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="
-	${PYTHON_DEPS}
-	net-dns/unbound[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
-		dev-python/m2crypto[${PYTHON_MULTI_USEDEP}]
-		openpgp? ( dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}] )
-	')
-	ipsec? ( net-vpn/libreswan[dnssec] )
-	ssh? ( net-misc/openssh )
-"
-
-src_install() {
-	local tools
-	tools="tlsa"
-	use ssh	&& tools+=" sshfp"
-	use openpgp && tools+=" openpgpkey"
-	use ipsec && tools+=" ipseckey"
-	for tool in $tools ; do
-		doman ${tool}.1
-		python_doscript ${tool}
-	done
-	dodoc BUGS CHANGES README
-}
diff --git a/net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild b/net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild
deleted file mode 100644
index e36c1758e267..000000000000
--- a/net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY"
-HOMEPAGE="https://people.redhat.com/pwouters/hash-slinger/"
-SRC_URI="https://people.redhat.com/pwouters/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ipsec +openpgp +ssh"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="
-	${PYTHON_DEPS}
-	net-dns/unbound[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
-		dev-python/m2crypto[${PYTHON_MULTI_USEDEP}]
-		openpgp? ( dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}] )
-	')
-	ipsec? ( net-vpn/libreswan[dnssec] )
-	ssh? ( net-misc/openssh )
-"
-
-src_install() {
-	local tools
-	tools="tlsa"
-	use ssh	&& tools+=" sshfp"
-	use openpgp && tools+=" openpgpkey"
-	use ipsec && tools+=" ipseckey"
-	for tool in $tools ; do
-		doman ${tool}.1
-		python_doscript ${tool}
-	done
-	dodoc BUGS CHANGES README
-}
diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index 2797eeebeaf1..a99329767937 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -2,6 +2,6 @@ AUX idnkit-1.0-autotools.patch 1843 BLAKE2B 75043eeccb34f00b9faab57d7db7ec608119
 AUX idnkit-1.0-test-subdirs.patch 289 BLAKE2B 6c9237cd1d17785a5d0a379d610ddc6b6e7b604c14a5680e24b80f5d9188413fe4e8f5dbbc55e72fe5d4c453c94efd231110238f68ced316986abeb6134f8173 SHA512 63d76f9ad95fc83c00259d41dcfdd47442bfda6f1dfe861a824146ded113d18284c1fe6f0f5ff1eba05a9a38055e7e8fdc3579fc14a3b441d831a9bd5b75af7a
 DIST idnkit-1.0-src.tar.gz 432823 BLAKE2B 4e96bed174ea704ec0eb5c6655cb65145ed808b2bf9582ec9b6dcb8606de7a006937a2f8d8fce386dbc328e074b95ca504464c1ed6d16acc7be82d9904f2c2b4 SHA512 74f2db007a1991610f62a7a060d534f724f08395a16a7d76fda0824e9017aa47ffe4e251c90d0481218b70534fcd2b32724a66223042f59c1e16c1ff39f3be19
 DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
-EBUILD idnkit-1.0-r2.ebuild 1036 BLAKE2B 4caf9fa02f80ecb847852b38db26796a4c60be63907dd8d7f7134dddd4c82b261ed8b64a47c1cd0390260f2c438a9508b09838a6eeaeaa69172ce1d68a3498c9 SHA512 5c2af220fc09bd39eaf1adace5b47ebe6a117cd90a83f5d0faddec0ea21a67b037003becb9189f7f35461467a89aa3d0eacfc087ba07f22a72785c3b7c4f1cd5
-EBUILD idnkit-2.3.ebuild 647 BLAKE2B 35a0b45d15114eb632c487a142cef1d02af326638a76a2e28cb82eb569305b2d03b51ae9e227bd9e453432a4d11528ef557ff0cbf6529a0db77cf5e64bdb6bdc SHA512 7e85466faf53a2c205ac1dc34741409e20f9a46f36ddfdc157279b046efd28db4d67eca5033bc8e2cf974b3d7fd84469a91e86964902ce14518c97fcf447ce2b
+EBUILD idnkit-1.0-r2.ebuild 1034 BLAKE2B 7ed049290ebfd93eb9c5debe4ed5f918be70cafb9e5d0625a04c658ea2e75c0bf4c16bde4cbc8dd5097ce0484c0a10d0754c5f86f3551444b736355407f5d900 SHA512 4fcb2b17eb827f166f9e21bc77418a1bbe8249c32fdfd95cdee7a537c609fb3ffb98b34f39a2a0875879a2a289947c4ca7bf50571ee6b6e89519ea5f307ec4b4
+EBUILD idnkit-2.3.ebuild 643 BLAKE2B ec94f1145235e470b19c76164ea36bb6a16afcda1d07e6185705a5c0f444fd2112ea50b941035f359aa1733be78bd5c61427d56c41174d4b3044af8f569025d3 SHA512 90a412e9f5f03bca123092352db5e321e8894bbb8787dace3ffd8110791f2317ab997209693e5626033bdb072f1b4c6904d8350d6265458708869ddf52a63f6f
 MISC metadata.xml 290 BLAKE2B 9b8f414f2eb140cd1c4c9b290bbd4f3d36e58649b68a9ed478ba55661df34bd1f8e1ea9c6d132e2edc4365bb8d4abd5f78d9b0f24e588d548354f63057da0b78 SHA512 5ae703d1a74d5fe45ac66f8f4922b754999932112931b8ba1f46d4a2e769a5d7130b4a418bf687d857a89f20e287d85e384236848c0e01747d0aa1c1ea350492
diff --git a/net-dns/idnkit/idnkit-1.0-r2.ebuild b/net-dns/idnkit/idnkit-1.0-r2.ebuild
index ffada10d1668..2459e19b33c3 100644
--- a/net-dns/idnkit/idnkit-1.0-r2.ebuild
+++ b/net-dns/idnkit/idnkit-1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nic.ad.jp/ja/idn/idnkit/download/sources/${P}-src.tar.gz"
 
 LICENSE="JNIC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="virtual/libiconv"
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index 054a15cae6f1..65ccde2d26d1 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://jprs.co.jp/idn/${P}.tar.bz2"
 
 LICENSE="JPRS"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="liteonly static-libs"
 RDEPEND="
 	virtual/libiconv
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index a7496a409c36..34703f24ba14 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -3,6 +3,8 @@ AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc3
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
 DIST knot-2.8.5.tar.xz 1209076 BLAKE2B 7454499745caa04a9454f023bed0ce6d8ccc54fc2c264aada72a842c39b056a91caee908eb1b036fe77b97d8cea4f03b9afcd084a69846a2632e717f7c3591fd SHA512 f45e62816ddc1f534e724d2fa71831100efc01b415ec2ea8301d02cf44d8f104a248deccdb706ebad6853404aee2a209c2bf51b07076aa69340af6812e5a79de
 DIST knot-2.9.2.tar.xz 1181860 BLAKE2B 4c4a54624cc0c107517596efb3d4a4dc205dac488e293b594e93f8e73b1face3c0ac4ca94d5def68576f7b801540468a355e5b4bd06d7992edc3bce122952fd3 SHA512 7e09cd6e587342b0a213f7a108704fff7535d02dd47d662e60b96ae5d75d9745d659131622253f964deb1607f28d172d1d46dc3b5f61e2f6c70e5002e746da68
+DIST knot-2.9.3.tar.xz 1214512 BLAKE2B a4545ba32827a1866046fd42a5819963607d5d7d1fd1e73b17b08dca9c3aeb3b8ecbad67ef3293f4a417ac2b25c7540e299cf914d90d6a659bcc58f809f178c7 SHA512 69186b0d83ab548e46a7eed2703b1c3e29de36123c39a7ca461a8728488433bcc27dd5564ff3cb55d8490d4515098cebdd72aa732742fb0b9fceaca27f456e08
 EBUILD knot-2.8.5.ebuild 1887 BLAKE2B 7eb58953ff6217a867692a88112fadfbccab09822786c9bcc5a3b049f9ad300d7406edca1122c326a2127811dc8af7c74de0625174ff1968645e91cf54c9ecc4 SHA512 c9e51d696c0e0d50b5b40ac76cd950eb7ca21a7a679f1655440d7a77af46aeec59697d12a84b8becf0f0de1a1a4e425bc4af4e51331a83e9fd724aab92b467bb
 EBUILD knot-2.9.2.ebuild 1892 BLAKE2B bda8c5a9320f1cc5de5149a1435501595b50f7d39734a81106c7712c6bfb479afe3807d01849aab4cb0515859caa27a92baf24fe7ffea5cd7aba726ff85dd570 SHA512 5db2d53e35f7d4d644fde4aac1ecb6254ca654973181fbc16c5b0f670f8f812c8700f119d4344acba73bc30a48f4fa652a7b760a95b91a2af6ad5b9f96aeda3a
+EBUILD knot-2.9.3.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
 MISC metadata.xml 1677 BLAKE2B 89c3190781cf6b6d6217c84dd45f78ebd86695e9c224c7fa7f5112b246b95b982fb025c6c30b065d59b11f3acdcabda8e92b0da001cf1a7ad3e67ee9b2207d3c SHA512 d1e480d3e5d422b94a952a8fd0a679052d24724cccdda0bf13808f1a6b47b129a1db6ad17a0a42d9a6d315e9cbe64293a1a22077b7affc36862313ff8715d9e1
diff --git a/net-dns/knot/knot-2.9.3.ebuild b/net-dns/knot/knot-2.9.3.ebuild
new file mode 100644
index 000000000000..2cc9e9753dfc
--- /dev/null
+++ b/net-dns/knot/knot-2.9.3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="High-performance authoritative-only DNS server"
+HOMEPAGE="https://www.knot-dns.cz/"
+SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+KNOT_MODULES=(
+	"+cookies"
+	"+dnsproxy"
+	"dnstap"
+	"geoip"
+	"+noudp"
+	"+onlinesign"
+	"+queryacl"
+	"+rrl"
+	"+stats"
+	"+synthrecord"
+	"+whoami"
+)
+IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
+
+RDEPEND="
+	acct-group/knot
+	acct-user/knot
+	dev-db/lmdb
+	dev-libs/libedit
+	dev-libs/userspace-rcu:=
+	dev-python/lmdb
+	net-libs/gnutls:=
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c:=
+	)
+	geoip? ( dev-libs/libmaxminddb:= )
+	idn? (
+		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
+		libidn2? ( net-dns/libidn2:= )
+	)
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	local u
+	local my_conf=(
+		--with-storage="${EPREFIX}/var/lib/${PN}"
+		--with-rundir="${EPREFIX}/var/run/${PN}"
+		$(use_enable fastparser)
+		$(use_enable dnstap)
+		$(use_enable doc documentation)
+		$(use_enable utils utilities)
+		--enable-systemd=$(usex systemd)
+		$(use_with idn libidn)
+	)
+
+	for u in "${KNOT_MODULES[@]#+}"; do
+		my_conf+=("$(use_with ${u} module-${u})")
+	done
+
+	econf "${my_conf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
+
+	default
+
+	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
+
+	newinitd "${FILESDIR}/knot.init" knot
+	if use systemd; then
+		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 18a9d2cefa9d..3f301b37315b 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,5 +1,5 @@
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-EBUILD ldns-utils-1.7.0-r1.ebuild 1197 BLAKE2B f671e94313e8b92b99d27ccf39a0c5011f16772ecee28281ea0bc28a30d3693a129cccae623beb1e68c09fb7eef8cbcbf76e29ee28db4ca9ab5183ff9dc73c33 SHA512 03fef1e45f26d766c594f4f678d3fb582c047ae8188c604a2fff7058344888dba34637b363020c1c48a875a1b306d24545e52a27c164fca711f4bec7326dd807
-EBUILD ldns-utils-1.7.1.ebuild 1486 BLAKE2B 276669c58c0a0bea638294060b97c7bf28178f3493a7e3d0a7b32e94073031594fab30c5ba2909900e2af0ae2f42623db6ab31b4bb2091ada933e33f3e4d1182 SHA512 647840b1cbcc572c4bc6c2105705bc645bd8574019a28e4b167754bedbdbd71ca26c6a529f71225d13b1e2666c54f43a3f623d2f5e0dd63b3fde6438328af07d
+EBUILD ldns-utils-1.7.0-r1.ebuild 1194 BLAKE2B bd2ee91e3a1adee034b4864ec624e15531bf27cadd9625744344c5df88a2a5adc0fc6c02045ef36bc4e88042bda9e85ad658c076709cdc413ba5f041dbd9c871 SHA512 a59e00760c948641198c9693f503244b62166cc4f628c1fe49fb6aa3a7abddeb47e616fded6d466e85d982a1d921883d51f0776f88dad3c0162f40d017561b22
+EBUILD ldns-utils-1.7.1.ebuild 1482 BLAKE2B fe00419f5fac8284cf78fb6c26b5a1f7b59c6b0ac244af2e4c63ce6880f2cfa701c257d77c20f3a397c131c7216f3e8f35e3af37539f13b4e97252ab4f60de16 SHA512 bbecf521d4b833e743418ed9d29e5b99780bacc88725b1c4d9453ca28e2978fc37f7a77f0cb152b3559b9789791ee9ec7830d219320424984030fe52299a7c86
 MISC metadata.xml 848 BLAKE2B a31c8bfb2c5a90add80c4f608cdbd02e3bf15126726ed92203425b166ae01cf8240fa040d98ba44991cd315bdb388664692eca5820fc807cf3fddefc7663ffb4 SHA512 6ce3c5421c6e739f0c15a5b7e9120638cddc78fa3d9c2f564acfccd4c98bb3034512ce1a68422ba0ef7896750c1a41e273f2960d9d1f0ffc21c9028342482366
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
index d8eb251073bb..e9a8f9275263 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+dane ecdsa examples gost ssl"
 
 REQUIRED_USE="
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
index 43f84b976da2..75f950d2d986 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
 
 REQUIRED_USE="
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 7eaec6493c19..764d1af7d59c 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,4 +1,4 @@
 AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d06251b07ee2fd3ecbac16347d633644f30dc7428e5bdf9747b0a4d51d7541601d3fbd4be6f9f746693f SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501
 DIST libidn-1.35.tar.gz 4169217 BLAKE2B 809f9e854a4f2fcd3b2d5f7cdb34e2c68a0f00f5fcffc9002ead2d2d3dcee38022b3288f29716437f65f09e259e35cc98679d9c9d943423190cebb76fcbc94fa SHA512 782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09
-EBUILD libidn-1.35.ebuild 2632 BLAKE2B 985dc88fbf85d909f672e2ddd5180329cc0a767aad46fe779b305208f35ceb3a46275dd0629940d709b8894d58c32e075b6fea14ceca7e776fe0949b62be7945 SHA512 2a46e776fee8dfc3c59f451c393b1a6b42c634e2a74a9c010f6d15ccd5df011886ad904c0c965ada531abb89fc527eb40157f3afc81961e5a5a058233708446c
+EBUILD libidn-1.35.ebuild 2629 BLAKE2B e3f8b2e80132c1590e222bee5b8d2ade62f7a6a8bf2c301ad9535394bbe1ffcaad7b8d713437a834ec049336ba7b44eba4412c2e4ae9f8b23af83b95b7083762 SHA512 7548a82b6e35b2f5bdc1653a637938eb95e75afd76832ae8f117325209c8159b858f158529860e12f9158a5df651b8dc676868982dcbd56bd9f092fa648861c7
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/net-dns/libidn/libidn-1.35.ebuild b/net-dns/libidn/libidn-1.35.ebuild
index f37edd20c66e..448eff85d7ee 100644
--- a/net-dns/libidn/libidn-1.35.ebuild
+++ b/net-dns/libidn/libidn-1.35.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 ~sh 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 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/libidn2/Manifest b/net-dns/libidn2/Manifest
index 072c10677d0f..3510ee93c76a 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,7 +1,5 @@
-DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
 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.1.1a-r1.ebuild 1281 BLAKE2B 97ea0ecb2ab12574e944970007c729acd6ce1c4bfa3906903f5b522cd2f004d7d5ff18edacf6d0bccb3d55a26c91d7192d55e5eb09da8f870ac5c41537ff6978 SHA512 be575ca04029a756fb52aeb0602029cf37aead1acc8b6ae6a594254f8d262fb00500b147c429ac54bdd42eb963524abea4f217656da67e42c8f4ac92a22605ef
-EBUILD libidn2-2.3.0.ebuild 1293 BLAKE2B 49627eec10d27d1e8890fc6529cae22ed64ac740e0e1949ecf1878bf09cba98be56289f365db6aec4bc47a4e52bb7765496faac3a0eb4c5d5bdd5d9350776168 SHA512 7f2c5e93cc133bbba0c52c36a4f2c1a30cd62474910787f3c4dfef2c62ac5e535a8d977de982b1318131e46cf8d31b1ba8c1c4172705303bd997d65d629ae4b5
+EBUILD libidn2-2.3.0.ebuild 1280 BLAKE2B 7c1871abbe19d7894f15625c1e73d87a2ab80b9f2cd120a24961eff8334b3f6d5574157a2117dc21213cb6eb1fde0406de8dbbd72735e7cf4234759088e50003 SHA512 78c617cb666b06fdb7fde64aa0c0787aa1ca03449853b1d46bd8c85f5310af3d5528e7b6260debfb9e8661a96eaf84ab8ccda2795480114e9212dacace759283
 EBUILD libidn2-99999.ebuild 1389 BLAKE2B fcfb60063cc023925064542e49584ea0c3a81f1fb8dc0116c34010eeef02a112461c0cd62aece8614405fa228ac984f43281bbb65e03e1b3943f6252b0f6e4f4 SHA512 0e6d9e9b3302c97e94ab059e54a43f8a23b6c64f171587a1144c3bf85ff5b2b9ca60807a1835fa39a1f8de4db1b3a9b38baa2dbd23e4e41e27b2a98c7a9e0304
 MISC metadata.xml 298 BLAKE2B 10b6250e87ec67fff437294893f9ac1a0c923b6c2bf69bc0462698632fbed280538f547a920cba9e8a1175534ad35a5a5d8d0d48f6824c378c46d34f91787712 SHA512 fb859efba7ea8f760f3d3f341496feeda5f8af633f40d4785ea738037017eae89060555447ae29abe69c0acc6f911a323aaa94dfc39f34e6aa9996af506372c0
diff --git a/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild b/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild
deleted file mode 100644
index c67611ebd56b..000000000000
--- a/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal
-
-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"
-SRC_URI="
-	mirror://gnu/libidn/${P}.tar.gz
-"
-
-LICENSE="GPL-2+ LGPL-3+"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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="static-libs"
-
-RDEPEND="
-	dev-libs/libunistring[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	sys-apps/help2man
-"
-S=${WORKDIR}/${P/a/}
-
-src_prepare() {
-	default
-
-	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 \
-		$(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/libidn2-2.3.0.ebuild b/net-dns/libidn2/libidn2-2.3.0.ebuild
index cd0d6da96bfa..3fb6a9375886 100644
--- a/net-dns/libidn2/libidn2-2.3.0.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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="static-libs"
 
 RDEPEND="
diff --git a/net-dns/mydns/Manifest b/net-dns/mydns/Manifest
index 06fbba7407cc..b87390bd2711 100644
--- a/net-dns/mydns/Manifest
+++ b/net-dns/mydns/Manifest
@@ -3,6 +3,6 @@ AUX mydns-1.2.8.31-texinfo.patch 923 BLAKE2B 64146ddd6714fd5fb29cf0e3d85d6cc4358
 AUX mydns.confd 84 BLAKE2B e95e66b464e9f7e7d3742312c9cd9bebc5cedc1f4f49fb4e632ef1f51820c6400c598ea611af51fde11da6cca93dd126bda8dd8ef20905c4f165935612e92681 SHA512 7fd98de31583d0556734b7313afa257b9f73f4d74611ce03dd44f2d7e833ec4f95b4bf84dab627d59da18f89f7dc1d9eb6d840a90b16556b4e1d97439944452a
 AUX mydns.initd 850 BLAKE2B 58275e0415dbf27344045e9cc19037e09a5ee9dd1a52f80b6c05852313b646c7b41a52f1be46ff13629bc0873b2b7fc1db73e0cd45cfc7bb4c6d9a0582524fa1 SHA512 919a7022a350b121c8c0eed962d7a7233dc41f2e4cfda1185d642114719a533cff580367b9302b24e8c9d377c2ccb9b02ad45d638d5b483b7c101405cb9ba1be
 DIST mydns-1.2.8.31.tar.gz 958701 BLAKE2B a07ca8314f6f8d3ce6cf88ce3a49238d00f1ed8e2352f3a76a9ffa348711f76e0cf19fa304a92a71b420c39db2795094d42997daddb091c7046e4bf1b61f6fe8 SHA512 471dfed9b4f38b446fd5896939faa4c58f4e1b3a3e6928fa84eddf769eba8f3406ef08c77ab39ee79d2ac85c1e72a499b283c7404a0cae9830ffe0faee9e2737
-EBUILD mydns-1.2.8.31-r1.ebuild 2064 BLAKE2B ae4c1398b11ad4ba38446c438b00663b8835a9698618efa6a726bd0812e9f4a2fd76c300b5ed9480ce1ee2a22b6305ae3e963c927019af36d82c091992ab446b SHA512 ca4c774a2bb6502538a0617a2f0bdcb7bd97d1a338dc490181d503d803e9288a01fc828605dec8208ce009c55c8ce5d8eb484c3c4ca8ee50a56eaba842f6016b
+EBUILD mydns-1.2.8.31-r1.ebuild 2065 BLAKE2B e939c3fd4857fb8ab8707655196afdfdb322d0e3002642703bb022cb58d5b15bb95d0a3df6a841f9d5d611a5e668586fc6d5192fe11aeb17f6b14eb5cee9ca1a SHA512 aef7163ab416b7f2a88db6e87badf6019b9673ea7fe2dba46e4a4a7e60f941b01fd8b48c076f40e3aeca48a9c5abd4fb93578ac5adf0e56765845a84fd567790
 EBUILD mydns-1.2.8.31-r2.ebuild 2085 BLAKE2B beb1ad22b99450b0606361119b9d9d266195bb085508835076ba1d5315b7abfc78cbba957137b826f74166b4daa413f4bead70942c2511760503be5d63152d86 SHA512 fb6b705de52708b4c0dc4310695dc9da81bdd26102b0f9f82f06fa212f85dd6f0b1bf85f96faad6a00e59c5d1991decb92d783fcfa1d828626f52f8f601e8647
 MISC metadata.xml 396 BLAKE2B c343b16b422a587d568b331f868e959348bd12cdb7ee28d6390ebeca8234f1e34ef9efcf7aa70e9b18dac66777ab46763c41f8b68e3f9d96b3863d085ed51066 SHA512 cba5e716877204e00ef18549d35bb39f47921389f8712c69ce81b8dd365505d6ea95fed89976bfc6722343dadd15f914f27d26fe35416c242e7963d467b147d0
diff --git a/net-dns/mydns/mydns-1.2.8.31-r1.ebuild b/net-dns/mydns/mydns-1.2.8.31-r1.ebuild
index 8de44ad70ba0..ba669a185235 100644
--- a/net-dns/mydns/mydns-1.2.8.31-r1.ebuild
+++ b/net-dns/mydns/mydns-1.2.8.31-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mydns-ng/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc sparc x86"
 IUSE="alias debug nls mysql postgres ssl static status"
 
 RDEPEND="mysql? ( virtual/mysql )
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 4d6edca9944a..7258edfdf851 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -2,10 +2,8 @@ AUX nsd.initd-r1 1383 BLAKE2B b90de2ebef09a4f9050f6e95f5faf659c62910462aba1179da
 AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1df39ceb58b92a44c48cb21583a480e622f72d07650f410f2e0703f1d16af08152aed16982ab8da2 SHA512 c06d0b035387e7be79cfa8fedf8afb3900772146c6d4090ac39ea2ef165772d875b222ef467bd73422078ef57818bcc931ca67fa290bd99a7a9456efa5448853
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
-DIST nsd-4.2.2.tar.gz 1149182 BLAKE2B 1cbac527063f7d14da589bd5060117da10fdd6a9e34b04eb763dbb94fe6c9cf09dc351985de3d099aea3377a4c945622871566c06e7f78aede885aa0c2bc5937 SHA512 43e2ee980a11ed0ad521cc9d8be1e2d29fa8ab552bdda043ffa7e5bc71cf07ad49319629f71e93dcf1dabd315f93bcfb9fd8b5847f27b125cf151fb4f63779b2
-DIST nsd-4.2.3.tar.gz 1148054 BLAKE2B 1e184a557b973af24620338c2f4c94d27ecbd544dd40ee11c7905dc8304f6a1f7ba6d3e8ec49057ef88243d8afb9c005adba89e464ebecdd8b2ab2e5a751c302 SHA512 08349375caf96d870a7ba6e8de6342794f4bba356ef75d46f3c3f50462d356317f3e82a252febda21e2fbfe36bf7ad0c53f40079779faf204a4aaebd41fdc965
 DIST nsd-4.2.4.tar.gz 1148826 BLAKE2B e2508c225d0bebeb9134c6eb3f00dfaf00d2de1a545cf9719b3bf04de8cf4a173ed744ebe5ff50a7062f5fb3135f4e476b9111736442fa358eb6ce20faac8406 SHA512 5d4f546a2a4484b182c65d3337d44596e935bca074c0eda2947b9d128a56db08a00240c6ec9ce22bc9a436e009c00c3283c4a5cbd1163ca4a429eaa92ec54208
-EBUILD nsd-4.2.2.ebuild 2957 BLAKE2B 3ba1eccf0601e919735588afbbf5f1bec28ac47eacaccc659f2ca0bbd7e8da6f9a1ba7f2e032470bf12269cab8cd19647513d22203f447ea78519a8ba3e763ab SHA512 dfc60ec11c179d9e8fec1fcf073c3d405b5ebfdeff316af202370f50690f2a592d5c7f2e5c42e559e0e83979cd2c8931e45156064edd499b20b1fb603ef26a1d
-EBUILD nsd-4.2.3.ebuild 2959 BLAKE2B c5f5d8d3080ddf40fba98d24c80e2440af5b83364b84a178ee646507504ffd1036135e10b9df71bdfc20c6da64989a497bc91320d14f2f5428a410661beba280 SHA512 7b1ae3ff916fca6cde66b4ada3647b0be59a23c60340606094eb8e40c0433699d96ef0ef1f6e8523084fb9b8b92201a0ee6e06caa1a2c58212e5517557c7dafd
-EBUILD nsd-4.2.4.ebuild 3015 BLAKE2B 141d4a5efd4e0db7fdf2555ac2418e4bbb366fd48b5b8204f44dbc710189a0444af166496dc80beb80f90bd40245a1ec8ffdacb23e9ec837a2238251c814e3fc SHA512 1df43fe80e6a3ff8be8a9577f00bca55ea8d6dde067357cadbf93b5bacf30e30b95866b903b725109e822258def0cebb6abefd1ca6668c8216455c69ea55c4cb
+DIST nsd-4.3.0.tar.gz 1168198 BLAKE2B 87eb68987dfff84f7ab3038e8c563724d2859e61d28238967d5db272f6783f026eaa3729b73bd16761b8218110bdac7d636307babdaf67b9d35ddeb013ab5ae8 SHA512 8724fdfe9ca07dce6cf73bd0441a5d6b6e8a37f31744aca185e8cff2bde66ba677c189bb0b5bd8c8ec5682cd623bf24c0087ae47630615292b96d89f1d4134c5
+EBUILD nsd-4.2.4.ebuild 3013 BLAKE2B ea358a487f8e18f40a6d5018c04994607c9f7a66e53b31ea70eb24e0386ae15d8e7ac7c0c7196980241420a5de90fd30c980b03f30914febbe725608341fde6a SHA512 52b615e9b4676a35ebf0d3b413ed703c10b65f860adbdc490f9624d31e898dcee34fd01efc8d294b83a517ac54ddd713ab010fb296ade398a1ce4257f0054d01
+EBUILD nsd-4.3.0.ebuild 3015 BLAKE2B e9be556ca875cf52a3f01887d5468388625378356d93ae3a94008d39fb0b8ae68fb06bbe5b328511ff5d633b6130a733bdec8ba6ded8c022f6cc75e8c8393499 SHA512 eda0d29c58cc70eb019767431ec3d32f6e663a0029b02bf4bbabf9b45168f6bfb1620f96e2d23c750760355a95b512afac338d705ab7c11df0b1bfab958c9139
 MISC metadata.xml 1082 BLAKE2B c44a5b7b9cb5ad52ebc55dd52a584cd8b0700977a19d541df1b415164250e390941ef35a0e8633a975e6cbae402719d8c5fe7d452dde5623223b01a7ec4320ac SHA512 a66e71346c6742c77ce38ca73f600dde471f3256928bab79f2015cb88c2f3237a4d69f7b9127ea90c58f584b60b8b676416b0704761ee1455479644fd2cd5a8d
diff --git a/net-dns/nsd/nsd-4.2.2.ebuild b/net-dns/nsd/nsd-4.2.2.ebuild
deleted file mode 100644
index 232aade21c09..000000000000
--- a/net-dns/nsd/nsd-4.2.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	acct-group/nsd
-	acct-user/nsd
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	libevent? ( dev-libs/libevent )
-	munin? ( net-analyzer/munin )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	systemd? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	# Fix the paths in the munin plugin to match our install
-	"${FILESDIR}"/nsd_munin_.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-largefile
-		--enable-pie
-		--enable-relro-now
-		--enable-tcp-fastopen
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable dnstap)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_enable systemd)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-
-	keepdir /var/db/${PN}
-}
-
-pkg_postinst() {
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
-}
diff --git a/net-dns/nsd/nsd-4.2.4.ebuild b/net-dns/nsd/nsd-4.2.4.ebuild
index ec29bccb6144..fa42a2b9d37c 100644
--- a/net-dns/nsd/nsd-4.2.4.ebuild
+++ b/net-dns/nsd/nsd-4.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-dns/nsd/nsd-4.2.3.ebuild b/net-dns/nsd/nsd-4.3.0.ebuild
index 0eba80ae8a8a..b6ca20a489b4 100644
--- a/net-dns/nsd/nsd-4.2.3.ebuild
+++ b/net-dns/nsd/nsd-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
 SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64 ~x86"
 IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
 
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index ec7e7347c947..c43062dbe923 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,5 +1,5 @@
 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.9.0.ebuild 1055 BLAKE2B 733e8156fc562b5f45c7ffa5c03a588e450d4ddcd696e74d84ddbdc27dc4386d08aadd50b9a941397a48da9a56cf3268db53edee7ac2d92bb8f6f4e062289ab0 SHA512 f9c1838df4a03fd28d0a5041ee41cfd12766185a6d2a9e4171567d04c4a8bef0daf72b5edbbcadccbed366a0c0daf23265c5bb322c86cc1ca3f4bc87dfd67a3b
-EBUILD openresolv-3.9.2.ebuild 1101 BLAKE2B ca4ad09308d1eec8a71fa50e02fc0c4dcdfd0ea73c7aef1f4a282b440aad0b9191c7befb9554612c8ee21b11c826d99d369e32bb4bc36918b0755b5546fa456f SHA512 8e5ca1fd5a1cef044fc60296288c1426a81ba45dd8045d2afa5e1d33359006072d60e190259de7b40c0b265d9cea8588cb505aac3beedca2615352d4f3c36f58
+EBUILD openresolv-3.9.0.ebuild 1052 BLAKE2B 5b1b3b1092bf55ccc00bc044f228262ce3db17f161a57e238065dd3cbfeb7450209344fd2fbcb100297d4d7d84089933b9667135db82363d3786b637344882ee SHA512 ff94593aa90b87b512152763b998c9ed1a774126a2c9b4075659a70a440c004d30eb83bed0e48bdbd6dbdd757f4595ec52600a6f9fa1cb66140c93042a657572
+EBUILD openresolv-3.9.2.ebuild 1097 BLAKE2B f64842286737d4551140728da7a54090ce14b8bce3f471c07ce38a6bdd5919ff5b47d70816298e28a4491754e23310a5b54d766d96ef6c71065671cfe478d887 SHA512 55cc9dc93231bd98b29c3ec12032266a23cd11fbdef244d558f55c0c9fc49c2e30737cc9ce6bde2f8128050005f7dd049964c6002917af54a702cf4d3b078556
 MISC metadata.xml 259 BLAKE2B a0bbc917de0867f447b7f02307f4f3ae6d6fc0e7afa06db2f6733a560676a4ad07fcbf433dc93070a6e7815d9d3bf48d651ae7222f53f62620d8cdda049af543 SHA512 79d964de6f58ae4a6f1e815620de06753b9d44ba1740c0330b94b8fe5bbff1f7e1e67f21ac30d80a35bd72e9681631b9f1697d896a4bffa066d364690c572838
diff --git a/net-dns/openresolv/openresolv-3.9.0.ebuild b/net-dns/openresolv/openresolv-3.9.0.ebuild
index 04477061b26c..9615acdaa165 100644
--- a/net-dns/openresolv/openresolv-3.9.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.0.ebuild
@@ -9,7 +9,7 @@ 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 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="selinux"
 
 DEPEND="!net-dns/resolvconf-gentoo
diff --git a/net-dns/openresolv/openresolv-3.9.2.ebuild b/net-dns/openresolv/openresolv-3.9.2.ebuild
index 0d725c4c13e1..7efc80a0a9a3 100644
--- a/net-dns/openresolv/openresolv-3.9.2.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ 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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="selinux"
 
 DEPEND="!net-dns/resolvconf-gentoo
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 36fa13c89fbf..3a4c3d54a643 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,10 +1,13 @@
 AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
+AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
 DIST pdns-recursor-4.1.14.tar.bz2 1249908 BLAKE2B 8918cbfa2b8ef91b18b7ef79c94bb2ae5e73f2dd835e810aca6480b7338be19e9d151f6ace6cd42bba6c71123378b95811dfa570d31ce2aa3e141b9e49753c8e SHA512 9b1842df5d32f0f7a7080bedb98d8f9e36c08cbf7427c9ba1bd07bae40ef48ad4a843d6eaff336d1fe9869c209c05f4edf1117b994b6ed5818146445b28b3011
 DIST pdns-recursor-4.1.15.tar.bz2 1252518 BLAKE2B 11eecf1ca69e6855be1cb1a1a6bfefd6b65cf38a6fcfd1e98727fd7813958024b47f974a12fa05cf0a92079a7d14ecb1a6b199a51ba0b4731aa4a1a8b638441a SHA512 d493de78086a88784dbf8b54732faddca7e0dec008cf80a757240f8e1943d230edc4f0ef5a372cb1897be01956bbcfd282a979150901c0df6cc304ccdc6d878d
 DIST pdns-recursor-4.2.0.tar.bz2 1316156 BLAKE2B 3ceb71695b0d5aa2826e28975f45d03910b23f2d7dfbe7388ffd19ea51c37bf6758ea6f90f1772b0c4ed217ef844e112961f51c04dee4db20a05f1e25ae6b71f SHA512 e4be63c1be70f0dfd7aab71f1184d5cc1d15e60e775451a96e8472db6fb3825762ebd6f51b593b167389868bbfde0538612b14a04c03f3f60a7e49f7882e78bf
 DIST pdns-recursor-4.2.1.tar.bz2 1318022 BLAKE2B 19fba9dae26d27f68ceaf70f15f2fb27ec030fa64d5dfdfe7bf482293ed5aac6b8eb6ed47a75c2b88f4d481794695d66f0ce1cbc71d8eedeabd86d8ce8c382ba SHA512 ebd7ff40def4b5c9398dee5ceae0aaf762982be4124773002b3f603b18cab2a6df667524a268e72268032334ae29d32b42294cbae68dcdc154e08b8a38f75dff
+DIST pdns-recursor-4.3.0.tar.bz2 1349359 BLAKE2B cdb9d38a350ef371c3675185c0f52f416d55338df034ff32a9d9fc85d783de04513555ec96fbc1dd07ecd7214d889cfe6fba80bc6981e66a6b8d4fe6f1da7dfa SHA512 6ba4721f502e1e483d04e8d8cafa35d1cc088c6b3c73120a0cc90ff9c8e8f495a1591e01f0daf30d00f020e3aa06b1cf092ed6b8a0786070c307a6564812c085
 EBUILD pdns-recursor-4.1.14.ebuild 1802 BLAKE2B 2943554881f1873014e5712c2baef1ef4bd9e3f0e7061ab576aac0d23c7ae8657a744d257b015532f6c57c3086ec748e3f1faaa4e12f70f626ad7096e7c81511 SHA512 31141369c4c6229c9dd13309d5b0cce47cac7c0ef6d765ff72eb4515691a9742fc510bc80cbd4c71fbf739829e157d29565df0f8240f84a5a1767e021fb484d7
 EBUILD pdns-recursor-4.1.15.ebuild 1804 BLAKE2B 7cea57f7268aab9d16b526e070f7e8b999788f6d28707376eb4451b86af87b5f57b1ca14758b4e7e9e44833ac8583bd9ae24a7c3d4674ff373f2dbcc4f32cd71 SHA512 96e29573690bd3b44b31e2f80ebfd049f21d57fbc01de38d53e4804608cf3a61d0821a79baa3d3bc2a46f7cb6285641a876a6a331dea074a7163a0d8edac8b0f
 EBUILD pdns-recursor-4.2.0.ebuild 1785 BLAKE2B 82cbbf5546fdafc609cf894d6d1db631617bfc99c5e41268a1cef72904b31f88499c79d0a0c2e7af478a408f9e199b60888248382c768e335b6f6782d309ee6a SHA512 8148cd27aa5d133ad4a111ca832672900759d09b8ec7de1a1c7f97f4eb85af48983a58734310ddd7889c5f2e1d0369cbd94c2046c9a2b9b0c663f7d5b903a14b
-EBUILD pdns-recursor-4.2.1.ebuild 1785 BLAKE2B 82cbbf5546fdafc609cf894d6d1db631617bfc99c5e41268a1cef72904b31f88499c79d0a0c2e7af478a408f9e199b60888248382c768e335b6f6782d309ee6a SHA512 8148cd27aa5d133ad4a111ca832672900759d09b8ec7de1a1c7f97f4eb85af48983a58734310ddd7889c5f2e1d0369cbd94c2046c9a2b9b0c663f7d5b903a14b
+EBUILD pdns-recursor-4.2.1.ebuild 1783 BLAKE2B 85b1dfe2efe41551397d6a1ad8d41ee779f841ca965359a0904902e7d78637fd4308a095034ccbc6d3bf72da6ee4b1efbb04ba082b8527255b599a5edb4a5a15 SHA512 06e83d7bd1d7e048abda6d5d4f9d0f8a3fc0eb86a1e4e14ef5f6c935fceae4542579897fe10c31391d01fae793d1e401e5cc49df484ef89b5a0834437f1d5587
+EBUILD pdns-recursor-4.3.0-r1.ebuild 1788 BLAKE2B fcb244abbc5c831806206768cfc72c5e4455ba2b43ab98156a2fbcedad2651ec821e62e73a0898e5a8963f8370cdeaca025c9584bc5d02d5d637f9ad06ca18ba SHA512 c3e4c7b3042146f8643e520c3abbd92d3d870acb588c12fdd09054f38f163b0df06130e85ff8ae1a254f5c3dadadd8e323294c78928b615623c8c2537f83c41b
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-r2 b/net-dns/pdns-recursor/files/pdns-recursor-r2
new file mode 100644
index 000000000000..01ce79167bbc
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-r2
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}"
+
+PDNS_CONFIG="${PDNS_CONFIGDIR}/recursor.conf"
+PDNS_CHROOTDIR="$( awk -F = '$1 == "chroot" { print $2 }' "${PDNS_CONFIG}" )"
+PDNS_SOCKETDIR="$( awk -F = '$1 == "socket-dir" { print $2 }' "${PDNS_CONFIG}" )"
+[ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run/pdns-recursor"
+
+name="PowerDNS Recursor"
+description="Recursive name server"
+
+extra_started_commands="ping"
+description_ping="Ping the PowerDNS instance"
+
+command="/usr/sbin/pdns_recursor"
+command_args="--config-dir=${PDNS_CONFIGDIR} --write-pid=yes"
+command_args_foreground="--daemon=no"
+command_args_background="--daemon=yes"
+yesno ${rc_verbose} || command_args_background="${command_args_background} >/dev/null 2>&1"
+
+pidfile="${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}/pdns_recursor.pid"
+
+control_command="/usr/bin/rec_control"
+control_command_args="${command_args}"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	checkpath --directory --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
+}
+
+ping() {
+	ebegin "Pinging ${name}"
+	${control_command} ${control_command_args} ping >/dev/null 2>&1
+	eend $?
+}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild
index 2ae00b46ee1f..64c04adb42e3 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -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 libressl luajit protobuf snmp sodium systemd"
 
 DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..fa5437a3d388
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild
@@ -0,0 +1,78 @@
+# 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 libressl luajit protobuf snmp sodium systemd"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	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-lua=$(usex luajit luajit lua) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(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 9d00f4edd76e..dcfb06013ce3 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -3,7 +3,10 @@ AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02
 DIST pdns-4.1.13.tar.bz2 1117990 BLAKE2B 95fa26d872fe138d1cde7e586881010dd27211c4186d0a99693d2fd90bdc3fd939da09805898d469daec6fe8c3493166346cf18b528760f3b25274fe10f45ad2 SHA512 94d80b1c6b78e93dd856631d391225c521485c3fb6b4123b28f9f58e178a7f6eb03f24189eaa261873e7e29962761b513c1fcf092101d68ad81dac73249a54d4
 DIST pdns-4.2.0.tar.bz2 1249282 BLAKE2B 56b3639004abd05ab9df4541cc46f155ce76426b35a29d9a4cedd16428c5852bf9306e14b77440b8239e823cb0603b4747a8ae7729f964f415a529f17706eb1f SHA512 ee67c132458e539d522aaa5835237dc64d92ad546f51e0ef86366964f7105631f2bd1e6c5d19d85466d95e1982f6410aeb14932c265fddfd301e403e76542624
 DIST pdns-4.2.1.tar.bz2 1252829 BLAKE2B e5cfcdd0c3011fe43e5abe52e5308b5e6346d186c5d5046c862468ecf810db7e5ab64bd36a9c62f251fbf63948572c5193ed354b8e98d647111e9373578c54ef SHA512 40b5533c755d7c0d41cfb273b704a45a3006dafc98c79bf41cae43d9e2d03bbd7a663996a7f209c390a89c5f7161f2f6246389beef18fbac48e95907e1b7936a
+DIST pdns-4.3.0.tar.bz2 1211536 BLAKE2B 3291597c4f0c39e23f793b128ef26b1ce3dc77640ddf6979242ab291b0e2780ae5c19b18591ea90f5282810044959feca265a245e27eca1f2ebacbdeeb8a3785 SHA512 0734dbfb83a2e5080dc54cfc016ceb3e1f7e15a2de2f33392b2f3c995357fa97f9e87ff21e969f148c3e881165471d3058eb2b9cf632117ebce0d7818e025fe2
 EBUILD pdns-4.1.13.ebuild 4730 BLAKE2B 30e7d3a402ce3f95e29f787ea74bbe3dac6a7f995eb50a8843acc64faab3198d68bb79838b68dbc3877a623705447d1884a395a8bbba468eec179af7914b5122 SHA512 659759a07c3f0003de18d9a4711a48245ec39b9389f513ba2b1c720e8aad148d6710defbac7b7302bc97d8607bf411ab32c2131b7ec7884e4c39f321f8e90db3
 EBUILD pdns-4.2.0.ebuild 4725 BLAKE2B 4967ae6d766a7e83086c9d67679871540c103e0d88d35f7fe9fbae40ea77a10dddbf880687cdab4a8f23253c24fc544dd3901e833606cb20471b046b68455a99 SHA512 d865cd6f4d80cb2604120391601a8ac385db701bcb91ec48a696f8e66c6d541a382662bc90e83affcbdc78d1747f21e1745ef67f49d54c08fe04be958a0fafd6
-EBUILD pdns-4.2.1.ebuild 4725 BLAKE2B 4967ae6d766a7e83086c9d67679871540c103e0d88d35f7fe9fbae40ea77a10dddbf880687cdab4a8f23253c24fc544dd3901e833606cb20471b046b68455a99 SHA512 d865cd6f4d80cb2604120391601a8ac385db701bcb91ec48a696f8e66c6d541a382662bc90e83affcbdc78d1747f21e1745ef67f49d54c08fe04be958a0fafd6
+EBUILD pdns-4.2.1-r1.ebuild 4703 BLAKE2B 6e5933de1a9caa359f5c7fa9f79c5695b3169b3508b40761e5b43fe7c8ffa257193d80a1fe0168dc1dec09a5e99c48c6e544ff024567d84b33c0c9d75d7f2755 SHA512 90db22de6743e5fa119dd8fa86d963d04b79bfe82ffba30633d3ca9e2032002e99291b748372cabeb340bee9fb1ae43140ffa53cf19a8dfecb97e724df91428c
+EBUILD pdns-4.2.1.ebuild 4723 BLAKE2B 7a0f4d38be60f150dacc2472d6dd7f8bf35fc882092d85d38fdcd65d158b5957b6f40ca7a9a67bbad98df12ed3dd36cc73bffd76a5cabac332454eec6906f203 SHA512 80f34e578631076bc77397d9aed72aff68ae107ae55c03e6653459c0df9a30b6570b7295707cebf0bf1ae75e9ca673ec9bd1cf843d632954427d29b2466a54a4
+EBUILD pdns-4.3.0.ebuild 4549 BLAKE2B c0d49099a18204eed0607592eaffabe08d74b926ee801975538c8497665a641b31630ab4369b4276dd55041a8e528f5abad2496dc6eedaa1934a56cd01134942 SHA512 71fed276f0de58fe63d57b6807b0bd7247702d733268de30258e996ea4b50d6042e0dd55ff81b392e0033eee037bcd7864b8638663f65f4fe373b5c8bdfa3467
 MISC metadata.xml 1383 BLAKE2B fd622facab46aaba7d1e54529574ec0d0531254fcbed8c454bc21438212a9d7f0ce744417b24461e1dc144a3daded8d252d805011b77bc5f396bb59297cf55c4 SHA512 6301ccaa19d82478a7e338cf1ad3b586cbdc4c2b98298bb306e7913399efab4e30305756cc7dcf6df4d81520733f2095c4bf61f65ac83763e38f375c2cc0b2a7
diff --git a/net-dns/pdns/pdns-4.2.1-r1.ebuild b/net-dns/pdns/pdns-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..11a7e60ebb99
--- /dev/null
+++ b/net-dns/pdns/pdns-4.2.1-r1.ebuild
@@ -0,0 +1,173 @@
+# 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 lua luajit lua-records mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="lua-records? ( lua ) mydns? ( mysql )"
+
+RDEPEND="
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:=
+	lua? (
+		!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 )
+	opendbx? ( dev-db/opendbx )
+	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/_/-}
+
+src_configure() {
+	local dynmodules="pipe bind" # the default backends, always enabled
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use lua && dynmodules+=" lua"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	use opendbx && dynmodules+=" opendbx"
+	#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) \
+		$(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 lua lua $(usex luajit luajit lua)) \
+		$(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/pdns/pdns-4.2.1.ebuild b/net-dns/pdns/pdns-4.2.1.ebuild
index 5c7378bfdf75..5156520ab101 100644
--- a/net-dns/pdns/pdns-4.2.1.ebuild
+++ b/net-dns/pdns/pdns-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # other possible flags:
 # db2: we lack the dep
diff --git a/net-dns/pdns/pdns-4.3.0.ebuild b/net-dns/pdns/pdns-4.3.0.ebuild
new file mode 100644
index 000000000000..97e6ee4740ad
--- /dev/null
+++ b/net-dns/pdns/pdns-4.3.0.ebuild
@@ -0,0 +1,168 @@
+# 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/_/-}
+
+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/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 4220481d12b0..2e42284aac87 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -7,6 +7,6 @@ AUX pdnsd.resolvconf-r1 17538 BLAKE2B 0797bf3800e5ca1bf3d4c55cbd0862bb8a6964b5b1
 AUX pdnsd.service 269 BLAKE2B b14978db01ec729a6e04d4849a468fd45999c1fbd7d21e986b2034edb81f645df7f5ce8924d72e11b04a548c6957964c936442f1d57c5fa9a327667b331ce4f4 SHA512 c1504f52fb30ba197bd3c3450f200f2f274bf73f7a6436bc317ad9affc18e9c5edcb8555913a4aa9c6bf44b935e0c9cd005b4f5b0fd56eed6e11914f63db9ef2
 AUX pdnsd.tmpfiles 37 BLAKE2B c4da53c3d0ebea88e456e6ea07b2505ed187e074286bb40fabde6a27c4cc017dabea3207e8fde80aa3fe38957b12ce8e09c809b369f06356c1737ae0825cdbff SHA512 7beacc66e8504ca0f8e613dfc8ed2479362f1ebc98ffab902622b36c795fe75e176d9f0a330ad74e10a7f7b1597cce068d94eea6511a75b941e42b2458b76df5
 DIST pdnsd-1.2.9a-par.tar.gz 516061 BLAKE2B 33f2fa85f4b2fa3b709e612c12c8a6edff67f3d2203a8ccd9e838f72b8ab2664eb2e88c0957c08c64568581d9eeb4bede9157ba0928fa6d28ccca279f71fbd1a SHA512 4fde296642306aa986ddb7cad0b5991bcd397656d93ef4962706276848c7fa62c664a40198e807d029637f116e8000c237d98b91cbbfec5c08b134d8bb3adf81
-EBUILD pdnsd-1.2.9a-r1.ebuild 4065 BLAKE2B 88f9047c7080d077a9ebe403f55aea3153320dce48ff17e12457f83f27ca1bf72adc2d7df28f007aed1ff6be87eadca4be4c72c6579bffbfe51d646880bb967d SHA512 f49b84662d1d8fbd8a02121fdb218649405604d6b3a685b605643f638535aaaf9efc582f24107bb445f147a02dbd85e1b5254755723580ac7960e3341ebfea2f
+EBUILD pdnsd-1.2.9a-r1.ebuild 4066 BLAKE2B ada2c3ef181876904cce8d248012f6bd233c7d8755a29b83c3c480b5db6e4e0c54a097d0ae6ac4a0d4fe33910cfe8aeb6215e420d4fa4d5651908f8a791d7b39 SHA512 9aa45f1945e2864b2d210aabe222c6f9edf56157750360908621e7f2ce725d147060f9698882dd3b288546a9b35a4c914ba1704b37e6567da3394e6368a280dd
 EBUILD pdnsd-1.2.9a-r2.ebuild 3264 BLAKE2B a24f2a56c64ee7b74c0040cb415b6d227ac2793bd5cb841320e9fa616785662f114ed646b34c1a1417287f310140a59333b40f775c4b05f64dec80b9c865ada0 SHA512 c281a39c296f34725ef64fcd40f11102c42e6ab697fc2e07ce325d9789dcaf7389bb2d2544585a492de6c419dc70f98b29b7b90c00ec3c5cd10778d86936fc68
 MISC metadata.xml 814 BLAKE2B 2f0e173648d270958a54e378a0638936666c958f69768047e24d4d6cd03d9f52d89940cf57fb346d27fd2806c6ea6be378ff4d950161d475f1f0a0eac0fe206f SHA512 b5bca37d42c4c50031a968297332e824e2830481903ae4036347ffbf554a0a37efb582d8a52b6bba48a0566db81942b1052aca5ed16bbe248fcec46ea99090a8
diff --git a/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild b/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
index 825f04a55574..5a05f498a8b3 100644
--- a/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://members.home.nl/p.a.rombouts/pdnsd/releases/${P}-par.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
 IUSE="debug ipv6 isdn +urandom test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/rbldnsd/Manifest b/net-dns/rbldnsd/Manifest
index bcbb5099dc35..4d7d25d63805 100644
--- a/net-dns/rbldnsd/Manifest
+++ b/net-dns/rbldnsd/Manifest
@@ -2,6 +2,6 @@ AUX confd-0.997a 1375 BLAKE2B 61980080ecad7a64ed547f19de7ca827057cca1ed4c4c724c5
 AUX initd-0.997a 546 BLAKE2B 6f7a5220598bc37e7b3c59db65fd38f17ed68c407a9ff1c486c2052fba166fbcd854bca5dc6cedf59b497998d968077b39e790168dc7e93ee62fa29b4c5864fa SHA512 2d18c5126ee1cf79e45881cf358f9d9299387dc1b2c0ee2433f85f617694ba11fb2c80703c18002995dc3d1f3d9d561b9b473a9c705b5b0c8ff282385b2e3170
 AUX rbldnsd-0.997a-robust-ipv6-test-support.patch 10867 BLAKE2B b2470f4a364c490b01cc8c2349d18d54ce6bc44f0113883bab763742cd798a0edec8add591a716ea99ac2d121bb1070bda1109d40018a91c162aaede3a2bc31d SHA512 a502df0c102a92dbccba482741ef628cde409f6d87d8467b66a0e4f595f8b28b9e99db0832ca27e3dbf317018b33f666b8bb8962988177cfaf1e0d28b6bf21d6
 DIST rbldnsd-0.998b.tar.gz 154022 BLAKE2B f0bf03bef69853d45c3546c6fd3e58ffb95e76192ecb64f71f6799c6041749b1d117bed2bb21edbf1dec81d1684334b3af7d60b35d49089efb3a5e28752be6db SHA512 9b9c8694824a99b4ad120a22dbe4b05351867434e43ed0d8137990d3ece90ed67349965b6ed0450066d6663c1858545774c733b0d7afff304095de500ba30175
-EBUILD rbldnsd-0.998b-r1.ebuild 1526 BLAKE2B 2ca92c51ccaabdf318593d822128f25fbb3975f597b63da1cec66b76f4ab254ca5062027cb59d1954465ed87b2d2f4183b4f288d63bb6e8c59ecd5edafb006a2 SHA512 06eb2e2eb61f77ee012224ee6ef291f1066b89a1ad7c68cd06dfbfb0d23dafc64e5273a8ae24cb9a6d99026ec778b38820478f2a85e4358a2075050e544476b3
+EBUILD rbldnsd-0.998b-r2.ebuild 1248 BLAKE2B c447226943e2ea69274996a6c6a2388e38cf184654669221c34cfc9825afeac2dd1d27aba281f20a73fdf8485ede07f2f6d1feb62c136b14064e1f205fb23a9a SHA512 a6f384fc06397dcd1148e31e6a11b0c6c7feba90f19539a96c0fc064ba0780283ee30d28b6b64a88c440e46d58d75a3c469cac86f6d316f43e5ef782dfdfd1b0
 EBUILD rbldnsd-0.998b.ebuild 1471 BLAKE2B 2cfb519389960159469c39726e2f6ca8fd4b0504803b7944c729785b9db21f598120a55b1006ea38fe81d50c2d35a9743324612f53b8254ee2a2b26c063805bc SHA512 1d13f5a5fff869e5a37d7a8f5cefbe7fff6f004bddddb7200de14099cfadce67498e0176b4cdb4cd3738cb0a9bbc34ed3b3273c2794ff77fdaa362775eb91177
 MISC metadata.xml 1219 BLAKE2B 78d1de3d2e056e8d1441e929686a9cf1d073348f2b58ef263ffee7c6e9c03ad59b387c6112fdcb845915b1d5f41eaf6825f21510e7d085852ab49567412eb867 SHA512 23bddced94702b936cadbaf9a6a51cfd8506715a766cbef9dbb0fb69bf02443e0c8636b6237f98fd3922d0c43fb17c7c2850074e6bdefc2c9af3731a01971f8f
diff --git a/net-dns/rbldnsd/rbldnsd-0.998b-r1.ebuild b/net-dns/rbldnsd/rbldnsd-0.998b-r2.ebuild
index c73e294de9e9..a95bcde36f78 100644
--- a/net-dns/rbldnsd/rbldnsd-0.998b-r1.ebuild
+++ b/net-dns/rbldnsd/rbldnsd-0.998b-r2.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
 
-inherit toolchain-funcs python-any-r1
+inherit toolchain-funcs
 
 DESCRIPTION="DNS server designed to serve blacklist zones"
 HOMEPAGE="https://rbldnsd.io/"
@@ -13,23 +12,18 @@ SRC_URI="https://github.com/spamhaus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE="ipv6 test zlib"
-RESTRICT="!test? ( test )"
+IUSE="ipv6 zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	acct-group/rbldns
 	acct-user/rbldns
-	test? (
-		${RDEPEND}
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]')
-	)"
+"
 
-PATCHES=(
-	"${FILESDIR}/rbldnsd-0.997a-robust-ipv6-test-support.patch"
-)
+# The test suite was dropped from the ebuild because it requires
+# python-2.7, and it will crash if you try to run it now.
+RESTRICT=test
 
 src_configure() {
 	# The ./configure file is handwritten and doesn't support a `make
@@ -48,12 +42,6 @@ src_compile() {
 		RANLIB="$(tc-getRANLIB)"
 }
 
-src_test() {
-	emake check \
-		CC="$(tc-getCC)" \
-		PYTHON="${PYTHON}"
-}
-
 src_install() {
 	einstalldocs
 	dosbin rbldnsd
@@ -63,7 +51,3 @@ src_install() {
 	diropts -g rbldns -o rbldns -m 0750
 	keepdir /var/db/rbldnsd
 }
-
-python_check_deps() {
-	! use test || has_version "dev-python/pydns:2[${PYTHON_USEDEP}]"
-}
diff --git a/net-dns/resolv_wrapper/Manifest b/net-dns/resolv_wrapper/Manifest
index 20c0814222ba..ba50f75ed294 100644
--- a/net-dns/resolv_wrapper/Manifest
+++ b/net-dns/resolv_wrapper/Manifest
@@ -1,5 +1,5 @@
-DIST resolv_wrapper-1.1.4.tar.gz 33288 BLAKE2B 1e6ee070e2766bae9d6c9007c1bedc60ad550d33d2e785ef98ea81ab0f9034a0be056a76d56790f7d3c1c400c9b00cab37a37fb78ed99a8b2a4bfe30795b1ca7 SHA512 da7eb897d3964015b2bb6f7c1ba6483020c70e2d64c5e13b6c095f9e57dccf5b035d04e41c38953fa0eb260e83d7e23f6af32c0d8186553bae8d7b741c46c5ba
 DIST resolv_wrapper-1.1.5.tar.gz 34241 BLAKE2B 7025885731a1defa79ae7a0381ca4394c37508883dc5e19aa9e29b0545cddc1c3f2b5091991a3e1599654e1a64442a6a36760f7725e54d1270c1a5b71bd3fadb SHA512 d11beff60cf935c0c12ac97ae375299ab1cd2e270d09438cf81b5c19dd94b7d430484c44ec9611171b67654d5c0f26afc4aa9d069d61293a956ef8fc59efc7a8
-EBUILD resolv_wrapper-1.1.4.ebuild 678 BLAKE2B ef1f99d669fab1a4c63e9b32746e2ed5d790ee8fae2ff92253752a1e63b5e91cdb263d529d90382c7e07f14c2a724fd565ea151a5ff97d62dc931f9795d7f17b SHA512 301cae2529400f6826726e11b3f74c9fdc72e5ea68bf944dba3d6dc3cb7c5c64a269e6be047d2c6aadf5e8e3c9eb8be9366365fa6ae510129c87ac1eb495af27
-EBUILD resolv_wrapper-1.1.5.ebuild 714 BLAKE2B 6185a87b932e3817c2db63035d464e3f212c320f27af55cf53ca416065fc3a517d017f5e6050dfbe43577622f2b0cde650f4fb2f866cb021cd59255d8caa4d11 SHA512 79677bb62b2a4edaf77332f6492aa23dc6433f4edad1c0e513bbe6401fe5f90df3690571399baa0dcfd533a2e979f6799f07e3b0e9066fd89c41534f02009309
-MISC metadata.xml 360 BLAKE2B 3c45284477381a60df338afbc4293cc20c47223eca1b4669b3f310ccb80cb0b81d534d9fbfdac8357b43507340e5f61e959c03e39e5a3deba0430e4f15aa740c SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2
+DIST resolv_wrapper-1.1.6.tar.gz 38276 BLAKE2B 4b1c79a342b74f33063ba480b1706a107c53275430b3f5e1e46204265af3501394f72b6119e98ad3382e48f9a8f2511e679b3f4093446beaa11095bfaed340ce SHA512 cc379124c6104ba1330dfc038f04f9b473b71ac81b18889e481fb7812b38e71040ca6bed7bffd6eeaf77abeb8452a4d3308514ec6380811327dc832aa0381be8
+EBUILD resolv_wrapper-1.1.5.ebuild 657 BLAKE2B 909507585dfea902627521d326e76368a40dbe8e3d3b40f78fb4902b5cde67a4f50fad9d5d169a71e6437968bdc7e479e64f024c25c987aa9375c311a8b14b22 SHA512 14db7048addb5a6b7331c629acac97852fc1939501142359b4e9b0942bef1b0897adcc85c794c43de6f0c3947cdb476d745abba8b6439199f068af1aa522c7e1
+EBUILD resolv_wrapper-1.1.6.ebuild 664 BLAKE2B decc50a1b1a35010953fb0cfe98c3a35c1968c285f3b20f7a446456b6a834a6ffd02224ff4721eba7a3cc2e95ac8f58ed720cdb5ba35fe974dc2d7ae7d01c615 SHA512 056ff258de0cb3671316834fec593c5ecdf3ec47d72c9141df8dfbb12a0331a850fa5d252cf4f1dde836e895f0f5b6bb2ab10a64dab4d98303a7345a89e914e1
+MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-dns/resolv_wrapper/metadata.xml b/net-dns/resolv_wrapper/metadata.xml
index f05d1f266834..48f6ca46f45a 100644
--- a/net-dns/resolv_wrapper/metadata.xml
+++ b/net-dns/resolv_wrapper/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>samba@gentoo.org</email>
-    <name>Samba</name>
+    <name>Samba Team</name>
   </maintainer>
 </pkgmetadata>
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
index ba89b7e9fb90..3fa4778a53d0 100644
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
@@ -1,25 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
-DESCRIPTION="A wrapper for DNS name resolving or DNS faking"
+DESCRIPTION="Wrapper for DNS name resolving or DNS faking"
 HOMEPAGE="https://cwrap.org/resolv_wrapper.html"
 SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 
 # Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
 # Because of this we cannot use cmake-multilib_src_configure() here.
 multilib_src_configure() {
 	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.4.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.6.ebuild
index 46ba959b819d..98ba5d7cdd3d 100644
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.4.ebuild
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.6.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
-DESCRIPTION="A wrapper for DNS name resolving or DNS faking"
+DESCRIPTION="Wrapper for DNS name resolving or DNS faking"
 HOMEPAGE="https://cwrap.org/resolv_wrapper.html"
 SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
 # Because of this we cannot use cmake-multilib_src_configure() here.
 multilib_src_configure() {
 	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 83161a1b6c2c..7167bde44469 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -8,6 +8,6 @@ AUX unbound.socket 101 BLAKE2B 4885d311873d7f3e5daf1c0a63798b13761b7c0bfb1bead0b
 AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a73b0c6148f4df336c4c07e8da19320df6bedb49cb6884da565543f78456d38dc3000ca2a1abde84816be SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3
 DIST unbound-1.10.0.tar.gz 5727902 BLAKE2B 64285aa60a11afa84f7fd30c2727de2831a0e418186f7665a3529a2fa2150f8d616838bcdad23aa69e4e761ad0764ead47aee1cddbcf82101a64cf5974c29700 SHA512 a64514990f5d614d749045a11f5ce9bb33cf856cc31895b4db3503f2b05a98f1ca57945b17dd7ec5befbd0c356fc42a717d3e2bae3d3510a0507d0445b1f6d59
 DIST unbound-1.9.6.tar.gz 5680145 BLAKE2B 9aa047270694babed36395100bbfc4287c74e173abfbb6f33939a7bf1362f765b16a8d016d84d426a5c0014d244063b4c028d5b5dddb05f09ad4287d8a63f098 SHA512 39a60f51da912ed25d247bc1e882b1242d80a63b0c2b3f753d38ed558f3a24691267375136ff6d85e5945a98ca0c4ac87e43e131c97737a355374dde64259951
-EBUILD unbound-1.10.0.ebuild 5405 BLAKE2B cd64c3dcf564ce947983d3c567c1c984465e695e22e70307eccb1e6d0cccede21984e3cda2d90b09c193bab9a8c5badfa4fd2a5cc287a300b51d879645902fb8 SHA512 8439eba62cfdf34344d7f5aac281ceff2fe3dac7cc6a1b3f96c10330ca6159659dee296375f5b9296969abd4e5a4ec20fc55e74499730cea6aafc28fa47c1959
-EBUILD unbound-1.9.6.ebuild 5400 BLAKE2B e7ff3b4b75d812085ab79c1101dcbec1f4d0a845c28254940b5990e087b9441bb91806dafc11e3a4e6d7ef83065fbd7e83818e5706b60a7bcf8523d18685febe SHA512 7d3a1751cf5387b0723d4727faf11ad4b5d9f92fc203754152e069168ed2857b750c8e647af5d28154635a82358deca355f04a5ef3129c069b2859b3cb6b958b
+EBUILD unbound-1.10.0.ebuild 5395 BLAKE2B d71646af37c089104432c58c2f422b1adbcce99d2d4e5c139660c03dd653d6e28862fbbfb42aa46f2c694222ee13d0e37dd061f7b4d2b2f28eee3941c11425a9 SHA512 b069325bb5639ec35e94f0c905f3105be0ac1e0e1938022190100d478029c04d34f932d87b854a43d7f739c94fee7ae9115c682bd4e140cec75ea0a29d2d18b4
+EBUILD unbound-1.9.6.ebuild 5390 BLAKE2B ce7620d0f76f8ec2b304cb73e7f875938957f285bdf73741e7c43f3d720853500d0ff857d2ec101bacbd3d8a61e270c42d9aebb4365718b1cc434519b387d48b SHA512 2e9305db63c2889389362ea48938d0cdd66aeb3fc15636004b43ba2a9ab0a2c8ccf934125fc253c89927e24bbe68ce2e21ee2c736835d4fe8eedb560e996d3b3
 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/unbound-1.10.0.ebuild b/net-dns/unbound/unbound-1.10.0.ebuild
index 41498e209a39..fd179dd04cb7 100644
--- a/net-dns/unbound/unbound-1.10.0.ebuild
+++ b/net-dns/unbound/unbound-1.10.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
 
diff --git a/net-dns/unbound/unbound-1.9.6.ebuild b/net-dns/unbound/unbound-1.9.6.ebuild
index 0a689254ef95..704a3c262452 100644
--- a/net-dns/unbound/unbound-1.9.6.ebuild
+++ b/net-dns/unbound/unbound-1.9.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-dns
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)