gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /net-dns
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
98 files changed, 1910 insertions, 1301 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index ebd264a09f0d..c71881a8ffca 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 9874010c63d2..40a1151633be 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -3,6 +3,6 @@ AUX autoipd.sh 1271 BLAKE2B 815c5776afff71489826eb8338535df1af6fbf02f3d42eedb6eb
 AUX avahi-0.7-CVE-2017-6519.patch 1578 BLAKE2B 87fce922927e1217802ce0f7b2a1a6f22649903a495817e224a37e7fc5c76d0d2a6cfbb50a1373a950a75a45a68bfbcba9f2155ed24940e3ffb994b862c00e4c SHA512 6c30c0d095f42b9bd289a1ac7b42287cd109bf0bad480d13eec70bedb65e7e1ab495600703f39f1caf73c3c0617c72940c33462586d68deb0a416d7c93964997
 AUX avahi-0.7-qt5.patch 6033 BLAKE2B 10c7879f6e28942a32497c84dcf523f742cb13112d9e9c23f74967c2d6c05e6f463406716c144edc1bd4588c8c76693473765d9d678f6517c4a57615d0364b91 SHA512 cd8b900a5a068add3b7aa9080491938d469795c26e1a1869ee581b95d877ded4d120cb4db768fb4d97535a72e66c3fabf6617cdca2c9bdb50ff54e24d17b1f51
 DIST avahi-0.7.tar.gz 940047 BLAKE2B 8299577bf27ee65fad5d743dbf94202b148a6fc86825cae303f94c44482eea07cf6570d970ca286e81a787d6a64598b7123f2ac17a259ddc50ef431b9c94b530 SHA512 61f656da7614d8cca1862180038f571db3474c84f05db4d3509f614cdbf8b1a1047661b7e24d63682d5b48ed1bfa1b08b3c9e6dbe9222bcd62d99bc168a11abe
-EBUILD avahi-0.7-r2.ebuild 5259 BLAKE2B 40ca772ce3bb4004cc86545e81288afecd9324ecd1cdb11c188d8b1f0572a118b275b01c123beb2bc7247ced4f1baf197969b9e33a6e0bbbc14f5c66e8d89277 SHA512 dd64616525130c59d7ebe2c433113542d9ec57d591cc72661b3580371e1da668776038e3c509934be12aeb8647f5550b7dff433726eb4d00324eb453f24f14f0
-EBUILD avahi-0.7-r3.ebuild 5289 BLAKE2B f14eb1796409fab5637b5b23541ce2b9a3f9b791461052b268840e8d34d0092a391dc418fd540b3fc9411c53bb80d6bf73ed6b70201a27e5bdb4a7ca6fa541ef SHA512 214bea56bd34853bbca44512e84cbf8b2b8938690285b44974912de31f0594bfdb5cd4bee18de53df551e4d0fea068028a748b523917738316a1eb12ebe05169
+EBUILD avahi-0.7-r2.ebuild 5250 BLAKE2B fb2f31ff16159ec52bdaf74a45e67b0d440ac81dd37b84cbff8596fbf931cb876b31c6631f2227fab6abf83671960ad45ed37f616ed2a8b424dea0cf6e3a9dc2 SHA512 ea3143c5834c2ed15cbaac7d8efd0dd3198c8e982b851abfad68c3dd3de9f5bad440a4af9db4ad140ef02f3cc39eb18ce53592cbed30b999ea433284898f948a
+EBUILD avahi-0.7-r4.ebuild 5215 BLAKE2B 0d387cb0af825bd7813bdf0f99bdfbc83dc8f7f69a4c0e374bf0ff51522074453197f659019395cb4efcc50719b56c6206eade55c7ce28e075d70c48a140e2aa SHA512 ac32afae86f2347d0961978b8189345e0bb2ff9feda118f2075be148d8dcdb02da591ed5e93d417a2d8a050e206fb2ba6729e8f22422bed7bc052791c8587556
 MISC metadata.xml 935 BLAKE2B 890b4a3ab97241ba254dcf68b97a6a8b2ae4af914dc2348b8eb9d6c3182c1d2dfbd5eca8dac009e30f4662b88001c159ac5479a100bfc48a956ac2d603b6343e SHA512 7d2114e25574532405b5ff6db66b833aef68772d5b699d8885e9f1005a1785298e5b71288a858572a1270c6a4d9d2ad98aac7f79f4df6713dea79778280c82d8
diff --git a/net-dns/avahi/avahi-0.7-r2.ebuild b/net-dns/avahi/avahi-0.7-r2.ebuild
index a1d608250889..5768b6f05c1a 100644
--- a/net-dns/avahi/avahi-0.7-r2.ebuild
+++ b/net-dns/avahi/avahi-0.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux test"
 RESTRICT="!test? ( test )"
 
@@ -190,7 +190,7 @@ multilib_src_install() {
 		docinto html
 		dodoc -r doxygen/html/.
 		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
+		doins avahi.devhelp
 	fi
 
 	# The build system creates an empty "/run" directory, so we clean it up here
diff --git a/net-dns/avahi/avahi-0.7-r3.ebuild b/net-dns/avahi/avahi-0.7-r4.ebuild
index 9295cc5587fe..045191094868 100644
--- a/net-dns/avahi/avahi-0.7-r3.ebuild
+++ b/net-dns/avahi/avahi-0.7-r4.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="gdbm"
 
-inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env python-r1 systemd user
+inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env python-r1 systemd
 
 DESCRIPTION="System which facilitates service discovery on a local network"
 HOMEPAGE="http://avahi.org/"
@@ -51,7 +51,15 @@ DEPEND="
 		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 	)
 "
-RDEPEND="${DEPEND}
+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 )
@@ -71,17 +79,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-CVE-2017-6519.patch"
 )
 
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
 pkg_setup() {
 	use mono && mono-env_pkg_setup
 }
@@ -187,7 +184,7 @@ multilib_src_install() {
 		docinto html
 		dodoc -r doxygen/html/.
 		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
+		doins avahi.devhelp
 	fi
 
 	# The build system creates an empty "/run" directory, so we clean it up here
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 0be2d97e4248..927c6fc5b282 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,6 +1,5 @@
-AUX sparc-pause-instruction.patch 4109 BLAKE2B e0a705c5b29033f54ae5d707a0159d8814fb15be4fdc33f91834f2aa50c3c37ca2d653d17222f16bb4e45f8d2e6a983f15ef70ebcd07f579426d3d97b5d78ecf SHA512 590fa784999692700db796291236ce9436e775b16cb737f853d2b5e0b9433f2993682edad2e9f25be140d6fe00edc3768947670a404079b603f8e93651d6da84
-DIST bind-9.14.7.tar.gz 6320994 BLAKE2B 7f21f856c9cc8a85d7757dc58ca8063faeb5a227ea65502e0385f09874cabaecae6c6bb4e9c7ed1f72db9191688a940202448d2a9fd6b0ab7ef04acb9d362e39 SHA512 e1837ebfbbc60487f5f0e67fb9e935588fd6e5ffe55cdc9dc77e3ce63cd6fc4f076f4eb282cc4f51701ddda3e51e8f15255db5a3841f9fe92a4fb4207d806740
-DIST bind-9.15.5.tar.gz 6303092 BLAKE2B 82bc078a6540d8847ecf39c8b29a58175db2ed7017c8cfd9a40a88292ece0935d532ea02fea09143c48e2949c912eab90d41d199cf8acdb3d69b13bf6aa669c7 SHA512 7632402dfe30c83c732ea6a4079a36e8529e4dd0541d794167d43103e8cd5257709af74d5823c65f4fe4c8fe5ca80c514e66fafbb2302ccd94973b86c67a1978
-EBUILD bind-tools-9.14.7.ebuild 3152 BLAKE2B 045f55cdf9e9f1c3f7eba882a4d8a48c1e3ca1af2a3550bec9164367db7b914319cdc7264bedc785d902de9000fc20e065e3a6ab0ae2e052c4c7ac92398a4885 SHA512 b784a176bb9856a750783f19940a05a875ede771eadcd0490b80319d6b6a2cfeb50eb7e35adaf13a88e52a8c59f92db6c06ae39fe3be31c568123a4de3378e8b
-EBUILD bind-tools-9.15.5.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8
+DIST bind-9.14.8.tar.gz 6403140 BLAKE2B 45cb06ce8564880d501c63d25c7af8567184e4e4293e01886620cf655449c972ab55c77c7aded07838c61557bc56d9edac26097715c1121fcfb6b606d7a29365 SHA512 eb52760982ebd246e6e1945684771193fc7364324a6d6a95a0cae33afa0a4fa24ffe8313b5f9094420c7c2ec932b1b1a9fb19f6e673ff3c5583ab5e3ff04eb6a
+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.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.7.ebuild b/net-dns/bind-tools/bind-tools-9.14.8.ebuild
index 089de718b324..4d1467150701 100644
--- a/net-dns/bind-tools/bind-tools-9.14.7.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.8.ebuild
@@ -22,19 +22,18 @@ IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
 
 COMMON_DEPEND="
 	caps? ( sys-libs/libcap )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	!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:0= )
+		readline? ( sys-libs/readline:= )
 	)"
 DEPEND="${COMMON_DEPEND}"
 
-RDEPEND="${COMMON_DEPEND}
-	!<net-dns/bind-9.10.2"
+RDEPEND="${COMMON_DEPEND}"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/net-dns/bind-tools/bind-tools-9.15.5.ebuild b/net-dns/bind-tools/bind-tools-9.15.6.ebuild
index 5a710f6efc50..8e1614afbea2 100644
--- a/net-dns/bind-tools/bind-tools-9.15.5.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.15.6.ebuild
@@ -34,8 +34,7 @@ COMMON_DEPEND="
 
 DEPEND="${COMMON_DEPEND}"
 
-RDEPEND="${COMMON_DEPEND}
-	!<net-dns/bind-9.10.2"
+RDEPEND="${COMMON_DEPEND}"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/net-dns/bind-tools/files/sparc-pause-instruction.patch b/net-dns/bind-tools/files/sparc-pause-instruction.patch
deleted file mode 100644
index 35ddb24da0b0..000000000000
--- a/net-dns/bind-tools/files/sparc-pause-instruction.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From a5ad6b16c5c0bfd333758d707a6397be79a92914 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 8 Aug 2019 08:33:10 +0100
-Subject: [PATCH] configure.ac: autodetect 'pause' instruction presence on
- sparc
-
-The change fixes the following build failure on sparc T3 and older CPUs:
-
-```
-sparc-unknown-linux-gnu-gcc ... -O2 -mcpu=niagara2 ... -c rwlock.c
-{standard input}: Assembler messages:
-{standard input}:398: Error: Architecture mismatch on "pause ".
-{standard input}:398: (Requires v9e|v9v|v9m|m8; requested architecture is v9b.)
-make[1]: *** [Makefile:280: rwlock.o] Error 1
-```
-
-`pause` insutruction exists only on `-mcpu=niagara4` (`T4`) and upper.
-
-The change adds `pause` configure-time autodetection and uses it if available.
-config.h.in got new `HAVE_SPARC_PAUSE` knob. Fallback is a fall-through no-op.
-
-Build-tested on:
-
-- sparc-unknown-linux-gnu-gcc (no `pause`, build succeeds)
-- sparc-unknown-linux-gnu-gcc -mcpu=niagara4 (`pause`, build succeeds)
-
-Reported-by: Rolf Eike Beer
-Bug: https://bugs.gentoo.org/691708
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- config.h.in      |  3 +++
- configure        | 33 +++++++++++++++++++++++++++++++++
- configure.ac     | 14 ++++++++++++++
- lib/isc/rwlock.c |  2 +-
- 4 files changed, 51 insertions(+), 1 deletion(-)
-
-diff --git a/config.h.in b/config.h.in
-index 91508e5d91..eeba105ec6 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -357,6 +357,9 @@
- /* Define to 1 if you have the `setresuid' function. */
- #undef HAVE_SETRESUID
- 
-+/* define if the SPARC pause instruction is available */
-+#undef HAVE_SPARC_PAUSE
-+
- /* define if struct stat has st_mtim.tv_nsec field */
- #undef HAVE_STAT_NSEC
- 
-diff --git a/configure b/configure
-index d336f6aa24..757dacb06e 100755
---- a/configure
-+++ b/configure
-@@ -13872,6 +13872,39 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; #(
-      ;;
- esac
- 
-+#
-+# Check for pause support on SPARC processors
-+#
-+case $host in #(
-+  sparc*) :
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pause instruction support" >&5
-+$as_echo_n "checking for pause instruction support... " >&6; }
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+__asm__ __volatile__ ("pause")
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+$as_echo "#define HAVE_SPARC_PAUSE 1" >>confdefs.h
-+
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; #(
-+  *) :
-+     ;;
-+esac
-+
- for ac_func in sysctlbyname
- do :
-   ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname"
-diff --git a/configure.ac b/configure.ac
-index 90aafae8d0..b04c651966 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -415,6 +415,20 @@ AS_CASE([$host],
- 			[define if the ARM yield instruction is available])],
- 	     [AC_MSG_RESULT([no])])])
- 
-+#
-+# Check for pause support on SPARC processors
-+#
-+AS_CASE([$host],
-+	[sparc*],
-+	[AC_MSG_CHECKING([for pause instruction support])
-+	 AC_COMPILE_IFELSE(
-+	     [AC_LANG_PROGRAM([[]],
-+			     [[__asm__ __volatile__ ("pause")]])],
-+	     [AC_MSG_RESULT([yes])
-+	      AC_DEFINE([HAVE_SPARC_PAUSE], [1],
-+			[define if the SPARC pause instruction is available])],
-+	     [AC_MSG_RESULT([no])])])
-+
- AC_CHECK_FUNCS([sysctlbyname])
- 
- #
-diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
-index a6ea35feed..e313a912e0 100644
---- a/lib/isc/rwlock.c
-+++ b/lib/isc/rwlock.c
-@@ -152,7 +152,7 @@ isc_rwlock_destroy(isc_rwlock_t *rwl) {
- # define isc_rwlock_pause() __asm__ __volatile__ ("yield")
- #elif defined(sun) && (defined(__sparc) || defined(__sparc__))
- # define isc_rwlock_pause() smt_pause()
--#elif defined(__sparc) || defined(__sparc__)
-+#elif (defined(__sparc) || defined(__sparc__)) && HAVE_SPARC_PAUSE
- # define isc_rwlock_pause() __asm__ __volatile__ ("pause")
- #elif defined(__ppc__) || defined(_ARCH_PPC)  ||			\
- 	defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)
--- 
-2.21.0
-
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 07aacaf6c64a..68de73786dd3 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -7,9 +7,9 @@ AUX named.conf-r8 4020 BLAKE2B beb900a89be0f2acc1b08a8d29443c87b098e5ac1f1de9c63
 AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f5bae6c2313485808b99a1a46fc10431913d187ed67cc1e6bad019a9192638bc7fdf97c951e2326ce SHA512 68fa7c8963ac59349de3d05972c07aa0123b7bebbe0ba9604463ccfd1b377c2babe01eed4745cbe0f7d3831d1b47c2fa620f8092c67465fb771cae4932b0861a
 AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
-DIST bind-9.14.7.tar.gz 6320994 BLAKE2B 7f21f856c9cc8a85d7757dc58ca8063faeb5a227ea65502e0385f09874cabaecae6c6bb4e9c7ed1f72db9191688a940202448d2a9fd6b0ab7ef04acb9d362e39 SHA512 e1837ebfbbc60487f5f0e67fb9e935588fd6e5ffe55cdc9dc77e3ce63cd6fc4f076f4eb282cc4f51701ddda3e51e8f15255db5a3841f9fe92a4fb4207d806740
-DIST bind-9.15.5.tar.gz 6303092 BLAKE2B 82bc078a6540d8847ecf39c8b29a58175db2ed7017c8cfd9a40a88292ece0935d532ea02fea09143c48e2949c912eab90d41d199cf8acdb3d69b13bf6aa669c7 SHA512 7632402dfe30c83c732ea6a4079a36e8529e4dd0541d794167d43103e8cd5257709af74d5823c65f4fe4c8fe5ca80c514e66fafbb2302ccd94973b86c67a1978
+DIST bind-9.14.8.tar.gz 6403140 BLAKE2B 45cb06ce8564880d501c63d25c7af8567184e4e4293e01886620cf655449c972ab55c77c7aded07838c61557bc56d9edac26097715c1121fcfb6b606d7a29365 SHA512 eb52760982ebd246e6e1945684771193fc7364324a6d6a95a0cae33afa0a4fa24ffe8313b5f9094420c7c2ec932b1b1a9fb19f6e673ff3c5583ab5e3ff04eb6a
+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.7.ebuild 11300 BLAKE2B 27c161fbca4aee4970cbfa59937d4fc211863c55c0b060d0933b65e45ae07ddef4ce026aad6cf1db330b28d909b227c1d0f67d6fbc7d5bb1ca0d24097da6645b SHA512 4951b23e8765bae8414de4e012306c5facf4825af949a48e1d02048f6c28fb4426d0a0ea3281b59ae606bd8f0c9b70a7549648c82da790bfa9209154884e9a47
-EBUILD bind-9.15.5.ebuild 10907 BLAKE2B 5291d61252d9f95fd80ffa0c74f0c146746551129ae20ae57b3b89ece4a4166c21dd29abc1bbbe0d31ab4e8a7e4fcd3456dd60369518d211093f6c03cc372f42 SHA512 524850fe8b371f815cb98c2347c063aac0e222e33c02f1e2f6e26afb39b9fe8380cff99e5f8386a3bcb81c9fb4c6d260e6b0e4aa296d8d531030f9c2c38653e2
+EBUILD bind-9.14.8.ebuild 11292 BLAKE2B 8029b0b3f0cfec9e39006f4ecd4bd3b2af668e22d7824707092a9970886d59aa4ad2cc11887ce909552e19976f8e1978c7fac0c2cca111ed606a8ed639474d94 SHA512 bf0cdd2c993ce1909439da92064f643e4c266b059b0c2fb315a1e6bf3aaebf3df820f14c87f78c794c81ad34aa5d968eabbc70f45483f6f8f0c76d8740715561
+EBUILD bind-9.15.6.ebuild 10897 BLAKE2B 59f50b0e5db6d33135dc98fafe8567a714ad1ae847b379a4b55e9a68c3a717626de8a0d8b4d1e07e9404e309ec74afbd5d22ff57b71273ec9a2228b645d84d97 SHA512 daa3cd1ebfd36c1699ddacfc2ecd9dbc927bf07ac9485b876d3b21cdc7079f02cd3fcec3edc85f5deea41ae7ef9006d95c4577b1929d10ec520c7e63294baf24
 MISC metadata.xml 1125 BLAKE2B 930164a56df7b9d5c790887910cc208335d05d763fc612595dc60413010e18268ee47831cd5b67cf9a1b7e0b1c730639404a7550b390c46cbdacd8ea11fe0ca1 SHA512 183029922f164fb03f6d781fbfb7298d6a5a73153dac1aad4eb78e9fe2f87f596fd408cfddd220dcf9e861cdb6d72d0c00dab0d9dfb5040ce366308c338e2365
diff --git a/net-dns/bind/bind-9.14.7.ebuild b/net-dns/bind/bind-9.14.8.ebuild
index 0aee6aaf90d0..fdf0e802d343 100644
--- a/net-dns/bind/bind-9.14.7.ebuild
+++ b/net-dns/bind/bind-9.14.8.ebuild
@@ -54,8 +54,8 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )"
 # sdb-ldap? ( dlz )
 
-DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] )
-	libressl? ( dev-libs/libressl )
+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 )
@@ -193,7 +193,7 @@ src_install() {
 		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
 
 		# some handy-dandy dynamic dns examples
-		pushd "${ED%/}"/usr/share/doc/${PF} 1>/dev/null || die
+		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
 		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
 		popd 1>/dev/null || die
 	fi
@@ -219,7 +219,7 @@ src_install() {
 	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
+	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
@@ -245,9 +245,9 @@ src_install() {
 	# bug 450406
 	dosym named.cache /var/bind/root.cache
 
-	dosym "${ED}"/var/bind/pri /etc/bind/pri
-	dosym "${ED}"/var/bind/sec /etc/bind/sec
-	dosym "${ED}"/var/bind/dyn /etc/bind/dyn
+	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
diff --git a/net-dns/bind/bind-9.15.5.ebuild b/net-dns/bind/bind-9.15.6.ebuild
index 1d80f2f56f56..03873a3a2128 100644
--- a/net-dns/bind/bind-9.15.5.ebuild
+++ b/net-dns/bind/bind-9.15.6.ebuild
@@ -235,16 +235,16 @@ src_install() {
 		}
 		python_foreach_impl install_python_tools
 
-		python_replicate_script "${ED%/}/usr/sbin/dnssec-checkds"
-		python_replicate_script "${ED%/}/usr/sbin/dnssec-coverage"
+		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 "${ED}"/var/bind/pri /etc/bind/pri
-	dosym "${ED}"/var/bind/sec /etc/bind/sec
-	dosym "${ED}"/var/bind/dyn /etc/bind/dyn
+	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
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index 1b58479d9d3c..a2b8296b5a7f 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -4,5 +4,5 @@ DIST c-ares-1.14.0.tar.gz 1335940 BLAKE2B d62a0b6d5ea4a2926ff8f2f719d267f9a0c97f
 DIST c-ares-1.15.0.tar.gz 1347687 BLAKE2B c4028bb2840af23274b79c73600bfcf73a348c7ab63ae3c215829e0fe2cf149f4ad38a3ec657c3997bad818ced3cacaed0579dd0dd2ef42eaffd074bdc4f22ed SHA512 a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50
 EBUILD c-ares-1.13.0.ebuild 969 BLAKE2B 2f23720e95a9be5863ccec52ca054757a30e99241f3e23b699b7eaea3e25fb225b1e541373e3c17086b68a3486f98eb287201e0df4ac6e9eb124270367395818 SHA512 0bb7a95651abbf457d714dad172a81b3175231bfea17d3316b41d3d945d7f3f6e7f2cc181e0b6b742c28f845b295bc7ecc0f6af0bf55d33610b314c92f3844ff
 EBUILD c-ares-1.14.0.ebuild 982 BLAKE2B f44ea3bae649a7e86efe3dd9e27646fa85c769ff8ccfa526e5639b340adc43161fa3e132e24ef36e2a6d8eb38e19835389e18cec67bae3e365aa9ef9827001e6 SHA512 ae1071964f64ba56385d3ab7b0dd5a59c5181ba664615d8ddf55320db2c47322e87c4ae735e845abb271dd8a171cbc742af8fe621d73ab84d2cc0dd077101ca5
-EBUILD c-ares-1.15.0.ebuild 976 BLAKE2B 427383ac2aea0af63ae692d3c001ee4844add852050d68e878d22956e70f18a47698da60bf71916ef75bf74b5bb92d830ce6862c387ea9df74ea364adec843e4 SHA512 e2b13904a50cf1e73bcd194d63975817874e9895f810eb594e8e5298b0b5e5b7a47c706f781f6e79c49687a8bf3b563f25ea8fb8095fa0d7d95c4098027d681c
+EBUILD c-ares-1.15.0.ebuild 975 BLAKE2B f3b5e8cc99870658ad29579f9cd7c15d645fcb8cd1bbbca5dde4e1aa593b6f33fbac8d5b926e542d111a0085464aaaecfa5b1d33172822ed1a906a028c87a0d3 SHA512 b3343d482dccb379cecead17c000fb9fdd039eefe98f7c5c24d2eca5ff07636f1a6e1f5f095adc5e2af743fa60ba4d952d712dd90f207fcac332753a993aa72c
 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.15.0.ebuild b/net-dns/c-ares/c-ares-1.15.0.ebuild
index 13f28c89b108..ec4943a9d483 100644
--- a/net-dns/c-ares/c-ares-1.15.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.15.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://c-ares.haxx.se/"
 SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 # Subslot = SONAME of libcares.so.2
diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest
index b9ef98965173..288549fe5e18 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -1,11 +1,98 @@
 AUX coredns.confd 39 BLAKE2B 5db4c5b9e992dc7beff0ba80a7cc5337d5ddad132c2467b64b5214d9e4fabfaf1821bb61e727a49d052196f64bf2ece1f40f4c665d8ca53f17a98d2251c0731e SHA512 ade2ce80cf2a1f0bdc5d2de3a80194973289e3d62cbd349cfc7f03fa3bc8c3afc95a7a8dc4a46eda0c401239c226c55acb50b71d5596ed65e9afc56be6dfbb97
-AUX coredns.initd 497 BLAKE2B 3e29d701123c0b039312c9d7306aa81aecbbec3dfa654da382ae9598b3bd6c2b3e224d0faef8549d37606055a49e9d78413e7aff552148bc417cebf3ecd5d960 SHA512 afc2a20c1a2918292931cf27446ac817df1a9e88a4c3ffe7fee50c4424c1c8ae7dd084753a624d382ad2158020fb565ba6151c3eaca2ff4d80c9640e566529a1
+AUX coredns.initd 502 BLAKE2B 1b5e4cf88c31980db0bf0ae487d66a49fd0c083866307e053076f7ce400a0d146c1b98e03a5a9da80adb7a3e90196dba96e6e2f9aa44aa04fbf2f02de0049c09 SHA512 46989757c5a04a2dcd8ce02635f4ba225bb74e17e9c836b1b9417979d6d93d5d609717ce3e0b2a2d014bb334fb08e3c646f1f80f0495657d5a0f1958f0e9ca2d
 AUX coredns.logrotated 81 BLAKE2B 7fe70e32133a9470a60834dee5632151ed215e478a9de697dbca3ee553e5a8719bc941251c6a37723625b7c59f10f5050c79edb94ac8d4127561c12813ba6a27 SHA512 c697c08c3b1153ae224a1eeb3521f9ee594de4852bc6ef78d94dc7f6f680517659a653ab5c13ea03918deb79e6654ef11512ba4c90fe06ea4591fefbab876ece
 DIST coredns-1.3.1.tar.gz 5784513 BLAKE2B 4f04bd338939732fa284901e60b094d555b186c9c701a849aef7416e020aec6f7eccb9ff4654e08cd1daf0b130ad103ba2b3d11ffaf1810029aa049e6e69a6bc SHA512 0992f6fff08aa0a91b0be3c03b54a23f50d5a6dcba63f652c6d65cf925b900826b1b711f7621402ec059152e4fdd01e0d2f8fee4a1e414aa4fd2b12ad6e7a13a
+DIST coredns-1.6.5.tar.gz 508913 BLAKE2B 50f4b56d31d328a29af69f269ab25711be17ca560adc8f4230f9aeb31815370bc2adbfb7c19099c49aba4d360901775419ef96c8430bfd552fe08838ba179e0f SHA512 e759a74eaacf61b933b1faf055c47d0ed2cdcc07ce1f57ad5514667e23b7cd1cccb55e4cd0b478e9ad8a363de67bb8571bca62bfb29e94e0ba98b63265d6b9ac
+DIST github.com-Azure-azure-sdk-for-go-v31.1.0.tar.gz 16817209 BLAKE2B 14c1d566cead849d212c54cc8e00c6d2646d3b7e7b23c9ccce0206c44d14af347eb5d398ced35a030a69179a8042c3253fc9d389270c7b9bdf801b42c286bf66 SHA512 6054e3eb42b1be85ccc5771d9299b8d01e6018fc967313c2d3372a1bffd3c0f5d9b6e200a56d03dafb1a7feb5c622b43e37c0cf3b15286eb200f541e53eecd50
+DIST github.com-Azure-go-autorest-v13.0.0.tar.gz 181063 BLAKE2B cf4663c84429234425f516adb3071b150282485311e9cc36ec676eacb8f248f57567cc86a2aef9a96bd53775862c7a5b849a04b7bfe8d61ecddd0571669cadf3 SHA512 26d2f3230a2f15b4da9a2709c4e3254431ea0efca2fe740799f6693546eb24efa6d4b9160b199de0876da4839e31f4c64358b68cdbc2c5ef964828c4090bf0d4
+DIST github.com-DataDog-datadog-go-v2.2.0.tar.gz 20210 BLAKE2B 3391806de2e32b34e9eb394ccaa9cf6932f3c32007886f30fabff02da53ae7a32695e9796672fcadf469c033049d2519a9f5e8c50f4e32c83517339b370d1d3d SHA512 acb23ce055c9ee5491b4fad6744e95d78cd7aa7817a1eb0f6c944ed99b0183d3964c60519be6d1373cd6435b375d6612849862537289b06090838718d1353dd4
+DIST github.com-DataDog-dd-trace-go-v1.19.0.tar.gz 477784 BLAKE2B 59b97e006b303422f2fb44778f88bd214fd2b90a52f089378dbf39eae3b3a0aa3a2d7467ae81da0ec7c676a1b0f3084ea6658a2e66993bbaafd3ea85581350a5 SHA512 db00ed5bfe2005af553bd99d64a9d2fb6f1c0c4bf3ce0d335013ffa36af995b5a6c488b98d60bad38ae201f0786cf09bde3340a991cc333910bb12aa2bb409c0
+DIST github.com-DataDog-zstd-v1.3.5.tar.gz 445195 BLAKE2B 8e4e041bffb2ce691e3dc80e56d20e804cc3df8bb5cbc0edbe806073d04b88f5346643b790ecddcdafd6b4ac589a1f3b0d54f90692ae75584365124a3159e983 SHA512 c6d3f03770ce58d0c1682482ba807c2f98e9e188cc3f370ddfd56a47bfd3b2d7e58700df26c8e743d4f4fd195d68ce109cd2f9a80d9987d0d0f075e1b1e13b6f
+DIST github.com-Shopify-sarama-v1.21.0.tar.gz 203130 BLAKE2B c835202ec4462ab7c380306968c3d4fcb0a5865176d489aedcc846fa962bacc56b69c29a31dc32e10f306f28e76ea8680e900283e2f48762d156d7d6e985c63b SHA512 f0950f8abbdfdbd507e3b9486400f83f6db27cd4762f1c2919f25d1492706512f6cc25837b3266522dcd3893e140ad99431ee2f796180ba129ee5a1e236cf854
+DIST github.com-apache-thrift-v0.12.0.tar.gz 2960476 BLAKE2B 243b1691c0c3e52c13839d8170f959058c2c7851f53ce619c623e20b4c0c5e842ec877ebca8a18a285918643883f49759685936bcb89154946e214353db72f0d SHA512 b4154bca6ba9562d2d0aa7835aabfccbe1f065cea8b254539659bf357cd0d2f1044037e78c4030fa625853b544c1e36ac6b3a02983bb2b355ce9f6eebcecf8f2
+DIST github.com-aws-aws-sdk-go-v1.25.19.tar.gz 12012083 BLAKE2B 43f051eb174331ff252091156f2003160dc21a5d38d6a1a8cf8a0525f320f87fc519313540f5c778521ada67545a7ad6b0d4f2f48c8822f9c98d4bb378f5b876 SHA512 a245786e4c63cda33758bdb3eceab9720c784879f1ad48ee1c096f164b33b262c5ac2c2d06851599d7119b15bafc2779d75365c5d3e50c0a93312bdaec20b77e
 DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
+DIST github.com-beorn7-perks-v1.0.1.tar.gz 10867 BLAKE2B 373c4dc08cc964430f187a05a8165df751ea7398b2dd271b85fd13dfe5c9a33c2f8df32ca6f6229b332358e60e90de6d4670d54eb1b9808d1eada0ec7a83e0f6 SHA512 686eefcc824c5bde49385d63916299e2797be205523bda66500404c5ad64ed4d1ebe8ee50958237b41a4c481579f5040288b99c9d2ff1082abbf172893f389f1
+DIST github.com-caddyserver-caddy-v1.0.3.tar.gz 381866 BLAKE2B bc2159725d5cc7770b7f1d975c39f9c871bb1c016c318a18b5cb3d7e9ab16656c8c08c2074e1e3e5a6abe688666fed41e1ae7363e4d75333a6a67745a007f389 SHA512 5fa015268ccfcc7439ce688798630b6d2ed30c92e0e828ca524dd373bdacf88be5435807cec3bddca712d2643e14d5bc314d6e488f280cc529d0f85279ff5f40
+DIST github.com-cenkalti-backoff-v2.1.1.tar.gz 8626 BLAKE2B ee9ada52af1c5e305e3d86c5045304aeb2a21f5a8798eb8b652506fe78338cabf8767f68b19dc8bbbe455516b35935521b4addf0788946aa1370adbe990e85ef SHA512 663981b6471f67a21ffbd886a9fd850fe88d64dde16922f17234486db3e0934b46bd8b3c76c571e5840de392fb79ff69464b7c1756ec1967e0102de400319039
+DIST github.com-census-instrumentation-opencensus-go-v0.22.0.tar.gz 162290 BLAKE2B 24c2d2700b21fff2189cff831c7d7aebedce740b087219650cc38257a6a9589d37b209812bc2da476b04a5eeafa79dd2dd185460c908f6479b9154ac5eaff970 SHA512 e8b69381ac64750d259fb21c35aa80364d692ed02a15d7ba6ad29f43101290f0e36fca2feef52c29b1d2d83201495f6b374cf4f9f8208222d1f9609ba861dec3
+DIST github.com-cespare-xxhash-v2.1.0.tar.gz 9198 BLAKE2B 15dca7edb75751fac840795e5735c5e284e212180c0bf40b6bbb3023685b611b3835b8e70e865bef07ed915a5a81def967caa8cfc2a46bcd6edf81eac42d119b SHA512 6a44b29efe90fda8cdb267d1419673a577e231398480add90e7afb7eab92ecb375c947ce68c2221ed94b1fc7032a497703ec8026bff62386f52d22cac89ae2ab
+DIST github.com-coredns-federation-e032b096babe.tar.gz 6740 BLAKE2B 68cb76230406648a341de109a65b95e66f5c7399e3d8b00f03c5c30e51401a5ea4e879078fe8d5649ff9e687574b9f9fae9346ea195ae9afb183cf07d1cacefc SHA512 781a6872b3c603452c3778d88f902298483fbec935e96b14edf6f5ea9bd9d59defb036bc2327759681571e6ee0a373d33c359a56e067c2d2f27db87567a12fae
+DIST github.com-coreos-go-systemd-93d5ec2c7f76.tar.gz 63666 BLAKE2B b8587858b600b5c1c454817e944eccc6c3eece2a7856a2f35f6e76ac2a30cbb42c272953fceb4da75c834f40f81c363c19c446538f6be770fda176ff7063a1e3 SHA512 62981fe28b784f65f9803bafa5454016517987aebaf0951f62471eb0bce1793939267d3cb6b89cd7501edd426b7499988bfbd8ac5061bafed7d695f11aac53f3
+DIST github.com-coreos-pkg-399ea9e2e55f.tar.gz 32448 BLAKE2B dd16434c0613f541a64ffb29c0afaf01413016cb2edf247e32c4766ac7820341cb332593c3c74d7a7953de4972e59ca5fb6b9b71e8a63f452f48ce44af1fb28b SHA512 cae50b921238ce2fff94341be7feea6aba569b5d4c77a70f5d3516266126c248ff089b3f61a197c9478c4f8866a2593b30a791bd546162834ce8d5bddf407dd6
+DIST github.com-davecgh-go-spew-v1.1.1.tar.gz 42152 BLAKE2B 3c6689b3d2861fbc4a70b8ab25b790d132865e4ec34062fd80005fc7d62c1b4cd77df534c27a2d8b1c42c63f8a551fc7d98e3649bf902d176fd965e933faf6be SHA512 b00621d2f11c4cc858e69fda3e6975f910deb375c4f2305a45b230e2d9be73f183db5d2ce4f5e30a14b27e11e79380233ee68fceeef0d855c64fca966e68111e
+DIST github.com-dgrijalva-jwt-go-v3.2.0.tar.gz 36960 BLAKE2B ad0829882581302e00997886c31e763f89205b5aa58226033061d36ed24a1c174170e6a723cf7d7ab4ade2a6c67803455ff9f33e4781a8473d351470af55b156 SHA512 782dd5fb85e56915fca96b894eb4c6f57ea05cc2ed725f3504868a7acf9c75a4ce1acc46d179b3e4ab14100ec7eb05a906fd291bf016897c4490c27126c0fb0f
+DIST github.com-dimchansky-utfbom-v1.1.0.tar.gz 8422 BLAKE2B 33d1fe0753dd508dbaf5e354f6ee4cb58a84ab4245972c1a0ba421f8f6bd576782b946bd2ee0fd8c066ce92b1c1f87e760daabc6f0475f0922afd56def88105d SHA512 9e759ecc6ad62d8ced863b5cbef8a808ff7bf1c28c6304e4c24de66a8cbf60bf480479f7542336fc3daf441db263dd74cfe9d0ef1c61fe7453f258878d8e4fb3
+DIST github.com-dnstap-golang-dnstap-2cf77a2b5e11.tar.gz 16969 BLAKE2B 387869f20a2a8bd7322b69b868a3b9b355085bf0c65bbd8b933ca412135b420962554c24cd0ab4bde186148cdf0dc3d393a145b600041c8666284e945280ceb5 SHA512 780eebe4f62e09cdb88a849308bbfd8b4e966ad3906d026b92edb16b2b644b6a167b22a25d09c8d334afcdfb6d7acc21ce43c2f2f51d4b737774e8620d4b2107
+DIST github.com-eapache-go-resiliency-v1.1.0.tar.gz 9881 BLAKE2B 3861fe2831ec2e3b088c7085d763d4e3474000c1f952a4d3ca5c9c3a132267711e5d98eacfae8eeb0d6bdcf597fb833866e2db0bb2c2a77a127e5192bd469bc5 SHA512 4c7581b5a77bf6a3321c756532ec1f27cdb6622019ad8f79a5260500383c1ad2a8ad72176c068c37bde2d2c2cdfeb66d31fe8d243ebc753cd9a112f43b473e5e
+DIST github.com-eapache-go-xerial-snappy-776d5712da21.tar.gz 7841 BLAKE2B 033e8657f43bfc921558ecb0caa1f68c3c00d04912146437b19d1ed1de5fe57d128fdc85d14280e74dda3c642183b9eb1bb459bd68f9954e874fa5df47552f03 SHA512 17a34fa71d2ab18db970ce945489aa73bb64580423ae1e048cf7635a6f91075d2b7714c835b29999e2639ab68acd6f308ac4473cb3e00006d50f7002954e3985
+DIST github.com-eapache-queue-v1.1.0.tar.gz 3502 BLAKE2B 6a6a36c62b7e4940a94c273b9c1f182c5ecdd8dacf0ffa9534c97dadda33789b250f05f8d9b7d28a08176033d94d400480cc949e9bcd6ef24b6f0c2ebdd6ee65 SHA512 27b319be5b0ed6a30c1aa68660127d837dab3622ecd74ddc0cab8f490a4dd7706785110fed228a4410aaf6bd3d634d1decf73293520bee887726b81f71c7ba8b
+DIST github.com-etcd-io-etcd-a14579fbfb1a.tar.gz 8943383 BLAKE2B 1aff25fb484b5f6fb0c4702e977bbe1a6e598f142619d7d49ded45559a77e3da2a2890ed01180192247006b8d8b941eccd2eda0850e2b5bd493d607c83e75087 SHA512 fab05ad957e2a772f4789860479adc007a923ac3bf4d436cd1f5a63cf3586e6795d00e639abf9c4b1ea218e59702f882ab76c3fa735d5af96e8194d9d73ef962
+DIST github.com-farsightsec-golang-framestream-8a0cb8ba8710.tar.gz 7908 BLAKE2B dc936cd7ccf12e4a6124d66245145d51d914e5c3595df4f0829b357d8481c34347b00acec1380854c0b7c00e477b25a648a6e9a78185f36d80a8e9a43160106f SHA512 87a10115255102e405eee12156e99b1270c086231a31dedf30b1f8a74302db1da182b3028c747070ac05cad456b13e47b2cfd5a0c70d6b543faa99d13309ab98
+DIST github.com-flynn-archive-go-shlex-3f9db97f8568.tar.gz 7682 BLAKE2B e62cf23c7a1abe3228df1589d65f1e4f9b39a26f37f2b01255ee73073461b9d78b96775843437ce6748eb4606b751569034321af8a71af07e502076a4f2aa86b SHA512 7e167dc71a001e85ac72b03921b0749045fe457d181127f6b4b46a3e1e0d4d968bd1535572518d79e0b5119b796e25c3bbce00217419c890f71452a0e80125a6
+DIST github.com-go-acme-lego-v2.5.0.tar.gz 4979106 BLAKE2B 5c25c950492fe629683120b678e1ae70d92162264a5bac39382ae960781ded38206bf9e78d313cb214a676d05645f8415f0495d36a6b99bf450b7e6ef9a4c283 SHA512 173bd25eb6621a3d3131ad1d14574e59fa10dee0414c487f8202850b9e2c93fe07ea8690eb12e7f22ecd4d951a852eede22fc17bcbdd9ed46ce71f923e73d70d
+DIST github.com-go-inf-inf-v0.9.1.tar.gz 13072 BLAKE2B d7418f32eebd7a31be97c25f876e91ca7b44235975f2f69d8f75c0009c097095ee2e847cf6ff8f552749b6efa1bb5098c72f29c624ee92cf573f8fc37d0e3e41 SHA512 8627b4a636005089669ab0c7262e7a5a1549941d049a66abe6b73e61533f45a953012615d9b114c883d68450608d69f8aa5d0b1e9ad67d95ce9916d4ede640a8
+DIST github.com-go-logfmt-logfmt-v0.4.0.tar.gz 12724 BLAKE2B f5bc08f09f533c3a08cb5de141ca3152b739f77140185f6c80712b6c01dddfca8b9def6d6a83e91b73a821d8e8529602d73c03af7785c149558d4ffed98ee5d7 SHA512 2ed3fb6258671aff183690afd2e7851b574a562e768bf0f57863ac5941b4cc75bd7f9baa99f2dd4e5de44530a2bda2c365f1a5ef5a3ffa28499d20fb49f185fb
+DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
+DIST github.com-gogo-protobuf-v1.2.1.tar.gz 2017393 BLAKE2B d55fc545759add352512c2ef81d948c598f71131fdb1649ee526b59989457a324b03144e989a3c651b5614a2eee9e7b1652d3d259733cd3752c97fc2f6720705 SHA512 7cb48dc85e76cf6b116015441e29e86a25514667b409c0a1d335ce1c844a080fc9b37f48911959531aac8ece009b6d8401b1fb7bc463fc8e6fb5e133c9846e64
+DIST github.com-golang-crypto-34f69633bfdc.tar.gz 1708027 BLAKE2B 7b52e1923b3d8b5c1bd5f9d1524bc800249473bac8e74ea7a6a10b4898a60acd152e1cc2f2f22f57dca6d1e56bff52a3b7abc4c639a319c2fa66d36cf88f347e SHA512 01e113a4c5fa6c9c1fc376db2500a226fb1b716b69f952ae83209d1a35918268f984a6c72cb0d954705de77a87b74afe97c665869a2808dad22b5edcd621da8b
+DIST github.com-golang-net-d98b1b443823.tar.gz 1101360 BLAKE2B 98ecd03b566e7eb28ef03bae8c62d998520b5b429890e2c5342857167ad073a9d996d32eff46354755962d2712baed40a99ac47e2ecacc331d98452ac7d83e00 SHA512 8f9fdc48423148df4a7e8b4e35d3f0e9ba83363e29b8dbc3b19b3a50945e66cc39b66da4fb8ade092231cc4501393c466b60c9aed5dc46c77225bf843a982b2d
+DIST github.com-golang-oauth2-0f29369cfe45.tar.gz 45476 BLAKE2B 42a97cfb38a2633d99e5995b75f055a6ae5bc3f34b3a501fd4b016c129a0e85fdf1412f5f8e5614ccaf19b1abf018e3b5da7339c9c796ed9d2bb40c25ee477fb SHA512 f7b55b531c924bcdae71beeae0191b0ba002a7551012e8a6e1c088fc74dc4c985353af362138fa9276eb5d965f25b45b3c87c8e1a756d8c0e89893816b825661
+DIST github.com-golang-protobuf-v1.3.2.tar.gz 312285 BLAKE2B 381ae3c4bad3d3b3d489a3b66752e9e2405d17d9ed2c55aa1ec06ce6c18171b1c7625f6cc6e28490551a6410835f6e774a408de39f6e9ea9b3cddaf46e3b859a SHA512 ef9190f7773b18005760eb755a1dee25eff38c188687033362635e2431cf2c7372a59a3fec91acd6e4f63aa31d08391f7521a8dafef7895268b6a1a78735dd8a
+DIST github.com-golang-snappy-2e65f85255db.tar.gz 62611 BLAKE2B 70e476136c4ab621c38e1335a61673fba0fa085dbfadef480b75d06b1d6759abda7db2566938a9af1112302217af87f015fa9be2c28c1e9a80288158ac28cf18 SHA512 3f0be750c0e40266a4c621c5bbcf4fccf574350a6d1bef00ed9c64492767ef77073a17401115c5dee30e61570cc50ff433c17a3fa9c0bec7b3d2a7b9db4483f0
+DIST github.com-golang-sys-b09406accb47.tar.gz 1499131 BLAKE2B 86058e9899923af031ede2eee74915b74b496ea6b4937828264ec5371b4b0b01957c3d7af69de57c8b3bf78eaf08ceca4564872f40f49a55c0a4e228096bf700 SHA512 02b2aee839e605274999bc1839bdb8f2b6fdb643f7fa4dda1f8d047c54409dfb23819c938041ce964aa360b15954ca787f10002d2fea2b4ae4973f7638bf1268
+DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
+DIST github.com-golang-time-9d24e82272b4.tar.gz 9318 BLAKE2B f2d50340655d21b1bcded6cb76ae16026c1d43a40a45a45dcfdda8171722c64bde3fcdddde9eca4e1f9ceb994a58750687ebd439464f962652cfb004329b6310 SHA512 d4f6336675a491f5de855c33a506baa99c33c02f59fa9c5284e29ab4638eb55ff5f7d24dd5a1c480211f41cbd3bffa6366594828c333f5f039a7f3009515beb6
+DIST github.com-golang-xerrors-a985d3407aa7.tar.gz 12271 BLAKE2B cdcaf0bbf67399c9176786118a622fc0912036b9b0611922dd3d32ace2cac65ac288136ef228ff526e626d36c16e6f8442ffbb5df0c84fd713a669c326fa350c SHA512 719b3a3e432a928f641e15b8553d3e2c2015b1c68c633e9f13f1d57cee634544bb857518fcd75124e41a448b4c219b80dd0c1823329eb4edfc715994d40331d5
+DIST github.com-google-go-cmp-v0.3.0.tar.gz 76127 BLAKE2B 8f9f20d328be91d5a2040fd0a27eaa98fcc533e0f600a8ecf9c21fbd023fe5428dc94055203fec6e4940e0ef7ef378ad8a0480ebc82b40e04beba1cdfbc86b04 SHA512 74c39cdf2b73cc9219082a20083ef2a104e77c539b34d697ad36d5e0a203fb77532fb5a9bac365c1d8957237a4d165dcb5ab31d32c96014e3090535f812ee1de
+DIST github.com-google-go-genproto-710ae3a149df.tar.gz 5232516 BLAKE2B 8b8e6229444b5ad0fed29b8c13ea9ea58c065c4c6c1c66f8f604f57610359b4b0a23808e618c250821837369091baa83c1d164b449d8c75d45473a74952ac7d6 SHA512 59e58b0e27e1f10c2215fe57d1ccf5c685cd15fdfae15d6c68b3bb45448338a9e5f8ba4a8d1cac1389438a14aa1ad0042918466651d8abfbae208a738e82fa9e
+DIST github.com-google-gofuzz-v1.0.0.tar.gz 13201 BLAKE2B 3884b6e9a6f910986f6ff5705b505e9107200a034d0c99de426af38938a71adb3ed443bf45da70fe68133c528db69aacebf4be74fe47d5f8bbff0bb88a4d8bd3 SHA512 826cd0d22d8cfa724e4b16e052fe732f52c81ded6168b22eed1839fed2b12d020b98ff3518f8620bba3659cb404fae342875c16386f4ecdf48286e5b99b46a95
+DIST github.com-google-uuid-v1.1.1.tar.gz 13543 BLAKE2B 554d0cd47b38f272b4b6da0e7f326336c43bc2730ff595640c1ecbef2087fbfc063b21e6477003033ca2486c68fb91610f9e294a60f69fc72c60b1bc553eb778 SHA512 49d72c190422c1c7bd201f288a8bc644641ef61538b21d91e79d58d096f672bd49359d22be856d450f657848ff11b110ef325030565720f7bbc3e9d58b003f0b
+DIST github.com-googleapis-gax-go-v2.0.5.tar.gz 15328 BLAKE2B 347d2ba9ffc3f752baeb6500a11a598c4d195141002ca725f2a9b0fbd29a5c1ab1e5d578c8d6512300874ff9899ee28c18a16593a09d8deca820eb76b7661e62 SHA512 b164b4d18cb4b9b8c88d4260933b62abd6b211b2461c158b3569815cfa61aa04f481df7545e616b6da3e71204127e3955f39e56bdf3fa7db2672781b9ac3bbd7
+DIST github.com-googleapis-gnostic-v0.2.0.tar.gz 442804 BLAKE2B a61bc91bad444adb0f59d779a081446bd5fdca6204fa971ccd14fee33f7c7f3169dd14fe25d6c41f7419c8c3c7f4f75965f0b67ab11a23e55192823db24aa016 SHA512 9f00736b821728fdc9fc824f0735696ff67defa1cdddcae68da6f2dc6ea1317b6e3390068f3b255a3eef6276fccc44bff7a658b9a0f92527d0bf08f1dfa310f7
+DIST github.com-googleapis-google-api-go-client-v0.13.0.tar.gz 12592458 BLAKE2B 24c9c33c3065367b26919979239bb0e087d4f90016c682f55f93e6b214d16939e4f30b972006401046ba3a771377c8cee999e58e63e96dfa13f12712c9efb92d SHA512 9a943d36ab7243d38ca8d71d12ccc25926d41c16b20f15e68897522d21f1881b1ae91d5a0a7a498840066d11311b78da40560a9b59b2f595d776586287747e5d
+DIST github.com-googleapis-google-cloud-go-v0.41.0.tar.gz 2102511 BLAKE2B 141c8cd353dea010bc3f56966e81a444163a08c886f5d7c887f51c38a547bf1ab3929bf0a9422ba57a9d1fe3a55b60389c63f77d308e7929350a88d290dc061b SHA512 216560e5a1367beee9e3e7d0f49a667a4629c020c8c546ebd3b27d0a4afb20ef79ef57c7fdf580370c3a4666ecf0a19442f6d07069b30dc970f0eb08b57091a3
+DIST github.com-gophercloud-gophercloud-fe1ba5ce12dd.tar.gz 837561 BLAKE2B 7b6d14583f48fbb03a88e00c42ae24523f6fb81338975ce563f6f1921cabdecf9f721e236bb697c9d6ee394c8c4b714d2e323d0f54a8752a8af3211cbafb9c1c SHA512 f590813d6f61922803c073af3879626d090c6ebd4c7eb5f5c819586585e116356a9134b58685b686b3c50a0099fbad0364c726d0009deda1edc342610060f908
+DIST github.com-grpc-ecosystem-grpc-opentracing-8e809c8a8645.tar.gz 48116 BLAKE2B 0c6ee7ef0caeab448e6f15a7c829453adb8ba4932cf9dddfa4ee8f006b454f0176bf8e16513b1380b4aed0b65456471161772da5df09b23bc2d65deb53c98e0f SHA512 7834e36a183b49d553d881c6b26c349e7a1d59a656863699441c612cc6d2706dc2dd5b112574c99d568db5630fac94526ab0f6c1e103b514949afa727080704d
+DIST github.com-grpc-grpc-go-v1.24.0.tar.gz 755074 BLAKE2B d3f65458971195db3329807e147811e3ac049d0b6775498efee7a98885dfbfd616bab490f5684341a9968bda6573b89ac008219d76b224a8c25994e97453b36f SHA512 479dbb72eaaec6fd6e48006b9b2ae636b5fd08b1fe5aeeed18c40d794b1ee4d4fe473b3d2cc77fe5ceaa1ddd00221a64d940d8fb228612c9ed3c83c7d1b4c756
+DIST github.com-hashicorp-golang-lru-v0.5.1.tar.gz 12982 BLAKE2B 99a1a79d86162e6c528e1c985a39bbaf0d6adf272c155697efa868f8a0fff3b7c206a45ded6ae4436113d1fab8daab97d4596e3f888056af8a757f9440e1b802 SHA512 c71c35fee10d34f2d075e589e9d4a770e8b48dd5b09946a3fab34337b3680f1fbc20de1cb8ce52aa205c79bbfb1194c44391d7fbe746e7c676969ba8930d827b
+DIST github.com-imdario-mergo-v0.3.7.tar.gz 16668 BLAKE2B df4c5e77da87c22bc0fe9eb8317e8d8855a7914af8a3930da82f56d9e3d49683be4792ec6efdd09ef67fc960c6eccbdff8c31af069f0a1b1d833abb230a19779 SHA512 e26e039dc5ba17898d7ced1379a879ddbd3a9f68a10075893bd57c99599e6039ec813df08178d5dbcca268ebb8fe4de5b5b171d6e1859e29bb18835534c4918d
+DIST github.com-infobloxopen-go-trees-2af4e13f9062.tar.gz 471816 BLAKE2B eea6b9b8cb82e686f4449e5cf4c895bc8c9fd0f6c779a33daca170c91bd56d6abc052e434e4d33c69ef4afadabb160bad0ae46e740094e067cab7aa5f97e0be4 SHA512 953ea8e03dba87a675861ba4953c1d639b3edc318fd8395a14bc289db81b322c24344fb09b82d1af5b0d4911d11a250d84e88377c72b45655054988cff5f2adb
+DIST github.com-jmespath-go-jmespath-c2b33e8439af.tar.gz 48279 BLAKE2B e295c462df41ad1ceafbdae510dab16db1ddf81ab96e050e56dc9a9397131d7013603aec8e649e4688f7c5980f14e4e80f2f837709e26754a523535588f36bad SHA512 0a18d6126625adb9de5f06e94ca2a36761c6304821297bf7eb20b230e82e9fdb08776ba5bc320d02a459d79971050c97387ccffd2d3a44a09e2d6102a8b14439
+DIST github.com-json-iterator-go-v1.1.7.tar.gz 77936 BLAKE2B 3bdebbc4c36c3fa6ea805a120b542768203460618b7a1cd566f7618b11096af9b6f378806074d06c5cdd17527e6ec7871e363ecdd17973a7a05d5c9c956fe98f SHA512 b93e335d828a4be5bbc402b17c24ede3c741e9ef4e62c91d8899c4fd70b567cbe841c175e3ce31a87d589627185ad3dd6c664b9db6170943451a4e66ab75ad02
+DIST github.com-klauspost-cpuid-v1.2.0.tar.gz 278872 BLAKE2B 2ff00148fa9213b1d4728bbdd94737ebe975baabcbf654658c00c1a052d6c6c647e4ecd39d3327c0fae7afe63ffbf214b53621d61cd8df71736d3de9dde6273c SHA512 c9607f25d6c97b9c37ee71e09c7275bb46da5815d4d2cce40e6b1b6d1ad30863e0ca2cc52bd6b70460b5835c263e573123eba21a04f153d7d1e2efe8076af7ac
+DIST github.com-kubernetes-api-7cf5895f2711.tar.gz 1447047 BLAKE2B 964cae79b15cc112d0f9cc91611b5103900d4e74aca63f731790caef2e2fc5f189e0c53d17b41b242565debbf032dabc8801a05bc2d886f522aede196ecc00fe SHA512 7b387cf705e547331d7ec106ea8ff9db1a114e231852795f2f2c0ea18634056ccd3a3dd4b5e18069b94a500a294865cf41d8aa1091f1aef0337e93bca150ec65
+DIST github.com-kubernetes-apimachinery-1799e75a0719.tar.gz 491755 BLAKE2B 21ca16da64c0b657e6dbcc27eb26dad784c7fc6be16669447a55ed2ca264fc72963dd53ac0a3cb165437df4a5018444dea5f051b10d47633c730f4fbbcad4424 SHA512 7d63539d33aa99e1cd32e079ad303ab9223a3a248df146152d1d1df4ce31c8ad8025546dee33b5f87a5be5c3b9080c07e95291cb2d9ece83bebaed736c4e2e45
+DIST github.com-kubernetes-client-go-78d2af792bab.tar.gz 560611 BLAKE2B 2d4f996b26573099b6c1efcb25da61400a4f994c59ed4fcc896ef3064ed5ef9260f5ba2ef3d9fdafa50195edd687c914cc0a874e562c235b3d135d1edb41adc4 SHA512 06c2c6329aa980726e56d52563af7dd4e191e0c1209f0c2e79978877cca13e1f6b022e8da4069916a95f84f81f07c8d6cea9b2d832935b3ed00cf7559bb86894
+DIST github.com-kubernetes-klog-v0.4.0.tar.gz 32424 BLAKE2B 37bd972eae105e50b3eb9d04f20daff75b7aa5a754ae780d1e4194e6c33b355280ca7637025a8c1864f43269ba8e6cb152f2f027085a6509ff3b279595c3c52c SHA512 2871e1d32ff390bab505f4b00e29b000b2014313a1759d76fec34d21326566b4e9f5cbd990aad8b0549627019ac16624b487c817a5bb814204d030fbe5abf347
+DIST github.com-kubernetes-sigs-yaml-v1.1.0.tar.gz 14890 BLAKE2B 0c4e040a25cc75839a748a7e1918167e3ac994195fd80201692946d2ad722ec234ee2c98fa6e5d799d4c74dfa7355418cfb1559f2d25f3a33034e6399f3b9101 SHA512 a6c8094a0ac9bf59e784ced474a402b0ddec48d4bc6280db3eda9b896b6ece8b995fbffec680661ef61c79aae40d578f47446fe3837d6d4903f84e26d875c9e7
+DIST github.com-kubernetes-utils-6999998975a7.tar.gz 43151 BLAKE2B 830a80c6c1ef37653692a0b4f9033c5f2f8234284b413abbb0c189f23f5ef43efc1af6a5eb8f89dbec59750931df246b8bef71e48ad0626334efc8b58c3675f7 SHA512 7eaecce081bb0ddf1f351e808fe2f713f405c91a73162eb606e4038e0137cfc7cd9827f689765b7babd5b7f1f6a834988c5c832b481129229e026a108b9d3983
+DIST github.com-matttproud-golang_protobuf_extensions-v1.0.1.tar.gz 37184 BLAKE2B 9ad023f9b70938f45e6dd44624a7008c1895e488e63124bcd8f8492292ef98479e966ed627a62de32e0fe84a57e60710227e02e4a276aabece81f021af9408a5 SHA512 63d9963502e967e47253f638a19dfbeaa2b63efab74ed790539ceaa9b4a0b695aa107f9e0c920c0da547ac1abe81af22d47f6de547c500deeb005fd8a5e22660
 DIST github.com-mholt-caddy-6f580c6aa36c54c3e1c65b5c609550a8a2508e3e.tar.gz 2918590 BLAKE2B 44e50f98c48687d0d5a2155bb7f093ef7e18b6a0f0a23186ee6be28866b9e7dd79a8e0b5223f8a2250f710b2d290d7274195cdaced8b25eb6c478c7e00a2dc43 SHA512 ebf7dfa6376d9bf9f487919a630148c9870fadc23beed12b70837ed73b72852bb0373407f3e994903bba2365ce1233f79c786465f2bc1c99f64718dd8e14d844
+DIST github.com-mholt-certmagic-6a42ef9fe8c2.tar.gz 66716 BLAKE2B 94ff0ca7ce3a0d057f7c41518afdab4133783d61719f9338644a99ae75583b653e04232f1d0274f8eb9937399908624a29d3b298f5db809225943511f4c90f5e SHA512 0d622b6bb703fe981c1ff25a50d846d84bc96ced41c44ab4f6308defd6e5ea0423b5bb70f6ae8cee9163c4effa02d56092da2bfb04a90f9ce115ed86afc9d3d7
 DIST github.com-miekg-dns-56be65265e34e731425e0269a301774938827c60.tar.gz 3885474 BLAKE2B 7de6f916469ccd9a09fbfbf90feafdd47aab7484542167cbb6ab3ba6051f55e77f9691851adbc0fa285f3463200f09da4c752a643fc79f1fe48e4db48068aca3 SHA512 ae001df0d4b1c692f6c35c02bd67cd1d91b19d8cc1e92cad9f2253e21a0c1b88bd7b6b7b150bb51e551ffee31241d1e6bd736606a1b8305b1c65165c91b0c39d
+DIST github.com-miekg-dns-v1.1.22.tar.gz 178978 BLAKE2B a14b262ffe5e257865653a1daad7999eb7e514f5ecd8b96ecc5ac8d89f66e24fd5fee6bae324d30a48e239104fab766e24863b47ff06e3552ce13586018831bc SHA512 e4b56c6b2b9b38ef419831739a03c899202181657890ee463f1f37165dc6724bc73787ff3d2f2f0cba9d02174cc06cea13fb4fec859ab0ef7afb7d183d280a18
+DIST github.com-mitchellh-go-homedir-v1.1.0.tar.gz 3362 BLAKE2B b3388de9230439ec591042f6a319a80216c0bd7ef055f4bee42bd9020ce8104afb1d10b6105cd2a6f431f066f78af1286537236c054c3bfe15c7ee9b10e1935f SHA512 19f3341d9b343d46a215da3d9aba8e218cd4a5e22a33bb26ee296ab3764e9ab7befa7b65f05bf7e9af8b28be1f078e7da691b68c0a7b1e0c8d853de3ba53d643
+DIST github.com-modern-go-concurrent-bacd9c7ef1dd.tar.gz 7527 BLAKE2B fe191bd398bbd1beac3de9a69b54b04e01436347f0f8933b8eb189dcafaf3d68bb76d6d738f5532e5e9d8e1631ef4d3785a110b69856c4e11d811b80dc31f19c SHA512 bca1593dea7cd004a0191420ccad56cffb91bc5523434f50920ce25c2ee82dc6a756e2eefdcee94ae0bb403fea881e42bf403d6218d6169f30dc9288e72d1c36
+DIST github.com-modern-go-reflect2-v1.0.1.tar.gz 14394 BLAKE2B 6169613fe7fda3f65902f153c0e87b11058ab72af87c669d71140cb19e835bcb2d84cd579544379ad7e77bfa4683b304c930e2bb833bcae035a71447bba1ffd5 SHA512 6c52772e7d164837b02fd6b5b5653b7633914e5e8cadbc071d4cd647cc05b0408c152e4334b30f43f6c5a8700b032e5a8ef35e6506961963bfad918b28f5df22
+DIST github.com-opentracing-contrib-go-observer-a52f23424492.tar.gz 6147 BLAKE2B 65337406aa23a734adb0e6ae1095b8ac25870fcb4a35076dcebbf4e5aecac655dcd7f2b3bd497cac2ef8e1063229527b702df48b8b30e97f776bd500f58f9671 SHA512 054c9c08cab440af3d77c86635b69d3d57e5c9c788486e5eaf3300508d6167a1190618ee55003cb95d943d468e94ac2392a26e9f8665aeac479910979dd31755
+DIST github.com-opentracing-opentracing-go-v1.1.0.tar.gz 33085 BLAKE2B d6cb401a48d216c5188d60344e1d3c839e1704f2f991cd2ab2d4a1e96a269dee9afc1d2438a10c5e8f5ada65f2600ec0e666bbe33ae13d79a73a9fe78aee0b46 SHA512 070925e0220d3ca1432269526485befa6279840cbbfe67c091474fb827ee1743c534654d9ff141d7f34892de1d73fad0b085e24f7e58263919d4ed7c358f1d1d
+DIST github.com-openzipkin-contrib-zipkin-go-opentracing-v0.3.5.tar.gz 63608 BLAKE2B 80c93f02ce53194c1e3008d16971ae41ddea321dd504542cb4b560fa7f0b123478132cbe1c3efed9bf8e3c8494bdc8730cab25614811ecd2ceb24b0df2e2da3c SHA512 f6de30e59149c3a31e27322796ec8a46d0373f93ba5a74a3d02a8dd7765198103d0f0112220a31e168e1464d7d9e75c5999de8c1bb3b41ff5cee5ae410a43ffc
+DIST github.com-philhofer-fwd-v1.0.0.tar.gz 9221 BLAKE2B 4e5b61b86e7ff08f9d5c59d11dfa3f36feb030a804cb6a1bd660286cfd19f9b05861c7ac4036566c114bf533fa8c155d32681afcedcdfa65fce46bd131c23659 SHA512 2ba92ce676611e43a476c0df09adc84463f1398b11d6d8ef7b5c776d7e349e656ae9e50a425ad5134ea093384fc0d915f4e56ff7b826a39200a4cbeed2ff3183
+DIST github.com-pierrec-lz4-v2.0.5.tar.gz 3555216 BLAKE2B ddfd20be1af946c32721115f7c77161ed0bd897480b974e8a796eab1296049d54c580e2dd253217cc6d75fc4f90370d3c493a433823ba8ee4148435de173594e SHA512 139bab790fdd238ac943452af7aac4af74119dec4311f545bd85e349a450485556077dd4633f3d871a5bf0a6ddbf78d3588a2bc07643b06efe87406b52ac8b9a
 DIST github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz 130114 BLAKE2B df1149ebda18c7940ea35fbe09b08be6437a8d4c4f812e3b4b088da8a374718212f0b10a153f3e04a6ffbe0bac109a92e5eca8b95814d221cd6a01d5fcfd48c5 SHA512 27a3cd10256ba6784b2f1318919ad6ce9e2a15c029c18961cd760a7569d5c683097c7407478b2ec96852163a321cda854aba18b0a73e0dda836480d05451bd62
+DIST github.com-prometheus-client_golang-v1.2.1.tar.gz 142465 BLAKE2B 5570e7fff11db4372a6e3dfc465359e32ed51921372f0012768e23f0b49d84e8a10dc60ec09b50c50b51e2e566779ca7e0d034de7b3b62850d57b7890a88de10 SHA512 3ac98e101fb27cdaab5d282ed01eac2d4b8addd902fb40f67a3307f82f0a1c9f6ce15b706bf530d1bb55524bc1f2cc34359eda48676f76d68b26ef48e7c413c4
+DIST github.com-prometheus-client_model-14fe0d1b01d4.tar.gz 57541 BLAKE2B acc5701969d724df3d0c85a3b456b1e397b6c72ba33fb2ff98a04702423e8873c2c3ce2aa68ef7f62ab2a6b4ab881dcfec740217f88f29bd35a7d99df298ec19 SHA512 d9cf5775446d349767573831df1020aec72fb340e6fd3d181ff7e6cad9e972a2b26f1aeb1382d70431470933e1452d718782c8f0a0c4159a81069e9ee5623198
+DIST github.com-prometheus-common-v0.7.0.tar.gz 100520 BLAKE2B b03ae3e46a9cd038b1123df7b230995c65f8002430f341cc94fc39ff59a3050c37cf1caac036c7c13798c1303ed13c67f3628a2f9e5c7a90b92f465b98f6acfd SHA512 47a1fec9bffb720a8fd20287c7628167e649c9fad436c3d6eb290863b30580dc9c9ca417dfae01d8d76c278bb021cb2288ff1d3fa9b598370be6534637fa8337
 DIST github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz 61606 BLAKE2B f67de9c0f3e8d814bed1711f0e0771c13e7d4d8d9dcc67ede3615bb80f8a8f20bbcf9ef65e46dff4a41cc587ef10ad54ffdb6909fbe83f19993422ed5714dd81 SHA512 8cabd997ac2405fe53aa507b6755aff7aa4ae2a1fdb3711abfac5d29bdd369412a17359c3d9c3ebc4945d1b6310c2fadd25201ec7b040b20e2ac5d27b56c564b
+DIST github.com-prometheus-procfs-v0.0.5.tar.gz 112152 BLAKE2B d989dc38ab9e4b056884eedc61411d34ecbaa109d270820ce2bcac1abd40dc1c730071a0cc5bd1fd93191134a26f8475d682a17d517bac69e4ee37a93bf07a28 SHA512 35f29e69c4782f882d8f68ac448c6c7e2aceb93319d44a07c5ffbbcd61051e3ab1355e5191ccbd217146403492d33f8f35eb61e44c73dcbf1700b5cd72aa635b
+DIST github.com-rcrowley-go-metrics-3113b8401b8a.tar.gz 36745 BLAKE2B f5313bdf8173c5ee0f0eb8a63b68d5a9c66c18b3a2164428200a599f12afd67af7ad1148766fdcc7d17601121f357d20afc707f57dab1f5d38a8c96e146d3521 SHA512 956bb23138464aa09045fc4927a5eb6d0ab53f93e89b8ffbbafde6ff0aff1a2ff80b302a98560d9b86ab7f6a845b1dc7bcdbc43ea4cd0e5ed4d712233af32eb9
+DIST github.com-spf13-pflag-v1.0.3.tar.gz 46002 BLAKE2B b7caa90be69c7bb6a36b0da68af309debee6edd6e2596d39e286ebdb10f9f90246736f3af3a35c89ac704e2764d2ac40e76dad09c3147a942200592e3d234916 SHA512 d7121dade4fc06568cfb650a529dda350c60171e97ca405d29b9654a9fd06e453d20f8efc2fd8c51f530cfb0708648b2b2ba06ab40897b262ef2f3baf04d65a7
+DIST github.com-square-go-jose-v2.2.2.tar.gz 297978 BLAKE2B 8edc56ec5d99e92d3d49560fbbac7505568a017cdde32f4c44d362006253daeebaccb03ce1def4532bd774e8063786dc608ecc3be5b45d02be271ac940bddf30 SHA512 613bf1bbf26fa033e245183a7cb21341e26a6da78a700f896741685d3614c59e74c8be0c6297148a5f41d5d3d1f81419568931494a8a5bf48b400a248108cec0
+DIST github.com-tinylib-msgp-v1.1.0.tar.gz 77923 BLAKE2B a6eb18c6d0e02e25bc49ab0422d1918027881b3e9fd0dddc601478f043084ec4c21df4106212b3241c42d3408f13bfbb6779cc8b3030b18a74b9a86f07461aee SHA512 c5aaa364cb8c3cc8dae1e8ad318c6c5324098ced7a2274272294b027d8a4a68fc7520b9bb90c385e3b0812536b22f5f54c5ad1ef7eb85c4c656b1ddb6299facd
+DIST github.com-uber-go-atomic-v1.3.2.tar.gz 8047 BLAKE2B 12f10e6851f4cf9febba4b682dc320548337e58781b50edc3c2c1fb61c90599c85616bb7d4cd85ba0c84378741000cf711d3d87ec742825622a06e5a9a26b687 SHA512 a121be8fa065ff46d5dac7091ef141706fcb3deddcfae49ea3ace88cd2d69e8d25a7b4b799472aff7479841354efe837cc2ed7a0b11e76d5663cc5135d170741
+DIST github.com-uber-go-multierr-v1.1.0.tar.gz 9234 BLAKE2B 0c04e585514b9cf132bd9897b9230be8f074b1531b5d3a78e8a410afb4a98af062df27eafff8ba9ee3f2793ede52b793bf805f55d5bb1fae392d9104df6fcf43 SHA512 c870b53a3d4bb4650d10c67c11b438d0531423eddedc0307254b545f1507ac38f792f3521cc411c4594db93ad1e149d12f2eb557cfad454befd26818297a1efe
+DIST github.com-uber-go-zap-v1.10.0.tar.gz 112084 BLAKE2B 3176aac2ef5c1302af0b48c1bd513449a94520e22b7e81f3cf19cc0b01aa2a2c3760abee71019faebc7b3c8b24566f79ffc5f999d3f14ecb3f2930d17fd5b084 SHA512 13663e325276b80d11138997b7fb0e08ac076fa3aa77564a4dde4a924acc733567965b9e194f7f146086bf3f4cc024550e2f92af7500473dea492e6be7f49e59
 EBUILD coredns-1.3.1.ebuild 1329 BLAKE2B b3b7e499404ddad19ed072bba158a41adfa069034e68fbf4e45c7969c1b25ecb4e8f8bc751fd58ddee596189884a840d421d3fd580fd98c55620d0c22d1a72c8 SHA512 26599e042af39b5fc4aaa8292cb8268c135fc632533c920125f4516bea5cbb2afe60709db138156a8c066df51c5acc5837e8fdced80c4b0f00721218ca65a685
-MISC metadata.xml 252 BLAKE2B 7baf6a36298a65278df45bc6e36a8ad2e613e3442ce78d334635f1ea2550695e12883bf64e5648ce684803ed18014e70898f719db30558367e4012a63ca121ab SHA512 0b024640287c05805bfd170d1c38b1de9c1165ad20548d52a89650b39d6da814a27718d739252c2d2a57b8694ddae913fffc4af7bb78bb2a3985475a88c19d7c
+EBUILD coredns-1.6.5.ebuild 6050 BLAKE2B dbe9799a01bef6cb133ae34d02564106879ef8119c075091f1625ba03698ec9f72fe0cd18f647bfef001f45d555278c717a2c6c8a5dd0af473b11019744b7e5b SHA512 403b4b1d767daed2b09185424ab61f6c0f63d0b9881bd8c8d4636e47e45eb4a5f43eb32cee91868b6f05b4c79cd69836b3a85e28236df15ae98e151b2452a98e
+MISC metadata.xml 916 BLAKE2B 587ce18cf3b5d11b48e52466d5ea8f98e7c7080ca7f3edf4a540202c53edacb948b999b5d13a30dbd255e0d963874a5fb44c493f48271df2497ce97e99c49e48 SHA512 e3f31bc5d7c3899863e3526d81e99e5f4c2643fb6d292c36af4136f1215082268122fba0e37c2bac5a6b36436ad14bf3cc79d8ba0b833cd8dffc52fdc5c9a6bf
diff --git a/net-dns/coredns/coredns-1.6.5.ebuild b/net-dns/coredns/coredns-1.6.5.ebuild
new file mode 100644
index 000000000000..7d8d5f092b63
--- /dev/null
+++ b/net-dns/coredns/coredns-1.6.5.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=(
+    "github.com/coredns/federation e032b096babe" # Apache-2.0
+    "golang.org/x/crypto 34f69633bfdc github.com/golang/crypto" # BSD
+    "golang.org/x/net d98b1b443823 github.com/golang/net" # BSD
+    "golang.org/x/sys b09406accb47 github.com/golang/sys" # BSD
+    "golang.org/x/text v0.3.2 github.com/golang/text" # BSD
+    "golang.org/x/oauth2 0f29369cfe45 github.com/golang/oauth2" # BSD
+    "golang.org/x/xerrors a985d3407aa7 github.com/golang/xerrors" # BSD
+    "golang.org/x/time 9d24e82272b4 github.com/golang/time" # BSD
+    "github.com/golang/protobuf v1.3.2" # BSD
+    "github.com/golang/snappy 2e65f85255db" # BSD
+    "github.com/Azure/azure-sdk-for-go v31.1.0" # Apache-2.0
+    "github.com/Azure/go-autorest v13.0.0" # Apache-2.0
+    "github.com/aws/aws-sdk-go v1.25.19" # Apache-2.0
+    "github.com/caddyserver/caddy v1.0.3" # Apache-2.0
+    "github.com/dgrijalva/jwt-go v3.2.0" # MIT
+    "github.com/dimchansky/utfbom v1.1.0" # Apache-2.0
+    "github.com/dnstap/golang-dnstap 2cf77a2b5e11" # Apache-2.0
+    "github.com/farsightsec/golang-framestream 8a0cb8ba8710" # Apache-2.0
+    "github.com/flynn/go-shlex 3f9db97f8568 github.com/flynn-archive/go-shlex" # Apache-2.0
+    "github.com/grpc-ecosystem/grpc-opentracing 8e809c8a8645" # BSD
+    "github.com/infobloxopen/go-trees 2af4e13f9062" # Apache-2.0
+    "github.com/jmespath/go-jmespath c2b33e8439af" # Apache-2.0
+    "github.com/matttproud/golang_protobuf_extensions v1.0.1" # Apache-2.0
+    "github.com/mholt/certmagic 6a42ef9fe8c2" # Apache-2.0
+    "github.com/go-acme/lego v2.5.0" # MIT
+    "github.com/cenkalti/backoff v2.1.1" # MIT
+    "github.com/klauspost/cpuid v1.2.0" # MIT
+    "github.com/miekg/dns v1.1.22" # BSD
+    "github.com/mitchellh/go-homedir v1.1.0" # MIT
+    "github.com/opentracing/opentracing-go v1.1.0" # Apache-2.0
+    "github.com/openzipkin-contrib/zipkin-go-opentracing v0.3.5" # Apache-2.0
+    "github.com/Shopify/sarama v1.21.0" # MIT
+    "github.com/DataDog/zstd v1.3.5" # BSD
+    "github.com/apache/thrift v0.12.0" # Apache-2.0
+    "github.com/davecgh/go-spew v1.1.1" # ISC
+    "github.com/eapache/go-resiliency v1.1.0" # MIT
+    "github.com/eapache/go-xerial-snappy 776d5712da21" # MIT
+    "github.com/eapache/queue v1.1.0" # MIT
+    "github.com/go-logfmt/logfmt v0.4.0" # MIT
+    "github.com/gogo/protobuf v1.2.1" # BSD
+    "github.com/opentracing-contrib/go-observer a52f23424492" # Apache-2.0
+    "github.com/pierrec/lz4 v2.0.5" # BSD
+    "github.com/beorn7/perks v1.0.1" # MIT
+    "github.com/cespare/xxhash/v2 v2.1.0 github.com/cespare/xxhash" # MIT
+    "github.com/prometheus/client_golang v1.2.1" # Apache-2.0
+    "github.com/prometheus/client_model 14fe0d1b01d4" # Apache-2.0
+    "github.com/prometheus/common v0.7.0" # Apache-2.0
+    "github.com/prometheus/procfs v0.0.5" # Apache-2.0
+    "github.com/rcrowley/go-metrics 3113b8401b8a" # BSD-2
+    "go.etcd.io/etcd a14579fbfb1a github.com/etcd-io/etcd" # Apache-2.0
+    "github.com/coreos/go-systemd 93d5ec2c7f76" # Apache-2.0
+    "github.com/coreos/pkg 399ea9e2e55f" # Apache-2.0
+    "go.uber.org/zap v1.10.0 github.com/uber-go/zap" # MIT
+    "go.uber.org/atomic v1.3.2 github.com/uber-go/atomic" # MIT
+    "go.uber.org/multierr v1.1.0 github.com/uber-go/multierr" # MIT
+    "github.com/google/uuid v1.1.1" # BSD
+    "github.com/google/gofuzz v1.0.0" # Apache-2.0
+    "github.com/google/go-cmp v0.3.0" # BSD
+    "google.golang.org/api v0.13.0 github.com/googleapis/google-api-go-client" # BSD MIT
+    "google.golang.org/grpc v1.24.0 github.com/grpc/grpc-go" # Apache-2.0
+    "google.golang.org/genproto 710ae3a149df github.com/google/go-genproto" # Apache-2.0
+    "github.com/googleapis/gax-go v2.0.5" # BSD
+    "github.com/googleapis/gnostic v0.2.0" # Apache-2.0
+    "cloud.google.com/go v0.41.0 github.com/googleapis/google-cloud-go" # Apache-2.0
+    "go.opencensus.io v0.22.0 github.com/census-instrumentation/opencensus-go" # Apache-2.0
+    "github.com/hashicorp/golang-lru v0.5.1" # MPL-2.0
+    "gopkg.in/DataDog/dd-trace-go.v1 v1.19.0 github.com/DataDog/dd-trace-go" # BSD Apache-2.0
+    "github.com/DataDog/datadog-go v2.2.0" # MIT
+    "github.com/tinylib/msgp v1.1.0" # MIT
+    "github.com/philhofer/fwd v1.0.0" # MIT
+    "gopkg.in/inf.v0 v0.9.1 github.com/go-inf/inf" # BSD
+    "gopkg.in/square/go-jose.v2 v2.2.2 github.com/square/go-jose" # Apache-2.0
+    "gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml" # Apache-2.0
+    "sigs.k8s.io/yaml v1.1.0 github.com/kubernetes-sigs/yaml" # MIT BSD
+    "k8s.io/api 7cf5895f2711 github.com/kubernetes/api" # Apache-2.0
+    "k8s.io/apimachinery 1799e75a0719 github.com/kubernetes/apimachinery" # Apache-2.0
+    "k8s.io/client-go 78d2af792bab github.com/kubernetes/client-go" # Apache-2.0
+    "k8s.io/klog v0.4.0 github.com/kubernetes/klog" # Apache-2.0
+    "k8s.io/utils 6999998975a7 github.com/kubernetes/utils" # Apache-2.0
+    "github.com/gophercloud/gophercloud fe1ba5ce12dd" # Apache-2.0
+    "github.com/imdario/mergo v0.3.7" # BSD
+    "github.com/json-iterator/go v1.1.7" # MIT
+    "github.com/modern-go/concurrent bacd9c7ef1dd" # Apache-2.0
+    "github.com/modern-go/reflect2 v1.0.1" # Apache-2.0
+    "github.com/spf13/pflag v1.0.3" # BSD
+)
+
+EGO_PN="github.com/${PN}/${PN}"
+
+inherit go-module
+
+EGIT_COMMIT="c2fd1b2467249d8b1bb6bbee72ad83b63dd9087f"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A DNS server that chains middleware"
+HOMEPAGE="https://github.com/coredns/coredns"
+
+SRC_URI="${ARCHIVE_URI}
+	$(go-module_vendor_uris)"
+LICENSE="Apache-2.0 MIT BSD ISC MPL-2.0 BSD-2"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	go build -v -ldflags="-X github.com/coredns/coredns/coremain.GitCommit=${EGIT_COMMIT}" || die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README.md
+	doman man/*
+
+	newinitd "${FILESDIR}"/coredns.initd coredns
+	newconfd "${FILESDIR}"/coredns.confd coredns
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/coredns.logrotated coredns
+}
diff --git a/net-dns/coredns/files/coredns.initd b/net-dns/coredns/files/coredns.initd
index bea612d7d5e0..1a14214a541d 100644
--- a/net-dns/coredns/files/coredns.initd
+++ b/net-dns/coredns/files/coredns.initd
@@ -7,9 +7,10 @@ pidfile=${pidfile:-"/run/${SVCNAME}.pid"}
 user=${user:-root}
 group=${group:-root}
 
+supervisor="supervise-daemon"
 command="/usr/bin/coredns"
 command_args="${command_args}"
-command_background="true"
+
 start_stop_daemon_args="--user ${user} --group ${group} \
 	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
 	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
diff --git a/net-dns/coredns/metadata.xml b/net-dns/coredns/metadata.xml
index f5c6245e0ac0..3c4a2efb2b11 100644
--- a/net-dns/coredns/metadata.xml
+++ b/net-dns/coredns/metadata.xml
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>kpp+gentoo@qrator.net</email>
+    <name>Konstantin Ignatov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+     CoreDNS is a DNS server/forwarder, written in Go, that chains plugins.
+     It is fast and flexible. The key word here is flexible:
+     with CoreDNS you are able to do what you want with your DNS data by utilizing plugins.
+     CoreDNS can listen for DNS requests coming in over UDP/TCP (go'old DNS), TLS (RFC 7858),
+     also called DoT, DNS over HTTP/2 - DoH - (RFC 8484) and gRPC (not a standard).
+  </longdescription>
   <upstream>
     <remote-id type="github">coredns/coredns</remote-id>
   </upstream>
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index 35c5f5ad31e1..f7bcc37d3b70 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 1496 BLAKE2B 5343085249362d0052933cb6ff393f36c8338d14dbb7d160e97e3f778decc0e32818527aacf37a08a4bc7809fba520ff16c4a55124dbcf563349aaf151d06315 SHA512 4a1729522210fd41e64c82ea106f7a8b14dc0c0a0c9a9da8bb5feadb4a02da534389880a63f0b784c0956d8e79f2cf56813cb3a4fb8cf1c622f543e064f2e36f
-MISC metadata.xml 1118 BLAKE2B 9c52e1e2a862458405eb841a5ee3a16da8995de56e7bfabbc91d109050c6ed128bade2b9b4a9fe383ae8c123bac8e8a717f837dd2fbe4979c0662f6dfe53d81d SHA512 759c289b0a7b3b6e35fc0848cdfe340e3afc806fe8164e30a7550ef713ef5a74ccfc0a170b9569b10cf4cba55d1a7f9f654ebdba95e2dcccf4f52299c3a901ce
+EBUILD ddclient-3.9.0-r3.ebuild 1492 BLAKE2B 8018482e552be75ba9b1c9eae2d9378e3281dfa1afb96d41db4235651c164363e0f03baa38f7c278b514705fa0144a6dc80f1755845745ea40bd92cc48eb4d18 SHA512 6a0437333db161456acc90120c2e663d16dbb4a0bf68f3d7f6418e2c29b137f826ede08bdb2e5d367dd0b2c3dcc2da2354fdd209121b6b88e0989c9cef64bf35
+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 4ff4befed84f..026d51b44626 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/ddclient/metadata.xml b/net-dns/ddclient/metadata.xml
index a65cccd3f082..deae2b5d7d82 100644
--- a/net-dns/ddclient/metadata.xml
+++ b/net-dns/ddclient/metadata.xml
@@ -6,13 +6,9 @@
 		<name>Aaron W. Swenson</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		DDclient is a perl client used to update dynamic DNS entries
 		for accounts on dynamic DNS network service providers.
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index a23fb4837197..5fd79fd3c6a3 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,21 +1,26 @@
 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.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.19.tar.gz 3339713 BLAKE2B e65b5ed8243aa6cf471700c6edba6e843fdf6482443335ec74201363657b23a7c6e432318e4de508120b6210cecd02666d97bb62a5f2968ce7d4813518eb3997 SHA512 4501a64717c0f2a9313e9328340e466c9ec325d09ef548f6af9a7855ff3497fb741269a17b397a36e2a120519820378e9f98a6a768a3678ea8144ee4690364f6
 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
-EBUILD dnscrypt-proxy-2.0.19.ebuild 3057 BLAKE2B f624c0a34f235f9ed5c7bfd93e4c3f3284387d56ae594e27a51e541bfd56a19ea81fff955df3eb2442bca093c42f56b75759ebd325a972c05023e4e27f2f793e SHA512 6bd9621a4902a3de52b912f4bd3a0653cf42d74538a36328f558ae4d62f734e577ab90041d119fc6587067aa36faf5f52f0447e9c84f84fee873d748180ecdcf
+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-9999.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
 MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.19.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild
index 2f732970bcdd..eac66d7f0824 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.19.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild
@@ -1,39 +1,43 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGO_PN="github.com/jedisct1/${PN}"
 
-inherit fcaps golang-build systemd user
+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 ~x86"
+	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"
+LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
 SLOT="0"
-IUSE="pie test"
+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 )
 
-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
 }
@@ -53,11 +57,14 @@ src_install() {
 	insinto /usr/share/dnscrypt-proxy
 	doins -r "utils/generate-domains-blacklists/."
 
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	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
 }
 
@@ -74,20 +81,6 @@ pkg_postinst() {
 		ewarn
 	fi
 
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v} == 1.* ]] ; then
-			elog "Version 2 is a complete rewrite of ${PN}"
-			elog "please clean up old config/log files"
-			elog
-		fi
-		if [[ ${v} == 2.* ]] ; then
-			elog "As of version 2.0.12 of ${PN} runs as an 'dnscrypt-proxy' user/group"
-			elog "you can remove obsolete 'dnscrypt' accounts from the system"
-			elog
-		fi
-	done
-
 	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"
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild
new file mode 100644
index 000000000000..e3266982fa26
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.34.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps go-module systemd
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+
+LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="pie"
+
+BDEPEND=">=dev-lang/go-1.13"
+
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+src_compile() {
+	pushd "${PN}" >/dev/null || die
+	go build -buildmode="$(usex pie pie default)" || die
+	popd >/dev/null || die
+}
+
+src_install() {
+	pushd "${PN}" >/dev/null || die
+
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins example-{blacklist.txt,whitelist.txt}
+	doins example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	popd >/dev/null || die
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-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
+	go-module_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild
new file mode 100644
index 000000000000..e3266982fa26
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.35.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps go-module systemd
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+
+LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="pie"
+
+BDEPEND=">=dev-lang/go-1.13"
+
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+src_compile() {
+	pushd "${PN}" >/dev/null || die
+	go build -buildmode="$(usex pie pie default)" || die
+	popd >/dev/null || die
+}
+
+src_install() {
+	pushd "${PN}" >/dev/null || die
+
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins example-{blacklist.txt,whitelist.txt}
+	doins example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	popd >/dev/null || die
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-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
+	go-module_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index 215c07210b28..e3266982fa26 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.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-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
 
@@ -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/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
new file mode 100644
index 000000000000..e0fc08ad6a0c
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -0,0 +1,19 @@
+#!/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"
+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 64c6489e05ce..517c4c1b5c6f 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -2,6 +2,6 @@ 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
-EBUILD dnsdist-1.3.3-r1.ebuild 2619 BLAKE2B ea4d0160d868605d48f5ff7b89974ed01dd4fe3308a8fde5c6f0998b274ef9f967b8216910ab67220547ee471758b127b8f4bd6257133c660ad53318a9edc45d SHA512 3d6ad071ee27455d0dbdd1db5459cbcb092e4949b0b88c2ab13d89a0aaf25dedeb09b4f924856b61dbbf09b0dc4b6473680ef38a5f946bcfb6911eb70357ca2b
-EBUILD dnsdist-9999.ebuild 2619 BLAKE2B ea4d0160d868605d48f5ff7b89974ed01dd4fe3308a8fde5c6f0998b274ef9f967b8216910ab67220547ee471758b127b8f4bd6257133c660ad53318a9edc45d SHA512 3d6ad071ee27455d0dbdd1db5459cbcb092e4949b0b88c2ab13d89a0aaf25dedeb09b4f924856b61dbbf09b0dc4b6473680ef38a5f946bcfb6911eb70357ca2b
+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
diff --git a/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
index ed3b96e1ed6a..493fd0f5e4c1 100644
--- a/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="dnscrypt? ( ssl )
 		gnutls? ( ssl )"
 
diff --git a/net-dns/dnsdist/dnsdist-9999.ebuild b/net-dns/dnsdist/dnsdist-9999.ebuild
index ed3b96e1ed6a..493fd0f5e4c1 100644
--- a/net-dns/dnsdist/dnsdist-9999.ebuild
+++ b/net-dns/dnsdist/dnsdist-9999.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="dnscrypt? ( ssl )
 		gnutls? ( ssl )"
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index f97f6aa490cd..2672c20447cd 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -5,9 +5,6 @@ AUX dnsmasq-init-r4 613 BLAKE2B 7ea82e879f8770c3f4b764a9044ef585cc6e91de793c5673
 AUX dnsmasq.confd-r1 170 BLAKE2B 84d5cdb15236c9e1c83fa53d0e401df90e86c6687cc88f9ebba3e2a0987cad2ccf9bb82ac7b1fcd77a81fa6058a3cd3276fb8a8a76e13983628e92be95b39af1 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8
 AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f9002a3426c05632896a5f94a84ada168d672cb38e236cbde72b59201c970e348ba052dff655be1a9a57b4 SHA512 b59b299849487dcdfc18ab30ded0605e2df4876cb778b2d1cd03b740406a5580001028eb33f1ecf0dc910f393c58b7cad7c28801aa4641c3fa376e3dac997abf
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
-DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f
 DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068
-EBUILD dnsmasq-2.79.ebuild 4584 BLAKE2B a4d609bb9cc382649994bd612f9777a2edf8e5917689f0172589db8379bace171573bc302962f671d9baee0f4083606fa4ab0d5ed2f05eec4d775f2879464a91 SHA512 5b60f8d1408096c1d1fce3acf9d5cdb2b3f419eabba5d2b768386794eed80242b101f4ea0a8144627bb23b4535f7d59aa66163d02ce1d248d7c1cc7996450fa3
 EBUILD dnsmasq-2.80-r1.ebuild 4784 BLAKE2B 3d135c899bc09786357906c7f261bf695bcc6dcbf0d920b5624aa2630214c147c359cd9fa731b570c70d9c22c00892e170e27a5f50edcefbfa6b36074427f493 SHA512 403b373d6fb59279e82b4825f53d0a33c6cf5774ac9f9712949c6f72e3511f2db11a3f1525dd5c244e44d9216282f3c4659cd2a8ce9ce7c8d713f13543fd052e
-EBUILD dnsmasq-2.80.ebuild 4674 BLAKE2B 0aff7f9798e87cd317294e613db1d8a1f59054b1fb72293afe70a00d02dea7b71831eb343b29643105a28c09bf28f514d1851bd30417c74d25d010048bb4ff0b SHA512 1120c8092a229f3f5027502f52aa46d556cf52fc32c4fea0151d18e1d85b210c0d30fb0c72d1c496e7936040d1208166bbc1a9cf44f5d5a609b725af954d8ac0
 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.79.ebuild b/net-dns/dnsmasq/dnsmasq-2.79.ebuild
deleted file mode 100644
index c82ca7f79b3c..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.79.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic user systemd
-
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec id idn libidn2 +inotify"
-IUSE+=" ipv6 lua nls script selinux static tftp"
-
-DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
-
-CDEPEND="dbus? ( sys-apps/dbus )
-	idn? (
-		!libidn2? ( net-dns/libidn:0 )
-		libidn2? ( >=net-dns/libidn2-2.0 )
-	)
-	lua? ( dev-lang/lua:* )
-	conntrack? ( net-libs/libnetfilter_conntrack )
-	nls? ( sys-devel/gettext )
-"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	dnssec? (
-		dev-libs/nettle[gmp]
-		static? ( dev-libs/nettle[static-libs(+)] )
-	)
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	dnssec? (
-		!static? (
-			dev-libs/nettle[gmp]
-		)
-	)
-	selinux? ( sec-policy/selinux-dnsmasq )
-"
-
-REQUIRED_USE="dhcp-tools? ( dhcp )
-	lua? ( script )
-	libidn2? ( idn )"
-
-use_have() {
-	local useflag no_only uword
-	if [[ $1 == '-n' ]]; then
-		no_only=1
-		shift
-	fi
-	useflag="${1}"
-	shift
-
-	uword="${1:-${useflag}}"
-	shift
-
-	while [[ ${uword} ]]; do
-		uword="${uword^^}"
-
-		if ! use "${useflag}"; then
-			printf -- " -DNO_%s" "${uword}"
-		elif [[ -z "${no_only}" ]]; then
-			printf -- " -DHAVE_%s" "${uword}"
-		fi
-		uword="${1}"
-		shift
-	done
-}
-
-pkg_pretend() {
-	if use static; then
-		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
-		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored."
-	fi
-}
-
-pkg_setup() {
-	enewgroup dnsmasq
-	enewuser dnsmasq -1 -1 /dev/null dnsmasq
-}
-
-src_prepare() {
-	default
-
-	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
-	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
-}
-
-src_configure() {
-	COPTS="$(use_have -n auth-dns auth)"
-	COPTS+="$(use_have conntrack)"
-	COPTS+="$(use_have dbus)"
-	COPTS+="$(use libidn2 || use_have idn)"
-	COPTS+="$(use_have libidn2)"
-	COPTS+="$(use_have -n inotify)"
-	COPTS+="$(use_have -n dhcp dhcp dhcp6)"
-	COPTS+="$(use_have -n ipv6 ipv6 dhcp6)"
-	COPTS+="$(use_have -n id id)"
-	COPTS+="$(use_have lua luascript)"
-	COPTS+="$(use_have -n script)"
-	COPTS+="$(use_have -n tftp)"
-	COPTS+="$(use_have dnssec)"
-	COPTS+="$(use_have static dnssec_static)"
-}
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		COPTS="${COPTS}" \
-		CONFFILE="/etc/${PN}.conf" \
-		all$(use nls && echo "-i18n")
-
-	use dhcp-tools && emake -C contrib/lease-tools \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		all
-}
-
-src_install() {
-	local lingua puid
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		COPTS="${COPTS}" \
-		DESTDIR="${D}" \
-		install$(use nls && echo "-i18n")
-
-	for lingua in "${DM_LINGUAS[@]}"; do
-		has ${lingua} ${LINGUAS-${lingua}} \
-			|| rm -rf "${D}"/usr/share/locale/${lingua}
-	done
-	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
-
-	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
-	dodoc -r logo
-
-	docinto html/
-	dodoc *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN}
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/dnsmasq.logrotate ${PN}
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	insinto /usr/share/dnsmasq
-	doins trust-anchors.conf
-
-	if use dhcp; then
-		keepdir /var/lib/misc
-		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN}
-	fi
-	if use dbus; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-
-	if use dhcp-tools; then
-		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
-		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
-		if use ipv6; then
-			dosbin contrib/lease-tools/dhcp_release6
-			doman contrib/lease-tools/dhcp_release6.1
-		fi
-	fi
-
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-}
-
-pkg_preinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}"
-}
-
-pkg_postinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.80.ebuild b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
deleted file mode 100644
index fbf773ea07c1..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.80.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic user systemd
-
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
-IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
-
-DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
-
-BDEPEND="app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-COMMON_DEPEND="dbus? ( sys-apps/dbus:= )
-	idn? (
-		!libidn2? ( net-dns/libidn:0= )
-		libidn2? ( >=net-dns/libidn2-2.0:= )
-	)
-	lua? ( dev-lang/lua:* )
-	conntrack? ( net-libs/libnetfilter_conntrack:= )
-	nls? ( sys-devel/gettext )
-"
-
-DEPEND="${COMMON_DEPEND}
-	dnssec? (
-		dev-libs/nettle:=[gmp]
-		static? ( >=dev-libs/nettle-3.4[static-libs(+)] )
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	dnssec? (
-		!static? (
-			>=dev-libs/nettle-3.4:=[gmp]
-		)
-	)
-	selinux? ( sec-policy/selinux-dnsmasq )
-"
-
-REQUIRED_USE="dhcp-tools? ( dhcp )
-	lua? ( script )
-	libidn2? ( idn )"
-
-use_have() {
-	local useflag no_only uword
-	if [[ ${1} == '-n' ]]; then
-		no_only=1
-		shift
-	fi
-	useflag="${1}"
-	shift
-
-	uword="${1:-${useflag}}"
-	shift
-
-	while [[ ${uword} ]]; do
-		uword="${uword^^}"
-
-		if ! use "${useflag}"; then
-			printf -- " -DNO_%s" "${uword}"
-		elif [[ -z "${no_only}" ]]; then
-			printf -- " -DHAVE_%s" "${uword}"
-		fi
-		uword="${1}"
-		shift
-	done
-}
-
-pkg_pretend() {
-	if use static; then
-		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
-		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \
-			"the static USE flag is ignored."
-	fi
-}
-
-pkg_setup() {
-	enewgroup dnsmasq
-	enewuser dnsmasq -1 -1 /dev/null dnsmasq
-}
-
-src_prepare() {
-	default
-
-	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
-	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
-}
-
-src_configure() {
-	COPTS=(
-		"$(use_have -n auth-dns auth)"
-		"$(use_have conntrack)"
-		"$(use_have dbus)"
-		"$(use libidn2 || use_have idn)"
-		"$(use_have libidn2)"
-		"$(use_have -n inotify)"
-		"$(use_have -n dhcp dhcp dhcp6)"
-		"$(use_have -n ipv6 ipv6 dhcp6)"
-		"$(use_have -n id id)"
-		"$(use_have lua luascript)"
-		"$(use_have -n script)"
-		"$(use_have -n tftp)"
-		"$(use_have dnssec)"
-		"$(use_have static dnssec_static)"
-		"$(use_have -n dumpfile)"
-	)
-}
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		COPTS="${COPTS[*]}" \
-		CONFFILE="/etc/${PN}.conf" \
-		all$(use nls && printf -- "-i18n\n")
-
-	use dhcp-tools && emake -C contrib/lease-tools \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		all
-}
-
-src_install() {
-	local lingua puid
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		COPTS="${COPTS[*]}" \
-		DESTDIR="${ED}" \
-		install$(use nls && printf -- "-i18n\n")
-
-	for lingua in "${DM_LINGUAS[@]}"; do
-		has ${lingua} ${LINGUAS-${lingua}} \
-			|| rm -rf "${ED}"/usr/share/locale/${lingua}
-	done
-	[[ -d "${D}"/usr/share/locale/ ]] && \
-		rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/
-
-	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
-	dodoc -r logo
-
-	docinto html/
-	dodoc *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN}
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/dnsmasq.logrotate ${PN}
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	insinto /usr/share/dnsmasq
-	doins trust-anchors.conf
-
-	if use dhcp; then
-		keepdir /var/lib/misc
-		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN}
-	fi
-	if use dbus; then
-		insinto /etc/dbus-1/system.d
-		doins dbus/dnsmasq.conf
-	fi
-
-	if use dhcp-tools; then
-		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
-		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
-		if use ipv6; then
-			dosbin contrib/lease-tools/dhcp_release6
-			doman contrib/lease-tools/dhcp_release6.1
-		fi
-	fi
-
-	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-}
-
-pkg_preinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f /var/lib/misc/dnsmasq.leases ]] && \
-		cp /var/lib/misc/dnsmasq.leases "${T}"
-}
-
-pkg_postinst() {
-	# temporary workaround to (hopefully) prevent leases file from being removed
-	[[ -f "${T}"/dnsmasq.leases ]] && \
-		cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
-}
diff --git a/net-dns/dnssec-root/Manifest b/net-dns/dnssec-root/Manifest
index dba6e825c101..a6a49c13c33e 100644
--- a/net-dns/dnssec-root/Manifest
+++ b/net-dns/dnssec-root/Manifest
@@ -1,5 +1,5 @@
 DIST icannbundle-20181220.pem 13026 BLAKE2B 36f760c69e8e22036d7d927071be25508b6906838f0f468900385d5a3b9ce301c5688f9bdcab471abc5445a14bfbbe34ecb39ca131b01d9e6bbebcc3f1481241 SHA512 6a8b8bec6d104d31253a8acafc1694a095714537a39a4dc53a379ac900c83715f85d75ea7322de430557691ff31ec95ae5104f47b050da3568dd68377c2d5767
 DIST root-anchors-20181220.p7s 4182 BLAKE2B 3d7d881f5ef066a3ff937cf638941f783e9b65834a13ba0efce766b59e8f469826718cea9e8968ca64e216b7ef1f1b4d7b73c3110ff2d65667a28e071cd52859 SHA512 af96358bbb7847fe7c30452f566771480a38a99f192775168ab8672332381958ffa6d2f4870f539e3957b6ecf62e0e3a80b1cffbd579beb3be6941ffba3f6fa9
 DIST root-anchors-20181220.xml 690 BLAKE2B 548fd62073542f527e0b05c09ed1e668baafbb3cf7ca8afd1a32b67dd43d8958cef5005729c1bc11c2b1d0ddea48ca4db69a10b049f2e8a05536b93fff15e911 SHA512 e3adfaa4f8c9751599b8062787f4c3a81d3fa1478411f138f227c0cc972c7262bcf85578d333d36352da3628211b7d8ec4416528814a8937078dc393ce195f32
-EBUILD dnssec-root-20181220.ebuild 2787 BLAKE2B 77d9e4185a3856c451ad692fc6424d897d81f71f5db0c838c01225cea1fa3a8194ba08cfda887341ff8ad7ee775861bb98cfd05040e39a40c248b67c2f1dc9b1 SHA512 6d09cd37d3668eb4289b3e4102b2daffb04fd6e8f24d643faf8c2187a9ed98478966299f4b92cee756962e108b11457dca4ed8dd24cb45f54da8e73887524170
+EBUILD dnssec-root-20181220-r1.ebuild 2787 BLAKE2B 048263642587cdc1a07a722504f94304ecbcdf8c94cb88edc22a3eb79645fa465d72874c5f529bbd32a0b8d69455f5e153f99320bdbdb49abdd778dfe985e743 SHA512 84bb2c034834ec69457767985c7b54af97a118e45423878d5b94cf20c5e5b9b2c0469ccbb7a7070014309118a191179c7019262dc8c48ba6beb0cd67e8849638
 MISC metadata.xml 449 BLAKE2B a4d0bb439c17b336bc45bb943266a63b12eebb8c16346d6bb50f2a5af10dc7470150d75dd77ee3503f28f4886335efedacd3629874f89322b71d4b23520e7857 SHA512 f4006edfc6d2283d607a3ed38afb76843b4eeb891739f706f1398de845d711203176e2e97b8583b109fb3a26dc5c7b79dd05adff6196db56d7f37873f006b895
diff --git a/net-dns/dnssec-root/dnssec-root-20181220.ebuild b/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild
index 3c8605cef524..9c33658f21cd 100644
--- a/net-dns/dnssec-root/dnssec-root-20181220.ebuild
+++ b/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild
@@ -14,8 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos"
 IUSE=""
 
-RDEPEND=""
-DEPEND=">=dev-perl/XML-XPath-1.420.0"
+BDEPEND=">=dev-perl/XML-XPath-1.420.0"
+DEPEND=""
 
 src_unpack() {
 	mkdir "${S}" || die
diff --git a/net-dns/dnssec-validator/Manifest b/net-dns/dnssec-validator/Manifest
index 43551fba85b2..bc14c6c8af8e 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 1432 BLAKE2B 5220ffae8d4e02399992af28947240a965b771e6a0f51ff17656eec7c4719b4ccdb3d2a7038905aa223c6ad8e508b4466151e8e9d38df85d3239e1406c1b1f2f SHA512 5a0c6285c0faf1c4a1542f3e21878c16cccded2caa482ba4e9e6810a762bbf33fa29c45054f9d4634eee79788df6e647d2def69ab1efb33af4251dd1bdfb5363
-MISC metadata.xml 917 BLAKE2B 83e755db86b934e09789aae1c6aa9654ed3c83826e76f1b61c91ba153c213bad833d1efb0d3bf45bcd761cf9896c5fc85247b693d704a41a7fe9d5fae1895067 SHA512 0f3be57605abf3c6cb0e55f11924bf505b3ac61234ea237e4d0e1df6d89c5feb25ea643ff9dec77cbb25a832de976a74329dbd8d04a05d3c108ef022696f848e
+EBUILD dnssec-validator-2.2.3.ebuild 1431 BLAKE2B 0b4a3225279aae093fb60868cfa70829661a894161fbc82c5482c0b4e3fbb10045b310a16146d787d0c0b911834f69ae85798fc072f9b85ea605d638ef9568c7 SHA512 93b5541096fccff4ac4e4a3f014782791ad2446595cce735e29dcc9db24d40afec13dc34789514c1ac40c3e28ed7165b8bdfb09adcfb2fdc934db2e7cfad57c5
+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 04606f66a6fb..8263dbb8ab58 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/dnssec-validator/metadata.xml b/net-dns/dnssec-validator/metadata.xml
index 7702fb5a8958..b5b6e63eb1e4 100644
--- a/net-dns/dnssec-validator/metadata.xml
+++ b/net-dns/dnssec-validator/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		A tool which can display the sequence of queries and their results
 		used to validate a DNS query. The stderr output of this command can
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 8c98cb300b61..536c5e744f28 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -3,6 +3,8 @@ AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc3
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
 DIST knot-2.8.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
 MISC metadata.xml 1677 BLAKE2B 89c3190781cf6b6d6217c84dd45f78ebd86695e9c224c7fa7f5112b246b95b982fb025c6c30b065d59b11f3acdcabda8e92b0da001cf1a7ad3e67ee9b2207d3c SHA512 d1e480d3e5d422b94a952a8fd0a679052d24724cccdda0bf13808f1a6b47b129a1db6ad17a0a42d9a6d315e9cbe64293a1a22077b7affc36862313ff8715d9e1
diff --git a/net-dns/knot/knot-2.9.1.ebuild b/net-dns/knot/knot-2.9.1.ebuild
new file mode 100644
index 000000000000..832d155aba2c
--- /dev/null
+++ b/net-dns/knot/knot-2.9.1.ebuild
@@ -0,0 +1,102 @@
+# 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
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
+
+	default
+
+	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
+
+	newinitd "${FILESDIR}/knot.init" knot
+	if use systemd; then
+		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index facd33794e82..b097344b8aaa 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,10 +1,4 @@
 AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d06251b07ee2fd3ecbac16347d633644f30dc7428e5bdf9747b0a4d51d7541601d3fbd4be6f9f746693f SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501
-AUX libidn-1.33-CVE-2017-14062.patch 2348 BLAKE2B 4f9606d25405d950f23444886e423008d928991b23c5a05a8de794eea18f236aa8f4b53b7945f4340aa3b2f4f7aa9c63d5dadaf3bc0513ee3f5e27ecb9040a7a SHA512 25e6ff17d2d6886fec51db7e9584bbb7aff9b717c23accf7c956611f1bf4c965cc5f51837367c410b7c8c29c58170e94e2e0146e9e2921b3a0c5bc411bcddfbb
-AUX libidn-1.33-parallel-make.patch 3584 BLAKE2B fbd1f372b11bc1da38bdeb3a8c0f01708339e0a7c23da7f22b450985a2b69c31887a5f686430e5014d1a5c116ae7e03b922c0350f3926e5a43e5cbc6cdbbfb83 SHA512 de98b4122c272bcd38a673beab8da56fac5b4c877d4bc0930505979addf4cc4e85fcf065ee9044d1196e83b1d2d5389ee8dceac4ffe7bf623a3f3c7bc7aca4f1
-DIST libidn-1.33-security_backports-01.tar.xz 3420 BLAKE2B c0311d83dee53b83bceab7777e9508ffdc2737e31eec71dc7e67b29ee75cdcef8558db0e89d857ed8c402980fdd7c3419fbb123eba91dddc2358a06684114811 SHA512 e925d20c9258b47821d444c563c75f09f003d1c6b367c934a808242ce4c259ff83e9d67e886cb3e832117df1cd9cae4b18417c48fbf9c77266ab379d3afcd4f4
-DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6
 DIST libidn-1.35.tar.gz 4169217 BLAKE2B 809f9e854a4f2fcd3b2d5f7cdb34e2c68a0f00f5fcffc9002ead2d2d3dcee38022b3288f29716437f65f09e259e35cc98679d9c9d943423190cebb76fcbc94fa SHA512 782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09
-EBUILD libidn-1.33-r2.ebuild 2857 BLAKE2B 1299c64f8cc3e81cf91e666a40216c2a63d627a98839ad75ebb41943c998a217c9f3ebb28ceb96c513235646fda9e80bd1cfd6ca5bdb9cf6406fd46f66dfb259 SHA512 49c76a8e20c33b726658c7905209564d16cb2e3c96ce640ad89a9474a10c0087551e19ed6349fcec335d4a042a6c6ca914e65d59e55029f780a80880893fb8ce
-EBUILD libidn-1.33-r99.ebuild 1572 BLAKE2B 1741c91cc423278d3e2aa848b00f2c9134773d92ee43f28d330fea9e94c0e92fd73f1a346ac40ab8bf054c4811242710c0a9956d973fcdb2bd318c8fbbc11a89 SHA512 83442c82494ac821078dbf1573eb19b570785a5699af571b2b93b7f271c5f3cc4df566f059e96c8c597c7c964d9801f09324ca62b4d37e189d324e94fef87338
 EBUILD libidn-1.35.ebuild 2638 BLAKE2B 0d7a15e990fc0188d42cffbcaf6ecc87489e7b0c5e1ac237f2b24120e3151a43620a84090b34654803a2ba3bdae063166ed9dcd5f06d219c49578477918a7037 SHA512 b258a78bfcfa949fa2b3d5de17c405bf0cd4f111d03108dc84ef18be16b48b1e418c3672d5c5f61dee9138bef8a23ae40719b867dc71c13738bf338e7d3da43d
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch b/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch
deleted file mode 100644
index 5c2e0a91b2e3..000000000000
--- a/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From e9e81b8063b095b02cf104bb992fa9bf9515b9d8 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Fri, 1 Sep 2017 10:04:48 +0200
-Subject: [PATCH] lib/punycode.c (decode_digit): Fix integer overflow
-
-This fix is a backport from libidn2 and addresses
-CVE-2017-14062.
----
- lib/punycode.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/punycode.c b/lib/punycode.c
-index 86819a7..49250a1 100644
---- a/lib/punycode.c
-+++ b/lib/punycode.c
-@@ -88,10 +88,10 @@ enum
- /* point (for use in representing integers) in the range 0 to */
- /* base-1, or base if cp does not represent a value.          */
- 
--static punycode_uint
--decode_digit (punycode_uint cp)
-+static unsigned
-+decode_digit (int cp)
- {
--  return cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
-+  return (unsigned) cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
-     cp - 97 < 26 ? cp - 97 : base;
- }
- 
--- 
-1.9.1
-
-From 6c8a9375641ca283b50f9680c90dcd57f9c44798 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Wed, 4 Oct 2017 15:22:43 +0200
-Subject: [PATCH] lib/punycode.c (decode_digit): Really fix integer overflow
-
-The fix in commit e9e81b8063b095b02cf104bb992fa9bf9515b9d8
-was incomplete.
-
-Reported-by: Christian Weisgerber
----
- lib/punycode.c   | 4 ++--
- tests/tst_idna.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/punycode.c b/lib/punycode.c
-index 49250a1..d475b6d 100644
---- a/lib/punycode.c
-+++ b/lib/punycode.c
-@@ -91,8 +91,8 @@ enum
- static unsigned
- decode_digit (int cp)
- {
--  return (unsigned) cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
--    cp - 97 < 26 ? cp - 97 : base;
-+  return (unsigned) (cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
-+    cp - 97 < 26 ? cp - 97 : base);
- }
- 
- /* encode_digit(d,flag) returns the basic code point whose value      */
-diff --git a/tests/tst_idna.c b/tests/tst_idna.c
-index 4ac046f..7fb58b9 100644
---- a/tests/tst_idna.c
-+++ b/tests/tst_idna.c
-@@ -211,7 +211,7 @@ static const struct idna idna[] = {
-     'x', 'n', '-', '-', 'f', 'o', 0x3067},
-    IDNA_ACE_PREFIX "too long too long too long too long too long too "
-    "long too long too long too long too long ", 0,
--   IDNA_CONTAINS_ACE_PREFIX, IDNA_PUNYCODE_ERROR}
-+   IDNA_CONTAINS_ACE_PREFIX, IDNA_INVALID_LENGTH}
- };
- 
- void
--- 
-1.9.1
-
diff --git a/net-dns/libidn/files/libidn-1.33-parallel-make.patch b/net-dns/libidn/files/libidn-1.33-parallel-make.patch
deleted file mode 100644
index 2d237f3e27b1..000000000000
--- a/net-dns/libidn/files/libidn-1.33-parallel-make.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 4709e64fef29ca8ddd5b0878e3126640bd1480c2 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
-Date: Wed, 4 Oct 2017 15:02:49 +0200
-Subject: [PATCH] * src/Makefile.am: Fix rule for parallel builds
-
----
- src/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6832c20..218d52e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -35,7 +35,8 @@ libidn_cmd_la_SOURCES =  idn.ggo idn_cmd.c idn_cmd.h
- libidn_cmd_la_LIBADD = ../gl/libgnu.la
- libidn_cmd_la_CFLAGS =
- 
--idn_cmd.c idn_cmd.h: idn.ggo Makefile.am
-+# pattern rule (%) needed for parallel make (-j)
-+idn_cmd%c idn_cmd%h: idn.ggo
- 	gengetopt --unamed-opts --no-handle-version --no-handle-help \
- 		--set-package="idn" \
- 		--input $^ --file-name idn_cmd
--- 
-1.9.1
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -1,7 +1,7 @@
--# Makefile.in generated by automake 1.14.1 from Makefile.am.
-+# Makefile.in generated by automake 1.15.1 from Makefile.am.
- # @configure_input@
- 
--# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
- 
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -34,7 +34,17 @@
- 
- 
- VPATH = @srcdir@
--am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-+am__is_gnu_make = { \
-+  if test -z '$(MAKELEVEL)'; then \
-+    false; \
-+  elif test -n '$(MAKE_HOST)'; then \
-+    true; \
-+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-+    true; \
-+  else \
-+    false; \
-+  fi; \
-+}
- am__make_running_with_option = \
-   case $${target_option-} in \
-       ?) ;; \
-@@ -99,8 +109,6 @@
- host_triplet = @host@
- bin_PROGRAMS = idn$(EXEEXT)
- subdir = src
--DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
--	$(top_srcdir)/build-aux/depcomp $(dist_lisp_DATA)
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/lib/gl/m4/ctype.m4 \
- 	$(top_srcdir)/lib/gl/m4/gnulib-comp.m4 \
-@@ -184,6 +192,8 @@
- 	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
-+DIST_COMMON = $(srcdir)/Makefile.am $(dist_lisp_DATA) \
-+	$(am__DIST_COMMON)
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-@@ -294,6 +304,8 @@
-   done | $(am__uniquify_input)`
- ETAGS = etags
- CTAGS = ctags
-+am__DIST_COMMON = $(srcdir)/Makefile.in \
-+	$(top_srcdir)/build-aux/depcomp
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
-@@ -863,6 +875,7 @@
- LT_AGE = @LT_AGE@
- LT_CURRENT = @LT_CURRENT@
- LT_REVISION = @LT_REVISION@
-+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
- MAKEINFO = @MAKEINFO@
- MANIFEST_TOOL = @MANIFEST_TOOL@
- MKDIR_P = @MKDIR_P@
-@@ -1200,7 +1213,6 @@
- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
- 	$(am__cd) $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu src/Makefile
--.PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- 	@case '$?' in \
- 	  *config.status*) \
-@@ -1562,10 +1574,13 @@
- 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- 	uninstall-binPROGRAMS uninstall-dist_lispDATA
- 
-+.PRECIOUS: Makefile
-+
- 
- idn.c: $(BUILT_SOURCES)
- 
--idn_cmd.c idn_cmd.h: idn.ggo Makefile.am
-+# pattern rule (%) needed for parallel make (-j)
-+idn_cmd%c idn_cmd%h: idn.ggo
- 	gengetopt --unamed-opts --no-handle-version --no-handle-help \
- 		--set-package="idn" \
- 		--input $^ --file-name idn_cmd
diff --git a/net-dns/libidn/libidn-1.33-r2.ebuild b/net-dns/libidn/libidn-1.33-r2.ebuild
deleted file mode 100644
index 3d0c3be3b448..000000000000
--- a/net-dns/libidn/libidn-1.33-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal libtool
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation"
-HOMEPAGE="https://www.gnu.org/software/libidn/"
-SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs java mono nls static-libs"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
-COMMON_DEPEND="
-	emacs? ( virtual/emacs )
-	mono? ( >=dev-lang/mono-0.95 )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? (
-		>=sys-devel/gettext-0.17
-	)
-	java? (
-		>=virtual/jdk-1.5
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	nls? (
-		>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
-	)
-	java? (
-		>=virtual/jre-1.5
-	)
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.33-CVE-2017-14062.patch
-	"${FILESDIR}"/${PN}-1.33-parallel-make.patch
-)
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# bundled, with wrong bytecode
-	rm "${S}/java/${P}.jar" || die
-
-	# prevent triggering doc updates after punycode.c patch
-	touch doc/texi/punycode* doc/man/punycode* doc/libidn.info || die
-
-	elibtoolize  # for Solaris shared objects
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} GJDOC=javadoc \
-	econf \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_enable mono csharp mono) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--disable-silent-rules \
-		--disable-valgrind-tests \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-packager-bug-reports="https://bugs.gentoo.org" \
-		--with-packager-version="r${PR}" \
-		--with-packager="Gentoo"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		use emacs && elisp-compile "${S}"/src/*.el
-		use java && use doc && emake -C java/src/main/java javadoc
-	fi
-}
-
-multilib_src_test() {
-	# only run libidn specific tests and not gnulib tests (bug #539356)
-	emake -C tests check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_newjar java/${P}.jar ${PN}.jar
-		rm -r "${ED}"/usr/share/java || die
-		use doc && java-pkg_dojavadoc "${S}"/doc/java
-	fi
-}
-
-multilib_src_install_all() {
-	if use emacs; then
-		# *.el are installed by the build system
-		elisp-install ${PN} "${S}"/src/*.elc
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
-	else
-		rm -r "${ED}/usr/share/emacs" || die
-	fi
-
-	einstalldocs
-
-	if use doc ; then
-		dodoc -r doc/reference/html/
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-dns/libidn/libidn-1.33-r99.ebuild b/net-dns/libidn/libidn-1.33-r99.ebuild
deleted file mode 100644
index d80feb1ef34b..000000000000
--- a/net-dns/libidn/libidn-1.33-r99.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib-minimal libtool
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation"
-HOMEPAGE="https://www.gnu.org/software/libidn/"
-SRC_URI="
-	mirror://gnu/libidn/${P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${P}-security_backports-01.tar.xz
-"
-
-LICENSE="GPL-2 GPL-3 LGPL-3"
-SLOT="1.33"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="!<${CATEGORY}/${PN}-1.35:0"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.33-parallel-make.patch
-)
-
-src_prepare() {
-	default
-
-	eapply "${WORKDIR}"/patches
-
-	# breaks eautoreconf
-	sed '/AM_INIT_AUTOMAKE/s@ -Werror@@' -i configure.ac || die
-	# Breaks build because --disable-gtk-doc* gets ignored
-	sed '/^SUBDIRS/s@ doc@@' -i Makefile.am || die
-	eautoreconf
-	elibtoolize  # for Solaris shared objects
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-java
-		--disable-csharp
-		--disable-nls
-		--disable-static
-		--disable-silent-rules
-		--disable-valgrind-tests
-		--with-packager-bug-reports="https://bugs.gentoo.org"
-		--with-packager-version="r${PR}"
-		--with-packager="Gentoo"
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# only run libidn specific tests and not gnulib tests (bug #539356)
-	emake -C tests check
-}
-
-multilib_src_install() {
-	dolib.so lib/.libs/libidn.so.11*
-}
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index e2cb0633690c..e1fe899e3232 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,9 +1,7 @@
 DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
-DIST libidn2-2.2.0.tar.gz 2110743 BLAKE2B 08a1f89d4b6edd7da4d91c9d21f9944c1ebb4064cb43147ac23fcd79f0a0bbd94e7d2b9a72382784f4aaca211cf9502a5117dfa63ab5fe72383188eeae6f628b SHA512 ccf56056a378d49a28ff67a2a23cd3d32ce51f86a78f84839b98dad709a1d0d03ac8d7c1496f0e4d3536bca00e3d09d34d76a37317b2ce87e3aa66bdf4e877b8
 DIST libidn2-2.3.0.tar.gz 2164993 BLAKE2B 3c103831c39fa3fd0340c9c45f3f683483207ade9cadc8d85b046a698f75bbe5ce6829de69a5cb238404d243b7a39ef44d69ea4ea80c22b813eafbacae615a8b SHA512 a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
 EBUILD libidn2-2.1.1a-r1.ebuild 1307 BLAKE2B 48f3e52c90b5c0c371151b42f3cc6bfab59a24558e8f89e9070b4f82bf3a72370af1c620d343a3178f4047d6e2dd06b9d0d8efcf42bf067e4bfb07cdb90ee241 SHA512 18ffd225a7e9dbd238f85a93a79099dbc53733569ea2e6d4e8b0d3c37d0534686b0b939a02c4e7f913c40cadc9a7ef274c6de2988982b8381dbbf17d2ed9cfe1
-EBUILD libidn2-2.2.0.ebuild 1320 BLAKE2B a86dcfd0262d88816e207842c2dcc64a4561530ee75284540fc670577c06cc0ec595da073f8b4b8630ab52836f1b9959e5f1cac692bb0534bd06640d810b4c77 SHA512 48b1de72a6bddddd7dee26240c06e40ada7e2064125a38c1cd59f7807e2992f8aeac0f4460e15a22e858bf4788ae8a01fbbcd9ec207057e97172e183f4f4f0a5
 EBUILD libidn2-2.3.0.ebuild 1320 BLAKE2B a86dcfd0262d88816e207842c2dcc64a4561530ee75284540fc670577c06cc0ec595da073f8b4b8630ab52836f1b9959e5f1cac692bb0534bd06640d810b4c77 SHA512 48b1de72a6bddddd7dee26240c06e40ada7e2064125a38c1cd59f7807e2992f8aeac0f4460e15a22e858bf4788ae8a01fbbcd9ec207057e97172e183f4f4f0a5
 EBUILD libidn2-99999.ebuild 1416 BLAKE2B e7e8c9d1bdd0f95859ea274c51ffc17d18688e9ad891ad98e1de8e98129da0f479dc843cc4c9c9bd1bf4e2dde11b2127f0d56084dd983c10e29b370d2656bc3d SHA512 5da9807a3553225f5f4b0127365dbbb9d758b3ebd36f3db490d8f87d2b8f61e71fc03925c66e52ad714c5c3f265722faf84e8b6acccfbcd3d2b4715029ef54e5
 MISC metadata.xml 298 BLAKE2B 10b6250e87ec67fff437294893f9ac1a0c923b6c2bf69bc0462698632fbed280538f547a920cba9e8a1175534ad35a5a5d8d0d48f6824c378c46d34f91787712 SHA512 fb859efba7ea8f760f3d3f341496feeda5f8af633f40d4785ea738037017eae89060555447ae29abe69c0acc6f911a323aaa94dfc39f34e6aa9996af506372c0
diff --git a/net-dns/libidn2/libidn2-2.2.0.ebuild b/net-dns/libidn2/libidn2-2.2.0.ebuild
deleted file mode 100644
index 423471d58b6e..000000000000
--- a/net-dns/libidn2/libidn2-2.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal
-
-DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
-SRC_URI="
-	mirror://gnu/libidn/${P}.tar.gz
-"
-
-LICENSE="GPL-2+ LGPL-3+"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/libunistring[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	sys-apps/help2man
-"
-S=${WORKDIR}/${P/a/}
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
-		# reason in the Makefile)
-		sed -i -e '/^TMPDIR = /d' Makefile.in || die
-		export TMPDIR="${T}"
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-doc \
-		--disable-gcc-warnings \
-		--disable-gtk-doc \
-		--disable-silent-rules
-}
-
-multilib_src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index f4a75fe070ae..18b2ab0545ed 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -10,5 +10,5 @@ DIST maradns-2.0.14.tar.bz2 1156272 BLAKE2B 7e96d0769dd1df70316cc1bd79fb7e902c72
 DIST maradns-2.0.16.tar.bz2 1127504 BLAKE2B 142166370efed2d52c0a1e659bf0056f8d13cc5eca3c1d30c0278b81047aa58ce6c6f3f8496e982841b9dcd541ffd2c24467b8062aa5a7ffb1f31ef6cf841a15 SHA512 9959a7b6724aff5561fa9303b3d7c967e298fd63d95ef7e34d80514dde8871c19887c184a6466779f2833c295233dd1d54a7c06928ac58dcbb374281deb13f17
 EBUILD maradns-2.0.09-r2.ebuild 2691 BLAKE2B 4cfc46b00741e7263f2e941fbc2028bd1587d0919061dfe07cecacfbdaa6326da404dfbeba99541c9197e089c5709146d9848b4f85f16b069a56b5c8cec6fdc9 SHA512 481512b5a855aa8751ae8d3699c2b3218cf05e5ec2808df30502ed2e20756e1d50ce8714e8acd09eba09f6b3faa8442345bc9187ca5eae53a0bd178421a92f12
 EBUILD maradns-2.0.14.ebuild 2848 BLAKE2B 62f4a9e99a249fe5084ee5d4b57513d151fd4fbb3a39d382c2d4c40d72c143d9051c8b6bbbfcf8cfa06c4f5929c171429e9eb1b42f038b8d4798becbcab353bd SHA512 bac2001e02da3ab7cd7be5009953d2cdeb73062c2ded1e58b35998001ae6d77b0c51a3166202f291733c635b751fd82cadeed6d3171bdfb1bce5032fd59cfc7b
-EBUILD maradns-2.0.16.ebuild 2815 BLAKE2B 8b8d420f5b3e71a8528527321facb1893cadf92f6b8763f51da6e6494163853bef7fc6356e8d0e716626e33b3420d4d709d616921cbf57fd807168634e4d7158 SHA512 6686f9dab1e29f9f829738d66276855cb81f6f156700a63019ffe99405f2e7a1b16a7a1db21c2af0c709c6858f0f1b04e102b07fdfa0d8e0c73eb77cf06b6b2a
+EBUILD maradns-2.0.16.ebuild 2814 BLAKE2B 5c7baba17ac15bcfe55c3e1600f4139e62564443647b53def559468c6c4a75c1dfad0212ccf7ac0ff73d4f8b7c241351629766d5b10f12c29a2c7a118e073ed6 SHA512 155e04103597ec88ad5f4e47ceb2829cc6d64e5971f7fd9f2a5198f0def046612fdfa29f14b7b45a173909585e84c0d3a6fd2f3854faf489de7f5261fa7eba49
 MISC metadata.xml 597 BLAKE2B c20996c53cdf360a0f72998c674ceb22d97fe0f07c08c0712fadd36572ac157c93fa42a7011d45f22a19e7a7f98dc2abf8159973e155b0d78bb0e5277adc26b6 SHA512 b8f775d1f780e3ecb23dc900d0c464a25a5166196b27f103151bc5100a321188b0186e2b3149d543aa139d58bd5c0ce11d80ca1be0cace16b8d392bbd2a1b762
diff --git a/net-dns/maradns/maradns-2.0.16.ebuild b/net-dns/maradns/maradns-2.0.16.ebuild
index 77bcdaaae0aa..17e475eff849 100644
--- a/net-dns/maradns/maradns-2.0.16.ebuild
+++ b/net-dns/maradns/maradns-2.0.16.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.maradns.org/download/${PV%.*}/${PV}/${P}.tar.bz2"
 # The GPL-2 covers the init script, bug 426018.
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc x86"
+KEYWORDS="amd64 ~mips ~ppc x86"
 IUSE="authonly examples ipv6"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 7455a5159e54..4d6edca9944a 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -3,5 +3,9 @@ AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1d
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
 DIST nsd-4.2.2.tar.gz 1149182 BLAKE2B 1cbac527063f7d14da589bd5060117da10fdd6a9e34b04eb763dbb94fe6c9cf09dc351985de3d099aea3377a4c945622871566c06e7f78aede885aa0c2bc5937 SHA512 43e2ee980a11ed0ad521cc9d8be1e2d29fa8ab552bdda043ffa7e5bc71cf07ad49319629f71e93dcf1dabd315f93bcfb9fd8b5847f27b125cf151fb4f63779b2
+DIST nsd-4.2.3.tar.gz 1148054 BLAKE2B 1e184a557b973af24620338c2f4c94d27ecbd544dd40ee11c7905dc8304f6a1f7ba6d3e8ec49057ef88243d8afb9c005adba89e464ebecdd8b2ab2e5a751c302 SHA512 08349375caf96d870a7ba6e8de6342794f4bba356ef75d46f3c3f50462d356317f3e82a252febda21e2fbfe36bf7ad0c53f40079779faf204a4aaebd41fdc965
+DIST nsd-4.2.4.tar.gz 1148826 BLAKE2B e2508c225d0bebeb9134c6eb3f00dfaf00d2de1a545cf9719b3bf04de8cf4a173ed744ebe5ff50a7062f5fb3135f4e476b9111736442fa358eb6ce20faac8406 SHA512 5d4f546a2a4484b182c65d3337d44596e935bca074c0eda2947b9d128a56db08a00240c6ec9ce22bc9a436e009c00c3283c4a5cbd1163ca4a429eaa92ec54208
 EBUILD nsd-4.2.2.ebuild 2957 BLAKE2B 3ba1eccf0601e919735588afbbf5f1bec28ac47eacaccc659f2ca0bbd7e8da6f9a1ba7f2e032470bf12269cab8cd19647513d22203f447ea78519a8ba3e763ab SHA512 dfc60ec11c179d9e8fec1fcf073c3d405b5ebfdeff316af202370f50690f2a592d5c7f2e5c42e559e0e83979cd2c8931e45156064edd499b20b1fb603ef26a1d
+EBUILD nsd-4.2.3.ebuild 2959 BLAKE2B c5f5d8d3080ddf40fba98d24c80e2440af5b83364b84a178ee646507504ffd1036135e10b9df71bdfc20c6da64989a497bc91320d14f2f5428a410661beba280 SHA512 7b1ae3ff916fca6cde66b4ada3647b0be59a23c60340606094eb8e40c0433699d96ef0ef1f6e8523084fb9b8b92201a0ee6e06caa1a2c58212e5517557c7dafd
+EBUILD nsd-4.2.4.ebuild 3015 BLAKE2B 141d4a5efd4e0db7fdf2555ac2418e4bbb366fd48b5b8204f44dbc710189a0444af166496dc80beb80f90bd40245a1ec8ffdacb23e9ec837a2238251c814e3fc SHA512 1df43fe80e6a3ff8be8a9577f00bca55ea8d6dde067357cadbf93b5bacf30e30b95866b903b725109e822258def0cebb6abefd1ca6668c8216455c69ea55c4cb
 MISC metadata.xml 1082 BLAKE2B c44a5b7b9cb5ad52ebc55dd52a584cd8b0700977a19d541df1b415164250e390941ef35a0e8633a975e6cbae402719d8c5fe7d452dde5623223b01a7ec4320ac SHA512 a66e71346c6742c77ce38ca73f600dde471f3256928bab79f2015cb88c2f3237a4d69f7b9127ea90c58f584b60b8b676416b0704761ee1455479644fd2cd5a8d
diff --git a/net-dns/nsd/nsd-4.2.3.ebuild b/net-dns/nsd/nsd-4.2.3.ebuild
new file mode 100644
index 000000000000..0eba80ae8a8a
--- /dev/null
+++ b/net-dns/nsd/nsd-4.2.3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An authoritative only, high performance, open source name server"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	acct-group/nsd
+	acct-user/nsd
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
+	libevent? ( dev-libs/libevent )
+	munin? ( net-analyzer/munin )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	systemd? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+	# Fix the paths in the munin plugin to match our install
+	"${FILESDIR}"/nsd_munin_.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-largefile
+		--enable-pie
+		--enable-relro-now
+		--enable-tcp-fastopen
+		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
+		--with-logfile="${EPREFIX}"/var/log/nsd.log
+		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
+		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
+		--with-xfrdir="${EPREFIX}"/var/db/nsd
+		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
+		--with-zonesdir="${EPREFIX}"/var/lib/nsd
+		$(use_enable bind8-stats)
+		$(use_enable bind8-stats zone-stats)
+		$(use_enable dnstap)
+		$(use_enable ipv6)
+		$(use_enable minimal-responses)
+		$(use_enable mmap)
+		$(use_enable nsec3)
+		$(use_enable ratelimit)
+		$(use_enable root-server)
+		$(use_enable runtime-checks checking)
+		$(use_enable systemd)
+		$(use_with libevent)
+		$(use_with ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
+
+	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
+
+	# install munin plugin and config
+	if use munin ; then
+		exeinto /usr/libexec/munin/plugins
+		doexe contrib/nsd_munin_
+		insinto /etc/munin/plugin-conf.d
+		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
+	fi
+
+	systemd_dounit "${FILESDIR}"/nsd.service
+
+	# remove the /run directory that usually resides on tmpfs and is
+	# being taken care of by the nsd init script anyway (checkpath)
+	rm -r "${ED}"/run || die "Failed to remove /run"
+
+	keepdir /var/db/${PN}
+}
+
+pkg_postinst() {
+	# database directory, writable by nsd for database updates and zone transfers
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
+
+	# zones directory, writable by nsd for zone file updates (nsd-control write)
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
+}
diff --git a/net-dns/nsd/nsd-4.2.4.ebuild b/net-dns/nsd/nsd-4.2.4.ebuild
new file mode 100644
index 000000000000..ec29bccb6144
--- /dev/null
+++ b/net-dns/nsd/nsd-4.2.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An authoritative only, high performance, open source name server"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	acct-group/nsd
+	acct-user/nsd
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
+	libevent? ( dev-libs/libevent )
+	munin? ( net-analyzer/munin )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	systemd? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+	# Fix the paths in the munin plugin to match our install
+	"${FILESDIR}"/nsd_munin_.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-largefile
+		--enable-pie
+		--enable-relro-now
+		--enable-tcp-fastopen
+		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
+		--with-logfile="${EPREFIX}"/var/log/nsd.log
+		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
+		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
+		--with-xfrdir="${EPREFIX}"/var/db/nsd
+		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
+		--with-zonesdir="${EPREFIX}"/var/lib/nsd
+		$(use_enable bind8-stats)
+		$(use_enable bind8-stats zone-stats)
+		$(use_enable dnstap)
+		$(use_enable ipv6)
+		$(use_enable minimal-responses)
+		$(use_enable mmap)
+		$(use_enable nsec3)
+		$(use_enable ratelimit)
+		$(use_enable root-server)
+		$(use_enable runtime-checks checking)
+		$(use_enable systemd)
+		$(use_with libevent)
+		$(use_with ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
+
+	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
+
+	# install munin plugin and config
+	if use munin ; then
+		exeinto /usr/libexec/munin/plugins
+		doexe contrib/nsd_munin_
+		insinto /etc/munin/plugin-conf.d
+		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
+	fi
+
+	systemd_dounit "${FILESDIR}"/nsd.service
+
+	# remove the /run directory that usually resides on tmpfs and is
+	# being taken care of by the nsd init script anyway (checkpath)
+	rm -r "${ED}"/run || die "Failed to remove /run"
+
+	keepdir /var/db/${PN}
+}
+
+pkg_postinst() {
+	# database directory, writable by nsd for database updates and zone transfers
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
+
+	# zones directory, writable by nsd for zone file updates (nsd-control write)
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
+}
diff --git a/net-dns/odsclient/Manifest b/net-dns/odsclient/Manifest
index e4d83ca40600..7af6252430e2 100644
--- a/net-dns/odsclient/Manifest
+++ b/net-dns/odsclient/Manifest
@@ -1,4 +1,4 @@
 AUX 1.03-gentoo.patch 461 BLAKE2B c022e88c4dcd4b10c6207cd25555f1bef861589ca965251b219bd2cfbfe650460305323f3058d0ed56ca8ee05ca6ccb6b0972678e2b1b6a662bb8110a1cba07b SHA512 6a567daef79997488ac328f31b3f1cb8bd299399a6bf831bd19591f2ebd9d94d94a5949baefbfa98031aa6eadf34cfa6192b1e0bcd3282bad1acb05a4e8b9e03
 DIST odsclient-1.03.tar.gz 4263 BLAKE2B b4d04133b9ab837cd3df06cf331aeb5b0987d370d27e824776374135e0340e42449fa24027eaaed2a4921b82abc9a61e4f750fdf1aba1a33b91780a4662704dd SHA512 12cc8b734314ec23432fc7ca980e099eee04be84134740460b7ab3edcff1abfb116794504653ef0af72b27fdc2b074633b96196e1894092152e1bd0e8300ab11
-EBUILD odsclient-1.03-r1.ebuild 630 BLAKE2B 6e000d80862a85e1dde174f468cdd7f8486e6ef15bb45fa5fc70d5bcef7d16a39898c2497027f716087319511c56cae6175481c4f32348df9a2f7ced0e3912a3 SHA512 1ec71dc18374d4595141f22981bb849a8d3e1f568b68e1cf84a46b1a443133d944ce3b30a15d8e7235eb74d75e318e2f18b5bbb17a53f4bf2edf6b396724b84f
+EBUILD odsclient-1.03-r1.ebuild 619 BLAKE2B a792010f19a5c632b28dc916f148679f72c5f896e221c8eb7f182d836633830137aceabe8810075264c1ce35bc2cc761d93d41c68d7aa89e16f8cb152941c197 SHA512 05e441ffd445d5da97ccbb1d207181e5752e6ef506f9eae422ad6892d989e19acb5e95cb614b3c4c99adef5eeab0f9673356de781aa7e2d2c79207054e3fcc28
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/odsclient/odsclient-1.03-r1.ebuild b/net-dns/odsclient/odsclient-1.03-r1.ebuild
index 4f928f134a1e..7222b961927d 100644
--- a/net-dns/odsclient/odsclient-1.03-r1.ebuild
+++ b/net-dns/odsclient/odsclient-1.03-r1.ebuild
@@ -25,8 +25,7 @@ src_compile() {
 	emake \
 		CC=$(tc-getCC) \
 		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index de64a0aff011..6b55666194a5 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -18,9 +18,9 @@ DIST opendnssec-1.4.12.tar.gz 1036392 BLAKE2B 3bfbcfe91d7da7c2e4b1c5439f7d55e156
 DIST opendnssec-1.4.8.2.tar.gz 1043171 BLAKE2B 20b1fa0d97b776223314937061cd42f4fe0a924e58a159fd0399d23058e2b0fd44d55049947de26c36aade5b5599527fc03f09eeef4e20f8c9beee40dfbcd7fb SHA512 7f2e10b425f60947aca40c61509b07ddc4363105cc882b518ffa816437299d6f881411cb38325f27b3a34c2005953988b39c945362866dd0f1f7c6ef973bfa06
 DIST opendnssec-2.0.1.tar.gz 1101523 BLAKE2B 0446efd04e73e00d204c53164c3c6aaecb9f37014a110ee85d7e7b1728d225aafcf9e6ef31a7dd29cdf2e875e7b653ab6e8178cece65c47a1c5b027facc16130 SHA512 aa12818f92688e087acaff8a6771d2a7da733e04d9e821967d313c7ff880a1056f470b11988eba1e7aad606418c3a4587f654163d74f68e3f61943c74d86d052
 DIST opendnssec-2.0.3.tar.gz 1103355 BLAKE2B b64e729003de86e4139efaad60c9feae9f4e19c16a29fdced55d66f5896c4b7d76c4b8c57a8330d55c0c03e87de1ebe6ec49ef9d1b6e215be963680d2c805579 SHA512 4745a9ac317cc65d6f5b14be640687efd5fde2149541f692fb607a458378d27e903f175023c1aa16a777d17cef9cc68f1a84e7e7cdb233466d26756721b34424
-EBUILD opendnssec-1.3.18-r1.ebuild 5693 BLAKE2B 4dd186eb49ed5d4b293c0a43907d8b43bac3fcd30182f0a07c423a05b9cdc3fc0978cf5241ea06a311f13504f5a2219e2f4c4a155dc32bd824f3d870b7adfdbb SHA512 6322f3c01ce746605249fe7a7e748b3d59017a2cda394f750eb3ce646923335a6659cf47a240bd5c07b179ba3219f8a650a610b898d3ead4d4b68c3f150bcc34
-EBUILD opendnssec-1.4.12-r1.ebuild 5780 BLAKE2B 28b72f5541667b5218f5bb631593855394084405d95dfcbf16afe36325ab7171708e3eb0111a3c403f747c52d1e44c897436f4775f1b7cdebb0578d09ca4ac6f SHA512 3e0ac6197e86315794dd604de6adb605845c09f8a00958189f35d3432b748de2e2d8589c217035c4dd167971452026d56a6b2ca38db0af8d7eb18ad8f888237c
-EBUILD opendnssec-1.4.8.2.ebuild 5830 BLAKE2B 162c6e75f89225d73b455191f65c37ba680eefbeccdc12d21bac984257ff4b5ceb82843c42020b43b4330af2dea4cb70c6a74eb83dc0b00d70f02ae5d91e0fc1 SHA512 d9cb344ca13a2a926f46e4dd041453132cb669d0ae23f4180dda38ca12fa41f6aa6187d7e9cf70ca8e36ec4266cd75569a36d928c9ab65800c68ecc11ec6da80
-EBUILD opendnssec-2.0.1-r1.ebuild 6763 BLAKE2B e4f38470013f4d90ba567d3d5520df89fa15d5d77b6b3f7a9faa224fe1f60e1eef6980f20f83b69688d44d860e94f7f56cf98b8259acc07a1d89d03fd17deaf1 SHA512 9398125ccf2e3bc05ffc8c87e9582374075cb89d079e3e01364134f6529f399fa7556afd1d489f43235a31f6e2c7e13726b6552ab59d757df761680668ad7102
-EBUILD opendnssec-2.0.3-r1.ebuild 6732 BLAKE2B e1cb04da8eab2d36761f775c9af776665771276bb274cd51d0537069e1e3fd67eecf862f5766b8137dfefef31ba114a14c1f1365e0355324be72bb548e1d0a8c SHA512 0dbc6c60279574513b0d1eb60b4583a845b7961e9615eec81a0f09488cdaa40d6532895bada99c016af7eb59fdf3011c61178e2c149410965c86849d9bf49a43
+EBUILD opendnssec-1.3.18-r1.ebuild 5717 BLAKE2B a0367f5c05d1211c7ab393dde80fc3f96c40dacb8ba6494507878eb871fc89541a74f07cd5aec1406ebce7d7e386097ad2bce5ba2fec691e6a087348d033d3ba SHA512 012d731bf038501ee3bbe6efe115fdbdd278bc912128d209c4d777d9b3a56b46e4357a91524d617836e88abe716f1d17b7ed35114ff84585b306343e3aed5075
+EBUILD opendnssec-1.4.12-r1.ebuild 5804 BLAKE2B 24230a7e63a77b1f77f921d85608c85fd924235e2a996dbbd0b24b50eeb22cefeeff3a3f8c15b1d604f77355f5b3fe52e0d3c03fce693f00cfe7b94f9a7535d9 SHA512 b833b447452d048e3ce0b5619fb4969fceb80d2ceb168c5e3cca06bd30b0395edd745de2de558cdcf7beb86ebfce84691db9868f32f3583d706701072e18707a
+EBUILD opendnssec-1.4.8.2.ebuild 5854 BLAKE2B bd33ae903129a4cc06053d00840f848c1cc02c52040ed95b0137671ea9b03067eec5b8dc6edd89ade59c8ddf2f83928edbe62577f83b78511fa0aa2521ee9662 SHA512 a66894f5e6439658027c00298690c855603d1e97b17f3e06e461fde9efcab3b9dc10a285b55c435a85ad17de01202529b01a2ae5fcf052e9e103f86bcd8f2ac2
+EBUILD opendnssec-2.0.1-r1.ebuild 6787 BLAKE2B 203de779bc74c2273598ab37e0faa1a9a9dcc3a7ea00697b3c88180b90db9b9d09891442793ba9401aa1a3f5bf22b02f40a99a29496a5b8aeb2e6aa7149ccab5 SHA512 3a91fe2a31c58225de3ae786fbd3697ee4935e3ebd8949d066c41a14998f577dc9afbae758eb890d94960ba7912ba5ce4d9fefea1702c0687dec30cab1204283
+EBUILD opendnssec-2.0.3-r1.ebuild 6759 BLAKE2B 59e2fbd023d0c57480743fdcdbfdca29e3080bc726f8fd472f4dbae876e6e5738ec0d9b58194177fee23406aac8477dbf5726fa94a9f286f274826cd353e1603 SHA512 e34deebce92b6c3057e36a88cd46efef5141a3903a36df39e052fa64323559d1cf9ea32d85dc209613b7b6c6536c592678ae78310274cbbce08d2a1aaea3ecc7
 MISC metadata.xml 906 BLAKE2B 87ce475aaab1ed562daa0c2102e206f32abc25b9fd77932bd6a33e5f31990864dd0da48e48e7165debc10ae0653f6bed364c12a52df48dd448e29590bf6f7141 SHA512 9cddc6b15c7a959cb885bc639c19e166ee202dd4b45db50c9bbb3b61fe9e84311f023a3d34cfc44e689cf81df092211fa4cb88427fb143c113bdfc1e7897112e
diff --git a/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild b/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
index d4bfd0296b7c..c29c6bf1ac7b 100644
--- a/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="-auditor +curl debug doc eppclient mysql +signer +sqlite test ${PKCS11_IUSE}"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild b/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
index 68d85cf8be58..61d2ca9f1014 100644
--- a/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc +mysql +signer sqlite test ${PKCS11_IUSE}"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild b/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
index c83f258bb104..271869383a54 100644
--- a/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc +mysql +signer sqlite test ${PKCS11_IUSE}"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild b/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
index f4ecf0b3f3eb..4802edd1581e 100644
--- a/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc +mysql readline +signer sqlite test ${PKCS11_IUSE}"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild b/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
index d8769127684e..71ed1ff5e73b 100644
--- a/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc +mysql readline +signer sqlite test ${PKCS11_IUSE}"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 1ce5793ab15d..b14cc1d4c958 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,3 +1,5 @@
 DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51aa6ff5b44fdfe08e96ccc78ae1d84f2115e5d59940e7e1cedf7e4fe7dc36a461839bcef8fc2c5b2e21242e441f36 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e
+DIST openresolv-3.9.2.tar.xz 20200 BLAKE2B 25cb56fd85114c3866207a3bf83d1295eb135f1746f141d8cb8f0fb18cdd96e184ad3fbb47d1f65ce4193b57da61e918ca4306a502eaba650ca438589be9a29b SHA512 2f88ccbb53c6e830eeb7dd53666ee72b9fa30f38324766e1d1734896bc9b7f531e42e234c882b921c79604a3bde2877db2681bab9dd8c590f02779da908d0649
 EBUILD openresolv-3.9.0.ebuild 1054 BLAKE2B 349ec6e7a2466fa6dae20892e1fc1ac11257616acecea52ea81912158523b222d92d8703c41110090da2d8abf290dbc04fa1e1132dc55e25d703fa8a274ac3e0 SHA512 0c684d8ebfcc1c01eb0583fb608aea48fa11ff59457b1c737c27f9d570a3b82d281c1d5180e5a05a8c9210f49729c5fe05c4a78bb3e2a765f62d4462bec85efe
-MISC metadata.xml 309 BLAKE2B 8abae227455bf1e75801e0dcf3b4165beedefc1499e12049e9eb6652302925a11b2b50ea09d417ed523e00103c5f2d7c619669d40bf3c98a7393b939bbb8a05c SHA512 311a9444ac8811bf1ea1a8bb06370b81360c6642921b2932095bd191d8784509bfe46189de8f073a34a831eaf1c8114c3b5bfcf67d0fe042ea2ecd8c1fc7cc0a
+EBUILD openresolv-3.9.2.ebuild 1101 BLAKE2B ca4ad09308d1eec8a71fa50e02fc0c4dcdfd0ea73c7aef1f4a282b440aad0b9191c7befb9554612c8ee21b11c826d99d369e32bb4bc36918b0755b5546fa456f SHA512 8e5ca1fd5a1cef044fc60296288c1426a81ba45dd8045d2afa5e1d33359006072d60e190259de7b40c0b265d9cea8588cb505aac3beedca2615352d4f3c36f58
+MISC metadata.xml 259 BLAKE2B a0bbc917de0867f447b7f02307f4f3ae6d6fc0e7afa06db2f6733a560676a4ad07fcbf433dc93070a6e7815d9d3bf48d651ae7222f53f62620d8cdda049af543 SHA512 79d964de6f58ae4a6f1e815620de06753b9d44ba1740c0330b94b8fe5bbff1f7e1e67f21ac30d80a35bd72e9681631b9f1697d896a4bffa066d364690c572838
diff --git a/net-dns/openresolv/metadata.xml b/net-dns/openresolv/metadata.xml
index 6c713591fd81..e5a933ad81f9 100644
--- a/net-dns/openresolv/metadata.xml
+++ b/net-dns/openresolv/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alonbl@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		A framework for managing DNS information
 	</longdescription>
diff --git a/net-dns/openresolv/openresolv-3.9.2.ebuild b/net-dns/openresolv/openresolv-3.9.2.ebuild
new file mode 100644
index 000000000000..0d725c4c13e1
--- /dev/null
+++ b/net-dns/openresolv/openresolv-3.9.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A framework for managing DNS information"
+HOMEPAGE="https://roy.marples.name/projects/openresolv"
+SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="!net-dns/resolvconf-gentoo
+	!<net-dns/dnsmasq-2.40-r1"
+RDEPEND="selinux? ( sec-policy/selinux-resolvconf )"
+
+src_configure() {
+	local myeconfargs=(
+		--prefix="${EPREFIX}"
+		--rundir="${EPREFIX}"/var/run
+		--libexecdir="${EPREFIX}"/lib/resolvconf
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_config() {
+	if [[ ${ROOT} != / ]]; then
+		eerror "We cannot configure unless \$ROOT=/"
+		return 1
+	fi
+
+	if [[ -n "$(resolvconf -l)" ]]; then
+		einfo "${PN} already has DNS information"
+	else
+		ebegin "Copying /etc/resolv.conf to resolvconf -a dummy"
+		resolvconf -a dummy </etc/resolv.conf
+		eend $? || return $?
+		einfo "The dummy interface will disappear when you next reboot"
+	fi
+}
diff --git a/net-dns/pdns-ldap-backend/Manifest b/net-dns/pdns-ldap-backend/Manifest
index d7ce3aaf7f90..68d7ceff21a5 100644
--- a/net-dns/pdns-ldap-backend/Manifest
+++ b/net-dns/pdns-ldap-backend/Manifest
@@ -1,3 +1,3 @@
 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 246 BLAKE2B 51bdde4e62e7640728e7f70e5bdb7a5020dbe78a8c2ecdf8f3801f0a0a160ae24967a5db07fd4d53ef726c153401424c1361b9498b2ece90f99d7727abe03e48 SHA512 3bf43ee02643fbfa29643230bb65c6ef527f1fb3df69d0d669afb641c26b27a13e5deac1607dc5a88bf96f0300e3806419468df36fd4de8577f4a5c3c24276e4
+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
index 9df272efa6bd..6f49eba8f496 100644
--- a/net-dns/pdns-ldap-backend/metadata.xml
+++ b/net-dns/pdns-ldap-backend/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>dev-zero@gentoo.org</email>
-	<name>Tiziano Müller</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index cfe7d05c32ad..36fa13c89fbf 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,6 +1,10 @@
 AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
 DIST pdns-recursor-4.1.14.tar.bz2 1249908 BLAKE2B 8918cbfa2b8ef91b18b7ef79c94bb2ae5e73f2dd835e810aca6480b7338be19e9d151f6ace6cd42bba6c71123378b95811dfa570d31ce2aa3e141b9e49753c8e SHA512 9b1842df5d32f0f7a7080bedb98d8f9e36c08cbf7427c9ba1bd07bae40ef48ad4a843d6eaff336d1fe9869c209c05f4edf1117b994b6ed5818146445b28b3011
+DIST pdns-recursor-4.1.15.tar.bz2 1252518 BLAKE2B 11eecf1ca69e6855be1cb1a1a6bfefd6b65cf38a6fcfd1e98727fd7813958024b47f974a12fa05cf0a92079a7d14ecb1a6b199a51ba0b4731aa4a1a8b638441a SHA512 d493de78086a88784dbf8b54732faddca7e0dec008cf80a757240f8e1943d230edc4f0ef5a372cb1897be01956bbcfd282a979150901c0df6cc304ccdc6d878d
 DIST pdns-recursor-4.2.0.tar.bz2 1316156 BLAKE2B 3ceb71695b0d5aa2826e28975f45d03910b23f2d7dfbe7388ffd19ea51c37bf6758ea6f90f1772b0c4ed217ef844e112961f51c04dee4db20a05f1e25ae6b71f SHA512 e4be63c1be70f0dfd7aab71f1184d5cc1d15e60e775451a96e8472db6fb3825762ebd6f51b593b167389868bbfde0538612b14a04c03f3f60a7e49f7882e78bf
+DIST pdns-recursor-4.2.1.tar.bz2 1318022 BLAKE2B 19fba9dae26d27f68ceaf70f15f2fb27ec030fa64d5dfdfe7bf482293ed5aac6b8eb6ed47a75c2b88f4d481794695d66f0ce1cbc71d8eedeabd86d8ce8c382ba SHA512 ebd7ff40def4b5c9398dee5ceae0aaf762982be4124773002b3f603b18cab2a6df667524a268e72268032334ae29d32b42294cbae68dcdc154e08b8a38f75dff
 EBUILD pdns-recursor-4.1.14.ebuild 1802 BLAKE2B 2943554881f1873014e5712c2baef1ef4bd9e3f0e7061ab576aac0d23c7ae8657a744d257b015532f6c57c3086ec748e3f1faaa4e12f70f626ad7096e7c81511 SHA512 31141369c4c6229c9dd13309d5b0cce47cac7c0ef6d765ff72eb4515691a9742fc510bc80cbd4c71fbf739829e157d29565df0f8240f84a5a1767e021fb484d7
+EBUILD pdns-recursor-4.1.15.ebuild 1804 BLAKE2B 7cea57f7268aab9d16b526e070f7e8b999788f6d28707376eb4451b86af87b5f57b1ca14758b4e7e9e44833ac8583bd9ae24a7c3d4674ff373f2dbcc4f32cd71 SHA512 96e29573690bd3b44b31e2f80ebfd049f21d57fbc01de38d53e4804608cf3a61d0821a79baa3d3bc2a46f7cb6285641a876a6a331dea074a7163a0d8edac8b0f
 EBUILD pdns-recursor-4.2.0.ebuild 1785 BLAKE2B 82cbbf5546fdafc609cf894d6d1db631617bfc99c5e41268a1cef72904b31f88499c79d0a0c2e7af478a408f9e199b60888248382c768e335b6f6782d309ee6a SHA512 8148cd27aa5d133ad4a111ca832672900759d09b8ec7de1a1c7f97f4eb85af48983a58734310ddd7889c5f2e1d0369cbd94c2046c9a2b9b0c663f7d5b903a14b
+EBUILD pdns-recursor-4.2.1.ebuild 1785 BLAKE2B 82cbbf5546fdafc609cf894d6d1db631617bfc99c5e41268a1cef72904b31f88499c79d0a0c2e7af478a408f9e199b60888248382c768e335b6f6782d309ee6a SHA512 8148cd27aa5d133ad4a111ca832672900759d09b8ec7de1a1c7f97f4eb85af48983a58734310ddd7889c5f2e1d0369cbd94c2046c9a2b9b0c663f7d5b903a14b
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.15.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.15.ebuild
new file mode 100644
index 000000000000..8c6bb86d0ac8
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.15.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug libressl luajit protobuf snmp sodium systemd"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable sodium libsodium) \
+		$(use_with !luajit lua) \
+		$(use_with luajit luajit) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
+
+	keepdir /var/lib/powerdns
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild
new file mode 100644
index 000000000000..2ae00b46ee1f
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.2.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug libressl luajit protobuf snmp sodium systemd"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-lua=$(usex luajit luajit lua) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
+
+	keepdir /var/lib/powerdns
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 06ec1b84960c..9d00f4edd76e 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -2,6 +2,8 @@ AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf40345342288
 AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02f2ad4324cb7c99a05736bac7cbe80e1b9081832cac95d8c482eb4d1a8c344a6b55da623e3 SHA512 6392f59f82b82621b6cab6823f7761cd875bc6818c48db846df289057c02d8119a1024c5ecdf70a5ca8a55c00a2c3c56240d36b42cc038a25e8616ab9b966dd6
 DIST pdns-4.1.13.tar.bz2 1117990 BLAKE2B 95fa26d872fe138d1cde7e586881010dd27211c4186d0a99693d2fd90bdc3fd939da09805898d469daec6fe8c3493166346cf18b528760f3b25274fe10f45ad2 SHA512 94d80b1c6b78e93dd856631d391225c521485c3fb6b4123b28f9f58e178a7f6eb03f24189eaa261873e7e29962761b513c1fcf092101d68ad81dac73249a54d4
 DIST pdns-4.2.0.tar.bz2 1249282 BLAKE2B 56b3639004abd05ab9df4541cc46f155ce76426b35a29d9a4cedd16428c5852bf9306e14b77440b8239e823cb0603b4747a8ae7729f964f415a529f17706eb1f SHA512 ee67c132458e539d522aaa5835237dc64d92ad546f51e0ef86366964f7105631f2bd1e6c5d19d85466d95e1982f6410aeb14932c265fddfd301e403e76542624
-EBUILD pdns-4.1.13.ebuild 4703 BLAKE2B 6b6d49e55745519af07c3bba4a964e4bc40536fd1189f681699075b79f6f690368f635c6f65f699875ace38065b18afff0739fae715e2c9163a9246d3e96ac86 SHA512 acaab7c3256e09e54b56f5fde789d0776bdc6320ec4489158119d00659d18d9747b87c8df2e2ad2c7ec8fca6658c916ca0b636e261c9565269b844fa527ad83e
-EBUILD pdns-4.2.0.ebuild 4698 BLAKE2B b44da7a37397340af4af678dc9a05c2e1aba2676a1058c348926483ab0fb5f69617dcc331659f70a1d308166cce40c5ec717caf8acae84d61f2a304153b84397 SHA512 a1086874a1c1b60306504274f700131be47d1022abbb2d2057cc3cb2c6f3a0cbbb9725f5561b09fe5508ca208f275c53f3f3bfbcb6cd6f68b9f7d75de51b5574
+DIST pdns-4.2.1.tar.bz2 1252829 BLAKE2B e5cfcdd0c3011fe43e5abe52e5308b5e6346d186c5d5046c862468ecf810db7e5ab64bd36a9c62f251fbf63948572c5193ed354b8e98d647111e9373578c54ef SHA512 40b5533c755d7c0d41cfb273b704a45a3006dafc98c79bf41cae43d9e2d03bbd7a663996a7f209c390a89c5f7161f2f6246389beef18fbac48e95907e1b7936a
+EBUILD pdns-4.1.13.ebuild 4730 BLAKE2B 30e7d3a402ce3f95e29f787ea74bbe3dac6a7f995eb50a8843acc64faab3198d68bb79838b68dbc3877a623705447d1884a395a8bbba468eec179af7914b5122 SHA512 659759a07c3f0003de18d9a4711a48245ec39b9389f513ba2b1c720e8aad148d6710defbac7b7302bc97d8607bf411ab32c2131b7ec7884e4c39f321f8e90db3
+EBUILD pdns-4.2.0.ebuild 4725 BLAKE2B 4967ae6d766a7e83086c9d67679871540c103e0d88d35f7fe9fbae40ea77a10dddbf880687cdab4a8f23253c24fc544dd3901e833606cb20471b046b68455a99 SHA512 d865cd6f4d80cb2604120391601a8ac385db701bcb91ec48a696f8e66c6d541a382662bc90e83affcbdc78d1747f21e1745ef67f49d54c08fe04be958a0fafd6
+EBUILD pdns-4.2.1.ebuild 4725 BLAKE2B 4967ae6d766a7e83086c9d67679871540c103e0d88d35f7fe9fbae40ea77a10dddbf880687cdab4a8f23253c24fc544dd3901e833606cb20471b046b68455a99 SHA512 d865cd6f4d80cb2604120391601a8ac385db701bcb91ec48a696f8e66c6d541a382662bc90e83affcbdc78d1747f21e1745ef67f49d54c08fe04be958a0fafd6
 MISC metadata.xml 1383 BLAKE2B fd622facab46aaba7d1e54529574ec0d0531254fcbed8c454bc21438212a9d7f0ce744417b24461e1dc144a3daded8d252d805011b77bc5f396bb59297cf55c4 SHA512 6301ccaa19d82478a7e338cf1ad3b586cbdc4c2b98298bb306e7913399efab4e30305756cc7dcf6df4d81520733f2095c4bf61f65ac83763e38f375c2cc0b2a7
diff --git a/net-dns/pdns/pdns-4.1.13.ebuild b/net-dns/pdns/pdns-4.1.13.ebuild
index ae6ae070db07..41fbabb111d2 100644
--- a/net-dns/pdns/pdns-4.1.13.ebuild
+++ b/net-dns/pdns/pdns-4.1.13.ebuild
@@ -19,6 +19,7 @@ KEYWORDS="amd64 x86"
 # xdb: (almost) dead, surely not supported
 
 IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="mydns? ( mysql )"
 
diff --git a/net-dns/pdns/pdns-4.2.0.ebuild b/net-dns/pdns/pdns-4.2.0.ebuild
index e1229b5437f0..5c7378bfdf75 100644
--- a/net-dns/pdns/pdns-4.2.0.ebuild
+++ b/net-dns/pdns/pdns-4.2.0.ebuild
@@ -19,6 +19,7 @@ KEYWORDS="~amd64 ~x86"
 # xdb: (almost) dead, surely not supported
 
 IUSE="debug doc geoip ldap libressl lua luajit lua-records mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="lua-records? ( lua ) mydns? ( mysql )"
 
diff --git a/net-dns/pdns/pdns-4.2.1.ebuild b/net-dns/pdns/pdns-4.2.1.ebuild
new file mode 100644
index 000000000000..5c7378bfdf75
--- /dev/null
+++ b/net-dns/pdns/pdns-4.2.1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib user
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="debug doc geoip ldap libressl lua luajit lua-records mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="lua-records? ( lua ) mydns? ( mysql )"
+
+RDEPEND="
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:=
+	lua? (
+		!luajit? ( dev-lang/lua:= )
+		luajit? ( dev-lang/luajit:= )
+	)
+	lua-records? ( >=net-misc/curl-7.21.3 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	opendbx? ( dev-db/opendbx )
+	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
+	sodium? ( dev-libs/libsodium:= )
+	tinydns? ( >=dev-db/tinycdb-0.77 )
+	protobuf? ( dev-libs/protobuf )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/${P/_/-}
+
+src_configure() {
+	local dynmodules="pipe bind" # the default backends, always enabled
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use lua && dynmodules+=" lua"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	use opendbx && dynmodules+=" opendbx"
+	#use oracle && dynmodules+=" goracle oracle"
+	use postgres && dynmodules+=" gpgsql"
+	use remote && dynmodules+=" remote"
+	use sqlite && dynmodules+=" gsqlite3"
+	use tinydns && dynmodules+=" tinydns"
+	use geoip && dynmodules+=" geoip"
+	#use xdb && dynmodules+=" xdb"
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-modules= \
+		--with-dynmodules="${dynmodules}" \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable lua-records) \
+		$(use_enable test unit-tests) \
+		$(use_enable tools) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		$(use_with lua lua $(usex luajit luajit lua)) \
+		$(use_with protobuf) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	newinitd "${FILESDIR}"/pdns-r1 pdns
+
+	keepdir /var/empty
+
+	if use doc; then
+		docinto html
+		dodoc -r codedocs/html/.
+	fi
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	enewgroup pdns
+	enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	if use ldap ; then
+		echo
+		ewarn "The official LDAP backend module is only compile-tested by upstream."
+		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
+	fi
+
+	local old
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 3.2 || continue
+
+		echo
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/powerdns"
+		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
+
+		break
+	done
+
+	if use postgres; then
+		for old in ${REPLACING_VERSIONS}; do
+			ver_test ${old} -lt 4.1.11-r1 || continue
+
+			echo
+			ewarn "PowerDNS 4.1.11 contains a security fix for the PostgreSQL backend."
+			ewarn "This security fix needs to be applied manually to the database schema."
+			ewarn "Please refer to the official security advisory for more information:"
+			ewarn
+			ewarn "  https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-06.html"
+
+			break
+		done
+	fi
+}
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 11492b7f05f1..376c9c9e370a 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -7,6 +7,6 @@ AUX pdnsd.resolvconf-r1 17538 BLAKE2B 0797bf3800e5ca1bf3d4c55cbd0862bb8a6964b5b1
 AUX pdnsd.service 269 BLAKE2B b14978db01ec729a6e04d4849a468fd45999c1fbd7d21e986b2034edb81f645df7f5ce8924d72e11b04a548c6957964c936442f1d57c5fa9a327667b331ce4f4 SHA512 c1504f52fb30ba197bd3c3450f200f2f274bf73f7a6436bc317ad9affc18e9c5edcb8555913a4aa9c6bf44b935e0c9cd005b4f5b0fd56eed6e11914f63db9ef2
 AUX pdnsd.tmpfiles 37 BLAKE2B c4da53c3d0ebea88e456e6ea07b2505ed187e074286bb40fabde6a27c4cc017dabea3207e8fde80aa3fe38957b12ce8e09c809b369f06356c1737ae0825cdbff SHA512 7beacc66e8504ca0f8e613dfc8ed2479362f1ebc98ffab902622b36c795fe75e176d9f0a330ad74e10a7f7b1597cce068d94eea6511a75b941e42b2458b76df5
 DIST pdnsd-1.2.9a-par.tar.gz 516061 BLAKE2B 33f2fa85f4b2fa3b709e612c12c8a6edff67f3d2203a8ccd9e838f72b8ab2664eb2e88c0957c08c64568581d9eeb4bede9157ba0928fa6d28ccca279f71fbd1a SHA512 4fde296642306aa986ddb7cad0b5991bcd397656d93ef4962706276848c7fa62c664a40198e807d029637f116e8000c237d98b91cbbfec5c08b134d8bb3adf81
-EBUILD pdnsd-1.2.9a-r1.ebuild 4074 BLAKE2B f4efe1ca8b8d59d357d9dc3ef287ecd38846b1ee94fca864e600a94758775b7c861510d545f7202a40bd3a3f659dbbf6d531ce2cd95d90e88bfb49c039f92d03 SHA512 2378463b4df77ed3cca083e4434ccbec9b1bfebe65a2fbd42acb10a90f1ae22e43e875302fcf5a47c35702b57186a4303234f29b2618d502ee06e75d13d6c554
-EBUILD pdnsd-1.2.9a-r2.ebuild 3237 BLAKE2B 443a730a92b6ed3d19437035b8e1d2179744331a2a847012060e9b8913dfbac0dcc82cc007d2e22030803d9b7880495af149adda42fbb7f6dbccf279a312ff92 SHA512 0c1016fa373001c5fc32aed688b010646429d7ceeabde04b1cb161d0e8d871a9a2693635561b6e0a03e622ca266c839c824237d43201843935a1769da843fcfc
+EBUILD pdnsd-1.2.9a-r1.ebuild 4098 BLAKE2B 19346403b1a600cc65851988346a8a055cd4f4990254992083558e108bfa30d16af135f5e85ac3bdd0a7268da5160411aaa014d6b8b392e3124c0ed8fff4d383 SHA512 cbc3d439260cef10b4002a50e417146fb2dab19c6eaadee638911954323e611a437adec4715ae820c2d0dc247cff3f7958930674822f2250becfc5a3f5cd9304
+EBUILD pdnsd-1.2.9a-r2.ebuild 3264 BLAKE2B a24f2a56c64ee7b74c0040cb415b6d227ac2793bd5cb841320e9fa616785662f114ed646b34c1a1417287f310140a59333b40f775c4b05f64dec80b9c865ada0 SHA512 c281a39c296f34725ef64fcd40f11102c42e6ab697fc2e07ce325d9789dcaf7389bb2d2544585a492de6c419dc70f98b29b7b90c00ec3c5cd10778d86936fc68
 MISC metadata.xml 814 BLAKE2B 2f0e173648d270958a54e378a0638936666c958f69768047e24d4d6cd03d9f52d89940cf57fb346d27fd2806c6ea6be378ff4d950161d475f1f0a0eac0fe206f SHA512 b5bca37d42c4c50031a968297332e824e2830481903ae4036347ffbf554a0a37efb582d8a52b6bba48a0566db81942b1052aca5ed16bbe248fcec46ea99090a8
diff --git a/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild b/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
index 67ce6e471960..2fcb1252a535 100644
--- a/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ~s390 sparc x86"
 IUSE="debug ipv6 isdn +urandom test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="test? ( net-dns/bind-tools )"
diff --git a/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild b/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
index 941fd2c1f91c..beab65cedd77 100644
--- a/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86"
 IUSE="debug ipv6 isdn +urandom test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-group/pdnsd
diff --git a/net-dns/rbldnsd/Manifest b/net-dns/rbldnsd/Manifest
index a5d9c957ec21..cfd3235e7d97 100644
--- a/net-dns/rbldnsd/Manifest
+++ b/net-dns/rbldnsd/Manifest
@@ -1,10 +1,6 @@
 AUX confd-0.997a 1375 BLAKE2B 61980080ecad7a64ed547f19de7ca827057cca1ed4c4c724c5600faa8e1f5ae2845fef95a39a79ba297155ca7a0c33e1ed38eff86de65e19cc6c38fdd7b89944 SHA512 c26f561a0906704c8eb32d8748428b120489cb02d0c9b5ea814b7b4eb71e2ccdddc153d442ebcc46789e65c8c3aa3a305bbf56e6030f3b9994c6d7d247120669
 AUX initd-0.997a 546 BLAKE2B 6f7a5220598bc37e7b3c59db65fd38f17ed68c407a9ff1c486c2052fba166fbcd854bca5dc6cedf59b497998d968077b39e790168dc7e93ee62fa29b4c5864fa SHA512 2d18c5126ee1cf79e45881cf358f9d9299387dc1b2c0ee2433f85f617694ba11fb2c80703c18002995dc3d1f3d9d561b9b473a9c705b5b0c8ff282385b2e3170
-AUX rbldnsd-0.997a-format-security-compile-fix.patch 914 BLAKE2B dadce821f6d1d06b3c6bd5d5ffb42227af203d47b771d45e6231cc0c9d161d9ff700bf8e442e4bd6ca25e1c79e66a9f2dd2ca3e2a8c21a4e3ef96382e1237b63 SHA512 fe61d08ca56759cbce9e078576b3efd4e0bfa35108ca3921d9aa02d78d8e5fc8bae4ea4c38cc9695379ea28f058facf70978c8aa5ecc7d53742222a28dcbc166
 AUX rbldnsd-0.997a-robust-ipv6-test-support.patch 10867 BLAKE2B b2470f4a364c490b01cc8c2349d18d54ce6bc44f0113883bab763742cd798a0edec8add591a716ea99ac2d121bb1070bda1109d40018a91c162aaede3a2bc31d SHA512 a502df0c102a92dbccba482741ef628cde409f6d87d8467b66a0e4f595f8b28b9e99db0832ca27e3dbf317018b33f666b8bb8962988177cfaf1e0d28b6bf21d6
-AUX rbldnsd-0.998-fix-huge-zone-OOM.patch 1659 BLAKE2B 310b0b0851a09b5161919ce5a7fd97bb57c6ecbc1d87780af04c31214c72d25ca5d9dae481a46d1e5ccec4c5ba7b04b2b216a8ed104eb2af47b95771e32fa1b8 SHA512 2342d29322e6a5b726319a60c54a7f8d19b020e3dfc8a9d236ac7b6a55d9755b9afe1505c2f835604016fb899630074090baa737b2d3a24f7b4d4e4d911b0443
-DIST rbldnsd-0.998.tar.gz 145363 BLAKE2B e698f5b99ed1deae1aedda1952c19eb6189cbdcc71ecfa043faada966d30eee93e158dfeb059603dc493a665a7c56c84ff6ee636fc9eec7de38eb0bc73ed26db SHA512 7b6fb106f8188b2ce6e05b622cf90a393a4642f00faa5bddc184ce02dbd2beee9d8de22cb09ae53a25c475f28f99d13fbf6252f0d4c1d72bf47ba23f769e7074
 DIST rbldnsd-0.998b.tar.gz 154022 BLAKE2B f0bf03bef69853d45c3546c6fd3e58ffb95e76192ecb64f71f6799c6041749b1d117bed2bb21edbf1dec81d1684334b3af7d60b35d49089efb3a5e28752be6db SHA512 9b9c8694824a99b4ad120a22dbe4b05351867434e43ed0d8137990d3ece90ed67349965b6ed0450066d6663c1858545774c733b0d7afff304095de500ba30175
-EBUILD rbldnsd-0.998.ebuild 1540 BLAKE2B 46abc7491803de1c9a3508d0213e97fc565bc4f8bbdc851fb1fe45a5cc79fbeb526a2cd83b1658935c9a30923bf1c94a5cda350d1689b7f6eb82efa5f9adabaf SHA512 236ddc68f8a48f092ac1d485f7d9e3bc6c8d24f19dbb437a9d06ca82bc63a603233894592b8f38a415b6225ca992d6e073df63f3e6f5801faddc820db00722ef
-EBUILD rbldnsd-0.998b.ebuild 1448 BLAKE2B 8dcf4a48068a747638ed3c222bb4a1178fbf920625f2f2379277aac48ca1dc72803a5255b9e1870fe49dc1cac796f9f3755c2036a7ea1fd7fb34951107696a7e SHA512 7b90211bdf848e1cb021c83eb6bdb737a07f0579dd2ee96689525d03b41af648d4125b7f92ed81d1da84514174804396e63730ab26d3ebd7fee282d139aab6cd
+EBUILD rbldnsd-0.998b.ebuild 1471 BLAKE2B 2cfb519389960159469c39726e2f6ca8fd4b0504803b7944c729785b9db21f598120a55b1006ea38fe81d50c2d35a9743324612f53b8254ee2a2b26c063805bc SHA512 1d13f5a5fff869e5a37d7a8f5cefbe7fff6f004bddddb7200de14099cfadce67498e0176b4cdb4cd3738cb0a9bbc34ed3b3273c2794ff77fdaa362775eb91177
 MISC metadata.xml 1219 BLAKE2B 78d1de3d2e056e8d1441e929686a9cf1d073348f2b58ef263ffee7c6e9c03ad59b387c6112fdcb845915b1d5f41eaf6825f21510e7d085852ab49567412eb867 SHA512 23bddced94702b936cadbaf9a6a51cfd8506715a766cbef9dbb0fb69bf02443e0c8636b6237f98fd3922d0c43fb17c7c2850074e6bdefc2c9af3731a01971f8f
diff --git a/net-dns/rbldnsd/files/rbldnsd-0.997a-format-security-compile-fix.patch b/net-dns/rbldnsd/files/rbldnsd-0.997a-format-security-compile-fix.patch
deleted file mode 100644
index 03da010336e3..000000000000
--- a/net-dns/rbldnsd/files/rbldnsd-0.997a-format-security-compile-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5d3455065f84fe1ef4673552a27d2e6e8f02c97a Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Mon, 22 Sep 2014 10:09:27 -0400
-Subject: [PATCH 1/1] Fix compilation with -Werror=format-security.
-
-The dslog() function takes an optional format string, analogous to
-e.g. printf(), and a list of arguments to be substituted into the
-format string. A call to dslog() in do_reload() omitted the format
-string causing GCC to throw a format-security warning. To silence the
-warning, a trivial format string of "%s" was provided.
----
- rbldnsd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rbldnsd.c b/rbldnsd.c
-index abf1d01..e791231 100644
---- a/rbldnsd.c
-+++ b/rbldnsd.c
-@@ -959,7 +959,7 @@ static int do_reload(int do_fork) {
- # undef kb
-   }
- #endif /* NO_MEMINFO */
--  dslog(LOG_INFO, 0, ibuf);
-+  dslog(LOG_INFO, 0, "%s", ibuf);
- 
-   check_expires();
- 
--- 
-1.8.5.5
-
diff --git a/net-dns/rbldnsd/files/rbldnsd-0.998-fix-huge-zone-OOM.patch b/net-dns/rbldnsd/files/rbldnsd-0.998-fix-huge-zone-OOM.patch
deleted file mode 100644
index 7a4d2da7187f..000000000000
--- a/net-dns/rbldnsd/files/rbldnsd-0.998-fix-huge-zone-OOM.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-This upstream patch has been merged but not released. I (mjo) dropped
-a change to the NEWS file to prevent a pointless conflict.
-
-From a1295eefc78b6e8a3c220e164dbfad6dbecc6f6e Mon Sep 17 00:00:00 2001
-From: Antonio Mammita <am@spamteq.com>
-Date: Wed, 21 Dec 2016 16:54:06 +0100
-Subject: [PATCH] Fix for out of memory errors on huge zones. Thanks to Andrew
- Clayton
-
----
- rbldnsd.h      | 6 +++---
- rbldnsd_util.c | 6 +++---
- 3 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/rbldnsd.h b/rbldnsd.h
-index 6acd8a0..f195a30 100644
---- a/rbldnsd.h
-+++ b/rbldnsd.h
-@@ -367,9 +367,9 @@ extern struct dataset *g_dsacl;	/* global acl */
- extern const char *show_version; /* version.bind CH TXT */
- 
- void oom(void);
--char *emalloc(unsigned size);
--char *ezalloc(unsigned size); /* zero-fill */
--char *erealloc(void *ptr, unsigned size);
-+char *emalloc(size_t size);
-+char *ezalloc(size_t size); /* zero-fill */
-+char *erealloc(void *ptr, size_t size);
- char *estrdup(const char *str);
- char *ememdup(const void *buf, unsigned size);
- 
-diff --git a/rbldnsd_util.c b/rbldnsd_util.c
-index d17b51b..c6d628d 100644
---- a/rbldnsd_util.c
-+++ b/rbldnsd_util.c
-@@ -460,21 +460,21 @@ dump_a_txt(const char *name, const char *rr,
- 
- #endif
- 
--char *emalloc(unsigned size) {
-+char *emalloc(size_t size) {
-   void *ptr = malloc(size);
-   if (!ptr)
-     oom();
-   return ptr;
- }
- 
--char *ezalloc(unsigned size) {
-+char *ezalloc(size_t size) {
-   void *ptr = calloc(1, size);
-   if (!ptr)
-     oom();
-   return ptr;
- }
- 
--char *erealloc(void *ptr, unsigned size) {
-+char *erealloc(void *ptr, size_t size) {
-   void *nptr = realloc(ptr, size);
-   if (!nptr)
-     oom();
diff --git a/net-dns/rbldnsd/rbldnsd-0.998.ebuild b/net-dns/rbldnsd/rbldnsd-0.998.ebuild
deleted file mode 100644
index e6463eb22efa..000000000000
--- a/net-dns/rbldnsd/rbldnsd-0.998.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils toolchain-funcs user python-any-r1
-
-DESCRIPTION="DNS server designed to serve blacklist zones"
-HOMEPAGE="http://www.corpit.ru/mjt/rbldnsd.html"
-SRC_URI="http://www.corpit.ru/mjt/rbldnsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~sparc x86"
-IUSE="ipv6 test zlib"
-
-RDEPEND="zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]')
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}/rbldnsd-0.997a-robust-ipv6-test-support.patch"
-	epatch "${FILESDIR}/rbldnsd-0.997a-format-security-compile-fix.patch"
-}
-
-src_configure() {
-	# The ./configure file is handwritten and doesn't support a `make
-	# install` target, so there are no --prefix options. The econf
-	# function appends those automatically, so we can't use it.
-	./configure \
-		$(use_enable ipv6) \
-		$(use_enable zlib) \
-		|| die "./configure failed"
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)"
-}
-
-src_test() {
-	emake check \
-		CC="$(tc-getCC)" \
-		PYTHON="${PYTHON}"
-}
-
-src_install() {
-	dosbin rbldnsd
-	doman rbldnsd.8
-	keepdir /var/db/rbldnsd
-	dodoc CHANGES* TODO NEWS README*
-	newinitd "${FILESDIR}"/initd-0.997a rbldnsd
-	newconfd "${FILESDIR}"/confd-0.997a rbldnsd
-}
-
-pkg_postinst() {
-	enewgroup rbldns
-	enewuser rbldns -1 -1 /var/db/rbldnsd rbldns
-	chown rbldns:rbldns /var/db/rbldnsd
-}
diff --git a/net-dns/rbldnsd/rbldnsd-0.998b.ebuild b/net-dns/rbldnsd/rbldnsd-0.998b.ebuild
index c570f9b9fbcd..19ee0603f04b 100644
--- a/net-dns/rbldnsd/rbldnsd-0.998b.ebuild
+++ b/net-dns/rbldnsd/rbldnsd-0.998b.ebuild
@@ -12,8 +12,9 @@ SRC_URI="https://github.com/spamhaus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 hppa sparc x86"
 IUSE="ipv6 test zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}"
