gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /net-dns
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
62 files changed, 316 insertions, 1627 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index f337c2eb97a9..0469dfd278e8 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index f07f657c052b..aa1fc7129ed4 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -7,6 +7,6 @@ AUX avahi-0.7-qt5.patch 6033 BLAKE2B 10c7879f6e28942a32497c84dcf523f742cb13112d9
 DIST avahi-0.6.32.tar.gz 934004 BLAKE2B 76bbff65075bbc49d52b1e406373c4856622c22364cb5f1a4ccc0bf04a6dc7d54c58753a8cce6622e4fc62dc22086659ffbd157aeb1a6a30de353d08fd08a307 SHA512 e6dc788cc8691288ef001007006719b5eb022d484ee6fc84e68a7d227af5993e4d09484b824998155e5b25fc0ffc014beb8961d312982f63b82b10a6e2edee18
 DIST avahi-0.7.tar.gz 940047 BLAKE2B 8299577bf27ee65fad5d743dbf94202b148a6fc86825cae303f94c44482eea07cf6570d970ca286e81a787d6a64598b7123f2ac17a259ddc50ef431b9c94b530 SHA512 61f656da7614d8cca1862180038f571db3474c84f05db4d3509f614cdbf8b1a1047661b7e24d63682d5b48ed1bfa1b08b3c9e6dbe9222bcd62d99bc168a11abe
 EBUILD avahi-0.6.32.ebuild 5485 BLAKE2B a16979e77772ecf824dd03db48ae39d9c3ad8bba89211cc7c15ed3bec0cb57db0a793b14f3e0d55ff5afb52312fda6b8e5ca77ea17c1830f3be8a21d1cd9e6f6 SHA512 2290435448ddadfd4bc4b48b40e6cd2bce036e0022c20f717d5d782f7622627ff6116cc2057642a8a0291f17afb207182a0fd3ce1ec1c68313f9342350e51c41
-EBUILD avahi-0.7-r1.ebuild 5143 BLAKE2B 49679babf67928cbc925042e890abcbb60d97c7c967964712673a39a79dff3701dd05f53186b611c58c7d8df3d0d62f940c7306e17f91b0934494252ef833474 SHA512 6caee5018f83eb7a8b51bf5656c345ce36f5dcffd714bcdf318b82830381cb33711db62eed94c76e59e5577521e3daef58ac2761fa95caf65306e42c2697cef1
-EBUILD avahi-0.7-r2.ebuild 5123 BLAKE2B ee26ad8c2088ec3ecf0602955bc69b8294fca639030993c028f196a979cde210bd7cb4745528a97e7f9036039dd3c52547b96295e7834a44cdeb37db926bdba6 SHA512 7f9850f51b66538ae2b841683c3642a25cc03915bad5dba5d48aa6b341b857ee1b4478f66259c0570ad6e9b44c92ecec9c8acd31fb9ce257e2a8aa1515384fec
+EBUILD avahi-0.7-r1.ebuild 5131 BLAKE2B 39d8cb31c3d9dc4acbeae11177cc0cbf565a51ccb3aa73751bbde3c3c27c9eea2367e184e251659ddbde730f2b6562df3434eda7c318878511e777a004beb054 SHA512 c0190cb01763d64eb386c5fba16c24d42517e2d675655ab1fbc0d55306572f8ad1b0bd9a2c050c21df5f12f248436feb91d7ce4f1b1ab2dcc28051fd36fcef09
+EBUILD avahi-0.7-r2.ebuild 5111 BLAKE2B b2f674e4fc9f52ede41129ad6719b54dffff06bdd5ec235e6a564345210dbbafcf9b8f024fe759233f972634e70a0305d952eddc2d834a281efd58e41b20a141 SHA512 56d6ab16e3d4f3e6093050dbbc9bc64ee9b69f88f3d0d407afa48abc5481b51aadc5aac2556ff2ca1f826b8ab4168d055f0583affeb289b1b839d9601c992cbe
 MISC metadata.xml 1025 BLAKE2B 6a13958a5fafd973058008477fe96575956dde8888c555eb5dfc9382536a637b1f659494a164f7973dadf8a37420cc1b586f63ab2e418b9aea8bd44aa90c0250 SHA512 2f22fbed84d4e1b1f85523f3a2a4b43678ae76b9300e0c43dea561532f392c4370fff25ebfc04537423736e7059f0f606c25ade7e37410449ba9f0c8216c27a3
diff --git a/net-dns/avahi/avahi-0.7-r1.ebuild b/net-dns/avahi/avahi-0.7-r1.ebuild
index 72a21b859955..9c34a955fcdc 100644
--- a/net-dns/avahi/avahi-0.7-r1.ebuild
+++ b/net-dns/avahi/avahi-0.7-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux test"
 
 REQUIRED_USE="
diff --git a/net-dns/avahi/avahi-0.7-r2.ebuild b/net-dns/avahi/avahi-0.7-r2.ebuild
index db0a8b7a03cd..aec964a46ca5 100644
--- a/net-dns/avahi/avahi-0.7-r2.ebuild
+++ b/net-dns/avahi/avahi-0.7-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux test"
 
 REQUIRED_USE="
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 37407f3a6377..90f912d36025 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -2,19 +2,9 @@ AUX sparc-pause-instruction.patch 4109 BLAKE2B e0a705c5b29033f54ae5d707a0159d881
 DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932
 DIST bind-9.14.5.tar.gz 6313555 BLAKE2B 46bde0f6f78ee15357bca0129022a6dd88941f633513a8d768b53d9c3bc0f4f7af4d8dc8cc4b1d6119d148700703b2fa27b6834671dcb5df9b544e4a2025452b SHA512 1b18eda5dea639f9b34e1c41b534704b0d5f64c036b766c9cfccf9bbeb586ce4ea7f0d098a5b2747e88aa403e48ad8ae0b6e560e93348f0dc7616f914671d084
 DIST bind-9.14.6.tar.gz 6314291 BLAKE2B f114cf3516e863656d1b0f3bbc634c5b5f5c539ffa4591cbe09f7cc1e26f30b0bff2d4913297b73304387944ba249b847b7983d4279d625645ec64387a0121ed SHA512 129cb6c8e18fabf9f9fda91afa06fccf65e7009b2e8f9f7c1960f0039d35c22614986fbea36ca0b7bbc74995e380df083a641cf51601a0cf0c87e7dbb77a0366
-<<<<<<< HEAD
-DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646
-DIST bind-9.15.3.tar.gz 6296471 BLAKE2B 30815330f4273b7b6df34857fdd7d03490e03e3d340986c01c1d382927480bcd6c01cefdb689c7c397cbb1495b1f06503dbeb425a823a5c676211d45b7b6663a SHA512 2c594c48f1e06c6ab2e0977473fbdb8d3bdbf089bc5c727424510f1bec3fc6dac9a21206724e886f6a88d1e8098aa3b03aed226a92ae91a6c7f3528187288cc0
-EBUILD bind-tools-9.14.4.ebuild 3229 BLAKE2B cb70c1a055c7a51fd1be5ce461fc50f327ac7f283f46cc07c5687b90dd82667d3e5aa205590031d80fddb3ffa9eebd560995fcebdde05511a75b93465b2bd84f SHA512 81fa51660bb87b57a013d075275cad7efaa373c8896eeb4069991a2470318d4b8f32a6e8af8646062a477d38e5ae764ef8cdffc4eb1fc843ddc6c6d10dade19a
-EBUILD bind-tools-9.14.5.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908
-EBUILD bind-tools-9.14.6.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908
-EBUILD bind-tools-9.15.2.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8
-EBUILD bind-tools-9.15.3.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8
-=======
 DIST bind-9.15.4.tar.gz 6307930 BLAKE2B e57c5874b18abb8daddee03ecca35ecc422106428b408f078b3e7beb42d986165f853c985996b70343c0cea113389edd2ea4fc53440328b352818def913d4bd7 SHA512 bd6ac320c553253f4c6befe9c5237f31e1172c35b14e34946b5082b333621f246755b2d2856542bee68f4cc411e955ac7dd4c84e2c7155949cbcfe469b5ae709
-EBUILD bind-tools-9.14.4.ebuild 3229 BLAKE2B cb70c1a055c7a51fd1be5ce461fc50f327ac7f283f46cc07c5687b90dd82667d3e5aa205590031d80fddb3ffa9eebd560995fcebdde05511a75b93465b2bd84f SHA512 81fa51660bb87b57a013d075275cad7efaa373c8896eeb4069991a2470318d4b8f32a6e8af8646062a477d38e5ae764ef8cdffc4eb1fc843ddc6c6d10dade19a
-EBUILD bind-tools-9.14.5.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908
-EBUILD bind-tools-9.14.6.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908
+EBUILD bind-tools-9.14.4.ebuild 3207 BLAKE2B b42890cc40d54bde99dd7f75eb896c014d0b5e315f15ff072295f662c7cebf3fb5515b12d9b081a87bc5abc2f780538222d0b90abb98fb89c9675c2df44a9632 SHA512 e0ec57a028ee51f8a479a4e2a88b7947b2015180eebfe90bf2f5df06fc207e801cc262eed0cf11c2f0395c944e73fabfa25b004c401098a6fbd1f7ee27ba85cd
+EBUILD bind-tools-9.14.5.ebuild 3160 BLAKE2B 88185d6d79a68a27288a4e5c6587f89e1824d36613d9c72d7722c4714d49adddece89832fc3bef56d62a67042cbc6a875cd885da7cd983323bbeba133841abc7 SHA512 051e99cbb393544b314755d832cbe1d8118786ae53a6d971763ddded91066e25062e0bc9e0c40c64563c266e5546b3d46dce8d36c0ef60d1ed18aa5b86ade020
+EBUILD bind-tools-9.14.6.ebuild 3160 BLAKE2B 88185d6d79a68a27288a4e5c6587f89e1824d36613d9c72d7722c4714d49adddece89832fc3bef56d62a67042cbc6a875cd885da7cd983323bbeba133841abc7 SHA512 051e99cbb393544b314755d832cbe1d8118786ae53a6d971763ddded91066e25062e0bc9e0c40c64563c266e5546b3d46dce8d36c0ef60d1ed18aa5b86ade020
 EBUILD bind-tools-9.15.4.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8
->>>>>>> next
 MISC metadata.xml 488 BLAKE2B 44d0112102447f6d6f8c76aa5e3018de5fc4746240a1a7f187cb7bc493e9a442812c5b0f1c4a8a0a3410af12fbd2e390f6291c981440840b42348f403a278e2c SHA512 ac2a79f4622fd4aa957f9ad0618c631d4c68497443015bbd12c1670576d4515649f26c39c555046771b2aadd5f9b53fdc4c478ba7fb07e24f06b3a4f30f071e0
diff --git a/net-dns/bind-tools/bind-tools-9.14.4.ebuild b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
index 31924994d66e..eb1376ff4794 100644
--- a/net-dns/bind-tools/bind-tools-9.14.4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind-tools/bind-tools-9.14.5.ebuild b/net-dns/bind-tools/bind-tools-9.14.5.ebuild
index 135ea809d2a3..16e89824d85f 100644
--- a/net-dns/bind-tools/bind-tools-9.14.5.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind-tools/bind-tools-9.14.6.ebuild b/net-dns/bind-tools/bind-tools-9.14.6.ebuild
index 135ea809d2a3..16e89824d85f 100644
--- a/net-dns/bind-tools/bind-tools-9.14.6.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind-tools/bind-tools-9.15.2.ebuild b/net-dns/bind-tools/bind-tools-9.15.2.ebuild
deleted file mode 100644
index 5a710f6efc50..000000000000
--- a/net-dns/bind-tools/bind-tools-9.15.2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-COMMON_DEPEND="
-	caps? ( sys-libs/libcap )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	xml? ( dev-libs/libxml2 )
-	idn? ( net-dns/libidn2:= )
-	gssapi? ( virtual/krb5 )
-	libedit? ( dev-libs/libedit )
-	!libedit? (
-		readline? ( sys-libs/readline:0= )
-	)"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!<net-dns/bind-9.10.2"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--without-python
-		--without-libjson
-		--without-zlib
-		--without-lmdb
-		--with-openssl="${EPREFIX}"/usr
-		$(use_with idn libidn2)
-		$(use_with xml libxml2)
-		$(use_with gssapi)
-		$(use_with readline)
-		$(use_enable caps linux-caps)
-	)
-
-	# bug 607400
-	if use libedit ; then
-		myeconfargs+=( --with-readline=-ledit )
-	elif use readline ; then
-		myeconfargs+=( --with-readline=-lreadline )
-	else
-		myeconfargs+=( --without-readline )
-	fi
-
-	# bug 344029
-	append-cflags "-DDIG_SIGCHASE"
-
-	# to expose CMSG_* macros from sys/sockets.h
-	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
-
-	# localstatedir for nsupdate -l, bug 395785
-	tc-export BUILD_CC
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_compile() {
-	local AR=$(tc-getAR)
-
-	emake AR="${AR}" -C lib/
-	emake AR="${AR}" -C bin/delv/
-	emake AR="${AR}" -C bin/dig/
-	emake AR="${AR}" -C bin/nsupdate/
-	emake AR="${AR}" -C bin/dnssec/
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	cd "${S}"/bin/delv || die
-	dobin delv
-	doman delv.1
-
-	cd "${S}"/bin/dig || die
-	dobin dig host nslookup
-	doman {dig,host,nslookup}.1
-
-	cd "${S}"/bin/nsupdate || die
-	dobin nsupdate
-	doman nsupdate.1
-	if use doc; then
-		docinto html
-		dodoc nsupdate.html
-	fi
-
-	cd "${S}"/bin/dnssec || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-		revoke settime signzone verify; do
-		dobin dnssec-"${tool}"
-		doman dnssec-"${tool}".8
-		if use doc; then
-			docinto html
-			dodoc dnssec-"${tool}".html
-		fi
-	done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.15.3.ebuild b/net-dns/bind-tools/bind-tools-9.15.3.ebuild
deleted file mode 100644
index 5a710f6efc50..000000000000
--- a/net-dns/bind-tools/bind-tools-9.15.3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-COMMON_DEPEND="
-	caps? ( sys-libs/libcap )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	xml? ( dev-libs/libxml2 )
-	idn? ( net-dns/libidn2:= )
-	gssapi? ( virtual/krb5 )
-	libedit? ( dev-libs/libedit )
-	!libedit? (
-		readline? ( sys-libs/readline:0= )
-	)"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!<net-dns/bind-9.10.2"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--without-python
-		--without-libjson
-		--without-zlib
-		--without-lmdb
-		--with-openssl="${EPREFIX}"/usr
-		$(use_with idn libidn2)
-		$(use_with xml libxml2)
-		$(use_with gssapi)
-		$(use_with readline)
-		$(use_enable caps linux-caps)
-	)
-
-	# bug 607400
-	if use libedit ; then
-		myeconfargs+=( --with-readline=-ledit )
-	elif use readline ; then
-		myeconfargs+=( --with-readline=-lreadline )
-	else
-		myeconfargs+=( --without-readline )
-	fi
-
-	# bug 344029
-	append-cflags "-DDIG_SIGCHASE"
-
-	# to expose CMSG_* macros from sys/sockets.h
-	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
-
-	# localstatedir for nsupdate -l, bug 395785
-	tc-export BUILD_CC
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_compile() {
-	local AR=$(tc-getAR)
-
-	emake AR="${AR}" -C lib/
-	emake AR="${AR}" -C bin/delv/
-	emake AR="${AR}" -C bin/dig/
-	emake AR="${AR}" -C bin/nsupdate/
-	emake AR="${AR}" -C bin/dnssec/
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	cd "${S}"/bin/delv || die
-	dobin delv
-	doman delv.1
-
-	cd "${S}"/bin/dig || die
-	dobin dig host nslookup
-	doman {dig,host,nslookup}.1
-
-	cd "${S}"/bin/nsupdate || die
-	dobin nsupdate
-	doman nsupdate.1
-	if use doc; then
-		docinto html
-		dodoc nsupdate.html
-	fi
-
-	cd "${S}"/bin/dnssec || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-		revoke settime signzone verify; do
-		dobin dnssec-"${tool}"
-		doman dnssec-"${tool}".8
-		if use doc; then
-			docinto html
-			dodoc dnssec-"${tool}".html
-		fi
-	done
-}
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 9da0fae19929..50f06e11fa5d 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -10,20 +10,10 @@ AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826b
 DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932
 DIST bind-9.14.5.tar.gz 6313555 BLAKE2B 46bde0f6f78ee15357bca0129022a6dd88941f633513a8d768b53d9c3bc0f4f7af4d8dc8cc4b1d6119d148700703b2fa27b6834671dcb5df9b544e4a2025452b SHA512 1b18eda5dea639f9b34e1c41b534704b0d5f64c036b766c9cfccf9bbeb586ce4ea7f0d098a5b2747e88aa403e48ad8ae0b6e560e93348f0dc7616f914671d084
 DIST bind-9.14.6.tar.gz 6314291 BLAKE2B f114cf3516e863656d1b0f3bbc634c5b5f5c539ffa4591cbe09f7cc1e26f30b0bff2d4913297b73304387944ba249b847b7983d4279d625645ec64387a0121ed SHA512 129cb6c8e18fabf9f9fda91afa06fccf65e7009b2e8f9f7c1960f0039d35c22614986fbea36ca0b7bbc74995e380df083a641cf51601a0cf0c87e7dbb77a0366
