gentoo resync : 02.06.2019

25 files changed, 576 insertions, 35 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index bb7efc477510..7e9c6c110b45 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 1a0fae781063..a1871271f017 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,3 +1,3 @@
 DIST bind-9.12.3_p4.tar.gz 8627833 BLAKE2B f7f8b88d8179f2df92b3105a49f30f7de5ccfe78a4a51f6bfa08e732968bf8e4c35f298c4209d8d05bea4d71b8669fd360d4c17193574eda471ba4d7ad742092 SHA512 42c41f47a0282dc08ee875fe098ce84b26384dba5efbaf99b557d34c4271e0d6aac70126f280a3ee157e8604cce16901c8cd51fab791dec82f4a3d00c054f363
-EBUILD bind-tools-9.12.3_p4.ebuild 3565 BLAKE2B 6705009bb3e2c1c343197efc109db21119064b562f3d7dd7257e5c8ccfd92c23c5773b14cea710f9bae512b7d3d65907742516af58908ff7b9ae4e3c92f305c3 SHA512 3ba3f607ac4f951f3d62af9e1736e033fc2d93c672e95331ca17256d602741a020ba971d271fd7c8aa7c5fdf9386f534b48c9459f921d971db20abec797bb988
+EBUILD bind-tools-9.12.3_p4.ebuild 3564 BLAKE2B 3a6232d97229208746fbb33c2b9c6371a7ce915d495a759bdaed498691d21dd94a39e241ccac308270ace1ad4145c55199b81efd8cb43be91bd6e75d3f1b335c SHA512 7693dc80b416aa7c790f48f8b308a521298ffe9e4486adb78d0cdb0767e17b6d6878d610ff2470eb8562da2429511b42f256dbe823b95190ce65dce42a0a4926
 MISC metadata.xml 640 BLAKE2B e563c600c07069fbcf6b9c6a650c4ea47004973757ee685ef12d88c012d70dc2d50831f238aa0ce557531dc91fe8dbb606e526a3b3a72d56725024d76329bcf7 SHA512 e87aa31e416bf3051f213c22b744262a6f4700254a42ab684da2a99eb2b9efb848ccbd2ec747f7c9f309556e6ba5426edaaf3a877cc620758cbde0b40d8c6b37
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 d32063eaa873..29540d5b0f5d 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/dnrd/Manifest b/net-dns/dnrd/Manifest
index 02376f82c4e7..bef3ef9c0eb1 100644
--- a/net-dns/dnrd/Manifest
+++ b/net-dns/dnrd/Manifest
@@ -3,4 +3,4 @@ AUX dnrd-2.20.3-docdir.patch 719 BLAKE2B 45cf21aaf65ef35c7de3ffd12398d6962fed28a
 AUX dnrd.conf 250 BLAKE2B a9334bdd7ed06152068e22d72c7fbb5c4de97fa888e0b0cde6a6517c8d29e47e9727c0bfdb732156b77e7f825413d31c808565c5a65103d90828ba04bbc3ee92 SHA512 461bbebba321b5216a15ea9550342ca9f7374af6446c2f515a3f5ce35bf45480c8f684b60ce8c206ec017e7ca060d4588c0d2da026d2e99162f3f9a6e58f03d2
 DIST dnrd-2.20.3.tar.gz 161887 BLAKE2B e04941fe59a8835386d398aa4a76bb0b2562705f98994b1d9d6c57557499de49a084dd2c3bab4c25499c81267fb336bac7a2b27dd8efd77164bf8d5409b2c94c SHA512 a526ec9c2f82ac36fa7beaf864ab39c56e5956530b10115ad2ca2f79ecb820fe865d9da9edd1dea5f4cb97508afbec88f0606b03f87baba25561c097e7c0ea9b
 EBUILD dnrd-2.20.3-r2.ebuild 594 BLAKE2B 066fef67266ca9b4e765a13d42341f8ff74463cb2e17479224c9713407a1619c501ce22b62520cbd0bbfb0249ac623993876d89bfd102df05522fb0d6e1651f8 SHA512 3f9299d991e4e4b9de04fe08e756d54359c5d81910cfe858fc9e2aef120e2b3ca8357a0b442972ce68c333609a0a8e670c2232eac4cfbbf115d903808b37aeef
