gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-dns
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
61 files changed, 1523 insertions, 813 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index c71881a8ffca..5898201a919d 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 40a1151633be..b6a95bef31a1 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,8 +1,13 @@
 AUX autoipd-openrc.sh 700 BLAKE2B e71e5583db890f8ee1bbe9c03fc42285871089b2ea2d4549d553f14a20a3aa97c519b298bfaaccf02346c911f65f8e3f8bab7b2dc8270a5d35c471cc6bf31f6b SHA512 a5dbbac4d6d1959db3a07a63acb7569dbeba33d2274a1dd3253dc27687549371611cf08bad3998d89efb3ace63b5541a4d225e484274450e0c82661f5a1dbc32
 AUX autoipd.sh 1271 BLAKE2B 815c5776afff71489826eb8338535df1af6fbf02f3d42eedb6ebb69e5fff181e7252060818dd2dd67141a40c097ded8b7ac4210cb9929bab4b68ea99533bcf26 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3
 AUX avahi-0.7-CVE-2017-6519.patch 1578 BLAKE2B 87fce922927e1217802ce0f7b2a1a6f22649903a495817e224a37e7fc5c76d0d2a6cfbb50a1373a950a75a45a68bfbcba9f2155ed24940e3ffb994b862c00e4c SHA512 6c30c0d095f42b9bd289a1ac7b42287cd109bf0bad480d13eec70bedb65e7e1ab495600703f39f1caf73c3c0617c72940c33462586d68deb0a416d7c93964997
+AUX avahi-0.7-python3-gdbm.patch 7138 BLAKE2B 0ec244db80c4fd5eb896ce32ce78223e5cff3c8b0b7ecf690042489682423651f7f8c9b15d593088abbde56534e35dc2e5802b6d73d38c0cc0a112a234776237 SHA512 7b287062d605c0dd0c5a0a78ccc072ea31d2a4d158a804133e5ea8056a8f1eecf7f4833d2078c2349e01f0e97d269efb944c883a543f8f4fc3f5d538bc2c0cbe
+AUX avahi-0.7-python3-unittest.patch 4772 BLAKE2B 2b1a7affc0bf4ad136f71af5c1bd03acff90c175a1efc18b63adfad7381471f06c187ef1bf0c702391dcc86cffe2e9041f0a0266a01f36b4810f53f2cb096159 SHA512 c598a3eb6aab93f58ee24ca77a2ae0a12b081a4c4e91f1f83c57dc1f62abf40dd3f914bff3ab17ac7032a45e9f30df6f8e7913ac5eaf5ea6c673dda47e878501
+AUX avahi-0.7-python3.patch 2810 BLAKE2B 523515d5d324e5b74d60abbdbc88469fec55ce31cb9d0803e9255f82aedb36fec4740d507c326166d73fb64316ad2490850d795aed27c9bef1249022be008656 SHA512 90ed5a68f39d135edec7264786eec6e0adba420cfcbf220bfc64b2739a7c0a72a869760cf4a1830949502660bfe324bf60918c71183cc68abfdf090bbeb10d92
 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 5250 BLAKE2B fb2f31ff16159ec52bdaf74a45e67b0d440ac81dd37b84cbff8596fbf931cb876b31c6631f2227fab6abf83671960ad45ed37f616ed2a8b424dea0cf6e3a9dc2 SHA512 ea3143c5834c2ed15cbaac7d8efd0dd3198c8e982b851abfad68c3dd3de9f5bad440a4af9db4ad140ef02f3cc39eb18ce53592cbed30b999ea433284898f948a
 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