-<<<<<<< HEAD
-DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646
-DIST bind-9.15.3.tar.gz 6296471 BLAKE2B 30815330f4273b7b6df34857fdd7d03490e03e3d340986c01c1d382927480bcd6c01cefdb689c7c397cbb1495b1f06503dbeb425a823a5c676211d45b7b6663a SHA512 2c594c48f1e06c6ab2e0977473fbdb8d3bdbf089bc5c727424510f1bec3fc6dac9a21206724e886f6a88d1e8098aa3b03aed226a92ae91a6c7f3528187288cc0
-=======
 DIST bind-9.15.4.tar.gz 6307930 BLAKE2B e57c5874b18abb8daddee03ecca35ecc422106428b408f078b3e7beb42d986165f853c985996b70343c0cea113389edd2ea4fc53440328b352818def913d4bd7 SHA512 bd6ac320c553253f4c6befe9c5237f31e1172c35b14e34946b5082b333621f246755b2d2856542bee68f4cc411e955ac7dd4c84e2c7155949cbcfe469b5ae709
->>>>>>> next
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.14.4.ebuild 11646 BLAKE2B 8112eb9963f76aeab8b708d1f859fb23fb9bdca794c5608dd62f97f616f2344288e895ef3b2d4201ee8efb14d935b73d38808b03efcba364f27c610e3d56990c SHA512 1318ea4e198956c1f28cddb2d5ed05b8583f02b4d03bc006183341690e19213f29f3a9f514a70e2ed2c22c969f4dfe35cbf3b32e7cd55a7ffb2d0008d565b213
-EBUILD bind-9.14.5.ebuild 11355 BLAKE2B cfecd5bcd818c0d877d2e9fac5936351ce5d445a06c5f07e18ed22f0125bdb7054d9b6abe64f6ad42f0f2abe8d4daaffb1ff95b6d72ff5f80e3556468b934936 SHA512 b948632349e8ff57fb252396b78fca62acb7bbab2d28d5128cc9d7700df5f1ab570f101026c8a518512c7747fe904af40fbfc01f158f6e81395c69169c2c5c02
-EBUILD bind-9.14.6.ebuild 11355 BLAKE2B cfecd5bcd818c0d877d2e9fac5936351ce5d445a06c5f07e18ed22f0125bdb7054d9b6abe64f6ad42f0f2abe8d4daaffb1ff95b6d72ff5f80e3556468b934936 SHA512 b948632349e8ff57fb252396b78fca62acb7bbab2d28d5128cc9d7700df5f1ab570f101026c8a518512c7747fe904af40fbfc01f158f6e81395c69169c2c5c02
-<<<<<<< HEAD
-EBUILD bind-9.15.2.ebuild 11454 BLAKE2B 6c1ea71ffab3a2b9e3391da5250dc92d93a811faa88a837e14b2893d07696e669f97ecd62db0b5aaf66928b03487a720b8d45063e9d6ed83da496c8d45f57e21 SHA512 88022b4c1dc7a3065bd5cef960f1eeb9954e1f7f399472af5d9374838b95897130cb3f5565bd626b76b2a8574182095f7bc1d3909ff0f024ea85eed4583a6b63
-EBUILD bind-9.15.3.ebuild 11458 BLAKE2B 62acb41ae664893fdd657cdc5466bd14de8cdb5f91f16f644a0ca0edb31fd0237a053ed770c3309b9f9bbe2d480aa2c60ca173d611fab845c604bf178955bafe SHA512 7a55459af4d9f45783de288e512aedb591c73359807ea30cc31ed662b08f7242755dc7c74307472098acc148611a7bc2957749b3051b321d4487bfa6cc084b7d
-=======
+EBUILD bind-9.14.4.ebuild 11636 BLAKE2B 203bea0745b498e98e4bf532ab8379482395577161d3214a3e7afbe539d3b860160e6deb48a74af49c64e868277d9dde59669f42b32194693edab4c45bf1534a SHA512 d2faf9f9dec2f39bc4b0ec9f280df6b20f3012c9f2aa77b3bf955df0ad2d754f5cc465f4f719ba958786b4208db36365c5e3515c7ddcbf2d08886c696cc40cb9
+EBUILD bind-9.14.5.ebuild 11345 BLAKE2B dccc7c10a8db0f259880a5060729b175809f57d277284808b6c766e05054f1d11fd56bdfa38f50ae06c9d20ad8663b314da406c41da7111a63f0d32b6ae54324 SHA512 983a01dd29ac0e88e7d47d4b85e991a4cb3d253c1815e9ee71f8aa8e5947ad657784c52d306886b43875f0ae96cdbf78aeb5e225a494bd9b2d6625564e3a2fd0
+EBUILD bind-9.14.6.ebuild 11345 BLAKE2B dccc7c10a8db0f259880a5060729b175809f57d277284808b6c766e05054f1d11fd56bdfa38f50ae06c9d20ad8663b314da406c41da7111a63f0d32b6ae54324 SHA512 983a01dd29ac0e88e7d47d4b85e991a4cb3d253c1815e9ee71f8aa8e5947ad657784c52d306886b43875f0ae96cdbf78aeb5e225a494bd9b2d6625564e3a2fd0
 EBUILD bind-9.15.4.ebuild 10943 BLAKE2B 73d58287c568a030ccd5c204645d1a15141506b20d32e5417089afb2d03db3e4efb07483af45d34d6bcf29adee36c1a1ce6b04adbe7d186d7b672c03a8a010dd SHA512 ef1ce8e4337b20521c04ef392fbf18f083a065c93683190b32c02c377a392308a3bae444268f735a1533e24d7435dd07e26b4abbb5cd3b2b920f237a5507edcf
->>>>>>> next
 MISC metadata.xml 1188 BLAKE2B 6da9a02bb959544829b980c3edfbe859b73e9f21485e78a23c00d9351fd933de5ba668ebffcffbec7da118116d95232ccaae7d4528de9c2dac6565cabc4f29cc SHA512 0589922970d0998c59e48e485c4475eede9a04cc5b029e1c4c2988d478e72287230613003777034b1df98042c0e7b4f79cfe22585c108b2c668d20710d43c655
diff --git a/net-dns/bind/bind-9.14.4.ebuild b/net-dns/bind/bind-9.14.4.ebuild
index 3c1d3ba5ad9b..fd0061570922 100644
--- a/net-dns/bind/bind-9.14.4.ebuild
+++ b/net-dns/bind/bind-9.14.4.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi
 json ldap libressl lmdb mysql odbc postgres python selinux static-libs
diff --git a/net-dns/bind/bind-9.14.5.ebuild b/net-dns/bind/bind-9.14.5.ebuild
index 5d27afa5590b..dcd2914ae383 100644
--- a/net-dns/bind/bind-9.14.5.ebuild
+++ b/net-dns/bind/bind-9.14.5.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
 json ldap libressl lmdb mysql odbc postgres python selinux static-libs
diff --git a/net-dns/bind/bind-9.14.6.ebuild b/net-dns/bind/bind-9.14.6.ebuild
index 5d27afa5590b..dcd2914ae383 100644
--- a/net-dns/bind/bind-9.14.6.ebuild
+++ b/net-dns/bind/bind-9.14.6.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
 json ldap libressl lmdb mysql odbc postgres python selinux static-libs