-MISC metadata.xml 657 BLAKE2B 2a27a4416cbee6eb65e220f99fc847fd2bedca655740ffbaf8fae61eb3986472b69f7ba89eca393049cc57ce94e38ca3b69bc8024f2aa344a50a816d4220f466 SHA512 1b241e4719fde34ca85e146e21906a0b82aaacd5e71cdd215365e32bb005d2166f39f90eab12bdcd574d9387175a5870af6d24a676a108470c30e096ff9f53f8
+MISC metadata.xml 455 BLAKE2B 4f423f5ea5c92a093b5c09d7cf9ce5f4b380ac58911f236ca89655104a24c01c298aa19d389009c5c04532bf3320dea75b155a38237cd41113eef75e41a0b7a6 SHA512 74e9f0700866a28065395947e4b37f2f06d68a1ff2886bb2574cc164d94f2104ca37f4d029f28032164d7f29c7b59d9b228456a0ac55a2382fd37c2affa69723
diff --git a/net-dns/dnrd/metadata.xml b/net-dns/dnrd/metadata.xml
index 349a9bf300f0..584bfbc30142 100644
--- a/net-dns/dnrd/metadata.xml
+++ b/net-dns/dnrd/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>natanael.copa@gmail.com</email>
-		<name>Natanael Copa</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 Domain Name Relay Daemon is a caching, forwarding DNS proxy server. Most useful on vpn or dialup firewalls but it is also a nice DNS cache for minor networks and workstations.
 </longdescription>
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 664e515d7273..c92185005d21 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -6,5 +6,5 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8
 DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f
 DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068
 EBUILD dnsmasq-2.79.ebuild 4594 BLAKE2B 28cf745cd261bf067114adc98733f5e00a2f6a10a906d4eaf2175c0457d538d7d96b91fe87a87320c3df27a5c64234ed7d5bbee993070964fa421b8e5b12693c SHA512 eb8ac4fdf747657983909b22baa2e0af5f2299d2a5ab4d97933b185e528cddbb1d4cc7ca14c2efddcd8c6f4ec9861f3c37d9fc59c96b68f55c45a274acf7eff7
-EBUILD dnsmasq-2.80.ebuild 4743 BLAKE2B bb50234f08188339f68592a7e94acd3232adb130e73f7c50bfddc4d502247657a7a3ca356fe255dccfec1d95844b6085bf224803f501c7f0ee7fc80f93eb87e6 SHA512 8fb983c7cb709385b8e492d95f7101e8cb794c92f624e5a4548f7932f2db16f8fc356b68791c59aa2fe90193c01f618bc4902fe0e973c766b8b86aa4031c1458
+EBUILD dnsmasq-2.80.ebuild 4742 BLAKE2B 4844bb2c2fed9d35ee6358bedf86c9fac3feacedc965628b53687bc22ac672f2a5a7eef90f112a0a1446fb99ce79c7233d2178b5bf7773e8fad23dc2a1557f2b SHA512 a278d6e216bde4d31671481eb7d9ec302789854119229c0852a1204b7b059213ca19ed48b99afe75221e39494c358f537d56a6da1e5275ef563844ff4083e49e
 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.80.ebuild b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