diff --git a/net-dns/resolv_wrapper/Manifest b/net-dns/resolv_wrapper/Manifest
index 7b3adac75e00..c3d659dc80ee 100644
--- a/net-dns/resolv_wrapper/Manifest
+++ b/net-dns/resolv_wrapper/Manifest
@@ -1,5 +1,5 @@
 DIST resolv_wrapper-1.1.4.tar.gz 33288 BLAKE2B 1e6ee070e2766bae9d6c9007c1bedc60ad550d33d2e785ef98ea81ab0f9034a0be056a76d56790f7d3c1c400c9b00cab37a37fb78ed99a8b2a4bfe30795b1ca7 SHA512 da7eb897d3964015b2bb6f7c1ba6483020c70e2d64c5e13b6c095f9e57dccf5b035d04e41c38953fa0eb260e83d7e23f6af32c0d8186553bae8d7b741c46c5ba
 DIST resolv_wrapper-1.1.5.tar.gz 34241 BLAKE2B 7025885731a1defa79ae7a0381ca4394c37508883dc5e19aa9e29b0545cddc1c3f2b5091991a3e1599654e1a64442a6a36760f7725e54d1270c1a5b71bd3fadb SHA512 d11beff60cf935c0c12ac97ae375299ab1cd2e270d09438cf81b5c19dd94b7d430484c44ec9611171b67654d5c0f26afc4aa9d069d61293a956ef8fc59efc7a8