diff --git a/net-dns/bind/bind-9.15.2.ebuild b/net-dns/bind/bind-9.15.2.ebuild
deleted file mode 100644
index 721776421718..000000000000
--- a/net-dns/bind/bind-9.15.2.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Re dlz/mysql and threads, needs to be verified..
-# MySQL uses thread local storage in its C api. Thus MySQL
-# requires that each thread of an application execute a MySQL
-# thread initialization to setup the thread local storage.
-# This is impossible to do safely while staying within the DLZ
-# driver API. This is a limitation caused by MySQL, and not the DLZ API.
-# Because of this BIND MUST only run with a single thread when
-# using the MySQL driver.
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
-
-MY_PV="${PV/_p/-P}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0-fc14"
-
-RRL_PV="${MY_PV}"
-
-# SDB-LDAP: http://bind9-ldap.bayour.com/
-
-DESCRIPTION="Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-#	sdb-ldap? (
-#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-#	)"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS=""
-# -berkdb by default re bug 602682
-IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi
-json ldap libressl lmdb mysql odbc postgres python selinux static-libs
-urandom xml +zlib"
-# sdb-ldap - patch broken
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="
-	postgres? ( dlz )
-	berkdb? ( dlz )
-	mysql? ( dlz )
-	odbc? ( dlz )
-	ldap? ( dlz )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-# sdb-ldap? ( dlz )
-
-DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] )
-	libressl? ( dev-libs/libressl )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	postgres? ( dev-db/postgresql:= )
-	caps? ( >=sys-libs/libcap-2.1.0 )
-	xml? ( dev-libs/libxml2 )
-	geoip? ( >=dev-libs/geoip-1.4.6 )
-	gssapi? ( virtual/krb5 )
-	json? ( dev-libs/json-c:= )
-	lmdb? ( dev-db/lmdb )
-	zlib? ( sys-libs/zlib )
-	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/ply[${PYTHON_USEDEP}]
-	)"
-#	sdb-ldap? ( net-nds/openldap )
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_prepare() {
-	default
-
-	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
-
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}" || die "sed failed, ${i} doesn't exist"
-	done
-
-#	if use dlz; then
-#		# sdb-ldap patch as per  bug #160567
-#		# Upstream URL: http://bind9-ldap.bayour.com/
-#		# New patch take from bug 302735
-#		if use sdb-ldap; then
-#			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
-#			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
-#			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
-#			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
-#		fi
-#	fi
-
-	# should be installed by bind-tools
-	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir=/etc/bind
-		--localstatedir=/var
-		--with-libtool
-		--enable-full-report
-		--without-readline
-		--with-openssl="${EPREFIX}"/usr
-		$(use_enable caps linux-caps)
-		$(use_enable dnsrps)
-		$(use_enable dnstap)
-		$(use_enable fixed-rrset)
-		# $(use_enable static-libs static)
-		$(use_with berkdb dlz-bdb)
-		$(use_with dlz dlopen)
-		$(use_with dlz dlz-filesystem)
-		$(use_with dlz dlz-stub)
-		$(use_with gssapi)
-		$(use_with json libjson)
-		$(use_with ldap dlz-ldap)
-		$(use_with mysql dlz-mysql)
-		$(use_with odbc dlz-odbc)
-		$(use_with postgres dlz-postgres)
-		$(use_with lmdb)
-		$(use_with python)
-		$(use_with xml libxml2)
-		$(use_with zlib)
-	)
-
-	use geoip && myeconfargs+=( --enable-geoip )
-
-	# bug #158664
-#	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	# To include db.h from proper path
-	use berkdb && append-flags "-I$(db_includedir)"
-
-	export BUILD_CC=$(tc-getBUILD_CC)
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_install() {
-	default
-
-	dodoc CHANGES README
-
-	if use doc; then
-		dodoc doc/arm/Bv9ARM.pdf
-
-		docinto misc
-		dodoc -r doc/misc/
-
-		# might a 'html' useflag make sense?
-		docinto html
-		dodoc -r doc/arm/
-
-		docinto contrib
-		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
-
-		# some handy-dandy dynamic dns examples
-		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
-		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
-		popd 1>/dev/null || die
-	fi
-
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r8 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.cache:
-	insinto /var/bind
-	newins "${FILESDIR}"/named.cache-r3 named.cache
-
-	insinto /var/bind/pri
-	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
-
-	newinitd "${FILESDIR}"/named.init-r13 named
-	newconfd "${FILESDIR}"/named.confd-r7 named
-
-	if use gost; then
-		sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' \
-			-i "${ED%/}/etc/init.d/named" || die
-	else
-		sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' \
-			-i "${ED%/}/etc/init.d/named" || die
-	fi
-
-	newenvd "${FILESDIR}"/10bind.env 10bind
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die
-	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
-	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
-	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
-		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
-		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
-	done
-
-	# bug 405251, library archives aren't properly handled by --enable/disable-static
-	if ! use static-libs; then
-		find "${ED}" -type f -name '*.a' -delete || die
-	fi
-
-	# bug 405251
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use python; then
-		install_python_tools() {
-			dosbin bin/python/dnssec-{checkds,coverage}
-		}
-		python_foreach_impl install_python_tools
-
-		python_replicate_script "${ED}/usr/sbin/dnssec-checkds"
-		python_replicate_script "${ED}/usr/sbin/dnssec-coverage"
-	fi
-
-	# bug 450406
-	dosym named.cache /var/bind/root.cache
-
-	dosym "${ED}"/var/bind/pri /etc/bind/pri
-	dosym "${ED}"/var/bind/sec /etc/bind/sec
-	dosym "${ED}"/var/bind/dyn /etc/bind/dyn
-	keepdir /var/bind/{pri,sec,dyn}
-
-	dodir /var/log/named
-
-	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
-	systemd_newunit "${FILESDIR}/named.service-r1" named.service
-	systemd_dotmpfilesd "${FILESDIR}"/named.conf
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if use urandom; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
-			echo
-		fi
-		chown root:named /etc/bind/rndc.key || die
-		chmod 0640 /etc/bind/rndc.key || die
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	use mysql || use postgres || use ldap && {
-		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
-		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
-		einfo
-	}
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	mkdir -m 0750 -p ${CHROOT} || die
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
-	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
-	# As of bind 9.8.0
-	if has_version net-dns/bind[gost]; then
-		mkdir -m 0755 -p ${CHROOT}/usr/$(get_libdir)/engines || die
-		if [ "$(get_libdir)" = "lib64" ]; then
-			ln -s lib64 ${CHROOT}/usr/lib || die
-		fi
-	fi
-	chown root:named \
-		${CHROOT} \
-		${CHROOT}/var/{bind,log/named} \
-		${CHROOT}/run/named/ \
-		${CHROOT}/etc/bind \
-		|| die
-
-	mknod ${CHROOT}/dev/null c 1 3 || die
-	chmod 0666 ${CHROOT}/dev/null || die
-
-	mknod ${CHROOT}/dev/zero c 1 5 || die
-	chmod 0666 ${CHROOT}/dev/zero || die
-
-	if use urandom; then
-		mknod ${CHROOT}/dev/urandom c 1 9 || die
-		chmod 0666 ${CHROOT}/dev/urandom || die
-	else
-		mknod ${CHROOT}/dev/random c 1 8 || die
-		chmod 0666 ${CHROOT}/dev/random || die
-	fi
-
-	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
-		cp -a /etc/bind ${CHROOT}/etc/ || die
-		cp -a /var/bind ${CHROOT}/var/ || die
-	fi
-
-	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-		mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
-	fi
-
-	elog "You may need to add the following line to your syslog-ng.conf:"
-	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/bind/bind-9.15.3.ebuild b/net-dns/bind/bind-9.15.3.ebuild
deleted file mode 100644
index bfdb5db3d257..000000000000
--- a/net-dns/bind/bind-9.15.3.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Re dlz/mysql and threads, needs to be verified..
-# MySQL uses thread local storage in its C api. Thus MySQL
-# requires that each thread of an application execute a MySQL
-# thread initialization to setup the thread local storage.
-# This is impossible to do safely while staying within the DLZ
-# driver API. This is a limitation caused by MySQL, and not the DLZ API.
-# Because of this BIND MUST only run with a single thread when
-# using the MySQL driver.
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
-
-MY_PV="${PV/_p/-P}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0-fc14"
-
-RRL_PV="${MY_PV}"
-
-# SDB-LDAP: http://bind9-ldap.bayour.com/
-
-DESCRIPTION="Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-#	sdb-ldap? (
-#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-#	)"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS=""
-# -berkdb by default re bug 602682
-IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi
-json ldap libressl lmdb mysql odbc postgres python selinux static-libs
-urandom xml +zlib"
-# sdb-ldap - patch broken
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="
-	postgres? ( dlz )
-	berkdb? ( dlz )
-	mysql? ( dlz )
-	odbc? ( dlz )
-	ldap? ( dlz )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-# sdb-ldap? ( dlz )
-
-DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] )
-	libressl? ( dev-libs/libressl )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	postgres? ( dev-db/postgresql:= )
-	caps? ( >=sys-libs/libcap-2.1.0 )
-	xml? ( dev-libs/libxml2 )
-	geoip? ( >=dev-libs/geoip-1.4.6 )
-	gssapi? ( virtual/krb5 )
-	json? ( dev-libs/json-c:= )
-	lmdb? ( dev-db/lmdb )
-	zlib? ( sys-libs/zlib )
-	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/ply[${PYTHON_USEDEP}]
-	)"
-#	sdb-ldap? ( net-nds/openldap )
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_prepare() {
-	default
-
-	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
-
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}" || die "sed failed, ${i} doesn't exist"
-	done
-
-#	if use dlz; then
-#		# sdb-ldap patch as per  bug #160567
-#		# Upstream URL: http://bind9-ldap.bayour.com/
-#		# New patch take from bug 302735
-#		if use sdb-ldap; then
-#			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
-#			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
-#			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
-#			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
-#		fi
-#	fi
-
-	# should be installed by bind-tools
-	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir=/etc/bind
-		--localstatedir=/var
-		--with-libtool
-		--enable-full-report
-		--without-readline
-		--with-openssl="${EPREFIX}"/usr
-		$(use_enable caps linux-caps)
-		$(use_enable dnsrps)
-		$(use_enable dnstap)
-		$(use_enable fixed-rrset)
-		# $(use_enable static-libs static)
-		$(use_with berkdb dlz-bdb)
-		$(use_with dlz dlopen)
-		$(use_with dlz dlz-filesystem)
-		$(use_with dlz dlz-stub)
-		$(use_with gssapi)
-		$(use_with json libjson)
-		$(use_with ldap dlz-ldap)
-		$(use_with mysql dlz-mysql)
-		$(use_with odbc dlz-odbc)
-		$(use_with postgres dlz-postgres)
-		$(use_with lmdb)
-		$(use_with python)
-		$(use_with xml libxml2)
-		$(use_with zlib)
-	)
-
-	use geoip && myeconfargs+=( --enable-geoip )
-
-	# bug #158664
-#	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	# To include db.h from proper path
-	use berkdb && append-flags "-I$(db_includedir)"
-
-	export BUILD_CC=$(tc-getBUILD_CC)
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_install() {
-	default
-
-	dodoc CHANGES README
-
-	if use doc; then
-		dodoc doc/arm/Bv9ARM.pdf
-
-		docinto misc
-		dodoc -r doc/misc/
-
-		# might a 'html' useflag make sense?
-		docinto html
-		dodoc -r doc/arm/
-
-		docinto contrib
-		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
-
-		# some handy-dandy dynamic dns examples
-		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
-		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
-		popd 1>/dev/null || die
-	fi
-
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r8 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.cache:
-	insinto /var/bind
-	newins "${FILESDIR}"/named.cache-r3 named.cache
-
-	insinto /var/bind/pri
-	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
-
-	newinitd "${FILESDIR}"/named.init-r13 named
-	newconfd "${FILESDIR}"/named.confd-r7 named
-
-	if use gost; then
-		sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' \
-			-i "${ED%/}/etc/init.d/named" || die
-	else
-		sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' \
-			-i "${ED%/}/etc/init.d/named" || die
-	fi
-
-	newenvd "${FILESDIR}"/10bind.env 10bind
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die
-	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
-	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
-	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
-		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
-		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
-	done
-
-	# bug 405251, library archives aren't properly handled by --enable/disable-static
-	if ! use static-libs; then
-		find "${ED}" -type f -name '*.a' -delete || die
-	fi
-
-	# bug 405251
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use python; then
-		install_python_tools() {
-			dosbin bin/python/dnssec-{checkds,coverage}
-		}
-		python_foreach_impl install_python_tools
-
-		python_replicate_script "${ED%/}/usr/sbin/dnssec-checkds"
-		python_replicate_script "${ED%/}/usr/sbin/dnssec-coverage"
-	fi
-
-	# bug 450406
-	dosym named.cache /var/bind/root.cache
-
-	dosym "${ED}"/var/bind/pri /etc/bind/pri
-	dosym "${ED}"/var/bind/sec /etc/bind/sec
-	dosym "${ED}"/var/bind/dyn /etc/bind/dyn
-	keepdir /var/bind/{pri,sec,dyn}
-
-	dodir /var/log/named
-
-	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
-	systemd_newunit "${FILESDIR}/named.service-r1" named.service
-	systemd_dotmpfilesd "${FILESDIR}"/named.conf
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if use urandom; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
-			echo
-		fi
-		chown root:named /etc/bind/rndc.key || die
-		chmod 0640 /etc/bind/rndc.key || die
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	use mysql || use postgres || use ldap && {
-		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
-		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
-		einfo
-	}
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	mkdir -m 0750 -p ${CHROOT} || die
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
-	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
-	# As of bind 9.8.0
-	if has_version net-dns/bind[gost]; then
-		mkdir -m 0755 -p ${CHROOT}/usr/$(get_libdir)/engines || die
-		if [ "$(get_libdir)" = "lib64" ]; then
-			ln -s lib64 ${CHROOT}/usr/lib || die
-		fi
-	fi
-	chown root:named \
-		${CHROOT} \
-		${CHROOT}/var/{bind,log/named} \
-		${CHROOT}/run/named/ \
-		${CHROOT}/etc/bind \
-		|| die
-
-	mknod ${CHROOT}/dev/null c 1 3 || die
-	chmod 0666 ${CHROOT}/dev/null || die
-
-	mknod ${CHROOT}/dev/zero c 1 5 || die
-	chmod 0666 ${CHROOT}/dev/zero || die
-
-	if use urandom; then
-		mknod ${CHROOT}/dev/urandom c 1 9 || die
-		chmod 0666 ${CHROOT}/dev/urandom || die
-	else
-		mknod ${CHROOT}/dev/random c 1 8 || die
-		chmod 0666 ${CHROOT}/dev/random || die
-	fi
-
-	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
-		cp -a /etc/bind ${CHROOT}/etc/ || die
-		cp -a /var/bind ${CHROOT}/var/ || die
-	fi
-
-	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-		mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
-	fi
-
-	elog "You may need to add the following line to your syslog-ng.conf:"
-	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index 85a3a5eae995..e149e10a1875 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -2,7 +2,7 @@ AUX c-ares-1.12.0-remove-tests.patch 422 BLAKE2B 37b7a7a85f053d6a2231b46ca244ffb
 DIST c-ares-1.13.0.tar.gz 1446797 BLAKE2B 9d7daaad8e35242f110ee8b4abf20619e46beb3fcf49a1b6d7df596fd4129b56cb92f4aeba10845aeb6ed4f4d789ac11745ddc87803ca5bf27fed1aebdb4286c SHA512 4a7942e754673f5b8d55a7471e31b0f390e8324b14c12077580c956147fad4d165c7fe8a3190199b1add95c710ceeb1a7957706d4f0d6299d39c5dddc719bd9d
 DIST c-ares-1.14.0.tar.gz 1335940 BLAKE2B d62a0b6d5ea4a2926ff8f2f719d267f9a0c97fa9756b80fcf7c97822f3dd7a1ce9587d9db0ea5217f052f54f5858c68e71c78c33f32fe60df81f456cd9719ac6 SHA512 30cd3f8c4eea15f994b2ceb44d84e506858f69f624e651e39bb4db523fea9ad5e8906b75abf07131ae364be19172274ed4053059669091f21ce4463cdbb857bf
 DIST c-ares-1.15.0.tar.gz 1347687 BLAKE2B c4028bb2840af23274b79c73600bfcf73a348c7ab63ae3c215829e0fe2cf149f4ad38a3ec657c3997bad818ced3cacaed0579dd0dd2ef42eaffd074bdc4f22ed SHA512 a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50
-EBUILD c-ares-1.13.0.ebuild 991 BLAKE2B 7280a6be8d366fa4f21d283c7a1a2b36706c6a6003adfba6ec5faee7bbd734e27866bd66e47cc06a66eecd2b0b0cb41c060fdcffe0f159be13e4e2ea625ccf40 SHA512 1906777bbfe4a76e72a870fd3f40fbd4c2c600d8feaffec2072dd5833056fcd2ce334d277d45474ebb8c10c1fab2565105fee4684dc71486e29e7c88a2d3ec98
-EBUILD c-ares-1.14.0.ebuild 1004 BLAKE2B a196f3b114548c95b8cbb3f7bd1adb5eeda613ee1a04d800695ed7600a20ebd2d9507a6ddd157d40a78d74c3210062bac1282a8da5280898aa3e11878eaf8014 SHA512 184e50603133fe1449c77a94f8a159f6f0aa3b964ad4bb62e2c63aeb36977d88edb65a858f9245216fe7a0710e1c62fdf42516f3a4fc1f2fd8d5bc2a79eff30a
-EBUILD c-ares-1.15.0.ebuild 1008 BLAKE2B 5532bdcb3ec72f359fca062daed6117e73c6358152d0eaa68fc57744af65138c9b50320b60d56cad627bfcf5773c63bb47880f44a860d82de5916c1f4fbf136b SHA512 7c6da72d1b212989171e1b4fa69166034a5ae68fa16ce0697adb59075d22c7dfb2e045d3852ed7254634caa8e632a122b680b309db111fc2c05d27cdfd06b450
+EBUILD c-ares-1.13.0.ebuild 969 BLAKE2B 2f23720e95a9be5863ccec52ca054757a30e99241f3e23b699b7eaea3e25fb225b1e541373e3c17086b68a3486f98eb287201e0df4ac6e9eb124270367395818 SHA512 0bb7a95651abbf457d714dad172a81b3175231bfea17d3316b41d3d945d7f3f6e7f2cc181e0b6b742c28f845b295bc7ecc0f6af0bf55d33610b314c92f3844ff
+EBUILD c-ares-1.14.0.ebuild 982 BLAKE2B f44ea3bae649a7e86efe3dd9e27646fa85c769ff8ccfa526e5639b340adc43161fa3e132e24ef36e2a6d8eb38e19835389e18cec67bae3e365aa9ef9827001e6 SHA512 ae1071964f64ba56385d3ab7b0dd5a59c5181ba664615d8ddf55320db2c47322e87c4ae735e845abb271dd8a171cbc742af8fe621d73ab84d2cc0dd077101ca5
+EBUILD c-ares-1.15.0.ebuild 986 BLAKE2B 207f0489d7dc7c6c9f99791b4bcff3c4dd9bf52bf1d4504f1394ad85e5766f16ebccb56c5882e5d454f18ecccfbe982ce5a34783efbb5dbd739e540f218c2bc7 SHA512 ad952ae17baa156e31c657e95de1e699617a4cb0f6d517eed14dbfe91ceac143ffe700920c1e9716d8a5edc72fd1d361b8349ecc19dda12403b9107f1705b893
 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.13.0.ebuild b/net-dns/c-ares/c-ares-1.13.0.ebuild
index 8d4be140c84a..7dbe2790a8e1 100644
--- a/net-dns/c-ares/c-ares-1.13.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.13.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://c-ares.haxx.se/"
 SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 # Subslot = SONAME of libcares.so.2
diff --git a/net-dns/c-ares/c-ares-1.14.0.ebuild b/net-dns/c-ares/c-ares-1.14.0.ebuild
index 0b3b9c3ff1b2..d9d495d637e0 100644
--- a/net-dns/c-ares/c-ares-1.14.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.14.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://c-ares.haxx.se/"
 SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 # Subslot = SONAME of libcares.so.2
diff --git a/net-dns/c-ares/c-ares-1.15.0.ebuild b/net-dns/c-ares/c-ares-1.15.0.ebuild
index 25adeaa01cad..bce7a7005a21 100644
--- a/net-dns/c-ares/c-ares-1.15.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.15.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://c-ares.haxx.se/"
 SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 # Subslot = SONAME of libcares.so.2
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index e0b607f51b33..35c5f5ad31e1 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -3,5 +3,6 @@ AUX ddclient.initd-r6 584 BLAKE2B 6f1c9ddf862e50013208adbbd77f471ed03faf59381ed3
 AUX ddclient.service-r1 235 BLAKE2B 204793b269c65d7ed77f89c1d5f191298a7b03f44dc22526331fe28585ad1abc2c19fb3f2c65df1dd32bd20f3f121bf2f7d936ed42831067fc232024383c768a SHA512 1bcceae10d8076cb3fa5cb0215c0eaf17588e943d802c40cf5334f125a3697b103646bc393ba4db90845ad8e6ff1d4301b86afba5609ecb3bff98a5623f09195
 AUX ddclient.tmpfiles 149 BLAKE2B 0ad955937dd6cf714530429ffb423e0acc7033bdf7e2486a99d50d055edb85adff869209631cdfd8c2aa49263c31817868b765e7af27e222ad9f0b19bf439d74 SHA512 13c6e541ff23575d799eee943b8e10e277e5073732cd7c9705c23ee557bd99978435c0fe8b546fa3122a60cfb0499e27853e1968f0c1e0225890b68ae678e0c7
 DIST ddclient-3.9.0.tar.gz 59018 BLAKE2B b9b58108d9f124fcd5a72cc57bfb0e6a5bc2e115edc27a1d5950a929670d67d5c703b09f51e7e82e977ccfb544d115da177b0ac8dc06a76a800aa207cde5a42d SHA512 ae314c96a37dd90256d6acf62f4a4523b72f540194131e351a032239b00b4520351f6549d3b20a9209fe49ccc6de7ce158ffa8635d341066ea71b789dc667438
-EBUILD ddclient-3.9.0-r2.ebuild 1537 BLAKE2B 6e40af4f5e760b906adb1d1068c07c3cce7817a4d704088e34f7e8e075307b3b018e3dc6776eeb69ed352425b240b31ca9ac150d97236622828dbf4cbeebf656 SHA512 f86d17fd03aa297e0d3e823c2fc6a893502bde1bfa8e47d02b3b59511d2d0e2b7e82b9d6dffcf5ef0de81d4a40e2e9f9c47aba96029d03ccb577d067b297a559
+EBUILD ddclient-3.9.0-r2.ebuild 1527 BLAKE2B 23fa0b6362b0497119fd66623230518de3ddb5c19f299017e3e3a9fe5b354db0d2a78ffb9c827570133ce41d40eb2c6f64a483c53adfbd37bd030780910e9440 SHA512 e426bbf12303bd878a95b0b7904bfb4c520bbd39ed18caecb2d07b49d4fbad7fd2018de2ab6a50614015c55480ce62c7c621c760efac6b8f2f255c01171621d0
+EBUILD ddclient-3.9.0-r3.ebuild 1496 BLAKE2B 5343085249362d0052933cb6ff393f36c8338d14dbb7d160e97e3f778decc0e32818527aacf37a08a4bc7809fba520ff16c4a55124dbcf563349aaf151d06315 SHA512 4a1729522210fd41e64c82ea106f7a8b14dc0c0a0c9a9da8bb5feadb4a02da534389880a63f0b784c0956d8e79f2cf56813cb3a4fb8cf1c622f543e064f2e36f
 MISC metadata.xml 1118 BLAKE2B 9c52e1e2a862458405eb841a5ee3a16da8995de56e7bfabbc91d109050c6ed128bade2b9b4a9fe383ae8c123bac8e8a717f837dd2fbe4979c0662f6dfe53d81d SHA512 759c289b0a7b3b6e35fc0848cdfe340e3afc806fe8164e30a7550ef713ef5a74ccfc0a170b9569b10cf4cba55d1a7f9f654ebdba95e2dcccf4f52299c3a901ce
diff --git a/net-dns/ddclient/ddclient-3.9.0-r2.ebuild b/net-dns/ddclient/ddclient-3.9.0-r2.ebuild
index 4d7d99d3c2e9..7098cfde335d 100644
--- a/net-dns/ddclient/ddclient-3.9.0-r2.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.0-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Perl client used to update dynamic DNS entries"
 HOMEPAGE="https://sourceforge.net/projects/ddclient/"
 SRC_URI="mirror://sourceforge/ddclient/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="examples iproute2"
diff --git a/net-dns/ddclient/ddclient-3.9.0-r3.ebuild b/net-dns/ddclient/ddclient-3.9.0-r3.ebuild
new file mode 100644
index 000000000000..4ff4befed84f
--- /dev/null
+++ b/net-dns/ddclient/ddclient-3.9.0-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Perl client used to update dynamic DNS entries"
+HOMEPAGE="https://sourceforge.net/projects/ddclient/"
+SRC_URI="mirror://sourceforge/ddclient/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="examples iproute2"
+
+RDEPEND="
+	acct-group/ddclient
+	acct-user/ddclient
+	dev-lang/perl
+	dev-perl/Data-Validate-IP
+	dev-perl/Digest-SHA1
+	dev-perl/IO-Socket-INET6
+	dev-perl/IO-Socket-SSL
+	virtual/perl-Digest-SHA
+	virtual/perl-JSON-PP
+	iproute2? ( sys-apps/iproute2 )
+"
+
+src_prepare() {
+	# Remove PID setting, to reliably setup the environment for the init script
+	sed -e '/^pid/d' -i sample-etc_ddclient.conf || die
+
+	# Remove windows executable
+	if use examples; then
+		rm sample-etc_dhcpc_dhcpcd-eth0.exe || die
+	fi
+
+	# Use sys-apps/iproute2 instead of sys-apps/net-tools
+	use iproute2 && eapply "${FILESDIR}"/${P}-use_iproute2.patch
+
+	default
+}
+
+src_install() {
+	dobin ddclient
+
+	insinto /etc/ddclient
+	insopts -m 0600 -o ddclient -g ddclient
+	newins sample-etc_ddclient.conf ddclient.conf
+
+	newinitd "${FILESDIR}"/ddclient.initd-r6 ddclient
+	systemd_newunit "${FILESDIR}"/ddclient.service-r1 ddclient.service
+	systemd_newtmpfilesd "${FILESDIR}"/ddclient.tmpfiles ddclient.conf
+
+	dodoc Change* README* RELEASENOTE TODO UPGRADE
+
+	if use examples; then
+		docinto examples
+		dodoc sample-*
+	fi
+}
diff --git a/net-dns/dnscap/Manifest b/net-dns/dnscap/Manifest
index 1ccf13bb7999..a5e0736812d9 100644
--- a/net-dns/dnscap/Manifest
+++ b/net-dns/dnscap/Manifest
@@ -1,5 +1,5 @@
-DIST dnscap-1.10.0.tar.gz 661981 BLAKE2B e4c3c1cf0ddc21fb5c28abb339607c0233097394cd5c75b55a90d89903aab4beaf32f8ab8fc09a57c16eb2d9598c8fa6b98d034a5c5c5226c1c7a0e8a03e8b9b SHA512 b116bcdf876dd1b03d9d093549e8e19db6f366d6df4eef3ddd09cf8eb1d79e94c9abebdd702702efb105633b2e437bbc835abcb1252599261a546881de477791
 DIST dnscap-1.10.2.tar.gz 655932 BLAKE2B 317547e9d7b8f87d08e954639b62e1894e4d8e37eb9612a984dc10deb674c35973f03f94843df0e9eeb74c94904de00b2718e7121f3dddb9e343b3519d13e02e SHA512 22df8068a17b202b1dfed2dc4ce1c4178abf32af16a3b15a76ae8f46510b3979d44c62eac673afd8452abda69a49e3da133f740217b7ab64631d2c18657a9a8b
-EBUILD dnscap-1.10.0.ebuild 587 BLAKE2B 5783d7fef07d955b3bdb6fc3dc596e1c3f5422242eee1a6e173b867e8fda95b2b6899c2c27f22fb7499e0e45c4028af0246572963ca92d3c4e0438bc1b4b956a SHA512 53a156266ecaa02f80ab4572b361bbf6f5194b50f8732b8ca6c891453a4447711b9bca18669989d2e99666c811116cb70e476cf8eae8ed26861fdb4377422d3c
+DIST dnscap-1.10.3.tar.gz 655965 BLAKE2B 8ee267839424b4876833ed5f466ee5972facf0fa866025a2172aa3cdd8900b182b9c8f4f7bf1ecc2f41d017237b9f2d9085722c114a4a0cabf9c953c02a9be02 SHA512 7bc97881c2cbd985010f3bd515aec454440767a0e9926d1fd7060c0d815679544384efbc74786ad6922436b2d6626ce1a9f3e9fd2d4b753ad7409fe018ecb5f5
 EBUILD dnscap-1.10.2.ebuild 587 BLAKE2B 5783d7fef07d955b3bdb6fc3dc596e1c3f5422242eee1a6e173b867e8fda95b2b6899c2c27f22fb7499e0e45c4028af0246572963ca92d3c4e0438bc1b4b956a SHA512 53a156266ecaa02f80ab4572b361bbf6f5194b50f8732b8ca6c891453a4447711b9bca18669989d2e99666c811116cb70e476cf8eae8ed26861fdb4377422d3c
+EBUILD dnscap-1.10.3.ebuild 590 BLAKE2B 1e4c9962c9b238c5fa31f2849789e4fe58a4345d883875a8709fe3962783666925e1f41d1e23afa2ecbb74c626632ae095651aabf5fa6598e073ee24e5b0f565 SHA512 7a8bfc43167c4e85225962e8446d5bf48302fe44207ea6eb886636dcaae67947b0e577ee66659eee4a0af0a75c34d57bc3037ab05026e8e80942592a992d792e
 MISC metadata.xml 456 BLAKE2B bdda5ca1757331c14c11df81e2bb7e5915f9c771b8ecac997fb528334ab9e0d961f79fbb690f47329b5d7ae77cba7a6e44e01f26160a5a21a4c2be0374d74955 SHA512 b9d9248bcc882d4c50403ebed1474aeae687682141798d16965a1eea88700dcd28bf95a16437397b919abdfbf0f812612f2578251c147a6f1b11dcae799af383
diff --git a/net-dns/dnscap/dnscap-1.10.0.ebuild b/net-dns/dnscap/dnscap-1.10.3.ebuild
index 38e157300abc..dec8d68c40b9 100644
--- a/net-dns/dnscap/dnscap-1.10.0.ebuild
+++ b/net-dns/dnscap/dnscap-1.10.3.ebuild
@@ -12,11 +12,11 @@ SLOT="0"
 LICENSE="ISC"
 IUSE=""
 
-RDEPEND="net-libs/libpcap
-	net-libs/ldns
-	sys-libs/zlib
-	dev-libs/openssl:=
-	dev-perl/YAML"
+RDEPEND="dev-libs/openssl:0=
+	dev-perl/YAML
+	net-libs/ldns:=
+	net-libs/libpcap
+	sys-libs/zlib"
 
 DEPEND="${RDEPEND}"
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index c1b877025e50..82c06994eb3d 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -7,11 +7,7 @@ AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f900
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
 DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f
 DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068
-EBUILD dnsmasq-2.79.ebuild 4594 BLAKE2B 28cf745cd261bf067114adc98733f5e00a2f6a10a906d4eaf2175c0457d538d7d96b91fe87a87320c3df27a5c64234ed7d5bbee993070964fa421b8e5b12693c SHA512 eb8ac4fdf747657983909b22baa2e0af5f2299d2a5ab4d97933b185e528cddbb1d4cc7ca14c2efddcd8c6f4ec9861f3c37d9fc59c96b68f55c45a274acf7eff7
-<<<<<<< HEAD
-EBUILD dnsmasq-2.80-r1.ebuild 4803 BLAKE2B f596685ea68a061c1319b6f49c9d27089bc0ef36822d6074cc70e02155d4866a97c2059077901b0576c96bf09ba6328bb74bc6f720553e635ca3758381ac05f9 SHA512 69fd9a952d9414842bc9cabec39b3ab065010ebcd93c6804208d7fb6085e0917c9a00679cc84b36fef2591b3bf838319a5d4f94f499f5d25b197ed9b28f944d7
-=======
-EBUILD dnsmasq-2.80-r1.ebuild 4798 BLAKE2B e9b667e47e20493d66035efca9db5e6f9095f899c58b6c8191d16d650806b6d5a981edb5aceaeaded932259257d2a7ec212dcc4a6a88c8e465ad48014562863b SHA512 5f6a03704fdf8eb3e7c50e4a0637ab2894caa8bfe054c20001a46cb55c58733254a8a0a968f9732276305667810d5c7001ba5a27e30d24fa2116d7e326fcb6ac
->>>>>>> next
-EBUILD dnsmasq-2.80.ebuild 4684 BLAKE2B 64850d70d7fe613c4e3b89944052ccba458f702e59f6d3f6b5228d4a32e65221c64a7ae9a168edd9499723276f0b8fab10a1f97d4b5eaab89c6c87359e7f652d SHA512 0a14dca3228b931f646d465de4426d2e48ae4e4a1c76637620e8a4d6e9c5cfd877ffd34b2841508a405749626e5fb6299cae5485a2529ca79cf891f66d4897a2
+EBUILD dnsmasq-2.79.ebuild 4584 BLAKE2B a4d609bb9cc382649994bd612f9777a2edf8e5917689f0172589db8379bace171573bc302962f671d9baee0f4083606fa4ab0d5ed2f05eec4d775f2879464a91 SHA512 5b60f8d1408096c1d1fce3acf9d5cdb2b3f419eabba5d2b768386794eed80242b101f4ea0a8144627bb23b4535f7d59aa66163d02ce1d248d7c1cc7996450fa3
+EBUILD dnsmasq-2.80-r1.ebuild 4787 BLAKE2B aed69ee2f6839654f5d526cf82c96e37e032aa18a065ace3472888d069c7c249a694232c0a7691cd7f94f8a4bd39360239c417da70874d1229fe552cad9320b1 SHA512 c55237aba60bdae62938bafa6302029f36d5dc26a0a62dc103da5131f1dd522e088034ca164b79e538bb34a570f5ff013045d910c0beb8db4155be9ef400183d
+EBUILD dnsmasq-2.80.ebuild 4674 BLAKE2B 0aff7f9798e87cd317294e613db1d8a1f59054b1fb72293afe70a00d02dea7b71831eb343b29643105a28c09bf28f514d1851bd30417c74d25d010048bb4ff0b SHA512 1120c8092a229f3f5027502f52aa46d556cf52fc32c4fea0151d18e1d85b210c0d30fb0c72d1c496e7936040d1208166bbc1a9cf44f5d5a609b725af954d8ac0
 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.79.ebuild b/net-dns/dnsmasq/dnsmasq-2.79.ebuild
index 3b7329f0c0ac..c82ca7f79b3c 100644
--- a/net-dns/dnsmasq/dnsmasq-2.79.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.79.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec id idn libidn2 +inotify"
 IUSE+=" ipv6 lua nls script selinux static tftp"
diff --git a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
index 6e3d80b6e8ca..f709515357b9 100644
--- a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
@@ -11,11 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-<<<<<<< HEAD
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-=======
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
->>>>>>> next
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
 IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
diff --git a/net-dns/dnsmasq/dnsmasq-2.80.ebuild b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
index fb46b1495fa4..fbf773ea07c1 100644
--- a/net-dns/dnsmasq/dnsmasq-2.80.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
 IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index 86596abe57a6..9373d8666e9d 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -2,6 +2,6 @@ AUX idnkit-1.0-autotools.patch 1843 BLAKE2B 75043eeccb34f00b9faab57d7db7ec608119
 AUX idnkit-1.0-test-subdirs.patch 289 BLAKE2B 6c9237cd1d17785a5d0a379d610ddc6b6e7b604c14a5680e24b80f5d9188413fe4e8f5dbbc55e72fe5d4c453c94efd231110238f68ced316986abeb6134f8173 SHA512 63d76f9ad95fc83c00259d41dcfdd47442bfda6f1dfe861a824146ded113d18284c1fe6f0f5ff1eba05a9a38055e7e8fdc3579fc14a3b441d831a9bd5b75af7a
 DIST idnkit-1.0-src.tar.gz 432823 BLAKE2B 4e96bed174ea704ec0eb5c6655cb65145ed808b2bf9582ec9b6dcb8606de7a006937a2f8d8fce386dbc328e074b95ca504464c1ed6d16acc7be82d9904f2c2b4 SHA512 74f2db007a1991610f62a7a060d534f724f08395a16a7d76fda0824e9017aa47ffe4e251c90d0481218b70534fcd2b32724a66223042f59c1e16c1ff39f3be19
 DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
-EBUILD idnkit-1.0-r2.ebuild 1060 BLAKE2B 9cf072504d7e4c0c47eef5127ee0b6427e4505711ac7615227da3d513c444b90e12bc1a73ad1904d9d6780c11b3ed04b502531723f3b7e9edc2f590399ea3ed9 SHA512 cd865b076767cc07f65e56cfead10ddfa3f11c2e99eec844000b7bcd7e91cb739190a723f38c11771c10fe8317c543a91d8d64810b8402b5f7917f6ec979bae4
-EBUILD idnkit-2.3.ebuild 657 BLAKE2B e3868a1cad38f5338efc98cdb67d23f3006eaa2643223a049990657c788f8e15845c24c353b945c73942ae16e68e0c2edddf4fc49d3a07b8571c0d2682f8a803 SHA512 b7717d6318e8a9ed6311577618c25a1c4685171eaec29361368398daed1440c2aa41de23af66e463bf98a00f2dda664373cb7776aa7a21f6c02297e0a3a54695
+EBUILD idnkit-1.0-r2.ebuild 1038 BLAKE2B 92a39591869831f3c0ab1fbfe1d46dbf9f1f5494ba686825a3c2e3c13c84fcddd970e2678a0357feb15990c010e169029dc3a5ce07bd90fdaa1f52d422639f01 SHA512 f00d2f03f5ea1f8c0233ba8d5afb9a22dbaeae4a58a54d7371d4dee0363b0f8d794dacbe69b6d535382b11f5a39725d8a6d1b9279716f06bec3978020d218f84
+EBUILD idnkit-2.3.ebuild 635 BLAKE2B a7432b146faef7b9464ac03357dfdbb2e17e11779a0b08929472554952fb84e065d8cf666e20f301f5be463143e6cbc7d144d62660af57c6afdc4e6e1d612002 SHA512 0db5b9d09debc9e7b701bb4a2752aa6c49e0ac35abf92dddfec0cad93817802cb428d60d1febb6bb7d4555a8a13a62595fa3abb2968607b491286499c0239303
 MISC metadata.xml 290 BLAKE2B 9b8f414f2eb140cd1c4c9b290bbd4f3d36e58649b68a9ed478ba55661df34bd1f8e1ea9c6d132e2edc4365bb8d4abd5f78d9b0f24e588d548354f63057da0b78 SHA512 5ae703d1a74d5fe45ac66f8f4922b754999932112931b8ba1f46d4a2e769a5d7130b4a418bf687d857a89f20e287d85e384236848c0e01747d0aa1c1ea350492
diff --git a/net-dns/idnkit/idnkit-1.0-r2.ebuild b/net-dns/idnkit/idnkit-1.0-r2.ebuild
index 09be15ba9d37..6c1e4abe5377 100644
--- a/net-dns/idnkit/idnkit-1.0-r2.ebuild
+++ b/net-dns/idnkit/idnkit-1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nic.ad.jp/ja/idn/idnkit/download/sources/${P}-src.tar.gz"
 
 LICENSE="JNIC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 DEPEND="virtual/libiconv"
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index bf18b427ef9d..f2d81d83a585 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.bz2"
 
 LICENSE="JPRS"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="liteonly static-libs"
 RDEPEND="
 	virtual/libiconv
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index faa1f07f894b..8c98cb300b61 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,12 +1,8 @@
 AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e05dbd44c8b8c5c87a01d500d5ac328fdee1cae3f9dd126448a8b82b979e13a4ff5285fa48b983d5 SHA512 58c4186e57ebd00b86dae34d5d208ed8801c0376da40cccb23b3d4542a7ee04a1003a12a4b89347b76a384b50eae4a61f96164bf22ec987ce05b1c65691659e7
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
-DIST knot-2.7.7.tar.xz 1156996 BLAKE2B aa31233cf9af9f8060a40788529593d35912992472d5b9d892e632ba4cbf08a0f0adec6ed00d1152bf6cd443e3a659fa88050355e65a71cc2a3aac3c453bdc44 SHA512 95c341ce7c8cc2e65429d6e3bf009844fbd82ca5a0e36019f0e019ce35fc3ba8b68c159d34637380f6a3ad3dc2291ed5adc37e91515b2b6ecf61f7078ddad841
-DIST knot-2.7.8.tar.xz 1158284 BLAKE2B 513670a05d9014e990f09e525dd638cfaac00027172a09734e23302bfdc1bd8d61d145e566485410ee1277dfdc48317afeffc9064dad6e88b1938965ba862924 SHA512 e220e9d885f488119bcb8324576b981e4c45e15d710595d6acaf121fbff9442e5c1d8c723c11dcd9cbc4d26e7a5200f002d52a94c67ba8af04f5c0c82615def7
-DIST knot-2.8.2.tar.xz 1193760 BLAKE2B 0afd70740be103d596856dfcfea629b5216aa41e8e0044f050a993967c7bf53a129fd824d1d1ec6fef4d41072f25225f06a6113bf86266d755d6f944c8b5799f SHA512 d7a045cc7b1a1f43b9536283d4202d7f8f36ac2160e0b985b40f318cc0041f3c3e977ff2db6f518dd37ea62d93d0d3f617bca1ac0dff81185bf5dcb9c1eac97b
-DIST knot-2.8.3.tar.xz 1206172 BLAKE2B f306b5c788bb27c8062284167378046a4f77926b805f9c2fb84b5192f51d2079547cf740b9b156673e6bfc2a5f28d6ff6762dc7d854a56a0a98d1dcac9f39fca SHA512 a5743181807b944c9b6dfce845f009c576125c114fbac7b87592129b724628466740fb77e41cabd8aaf9f046374a9337a1c97ea74b33afae1af6e39e21f8e662
-EBUILD knot-2.7.7.ebuild 1962 BLAKE2B 37fd12290d609d8e5874f3e1cece9b600be35b90466b318e33f32c47ea422a6538c9c04cada4218d9fe91ea5b08fc23348c362ba19f8e425694a2fe1998d7c62 SHA512 8557b7aab3e1cbd7ab1bc0f1c0b510f9060c30ac1add36687340d3a6de16961394bbcf710230b70f9b1b890df1301c284993b1014bdde2cb83934d863d055fb7
-EBUILD knot-2.7.8.ebuild 1887 BLAKE2B 50877ea27c72362a6121b4c26a5fc5897ccb77ed94c95c695e6ecf7d61d6a2d13b6c8e1e582f8806a7c93e0e142776c1fb4f60813d644df25bc07b165a364e54 SHA512 c03750e0a03b492cadf77e41280ff7383bed4f38b52e82abb594edb6f86c053c875dbd06f8070e4a1348c63948a7056d81dfd684912f0143446a2ebfa5e13437
-EBUILD knot-2.8.2.ebuild 1962 BLAKE2B 37fd12290d609d8e5874f3e1cece9b600be35b90466b318e33f32c47ea422a6538c9c04cada4218d9fe91ea5b08fc23348c362ba19f8e425694a2fe1998d7c62 SHA512 8557b7aab3e1cbd7ab1bc0f1c0b510f9060c30ac1add36687340d3a6de16961394bbcf710230b70f9b1b890df1301c284993b1014bdde2cb83934d863d055fb7
-EBUILD knot-2.8.3.ebuild 1887 BLAKE2B 50877ea27c72362a6121b4c26a5fc5897ccb77ed94c95c695e6ecf7d61d6a2d13b6c8e1e582f8806a7c93e0e142776c1fb4f60813d644df25bc07b165a364e54 SHA512 c03750e0a03b492cadf77e41280ff7383bed4f38b52e82abb594edb6f86c053c875dbd06f8070e4a1348c63948a7056d81dfd684912f0143446a2ebfa5e13437
+DIST knot-2.8.4.tar.xz 1181812 BLAKE2B ff334ec3914ff682247b10719c9da28cdc1b353a24915204944ab2c010395a19d154ff1e1db399fa38df616c606574856f8ad69a144d56e4414a4c06dea9fe87 SHA512 8f826f0e2259b346c84212f9b58fe756044b2549ae84e42d929a0e01269d9f72bce1791c98327b02de375c739e77090d0ea9bacba9fa91ded5b2ea16154ac588
+DIST knot-2.9.0.tar.xz 1210236 BLAKE2B 1cc461feff60ed15bb04438767b2d0fa069bec5f649fc703127950672af2235ec3cb5a84c900c4fc42acdc40ef55f8f17605077eafbb0c4a9aabfe3bd3ea2c83 SHA512 7584152d4fd01cea40a254b05d59971c7341cf612976104ddd857c4a1c637fc83ad93669fc943de3c1514122be793b78f8cc26fef4cc98f5a693640bb766f2b9
+EBUILD knot-2.8.4.ebuild 1887 BLAKE2B 50877ea27c72362a6121b4c26a5fc5897ccb77ed94c95c695e6ecf7d61d6a2d13b6c8e1e582f8806a7c93e0e142776c1fb4f60813d644df25bc07b165a364e54 SHA512 c03750e0a03b492cadf77e41280ff7383bed4f38b52e82abb594edb6f86c053c875dbd06f8070e4a1348c63948a7056d81dfd684912f0143446a2ebfa5e13437
+EBUILD knot-2.9.0.ebuild 1887 BLAKE2B 50877ea27c72362a6121b4c26a5fc5897ccb77ed94c95c695e6ecf7d61d6a2d13b6c8e1e582f8806a7c93e0e142776c1fb4f60813d644df25bc07b165a364e54 SHA512 c03750e0a03b492cadf77e41280ff7383bed4f38b52e82abb594edb6f86c053c875dbd06f8070e4a1348c63948a7056d81dfd684912f0143446a2ebfa5e13437
 MISC metadata.xml 1677 BLAKE2B 89c3190781cf6b6d6217c84dd45f78ebd86695e9c224c7fa7f5112b246b95b982fb025c6c30b065d59b11f3acdcabda8e92b0da001cf1a7ad3e67ee9b2207d3c SHA512 d1e480d3e5d422b94a952a8fd0a679052d24724cccdda0bf13808f1a6b47b129a1db6ad17a0a42d9a6d315e9cbe64293a1a22077b7affc36862313ff8715d9e1
diff --git a/net-dns/knot/knot-2.7.7.ebuild b/net-dns/knot/knot-2.7.7.ebuild
deleted file mode 100644
index 5ccc7dcad7c8..000000000000
--- a/net-dns/knot/knot-2.7.7.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-KNOT_MODULES=(
-	"+cookies"
-	"+dnsproxy"
-	"dnstap"
-	"geoip"
-	"+noudp"
-	"+onlinesign"
-	"+queryacl"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
-
-RDEPEND="
-	dev-db/lmdb
-	dev-libs/libedit
-	dev-libs/userspace-rcu:=
-	dev-python/lmdb
-	net-libs/gnutls:=
-	caps? ( sys-libs/libcap-ng )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c:=
-	)
-	geoip? ( dev-libs/libmaxminddb:= )
-	idn? (
-		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
-		libidn2? ( net-dns/libidn2:= )
-	)
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local u
-	local my_conf=(
-		--with-storage="${EPREFIX}/var/lib/${PN}"
-		--with-rundir="${EPREFIX}/var/run/${PN}"
-		$(use_enable fastparser)
-		$(use_enable dnstap)
-		$(use_enable doc documentation)
-		$(use_enable utils utilities)
-		--enable-systemd=$(usex systemd)
-		$(use_with idn libidn)
-	)
-
-	for u in "${KNOT_MODULES[@]#+}"; do
-		my_conf+=("$(use_with ${u} module-${u})")
-	done
-
-	econf "${my_conf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -C doc html
-		HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/knot.init" knot
-	if use systemd; then
-		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	enewgroup knot 53
-	enewuser knot 53 -1 /var/lib/knot knot
-}
diff --git a/net-dns/knot/knot-2.8.2.ebuild b/net-dns/knot/knot-2.8.2.ebuild
deleted file mode 100644
index 5ccc7dcad7c8..000000000000
--- a/net-dns/knot/knot-2.8.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-KNOT_MODULES=(
-	"+cookies"
-	"+dnsproxy"
-	"dnstap"
-	"geoip"
-	"+noudp"
-	"+onlinesign"
-	"+queryacl"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
-
-RDEPEND="
-	dev-db/lmdb
-	dev-libs/libedit
-	dev-libs/userspace-rcu:=
-	dev-python/lmdb
-	net-libs/gnutls:=
-	caps? ( sys-libs/libcap-ng )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c:=
-	)
-	geoip? ( dev-libs/libmaxminddb:= )
-	idn? (
-		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
-		libidn2? ( net-dns/libidn2:= )
-	)
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local u
-	local my_conf=(
-		--with-storage="${EPREFIX}/var/lib/${PN}"
-		--with-rundir="${EPREFIX}/var/run/${PN}"
-		$(use_enable fastparser)
-		$(use_enable dnstap)
-		$(use_enable doc documentation)
-		$(use_enable utils utilities)
-		--enable-systemd=$(usex systemd)
-		$(use_with idn libidn)
-	)
-
-	for u in "${KNOT_MODULES[@]#+}"; do
-		my_conf+=("$(use_with ${u} module-${u})")
-	done
-
-	econf "${my_conf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -C doc html
-		HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/knot.init" knot
-	if use systemd; then
-		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	enewgroup knot 53
-	enewuser knot 53 -1 /var/lib/knot knot
-}
diff --git a/net-dns/knot/knot-2.7.8.ebuild b/net-dns/knot/knot-2.8.4.ebuild
index aa3b0735e370..aa3b0735e370 100644
--- a/net-dns/knot/knot-2.7.8.ebuild
+++ b/net-dns/knot/knot-2.8.4.ebuild
diff --git a/net-dns/knot/knot-2.8.3.ebuild b/net-dns/knot/knot-2.9.0.ebuild
index aa3b0735e370..aa3b0735e370 100644
--- a/net-dns/knot/knot-2.8.3.ebuild
+++ b/net-dns/knot/knot-2.9.0.ebuild
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index eaecec5d4381..76e79c712ca1 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,5 +1,5 @@
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
 EBUILD ldns-utils-1.7.0-r1.ebuild 1196 BLAKE2B 3743024ce280c8a1fd29b37f87333fd87d578cec89498be2b4cd8870f88f57081575c7236c883c95ed908bd5dd7b70ceda7311a6a660f3e2048b05ac1d97e353 SHA512 1305efbed428c05b10ec75e84ddf9dceb6d9087e87e3d1a1ae8b560a98db30b03366c005207135f3506d0fc40892fae4a8046f6b3a78367c490a8cae9940a06d