index e1d9a3e3aa28..1e8a6dddf189 100644
--- a/net-dns/dnsmasq/dnsmasq-2.80.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
 IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 40abe73464bf..504ad3a77dbf 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,3 +1,3 @@
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
-EBUILD ldns-utils-1.7.0-r1.ebuild 1192 BLAKE2B 6a8d02048c735ca3853cbd5456202e10802652b619e63c31b549b6fc5ec34d7146415ffd3a615620f4b8f9a4df60fd4a5d0e40940af74d7fb93b39a48b955784 SHA512 f9eb08a53bb37e225312ee5f4c13c036f7522a77bdfdc368d8bc99165048ab9ee00dce4d3a4b263b69e2f52d5f88caa6eeb683e348bd3a1d2a2c496d13b8a75a
+EBUILD ldns-utils-1.7.0-r1.ebuild 1196 BLAKE2B 3743024ce280c8a1fd29b37f87333fd87d578cec89498be2b4cd8870f88f57081575c7236c883c95ed908bd5dd7b70ceda7311a6a660f3e2048b05ac1d97e353 SHA512 1305efbed428c05b10ec75e84ddf9dceb6d9087e87e3d1a1ae8b560a98db30b03366c005207135f3506d0fc40892fae4a8046f6b3a78367c490a8cae9940a06d
 MISC metadata.xml 742 BLAKE2B 78bcba18e70bea755bab35347639a1a529961e91b709b789c045db918525939e9fdb4a7adb6dd7801c64bd02090503d5b3edbe444fbf34615ec3ebb5342d2288 SHA512 a0c0fc0a7dd05890fa9b2d6bf99c5b96990d76993d27d18a382ab69e1200aa5f472865c5de928575d773f70ef21314519bc46a1d2a138da34d569bf56a7d8748
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
index 9fe878c5d5bc..9d5a0611c2f2 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="+dane ecdsa examples gost ssl"
 
 REQUIRED_USE="
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 761c9dfdf019..9f4e0d1ad0a2 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,5 +1,7 @@
 DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
+DIST libidn2-2.2.0.tar.gz 2110743 BLAKE2B 08a1f89d4b6edd7da4d91c9d21f9944c1ebb4064cb43147ac23fcd79f0a0bbd94e7d2b9a72382784f4aaca211cf9502a5117dfa63ab5fe72383188eeae6f628b SHA512 ccf56056a378d49a28ff67a2a23cd3d32ce51f86a78f84839b98dad709a1d0d03ac8d7c1496f0e4d3536bca00e3d09d34d76a37317b2ce87e3aa66bdf4e877b8
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
 EBUILD libidn2-2.1.1a-r1.ebuild 1319 BLAKE2B 15d25cfc11f73533d94bdd40c20bb3bcf313c7b79e3a2750b12af32f712b0156469b4a1198ab3f8653246ef19e1ebccb29a3b8f0bbf04d2ed0a4261b3497cb91 SHA512 a5c09aa232d92230a4ed703c8ca022b387fd2c2e9afd287f0bfa69912c97210fc79da5876b520d573dd7983604967e89a62911ebbc82d3462bde4736f0bb2b7d
+EBUILD libidn2-2.2.0.ebuild 1332 BLAKE2B 9ebf852e6f4af2212e70e779990586d1632483b204dd84c34f0773f19fbc76462fe6023fd7799431c2efb1dcb9c8254fdc658af5c8e52aed31faa324cddf883b SHA512 83050754150dfebea699555702da010a58c3e89f7287e9bc22c88f458b7a9d81b81e0db18dd95aff7f4aa84e7f503b5cac4453981fc540fec79e0b53d631b24f
 EBUILD libidn2-99999.ebuild 1416 BLAKE2B ea56153f0eb2ca68fcd2fd170e2cfeedc8399a3bf5ba78d8bc78250ebbd59dd05e4074dee3bb4d3caf67b4c3391de331a495423d0f0cdc16c953fd4fa75ea278 SHA512 66f96b4e87d01dbb779d29ab83cfe6c1e756dcbc5db1555ca9128f0faa7888156c45e71befb2daa45c86aa77afeb9bdd6551b6336b955f57fb4179d1b2c6e512
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/net-dns/libidn2/libidn2-2.2.0.ebuild b/net-dns/libidn2/libidn2-2.2.0.ebuild
new file mode 100644
index 000000000000..17c2e6485f02
--- /dev/null
+++ b/net-dns/libidn2/libidn2-2.2.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
+SRC_URI="
+	mirror://gnu/libidn/${P}.tar.gz
+"
+
+LICENSE="GPL-2+ LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/help2man
+"
+S=${WORKDIR}/${P/a/}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
+		# reason in the Makefile)
+		sed -i -e '/^TMPDIR = /d' Makefile.in || die
+		export TMPDIR="${T}"
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-doc \
+		--disable-gcc-warnings \
+		--disable-gtk-doc \
+		--disable-silent-rules
+}
+
+multilib_src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index a116bb15554f..b1b03e6c0464 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,3 +1,3 @@
 DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51aa6ff5b44fdfe08e96ccc78ae1d84f2115e5d59940e7e1cedf7e4fe7dc36a461839bcef8fc2c5b2e21242e441f36 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e
