14 files changed, 515 insertions, 102 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 8e026eca603a..7db8c5f7e021 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnrd/Manifest b/net-dns/dnrd/Manifest
index 7c580aac970f..02376f82c4e7 100644
--- a/net-dns/dnrd/Manifest
+++ b/net-dns/dnrd/Manifest
@@ -2,6 +2,5 @@ AUX dnrd 444 BLAKE2B 100e9de8f2f3191b4b1c8e78bea41f4a8ae2f5b1b48eca025d5e55f0724
 AUX dnrd-2.20.3-docdir.patch 719 BLAKE2B 45cf21aaf65ef35c7de3ffd12398d6962fed28a86a5c91d7b1e17d838a0564c41313e11633e2da0fed010ab194c92bf6c09b8e9e83ab8d90ae49588ee6c39877 SHA512 384359d82e0b3cc3e70c9b6dc25363d4bbd117fb555022840eaa9061059c71575581e83243991941ad60282a3e964262b7f4c87379b7e0d038f5658db9de51e9
 AUX dnrd.conf 250 BLAKE2B a9334bdd7ed06152068e22d72c7fbb5c4de97fa888e0b0cde6a6517c8d29e47e9727c0bfdb732156b77e7f825413d31c808565c5a65103d90828ba04bbc3ee92 SHA512 461bbebba321b5216a15ea9550342ca9f7374af6446c2f515a3f5ce35bf45480c8f684b60ce8c206ec017e7ca060d4588c0d2da026d2e99162f3f9a6e58f03d2
 DIST dnrd-2.20.3.tar.gz 161887 BLAKE2B e04941fe59a8835386d398aa4a76bb0b2562705f98994b1d9d6c57557499de49a084dd2c3bab4c25499c81267fb336bac7a2b27dd8efd77164bf8d5409b2c94c SHA512 a526ec9c2f82ac36fa7beaf864ab39c56e5956530b10115ad2ca2f79ecb820fe865d9da9edd1dea5f4cb97508afbec88f0606b03f87baba25561c097e7c0ea9b
-EBUILD dnrd-2.20.3-r1.ebuild 802 BLAKE2B 4fb938b65b8f434e8de0aa777b2942398146867bf4607c338f232f92927dd6c9891492f1cfc1eefbfffc6a70496a865c60f32138aab0f71cbce25c56d7d50d23 SHA512 1a6a468a438974b54a6156f141c61789c8244f99083e37a5da9916e36dd9cfcc4c03ae04d5089ef2b113095f9d4a707c391595bcbef5d220a51aaa07b9824f13
 EBUILD dnrd-2.20.3-r2.ebuild 594 BLAKE2B 066fef67266ca9b4e765a13d42341f8ff74463cb2e17479224c9713407a1619c501ce22b62520cbd0bbfb0249ac623993876d89bfd102df05522fb0d6e1651f8 SHA512 3f9299d991e4e4b9de04fe08e756d54359c5d81910cfe858fc9e2aef120e2b3ca8357a0b442972ce68c333609a0a8e670c2232eac4cfbbf115d903808b37aeef
 MISC metadata.xml 657 BLAKE2B 2a27a4416cbee6eb65e220f99fc847fd2bedca655740ffbaf8fae61eb3986472b69f7ba89eca393049cc57ce94e38ca3b69bc8024f2aa344a50a816d4220f466 SHA512 1b241e4719fde34ca85e146e21906a0b82aaacd5e71cdd215365e32bb005d2166f39f90eab12bdcd574d9387175a5870af6d24a676a108470c30e096ff9f53f8
