gentoo resync : 22.10.2018

25 files changed, 617 insertions, 27 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index a41568b15e2c..9f9428e5a149 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index 50a4566017cd..be50c7ccc140 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -16,5 +16,5 @@ DIST ddclient-3.9.0.tar.gz 59018 BLAKE2B b9b58108d9f124fcd5a72cc57bfb0e6a5bc2e11
 EBUILD ddclient-3.8.1-r5.ebuild 1416 BLAKE2B ea2a67f9e888bbeea5208309ee71c87d35c98fd36a94bcd445224c40915226a81ba70d253bac29f55c0b87649ba15122115c854b40b06d67ff85bd85c6ab7b78 SHA512 a9215c25bd9c90042267eb9c1f0c2258d86c814ac3d343c8c795ecf8eb7eda6cc3ce7fbf1823f917b60724232d118d5904cb55afa1549f875466fcefb7dfb2bb
 EBUILD ddclient-3.8.2.ebuild 1176 BLAKE2B 7e1a9334915c9eedd9c3069af36c7d54c7a5a086b4bade3ee4afb55985dc9972bc09295943b795bf086c03d3b8775ddf4089825a43e89438c3a93e98116a6aef SHA512 b1105c13c16deda9923b1507fe6727905bc92911c3d6f206047ef4f89fc046feb08ed982448ce42743be06bc9f7eea3a5a2fa28f863459930512b5adee51335b
 EBUILD ddclient-3.8.3.ebuild 1190 BLAKE2B eebc90117aaa01be120afbd067090d01a5e2c33a4f41ff0bdce474a1f7da5ca0ca805d5743fa4ae3f762d7a0398fac628b4c261b39ce375e7c7d74ee711f1b41 SHA512 584e18a5bdbc165e216e74650a3fa48fdffa1bfde112ae30ce0d7a3c677ee67dc9c988fecc9a7bf059a483dfa54837d075536cfd826a1613169140f32efde3e4
-EBUILD ddclient-3.9.0-r1.ebuild 1503 BLAKE2B a28084389ca9a45a2d7337fcf54e5368ae8cabcecb771f8b64fcf09ac3ac712f2e3a49221ddab216bbcbda90ece7f12d4bf69eb6229a90f917ba547a338d16e3 SHA512 e259bea837158be04298c32acb032bcf7d366eba2048836656c6da4afa7f204d71bf8c988f8f8d7f51e2f7ae44a897541ce485066f15c107e7f9ddcd68c9cbec
+EBUILD ddclient-3.9.0-r1.ebuild 1526 BLAKE2B e6bab744fcea641ec83cbdb928f288fb8f89a012a45fca18e17a86c21945cdb2e26e0e061be1b09b469d9483740ef61bca19ff128f30b39393a58dfde52407bb SHA512 bbb7db7c316250546423bdf748132a6539790500eb12634af9f1c4890b281222e43640b0c5006e9da6d168f416b6bf095cc9178486a1fd49e68baee9059f0b8e
 MISC metadata.xml 1291 BLAKE2B 65ca31729d3503bd783e30255bd2bbd4ecccd11d51ed608a3c3515e1f538570ac2e0919cc96dc1901dcd14660c55289b30c37e53d65d5a27ebf67eb1f4d2bdcf SHA512 fe66dba44ea97947a4f6d7367486be7a7fa3adf0a877b2f6fb7d3954e13b2fce1edc322078cd0cda3260896be9e533840fba8281eef74787640ac6350e722885