-EBUILD ldns-utils-1.7.1.ebuild 1436 BLAKE2B f8588b0b321c76b5c2e2234706aaa8ac1605921c9ca7dc10a3e02bf5650e3056bdadffa4465b0a4b47cc324a842a7f0134eef87a17fc1f54a20fd61dcdba1882 SHA512 f2b7fa3be15f3fdd51e2b5410c463c4e7d9bc0164ff2b7c606b242d52f03d4415acfc17e3bfcfb87b6eb1b14c5c4c472cbca2222fba023ef48450c11d0b10ad8
+EBUILD ldns-utils-1.7.1.ebuild 1486 BLAKE2B 276669c58c0a0bea638294060b97c7bf28178f3493a7e3d0a7b32e94073031594fab30c5ba2909900e2af0ae2f42623db6ab31b4bb2091ada933e33f3e4d1182 SHA512 647840b1cbcc572c4bc6c2105705bc645bd8574019a28e4b167754bedbdbd71ca26c6a529f71225d13b1e2666c54f43a3f623d2f5e0dd63b3fde6438328af07d
 MISC metadata.xml 848 BLAKE2B a31c8bfb2c5a90add80c4f608cdbd02e3bf15126726ed92203425b166ae01cf8240fa040d98ba44991cd315bdb388664692eca5820fc807cf3fddefc7663ffb4 SHA512 6ce3c5421c6e739f0c15a5b7e9120638cddc78fa3d9c2f564acfccd4c98bb3034512ce1a68422ba0ef7896750c1a41e273f2960d9d1f0ffc21c9028342482366
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
index 6a6ba48f563a..43f84b976da2 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
@@ -26,11 +26,13 @@ DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,ed25519?,ed448?,gost?]
 	examples? ( net-libs/libpcap )"
 RDEPEND="${DEPEND}"
 