-EBUILD resolv_wrapper-1.1.4.ebuild 654 BLAKE2B e8d3875550836b8e5372550ebbfa44b75db792da5e8e09b153241299c8da8eb54f03b621f5a85b315f1be8bce7eed282d2e0683cc6a86aaeda84baa8c8113973 SHA512 12b5dc25e3ab825ed1c02149e82fcabd0544b983c53291653ca56e6bb7be4114c624ba1db0f0612e1665b2d4c2059b82bc428a95b3c67551a8b55510a732f0ce
-EBUILD resolv_wrapper-1.1.5.ebuild 689 BLAKE2B 02c982f607504bdaa6fb5b65c26c2917f14a2a55710871b409c9a314f313eb2bb98ac458c2afa499f760e1da6cde1aa02659b1afa15701cd1970de5fb6ec13db SHA512 0b1712f9c09412307e94336ae70714e0c976fde9a776a01b5091e725032138526739948cbd6185544ef0d4f1d3588e39aa79ed0e8399d52971c4d3af88bb5e69
+EBUILD resolv_wrapper-1.1.4.ebuild 678 BLAKE2B ef1f99d669fab1a4c63e9b32746e2ed5d790ee8fae2ff92253752a1e63b5e91cdb263d529d90382c7e07f14c2a724fd565ea151a5ff97d62dc931f9795d7f17b SHA512 301cae2529400f6826726e11b3f74c9fdc72e5ea68bf944dba3d6dc3cb7c5c64a269e6be047d2c6aadf5e8e3c9eb8be9366365fa6ae510129c87ac1eb495af27
+EBUILD resolv_wrapper-1.1.5.ebuild 713 BLAKE2B eaf18024408fab9c9a69497369c142fccb7512a7cb793d768fb4058f0816f8dd6e2057a658b2ddec90aa8c5347fc0d2b78e216fc11317101a48ccfe55d26d341 SHA512 a87e89c310dc1504e95ab93a4f4261928179c3adcf1dd5928d09929217fa1e2c4795a592fdf23e36a5e70dd68274f1db00e689da39e88cccd733ad7f986c21d6
 MISC metadata.xml 360 BLAKE2B 3c45284477381a60df338afbc4293cc20c47223eca1b4669b3f310ccb80cb0b81d534d9fbfdac8357b43507340e5f61e959c03e39e5a3deba0430e4f15aa740c SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.4.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.4.ebuild