-EBUILD openresolv-3.9.0.ebuild 1080 BLAKE2B 0c62aff8e54eb913dd446eb149e4e65c9bda8b15bcccdc990a0698969f40d1ebcfc4c2266542b2f08abea56aa0a4e7bf5f2b1f41bf41b6971c4f12e9bb05e791 SHA512 ace9feadc6d28c8fe083160602b33196afb41e1f37777bb2bcef65060d8005bc1224ad772cf56a05913e2a6f6f158c85485ea91053c0c09f9ea23b87fedaf2c6
+EBUILD openresolv-3.9.0.ebuild 1076 BLAKE2B 8b2a74f45af82e138fe7c32df4db16ac568aca964f8bdbf46b8e76da008df2892fa8bca0aca4eeaf34076860bf989d30e08822fd5c56f73a97f72f8c92ffb80e SHA512 38048c5c4fe0db31a4d88c06c7e1e8f2dd766dafaaa37ef6a2b2e08ab71054d1057d5a0d00e97b76e9fe995178d3e089ed3a0cffe8b7ad8142416daeee88dc7e
 MISC metadata.xml 309 BLAKE2B 8abae227455bf1e75801e0dcf3b4165beedefc1499e12049e9eb6652302925a11b2b50ea09d417ed523e00103c5f2d7c619669d40bf3c98a7393b939bbb8a05c SHA512 311a9444ac8811bf1ea1a8bb06370b81360c6642921b2932095bd191d8784509bfe46189de8f073a34a831eaf1c8114c3b5bfcf67d0fe042ea2ecd8c1fc7cc0a
diff --git a/net-dns/openresolv/openresolv-3.9.0.ebuild b/net-dns/openresolv/openresolv-3.9.0.ebuild
index 71369c4473ef..2199d8c1229a 100644
--- a/net-dns/openresolv/openresolv-3.9.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="selinux"
 
 DEPEND="!net-dns/resolvconf-gentoo
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 9f802df171b6..18059e251607 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,6 +1,10 @@
 AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
 DIST pdns-recursor-4.1.11.tar.bz2 1239986 BLAKE2B 33c9b2a2f811c43b67ad2bddf5a11d5d95cc88679d46ba3513f3eeec97bf7694af493a9fea4f733f003056b5f0fc971112e9062883324102ecca28838e2f3e41 SHA512 6041d31f0a517786f44a7fa22c7bfa94d5d4bdc3a7f349d2b47bc66be87404fe8eaf76f45ca18ef8ab96a45c0271f46fdba93a51fbda2542a3ad96e10f51c1d1
 DIST pdns-recursor-4.1.12.tar.bz2 1245110 BLAKE2B 187fe117ab64f234d144d7e2d91a119afe1d6b0a45079f1f9527724081c64f594c8c5d5b4dbc6e25b4beef1fcdfb3e5caed8e5a434921bf6b66e07617d0fb6f9 SHA512 d228976937ede7e9f6b3375e573f5b436d9df7ae246e411b13acb095a1a58f12173b663acc364ce0fbdcc61b3d5522e101472a88da8f044e44541564f9915d9e
+DIST pdns-recursor-4.1.13.tar.bz2 1246775 BLAKE2B ec664baa9d98dde179f15777fb83817706770a88e08dfb61bf8bc9f1fcbd1e6e6064e44bda90da2d82ef4d15e33e0656cd6624c38b3922b5c662610085319164 SHA512 3b64caf291b80e1b0d024d607fc7e0fe8d51450a687a1090f0d0f7aab1a42a73fb31576a0acfddcee3f9c476f8bb0ac192a937f9c3481bef8031d34866b5f430
+DIST pdns-recursor-4.2.0-rc1.tar.bz2 1312628 BLAKE2B 9ab6462cbfad26bd5590af19ff0527d749e5e48aba21ac52603f0d481415491f584976de6c03fce1d6b6a3180226e343e0ed715678e1e0c523a9f25dc18ac47c SHA512 f524001d6303bb8aa83b90646915d7b5666056a8c177391ddd2fd94b610e9cca94a7f33cc65be39d76e57a0b823c87c5a16147bc7a92438ab0b2b8dc891e401a
 EBUILD pdns-recursor-4.1.11.ebuild 1756 BLAKE2B e2fbacc7c51b9979ec9b1a034cac79d3f0960b70614aacb69362577e047383d03b35e2baefd0e5ceea666baa913e4bf2c068b2ab9d28567f8bd0458b2c63506e SHA512 acd802ca6e50382bbe08992ee77791d08ad9aeae143d889423bfe5cd08818fe83e0ec091ab1e65020883d838779bc344b0969a6f90dbb241fb66666fb0b434d8