+RESTRICT="test"
+
 S=${WORKDIR}/${MY_P}
 
 src_configure() {
 	# >=openssl-1.1.0 required for dane-ta
-	if has_version "<dev-libs/openssl-1.1.0"; then
+	if has_version "<dev-libs/openssl-1.1.0" || has_version dev-libs/libressl; then
 		local dane_ta_usage="--disable-dane-ta-usage"
 	else
 		local dane_ta_usage=""
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 796eefbbce21..facd33794e82 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -4,7 +4,7 @@ AUX libidn-1.33-parallel-make.patch 3584 BLAKE2B fbd1f372b11bc1da38bdeb3a8c0f017
 DIST libidn-1.33-security_backports-01.tar.xz 3420 BLAKE2B c0311d83dee53b83bceab7777e9508ffdc2737e31eec71dc7e67b29ee75cdcef8558db0e89d857ed8c402980fdd7c3419fbb123eba91dddc2358a06684114811 SHA512 e925d20c9258b47821d444c563c75f09f003d1c6b367c934a808242ce4c259ff83e9d67e886cb3e832117df1cd9cae4b18417c48fbf9c77266ab379d3afcd4f4
 DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6
 DIST libidn-1.35.tar.gz 4169217 BLAKE2B 809f9e854a4f2fcd3b2d5f7cdb34e2c68a0f00f5fcffc9002ead2d2d3dcee38022b3288f29716437f65f09e259e35cc98679d9c9d943423190cebb76fcbc94fa SHA512 782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09
-EBUILD libidn-1.33-r2.ebuild 2879 BLAKE2B c57bb01c91e3a82c5f68961ab0df8e12aba16781d59800fa82440e507555b996fa04da2c386a36d5021f06f6fa28a52afb93133d863d22b3f18b98ebe811af2a SHA512 965d7cc368ef053ab4cfeb9f7fcab9a1f9a618e2242810585950dca0a7266947ecd5ecec69be747c0db07872e5d90f39300c577ccb28b324b6017a9531e4c11f
-EBUILD libidn-1.33-r99.ebuild 1594 BLAKE2B 7e4fda8f1b660258d6c9cb92dfa5e86d2b24d0f6fbdfb6d47a217bb69928316a1897e7b67bf9b3206a0704185684e6d30089e96557dc03f7fec6b62380be2f46 SHA512 6e615d93dc2d3fa63f4cdcdb681f8faa8944182c840f243cf217cc8e4b33d545005a5d6a0c290d922b92895d018203c594d94d04f5fd99be85b1d5a8d8262540
-EBUILD libidn-1.35.ebuild 2660 BLAKE2B 72a42efce4eaf773e741ec8b4590a6496a97517b8bed359dc1158036e489c10cc5b62693b2bf9fc9d6b26f5a2388b11a99e63eee34f315eca494db02504452aa SHA512 671d49f7d7b82e268fd4c27cec35d06218c3a85ff8ccb46fab0fdf020c4193c3628b2c2f3c33e69e5acd2f61aa062151e036a3899308fe7468fd71c863640268
+EBUILD libidn-1.33-r2.ebuild 2857 BLAKE2B 1299c64f8cc3e81cf91e666a40216c2a63d627a98839ad75ebb41943c998a217c9f3ebb28ceb96c513235646fda9e80bd1cfd6ca5bdb9cf6406fd46f66dfb259 SHA512 49c76a8e20c33b726658c7905209564d16cb2e3c96ce640ad89a9474a10c0087551e19ed6349fcec335d4a042a6c6ca914e65d59e55029f780a80880893fb8ce
+EBUILD libidn-1.33-r99.ebuild 1572 BLAKE2B 1741c91cc423278d3e2aa848b00f2c9134773d92ee43f28d330fea9e94c0e92fd73f1a346ac40ab8bf054c4811242710c0a9956d973fcdb2bd318c8fbbc11a89 SHA512 83442c82494ac821078dbf1573eb19b570785a5699af571b2b93b7f271c5f3cc4df566f059e96c8c597c7c964d9801f09324ca62b4d37e189d324e94fef87338
+EBUILD libidn-1.35.ebuild 2638 BLAKE2B 0d7a15e990fc0188d42cffbcaf6ecc87489e7b0c5e1ac237f2b24120e3151a43620a84090b34654803a2ba3bdae063166ed9dcd5f06d219c49578477918a7037 SHA512 b258a78bfcfa949fa2b3d5de17c405bf0cd4f111d03108dc84ef18be16b48b1e418c3672d5c5f61dee9138bef8a23ae40719b867dc71c13738bf338e7d3da43d
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/net-dns/libidn/libidn-1.33-r2.ebuild b/net-dns/libidn/libidn-1.33-r2.ebuild
index 16e6204ad397..3d0c3be3b448 100644
--- a/net-dns/libidn/libidn-1.33-r2.ebuild
+++ b/net-dns/libidn/libidn-1.33-r2.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"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/libidn/libidn-1.33-r99.ebuild b/net-dns/libidn/libidn-1.33-r99.ebuild
index 170b0346b6e2..d80feb1ef34b 100644
--- a/net-dns/libidn/libidn-1.33-r99.ebuild
+++ b/net-dns/libidn/libidn-1.33-r99.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2 GPL-3 LGPL-3"
 SLOT="1.33"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="!<${CATEGORY}/${PN}-1.35:0"
 
diff --git a/net-dns/libidn/libidn-1.35.ebuild b/net-dns/libidn/libidn-1.35.ebuild
index d9562dd8fbac..bf9a50522715 100644
--- a/net-dns/libidn/libidn-1.35.ebuild
+++ b/net-dns/libidn/libidn-1.35.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0/12"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 0e057371fdf5..6dc91527c95e 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,7 +1,7 @@
 DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
 DIST libidn2-2.2.0.tar.gz 2110743 BLAKE2B 08a1f89d4b6edd7da4d91c9d21f9944c1ebb4064cb43147ac23fcd79f0a0bbd94e7d2b9a72382784f4aaca211cf9502a5117dfa63ab5fe72383188eeae6f628b SHA512 ccf56056a378d49a28ff67a2a23cd3d32ce51f86a78f84839b98dad709a1d0d03ac8d7c1496f0e4d3536bca00e3d09d34d76a37317b2ce87e3aa66bdf4e877b8
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
-EBUILD libidn2-2.1.1a-r1.ebuild 1319 BLAKE2B 15d25cfc11f73533d94bdd40c20bb3bcf313c7b79e3a2750b12af32f712b0156469b4a1198ab3f8653246ef19e1ebccb29a3b8f0bbf04d2ed0a4261b3497cb91 SHA512 a5c09aa232d92230a4ed703c8ca022b387fd2c2e9afd287f0bfa69912c97210fc79da5876b520d573dd7983604967e89a62911ebbc82d3462bde4736f0bb2b7d
-EBUILD libidn2-2.2.0.ebuild 1332 BLAKE2B 9ebf852e6f4af2212e70e779990586d1632483b204dd84c34f0773f19fbc76462fe6023fd7799431c2efb1dcb9c8254fdc658af5c8e52aed31faa324cddf883b SHA512 83050754150dfebea699555702da010a58c3e89f7287e9bc22c88f458b7a9d81b81e0db18dd95aff7f4aa84e7f503b5cac4453981fc540fec79e0b53d631b24f
+EBUILD libidn2-2.1.1a-r1.ebuild 1307 BLAKE2B 48f3e52c90b5c0c371151b42f3cc6bfab59a24558e8f89e9070b4f82bf3a72370af1c620d343a3178f4047d6e2dd06b9d0d8efcf42bf067e4bfb07cdb90ee241 SHA512 18ffd225a7e9dbd238f85a93a79099dbc53733569ea2e6d4e8b0d3c37d0534686b0b939a02c4e7f913c40cadc9a7ef274c6de2988982b8381dbbf17d2ed9cfe1
+EBUILD libidn2-2.2.0.ebuild 1320 BLAKE2B a86dcfd0262d88816e207842c2dcc64a4561530ee75284540fc670577c06cc0ec595da073f8b4b8630ab52836f1b9959e5f1cac692bb0534bd06640d810b4c77 SHA512 48b1de72a6bddddd7dee26240c06e40ada7e2064125a38c1cd59f7807e2992f8aeac0f4460e15a22e858bf4788ae8a01fbbcd9ec207057e97172e183f4f4f0a5
 EBUILD libidn2-99999.ebuild 1416 BLAKE2B ea56153f0eb2ca68fcd2fd170e2cfeedc8399a3bf5ba78d8bc78250ebbd59dd05e4074dee3bb4d3caf67b4c3391de331a495423d0f0cdc16c953fd4fa75ea278 SHA512 66f96b4e87d01dbb779d29ab83cfe6c1e756dcbc5db1555ca9128f0faa7888156c45e71befb2daa45c86aa77afeb9bdd6551b6336b955f57fb4179d1b2c6e512
 MISC metadata.xml 298 BLAKE2B 10b6250e87ec67fff437294893f9ac1a0c923b6c2bf69bc0462698632fbed280538f547a920cba9e8a1175534ad35a5a5d8d0d48f6824c378c46d34f91787712 SHA512 fb859efba7ea8f760f3d3f341496feeda5f8af633f40d4785ea738037017eae89060555447ae29abe69c0acc6f911a323aaa94dfc39f34e6aa9996af506372c0
diff --git a/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild b/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild
index c6f5d3489584..2f2bdcd0d558 100644
--- a/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild
+++ b/net-dns/libidn2/libidn2-2.1.1a-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-dns/libidn2/libidn2-2.2.0.ebuild b/net-dns/libidn2/libidn2-2.2.0.ebuild
index 17c2e6485f02..423471d58b6e 100644
--- a/net-dns/libidn2/libidn2-2.2.0.ebuild
+++ b/net-dns/libidn2/libidn2-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 20fe38969f78..7455a5159e54 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -2,10 +2,6 @@ AUX nsd.initd-r1 1383 BLAKE2B b90de2ebef09a4f9050f6e95f5faf659c62910462aba1179da
 AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1df39ceb58b92a44c48cb21583a480e622f72d07650f410f2e0703f1d16af08152aed16982ab8da2 SHA512 c06d0b035387e7be79cfa8fedf8afb3900772146c6d4090ac39ea2ef165772d875b222ef467bd73422078ef57818bcc931ca67fa290bd99a7a9456efa5448853
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
-DIST nsd-4.1.27.tar.gz 1131881 BLAKE2B 94a7f7efe23d130b04258faca0f73690712919e14268e6efabf4029bc30273d8ef3155259b072190776b6cde32050b61ade0584175f00eef0129e4621d5896a3 SHA512 9c75041f5a6213cdba7238c2e51fc73031f6f073e06587659f93992fed49418ee789642b25b5522d48642507050ac15021f385927eed81ce5ea649f974e66402
-DIST nsd-4.2.1.tar.gz 1145713 BLAKE2B 2cb265dbe274b68e2b038b98b37cf44b4dda4eb576f0fdae1c57686a3b99b0e2cdfd7f893ce196316ea02d1d872371cb36c00a35a5ddf8f83d66a981bf5b2560 SHA512 8f40baf7cc72b72a84f3c4eb45847f03b2f91e47dd7f3dfc89270c774565a8cc692363cee3547b0a2a124e9c43b23eed8887f95ae55b2e63af96c65467b85796
 DIST nsd-4.2.2.tar.gz 1149182 BLAKE2B 1cbac527063f7d14da589bd5060117da10fdd6a9e34b04eb763dbb94fe6c9cf09dc351985de3d099aea3377a4c945622871566c06e7f78aede885aa0c2bc5937 SHA512 43e2ee980a11ed0ad521cc9d8be1e2d29fa8ab552bdda043ffa7e5bc71cf07ad49319629f71e93dcf1dabd315f93bcfb9fd8b5847f27b125cf151fb4f63779b2
-EBUILD nsd-4.1.27.ebuild 3021 BLAKE2B 5af63c683a17a2d1fd1f997acec9a6ceea18a606313e011f2f90d04efa7afb201a994172b15a58f68935048dcf1e18479cf3da7e4326f616b5d0d9a98e910e1b SHA512 ee2fded785d879af29bdc9003c2a63d3c47efb2afabc1d8c72bee82392b84d9eeb780ad731c94190402b0e85c39ed5ead8078ddf18bd7672daf3c0e1c915ab51
-EBUILD nsd-4.2.1-r1.ebuild 2959 BLAKE2B c5f5d8d3080ddf40fba98d24c80e2440af5b83364b84a178ee646507504ffd1036135e10b9df71bdfc20c6da64989a497bc91320d14f2f5428a410661beba280 SHA512 7b1ae3ff916fca6cde66b4ada3647b0be59a23c60340606094eb8e40c0433699d96ef0ef1f6e8523084fb9b8b92201a0ee6e06caa1a2c58212e5517557c7dafd
-EBUILD nsd-4.2.2.ebuild 2959 BLAKE2B c5f5d8d3080ddf40fba98d24c80e2440af5b83364b84a178ee646507504ffd1036135e10b9df71bdfc20c6da64989a497bc91320d14f2f5428a410661beba280 SHA512 7b1ae3ff916fca6cde66b4ada3647b0be59a23c60340606094eb8e40c0433699d96ef0ef1f6e8523084fb9b8b92201a0ee6e06caa1a2c58212e5517557c7dafd
+EBUILD nsd-4.2.2.ebuild 2957 BLAKE2B 3ba1eccf0601e919735588afbbf5f1bec28ac47eacaccc659f2ca0bbd7e8da6f9a1ba7f2e032470bf12269cab8cd19647513d22203f447ea78519a8ba3e763ab SHA512 dfc60ec11c179d9e8fec1fcf073c3d405b5ebfdeff316af202370f50690f2a592d5c7f2e5c42e559e0e83979cd2c8931e45156064edd499b20b1fb603ef26a1d
 MISC metadata.xml 1082 BLAKE2B c44a5b7b9cb5ad52ebc55dd52a584cd8b0700977a19d541df1b415164250e390941ef35a0e8633a975e6cbae402719d8c5fe7d452dde5623223b01a7ec4320ac SHA512 a66e71346c6742c77ce38ca73f600dde471f3256928bab79f2015cb88c2f3237a4d69f7b9127ea90c58f584b60b8b676416b0704761ee1455479644fd2cd5a8d
diff --git a/net-dns/nsd/nsd-4.1.27.ebuild b/net-dns/nsd/nsd-4.1.27.ebuild
deleted file mode 100644
index a191a60d41c5..000000000000
--- a/net-dns/nsd/nsd-4.1.27.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools user systemd
-
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	libevent? ( dev-libs/libevent )
-	munin? ( net-analyzer/munin )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	systemd? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	# Fix the paths in the munin plugin to match our install
-	"${FILESDIR}"/nsd_munin_.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-largefile
-		--enable-pie
-		--enable-relro-now
-		--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() {
-	# Do this in postinst to ensure the uid/gid is consistent for binpkgs
-	enewgroup nsd
-	enewuser nsd -1 -1 -1 nsd
-
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
-}
diff --git a/net-dns/nsd/nsd-4.2.1-r1.ebuild b/net-dns/nsd/nsd-4.2.1-r1.ebuild
deleted file mode 100644
index 0eba80ae8a8a..000000000000
--- a/net-dns/nsd/nsd-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	acct-group/nsd
-	acct-user/nsd
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	libevent? ( dev-libs/libevent )
-	munin? ( net-analyzer/munin )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	systemd? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	# Fix the paths in the munin plugin to match our install
-	"${FILESDIR}"/nsd_munin_.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-largefile
-		--enable-pie
-		--enable-relro-now
-		--enable-tcp-fastopen
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable dnstap)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_enable systemd)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-
-	keepdir /var/db/${PN}
-}
-
-pkg_postinst() {
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
-}
diff --git a/net-dns/nsd/nsd-4.2.2.ebuild b/net-dns/nsd/nsd-4.2.2.ebuild
index 0eba80ae8a8a..232aade21c09 100644
--- a/net-dns/nsd/nsd-4.2.2.ebuild
+++ b/net-dns/nsd/nsd-4.2.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
 SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index b1b03e6c0464..1ce5793ab15d 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,3 +1,3 @@
 DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51aa6ff5b44fdfe08e96ccc78ae1d84f2115e5d59940e7e1cedf7e4fe7dc36a461839bcef8fc2c5b2e21242e441f36 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e