index 08489fe3e613..46ba959b819d 100644
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.4.ebuild
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
index c890434ea595..e717fbe3166a 100644
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest
index 2a11d48be1c3..2a6c4c7d5dec 100644
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@@ -2,8 +2,10 @@ DIST s6-dns-2.2.0.1.tar.gz 76046 BLAKE2B c7c7e94fa47fc20e2a328f2fc22650585e9bd02
 DIST s6-dns-2.3.0.0.tar.gz 76476 BLAKE2B 6896bf534d872aac19dd6b2ad819d7aee6d52737f33106640ad1c3afc7f8857e5672f3e35f7f2064cb8085a79adc33bdd33a99dc656a656040a93f813a986717 SHA512 9afa98d0a7a9d84311f6f93d5c1742f7dcfb84c76ca363f9e09b3b40cd3faa1721aebb6e974a98991c037d82b2540c1edbc3cc13ea5f7e3dd95a96d14918e454
 DIST s6-dns-2.3.0.1.tar.gz 77836 BLAKE2B 55f83152eea3e3c8f2d774d6330aadcb73ec9b7d1ca4b87d1093fb9ab216ac1ad130bc9437ff30311451b06f820720fec902ac40e9e8d63f9d605cbf13448edf SHA512 69ae32f9b4ff22a5d38e3a2c950357d8c8032a649c1d81e4a4e5f474ae5c1bb1072555baa1a34f955293aa0f66a93f51f2cc8efd8aa56704b906e0b0979f8157
 DIST s6-dns-2.3.0.2.tar.gz 77885 BLAKE2B 354a44d47f4fbc964c41999a442f730a738be361bc9633502c3c54f38d25060c58ef2ecfea764f1f5d3243a2e24f92e8b54abfaf61f76f7d155f93a53de2d1db SHA512 fec0edf852423bf8f717fcdc3c00c8f38e7bab4d9a03d14e6e81ad3f175b5db57be44409761bbd990f56f81c3ae8e0aa76ab8c5b65fec823a0ce392bf41cdf33
