gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /net-dns
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
47 files changed, 322 insertions, 1771 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 72fd8b9e5a03..0edc8ab89421 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index a8046c0700cc..1a0fae781063 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,10 +1,3 @@
-AUX bind-tools-9.5.0_p1-lwconfig.patch 1784 BLAKE2B aaa6e476300872528c1874fd894fd44bd4a58d2e4c8c7c7111273b48fa476892e14b8e0a964064a0bb51003afbb1957e165a18aa95c95be1b014f0624a5e42ba SHA512 2d97ad6ef9f5de1992c2923215117d319c03b393e666bcf7d10684c37130a185a466e0364c22be18cd7c6d5fa362cff4cc8b88b601679ca0f8ffa6e8a11b5ff6
-DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
-DIST bind-9.12.2_p2.tar.gz 9422128 BLAKE2B c7d56f025f381a0136aa67ccd49a3254fcfe566d5e3601410e5cada26ccab32a901fe6e14bc14e6e287fa2b3904a4eee8e3ef63329f9bc4cb11f204590ff3623 SHA512 458adf6b3d0df286e7d345a21c40b639efcb275e76f9e0bf4e40a5d76dcac875016324393e129f29397be326d1017367c506ec9cbb35871c98fad4281bc4e05a
-DIST bind-9.12.3_p1.tar.gz 8625693 BLAKE2B 1899e04e409d3dafe63494fb7a0d8b813a6487754149bbfd01888cddc5e134ac675e9ac790684fb6fd8de4b1484e23ed7f1881c01234c9f16b27180c9a4594a9 SHA512 c1c91de88e4297e79b527775edd525c6fa948f169977563ab2e6ca93cac7317f8ca85863567f5cc151d4c6e3c081864ab1cf813bcfdd1165b52e9471b8317c28
 DIST bind-9.12.3_p4.tar.gz 8627833 BLAKE2B f7f8b88d8179f2df92b3105a49f30f7de5ccfe78a4a51f6bfa08e732968bf8e4c35f298c4209d8d05bea4d71b8669fd360d4c17193574eda471ba4d7ad742092 SHA512 42c41f47a0282dc08ee875fe098ce84b26384dba5efbaf99b557d34c4271e0d6aac70126f280a3ee157e8604cce16901c8cd51fab791dec82f4a3d00c054f363
-EBUILD bind-tools-9.11.2_p1.ebuild 3150 BLAKE2B b0979f611760b25f7b65f5bf39c07dd244486c62b070c4cb459a7d35334f6484c86cd1eb7780507991bef6400406d9a7c4e4eb2892c94d2328d7ff81c3554eb9 SHA512 d84fd1fcb3576f26f51bd1dd8dc0a5b2174def2db158c6b7723a72eb74bef098031f206d4baf7e1fb8d0d9d0d5c8087f91036a8628e778e72021302e9ace6e45
-EBUILD bind-tools-9.12.2_p2-r1.ebuild 3566 BLAKE2B 152ed3e96ba00148a3655a0cf9afbf58d3ffd9c8fe8376e0128fbe989884b515998cf87a32128dfed507ca378cb8b2a5579069c4de85477ecddde32651d94877 SHA512 63da1ca6cf0db104888603ba0814d26804f73aa5df80b1f08613bc4bb17b1e3e0f9d4eca31d2e8ee16401164784dff6eac79304d9d9d78ebcd00bcf7bb0d32ed
-EBUILD bind-tools-9.12.3_p1.ebuild 3574 BLAKE2B 90185a97864ae966d4d75826d75d98edb6948ed85af077362906acbd737139e379b47997a277190f2e724d41ecaf00419403e7c4e3dafe2bfefe4d45fb86a575 SHA512 307c6d154a73f31f82b4a5019854d78de6d0dc4db945af372fa7125b6e2d478afa6bab52498db05930c8f13383bb5d697d7c52e5c31f0fb955a26ab0f1948c32
-EBUILD bind-tools-9.12.3_p4.ebuild 3573 BLAKE2B 120beda1ff19ceb6b6e23e6183e8f9a65af26c76f71d21b14a95d87e1cc411201ee50d07c6c34ce0fdfa1fd5ccab30fcdcf1a9526f92680dbc5021a2f4239c5d SHA512 67c8da254ef8909a55e100dde8b982eeb412ea6888fecbe60f935be2967676e5b3fc09e879945eac75bf8d041a2e6fd9baa4db4e2fab1a3d520f95cbdb4eabe6
+EBUILD bind-tools-9.12.3_p4.ebuild 3565 BLAKE2B 6705009bb3e2c1c343197efc109db21119064b562f3d7dd7257e5c8ccfd92c23c5773b14cea710f9bae512b7d3d65907742516af58908ff7b9ae4e3c92f305c3 SHA512 3ba3f607ac4f951f3d62af9e1736e033fc2d93c672e95331ca17256d602741a020ba971d271fd7c8aa7c5fdf9386f534b48c9459f921d971db20abec797bb988
 MISC metadata.xml 640 BLAKE2B e563c600c07069fbcf6b9c6a650c4ea47004973757ee685ef12d88c012d70dc2d50831f238aa0ce557531dc91fe8dbb606e526a3b3a72d56725024d76329bcf7 SHA512 e87aa31e416bf3051f213c22b744262a6f4700254a42ab684da2a99eb2b9efb848ccbd2ec747f7c9f309556e6ba5426edaaf3a877cc620758cbde0b40d8c6b37
diff --git a/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild b/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
deleted file mode 100644
index d6f84a585276..000000000000
--- a/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils 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="http://www.isc.org/software/bind"
-SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-${PV}.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"
-IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="gost? ( !libressl ssl )"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] )
-	xml? ( dev-libs/libxml2 )
-	idn? ( <net-dns/idnkit-2:= )
-	gssapi? ( virtual/krb5 )
-	readline? ( sys-libs/readline:0= )
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!<net-dns/bind-9.10.2"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch #231247
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4
-	rm -rf libtool.m4/
-
-	mv configure.in configure.ac || die # configure.in is deprecated
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	if use urandom; then
-		myconf="${myconf} --with-randomdev=/dev/urandom"
-	else
-		myconf="${myconf} --with-randomdev=/dev/random"
-	fi
-
-	# bug 344029
-	append-cflags "-DDIG_SIGCHASE"
-
-	# localstatedir for nsupdate -l, bug 395785
-	tc-export BUILD_CC
-	econf \
-		--localstatedir=/var \
-		--without-python \
-		--without-libjson \
-		--without-zlib \
-		--without-lmdb \
-		--disable-openssl-version-check \
-		$(use_enable ipv6) \
-		$(use_with idn) \
-		$(usex idn --with-idnlib=-lidnkit '') \
-		$(use_enable seccomp) \
-		$(use_with ssl openssl) \
-		$(use_with xml libxml2) \
-		$(use_with gssapi) \
-		$(use_with readline) \
-		$(use_with gost) \
-		${myconf}
-
-	# 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
-	dobin delv
-	doman delv.1
-
-	cd "${S}"/bin/dig
-	dobin dig host nslookup
-	doman {dig,host,nslookup}.1
-
-	cd "${S}"/bin/nsupdate
-	dobin nsupdate
-	doman nsupdate.1
-	if use doc; then
-		dohtml nsupdate.html
-	fi
-
-	cd "${S}"/bin/dnssec
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
-		dobin dnssec-"${tool}"
-		doman dnssec-"${tool}".8
-		if use doc; then
-			dohtml dnssec-"${tool}".html
-		fi
-	done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild b/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
deleted file mode 100644
index c9ad06bdb880..000000000000
--- a/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils 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="http://www.isc.org/software/bind"
-SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-${PV}.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"
-IUSE="doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="gost? ( !libressl ssl )
-	idn? ( !libidn2 )
-	libidn2? ( !idn )"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	gost? (
-		|| (
-			=dev-libs/openssl-1.0*[-bindist]
-			(
-				>=dev-libs/openssl-1.1
-				dev-libs/gost-engine
-			)
-		)
-	)
-	xml? ( dev-libs/libxml2 )
-	idn? ( <net-dns/idnkit-2:= )
-	libidn2? ( net-dns/libidn2:= )
-	gssapi? ( virtual/krb5 )
-	libedit? ( dev-libs/libedit )
-	!libedit? (
-		readline? ( sys-libs/readline:0= )
-	)
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!<net-dns/bind-9.10.2"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4
-	rm -rf libtool.m4/
-
-	mv configure.in configure.ac || die # configure.in is deprecated
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--without-python
-		--without-libjson
-		--without-zlib
-		--without-lmdb
-		$(use_enable ipv6)
-		$(use_with idn idnkit)
-		$(usex idn --with-idnlib=-lidnkit '')
-		$(use_with libidn2)
-		$(use_enable seccomp)
-		$(use_with ssl openssl "${EPREFIX}"/usr)
-		$(use_with xml libxml2)
-		$(use_with gssapi)
-		$(use_with readline)
-		$(use_with gost)
-	)
-
-	if use urandom; then
-		myeconfargs+=( --with-randomdev=/dev/urandom )
-	else
-		myeconfargs+=( --with-randomdev=/dev/random )
-	fi
-
-	# 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"
-
-	# 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.12.3_p1.ebuild b/net-dns/bind-tools/bind-tools-9.12.3_p1.ebuild
deleted file mode 100644
index 276687b352d9..000000000000
--- a/net-dns/bind-tools/bind-tools-9.12.3_p1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils 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="http://www.isc.org/software/bind"
-SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-${PV}.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"
-IUSE="doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="gost? ( !libressl ssl )
-	idn? ( !libidn2 )
-	libidn2? ( !idn )"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	gost? (
-		|| (
-			=dev-libs/openssl-1.0*[-bindist]
-			(
-				>=dev-libs/openssl-1.1
-				dev-libs/gost-engine
-			)
-		)
-	)
-	xml? ( dev-libs/libxml2 )
-	idn? ( <net-dns/idnkit-2:= )
-	libidn2? ( net-dns/libidn2:= )
-	gssapi? ( virtual/krb5 )
-	libedit? ( dev-libs/libedit )
-	!libedit? (
-		readline? ( sys-libs/readline:0= )
-	)
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!<net-dns/bind-9.10.2"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4
-	rm -rf libtool.m4/
-
-	mv configure.in configure.ac || die # configure.in is deprecated
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--without-python
-		--without-libjson
-		--without-zlib
-		--without-lmdb
-		$(use_enable ipv6)
-		$(use_with idn idnkit)
-		$(usex idn --with-idnlib=-lidnkit '')
-		$(use_with libidn2)
-		$(use_enable seccomp)
-		$(use_with ssl openssl "${EPREFIX}"/usr)
-		$(use_with xml libxml2)
-		$(use_with gssapi)
-		$(use_with readline)
-		$(use_with gost)
-	)
-
-	if use urandom; then
-		myeconfargs+=( --with-randomdev=/dev/urandom )
-	else
-		myeconfargs+=( --with-randomdev=/dev/random )
-	fi
-
-	# 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"
-
-	# 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.12.3_p4.ebuild b/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
index 84bb1a6f1a22..d32063eaa873 100644
--- a/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-
 
 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch b/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch
deleted file mode 100644
index ba615d5ac6eb..000000000000
--- a/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/lib/lwres/lwconfig.c
-+++ b/lib/lwres/lwconfig.c
-@@ -175,13 +175,8 @@
- 	REQUIRE(buffer != NULL);
- 	REQUIRE(size > 0U);
- 
--	*p = '\0';
--
- 	ch = eatwhite(fp);
- 
--	if (ch == EOF)
--		return (EOF);
--
- 	do {
- 		*p = '\0';
- 
-@@ -592,23 +587,37 @@
- 		if (strlen(word) == 0U)
- 			rval = LWRES_R_SUCCESS;
- 		else if (strcmp(word, "nameserver") == 0)
--			rval = lwres_conf_parsenameserver(ctx, fp);
-+			rval = (stopchar != '\n')? /* fail instantly if EOL is reached */
-+				lwres_conf_parsenameserver(ctx, fp)
-+				: LWRES_R_FAILURE;
- 		else if (strcmp(word, "lwserver") == 0)
--			rval = lwres_conf_parselwserver(ctx, fp);
-+			rval = (stopchar != '\n')?
-+				lwres_conf_parselwserver(ctx, fp)
-+				: LWRES_R_FAILURE;
- 		else if (strcmp(word, "domain") == 0)
--			rval = lwres_conf_parsedomain(ctx, fp);
-+			rval = (stopchar != '\n')?
-+				lwres_conf_parsedomain(ctx, fp)
-+				: LWRES_R_FAILURE;
- 		else if (strcmp(word, "search") == 0)
--			rval = lwres_conf_parsesearch(ctx, fp);
-+			rval = (stopchar != '\n')?
-+				lwres_conf_parsesearch(ctx, fp)
-+				: LWRES_R_FAILURE;
- 		else if (strcmp(word, "sortlist") == 0)
--			rval = lwres_conf_parsesortlist(ctx, fp);
-+			rval = (stopchar != '\n')?
-+				lwres_conf_parsesortlist(ctx, fp)
-+				: LWRES_R_FAILURE;
- 		else if (strcmp(word, "options") == 0)
--			rval = lwres_conf_parseoption(ctx, fp);
-+			rval = (stopchar != '\n')?
-+				lwres_conf_parseoption(ctx, fp)
-+				: LWRES_R_FAILURE;
- 		else {
- 			/* unrecognised word. Ignore entire line */
- 			rval = LWRES_R_SUCCESS;
--			stopchar = eatline(fp);
--			if (stopchar == EOF) {
--				break;
-+			if (stopchar != '\n') { /* do not eat the next line */
-+				stopchar = eatline(fp);
-+				if (stopchar == EOF) {
-+					break;
-+				}
- 			}
- 		}
- 		if (ret == LWRES_R_SUCCESS && rval != LWRES_R_SUCCESS)
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index a9883bc05d2c..efa6f60f363f 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -7,11 +7,7 @@ AUX named.conf-r8 4020 BLAKE2B beb900a89be0f2acc1b08a8d29443c87b098e5ac1f1de9c63
 AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f5bae6c2313485808b99a1a46fc10431913d187ed67cc1e6bad019a9192638bc7fdf97c951e2326ce SHA512 68fa7c8963ac59349de3d05972c07aa0123b7bebbe0ba9604463ccfd1b377c2babe01eed4745cbe0f7d3831d1b47c2fa620f8092c67465fb771cae4932b0861a
 AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
-DIST bind-9.12.2_p2.tar.gz 9422128 BLAKE2B c7d56f025f381a0136aa67ccd49a3254fcfe566d5e3601410e5cada26ccab32a901fe6e14bc14e6e287fa2b3904a4eee8e3ef63329f9bc4cb11f204590ff3623 SHA512 458adf6b3d0df286e7d345a21c40b639efcb275e76f9e0bf4e40a5d76dcac875016324393e129f29397be326d1017367c506ec9cbb35871c98fad4281bc4e05a
-DIST bind-9.12.3_p1.tar.gz 8625693 BLAKE2B 1899e04e409d3dafe63494fb7a0d8b813a6487754149bbfd01888cddc5e134ac675e9ac790684fb6fd8de4b1484e23ed7f1881c01234c9f16b27180c9a4594a9 SHA512 c1c91de88e4297e79b527775edd525c6fa948f169977563ab2e6ca93cac7317f8ca85863567f5cc151d4c6e3c081864ab1cf813bcfdd1165b52e9471b8317c28
 DIST bind-9.12.3_p4.tar.gz 8627833 BLAKE2B f7f8b88d8179f2df92b3105a49f30f7de5ccfe78a4a51f6bfa08e732968bf8e4c35f298c4209d8d05bea4d71b8669fd360d4c17193574eda471ba4d7ad742092 SHA512 42c41f47a0282dc08ee875fe098ce84b26384dba5efbaf99b557d34c4271e0d6aac70126f280a3ee157e8604cce16901c8cd51fab791dec82f4a3d00c054f363
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.12.2_p2-r1.ebuild 12355 BLAKE2B 8dcbb0f8a8f24aab4cd99dce950defaf77f001eca4012a0c6789a5cbc00014eaaa83e51ad40607b58f55ebee178317b55052baf72d8aa821d2f8574de80fe894 SHA512 e81aec10d07476636db05eeae2599af9d9b74d9319cdcacb003248f4720955ff105b50bd931acf59fc79c80c58ec795ad212de0ae0c72358d7c3382a96471876
-EBUILD bind-9.12.3_p1-r1.ebuild 12183 BLAKE2B e2916dc110ec5a63cf6b9504b4396c307fa42c4fb6efe375abdcf7b24df8a796f17afdbb15797823422d75c15289289d6a33ab3eb8d6ffb67856dd8ff20358e9 SHA512 285a425d8fa4a194abff3dd8e87f5fc9a0d5c8e8a24aebd360a1871761fbf9d112201438da1d04d901405642697d054b70543ec08dcc81f675df3f6873a071a5
-EBUILD bind-9.12.3_p4.ebuild 12182 BLAKE2B 07e377c3502b4f04f854286b380d1cbdbbcb1823cae8ae08f15c57eb89de242d7ca457a02c7aff9279d4fc75289252b5359f1e927597c15edbf6074569acd660 SHA512 3e60f82093653b282e4006c51650d729b7150fc62870f0a5b9bd98815b5cfa575279b83411e1561a1682bcf3dfdc006163a45e485b7c3aaee2228d7f49c58066
-MISC metadata.xml 1212 BLAKE2B d5d2d429c94de0711bad69afbba1ce9349e4a9c2033d6e77c73c77fa4646c226b0df497b68df4766f32861d254d926068d4e7d1fe960a566b0a2e77150e0a34b SHA512 1597200272c522a7b4597fa2ec302d66b8527e472cd2f88588597b80f4bea098215ffd53841f884695de2e53224dacd1081c236879177cc3dfc7d848d43b8295
+EBUILD bind-9.12.3_p4.ebuild 12172 BLAKE2B 62c3ce36bbe575dc6b3f60925bc7c3eaf8cea799322ce1931045ef465fdda30b9c4e37335c5bfbeb576b74e5eeda726bc263afcb2a26be01c800fdd75f898469 SHA512 1a87ca8aa2fb061d6d7cdb0359fe51268c5e11d96b10ccb45dca680e2f14c616a54a394e6c709487be656e8c2cf7343d4115522bb88d9eef4cfaee84971fdc8d
+MISC metadata.xml 1085 BLAKE2B 892344efd61f1a6fa09d7f0eeaff33362e59e0c395bdf213ffb3fb49fce1128cdd023cf20c4d5d7856ba6dcbc06d6e3290815370002db2054e0edca680a8c7b7 SHA512 56ebf9da232f14545887ff4a561211b7074ae605ec3900aca30a6a37f2589ff140c4db9d3785b82891090465cd7477ed09d3b3b04cd6af05993b9e3606f9c374
diff --git a/net-dns/bind/bind-9.12.2_p2-r1.ebuild b/net-dns/bind/bind-9.12.2_p2-r1.ebuild
deleted file mode 100644
index f6702e205b72..000000000000
--- a/net-dns/bind/bind-9.12.2_p2-r1.ebuild
+++ /dev/null
@@ -1,415 +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_{4,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="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/software/bind"
-SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-#	sdb-ldap? (
-#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-#	)"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm 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"
-# -berkdb by default re bug 602682
-IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi idn ipv6
-json ldap libidn2 libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs
-+threads urandom xml +zlib"
-# sdb-ldap - patch broken
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="idn? ( !libidn2 )
-	libidn2? ( !idn )
-	postgres? ( dlz )
-	berkdb? ( dlz )
-	mysql? ( dlz !threads )
-	odbc? ( dlz )
-	ldap? ( dlz )
-	gost? ( !libressl ssl )
-	threads? ( caps )
-	dnstap? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-# sdb-ldap? ( dlz )
-
-DEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0[-bindist] )
-		libressl? ( dev-libs/libressl )
-	)
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	idn? ( <net-dns/idnkit-2:= )
-	libidn2? ( net-dns/libidn2 )
-	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 )
-	gost? (
-		|| (
-			=dev-libs/openssl-1.0*[-bindist]
-			(
-				>=dev-libs/openssl-1.1
-				dev-libs/gost-engine
-			)
-		)
-	)
-	seccomp? ( sys-libs/libseccomp )
-	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 sys-process/fuser-bsd )"
-
-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
-
-	# 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
-	rm -rf libtool.m4/
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir=/etc/bind
-		--localstatedir=/var
-		--with-libtool
-		--enable-full-report
-		--without-readline
-		$(use_enable caps linux-caps)
-		$(use_enable dnsrps)
-		$(use_enable fixed-rrset)
-		$(use_enable ipv6)
-		$(use_enable rpz rpz-nsdname)
-		$(use_enable rpz rpz-nsip)
-		$(use_enable seccomp)
-		# $(use_enable static-libs static)
-		$(use_enable threads)
-		$(use_with berkdb dlz-bdb)
-		$(use_with dlz dlopen)
-		$(use_with dlz dlz-filesystem)
-		$(use_with dlz dlz-stub)
-		$(use_with gost)
-		$(use_with gssapi)
-		$(use_with idn idnkit)
-		$(use_with libidn2)
-		$(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 ssl ecdsa)
-		$(use_with ssl openssl "${EPREFIX}"/usr)
-		$(use_with xml libxml2)
-		$(use_with zlib)
-	)
-
-	if use urandom; then
-		myeconfargs+=( --with-randomdev=/dev/urandom )
-	else
-		myeconfargs+=( --with-randomdev=/dev/random )
-	fi
-
-	use geoip && myeconfargs+=( --with-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() {
-	emake DESTDIR="${D}" install
-
-	dodoc CHANGES README
-
-	if use idn; then
-		dodoc contrib/idn/README.idnkit
-	fi
-
-	if use doc; then
-		dodoc doc/arm/Bv9ARM.pdf
-
-		docinto misc
-		dodoc 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*
-	rm -f "${ED%/}"/usr/share/man/man8/nsupdate.8*
-	rm -f "${ED%/}"/usr/bin/{dig,host,nslookup,nsupdate}
-	rm -f "${ED%/}"/usr/sbin/{dig,host,nslookup,nsupdate}
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
-		rm -f "${ED%/}"/usr/{,s}bin/dnssec-"${tool}"
-		rm -f "${ED%/}"/usr/share/man/man8/dnssec-"${tool}".8*
-	done
-
-	# bug 405251, library archives aren't properly handled by --enable/disable-static
-	if ! use static-libs; then
-		find "${ED}" -type f -name '*.a' -delete || die
-	fi
-
-	# bug 405251
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use python; then
-		install_python_tools() {
-			dosbin bin/python/dnssec-{checkds,coverage}
-		}
-		python_foreach_impl install_python_tools
-
-		python_replicate_script "${ED%/}/usr/sbin/dnssec-checkds"
-		python_replicate_script "${ED%/}/usr/sbin/dnssec-coverage"
-	fi
-
-	# bug 450406
-	dosym named.cache /var/bind/root.cache
-
-	dosym /var/bind/pri /etc/bind/pri
-	dosym /var/bind/sec /etc/bind/sec
-	dosym /var/bind/dyn /etc/bind/dyn
-	keepdir /var/bind/{pri,sec,dyn}
-
-	dodir /var/log/named
-
-	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
-	systemd_newunit "${FILESDIR}/named.service-r1" named.service
-	systemd_dotmpfilesd "${FILESDIR}"/named.conf
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if use urandom; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
-			echo
-		fi
-		chown root:named /etc/bind/rndc.key || die
-		chmod 0640 /etc/bind/rndc.key || die
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	use mysql || use postgres || use ldap && {
-		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
-		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
-		einfo
-	}
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	mkdir -m 0750 -p ${CHROOT} || die
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
-	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
-	# 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.12.3_p1-r1.ebuild b/net-dns/bind/bind-9.12.3_p1-r1.ebuild
deleted file mode 100644
index 214450407536..000000000000
--- a/net-dns/bind/bind-9.12.3_p1-r1.ebuild
+++ /dev/null
@@ -1,407 +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_{4,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="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/software/bind"
-SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-#	sdb-ldap? (
-#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-#	)"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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"
-# -berkdb by default re bug 602682
-IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi ipv6
-json ldap libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs
-+threads 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 !threads )
-	odbc? ( dlz )
-	ldap? ( dlz )
-	gost? ( !libressl ssl )
-	threads? ( caps )
-	dnstap? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-# sdb-ldap? ( dlz )
-
-DEPEND="
-	ssl? (
-		!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 )
-	gost? (
-		|| (
-			=dev-libs/openssl-1.0*[-bindist]
-			(
-				>=dev-libs/openssl-1.1
-				dev-libs/gost-engine
-			)
-		)
-	)
-	seccomp? ( sys-libs/libseccomp )
-	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 sys-process/fuser-bsd )"
-
-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
-
-	# 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
-	rm -rf libtool.m4/
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir=/etc/bind
-		--localstatedir=/var
-		--with-libtool
-		--enable-full-report
-		--without-readline
-		$(use_enable caps linux-caps)
-		$(use_enable dnsrps)
-		$(use_enable dnstap)
-		$(use_enable fixed-rrset)
-		$(use_enable ipv6)
-		$(use_enable rpz rpz-nsdname)
-		$(use_enable rpz rpz-nsip)
-		$(use_enable seccomp)
-		# $(use_enable static-libs static)
-		$(use_enable threads)
-		$(use_with berkdb dlz-bdb)
-		$(use_with dlz dlopen)
-		$(use_with dlz dlz-filesystem)
-		$(use_with dlz dlz-stub)
-		$(use_with gost)
-		$(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 ssl ecdsa)
-		$(use_with ssl openssl "${EPREFIX}"/usr)
-		$(use_with xml libxml2)
-		$(use_with zlib)
-	)
-
-	if use urandom; then
-		myeconfargs+=( --with-randomdev=/dev/urandom )
-	else
-		myeconfargs+=( --with-randomdev=/dev/random )
-	fi
-
-	use geoip && myeconfargs+=( --with-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() {
-	emake DESTDIR="${D}" install
-
-	dodoc CHANGES README
-
-	if use doc; then
-		dodoc doc/arm/Bv9ARM.pdf
-
-		docinto misc
-		dodoc 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*
-	rm -f "${ED%/}"/usr/share/man/man8/nsupdate.8*
-	rm -f "${ED%/}"/usr/bin/{dig,host,nslookup,nsupdate}
-	rm -f "${ED%/}"/usr/sbin/{dig,host,nslookup,nsupdate}
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
-		rm -f "${ED%/}"/usr/{,s}bin/dnssec-"${tool}"
-		rm -f "${ED%/}"/usr/share/man/man8/dnssec-"${tool}".8*
-	done
-
-	# bug 405251, library archives aren't properly handled by --enable/disable-static
-	if ! use static-libs; then
-		find "${ED}" -type f -name '*.a' -delete || die
-	fi
-
-	# bug 405251
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use python; then
-		install_python_tools() {
-			dosbin bin/python/dnssec-{checkds,coverage}
-		}
-		python_foreach_impl install_python_tools
-
-		python_replicate_script "${ED%/}/usr/sbin/dnssec-checkds"
-		python_replicate_script "${ED%/}/usr/sbin/dnssec-coverage"
-	fi
-
-	# bug 450406
-	dosym named.cache /var/bind/root.cache
-
-	dosym /var/bind/pri /etc/bind/pri
-	dosym /var/bind/sec /etc/bind/sec
-	dosym /var/bind/dyn /etc/bind/dyn
-	keepdir /var/bind/{pri,sec,dyn}
-
-	dodir /var/log/named
-
-	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
-	systemd_newunit "${FILESDIR}/named.service-r1" named.service
-	systemd_dotmpfilesd "${FILESDIR}"/named.conf
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if use urandom; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
-			echo
-		fi
-		chown root:named /etc/bind/rndc.key || die
-		chmod 0640 /etc/bind/rndc.key || die
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	use mysql || use postgres || use ldap && {
-		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
-		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
-		einfo
-	}
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	mkdir -m 0750 -p ${CHROOT} || die
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
-	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
-	# 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.12.3_p4.ebuild b/net-dns/bind/bind-9.12.3_p4.ebuild
index a52e3e1d8a37..61bd0cdbc4c3 100644
--- a/net-dns/bind/bind-9.12.3_p4.ebuild
+++ b/net-dns/bind/bind-9.12.3_p4.ebuild
@@ -12,7 +12,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
 
@@ -36,7 +36,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~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 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"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi ipv6
 json ldap libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs
diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml
index 9db4d9571264..258ec322368e 100644
--- a/net-dns/bind/metadata.xml
+++ b/net-dns/bind/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="gost">Enables gost OpenSSL engine support</flag>
 		<flag name="gssapi">Enable gssapi support</flag>
 		<flag name="json">Enable JSON statistics channel</flag>
-		<flag name="libidn2">Enables IDN support using <pkg>net-dns/libidn2</pkg> rather than using <pkg>net-dns/idnkit</pkg></flag>
 		<flag name="lmdb">Enable LMDB support to store configuration for 'addzone' zones</flag>
 		<flag name="rpz">Enable response policy rewriting (rpz)</flag>
 		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index d10f8c39fff9..e0b607f51b33 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -1,16 +1,7 @@
-AUX cmd-over-cfg.patch 488 BLAKE2B d1ba92dd5c7bbff11ea431449c61b49d0bbbdc87b3ffe818a90c573a8a4f3ba12d150b8aba5789f6510bda74b0a9b19cca7583341db599d07aec787b4d149728 SHA512 a22ed7202b29e74ca8d4ffc597c5922cbe39da097c00876ac3e66c8f09eacd836ebb276e75753103f84699888f8e0a57abbfe839579eab0ddd48a2fa119fc70d
 AUX ddclient-3.9.0-use_iproute2.patch 1388 BLAKE2B da84054c603cccdaa45d4be9b11b90d04f273c78adec19d139ce4ed0b52ae4f9b76b958471f83b6d51fa13e73a7d2fa0df498f61843f49c89f8c4600c8a44ca8 SHA512 174a82996966cf42d0f6811757aceba3d2ea33e50ef842d952e3797bd7bb1194c7d2e23acf4a5aae88ecdde9bb677de8cd7fc2df666177ed0a12153e633aab42
-AUX ddclient.confd-r1 98 BLAKE2B e92bca71a65504290fc928c2f477f58f1d830de5f8a1181e715c9804d74d4f8b1e57b9cd22f12965f232527a8e7d65fbbf654f786c23cbe3859d78f20e843c74 SHA512 a74a3b0863fc20d740de07bfc37bee0aff6d7316ee72152241929e0a058ec34a5d76bc4429eedd69b03047f081cc0601543988b066ee246d671945a01fa0876d
-AUX ddclient.initd-r3 1312 BLAKE2B fb00fcd594117af5d147d507f66516db42ac8d09f2dcedb62b312b87129f23eeecb39af244283c0bb3d201651ae5bac70e23fd3605ab8027a86737aa10c7dda8 SHA512 388725815c3fea9df57b6cd73ab9a549967aba2add3be9fe5153f57e20635c037985c28b1f1ebcb8a122737cdc6277f0711029375f7d62e03491457959ae8dd1
-AUX ddclient.initd-r5 577 BLAKE2B 5cf4b239e15bed86f98b65891c471a52179d3c7435a0a371e3568eaea0911625fa58faf466dae49e3abf6858a5d2bdb6e682fbaae78dc80e34092c95664292f7 SHA512 3b26160d1e651f418324b3544f8ae01781db32de8040d88fb48710f776f475332c3fdf36906331039c20cd47f5400c3ea47adf8dd7fbc7d6ea78cccb47a43c4e
 AUX ddclient.initd-r6 584 BLAKE2B 6f1c9ddf862e50013208adbbd77f471ed03faf59381ed30fc7aa80dea7ec83c5c3122ee3a8b38f7192d4e940658a28afba2c1130f629f360e3d82d72d0336227 SHA512 636fb2ae3def5f3127c6fbecacdb16250dc843775a831877ab2e7dfc9695d48303d3a3e3f35c5d092c557df2f83493b4db78cc74ca0379b92054d9eec6291516
-AUX ddclient.service 234 BLAKE2B c9f9c224742f9047e12677b6e3ece8206a26b72953bc6b1695db39e397c8b1fbbd08b8fa2acdd739391a4fae379570488db9b2d4c274950e5881b50028f07fc2 SHA512 e3c36148804ca7ea29f2d030128941a5d5a7edc6ce3a223b8e72ea8800d622169d3825d2ede6e69630e9ca57e8c62b6f3af97269e9d671e6f2d2973b4a43602f
 AUX ddclient.service-r1 235 BLAKE2B 204793b269c65d7ed77f89c1d5f191298a7b03f44dc22526331fe28585ad1abc2c19fb3f2c65df1dd32bd20f3f121bf2f7d936ed42831067fc232024383c768a SHA512 1bcceae10d8076cb3fa5cb0215c0eaf17588e943d802c40cf5334f125a3697b103646bc393ba4db90845ad8e6ff1d4301b86afba5609ecb3bff98a5623f09195
 AUX ddclient.tmpfiles 149 BLAKE2B 0ad955937dd6cf714530429ffb423e0acc7033bdf7e2486a99d50d055edb85adff869209631cdfd8c2aa49263c31817868b765e7af27e222ad9f0b19bf439d74 SHA512 13c6e541ff23575d799eee943b8e10e277e5073732cd7c9705c23ee557bd99978435c0fe8b546fa3122a60cfb0499e27853e1968f0c1e0225890b68ae678e0c7
-AUX iproute2.patch 1394 BLAKE2B c0f9bc4d3086bc70fbc033a3e2c55479fbb29ae0c051ed1c336ab79c8d9d03388c6ec4f6906b78edf1476bc0a58a994f363d1a01424a9ceff2176707e173ceac SHA512 d802421204cf398b9a0ff679b00b1a9796f4c442e3128b5965169c6153bca9beac580b94bd20ffd5235157b4ad482fdc926d9ac8a56686598aa7a25ecd0f43e0
-DIST ddclient-3.8.1.tar.gz 48600 BLAKE2B a945adcb42bd298422c71c0eea6bea36c6b266ce39e97ebfd833b29819a2f30f2651d7f7b17dbfc0720b6209d0c0ed94bf2673624777f07e6de83a7081471995 SHA512 d6722582dffe0c5a806176f24bd3d9117bc1210ea0137aa92138390be16e67d47b746777dc431282a664849c91626969a5e267777126bac03304c7aa34a9dad7
 DIST ddclient-3.9.0.tar.gz 59018 BLAKE2B b9b58108d9f124fcd5a72cc57bfb0e6a5bc2e115edc27a1d5950a929670d67d5c703b09f51e7e82e977ccfb544d115da177b0ac8dc06a76a800aa207cde5a42d SHA512 ae314c96a37dd90256d6acf62f4a4523b72f540194131e351a032239b00b4520351f6549d3b20a9209fe49ccc6de7ce158ffa8635d341066ea71b789dc667438
-EBUILD ddclient-3.8.1-r5.ebuild 1416 BLAKE2B ea2a67f9e888bbeea5208309ee71c87d35c98fd36a94bcd445224c40915226a81ba70d253bac29f55c0b87649ba15122115c854b40b06d67ff85bd85c6ab7b78 SHA512 a9215c25bd9c90042267eb9c1f0c2258d86c814ac3d343c8c795ecf8eb7eda6cc3ce7fbf1823f917b60724232d118d5904cb55afa1549f875466fcefb7dfb2bb
-EBUILD ddclient-3.9.0-r1.ebuild 1541 BLAKE2B e472823e882bb67a096a9141ee6aba6e9d5c0a9e0fd8251999e1cc38e85b8188727204ce34bc9a343d8d89ccf81bba17b00175e3a1d0927e5100070c126ce536 SHA512 ba9e754205ef661318318ff7b0eb41af85db44009a193e74d876d7c406c773b4bda547327b946791c5e94cfc71db43cef9f487d1f306312d0117ac2f10421e24
-EBUILD ddclient-3.9.0-r2.ebuild 1538 BLAKE2B 7ea81058385b3fffda6c775b5f6e4824c57f2fc2074dfc07da617835b51166203a92c7a7dfd2a587e56cc5bb2061ac68514f812c90acc76954128475e1d1ea2a SHA512 a28e8f3b613f0522b488e8b91afc748c51ad1680e16bd2edba384be40a90332ee831e82e91dbc680095461148674b76efcfd2335116a6d7eacdb81466495ea79
-MISC metadata.xml 1204 BLAKE2B ac62d1bf7734e1374f7dc93c6ee580695326c8a849e632f0249d282040436e78a09853a8dd1b455c53ef6e4e4411041c72ce95e30c85969d9bcf15b54b3ff2bb SHA512 ac78082e28503857341d5ef0ec7a6c2d29b9d47c502c303878501c3bbc929627add8e6646afb692f786c44d09916f4cdcc1a8e2e6c6b5fd1fe8389a39a950aaa
+EBUILD ddclient-3.9.0-r2.ebuild 1537 BLAKE2B 6e40af4f5e760b906adb1d1068c07c3cce7817a4d704088e34f7e8e075307b3b018e3dc6776eeb69ed352425b240b31ca9ac150d97236622828dbf4cbeebf656 SHA512 f86d17fd03aa297e0d3e823c2fc6a893502bde1bfa8e47d02b3b59511d2d0e2b7e82b9d6dffcf5ef0de81d4a40e2e9f9c47aba96029d03ccb577d067b297a559
+MISC metadata.xml 1118 BLAKE2B 9c52e1e2a862458405eb841a5ee3a16da8995de56e7bfabbc91d109050c6ed128bade2b9b4a9fe383ae8c123bac8e8a717f837dd2fbe4979c0662f6dfe53d81d SHA512 759c289b0a7b3b6e35fc0848cdfe340e3afc806fe8164e30a7550ef713ef5a74ccfc0a170b9569b10cf4cba55d1a7f9f654ebdba95e2dcccf4f52299c3a901ce
diff --git a/net-dns/ddclient/ddclient-3.8.1-r5.ebuild b/net-dns/ddclient/ddclient-3.8.1-r5.ebuild
deleted file mode 100644
index f4c2cb5db010..000000000000
--- a/net-dns/ddclient/ddclient-3.8.1-r5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils systemd user
-
-DESCRIPTION="Perl updater client for dynamic DNS services"
-HOMEPAGE="http://ddclient.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="hardened"
-
-RDEPEND=">=dev-lang/perl-5.1
-		 dev-perl/Digest-SHA1
-		 dev-perl/IO-Socket-SSL
-		 hardened? ( sys-apps/iproute2 )
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	# Remove pid line, because it is specified in /etc/init.d/ddclient
-	ebegin "Removing PID setup from ${PN}.conf"
-	if ! sed '/^pid/d' -i "sample-etc_${PN}.conf"; then
-		eerror "Failed to remove pid from /etc/${PN}/${PN}.conf"
-	fi
-	eend $?
-
-	use hardened && epatch "${FILESDIR}/iproute2.patch"
-
-	epatch "${FILESDIR}/cmd-over-cfg.patch"
-}
-
-src_install() {
-	dosbin ${PN}
-	dodoc Change* COPYRIGHT README* RELEASENOTE sample*
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	keepdir /var/cache/${PN}
-	fowners -R ${PN}:${PN} /var/cache/${PN}
-
-	insinto /etc/${PN}
-	insopts -m 0600 -o ${PN} -g ${PN}
-	newins sample-etc_${PN}.conf ${PN}.conf
-	newins sample-etc_${PN}.conf ${PN}.conf.sample
-	fowners -R ${PN}:${PN} /etc/${PN}
-}
diff --git a/net-dns/ddclient/ddclient-3.9.0-r1.ebuild b/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
deleted file mode 100644
index 5176c0ebc346..000000000000
--- a/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit systemd user
-
-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"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="examples iproute2"
-
-RDEPEND="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 )"
-
-pkg_setup() {
-	enewgroup ddclient
-	enewuser ddclient -1 -1 -1 ddclient
-}
-
-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-r5 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/ddclient/ddclient-3.9.0-r2.ebuild b/net-dns/ddclient/ddclient-3.9.0-r2.ebuild
index 6388e4520ea5..4d7d99d3c2e9 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 ~x86-fbsd"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="examples iproute2"
diff --git a/net-dns/ddclient/files/cmd-over-cfg.patch b/net-dns/ddclient/files/cmd-over-cfg.patch
deleted file mode 100644
index 9033873fde74..000000000000
--- a/net-dns/ddclient/files/cmd-over-cfg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ddclient.old	2011-11-13 10:14:59.957846596 -0500
-+++ ddclient	2011-11-13 10:18:33.864245944 -0500
-@@ -773,7 +773,7 @@
- 		foreach my $h (sort keys %config) {
- 			next if $config{$h}{'protocol'} ne lc($s);
- 			$examined{$h} = 1;
--			my $use = $config{$h}{'use'} || opt('use');
-+			my $use = opt('use') || $config{$h}{'use'};
- 			local $opt{$use} = $config{$h}{$use} if $config{$h}{$use};
- 			# bug #13: we should only do this once
- 			# use isn't enough, we have to save the origin to.
diff --git a/net-dns/ddclient/files/ddclient.confd-r1 b/net-dns/ddclient/files/ddclient.confd-r1
deleted file mode 100644
index 69ad0eeff87d..000000000000
--- a/net-dns/ddclient/files/ddclient.confd-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-# No need to specify a pid in /etc/ddclient/ddclient.conf
-#PIDFILE=/var/run/ddclient/ddclient.pid
diff --git a/net-dns/ddclient/files/ddclient.initd-r3 b/net-dns/ddclient/files/ddclient.initd-r3
deleted file mode 100644
index e0606a60b11c..000000000000
--- a/net-dns/ddclient/files/ddclient.initd-r3
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ -d /run ] ; then
-	PIDFILE=${PIDFILE:-/run/ddclient/ddclient.pid}
-else
-	PIDFILE=${PIDFILE:-/var/run/ddclient/ddclient.pid}
-fi
-
-depend() {
-	before cron
-	need net
-	use dns logger squid
-}
-
-checkconfig() {
-	local conf="/etc/ddclient/ddclient.conf"
-
-	if [ -e "${conf}" ] ; then
-		if [ -n "$(find /etc/ddclient -maxdepth 1 -name ddclient.conf -perm +0044)" ] ; then
-			eerror "${conf} must not be world or group readable. Try:"
-			eerror "    chmod 600 ${conf}"
-			eerror "    chown ddclient:ddclient ${conf}"
-			return 1
-		fi
-	else
-		eerror "${conf} is needed to run ddclient"
-		eerror "There is a sample file in /etc/ddclient/"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	local piddir=$(dirname ${PIDFILE})
-	if [ ! -d ${piddir} ] ; then
-		ebegin "Making ${piddir}"
-		mkdir -p ${piddir}
-		eend $?
-		ebegin "Changing permissions of ${piddir}"
-		chown ddclient:ddclient ${piddir}
-		eend $?
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --user ddclient --exec /usr/sbin/ddclient \
-		--name ddclient --pidfile ${PIDFILE} -- -pid=${PIDFILE}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --signal USR1 --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-dns/ddclient/files/ddclient.initd-r5 b/net-dns/ddclient/files/ddclient.initd-r5
deleted file mode 100644
index a2284a27c1ff..000000000000
--- a/net-dns/ddclient/files/ddclient.initd-r5
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-name="DDclient"
-pidfile="/run/ddclient/${RC_SVCNAME}.pid"
-
-command="/usr/bin/ddclient"
-command_args="-pid ${pidfile}"
-command_group="ddclient"
-command_user="ddclient"
-
-depend() {
-	use dns logger
-}
-
-start_pre() {
-	checkpath -f -m 0600 -o ${command_user}:${command_group} /etc/ddclient/ddclient.conf
-	checkpath -d -m 0700 -o ${command_user}:${command_group} /run/ddclient
-	checkpath -d -m 0700 -o ${command_user}:${command_group} /var/cache/ddclient
-}
diff --git a/net-dns/ddclient/files/ddclient.service b/net-dns/ddclient/files/ddclient.service
deleted file mode 100644
index e2d3608d44d4..000000000000
--- a/net-dns/ddclient/files/ddclient.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Dynamic DNS Update Client
-After=network.target
-ConditionPathExists=/etc/ddclient/ddclient.conf
-
-[Service]
-ExecStart=/usr/sbin/ddclient --foreground
-User=ddclient
-Group=ddclient
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-dns/ddclient/files/iproute2.patch b/net-dns/ddclient/files/iproute2.patch
deleted file mode 100644
index f81dd8c00d82..000000000000
--- a/net-dns/ddclient/files/iproute2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u a/ddclient b/ddclient
---- a/ddclient	2011-07-11 17:04:21.000000000 -0400
-+++ b/ddclient	2011-08-12 20:13:15.980466303 -0400
-@@ -588,7 +588,7 @@
-     [ "ip",          "=s", "-ip address           : set the IP address to 'address'" ],
-     "",			     
-     [ "if",          "=s", "-if interface         : obtain IP address from 'interface'" ],
--    [ "if-skip",     "=s", "-if-skip pattern      : skip any IP addresses before 'pattern' in the output of ifconfig {if}" ],
-+    [ "if-skip",     "=s", "-if-skip pattern      : skip any IP addresses before 'pattern' in the output of ip addr show {if}" ],
-     "",
-     [ "web",         "=s", "-web provider|url     : obtain IP address from provider's IP checking page" ],
-     [ "web-skip",    "=s", "-web-skip pattern     : skip any IP addresses before 'pattern' on the web provider|url" ],
-@@ -1316,7 +1316,7 @@
- 
-     {
- 	local $opt{'use'} = 'if';
--	foreach my $if (grep {/^[a-zA-Z]/} `ifconfig -a`) {
-+	foreach my $if (grep {/^[a-zA-Z]/} `ip addr show`) {
- 	    $if =~ s/:?\s.*//is;
- 	    local $opt{'if'} = $if;
- 	    printf "use=if, if=%s address is %s\n", opt('if'), define(get_ip('if'), 'NOT FOUND');
-@@ -1937,7 +1937,7 @@
- 
-     } elsif ($use eq 'if') {
- 	$skip  = opt('if-skip', $h)  || '';
--	$reply = `ifconfig $arg 2> /dev/null`;
-+	$reply = `ip addr show $arg 2> /dev/null`;
- 	$reply = '' if $?;
- 
-     } elsif ($use eq 'cmd') {
diff --git a/net-dns/ddclient/metadata.xml b/net-dns/ddclient/metadata.xml
index 2d82a2acf9c1..a65cccd3f082 100644
--- a/net-dns/ddclient/metadata.xml
+++ b/net-dns/ddclient/metadata.xml
@@ -21,7 +21,6 @@
 	</longdescription>
 	<use>
 		<flag name="examples">Install various example files, like for cron.</flag>
-		<flag name="hardened">Use iproute2 instead of ifconfig to grab an IP address</flag>
 		<flag name="iproute2">Use <pkg>sys-apps/iproute2</pkg> instead of <pkg>sys-apps/net-tools</pkg> for interaction.</flag>
 	</use>
 	<upstream>
diff --git a/net-dns/dnssec-validator/Manifest b/net-dns/dnssec-validator/Manifest
index bd7f46e0e490..d7a0630f9c40 100644
--- a/net-dns/dnssec-validator/Manifest
+++ b/net-dns/dnssec-validator/Manifest
@@ -1,5 +1,8 @@
 AUX dnssec-validator-2.1-respect-LDFLAGS.patch 529 BLAKE2B b4e3199c1263973e93b744077025b11a1ab9d525d28129744b5c3dc5b9e4e4fc5461dbe4a2d7c36e8dee6f3b743cf73ae328cc5b044f8c1887d6601b33fe8ac1 SHA512 c6ff47eee87ff5b1add81b80136f58369c3b782d2ebae7328152374e7e6ed565bd116a75d69f5fb8ec8273800c4ebd47707aa4560e7bff8007651e13a8590eb6
 AUX dnssec-validator-2.2-glib-2.25.patch 5308 BLAKE2B 169c0163926388243d22f3ee5e73a30966525975c9dea800170dc82f61113902cb2d5d5e61bd4edab28ab41b9f0fd1cb2978f1433a1e75cc710cc481786bbc62 SHA512 17aa048f52c7fafc0074c83a725a6b487e88c4a55e3f3f082fa876b2d7ad95cbc3506401991de64546dd97f1ab75421dc3079a0b2d9dd02a26f90658830bf6af
+AUX dnssec-validator-2.2.3-ldflags.patch 955 BLAKE2B b6cf8f7e812d4ed14dfafde00afabdd30f2fb54ae604613d0f43520eb683e5f19113477421d9aba86ecc7f89a2706f12c713c19a3690bd93bb7c284123b08a71 SHA512 dfa88f661318b0f3406ce984455b3890ddc891ec2e4ac20ce5eb46d47b22014b001f447fbf69ac1a5d2a3239dfe4d6a330040d768ef4b1ad3ee4923ca06f95d0
+DIST dnssec-tools-2.2.3.tar.gz 42941393 BLAKE2B b7b6a54113fb5cf030bd60e18f5446b02d1ceba3564ac854b0305225672545e802fecfa1169dc81e68ffe195533e06082dc22500a51b48965aa9c0fc32c915ed SHA512 fd2467f116f77089bddf9311706f356957f4ae735d827d393534e4001b621c9dfc904ff3d4da698d37e8e97b1be9448ab2fd5455c124656399aac30f1f642baf
 DIST dnsval-2.2.tar.gz 1060434 BLAKE2B 3a19d5f4128e32f81ae824a128c65b5c5b6f21cef2786d1050631db10084a479614241d869bb33d054d96e7a1e286c472296edf8c4c7e45abd84aaa4df599f28 SHA512 1a01911b08e447d992f4843db8e10bc91041f9e3eaa8a3c050f71f0d7028292145379d1b769e69a837a157443abfa8b0b8ecc289c1b2fa4d33a9234282e9ae05
 EBUILD dnssec-validator-2.2-r1.ebuild 1097 BLAKE2B 98c4b321fac53ce8241c5d8d1cca0e52d4518d6ad93921e2d1bde07fadacafa13700cbbd595001a9e3e770c07ac34e7733845413324018817e6ed338a4a8f827 SHA512 96b4fe7ac902f4da7c53c3e7319d4199ba30730b6d8151d0bddc9659d692b1c5f52d8b5d4a5efd3d0405786905880efa532c6a5df7ee788ef449283c2868f78a
-MISC metadata.xml 239 BLAKE2B f1367162a3bbf8737d7129bcb1ee99aa11ec6997aeb9639a47ee317c9ef8ea255e2e751b17e5f667f9508738c92f042410c0e4a89e49a83541b0c92cd8aff342 SHA512 5b2f99d6bce800e4e2548e35b89acfe6d916ec5e7b61a6106d16fea44751dde528b0dd06b9ccb16c1f3259fc94e7e1af509a444302d887d576752c740bfd8ec5
+EBUILD dnssec-validator-2.2.3.ebuild 1432 BLAKE2B 5220ffae8d4e02399992af28947240a965b771e6a0f51ff17656eec7c4719b4ccdb3d2a7038905aa223c6ad8e508b4466151e8e9d38df85d3239e1406c1b1f2f SHA512 5a0c6285c0faf1c4a1542f3e21878c16cccded2caa482ba4e9e6810a762bbf33fa29c45054f9d4634eee79788df6e647d2def69ab1efb33af4251dd1bdfb5363
+MISC metadata.xml 978 BLAKE2B 88d72546d795b1a35cf55e754a625ade144ed7eda00bad406b0bca768f75282ec224900e7047b65a6ac1462af42d7ff8b195134e8ddd22c844ef719609f29d80 SHA512 2502af154fe0a98d2f76fb9818d654d40407627b331be994b25a843122c4c9cf5872388e5f86756da1c1e28d5fb82764da3a154c6449e9f6b17a157b960f2cac
diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild
new file mode 100644
index 000000000000..04606f66a6fb
--- /dev/null
+++ b/net-dns/dnssec-validator/dnssec-validator-2.2.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Tools to ease the validation of DNSSEC related technologies"
+HOMEPAGE="https://www.dnssec-tools.org/"
+SRC_URI="https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/dnssec-tools-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="dlv +ipv6 +nsec3 static-libs +threads"
+
+RDEPEND=">=dev-libs/openssl-1.1.0:0"
+DEPEND="${RDEPEND}"
+
+# Tests fail due "Cannot create context: -7"
+RESTRICT="test"
+
+S="${WORKDIR}/DNSSEC-Tools-dnssec-tools-${PV}/dnssec-tools/validator"
+
+PATCHES=(
+	# Users LDFLAGS are not respected
+	# See https://github.com/DNSSEC-Tools/DNSSEC-Tools/pull/9
+	"${FILESDIR}/${P}-ldflags.patch"
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with dlv)
+		$(use_with ipv6)
+		$(use_with nsec3)
+		$(use_enable static-libs static)
+		$(use_with threads)
+		--with-dnsval-conf="${EPREFIX%/}/etc/dnssec-tools/dnsval.conf"
+		--with-resolv-conf="${EPREFIX%/}/etc/dnssec-tools/resolv.conf"
+		--with-root-hints="${EPREFIX%/}/etc/dnssec-tools/root.hints"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	# Install fails with MAKEOPTS > -j1
+	# See https://github.com/DNSSEC-Tools/DNSSEC-Tools/issues/8
+	emake -j1 DESTDIR="${D}" install
+
+	einstalldocs
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-dns/dnssec-validator/files/dnssec-validator-2.2.3-ldflags.patch b/net-dns/dnssec-validator/files/dnssec-validator-2.2.3-ldflags.patch
new file mode 100644
index 000000000000..66f8b0b49ee6
--- /dev/null
+++ b/net-dns/dnssec-validator/files/dnssec-validator-2.2.3-ldflags.patch
@@ -0,0 +1,33 @@
+--- a/libsres/Makefile.in	2018-08-30 00:25:30.000000000 +0200
++++ b/libsres/Makefile.in	2018-12-09 02:32:05.000000000 +0100
+@@ -63,7 +63,7 @@
+ 	$(RM) -rf $(LT_DIR)
+ 
+ $(LIBRES): $(LOBJ)
+-	$(LIBTOOLLD) -o $@ $(LOBJ) 
++	$(LIBTOOLLD) -o $@ $(LOBJ) $(LDFLAGS)
+ 
+ install:
+ 	$(MKPATH) $(DESTDIR)$(libdir)
+--- a/libval_shim/Makefile.in	2018-08-30 00:25:30.000000000 +0200
++++ b/libval_shim/Makefile.in	2018-12-09 02:34:56.000000000 +0100
+@@ -21,7 +21,7 @@
+ 	$(RM) -rf $(LT_DIR)
+ 
+ $(LIBVAL_SHIM): $(LOBJ)
+-	$(LIBTOOLLD) -o $@ $(LOBJ) $(EXTRA_LIBS)
++	$(LIBTOOLLD) -o $@ $(LOBJ) $(EXTRA_LIBS) $(LDFLAGS)
+ 
+ install:
+ 	$(MKPATH) $(DESTDIR)$(libdir)
+--- a/libval/Makefile.in	2018-08-30 00:25:30.000000000 +0200
++++ b/libval/Makefile.in	2018-12-09 02:37:32.000000000 +0100
+@@ -65,7 +65,7 @@
+ 	$(RM) -rf $(LT_DIR)
+ 
+ $(LIBVAL): $(LOBJ)
+-	$(LIBTOOLLD) -o $@ $(LOBJ) $(LSRES)
++	$(LIBTOOLLD) -o $@ $(LOBJ) $(LSRES) $(LDFLAGS)
+ 
+ install:
+ 	$(MKPATH) $(DESTDIR)$(libdir)
diff --git a/net-dns/dnssec-validator/metadata.xml b/net-dns/dnssec-validator/metadata.xml
index 7206094d0b09..94a38b12e8db 100644
--- a/net-dns/dnssec-validator/metadata.xml
+++ b/net-dns/dnssec-validator/metadata.xml
@@ -1,8 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="ecdsa-check">Requires openssl[-bindist]</flag>
-</use>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		A tool which can display the sequence of queries and their results
+		used to validate a DNS query. The stderr output of this command can
+		serve as input to the drawvalmap tool.
+	</longdescription>
+	<use>
+		<flag name="dlv">Enable support for the DNSSEC look-aside validation</flag>
+		<flag name="ecdsa-check">Requires openssl[-bindist]</flag>
+		<flag name="nsec3">Enable support for the NSEC3 Resource Record</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://github.com/dnssec-tools/dnssec-tools/issues</bugs-to>
+		<remote-id type="github">DNSSEC-Tools/DNSSEC-Tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-dns/dnsviz/Manifest b/net-dns/dnsviz/Manifest
index 5517f0e76094..b57c8bb1444b 100644
--- a/net-dns/dnsviz/Manifest
+++ b/net-dns/dnsviz/Manifest
@@ -1,3 +1,3 @@
 DIST dnsviz-0.8.2.tar.gz 404265 BLAKE2B c4ba6b5a7d6fee7c8e2cba0c90f29560152dd4beed1ef4d80a6a3bf9f81646ee8f0d61c38329233e300f2b434cb5d9e9d2a926dc72997ae68ff0a57e147bafcf SHA512 5414d9bda6c0bf5fdc5a84a09cb5833619110702749b12f87d63f5149de473f4bd1b6960c506c60ec5fc5ff82d789536cee70a299ff13c960a45776de2916c80
-EBUILD dnsviz-0.8.2.ebuild 1417 BLAKE2B 0e9764ab9abba92318845c845eb51c82436ba1eae1e0dae0d38d92521943cd9c3192878de501732ece2f83782d43c738246b0727f6226e83b98ff8d515dd0a3d SHA512 5db40f04a1481e8528ee246c9e5b12105de6e4ffb07935c6002cfa384e2b8034565097b4dbf644bafdfb0c694040fc938c4e4adbe589822d32e547b7deb2c91d
+EBUILD dnsviz-0.8.2.ebuild 1413 BLAKE2B 827c59fe8cdc73a1788e30f13a1a3ad9c3eea52b2694823b13935471fe8a9d5c65ebb8590128fc50940c57d769090638a414af28f29665673b75f9750af4fe3f SHA512 2f80c1cf61a3d6c3006c6f07c62889e5f9d7e4d8caab13ddf1eced90e416171f55aab02a45a7808aacaab55d0d8e4f31dc31c823e322df76fdb3c8c41f83ade9
 MISC metadata.xml 687 BLAKE2B d648e9100b7cd371d7235c0f370d10f8cce3f7eef83afabe1e6d6df1619ea2ff1eb08ded3c724df22ee7d406c2f7c65b158ae67a4472084b832d0d806fc21cb9 SHA512 bcd03b712bf637a1019c3d22d9e336d514ffd9ba7ae3f05685371897af8893177a709ec8546c186a1b54de89794931f985aa72570c0eaa1d7a88d6579478dbb3
diff --git a/net-dns/dnsviz/dnsviz-0.8.2.ebuild b/net-dns/dnsviz/dnsviz-0.8.2.ebuild
index 74b6aa78b4b8..c92d2874f579 100644
--- a/net-dns/dnsviz/dnsviz-0.8.2.ebuild
+++ b/net-dns/dnsviz/dnsviz-0.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC"
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index c940cde5397f..47dc6a2c09d3 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,12 +1,12 @@
 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.6.9.tar.xz 1126872 BLAKE2B c15b7e61ccad5417ce53f3d3895014931a2825835958735bdd9459634d9d9f39d6bb3681036772e6a510570a7f6a8afc8b0de5e77e67778831dc6415378889fe SHA512 80fcbef17c3e6685c09eb57e59001a5f298a083c18ce077dc2f2d1fadbe7c36e543c205c0820bc7971a8ed7547897aec408f51e1a9555a50dae82d047fac471b
-DIST knot-2.7.2.tar.xz 1148880 BLAKE2B bf3042d762d2b66f47dbd27a1c9ecd03d111259c7db82254c1175e660497fd8343c3f1cf1cc14e6068cb3d3618931b659888a7b97d7d6e4ba9d0e74c00540e31 SHA512 e09f8a38e975ff4f90db59db9ae8a6baaca9b0cbc9c2ecd37225febfe718b7c2038ae45481ed830dc66f2b70d8312266e2dc7cb54a0aa0fdc02c87ca42bac96d
-DIST knot-2.7.3.tar.xz 1146456 BLAKE2B d584db01b2354c259cf5e5cdfeb2dff677b04e76b68156a2c672fffe95ee8c6516f82b8e199d8ec8cacfcd93f15b370a25172826460b82c5964f38207c9818f2 SHA512 ba735eb06d99f8cb41619f44413f6450178ab249ef9ff282bae36e8e965cb421f082852bbf0ae5814e3e3148f27431fc1f2b4ed30e21bfd0cbea1be189bdadfd
-DIST knot-2.7.4.tar.xz 1148652 BLAKE2B 081a23a0429b4fec1feebbe417bc95fe24d11404a2a6b9e4e71d89f99bc9cf2a5ed2bdc3a0fd2727cc4d45629b71faefda179e68c4781f8b21c475a7b1fe8bdd SHA512 e5f60a23817503468b18eaea517c5936945b901f568c56cb1ca67a208cc6206ff103e9ca03f1bf05018d13a688f54580ae816a5d70510f28a98ae31116a3f674
-EBUILD knot-2.6.9.ebuild 1862 BLAKE2B 223fc993fa63c312c51b6974b0dcba3ce00c8d9206b60f563a289bc3e584eee118aa11d12a44c7bf4e1c3b06e88a13015ee3dda6ed08fe7e07ef47362cacbb8e SHA512 663f320d82ba76a7a665ad8f54b959bcb589edb43ccd07f682941f2940c4b7d392e91790454e4e25d7c199360980157f8e1e795386b597158ab45972030a51b8
-EBUILD knot-2.7.2.ebuild 1907 BLAKE2B 672aac16fe71caa8ecc6b4567cac0240d34670516de51fe0fd8a7ffc319acc8ed7962c6d0db7c28d773cfd0e19e9c4d001ec541ec32468ccd73921ebc125e574 SHA512 0d187cde9dd27b81538e2d5652dd15931472fbc1249369cebc5df20008b2a734d75611af9d398b2ac9636a11c8bd2d1d97893ed80f8cf4792ccd6b68c7dc2ebf
-EBUILD knot-2.7.3.ebuild 1920 BLAKE2B 984190266bb6783ecb922b6673388ae694f303d4e46d2a232251b9edc73e84059cecb808dea861b000af05ec4afedf4a1a0cc8deff934190f2e5c0b73d1a81b2 SHA512 1423c1bd19a24dc927e237ab145dd736aa6ddee1653c02ee9ff59b88c7b9f58a0bf8153c2da93aa4ce82b260e4d89141c84b9f16676d28bfff0d271e1c5e94bc
-EBUILD knot-2.7.4.ebuild 1923 BLAKE2B 188b6e9f09fdfe7a2c2d8e608e67833ca97a7b355987ae28668b21dda27ae3e4aec16466c897cdf7b67be6aa20e3db27b6ce2db2a37a76ef3cca02733baa3abf SHA512 31c5bd0cca511d35d661de2593c4d467d32d6dbde95f58a9e5f0a40d4bd923932bd141aeb5deaea1daa8d742ea9be21dafdcdae9ac9ba7335f5f565853a6305b
-MISC metadata.xml 1776 BLAKE2B 704ee480034e47aa62a552ae559671728d96df078dca931c9acc1ab58bcd502188c21820cc8300f536e793515765ed32f6e9cc8f48d9b01b91a959df98a9aa92 SHA512 57ec897a014478f4f5693cd242ecf76215dcf2c331e951bc2a5c0f7b492a76a49cb86d54885325fff2777470119da2f8ea140afece4b70ae410ffe50a4a4679a
+DIST knot-2.7.6.tar.xz 1151068 BLAKE2B aba7b9f89d98ddabe5596198b0767b6d88cab2278eda33bea2738bcc2f62bc3b7463ee517488f8d2efa40b11859b3aefaa212999968654e5e5580969a173ec8e SHA512 6b6a727d57337da01e2d44abec7fde4504d112604769b118fe6254b0317f149ed4e9fab321a04517eccedb08e409818d1817fc1136c27d1fd351538e6816022a
+DIST knot-2.7.7.tar.xz 1156996 BLAKE2B aa31233cf9af9f8060a40788529593d35912992472d5b9d892e632ba4cbf08a0f0adec6ed00d1152bf6cd443e3a659fa88050355e65a71cc2a3aac3c453bdc44 SHA512 95c341ce7c8cc2e65429d6e3bf009844fbd82ca5a0e36019f0e019ce35fc3ba8b68c159d34637380f6a3ad3dc2291ed5adc37e91515b2b6ecf61f7078ddad841
+DIST knot-2.8.0.tar.xz 1168900 BLAKE2B e6d54709ce0bbc5411918de337fd2eb1cb939bbaf1b0dec149b169c2a93c6c0f4719028e35ff9a07d940d5e30470a4661e847a83c73ba0baaf89a520d8ee4fc3 SHA512 0cf2840d908bbab3197bff82d37e4a754204a3b79efa7e982719bc19028519d3ff0b2177780dada54e1b070f5f7aa28dab7bbfcc2d2ea086817f3a29b746228e
+DIST knot-2.8.1.tar.xz 1169260 BLAKE2B 0a02394d5dfdce98d5f909f04a8902778f152d366d76f449ee57dfe99ad6168d7848454fbf21e01ce47dde1721af5293445f450f45949c21c3715f3f32fd5af9 SHA512 b1f97171efae85b5d6f845e57d933170e8f81b30e8b5a1a6157bb0f6bf5e1e545e7b3d2d51eedf0061166e9842ab01eb6c5e84b1ef9e98e20eda9a806e3e5d4b
+EBUILD knot-2.7.6.ebuild 1962 BLAKE2B 37fd12290d609d8e5874f3e1cece9b600be35b90466b318e33f32c47ea422a6538c9c04cada4218d9fe91ea5b08fc23348c362ba19f8e425694a2fe1998d7c62 SHA512 8557b7aab3e1cbd7ab1bc0f1c0b510f9060c30ac1add36687340d3a6de16961394bbcf710230b70f9b1b890df1301c284993b1014bdde2cb83934d863d055fb7
+EBUILD knot-2.7.7.ebuild 1962 BLAKE2B 37fd12290d609d8e5874f3e1cece9b600be35b90466b318e33f32c47ea422a6538c9c04cada4218d9fe91ea5b08fc23348c362ba19f8e425694a2fe1998d7c62 SHA512 8557b7aab3e1cbd7ab1bc0f1c0b510f9060c30ac1add36687340d3a6de16961394bbcf710230b70f9b1b890df1301c284993b1014bdde2cb83934d863d055fb7
+EBUILD knot-2.8.0.ebuild 1962 BLAKE2B 37fd12290d609d8e5874f3e1cece9b600be35b90466b318e33f32c47ea422a6538c9c04cada4218d9fe91ea5b08fc23348c362ba19f8e425694a2fe1998d7c62 SHA512 8557b7aab3e1cbd7ab1bc0f1c0b510f9060c30ac1add36687340d3a6de16961394bbcf710230b70f9b1b890df1301c284993b1014bdde2cb83934d863d055fb7
+EBUILD knot-2.8.1.ebuild 1962 BLAKE2B 37fd12290d609d8e5874f3e1cece9b600be35b90466b318e33f32c47ea422a6538c9c04cada4218d9fe91ea5b08fc23348c362ba19f8e425694a2fe1998d7c62 SHA512 8557b7aab3e1cbd7ab1bc0f1c0b510f9060c30ac1add36687340d3a6de16961394bbcf710230b70f9b1b890df1301c284993b1014bdde2cb83934d863d055fb7
+MISC metadata.xml 1677 BLAKE2B 89c3190781cf6b6d6217c84dd45f78ebd86695e9c224c7fa7f5112b246b95b982fb025c6c30b065d59b11f3acdcabda8e92b0da001cf1a7ad3e67ee9b2207d3c SHA512 d1e480d3e5d422b94a952a8fd0a679052d24724cccdda0bf13808f1a6b47b129a1db6ad17a0a42d9a6d315e9cbe64293a1a22077b7affc36862313ff8715d9e1
diff --git a/net-dns/knot/knot-2.7.4.ebuild b/net-dns/knot/knot-2.7.6.ebuild
index ce8659e1fd17..5ccc7dcad7c8 100644
--- a/net-dns/knot/knot-2.7.4.ebuild
+++ b/net-dns/knot/knot-2.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,27 +26,28 @@ KNOT_MODULES=(
 	"+synthrecord"
 	"+whoami"
 )
-IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
+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
+	net-libs/gnutls:=
 	caps? ( sys-libs/libcap-ng )
 	dnstap? (
 		dev-libs/fstrm
-		dev-libs/protobuf-c
+		dev-libs/protobuf-c:=
 	)
-	geoip? ( dev-libs/libmaxminddb )
+	geoip? ( dev-libs/libmaxminddb:= )
 	idn? (
-		!libidn2? ( net-dns/libidn:* )
-		libidn2? ( net-dns/libidn2 )
+		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
+		libidn2? ( net-dns/libidn2:= )
 	)
-	systemd? ( sys-apps/systemd )
+	systemd? ( sys-apps/systemd:= )
 "
-BDEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( dev-python/sphinx )
 "
diff --git a/net-dns/knot/knot-2.7.3.ebuild b/net-dns/knot/knot-2.7.7.ebuild
index 1c1b445d8ccc..5ccc7dcad7c8 100644
--- a/net-dns/knot/knot-2.7.3.ebuild
+++ b/net-dns/knot/knot-2.7.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd user
 
@@ -26,27 +26,28 @@ KNOT_MODULES=(
 	"+synthrecord"
 	"+whoami"
 )
-IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
+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
+	net-libs/gnutls:=
 	caps? ( sys-libs/libcap-ng )
 	dnstap? (
 		dev-libs/fstrm
-		dev-libs/protobuf-c
+		dev-libs/protobuf-c:=
 	)
-	geoip? ( dev-libs/libmaxminddb )
+	geoip? ( dev-libs/libmaxminddb:= )
 	idn? (
-		!libidn2? ( net-dns/libidn:* )
-		libidn2? ( net-dns/libidn2 )
+		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
+		libidn2? ( net-dns/libidn2:= )
 	)
-	systemd? ( sys-apps/systemd )
+	systemd? ( sys-apps/systemd:= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( dev-python/sphinx )
 "
@@ -89,7 +90,7 @@ src_test() {
 src_install() {
 	default
 
-	rmdir "${D}var/run/${PN}" "${D}var/run/" || die
+	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
 	keepdir /var/lib/${PN}
 
 	newinitd "${FILESDIR}/knot.init" knot
diff --git a/net-dns/knot/knot-2.7.2.ebuild b/net-dns/knot/knot-2.8.0.ebuild
index 1312f7835d72..5ccc7dcad7c8 100644
--- a/net-dns/knot/knot-2.7.2.ebuild
+++ b/net-dns/knot/knot-2.8.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd user
 
@@ -20,32 +20,34 @@ KNOT_MODULES=(
 	"geoip"
 	"+noudp"
 	"+onlinesign"
+	"+queryacl"
 	"+rrl"
 	"+stats"
 	"+synthrecord"
 	"+whoami"
 )
-IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
+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
+	net-libs/gnutls:=
 	caps? ( sys-libs/libcap-ng )
 	dnstap? (
 		dev-libs/fstrm
-		dev-libs/protobuf-c
+		dev-libs/protobuf-c:=
 	)
-	geoip? ( dev-libs/libmaxminddb )
+	geoip? ( dev-libs/libmaxminddb:= )
 	idn? (
-		!libidn2? ( net-dns/libidn:* )
-		libidn2? ( net-dns/libidn2 )
+		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
+		libidn2? ( net-dns/libidn2:= )
 	)
-	systemd? ( sys-apps/systemd )
+	systemd? ( sys-apps/systemd:= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( dev-python/sphinx )
 "
@@ -88,7 +90,7 @@ src_test() {
 src_install() {
 	default
 
-	rmdir "${D}var/run/${PN}" "${D}var/run/" || die
+	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
 	keepdir /var/lib/${PN}
 
 	newinitd "${FILESDIR}/knot.init" knot
diff --git a/net-dns/knot/knot-2.6.9.ebuild b/net-dns/knot/knot-2.8.1.ebuild
index a99e9462b6a7..5ccc7dcad7c8 100644
--- a/net-dns/knot/knot-2.6.9.ebuild
+++ b/net-dns/knot/knot-2.8.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd user
 
@@ -14,36 +14,40 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 KNOT_MODULES=(
+	"+cookies"
 	"+dnsproxy"
 	"dnstap"
+	"geoip"
 	"+noudp"
 	"+onlinesign"
-	"rosedb"
+	"+queryacl"
 	"+rrl"
 	"+stats"
 	"+synthrecord"
 	"+whoami"
 )
-IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
+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
+	net-libs/gnutls:=
 	caps? ( sys-libs/libcap-ng )
 	dnstap? (
 		dev-libs/fstrm
-		dev-libs/protobuf-c
+		dev-libs/protobuf-c:=
 	)
+	geoip? ( dev-libs/libmaxminddb:= )
 	idn? (
-		!libidn2? ( net-dns/libidn:* )
-		libidn2? ( net-dns/libidn2 )
+		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
+		libidn2? ( net-dns/libidn2:= )
 	)
-	systemd? ( sys-apps/systemd )
+	systemd? ( sys-apps/systemd:= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( dev-python/sphinx )
 "
@@ -86,7 +90,7 @@ src_test() {
 src_install() {
 	default
 
-	rmdir "${D}var/run/${PN}" "${D}var/run/" || die
+	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
 	keepdir /var/lib/${PN}
 
 	newinitd "${FILESDIR}/knot.init" knot
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index d03b90100dde..d14d98d83184 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -42,10 +42,6 @@
 		<flag name="queryacl">
 			Enable the module for query access control
 		</flag>
-		<flag name="rosedb">
-			Enable the module that staticaly override certain
-			responses
-		</flag>
 		<flag name="rrl">
 			Enable the response rate limiting module
 		</flag>
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 7e8e91af9f7c..ec995cd782e0 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,5 +1,9 @@
 DIST libidn2-2.0.4.tar.gz 2008524 BLAKE2B 7163e1eff498031c7433911533b34d993876b55d9b324aaef39c93db2cceee78dec4c8cfbf4d9dabd1dbbb03a8cbd65021f26a94758f57b32ef98dc869f744b6 SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2
+DIST libidn2-2.0.5.tar.gz 2091929 BLAKE2B 1eb52ae7c9295bf4b5d6e36e6852ffb54b10663a0e3cea06df110bd7798fcb0d1b8e3b7169e4a11e800a23fc9f606167dcb7fc2d4a684e861d73a236de5c578c SHA512 9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79
 DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
-EBUILD libidn2-2.0.4.ebuild 1226 BLAKE2B 1c59cb393e3eb99006bfe99f21fb48de733a5cb55bb9729531e4b0f40c30ab90f187f100609aaa5ad6c98499fadf66ad457ddd96a5897703cefe00fc0e03b768 SHA512 7a77cbb77800e71ef7c77befbfb2ce16a7a74cd75f35f674686fa8435acad15b216794e6b3473d7adac6cb6e9554c6b59c37830162c66711d3af4765847ba06a
-EBUILD libidn2-2.1.1a.ebuild 1260 BLAKE2B 406dc49464e75d63eca4ef7cbec83e59d1e908f7d85768ff4523c79a8d805b2e3756d7f6955d3900086c3f08b2c869118bf6a163b51f68426c704c13ff08cb1b SHA512 92316541a7c853a75c3d31756bb8fdc86d77342eb4a6c994e23a86758156c1bd83541b80b374234ff7b73385d333b5a5f82f5052ac179d6c0aca8e90852df6d6
+DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
+EBUILD libidn2-2.0.4.ebuild 1226 BLAKE2B 349e7d0e1eb6bb0705dbd0a583bb29cb6a397f24a34a79bddd232fbb146a8e52ae57a750fe7c50c571f385ef79917d9190cb2e7a4ce3e533fce2f64d6d9d974d SHA512 3d4fc2e41b37d57cee88c9aae5222b491d38dd57cbd146da32f5a2ca6c1f68e8779a11637d12f406b99535212aaa6605d6ccae8e816d0e20881696a0ad0be9e2
+EBUILD libidn2-2.0.5.ebuild 1239 BLAKE2B 0fe9690d0cfefeac0991f3c9a54a1fc1a8905346fb6b97a40b8fbb3e2300e1020065dbbcf3ca99be6e15402997739319986e9477fb8efb55eb4f954d66479663 SHA512 8fb726639f2a0097be3d33f98b14ae79339da02f92e57295927e8ab7bd35c65d6285d63c2337381ca38050c389aad533f6a01c049f16ab867cf3aef22ae08e70
+EBUILD libidn2-2.1.1a.ebuild 1259 BLAKE2B d276d9eb648baa977f4c64476a3a5d28eee0ff90d12525f4fa9f261ddde73ebb77cf024539b5e62050094cbe90368fb5b5565aa1ab22a8ac981040632329110b SHA512 0c7bb475002c67a8531bac602c221be0ef6b95193a3f1d517d651f457ee971d70a2de1f82bcd82c49ab0a7d3d62ae49a91f98c2541ec9a6090a6cfc921a2807e
+EBUILD libidn2-99999.ebuild 1360 BLAKE2B cd6caaf3be83316d81ecd36b165ce74dd9aed4bc63cdb54a704cf2491b6a85245b3297f94905a13a787cc7fc462062267ced38c81b840f7b8431e121ee9f217e SHA512 f484360e40fc6ae6091c10a1894d8e6bdb89a479078ce98189806da8748b88cd1b567c260d61cfd078af40597ea93496cb1c3d7d821c606308203d0b6378ddce
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/net-dns/libidn2/libidn2-2.0.4.ebuild b/net-dns/libidn2/libidn2-2.0.4.ebuild
index 575241a6ca8b..bf10cc63fd6e 100644
--- a/net-dns/libidn2/libidn2-2.0.4.ebuild
+++ b/net-dns/libidn2/libidn2-2.0.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils flag-o-matic multilib-minimal
 
 DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
 SRC_URI="
 	mirror://gnu/libidn/${P}.tar.gz
 "
diff --git a/net-dns/libidn2/libidn2-2.0.5.ebuild b/net-dns/libidn2/libidn2-2.0.5.ebuild
new file mode 100644
index 000000000000..96124bffc61e
--- /dev/null
+++ b/net-dns/libidn2/libidn2-2.0.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
+SRC_URI="
+	mirror://gnu/libidn/${P}.tar.gz
+"
+
+LICENSE="GPL-2+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/libunistring[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	sys-apps/help2man
+"
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
+		# reason in the Makefile)
+		sed -i -e '/^TMPDIR = /d' Makefile.in || die
+		export TMPDIR="${T}"
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-doc \
+		--disable-gtk-doc
+}
+
+multilib_src_install() {
+	default
+
+	prune_libtool_files
+}
diff --git a/net-dns/libidn2/libidn2-2.1.1a.ebuild b/net-dns/libidn2/libidn2-2.1.1a.ebuild
index 0ce156e934bd..7e61ecfbaca3 100644
--- a/net-dns/libidn2/libidn2-2.1.1a.ebuild
+++ b/net-dns/libidn2/libidn2-2.1.1a.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
 SRC_URI="
 	mirror://gnu/libidn/${P}.tar.gz
 "
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 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 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"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-dns/libidn2/libidn2-99999.ebuild b/net-dns/libidn2/libidn2-99999.ebuild
new file mode 100644
index 000000000000..5e05d730b6ad
--- /dev/null
+++ b/net-dns/libidn2/libidn2-99999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3 multilib-minimal
+
+DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
+EGIT_REPO_URI="https://gitlab.com/libidn/libidn2.git/"
+SRC_URI="mirror://gnu/libunistring/libunistring-0.9.10.tar.gz"
+
+LICENSE="GPL-2+ LGPL-3+"
+SLOT="0"
+KEYWORDS=""
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/libunistring[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-util/gengetopt
+	sys-apps/help2man
+"
+S=${WORKDIR}/${P/a/}
+
+src_unpack() {
+	git-r3_src_unpack
+	unpack ${A}
+}
+
+src_prepare() {
+	mv "${WORKDIR}"/libunistring-0.9.10 unistring || die
+
+	einfo "./bootstrap"
+	./bootstrap --gnulib-srcdir=gnulib --no-bootstrap-sync --no-git --skip-po || die
+
+	default
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
+		# reason in the Makefile)
+		sed -i -e '/^TMPDIR = /d' Makefile.in || die
+		export TMPDIR="${T}"
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-doc \
+		--disable-gtk-doc
+}
+
+multilib_src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-dns/pdns-ldap-backend/Manifest b/net-dns/pdns-ldap-backend/Manifest
index f5db9b7558d5..31c56066b6d9 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 850 BLAKE2B a388dc1b89ed41b08c9a73e4b64e0ce3a1ff761b8fce57e3aa160ae3092229f36afb32cbc17dd70c6c50345f24bd69de542ad42cd960571d38986fd04ec70852 SHA512 612b3a0ba43257f1ddd1421df9938991e06e68c6feffc1eeecda9d86b23fb875b6d652db0f8a2ed2fe3be9089d5a5b64d9a3ad93e9a33d9678c6217fda40e516
+EBUILD pdns-ldap-backend-0.2.ebuild 851 BLAKE2B ea5b154382e9fe8758705f5e4797500758de5f3ea7150bda03e43303bf9191d5d0dc74b52a34464c5fb035ff50e621b1ec13b7fc3d003c15a2c27a31f794a371 SHA512 eca4d95a134d9e90e7597914367c36bf1f3fd701d8873123c7bef1132809149dc1d5d2ff3fe8797a3df11d9af7e7f83ec892beaabe9d6fa72bb376d307022232
 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 ff05ebf0060c..a53470cbafa4 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-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit autotools eutils multilib
 
 DESCRIPTION="Fork of the official but unmaintained LDAP backend"
-HOMEPAGE="http://repo.or.cz/w/pdns-ldap-backend.git http://sequanux.org/cgi-bin/mailman/listinfo/pdns-ldap-backend"
+HOMEPAGE="https://repo.or.cz/w/pdns-ldap-backend.git http://sequanux.org/cgi-bin/mailman/listinfo/pdns-ldap-backend"
 SRC_URI="http://sequanux.org/dl/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index d1b9f2edee78..9f802df171b6 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,8 +1,6 @@
 AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
-DIST pdns-recursor-4.1.10.tar.bz2 1238148 BLAKE2B b68e33b40d5f1a680cbbd76c9864439a84416071dc75d658a3988e891da7f6a5d0c197d8dda7ff014a30b7f762bfbe5db4a616a6cad4415fd46db119b51ba70a SHA512 204ea40f5c14d1e589935af4fbd24c102090390d741dbc5ad28f4c20044011f4b2b1c7926d8caaf144a7b2b1680f793e66199c5e9238e926da9fba60c5573dcd
 DIST pdns-recursor-4.1.11.tar.bz2 1239986 BLAKE2B 33c9b2a2f811c43b67ad2bddf5a11d5d95cc88679d46ba3513f3eeec97bf7694af493a9fea4f733f003056b5f0fc971112e9062883324102ecca28838e2f3e41 SHA512 6041d31f0a517786f44a7fa22c7bfa94d5d4bdc3a7f349d2b47bc66be87404fe8eaf76f45ca18ef8ab96a45c0271f46fdba93a51fbda2542a3ad96e10f51c1d1
 DIST pdns-recursor-4.1.12.tar.bz2 1245110 BLAKE2B 187fe117ab64f234d144d7e2d91a119afe1d6b0a45079f1f9527724081c64f594c8c5d5b4dbc6e25b4beef1fcdfb3e5caed8e5a434921bf6b66e07617d0fb6f9 SHA512 d228976937ede7e9f6b3375e573f5b436d9df7ae246e411b13acb095a1a58f12173b663acc364ce0fbdcc61b3d5522e101472a88da8f044e44541564f9915d9e
-EBUILD pdns-recursor-4.1.10.ebuild 1756 BLAKE2B e2fbacc7c51b9979ec9b1a034cac79d3f0960b70614aacb69362577e047383d03b35e2baefd0e5ceea666baa913e4bf2c068b2ab9d28567f8bd0458b2c63506e SHA512 acd802ca6e50382bbe08992ee77791d08ad9aeae143d889423bfe5cd08818fe83e0ec091ab1e65020883d838779bc344b0969a6f90dbb241fb66666fb0b434d8
 EBUILD pdns-recursor-4.1.11.ebuild 1756 BLAKE2B e2fbacc7c51b9979ec9b1a034cac79d3f0960b70614aacb69362577e047383d03b35e2baefd0e5ceea666baa913e4bf2c068b2ab9d28567f8bd0458b2c63506e SHA512 acd802ca6e50382bbe08992ee77791d08ad9aeae143d889423bfe5cd08818fe83e0ec091ab1e65020883d838779bc344b0969a6f90dbb241fb66666fb0b434d8
 EBUILD pdns-recursor-4.1.12.ebuild 1758 BLAKE2B bbee1332e0392092ccce34b4d75e10988559d5ed91a2aafa27c3408c6beb36468a303178f39b76edc42cb498318a7465578ee3dc3b2eba82f8c5a46e69532f88 SHA512 fb9ca18f4b87b744a5421648ea14039fe6f00a95434d3ab992723d8cd184ff2e04808a0a509d5be6515f32c98609024babd00b3d8a89e4e8319218686e13c064
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild
deleted file mode 100644
index 45a74d2b9434..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable systemd) \
-		$(use_enable sodium libsodium) \
-		$(use_with !luajit lua) \
-		$(use_with luajit luajit) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index b4fc121debfc..2efc18d44e66 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -8,6 +8,6 @@ AUX unbound.socket 101 BLAKE2B 4885d311873d7f3e5daf1c0a63798b13761b7c0bfb1bead0b
 AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a73b0c6148f4df336c4c07e8da19320df6bedb49cb6884da565543f78456d38dc3000ca2a1abde84816be SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3
 DIST unbound-1.9.0.tar.gz 5662176 BLAKE2B dff42ca4155df1c364bcfeb37c0f9516e7f167cc59bebd1fcf264db6471ad99804323c59e485662e03ab095932f1ca3fe25693a9ba840e9c0ecad69cf31b1a2d SHA512 7dfa8e078507fc24a2d0938eea590389453bacfcac023f1a41af19350ea1f7b87d0c82d7eead121a11068921292a96865e177274ff27ed8b8868445f80f7baf6
 DIST unbound-1.9.1.tar.gz 5665254 BLAKE2B 68a643cd17139b34e3651e0e72053b0faacf83ae975fff97493c78742ffa7f0d3dbc0028e96e581e125a3591467ec78ae245a718424c2fb32ea7db23ae945f44 SHA512 5dfac7ce3892f73109fdfe0f81863643b1f4c10cee2d4e2d1a28132f1b9ea4d4f89242e4e6348fdadf998f1c75d53577cbf4f719e98faa1342fc3c5de2e8903d
-EBUILD unbound-1.9.0.ebuild 5373 BLAKE2B 6968cc26ed18506a52857b0dc577a7a2bac81a0149245d2d14785dd4ecfb35d8f3cc2cb29014eda8e2a647d3b50fdb33884d549710b795bc0cf319c2e0c85e02 SHA512 8fa921ec4a1e8e7e43a090f6abdf57096aad3b7528494ccea68947bbeb6a267caeda7d635cd56a064eefe67ee9d6a661a617f5ead2aece94db3cc649c6e3ef75
-EBUILD unbound-1.9.1.ebuild 5378 BLAKE2B 5aab87b59b8ae382c9bc98ff72b911ad4c42f3c080e8c4f6c1c05a9011f3a38b84d0515d34d9b34ab62889a63bc18504a9491aa8dbfe5a927ec0d1f061880e3e SHA512 cd794bcfb53ac8d4538565650b9747cf86a4133d28b8951922afaeeed9c3098cad4172d30b81ab82b63370708880e675b0d2d2b9fddb0d14b1d8e48f85cfb813
+EBUILD unbound-1.9.0.ebuild 5371 BLAKE2B 210ca5db8c4fedf546d8caeffda1cf94f6366e9befe55be6c07ba273209ff2b5388509341c4540ee65aeedb3f543e0caa7fbac880121ba86f1426e856167689c SHA512 2f78e2c29c5ed3998260ae8803c0a5e9216f63c9001be4f62613e88899e130258b7a53e0072a621e2d436b6491ed688006cb2e8ccdf6e6426eec34d87d358648
+EBUILD unbound-1.9.1.ebuild 5376 BLAKE2B aa5a4eb9833094e082f52076a819fb5e05716d37f9423a3addb47bb64f508b6d4dbd2d12ca37ca13c701ea36a8fb4c33df35d30204cb5ceec889e3eac811f2de SHA512 3466847443d8548e4b961ad51e0dc8bc699b8954428715f82cce9069629fb486aef49a168b9922132d912d467bc9a144c36db0cb3116fbd690d3d9d17688ffb6
 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/unbound-1.9.0.ebuild b/net-dns/unbound/unbound-1.9.0.ebuild
index 412b18a80924..7d08d92eda4e 100644
--- a/net-dns/unbound/unbound-1.9.0.ebuild
+++ b/net-dns/unbound/unbound-1.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
 
diff --git a/net-dns/unbound/unbound-1.9.1.ebuild b/net-dns/unbound/unbound-1.9.1.ebuild
index c51b28fbac6b..6ae0e2e35b3e 100644
--- a/net-dns/unbound/unbound-1.9.1.ebuild
+++ b/net-dns/unbound/unbound-1.9.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /net-dns
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)