diff --git a/net-dns/ddclient/ddclient-3.9.0-r1.ebuild b/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
index 5e18aacab160..e1563a5a0e8c 100644
--- a/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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="~amd64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc64 ~sparc x86 ~x86-fbsd"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="examples iproute2"
diff --git a/net-dns/dnrd/Manifest b/net-dns/dnrd/Manifest
index b4f35b43f979..7c580aac970f 100644
--- a/net-dns/dnrd/Manifest
+++ b/net-dns/dnrd/Manifest
@@ -1,6 +1,7 @@
-AUX dnrd 356 BLAKE2B 64a8d45b30c91271c64db78b44af7356af6f03c123d917804f4ca29e9f7232a79e3603becec06937e49fcef8d92447b359bd530eefffa39d90d4d380f94ede95 SHA512 16ac5a0f40206b3dfaa178adba77c605bee57eca7b81e026c4e76b520894876f28ed8cea4281410453cd7a46e5b306f2280b67c80f1c5254f2f16d5489640685
-AUX dnrd-2.20.3-docdir.patch 711 BLAKE2B 9626f7f89529a38ad19631bd3e73cc58e9fbfd915b9fcb2b771a022eba3ece8112bb7a7e5a8316e6550843e4b8df25f5533d76a51eaea6634349cd808c3d1fb6 SHA512 0f97a79bcad417cbef90fdedebd116bc89490588065a242b2e0002b10f98ec2ecf45807cfd3333882426ddbde64eedad6ccdc71a149b6c28f6cba03d7b3cabf6
+AUX dnrd 444 BLAKE2B 100e9de8f2f3191b4b1c8e78bea41f4a8ae2f5b1b48eca025d5e55f07241f42e0d6cae70281edf9722a7893978501b8ce39acddd12df4e372f5a1658cf96e660 SHA512 5aed41fd2f8a4b7395308341fd48ba00d7707d7ee942c2b57958eb36f4637b0d04468bd8c8fb324205992f39d2fb53af0abef8a33f2b964a763e093cc8659dfb
+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-r2.ebuild b/net-dns/dnrd/dnrd-2.20.3-r2.ebuild
new file mode 100644
index 000000000000..571076853a7f
--- /dev/null
+++ b/net-dns/dnrd/dnrd-2.20.3-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools 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"
+
+PATCHES=( "${FILESDIR}"/${P}-docdir.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	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/dnrd/files/dnrd b/net-dns/dnrd/files/dnrd
index 9fb87107b7a8..4fcc2112cf2e 100644
--- a/net-dns/dnrd/files/dnrd
+++ b/net-dns/dnrd/files/dnrd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2003 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2 or later
 
 PIDFILE="/var/run/dnrd.pid"
@@ -11,13 +11,16 @@ depend() {
 
 start() {
 	ebegin "Starting dnrd"
-	/usr/sbin/dnrd $DNRD_OPTS &> /dev/null &
+	start-stop-daemon --start \
+		--pidfile ${PIDFILE} \
+		--exec /usr/sbin/dnrd \
+		-- ${DNRD_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping dnrd"
-	/usr/sbin/dnrd -k	
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
 	eend $?
 }
 
diff --git a/net-dns/dnrd/files/dnrd-2.20.3-docdir.patch b/net-dns/dnrd/files/dnrd-2.20.3-docdir.patch
index a3d1c8002d51..fe0c0d347e7e 100644
--- a/net-dns/dnrd/files/dnrd-2.20.3-docdir.patch
+++ b/net-dns/dnrd/files/dnrd-2.20.3-docdir.patch
@@ -1,7 +1,7 @@
 Index: doc/Makefile.am
 ===================================================================
---- doc/Makefile.am	(revision 247)
-+++ doc/Makefile.am	(revision 248)
+--- a/doc/Makefile.am	(revision 247)
++++ b/doc/Makefile.am	(revision 248)
 @@ -1,5 +1,4 @@
  PACKAGE = @PACKAGE_TARNAME@
 -docdir = $(datadir)/doc/$(PACKAGE)
@@ -10,8 +10,8 @@ Index: doc/Makefile.am
  EXTRA_DIST = $(man_MANS) $(doc_DATA)
 Index: Makefile.am
 ===================================================================
---- Makefile.am	(revision 247)
-+++ Makefile.am	(revision 248)
+--- a/Makefile.am	(revision 247)
++++ b/Makefile.am	(revision 248)
 @@ -1,6 +1,5 @@
  PACKAGE = @PACKAGE_TARNAME@
  SUBDIRS = src doc
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 2a35a89465f8..9f518c17cee0 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -6,5 +6,7 @@ AUX dnsmasq.confd-r1 170 BLAKE2B 84d5cdb15236c9e1c83fa53d0e401df90e86c6687cc88f9
 AUX dnsmasq.logrotate 176 BLAKE2B 4932be8c2a4ba37e0ed61361cdfae6e6cd498e5292f9002a3426c05632896a5f94a84ada168d672cb38e236cbde72b59201c970e348ba052dff655be1a9a57b4 SHA512 b59b299849487dcdfc18ab30ded0605e2df4876cb778b2d1cd03b740406a5580001028eb33f1ecf0dc910f393c58b7cad7c28801aa4641c3fa376e3dac997abf
 AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8fce1f7360928a374fe4c429df1f8ec2ffc093752234f9e2ccc717a887fa2557e3efd99ab6bd58f9ac0f SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1
 DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f
-EBUILD dnsmasq-2.79.ebuild 4595 BLAKE2B 7745df4ce05578681a1986017f897cb14273c5fe9b47f6ca5b136266572617497120d2e3efefba53515a217f243774325c6ed2ccf100bca9aacee0bbe255a558 SHA512 2cd18fa87627421a6eb56d7e75ab9560cde53f80b04f13d85b0edd68a828740e1827c5f0231beb6590630ef38e9d6df4e5cd8572497c7d649d8df53ba37f2e54
-MISC metadata.xml 1149 BLAKE2B 9d9b9c87dd5bf6233d4656e0de77cd9e5d75ef631731c2e9d06917ade555422a5d4dbd846bc6bc7b5ff411a7d706f35ba68bb8d5ec8f793d878bba2de86a1b44 SHA512 7fad0bb400a664a67e82173015dcc2fc95644dd6c357e787b8257a193dc14adbee8f5a04cb4422fadefdeec0d3dc5bd986f4f5b44ee420b8a104cb5a8e1b58a6
+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 4740 BLAKE2B c7ed685f2713f23b9e29d1d1c18a52997b7f68e080a8ff23e9bd393eae755be65f52525c40e6ad2ce370eceb79f585b7a28672e00753e89b35b69bd93e42f458 SHA512 87512e61093cbcf24326a29bafb72f850f30e6099c8253acb41c1f10f4909d774e0d94e32a48d787117723817f547e6686464b523c1ae668b8b8f0779143574d
+MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.79.ebuild b/net-dns/dnsmasq/dnsmasq-2.79.ebuild
index 3511354d396a..3b7329f0c0ac 100644
--- a/net-dns/dnsmasq/dnsmasq-2.79.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.79.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
 
 CDEPEND="dbus? ( sys-apps/dbus )
 	idn? (
-		!libidn2? ( net-dns/libidn )
+		!libidn2? ( net-dns/libidn:0 )
 		libidn2? ( >=net-dns/libidn2-2.0 )
 	)
 	lua? ( dev-lang/lua:* )
diff --git a/net-dns/dnsmasq/dnsmasq-2.80.ebuild b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
new file mode 100644
index 000000000000..5976927532a0
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2018 Gentoo Authors
+# Copyright 2017-2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic user systemd
+
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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"
+
+DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
+
+BDEPEND="app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+COMMON_DEPEND="dbus? ( sys-apps/dbus:= )
+	idn? (
+		!libidn2? ( net-dns/libidn:0= )
+		libidn2? ( >=net-dns/libidn2-2.0:= )
+	)
+	lua? ( dev-lang/lua:* )
+	conntrack? ( net-libs/libnetfilter_conntrack:= )
+	nls? ( sys-devel/gettext )
+"
+
+DEPEND="${COMMON_DEPEND}
+	dnssec? (
+		dev-libs/nettle:=[gmp]
+		static? ( dev-libs/nettle[static-libs(+)] )
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	dnssec? (
+		!static? (
+			dev-libs/nettle:=[gmp]
+		)
+	)
+	selinux? ( sec-policy/selinux-dnsmasq )
+"
+
+REQUIRED_USE="dhcp-tools? ( dhcp )
+	lua? ( script )
+	libidn2? ( idn )"
+
+use_have() {
+	local useflag no_only uword
+	if [[ ${1} == '-n' ]]; then
+		no_only=1
+		shift
+	fi
+	useflag="${1}"
+	shift
+
+	uword="${1:-${useflag}}"
+	shift
+
+	while [[ ${uword} ]]; do
+		uword="${uword^^}"
+
+		if ! use "${useflag}"; then
+			printf -- " -DNO_%s" "${uword}"
+		elif [[ -z "${no_only}" ]]; then
+			printf -- " -DHAVE_%s" "${uword}"
+		fi
+		uword="${1}"
+		shift
+	done
+}
+
+pkg_pretend() {
+	if use static; then
+		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
+		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \
+			"the static USE flag is ignored."
+	fi
+}
+
+pkg_setup() {
+	enewgroup dnsmasq
+	enewuser dnsmasq -1 -1 /dev/null dnsmasq
+}
+
+src_prepare() {
+	default
+
+	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
+	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
+}
+
+src_configure() {
+	COPTS=(
+		"$(use_have -n auth-dns auth)"
+		"$(use_have conntrack)"
+		"$(use_have dbus)"
+		"$(use libidn2 || use_have idn)"
+		"$(use_have libidn2)"
+		"$(use_have -n inotify)"
+		"$(use_have -n dhcp dhcp dhcp6)"
+		"$(use_have -n ipv6 ipv6 dhcp6)"
+		"$(use_have -n id id)"
+		"$(use_have lua luascript)"
+		"$(use_have -n script)"
+		"$(use_have -n tftp)"
+		"$(use_have dnssec)"
+		"$(use_have static dnssec_static)"
+		"$(use_have -n dumpfile)"
+	)
+}
+
+src_compile() {
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		COPTS="${COPTS[*]}" \
+		CONFFILE="/etc/${PN}.conf" \
+		all$(use nls && printf -- "-i18n\n")
+
+	use dhcp-tools && emake -C contrib/lease-tools \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		all
+}
+
+src_install() {
+	local lingua puid
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		COPTS="${COPTS[*]}" \
+		DESTDIR="${ED}" \
+		install$(use nls && printf -- "-i18n\n")
+
+	for lingua in "${DM_LINGUAS[@]}"; do
+		has ${lingua} ${LINGUAS-${lingua}} \
+			|| rm -rf "${ED}"/usr/share/locale/${lingua}
+	done
+	[[ -d "${D}"/usr/share/locale/ ]] && \
+		rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/
+
+	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
+	dodoc -r logo
+
+	docinto html/
+	dodoc *.html
+
+	newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN}
+	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnsmasq.logrotate ${PN}
+
+	insinto /etc
+	newins dnsmasq.conf.example dnsmasq.conf
+
+	insinto /usr/share/dnsmasq
+	doins trust-anchors.conf
+
+	if use dhcp; then
+		keepdir /var/lib/misc
+		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN}
+	fi
+	if use dbus; then
+		insinto /etc/dbus-1/system.d
+		doins dbus/dnsmasq.conf
+	fi
+
+	if use dhcp-tools; then
+		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
+		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
+		if use ipv6; then
+			dosbin contrib/lease-tools/dhcp_release6
+			doman contrib/lease-tools/dhcp_release6.1
+		fi
+	fi
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+}
+
+pkg_preinst() {
+	# temporary workaround to (hopefully) prevent leases file from being removed
+	[[ -f /var/lib/misc/dnsmasq.leases ]] && \
+		cp /var/lib/misc/dnsmasq.leases "${T}"
+}
+
+pkg_postinst() {
+	# temporary workaround to (hopefully) prevent leases file from being removed
+	[[ -f "${T}"/dnsmasq.leases ]] && \
+		cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
+}
diff --git a/net-dns/dnsmasq/metadata.xml b/net-dns/dnsmasq/metadata.xml
index dd1a2a161c68..9a597f9b11bb 100644
--- a/net-dns/dnsmasq/metadata.xml
+++ b/net-dns/dnsmasq/metadata.xml
@@ -11,6 +11,7 @@
 	<flag name="dhcp-tools">Install extra command line tools for manually managing DHCP leases.</flag>
 	<flag name="dhcp">Enable support for acting as a DHCP server.</flag>
 	<flag name="dnssec">Enable support DNSSEC validation and caching.</flag>
+	<flag name="dumpfile">Include code to dump packets to a libpcap-format file for debugging</flag>
 	<flag name="id">Whether report *.bind CHAOS info to clients, otherwise forward such requests upstream instead</flag>
 	<flag name="libidn2">Enable support for Internationalized Domain Names, via net-dns/libidn2 rather than net-dns/libidn</flag>
 	<flag name="script">Enable support for calling scripts when leases change.</flag>
diff --git a/net-dns/dnssec-root/Manifest b/net-dns/dnssec-root/Manifest
index ba27085fd605..0336ce2823ae 100644
--- a/net-dns/dnssec-root/Manifest
+++ b/net-dns/dnssec-root/Manifest
@@ -11,5 +11,5 @@ DIST root-anchors-20150504.p7s 5001 BLAKE2B 088dc39160013dbc63a82fcb7666c7c73707
 DIST root-anchors-20170203.p7s 4095 BLAKE2B 21c3d482cd2faa7dd85b45385b4dd4a00c8f0f5e8060a9f99df4e309e6d11bd77ae2dcc68d51eefed685dc48e9bba578ef885a6058ee3862072cdc156d254c1f SHA512 caecf5fbe3b0db140ed506fc7a3711e89e1fc2dacbdc7aefb36766f07af4c97c42466000e51bc2e9cd46a3764ccd482b93da448861aaed90a0f5cf13103b4792
 DIST root-anchors-20170203.xml 651 BLAKE2B 0f2321e27cfbf88fecee0840db3b3265c6f062753b8a15d972dca12c19fdfea616470fe200b7ec4cb069553f532b6464a2784d56636d9096956eabc496eb4a6e SHA512 a0799cf2d5bec0d527d511e016a075ffd0af450eda010a4c780f7e12b2218ec577576137703cf1413352d3aac3cfda945a8a830dbb3618557f5e629049d763f4
 EBUILD dnssec-root-20150403.ebuild 2986 BLAKE2B 44564df76bd319bcd88b5ccce52e5e344183749e031de3b3e6dc32f4a4f393b43d13ab7ad5cc3d6c3453c0f655fb812775d966b9021529657eda19ae6f3aa90e SHA512 2fb3d178b75d08b8e47c46b704dcbce0e30ddfbe5b272e8741c5ba3fc5ba3847f6bf6db552d18b1d77f56f40b336e1df543bd07c36e32654cec888edd180642a
-EBUILD dnssec-root-20170203-r1.ebuild 2788 BLAKE2B d8da2d3d90de8302c3eedd1b47bc15616fa8901edcc492275e71aa8b94fcd0adf4334fe82149f6f01059f39fda8422e83109e31629bb9d96876b9c44fbe978d5 SHA512 1601381d7403e53d19721f0d5349b1b79a201ee19d78dc9abc123a4499ebc0a126b7d0bb0f9e9fcce67649da424619b976fe5fc5f0c2c8ccf7cccaec809b94d9
+EBUILD dnssec-root-20170203-r1.ebuild 2787 BLAKE2B 32f4af0a3afbfd9a80fa5aac8245e4d6cc383a0518d04a1f9b06af6c96ddc15ead0c56f901b0ff6b45a35e79ff39193e05f5871e440d18bc0128cba74eb2d8d2 SHA512 94b89d0fca2dafbbf84f0845ed0ef9958d4bb77e8ed588633595ed9c026987897e45bf65cc8d3f5892f0dc0d29807b3e34121013953ad173cf3b125ab91524b8
 MISC metadata.xml 327 BLAKE2B 62401c527b8fc9b2bbcfe6502060fe06543e2fbebcea988e0b0c50223aec705d6c0e04e7233f5aedcf4694889fa23397c03b1048df07ec8de59f7bac3c3efdc0 SHA512 27361587e570a2f35e178724db7cf89cafc4da8e64984c7fd79971a469f96c128ed488b03e59fc3de4a1d1012664aaa66540dc79f0a85c9f191c19bc864bb1fc
diff --git a/net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild b/net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild
index 63c08e88bb7e..46c77ef4d90b 100644
--- a/net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild
+++ b/net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-${P
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index ecb06e746775..b3ce3bd52df0 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -3,6 +3,8 @@ AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc3
 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
 EBUILD knot-2.6.9.ebuild 1863 BLAKE2B 4543b8035b5a1939c6b739ed9edcff94098e56184116a2f4f9408b3a2252fe37cd94264cde36304875e61767ceaf1e1dad77464c4200aa377a645db375091dba SHA512 808cf7f8b0a1e2a4232e8943c7dc02713cb724140e964b23e5a0d9d9201907c5f5ec4a8902d575adf398824757a51e0540b4be7c3b8597026a40c397e5a6e756
 EBUILD knot-2.7.2.ebuild 1908 BLAKE2B 50a876560f36b6c6fdfbef4f7c3ca0b6f15202be8d5d169ada4604ed0b9c5892f8930903b271384061dba154e07ba43ca6b30e67f64a68f184578a711f6ca53b SHA512 43081a407699b81af13382edf983d383ee0dbca2001943b9c8591641a4aade6fc789340f57156eab8494d3f0ea7714ec7c450f202209f1c0a2483ed3f1f96df7
-MISC metadata.xml 1695 BLAKE2B a9a57a1a47be9a439018eeb5e670c057812f8fe8e54fe3f19d95e096a9daf916578a2a8887d5dcba18ad92c2b630cbe01a4122ae8671ee0a44dab01221f69b91 SHA512 373dd428815ebc5b8d0f689ae6e6a3dd3788a63f01e26e51fd01d9174d5692c5a5180ac3b552fd377c1a78e461c4c1d21ce721bc9093d6188f0049634ed48d93
+EBUILD knot-2.7.3.ebuild 1921 BLAKE2B 7417f96a92271fc81b795cf3bbaad7ca005447b67bf27d3ef887732a0479584be2770e43604b383380cddbb3a36a251dcb3154d9866da65e1680c4041562952c SHA512 8f4586ec916dd33fd89a63fdba419a8a81318e023371392ff01ba0428263c5cc3890b2e6f098913b029d0437b865564752b715cb17b6658be507f742473657d4
+MISC metadata.xml 1776 BLAKE2B 704ee480034e47aa62a552ae559671728d96df078dca931c9acc1ab58bcd502188c21820cc8300f536e793515765ed32f6e9cc8f48d9b01b91a959df98a9aa92 SHA512 57ec897a014478f4f5693cd242ecf76215dcf2c331e951bc2a5c0f7b492a76a49cb86d54885325fff2777470119da2f8ea140afece4b70ae410ffe50a4a4679a
diff --git a/net-dns/knot/knot-2.7.3.ebuild b/net-dns/knot/knot-2.7.3.ebuild
new file mode 100644
index 000000000000..28488683ca8f
--- /dev/null
+++ b/net-dns/knot/knot-2.7.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="High-performance authoritative-only DNS server"
+HOMEPAGE="https://www.knot-dns.cz/"
+SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+KNOT_MODULES=(
+	"+cookies"
+	"+dnsproxy"
+	"dnstap"
+	"geoip"
+	"+noudp"
+	"+onlinesign"
+	"+queryacl"
+	"+rrl"
+	"+stats"
+	"+synthrecord"
+	"+whoami"
+)
+IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
+
+RDEPEND="
+	dev-db/lmdb
+	dev-libs/libedit
+	dev-libs/userspace-rcu
+	dev-python/lmdb
+	net-libs/gnutls
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
+	geoip? ( dev-libs/libmaxminddb )
+	idn? (
+		!libidn2? ( net-dns/libidn:* )
+		libidn2? ( net-dns/libidn2 )
+	)
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	local u
+	local my_conf=(
+		--with-storage="${EPREFIX}/var/lib/${PN}"
+		--with-rundir="${EPREFIX}/var/run/${PN}"
+		$(use_enable fastparser)
+		$(use_enable dnstap)
+		$(use_enable doc documentation)
+		$(use_enable utils utilities)
+		--enable-systemd=$(usex systemd)
+		$(use_with idn libidn)
+	)
+
+	for u in "${KNOT_MODULES[@]#+}"; do
+		my_conf+=("$(use_with ${u} module-${u})")
+	done
+
+	econf "${my_conf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -C doc html
+		HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+
+	rmdir "${D}var/run/${PN}" "${D}var/run/" || die
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/knot.init" knot
+	if use systemd; then
+		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	enewgroup knot 53
+	enewuser knot 53 -1 /var/lib/knot knot
+}
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index b4c4ececc733..d03b90100dde 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -39,6 +39,9 @@
 			Enable the module that sign zones on the fly instead of
 			pre-signing zone
 		</flag>
+		<flag name="queryacl">
+			Enable the module for query access control
+		</flag>
 		<flag name="rosedb">
 			Enable the module that staticaly override certain
 			responses
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index d14c8765dc47..0ac44464d92a 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -2,5 +2,5 @@ AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f775
 DIST pdns-recursor-4.0.8.tar.bz2 1071831 BLAKE2B d9ab0dada8efa4b05c136650b9a2eab3aec4acab28ffb6da5bb4f627dc085b2c2d046d1f0dac5cf6e7054b47d76b8d7b95f56cc096b613891a4422b77e9abe9d SHA512 9886fccd3042904b7133e03a7b45479c8f2f57ecb33e4a043703b5e84816cd04a331503870e16030c86b353c1e14d9283dba767c1247e46ed6e14b7e0e93a5ef
 DIST pdns-recursor-4.1.4.tar.bz2 1224360 BLAKE2B ddfa4f8c6a4534ef41dcb2e5341a9eece84a44a5a77f1f8cdd251a84888d428283a1396de74e9b50239f0663c05fa60fe36b2a4fb44689215518ea390584501e SHA512 1904685dfdcd69d4b85c4c70559d51cc8ef288551ffd8f93a96108c3aca4e46ec3950f93840e4bd39da00c63129033b5a541beb68d1e924d477b5b0abbf1d00c
 EBUILD pdns-recursor-4.0.8.ebuild 1698 BLAKE2B bf67849d5f47c1f0d148596aea3fbc4268ad6696761f76f7fdb3b3b574708b01a464f12ae2a6c1df8979d60ec0cb877542dbf927af91bb2709e4510ce675a691 SHA512 358312b26fad4c6f2c473b7756f9c6d71c77045d6c7d0e92a10555848bc1643d9fc59454f61f8286d0891d181a1f6b20eeae055598dc7b150ba06faa0af44650
-EBUILD pdns-recursor-4.1.4.ebuild 1761 BLAKE2B 58f387bb7f37ec1ddb90409ce756b399271d850088647b58528cd1e69b9fe0561e587bfddc11183dfa386c54f796f0923e20155c4d839bb91334aa1a00020dc9 SHA512 4afac7ed9c7948c0caa65c812cbc17883c1edde853f413862e29ed4c2bb9a61c97e18f68b31aa5c6ac6f4f6380f916e554fd061c934fd924439b1d955ee06afe
+EBUILD pdns-recursor-4.1.4.ebuild 1756 BLAKE2B 1a3c13fc02d5b8a7a42ca513155ba244497ec3f667dcff34a51e9e7cf3b67534d66aacfb6498bb895edf952e96aaf247e8b67f321d0cbfe1d47b193b60e77e74 SHA512 a740b4dee0291128f4e58655975bbf32752906bdc0b75392026a7baef90adc8bd14c500df7b123c56bc883c38687ac64e936a8deb0f9bedccb02a3ee371ebcac
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.4.ebuild
index 29926f6c42d1..2e627d8108a4 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.4.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -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/Manifest b/net-dns/pdns/Manifest
index 7ef56f953141..f44ae7181f71 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -3,5 +3,5 @@ AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02
 DIST pdns-4.0.5.tar.bz2 1323468 BLAKE2B 7e10cc98177bfa4f81888e2598ab4f0ce83ee45e6349372c065940424a74015302da879536dea8346fe7b86f35c0524a5449489bdf71d1a091b7c6a82fac4b6f SHA512 4b0fa932c1d9caf35b988916447aa21c64ebe2a58bdd84417cf09321a21b264cf1057206dc6993a45a3b591eb1dfa49463710c06b6bdfaf6fb17ae6dec6086d9
 DIST pdns-4.1.4.tar.bz2 1089376 BLAKE2B bdf1736c547927579af7557f695bfd63c4f0ea270ce8d90ddbad186d24bc8c7851254b99ee44d418d0b8c92be0b9d61f10f11f7a491baa8e00e0197b511b1a1e SHA512 ae5cd89d039635beddcb9709d0f6b06321a923343900f88e536aac2feb1e08d41b466b6addb2399f50b20d7ac19fcf4c48d47d0d9219367b37b260c40863ad93
 EBUILD pdns-4.0.5.ebuild 4189 BLAKE2B e54c01a4a1882bb4e27b500ce18d7ff65694c8c22f575163878c183553dcd25f24a2cb9ed6e364efa68c26ba484b6119e55b78bf282def187559bad81ea297a9 SHA512 af0831d53921f643a124bcab3e4bcf7143345c4aa88e49ecd52fb2e3aece4414c0ec0c8e523f382c1ae30029de453f12e90dc8eb39ca27d9ed230d955b80c7d0
-EBUILD pdns-4.1.4.ebuild 4201 BLAKE2B 26d83c4153d0cd519c16352844fce4c8dc61cf4c80a0dd4022e2df9fb5b9633315bad89f97a2bd49ba3c4bd1a703b1dc5d8efa52a7a1ec1632e7a04d3e505902 SHA512 9e5bb2f914f0ea8b0edab84c8004a53b93f3910c4ecb549f9a836318b46a1781ca6927fe7673397bcaf451787337fe0ba07b8127c68da2ce9cce0ca04c0860dd
+EBUILD pdns-4.1.4.ebuild 4196 BLAKE2B 8db15298f19a709b4b2cbdc770dff132e1db2d3a77a9fade3cbe608fe377be82a89ffc578c23591eac78c6e364ec7bc87f81642e02c8945a3430929563cdf47b SHA512 464975e69174c198d75e92aa040d2fd8c720d78addf7c8f2bc3f187635f12246aea547b7b86f368eb430b102b2ca9160a1e8ed69754222286e5f03f84d606b0e
 MISC metadata.xml 1330 BLAKE2B 17be53a41fc13a3739905f8409b49996b1958cfd04baf1d2982c923ee7b39ef5b8be627017a6efb1261f158f45660337eb22157ceaadc7b07ed5b5b3da7c7cdf SHA512 fb13690059baceefc1366423c524427655d54313f5690e12709c9e1dd4b9567d111d7d748c530286dcd24dc78acfa38baac88a5cfc9a2b01996baae6b47f39dc
diff --git a/net-dns/pdns/pdns-4.1.4.ebuild b/net-dns/pdns/pdns-4.1.4.ebuild
index 45e60be2b588..d37fb5d3a775 100644
--- a/net-dns/pdns/pdns-4.1.4.ebuild
+++ b/net-dns/pdns/pdns-4.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -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/s6-dns/Manifest b/net-dns/s6-dns/Manifest
index 923ede801e0c..b190cd429950 100644
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@@ -1,5 +1,7 @@
 DIST s6-dns-2.2.0.1.tar.gz 76046 BLAKE2B c7c7e94fa47fc20e2a328f2fc22650585e9bd0260f4676c5ef6078097a62c43d75b18977e31187008b9fb90bebefc9ffb8d999395b012d85bdef9a4220aa7a6d SHA512 9b62ddec94be86d186520f0240dafda95861c54345f92a1fac3251f8560e70932bc5915cca4136d428ed02d0718e8082ad382bffd0c707ae867f1896d93ecaed
 DIST s6-dns-2.3.0.0.tar.gz 76476 BLAKE2B 6896bf534d872aac19dd6b2ad819d7aee6d52737f33106640ad1c3afc7f8857e5672f3e35f7f2064cb8085a79adc33bdd33a99dc656a656040a93f813a986717 SHA512 9afa98d0a7a9d84311f6f93d5c1742f7dcfb84c76ca363f9e09b3b40cd3faa1721aebb6e974a98991c037d82b2540c1edbc3cc13ea5f7e3dd95a96d14918e454
+DIST s6-dns-2.3.0.1.tar.gz 77836 BLAKE2B 55f83152eea3e3c8f2d774d6330aadcb73ec9b7d1ca4b87d1093fb9ab216ac1ad130bc9437ff30311451b06f820720fec902ac40e9e8d63f9d605cbf13448edf SHA512 69ae32f9b4ff22a5d38e3a2c950357d8c8032a649c1d81e4a4e5f474ae5c1bb1072555baa1a34f955293aa0f66a93f51f2cc8efd8aa56704b906e0b0979f8157
 EBUILD s6-dns-2.2.0.1.ebuild 1316 BLAKE2B e413614e39b05f07c616d83e5f3d7998ad33948bd67d96eb4653e1c81865b33209fe9efb16dc5731fd093f7ee87eb662974475426b9d8cc7b7590c879e8d09ad SHA512 a0153e3c80f54fd744dc5e1412672857280e3204da461e8eb75e2c06133a9d4162eccec950ebed272061a1614e00e04ce8024be8ac1a001ae0e57187ff064557
 EBUILD s6-dns-2.3.0.0.ebuild 1316 BLAKE2B 2c9dfe840307a11cf193077abc5011df5b01f455e1e0d8f5080061d8019c0824d12923c9182c8a6b3e84ab09fa0d7add2a8e99a9c9f27f8a3a74265042768a0b SHA512 61865257ed9b3e1321bd9aa0694cba91dc12402a76ed8db9c24f7d99566b4e060120d070122af7eb24cb13d7353f8ad16b8de252f39b5cd9e447dea67582ea73
+EBUILD s6-dns-2.3.0.1.ebuild 1211 BLAKE2B e74799d0b902714589cdb91b305ca8ea69939dd13f69cde242ac17292225f66802c89b421a6c2dc6f543a20b1f174d0c675b077a0150e2bc6a29f5e89fe1b243 SHA512 670fc13663ec03faf9f86ce6f4777730341c19783b6671249debfc0ac3594a1e2d33967f7b041778ff69388c7b56554ef679e246b0e6cd172a50c1b98b828342
 MISC metadata.xml 764 BLAKE2B 7e6f7e1ea30dcf3e0b8c08d90457019cfb0d577f2c7ad4d4664d2770c150ac2e51d38c047a7b41c5541c1a3771b8c18ad547f2a87cb4d13f49b6cf9141cf1aae SHA512 d49c08c4eb0bcdc6bade611ced7588ed1f6e8bb6c71a677b1b1ab1ef2357229a3a380858aecbf57a4fd9a75511fcd32cb7ea1ea91b75c7a0787518a83fd4ab62
diff --git a/net-dns/s6-dns/s6-dns-2.3.0.1.ebuild b/net-dns/s6-dns/s6-dns-2.3.0.1.ebuild
new file mode 100644
index 000000000000..de60beb85347
--- /dev/null
+++ b/net-dns/s6-dns/s6-dns-2.3.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="suite of DNS client programs and libraries for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+DEPEND=">=dev-libs/skalibs-2.7.0.0[static-libs?]"
+RDEPEND="!static? ( >=dev-libs/skalibs-2.7.0.0:= )"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 96e51a0cdbf5..d5ed933f99b0 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -21,6 +21,7 @@ DIST unbound-1.7.0.tar.gz 5538228 BLAKE2B a825e2cbef74b3a78f9802056d6f0992f77e0d
 DIST unbound-1.7.1.tar.gz 5565938 BLAKE2B 423dde8a13ea3539d86eade96507e6cdb4ac816393e99f58b4e0dc74a79c31bae57c87924ef737a567cc338d02d672f6c059c86d2f28a634f06e5f9a339f4260 SHA512 99a68abf1f60f6ea80cf2973906df44da9c577d8cac969824af1ce9ca385a2e84dd684937480da87cb73c7dc41ad5c00b0013ec74103eadb8fd7dc6f98a89255
 DIST unbound-1.7.3.tar.gz 5570604 BLAKE2B 93a4e7cc0e13b3da1057ce4e4518ab2363f03bff7c820095ed30b5fccd2f4245cfade6bf68a424a090967053c7fd727f33352c9e8004bb05d907a878d69c2517 SHA512 34b2e93660e519b2eccefef26a6c7ac09fa3312384cc3bc449ff2b10743bd86bfeb36ec19d35eb913f8d0a3d91ad7923260a66fc799f28b0a2cc06741d80f27a
 DIST unbound-1.8.0.tar.gz 5609213 BLAKE2B 41e464df60e03d502f13758e75f9143658b2a496c4fad69804d9d404e23a8d4b5480cc09048197f8593e37feffdffaea33b18a06d864d0d35e986169b49f42e4 SHA512 6c46f5b86b5bd98a7b549b660173d487e59e65385cebd7bc29429b4fee69f2b490651a409c57b072b9b604fa98e289fa82eeecfea8779900038c25b28a6bd064
+DIST unbound-1.8.1.tar.gz 5610191 BLAKE2B 15118f5940b4362dd515f8b335c8a39fc5ef1d3fbf0c20efbf0097342fabb4890eae0527f8b00ace181a425b413882db962b63d329f664cf12649d4d6ec8e5ea SHA512 1872a980e06258d28d2bc7f69a4c56fc07e03e4c9856161e89abc28527fff5812a47ea9927fd362bca690e3a87b95046ac96c8beeccaeb8596458f140c33b217
 EBUILD unbound-1.5.1-r2.ebuild 3427 BLAKE2B 193c35ecb00ae6303e6ab97852f79dffdf2bef64ce0b7c6e961370eb87d9506569e8aadfa6386624ce121162380b24fde713b36865b18bf228aacb3651defde8 SHA512 d3630f81fd44b40f5deb155473dc5835cc68e444be26afd0207fa734f285b566694b92dc073185cb24c9588a0ca5cb9ebf9c9268c2725c24a6c61d7ca73d1bcf
 EBUILD unbound-1.5.10.ebuild 3465 BLAKE2B 765d3f8f6a987a22195a235e515fb4fd29005a8e2b8d2eeadc9328993ba41d95655db10e1f8426b449311b08516b8dbd4abae382bf6d9b2f3608716c7f57f30c SHA512 28fb9da2c9bf08fbdd8e440c7c0f61da5ef25f7ca179b18e7c189e5c23f70dea295e1dd9b0fa289c75f5a4ee24ed9e1b3248f62fb0dc05d78068f22c00d100a7
 EBUILD unbound-1.6.3.ebuild 3689 BLAKE2B 8bdfd0f5b48ed66d7eb167e187cac4c64c3c0a044f0523662f253514717a273671fa15e6e931ec03f3ea16a6f2f727701811f41a10ecd49326a9c855f694a2d1 SHA512 15d464ec999b6c98e05d5904e52af977036c2c7ea2bf1d54cebf05f6841f8c28adda1b5d6fa9f344d12ea8417f512a1f0c0487aad62627a7761e97e71f3b018c
@@ -32,5 +33,6 @@ EBUILD unbound-1.6.8.ebuild 3696 BLAKE2B 2b520948c09e02bba9a1685e25a46b94280d9ef
 EBUILD unbound-1.7.0.ebuild 4814 BLAKE2B 4a22ffd38aa1a4c39d603f85a2fff0adb767bab5a1feea6386fb95f6f3d1dba5ed1749c99fe7f5d310fadfee95de628e077dca25c3800d1a1490ecea37341549 SHA512 8270d337d8b7241208406cd5b06320a624856aae1caa921b26d7115b77df27b93838c73ccb02ad0a5588e7bf41f82646f650c328b0c991afc9d319c77e59a303
 EBUILD unbound-1.7.1.ebuild 4814 BLAKE2B 4a22ffd38aa1a4c39d603f85a2fff0adb767bab5a1feea6386fb95f6f3d1dba5ed1749c99fe7f5d310fadfee95de628e077dca25c3800d1a1490ecea37341549 SHA512 8270d337d8b7241208406cd5b06320a624856aae1caa921b26d7115b77df27b93838c73ccb02ad0a5588e7bf41f82646f650c328b0c991afc9d319c77e59a303
 EBUILD unbound-1.7.3-r1.ebuild 4964 BLAKE2B 29c4159dce7346ffe39c78f7cc41be8d2f5a559579eaee964fa1c3bdba44af19233b7eb3ccd3ee53e331c582d32f3df786ea417a05d294f46a9424a42010b507 SHA512 9b39243fe41302474917d775574113ba697672453f439d3d31f02aac77f70f4a4f4b6fd404ff5ddfe5f4c52786ef7fdd223fdd540b0ac695ea5e53c914d50dfc
-EBUILD unbound-1.8.0-r1.ebuild 5357 BLAKE2B f502e7c2953e02706e0b960e289d262c02d7317af25c0715727dd9ec63ecff34da99818989ab5451a57ebf4a7aa61c3e8257a2d2e96c0463d885fc4028afed9f SHA512 62ed3dbb2460694c424923637d95e91e589ca3179b4885b3e2c4af7291401e53d1d8df09c82d02c17c6286ef0b79d1829a5d257c24aa160382feb0ea1d326ed1
+EBUILD unbound-1.8.0-r1.ebuild 5354 BLAKE2B 7089f7d46a314234be51e3d848ccd517c4654dfb30030679e0c82c0e02092104f668a613c5f809e86c9f1a2e9bb4730dd011517e15979c60c6f4729f36b9f35b SHA512 8edf751c0287446d9910372a8a36f7f23fa408ab22f925d108f09fb8ef9218eb9b13e050475d3310afb8efb87c0f548084d0d652d5f27b55b89d8995c22e4bcb
+EBUILD unbound-1.8.1.ebuild 5359 BLAKE2B e4da9248acd01a82908bd859247358359a6a0b72837028dcb13ac90fb16b50294f0621bf68cd948c9b4909b167fb69ae9d3739fc7d8fd69036ac871102d13297 SHA512 03b019d9cc9a93e525846c44ef96e1db4cd7257db4334a0a1de4427e7839ab40e0acfe31e7c82d15057b9ec6c820dbd908dc786e0356da7b9b0f655ba3c08ab3
 MISC metadata.xml 1239 BLAKE2B b23dea4347aa4eff995ff69d8e708abbc46b4d222b65d2e87734e77925d8026003df95fe503d66a96dd9dc6a73c32b69e6bb2ad9678a40c5c01b028e5247013a SHA512 6aeb057a87d2705bc9b1c42458cbe27c2b8c21f16ad338ef4421716527347c207360e154c82821ae10b32a22868d16b24601c2d115bee9e70e00a60d7fc133af
diff --git a/net-dns/unbound/unbound-1.8.0-r1.ebuild b/net-dns/unbound/unbound-1.8.0-r1.ebuild
index 4a5830825022..db6d5e3b03ba 100644
--- a/net-dns/unbound/unbound-1.8.0-r1.ebuild
+++ b/net-dns/unbound/unbound-1.8.0-r1.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 ~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/unbound/unbound-1.8.1.ebuild b/net-dns/unbound/unbound-1.8.1.ebuild
new file mode 100644
index 000000000000..2073aa739bea
--- /dev/null
+++ b/net-dns/unbound/unbound-1.8.1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_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 ""
+}