+DIST s6-dns-2.3.1.1.tar.gz 78171 BLAKE2B 0949a48a0c48a8c3ffa27794309efa4489cd15102b3a7c29a6dfbbe22cebd0d207417fbe687160266fcda6ff04174b538d7844ef7811e06f8c8bd9a91e4d013e SHA512 e69ee16cb16139d344255adc4bb92bd73003464925bbd2df893e3b922add155308b547274a66e3f20a5d3c0310c8fadc877b656753299ff9a269b4e25c26f7a9
 EBUILD s6-dns-2.2.0.1.ebuild 1316 BLAKE2B e413614e39b05f07c616d83e5f3d7998ad33948bd67d96eb4653e1c81865b33209fe9efb16dc5731fd093f7ee87eb662974475426b9d8cc7b7590c879e8d09ad SHA512 a0153e3c80f54fd744dc5e1412672857280e3204da461e8eb75e2c06133a9d4162eccec950ebed272061a1614e00e04ce8024be8ac1a001ae0e57187ff064557
 EBUILD s6-dns-2.3.0.0.ebuild 1316 BLAKE2B 2c9dfe840307a11cf193077abc5011df5b01f455e1e0d8f5080061d8019c0824d12923c9182c8a6b3e84ab09fa0d7add2a8e99a9c9f27f8a3a74265042768a0b SHA512 61865257ed9b3e1321bd9aa0694cba91dc12402a76ed8db9c24f7d99566b4e060120d070122af7eb24cb13d7353f8ad16b8de252f39b5cd9e447dea67582ea73
 EBUILD s6-dns-2.3.0.1.ebuild 1211 BLAKE2B e74799d0b902714589cdb91b305ca8ea69939dd13f69cde242ac17292225f66802c89b421a6c2dc6f543a20b1f174d0c675b077a0150e2bc6a29f5e89fe1b243 SHA512 670fc13663ec03faf9f86ce6f4777730341c19783b6671249debfc0ac3594a1e2d33967f7b041778ff69388c7b56554ef679e246b0e6cd172a50c1b98b828342
 EBUILD s6-dns-2.3.0.2.ebuild 1096 BLAKE2B 53389e651100b3171221f91b34d7b728a3a85986c37cb284436eda902bcf99a52ae9c460f38b71c049654b8cd3dde05b1479c9b2c4aaa50e057fef111489de1c SHA512 30935ee14fcd1e63f248e2093c89ee11e65cfdafa6143d36eb0034de08072556b0993b46f7d08d2a6b9d84da024f84303b6b90e97170f425a43eb09946bc4a12