diff --git a/net-dns/avahi/avahi-0.7-r5.ebuild b/net-dns/avahi/avahi-0.7-r5.ebuild
new file mode 100644
index 000000000000..550cf31f3817
--- /dev/null
+++ b/net-dns/avahi/avahi-0.7-r5.ebuild
@@ -0,0 +1,219 @@
+# 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 gtk3 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/expat
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] )
+	qt5? ( dev-qt/qtcore:5 )
+	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+	gtk3? ( 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
+		gtk? ( 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}
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )
+	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 )
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt5.patch"
+	"${FILESDIR}/${P}-CVE-2017-6519.patch"
+	"${FILESDIR}/${P}-remove-empty-avahi_discover.patch"
+	"${FILESDIR}/${P}-python3.patch"
+	"${FILESDIR}/${P}-python3-unittest.patch"
+	"${FILESDIR}/${P}-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 gtk)
+		$(use_enable 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 gtk || \
+		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/files/avahi-0.7-python3-gdbm.patch b/net-dns/avahi/files/avahi-0.7-python3-gdbm.patch
new file mode 100644
index 000000000000..3976b8df2e76
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.7-python3-gdbm.patch
@@ -0,0 +1,234 @@
+From 63750f1be96ad08c407193b08bf3b9ee74310e2d Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 11 Jul 2017 21:52:37 +0200
+Subject: [PATCH] avahi-python: Use the agnostic DBM interface
+
+Also fixes configure failing if Python 3 is the build python and GDBM is
+enabled, since Py3 only has anydbm under the name of 'dbm'.
+
+Not enough to make ServiceTypeDatabase.py compatible with Py3, but it's
+a start.
+---
+ avahi-python/avahi/Makefile.am                | 15 +--------
+ avahi-python/avahi/ServiceTypeDatabase.py.in  | 33 ++++++++++++++-----
+ configure.ac                                  |  9 +++--
+ service-type-database/.gitignore              |  1 -
+ service-type-database/Makefile.am             | 18 +++-------
+ .../{build-db.in => build-db}                 | 13 +++++---
+ 6 files changed, 42 insertions(+), 47 deletions(-)
+ rename service-type-database/{build-db.in => build-db} (87%)
+
+diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am
+index 3eb67d0d..c906b9bf 100644
+--- a/avahi-python/avahi/Makefile.am
++++ b/avahi-python/avahi/Makefile.am
+@@ -25,29 +25,16 @@ avahidir = $(pythondir)/avahi
+ 
+ if HAVE_GDBM
+ nodist_avahi_SCRIPTS = ServiceTypeDatabase.py
+-
+-ServiceTypeDatabase.py: ServiceTypeDatabase.py.in
+-	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
+-		-e 's,@DBM\@,gdbm,g' \
+-		-e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \
+-		-e 's,@CHECK_KEY\@,while key is not None:,g' \
+-		-e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \
+-		-e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \
+-	chmod +x $@
+ endif
+ 
+ if HAVE_DBM
+ nodist_avahi_SCRIPTS = ServiceTypeDatabase.py
++endif
+ 
+ ServiceTypeDatabase.py: ServiceTypeDatabase.py.in
+ 	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
+-		-e 's,@DBM\@,dbm,g' \
+-		-e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \
+-		-e 's,@CHECK_KEY\@,for key in keys:,g' \
+-		-e 's,@NEXT_KEY\@,,g' \
+ 		-e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \
+ 	chmod +x $@
+-endif
+ 
+ avahi_PYTHON = $(avahi_SCRIPTS)
+ 
+diff --git a/avahi-python/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in
+index 4ddd6544..d7f9969b 100644
+--- a/avahi-python/avahi/ServiceTypeDatabase.py.in
++++ b/avahi-python/avahi/ServiceTypeDatabase.py.in
+@@ -17,7 +17,11 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+ 
+-import @DBM@
++try:
++    import anydbm as dbm
++except ImportError:
++    import dbm
++
+ import locale
+ import re
+ 
+@@ -28,7 +32,7 @@ class ServiceTypeDatabase:
+ 
+     def __init__(self, filename = "@pkglibdatadir@/service-types.db"):
+ 
+-        self.db = @DBM@.open(filename, "r")
++        self.db = dbm.open(filename, "r")
+ 
+         l = locale.getlocale(locale.LC_MESSAGES)
+ 
+@@ -90,13 +94,24 @@ class ServiceTypeDatabase:
+ 
+     def __iter__(self):
+ 
+-        @FIRST_KEY@
+-        @CHECK_KEY@
+-
+-            if re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+', key) and not re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+\[.*\]', key):
+-                yield key
+-
+-            @NEXT_KEY@
++        def want_key(key):
++            if not re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+', key):
++                return False
++            if re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+\[.*\]', key):
++                return False
++            return True
++
++        try:
++            key = self.db.firstkey()
++        except AttributeError:
++            for key in self.db.keys():
++                if want_key(key):
++                    yield key
++        else:
++            while key is not None:
++                if want_key(key):
++                    yield key
++                key = self.db.nextkey(key)
+ 
+     def __len__(self):
+ 
+diff --git a/configure.ac b/configure.ac
+index 66789718..fbbf7cf3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -824,11 +824,10 @@ if test "x$HAVE_PYTHON" = "xyes" ; then
+         fi
+ 
+         AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
+-        if test "x$HAVE_GDBM" = "xyes"; then
+-            AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)])
+-        fi
+-        if test "x$HAVE_DBM" = "xyes"; then
+-            AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)])
++        if test "x$HAVE_GDBM" = "xyes" || test "x$HAVE_DBM" = "xyes"; then
++            AM_CHECK_PYMOD(anydbm,,,[
++                AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)])
++            ])
+         fi
+     fi
+ fi
+diff --git a/service-type-database/.gitignore b/service-type-database/.gitignore
+index 581f1929..51b02600 100644
+--- a/service-type-database/.gitignore
++++ b/service-type-database/.gitignore
+@@ -1,4 +1,3 @@
+ Makefile
+ Makefile.in
+ service-types.db
+-build-db
+diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
+index d184fde3..f9fa0825 100644
+--- a/service-type-database/Makefile.am
++++ b/service-type-database/Makefile.am
+@@ -15,7 +15,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+ 
+-EXTRA_DIST=build-db.in service-types
++EXTRA_DIST=service-types
+ 
+ pkglibdatadir=$(libdir)/avahi
+ 
+@@ -27,16 +27,11 @@ if HAVE_GDBM
+ noinst_SCRIPTS=build-db
+ pkglibdata_DATA+=service-types.db
+ 
+-build-db: build-db.in
+-	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
+-	    -e 's,@DBM\@,gdbm,g' $< > $@ && \
+-	chmod +x $@
+-
+-service-types.db: service-types build-db
++service-types.db: service-types
+ 	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
+ 	mv $@.coming $@
+ 
+-CLEANFILES = service-types.db build-db
++CLEANFILES = service-types.db
+ 
+ endif
+ if HAVE_DBM
+@@ -44,11 +39,6 @@ if HAVE_DBM
+ noinst_SCRIPTS=build-db
+ pkglibdata_DATA+=service-types.db.pag service-types.db.dir
+ 
+-build-db: build-db.in
+-	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
+-	    -e 's,@DBM\@,dbm,g' $< > $@ && \
+-	chmod +x $@
+-
+ service-types.db.pag: service-types.db
+ 	$(AM_V_GEN)mv service-types.db.coming.pag service-types.db.pag
+ service-types.db.dir: service-types.db
+@@ -57,7 +47,7 @@ service-types.db: service-types build-db
+ 	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
+ 	if test -f "$@.coming"; then mv $@.coming $@; fi
+ 
+-CLEANFILES = service-types.db* build-db
++CLEANFILES = service-types.db*
+ 
+ endif
+ endif
+diff --git a/service-type-database/build-db.in b/service-type-database/build-db
+similarity index 87%
+rename from service-type-database/build-db.in
+rename to service-type-database/build-db
+index 4cda4253..78ee892f 100755
+--- a/service-type-database/build-db.in
++++ b/service-type-database/build-db
+@@ -1,4 +1,4 @@
+-#!@PYTHON@
++#!/usr/bin/env python
+ # -*-python-*-
+ # This file is part of avahi.
+ #
+@@ -17,7 +17,12 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+ 
+-import @DBM@, sys
++try:
++    import anydbm as dbm
++except ImportError:
++    import dbm
++
++import sys
+ 
+ if len(sys.argv) > 1:
+     infn = sys.argv[1]
+@@ -29,9 +34,9 @@ if len(sys.argv) > 2:
+ else:
+     outfn = infn + ".db"
+ 
+-db = @DBM@.open(outfn, "n")
++db = dbm.open(outfn, "n")
+ 
+-for ln in file(infn, "r"):
++for ln in open(infn, "r"):
+     ln = ln.strip(" \r\n\t")
+     
+     if ln == "" or ln.startswith("#"):
diff --git a/net-dns/avahi/files/avahi-0.7-python3-unittest.patch b/net-dns/avahi/files/avahi-0.7-python3-unittest.patch
new file mode 100644
index 000000000000..9d735a1780c2
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.7-python3-unittest.patch
@@ -0,0 +1,151 @@
+From 62fe263662b52a462895fd8d21cf29b2fa22fe86 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Fri, 27 Apr 2018 11:10:57 +0100
+Subject: [PATCH] avahi-python: Add a unit test for string and bytestring
+ conversions
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ .gitignore                     |  1 +
+ avahi-python/avahi/.gitignore  |  5 ++
+ avahi-python/avahi/Makefile.am |  7 +++
+ avahi-python/avahi/test.py     | 85 ++++++++++++++++++++++++++++++++++
+ 4 files changed, 98 insertions(+)
+ create mode 100755 avahi-python/avahi/test.py
+
+diff --git a/.gitignore b/.gitignore
+index beab8d94..06565f06 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -32,3 +32,4 @@ ltmain.sh
+ missing
+ py-compile
+ stamp-h1
++test-driver
+diff --git a/avahi-python/avahi/.gitignore b/avahi-python/avahi/.gitignore
+index 118a34de..9b0f6e3c 100644
+--- a/avahi-python/avahi/.gitignore
++++ b/avahi-python/avahi/.gitignore
+@@ -1 +1,6 @@
++*.log
++*.pyc
++*.pyo
++*.trs
+ ServiceTypeDatabase.py
++__pycache__/
+diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am
+index 3eb67d0d..cf527aff 100644
+--- a/avahi-python/avahi/Makefile.am
++++ b/avahi-python/avahi/Makefile.am
+@@ -16,6 +16,11 @@
+ # USA.
+ 
+ EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in
++EXTRA_DIST += test.py
++
++TESTS =
++TEST_EXTENSIONS = .py
++PY_LOG_COMPILER = $(PYTHON)
+ 
+ pkglibdatadir=$(libdir)/avahi
+ 
+@@ -55,6 +60,8 @@ if HAVE_PYTHON_DBUS
+ 
+ avahi_PYTHON += __init__.py
+ 
++TESTS += test.py
++
+ endif
+ endif
+ 
+diff --git a/avahi-python/avahi/test.py b/avahi-python/avahi/test.py
+new file mode 100755
+index 00000000..7afc4809
+--- /dev/null
++++ b/avahi-python/avahi/test.py
+@@ -0,0 +1,85 @@
++#!/usr/bin/python
++#
++# Copyright 2018 Simon McVittie
++#
++# This file is part of avahi.
++#
++# avahi is free software; you can redistribute it and/or modify it
++# under the terms of the GNU Lesser General Public License as
++# published by the Free Software Foundation; either version 2 of the
++# License, or (at your option) any later version.
++#
++# avahi is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
++# License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public
++# License along with avahi; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
++# USA.
++
++import os
++import os.path
++import sys
++import unittest
++from collections import OrderedDict
++
++sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir))
++
++import avahi
++import dbus
++
++class TestUtilityMethods(unittest.TestCase):
++    def test_byte_array_to_string(self):
++        self.assertEqual(
++            avahi.byte_array_to_string([1, 2, 127, 128]),
++            '....')
++        self.assertEqual(
++            avahi.byte_array_to_string([ord('a'), ord(' '), ord('b')]),
++            'a b')
++
++    def test_txt_array_to_string_array(self):
++        self.assertEqual(
++            avahi.txt_array_to_string_array([[1, 2], [ord('a'), ord('b')]]),
++            ['..', 'ab'])
++
++    def test_string_to_byte_array(self):
++        self.assertEqual(
++            avahi.string_to_byte_array('abc'),
++            [dbus.Byte(97), dbus.Byte(98), dbus.Byte(99)])
++        self.assertIsInstance(
++            avahi.string_to_byte_array('abc')[0],
++            dbus.Byte)
++        self.assertEqual(
++            avahi.string_to_byte_array(b'\x01\xff'),
++            [dbus.Byte(0x01), dbus.Byte(0xff)])
++        self.assertEqual(
++            avahi.string_to_byte_array(u'\u00e1'),
++            [dbus.Byte(0xc3), dbus.Byte(0xa1)])
++
++    def test_string_array_to_txt_array(self):
++        self.assertEqual(
++            avahi.string_array_to_txt_array(['abc', b'\x01', u'\u00e1']),
++            [
++                [dbus.Byte(97), dbus.Byte(98), dbus.Byte(99)],
++                [dbus.Byte(0x01)],
++                [dbus.Byte(0xc3), dbus.Byte(0xa1)]])
++        self.assertIsInstance(
++            avahi.string_array_to_txt_array(['abc'])[0][0],
++            dbus.Byte)
++
++    def test_dict_to_txt_array(self):
++        self.assertEqual(
++            avahi.dict_to_txt_array(
++                OrderedDict((('a', 'abc'), ('b', b'\x01'), ('c', u'\u00e1')))),
++            [
++                [dbus.Byte(97), dbus.Byte(ord('=')), dbus.Byte(97), dbus.Byte(98), dbus.Byte(99)],
++                [dbus.Byte(98), dbus.Byte(ord('=')), dbus.Byte(0x01)],
++                [dbus.Byte(99), dbus.Byte(ord('=')), dbus.Byte(0xc3), dbus.Byte(0xa1)]])
++        self.assertIsInstance(
++            avahi.dict_to_txt_array({'a': 'abc'})[0][0],
++            dbus.Byte)
++
++if __name__ == '__main__':
++    unittest.main()
diff --git a/net-dns/avahi/files/avahi-0.7-python3.patch b/net-dns/avahi/files/avahi-0.7-python3.patch
new file mode 100644
index 000000000000..a4bb34029964
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.7-python3.patch
@@ -0,0 +1,94 @@
+From 169e85dbc13dcaae8a699618883e512614f540b7 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Fri, 27 Apr 2018 11:09:07 +0100
+Subject: [PATCH] avahi-python: Encode unicode strings as UTF-8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Previously, we would effectively encode anything representable in
+Latin-1 as Latin-1, and crash on anything not representable in Latin-1:
+
+>>> import avahi
+>>> avahi.string_to_byte_array(u'©')
+[dbus.Byte(169)]
+>>> avahi.string_to_byte_array(u'\ufeff')
+Traceback (most recent call last):
+  File "<stdin>", line 1, in <module>
+  File "/usr/lib/python2.7/dist-packages/avahi/__init__.py", line 94, in string_to_byte_array
+    r.append(dbus.Byte(ord(c)))
+ValueError: Integer outside range 0-255
+
+This is particularly important for Python 3, where the str type
+is a Unicode string.
+
+The b'' syntax for bytestrings is supported since at least Python 2.7.
+
+These functions now accept either Unicode strings (Python 2 unicode,
+Python 3 str), which are encoded in UTF-8, or bytestrings
+(Python 2 str, Python 3 bytes) which are taken as-is.
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ avahi-python/avahi/__init__.py | 24 +++++++++++++++++++++---
+ 1 file changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/avahi-python/avahi/__init__.py b/avahi-python/avahi/__init__.py
+index 7b450293..02305b02 100644
+--- a/avahi-python/avahi/__init__.py
++++ b/avahi-python/avahi/__init__.py
+@@ -17,6 +17,8 @@
+ 
+ # Some definitions matching those in avahi-common/defs.h
+ 
++import sys
++
+ import dbus
+ 
+ SERVER_INVALID, SERVER_REGISTERING, SERVER_RUNNING, SERVER_COLLISION, SERVER_FAILURE = range(0, 5)
+@@ -66,6 +68,9 @@
+ DBUS_INTERFACE_SERVICE_RESOLVER = DBUS_NAME + ".ServiceResolver"
+ DBUS_INTERFACE_RECORD_BROWSER = DBUS_NAME + ".RecordBrowser"
+ 
++if sys.version_info[0] >= 3:
++    unicode = str
++
+ def byte_array_to_string(s):
+     r = ""
+     
+@@ -86,12 +91,19 @@ def txt_array_to_string_array(t):
+ 
+     return l
+ 
+-
+ def string_to_byte_array(s):
++    if isinstance(s, unicode):
++        s = s.encode('utf-8')
++
+     r = []
+ 
+     for c in s:
+-        r.append(dbus.Byte(ord(c)))
++        if isinstance(c, int):
++            # Python 3: iterating over bytes yields ints
++            r.append(dbus.Byte(c))
++        else:
++            # Python 2: iterating over str yields str
++            r.append(dbus.Byte(ord(c)))
+ 
+     return r
+ 
+@@ -107,6 +119,12 @@ def dict_to_txt_array(txt_dict):
+     l = []
+ 
+     for k,v in txt_dict.items():
+-        l.append(string_to_byte_array("%s=%s" % (k,v)))
++        if isinstance(k, unicode):
++            k = k.encode('utf-8')
++
++        if isinstance(v, unicode):
++            v = v.encode('utf-8')
++
++        l.append(string_to_byte_array(b"%s=%s" % (k,v)))
+ 
+     return l
diff --git a/net-dns/avahi/files/avahi-0.7-remove-empty-avahi_discover.patch b/net-dns/avahi/files/avahi-0.7-remove-empty-avahi_discover.patch
new file mode 100644
index 000000000000..702499e22185
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.7-remove-empty-avahi_discover.patch
@@ -0,0 +1,77 @@
+From ffb19d8f3c7f1fe4f31f79f8601dd3079730401b Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Fri, 27 Apr 2018 09:01:13 +0100
+Subject: [PATCH] Remove empty avahi_discover Python module
+
+The avahi-discover tool no longer has any code outside its main
+executable, so it does not need to install library modules. Its only
+library code was avahi_discover.SimpleGladeApp, which was removed
+in 2009.
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ avahi-python/avahi-discover/Makefile.am |  6 ------
+ avahi-python/avahi-discover/__init__.py | 18 ------------------
+ 2 files changed, 24 deletions(-)
+ delete mode 100755 avahi-python/avahi-discover/__init__.py
+
+diff --git a/avahi-python/avahi-discover/Makefile.am b/avahi-python/avahi-discover/Makefile.am
+index 5fc4b25f..bb4d7172 100644
+--- a/avahi-python/avahi-discover/Makefile.am
++++ b/avahi-python/avahi-discover/Makefile.am
+@@ -18,7 +18,6 @@
+ AM_CFLAGS=-I$(top_srcdir)
+ 
+ EXTRA_DIST = \
+-	__init__.py \
+ 	avahi-discover.py \
+ 	avahi-discover.desktop.in.in
+ 
+@@ -31,15 +30,11 @@ pythonscripts =
+ desktopdir = $(datadir)/applications
+ desktop_DATA =
+ 
+-avahi_discoverdir = $(pythondir)/avahi_discover
+-avahi_discover_PYTHON =
+-
+ if HAVE_GDBM
+ pythonscripts += \
+ 	avahi-discover
+ desktop_DATA += avahi-discover.desktop
+ @INTLTOOL_DESKTOP_RULE@
+-avahi_discover_PYTHON += __init__.py
+ endif
+ 
+ if HAVE_DBM
+@@ -47,7 +42,6 @@ pythonscripts += \
+ 	avahi-discover
+ desktop_DATA += avahi-discover.desktop
+ @INTLTOOL_DESKTOP_RULE@
+-avahi_discover_PYTHON += __init__.py
+ endif
+ 
+ avahi-discover.desktop.in: avahi-discover.desktop.in.in
+diff --git a/avahi-python/avahi-discover/__init__.py b/avahi-python/avahi-discover/__init__.py
+deleted file mode 100755
+index 6f3ec7f9..00000000
+--- a/avahi-python/avahi-discover/__init__.py
++++ /dev/null
+@@ -1,18 +0,0 @@
+-#!@PYTHON@
+-# -*-python-*-
+-# This file is part of avahi.
+-#
+-# avahi is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU Lesser General Public License as
+-# published by the Free Software Foundation; either version 2 of the
+-# License, or (at your option) any later version.
+-#
+-# avahi is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+-# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+-# License for more details.
+-#
+-# You should have received a copy of the GNU Lesser General Public
+-# License along with avahi; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+-# USA.
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 927c6fc5b282..0133c6bf78ea 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,5 +1,7 @@
 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.15.6.tar.gz 6432248 BLAKE2B c6dbaeeafdad3e2c7dd30ed1e5121c961829af8d82b9b93dd4eca34d96dfc2854e302068987dcd30ab88c768f6328c81bf81b348a698ceb11001d4d700ef374f SHA512 3bf7ebde706a6771606fda675c60daccbb22c2dc9551a8f361fe102b59e342ded99568b27bca7d7fa32d3f2be3811f38ec014f4ad0c281b590b7b69967395cb7
-EBUILD bind-tools-9.14.8.ebuild 3126 BLAKE2B b1a54f4734260a6a240a215db5b4e7f1a62cba59521217b2c838b9ff1993d70ce618ea86e2bcefc14753a37ec5d54bfa67ace44f217858aa87c661209b626657 SHA512 b97b5656cd216d83c19c938ab6c825081061785dc85798d40fa377ed1e04c72bf03b59e2ad54e77f9eb6fb28d43f3d5e6136f03b28a1197d3f470e8b75bacdde
+EBUILD bind-tools-9.14.8.ebuild 3125 BLAKE2B 4402ed93971611484249bdf814060504a55cc398cf45a2a2680aef230e34ffcc9db05c955c3c64aed73f5711608f123b3a8a0f4411b123a5b46bd87718507cbb SHA512 7800e288bb99efde7a38be5ad3af0b6e08bddd4dec5131db78d10a44983a6c791b63bb317a9a9111828ce2c73b2c3ce2a39b84fd68c768e1c90446cc02f333b6
+EBUILD bind-tools-9.14.9.ebuild 3135 BLAKE2B 1c7913c93f7ad9716ee109ebbb28235103927cf51db7d94a99349d2534d3ad987593ee94b7a44b1ace94022c5b9a39b38af53f6b0b86c27d825090e5d4e52645 SHA512 f7169f6babe5181da116e9931727200c08b7fda61feecceec20a497ec5c4bcfa52502a389eb410e090d05e86c54a9b3740d06bc9ee25e1f0d29f461a68838a69
 EBUILD bind-tools-9.15.6.ebuild 2941 BLAKE2B a3f2ab48291ada712c5c4ff7671ee92eb4cb621dc25e9683d088744e1b75f27d14f4922204005bb9725d5446c0b37a002cf9c3f15963ec0aa10b86694d15c9d9 SHA512 0d2cc97e139ec33a85fa7b34f390672240811fcc20e01b39f7dc3fe4020f2e07b97cc1308642420a29107af7bb7792f7c2f1410f17ec705609b441f030ae33d1
 MISC metadata.xml 488 BLAKE2B 44d0112102447f6d6f8c76aa5e3018de5fc4746240a1a7f187cb7bc493e9a442812c5b0f1c4a8a0a3410af12fbd2e390f6291c981440840b42348f403a278e2c SHA512 ac2a79f4622fd4aa957f9ad0618c631d4c68497443015bbd12c1670576d4515649f26c39c555046771b2aadd5f9b53fdc4c478ba7fb07e24f06b3a4f30f071e0
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 4d1467150701..8ec275d7a797 100644
--- a/net-dns/bind-tools/bind-tools-9.14.8.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.8.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="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 ~sh 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
new file mode 100644
index 000000000000..8868521f0f3a
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.14.9.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 ~sh ~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/Manifest b/net-dns/bind/Manifest
index 68de73786dd3..5f63f7805055 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -8,8 +8,10 @@ AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f
 AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.14.8.tar.gz 6403140 BLAKE2B 45cb06ce8564880d501c63d25c7af8567184e4e4293e01886620cf655449c972ab55c77c7aded07838c61557bc56d9edac26097715c1121fcfb6b606d7a29365 SHA512 eb52760982ebd246e6e1945684771193fc7364324a6d6a95a0cae33afa0a4fa24ffe8313b5f9094420c7c2ec932b1b1a9fb19f6e673ff3c5583ab5e3ff04eb6a