-EBUILD openresolv-3.9.0.ebuild 1076 BLAKE2B 8b2a74f45af82e138fe7c32df4db16ac568aca964f8bdbf46b8e76da008df2892fa8bca0aca4eeaf34076860bf989d30e08822fd5c56f73a97f72f8c92ffb80e SHA512 38048c5c4fe0db31a4d88c06c7e1e8f2dd766dafaaa37ef6a2b2e08ab71054d1057d5a0d00e97b76e9fe995178d3e089ed3a0cffe8b7ad8142416daeee88dc7e
+EBUILD openresolv-3.9.0.ebuild 1054 BLAKE2B 349ec6e7a2466fa6dae20892e1fc1ac11257616acecea52ea81912158523b222d92d8703c41110090da2d8abf290dbc04fa1e1132dc55e25d703fa8a274ac3e0 SHA512 0c684d8ebfcc1c01eb0583fb608aea48fa11ff59457b1c737c27f9d570a3b82d281c1d5180e5a05a8c9210f49729c5fe05c4a78bb3e2a765f62d4462bec85efe
 MISC metadata.xml 309 BLAKE2B 8abae227455bf1e75801e0dcf3b4165beedefc1499e12049e9eb6652302925a11b2b50ea09d417ed523e00103c5f2d7c619669d40bf3c98a7393b939bbb8a05c SHA512 311a9444ac8811bf1ea1a8bb06370b81360c6642921b2932095bd191d8784509bfe46189de8f073a34a831eaf1c8114c3b5bfcf67d0fe042ea2ecd8c1fc7cc0a
