gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /net-dns
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
67 files changed, 895 insertions, 1443 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 850964741d9d..b827e85621c2 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 3d2bec4c0ece..e2c7cf60c178 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,5 +1,6 @@
 AUX autoipd-openrc.sh 700 BLAKE2B e71e5583db890f8ee1bbe9c03fc42285871089b2ea2d4549d553f14a20a3aa97c519b298bfaaccf02346c911f65f8e3f8bab7b2dc8270a5d35c471cc6bf31f6b SHA512 a5dbbac4d6d1959db3a07a63acb7569dbeba33d2274a1dd3253dc27687549371611cf08bad3998d89efb3ace63b5541a4d225e484274450e0c82661f5a1dbc32
 AUX autoipd.sh 1271 BLAKE2B 815c5776afff71489826eb8338535df1af6fbf02f3d42eedb6ebb69e5fff181e7252060818dd2dd67141a40c097ded8b7ac4210cb9929bab4b68ea99533bcf26 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3
+AUX avahi-0.8-disable-avahi-ui-sharp.patch 1397 BLAKE2B b04324648b09fdd69f017d0be068556ed443f888b56a0567c3f9647c80f959ddcaa7d2ee0022d6a9a8d6bdd60673ffe7086ae4f5065a47d7b62f5aa287931306 SHA512 1d824f16fffcc41015b507e8210f4daa127c9915387b0695d2e27a46a2d480783b679735ea1ffdd198f52470300e4ae9cfc731c62496ad6a3d7c8408c3ffd8dd
 DIST avahi-0.8.tar.gz 953319 BLAKE2B ddede1b8790ff3057ea5f4bb710e95578229e078a7abac83121e043017dda1ab3d971c723f920fdd4f3d98b88bd2cf21f9645bec1b7bbd2ea194cb399a5f5b46 SHA512 27bba9a551152dfc7e721f326042e7bfce55d227044a6cbaee04d6fb0e3f59c36e159c2b7a4dd42d1c955cdf37cc1c303e91991c08928bbded91d796e9a22abe
-EBUILD avahi-0.8-r2.ebuild 5275 BLAKE2B 20a25360d64fe3d6fcf07657bac0d42097095600c13703766d997a7f3cc64fc8cc3d75a85a4810664f0ee5159295e98f7a7b50691acac9321129c0cd74f3580a SHA512 f97c115e522b3318d5d212ce897078761442a45f6e6e198414947e50acd5986aa776c50bd262ef004d2bebb5b621919c106a70463a4392347b31027fadc8176f
-MISC metadata.xml 1002 BLAKE2B 5da5858bd8f074d636e9d08eaa3b91504fa1741def8e09a6c0234e0ac24734288971f502d7a894ffbf2fefdfc247336675b20e22ba46bf3d572f0db0d731152e SHA512 bd79bbb98f43867b91f5b8a5046beec5b91e66c72134ebc794e651f256c65f2efe964d40f641dbc544fd036bb98831a20280f5ffecbf07d349d9d5f7e4e93e58
+EBUILD avahi-0.8-r3.ebuild 5223 BLAKE2B bc45ca99ac5ba317aa20c23ac301982fd64aa682f9873e7231723a883d09feebfacb90851b46c5afea52feb141ebb1d9eb268aba5bb4d025afac3817ac12cfd9 SHA512 74eda66378f9437f9fe1b793ff3b5bf6d03c9f05bb5fef36811d8a682cc4d5fef8e49d66592f791d3ea589b70e9667244270dbb0c974aff69dbc4ef5e65a532c
+MISC metadata.xml 865 BLAKE2B 59950f0a850c79160f02f7a0d8f5af6a7b1f6813982bdc39244bd435d5f098d79a77fe918dfb6c81ac0d6673f90c70aa7378194f7086c6d6a89cae69590ea667 SHA512 ab1aefa11c59add17cabe4693ff44594ead164cb8d5cb3aa1193f48350bb74ffbb8f7a520d605ed52d3bd83e08d7b3a4a42a59cf55d8336c8fb4db431e8e28f1
diff --git a/net-dns/avahi/avahi-0.8-r2.ebuild b/net-dns/avahi/avahi-0.8-r3.ebuild
index 9571bd2d62fb..8c9e10456e2d 100644
--- a/net-dns/avahi/avahi-0.8-r2.ebuild
+++ b/net-dns/avahi/avahi-0.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -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"
-IUSE="autoipd bookmarks +dbus doc gdbm gtk gtk2 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux systemd test"
+IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux systemd test"
 
 REQUIRED_USE="
 	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
@@ -33,15 +33,11 @@ DEPEND="
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
 	gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] )
 	qt5? ( dev-qt/qtcore:5 )
-	gtk2? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
 	gtk?  ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	kernel_linux? ( sys-libs/libcap )
 	introspection? ( dev-libs/gobject-introspection:= )
-	mono? (
-		dev-lang/mono
-		gtk2? ( dev-dotnet/gtk-sharp:2 )
-	)
+	mono? ( dev-lang/mono )
 	python? (
 		${PYTHON_DEPS}
 		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
@@ -73,16 +69,17 @@ BDEPEND="
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h )
 