+DIST bind-9.14.9.tar.gz 6296339 BLAKE2B 65496ab94a83ddd1c519df4519373aa77858c6d66efed9342e962cd61943b12e9ecb2f74132015b3f835d0368d1cc59be23e0db92d4780f9f367c0d0fe8c3ada SHA512 aa6b1273f06fc16c842b7012a4d09cb65325a44ee88fea8bea8264ffa907ef4a6f8d5e09384599b2d6f5cea66c0dc220765c245814f54b2f09a5b6e65f97964b
 DIST bind-9.15.6.tar.gz 6432248 BLAKE2B c6dbaeeafdad3e2c7dd30ed1e5121c961829af8d82b9b93dd4eca34d96dfc2854e302068987dcd30ab88c768f6328c81bf81b348a698ceb11001d4d700ef374f SHA512 3bf7ebde706a6771606fda675c60daccbb22c2dc9551a8f361fe102b59e342ded99568b27bca7d7fa32d3f2be3811f38ec014f4ad0c281b590b7b69967395cb7
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.14.8.ebuild 11292 BLAKE2B 8029b0b3f0cfec9e39006f4ecd4bd3b2af668e22d7824707092a9970886d59aa4ad2cc11887ce909552e19976f8e1978c7fac0c2cca111ed606a8ed639474d94 SHA512 bf0cdd2c993ce1909439da92064f643e4c266b059b0c2fb315a1e6bf3aaebf3df820f14c87f78c794c81ad34aa5d968eabbc70f45483f6f8f0c76d8740715561
-EBUILD bind-9.15.6.ebuild 10897 BLAKE2B 59f50b0e5db6d33135dc98fafe8567a714ad1ae847b379a4b55e9a68c3a717626de8a0d8b4d1e07e9404e309ec74afbd5d22ff57b71273ec9a2228b645d84d97 SHA512 daa3cd1ebfd36c1699ddacfc2ecd9dbc927bf07ac9485b876d3b21cdc7079f02cd3fcec3edc85f5deea41ae7ef9006d95c4577b1929d10ec520c7e63294baf24
+EBUILD bind-9.14.8.ebuild 11297 BLAKE2B aaa4339c97e5ad1c3f0ef8ad92c32bb02fa1f73d3f1b85ef3de55e1be1e89dfab976ad6e3a1d11d70568eb88d68ecf0e192c1573353aefd642be57cc5519488d SHA512 9a0640363f0baea69c0eaff2cc5d8efa8bbd28daeaef07d79411f494c7b65e4570a2cf81f56e58aa0c4b255d3a9c798837d995d82074a4a672740d637af2b02d
+EBUILD bind-9.14.9.ebuild 11306 BLAKE2B 45d21e6e85da70f1b247b2ccc803d3702e631b629e8d01a16546bc761d035d2f6eff40d900b421cdec5d58934ef137f8978098d028ca5eb8119b5e3503be6d74 SHA512 20c129ae60661d929ec1ef1b892da415a39a9ebc303357c0760459693689e03955f013692d2b158d6775e86214fc6ebad81cf747d59480b7246d3962a20ddb56
+EBUILD bind-9.15.6.ebuild 10902 BLAKE2B 558005f7f351cf7060f2eeabcb2ee3055ce25a732ab2be94226001d3a37c65d3f0538afeed1fa548e03a3cf7a845a53a103e1b4df383736da0461a730f79c44a SHA512 0de8f6a45681494c3d7a9f3b9c3da2b5a2c6c972a991fc44206f85d79bd0dc8632d4cb2e33734edbcb4fc415f8b76c0fbe1199f69945035c8374a8f622e5503a
 MISC metadata.xml 1125 BLAKE2B 930164a56df7b9d5c790887910cc208335d05d763fc612595dc60413010e18268ee47831cd5b67cf9a1b7e0b1c730639404a7550b390c46cbdacd8ea11fe0ca1 SHA512 183029922f164fb03f6d781fbfb7298d6a5a73153dac1aad4eb78e9fe2f87f596fd408cfddd220dcf9e861cdb6d72d0c00dab0d9dfb5040ce366308c338e2365
diff --git a/net-dns/bind/bind-9.14.8.ebuild b/net-dns/bind/bind-9.14.8.ebuild
index fdf0e802d343..fd576c5e36ba 100644
--- a/net-dns/bind/bind-9.14.8.ebuild
+++ b/net-dns/bind/bind-9.14.8.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
 
 # Re dlz/mysql and threads, needs to be verified..
@@ -12,7 +12,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
 
@@ -51,6 +51,7 @@ REQUIRED_USE="
 	mysql? ( dlz )
 	odbc? ( dlz )
 	ldap? ( dlz )
+	dnsrps? ( dlz )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 # sdb-ldap? ( dlz )
 
diff --git a/net-dns/bind/bind-9.14.9.ebuild b/net-dns/bind/bind-9.14.9.ebuild
new file mode 100644
index 000000000000..817b8fb0b91e
--- /dev/null
+++ b/net-dns/bind/bind-9.14.9.ebuild
@@ -0,0 +1,374 @@
+# 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 ~sh ~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"
+
+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.15.6.ebuild b/net-dns/bind/bind-9.15.6.ebuild
index 03873a3a2128..b23f8ad912af 100644
--- a/net-dns/bind/bind-9.15.6.ebuild
+++ b/net-dns/bind/bind-9.15.6.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
 
 # Re dlz/mysql and threads, needs to be verified..
@@ -12,7 +12,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
 
@@ -50,6 +50,7 @@ REQUIRED_USE="
 	mysql? ( dlz )
 	odbc? ( dlz )
 	ldap? ( dlz )
+	dnsrps? ( dlz )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 # sdb-ldap? ( dlz )
 
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index f7bcc37d3b70..825cff51d5b9 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -4,5 +4,5 @@ AUX ddclient.service-r1 235 BLAKE2B 204793b269c65d7ed77f89c1d5f191298a7b03f44dc2
 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-r2.ebuild 1527 BLAKE2B 23fa0b6362b0497119fd66623230518de3ddb5c19f299017e3e3a9fe5b354db0d2a78ffb9c827570133ce41d40eb2c6f64a483c53adfbd37bd030780910e9440 SHA512 e426bbf12303bd878a95b0b7904bfb4c520bbd39ed18caecb2d07b49d4fbad7fd2018de2ab6a50614015c55480ce62c7c621c760efac6b8f2f255c01171621d0
-EBUILD ddclient-3.9.0-r3.ebuild 1492 BLAKE2B 8018482e552be75ba9b1c9eae2d9378e3281dfa1afb96d41db4235651c164363e0f03baa38f7c278b514705fa0144a6dc80f1755845745ea40bd92cc48eb4d18 SHA512 6a0437333db161456acc90120c2e663d16dbb4a0bf68f3d7f6418e2c29b137f826ede08bdb2e5d367dd0b2c3dcc2da2354fdd209121b6b88e0989c9cef64bf35
+EBUILD ddclient-3.9.0-r3.ebuild 1490 BLAKE2B ba428bcb794f0087ae3d92095a05a49ec52307c03edc1bb771df008839fcfe86d841d1822d80b21bab0cadcdf3a5132d46672370ff45548ef893d4c1aa4c687b SHA512 78df67a5422d438c1fbac07b2d49849799f0ba8d07194ece93f23320f7d33c45aa52207f454793b8943b76f003421a57f97d2574e861b36b39b178d42633080a
 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 026d51b44626..539a6e306351 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 5fd79fd3c6a3..a8dbd6e90824 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,26 +1,16 @@
 AUX config-full-paths-r10.patch 2487 BLAKE2B a0c7ff420a9000903ec8fdf446c463ef367db2ec934147817f08c12277d5e1704db7c7ec89ec068a5cdc26f88eb794f8caf6d9eb318764783ad62e22ce9a2798 SHA512 15a8af5fff20d9f9d7931faf40d2f9ff1a960a764d7330287af65290e85e986892f0b94a6b311e8ae0be60be3b78caa10c71e438275f20d44706850c2a61d407
 AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179a7e2103fdf716711912987961969619e6b6e6b2e201253e90f828ffa5eb011c0870c112a028c4cfd89ce5 SHA512 25ccbc09df7b51bc0fa4587f7a715429ba11517c64db53086dd09df24470da71b81dbacebe227bd41d1f9576b4560dc58729969eb7b33aa233ec6a6a07d573ab
-AUX dnscrypt-proxy.initd 629 BLAKE2B c16dae8cdf685faa6d99fc781c79508de261d861f63f540e5ad95a6dddf4230c0b0f49d07cd0c1531b94cd8021a9017c0ca3013c468fe512ea157fd22c04201a SHA512 a7c999e43809be69793aaf544e9ae6cdc01a61a17f142f6963242045f60fea049004310675cfb9c5f95de4d84d00342fee2504ab8480136c42620ef659c3c960
-AUX dnscrypt-proxy.initd-r1 667 BLAKE2B fba1075bd738fc86b50f37bc25e3ef7f54416d5d85cf3e6d088be0707164007b1ff9c01ac2b0a583724f726cde41a96cd77c8beab11082dbc7b5c03a05c8cf95 SHA512 89677b8718c1a45a6d8b1a0501dc5c4ff8c02793181ac84316fe5488807726bc66b40849c2f91da817862997628b3456926f5efc6ede9c25bf3f5e6533fb88ee
+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.25.tar.gz 2596674 BLAKE2B 10947c9e496c47a565e62fb4ca6ad95679da0d237885fe09da367b501bf0dd228cb3d4af41b3527dca64665364527ec2db06afab2c209792409078debd7d3fc8 SHA512 74a47b013e15cbdcf8691bf3618cce40149f9832f6fc4c2cbfb6af2a72b4ecb52b068a150999771a77fcf4fdb49c64dabd127c5101ae29fb86723bc30c946133
-DIST dnscrypt-proxy-2.0.27.tar.gz 2478887 BLAKE2B e9cabd6bdb330c3174cb904951f9e1a0a5482b642d458dd9fc7cba8d05333e7d91c37d43fbd360d8fbcda1c5febd2e5d577e0e612d9c2211047ba2a047b929ef SHA512 68cecec0228b3f03d5c50576c7dec32c7474a22bd1740d43b29514b5a00f27376ed5236302fa68c493f0c188134855b277fbbbb922222937fa726783af3f7246
-DIST dnscrypt-proxy-2.0.28.tar.gz 2620245 BLAKE2B fe31dd6d8054c4ae3d5892aaef0c8362405e06dba6de32121d9dea5d64d396ec39b1cfa884d5587c21367bb1dc3c1a4b4f994c286d0b8cc2a8bdbd9d247d239e SHA512 45496a02bd19c94def17b621d0843cc93de4467e51ded4c20af91d9b5aa127529d85b8ff2473a88293c726611291a055d466a50258b7587da0e7d4ba7f0f366e
-DIST dnscrypt-proxy-2.0.29.tar.gz 2621844 BLAKE2B 3ebd02b3c9df9dcb41d27d38a9d9f64c01d98f7b1afee7a7c3b1dd3ef26b2104aae650e34ff1b5651007461ee75d28bcfbfa3c7e82c32532f36553740e3dcb50 SHA512 f02abe56e017153e7fc8b4a26b34c90f68554a1b32a16558c05e8113327896dbf7f81aa69c76fa823a4a0a697b4bb2089bdeb1237ad4ef3587121c2d4cdfe78c
-DIST dnscrypt-proxy-2.0.31.tar.gz 2640523 BLAKE2B cf2e2b5557e6fcf59d3d28978db6c5e46f6b7f58aa4c5ae423149ec2f557269e88846dc4f97c6f6f20ff013b14b61b20d2df750d6b07946606293778a31e0ca1 SHA512 500c800213b94bf8ecbea7493716de5fe41afd584c70844519f1f50827b94a28ec982f2c2b85f7a281dca58273ba968113beed6a965c62bb3dc47ab83d7a1629
 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