diff --git a/net-dns/openresolv/openresolv-3.9.0.ebuild b/net-dns/openresolv/openresolv-3.9.0.ebuild
index 2199d8c1229a..000f5c81f918 100644
--- a/net-dns/openresolv/openresolv-3.9.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="selinux"
 
 DEPEND="!net-dns/resolvconf-gentoo
diff --git a/net-dns/pdns-ldap-backend/Manifest b/net-dns/pdns-ldap-backend/Manifest
index 31c56066b6d9..d7ce3aaf7f90 100644
--- a/net-dns/pdns-ldap-backend/Manifest
+++ b/net-dns/pdns-ldap-backend/Manifest
@@ -1,3 +1,3 @@
 DIST pdns-ldap-backend-0.2.tar.gz 745650 BLAKE2B 68371aebaa4f3d447ccc52d5ba6463ec3cae704071a78664529415fd57b61e98d6fe8b895cf96122c24f9fc3fe74d449d2f132030148c7f896c38dbe1afaea3e SHA512 1a9eb0282abd9dea945150412a77d9cad4ee5fb114b621396928adb6db5994a0ee54b084281b723460e2943c15570c783da518a51314636302d9179832a26990
-EBUILD pdns-ldap-backend-0.2.ebuild 851 BLAKE2B ea5b154382e9fe8758705f5e4797500758de5f3ea7150bda03e43303bf9191d5d0dc74b52a34464c5fb035ff50e621b1ec13b7fc3d003c15a2c27a31f794a371 SHA512 eca4d95a134d9e90e7597914367c36bf1f3fd701d8873123c7bef1132809149dc1d5d2ff3fe8797a3df11d9af7e7f83ec892beaabe9d6fa72bb376d307022232
+EBUILD pdns-ldap-backend-0.2.ebuild 848 BLAKE2B 199e382d87c149af8c997f6671164b308d486e13cea21b9247c8ed53bdd6a6e422a72d4ab16b925c181b50cf4e2133e0e86e206a7169da0f04a82602bf942a73 SHA512 e8851638219c6ef8226afd9040701722da2b40236cf678307ebddf2064ca6c2bf6dbf3b189723a2e655b3af8715487138b16b871c60b9ccbb2a7dc73d6cdfc5f
 MISC metadata.xml 246 BLAKE2B 51bdde4e62e7640728e7f70e5bdb7a5020dbe78a8c2ecdf8f3801f0a0a160ae24967a5db07fd4d53ef726c153401424c1361b9498b2ece90f99d7727abe03e48 SHA512 3bf43ee02643fbfa29643230bb65c6ef527f1fb3df69d0d669afb641c26b27a13e5deac1607dc5a88bf96f0300e3806419468df36fd4de8577f4a5c3c24276e4
diff --git a/net-dns/pdns-ldap-backend/pdns-ldap-backend-0.2.ebuild b/net-dns/pdns-ldap-backend/pdns-ldap-backend-0.2.ebuild
index a53470cbafa4..48439709cce8 100644
--- a/net-dns/pdns-ldap-backend/pdns-ldap-backend-0.2.ebuild
+++ b/net-dns/pdns-ldap-backend/pdns-ldap-backend-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-dns/rbldnsd/Manifest b/net-dns/rbldnsd/Manifest
index 9508e52a8e38..a5d9c957ec21 100644
--- a/net-dns/rbldnsd/Manifest
+++ b/net-dns/rbldnsd/Manifest
@@ -5,6 +5,6 @@ AUX rbldnsd-0.997a-robust-ipv6-test-support.patch 10867 BLAKE2B b2470f4a364c490b
 AUX rbldnsd-0.998-fix-huge-zone-OOM.patch 1659 BLAKE2B 310b0b0851a09b5161919ce5a7fd97bb57c6ecbc1d87780af04c31214c72d25ca5d9dae481a46d1e5ccec4c5ba7b04b2b216a8ed104eb2af47b95771e32fa1b8 SHA512 2342d29322e6a5b726319a60c54a7f8d19b020e3dfc8a9d236ac7b6a55d9755b9afe1505c2f835604016fb899630074090baa737b2d3a24f7b4d4e4d911b0443
 DIST rbldnsd-0.998.tar.gz 145363 BLAKE2B e698f5b99ed1deae1aedda1952c19eb6189cbdcc71ecfa043faada966d30eee93e158dfeb059603dc493a665a7c56c84ff6ee636fc9eec7de38eb0bc73ed26db SHA512 7b6fb106f8188b2ce6e05b622cf90a393a4642f00faa5bddc184ce02dbd2beee9d8de22cb09ae53a25c475f28f99d13fbf6252f0d4c1d72bf47ba23f769e7074
 DIST rbldnsd-0.998b.tar.gz 154022 BLAKE2B f0bf03bef69853d45c3546c6fd3e58ffb95e76192ecb64f71f6799c6041749b1d117bed2bb21edbf1dec81d1684334b3af7d60b35d49089efb3a5e28752be6db SHA512 9b9c8694824a99b4ad120a22dbe4b05351867434e43ed0d8137990d3ece90ed67349965b6ed0450066d6663c1858545774c733b0d7afff304095de500ba30175