-EBUILD pdns-recursor-4.1.12.ebuild 1758 BLAKE2B bbee1332e0392092ccce34b4d75e10988559d5ed91a2aafa27c3408c6beb36468a303178f39b76edc42cb498318a7465578ee3dc3b2eba82f8c5a46e69532f88 SHA512 fb9ca18f4b87b744a5421648ea14039fe6f00a95434d3ab992723d8cd184ff2e04808a0a509d5be6515f32c98609024babd00b3d8a89e4e8319218686e13c064
+EBUILD pdns-recursor-4.1.12.ebuild 1756 BLAKE2B e2fbacc7c51b9979ec9b1a034cac79d3f0960b70614aacb69362577e047383d03b35e2baefd0e5ceea666baa913e4bf2c068b2ab9d28567f8bd0458b2c63506e SHA512 acd802ca6e50382bbe08992ee77791d08ad9aeae143d889423bfe5cd08818fe83e0ec091ab1e65020883d838779bc344b0969a6f90dbb241fb66666fb0b434d8
+EBUILD pdns-recursor-4.1.13.ebuild 1804 BLAKE2B 7cea57f7268aab9d16b526e070f7e8b999788f6d28707376eb4451b86af87b5f57b1ca14758b4e7e9e44833ac8583bd9ae24a7c3d4674ff373f2dbcc4f32cd71 SHA512 96e29573690bd3b44b31e2f80ebfd049f21d57fbc01de38d53e4804608cf3a61d0821a79baa3d3bc2a46f7cb6285641a876a6a331dea074a7163a0d8edac8b0f
+EBUILD pdns-recursor-4.2.0_rc1.ebuild 1788 BLAKE2B 4bd0954bbf949b75e3dd47c338af4b0e4148027b4bd5cf5df8ec5e6a8a387e6024b923ee5ede858eb6f581a38e2965e6e7a06a4a137ee0ae479c4870d684ccc7 SHA512 4ec082568d1265293da90cc24766b702aec0fd4371fa067c91b108ee367d5473c040c3461f01e6ab3d3998939aa82bd13f2b5332f38286a5d24361bea0328680
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.12.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.12.ebuild
index c054da53ceed..45a74d2b9434 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.12.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="libressl luajit protobuf snmp sodium systemd"
 
 DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.13.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.13.ebuild
new file mode 100644
index 000000000000..8c6bb86d0ac8
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.13.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug libressl luajit protobuf snmp sodium systemd"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable sodium libsodium) \
+		$(use_with !luajit lua) \
+		$(use_with luajit luajit) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
+
+	keepdir /var/lib/powerdns
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.2.0_rc1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.2.0_rc1.ebuild
new file mode 100644
index 000000000000..4430ff42e693
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.2.0_rc1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="" # ~amd64 ~arm ~x86
+IUSE="debug libressl luajit protobuf snmp sodium systemd"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-lua=$(usex luajit luajit lua) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
+
+	keepdir /var/lib/powerdns
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 15678c486073..1ade22e1026a 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -2,6 +2,8 @@ AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf40345342288
 AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02f2ad4324cb7c99a05736bac7cbe80e1b9081832cac95d8c482eb4d1a8c344a6b55da623e3 SHA512 6392f59f82b82621b6cab6823f7761cd875bc6818c48db846df289057c02d8119a1024c5ecdf70a5ca8a55c00a2c3c56240d36b42cc038a25e8616ab9b966dd6
 DIST pdns-4.1.7.tar.bz2 1116191 BLAKE2B 8c214bff6d1af8354dc0b22c2bed233ec92e217fcfda456f69a665eb615500452f2bea7abfbab506f93abc35d0466a26594734a242e5cfef2b62e789252274d1 SHA512 dc9c693ac2eaf11ddce220e7fedc40f6ae3f9d7a55352643b30db2aad0b2d543ad04a14199a06355275aba2d9dd7873087715a16157b0ff2f7335f1a4a4b96a2
 DIST pdns-4.1.8.tar.bz2 1116996 BLAKE2B df32e1e239f65a37570b1f3f6b7fd2384ea9ea4d60ecf6dc520441e7f004c9e17c1cb35358e1cd9b5080c85b6366354ae4b3e5eaeda20af18c6e411bb119bbc1 SHA512 1113745cdaa8fba591c176721893fb478e976861beee0cb6c0240e5afa6b68c9afae286579036b2ed77fffe76ca1e6f103cda915f8b7b875bcdc1253931ad935