+PATCHES=(
+	"${FILESDIR}/${P}-disable-avahi-ui-sharp.patch" # bug 769062
 # These patches do not apply cleanly but may need to be re-instated.
 # I'll leave them commented out for now.
-#PATCHES=(
 #	"${FILESDIR}/${PN}-0.7-qt5.patch"
 #	"${FILESDIR}/${PN}-0.7-CVE-2017-6519.patch"
 #	"${FILESDIR}/${PN}-0.7-remove-empty-avahi_discover.patch"
 #	"${FILESDIR}/${PN}-0.7-python3.patch"
 #	"${FILESDIR}/${PN}-0.7-python3-unittest.patch"
 #	"${FILESDIR}/${PN}-0.7-python3-gdbm.patch"
-#)
+)
 
 pkg_setup() {
 	use mono && mono-env_pkg_setup
@@ -110,6 +107,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myconf=(
+		--disable-gtk
 		--disable-monodoc
 		--disable-python-dbus
 		--disable-qt3
@@ -124,8 +122,7 @@ multilib_src_configure() {
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		$(use_enable dbus)
 		$(use_enable gdbm)
-		$(use_enable gtk2 gtk)
-		$(use_enable gtk  gtk3)
+		$(use_enable gtk gtk3)
 		$(use_enable howl-compat compat-howl)
 		$(use_enable mdnsresponder-compat compat-libdns_sd)
 		$(use_enable nls)
@@ -169,7 +166,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake install DESTDIR="${D}"
-	use bookmarks && use python && use dbus && use gtk2 || \
+	use bookmarks && use python && use dbus || \
 		rm -f "${ED}"/usr/bin/avahi-bookmarks
 
 	# https://github.com/lathiat/avahi/issues/28
diff --git a/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch b/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch
new file mode 100644
index 000000000000..31b361d4e17f
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch
@@ -0,0 +1,57 @@
+From ebd2a01a7b5e88f3be35b2f803d5adbd36ae6593 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Mar 2021 22:49:08 +0100
+Subject: [PATCH] Disable avahi-ui-sharp
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ Makefile.am  | 6 ++----
+ configure.ac | 1 -
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 33c51f5..0e12120 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -46,7 +46,6 @@ EXTRA_DIST = \
+ 	avahi-qt4.pc.in \
+ 	avahi-qt5.pc.in \
+ 	avahi-sharp.pc.in \
+-	avahi-ui-sharp.pc.in \
+ 	avahi-compat-libdns_sd.pc.in \
+ 	avahi-compat-howl.pc.in \
+ 	avahi-ui.pc.in \
+@@ -77,7 +76,6 @@ SUBDIRS = \
+ 	avahi-compat-howl \
+ 	avahi-autoipd \
+ 	avahi-ui \
+-	avahi-ui-sharp \
+ 	avahi-libevent \
+ 	po
+ 
+@@ -188,8 +186,8 @@ CLEANFILES += avahi-compat-libdns_sd.pc
+ endif
+ 
+ if HAVE_MONO
+-pkgconfig_DATA += avahi-sharp.pc avahi-ui-sharp.pc
+-CLEANFILES += avahi-sharp.pc avahi-ui-sharp.pc
++pkgconfig_DATA += avahi-sharp.pc
++CLEANFILES += avahi-sharp.pc
+ endif
+ 
+ endif
+diff --git a/configure.ac b/configure.ac
+index 58db8c7..844360f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1166,7 +1166,6 @@ man/Makefile
+ tests/Makefile
+ service-type-database/Makefile
+ avahi-sharp/Makefile
+-avahi-ui-sharp/Makefile
+ avahi-compat-libdns_sd/Makefile
+ avahi-compat-howl/Makefile
+ avahi-compat-howl/samples/Makefile
+-- 
+2.31.1
+
diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
index 403d3fbd5a5f..c357c4fa1982 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -8,9 +8,8 @@
 	<use>
 		<flag name="autoipd">Build and install the IPv4LL (RFC3927) network address configuration daemon</flag>
 		<flag name="bookmarks">Install the avahi-bookmarks application (requires <pkg>dev-python/twisted</pkg>)</flag>
+		<flag name="gtk">Use gtk3 for the avahi utilities to build the avahi-ui-gtk3 library</flag>
 		<flag name="howl-compat">Enable compat libraries for howl</flag>
-		<flag name="gtk2">Use gtk2 for the avahi utilities (overridden by USE=gtk) and build the avahi-ui library</flag>
-		<flag name="gtk">Use gtk3 for the avahi utilities (overrides USE=gtk2) and build the avahi-ui-gtk3 library</flag>
 		<flag name="mdnsresponder-compat">Enable compat libraries for mDNSResponder</flag>
 	</use>
 	<upstream>
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 44b7e6e62902..1f14d391b663 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,5 +1,5 @@
 DIST bind-9.16.12.tar.xz 5017756 BLAKE2B e48fe94432a93df1f7f61b2d7ecb596e82a156deab3ee8dd3f5f11139028d42f839c483200ca6954076dfb68e768353a0ceb0d360d9e1dff3e36cf5ad06e8c43 SHA512 001613bd3c8bfc73d60bf3c053b233233a981132206e1ae5847820c5416ba0d65b0e026817ea3a718c7d3745c28a8de8dd9fb4355344955bead7bc2e1433e074
 DIST bind-9.16.13.tar.xz 5028340 BLAKE2B 7208d6361f84472a5549fd8d521878b1481c0930b1181fa79c99b9f7e7d3f736c120f0ca416e9aecca77015568428551937ee77449f441e9cd881779123e51b7 SHA512 1f3c8f54dd2c9e18cd9b67cfebb645d0a8e8f566add07fc4690cb8820bf81640c33b2b0685cb8be095e0f9ac84b2cf78176aea841a30c27d547b569b8353b07b
 EBUILD bind-tools-9.16.12.ebuild 3456 BLAKE2B 577787845f7cd50c9e13b9d61ed0635ab504f58c26ccdc04639793f9aee427369baa57e44d10fe23454f3cfa072abba1156ad2042827d1e93bbd05cebcdb50e8 SHA512 735208c923d7f2c6d751318138a0ba7f95692073cc41ebb9f875cc6c96faa6a9a37fd38b43376b8c015a3dcaa9f7d81146bb3e36ce69722282048717f48a2e10
-EBUILD bind-tools-9.16.13.ebuild 3463 BLAKE2B 07d1e5e6668b942085d7d2c3a45ef81c6fa974a6f7e384dfb1c354b97c6b575ccf0b82c4bee3ef457b24298c74045b6ad782a8d6dc0c5dd5237b522db013c7d2 SHA512 d1a444d02b76802bfe6b6f33db0415c311f9a94cc60d6e9d1744235744711fcba7540b153784e873bc9df8b36437f775527a82ad886c281e52403e99f7bb8473
+EBUILD bind-tools-9.16.13.ebuild 3581 BLAKE2B 62ed8b481120428e6af21bd8e03953c1e9b4e421e566c0dae9f0d165e4285e00c37fa601ddd9dcb62b8c68b5e9a50bc709690f42ccb6c954b65c23127d176796 SHA512 318772ae3fecc7e49c2a3731ceea7648c1ae4bd9fa901533847a3af330081b731592e09d7966cbe53d34d56506c9b3c0436287bfddb66a4c684fb574ee7b3ec5
 MISC metadata.xml 423 BLAKE2B 210c34f4faa1fa53d06d31b1bb401711c82102eeb319739ac85dd80d118a2cf6af7b3145e31a942b41afa56633265e5e950183e9421d9885a8278d55374ad889 SHA512 74d175fa11c79732223d09f91a8ead2d32140a508e05a45a897c85704a4c016701b4147f1c590eb3982eb01bcb14f33f51582b51564504505080e18953983b85
diff --git a/net-dns/bind-tools/bind-tools-9.16.13.ebuild b/net-dns/bind-tools/bind-tools-9.16.13.ebuild
index f983773f1fac..54919a230682 100644
--- a/net-dns/bind-tools/bind-tools-9.16.13.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.13.ebuild
@@ -55,6 +55,9 @@ src_prepare() {
 	# Disable tests for now, bug 406399
 	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
 
+	# it's meant to fix Solaris, but it actually breaks
+	sed -i -e 's/-zrelax=transtls//' configure.ac configure || die
+
 	# bug #220361
 	rm aclocal.m4 || die
 	rm -rf libtool.m4/ || die
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index fd5330e25255..050ef35ea486 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -1,3 +1,3 @@
 DIST c-ares-1.17.1.tar.gz 1518701 BLAKE2B 31dac21ecae231e2a201dc1ba954c1a0663a06f93eb8e7e033ca3c6d385f53e07af0b04854739f1ee8a7f0693f67f620143e152ef092b49342c62279a0480905 SHA512 b11887bcc9274d368088e1a8b6aca62414f20675cf0bc58e948f54fa04c327c39dd23cefe7509eec6397db14b550a3f6b77f5c18b3d735b3eef48ce2da1dcd00
-EBUILD c-ares-1.17.1.ebuild 909 BLAKE2B 5511694315d6dcc195d7a34458eeaa405aeb5e3b24ab38cd62ec040109ce62929caec0e9203cc3b52f66a505098374b1eeef68dee49647f145eb6049ccabd2fa SHA512 a7555b7a7a21847396ac98dfde618ef96548b4ac2a197515dbf2135bc15d569e3f5e369482bf4dcb1adf6b2cec425d633e35a53e40a4da481a51271fdedf16fc
+EBUILD c-ares-1.17.1.ebuild 903 BLAKE2B d917ecb20945f9625b9a559d3020afb1884a552163dba9fa68283456a42a838d2255624d036e3e593906ac3fc4572ce97ac1b2b06d5751ae8c5370f79ba54104 SHA512 60a88a0d054ee7d63c0015b9918684bcaaf3dd0add0a35aacdd6539406f4fdc1df254913b25c6f93e70512071643be3bb3febc352d49913ae37a7a3fd6594e62
 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.17.1.ebuild b/net-dns/c-ares/c-ares-1.17.1.ebuild
index 4d7c73e9bc7a..7a5e47f10609 100644
--- a/net-dns/c-ares/c-ares-1.17.1.ebuild
+++ b/net-dns/c-ares/c-ares-1.17.1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit autotools eutils multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="C library that resolves names asynchronously"
 HOMEPAGE="https://c-ares.haxx.se/"
 SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ca165b545fdc..8d4bd7eef49e 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -1162,5 +1162,5 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 EBUILD coredns-1.6.9.ebuild 37542 BLAKE2B b262e6e35a99cd7b5240502cb60f62e6f7c3ebbbe10e6948eb54bddacfed6e9d00275aced5d8b4233c81360d17b95e90d7ba111689855cbb1c833eeb7239e3bb SHA512 8a0570c92695815ab87e916a48a9aa313a7e7b5c17e7db3e31a6cf394750b358db36c1ee3f5d2b44fa17abc2f13883945fa88a8ca6c777fda90b8d018d6196f1
 EBUILD coredns-1.7.0.ebuild 47042 BLAKE2B 27cdbce782d2fc6872b9fd159dd564c0b72fb592ccb82275e74f0e02fa55f02a363eaebbb9b161f4369390031aef3197f9ab38639c2083e0c263f081240e1be6 SHA512 2e80ecadeb41ce07b5c858dc07e98b56b355f73afbf9f523aa5806daaad1637f41cbe2a4f6e1d4429fae858095d2ca70a3229a99e9fe1b75f4c63efdfc9ac2b9
-EBUILD coredns-1.8.3.ebuild 46678 BLAKE2B 041fdf7a5154f175874921e48abb47f2dd7379a9e6f222c0a5d5dfe8430088f2bfa3fcf087756ed4e8fc2384c6c92c40f408ab223aad06c84f88bef6b9db9282 SHA512 52a5a70ea5943434c4ac207ab04cefbfd6352862a6e085f7af5b4c8f550fc74a244c931cd713e8e9b7880037611cf19e80300b5d20c54906491ee63d1300c48a
+EBUILD coredns-1.8.3.ebuild 46679 BLAKE2B 9cc10ea221888888e4200e7c08f11bb1bb2e7460fb120b79286602568f696c065c7393bb43f5469000cca232d207660d02a6d1c6e2fc85a28fde917ef25c97eb SHA512 8cea96b4b737bf2a0a29bfea0140910345ac765e627e9e777e4eb69f5a2d18323aa1c74645db6370be07eb240f8edea0a851eb812a3326938b9fdbacb1a5ac4e
 MISC metadata.xml 782 BLAKE2B 16d03af7e36cb4fafb32cad39444432f4f43df03895c1a83028c13dd1c4e997c35014456fe3e5587f82f609e979489c9971e7e21122092bc2266b19778a53fe7 SHA512 783e304ab7158e9ec6c91caa2649f43e056e915e5a2d0647ac8c7a72892222e50d3e64e6ae297be9088a45bbecb21265ccdb3afe5857de06e4cd628b50497c75
diff --git a/net-dns/coredns/coredns-1.8.3.ebuild b/net-dns/coredns/coredns-1.8.3.ebuild
index 4dadd03c55fe..5bd6ee625fde 100644
--- a/net-dns/coredns/coredns-1.8.3.ebuild
+++ b/net-dns/coredns/coredns-1.8.3.ebuild
@@ -851,7 +851,7 @@ RDEPEND="acct-user/coredns
 	acct-group/coredns"
 
 FILECAPS=(
-	-m 755 'cap_net_bind_service=ei' usr/bin/${PN}
+	-m 755 'cap_net_bind_service=+ep' usr/bin/${PN}
 )
 
 src_compile() {
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 3195cd5842e4..a37085ec1759 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,4 +1,5 @@
 AUX 1.05-errno-r1.patch 242 BLAKE2B b02d686bbdad4178de2e8ba822feeeec5a3aa4549119c86ec806bfc34d0bebdcef7ee6bb2f57ffe73dc42e9d96b2bf08a28be7502aa8974f8f96cd32dcece178 SHA512 086d02600034d486f084fd2500aba9041dfa02110781594cdc3781a3ad7823f61f11c54c053c8c1241f58660527abe536906aba0e7f6c49ed3b8dbd74ba8f2b7
+AUX AR-and-RANLIB-support.patch 1208 BLAKE2B 19f2ee53ae5dde37551245775964a789f812870a50311a6b8be361af8c655222acc416e641133561b2953390f345b53032d10b7aeb4e34ff0ea7aa55b43eb7f3 SHA512 b1b73a4bf83b6ed4643370c0f1d43c65b96f25cc7582fe230003c31444b4e58476130c9466dc40c197669333882a682b8addf3c0fedc66a2bb341f24d0101759
 AUX CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch 9954 BLAKE2B ab189b25421c016bd24ecc34d9eae3552eeeb1303d158a2adeeb9c27b48a8935425d76f803104ba0be4bcc1bacd6cac48fb9b800c7401ea306d017525404b0cb SHA512 3ff6e971739bfe7f0fd7defd6520f4a03f88dd907668018c10efd91d03e4dbc2068773953d6feed22308d82fb2d38066b2102c6f6fd738c15c4bee6835a52dce
 AUX CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch 9914 BLAKE2B 3224e58eac5ac254359158a193b8a4c7618ff12826cce0f71b7c45e9c886ff54d1fb883d02a6b2d80801f395b721dee46390b6b5191e22cc5f2d75da06f2b08c SHA512 59e9aae2fd8e7c1e4d275066afceaade3b1276c6cda78cd58fef1dfbe9749c9e1bb415a80643b3c50a33372166aec055a9b3a6bcb3ed4cfd77e6e6038e069cff
 AUX CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch 3043 BLAKE2B 224cf29a7db357c3c421212cc240c16801ea544e1cbad65605e0ba8413139c09d37144f2f784a751015abbb99c2f36e3716c28a821b8f66edf02310c72d28417 SHA512 f830bfd2fabd4d9b4e2649bcc4061d656d4645b93829415d070b26c6a22e8e17d941666b8e776947bf9a8ef93007f77d8be57fc9911dcc6dc2b7ac607d556ba0
@@ -16,4 +17,5 @@ DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 2fef7e1be8a427b2c426c2af58bf4c22795e64
 DIST djbdns-1.05-test28.diff.xz 22072 BLAKE2B fff6c13220adfa056a0ac5942ff9385d83b75f8622adaebab65f557a2ca8d014fe3c255fe55ba9afca56b24880b7cd28597b26b5bcc3bbbd3ef9f581b67004fd SHA512 7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9
 EBUILD djbdns-1.05-r33.ebuild 3671 BLAKE2B a1316a82339046ec5560d0b1b458fbbaf202d7e8ebcfbccd9568ddf7fa5cbe84a827fd2b9e3720567fbb8cf27bbe50e51867425a9b249b1d8830501120487671 SHA512 5f73d51ada1789dd96c372b5ca9a587031136fcf60a72e0ecac7a0481a73f52394016723f98dcf6a16f7e7af4f0e4d9626678db77aa16fde067349d334c0287e
+EBUILD djbdns-1.05-r35.ebuild 3569 BLAKE2B 6f602fa7d150737f3d41f5a4f6d121bb58135ca194220902413a7849d0c33bd6062927b3bee6855fa40a291541737694538d7b1c44719c2722a70ad22d38d5e9 SHA512 3247af298946d5a746e24b5643de79b962d525669bc72498dd72b1ce51c58b36185313480421cb0d4c37765ceb00f35a12fc457cbb3fe1db32d0ca0e34c46044
 MISC metadata.xml 244 BLAKE2B c21c7a6cd7f859220baee98b22912e06955a7d63b4fc954a40507126ef6cb30659a3b7e89e798bb7d074814810f9625d3979ed2ac8877e213dc378da841bc786 SHA512 125b00b9e85650a6dcc365871f9f8be44d85cde4b938a66f7d96b6dc0237a1cae68b30be1ee16d7850998fc31be35eaf459df1bb7d9ea169904854b532f37bab
diff --git a/net-dns/djbdns/djbdns-1.05-r35.ebuild b/net-dns/djbdns/djbdns-1.05-r35.ebuild
new file mode 100644
index 000000000000..8cc9d5c60aac
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r35.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Collection of DNS client/server software"
+HOMEPAGE="http://cr.yp.to/djbdns.html"
+IPV6_PATCH="test28"
+
+SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
+	http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
+	ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.xz )"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 selinux"
+
+DEPEND=""
+RDEPEND="
+	acct-user/dnscache
+	acct-user/dnslog
+	acct-user/tinydns
+	sys-apps/ucspi-tcp
+	virtual/daemontools
+	selinux? ( sec-policy/selinux-djbdns )"
+
+src_unpack() {
+	# Unpack both djbdns and its man pages to separate directories.
+	default
+
+	# Now move the man pages under ${S} so that user patches can be
+	# applied to them as well in src_prepare().
+	mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
+}
+
+PATCHES=(
+	"${FILESDIR}/headtail-r1.patch"
+	"${FILESDIR}/dnsroots.patch"
+	"${FILESDIR}/dnstracesort.patch"
+	"${FILESDIR}/string_length_255.patch"
+	"${FILESDIR}/srv_record_support.patch"
+	"${FILESDIR}/increase-cname-recustion-depth.patch"
+	"${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
+	"${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
+	"${FILESDIR}/AR-and-RANLIB-support.patch"
+)
+
+src_prepare() {
+	if use ipv6; then
+		PATCHES=(${PATCHES[@]}
+			# The big ipv6 patch.
+			"${WORKDIR}/${P}-${IPV6_PATCH}.diff"
+			# Fix CVE2008-4392 (ipv6)
+			"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch"
+			"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch"
+			"${FILESDIR}/makefile-parallel-test25.patch"
+		)
+	else
+		PATCHES=(${PATCHES[@]}
+			# Fix CVE2008-4392 (no ipv6)
+			"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch"
+			"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
+			# Later versions of the ipv6 patch include this
+			"${FILESDIR}/${PV}-errno-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_compile() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+	echo "/usr" > conf-home || die
+	emake AR=$(tc-getAR) RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	insinto /etc
+	doins dnsroots.global
+
+	into /usr
+	dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
+		*-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
+		dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
+
+	if use ipv6; then
+		dobin dnsip6 dnsip6q
+	fi
+
+	dodoc CHANGES README
+
+	doman man/*.[158]
+
+	readme.gentoo_create_doc
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS='
+To configure djbdns, please follow the instructions at,
+
+	http://cr.yp.to/djbdns.html
+
+Of particular interest are,
+
+	axfrdns : http://cr.yp.to/djbdns/axfrdns-conf.html
+	dnscache: http://cr.yp.to/djbdns/run-cache-x-home.html
+	tinydns : http://cr.yp.to/djbdns/run-server.html
+
+Portage has created users for axfrdns, dnscache, and tinydns; the
+commands to configure these programs are,
+
+	1. axfrdns-conf tinydns dnslog /var/axfrdns /var/tinydns $ip
+	2. dnscache-conf dnscache dnslog /var/dnscache $ip
+	3. tinydns-conf tinydns dnslog /var/tinydns $ip
+
+(replace $ip with the ip address on which the server will run).
+
+If you wish to configure rbldns or walldns, you will need to create
+those users yourself (although you should still use the "dnslog"
+user for the logs):
+
+	4. rbldns-conf $username dnslog /var/rbldns $ip $base
+	5. walldns-conf $username dnslog /var/walldns $ip
+'
diff --git a/net-dns/djbdns/files/AR-and-RANLIB-support.patch b/net-dns/djbdns/files/AR-and-RANLIB-support.patch
new file mode 100644
index 000000000000..792bc22a82c5
--- /dev/null
+++ b/net-dns/djbdns/files/AR-and-RANLIB-support.patch
@@ -0,0 +1,48 @@
+From 5dde3af17a784615ab52130702458ca83d5b18bd Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 19 Apr 2021 21:11:02 -0400
+Subject: [PATCH 1/1] Makefile: support AR and RANLIB variables.
+
+These variables should default to the generic "ar" and "ranlib"
+commands, but if the user specifies them we now respect them.
+
+Gentoo-bug: https://bugs.gentoo.org/784230
+Gentoo-bug: https://bugs.gentoo.org/784233
+---
+ Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1429643..5742195 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,8 @@
+ # Don't edit Makefile! Use conf-* for configuration.
+ 
+ SHELL=/bin/sh
++AR ?= ar
++RANLIB ?= ranlib
+ 
+ default: it
+ 
+@@ -581,7 +583,7 @@ warn-auto.sh systype
+ 	( cat warn-auto.sh; \
+ 	echo 'main="$$1"; shift'; \
+ 	echo 'rm -f "$$main"'; \
+-	echo 'ar cr "$$main" $${1+"$$@"}'; \
++	echo '$(AR) cr "$$main" $${1+"$$@"}'; \
+ 	case "`cat systype`" in \
+ 	sunos-5.*) ;; \
+ 	unix_sv*) ;; \
+@@ -590,7 +592,7 @@ warn-auto.sh systype
+ 	dgux-*) ;; \
+ 	hp-ux-*) ;; \
+ 	sco*) ;; \
+-	*) echo 'ranlib "$$main"' ;; \
++	*) echo '$(RANLIB) "$$main"' ;; \
+ 	esac \
+ 	) > makelib
+ 	chmod 755 makelib
+-- 
+2.26.3
+
diff --git a/net-dns/dnrd/Manifest b/net-dns/dnrd/Manifest
index bef3ef9c0eb1..bd08b421bd59 100644
--- a/net-dns/dnrd/Manifest
+++ b/net-dns/dnrd/Manifest
@@ -2,5 +2,5 @@ AUX dnrd 444 BLAKE2B 100e9de8f2f3191b4b1c8e78bea41f4a8ae2f5b1b48eca025d5e55f0724
 AUX dnrd-2.20.3-docdir.patch 719 BLAKE2B 45cf21aaf65ef35c7de3ffd12398d6962fed28a86a5c91d7b1e17d838a0564c41313e11633e2da0fed010ab194c92bf6c09b8e9e83ab8d90ae49588ee6c39877 SHA512 384359d82e0b3cc3e70c9b6dc25363d4bbd117fb555022840eaa9061059c71575581e83243991941ad60282a3e964262b7f4c87379b7e0d038f5658db9de51e9
 AUX dnrd.conf 250 BLAKE2B a9334bdd7ed06152068e22d72c7fbb5c4de97fa888e0b0cde6a6517c8d29e47e9727c0bfdb732156b77e7f825413d31c808565c5a65103d90828ba04bbc3ee92 SHA512 461bbebba321b5216a15ea9550342ca9f7374af6446c2f515a3f5ce35bf45480c8f684b60ce8c206ec017e7ca060d4588c0d2da026d2e99162f3f9a6e58f03d2
 DIST dnrd-2.20.3.tar.gz 161887 BLAKE2B e04941fe59a8835386d398aa4a76bb0b2562705f98994b1d9d6c57557499de49a084dd2c3bab4c25499c81267fb336bac7a2b27dd8efd77164bf8d5409b2c94c SHA512 a526ec9c2f82ac36fa7beaf864ab39c56e5956530b10115ad2ca2f79ecb820fe865d9da9edd1dea5f4cb97508afbec88f0606b03f87baba25561c097e7c0ea9b
-EBUILD dnrd-2.20.3-r2.ebuild 594 BLAKE2B 066fef67266ca9b4e765a13d42341f8ff74463cb2e17479224c9713407a1619c501ce22b62520cbd0bbfb0249ac623993876d89bfd102df05522fb0d6e1651f8 SHA512 3f9299d991e4e4b9de04fe08e756d54359c5d81910cfe858fc9e2aef120e2b3ca8357a0b442972ce68c333609a0a8e670c2232eac4cfbbf115d903808b37aeef
+EBUILD dnrd-2.20.3-r3.ebuild 563 BLAKE2B b02764ec765255bec16954f0f61b18ff7bd933f2bdd84211241c334163de3b9e0c51c5c406ff27114fda62ce61a13de66fff3bcff8b1edf9ee41ca518a80de7c SHA512 de155101a45e517a2c1785131b95acc0ab32eb4cd3facdc0f2cccd3fc6c620dbaf104cfaed49c19071bfb12b4c1554b9db5e62d3b6bdaa8f96a6fc64c8bf5772
 MISC metadata.xml 455 BLAKE2B 4f423f5ea5c92a093b5c09d7cf9ce5f4b380ac58911f236ca89655104a24c01c298aa19d389009c5c04532bf3320dea75b155a38237cd41113eef75e41a0b7a6 SHA512 74e9f0700866a28065395947e4b37f2f06d68a1ff2886bb2574cc164d94f2104ca37f4d029f28032164d7f29c7b59d9b228456a0ac55a2382fd37c2affa69723
diff --git a/net-dns/dnrd/dnrd-2.20.3-r2.ebuild b/net-dns/dnrd/dnrd-2.20.3-r3.ebuild
index 571076853a7f..973a1d043f7e 100644
--- a/net-dns/dnrd/dnrd-2.20.3-r2.ebuild
+++ b/net-dns/dnrd/dnrd-2.20.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools user
+inherit autotools
 
 DESCRIPTION="A caching DNS proxy server"
 HOMEPAGE="http://dnrd.sourceforge.net/"
@@ -15,6 +15,11 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 PATCHES=( "${FILESDIR}"/${P}-docdir.patch )
 
+RDEPEND="
+	acct-group/dnrd
+	acct-user/dnrd
+"
+
 src_prepare() {
 	default
 	eautoreconf
@@ -27,8 +32,3 @@ src_install() {
 	doinitd "${FILESDIR}"/dnrd
 	newconfd "${FILESDIR}"/dnrd.conf dnrd
 }
-
-pkg_postinst() {
-	enewgroup dnrd
-	enewuser dnrd -1 -1 /dev/null dnrd
-}
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 6aee80843454..c7b9db11b4ac 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -6,6 +6,8 @@ AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f900
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
 DIST dnsmasq-2.83.tar.xz 513880 BLAKE2B 16220fd7eac03f3ba70b014ace3c9775a85b31cdbabd7680d88a87697453a54bfec4c553207477f416032e679dbdaf3ca6c8bb56b72ee423540e0bedf0621865 SHA512 1eaade775dc19658afe825407c10456ab954b82034644bb19af2594d737ceae17ff2cee7f1f917e8e8b2dadbfbcb83dd8b842c0693fcac71487a5fade1eb4b05
 DIST dnsmasq-2.84.tar.xz 514216 BLAKE2B 2bca97c16bcf32e0126eb50dc14b82a1f37e1635ebd1dc205e9a92455640fcbb98c093be725768ba9ced84443e451775f8556a164c82967e09e1df4bf7fc901b SHA512 e84bdcdf3cf35f08e8492eb5aa89ee6543233bdb821d01f164783bd6d0913ec01c513e85e2109352c77e77142a1a94bedcd3361f37d7b2a9a5d35a02448e85c6
+DIST dnsmasq-2.85.tar.xz 518316 BLAKE2B b7c081132c65d67b65f797bdbc603930c1509717bc1b5209b12f72fa3f01b4bae2f26a5387f95ef20317cd3d60e097c0b8bef5e019a35013f3ed2acce9fe9e89 SHA512 8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09
 EBUILD dnsmasq-2.83-r101.ebuild 4655 BLAKE2B ee0df2583a57fc499f5e9846522064c496967a25168bfcb945cd04b3b8131a5230dead8009898cb632bfa05898be1c4eab358f6025c85359c4db556d9fbdf4b8 SHA512 3424bff3bb3993c9ed8146ec8075d58c27289981c8a85dfa978529b579e5a0d438c80af6d12a0bb8d921a064fabc58f52994b24d6af18335009e95e2dbb4323c
 EBUILD dnsmasq-2.84-r101.ebuild 4724 BLAKE2B cd611e17b8494a7b6c67474996ac061b1255c4213e5174771c3d5cd1984e748d57beb45a23f8e43c3da0783175f0487bb5c2a7f45bf6501ca7e2e2f012a77386 SHA512 ec8b31735e3e2057bdefb4c8ed2ff562655986abebf9c539bbd4d93077e732a1146050fcc0249110af6087c9245fe1734d983dbc5c24d31dd9364a6add5e0e34
+EBUILD dnsmasq-2.85.ebuild 4662 BLAKE2B f9f8339ba7a5b2a195aaf5ce53184a568962949dae064bc2259aac9a06b5940cc36b658cebb145aeae0ea73384ea776cf838b7c48efb69ad07031b4e60383ad1 SHA512 9678027010e0b521d36c9347d9c2ac896be1d20b2ce19329acf7908e3ba491ab32b6958a1003667dcea302244002552cf4e13ddd94da8f3f0d890bade1a780fc
 MISC metadata.xml 1355 BLAKE2B 4441a99669977dd0a5464b4de4f0a46a1a69aea4438916dcf5e55db529b8ca05c1f652af58d0dae4c7dd7542f0748515929f493a328dd8c19a2e436d39351eec SHA512 e2fbb896d5842833cefd014e80ba20bed7f0560479f8fbf05d87dfe6ae09780c648eb588caca2e1b558c27e085e842c09784e7942903e4ab57d1fdcda26b830f
diff --git a/net-dns/dnsmasq/dnsmasq-2.85.ebuild b/net-dns/dnsmasq/dnsmasq-2.85.ebuild
new file mode 100644
index 000000000000..018e108669b5
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.85.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit toolchain-funcs flag-o-matic lua-single 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 ~sparc ~x86"
+
+IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
+IUSE+=" +inotify ipv6 lua nettlehash 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="
+	acct-group/dnsmasq
+	acct-user/dnsmasq
+	dbus? ( sys-apps/dbus:= )
+	idn? (
+		!libidn2? ( net-dns/libidn:0= )
+		libidn2? ( >=net-dns/libidn2-2.0:= )
+	)
+	lua? ( ${LUA_DEPS} )
+	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 )
+	dnssec? ( !nettlehash )
+	lua? (
+		script
+		${LUA_REQUIRED_USE}
+	)
+	libidn2? ( idn )
+"
+
+use_have() {
+	local no_only
+	if [[ ${1} == '-n' ]]; then
+		no_only=1
+		shift
+	fi
+	local useflag="${1}"
+	shift
+
+	local 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_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+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;" \
+			"in this case the static USE flag does nothing."
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -r 's:lua5.[0-9]+:lua:' Makefile || die
+	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" \
+		dnsmasq.conf.example || die
+}
+
+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 nettlehash)
+		$(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() {
+	[[ -f /var/lib/misc/dnsmasq.leases ]] && \
+		cp /var/lib/misc/dnsmasq.leases "${T}"
+}
+
+pkg_postinst() {
+	[[ -f "${T}"/dnsmasq.leases ]] && \
+		cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
+}
diff --git a/net-dns/dnsviz/Manifest b/net-dns/dnsviz/Manifest
index 24b8a69e0fe7..8c0021e967aa 100644
--- a/net-dns/dnsviz/Manifest
+++ b/net-dns/dnsviz/Manifest
@@ -2,7 +2,7 @@ AUX dnsviz-0.8.2-add-ed448-support.patch 6452 BLAKE2B 77f12acf3bd4224200f677b248
 DIST dnsviz-0.8.2.tar.gz 404265 BLAKE2B c4ba6b5a7d6fee7c8e2cba0c90f29560152dd4beed1ef4d80a6a3bf9f81646ee8f0d61c38329233e300f2b434cb5d9e9d2a926dc72997ae68ff0a57e147bafcf SHA512 5414d9bda6c0bf5fdc5a84a09cb5833619110702749b12f87d63f5149de473f4bd1b6960c506c60ec5fc5ff82d789536cee70a299ff13c960a45776de2916c80
 DIST dnsviz-0.9.2.tar.gz 477947 BLAKE2B 62b94e6b05d1129d5c4655ff1faf8adb3c2eec868db6049e09dd180cebccab94412eee25293d83ec3e6bc5b18fae33ba0acfe3c3b30cececdd4952005879eab0 SHA512 8ad9e1aabb4704ff4939617532c32e5edde0d369efd2e4a7a6f30d33b8bac941b2d1073e98fed90e2a11438a0b1c18b8fafe07f4122fb888ebdb24bd2426abf6
 DIST dnsviz-0.9.3.tar.gz 477931 BLAKE2B e3e020fdddacdf06a4e7b78edade72136d6530dac5b243b30e97f609c9fb3b912fb6d6c00b8c54e17f1d2ba411a2b116f9cb89bfc51c01f43d8a1a03a00755aa SHA512 8ccaa29df6cc7824db7153950d5cb423d1ac7a76ae20a15b35c2e66d362b3340e23a9973f71b884ea7e7b861e2bb0051e32abc3e45795792a7db3b01b62449c5
-EBUILD dnsviz-0.8.2-r1.ebuild 1716 BLAKE2B 43691ab360ea1eb74b9fd366ccfcd80e48ae10f336124ae176fa4b92a45965f80ed31dffda23f76fb29e2e42620c9d53b95a49f9d19b7a1722a7b0fee1626a2f SHA512 3a311bca10f923e84d19a88e4bb95da1ed79e22bd429b338537959b146c4122dec317494a3781279205a1435571619e4971c2e11386e6f39cf4c4b36c52ffb66
-EBUILD dnsviz-0.9.2.ebuild 1514 BLAKE2B c326f5b921b3a0516d688ad3caa5ab38a95099a946e5fff3775e1d97775239c48407730098bdda5747967fb056c39d1c61b2d004a59c93daa02a2abe3d9a2c06 SHA512 81021f27b7a4100e6e5321132f588bb8295e8dfe4f03e9297eb5f5b53fc30ac4bb118e84e171aa0bef490e075574e55c8984330664c93135763c07d5969f7d46
-EBUILD dnsviz-0.9.3.ebuild 1514 BLAKE2B c326f5b921b3a0516d688ad3caa5ab38a95099a946e5fff3775e1d97775239c48407730098bdda5747967fb056c39d1c61b2d004a59c93daa02a2abe3d9a2c06 SHA512 81021f27b7a4100e6e5321132f588bb8295e8dfe4f03e9297eb5f5b53fc30ac4bb118e84e171aa0bef490e075574e55c8984330664c93135763c07d5969f7d46
+EBUILD dnsviz-0.8.2-r1.ebuild 1665 BLAKE2B 8fc98b6e8541017e8ef69860f5f4c303ae0bd1052df844d292d32b9f4cbe8fa8c948c113cabbd79c3956637401c3ce6296e327b7c469a63eb9e12e6966d6a95f SHA512 6d282ff6cd563d83b8fe667bc65ba16dd714938301df646025d6f68cea456e6eb1390fc18279ab4bf3f8d143d151c648d688d2c76b8b8e0653b7e02a1b1fad0b
+EBUILD dnsviz-0.9.2.ebuild 1463 BLAKE2B 6a71e37c098775c6b3ed137b7226481e89ecc1acf64c618dd3c7d13c47b2ea8fe4912fc7a3120787c1ba5ff17f74909d226b4b7c75a87e3ac38651cab79d1b13 SHA512 197a8c4423fb4f62d1dc7386be493e307d746bc5b61be4a6130150ec4aa09f4979c1eae460ad1428c4f0d75da0ef93b969bbd8694eeaa44198de2c4b7d1b0ad4
+EBUILD dnsviz-0.9.3.ebuild 1463 BLAKE2B 6a71e37c098775c6b3ed137b7226481e89ecc1acf64c618dd3c7d13c47b2ea8fe4912fc7a3120787c1ba5ff17f74909d226b4b7c75a87e3ac38651cab79d1b13 SHA512 197a8c4423fb4f62d1dc7386be493e307d746bc5b61be4a6130150ec4aa09f4979c1eae460ad1428c4f0d75da0ef93b969bbd8694eeaa44198de2c4b7d1b0ad4
 MISC metadata.xml 829 BLAKE2B 2c2ba75f7e751553e235c661645e887a87c573dfab97cd7b3383bc9eee53dc74254971aedc2fdf255b548d36ab1319046f29c35a3ac7c9e1f8aff3fe4dd898ca SHA512 bab42a3edb09f79961ab58a9c2d38151e5fd924091def378aafdf8987ba02e0ddd9a06d7fa4a2fe0d58a55477fd5dda665dd6d65b7055f3946ef46b72a23944a
diff --git a/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild b/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild
index f1b35b8fe99f..e3feb492a94d 100644
--- a/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild
+++ b/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,7 +49,6 @@ python_test() {
 }
 
 pkg_postinst() {
-	elog "Support for extra feature can be get from:"
 	optfeature "Support for pre-deployment testing" net-dns/bind
 
 	# Warn about extra requirements for >=OpenSSL 1.1.0
diff --git a/net-dns/dnsviz/dnsviz-0.9.2.ebuild b/net-dns/dnsviz/dnsviz-0.9.2.ebuild
index 7c7e9021cc6b..d1f444d39db4 100644
--- a/net-dns/dnsviz/dnsviz-0.9.2.ebuild
+++ b/net-dns/dnsviz/dnsviz-0.9.2.ebuild
@@ -47,7 +47,6 @@ python_test() {
 }
 
 pkg_postinst() {
-	elog "Support for extra feature can be get from:"
 	optfeature "Support for pre-deployment testing" net-dns/bind
 	optfeature "Support for DNSSEC signatures using GOST algorithm or digest" dev-libs/ghost-engine
 }
diff --git a/net-dns/dnsviz/dnsviz-0.9.3.ebuild b/net-dns/dnsviz/dnsviz-0.9.3.ebuild
index 7c7e9021cc6b..d1f444d39db4 100644
--- a/net-dns/dnsviz/dnsviz-0.9.3.ebuild
+++ b/net-dns/dnsviz/dnsviz-0.9.3.ebuild
@@ -47,7 +47,6 @@ python_test() {
 }
 
 pkg_postinst() {
-	elog "Support for extra feature can be get from:"
 	optfeature "Support for pre-deployment testing" net-dns/bind
 	optfeature "Support for DNSSEC signatures using GOST algorithm or digest" dev-libs/ghost-engine
 }
diff --git a/net-dns/ez-ipupdate/Manifest b/net-dns/ez-ipupdate/Manifest
index 081f3ef1e412..441f41c947c4 100644
--- a/net-dns/ez-ipupdate/Manifest
+++ b/net-dns/ez-ipupdate/Manifest
@@ -1,10 +1,11 @@
 AUX ez-ipupdate-3.0.11.13.3_beta8-3322.diff 1934 BLAKE2B 4492e08e46f33693ea1f8c330fe8ac8f3d912c266ae584791c1b0a88568365b3598be279f0a865ebb7297c071d925ac787af8587ddb3f371be80994f7ae0c2fa SHA512 b6a5bf2d7bc46d192d20a25cf9a220703553f3143f6db681366b90815a28be7fb716618b8a13302d0e892924b4803c8ceb535df6026e4f3154118812f1f87647
 AUX ez-ipupdate-3.0.11.13.3_beta8-dnsexit.diff 6770 BLAKE2B fa5dfa7063ebc3cdbe6d4824a56c28c49a58b0c2d875ff97162c117df8cf1536b59a5aaf4c06f716dc74140c3982f9cb74a50004d0e5a03b4478f1c2389fab43 SHA512 e3f14a06383c3a49453b5b4b37e2030d17289ed4d43f15e7a48739e40adced66857820328a2635b814c1003541b3f0ea9bf46d3343c2ffe5fea27b2872a20670
+AUX ez-ipupdate-3.0.11.13.3_beta8-fix-format-mask.patch 1162 BLAKE2B eba6d6b58910e22c4451e132dfbd8bb996f91c333e828b0e3964c31c9c743bc5aa58c08d17fa96c00af5f776d4b378f67e351288ec215592c85d9e18986a8256 SHA512 091da8edb430f699a4b4c93ac20e307a47c8f5845cd510640203f5c7ce965b70b2da5d274def3b28b36eb66fdac88bd40315a6dd367141eb0744d62c1e0b807a
 AUX ez-ipupdate-3.0.11.13.3_beta8-ipv6.diff 767 BLAKE2B c07ed8e9a72de144d2aff588334259881c323213f08c363bc0b2a22a54f2c338878d26357ce6f99148310494675506de78a22d7ba6b25afe4d522d6214d4ae7d SHA512 7b62ce5ad610963beac5138ecb797fd2a36643720c25cae4efe94621c92e9b57dd2c73b2320735c56b477f06894e35e9eeb085b8c365729728c05eb6d0d78ae4
 AUX ez-ipupdate-3.0.11.13.3_beta8-linux.diff 5841 BLAKE2B e2a9caf7d86381092dfca2ae475698ebe33a07eecaea2dddf521b7357c317ba3fad142a82657d61bf7cea7c6e7e23ad2142bc7f7829374e80b8338095c1bf125 SHA512 3cee4b7c0b145344bba892e3a6fbdd07b4e21020005a9094bd96950304fea89d8e16439de9133eebfe581764b0abf240c27f59188762ee209b96159e6d0af168
 AUX ez-ipupdate.initd 2555 BLAKE2B ecec692326933d924687cf6a33a5a3b2973e5272e0f5a9fc474bac0a11b6fcb29a68d0aab5459816f650b6020fb2e2a95c8cb3aea5b87f831a27a7e29edb5a0a SHA512 31729abd0aae2d225838dcbbbd724ea2402536eced290c71dfcd201fe48dbb1cf176da519d239b380089aee1afbeb66fc488d42bfb1432e14dfe36a484d8f841
 AUX ez-ipupdate.service 363 BLAKE2B 9ec7a686fe9b4cf2cebd4c858b3b7c83c7e1913d356e01d83b7f680f98df99b0edff179efc2d4015b98a3b95ef00fcbea46077bf514a92a6bfcc388e0148b6ce SHA512 d8822278f9c32419fd95a37ee7523ce83bbbd5d0e43dd9869b076ffd837121ca2f5ee07ebd66bb6942ac9a2bf1c07025877781b2ed049945bcaee4e04a039022
 DIST ez-ipupdate_3.0.11b8-13.3.diff.gz 154094 BLAKE2B ae82ca990937c60d7f572c132883099dc3c25e3c1ce905e880b921bc48230c64bb1cf01f877cd8948704dfbf7f89312abb5f0be9fea1be13a3ee1262aad337f8 SHA512 bef3c344a3c16f224cc3c6e662213713bb1123b4e47347d83d01d632c5ca0b09e7f0e5a989b3987655759ac901307c8dd6768fab3056c8878c0adcf78b0d5fb9
 DIST ez-ipupdate_3.0.11b8.orig.tar.gz 81975 BLAKE2B a5f6e0f301f3eb2e26b4af2f0ec4839efbb254514a08315a66bf3f5ed07b045178dab0e5a3814fb06ff9d1733dceb23168d90ca50905f2e3896f90581cdfff7d SHA512 85de91cde25d176374ade7128e8932a4e015cd04beb8d5b71bf540e2f59b6c409d1c8bd0ff7c50734b87ecc19a74a7b1da3e646a8c8787badcae4feb9dba7864
-EBUILD ez-ipupdate-3.0.11.13.3_beta8-r3.ebuild 3435 BLAKE2B 111c723d9c5de72ada65eca8abb646d042035c81b75a447513116401609ea1e999368872962b954640d05ec30b4e20e54ed3dd652bffa2a75970b5602510f770 SHA512 ef9c3d1440158ef922ed29f14679874cda2bacfcc03e2bbe67568c077d51a9a60b29838e11131a348f9a7554d53d32c7d6116b6587183f3addcf4a7e16885407
+EBUILD ez-ipupdate-3.0.11.13.3_beta8-r4.ebuild 3210 BLAKE2B 0f86cb659a94e3a54229716c57e412d48f0727730919a6502d89fff859f723cb9cf9314129ca088b0fb2131aa1ba3a2c95871fba4029b145d6e3881a6f0a0018 SHA512 a0b28fd7e124ec14e124f05469390eaf4c935555f8c5dbbdf839098d6a55c7660cab11ff08e3e610b1ec1a9582f4dc341af6bbd1c4b27f59bcc861904825883a
 MISC metadata.xml 404 BLAKE2B ff62fad677b4b7a447e051805b3d76843acd9031289eac9939999e729ae59165489500b42009e112037e0a63f53662591ecfcf87fbc7f7ea8842f4f25a9851e7 SHA512 07417b283cb97be8e2d9ff84dc6fd42d89cb1fc48bd356efa7c29498137fbec47fd408960915805d18d9aa7b49a530ec55271a8eb97287b15586678c4fdf5b20
diff --git a/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r3.ebuild b/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r4.ebuild
index c264e1c1aba0..4a1e50900053 100644
--- a/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r3.ebuild
+++ b/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r4.ebuild
@@ -1,27 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit eutils readme.gentoo systemd user versionator
+EAPI=7
 
-MY_BETA="$(get_version_component_range 6)"
-MY_PATCH="$(get_version_component_range 4-5)"
-MY_PV="$(get_version_component_range 1-3)${MY_BETA/beta/b}"
+MY_BETA="$(ver_cut 6-)"
+MY_PATCH="$(ver_cut 4-5)"
+MY_PV="$(ver_cut 1-3)${MY_BETA/beta/b}"
+
+inherit readme.gentoo-r1 systemd
 
 DESCRIPTION="Dynamic DNS client for lots of dynamic dns services"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://debian/pool/main/e/ez-ipupdate/${PN}_${MY_PV}.orig.tar.gz
-	mirror://debian/pool/main/e/ez-ipupdate/${PN}_${MY_PV}-${MY_PATCH}.diff.gz"
+SRC_URI="
+	mirror://debian/pool/main/e/ez-ipupdate/${PN}_${MY_PV}.orig.tar.gz
+	mirror://debian/pool/main/e/ez-ipupdate/${PN}_${MY_PV}-${MY_PATCH}.diff.gz
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
+RDEPEND="
+	acct-group/ez-ipupd
+	acct-user/ez-ipupd
+"
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
@@ -44,35 +47,34 @@ init-script with the 'update' parameter inside
 your PPP ip-up script.
 "
 
-src_prepare() {
-	# apply debian patches
-	epatch "${WORKDIR}/${PN}_${MY_PV}-${MY_PATCH}.diff"
-
-	# repair/apply additional debian patches
-	sed -i -e "s|^\(---\s*\)\.\./|\1|g" debian/patches/*.diff
-	EPATCH_SOURCE="${S}/debian/patches" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
-
+PATCHES=(
 	# adding members.3322.org support
-	epatch "${FILESDIR}/${P}-3322.diff"
-
+	"${FILESDIR}/${P}-3322.diff"
 	# adding www.dnsexit.com support
-	epatch "${FILESDIR}/${P}-dnsexit.diff"
-
+	"${FILESDIR}/${P}-dnsexit.diff"
 	# make ez-ipupdate work with iproute2/dhcpcd under linux (bug #318905)
-	epatch "${FILESDIR}/${P}-linux.diff"
-
+	"${FILESDIR}/${P}-linux.diff"
 	# allows to set IPv6 via -a option, (bug #432764)
-	epatch "${FILESDIR}/${P}-ipv6.diff"
-
+	"${FILESDIR}/${P}-ipv6.diff"
 	# repair format mask issues
-	sed -i -e "s|\(\s*\)\(strlen(putbuf)\)|\1(int)\2|g" ez-ipupdate.c || die
+	"${FILESDIR}/${P}-fix-format-mask.patch"
+)
+
+src_prepare() {
+	# Debian patches
+	eapply "${WORKDIR}/${PN}_${MY_PV}-${MY_PATCH}.diff"
+	# repair/apply additional Debian patches
+	sed -i -e "s|^\(---\s*\)\.\./|\1|g" debian/patches/*.diff || die
+	eapply debian/patches
+
+	default
 
 	# comment out obsolete options
 	sed -i -e "s:^\(run-as-user.*\):#\1:g" \
 		-e "s:^\(cache-file.*\):#\1:g" ex*conf || die
 
 	# make 'missing' executable (bug #103480)
-	chmod +x missing
+	chmod +x missing || die
 }
 
 src_configure() {
@@ -99,23 +101,18 @@ src_install() {
 	readme.gentoo_create_doc
 }
 
-pkg_preinst() {
-	enewgroup ez-ipupd
-	enewuser ez-ipupd -1 -1 /var/cache/ez-ipupdate ez-ipupd
-}
-
 pkg_postinst() {
-	chmod 750 /etc/ez-ipupdate /var/cache/ez-ipupdate
-	chown ez-ipupd:ez-ipupd /etc/ez-ipupdate /var/cache/ez-ipupdate
+	chmod 750 /etc/ez-ipupdate /var/cache/ez-ipupdate || die
+	chown ez-ipupd:ez-ipupd /etc/ez-ipupdate /var/cache/ez-ipupdate || die
 
 	readme.gentoo_print_elog
 
-	if [ -f /etc/ez-ipupdate.conf ]; then
+	if [[ -f /etc/ez-ipupdate.conf ]]; then
 		elog "The ez-ipupdate init-script can now handle more"
 		elog "than one config file. New config file location is"
 		elog "/etc/ez-ipupdate/*.conf"
-		if [ ! -f /etc/ez-ipupdate/default.conf ]; then
-			mv -f /etc/ez-ipupdate.conf /etc/ez-ipupdate/default.conf
+		if [[ ! -f /etc/ez-ipupdate/default.conf ]]; then
+			mv -f /etc/ez-ipupdate.conf /etc/ez-ipupdate/default.conf || die
 			elog "Your old configuration has been moved to"
 			elog "/etc/ez-ipupdate/default.conf"
 		fi
diff --git a/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-fix-format-mask.patch b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-fix-format-mask.patch
new file mode 100644
index 000000000000..51663504e2c9
--- /dev/null
+++ b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-fix-format-mask.patch
@@ -0,0 +1,35 @@
+From fe3aa40dfc94640e4faedad68ac3e5fd57353111 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Mar 2021 13:07:11 +0100
+Subject: [PATCH] Fix format mask issues
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ ez-ipupdate.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ez-ipupdate.c b/ez-ipupdate.c
+index ff093a9..8d206da 100644
+--- a/ez-ipupdate.c
++++ b/ez-ipupdate.c
+@@ -2483,7 +2483,7 @@ int DHS_update_entry(void)
+   p += strlen(p);
+   limit = BUFFER_SIZE - 1 - strlen(buf);
+ 
+-  snprintf(buf, BUFFER_SIZE, "Content-length: %d\015\012", strlen(putbuf));
++  snprintf(buf, BUFFER_SIZE, "Content-length: %d\015\012", (int)strlen(putbuf));
+   output(buf);
+   snprintf(buf, BUFFER_SIZE, "\015\012");
+   output(buf);
+@@ -2620,7 +2620,7 @@ int DHS_update_entry(void)
+     p += strlen(p);
+     limit = BUFFER_SIZE - 1 - strlen(buf);
+ 
+-    snprintf(buf, BUFFER_SIZE, "Content-length: %d\015\012", strlen(putbuf));
++    snprintf(buf, BUFFER_SIZE, "Content-length: %d\015\012", (int)strlen(putbuf));
+     output(buf);
+     snprintf(buf, BUFFER_SIZE, "\015\012");
+     output(buf);
+-- 
+2.31.0
+
diff --git a/net-dns/fpdns/Manifest b/net-dns/fpdns/Manifest
index b2a1d7deb509..6018acf5d137 100644
--- a/net-dns/fpdns/Manifest
+++ b/net-dns/fpdns/Manifest
@@ -1,4 +1,4 @@
 AUX fpdns-0.10.0_pre20130404.ro-header.patch 1115 BLAKE2B d8042816acce161ba4e19533700151489f3a169fb96a11d4eb44b107818fe0eab87cb916b4e8d5d2a45e22c82693517d069c6e12095b415b352d40384a9040db SHA512 e345037a210103f5202c0dd052952bd2d3889ad53393fc4881ec48810f3e6d39b1b7d2220d259ffda0b85e339bcc4ef9f1ae28023cf84b81a00685c66e116923
 DIST fpdns-0.10.0_pre20130404.tar.gz 931723 BLAKE2B cab459afee74ef5d8163a25b98c123b799270e6d3293f155a340ebdbfbc86266fbffa999d31928c9b1a732898b0adf4a49e97469f9ae992a0e38f9478431e84c SHA512 1a4d9c1cb666efa3f48dcca2b5cd04793e92727359652095572b17479f5343479c57d2937f1fff8070c071a2698eda5c4dff981caf86436f184f0b076b0fa0b3
-EBUILD fpdns-0.10.0_pre20130404-r1.ebuild 685 BLAKE2B 4eba6746f3a476afb5679f673a1431f548c9c7947854531a5fb5edd1f81e64eb3c84274062ba488c908a8f4437b06380cbcd2ccd139cd236b80466c99ea6ff4e SHA512 828d120d8edbe0dcb76249fbf94f5fe73503e23cb4d9f1cddc7d40798479a81c61ac9bc97671c5dd5e67e1f5f1edd8ce7dd5c9606270400d1c22d840c8bb7403
+EBUILD fpdns-0.10.0_pre20130404-r1.ebuild 682 BLAKE2B 2d4c6cda36b6d6f87c7e23e4c0255a39801e596a759c9ae49a6a2d5d69ea1f2be7ba03f1fbd1e17f436fd1daf07d3cc9b7ee1999db854c3afc0578ad1e0ff80e SHA512 102c2bf43f52c3788cde71e9bfbb0b8aa07838d96299273f9137ec4812e9295fe0525247784ce750b20297ecc99811d18c452e9c31eb2240d106eb721d926269
 MISC metadata.xml 1420 BLAKE2B 5aa7a6ec84536e8b104d39c4d98e43378ef838dc6460832139f31ff21ccaec08123889ea7c1ebb4737933388d3f7401e90586c0057fbd9a1fbf1aa0ce1d52fb1 SHA512 21fc1c5f7ebfa5b377d3ae3116bfe017319db65e72002305f616b963ddfbc4f879da66fd7798988fd8cfdc38d805038d149f2b416edb2c496f876cb935fac72b
diff --git a/net-dns/fpdns/fpdns-0.10.0_pre20130404-r1.ebuild b/net-dns/fpdns/fpdns-0.10.0_pre20130404-r1.ebuild
index a61983bc150c..41acf92d3609 100644
--- a/net-dns/fpdns/fpdns-0.10.0_pre20130404-r1.ebuild
+++ b/net-dns/fpdns/fpdns-0.10.0_pre20130404-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils perl-module
+inherit epatch perl-module
 
 DESCRIPTION="Fingerprinting DNS servers"
 HOMEPAGE="https://github.com/kirei/fpdns/"
diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index 8ddf11ec06da..c8bc1f5721de 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -1,7 +1,3 @@
-AUX idnkit-1.0-autotools.patch 1843 BLAKE2B 75043eeccb34f00b9faab57d7db7ec6081192090afa4438e83df7bf02dc5ae047c4597153649aa0d4b1f658a37809687d91602d2ce61bf8cc7b3e878ed21b993 SHA512 1c405d1b72d678394284936d9130450b366f7a53bdf586fb6d4331b72c2d6672a19f2322a7f284067259ed0c0dd973865d9b117ae6c15cc8a1d41c734ef0a4ce
-AUX idnkit-1.0-test-subdirs.patch 289 BLAKE2B 6c9237cd1d17785a5d0a379d610ddc6b6e7b604c14a5680e24b80f5d9188413fe4e8f5dbbc55e72fe5d4c453c94efd231110238f68ced316986abeb6134f8173 SHA512 63d76f9ad95fc83c00259d41dcfdd47442bfda6f1dfe861a824146ded113d18284c1fe6f0f5ff1eba05a9a38055e7e8fdc3579fc14a3b441d831a9bd5b75af7a
-DIST idnkit-1.0-src.tar.gz 432823 BLAKE2B 4e96bed174ea704ec0eb5c6655cb65145ed808b2bf9582ec9b6dcb8606de7a006937a2f8d8fce386dbc328e074b95ca504464c1ed6d16acc7be82d9904f2c2b4 SHA512 74f2db007a1991610f62a7a060d534f724f08395a16a7d76fda0824e9017aa47ffe4e251c90d0481218b70534fcd2b32724a66223042f59c1e16c1ff39f3be19
 DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
-EBUILD idnkit-1.0-r2.ebuild 1036 BLAKE2B 41db47d4fa6717da6ae4dabf58c97562060370196e102b0f6e9b66e4fb9194f27345f2b261451867680d917364702993960c313d7f64c1cda525261cde7b5553 SHA512 5670bba89b798fcad610329adbfd0b19f44173a327620a27f99f73a5300fd96f2de5f7fd53883d963a178a777546ae5155bc9a50b26db26bf301941b15ee13cd
-EBUILD idnkit-2.3.ebuild 635 BLAKE2B b510282bbfaa8d659515ec5a00393e37fc5bfc490e277d52e3ccfdaeccf5178bf440c29fb6ad5610c39d52fd4313aeea46d3eb1989f68a7657fd991f927898c4 SHA512 63ef55ddb1dd9d9e14bde80d836b9ed28201ec918b6c7b00c33d08bda6fdd71fda6c43ba8a627d49577f8f6698e31f3d50c5d7809d0ce926d15a9424d2cd887c
+EBUILD idnkit-2.3.ebuild 637 BLAKE2B 90539a6b659a6194942777f1d7bc52f88d3f8ef4f33d98785ae66474be7e29a3b8e59a8b3acb306bf07509d2835b9daa72b89127f204f57918a5dd58a8b41670 SHA512 b732cb49fd3914231f4cdc4d05d958e8b044c59265012872b96123c7838dfce1490d0f304b2436125eec90b0ee43e2e966d2935bf9182d533e6665df699eb1b9
 MISC metadata.xml 246 BLAKE2B 053eb1eb0345156eb262d7eb10e70636fda57808641af19b715d4d323f19127491fe53e1dc7028454bc4af3f5ed282acd8d8632617b65c2003382193716510ca SHA512 02003cbc53a83f024e07311dc98a6255bcaa23c879f9b7da1263261e323c678bcb80fb0f9c3025076eafedaa0a85a52a98e963d37a692e8902bb9c6d68b54390
diff --git a/net-dns/idnkit/files/idnkit-1.0-autotools.patch b/net-dns/idnkit/files/idnkit-1.0-autotools.patch
deleted file mode 100644
index d0918bc9184a..000000000000
--- a/net-dns/idnkit/files/idnkit-1.0-autotools.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/configure.in	2003-03-11 00:53:20.000000000 +0100
-+++ b/configure.in	2010-03-12 14:15:24.000000000 +0100
-@@ -629,6 +629,41 @@
-     fi
- fi
- 
-+AC_DEFUN(AC_FIND_SYSTEM_SHOBJ,[
-+AC_MSG_CHECKING(for $1 shared object)
-+shobj_name=$1
-+shobj_path=
-+case "$host" in
-+*-hpux*)
-+    SOEXT=sl
-+    ;;
-+*)
-+    SOEXT=so
-+    ;;
-+esac
-+for shobj_libdir in /lib /usr/lib; do
-+    if test -f $shobj_libdir/$shobj_name.$SOEXT; then
-+        shobj_path=$shobj_libdir/$shobj_name.$SOEXT
-+    else
-+        shobj_path=`ls -r $shobj_libdir/$shobj_name.$SOEXT* 2>/dev/null | head -1`
-+	if test "$shobj_path" != "" -a -f "$shobj_path"; then
-+	    :
-+	else
-+	    shobj_path=
-+	fi
-+    fi
-+    if test "$shobj_path" != ""; then
-+	AC_MSG_RESULT($shobj_path)
-+        shobj_pathsymbol=SOPATH_`echo $shobj_name | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-+	AC_DEFINE_UNQUOTED($shobj_pathsymbol, "$shobj_path")
-+	break
-+    fi
-+done
-+if test "$shobj_path" = ""; then
-+    AC_MSG_RESULT(no)
-+fi
-+])dnl
-+
- dnl Find system shared object paths.
- AC_FIND_SYSTEM_SHOBJ(libc)
- if test "$install_runidn" = yes ; then
---- a/lib/Makefile.in	2003-03-12 17:14:41.000000000 +0100
-+++ b/lib/Makefile.in	2010-03-12 15:54:35.000000000 +0100
-@@ -241,7 +241,7 @@
- 
- install-common:
- 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
--	$(LIBTOOL) $(INSTALL_DATA) $(LITELIB).la \
-+	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LITELIB).la \
- 	    $(DESTDIR)$(libdir)/$(LITELIB).la
- 	-[ -f $(DESTDIR)$(libdir)/$(LITELIB).a ] \
- 	    && $(RANLIB) $(DESTDIR)$(libdir)/$(LITELIB).a
-@@ -262,7 +262,7 @@
- 
- install-nolite:
- 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
--	$(LIBTOOL) $(INSTALL_DATA) $(LIB).la \
-+	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIB).la \
- 	    $(DESTDIR)$(libdir)/$(LIB).la
- 	-[ -f $(DESTDIR)$(libdir)/$(LIB).a ] \
- 	    && $(RANLIB) $(DESTDIR)$(libdir)/$(LIB).a
diff --git a/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch b/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch
deleted file mode 100644
index 3e6dcf13b15e..000000000000
--- a/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -296,6 +296,7 @@
- 	rm -f Makefile
- 
- test check: test-localdir test-subdirs
-+test-subdirs: test-localdir
- 
- @LITEONLY_TRUE@test-localdir: $(TESTLITELIB).la $(SAMPLES)
- @LITEONLY_FALSE@test-localdir: $(TESTLIB).la $(TESTLITELIB).la $(SAMPLES)
diff --git a/net-dns/idnkit/idnkit-1.0-r2.ebuild b/net-dns/idnkit/idnkit-1.0-r2.ebuild
deleted file mode 100644
index 609d5068ddd8..000000000000
--- a/net-dns/idnkit/idnkit-1.0-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="Toolkit for Internationalized Domain Names (IDN)"
-HOMEPAGE="https://www.nic.ad.jp/ja/idn/idnkit/download/"
-SRC_URI="https://www.nic.ad.jp/ja/idn/idnkit/download/sources/${P}-src.tar.gz"
-
-LICENSE="JNIC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="virtual/libiconv"
-
-S=${WORKDIR}/${P}-src
-
-src_prepare() {
-	# Bug 263135, old broken libtool bundled
-	rm -f aclocal.m4 || die "rm failed"
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	epatch "${FILESDIR}"/${P}-test-subdirs.patch
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	if has_version dev-libs/libiconv; then
-		myconf="--with-iconv"
-	fi
-	econf $(use_enable static-libs static) ${myconf}
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name 'lib*.la' -delete
-	dodoc ChangeLog DISTFILES NEWS README README.ja
-}
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index e80d11bc44b0..ac05ac80ed0f 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit ltprune
 
 DESCRIPTION="Toolkit for Internationalized Domain Names (IDN)"
@@ -10,7 +11,7 @@ SRC_URI="https://jprs.co.jp/idn/${P}.tar.bz2"
 
 LICENSE="JPRS"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="liteonly static-libs"
 RDEPEND="
 	virtual/libiconv
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index e800691b8713..5f2790565572 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,4 +1,4 @@
 AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d06251b07ee2fd3ecbac16347d633644f30dc7428e5bdf9747b0a4d51d7541601d3fbd4be6f9f746693f SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501
 DIST libidn-1.36.tar.gz 4557804 BLAKE2B 562ea97cba7970e3f3bd1557ba9e25e4180cca1b5cb8f66539f7830baf195cd36dc513c50e2475829af42d420e3d3b73a1c002acb06579c8b8b3879dcc8f95b2 SHA512 0d66e10bf7a8de4b27f692a427d2c8e901b8bed73b0a36268d8f939205df81f6a30f0634fd3b87370d4e81c1327c0b10391fa122a0a5459c32a3541b8a2149ad
-EBUILD libidn-1.36.ebuild 2615 BLAKE2B c41f33e09ca11e9bd52355349266067138adc5522f481fa79ebfc44a76371ec57cb8027c49f4b266bd157e01c1cd47ecad97807f134b1e5f98a7c8754e175bcd SHA512 3216f5fc118c6932a844dc0d0ce043d115dfd59f7eecd04cd89a90a9262dece2524cbe72cc1e269df8a30ae93baa6bc4152d8a92bd72c431289f764f49658d84
+EBUILD libidn-1.36.ebuild 2616 BLAKE2B e768b6b0ddff783ae0f1dcc797790e48e1c76ca53591f3b6ef382833078d3b041641bf442f516050847dbb2d870a2090b3c4ad6a78b5632561d5be5dde149756 SHA512 1abe67f936bf69a62de01c026b1d442db5529e7bb008b04c19af7a0fe51de1f65a4de49ff2dcf970c5cc06ee6f8fee0b1444c180beba82d5a2f06474ac3865ef
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/net-dns/libidn/libidn-1.36.ebuild b/net-dns/libidn/libidn-1.36.ebuild
index 4673ff12c3fe..fc9779677ca6 100644
--- a/net-dns/libidn/libidn-1.36.ebuild
+++ b/net-dns/libidn/libidn-1.36.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 4b2ea8b1b049..43b83099f563 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,3 +1,3 @@
 DIST libidn2-2.3.0.tar.gz 2164993 BLAKE2B 3c103831c39fa3fd0340c9c45f3f683483207ade9cadc8d85b046a698f75bbe5ce6829de69a5cb238404d243b7a39ef44d69ea4ea80c22b813eafbacae615a8b SHA512 a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187
-EBUILD libidn2-2.3.0.ebuild 1302 BLAKE2B 4a822648295579f5a67e8f334c2b41cac08ea9263b56c7c5c4da1e70d2e1a458c5aa576e56820d989f03c443e0f4036cec7be53ced93e34c1cc9d495617f213d SHA512 6f98c4fdb672fea49b39e660c403e1aad7338d05ca800b97d65a58f6b40fc175230032fc088ad6b7892ef15489ded8a0d4263ae66e406a91e952e6c7eadfe672
+EBUILD libidn2-2.3.0.ebuild 1305 BLAKE2B d4f20a9e3843b88affc64c303f7e104db94db3aba44464d30b4a30e1685a51d3a328a75c38ff32308880dd6393ffc85a65c9be180d56b07ccb5b982c8ce1b437 SHA512 45ed8e38c4689d2f048c5c977347d308ffc5cb2c0543f91a7b4bb999ae9168844cf53ad990639e6a62891ade0a626eac82f044660df1f70e62497103c32dbb1a
 MISC metadata.xml 461 BLAKE2B 5529fce3c73a3d581d04cca1f25cbf1c552eadea79f068ceb8f379d4cf1e2adaaa827705193d894fa7c208902d8fcab66855222ce223734904a346395f72081a SHA512 ade0286770074952c4baac2c2b13bccc64918049e1c6283a12b0698164c539108e7e025c3cd82fd9b7d4c538db3a668363797fd46e92b86b2eb46c128dff7ba3
diff --git a/net-dns/libidn2/libidn2-2.3.0.ebuild b/net-dns/libidn2/libidn2-2.3.0.ebuild
index 381ffbc6392e..7af65a4869d1 100644
--- a/net-dns/libidn2/libidn2-2.3.0.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.0.ebuild
@@ -12,11 +12,11 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
-	dev-libs/libunistring[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/net-dns/mydns/Manifest b/net-dns/mydns/Manifest
index 749801cfc552..93bb4cb7b66e 100644
--- a/net-dns/mydns/Manifest
+++ b/net-dns/mydns/Manifest
@@ -5,6 +5,6 @@ AUX mydns-1.2.8.31-texinfo.patch 923 BLAKE2B 64146ddd6714fd5fb29cf0e3d85d6cc4358
 AUX mydns.confd 84 BLAKE2B e95e66b464e9f7e7d3742312c9cd9bebc5cedc1f4f49fb4e632ef1f51820c6400c598ea611af51fde11da6cca93dd126bda8dd8ef20905c4f165935612e92681 SHA512 7fd98de31583d0556734b7313afa257b9f73f4d74611ce03dd44f2d7e833ec4f95b4bf84dab627d59da18f89f7dc1d9eb6d840a90b16556b4e1d97439944452a
 AUX mydns.initd 850 BLAKE2B 58275e0415dbf27344045e9cc19037e09a5ee9dd1a52f80b6c05852313b646c7b41a52f1be46ff13629bc0873b2b7fc1db73e0cd45cfc7bb4c6d9a0582524fa1 SHA512 919a7022a350b121c8c0eed962d7a7233dc41f2e4cfda1185d642114719a533cff580367b9302b24e8c9d377c2ccb9b02ad45d638d5b483b7c101405cb9ba1be
 DIST mydns-1.2.8.31.tar.gz 958701 BLAKE2B a07ca8314f6f8d3ce6cf88ce3a49238d00f1ed8e2352f3a76a9ffa348711f76e0cf19fa304a92a71b420c39db2795094d42997daddb091c7046e4bf1b61f6fe8 SHA512 471dfed9b4f38b446fd5896939faa4c58f4e1b3a3e6928fa84eddf769eba8f3406ef08c77ab39ee79d2ac85c1e72a499b283c7404a0cae9830ffe0faee9e2737
-EBUILD mydns-1.2.8.31-r1.ebuild 2066 BLAKE2B b12db9aa17463d5372cf18033d297f14f9bfdffce143ca1f92fcef6eab2e2d3ca2fd52b6458c392af2d2305c6320943102e602d01bfe07de93c0d9f59fdb01a9 SHA512 b32b6cb484e7b05bc8d99cf62b111005c7d39b0be7f2323a08ed4f19920dd797cebdb42b6f884ddcc967e6cf9dfd76d92b22009c098d1d41faa3f35c7dfcc97a
+EBUILD mydns-1.2.8.31-r1.ebuild 2066 BLAKE2B 884654073e040d87df7d22f2fd15b86e349e52d9d55114908e753e3d5966108115ae7e7bc3bfcf497d6c2e429ccd49fe91acfbf4af4bb6ab081b65f6b5dd1938 SHA512 3775962480808296d810b09d54573688adb92a784ab17e5635a81654a21cbc46cedeceebcca976b57bda5ab623ce85376f04a18c4f9dc146b191360d4b74b931
 EBUILD mydns-1.2.8.31-r2.ebuild 2245 BLAKE2B 49c777b2f2dc5c22d69f0c6a8bb94605be608618bc59567bac677ba6234c2897e01619c7d16780078752addc2d23da8094736ea2fc5d6ce880df0728c6ca4277 SHA512 6dac36a161ff0a158731a82dbf50068cf47a5ca5a05657d2657fd61e7f104d3053227710a5e7a69d5031468c2eadfc870c7ea67af86c0c5291f5932ea67a531b
 MISC metadata.xml 396 BLAKE2B c343b16b422a587d568b331f868e959348bd12cdb7ee28d6390ebeca8234f1e34ef9efcf7aa70e9b18dac66777ab46763c41f8b68e3f9d96b3863d085ed51066 SHA512 cba5e716877204e00ef18549d35bb39f47921389f8712c69ce81b8dd365505d6ea95fed89976bfc6722343dadd15f914f27d26fe35416c242e7963d467b147d0
diff --git a/net-dns/mydns/mydns-1.2.8.31-r1.ebuild b/net-dns/mydns/mydns-1.2.8.31-r1.ebuild
index 8875da2f5e22..ae192fac4fee 100644
--- a/net-dns/mydns/mydns-1.2.8.31-r1.ebuild
+++ b/net-dns/mydns/mydns-1.2.8.31-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit autotools eutils
+inherit autotools epatch
 
 DESCRIPTION="A DNS-Server which gets its data from a MySQL-/PostgreSQL-database"
 HOMEPAGE="http://www.mydns.pl/"
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 588ec61d79bd..1fab6b4ad785 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -4,6 +4,8 @@ AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae6
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
 DIST nsd-4.3.4.tar.gz 1182467 BLAKE2B 10c06be9df393774627a42a7cf254202fe9800e7cd5048d392fbf90a65321a4596e742165b1157b3a0ce0645a80ae5425f7d43eb0a453077e45bff06d52347d4 SHA512 fe332caecfd3c6bb8ae1a92fec26984a7953e5e462515e8622c1079b217c962728e841826cdf7899f47f9ac24af1dd383f8ba7981541b05a2338cd288c40b0a7
 DIST nsd-4.3.5.tar.gz 1184220 BLAKE2B 0ded84d9a0c25b86af6c05a7ab3ffb680177142b79a96f952cdeb92d87d9d0f306fb3c864b8f3cb769b05b0a863a7470df9407e6f3f5f0bc9a32891185d32b6f SHA512 bd031da779ff7b9b53fb4ea4d038a51f3b8f7b59a2927f674def46ca775f30afa059b471fed7d8ebcd2b7d02968945972b98856198eafbc4263d3064dae01029
+DIST nsd-4.3.6.tar.gz 1197835 BLAKE2B 943ae0700a2f49fffa9414f1d2718fef5e6a2f181373cc0a17ebe04433bce22d3863c8f17bd4d0412264503a80720d6dea9ce0d3ad6305f54dc3a2496118c90f SHA512 d87837b483ab37fde5d3eae7dca4c9e2672a718a1f49847db13232358108a5e0d6395c07d3fac72092a949d3c9861cd1dbed3e9bd0342ba6cbe7ca32feba09d0
 EBUILD nsd-4.3.4.ebuild 3109 BLAKE2B 7af915c66086aefe78f666fc2aaa4df0bc8dfd99e58f1290baff441348cd69ef7fb377c0dc4ab0b1d1b9f456bf8eef2aff1813570affc3d4b6d2b833d904d294 SHA512 1db683c09d190c652c9ca9435e19d72f0ea881929b905938d54a8972da4c2584f19759a484fe0d6355be6c5428a4a1c387de902f562c5b9106908f06f97dff51
 EBUILD nsd-4.3.5.ebuild 3111 BLAKE2B 06f6a907ef17566e5150bb3362da143a3ffdf4b1b0df1f2494319ebc5ce5f02acc6e14c6494530af1e7b0ba31533b788dd7a8c4cb4529e35e2c8044f1d8edb30 SHA512 a9f62f66876f39265cacb807674a896797a2d505b660fb20af4755cde445d81edcb34263e4afbc778a5d57c36a3d5169162084f182809795892d706465dc3d07
+EBUILD nsd-4.3.6.ebuild 3111 BLAKE2B 06f6a907ef17566e5150bb3362da143a3ffdf4b1b0df1f2494319ebc5ce5f02acc6e14c6494530af1e7b0ba31533b788dd7a8c4cb4529e35e2c8044f1d8edb30 SHA512 a9f62f66876f39265cacb807674a896797a2d505b660fb20af4755cde445d81edcb34263e4afbc778a5d57c36a3d5169162084f182809795892d706465dc3d07
 MISC metadata.xml 1160 BLAKE2B bd724c7485cbabe2738d0439b442c28858f66200acd237ec2a79f0b583fe4fbd0c82a68efd3af277a4e7d5333fc371b8150cea742373100d5b3667cb7d161145 SHA512 8576175fa8c53b3f7c2c588fb467ca633f6a628c90d7c08cb0d9414a5e721ab57c29c012f8021a7710aeac9be8d4d1ccd69acd6cb7309804460638ca6b51aa1d
diff --git a/net-dns/nsd/nsd-4.3.6.ebuild b/net-dns/nsd/nsd-4.3.6.ebuild
new file mode 100644
index 000000000000..4ec0d9ca8c8b
--- /dev/null
+++ b/net-dns/nsd/nsd-4.3.6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 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
+	# Required to get correct pkg-config macros with USE="systemd"
+	# see bugs #663618 and #758050
+	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/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index 088067969c2a..a8570bb28d9f 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1,26 +1,10 @@
-AUX opendnssec-1.3.14-drop-privileges.patch 906 BLAKE2B 8591de896d85a55957a2354fa638e34630c5b31c2126445ccc92f5b89e5165b2174b2904557fa7ca2ececfe784b131eae65beb689f438f938842793c142f6062 SHA512 cbc17153fcd617bcbc54a0b14111908635dae722f845f894d9c6769d77960433fa75c3ec0a5061af054167b4223f7f2946c3e3ba09c2bb55598f72f71d1c2106
-AUX opendnssec-1.3.14-use-system-trang.patch 706 BLAKE2B bbe3edcd766bc6f6adb2427b4cbf51ef5c02e5387ae1d65ca878d31bcdcd81f3f62aeb4eba2b4e7ecf276f707c18d86f935fcb42b352977a0c5e8ad24ca87f12 SHA512 e7d664f6ee548efeae7a015ceaf21b3fedc7654ed295ecd2440b0212015c1556b4f1bac978a2f804e7b6830181273484b428e1a363989eff067a9b3587937b7f
-AUX opendnssec-1.3.18-eppclient-curl-CVE-2012-5582.patch 751 BLAKE2B 3c1053d916f1035c4fdc1f94fef825edc2fa04b64bd2bed4facbf3cfeb9e06514eea14b89b85be122b9b5a1f29aa284a7df899afd514d2719ebb017685df3a15 SHA512 f89fc43b96a76ed9af9ac4f28993037ee709d19e8cfeb53da2bdff2eb723c4200fe70aaac8b651998b9b6685343777316141dd0ee2ebc600f703d8dadca24d43
 AUX opendnssec-drop-privileges-2.0.x.patch 813 BLAKE2B 231537d3f8f40e1524eb76212abb7e00d965acaa39717de2c72e9d7ec93f866150510d971ba465f7a48c3eb588f1a78631ed33beef0ebe1fb369472f73062d80 SHA512 425eb123452183b4e4a3e87e9a71afa81684fe4af9c111d1bad3433ee640907cf3caa1065711f67286bb0336fd8d82e3f4bfeef94e3ff620bcbdaf960d4137b8
-AUX opendnssec-drop-privileges.patch 641 BLAKE2B 8ba78f6363424cbbef233c032f06704ad0a16af1056ff75f260200cfd42e45634ada74a83afba0fa45ed18d87b9b650fc1ddf5faa38db1821fd03c491e53a2ab SHA512 60cb666d821ae8880ccb789f8d2b60ea218a98e1b7b9393d8dc299be55efbd93efb9334ebf5cbf55f67ef1c58df1206dce906994bd9808e3db5a5bf9644a7f06
 AUX opendnssec-fix-localstatedir-2.0.x.patch 1161 BLAKE2B 28469aaad2878cdb1f58f247db0e7b9603ec9fab35ec9ded597dfba50889cd30e474cdaf2f0397e75147cb0374c049d9863f95f961eccce47a7e4874dae48fcc SHA512 1d07f2108238c041041c96b4efaaec1e75740ed54fbd6390fa45f5ccf7f631c1e8d4400bb9cb95023c8909ae10abc3c93aaa137f954921af75825c06a6d94d9a
-AUX opendnssec-fix-localstatedir.patch 1693 BLAKE2B 82220ef1f5c5da994fd01671436b9e47a5f0a08737e52a440866499792326389bc495de00305853dbdc6a08ef8b6288e509a8b2310461724f6f4d42aa2245614 SHA512 86700c97bb482f5fa6d99fe8f105c41e8798de542e6cf5fd4d6c14da11237e4fd11eccb2900de4893898d7855e31beb6572c709c2dad9774d5fe440673af2627
 AUX opendnssec-fix-run-dir-2.0.x.patch 1188 BLAKE2B c11d3e120dac17f4d9bb24c561cf67e33806c906391e0033677e1ecfa423ddae563cb20680a73b8dec4c50e0b1fd2dbc0cf0adb82c77e67f50a5f4a40e26a871 SHA512 293c2ceb336623ed52028ca3144c4249eaf426dd2eb84890be9f1ed53e27d4ff5fd6a699d41426ca57d6362c2f83dd8b3556691da2815235f72e69ab4ef45165
-AUX opendnssec-fix-run-dir.patch 1204 BLAKE2B 8109370737931c9172d7e89a02cf08cdb38524f91429c8526d27a18f90672586fc95eed671e3a2222698832e1df4cfad292950bd8b364af67ca9242e7dd074f4 SHA512 f604ab24731bd84498f33dc3213b937335e55f805d4913e80b037b91cc5bf14f406cb2af14cc455a9a23c45a3475ef1b3901c68760188d9e4a36d314d29f8f84
 AUX opendnssec-openssl1.1.patch 1823 BLAKE2B e94d97755bde512efa87751f99655903a9b9627d0a4896294f643d89adbf7aa6fa1a0edf9098d0d2a1fc059aeaf2e19f6c814807b9fd2716fdf98401e3c15b06 SHA512 17dac7598339ba5a8d1459c93c837344d926cd939b830502040e5c41514bb6261d25486dbfce5e2d9994c01d990dbf88108563aab1b04b02c6a69ba988503a73
 AUX opendnssec-use-system-trang.patch 618 BLAKE2B 32e1b6784f1666e0485e6109af40b06373fbdc974f90bf3a3d6fc564d7c69728151afc5a9f793c96a3be77593bb2679af9dee4456bf69e89367fa459f8b70435 SHA512 316b89a2c6ba56c4fe45d00ad1bc31316fa20ba7177a2cc0979c23f11aba4234cd2f0b8972f98e4f14be9535b704fdc3177a514a41c489eb43016f8ff878795c
 AUX opendnssec.confd 393 BLAKE2B 47f83e11292c01cb999fae36dbea2d0b45cb970493bfbab43c43682fe26e574e12bbe7f7096e71ff7bd0b8b49827f13e4de858a38868706fa769cc92ceb1f307 SHA512 17bd24efef9bd6b7a907c75126809a6012db23a6c8547169c41dbc62fc91775331f445905282bc6c2ef13357f92eccab5008d4605419d98acdb723806b63a924
-AUX opendnssec.confd-1.3.x 477 BLAKE2B e131ba95566a4d9cdab721551c7056c9ab07c0cd62b100ac4a84c4363a8ec96482758c13ec35f6188581764550364936123ea8011359278ef054f2ca03a509e0 SHA512 e45cd05e9d972dce5254f333ce21fd599ed905e8009f67de636c3a72dcd49e43fb75f702e21665dd3f19602fb9a5be5b6ff34e147ac4e29844560cc4f65f727c
 AUX opendnssec.initd 1854 BLAKE2B 358bcf513123f7a38b7795f142f56e6a186062d1ad80bb70bee46ba7ebe7a137b4d2830a6c27ae690add23e0296ed2bd3a7a5d7ee88e1ee7ee3a8a9631306916 SHA512 75bce27c152b55ba2ba7d0770c6f2149493ef4b145f2257328e7e4b6865ad2d644695a688c3e06be02705ac42752e031846551b80b560e19a73e595e5ad15def
-AUX opendnssec.initd-1.3.x 2870 BLAKE2B 925277b2343bc1297a5520115b987915b49c2a7f551243c9dabb9af652043d05f3fa34c0b76e54cf7c692b23c69cd7cab37a9b730e09cbc68ca0cb4c74b7b18d SHA512 d25f3106868a2d73f48cc12a555fa1b4a5281befe667cfa5bf982bf3bfd83b832d477eba857abaa00cfcb41b796c36257503121426c4c396595a3e7e018c5e03
-DIST opendnssec-1.3.18.tar.gz 1143889 BLAKE2B 0443a9d29de479257c05d024a756c176a342032eb17b105c04f5808ba550f1026815f191bce6ada13c54a7b7fea0f816d7754227f3d1c9ed76bc4d602785c2cf SHA512 5df39ba778c9b1245e88b81df7aa491bca0aad2943845284c4f8b4dd729fa69014d45f07bdf99a048ccf668a1c9675a8dd99efcec1abdbd4e06e9738fec6ab6d
-DIST opendnssec-1.4.12.tar.gz 1036392 BLAKE2B 3bfbcfe91d7da7c2e4b1c5439f7d55e15612ab6ace6af25fcb9c9eb7ddb2e1055e70684c2bd6bbae57a0c2eb78098b448f7dca198e0d6f9e2e812945a1f06cc2 SHA512 b72b76ab4aec8cc63cc9c020bef9a24b000fd00172a07cf43d57b3a33041bef9e107b71eb7271bb13c3566510599c6a1913cf986a724e169c42dc8bdac8d2e51
-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 5719 BLAKE2B 33ed406b2fb2bfdcd7a33a67971ceed4986958b8016259693379726604342ef930ce9626e962125a02b315bc0fc2b07ab31cbd88c09060b3b08b48f51ffd5652 SHA512 098d741ffe09e814ce0697d6d9b824080efcb08548c932b8e1a78fa905c4e680fa193304cf51e75563c70cd939597fb30e858d90eeea5984b15a0810d4fd6e22
-EBUILD opendnssec-1.4.12-r1.ebuild 5806 BLAKE2B 96d15804c15759d8f5c6caa8284d583e30308cb6fa24d9d36b177d8505bb816ab6d899ddd82225c1102a4ac58b1f98110f53cb6bdf7c40255532dbf91cf8959e SHA512 67c7c4afec19bb5f2c22498fcb385c4ce1042fa1e98b3b12bd183d8999531facf1d878c1f0800d22d19f67e09259b2545c0738e609885178f8a294020517861d
-EBUILD opendnssec-1.4.8.2.ebuild 5856 BLAKE2B b9b4bf8e9d94743c7bd4189889e3071aeaacb71915749b542b59d28a86260affd402bbcd2b2f88896a791237bcc358e0bdc72f4e068e61b048bf98ec03e3cd74 SHA512 e9f000c17e6bb9bdcd66bc38e2b7c21ff3dce0da7dcda07e2062ccd64416cc563577cc6856bb279d575eb74896e89527a895fc825fcd2cda8431c8e14c372633
-EBUILD opendnssec-2.0.1-r1.ebuild 6789 BLAKE2B 996d5f5d1335513084428339fd2ccb9482a1901b5940bf77bfd19bda36f6b99a4dd40f0d35cbe4d90f7e5b9ca37566b6f65e5aed21174618a1e477f97cc0de6c SHA512 982583cba1c39f9591d710bb4dbb7cf5b53c4b7b9a073b01416097bf7b604a94582f564bf60b7e8d4de588300bcb77d826f7cb3a9987475a94901f3b67d1d7e1
 EBUILD opendnssec-2.0.3-r1.ebuild 6761 BLAKE2B 67105b5333460bf466ac4620a7efb093423321b5878e715475e0232ac9a74ff51534a75b4417abc6a26a46027c31585ff60cfe92eed03b0300a2fb5e3cf0363b SHA512 dc199e6aaa506090c25ba9ea9538cda922f67dcb509a3e6ddf6ddbc9d15300d0d5166720ca53b10be49f99a13c90a9f1aef7429a1c0e26b039cbdac28f5bcad6
-MISC metadata.xml 906 BLAKE2B 87ce475aaab1ed562daa0c2102e206f32abc25b9fd77932bd6a33e5f31990864dd0da48e48e7165debc10ae0653f6bed364c12a52df48dd448e29590bf6f7141 SHA512 9cddc6b15c7a959cb885bc639c19e166ee202dd4b45db50c9bbb3b61fe9e84311f023a3d34cfc44e689cf81df092211fa4cb88427fb143c113bdfc1e7897112e
+MISC metadata.xml 717 BLAKE2B a78c51d08bd665681b9977050e8337fbe95adface07632923e7bfa7f5ca9cbef0443bf8ada06480b862219720d71669220eeeca21d06edf68ba3452667faa861 SHA512 203b2e6d467ecd5832d7a56a9d31d37f6427c6cf3d9ad45d4b18d4b9b3f74ac53dcfb03bea0bd2c68d34a9474992216c198173e65c8f7edc00f61ead434c2b1d
diff --git a/net-dns/opendnssec/files/opendnssec-1.3.14-drop-privileges.patch b/net-dns/opendnssec/files/opendnssec-1.3.14-drop-privileges.patch
deleted file mode 100644
index 7c9f72355d20..000000000000
--- a/net-dns/opendnssec/files/opendnssec-1.3.14-drop-privileges.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: conf/conf.xml.in
-===================================================================
---- conf/conf.xml.in	(revision 3022)
-+++ conf/conf.xml.in	(working copy)
-@@ -38,12 +38,10 @@
- 	</Common>
- 
- 	<Enforcer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<Datastore><SQLite>@OPENDNSSEC_STATE_DIR@/kasp.db</SQLite></Datastore>
- 		<Interval>PT3600S</Interval>
-@@ -56,12 +54,10 @@
- 	</Enforcer>
- 
- 	<Signer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
- 		<WorkerThreads>8</WorkerThreads>
-@@ -80,12 +76,10 @@
- 	</Signer>
- 
- 	<Auditor>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
- 	</Auditor>
diff --git a/net-dns/opendnssec/files/opendnssec-1.3.14-use-system-trang.patch b/net-dns/opendnssec/files/opendnssec-1.3.14-use-system-trang.patch
deleted file mode 100644
index 39678408264a..000000000000
--- a/net-dns/opendnssec/files/opendnssec-1.3.14-use-system-trang.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN opendnssec-1.3.0rc3.old/conf/Makefile.am opendnssec-1.3.0rc3/conf/Makefile.am
---- opendnssec-1.3.0rc3.old/conf/Makefile.am	2011-07-01 21:15:25.000000000 +0200
-+++ opendnssec-1.3.0rc3/conf/Makefile.am	2011-07-01 21:17:00.000000000 +0200
-@@ -7,7 +7,7 @@
- XML =	conf.xml kasp.xml zonelist.xml signconf.xml zonefetch.xml
- XSL=	kasp2html.xsl
- 
--TRANG=	$(srcdir)/trang/trang.jar
-+TRANG=	/usr/bin/trang
- 
- sysconfdir = @sysconfdir@/opendnssec
- datadir = @datadir@/opendnssec
-@@ -25,7 +25,7 @@
- .rnc.rng:
- 	@test -x "${JAVA}" || \
- 		(echo "java is required for converting RelaxNG Compact to RelaxNG"; false)
--	${JAVA} -jar ${TRANG} $< $@
-+	${TRANG} $< $@
- 
- regress: $(RNG)
- 	@test -x "${XMLLINT}" || \
diff --git a/net-dns/opendnssec/files/opendnssec-1.3.18-eppclient-curl-CVE-2012-5582.patch b/net-dns/opendnssec/files/opendnssec-1.3.18-eppclient-curl-CVE-2012-5582.patch
deleted file mode 100644
index a0676dd091be..000000000000
--- a/net-dns/opendnssec/files/opendnssec-1.3.18-eppclient-curl-CVE-2012-5582.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN opendnssec-1.3.18.orig/plugins/eppclient/src/epp.c opendnssec-1.3.18/plugins/eppclient/src/epp.c
---- opendnssec-1.3.18.orig/plugins/eppclient/src/epp.c	2014-07-21 11:16:10.000000000 +0200
-+++ opendnssec-1.3.18/plugins/eppclient/src/epp.c	2016-03-23 22:25:18.679354984 +0100
-@@ -390,7 +390,7 @@
-     curl_easy_setopt(curl, CURLOPT_URL, url);
-     curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 1L);
-     curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
--    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 1L);
-+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2L);
-     curl_easy_setopt(curl, CURLOPT_USE_SSL, CURLUSESSL_ALL);
-     curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curlerr);
-     curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L);
diff --git a/net-dns/opendnssec/files/opendnssec-drop-privileges.patch b/net-dns/opendnssec/files/opendnssec-drop-privileges.patch
deleted file mode 100644
index c1972bbc3d1b..000000000000
--- a/net-dns/opendnssec/files/opendnssec-drop-privileges.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- conf/conf.xml.in.orig	2013-05-12 22:36:47.530988182 +0200
-+++ conf/conf.xml.in	2013-05-12 22:37:56.459817918 +0200
-@@ -38,12 +38,10 @@
- 	</Common>
- 
- 	<Enforcer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- <!-- NOTE: Enforcer worker threads are not used; this option is ignored -->
- <!--
- 		<WorkerThreads>4</WorkerThreads>
-@@ -60,12 +58,10 @@
- 	</Enforcer>
- 
- 	<Signer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
- 		<WorkerThreads>4</WorkerThreads>
diff --git a/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch b/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch
deleted file mode 100644
index 3958c6c70ccf..000000000000
--- a/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -urN opendnssec-1.3.0rc2.old/Makefile.am opendnssec-1.3.0rc2/Makefile.am
---- opendnssec-1.3.0rc2.old/Makefile.am	2011-06-02 13:48:56.000000000 +0200
-+++ opendnssec-1.3.0rc2/Makefile.am	2011-06-02 13:49:19.000000000 +0200
-@@ -31,11 +31,11 @@
- 
- install-data-hook:
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/tmp
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/tmp
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
- 
-diff -urN opendnssec-1.3.0rc2.old/m4/opendnssec_common.m4 opendnssec-1.3.0rc2/m4/opendnssec_common.m4
---- opendnssec-1.3.0rc2.old/m4/opendnssec_common.m4	2011-06-02 13:48:56.000000000 +0200
-+++ opendnssec-1.3.0rc2/m4/opendnssec_common.m4	2011-06-02 13:49:36.000000000 +0200
-@@ -18,7 +18,7 @@
- OPENDNSSEC_LIBEXEC_DIR=$full_libexecdir/opendnssec
- OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
- OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
--OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"
-+OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/lib/opendnssec"
- OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
- 
- AC_SUBST([OPENDNSSEC_BIN_DIR])
diff --git a/net-dns/opendnssec/files/opendnssec-fix-run-dir.patch b/net-dns/opendnssec/files/opendnssec-fix-run-dir.patch
deleted file mode 100644
index fe5b504344cf..000000000000
--- a/net-dns/opendnssec/files/opendnssec-fix-run-dir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur opendnssec-1.3.12.orig/m4/opendnssec_common.m4 opendnssec-1.3.12/m4/opendnssec_common.m4
---- opendnssec-1.3.12.orig/m4/opendnssec_common.m4	2013-01-31 13:46:01.122201232 +0100
-+++ opendnssec-1.3.12/m4/opendnssec_common.m4	2013-01-31 13:54:47.648861211 +0100
-@@ -19,7 +19,7 @@
- OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
- OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
- OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/lib/opendnssec"
--OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
-+OPENDNSSEC_PID_DIR="${destdir}/run/opendnssec"
- 
- AC_SUBST([OPENDNSSEC_BIN_DIR])
- AC_SUBST([OPENDNSSEC_SBIN_DIR])
-diff -ur opendnssec-1.3.12.orig/Makefile.am opendnssec-1.3.12/Makefile.am
---- opendnssec-1.3.12.orig/Makefile.am	2013-01-31 13:46:01.122201232 +0100
-+++ opendnssec-1.3.12/Makefile.am	2013-01-31 13:47:08.569951675 +0100
-@@ -37,8 +37,8 @@
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
-+
-+
- 
- docs:
- 	(cd libhsm; $(MAKE) doxygen)
diff --git a/net-dns/opendnssec/files/opendnssec.confd-1.3.x b/net-dns/opendnssec/files/opendnssec.confd-1.3.x
deleted file mode 100644
index 63121af7f0ca..000000000000
--- a/net-dns/opendnssec/files/opendnssec.confd-1.3.x
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Variables containing default binaries used in the opendnssec
-# initscript. You can alter them to another applications/paths
-# if required.
-
-CHECKCONFIG_BIN=/usr/bin/ods-kaspcheck
-CONTROL_BIN=/usr/sbin/ods-control
-ENFORCER_BIN=/usr/sbin/ods-enforcerd
-SIGNER_BIN=/usr/sbin/ods-signerd
-EPPCLIENT_BIN=/usr/sbin/eppclientd
-EPPCLIENT_PIDFILE=/run/opendnssec/eppclientd.pid
diff --git a/net-dns/opendnssec/files/opendnssec.initd-1.3.x b/net-dns/opendnssec/files/opendnssec.initd-1.3.x
deleted file mode 100644
index f4c9fa3c149b..000000000000
--- a/net-dns/opendnssec/files/opendnssec.initd-1.3.x
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="An open-source turn-key solution for DNSSEC"
-
-depend() {
-	use logger
-}
-
-checkconfig() {
-	if [ -z "${CHECKCONFIG_BIN}" ]; then
-		# no config checker configured, skip config check
-		return 0
-	fi
-	if [ -x "${CHECKCONFIG_BIN}" ]; then
-		output=$(${CHECKCONFIG_BIN} 2>&1| grep -v -E "^/etc/opendnssec/(conf|kasp).xml validates")
-		if [ -n "$output" ]; then
-			echo $output
-		fi
-
-		errors=$(echo $output | grep ERROR | wc -l)
-		if [ $errors -gt 0 ]; then
-			ewarn "$errors error(s) found in OpenDNSSEC configuration."
-		fi
-		return $errors
-	fi
-	eerror "Unable to execute ${CHECKCONFIG_BIN:-config binary}"
-	# can't validate config, just die
-	return 1
-}
-
-start_enforcer() {
-	if [ -n "${ENFORCER_BIN}" ] && [ -x "${ENFORCER_BIN}" ]; then
-		ebegin "Starting OpenDNSSEC Enforcer"
-		${CONTROL_BIN} enforcer start > /dev/null
-		eend $?
-	else
-		if [ -n "${ENFORCER_BIN}" ]; then
-			eerror "OpenDNSSEC Enforcer binary not executable"
-			return 1
-		fi
-		einfo "OpenDNSSEC Enforcer not used."
-	fi
-}
-
-stop_enforcer() {
-	if [ -x "${ENFORCER_BIN}" ]; then
-		ebegin "Stopping OpenDNSSEC Enforcer"
-		${CONTROL_BIN} enforcer stop > /dev/null
-		eend $?
-	fi
-}
-
-start_signer() {
-	if [ -n "${SIGNER_BIN}" ] && [ -x "${SIGNER_BIN}" ]; then
-		ebegin "Starting OpenDNSSEC Signer"
-		${CONTROL_BIN} signer start > /dev/null 2>&1
-		eend $?
-	else
-		if [ -n "${SIGNER_BIN}" ]; then
-			eerror "OpenDNSSEC Signer binary not executable"
-			return 1
-		fi
-		einfo "OpenDNSSEC Signer not used."
-	fi
-}
-
-stop_signer() {
-	if [ -x "${SIGNER_BIN}" ]; then
-		ebegin "Stopping OpenDNSSEC Signer"
-		${CONTROL_BIN} signer stop > /dev/null 2>&1
-		eend $?
-	fi
-}
-
-start_eppclient() {
-	if [ -n "${EPPCLIENT_BIN}" ] && [ -x "${EPPCLIENT_BIN}" ]; then
-		ebegin "Starting OpenDNSSEC Eppclient"
-		start-stop-daemon \
-			--start \
-			--user opendnssec --group opendnssec \
-			--exec "${EPPCLIENT_BIN}" \
-			--pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
-		eend $?
-	else
-		# eppclient is ofptional so if we use the default binary and it
-		# is not used we won't die
-		if [ -n "${EPPCLIENT_BIN}" ] && \
-				[ "${EPPCLIENT_BIN}" != "/usr/sbin/eppclientd" ]; then
-			eerror "OpenDNSSEC Eppclient binary not executable"
-			return 1
-		fi
-		einfo "OpenDNSSEC Eppclient not used."
-	fi
-}
-
-stop_eppclient() {
-	if [ -x "${EPPCLIENT_BIN}" ]; then
-		ebegin "Stopping OpenDNSSEC Eppclient"
-		start-stop-daemon \
-			--stop \
-			--exec "${EPPCLIENT_BIN}" \
-			--pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
-		eend $?
-	fi
-}
-
-start() {
-	checkconfig || return $?
-	test -d /run/opendnssec || mkdir -p /run/opendnssec
-	chown opendnssec:opendnssec /run/opendnssec
-	start_enforcer || return $?
-	start_signer || return $?
-	start_eppclient || return $?
-}
-
-stop() {
-	stop_eppclient
-	stop_signer
-	stop_enforcer
-	sleep 5
-}
diff --git a/net-dns/opendnssec/metadata.xml b/net-dns/opendnssec/metadata.xml
index f81a154f2ecf..05f2788d1508 100644
--- a/net-dns/opendnssec/metadata.xml
+++ b/net-dns/opendnssec/metadata.xml
@@ -5,8 +5,6 @@
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="auditor">Enables auditing capabilities for OpenDNSSEC</flag>
-		<flag name="eppclient">Enables support for automatic submission of DNSSEC keys to an upstream epp server</flag>
 		<flag name="signer">Enables signing capabilities for OpenDNSSEC</flag>
 		<flag name="opensc">Enables support for storing DNSSEC keys through a <pkg>dev-libs/opensc</pkg> PKCS#11 interface</flag>
 		<flag name="softhsm">Enables support for storing DNSSEC keys in a <pkg>dev-libs/softhsm</pkg> PKCS#11 object</flag>
diff --git a/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild b/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
deleted file mode 100644
index a37fb6fc331a..000000000000
--- a/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/_}"
-PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit autotools multilib user
-
-DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
-
-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
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-libs/ldns
-	curl? ( net-misc/curl )
-	mysql? (
-		virtual/mysql
-		dev-perl/DBD-mysql
-	)
-	opensc? ( dev-libs/opensc )
-	softhsm? ( dev-libs/softhsm:* )
-	sqlite? (
-		dev-db/sqlite:3
-		dev-perl/DBD-SQLite
-	)
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		app-text/trang
-	)
-"
-# test? dev-util/cunit # Requires running test DB
-
-REQUIRED_USE="
-	^^ ( mysql sqlite )
-	^^ ( softhsm opensc external-hsm )
-	eppclient? ( curl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-localstatedir.patch"
-	"${FILESDIR}/${PN}-fix-run-dir.patch"
-	"${FILESDIR}/${PN}-1.3.14-drop-privileges.patch"
-	"${FILESDIR}/${PN}-1.3.14-use-system-trang.patch"
-	"${FILESDIR}/${PN}-1.3.18-eppclient-curl-CVE-2012-5582.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( MIGRATION NEWS )
-
-check_pkcs11_setup() {
-	# PKCS#11 HSM's are often only available with proprietary drivers not
-	# available in portage tree.
-
-	if use softhsm; then
-		PKCS11_LIB=softhsm
-		if has_version ">=dev-libs/softhsm-1.3.1"; then
-			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
-		else
-			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		fi
-		elog "Building with SoftHSM PKCS#11 library support."
-	fi
-	if use opensc; then
-		PKCS11_LIB=opensc
-		PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
-		elog "Building with OpenSC PKCS#11 library support."
-	fi
-	if use external-hsm; then
-		if [[ -n ${PKCS11_SCA6000} ]]; then
-			PKCS11_LIB=sca6000
-			PKCS11_PATH=${PKCS11_SCA6000}
-		elif [[ -n ${PKCS11_ETOKEN} ]]; then
-			PKCS11_LIB=etoken
-			PKCS11_PATH=${PKCS11_ETOKEN}
-		elif [[ -n ${PKCS11_NCIPHER} ]]; then
-			PKCS11_LIB=ncipher
-			PKCS11_PATH=${PKCS11_NCIPHER}
-		elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
-			PKCS11_LIB=aepkeyper
-			PKCS11_PATH=${PKCS11_AEPKEYPER}
-		else
-			ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
-			ewarn "library. To set a path, set one of the following environment variables:"
-			ewarn "  for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
-			ewarn "  for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
-			ewarn "  for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
-			ewarn "  for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
-			ewarn "Example:"
-			ewarn "  PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
-			ewarn "or store the variable into /etc/portage/make.conf"
-			die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
-		fi
-		elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
-	fi
-}
-
-pkg_pretend() {
-	local i
-
-	for i in eppclient mysql; do
-		if use ${i}; then
-			ewarn
-			ewarn "Usage of ${i} is considered experimental."
-			ewarn "Do not report bugs against this feature."
-			ewarn
-		fi
-	done
-
-	check_pkcs11_setup
-}
-
-pkg_setup() {
-	enewgroup opendnssec
-	enewuser opendnssec -1 -1 -1 opendnssec
-
-	# pretend does not preserve variables so we need to run this once more
-	check_pkcs11_setup
-}
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	# $(use_with test cunit "${EPREFIX}/usr/") \
-	econf \
-		--without-cunit \
-		--localstatedir="${EPREFIX}/var/" \
-		--disable-static \
-		--with-database-backend=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
-		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
-		--disable-auditor \
-		$(use_with curl) \
-		$(use_enable debug timeshift) \
-		$(use_enable eppclient) \
-		$(use_enable signer)
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	default
-
-	# remove useless .la files
-	find "${ED}" -name '*.la' -delete
-
-	# Remove subversion tags from config files to avoid useless config updates
-	sed -i \
-		-e '/<!-- \$Id:/ d' \
-		"${ED}"/etc/opendnssec/* || die
-
-	# install update scripts
-	insinto /usr/share/opendnssec
-	use sqlite && doins enforcer/utils/migrate_keyshare_sqlite3.pl
-	use mysql && doins enforcer/utils/migrate_keyshare_mysql.pl
-
-	# fix permissions
-	fowners root:opendnssec /etc/opendnssec
-	fowners root:opendnssec /etc/opendnssec/{conf,kasp,zonelist,zonefetch}.xml
-	use eppclient && fowners root:opendnssec /etc/opendnssec/eppclientd.conf
-
-	fowners opendnssec:opendnssec /var/lib/opendnssec/{,signconf,unsigned,signed,tmp}
-
-	# install conf/init script
-	newinitd "${FILESDIR}"/opendnssec.initd-1.3.x opendnssec
-	newconfd "${FILESDIR}"/opendnssec.confd-1.3.x opendnssec
-	use auditor || sed -i 's/^CHECKCONFIG_BIN=.*/CHECKCONFIG_BIN=/' "${D}"/etc/conf.d/opendnssec
-}
-
-pkg_postinst() {
-	if use softhsm; then
-		elog "Please make sure that you create your softhsm database in a location writeable"
-		elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
-		elog "Suggested configuration is:"
-		elog "    echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
-		elog "    softhsm --init-token --slot 0 --label OpenDNSSEC"
-		elog "    chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
-	fi
-	if use auditor; then
-		ewarn
-		ewarn "Please note that auditor support has been disabled in this version since it"
-		ewarn "it depends on ruby 1.8 which has been removed from the portage tree."
-		ewarn "USE=auditor is only provided for this warning but will not install the"
-		ewarn "auditor anymore."
-		ewarn
-	fi
-}
diff --git a/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild b/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
deleted file mode 100644
index 7204fc6a5df8..000000000000
--- a/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/_}"
-PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit autotools eutils multilib user
-
-DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
-
-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
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-libs/ldns
-	mysql? (
-		virtual/mysql
-		dev-perl/DBD-mysql
-	)
-	opensc? ( dev-libs/opensc )
-	softhsm? ( dev-libs/softhsm:* )
-	sqlite? (
-		dev-db/sqlite:3
-		dev-perl/DBD-SQLite
-	)
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		app-text/trang
-	)
-"
-
-REQUIRED_USE="
-	^^ ( mysql sqlite )
-	^^ ( softhsm opensc external-hsm )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-localstatedir.patch"
-	"${FILESDIR}/${PN}-fix-run-dir.patch"
-	"${FILESDIR}/${PN}-drop-privileges.patch"
-	"${FILESDIR}/${PN}-use-system-trang.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( MIGRATION NEWS )
-
-check_pkcs11_setup() {
-	# PKCS#11 HSM's are often only available with proprietary drivers not
-	# available in portage tree.
-
-	if use softhsm; then
-		PKCS11_LIB=softhsm
-		if has_version ">=dev-libs/softhsm-1.3.1"; then
-			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
-		else
-			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		fi
-		elog "Building with SoftHSM PKCS#11 library support."
-	fi
-	if use opensc; then
-		PKCS11_LIB=opensc
-		PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
-		elog "Building with OpenSC PKCS#11 library support."
-	fi
-	if use external-hsm; then
-		if [[ -n ${PKCS11_SCA6000} ]]; then
-			PKCS11_LIB=sca6000
-			PKCS11_PATH=${PKCS11_SCA6000}
-		elif [[ -n ${PKCS11_ETOKEN} ]]; then
-			PKCS11_LIB=etoken
-			PKCS11_PATH=${PKCS11_ETOKEN}
-		elif [[ -n ${PKCS11_NCIPHER} ]]; then
-			PKCS11_LIB=ncipher
-			PKCS11_PATH=${PKCS11_NCIPHER}
-		elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
-			PKCS11_LIB=aepkeyper
-			PKCS11_PATH=${PKCS11_AEPKEYPER}
-		else
-			ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
-			ewarn "library. To set a path, set one of the following environment variables:"
-			ewarn "  for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
-			ewarn "  for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
-			ewarn "  for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
-			ewarn "  for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
-			ewarn "Example:"
-			ewarn "  PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
-			ewarn "or store the variable into /etc/portage/make.conf"
-			die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
-		fi
-		elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
-	fi
-}
-
-pkg_pretend() {
-	check_pkcs11_setup
-}
-
-pkg_setup() {
-	enewgroup opendnssec
-	enewuser opendnssec -1 -1 -1 opendnssec
-
-	# pretend does not preserve variables so we need to run this once more
-	check_pkcs11_setup
-}
-
-src_prepare() {
-	local patch
-	default
-	for patch in "${PATCHES[@]}"; do
-		epatch "$patch"
-	done
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-cunit \
-		--localstatedir="${EPREFIX}/var/" \
-		--disable-static \
-		--with-database-backend=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
-		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
-		$(use_enable debug timeshift) \
-		$(use_enable signer)
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	default
-
-	# remove useless .la files
-	find "${ED}" -name '*.la' -delete
-
-	# Remove subversion tags from config files to avoid useless config updates
-	sed -i \
-		-e '/<!-- \$Id:/ d' \
-		"${ED}"/etc/opendnssec/* || die
-
-	# install update scripts
-	insinto /usr/share/opendnssec
-	if use sqlite; then
-		doins enforcer/utils/migrate_*sqlite*
-	fi
-	if use mysql; then
-		doins enforcer/utils/migrate_*mysql*
-	fi
-
-	# fix permissions
-	fowners root:opendnssec /etc/opendnssec
-	fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
-	fowners opendnssec:opendnssec /var/lib/opendnssec/{,signconf,unsigned,signed,tmp}
-
-	# install conf/init script
-	newinitd "${FILESDIR}"/opendnssec.initd opendnssec
-	newconfd "${FILESDIR}"/opendnssec.confd opendnssec
-}
-
-pkg_postinst() {
-	local v
-	if use softhsm; then
-		elog "Please make sure that you create your softhsm database in a location writeable"
-		elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
-		elog "Suggested configuration is:"
-		elog "    echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
-		elog "    softhsm --init-token --slot 0 --label OpenDNSSEC"
-		elog "    chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
-	fi
-
-	for v in $REPLACING_VERSIONS; do
-		case $v in
-			1.3.*)
-				ewarn ""
-				ewarn "You are upgrading from version 1.3."
-				ewarn ""
-				ewarn "Please be aware of the following:"
-				ewarn "  * OpenDNSSEC now supports both input and output adapters for"
-				ewarn "    AXFR and IXFR in addition to file transfer."
-				ewarn "    -> The zonefetch.xml file has been replaced by addns.xml"
-				ewarn "       to support this enhancement."
-				ewarn "    -> changes to the KASP database mean that a database"
-				ewarn "       migration is required to upgrade to 1.4 from earlier"
-				ewarn "       versions of OpenDNSSEC."
-				ewarn "  * The auditor is no longer supported."
-				ewarn ""
-				ewarn "You can find more information here:"
-				ewarn "  * /usr/share/doc/opendnssec*/MIGRATION*"
-				ewarn "  * https://wiki.opendnssec.org/display/DOCS/Migrating+zone+fetcher+to+DNS+adapters"
-				ewarn "  * https://wiki.opendnssec.org/display/DOCS/Migrating+from+earlier+versions+of+OpenDNSSEC"
-				ewarn ""
-			;;
-		esac
-	done
-}
diff --git a/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild b/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
deleted file mode 100644
index fa23c0bf555a..000000000000
--- a/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/_}"
-PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit autotools multilib user
-
-DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
-
-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
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-libs/ldns
-	mysql? (
-		virtual/mysql
-		dev-perl/DBD-mysql
-	)
-	opensc? ( dev-libs/opensc )
-	softhsm? ( dev-libs/softhsm:* )
-	sqlite? (
-		dev-db/sqlite:3
-		dev-perl/DBD-SQLite
-	)
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		app-text/trang
-	)
-"
-
-REQUIRED_USE="
-	^^ ( mysql sqlite )
-	^^ ( softhsm opensc external-hsm )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-localstatedir.patch"
-	"${FILESDIR}/${PN}-fix-run-dir.patch"
-	"${FILESDIR}/${PN}-drop-privileges.patch"
-	"${FILESDIR}/${PN}-use-system-trang.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( MIGRATION NEWS )
-
-check_pkcs11_setup() {
-	# PKCS#11 HSM's are often only available with proprietary drivers not
-	# available in portage tree.
-
-	if use softhsm; then
-		PKCS11_LIB=softhsm
-		if has_version ">=dev-libs/softhsm-1.3.1"; then
-			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
-		else
-			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		fi
-		elog "Building with SoftHSM PKCS#11 library support."
-	fi
-	if use opensc; then
-		PKCS11_LIB=opensc
-		PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
-		elog "Building with OpenSC PKCS#11 library support."
-	fi
-	if use external-hsm; then
-		if [[ -n ${PKCS11_SCA6000} ]]; then
-			PKCS11_LIB=sca6000
-			PKCS11_PATH=${PKCS11_SCA6000}
-		elif [[ -n ${PKCS11_ETOKEN} ]]; then
-			PKCS11_LIB=etoken
-			PKCS11_PATH=${PKCS11_ETOKEN}
-		elif [[ -n ${PKCS11_NCIPHER} ]]; then
-			PKCS11_LIB=ncipher
-			PKCS11_PATH=${PKCS11_NCIPHER}
-		elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
-			PKCS11_LIB=aepkeyper
-			PKCS11_PATH=${PKCS11_AEPKEYPER}
-		else
-			ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
-			ewarn "library. To set a path, set one of the following environment variables:"
-			ewarn "  for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
-			ewarn "  for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
-			ewarn "  for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
-			ewarn "  for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
-			ewarn "Example:"
-			ewarn "  PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
-			ewarn "or store the variable into /etc/portage/make.conf"
-			die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
-		fi
-		elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
-	fi
-}
-
-pkg_pretend() {
-	check_pkcs11_setup
-}
-
-pkg_setup() {
-	enewgroup opendnssec
-	enewuser opendnssec -1 -1 -1 opendnssec
-
-	# pretend does not preserve variables so we need to run this once more
-	check_pkcs11_setup
-}
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-cunit \
-		--localstatedir="${EPREFIX}/var/" \
-		--disable-static \
-		--with-database-backend=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
-		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
-		$(use_enable debug timeshift) \
-		$(use_enable signer)
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	default
-
-	# remove useless .la files
-	find "${ED}" -name '*.la' -delete
-
-	# Remove subversion tags from config files to avoid useless config updates
-	sed -i \
-		-e '/<!-- \$Id:/ d' \
-		"${ED}"/etc/opendnssec/* || die
-
-	# install update scripts
-	insinto /usr/share/opendnssec
-	if use sqlite; then
-		doins enforcer/utils/migrate_keyshare_sqlite3.pl
-		doins enforcer/utils/migrate_adapters_1.sqlite3
-	fi
-	if use mysql; then
-		doins enforcer/utils/migrate_keyshare_mysql.pl
-		doins enforcer/utils/migrate_adapters_1.mysql
-	fi
-
-	# fix permissions
-	fowners root:opendnssec /etc/opendnssec
-	fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
-	fowners opendnssec:opendnssec /var/lib/opendnssec/{,signconf,unsigned,signed,tmp}
-
-	# install conf/init script
-	newinitd "${FILESDIR}"/opendnssec.initd opendnssec
-	newconfd "${FILESDIR}"/opendnssec.confd opendnssec
-}
-
-pkg_postinst() {
-	local v
-	if use softhsm; then
-		elog "Please make sure that you create your softhsm database in a location writeable"
-		elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
-		elog "Suggested configuration is:"
-		elog "    echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
-		elog "    softhsm --init-token --slot 0 --label OpenDNSSEC"
-		elog "    chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
-	fi
-
-	for v in $REPLACING_VERSIONS; do
-		case $v in
-			1.3.*)
-				ewarn ""
-				ewarn "You are upgrading from version 1.3."
-				ewarn ""
-				ewarn "Please be aware of the following:"
-				ewarn "  * OpenDNSSEC now supports both input and output adapters for"
-				ewarn "    AXFR and IXFR in addition to file transfer."
-				ewarn "    -> The zonefetch.xml file has been replaced by addns.xml"
-				ewarn "       to support this enhancement."
-				ewarn "    -> changes to the KASP database mean that a database"
-				ewarn "       migration is required to upgrade to 1.4 from earlier"
-				ewarn "       versions of OpenDNSSEC."
-				ewarn "  * The auditor is no longer supported."
-				ewarn ""
-				ewarn "You can find more information here:"
-				ewarn "  * /usr/share/doc/opendnssec*/MIGRATION*"
-				ewarn "  * https://wiki.opendnssec.org/display/DOCS/Migrating+zone+fetcher+to+DNS+adapters"
-				ewarn "  * https://wiki.opendnssec.org/display/DOCS/Migrating+from+earlier+versions+of+OpenDNSSEC"
-				ewarn ""
-			;;
-		esac
-	done
-}
diff --git a/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild b/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
deleted file mode 100644
index b93dc8f5ab2b..000000000000
--- a/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/_}"
-PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit autotools eutils multilib user
-
-DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
-
-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
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-libs/ldns
-	mysql? (
-		virtual/mysql
-		dev-perl/DBD-mysql
-	)
-	opensc? ( dev-libs/opensc )
-	readline? ( sys-libs/readline:0 )
-	softhsm? ( dev-libs/softhsm:* )
-	sqlite? (
-		dev-db/sqlite:3
-		dev-perl/DBD-SQLite
-	)
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		app-text/trang
-	)
-"
-
-REQUIRED_USE="
-	^^ ( mysql sqlite )
-	^^ ( softhsm opensc external-hsm )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-localstatedir-2.0.x.patch"
-	"${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch"
-	"${FILESDIR}/${PN}-drop-privileges-2.0.x.patch"
-	"${FILESDIR}/${PN}-use-system-trang.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( MIGRATION NEWS )
-
-check_pkcs11_setup() {
-	# PKCS#11 HSM's are often only available with proprietary drivers not
-	# available in portage tree.
-
-	if use softhsm; then
-		PKCS11_LIB=softhsm
-		if has_version ">=dev-libs/softhsm-1.3.1"; then
-			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
-		else
-			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		fi
-		elog "Building with SoftHSM PKCS#11 library support."
-	fi
-	if use opensc; then
-		PKCS11_LIB=opensc
-		PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
-		elog "Building with OpenSC PKCS#11 library support."
-	fi
-	if use external-hsm; then
-		if [[ -n ${PKCS11_SCA6000} ]]; then
-			PKCS11_LIB=sca6000
-			PKCS11_PATH=${PKCS11_SCA6000}
-		elif [[ -n ${PKCS11_ETOKEN} ]]; then
-			PKCS11_LIB=etoken
-			PKCS11_PATH=${PKCS11_ETOKEN}
-		elif [[ -n ${PKCS11_NCIPHER} ]]; then
-			PKCS11_LIB=ncipher
-			PKCS11_PATH=${PKCS11_NCIPHER}
-		elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
-			PKCS11_LIB=aepkeyper
-			PKCS11_PATH=${PKCS11_AEPKEYPER}
-		else
-			ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
-			ewarn "library. To set a path, set one of the following environment variables:"
-			ewarn "  for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
-			ewarn "  for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
-			ewarn "  for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
-			ewarn "  for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
-			ewarn "Example:"
-			ewarn "  PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
-			ewarn "or store the variable into /etc/portage/make.conf"
-			die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
-		fi
-		elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
-	fi
-}
-
-pkg_pretend() {
-	if has_version "<net-dns/opendnssec-1.4.10"; then
-		################################################################################
-		eerror "You are already using OpenDNSSEC."
-		eerror "In order to migrate to version >=2.0.0 you need to upgrade to"
-		eerror "version >=1.4.10 first:"
-		eerror ""
-		eerror "   emerge \"<net-dns/opendnssec-2\""
-		eerror ""
-		eerror "See https://github.com/opendnssec/opendnssec/blob/2.0/master/MIGRATION"
-		eerror "for details."
-		eerror ""
-		die "Please upgrade to version >=1.4.10 first for proper db migraion"
-	fi
-
-	check_pkcs11_setup
-}
-
-pkg_setup() {
-	enewgroup opendnssec
-	enewuser opendnssec -1 -1 -1 opendnssec
-
-	# pretend does not preserve variables so we need to run this once more
-	check_pkcs11_setup
-}
-
-src_prepare() {
-	local patch
-	default
-	for patch in "${PATCHES[@]}"; do
-		epatch "$patch"
-	done
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-cunit \
-		--localstatedir="${EPREFIX}/var" \
-		--disable-static \
-		--with-enforcer-database=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
-		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
-		$(use_with readline) \
-		$(use_enable signer)
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	default
-
-	# remove useless .la files
-	find "${ED}" -name '*.la' -delete
-
-	# Remove subversion tags from config files to avoid useless config updates
-	sed -i \
-		-e '/<!-- \$Id:/ d' \
-		"${ED}"/etc/opendnssec/* || die
-
-	# install db update/migration stuff
-	insinto /usr/share/opendnssec/db
-	if use sqlite; then
-		doins enforcer/utils/convert_mysql_to_sqlite
-	fi
-	if use mysql; then
-		doins enforcer/utils/convert_sqlite_to_mysql
-	fi
-
-	insinto /usr/share/opendnssec/db/sql
-	if use sqlite; then
-		doins enforcer/src/db/schema.sqlite
-	fi
-	if use mysql; then
-		doins enforcer/src/db/schema.mysql
-	fi
-
-	insinto /usr/share/opendnssec/db/1.4-2.0_db_convert
-	doins enforcer/utils/1.4-2.0_db_convert/find_problematic_zones.sql
-	doins enforcer/utils/1.4-2.0_db_convert/README.md
-	if use sqlite; then
-		doins enforcer/utils/1.4-2.0_db_convert/sqlite_convert.sql
-		doins enforcer/utils/1.4-2.0_db_convert/convert_sqlite
-	fi
-	if use mysql; then
-		doins enforcer/utils/1.4-2.0_db_convert/convert_mysql
-		doins enforcer/utils/1.4-2.0_db_convert/mysql_convert.sql
-	fi
-
-	# patch scripts to find schema files
-	sed -i \
-		-e 's,^SCHEMA=../src/db/,SCHEMA=/usr/share/opendnssec/db/sql/,' \
-		-e 's,^SCHEMA=../../src/db/,SCHEMA=/usr/share/opendnssec/db/sql/,' \
-		"${ED}"/usr/share/opendnssec/db/convert_* \
-		"${ED}"/usr/share/opendnssec/db/1.4-2.0_db_convert/convert_*
-
-	# fix permissions
-	fowners root:opendnssec /etc/opendnssec
-	fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
-	fowners opendnssec:opendnssec /var/lib/opendnssec/{,enforcer,signconf,signed,signer,unsigned}
-
-	# install conf/init script
-	newinitd "${FILESDIR}"/opendnssec.initd opendnssec
-	newconfd "${FILESDIR}"/opendnssec.confd opendnssec
-}
-
-pkg_postinst() {
-	local v
-	if use softhsm; then
-		elog "Please make sure that you create your softhsm database in a location writeable"
-		elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
-		elog "Suggested configuration is:"
-		elog "    echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
-		elog "    softhsm --init-token --slot 0 --label OpenDNSSEC"
-		elog "    chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
-	fi
-	for v in $REPLACING_VERSIONS; do
-		case $v in
-			1.4.*)
-				ewarn ""
-				ewarn "You are upgrading from version 1.4."
-				ewarn ""
-				ewarn "A migration is needed from 1.4 to 2.0."
-				ewarn "For details see /usr/share/doc/${P}/MIGRATION*"
-				ewarn ""
-				ewarn "For your convenience the mentioned migration scripts and README"
-				ewarn "have been installed to /usr/share/${PN}/db/1.4-2.0_db_convert"
-				ewarn ""
-			;;
-		esac
-	done
-}
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index cb17f0cae15b..ea58bac1107a 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,5 +1,5 @@
 DIST openresolv-3.11.0.tar.xz 20552 BLAKE2B 5564ecac60124fa391a13979da533c4f7cf99601acc896cb5d3cc029bff15ef48ea36e867a0fc6d1e6e475a7536660fbd819120b3066dd2aadc12abf0e16c8ff SHA512 09708b8a1abf7de926f75a1825d4243be6e59fc1de7cc3d7ab7f5a317e11175bd24af03bff2c878ccc54c96913feed27630765647c70fec8a9f9aa7370744e24
 DIST openresolv-3.12.0.tar.xz 21008 BLAKE2B 1609d8e97a9abe82f9ead7179727dd4323571e92b36aa2ca2a1177972f3a61946f612dd0cf81a804087f1c71bda25e78dab8b085ad2be55ce21214dc9870fdf6 SHA512 60348ca35114b105c8b3121e5f2d301311fcc7251a9be60c45fedc27267cfd94e413e77c7d5c91d0a0ccb8f1b4288bc147582b0ac9be64afcaa96ad3d833f26f
 EBUILD openresolv-3.11.0.ebuild 1054 BLAKE2B 6d8afb6396bbcc82eb4957afce12914c29c66c765cbaca39a91bc256cab5551c11c88ca57faa5dd394df677a4a21cacedab984a0d714c6ac3bfd97a27dc540f7 SHA512 8c8a50bd91f96cd3c8ff688e46fc9ea1e39995d26cb2c5f65a1b79e20de48de44f569a50426a1246a2e9683a1431b6318bf0a83492ece338a8f66b3a25d04498
-EBUILD openresolv-3.12.0.ebuild 1062 BLAKE2B ec16455ad5b1908020cdea3c821dde7cd1355129f4f0669d77d6ef220382928c2fbd7d0608f8029992b87b04a12967ad78574749e56cdf3963a46f894b7f743f SHA512 dd9665e7449f0a62faeea7bbff6d9d4732b3b9a89892c297f8ab555b1493a673128e1b0497e0c2427c3742e4cecfbb8a55e8700c56b3ccf833589f0d7e938b17
-MISC metadata.xml 296 BLAKE2B e1c6c8f42462baf3baa01d0585b0b0c7c60b051f049e430ec8d897ce6e52076d6d6559ad6a1694a8b88defad53987b0db7fd15a67221f94ff1d68d2732f94c3b SHA512 0930523210dedeaa5cd93debcfaac1d8b578c0fe1a9205a9ff2d2a79ae6567a5b220711fc12c16a69bf6f174b2d5cffb425db772b2dd436ca6386b352b5964f8
+EBUILD openresolv-3.12.0.ebuild 1054 BLAKE2B f3d5751724ab8ae7ae3696529dda12f5de6f64bafea6cab8fcb9d85004895ec4dcd9415541f23d12d2b3f7b205d59f75b2bcd0d5916e54073393c13b91689861 SHA512 7581367618108f4406c422d3adf829568d5795648f3cd03f96d8fca7a4ae6d3afa5cfd5ac27b366bb84092cb6d2d71dbc5b5a6af728c19a1f702d00fd2147f57
+MISC metadata.xml 268 BLAKE2B 64bd35ab0734da264061b8946fa2d38f03b25ae7fb2aafbbe8c51c63f58c98ae052e49f5854c711895c0b81b46be7bbef8525408883b7fcdcd5a975295c92eab SHA512 dd949ae4aac3d786ce9127771b07178f1044f5611b9aa0ed59235dc0f3f7f75eea71c0ccde661bf5149773f9c4c9ebbc81940c01260a456ee578351bf935e68b
diff --git a/net-dns/openresolv/metadata.xml b/net-dns/openresolv/metadata.xml
index d6b6749c1b44..8411f56fb911 100644
--- a/net-dns/openresolv/metadata.xml
+++ b/net-dns/openresolv/metadata.xml
@@ -5,6 +5,5 @@
 		<email>bkohler@gentoo.org</email>
 		<name>Ben Kohler</name>
 	</maintainer>
-	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/net-dns/openresolv/openresolv-3.12.0.ebuild b/net-dns/openresolv/openresolv-3.12.0.ebuild
index b6f8cef53a1f..2cc9fb729890 100644
--- a/net-dns/openresolv/openresolv-3.12.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.12.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-resolvconf )"
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 4c58acf81e96..95bdedc96374 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,4 +1,6 @@
 AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
 DIST pdns-recursor-4.4.2.tar.bz2 1396763 BLAKE2B f8dad7694ac13ed8d824ddaf613d1a001452ab2c08fcbb0e00d2b2258464b754809746b89998b818c44866f9e4b22c87c1cebf2da852fb7b6247ac6b9fd4b99d SHA512 31fdf62d87e5ee8f9570c6b738339bc8cc65c43800f18c7fb49aa5c53fc9ad76a1ddf02cc44f7129e06b41700b5cb3768ff8f81cc521c28147ea6538c73f8781
+DIST pdns-recursor-4.4.3.tar.bz2 1398743 BLAKE2B d9429ef22bb2b196e42da91332332b38dee9220d490c8adda686b0bc144e0981ea4418973f4304d6d964ef8f6ac4adcde4bd3e6d6b208c620440eab1b11a7fc0 SHA512 bac69cbaabc1b0de0def681e07f7e77954e0d487732cb46dc722f7869576a8a477a4011f78c9cc66b5e9b45455eb81534602b2834dc1ad42b85f5f2801915cbb
 EBUILD pdns-recursor-4.4.2-r100.ebuild 2002 BLAKE2B 9edb0aa92f545c91b1eadf5426ad3652e522b0b7e35a9ae5ea22c4632fa5907a475b873c6caa99b9beede497b298709c5fbebc4c5c6e68841c140ed719729497 SHA512 f9bb8eba62146a30e0bb8b2abdddfcfac9cc4766f3009686f56fc978dd625cda49ea4d5b1e294a1a20b82ceb4d64ee68542aea2daa98305c2c4328700f0d1f72
+EBUILD pdns-recursor-4.4.3.ebuild 2070 BLAKE2B cd2177eac66fda358eb0af7179ebd4eff4c5073045cc89eeb8cfe66784c53bfa7d49e4c99e61dd4f11950fbaa4897f126f3e8f15c0f2692419a67f7da01a36ff SHA512 3838a0f71be851a32fb608dfb501f5f07b91b66b4dfdb9e17a94316cc2cb46809de91406178509a19442f8ae921dccac19f0e5db1e54436425d51a5af3401121
 MISC metadata.xml 1008 BLAKE2B 1c82fd9262358bcf1ff0f8503bc8dfe9b640023133ca48711bc576df00312312b5e37a36ff10aac561ef1c71e20f64c5f0a4c431c60ca029220732fba0ee1bf9 SHA512 2deab5a88c42d3416b3da5b6d9d3ed9b2db0a5dcb3d8b7fc4c7a13b2219fd7df786bfef42ff5e3d7c2b40058592e892f380d126a0254013534e66e65499e7105
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.3.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.3.ebuild
new file mode 100644
index 000000000000..312ff4250bd2
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug dnstap libressl protobuf snmp sodium systemd test"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	dnstap? ( protobuf )"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	dnstap? ( dev-libs/fstrm )
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
+		$(use_with sodium libsodium) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-dns/resolv_wrapper/Manifest b/net-dns/resolv_wrapper/Manifest
index be1c17ac20d9..43e89e4bce22 100644
--- a/net-dns/resolv_wrapper/Manifest
+++ b/net-dns/resolv_wrapper/Manifest
@@ -3,5 +3,5 @@ DIST resolv_wrapper-1.1.6.tar.gz 38276 BLAKE2B 4b1c79a342b74f33063ba480b1706a107
 DIST resolv_wrapper-1.1.7.tar.gz 45148 BLAKE2B d1b860187bfa3be6eadd848abc458d5c9e3c4c4048a70b37d7548caf2604bda51f8a3606487fb95d682ab39e06f63f29b85de981ae32527997799fa5d72befab SHA512 531a7734f40d8a7cb3da4618eebbb4530657ad2cdcf3c1cd48f3ae1dcf55fc003205e44745fc3f70704060ae0c6a2516919c61fd10223ff56d90a47a3c59b3c0
 EBUILD resolv_wrapper-1.1.5.ebuild 658 BLAKE2B d08b85542d7f12ac823968a30608f70a8d288f6967e5180e3e47345bde26caf5f9e97436793752dc82eadeb1566c78852a6a78cd5284f4b9ad962312ebab0969 SHA512 836c969b74b0f5aa9d37500f655d00fa1307c7a21d88b0a2ba90eebe2dd7c89a5b3927ef41d1aa5dba0b9031f7264dee1e488f44919350bef11129a59ed48656
 EBUILD resolv_wrapper-1.1.6.ebuild 664 BLAKE2B decc50a1b1a35010953fb0cfe98c3a35c1968c285f3b20f7a446456b6a834a6ffd02224ff4721eba7a3cc2e95ac8f58ed720cdb5ba35fe974dc2d7ae7d01c615 SHA512 056ff258de0cb3671316834fec593c5ecdf3ec47d72c9141df8dfbb12a0331a850fa5d252cf4f1dde836e895f0f5b6bb2ab10a64dab4d98303a7345a89e914e1
-EBUILD resolv_wrapper-1.1.7.ebuild 802 BLAKE2B 01b26bed8b488e6a2e4a90789c4107c96aca4f1329d6414779c4400da66a11e00f04f2870aa1a0f67ccc0092da87ada4ac995ac6b964bf7b10cab70e9f1ce734 SHA512 59ef159340ca914b8191b59b37bceb3786bf6db50cdbfb281b7a558ba1b126906021adc582f47b8cb187afbfdcfde5f58efaf50c43967f9c0fe9cd50cbb0c7a2
+EBUILD resolv_wrapper-1.1.7.ebuild 801 BLAKE2B b56cb13860ca6ff97248e4e7b7e0f5d37795c92a0c663a462bcdc5df979c31a74986af31944e7fd7d9639b5412a75e77a8d4aec5fdc670e44e377bfb4522d9ff SHA512 158c39da6a0a54b4de4ddd69e865703a9ca4a017d9cae29123bbcde66d460e3d66a14778c6db1da1c4fa3b4c1e7f2fa8bbb1245691f641a29116d5841d3a30be
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
index 50e162a27887..5ccbe31fda31 100644
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/sheerdns/Manifest b/net-dns/sheerdns/Manifest
deleted file mode 100644
index 7f4ebb481b94..000000000000
--- a/net-dns/sheerdns/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sheerdns-1.0.3.tar.gz 22937 BLAKE2B c5a32220c2f3e91f251f7aef37106a39764a13bf8bda1f9178d21356c79ac5da64e2f803ddac46bdce9de18f72fd72e1e79c9c4aa9c159b460279dc197750152 SHA512 c24b33d5ed9cdf501a3c685398f694c2c8e31814c30caec7406d3d819e3d2affd854da23f3e1f1e0621fbd7e81f189f3316346c4d1c48abeef9ee0b9b47e4c12
-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/metadata.xml b/net-dns/sheerdns/metadata.xml
deleted file mode 100644
index 1145277be30e..000000000000
--- a/net-dns/sheerdns/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-    SheerDNS was written to be a simple replacement master DNS server that can
-    be used where atomic updates are required. Because it stores each record in
-    a small file, updating records does not require the sheerdns process to be
-    notified or restarted. Each update is immediately available and served 
-    as-is. 
-    SheerDNS is extremely light-weight, simple, and fast, and written with 
-    security in mind.
-   </longdescription>
-</pkgmetadata>
diff --git a/net-dns/sheerdns/sheerdns-1.0.3.ebuild b/net-dns/sheerdns/sheerdns-1.0.3.ebuild
deleted file mode 100644
index 4ef9604323b8..000000000000
--- a/net-dns/sheerdns/sheerdns-1.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="Sheerdns is a small, simple, fast master only DNS server"
-HOMEPAGE="http://threading.2038bug.com/sheerdns/"
-SRC_URI="http://threading.2038bug.com/sheerdns/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# Fix multilib support
-	sed -i "/^CFLAGS/s:usr/lib:usr/$(get_libdir):" Makefile
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	dodoc ChangeLog
-	doman sheerdns.8
-	dosbin sheerdns sheerdnshash
-}
diff --git a/net-dns/updatedd/Manifest b/net-dns/updatedd/Manifest
index 0bb53f578294..8ffc331b80e5 100644
--- a/net-dns/updatedd/Manifest
+++ b/net-dns/updatedd/Manifest
@@ -1,7 +1,9 @@
 AUX fix-ovh-DYNDNSHOST.patch 278 BLAKE2B 022d9e05fd189bfd2e30c62d28bb9f78558b78e3226872f33ba815a791ea511eb169b900bcc961328bb61b9e8ae2ac6a33a763e61ba3a320a425897962be68f5 SHA512 2d172df64210a081c026b64a88d92eb0118d4cc5cd75b6c52187cecdea7a22d650c439e893fef533f76bce18a532f888fb0bfa1ef3be0ee04a331ae3bf00a406
+AUX fix-ovh-support.patch 1590 BLAKE2B 88629183dd9db90984b0884df05214154b2ed03122ec69c3da7a632af9a529bf9ba1b87d017359abee9b625f5d8b03944bb987086454b9b6b22f2c92ef667fe2 SHA512 6f307b8771568c6220705ff81f9eb5044cb9c79caf48ab178d20b2c58c145c84806d6523877b94e7908c82c6cdc6f65ff8a20526c8fb2c5e5c85b793e3453c69
 AUX respect-docdir.patch 1189 BLAKE2B 45906d6aa2211bb1e28f46dd264e5fab5d49ab76ca36b56a434329a8ac45b06b2fc189b5abfc87a8963074e3844825790b943af24309980242341418c0eb7cdc SHA512 6dbd17bfccc5823d7eb412f0189ab691ad277e6796b760096ff11ab2e493e84159e900b1990bf54fde0ee5a4e5b0e6c956cf0878741520dcc9c9225989a739c7
 AUX set-socket-timeouts-for-ipserv.patch 1001 BLAKE2B 0a2d769313f49bd198338af4ec43663cd2667b1ecbbcd5938398bc7bab3bd4389b56df90de322f2951cc5bc534753edc4e226af6558564d6e64804db89fccfdf SHA512 def30f688dbef6c6547a671914120b0da3fc6177236ed563e4a0f26f5c4200a393ce2fd6e48042cce3eca281c5073e0ad8c6aed98e507be9b52781f8e57b29bd
 AUX updatedd-2.6-options.patch 385 BLAKE2B 35a85ad990250a799d512bbb5494ac22acdee4567056ab09c92ccb4ff9641cf05d5a4e6cd3a768b6cd05f377f587a60c5203a3972737b3b8d414708662635ded SHA512 e509e177d0147cc047d8272051541f132a6b64beabff14db9fc7936e780b61947653cd9c501f76877c869ebbbcb052fc263d539ee42bba8eb46c47a6b24eac33
 DIST updatedd_2.6.tar.gz 667104 BLAKE2B 7cae9eab63c0dcf97203d5cd10527cbe8f937f048a2508983feb26d44755189af0789c0b741b41dad51abaad51e3e3aa1e3e77328094b04734552bb33e14cdf0 SHA512 f8a83dfc612d4f0dfc7ffabb9934fbfc236a21f7bbd38355dd1234e45cf5fa616c1cc48036a29a2b82195c0b9d1f9b6bb3b78a3acc8f28c1c65b87f27f2b832f
 EBUILD updatedd-2.6-r5.ebuild 672 BLAKE2B 96dc853d6c689137c707179884575a135fc345b6972b318829318d9c4d7d6e18858cc4592b803217835bca8b7d193f465586dc14f6308897b59e44cd40e90441 SHA512 bf69c39898c1666d23f58d98c12b0e8e45addaf0dc588115f51862f04546ea3132a4026f46833a98419d41292db856447cc1481ae9ac2d3984f569e053666d03
+EBUILD updatedd-2.6-r6.ebuild 712 BLAKE2B 142414fbdf843bd57a3647556dc5f2bd031181e55bcd20db0055036ac92d5c63ff0522aca2634fb48a59610efa4046a382c51079171c63c89aa2ebf33f5e9f6a SHA512 526e95da992850e6860789502d52d3bf10a457aae82f05286d52ccac95707fd40b72d5602eef5795ce5c1824b251fb8eccb7005aace94c14e53de685484535bc
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/updatedd/files/fix-ovh-support.patch b/net-dns/updatedd/files/fix-ovh-support.patch
new file mode 100644
index 000000000000..da9e64d90857
--- /dev/null
+++ b/net-dns/updatedd/files/fix-ovh-support.patch
@@ -0,0 +1,70 @@
+https://bugs.gentoo.org/777423
+
+--- a/src/plugins/libovh.c
++++ b/src/plugins/libovh.c
+@@ -181,6 +181,7 @@
+ 
+ 	char *b64user;
+ 	char message[BUFLEN];
++	size_t pos, towrite;
+ 
+ 	if(strlen(args->login) > 128) {
+ 		ret_msg(NONE, "username is too long");
+@@ -220,10 +221,18 @@
+ 		    "\n--------------------------------------\n"
+ 		    "%s--------------------------------------\n\n",
+                     message);
+-	
+-	if(write(s, message, strlen(message)) == -1) {
+-		ret_msg(PERR, "write() failed");
+-		return RET_WARNING;
++
++	for (pos = 0, towrite = strlen(message); towrite > 0; ) {
++		ssize_t ret;
++
++		ret = write(s, message + pos, towrite - pos);
++		if(ret <= 0) {
++			ret_msg(PERR, "write() failed");
++			return RET_WARNING;
++		}
++
++		pos += ret;
++		towrite -= ret;
+ 	}
+ 
+ 	free(b64user);
+@@ -236,13 +245,22 @@
+ {
+ 
+ 	int n;
+-	char server_msg[BUFSIZE], *ptr;
++	char server_msg[BUFLEN], *ptr;
+ 
+ 	/* get server_msg */
+ 	(void)memset(server_msg, 0, sizeof(server_msg));
+-	if(read(s, server_msg, sizeof(server_msg) - 1) < 0) {
+-		ret_msg(PERR, "read() failed");
+-		return RET_WARNING;
++
++	for (ptr = server_msg; ptr < &server_msg[BUFLEN]; ) {
++		ssize_t ret;
++
++		ret = read(s, ptr, &server_msg[BUFLEN] - ptr);
++		if (ret < 0) {
++			ret_msg(PERR, "read() failed");
++			return RET_WARNING;
++		} else if (ret == 0)
++			break;
++
++		ptr += ret;
+ 	}
+ 
+ 	print_debug("\n\nServer message:"
+@@ -267,6 +285,7 @@
+ 				}
+ 			}
+ 		}
++		ret_msg(NONE, "unknown server response");
+ 	} else if(strstr(server_msg, "401 Authorization Required")) {
+ 		ret_msg(NONE, "wrong username or password");
+ 	} else {
diff --git a/net-dns/updatedd/updatedd-2.6-r6.ebuild b/net-dns/updatedd/updatedd-2.6-r6.ebuild
new file mode 100644
index 000000000000..d352c43644a3
--- /dev/null
+++ b/net-dns/updatedd/updatedd-2.6-r6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dynamic DNS client with plugins for several dynamic dns services"
+HOMEPAGE="https://savannah.nongnu.org/projects/updatedd/"
+SRC_URI="https://savannah.nongnu.org/download/updatedd/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	dev-perl/IO-Socket-Timeout"
+
+PATCHES=(
+	"${FILESDIR}/${P}-options.patch"
+	"${FILESDIR}/fix-ovh-DYNDNSHOST.patch"
+	"${FILESDIR}/respect-docdir.patch"
+	"${FILESDIR}/set-socket-timeouts-for-ipserv.patch"
+	"${FILESDIR}/fix-ovh-support.patch"
+)
+
+src_configure() {
+	econf --disable-static
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /net-dns
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)