-EBUILD dnscrypt-proxy-2.0.25-r2.ebuild 2818 BLAKE2B 68b69f308ceda1969bbc53f098a1a3ae0a04fe3029e38653993fc4899fe5d84956730ef4cc923ce041cc98cbe15559daa367fe901e125f5d69603ff0e8a40836 SHA512 786ff205b146066fb9d2d97d0d3d4f589a1d9523cc554633a738906a2bda435891af3b421985483d1a0e56731dc803f39e5ae9c8074d4297fae713c3822e4661
-EBUILD dnscrypt-proxy-2.0.25.ebuild 2760 BLAKE2B b5644b87589d113331e0d2bb902313481999e27d135df14ba0991c756eb4ecd3dc22e5d335ab794b980c540aa88c2ab92ad5fb9298e2fac18a397eb65d170065 SHA512 0ef7ddd2a4b6b33eed3bef91c9ef313c1e6d1f432f6d5de36fc4d908478b569e415c1eef4f5d53f3836bc337a8d93926f49526a5f964ae718b450ff17e6e01cc
-EBUILD dnscrypt-proxy-2.0.27.ebuild 2818 BLAKE2B 68b69f308ceda1969bbc53f098a1a3ae0a04fe3029e38653993fc4899fe5d84956730ef4cc923ce041cc98cbe15559daa367fe901e125f5d69603ff0e8a40836 SHA512 786ff205b146066fb9d2d97d0d3d4f589a1d9523cc554633a738906a2bda435891af3b421985483d1a0e56731dc803f39e5ae9c8074d4297fae713c3822e4661
-EBUILD dnscrypt-proxy-2.0.28.ebuild 2845 BLAKE2B 57585992fee08f503d3fb4398e4c57a1b4aec358b2cf7f2f1af28cf29b5b42298c58afcc19fe5dbc4cb255a28c9b56c1bda27e36384a02b17cd7ed8347c9dcf6 SHA512 d203cb7ff9229d75ded91322f86f7e2aa82090cd9a59f7ab18c17a848b092e184083793078e055aa1ce30a478c4e4d105ce587807fd78ec8d8f3723ab5f58d16
-EBUILD dnscrypt-proxy-2.0.29.ebuild 2845 BLAKE2B 57585992fee08f503d3fb4398e4c57a1b4aec358b2cf7f2f1af28cf29b5b42298c58afcc19fe5dbc4cb255a28c9b56c1bda27e36384a02b17cd7ed8347c9dcf6 SHA512 d203cb7ff9229d75ded91322f86f7e2aa82090cd9a59f7ab18c17a848b092e184083793078e055aa1ce30a478c4e4d105ce587807fd78ec8d8f3723ab5f58d16
-EBUILD dnscrypt-proxy-2.0.31.ebuild 2848 BLAKE2B 1d29b9ec5b3a6743dbc8e086fbbafd273948083c41b0ed25ff112bed749c7d4cca53386e5d432407d69d4ebf88afe6f5fb4b5f2df062f8d7d37f86d01952d2b7 SHA512 9e3884931614c326f6c4b23305f0669501e1b2c51f54a7981271f5c551c002227f43241ba05dfd3be754d76b0f8c5ed962606d6316e9ed3484b82d8c1a573c74
-EBUILD dnscrypt-proxy-2.0.33.ebuild 2847 BLAKE2B d1920acd8c142f7293a40af929b7a64f9028f387e818b05edc4e8f50f66890c2be4805ab1404862f6d3e36b83ea8b406e8936f75aeda6f995ab90b2949ed66fd SHA512 a07cb7e8b80569540158bd741a25eeb12674b365373c3a23c4e81674531a7bfa793c43857850e100bf861d82205423a375091f9261ad46208d307e5778100b2e
-EBUILD dnscrypt-proxy-2.0.34.ebuild 2686 BLAKE2B 45c7d034115b2511f00e057552cf536c39d4a8971936fe3030a0397090ba2868b9665724e9adebd2fa4d1d629a24d8c030bbb8d14518f7d234ae309acdd12529 SHA512 2d8bdd88e73858f1bbc5212355d119a2df481e5677709326e3a45fb1e5f5a2e7f2d0d398c2f9f785be052a0ac80fb73dbfe1fdc6667cc090e9e968021a045a5f
-EBUILD dnscrypt-proxy-2.0.35.ebuild 2686 BLAKE2B 45c7d034115b2511f00e057552cf536c39d4a8971936fe3030a0397090ba2868b9665724e9adebd2fa4d1d629a24d8c030bbb8d14518f7d234ae309acdd12529 SHA512 2d8bdd88e73858f1bbc5212355d119a2df481e5677709326e3a45fb1e5f5a2e7f2d0d398c2f9f785be052a0ac80fb73dbfe1fdc6667cc090e9e968021a045a5f
-EBUILD dnscrypt-proxy-9999.ebuild 2686 BLAKE2B 45c7d034115b2511f00e057552cf536c39d4a8971936fe3030a0397090ba2868b9665724e9adebd2fa4d1d629a24d8c030bbb8d14518f7d234ae309acdd12529 SHA512 2d8bdd88e73858f1bbc5212355d119a2df481e5677709326e3a45fb1e5f5a2e7f2d0d398c2f9f785be052a0ac80fb73dbfe1fdc6667cc090e9e968021a045a5f
+DIST dnscrypt-proxy-2.0.36.tar.gz 2814470 BLAKE2B d1483d1c0550d9493129fd7b9969d45ab5225b09cfa6c2e10c60d9df963742664a1fa75720561e1e883c4688077ee1e2de84669f527271c8c5455e435ea2daf8 SHA512 b1e3ed2a0226eaf35980b9f1125e0794640bcd837f99b8f2a0346498770305f04e27f13ccf97f01f0639285ef35f63cbbf72e9f2b419d592b615f6b07cdf7f2d
+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-9999.ebuild 2683 BLAKE2B ca235eaf06453f1e0ac7b8791373255b66e482d13081ce8e4d99045ecb3e836e60fbd858825213ed4ff23e213e5da21974bc7126ad933a22d9a3951a1eb25c5a SHA512 77174dbde156c9f01f5030d733692d49fd0ae606ade1ea2527c2a4eb67b0723a33a9a57d4708473f72629ae29bea491f841643d77b0fd790f7b5cf9a8e8f196f
 MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild
deleted file mode 100644
index 694bc5d7c027..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild
+++ /dev/null
@@ -1,101 +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 golang-build 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="ISC"
-SLOT="0"
-IUSE="pie"
-
-DEPEND=">=dev-lang/go-1.12"
-
-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_prepare() {
-	default
-	# Create directory structure suitable for building
-	mkdir -p "src/${EGO_PN%/*}" || die
-	# fixes $GOPATH/go.mod exists but should not
-	rm go.mod || die
-	mv "${PN}" "src/${EGO_PN}" || die
-	mv "vendor" "src/${EGO_PN}" || die
-}
-
-src_configure() {
-	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
-}
-
-src_install() {
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
-	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
-
-	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
-
-	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.25.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25.ebuild
deleted file mode 100644
index fd4f4f93ab04..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25.ebuild
+++ /dev/null
@@ -1,98 +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 golang-build systemd user
-
-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 ~x86"
-fi
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="pie"
-
-DEPEND=">=dev-lang/go-1.12"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
-
-pkg_setup() {
-	enewgroup dnscrypt-proxy
-	enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
-}
-
-src_prepare() {
-	default
-	# Create directory structure suitable for building
-	mkdir -p "src/${EGO_PN%/*}" || die
-	# fixes $GOPATH/go.mod exists but should not
-	rm go.mod || die
-	mv "${PN}" "src/${EGO_PN}" || die
-	mv "vendor" "src/${EGO_PN}" || die
-}
-
-src_configure() {
-	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
-}
-
-src_install() {
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
-	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
-
-	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
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	fcaps_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.27.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.27.ebuild
deleted file mode 100644
index 694bc5d7c027..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.27.ebuild
+++ /dev/null
@@ -1,101 +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 golang-build 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="ISC"
-SLOT="0"
-IUSE="pie"
-
-DEPEND=">=dev-lang/go-1.12"
-
-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_prepare() {
-	default
-	# Create directory structure suitable for building
-	mkdir -p "src/${EGO_PN%/*}" || die
-	# fixes $GOPATH/go.mod exists but should not
-	rm go.mod || die
-	mv "${PN}" "src/${EGO_PN}" || die
-	mv "vendor" "src/${EGO_PN}" || die
-}
-
-src_configure() {
-	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
-}
-
-src_install() {
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
-	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
-
-	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
-
-	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.28.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.28.ebuild
deleted file mode 100644
index c2e5ddb01ed9..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.28.ebuild
+++ /dev/null
@@ -1,101 +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 golang-build 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"
-
-DEPEND=">=dev-lang/go-1.12"
-
-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_prepare() {
-	default
-	# Create directory structure suitable for building
-	mkdir -p "src/${EGO_PN%/*}" || die
-	# fixes $GOPATH/go.mod exists but should not
-	rm go.mod || die
-	mv "${PN}" "src/${EGO_PN}" || die
-	mv "vendor" "src/${EGO_PN}" || die
-}
-
-src_configure() {
-	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
-}
-
-src_install() {
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
-	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
-
-	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
-
-	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.31.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.31.ebuild
deleted file mode 100644
index 215c07210b28..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.31.ebuild
+++ /dev/null
@@ -1,101 +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 golang-build 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"
-
-DEPEND=">=dev-lang/go-1.12"
-
-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_prepare() {
-	default
-	# Create directory structure suitable for building
-	mkdir -p "src/${EGO_PN%/*}" || die
-	# fixes $GOPATH/go.mod exists but should not
-	rm go.mod || die
-	mv "${PN}" "src/${EGO_PN}" || die
-	mv "vendor" "src/${EGO_PN}" || die
-}
-
-src_configure() {
-	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
-}
-
-src_install() {
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
-	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
-
-	insinto /usr/share/dnscrypt-proxy
-	doins -r "utils/generate-domains-blacklists/."
-
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 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
-
-	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.33.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild
index eac66d7f0824..357e2fb1bc95 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild
@@ -57,7 +57,7 @@ src_install() {
 	insinto /usr/share/dnscrypt-proxy
 	doins -r "utils/generate-domains-blacklists/."
 
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 dnscrypt-proxy
+	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
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild
index e3266982fa26..3d902b82aaef 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild
@@ -53,7 +53,7 @@ src_install() {
 	insinto /usr/share/dnscrypt-proxy
 	doins -r "utils/generate-domains-blacklists/."
 
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 dnscrypt-proxy
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
 	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
 
 	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild
index e3266982fa26..3d902b82aaef 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild
@@ -53,7 +53,7 @@ src_install() {
 	insinto /usr/share/dnscrypt-proxy
 	doins -r "utils/generate-domains-blacklists/."
 
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 dnscrypt-proxy
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
 	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
 
 	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.29.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.36.ebuild
index c2e5ddb01ed9..3d902b82aaef 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.29.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.36.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 EGO_PN="github.com/jedisct1/${PN}"
 
-inherit fcaps golang-build systemd
+inherit fcaps go-module systemd
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="pie"
 
-DEPEND=">=dev-lang/go-1.12"
+BDEPEND=">=dev-lang/go-1.13"
 
 RDEPEND="
 	acct-group/dnscrypt-proxy
@@ -32,33 +32,30 @@ RDEPEND="
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
 
-src_prepare() {
-	default
-	# Create directory structure suitable for building
-	mkdir -p "src/${EGO_PN%/*}" || die
-	# fixes $GOPATH/go.mod exists but should not
-	rm go.mod || die
-	mv "${PN}" "src/${EGO_PN}" || die
-	mv "vendor" "src/${EGO_PN}" || die
-}
-
-src_configure() {
-	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
+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 "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
-	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
+	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
 
@@ -70,6 +67,7 @@ src_install() {
 
 pkg_postinst() {
 	fcaps_pkg_postinst
+	go-module_pkg_postinst
 
 	if ! use filecaps; then
 		ewarn "'filecaps' USE flag is disabled"
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index e3266982fa26..3d902b82aaef 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -53,7 +53,7 @@ src_install() {
 	insinto /usr/share/dnscrypt-proxy
 	doins -r "utils/generate-domains-blacklists/."
 
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 dnscrypt-proxy
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
 	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
 
 	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
index e0fc08ad6a0c..ce1d1175d707 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -6,6 +6,7 @@ command="/usr/bin/dnscrypt-proxy"
 command_args="${DNSCRYPT_PROXY_OPTS:--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml}"
 command_user="${DNSCRYPT_PROXY_USER:-dnscrypt-proxy}:${DNSCRYPT_PROXY_GROUP:-dnscrypt-proxy}"
 pidfile="/run/${RC_SVCNAME}.pid"
+retry="SIGTERM/5/SIGTERM/5/SIGKILL/5"
 start_stop_daemon_args="--background --make-pidfile"
 
 depend() {
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
deleted file mode 100644
index ce1d1175d707..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r1
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/dnscrypt-proxy"
-command_args="${DNSCRYPT_PROXY_OPTS:--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml}"
-command_user="${DNSCRYPT_PROXY_USER:-dnscrypt-proxy}:${DNSCRYPT_PROXY_GROUP:-dnscrypt-proxy}"
-pidfile="/run/${RC_SVCNAME}.pid"
-retry="SIGTERM/5/SIGTERM/5/SIGKILL/5"
-start_stop_daemon_args="--background --make-pidfile"
-
-depend() {
-	use logger net
-	provide dns
-}
-
-start_pre() {
-	checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${RC_SVCNAME}"
-	checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${RC_SVCNAME}"
-}
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 517c4c1b5c6f..0fffa208b3a9 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -2,6 +2,7 @@ AUX dnsdist.conf.example 524 BLAKE2B e9d140129dfbd276d1fb927d73bee4e4c29920ae70d
 AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e46744160298456c86a9d9bbf65d1a339c0c13db4c796efb7c3adba01110882542fe501c735c9dd190f92 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f
 AUX dnsdist.initd 1334 BLAKE2B db80ebec89cfc9050d0e43402d8cc9af56bd764ba52a6db948747585d23896d3e6daed4eaa5fabc2b500dc96c1f86e9e8624b8da755b87fdd3c730104c9082fd SHA512 0d17c476ba3d775bc6e2bda0133516bf5cf48183fdeaaf913337c393080eaff4770267842e81d7b6e66a7ae087ce3d73ba4daea3cbf9982719e0f205b0d096ba
 DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010 SHA512 c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad
+DIST dnsdist-1.4.0.tar.bz2 1044479 BLAKE2B 79aef57ed2b1036f222e8bcfdf615c3221c9dfdbc8fd3f80d778fb050f74bc200958b4d605dcadd5c23ac6c4b5b1a36048108cd85394920e99d6037177b81342 SHA512 c9450e97325d8ad8c8c3a395412c46ea8053cbe1ebe73329a1618212ba29bdf2f8da908ae2b90c314b5aab613387f42363e3a5322b1a36f60190fb48e1c425c5
 EBUILD dnsdist-1.3.3-r1.ebuild 2646 BLAKE2B fdeae74f8a6f4aecd7fdd2ef0d25d2f1df238c98fe566f44455c7b951ca970d64cb3de43baa4dffa02e8c85db055916fe5c69bb5ee74bcffbfd6bb7d08a9465c SHA512 ba4a486dafd0cb5fc19a0263317646478d090ca4b872c75cc8bdc4ddca7da12956ed68cc8fc2c46d657785b00f1d85f885046781bc2f1621626540562d5a7ac6
-EBUILD dnsdist-9999.ebuild 2646 BLAKE2B fdeae74f8a6f4aecd7fdd2ef0d25d2f1df238c98fe566f44455c7b951ca970d64cb3de43baa4dffa02e8c85db055916fe5c69bb5ee74bcffbfd6bb7d08a9465c SHA512 ba4a486dafd0cb5fc19a0263317646478d090ca4b872c75cc8bdc4ddca7da12956ed68cc8fc2c46d657785b00f1d85f885046781bc2f1621626540562d5a7ac6
-MISC metadata.xml 1017 BLAKE2B cf131f8ad5b5c9a55ea0400a54c79e458e0934ea1a7b53422baf6bd791285323b3f7024229f382922d427bf3498e32d0cc395917ac53a474d429c582d1df7bb1 SHA512 abc9c348a491f29826d26a430015b2f561bdfb071522be423c518f7c0c68ce7306bb7f41410c8a515980d0a1aa32d095076cab38aade271c3a59d48063b4d703
+EBUILD dnsdist-1.4.0.ebuild 2373 BLAKE2B b61a275f984088a7ddd621c3441141af2cca5b0e640dbd0a8cd21d185b4e8be42dcfa8d777d4c34ace06cdf746778264cccb28e70434de214e0d5307ce0fbe6b SHA512 1baf3fba9a7f89c67f57d70199493d91d807669a07b323dd76481cd65eb42fb86c5224ca01e12d67e0ca528a41094702ff0f76933aa480158e8c98f7a2f22e75
+MISC metadata.xml 1213 BLAKE2B c4fe0c3ae740de6b996c8f54f48234a84a4f54cdef743a88fe9730c86ade3d7ccad0118ba0b8f17422fd57a91d2fa13999e7bcb855ffc70394ab3591e01f33d5 SHA512 eb88f1f798d82348e4f633382d3f422d4adf592dfdba878ccab9bdec9228805b5c41f9c5122904cd9d6374b5583a1de0ef3316585c88abada86c0ccb2fbb242a
diff --git a/net-dns/dnsdist/dnsdist-9999.ebuild b/net-dns/dnsdist/dnsdist-1.4.0.ebuild
index 493fd0f5e4c1..dae9b523e363 100644
--- a/net-dns/dnsdist/dnsdist-9999.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.4.0.ebuild
@@ -1,45 +1,37 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git"
-
-if [[ ${PV} = 9999 ]]; then
-	ADDITIONAL_ECLASSES="autotools git-r3"
-fi
-
-inherit eutils flag-o-matic user ${ADDITIONAL_ECLASSES}
+inherit eutils flag-o-matic user
 
 DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
 HOMEPAGE="https://dnsdist.org"
 
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	S="${WORKDIR}/${P}/pdns/dnsdistdist"
-else
-	SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
+IUSE="dnscrypt dnstap doh gnutls +lmdb luajit regex remote-logging snmp +ssl systemd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="dnscrypt? ( ssl )
-		gnutls? ( ssl )"
+		gnutls? ( ssl )
+		doh? ( ssl !gnutls )"
 
 RDEPEND="
 	>=dev-libs/boost-1.35:=
 	dev-libs/libedit:=
-	fstrm? ( dev-libs/fstrm:= )
+	dnscrypt? ( dev-libs/libsodium:= )
+	dnstap? ( dev-libs/fstrm:= )
+	doh? ( www-servers/h2o:=[libh2o] )
+	lmdb? ( dev-db/lmdb:= )
 	luajit? ( dev-lang/luajit:= )
 	!luajit? ( >=dev-lang/lua-5.1:= )
-	remote-logging? ( >=dev-libs/protobuf-3:= )
 	regex? ( dev-libs/re2:= )
+	remote-logging? ( >=dev-libs/protobuf-3:= )
 	snmp? ( net-analyzer/net-snmp:= )
 	ssl? (
-		dev-libs/libsodium:=
 		gnutls? ( net-libs/gnutls:= )
 		!gnutls? ( dev-libs/openssl:= )
 	)
@@ -50,34 +42,26 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-[[ ${PV} == 9999 ]] && DEPEND+="
-	app-text/pandoc
-	dev-util/ragel
-	dev-python/virtualenv
-"
-
 src_prepare() {
 	default
-	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
 		--sysconfdir=/etc/dnsdist \
+		$(use_enable doh dns-over-https) \
 		$(use_enable dnscrypt) \
-		$(use_enable fstrm) \
+		$(use_enable dnstap) \
+		$(use_with lmdb ) \
 		$(use luajit && echo "--with-lua=luajit" || echo "--with-lua=lua" ) \
-		$(use_enable regex re2) \
+		$(use_with regex re2) \
 		$(use_with remote-logging protobuf) \
 		$(use_with snmp net-snmp) \
-		$(use_enable ssl libsodium) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_enable gnutls && use_enable !gnutls libssl;} || echo "--disable-gnutls --disable-libssl") \
+		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
 		$(use_enable systemd) \
 		$(use_enable test unit-tests)
-		if [ ${PV} == "1.3.3" ]; then
-			sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
 			-i "${S}/configure"
-		fi
 }
 
 src_install() {
diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml
index e4d52294acda..d42d77d511da 100644
--- a/net-dns/dnsdist/metadata.xml
+++ b/net-dns/dnsdist/metadata.xml
@@ -14,5 +14,8 @@
 		<flag name="regex">Enable support for regular expression matching via <pkg>dev-libs/re2</pkg></flag>
 		<flag name="remote-logging">Enable support for remote logging via <pkg>dev-libs/protobuf</pkg></flag>
 		<flag name="ssl">Enable support for and encrypted client-server communication via <pkg>dev-libs/libsodium</pkg></flag>
+		<flag name="doh">Enable support for dns over http via <pkg>www-servers/h2o</pkg></flag>
+		<flag name="dnstap">Enable support for dnstap</flag>
+		<flag name="lmdb">Enable support for lmdb</flag>
 	</use>	
 </pkgmetadata>
diff --git a/net-dns/dnssec-validator/Manifest b/net-dns/dnssec-validator/Manifest
index bc14c6c8af8e..3875a21f7ac8 100644
--- a/net-dns/dnssec-validator/Manifest
+++ b/net-dns/dnssec-validator/Manifest
@@ -1,4 +1,4 @@
 AUX dnssec-validator-2.2.3-ldflags.patch 955 BLAKE2B b6cf8f7e812d4ed14dfafde00afabdd30f2fb54ae604613d0f43520eb683e5f19113477421d9aba86ecc7f89a2706f12c713c19a3690bd93bb7c284123b08a71 SHA512 dfa88f661318b0f3406ce984455b3890ddc891ec2e4ac20ce5eb46d47b22014b001f447fbf69ac1a5d2a3239dfe4d6a330040d768ef4b1ad3ee4923ca06f95d0
 DIST dnssec-tools-2.2.3.tar.gz 42941393 BLAKE2B b7b6a54113fb5cf030bd60e18f5446b02d1ceba3564ac854b0305225672545e802fecfa1169dc81e68ffe195533e06082dc22500a51b48965aa9c0fc32c915ed SHA512 fd2467f116f77089bddf9311706f356957f4ae735d827d393534e4001b621c9dfc904ff3d4da698d37e8e97b1be9448ab2fd5455c124656399aac30f1f642baf
-EBUILD dnssec-validator-2.2.3.ebuild 1431 BLAKE2B 0b4a3225279aae093fb60868cfa70829661a894161fbc82c5482c0b4e3fbb10045b310a16146d787d0c0b911834f69ae85798fc072f9b85ea605d638ef9568c7 SHA512 93b5541096fccff4ac4e4a3f014782791ad2446595cce735e29dcc9db24d40afec13dc34789514c1ac40c3e28ed7165b8bdfb09adcfb2fdc934db2e7cfad57c5
+EBUILD dnssec-validator-2.2.3.ebuild 1429 BLAKE2B 53d2080710eadcb051f39419e50d7beab2c046abbc07a3707952e14ae06bb7394c271c7cf3216c16a6c67619af7eb5d15e3205b8297420f3229ddd8c27744fd2 SHA512 0b9ebe639af97a19fcd932bc9f55c84e21e5f6656220e5220116324f012658fd912de41aee9b6aff48128e0ab25a0efa79c34fd099a02239352390b26da4201e
 MISC metadata.xml 798 BLAKE2B 50d4cacfbbb5365e56e569dd0bad78b5c39c725f6dafd88567178aec43e6cbf1a0dfd303dc886551ce2c079730ca77bb0de1d4b01c0cf954afdd619d2b356d74 SHA512 d8b2d3c8fc121598f2a236159751b0666d8ab75d400fce99389299ad7ef9d6c95327047331f8414d133ae808d916e6b5fe93724fdb0b9d55c06073beffb61f74
diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild
index 8263dbb8ab58..dd51bea55f68 100644
--- a/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild
+++ b/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/dnssec-tools-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="dlv +ipv6 +nsec3 static-libs +threads"
 
 RDEPEND=">=dev-libs/openssl-1.1.0:0"
diff --git a/net-dns/dnsviz/Manifest b/net-dns/dnsviz/Manifest
index d4cc0c72131f..37301eef5326 100644
--- a/net-dns/dnsviz/Manifest
+++ b/net-dns/dnsviz/Manifest
@@ -1,3 +1,3 @@
 DIST dnsviz-0.8.2.tar.gz 404265 BLAKE2B c4ba6b5a7d6fee7c8e2cba0c90f29560152dd4beed1ef4d80a6a3bf9f81646ee8f0d61c38329233e300f2b434cb5d9e9d2a926dc72997ae68ff0a57e147bafcf SHA512 5414d9bda6c0bf5fdc5a84a09cb5833619110702749b12f87d63f5149de473f4bd1b6960c506c60ec5fc5ff82d789536cee70a299ff13c960a45776de2916c80
-EBUILD dnsviz-0.8.2.ebuild 1412 BLAKE2B e21b41398c34b561e163f0fea3ddede556018d7ca6a7dce49ded943b9a7f0e5b00f55778ce4b2f71e504c97cd04af0557c2d4fd2088d1d5e5d0ebe858c5a118d SHA512 2dbf2adaba76146596870ea62947058f37cca3ce5f27a402e2b946668352eb58034d9af2fa9eb2b6e0fe41672d69e1b293b61d4f14d4d18b13ccb997293ed537
+EBUILD dnsviz-0.8.2.ebuild 1408 BLAKE2B b515dccad8dff1a07c7001a6c57d1bde18a7a8f6a103eb8fd7a6edabafcca5a301937e2f912e3b55554c816b22954bdd198bbff0ba7094b1af6fb128dbee9160 SHA512 42d4d78ebeffa53be9bac3127a6ce4ee2cb610ea21fdb4260f25b378d748e474a89b40dfbbefd2cc6a2726b1fc513e8ce9e19bdcd1dd5a63a5aeeab429bcd9b8
 MISC metadata.xml 687 BLAKE2B d648e9100b7cd371d7235c0f370d10f8cce3f7eef83afabe1e6d6df1619ea2ff1eb08ded3c724df22ee7d406c2f7c65b158ae67a4472084b832d0d806fc21cb9 SHA512 bcd03b712bf637a1019c3d22d9e336d514ffd9ba7ae3f05685371897af8893177a709ec8546c186a1b54de89794931f985aa72570c0eaa1d7a88d6579478dbb3
diff --git a/net-dns/dnsviz/dnsviz-0.8.2.ebuild b/net-dns/dnsviz/dnsviz-0.8.2.ebuild
index 0081344f211c..45493369c766 100644
--- a/net-dns/dnsviz/dnsviz-0.8.2.ebuild
+++ b/net-dns/dnsviz/dnsviz-0.8.2.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
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC"
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 54d4f9f52453..a9a1d0de8eb1 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,9 +1,12 @@
 AUX getdns-1.4.2-stubby.service.patch 568 BLAKE2B f2e605116f924b109bf2cd734c8eb79314aeb02b0e30e2fd8d62117b44a74f20e64b1b527253a09525ad9ab26aa2a64a51940773064de87e295d1831dfe9e51b SHA512 67c88787d48662d5c555cd2cdff5916a2211aaf45a13b41e0a909d703dcbc66cb3de834cc94b7c3d292d16a99d024b07098b4e0bb1c790e48201ca9ffb598bd2
 AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c
 AUX stubby.initd-r1 636 BLAKE2B 1f8e96c0b844837af8d46f12c80750979be3e763bd7ac08b956f69a8fd4fd9cdf018cc666e1fc47a324ee3960e358489e01b8da6d7d09cae8dffe9cff1b38b90 SHA512 556c35dbcdc157668308e502895519e73fa723074bc8cb1d7cbfd762e0831a584be67a9204744dad17ff4ffaaf9b97b67ed60acfc6ef56e44e240c51d2f783b0
+AUX stubby.initd-r2 685 BLAKE2B d079db5129c02d7b4bdbfdd28733426b39f9e094e76f14e5a32b948f40717faa1886f9093059ddca9e4cd58e6621e06ff75ff94ef713338b1e0335785274f954 SHA512 11b9a6d1a60543ed6e897c87b9c78c72a241388486f1d389918f5a11176a208d885e641fe304bd2ca91284861e37422b8c387ebc8aaa820093b3e70d31b28cf1
 AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b934f9b9b9f9001a41ebaf148d266272529c594a79eb27c0b99ff9f30d4c519f91128d35b4ea87eb22 SHA512 c4f1de3789debd1d51a47499960b6f688bc594b4beb01062a55c5623a6ceb07d03705e4f411c9a0cc88442af223120b29c46a9dc72c600477d3e598f9c02c805
 DIST getdns-1.5.1.tar.gz 1075728 BLAKE2B fd6ac52a302ecf22cc913d8de6f93f9ab125429d0eb9d6e233f23b84bb2e242573cd93997f88b4d1a2493273691dab897efc8509a0e3f03f6fddcb9d3b53ecb6 SHA512 4013cb4f00cc87164380c22dc6f82a4fd54702769c28eeb7cfcb13fb35ef41e32916c36a1aa2f6ef05f008da97bea5c7ed849aedc6ae7050c285f9589a9817b0
 DIST getdns-1.5.2.tar.gz 1091088 BLAKE2B c5f32af794f3c710c0f84027d38ca393c72a438905c5e2fe49f2d20477e3f90f855d280f43d0ef7d204fa67d95ebdb960ce86d934e26c1ef3030f263f98ec7f4 SHA512 42e56264578f59e94d0a7315cd9cb1720f24c7a9abbaa09e1b42c274d15d1082ad4a036fa3c10573cf4d0ee6d868b6fcedf3a7cd64b53bdabd9d45542e479ca4
+DIST getdns-1.6.0-beta.1.tar.gz 669637 BLAKE2B cab019c38a0e7268a3ffef7ffd6b52ab3565bbf0b4ea4e897d60cfc0885ee7d32d8bd22e58f24b554e03d4297945d4eaa915aff254f43d4e82455f1070923d46 SHA512 b36d05b09b5ab7c384fdb93820bc6ad253e9a44da9c7ea38c735882e56e03eaba1793ea22068d03867ed2ade71682686a359b1b0a821eed4a5f3bebeeaeeb7e2
 EBUILD getdns-1.5.1.ebuild 2117 BLAKE2B 1e9a9cd2140fe0609310cea1bb2e751005c2cb25832e3f52b4b1eea006ac14e86d047ade4a81b6643a5eb7371b5fdb686b599f4611a2599860cd05c415f810a0 SHA512 04d57c28f0e172b1f4c920c07f610add18e374ff36e1f970f6cafc35ef1206e900ec3f1d9bc6bb3ac757c2fcc66e1d4b07b1fdd3acfec2d3e0b2d5324f83a80c
 EBUILD getdns-1.5.2-r2.ebuild 2255 BLAKE2B f474c9739b83a2c3d15440882934266efcb845a11a49d60a0caa481489becec7ce3b414ba01248ab3e80b39df97bb15537c7914e441f2912ee19b7038072b8ee SHA512 1a45a6b80d714b7b4637f1ee4d4755ab8c4849f9ee89ed42bdf40f01090d3f5bf67364cc1fc5d5921e9d4f7066ed71398cdbdda4c08753505e19e6c5fd50683c
-MISC metadata.xml 935 BLAKE2B 8a1cec2e5db3f06da68bdd753fd558b7ba94b7366be054a421d585af5e6383d6f5440372fc998f5c55a42dd7efb1f51d171a00155d722e8317ce6e1f77720a36 SHA512 3d1bb8b1a423d976334131c803c7bdb917bcf30c8e4974312bb7d82e3ae3e342839f132e2b7680ef4857c94d14ca2e24293a452c2cc48ae91b052aaa91c0ca16
+EBUILD getdns-1.6.0_beta1-r2.ebuild 2030 BLAKE2B 3497e73868f256d25108f564ec8b427bd5ad6ac501e1a975680ff39b143877d314d103c808fe9f65732b0806a4198cb3c88372cb7e58414584d904a361f6381f SHA512 1ca54e0a776808debab7eb3ae96faac2e7d7b5b4418f6a8c8c096656dfcd28bd7cce3bbc9f5ca4ea29de78e53e404e3adbe4d65e1f3f3b6076b9918fdbbf17bf
+MISC metadata.xml 823 BLAKE2B 6f036445b01fd8b4c4a0ddac2f04ed45cb980dc31ca5aa5a25b5da8272541ab7b8d6b6d9fcd8b3d122de378a71b2e8f1dffa158da6a0db84d7e61b9e6f8d134b SHA512 2ac45a84c1d38e601cc9a1bb2af25a4843b8b43902736fce9fe8fba7fb6a2f6b98c020e4a76c8443526c51af7f91602daa01e84e69fe29bc838ad79eb147ded2
diff --git a/net-dns/getdns/files/stubby.initd-r2 b/net-dns/getdns/files/stubby.initd-r2
new file mode 100755
index 000000000000..69e76c0acfdf
--- /dev/null
+++ b/net-dns/getdns/files/stubby.initd-r2
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+stubby_opts="-C ${STUBBY_CONFIG_FILE:-/etc/stubby/stubby.yml} -v ${STUBBY_LOGLEVEL:-5}"
+command="capsh"
+command_args="--inh=cap_net_bind_service --user=stubby -- -c '/usr/bin/stubby -g ${stubby_opts} >>/var/log/stubby.log 2>&1'"
+pidfile="/run/stubby.pid"
+name="DNS Privacy Daemon"
+
+depend()
+{
+	provide dns
+	need localmount net
+	after bootmisc
+	use logger
+}
+
+start_pre()
+{
+	checkpath -f -m 0644 -o stubby:stubby /run/stubby.pid
+	checkpath -f -m 0644 -o stubby:stubby /var/log/stubby.log
+}
+
+stop_post()
+{
+	[ -f /run/stubby.pid ] && rm /run/stubby.pid
+}
diff --git a/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild b/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild
new file mode 100644
index 000000000000..543db3e2c784
--- /dev/null
+++ b/net-dns/getdns/getdns-1.6.0_beta1-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+_SRCURI_P="${P/%_beta1/-beta.1}"
+
+inherit cmake fcaps systemd
+
+DESCRIPTION="Modern asynchronous DNS API"
+HOMEPAGE="https://getdnsapi.net/"
+SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby +unbound"
+
+S="${WORKDIR}/${_SRCURI_P}"
+
+# https://bugs.gentoo.org/661760
+# https://github.com/getdnsapi/getdns/issues/407
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/libbsd
+	dev-libs/libyaml
+	dev-libs/openssl:=
+	idn? ( net-dns/libidn2:= )
+	gnutls? (
+		net-libs/gnutls:0=[dane,openssl]
+		dev-libs/nettle:0=
+	)
+	libev? ( dev-libs/libev:= )
+	libevent? ( dev-libs/libevent:= )
+	libuv? ( dev-libs/libuv:= )
+	>=net-dns/unbound-1.5.9:=
+"
+RDEPEND="
+	${DEPEND}
+	stubby? (
+		acct-group/stubby
+		acct-user/stubby
+		sys-libs/libcap
+	)
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_RUNSTATEDIR=/var/run
+		-DBUILD_DOXYGEN=$(usex doc)
+		-DBUILD_GETDNS_QUERY=$(usex getdns-query)
+		-DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon)
+		-DBUILD_STUBBY=$(usex stubby)
+		-DENABLE_STATIC=$(usex static-libs)
+		-DENABLE_UNBOUND_EVENT_API=$(usex unbound)
+		-DUSE_GNUTLS=$(usex gnutls)
+		-DUSE_LIBEV=$(usex libev)
+		-DUSE_LIBEVENT2=$(usex libevent)
+		-DUSE_LIBIDN2=$(usex idn)
+		-DUSE_LIBUV=$(usex libuv)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use stubby; then
+		newinitd "${FILESDIR}"/stubby.initd-r2 stubby
+		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/stubby.logrotate stubby
+		systemd_dounit "${S}"/stubby/systemd/stubby.service
+		systemd_dotmpfilesd "${S}"/stubby/systemd/stubby.conf
+	fi
+}
+
+pkg_postinst() {
+	if use stubby; then
+		fcaps cap_net_bind_service=ei /usr/bin/stubby
+	fi
+}
diff --git a/net-dns/getdns/metadata.xml b/net-dns/getdns/metadata.xml
index dbf4417374b7..eef66059a1eb 100644
--- a/net-dns/getdns/metadata.xml
+++ b/net-dns/getdns/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>gentoo@retornaz.com</email>
-		<name>Quentin Retornaz</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
diff --git a/net-dns/hash-slinger/Manifest b/net-dns/hash-slinger/Manifest
index cc72081a36af..c0a6fee07706 100644
--- a/net-dns/hash-slinger/Manifest
+++ b/net-dns/hash-slinger/Manifest
@@ -1,5 +1,5 @@
 DIST hash-slinger-2.6.tar.gz 34864 BLAKE2B 4bd66a30ce0f6f57676d8c8691a38743b2b4263fc600b9a3756f1ff4676477bd61a4b20df082227a3437ca2bcbb1ad4e44643f8a87cda0a1123dab8fafa26140 SHA512 1e5d67ed2ef8eae910927fbd7419928d87ba31a91ca43a1c163b05f725da96a50d30e1539c4c55a68a22f0e2c9a2f7c7101fbdcfb5fc903e87fe4c22e20f33af
 DIST hash-slinger-2.7.tar.gz 37684 BLAKE2B e8758251c51139723778ca0db271cbc730e19bba25fad3f7f784f06774ce52038f520c11b526fffd30570854112f0e7b184f6d05e4d20847ac2c014bc66151f8 SHA512 b1b3e46c4cdd8b983b55156c9bcc58afc973c2503cde48283e98306e381753547f425bfaee68707ae10b2e31b71d01485b34e4a9841c9ce2048f9551f23d0976
 EBUILD hash-slinger-2.6-r1.ebuild 1076 BLAKE2B 6a5920d8930cdbc70d353d020bda6413ad51a51867c9b151e71f00088ddd78410bdf3313600805ede1992bd9fe217088d58aac5fdaa4e341db54f1690bd08b19 SHA512 b1e974bb72e667cae331fbe546a4309590611c06988d2eda4fdfc7d5c201d5e9c60b443dc52a23259451a8c958f6a6ff510c66e3511cd0b23fb95698e58f1548
-EBUILD hash-slinger-2.7-r1.ebuild 1076 BLAKE2B 6a5920d8930cdbc70d353d020bda6413ad51a51867c9b151e71f00088ddd78410bdf3313600805ede1992bd9fe217088d58aac5fdaa4e341db54f1690bd08b19 SHA512 b1e974bb72e667cae331fbe546a4309590611c06988d2eda4fdfc7d5c201d5e9c60b443dc52a23259451a8c958f6a6ff510c66e3511cd0b23fb95698e58f1548
+EBUILD hash-slinger-2.7-r1.ebuild 1078 BLAKE2B 9c6f75404afcb748586ea0f06741ed70723e8e08dd469deb10c9fd1741bf1188eb00a04a1ef24744955879f9c8e59464d4a3150af9cc9c4bba3c787716e17a77 SHA512 3b3a4755964193e8f63de1e0e8b6f577a6657585275ccf66d9576a9311a3d673eb65e257c35cf7849b64067f00352d079bffd78925c36315bafaa200f40688ca
 MISC metadata.xml 488 BLAKE2B e51e5da837d62c1fefc50f59a31bc8464e1cfdaf770130562b20ad33c8f9b8b5bc604e508eaa5b9087fe59e25fdd3993f5fedc062f0a75ad6ad723234e7e5f6f SHA512 d7d812a2e7a32bd659135bddc88f74b3f882237eba39d96d67ef8a5a53656c64090bfa4535a104e0581c82f2d8e6c69357a314cf8750cb4dd1a5fb421cb3251e
diff --git a/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild
index a2ff821691bc..161c87a31f2d 100644
--- a/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild
+++ b/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/pwouters/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="ipsec +openpgp +ssh"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index 9373d8666e9d..e8dd244af134 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -3,5 +3,5 @@ AUX idnkit-1.0-test-subdirs.patch 289 BLAKE2B 6c9237cd1d17785a5d0a379d610ddc6b6e
 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 1038 BLAKE2B 92a39591869831f3c0ab1fbfe1d46dbf9f1f5494ba686825a3c2e3c13c84fcddd970e2678a0357feb15990c010e169029dc3a5ce07bd90fdaa1f52d422639f01 SHA512 f00d2f03f5ea1f8c0233ba8d5afb9a22dbaeae4a58a54d7371d4dee0363b0f8d794dacbe69b6d535382b11f5a39725d8a6d1b9279716f06bec3978020d218f84
-EBUILD idnkit-2.3.ebuild 635 BLAKE2B a7432b146faef7b9464ac03357dfdbb2e17e11779a0b08929472554952fb84e065d8cf666e20f301f5be463143e6cbc7d144d62660af57c6afdc4e6e1d612002 SHA512 0db5b9d09debc9e7b701bb4a2752aa6c49e0ac35abf92dddfec0cad93817802cb428d60d1febb6bb7d4555a8a13a62595fa3abb2968607b491286499c0239303
+EBUILD idnkit-2.3.ebuild 647 BLAKE2B 8e431d026f6c4c4e2424d32a8f9e73c30a3095c43b11e8563aedb9f6b64ecc0202d93bba1bc561f3ef00e85deaa0e7fd3aa428809f03def14318655104d7df7a SHA512 1f04b36cc67066e74a39045fea0c6bbebc29d10fe109bcd1ed5f25ba9599691adec8007f1d2d51008fec4d87c0b76a2e2777b9495f405778b951bcc79ed7cec0
 MISC metadata.xml 290 BLAKE2B 9b8f414f2eb140cd1c4c9b290bbd4f3d36e58649b68a9ed478ba55661df34bd1f8e1ea9c6d132e2edc4365bb8d4abd5f78d9b0f24e588d548354f63057da0b78 SHA512 5ae703d1a74d5fe45ac66f8f4922b754999932112931b8ba1f46d4a2e769a5d7130b4a418bf687d857a89f20e287d85e384236848c0e01747d0aa1c1ea350492
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index f2d81d83a585..b325b32c4091 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -6,7 +6,7 @@ inherit ltprune
 
 DESCRIPTION="Toolkit for Internationalized Domain Names (IDN)"
 HOMEPAGE="https://jprs.co.jp/idn/"
-SRC_URI="${HOMEPAGE}${P}.tar.bz2"
+SRC_URI="https://jprs.co.jp/idn/${P}.tar.bz2"
 
 LICENSE="JPRS"
 SLOT="0"
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 536c5e744f28..a7496a409c36 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,10 +1,8 @@
 AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e05dbd44c8b8c5c87a01d500d5ac328fdee1cae3f9dd126448a8b82b979e13a4ff5285fa48b983d5 SHA512 58c4186e57ebd00b86dae34d5d208ed8801c0376da40cccb23b3d4542a7ee04a1003a12a4b89347b76a384b50eae4a61f96164bf22ec987ce05b1c65691659e7
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
-DIST knot-2.8.4.tar.xz 1181812 BLAKE2B ff334ec3914ff682247b10719c9da28cdc1b353a24915204944ab2c010395a19d154ff1e1db399fa38df616c606574856f8ad69a144d56e4414a4c06dea9fe87 SHA512 8f826f0e2259b346c84212f9b58fe756044b2549ae84e42d929a0e01269d9f72bce1791c98327b02de375c739e77090d0ea9bacba9fa91ded5b2ea16154ac588
-DIST knot-2.9.0.tar.xz 1210236 BLAKE2B 1cc461feff60ed15bb04438767b2d0fa069bec5f649fc703127950672af2235ec3cb5a84c900c4fc42acdc40ef55f8f17605077eafbb0c4a9aabfe3bd3ea2c83 SHA512 7584152d4fd01cea40a254b05d59971c7341cf612976104ddd857c4a1c637fc83ad93669fc943de3c1514122be793b78f8cc26fef4cc98f5a693640bb766f2b9
-DIST knot-2.9.1.tar.xz 1212460 BLAKE2B 7b025ab7fffddd6860cf4fa04386746c1e900d28bfc4322a021807c27f6c4621c0a19becbba07f9519c8fbb663b70c59b815ca566f6952edc3deb56b5658ae86 SHA512 467de157894c6d09f5ba0864f6c637f31f2cf4bcc612e1aa94a9f72395ce2f42dfe024818f84be5f3519af3d6421c771ad08f2dbf7ede6ff9ec7ec2a885178ff
-EBUILD knot-2.8.4.ebuild 1887 BLAKE2B 50877ea27c72362a6121b4c26a5fc5897ccb77ed94c95c695e6ecf7d61d6a2d13b6c8e1e582f8806a7c93e0e142776c1fb4f60813d644df25bc07b165a364e54 SHA512 c03750e0a03b492cadf77e41280ff7383bed4f38b52e82abb594edb6f86c053c875dbd06f8070e4a1348c63948a7056d81dfd684912f0143446a2ebfa5e13437
-EBUILD knot-2.9.0.ebuild 1887 BLAKE2B 50877ea27c72362a6121b4c26a5fc5897ccb77ed94c95c695e6ecf7d61d6a2d13b6c8e1e582f8806a7c93e0e142776c1fb4f60813d644df25bc07b165a364e54 SHA512 c03750e0a03b492cadf77e41280ff7383bed4f38b52e82abb594edb6f86c053c875dbd06f8070e4a1348c63948a7056d81dfd684912f0143446a2ebfa5e13437
-EBUILD knot-2.9.1.ebuild 1892 BLAKE2B bda8c5a9320f1cc5de5149a1435501595b50f7d39734a81106c7712c6bfb479afe3807d01849aab4cb0515859caa27a92baf24fe7ffea5cd7aba726ff85dd570 SHA512 5db2d53e35f7d4d644fde4aac1ecb6254ca654973181fbc16c5b0f670f8f812c8700f119d4344acba73bc30a48f4fa652a7b760a95b91a2af6ad5b9f96aeda3a
+DIST knot-2.8.5.tar.xz 1209076 BLAKE2B 7454499745caa04a9454f023bed0ce6d8ccc54fc2c264aada72a842c39b056a91caee908eb1b036fe77b97d8cea4f03b9afcd084a69846a2632e717f7c3591fd SHA512 f45e62816ddc1f534e724d2fa71831100efc01b415ec2ea8301d02cf44d8f104a248deccdb706ebad6853404aee2a209c2bf51b07076aa69340af6812e5a79de
+DIST knot-2.9.2.tar.xz 1181860 BLAKE2B 4c4a54624cc0c107517596efb3d4a4dc205dac488e293b594e93f8e73b1face3c0ac4ca94d5def68576f7b801540468a355e5b4bd06d7992edc3bce122952fd3 SHA512 7e09cd6e587342b0a213f7a108704fff7535d02dd47d662e60b96ae5d75d9745d659131622253f964deb1607f28d172d1d46dc3b5f61e2f6c70e5002e746da68
+EBUILD knot-2.8.5.ebuild 1887 BLAKE2B 7eb58953ff6217a867692a88112fadfbccab09822786c9bcc5a3b049f9ad300d7406edca1122c326a2127811dc8af7c74de0625174ff1968645e91cf54c9ecc4 SHA512 c9e51d696c0e0d50b5b40ac76cd950eb7ca21a7a679f1655440d7a77af46aeec59697d12a84b8becf0f0de1a1a4e425bc4af4e51331a83e9fd724aab92b467bb
+EBUILD knot-2.9.2.ebuild 1892 BLAKE2B bda8c5a9320f1cc5de5149a1435501595b50f7d39734a81106c7712c6bfb479afe3807d01849aab4cb0515859caa27a92baf24fe7ffea5cd7aba726ff85dd570 SHA512 5db2d53e35f7d4d644fde4aac1ecb6254ca654973181fbc16c5b0f670f8f812c8700f119d4344acba73bc30a48f4fa652a7b760a95b91a2af6ad5b9f96aeda3a
 MISC metadata.xml 1677 BLAKE2B 89c3190781cf6b6d6217c84dd45f78ebd86695e9c224c7fa7f5112b246b95b982fb025c6c30b065d59b11f3acdcabda8e92b0da001cf1a7ad3e67ee9b2207d3c SHA512 d1e480d3e5d422b94a952a8fd0a679052d24724cccdda0bf13808f1a6b47b129a1db6ad17a0a42d9a6d315e9cbe64293a1a22077b7affc36862313ff8715d9e1
diff --git a/net-dns/knot/knot-2.8.4.ebuild b/net-dns/knot/knot-2.8.4.ebuild
deleted file mode 100644
index aa3b0735e370..000000000000
--- a/net-dns/knot/knot-2.8.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 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
-
-	if use doc; then
-		emake -C doc html
-		HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	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/knot/knot-2.9.0.ebuild b/net-dns/knot/knot-2.8.5.ebuild
index aa3b0735e370..d9559bbada82 100644
--- a/net-dns/knot/knot-2.9.0.ebuild
+++ b/net-dns/knot/knot-2.8.5.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
diff --git a/net-dns/knot/knot-2.9.1.ebuild b/net-dns/knot/knot-2.9.2.ebuild
index 832d155aba2c..832d155aba2c 100644
--- a/net-dns/knot/knot-2.9.1.ebuild
+++ b/net-dns/knot/knot-2.9.2.ebuild
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index b097344b8aaa..7b2da4e82464 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 2638 BLAKE2B 0d7a15e990fc0188d42cffbcaf6ecc87489e7b0c5e1ac237f2b24120e3151a43620a84090b34654803a2ba3bdae063166ed9dcd5f06d219c49578477918a7037 SHA512 b258a78bfcfa949fa2b3d5de17c405bf0cd4f111d03108dc84ef18be16b48b1e418c3672d5c5f61dee9138bef8a23ae40719b867dc71c13738bf338e7d3da43d
+EBUILD libidn-1.35.ebuild 2651 BLAKE2B 7338416887534df17f9de8537ab0b3bd02e330adacc5645bb0de785eb011a758115e97ce832662f4b4378b3f631ab9270e4232cedd3cdbfb450e9c53a08ce1cd SHA512 a7d573a0335cbf38602fb93a6ea6ba4435529a1063d75e1ae62776777f1d774c363bb587072461a8bb5ce89d0c53040c3df58e403f549346e54820bce76df323
 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 bf9a50522715..e0bd8ca753d2 100644
--- a/net-dns/libidn/libidn-1.35.ebuild
+++ b/net-dns/libidn/libidn-1.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
 COMMON_DEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	mono? ( >=dev-lang/mono-0.95 )
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/net-dns/pdns-ldap-backend/Manifest b/net-dns/pdns-ldap-backend/Manifest
deleted file mode 100644
index 68d7ceff21a5..000000000000
--- a/net-dns/pdns-ldap-backend/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pdns-ldap-backend-0.2.tar.gz 745650 BLAKE2B 68371aebaa4f3d447ccc52d5ba6463ec3cae704071a78664529415fd57b61e98d6fe8b895cf96122c24f9fc3fe74d449d2f132030148c7f896c38dbe1afaea3e SHA512 1a9eb0282abd9dea945150412a77d9cad4ee5fb114b621396928adb6db5994a0ee54b084281b723460e2943c15570c783da518a51314636302d9179832a26990
-EBUILD pdns-ldap-backend-0.2.ebuild 848 BLAKE2B 199e382d87c149af8c997f6671164b308d486e13cea21b9247c8ed53bdd6a6e422a72d4ab16b925c181b50cf4e2133e0e86e206a7169da0f04a82602bf942a73 SHA512 e8851638219c6ef8226afd9040701722da2b40236cf678307ebddf2064ca6c2bf6dbf3b189723a2e655b3af8715487138b16b871c60b9ccbb2a7dc73d6cdfc5f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/pdns-ldap-backend/metadata.xml b/net-dns/pdns-ldap-backend/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-dns/pdns-ldap-backend/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-dns/pdns-ldap-backend/pdns-ldap-backend-0.2.ebuild b/net-dns/pdns-ldap-backend/pdns-ldap-backend-0.2.ebuild
deleted file mode 100644
index 48439709cce8..000000000000
--- a/net-dns/pdns-ldap-backend/pdns-ldap-backend-0.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib
-
-DESCRIPTION="Fork of the official but unmaintained LDAP backend"
-HOMEPAGE="https://repo.or.cz/w/pdns-ldap-backend.git http://sequanux.org/cgi-bin/mailman/listinfo/pdns-ldap-backend"
-SRC_URI="http://sequanux.org/dl/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="sasl"
-
-DEPEND=">=net-dns/pdns-3.2[-ldap]
-	net-nds/openldap[sasl=]
-	virtual/krb5"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--with-pdns="${EPREFIX}/usr/include" \
-		--libdir=/usr/$(get_libdir)/powerdns
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README USAGE* src/dns.ldif"
-	default
-	prune_libtool_files --all
-	insinto /etc/openldap/schema
-	doins schema/*
-}
diff --git a/net-dns/resolvconf-symlink/Manifest b/net-dns/resolvconf-symlink/Manifest
index 6328493bdfd9..e5db6f5d4a4e 100644
--- a/net-dns/resolvconf-symlink/Manifest
+++ b/net-dns/resolvconf-symlink/Manifest
@@ -1,2 +1,2 @@
-EBUILD resolvconf-symlink-0.ebuild 1496 BLAKE2B 3afb110a759f304c84a865b97340618bf32b2eb777fac702f90a625685417423a52c4098ecf3278a111a11f926ac974f8c628e883d0e8b96dd91a6392112141d SHA512 8099ea0189da0e4614445d406c569e70ee1f88227803a5fcf42b6365a75224ac550f0af2a140c2d70db1f0bb2c49c0f85f6eb25314b161307829f99e552be889
+EBUILD resolvconf-symlink-0.ebuild 1534 BLAKE2B c32f7f626f31743f25e0280e7b4eced5f374fc88d4344cd70823fc100f88b55e33dd8522b4a7792abf401beaa857e5c9eaa368ef1f01c3a456f45159472fdf4f SHA512 dd19baa7de4f29951b6639b0bca293eddb70150281d9829413c71f090734a94702939fba7bc6f27e5497ef98ff4e5e89f497f038cc20314a4a88f69e63592c09
 MISC metadata.xml 387 BLAKE2B 3a03e49bfd34ba84173daa8e0449b1fc8fbba941c14be257ee444d0fe20dbb2a1ebe5ed4671467c1f827549733ea20ac12ba8aef2d588360632339114ec4f094 SHA512 34bb7374a90375f557a9791c7b7cfb78260965a148e6c73ef829bbd2dbc34931b7677408e519e7cdb06445c0ac3ea180b59e73770614e6215eddf15fcdbaf064
diff --git a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
index d11ff4ab6257..782762cc845f 100644
--- a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
+++ b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
@@ -1,35 +1,34 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Make /etc/resolv.conf a symlink to a runtime-writable location"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
+S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+symlink"
 
-S=${WORKDIR}
-
 pkg_preinst() {
 	if use symlink; then
-		if [[ -f "${ROOT}"etc/resolv.conf && ! -L "${ROOT}"etc/resolv.conf ]]
+		if [[ -f ${EROOT}/etc/resolv.conf && ! -L ${EROOT}/etc/resolv.conf ]]
 		then # migrate existing resolv.conf
-			if [[ "$(head -n 1 "${ROOT}"etc/resolv.conf)" \
+			if [[ "$(head -n 1 "${EROOT}"/etc/resolv.conf)" \
 					!= "# Generated by "* ]]; then
 
-				eerror "${ROOT}etc/resolv.conf seems not to be autogenerated."
+				eerror "${EROOT}/etc/resolv.conf seems not to be autogenerated."
 				eerror "Aborting build to avoid removing user data. If that file is supposed"
 				eerror "to be autogenerated, please remove it manually. Otherwise, please"
 				eerror "set USE=-symlink to avoid installing resolv.conf symlink."
 
-				die "${ROOT}etc/resolv.conf not autogenerated"
+				die "${EROOT}/etc/resolv.conf not autogenerated"
 			else
-				ebegin "Moving ${ROOT}etc/resolv.conf to ${ROOT}var/run/"
-				mv "${ROOT}"etc/resolv.conf "${ROOT}"var/run/
+				ebegin "Moving ${EROOT}/etc/resolv.conf to ${EROOT}/var/run/"
+				mv "${EROOT}"/etc/resolv.conf "${EROOT}"/var/run/
 				eend ${?} || die
 			fi
 		fi
@@ -39,14 +38,15 @@ pkg_preinst() {
 src_install() {
 	# XXX: /run should be more correct, when it's supported by baselayout
 
-	use symlink && dosym /var/run/resolv.conf /etc/resolv.conf
+	use symlink && dosym ../var/run/resolv.conf /etc/resolv.conf
 }
 
 pkg_postrm() {
 	# Don't leave the user with no resolv.conf
-	if [[ ! -e "${ROOT}"etc/resolv.conf && -f "${ROOT}"var/run/resolv.conf ]]; then
-		ebegin "Moving ${ROOT}var/run/resolv.conf to ${ROOT}etc/"
-		mv "${ROOT}"var/run/resolv.conf "${ROOT}"etc/
+	if [[ ! -e ${EROOT}/etc/resolv.conf && -f ${EROOT}/var/run/resolv.conf ]]
+	then
+		ebegin "Moving ${EROOT}/var/run/resolv.conf to ${EROOT}/etc/"
+		mv "${EROOT}"/var/run/resolv.conf "${EROOT}"/etc/
 		eend ${?} || die
 	fi
 }
diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest
index 2a6c4c7d5dec..19c2906fd4ab 100644
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@@ -8,4 +8,4 @@ EBUILD s6-dns-2.3.0.0.ebuild 1316 BLAKE2B 2c9dfe840307a11cf193077abc5011df5b01f4
 EBUILD s6-dns-2.3.0.1.ebuild 1211 BLAKE2B e74799d0b902714589cdb91b305ca8ea69939dd13f69cde242ac17292225f66802c89b421a6c2dc6f543a20b1f174d0c675b077a0150e2bc6a29f5e89fe1b243 SHA512 670fc13663ec03faf9f86ce6f4777730341c19783b6671249debfc0ac3594a1e2d33967f7b041778ff69388c7b56554ef679e246b0e6cd172a50c1b98b828342
 EBUILD s6-dns-2.3.0.2.ebuild 1096 BLAKE2B 53389e651100b3171221f91b34d7b728a3a85986c37cb284436eda902bcf99a52ae9c460f38b71c049654b8cd3dde05b1479c9b2c4aaa50e057fef111489de1c SHA512 30935ee14fcd1e63f248e2093c89ee11e65cfdafa6143d36eb0034de08072556b0993b46f7d08d2a6b9d84da024f84303b6b90e97170f425a43eb09946bc4a12
 EBUILD s6-dns-2.3.1.1.ebuild 1096 BLAKE2B 25dce0059e773e0f43a0fce14826851711a25380414bb83039940c2a6e6cc464dce9d0dd6950d4e266dfb038c50426728232ec076843a5f93c4dd63296f757a7 SHA512 59470d1c20fdd791ee7d31e4b0af021b4c3f7718a2e62d8466948e85638f533183b92795de765a710375d718975f905a22ae92f209ed84be529f6214c97e1a0c
-MISC metadata.xml 764 BLAKE2B 7e6f7e1ea30dcf3e0b8c08d90457019cfb0d577f2c7ad4d4664d2770c150ac2e51d38c047a7b41c5541c1a3771b8c18ad547f2a87cb4d13f49b6cf9141cf1aae SHA512 d49c08c4eb0bcdc6bade611ced7588ed1f6e8bb6c71a677b1b1ab1ef2357229a3a380858aecbf57a4fd9a75511fcd32cb7ea1ea91b75c7a0787518a83fd4ab62
+MISC metadata.xml 661 BLAKE2B cf98c2a78cea43c2d9c31d4093673464cc9ac7a869a6ed32cbae59672d1ee29585e192ed28bd9a8683c9395147ea4b81be78b440463c5e6ad34bcd34f1492081 SHA512 f95553b5a3f5d8da7d19f0c0725c7591fdcc43a40d48d058f1d80a3101d71fe8f1589885ded474adcfea62eb9b38c212fa570a0886d862db303852f07836c1a9
diff --git a/net-dns/s6-dns/metadata.xml b/net-dns/s6-dns/metadata.xml
index d62b9e59590b..777c8af46540 100644
--- a/net-dns/s6-dns/metadata.xml
+++ b/net-dns/s6-dns/metadata.xml
@@ -9,10 +9,6 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>aranea@aixah.de</email>
-		<name>Luis Ressel</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 912d9762b2f6..9fd0ca5c4e89 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -9,7 +9,7 @@ AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a7
 DIST unbound-1.9.4.tar.gz 5686242 BLAKE2B de9e553ba6e8c3839b41776052c3b0f83890b5bd9cbdb895fbf1e413169dd4740a9dc354ccc787fa018755acb73e831f1cb2742db65e151d1e01367b35a7b9e5 SHA512 44021014c944fc01a1f5f9afd77145f5554a3282cc2bfd54526fc4f88346f497c847ddb72bafa155d7e6e5dd02b6bb031836ead4408977d4e4b5b3290dffea9c
 DIST unbound-1.9.5.tar.gz 5686689 BLAKE2B a685d7f74bff5d76907694877a988346f233c202121b76f7fbd0d86edc200abe06d345e77fdca41e97d2a22329e6bbc1600fefeaac2abc1784f34367413593e3 SHA512 0b198b49165b25c93899ca41fead67c479e5b6fd255f7e2af6930f4b9898c73d8a72caf376fce9a2a33199d0764db58388371c3fdbd442999ddfdb0b8b5394ea
 DIST unbound-1.9.6.tar.gz 5680145 BLAKE2B 9aa047270694babed36395100bbfc4287c74e173abfbb6f33939a7bf1362f765b16a8d016d84d426a5c0014d244063b4c028d5b5dddb05f09ad4287d8a63f098 SHA512 39a60f51da912ed25d247bc1e882b1242d80a63b0c2b3f753d38ed558f3a24691267375136ff6d85e5945a98ca0c4ac87e43e131c97737a355374dde64259951
-EBUILD unbound-1.9.4.ebuild 5428 BLAKE2B 76e809a5e05cd35d7a4a99363d7537ec2191c780209e31e16ea54b57237eb0873eaba4bfecfb0c83e32fe907eb6fe4dcc24222c9432049b9b55256625da8ead0 SHA512 66457b5abaa880275be83bcc3d7ea824dba6f006e7195199fb7a490058752e06e114324b2a5596b2c351277cff1dd7b1fd55e6d933c895d6de1352576ccb59f8
-EBUILD unbound-1.9.5.ebuild 5402 BLAKE2B b4f049b6593fc223b18cd46198bd478935830b126f0d0b17c2f48d49b680d57e3774d00fa28b93ba3950cf612a5b15d07c022a3b1b17284ab43ab4205494f7e3 SHA512 6d5ccfa700840dc7a9808378fb588444c5966ee4f50b2ac10b15684b24fa82fade1aa0ec3c6ae59acdc2f256357224533819b564407179f0b5a3f48b0e12370a
-EBUILD unbound-1.9.6.ebuild 5405 BLAKE2B 28d14703de4e70d8e7666930a57885f252c94e6a7db50f567f57fa973b644c9bcfc6195ce2e315e97e9efc6bb22caf73cf6c438c0bff011d80e57f8c2852d870 SHA512 1b278ba654c85e6f206f3cbfb03892f779599d1980638d383307dc8f0acf489088c13f52c1121cdedecf278c69d9a97799a59946c57b46083d6b2ba3a2fd78c6
+EBUILD unbound-1.9.4.ebuild 5426 BLAKE2B a252b262ecf27479c65f2402c7b8f1521d3dc74276f11e9bb580fda54e35bff976b1b2f67b1dabaa684a8f1f1960f417ac3e2275ac76434b54b55630ee7f568f SHA512 84a52d942381bec1757cf995ade916753d4df520e52a6263e89206d656b39d93116d2e811ca575b16683c381bb9b2c22ebc7c0b99e1bfb37ab3a864fce1be91d
+EBUILD unbound-1.9.5.ebuild 5400 BLAKE2B e7ff3b4b75d812085ab79c1101dcbec1f4d0a845c28254940b5990e087b9441bb91806dafc11e3a4e6d7ef83065fbd7e83818e5706b60a7bcf8523d18685febe SHA512 7d3a1751cf5387b0723d4727faf11ad4b5d9f92fc203754152e069168ed2857b750c8e647af5d28154635a82358deca355f04a5ef3129c069b2859b3cb6b958b
+EBUILD unbound-1.9.6.ebuild 5400 BLAKE2B e7ff3b4b75d812085ab79c1101dcbec1f4d0a845c28254940b5990e087b9441bb91806dafc11e3a4e6d7ef83065fbd7e83818e5706b60a7bcf8523d18685febe SHA512 7d3a1751cf5387b0723d4727faf11ad4b5d9f92fc203754152e069168ed2857b750c8e647af5d28154635a82358deca355f04a5ef3129c069b2859b3cb6b958b
 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/unbound-1.9.4.ebuild b/net-dns/unbound/unbound-1.9.4.ebuild
index cd653fdb32bd..840b23595d5c 100644
--- a/net-dns/unbound/unbound-1.9.4.ebuild
+++ b/net-dns/unbound/unbound-1.9.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
 
diff --git a/net-dns/unbound/unbound-1.9.5.ebuild b/net-dns/unbound/unbound-1.9.5.ebuild
index f8ac0358003e..0a689254ef95 100644
--- a/net-dns/unbound/unbound-1.9.5.ebuild
+++ b/net-dns/unbound/unbound-1.9.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 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 873b25698f4e..0a689254ef95 100644
--- a/net-dns/unbound/unbound-1.9.6.ebuild
+++ b/net-dns/unbound/unbound-1.9.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
 
@@ -13,7 +13,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-dns
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)