+DIST pdns-4.2.0-rc1.tar.bz2 1221177 BLAKE2B fa911805bfe9c04ffe6b508e1deec716e9149a6cfe10b771bb8bb214c4b4db72a9d4990eb21145e13422388c48563e2951c6e7d210a59dc2d3569cac6a3232b8 SHA512 bd769a2e0159b44d5699b0166d20afe49d9c48aa04c170405099a897417a12887a4dfb54bf9c100498be37a519c91e08a96039b23bdbc1cf33499ea63841c1ba
 EBUILD pdns-4.1.7.ebuild 4196 BLAKE2B af3cfdf1057305c0675ea5aa66d6774a1a8625b2b53ed7ff132f916a0502c14662c8c9ae40d161bce8c088df68d7448ca971ba7007ceb9f8eb6c01578086f664 SHA512 99dc3cac1fc167c1b7e546209266717002f723898a74a43d1c566a0daf7f31c432db6ae39ba1e31edfc0ad2b3983c20c42f36d9ae7b3cd857e9500ebcd01bad2
-EBUILD pdns-4.1.8.ebuild 4198 BLAKE2B 6f5a5605abb7b08ccd7b959997db18d7f8adca4d1eefba2cd2dc3bff227eef09a6d345bee089cb7649a0a47e37f597404f9f9c9f3eebf42ea6906eaf93e15739 SHA512 10c501e58ded7213cf21eca41502fe2e9dda82733e54591c28ec97a9b58c6d59e3e402511a074082f9d6c28930239ca8a9fd4a590d0f2d4759c836eea91ca6b0
+EBUILD pdns-4.1.8.ebuild 4196 BLAKE2B af3cfdf1057305c0675ea5aa66d6774a1a8625b2b53ed7ff132f916a0502c14662c8c9ae40d161bce8c088df68d7448ca971ba7007ceb9f8eb6c01578086f664 SHA512 99dc3cac1fc167c1b7e546209266717002f723898a74a43d1c566a0daf7f31c432db6ae39ba1e31edfc0ad2b3983c20c42f36d9ae7b3cd857e9500ebcd01bad2
+EBUILD pdns-4.2.0_rc1.ebuild 4090 BLAKE2B b4310e3cd28309b960f6c9593f17d522a2859b27f86c4b4c469a8120bff116017a4a2b0690ed00f39693e5003a3775fd8fc70c2f89b325e4b206ec49a0ec7998 SHA512 63ce610a1a26b368dd7b625bf8f20313bc2966a45c2d584745304dccb1b11061e138d8bff173076b03d692822cdfe45a117ef03b0e39265a2010701665d767ac
 MISC metadata.xml 1330 BLAKE2B 17be53a41fc13a3739905f8409b49996b1958cfd04baf1d2982c923ee7b39ef5b8be627017a6efb1261f158f45660337eb22157ceaadc7b07ed5b5b3da7c7cdf SHA512 fb13690059baceefc1366423c524427655d54313f5690e12709c9e1dd4b9567d111d7d748c530286dcd24dc78acfa38baac88a5cfc9a2b01996baae6b47f39dc
diff --git a/net-dns/pdns/pdns-4.1.8.ebuild b/net-dns/pdns/pdns-4.1.8.ebuild
index 9c4996e63d3b..ad05ab448209 100644
--- a/net-dns/pdns/pdns-4.1.8.ebuild
+++ b/net-dns/pdns/pdns-4.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # other possible flags:
 # db2: we lack the dep