+EBUILD s6-dns-2.3.1.1.ebuild 1096 BLAKE2B 25dce0059e773e0f43a0fce14826851711a25380414bb83039940c2a6e6cc464dce9d0dd6950d4e266dfb038c50426728232ec076843a5f93c4dd63296f757a7 SHA512 59470d1c20fdd791ee7d31e4b0af021b4c3f7718a2e62d8466948e85638f533183b92795de765a710375d718975f905a22ae92f209ed84be529f6214c97e1a0c
 MISC metadata.xml 764 BLAKE2B 7e6f7e1ea30dcf3e0b8c08d90457019cfb0d577f2c7ad4d4664d2770c150ac2e51d38c047a7b41c5541c1a3771b8c18ad547f2a87cb4d13f49b6cf9141cf1aae SHA512 d49c08c4eb0bcdc6bade611ced7588ed1f6e8bb6c71a677b1b1ab1ef2357229a3a380858aecbf57a4fd9a75511fcd32cb7ea1ea91b75c7a0787518a83fd4ab62
diff --git a/net-dns/s6-dns/s6-dns-2.3.1.1.ebuild b/net-dns/s6-dns/s6-dns-2.3.1.1.ebuild
new file mode 100644
index 000000000000..55879080c237
--- /dev/null
+++ b/net-dns/s6-dns/s6-dns-2.3.1.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Suite of DNS client programs and libraries for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-libs/skalibs-2.9.1.0:=[static-libs?]"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/net-dns/sheerdns/Manifest b/net-dns/sheerdns/Manifest
index 6ac34c10e1df..7f4ebb481b94 100644
--- a/net-dns/sheerdns/Manifest
+++ b/net-dns/sheerdns/Manifest
@@ -1,3 +1,3 @@
 DIST sheerdns-1.0.3.tar.gz 22937 BLAKE2B c5a32220c2f3e91f251f7aef37106a39764a13bf8bda1f9178d21356c79ac5da64e2f803ddac46bdce9de18f72fd72e1e79c9c4aa9c159b460279dc197750152 SHA512 c24b33d5ed9cdf501a3c685398f694c2c8e31814c30caec7406d3d819e3d2affd854da23f3e1f1e0621fbd7e81f189f3316346c4d1c48abeef9ee0b9b47e4c12