diff --git a/net-dns/dnrd/dnrd-2.20.3-r1.ebuild b/net-dns/dnrd/dnrd-2.20.3-r1.ebuild
deleted file mode 100644
index fae872bc300d..000000000000
--- a/net-dns/dnrd/dnrd-2.20.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools eutils user
-
-DESCRIPTION="A caching DNS proxy server"
-HOMEPAGE="http://dnrd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dnrd/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-docdir.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable debug) \
-		--disable-dependency-tracking \
-		--docdir=/usr/share/doc/${PF} \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	keepdir /etc/dnrd
-	doinitd ${FILESDIR}/dnrd
-	newconfd ${FILESDIR}/dnrd.conf dnrd
-}
-
-pkg_postinst() {
-	enewgroup dnrd
-	enewuser dnrd -1 -1 /dev/null dnrd
-}
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 18476541a851..da5574da3dd7 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,7 +1,5 @@
 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.0.tar.gz 2102683 BLAKE2B ef8b29e458598f59044a058e2121b08a0034cf0a14d9a7952e83722a38e03cb66152271a62b690be3ede7dad36cdb69849f1a7ccd6e61c4f75256afeb6b1d1bb SHA512 003f3bdb872f9c6f5db80bc5ad5e5dd8f414e14139f4ae15b451e955eba18f612fda8b159796e9631d741fa0a2d731e6d489f9901d2561ac35b716efe56557a2
+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.0.5.ebuild 1239 BLAKE2B 2e1caba85c2a501947afd2a8d6291a64feb35487b6ceeeed7d0479944d3257fdbb8f189999c66bb2a774f377bbe6351b8fcabedd13ed7c72497a61caab7146ea SHA512 df5f8e536da174a039f1538c53da6827515eacd0198e8aa00c3fb71c9cca9ed52a024c68d0834e4acecca981f87462472a30c7d00a46d2a9cf5ea9da8f03e067
-EBUILD libidn2-2.1.0.ebuild 1251 BLAKE2B 6a888aeaed3965d9255f8375083a512f5d913a7e10c45ecd92f9c6ff88a0a68a1f7be0972e605c6704f7af1ee8d5e35d8453eafa4511dd766608ce61d6aea3a8 SHA512 9a5a2da4c2165578589678b37a0959d219747c77b25de943cbb187f4aaeb0bc6f9306147c326c2c44fca8b63e0b1002540bd7607dc0e4f38709aa32f2c608ee8
+EBUILD libidn2-2.1.1a.ebuild 1266 BLAKE2B 851bc4749621b14cb943bc1b031e1d8dd1f1a4f8be8448896627a3ce0f9494c608ed2179de7e5606318809238ae68ab16d5147745455b75576867b5eac2aa6ee SHA512 2ebc8c116a965693dbd788a7d4be35919e89d20e66b95f7d97f843f92f920521952e251758a8126a2206c8debe7ead16a47f2b714d798cdb737cbf4abf342437
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/net-dns/libidn2/libidn2-2.0.5.ebuild b/net-dns/libidn2/libidn2-2.0.5.ebuild
deleted file mode 100644
index 7d53fcdaf7a8..000000000000
--- a/net-dns/libidn2/libidn2-2.0.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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"
-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.0.ebuild b/net-dns/libidn2/libidn2-2.1.1a.ebuild
index d5e87e2879a9..cee3c6dfa002 100644
--- a/net-dns/libidn2/libidn2-2.1.0.ebuild
+++ b/net-dns/libidn2/libidn2-2.1.1a.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2+ LGPL-3+"
-SLOT="0/4.0.0"
+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"
 
@@ -23,6 +23,7 @@ BDEPEND="
 	dev-lang/perl
 	sys-apps/help2man
 "