diff --git a/net-dns/pdns/pdns-4.2.0_rc1.ebuild b/net-dns/pdns/pdns-4.2.0_rc1.ebuild
new file mode 100644
index 000000000000..9bffaee27109
--- /dev/null
+++ b/net-dns/pdns/pdns-4.2.0_rc1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib user
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="" # ~amd64 ~x86
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="debug doc geoip ldap libressl lua luajit 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:=
+	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 debug verbose-logging) \
+		$(use_enable test unit-tests) \
+		$(use_enable tools) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		$(use_with lua lua $(usex luajit luajit lua)) \
+		$(use_with protobuf) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	newinitd "${FILESDIR}"/pdns-r1 pdns
+
+	keepdir /var/empty
+
+	if use doc; then
+		docinto html
+		dodoc -r codedocs/html/.
+	fi
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	enewgroup pdns
+	enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	if use ldap ; then
+		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 2efc18d44e66..7f3d92de5932 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -9,5 +9,6 @@ AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a7
 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 5371 BLAKE2B 210ca5db8c4fedf546d8caeffda1cf94f6366e9befe55be6c07ba273209ff2b5388509341c4540ee65aeedb3f543e0caa7fbac880121ba86f1426e856167689c SHA512 2f78e2c29c5ed3998260ae8803c0a5e9216f63c9001be4f62613e88899e130258b7a53e0072a621e2d436b6491ed688006cb2e8ccdf6e6426eec34d87d358648
-EBUILD unbound-1.9.1.ebuild 5376 BLAKE2B aa5a4eb9833094e082f52076a819fb5e05716d37f9423a3addb47bb64f508b6d4dbd2d12ca37ca13c701ea36a8fb4c33df35d30204cb5ceec889e3eac811f2de SHA512 3466847443d8548e4b961ad51e0dc8bc699b8954428715f82cce9069629fb486aef49a168b9922132d912d467bc9a144c36db0cb3116fbd690d3d9d17688ffb6
+EBUILD unbound-1.9.1-r1.ebuild 5406 BLAKE2B 92f267663f8174cf9ed701078773c5e56a2e44456788037ba392df6d4d3aacf7d3fab1447a93271bdf1ededc6bc4e2e010157f782389f48fa3678f2449acedd2 SHA512 761d406627a16bd9ed687c939f57e9b16e42e7aa9de84aa3b03aa11efb4efa9eb9910cbb73ab962dc34184159b46413540d8f6b1071059ac02231eda63190527
+EBUILD unbound-1.9.1.ebuild 5383 BLAKE2B 2e5777319dab657dea41e1eb2e6e325ed8dc0d5d6c9e7711ee4cd11e043bc9582cb58fcffa26d1264759fed85debfa8f23b21dde1a936730e47d7ecf1ea2eb0f SHA512 1cc7d4b7deef9d75412caee7633e487e22fea793454eb87554401bf8b1efdaf24b67c2d6a463232cddb4cf1ecd8ab90f998623df0c99e9c8434245f27b202975
 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/unbound-1.9.1-r1.ebuild b/net-dns/unbound/unbound-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..e4d1ceae7af4