-EBUILD sheerdns-1.0.3.ebuild 665 BLAKE2B a0fd610bbc32b8cdc81b0ef9e7665c1eae251c27712cbb461f72880a63acbf553ad10b7ec98d107a17a5a1f7ba3220903c31a7b25f3aa6a3be3a61761b0f732a SHA512 0f98fb58389e29ea690509ee8eca482bbe985a2359bcc136916509717a2c8970e25594f7ff53563d71c4c7962fbbc48f3fa0c3a28a3f985d6d0f83dbd83f7c43
+EBUILD sheerdns-1.0.3.ebuild 658 BLAKE2B 16f1c9b3e924bfb063d1a061ab6b4eb33e360d631659e9748d191fe82eeb192ad2c4a5a45204a5390594cf436d43a5cdfaed64d0555b2aa25b550fd8b966d80c SHA512 35b87e5917899ad2a7ef2d3696d3075ed8b0304660395deb2f522e7c0d2d670366dbdebb1cac9b346fc7bc9fd4af548cab287e3daf5a5b6c705bdb49dd63c2c9
 MISC metadata.xml 634 BLAKE2B 30b2f4219a2173f23d608a51755b91532d66f954b5595d87373903def3b98c0331a8d4f3cf05b1d9784d78644db543e4ceaf71135b3d4c724be06bf438345558 SHA512 daca37a1ea32a267c0d2b622a533713bcc63ffcfc351a8b7111cf208fba30f4aab38f181c7f0f1910a5598e20828ee24ab17fba3e91af384ad8c15233e477896
diff --git a/net-dns/sheerdns/sheerdns-1.0.3.ebuild b/net-dns/sheerdns/sheerdns-1.0.3.ebuild
index d1e7c5e721a3..4ef9604323b8 100644
--- a/net-dns/sheerdns/sheerdns-1.0.3.ebuild
+++ b/net-dns/sheerdns/sheerdns-1.0.3.ebuild
@@ -22,7 +22,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) || die
+	emake CC=$(tc-getCC)
 }
 
 src_install() {
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 485b8db134c5..912d9762b2f6 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -7,5 +7,9 @@ AUX unbound.service 247 BLAKE2B d986319f9b43600d4f6443f50e214efd39fd20be6a7067b5
 AUX unbound.socket 101 BLAKE2B 4885d311873d7f3e5daf1c0a63798b13761b7c0bfb1bead0bde11bc2a2a994d55670c992b42ea1b4bbee98d04a12f4e7e7517bd0e9caa74d8cac2d1dc0c33274 SHA512 935ab3bd5bc3d3347e44c20482aa19396d243b89f2dbc7bf9f89b16a2559715866e16dfd9f5c4866222d8ee968f158a773475d94629f0ef9fa9b8fd23f0fbc2e
 AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a73b0c6148f4df336c4c07e8da19320df6bedb49cb6884da565543f78456d38dc3000ca2a1abde84816be SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3
 DIST unbound-1.9.4.tar.gz 5686242 BLAKE2B de9e553ba6e8c3839b41776052c3b0f83890b5bd9cbdb895fbf1e413169dd4740a9dc354ccc787fa018755acb73e831f1cb2742db65e151d1e01367b35a7b9e5 SHA512 44021014c944fc01a1f5f9afd77145f5554a3282cc2bfd54526fc4f88346f497c847ddb72bafa155d7e6e5dd02b6bb031836ead4408977d4e4b5b3290dffea9c
-EBUILD unbound-1.9.4.ebuild 5401 BLAKE2B 66fbfcec284747e356ac67088f4fd126d5dd23828da7c972722a1aa8100bbefbf4bcf41e637ccce43c6477cad3f2b1ed308729d1e3056fd8d355edc7dba44091 SHA512 e3a2a52e443430a214afac126d32a30c578bbbd0451d906f59caf339b39a6570d5c12795d4b66c47060d6f54db381ad09a9add361f6afd16700c019f8689eba5
+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
 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 9b6df938ec24..cd653fdb32bd 100644
--- a/net-dns/unbound/unbound-1.9.4.ebuild
+++ b/net-dns/unbound/unbound-1.9.4.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # Note: expat is needed by executable only but the Makefile is custom
diff --git a/net-dns/unbound/unbound-1.9.5.ebuild b/net-dns/unbound/unbound-1.9.5.ebuild
new file mode 100644
index 000000000000..f8ac0358003e
--- /dev/null
+++ b/net-dns/unbound/unbound-1.9.5.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup unbound
+	enewuser unbound -1 -1 /etc/unbound unbound
+	# improve security on existing installs (bug #641042)
+	# as well as new installs where unbound homedir has just been created
+	if [[ -d "${ROOT}/etc/unbound" ]]; then
+		chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED}/etc/unbound/unbound.conf" || \
+		die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	# make var/ writable by unbound
+	if [[ -d "${EROOT}/etc/unbound/var" ]]; then
+		chown --no-dereference --from=root unbound: "${EROOT}/etc/unbound/var"
+	fi
+
+	einfo ""
+	einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+	einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
+	einfo "and run"
+	einfo ""
+	einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
+	einfo ""
+	einfo "as root to create it initially before starting unbound for the first time after enabling this."
+	einfo ""
+}
diff --git a/net-dns/unbound/unbound-1.9.6.ebuild b/net-dns/unbound/unbound-1.9.6.ebuild
new file mode 100644
index 000000000000..873b25698f4e
--- /dev/null
+++ b/net-dns/unbound/unbound-1.9.6.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup unbound
+	enewuser unbound -1 -1 /etc/unbound unbound
+	# improve security on existing installs (bug #641042)
+	# as well as new installs where unbound homedir has just been created
+	if [[ -d "${ROOT}/etc/unbound" ]]; then
+		chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED}/etc/unbound/unbound.conf" || \
+		die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	# make var/ writable by unbound
+	if [[ -d "${EROOT}/etc/unbound/var" ]]; then
+		chown --no-dereference --from=root unbound: "${EROOT}/etc/unbound/var"
+	fi
+
+	einfo ""
+	einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+	einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
+	einfo "and run"
+	einfo ""
+	einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
+	einfo ""
+	einfo "as root to create it initially before starting unbound for the first time after enabling this."
+	einfo ""
+}
diff --git a/net-dns/validns/Manifest b/net-dns/validns/Manifest
index 7328e32f1e2f..8c5f4d2c0e61 100644
--- a/net-dns/validns/Manifest
+++ b/net-dns/validns/Manifest
@@ -1,3 +1,3 @@
 DIST validns-0.8.tar.gz 190325 BLAKE2B cb1f7200aa9256e24bc9c9d071c4680e22ef436dbe997bc0278331b76131070d3797012d0f40f7bd66f5cfa2c8b8baef80753764caf758351a41c27f8cc59030 SHA512 2443bb8a7373f27d41ab3be1a92b61696d05b74afa42c19db54f6e999e4a634499faa44a5feefd3bc515bc677a8ef0a076092cf13316eff6d1cc504ff9702038
-EBUILD validns-0.8.ebuild 526 BLAKE2B b108891333f275e69e8320e136dbe42cd491f07ebeb842ff2a14b471acb51d18c84d9adf3bb3600372ccc9502d49211e8456b628a6282cb9472e1c95b33c6582 SHA512 301fb91e5dbfb030f3cb16cb5e3a4ee07a8692e600b6a33ea049250ae430c751d50ed1e2945ead284795c4b19091f7de9fa74a7fcd000ddcc917a89e12e4fc6a
+EBUILD validns-0.8.ebuild 550 BLAKE2B 6e02a42d046c7eb1d8cb79e48cba8b23c1c76cff9338171625ad2e21c9a90bc7783b24afb56665d0db53f02fac6b0007313b26fd837566ac329dd6f9a849e747 SHA512 f38fe00de440ca624aad13616414557d093404eb992da1539fefd776920de28e5f2bcfddd983bf8fc5c04634b91855fbc7b617a757594c0e8e2970c7e6be98ba
 MISC metadata.xml 471 BLAKE2B bdb426332df401e1df1fc63668c077dfc5b4275ba7e9e1734a9a59e6cbccd433214323fc20a93eb3d570f653087250b85451f1402f1c8724a929ea98d98be6b8 SHA512 26c46b8856c214a71ac566859c44f7ed029d96d9e61f98094d9cce02201c3c4520986bd8aeafec734ecc6c89d95266544f21b0c58677c6411c49ff7e85f73142
diff --git a/net-dns/validns/validns-0.8.ebuild b/net-dns/validns/validns-0.8.ebuild
index b50c9ab0f8d9..88412c36c750 100644
--- a/net-dns/validns/validns-0.8.ebuild
+++ b/net-dns/validns/validns-0.8.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=4
@@ -11,6 +11,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/judy"
 DEPEND="
diff --git a/net-dns/valtz/Manifest b/net-dns/valtz/Manifest
index a974e0a39cd1..609b74f0455d 100644
--- a/net-dns/valtz/Manifest
+++ b/net-dns/valtz/Manifest
@@ -1,3 +1,6 @@
+AUX add-support-for-srv-records.patch 2565 BLAKE2B 8e858bbb93991ccdb033318dec6c81c391181ea7c43044ff3f660995b114a7592c23099306e67eeb99bed05f6ec04bcab7153512b45c8031175f24a85f6a82b2 SHA512 6c4616f1df43530f1ccebd900ac19bac6b8f217dfebfa81b6eaf25afa0dbd96c616a5e7b859a326eb903d82f7d165997a695c21c8a457be467fc51d92bc40f0b
+AUX allow-underscores-in-records.patch 1561 BLAKE2B 7aba9fc4ca4f0b25d1bed1f7dbe524073b1b16b701a4c3d7830fd20e40af1983284a640a7c4ad913e9d8b2b27a864225989b0a8e7e9ec55c5d56841e65d837a3 SHA512 c23aaadab40863710b0ff9de964ab639c4dec2ef5aec0bf2fb402e7631436081012e80302aac5dbc81611b127fc2a6b549b7bb433d0220f012a7ae39fa0a0381
+AUX fix-generic-records-support.patch 1165 BLAKE2B e164ea03315bbbb0d9641f66a37c22a97a4f8e05f4dae86af542619b3299ad764417a40718e944bf10e6119419fad29beff55b947b00e601f86a5297cc2826fa SHA512 0613180930e526feeffa4367d1bf3e0050d2dcffe2181464b9084a1223ec4482c23890868aa761ae1a046da67b16f61761026fd2194c44bdaf6c4c5c556e3e62
 DIST valtz-0.7.tgz 10638 BLAKE2B f6c8c476f523bc72531dd6537a7ed096b4fe15122db8ac8398b6ce325e8d61aecd3ef496c6102127bb8df4c8e0651201826ed4ccf79fd47616b6e083967412c4 SHA512 173e9f04399f8011b565ddfa7ad542c87af03da1b829d40b616271a993a282a1a3f54fb434db4837fb9ee4c3eb66a39f70ebf5ff5f13aff9c6fccfeabb3a3df7
-EBUILD valtz-0.7-r1.ebuild 411 BLAKE2B 7aea688aea884ef88944c452682716d465ca61c727b6e65f0e62c81589e0ff56421c28c31842525c55bf992a257287877b9f86bcfacbe51f3608d6d06ba6aafe SHA512 fe9e61498ef8df67b57d817754fecf0433d59bea2b8daa21626157485942d19329d11e9671b84bad38c5be648b546efe40c9be585662a68685b231447cc30695
-MISC metadata.xml 341 BLAKE2B 53f669b92bd42cbfc65ed61e51ddfbcf29046003710d2ed754989a6d09a912b606c7a0b8539551b05c58325af576113fb1c5065f7d1e7ef1a7c68e2f12f263d7 SHA512 a85234c263a6f8f3a857f9b803cc19d483181060cfb37118287924bee852d95be01d898585b0417d4aad71bd565ae2fce107fecd234777dfd4384302e602c6cd
+EBUILD valtz-0.7-r3.ebuild 577 BLAKE2B 5f9afb0bb6a709e2f89c3eef5f9403faea7418e8ae1cdac57671985d86db74b3ee1dc4071ea4aaa2039ca9444c8388d7fccf5f98e1cb0eac9b490d371d45a5fd SHA512 b8633fec0770b7b58c51547d27c4bed79b458638fbe85e92241c2cabd2cccc409a093894c1ecb72e0bd16af1803eb254fbff6549fcdcf90482d79ca06b676e21
+MISC metadata.xml 425 BLAKE2B 4d19148fc299036fffdd0c0c5b2dbbd35ee256071c36fad39a3595a95cc560466e10d680cf720c6b2a51d7304d21d734b7039c3fbc74f304cc9d5c8293ece42e SHA512 028d54f6c591f211acc6ae3605158053516e17424db39e34b8cf01706619421f65efbbb422e0bdfad88be4b1f539672782ad754201499ae3a40deb00c05c0ab4
diff --git a/net-dns/valtz/files/add-support-for-srv-records.patch b/net-dns/valtz/files/add-support-for-srv-records.patch
new file mode 100644
index 000000000000..f8b9435c2ba8
--- /dev/null
+++ b/net-dns/valtz/files/add-support-for-srv-records.patch
@@ -0,0 +1,83 @@
+From 9d29c28941ca629e223d0d4f20a833f10375d331 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Thu, 5 Dec 2019 10:28:40 -0500
+Subject: [PATCH 2/3] Add support for SRV records.
+
+There is a patch for djbdns that adds support for SRV records to both
+tinydns-data and axfr-get:
+
+  From: Michael Handler <handler@sub-rosa.com>
+  To: dns@list.cr.yp.to
+  Subject: tinydns-data SRV & axfr-get SRV/PTR patches
+  Date: Thu, 14 Sep 2000 20:37:50 -040
+
+Many distributions carry the patch, but valtz rejects the SRV records
+because it doesn't recognize the "S" indicator or know how to validate
+the port, weight, or priority fields.
+
+This commit adds support for the new record type, and adds validation
+routines for the three new fields. All of them are the same: ports,
+weights, and priorities are all integers between 0 and 65536.
+---
+ valtz | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+ mode change 100644 => 100755 valtz
+
+diff --git a/valtz b/valtz
+old mode 100644
+new mode 100755
+index eebda76..92aaa40
+--- a/valtz
++++ b/valtz
+@@ -100,6 +100,9 @@ my %token_name = (
+     'min' => 'Minimum time',
+     'n' => 'Record type number',
+     'rdata' => 'Resource data',
++    'port' => 'Port',
++    'priority' => 'Priority',
++    'weight' => 'Weight'
+ );
+ 
+ my %record_type = (
+@@ -114,6 +117,7 @@ my %record_type = (
+     "'" => 'TXT',
+     '^' => 'PTR',
+     'C' => 'CNAME',
++    'S' => 'SRV',
+     'Z' => 'SOA',
+     ':' => 'GENERIC'
+ );
+@@ -131,6 +135,8 @@ my %line_type = (
+     "'" => [ 'TXT', 'fqdn:s:ttl:timestamp:lo', 'fqdn:s' ],
+     '^' => [ 'PTR', 'fqdn:p:ttl:timestamp:lo', 'fqdn:p' ],
+     'C' => [ 'CNAME', 'fqdn:p:ttl:timestamp:lo', 'fqdn:p' ],
++    'S' => [ 'SRV', 'fqdn:ip:x:port:weight:priority:ttl:timestamp:lo',
++	     'fqdn:x:port' ],
+     'Z' => [ 'SOA', 'fqdn:mname:rname:ser:ref:ret:exp:min:ttl:timestamp:lo',
+             'fqdn:mname:rname' ],
+     ':' => [ 'GENERIC', 'fqdn:n:rdata:ttl:timestamp:lo', 'fqdn:n:rdata' ]
+@@ -340,6 +346,21 @@ my %token_validator = (
+         # TODO : Validation needed? 
+         my $result = 0;
+         return $result;
++     }],
++    'port' => [ 21, sub {
++        my ($type, $s) = @_;
++        my $result = validate_integer($s, 65536);
++        return $result;
++    }],
++    'priority' => [ 22, sub {
++        my ($type, $s) = @_;
++        my $result = validate_integer($s, 65536);
++        return $result;
++    }],
++    'weight' => [ 23, sub {
++        my ($type, $s) = @_;
++        my $result = validate_integer($s, 65536);
++        return $result;
+     }],
+ 
+ 
+-- 
+2.23.0
+
diff --git a/net-dns/valtz/files/allow-underscores-in-records.patch b/net-dns/valtz/files/allow-underscores-in-records.patch
new file mode 100644
index 000000000000..b76b231e6f15
--- /dev/null
+++ b/net-dns/valtz/files/allow-underscores-in-records.patch
@@ -0,0 +1,48 @@
+From 7c5df8ad5c18a9f8b9440dbd1ae4faacf55b452a Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Thu, 5 Dec 2019 10:34:54 -0500
+Subject: [PATCH 1/3] Allow underscore characters in FQDNs and pointers.
+
+Modern DNS records can contain underscores for a number of reasons. In
+particular, DKIM records involve a "_domainkey" part,
+
+  https://tools.ietf.org/html/rfc6376
+
+that is rejected by the current "fqdn" and "p" validation routines.
+Moreover, any SRV records will have a service name prefixed with an
+underscore:
+
+  https://tools.ietf.org/html/rfc2782
+
+To recognize these tokens as valid, this commit expands the "fqdn" and
+"p" regular expressions to allow underscores as the first character in
+each component of an FQDN.
+---
+ valtz | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/valtz b/valtz
+index c68c120..eebda76 100644
+--- a/valtz
++++ b/valtz
+@@ -202,7 +202,7 @@ my %token_validator = (
+         # check all parts
+         for my $hostpart (split /\./, $s)
+         {
+-            return 1005 unless $hostpart =~ /^[-a-z0-9]+$/i;
++            return 1005 unless $hostpart =~ /^_?[-a-z0-9]+$/i;
+             return 1006 if $hostpart =~ /^-/;
+             return 1007 if $hostpart =~ /-$/;
+         }
+@@ -268,7 +268,7 @@ my %token_validator = (
+         # check all parts
+         for (split /\./, $s)
+         {
+-            return 1005 unless /^[-[a-z0-9]+$/i;
++            return 1005 unless /^_?[-[a-z0-9]+$/i;
+             return 1006 if /^-/;
+             return 1007 if /-$/;
+         }
+-- 
+2.23.0
+
diff --git a/net-dns/valtz/files/fix-generic-records-support.patch b/net-dns/valtz/files/fix-generic-records-support.patch
new file mode 100644
index 000000000000..b266340a471b
--- /dev/null
+++ b/net-dns/valtz/files/fix-generic-records-support.patch
@@ -0,0 +1,33 @@
+mjo: cherry-picked from https://github.com/wKovacs64/valtz
+
+From 422cc33cf0da52d10c271a75cda271d5963da4eb Mon Sep 17 00:00:00 2001
+From: wKovacs64 <justin.r.hall@gmail.com>
+Date: Tue, 16 Dec 2014 17:13:17 -0700
+Subject: [PATCH] Fix support for generic records
+
+---
+ valtz | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/valtz b/valtz
+index e9b831f..c68c120 100644
+--- a/valtz
++++ b/valtz
+@@ -75,7 +75,7 @@ my %validation_msg = (
+     1007 => 'parts must not end with the - character',
+     1008 => 'integer out of bounds',
+     1009 => 'must have at least three labels to be valid as mail address',
+-    1010 => 'must not 2(NS), 5(CNAME), 6(SOA), 12(PTR), 15(MX) or 252(AXFR)',
++    1010 => 'must not be 2(NS), 5(CNAME), 6(SOA), 12(PTR), 15(MX) or 252(AXFR)',
+ );
+ 
+ # NOTE : ONLY translate the right-hand part
+@@ -331,7 +331,7 @@ my %token_validator = (
+         my ($type, $s) = @_;
+         my $result = validate_integer($s, 65535);
+     
+-        return 1010 if ($s==2)||($s==5)||($s==6)||($s==12)||($s==15)||($s=252);
++        return 1010 if ($s==2)||($s==5)||($s==6)||($s==12)||($s==15)||($s==252);
+ 
+         return $result;
+     }],
diff --git a/net-dns/valtz/metadata.xml b/net-dns/valtz/metadata.xml
index 9667cc45e608..ea885d1f24b0 100644
--- a/net-dns/valtz/metadata.xml
+++ b/net-dns/valtz/metadata.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>Simple validation tool for tinydns-data zonefiles. Also able to
-filter file(s) from errors, not allowed zones and not allowed record types.</longdescription>
+<maintainer type="person">
+  <email>mjo@gentoo.org</email>
+  <name>Michael Orlitzky</name>
+</maintainer>
+<longdescription>
+  Simple validation tool for tinydns-data zonefiles. Also able to
+  filter file(s) from errors, not allowed zones and not allowed record types.
+</longdescription>
 </pkgmetadata>
diff --git a/net-dns/valtz/valtz-0.7-r1.ebuild b/net-dns/valtz/valtz-0.7-r3.ebuild
index 0a8f39b368fe..002d679c03a7 100644
--- a/net-dns/valtz/valtz-0.7-r1.ebuild
+++ b/net-dns/valtz/valtz-0.7-r3.ebuild
@@ -14,6 +14,10 @@ IUSE=""
 
 RDEPEND="dev-lang/perl"
 
+PATCHES=( "${FILESDIR}/fix-generic-records-support.patch"
+		  "${FILESDIR}/allow-underscores-in-records.patch"
+		  "${FILESDIR}/add-support-for-srv-records.patch" )
+
 src_install() {
 	dobin valtz
 	dodoc README CHANGES
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /net-dns
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)