-EBUILD rbldnsd-0.998.ebuild 1550 BLAKE2B aef0a1798de7b636f6f0d2bc7c46607fe321eabd3e0db3bc6820ba1ebaea6625ca002128422b44e21b65b0f9b4c9ecfb02cbfad64c4ccc7ecc2695bbc0cad496 SHA512 0035d4f3a4119a03cb7f102ae63a25ef09d85e216dae8fd847a050b670ac281b624fa4873fe6d4cc0454c4e67d891748509a4f0f2180bdb932def5ccc7aa999a
-EBUILD rbldnsd-0.998b.ebuild 1458 BLAKE2B 81fb2726eb6b4b86b180870743d512cc336b62fc488f140461a776c4beecbac72fc45686668759732729a68609a9c77997d40e73d6505e79856edb050fdd154b SHA512 176492ba596b13ee7003fb056149439bae7b1662a8adaed50b7c050e0452aac230fbf663f8031f9983abae696718e6d8c0da75ec5ca06deb5c4002bfd0a75314
+EBUILD rbldnsd-0.998.ebuild 1540 BLAKE2B 46abc7491803de1c9a3508d0213e97fc565bc4f8bbdc851fb1fe45a5cc79fbeb526a2cd83b1658935c9a30923bf1c94a5cda350d1689b7f6eb82efa5f9adabaf SHA512 236ddc68f8a48f092ac1d485f7d9e3bc6c8d24f19dbb437a9d06ca82bc63a603233894592b8f38a415b6225ca992d6e073df63f3e6f5801faddc820db00722ef
+EBUILD rbldnsd-0.998b.ebuild 1448 BLAKE2B 8dcf4a48068a747638ed3c222bb4a1178fbf920625f2f2379277aac48ca1dc72803a5255b9e1870fe49dc1cac796f9f3755c2036a7ea1fd7fb34951107696a7e SHA512 7b90211bdf848e1cb021c83eb6bdb737a07f0579dd2ee96689525d03b41af648d4125b7f92ed81d1da84514174804396e63730ab26d3ebd7fee282d139aab6cd
 MISC metadata.xml 1219 BLAKE2B 78d1de3d2e056e8d1441e929686a9cf1d073348f2b58ef263ffee7c6e9c03ad59b387c6112fdcb845915b1d5f41eaf6825f21510e7d085852ab49567412eb867 SHA512 23bddced94702b936cadbaf9a6a51cfd8506715a766cbef9dbb0fb69bf02443e0c8636b6237f98fd3922d0c43fb17c7c2850074e6bdefc2c9af3731a01971f8f
diff --git a/net-dns/rbldnsd/rbldnsd-0.998.ebuild b/net-dns/rbldnsd/rbldnsd-0.998.ebuild
index 8c559177fb0e..e6463eb22efa 100644
--- a/net-dns/rbldnsd/rbldnsd-0.998.ebuild
+++ b/net-dns/rbldnsd/rbldnsd-0.998.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.corpit.ru/mjt/rbldnsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ~sparc x86"
 IUSE="ipv6 test zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )"
diff --git a/net-dns/rbldnsd/rbldnsd-0.998b.ebuild b/net-dns/rbldnsd/rbldnsd-0.998b.ebuild
index 27c112013d70..c570f9b9fbcd 100644
--- a/net-dns/rbldnsd/rbldnsd-0.998b.ebuild
+++ b/net-dns/rbldnsd/rbldnsd-0.998b.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/spamhaus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 IUSE="ipv6 test zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )"
diff --git a/net-dns/tinystats/Manifest b/net-dns/tinystats/Manifest
deleted file mode 100644
index d200d458e20a..000000000000
--- a/net-dns/tinystats/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tinystats-1.1.tar.gz 8102 BLAKE2B 367c33fec6f9d4174b0cc767112e87b6ee9a23d880861193f0e8cfe2ba7ffbd9082fe7167e96460d315f1c5ca86811637f5f859af396c8cf5d94177ead34cf58 SHA512 62791ee6cd759eb535e19b8c2901059ec6b335d79d3997ba6fa437927b18902cdeb73fb830b804b0bcfa48e75bb150ffa793a4412cd2e1dafebe6ca861be8e23
-EBUILD tinystats-1.1.ebuild 717 BLAKE2B 5cd6747fd1f051d253906baf0ad9ae42b02a13e42bcd916a0bd21378191cd938c496082147224c8412bba2e22eb21d0a3299af006bcf5e75e13842da85c67ed1 SHA512 31fd1fdf078ff33f224a2b7a1ec0f42069f96bc88f9f8ed1422096fd53a374784fd65c66110bc03487e783f6a271e7ca3b0a5af459eefb0a080927a001b6e9c9
-MISC metadata.xml 330 BLAKE2B 9df904ac5018efe6f520b2ef4382f62454b1a5fc2ed2bde642a4f238469ab807ba3604f9c8e4d5cca23a19e8dd3de1113aeeff9b5bfab34496202e0b43eab39e SHA512 2e9a09f3f2ccee2b639c468cd1b025f27c6095a29265cc2e9e1947a011593b9a9287265737fa7015a8aa8d5b5a73c724b92827228f1387ff6c7ef5a45a15a7da
diff --git a/net-dns/tinystats/metadata.xml b/net-dns/tinystats/metadata.xml
deleted file mode 100644
index 7998a88c5476..000000000000
--- a/net-dns/tinystats/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">tinystats is a filter that reads tinydns logs and stores stats
-about query types and errors of your authoritative dns.</longdescription>
-</pkgmetadata>
diff --git a/net-dns/tinystats/tinystats-1.1.ebuild b/net-dns/tinystats/tinystats-1.1.ebuild
deleted file mode 100644
index 5e6ccf0dfae9..000000000000
--- a/net-dns/tinystats/tinystats-1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="A tinydns logging helper app"
-HOMEPAGE="http://www.morettoni.net/tinystats.en.html"
-SRC_URI="http://www.morettoni.net/bsd/${P}.tar.gz"
-IUSE="ipv6"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~x86"
-RDEPEND="net-dns/djbdns"
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	use ipv6 && IPV6="-D WITH_IPV6"
-	$(tc-getCC) ${CFLAGS} ${IPV6} -o tinystats ${LDFLAGS} tinystats.c || \
-		die "compile failed"
-}
-
-src_install() {
-	dobin tinystats || die 'dobin failed'
-	dodoc README
-	docinto sample
-	dodoc start_slave.sh.sample update_slave.sh.sample \
-		tinydns.log.run.sample tinydns.sh.sample
-}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 9c98fe537886..7cb118bfec27 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -10,9 +10,11 @@ DIST unbound-1.9.0.tar.gz 5662176 BLAKE2B dff42ca4155df1c364bcfeb37c0f9516e7f167
 DIST unbound-1.9.1.tar.gz 5665254 BLAKE2B 68a643cd17139b34e3651e0e72053b0faacf83ae975fff97493c78742ffa7f0d3dbc0028e96e581e125a3591467ec78ae245a718424c2fb32ea7db23ae945f44 SHA512 5dfac7ce3892f73109fdfe0f81863643b1f4c10cee2d4e2d1a28132f1b9ea4d4f89242e4e6348fdadf998f1c75d53577cbf4f719e98faa1342fc3c5de2e8903d
 DIST unbound-1.9.2.tar.gz 5676395 BLAKE2B fa42e6afaf7e7fc98dba35fb6ec4513f7f392194e9124f7a4625c9a51f4b2b58bb63ca40a083b9f3583af3636399df02f92ef7cb0ae10404b7258cddfce82adc SHA512 118f0e53ee2d5cfb53ce1f792ca680cc01b5825bf81575e36bd3b24f3bdbe14e6631401bf1bf85eb2ac2a3fa0ee2ee3eb6a28b245d06d48d9975ce4cc260f764
 DIST unbound-1.9.3.tar.gz 5686017 BLAKE2B f96636f4070e48cc5e3eadfb59e28f2ab2fc95a8c5a78af095743ea6d32149aadc486f8da62ea1b38c856f4ba9c2cf041407dceb33396a47c59a19816d67f8c6 SHA512 21e14dc1577adbe502a262d7fbe9aae0cd389cd9c0b822246beadf00f0ee875e268eeb3ce820433cbb01495d6b182c334b34b63b1bc33b08589a230810ccfe90
+DIST unbound-1.9.4.tar.gz 5686242 BLAKE2B de9e553ba6e8c3839b41776052c3b0f83890b5bd9cbdb895fbf1e413169dd4740a9dc354ccc787fa018755acb73e831f1cb2742db65e151d1e01367b35a7b9e5 SHA512 44021014c944fc01a1f5f9afd77145f5554a3282cc2bfd54526fc4f88346f497c847ddb72bafa155d7e6e5dd02b6bb031836ead4408977d4e4b5b3290dffea9c
 EBUILD unbound-1.9.0.ebuild 5371 BLAKE2B 210ca5db8c4fedf546d8caeffda1cf94f6366e9befe55be6c07ba273209ff2b5388509341c4540ee65aeedb3f543e0caa7fbac880121ba86f1426e856167689c SHA512 2f78e2c29c5ed3998260ae8803c0a5e9216f63c9001be4f62613e88899e130258b7a53e0072a621e2d436b6491ed688006cb2e8ccdf6e6426eec34d87d358648
 EBUILD unbound-1.9.1-r1.ebuild 5406 BLAKE2B 92f267663f8174cf9ed701078773c5e56a2e44456788037ba392df6d4d3aacf7d3fab1447a93271bdf1ededc6bc4e2e010157f782389f48fa3678f2449acedd2 SHA512 761d406627a16bd9ed687c939f57e9b16e42e7aa9de84aa3b03aa11efb4efa9eb9910cbb73ab962dc34184159b46413540d8f6b1071059ac02231eda63190527
 EBUILD unbound-1.9.1.ebuild 5383 BLAKE2B 2e5777319dab657dea41e1eb2e6e325ed8dc0d5d6c9e7711ee4cd11e043bc9582cb58fcffa26d1264759fed85debfa8f23b21dde1a936730e47d7ecf1ea2eb0f SHA512 1cc7d4b7deef9d75412caee7633e487e22fea793454eb87554401bf8b1efdaf24b67c2d6a463232cddb4cf1ecd8ab90f998623df0c99e9c8434245f27b202975
 EBUILD unbound-1.9.2.ebuild 5406 BLAKE2B 92f267663f8174cf9ed701078773c5e56a2e44456788037ba392df6d4d3aacf7d3fab1447a93271bdf1ededc6bc4e2e010157f782389f48fa3678f2449acedd2 SHA512 761d406627a16bd9ed687c939f57e9b16e42e7aa9de84aa3b03aa11efb4efa9eb9910cbb73ab962dc34184159b46413540d8f6b1071059ac02231eda63190527
 EBUILD unbound-1.9.3.ebuild 5406 BLAKE2B 92f267663f8174cf9ed701078773c5e56a2e44456788037ba392df6d4d3aacf7d3fab1447a93271bdf1ededc6bc4e2e010157f782389f48fa3678f2449acedd2 SHA512 761d406627a16bd9ed687c939f57e9b16e42e7aa9de84aa3b03aa11efb4efa9eb9910cbb73ab962dc34184159b46413540d8f6b1071059ac02231eda63190527
+EBUILD unbound-1.9.4.ebuild 5402 BLAKE2B 7c36d4ae986ee898568c24a1cda000b656f62501cfdf39a6d60b40061c95fe44dd5c481033bbc3475379b3717f0bfdc16e54ae91282e458f0f5492a30e68aac9 SHA512 232cce930812ecd5c6935c0aeef9cf6604a81ed3af46c62277001475cb260dfa7871684a266daec7f62ab23c9fcf28198912975edaf3249bd796972d8bb295ae
 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/unbound-1.9.4.ebuild b/net-dns/unbound/unbound-1.9.4.ebuild
new file mode 100644
index 000000000000..735249132240
--- /dev/null
+++ b/net-dns/unbound/unbound-1.9.4.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup unbound
+	enewuser unbound -1 -1 /etc/unbound unbound
+	# improve security on existing installs (bug #641042)
+	# as well as new installs where unbound homedir has just been created
+	if [[ -d "${ROOT}/etc/unbound" ]]; then
+		chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX%/}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX%/}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX%/}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX%/}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX%/}"/usr \
+		--with-libexpat="${EPREFIX%/}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED%/}/etc/unbound/unbound.conf" || \
+		die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	# make var/ writable by unbound
+	if [[ -d "${EROOT%/}/etc/unbound/var" ]]; then
+		chown --no-dereference --from=root unbound: "${EROOT%/}/etc/unbound/var"
+	fi
+
+	einfo ""
+	einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+	einfo "set 'auto-trust-anchor-file: ${EROOT%/}/etc/unbound/var/root-anchors.txt' in ${EROOT%/}/etc/unbound/unbound.conf"
+	einfo "and run"
+	einfo ""
+	einfo "  su -s /bin/sh -c '${EROOT%/}/usr/sbin/unbound-anchor -a ${EROOT%/}/etc/unbound/var/root-anchors.txt' unbound"
+	einfo ""
+	einfo "as root to create it initially before starting unbound for the first time after enabling this."
+	einfo ""
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /net-dns
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)