+S=${WORKDIR}/${P/a/}
 
 src_prepare() {
 	default
diff --git a/net-dns/mydns/Manifest b/net-dns/mydns/Manifest
index 89d1b05be876..a7b6b6a710f6 100644
--- a/net-dns/mydns/Manifest
+++ b/net-dns/mydns/Manifest
@@ -4,4 +4,5 @@ AUX mydns.confd 84 BLAKE2B e95e66b464e9f7e7d3742312c9cd9bebc5cedc1f4f49fb4e632ef
 AUX mydns.initd 850 BLAKE2B 58275e0415dbf27344045e9cc19037e09a5ee9dd1a52f80b6c05852313b646c7b41a52f1be46ff13629bc0873b2b7fc1db73e0cd45cfc7bb4c6d9a0582524fa1 SHA512 919a7022a350b121c8c0eed962d7a7233dc41f2e4cfda1185d642114719a533cff580367b9302b24e8c9d377c2ccb9b02ad45d638d5b483b7c101405cb9ba1be
 DIST mydns-1.2.8.31.tar.gz 958701 BLAKE2B a07ca8314f6f8d3ce6cf88ce3a49238d00f1ed8e2352f3a76a9ffa348711f76e0cf19fa304a92a71b420c39db2795094d42997daddb091c7046e4bf1b61f6fe8 SHA512 471dfed9b4f38b446fd5896939faa4c58f4e1b3a3e6928fa84eddf769eba8f3406ef08c77ab39ee79d2ac85c1e72a499b283c7404a0cae9830ffe0faee9e2737
 EBUILD mydns-1.2.8.31-r1.ebuild 2066 BLAKE2B 42e31c747bd2efc110db0f57502987d5d7303248d74a928e896f861ce3b8279f7c51de54fb13ac9b514f801aafaa5a0f21fa2fb6daefcb8edf3655c14ae154b1 SHA512 007e14a8d4616530576173ef53a3e9e6588be18ed132965b265e88cf40874f465e9f391be19cc16d638823a88421718741028c160eb1f047106cc69571509a29
+EBUILD mydns-1.2.8.31-r2.ebuild 2085 BLAKE2B beb1ad22b99450b0606361119b9d9d266195bb085508835076ba1d5315b7abfc78cbba957137b826f74166b4daa413f4bead70942c2511760503be5d63152d86 SHA512 fb6b705de52708b4c0dc4310695dc9da81bdd26102b0f9f82f06fa212f85dd6f0b1bf85f96faad6a00e59c5d1991decb92d783fcfa1d828626f52f8f601e8647
 MISC metadata.xml 396 BLAKE2B c343b16b422a587d568b331f868e959348bd12cdb7ee28d6390ebeca8234f1e34ef9efcf7aa70e9b18dac66777ab46763c41f8b68e3f9d96b3863d085ed51066 SHA512 cba5e716877204e00ef18549d35bb39f47921389f8712c69ce81b8dd365505d6ea95fed89976bfc6722343dadd15f914f27d26fe35416c242e7963d467b147d0
diff --git a/net-dns/mydns/mydns-1.2.8.31-r2.ebuild b/net-dns/mydns/mydns-1.2.8.31-r2.ebuild
new file mode 100644
index 000000000000..5f6aeb01f0cb
--- /dev/null
+++ b/net-dns/mydns/mydns-1.2.8.31-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A DNS-Server which gets its data from a MySQL-/PostgreSQL-database"
+HOMEPAGE="http://www.mydns.pl/"
+SRC_URI="mirror://sourceforge/mydns-ng/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="alias debug nls mysql postgres ssl static status"
+
+RDEPEND="mysql? ( dev-db/mysql-connector-c:= )
+	nls? ( virtual/libintl )
+	postgres? ( dev-db/postgresql )
+	ssl? ( dev-libs/openssl:0= )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.12 )
+	sys-devel/bison"
+
+REQUIRED_USE="^^ ( mysql postgres )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.8.27-m4.patch"
+	"${FILESDIR}/${P}-texinfo.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable alias) \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_enable static) \
+		$(use_enable static static-build) \
+		$(use_enable status) \
+		$(use_with ssl openssl) \
+		--without-included-gettext
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS BUGS ChangeLog QUICKSTART* NEWS README* TODO
+	docinto contrib
+	dodoc contrib/*.php contrib/*.pl contrib/*.pm contrib/README*
+
+	newinitd "${FILESDIR}/mydns.initd" mydns
+	newconfd "${FILESDIR}/mydns.confd" mydns
+
+	## Avoid file collision
+	rm -f "${ED}/usr/share/locale/locale.alias"
+
+	# Install config file
+	insinto /etc
+	newins mydns.conf mydns.conf
+	fowners root:root /etc/mydns.conf
+	fperms 0600 /etc/mydns.conf
+}
+
+pkg_postinst() {
+	if use postgres; then
+		elog "# createdb mydns"
+		elog "# /usr/sbin/mydns --create-tables | psql mydns"
+		elog
+		elog "to create the tables in the PostgreSQL-Database."
+		elog "For more info see QUICKSTART.postgres."
+	fi
+	if use mysql; then
+		elog "# mysqladmin -u <useruname> -p create mydns"
+		elog "# /usr/sbin/mydns --create-tables | mysql -u <username> -p mydns"
+		elog
+		elog "to create the tables in the MySQL-Database."
+		elog "For more info see QUICKSTART.mysql."
+	fi
+	elog
+}
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index aaceb44b19bc..b0992598a644 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,4 +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
 EBUILD pdns-recursor-4.1.10.ebuild 1756 BLAKE2B e2fbacc7c51b9979ec9b1a034cac79d3f0960b70614aacb69362577e047383d03b35e2baefd0e5ceea666baa913e4bf2c068b2ab9d28567f8bd0458b2c63506e SHA512 acd802ca6e50382bbe08992ee77791d08ad9aeae143d889423bfe5cd08818fe83e0ec091ab1e65020883d838779bc344b0969a6f90dbb241fb66666fb0b434d8
+EBUILD pdns-recursor-4.1.11.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.11.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.11.ebuild
new file mode 100644
index 000000000000..c054da53ceed
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.11.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="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/pdns/Manifest b/net-dns/pdns/Manifest
index 7f5f439f8648..3a427271fa48 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,5 +1,7 @@
 AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf403453422888e2cb44fa4fed7891241919a39c8c6f539a61de032654650a45ea548a6983777ea1bfe029e817f2c315 SHA512 ac16f8d528d6138d3c2cbf997fd8fbb467d388aa63eb6ed4e7780a3dad11ea885b91252ff0809b1d2cf7d5200814b8963aab890af84741ea86d35b2f5955a7ea
 AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02f2ad4324cb7c99a05736bac7cbe80e1b9081832cac95d8c482eb4d1a8c344a6b55da623e3 SHA512 6392f59f82b82621b6cab6823f7761cd875bc6818c48db846df289057c02d8119a1024c5ecdf70a5ca8a55c00a2c3c56240d36b42cc038a25e8616ab9b966dd6
 DIST pdns-4.1.5.tar.bz2 1116238 BLAKE2B f67b94881cce988a7ac9f579b3107422aff68d1b4c6d4dc8b3b066ce76abb5a280f8ded0b4640f4ce3f3aec0652bdf544ab4bfc83a2a2e7d2d363ceae0efb7c8 SHA512 c5c42975e6402f17b3cdf947a26c944a462d39c23bef44b6f6e823b8c9459be9e8bd750aa0481f9f707eec8b124c4edc4769a6241c75836583ee0bbe111e33e5
+DIST pdns-4.1.6.tar.bz2 1116100 BLAKE2B 691dc67c28342534dca11dafd786dededce930d39b1ef77670ff6627c175dbb527a3759aae7d3cc2fb56419d67baecc528c812ffee86da57e84c8da103bc991f SHA512 094e532ff50aeb54c8b3e46e3b4a77d1fb2c9d3d0fccce6ccb71b3825f5e53f53af680625ea4e98b5dbc29fbd210bc3b4a47c7f05b4b3ac2cf7537369a7e15b2
 EBUILD pdns-4.1.5.ebuild 4196 BLAKE2B 8db15298f19a709b4b2cbdc770dff132e1db2d3a77a9fade3cbe608fe377be82a89ffc578c23591eac78c6e364ec7bc87f81642e02c8945a3430929563cdf47b SHA512 464975e69174c198d75e92aa040d2fd8c720d78addf7c8f2bc3f187635f12246aea547b7b86f368eb430b102b2ca9160a1e8ed69754222286e5f03f84d606b0e
+EBUILD pdns-4.1.6.ebuild 4198 BLAKE2B 6f5a5605abb7b08ccd7b959997db18d7f8adca4d1eefba2cd2dc3bff227eef09a6d345bee089cb7649a0a47e37f597404f9f9c9f3eebf42ea6906eaf93e15739 SHA512 10c501e58ded7213cf21eca41502fe2e9dda82733e54591c28ec97a9b58c6d59e3e402511a074082f9d6c28930239ca8a9fd4a590d0f2d4759c836eea91ca6b0
 MISC metadata.xml 1330 BLAKE2B 17be53a41fc13a3739905f8409b49996b1958cfd04baf1d2982c923ee7b39ef5b8be627017a6efb1261f158f45660337eb22157ceaadc7b07ed5b5b3da7c7cdf SHA512 fb13690059baceefc1366423c524427655d54313f5690e12709c9e1dd4b9567d111d7d748c530286dcd24dc78acfa38baac88a5cfc9a2b01996baae6b47f39dc
diff --git a/net-dns/pdns/pdns-4.1.6.ebuild b/net-dns/pdns/pdns-4.1.6.ebuild
new file mode 100644
index 000000000000..9c4996e63d3b
--- /dev/null
+++ b/net-dns/pdns/pdns-4.1.6.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib user
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
+
+REQUIRED_USE="mydns? ( mysql )"
+
+RDEPEND="
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:=
+	botan? ( dev-libs/botan:2= )
+	lua? (
+		!luajit? ( dev-lang/lua:= )
+		luajit? ( dev-lang/luajit:= )
+	)
+	mysql? ( dev-db/mysql-connector-c )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	opendbx? ( dev-db/opendbx )
+	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
+	sodium? ( dev-libs/libsodium:= )
+	tinydns? ( >=dev-db/tinycdb-0.77 )
+	protobuf? ( dev-libs/protobuf )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/${P/_/-}
+
+src_configure() {
+	local dynmodules="pipe bind" # the default backends, always enabled
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use lua && dynmodules+=" lua"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	use opendbx && dynmodules+=" opendbx"
+	#use oracle && dynmodules+=" goracle oracle"
+	use postgres && dynmodules+=" gpgsql"
+	use remote && dynmodules+=" remote"
+	use sqlite && dynmodules+=" gsqlite3"
+	use tinydns && dynmodules+=" tinydns"
+	use geoip && dynmodules+=" geoip"
+	#use xdb && dynmodules+=" xdb"
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-modules= \
+		--with-dynmodules="${dynmodules}" \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		$(use_enable botan) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable test unit-tests) \
+		$(use_enable tools) \
+		$(use_enable systemd) \
+		$(use_enable sodium libsodium) \
+		$(usex lua "$(use_with !luajit lua) $(use_with luajit)" \
+			'--without-lua --without-luajit') \
+		$(use_with protobuf) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	newinitd "${FILESDIR}"/pdns-r1 pdns
+
+	keepdir /var/empty
+
+	if use doc; then
+		docinto html
+		dodoc -r codedocs/html/.
+	fi
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	enewgroup pdns
+	enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	if use ldap ; then
+		ewarn "The official LDAP backend module is only compile-tested by upstream."
+		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
+	fi
+
+	local old
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 3.2 || continue
+
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/powerdns"
+		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
+
+		break
+	done
+}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 45ced66bd6a8..f62655a72ae4 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -9,7 +9,9 @@ AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a7
 DIST unbound-1.8.0.tar.gz 5609213 BLAKE2B 41e464df60e03d502f13758e75f9143658b2a496c4fad69804d9d404e23a8d4b5480cc09048197f8593e37feffdffaea33b18a06d864d0d35e986169b49f42e4 SHA512 6c46f5b86b5bd98a7b549b660173d487e59e65385cebd7bc29429b4fee69f2b490651a409c57b072b9b604fa98e289fa82eeecfea8779900038c25b28a6bd064
 DIST unbound-1.8.1.tar.gz 5610191 BLAKE2B 15118f5940b4362dd515f8b335c8a39fc5ef1d3fbf0c20efbf0097342fabb4890eae0527f8b00ace181a425b413882db962b63d329f664cf12649d4d6ec8e5ea SHA512 1872a980e06258d28d2bc7f69a4c56fc07e03e4c9856161e89abc28527fff5812a47ea9927fd362bca690e3a87b95046ac96c8beeccaeb8596458f140c33b217
 DIST unbound-1.8.3.tar.gz 5629180 BLAKE2B f3fe17df04100291aac752565b3afa859200c222e4fb8c2ed2d9903f7a38ede9965444237c34f3257d29bf367b56fd2a2d48648e7145c91e2dbbd0b79242451d SHA512 545486ccce288a6ef1937d82653a43a11dbd3aec7b8d0036e7fd107e537cdfc935def9db9178c2eb418d6f4b0849a242a0be1dea966f3e9e0145aa7266e483ad
+DIST unbound-1.9.0.tar.gz 5662176 BLAKE2B dff42ca4155df1c364bcfeb37c0f9516e7f167cc59bebd1fcf264db6471ad99804323c59e485662e03ab095932f1ca3fe25693a9ba840e9c0ecad69cf31b1a2d SHA512 7dfa8e078507fc24a2d0938eea590389453bacfcac023f1a41af19350ea1f7b87d0c82d7eead121a11068921292a96865e177274ff27ed8b8868445f80f7baf6
 EBUILD unbound-1.8.0-r1.ebuild 5355 BLAKE2B f1c2b7694ebb346c0835801b559bfc069e3487e743fb467f21197154726ad553c94387cebbe3be8adb4758da27aebe7706ed47bb5583d5c22a19590ce1a061e9 SHA512 b58a369168357491a1b5149e4ea32f451c23275f69bddb5bb550f682939f7d8fb00f288eb041a04c817c52193f3123b065d2a3df8c871f898b8ceafddc6414a2
 EBUILD unbound-1.8.1.ebuild 5360 BLAKE2B debee5f87a838a19b9d018e5df91aca309a5c4c8e8e229ae0ec1df2278bd199755517d4d99d12c87298711157eaeffaaaf0078badabcd88c7424c1c3735570b0 SHA512 de4aae3c54f81752f98c862bb3a5a6d03248695d7e6bb0f380266668b4db73d734d081f15a1195b22b010563140932db9813143f4aaa104f1a37b9ddf0ca954e
 EBUILD unbound-1.8.3.ebuild 5378 BLAKE2B e949c9443bc32d3fb2656dbe8143b3b56cb521226d559e3b11d6b904d45a1bb08377bcbe7d2d3e9c98d5db1b66f565bc6b7e643ac4b5b2b97bde3d294b0a835f SHA512 f3557b42afeb9618bd09381cd94a1a8ec45744250815caa8a1a1e07e79034e3d509027d5467952b1d2b26818a3f3ddcf6deb5a3f7ceef89cc4e4dd2c5a3d18de
+EBUILD unbound-1.9.0.ebuild 5376 BLAKE2B 598472e79350cf2b4135ca845e5895b6c264aa419bbb636488b4ec7336cf6e5ac9fec2c5917c330a7958ab03a2c66931604ef65cf8ea8131fd3f40e6e22ecdfd SHA512 1ef7ba186134d42732b0ddb21d5a1c1d6f892c3ca06dbdcfdbe1031944a39489df74c45057a71cbadb0581658e71e06266808d7090aa15de99ef03b926d48d66
 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
new file mode 100644
index 000000000000..16a0168dc2ea
--- /dev/null
+++ b/net-dns/unbound/unbound-1.9.0.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup unbound
+	enewuser unbound -1 -1 /etc/unbound unbound
+	# improve security on existing installs (bug #641042)
+	# as well as new installs where unbound homedir has just been created
+	if [[ -d "${ROOT}/etc/unbound" ]]; then
+		chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX%/}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX%/}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX%/}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX%/}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX%/}"/usr \
+		--with-libexpat="${EPREFIX%/}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED%/}/etc/unbound/unbound.conf" || \
+		die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	# make var/ writable by unbound
+	if [[ -d "${EROOT%/}/etc/unbound/var" ]]; then
+		chown --no-dereference --from=root unbound: "${EROOT%/}/etc/unbound/var"
+	fi
+
+	einfo ""
+	einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+	einfo "set 'auto-trust-anchor-file: ${EROOT%/}/etc/unbound/var/root-anchors.txt' in ${EROOT%/}/etc/unbound/unbound.conf"
+	einfo "and run"
+	einfo ""
+	einfo "  su -s /bin/sh -c '${EROOT%/}/usr/sbin/unbound-anchor -a ${EROOT%/}/etc/unbound/var/root-anchors.txt' unbound"
+	einfo ""
+	einfo "as root to create it initially before starting unbound for the first time after enabling this."
+	einfo ""
+}