--- /dev/null
+++ b/net-dns/unbound/unbound-1.9.1-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup unbound
+	enewuser unbound -1 -1 /etc/unbound unbound
+	# improve security on existing installs (bug #641042)
+	# as well as new installs where unbound homedir has just been created
+	if [[ -d "${ROOT}/etc/unbound" ]]; then
+		chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX%/}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX%/}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX%/}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX%/}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX%/}"/usr \
+		--with-libexpat="${EPREFIX%/}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED%/}/etc/unbound/unbound.conf" || \
+		die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	# make var/ writable by unbound
+	if [[ -d "${EROOT%/}/etc/unbound/var" ]]; then
+		chown --no-dereference --from=root unbound: "${EROOT%/}/etc/unbound/var"
+	fi
+
+	einfo ""
+	einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+	einfo "set 'auto-trust-anchor-file: ${EROOT%/}/etc/unbound/var/root-anchors.txt' in ${EROOT%/}/etc/unbound/unbound.conf"
+	einfo "and run"
+	einfo ""
+	einfo "  su -s /bin/sh -c '${EROOT%/}/usr/sbin/unbound-anchor -a ${EROOT%/}/etc/unbound/var/root-anchors.txt' unbound"
+	einfo ""
+	einfo "as root to create it initially before starting unbound for the first time after enabling this."
+	einfo ""
+}
diff --git a/net-dns/unbound/unbound-1.9.1.ebuild b/net-dns/unbound/unbound-1.9.1.ebuild
index 6ae0e2e35b3e..8dde19fcab96 100644
--- a/net-dns/unbound/unbound-1.9.1.ebuild
+++ b/net-dns/unbound/unbound-1.9.1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-dns/validns/Manifest b/net-dns/validns/Manifest
index 6618e6a8ecef..e35fa1c9a3d7 100644
--- a/net-dns/validns/Manifest
+++ b/net-dns/validns/Manifest
@@ -2,4 +2,4 @@ DIST validns-0.7.tar.gz 185377 BLAKE2B 53d1607062e4d6669b82bc5bfa3ff987eafabbb9d
 DIST validns-0.8.tar.gz 190325 BLAKE2B cb1f7200aa9256e24bc9c9d071c4680e22ef436dbe997bc0278331b76131070d3797012d0f40f7bd66f5cfa2c8b8baef80753764caf758351a41c27f8cc59030 SHA512 2443bb8a7373f27d41ab3be1a92b61696d05b74afa42c19db54f6e999e4a634499faa44a5feefd3bc515bc677a8ef0a076092cf13316eff6d1cc504ff9702038
 EBUILD validns-0.7.ebuild 526 BLAKE2B b108891333f275e69e8320e136dbe42cd491f07ebeb842ff2a14b471acb51d18c84d9adf3bb3600372ccc9502d49211e8456b628a6282cb9472e1c95b33c6582 SHA512 301fb91e5dbfb030f3cb16cb5e3a4ee07a8692e600b6a33ea049250ae430c751d50ed1e2945ead284795c4b19091f7de9fa74a7fcd000ddcc917a89e12e4fc6a
 EBUILD validns-0.8.ebuild 526 BLAKE2B b108891333f275e69e8320e136dbe42cd491f07ebeb842ff2a14b471acb51d18c84d9adf3bb3600372ccc9502d49211e8456b628a6282cb9472e1c95b33c6582 SHA512 301fb91e5dbfb030f3cb16cb5e3a4ee07a8692e600b6a33ea049250ae430c751d50ed1e2945ead284795c4b19091f7de9fa74a7fcd000ddcc917a89e12e4fc6a
-MISC metadata.xml 667 BLAKE2B 267d0c89bb03695add59a50dd203f3c40b52e7fd3eb67bfe3edcf2b3fe5f9b959b6b83926aa62948bdbdc57acfee7492e7ce71f2d9ada959dead41dbba4d0053 SHA512 2769398f65753d988431df8d9b19f21cc957a491ea8115b5f19f3591e19cf805fe5257f2b1a51c1ecdb2a70d5deda64480f2b90ff5927bad12e303ee2bdef475
+MISC metadata.xml 471 BLAKE2B bdb426332df401e1df1fc63668c077dfc5b4275ba7e9e1734a9a59e6cbccd433214323fc20a93eb3d570f653087250b85451f1402f1c8724a929ea98d98be6b8 SHA512 26c46b8856c214a71ac566859c44f7ed029d96d9e61f98094d9cce02201c3c4520986bd8aeafec734ecc6c89d95266544f21b0c58677c6411c49ff7e85f73142
diff --git a/net-dns/validns/metadata.xml b/net-dns/validns/metadata.xml
index 87897f6ba70a..9fe242e22541 100644
--- a/net-dns/validns/metadata.xml
+++ b/net-dns/validns/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tom@whyscream.net</email>
-		<name>Tom Hendrikx</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>Validns is a standalone command line RFC 1034/1035 zone file validation tool that, in addition to basic syntactic and semantic zone checks, includes DNSSEC signature verification and NSEC/NSEC3 chain validation, as well a number of optional policy checks on the zone.</longdescription>
 </pkgmetadata>
-