gentoo resync 08.09.2018

24 files changed, 302 insertions, 138 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index da3bdbd548ec..2401ec147e30 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index f50df7f7a50b..50a4566017cd 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -1,14 +1,20 @@
 AUX cmd-over-cfg.patch 488 BLAKE2B d1ba92dd5c7bbff11ea431449c61b49d0bbbdc87b3ffe818a90c573a8a4f3ba12d150b8aba5789f6510bda74b0a9b19cca7583341db599d07aec787b4d149728 SHA512 a22ed7202b29e74ca8d4ffc597c5922cbe39da097c00876ac3e66c8f09eacd836ebb276e75753103f84699888f8e0a57abbfe839579eab0ddd48a2fa119fc70d
+AUX ddclient-3.9.0-use_iproute2.patch 1388 BLAKE2B da84054c603cccdaa45d4be9b11b90d04f273c78adec19d139ce4ed0b52ae4f9b76b958471f83b6d51fa13e73a7d2fa0df498f61843f49c89f8c4600c8a44ca8 SHA512 174a82996966cf42d0f6811757aceba3d2ea33e50ef842d952e3797bd7bb1194c7d2e23acf4a5aae88ecdde9bb677de8cd7fc2df666177ed0a12153e633aab42
 AUX ddclient.confd 97 BLAKE2B 8215e87920f35d31f26c743ddb513295bd5556b781d9373c858040dcd2df066cf3636a7c9e2737c20d8cf30bb1c5fca7565068eb98f5827da1e8681b70c07e2a SHA512 3784fc11ba1b00b863b8a626910f75adb4b73f87f1887620c6ab17d68f36be4c481366ff1a8d91242c7ff62871e397ad1d4544b266405130d0fd8267f5a07f3d
 AUX ddclient.confd-r1 98 BLAKE2B e92bca71a65504290fc928c2f477f58f1d830de5f8a1181e715c9804d74d4f8b1e57b9cd22f12965f232527a8e7d65fbbf654f786c23cbe3859d78f20e843c74 SHA512 a74a3b0863fc20d740de07bfc37bee0aff6d7316ee72152241929e0a058ec34a5d76bc4429eedd69b03047f081cc0601543988b066ee246d671945a01fa0876d
 AUX ddclient.initd-r3 1312 BLAKE2B fb00fcd594117af5d147d507f66516db42ac8d09f2dcedb62b312b87129f23eeecb39af244283c0bb3d201651ae5bac70e23fd3605ab8027a86737aa10c7dda8 SHA512 388725815c3fea9df57b6cd73ab9a549967aba2add3be9fe5153f57e20635c037985c28b1f1ebcb8a122737cdc6277f0711029375f7d62e03491457959ae8dd1
 AUX ddclient.initd-r4 856 BLAKE2B 515cd52482fddba204a492e7f5660a10d5cbddcdcef921ea56a10675571bde3ee6277d1810c8c917307689a7db5701991f22a026c1a8f77d7ae01f3003faf9e3 SHA512 d68e4f01a731826f540243c1123849cc85cbffc41dc5d18c1538d63ccac03a7f535089e99074cc7a06beb6ac48b70575d60f3ad0a3a37c378eaf17c816c0cad3
+AUX ddclient.initd-r5 577 BLAKE2B 5cf4b239e15bed86f98b65891c471a52179d3c7435a0a371e3568eaea0911625fa58faf466dae49e3abf6858a5d2bdb6e682fbaae78dc80e34092c95664292f7 SHA512 3b26160d1e651f418324b3544f8ae01781db32de8040d88fb48710f776f475332c3fdf36906331039c20cd47f5400c3ea47adf8dd7fbc7d6ea78cccb47a43c4e
 AUX ddclient.service 234 BLAKE2B c9f9c224742f9047e12677b6e3ece8206a26b72953bc6b1695db39e397c8b1fbbd08b8fa2acdd739391a4fae379570488db9b2d4c274950e5881b50028f07fc2 SHA512 e3c36148804ca7ea29f2d030128941a5d5a7edc6ce3a223b8e72ea8800d622169d3825d2ede6e69630e9ca57e8c62b6f3af97269e9d671e6f2d2973b4a43602f
+AUX ddclient.service-r1 235 BLAKE2B 204793b269c65d7ed77f89c1d5f191298a7b03f44dc22526331fe28585ad1abc2c19fb3f2c65df1dd32bd20f3f121bf2f7d936ed42831067fc232024383c768a SHA512 1bcceae10d8076cb3fa5cb0215c0eaf17588e943d802c40cf5334f125a3697b103646bc393ba4db90845ad8e6ff1d4301b86afba5609ecb3bff98a5623f09195
+AUX ddclient.tmpfiles 149 BLAKE2B 0ad955937dd6cf714530429ffb423e0acc7033bdf7e2486a99d50d055edb85adff869209631cdfd8c2aa49263c31817868b765e7af27e222ad9f0b19bf439d74 SHA512 13c6e541ff23575d799eee943b8e10e277e5073732cd7c9705c23ee557bd99978435c0fe8b546fa3122a60cfb0499e27853e1968f0c1e0225890b68ae678e0c7
 AUX iproute2.patch 1394 BLAKE2B c0f9bc4d3086bc70fbc033a3e2c55479fbb29ae0c051ed1c336ab79c8d9d03388c6ec4f6906b78edf1476bc0a58a994f363d1a01424a9ceff2176707e173ceac SHA512 d802421204cf398b9a0ff679b00b1a9796f4c442e3128b5965169c6153bca9beac580b94bd20ffd5235157b4ad482fdc926d9ac8a56686598aa7a25ecd0f43e0
 DIST ddclient-3.8.1.tar.gz 48600 BLAKE2B a945adcb42bd298422c71c0eea6bea36c6b266ce39e97ebfd833b29819a2f30f2651d7f7b17dbfc0720b6209d0c0ed94bf2673624777f07e6de83a7081471995 SHA512 d6722582dffe0c5a806176f24bd3d9117bc1210ea0137aa92138390be16e67d47b746777dc431282a664849c91626969a5e267777126bac03304c7aa34a9dad7
 DIST ddclient-3.8.2.tar.gz 46059 BLAKE2B 95dc19f26fe4a14d67154ad86723882ef371545156d88119d000366d97e045f37e9d6af229a24950740b915404cb35250baf05aa7cf1268f756ce7b1e776c6cb SHA512 8f74ce90ce4a31b8d53887b99556661343b96734ae630403434689459eaeb1354159ae26f0404b9db21a0ff4151816d1650746a13c547064748656a8c6e3f13b
 DIST ddclient-3.8.3.tar.gz 54516 BLAKE2B a472c84c05b6eccdef3ead0abfa6e38d5ef04fdc0df3327dad2181088102f1b40ac7986492c8d964589e3994cace9103ba56664809174f99d14d9c86c377c46a SHA512 055b6edf91a3b72d9ba80c9dedfbc1d60f62d6879bc722735488a5a1a37fafeb2e97567da98939ccc62fd39b0846438dfad1c022635d602c67bafda178574a76
+DIST ddclient-3.9.0.tar.gz 59018 BLAKE2B b9b58108d9f124fcd5a72cc57bfb0e6a5bc2e115edc27a1d5950a929670d67d5c703b09f51e7e82e977ccfb544d115da177b0ac8dc06a76a800aa207cde5a42d SHA512 ae314c96a37dd90256d6acf62f4a4523b72f540194131e351a032239b00b4520351f6549d3b20a9209fe49ccc6de7ce158ffa8635d341066ea71b789dc667438
 EBUILD ddclient-3.8.1-r5.ebuild 1416 BLAKE2B ea2a67f9e888bbeea5208309ee71c87d35c98fd36a94bcd445224c40915226a81ba70d253bac29f55c0b87649ba15122115c854b40b06d67ff85bd85c6ab7b78 SHA512 a9215c25bd9c90042267eb9c1f0c2258d86c814ac3d343c8c795ecf8eb7eda6cc3ce7fbf1823f917b60724232d118d5904cb55afa1549f875466fcefb7dfb2bb
 EBUILD ddclient-3.8.2.ebuild 1176 BLAKE2B 7e1a9334915c9eedd9c3069af36c7d54c7a5a086b4bade3ee4afb55985dc9972bc09295943b795bf086c03d3b8775ddf4089825a43e89438c3a93e98116a6aef SHA512 b1105c13c16deda9923b1507fe6727905bc92911c3d6f206047ef4f89fc046feb08ed982448ce42743be06bc9f7eea3a5a2fa28f863459930512b5adee51335b
 EBUILD ddclient-3.8.3.ebuild 1190 BLAKE2B eebc90117aaa01be120afbd067090d01a5e2c33a4f41ff0bdce474a1f7da5ca0ca805d5743fa4ae3f762d7a0398fac628b4c261b39ce375e7c7d74ee711f1b41 SHA512 584e18a5bdbc165e216e74650a3fa48fdffa1bfde112ae30ce0d7a3c677ee67dc9c988fecc9a7bf059a483dfa54837d075536cfd826a1613169140f32efde3e4
-MISC metadata.xml 535 BLAKE2B f72f48609402da3c66ddf2bf8f5d3c6409dcc8fcb9d3c4b65e22ef10b26c0168043c330a7db87d58b1628d2d68f37a98b13cdeab92cc599cc9d100bf2409103e SHA512 7803f404d9c75941f563ea91af06d41b2b694713a9484b787a566d5dff5db2be80ed92b01bcccf88c695bd5e83cb52bb71b8b44fa30f13a5dcd564c552aca72d
+EBUILD ddclient-3.9.0-r1.ebuild 1503 BLAKE2B a28084389ca9a45a2d7337fcf54e5368ae8cabcecb771f8b64fcf09ac3ac712f2e3a49221ddab216bbcbda90ece7f12d4bf69eb6229a90f917ba547a338d16e3 SHA512 e259bea837158be04298c32acb032bcf7d366eba2048836656c6da4afa7f204d71bf8c988f8f8d7f51e2f7ae44a897541ce485066f15c107e7f9ddcd68c9cbec
+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
new file mode 100644
index 000000000000..5e18aacab160
--- /dev/null
+++ b/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit systemd user
+
+DESCRIPTION="Perl client used to update dynamic DNS entries"
+HOMEPAGE="https://sourceforge.net/projects/ddclient/"
+SRC_URI="mirror://sourceforge/ddclient/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="examples iproute2"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Data-Validate-IP
+	dev-perl/Digest-SHA1
+	dev-perl/IO-Socket-INET6
+	dev-perl/IO-Socket-SSL
+	virtual/perl-Digest-SHA
+	virtual/perl-JSON-PP
+	iproute2? ( sys-apps/iproute2 )"
+
+pkg_setup() {
+	enewgroup ddclient
+	enewuser ddclient -1 -1 -1 ddclient
+}
+
+src_prepare() {
+	# Remove PID setting, to reliably setup the environment for the init script
+	sed -e '/^pid/d' -i sample-etc_ddclient.conf || die
+
+	# Remove windows executable
+	if use examples; then
+		rm sample-etc_dhcpc_dhcpcd-eth0.exe || die
+	fi
+
+	# Use sys-apps/iproute2 instead of sys-apps/net-tools
+	use iproute2 && eapply "${FILESDIR}"/${P}-use_iproute2.patch
+
+	default
+}
+
+src_install() {
+	dobin ddclient
+
+	insinto /etc/ddclient
+	insopts -m 0600 -o ddclient -g ddclient
+	newins sample-etc_ddclient.conf ddclient.conf
+
+	newinitd "${FILESDIR}"/ddclient.initd-r5 ddclient
+	systemd_newunit "${FILESDIR}"/ddclient.service-r1 ddclient.service
+	systemd_newtmpfilesd "${FILESDIR}"/ddclient.tmpfiles ddclient.conf
+
+	dodoc Change* README* RELEASENOTE TODO UPGRADE
+
+	if use examples; then
+		docinto examples
+		dodoc sample-*
+	fi
+}
diff --git a/net-dns/ddclient/files/ddclient-3.9.0-use_iproute2.patch b/net-dns/ddclient/files/ddclient-3.9.0-use_iproute2.patch
new file mode 100644
index 000000000000..b57f78ba14e1
--- /dev/null
+++ b/net-dns/ddclient/files/ddclient-3.9.0-use_iproute2.patch
@@ -0,0 +1,29 @@
+--- a/ddclient	2018-08-09 17:58:16.000000000 +0200
++++ b/ddclient	2018-09-01 22:35:43.000000000 +0200
+@@ -710,7 +710,7 @@
+     [ "ip",          "=s", "-ip address           : set the IP address to 'address'" ],
+     "",			     
+     [ "if",          "=s", "-if interface         : obtain IP address from 'interface'" ],
+-    [ "if-skip",     "=s", "-if-skip pattern      : skip any IP addresses before 'pattern' in the output of ifconfig {if}" ],
++    [ "if-skip",     "=s", "-if-skip pattern      : skip any IP addresses before 'pattern' in the output of ip addr show {if}" ],
+     "",
+     [ "web",         "=s", "-web provider|url     : obtain IP address from provider's IP checking page" ],
+     [ "web-skip",    "=s", "-web-skip pattern     : skip any IP addresses before 'pattern' on the web provider|url" ],
+@@ -1448,7 +1448,7 @@
+ 
+     {
+ 	local $opt{'use'} = 'if';
+-	foreach my $if (grep {/^[a-zA-Z]/} `ifconfig -a`) {
++	foreach my $if (grep {/^[a-zA-Z]/} `ip addr show`) {
+ 	    $if =~ s/:?\s.*//is;
+ 	    local $opt{'if'} = $if;
+ 	    printf "use=if, if=%s address is %s\n", opt('if'), define(get_ip('if'), 'NOT FOUND');
+@@ -2165,7 +2165,7 @@
+ 
+     } elsif ($use eq 'if') {
+ 	$skip  = opt('if-skip', $h)  || '';
+-	$reply = `ifconfig $arg 2> /dev/null`;
++	$reply = `ip addr show $arg 2> /dev/null`;
+ 	$reply = `ip addr list dev $arg 2> /dev/null` if $?;
+ 	$reply = '' if $?;
+ 
diff --git a/net-dns/ddclient/files/ddclient.initd-r5 b/net-dns/ddclient/files/ddclient.initd-r5
new file mode 100644
index 000000000000..a2284a27c1ff
--- /dev/null
+++ b/net-dns/ddclient/files/ddclient.initd-r5
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+name="DDclient"
+pidfile="/run/ddclient/${RC_SVCNAME}.pid"
+
+command="/usr/bin/ddclient"
+command_args="-pid ${pidfile}"
+command_group="ddclient"
+command_user="ddclient"
+
+depend() {
+	use dns logger
+}
+
+start_pre() {
+	checkpath -f -m 0600 -o ${command_user}:${command_group} /etc/ddclient/ddclient.conf
+	checkpath -d -m 0700 -o ${command_user}:${command_group} /run/ddclient
+	checkpath -d -m 0700 -o ${command_user}:${command_group} /var/cache/ddclient
+}
diff --git a/net-dns/ddclient/files/ddclient.service-r1 b/net-dns/ddclient/files/ddclient.service-r1
new file mode 100644
index 000000000000..d183b4f2a6c7
--- /dev/null
+++ b/net-dns/ddclient/files/ddclient.service-r1
@@ -0,0 +1,13 @@
+[Unit]
+After=network-online.target
+ConditionPathExists=/etc/ddclient/ddclient.conf
+Description=DDclient
+
+[Service]
+ExecStart=/usr/bin/ddclient --foreground
+Group=ddclient
+Type=simple
+User=ddclient
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-dns/ddclient/files/ddclient.tmpfiles b/net-dns/ddclient/files/ddclient.tmpfiles
new file mode 100644
index 000000000000..4c6cc19ab943
--- /dev/null
+++ b/net-dns/ddclient/files/ddclient.tmpfiles
@@ -0,0 +1,3 @@
+z /etc/ddclient/ddclient.conf 0600 ddclient ddclient - -
+d /run/ddclient 0700 ddclient ddclient - -
+d /var/cache/ddclient 0700 ddclient ddclient - -
diff --git a/net-dns/ddclient/metadata.xml b/net-dns/ddclient/metadata.xml
index e4faff9063ad..4e40c4923a78 100644
--- a/net-dns/ddclient/metadata.xml
+++ b/net-dns/ddclient/metadata.xml
@@ -1,15 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>titanofold@gentoo.org</email>
-    <name>Aaron W. Swenson</name>
-  </maintainer>
-  <use>
-    <flag name="cloudflare">Enable support for updating IP address via CloudFlare</flag>
-    <flag name="hardened">Use iproute2 instead of ifconfig to grab an IP address</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">ddclient</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="cloudflare">Enable support for updating IP address via CloudFlare</flag>
+		<flag name="examples">Install various example files, like for cron.</flag>
+		<flag name="hardened">Use iproute2 instead of ifconfig to grab an IP address</flag>
+		<flag name="iproute2">Use <pkg>sys-apps/iproute2</pkg> instead of <pkg>sys-apps/net-tools</pkg> for interaction.</flag>
+	</use>
+	<longdescription>
+		DDclient is a perl client used to update dynamic DNS entries
+		for accounts on dynamic DNS network service providers.
+		It has the capability to update more than just dynamic DNS
+		and it can fetch WAN-IP-addresses in a few different ways.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://sourceforge.net/p/ddclient/bugs/</bugs-to>
+		<remote-id type="sourceforge">ddclient</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 3944ab9ed142..46f9ae4bc7db 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -3,9 +3,9 @@ AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179
 AUX dnscrypt-proxy.initd 632 BLAKE2B 6f82264977f3ca795d4f92919cf7da606c02a0d10ce601b9634caf9ead02fa96e07d90fea83b90422f2affdbb74ce29c37132384c666fc0553b9d7b45d1e7cf8 SHA512 cd1cd5e4d72d5a19c636abab7cce9f6d61c4053653fc2ace4cf241fa518a916b243e4a8c8c1b6678c0d1b2d017953c367e1e28da6aa7c9c33a60bbdf8768a072
 AUX dnscrypt-proxy.service 1198 BLAKE2B 14db1a48f94b07622e0f52d8510e6c1634013e66ab5e5cdd7ddf7c0cde4441fd78b71134e4cfb6f122ba4a191ec032d54e92b1be97e4bd49af61a873431ea002 SHA512 c7dfe482a8ea17cb67681b92ac65a2d2d58d2be364351d131b0b689905d80390c5df794f6c7fb944bd508f69af72af96d36c1b7f7c5c70af7ee636423ab77e11
 AUX dnscrypt-proxy.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36
-DIST dnscrypt-proxy-2.0.15.tar.gz 2887764 BLAKE2B 7c4dd36f8305494566cb8548e478d9b89eed799dab124e574c0840c606f6c51cafb73818a07b18928a6457756a122d7bceabc108b1114b2b546d3db707d2ef3a SHA512 4517ab7b7eb1474f8c9e133a289caf6c02f472b51b910f1fbe1e5ffd6d389943626c8878e68f7f27a47b00301a427dfe9c563bc82b67cafab32f4ab3bc4c84b9
 DIST dnscrypt-proxy-2.0.16.tar.gz 3770249 BLAKE2B e6dc40ec503cff11e4deec1a243875fff42ec7ecba8c7c3552b69322d405c762fa152e7e9417baf944e2a476715f00813a305c20db583970520d35acd378f1d4 SHA512 f138df20560dd440a2ed390c1468d630191ae7b0e50521b4dde3fa7ef4377c3ae6409e8c547858bace53216c84aeeea6794305546b9ff87832f704c160c6782f
-EBUILD dnscrypt-proxy-2.0.15.ebuild 2880 BLAKE2B bf0fc37008d0d54f8aeec9b294175e1eefdfedd1ebda02de0f40ca6678a1070fdbc1702359fa0b8474f62b6a94ff6c68ac166eeac0302909d502c31f4298c2cd SHA512 d148bb289b66526eb0600c1817d54acdd702177571215da2a66a88a4ce5ae419b92ff8e8a0ef0a7b9988704e4571fae89b3f29cbe25e2808d168cf4db05ebe74
-EBUILD dnscrypt-proxy-2.0.16.ebuild 2878 BLAKE2B 42284fc77e8809e196a00cf6b24e0f379c6ac3e8f5da17fdd8387788a19e583914ea8ade40e82d039234632eda4e19e501e8f14e4cee7c4c7a9dd18546bdfc45 SHA512 a83ced12c49aceba4452c1db9173f72972aa105aa9344983f96b06b87da7255ba601970dec2546299921af71e20b1ccc3188a99dbb6b1c930cc0b84a5cc1c947
-EBUILD dnscrypt-proxy-9999.ebuild 2973 BLAKE2B ff38c4e6b05d8743d6d91e10569f89cd78e8d29a0ba05e252dd087fa076c922f3711c38bd3109ce69cec721807902e0f070bc1e664b9dc50fec0c6767a85827f SHA512 5510605f1c0b6aa5087a848f2662d93b890d868c2b81ddf6fe714f50eae7b681d90643f458aa8a51938e8dfa4e3aeb7b054ae81555bace5819f6b9c73e1f60ba
+DIST dnscrypt-proxy-da5ee45b8ceb9233f4bc21b2a5f1eb7c875947cc.tar.gz 3266257 BLAKE2B bc724b56ef75faf1e2416e81fe3e68947f1581ef1c85575b8c7c5bde721f41f32604835678923dd12654b23a2c97a7e84d598eb8c7a7f553cb59c998141ff19c SHA512 cd23bc4cee7a1d9337ad5a41cf49c5603d9bfb8b7a0458532de68df35f8bd1bb75c39c069dc692506673bdba485e360b23712e997072ed86b541597aa3ea9b12
+EBUILD dnscrypt-proxy-2.0.16-r1.ebuild 2906 BLAKE2B 00c7405d34cbfa51c219ad0e708f9bc93eb3517dbaf6484ad46ad9116a4e489e0c10495c4c10e710a5434bbd26f3bd1f54b61bcafdfec35ebd96ec71f2569aaf SHA512 00e944487ddaafb9b55cf67ebfce3b7d3e13f4a931c21e1770a3beeeb140dc1dc3f65f8308180dfe9fbda1d53aa6a2e04bc3fc87a63fbb1f83c299887e556b35
+EBUILD dnscrypt-proxy-2.0.17_pre20180903.ebuild 3340 BLAKE2B f6041dc3e96600aabbe7f2d4719c810f92e720c1f25a25bafe8ddadc2dc211c0370d764936b67b6b2314870c2dfedf336633b29e12c95ba80e2d00c66f28bdf9 SHA512 a90d21da4eb6bccde4d11bf7bb23e623d0a8dc66a39ec9012e5e82c1c2d2978fb6ff6c6907ac3cfb9624080cdc8dbd5c27b8a1f662cb84d67cb88c2e0f46376f
+EBUILD dnscrypt-proxy-9999.ebuild 3052 BLAKE2B f159a8b16482f32aa5eae337cb425a1800c6bdeb58c503ba0981f5e5cb8184c6d6b749602a113a7fe4b7738ac3dd5b08fe6fb99351d59259e1d91897a8b20d23 SHA512 151ef1a5565e836e2eb0bc4854ef1b89f5c3311ffd49ca760d466692190b819b5dd3742f6905221facd190b2e2d2170c8aa11c5ff7bfdcd8c54b2a0042dbb9bd
 MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16-r1.ebuild
index 778e3aa9cecb..57dc638fa77f 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16-r1.ebuild
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
+DEPEND="<dev-lang/go-1.11"
+
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
 
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17_pre20180903.ebuild
index 48aca6233183..c9ee2a53186f 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17_pre20180903.ebuild
@@ -3,22 +3,26 @@
 
 EAPI=6
 
+EGIT_COMMIT="da5ee45b8ceb9233f4bc21b2a5f1eb7c875947cc"
 EGO_PN="github.com/jedisct1/${PN}"
+MY_P="${PN}-${EGIT_COMMIT}"
 
 inherit fcaps golang-build systemd user
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
 HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
+IUSE="pie test"
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
 
+S="${WORKDIR}/${MY_P}"
+
 pkg_setup() {
 	enewgroup dnscrypt-proxy
 	enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
@@ -32,6 +36,22 @@ src_prepare() {
 	mv "vendor" "src/" || die
 }
 
+src_configure() {
+	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
+}
+
+src_compile() {
+	ego_pn_check
+	GOPATH="${WORKDIR}/${MY_P}:$(get_golibdir_gopath)" \
+	go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	ego_pn_check
+	GOPATH="${WORKDIR}/${MY_P}:$(get_golibdir_gopath)" \
+	go test -v -work -x "${EGO_PN}"
+}
+
 src_install() {
 	dobin dnscrypt-proxy
 
@@ -40,7 +60,7 @@ src_install() {
 	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
 	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
 
-	insinto "/usr/share/dnscrypt-proxy"
+	insinto /usr/share/dnscrypt-proxy
 	doins -r "utils/generate-domains-blacklists/."
 
 	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index 98ba6f98e2c6..97e32d347371 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="test"
+IUSE="pie test"
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
@@ -38,6 +38,10 @@ src_prepare() {
 	mv "vendor" "src/" || die
 }
 
+src_configure() {
+	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
+}
+
 src_install() {
 	dobin dnscrypt-proxy
 
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 34c698165927..ecb06e746775 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,10 +1,8 @@
 AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e05dbd44c8b8c5c87a01d500d5ac328fdee1cae3f9dd126448a8b82b979e13a4ff5285fa48b983d5 SHA512 58c4186e57ebd00b86dae34d5d208ed8801c0376da40cccb23b3d4542a7ee04a1003a12a4b89347b76a384b50eae4a61f96164bf22ec987ce05b1c65691659e7
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
-DIST knot-2.5.7.tar.xz 1084656 BLAKE2B c2d583625a19f6a61248b3b42cdf14f5bb2bdbafdb20be6b0813744095a4016a4be2eb5e2dfaff0628238c60153480175a86706db0b88569d76156f86ba33968 SHA512 96e375f556309bb89cea982dda169cef70c23d03c48282110e47a44849c1102cd37d98aa7650781b399f5d932b724b8a935f0b9e55e4920465ae7b74a0d1d55a
-DIST knot-2.6.6.tar.xz 1120340 BLAKE2B 374d9b78f2ef2143d1221fced29184a52ee3773abd7cb08b6b48910f6ffc0f7c4f07c00d17d28344c93d71a709363bdf855d20587f87da622153c44d08d85fd8 SHA512 bd7a36decc74041f12971045cd69b8cc9e7ecce68f8d2b4cddc9b5f23ee96e8ed290d98fe9e6c441d6727ad4395bea615cbd9ec19cc641abce19ef8da6371972
-DIST knot-2.6.8.tar.xz 1121740 BLAKE2B 2da7e20630fec53952c6892ee4002afeee0c36ef5cb271346caf1760389abaacac7f11dd0b24950ff5eedca40564ccf70c25b5c8548564bdd61c78a1bd9cf93e SHA512 3300985bd4fbf88b58fbb5ba06bdd3dcbe7a50885baa89f9db47811c071a93994a2b17a0dbd27d185feade056ed5d65eef712eedb26de5a4101da363a7c24967
-EBUILD knot-2.5.7.ebuild 1913 BLAKE2B df4f8dba2d9cf3b2a2905eee881bd57ec81d3086682c1791ea3c1a3a14df72997346873ff1f4bbaa08a70584123c260d27e4e436e76cf04840e379a58e3a143a SHA512 62e40fe7b3ddd94544cb1435f448ee3e9ed0175a1b68211ee0328c34163a52127d35fec146168a1846c4da44cca3098fe562828b8c62fef7238bfed3713596ed
-EBUILD knot-2.6.6.ebuild 1861 BLAKE2B 6aba8244d1e9af4a2da5e2d7ecd0cc2af6ddfdda408d4c57b210ad21478cc0b95f3e7b3dbba08e78d55a54769e90b99010f7230c392c4ffa19f01235150e667b SHA512 fc87b9e3a3561e7cb5b06ea59d38d9ef2dcdeab01fcbaddb0f89861e173ebbb9bfde6ab2c81e4bf2523cc1682f3386f1095a42ee6d010daa6a5dae5773c08c8a
-EBUILD knot-2.6.8.ebuild 1861 BLAKE2B 6aba8244d1e9af4a2da5e2d7ecd0cc2af6ddfdda408d4c57b210ad21478cc0b95f3e7b3dbba08e78d55a54769e90b99010f7230c392c4ffa19f01235150e667b SHA512 fc87b9e3a3561e7cb5b06ea59d38d9ef2dcdeab01fcbaddb0f89861e173ebbb9bfde6ab2c81e4bf2523cc1682f3386f1095a42ee6d010daa6a5dae5773c08c8a
-MISC metadata.xml 1539 BLAKE2B c07704f4bbf249b7953403a33c71d7565ef2219b019dbccdc15d9d459ff57f0aa200ed5ae9ab74b07e352d8dcd12f62f5d7bb392b064dbeedad3257ced653675 SHA512 8b39c687fb8b9fb4bf25e0baa8c851ffb4980c0028bf0f64a3c642146139429e292c6ca3fbd01b7bb311ecbbe7bf1df128885b53971b836f541fe97bedf6f056
+DIST knot-2.6.9.tar.xz 1126872 BLAKE2B c15b7e61ccad5417ce53f3d3895014931a2825835958735bdd9459634d9d9f39d6bb3681036772e6a510570a7f6a8afc8b0de5e77e67778831dc6415378889fe SHA512 80fcbef17c3e6685c09eb57e59001a5f298a083c18ce077dc2f2d1fadbe7c36e543c205c0820bc7971a8ed7547897aec408f51e1a9555a50dae82d047fac471b
+DIST knot-2.7.2.tar.xz 1148880 BLAKE2B bf3042d762d2b66f47dbd27a1c9ecd03d111259c7db82254c1175e660497fd8343c3f1cf1cc14e6068cb3d3618931b659888a7b97d7d6e4ba9d0e74c00540e31 SHA512 e09f8a38e975ff4f90db59db9ae8a6baaca9b0cbc9c2ecd37225febfe718b7c2038ae45481ed830dc66f2b70d8312266e2dc7cb54a0aa0fdc02c87ca42bac96d
+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
diff --git a/net-dns/knot/knot-2.5.7.ebuild b/net-dns/knot/knot-2.5.7.ebuild
deleted file mode 100644
index 2c5988f91145..000000000000
--- a/net-dns/knot/knot-2.5.7.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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=(
-	"+dnsproxy"
-	"dnstap"
-	"+noudp"
-	"+onlinesign"
-	"rosedb"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
-
-RDEPEND="
-	>=dev-db/lmdb-0.9.15
-	dev-libs/libedit
-	>=dev-libs/userspace-rcu-0.5.4
-	dev-python/lmdb
-	>=net-libs/gnutls-3.3:=
-	caps? ( >=sys-libs/libcap-ng-0.6.4 )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	idn? (
-		!libidn2? ( net-dns/libidn )
-		libidn2? ( >=net-dns/libidn2-2.0.0 )
-	)
-	systemd? ( >=sys-apps/systemd-229 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local u
-	local my_conf=()
-	for u in "${KNOT_MODULES[@]#+}"; do
-		my_conf+=("$(use_with $u module-$u)")
-	done
-
-	econf \
-		--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) \
-		"${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
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	enewgroup knot 53
-	enewuser knot 53 -1 /var/lib/knot knot
-}
diff --git a/net-dns/knot/knot-2.6.8.ebuild b/net-dns/knot/knot-2.6.9.ebuild
index 2c624d4be58a..e4afd6cf3d88 100644
--- a/net-dns/knot/knot-2.6.8.ebuild
+++ b/net-dns/knot/knot-2.6.9.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 		dev-libs/protobuf-c
 	)
 	idn? (
-		!libidn2? ( net-dns/libidn )
+		!libidn2? ( net-dns/libidn:* )
 		libidn2? ( net-dns/libidn2 )
 	)
 	systemd? ( sys-apps/systemd )
diff --git a/net-dns/knot/knot-2.6.6.ebuild b/net-dns/knot/knot-2.7.2.ebuild
index 2c624d4be58a..2da8f50f93a2 100644
--- a/net-dns/knot/knot-2.6.6.ebuild
+++ b/net-dns/knot/knot-2.7.2.ebuild
@@ -14,11 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 KNOT_MODULES=(
+	"+cookies"
 	"+dnsproxy"
 	"dnstap"
+	"geoip"
 	"+noudp"
 	"+onlinesign"
-	"rosedb"
 	"+rrl"
 	"+stats"
 	"+synthrecord"
@@ -37,8 +38,9 @@ RDEPEND="
 		dev-libs/fstrm
 		dev-libs/protobuf-c
 	)
+	geoip? ( dev-libs/libmaxminddb )
 	idn? (
-		!libidn2? ( net-dns/libidn )
+		!libidn2? ( net-dns/libidn:* )
 		libidn2? ( net-dns/libidn2 )
 	)
 	systemd? ( sys-apps/systemd )
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index 9245494df34e..b4c4ececc733 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -10,6 +10,9 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="cookies">
+			Enable the DNS cookie module (RFC 7873)
+		</flag>
 		<flag name="dnsproxy">
 			Enable the tiny DNS proxy module
 		</flag>
@@ -21,6 +24,9 @@
 			Use a zone file parser that is faster, but requires
 			more memory and CPU time to compile
 		</flag>
+		<flag name="geoip">
+			Enable the Geography-based responses module
+		</flag>
 		<flag name="libidn2">
 			If IDN support is enabled, use net-dns/libidn2 instead
 			of net-dns/libidn
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 4a764a64f7a0..47ae9594672a 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,5 +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
-EBUILD libidn2-2.0.4.ebuild 1237 BLAKE2B d0b1a78213888d195af827682340c16836fab292650cc904554e3bacba9e8b2e751b485ba2a7413b8a638bf64203849a2c49426e388d22eaaabd1db6f7c6cdca SHA512 66e24dc0ae01d8009783c0cc1722bbcbc73baf4a2a4332f35902f75c73bd7b9a3c05c752833b32e5e75ffc2b6c3b923572962b6d22777efdf21a44e66ec693fe
-EBUILD libidn2-2.0.5.ebuild 1250 BLAKE2B e72388c4f68dee0b4fe0d35efe065154fbb84f9f2dbf85c06a59fc29b7e8630faa67db85f10f9789915035402c606b48315e83c37b70301f0da0e31853d5a425 SHA512 b9cc9e347080ea844eeec879c518538726849fd80ff00b8ba5769cbb5696ec59661145f0f215c27b1674cec46c679cc009084a2328a900fe2857d54bd009288a
+EBUILD libidn2-2.0.4.ebuild 1226 BLAKE2B 1c59cb393e3eb99006bfe99f21fb48de733a5cb55bb9729531e4b0f40c30ab90f187f100609aaa5ad6c98499fadf66ad457ddd96a5897703cefe00fc0e03b768 SHA512 7a77cbb77800e71ef7c77befbfb2ce16a7a74cd75f35f674686fa8435acad15b216794e6b3473d7adac6cb6e9554c6b59c37830162c66711d3af4765847ba06a
+EBUILD libidn2-2.0.5.ebuild 1239 BLAKE2B 2e1caba85c2a501947afd2a8d6291a64feb35487b6ceeeed7d0479944d3257fdbb8f189999c66bb2a774f377bbe6351b8fcabedd13ed7c72497a61caab7146ea SHA512 df5f8e536da174a039f1538c53da6827515eacd0198e8aa00c3fb71c9cca9ed52a024c68d0834e4acecca981f87462472a30c7d00a46d2a9cf5ea9da8f03e067
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/net-dns/libidn2/libidn2-2.0.4.ebuild b/net-dns/libidn2/libidn2-2.0.4.ebuild
index 419d4b44dff5..575241a6ca8b 100644
--- a/net-dns/libidn2/libidn2-2.0.4.ebuild
+++ b/net-dns/libidn2/libidn2-2.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-dns/libidn2/libidn2-2.0.5.ebuild b/net-dns/libidn2/libidn2-2.0.5.ebuild
index ab79a5425424..7d53fcdaf7a8 100644
--- a/net-dns/libidn2/libidn2-2.0.5.ebuild
+++ b/net-dns/libidn2/libidn2-2.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index ec70751262e4..c1beef8cb0a2 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -9,4 +9,4 @@ DIST maradns-2.0.09.tar.bz2 1139409 BLAKE2B 8c3709241b85f9069eb4e18098f7753b19bc
 DIST maradns-2.0.14.tar.bz2 1156272 BLAKE2B 7e96d0769dd1df70316cc1bd79fb7e902c723f78db035fe721aaab0d6902958a40c2743374824ae024759164ad9cbda9a3c6ecaec7cc6bf3c5fa7b384101c16f SHA512 57527bba2f9801904f59cc7d9e56cbd7124635841ad8c91cbd3d1b8d58e7fe38d509e19f6ea53e2790777e054b68bb8df02bfa820ba7c9dbe65262e1993a2aa4
 EBUILD maradns-2.0.09-r2.ebuild 2691 BLAKE2B 4cfc46b00741e7263f2e941fbc2028bd1587d0919061dfe07cecacfbdaa6326da404dfbeba99541c9197e089c5709146d9848b4f85f16b069a56b5c8cec6fdc9 SHA512 481512b5a855aa8751ae8d3699c2b3218cf05e5ec2808df30502ed2e20756e1d50ce8714e8acd09eba09f6b3faa8442345bc9187ca5eae53a0bd178421a92f12
 EBUILD maradns-2.0.14.ebuild 2848 BLAKE2B 62f4a9e99a249fe5084ee5d4b57513d151fd4fbb3a39d382c2d4c40d72c143d9051c8b6bbbfcf8cfa06c4f5929c171429e9eb1b42f038b8d4798becbcab353bd SHA512 bac2001e02da3ab7cd7be5009953d2cdeb73062c2ded1e58b35998001ae6d77b0c51a3166202f291733c635b751fd82cadeed6d3171bdfb1bce5032fd59cfc7b
-MISC metadata.xml 594 BLAKE2B 983a7bd75f1efa6bbecc6b850791b7bd56c91adb9299e90014675c13073f61dbee2e97b405cd32111b4bc0e1f77023bf68ab143fcdb263c840861eabc5521d11 SHA512 fca3644846d354386e7d7fee5023cad94dd64133ddedb5e22b3f3a1cc1cc30ff0d54e7c25a276cb226086cec670240f9ca0498b1cb420c74048ad217e9d220fa
+MISC metadata.xml 597 BLAKE2B c20996c53cdf360a0f72998c674ceb22d97fe0f07c08c0712fadd36572ac157c93fa42a7011d45f22a19e7a7f98dc2abf8159973e155b0d78bb0e5277adc26b6 SHA512 b8f775d1f780e3ecb23dc900d0c464a25a5166196b27f103151bc5100a321188b0186e2b3149d543aa139d58bd5c0ce11d80ca1be0cace16b8d392bbd2a1b762
diff --git a/net-dns/maradns/metadata.xml b/net-dns/maradns/metadata.xml
index 02f117e9d8f0..08d29c2b89ac 100644
--- a/net-dns/maradns/metadata.xml
+++ b/net-dns/maradns/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
-        <email>coyote@bks.tv</email>
+        <email>ktrace@yandex.ru</email>
         <name>Victor Kustov</name>
     </maintainer>
     <maintainer type="project">
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 392945dc3597..ef7486a6902b 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -3,8 +3,10 @@ DIST pdns-recursor-4.0.8.tar.bz2 1071831 BLAKE2B d9ab0dada8efa4b05c136650b9a2eab
 DIST pdns-recursor-4.1.1.tar.bz2 1224544 BLAKE2B 886353fabed5795696e84c6f70872577ff3832e449c5b88c81fec007777eb39b764091b92c9c8b5dfc7aa0af2fdb305a3ec3578ccaff469e9c305903bcea8089 SHA512 a8561bf0688752f30c4c997930f13d55c506b2a2113d22b074443757a51cde9be182ef948e61eb8c4d639bbf8679d8a4139aafb6983f483b3a917e049fa64e45
 DIST pdns-recursor-4.1.2.tar.bz2 1219927 BLAKE2B 3db5d383ad75406925c7196ad0b9552c938a60238fa60e4317c5f4037d716d2faf2ac897dac18661df809211129950a2988846a1c7aa1d24f89c5a682448abfc SHA512 eaf28ce424f1367e548cb78c09de9d39154dddd87e2f19ed238197b6304b20bd9fef599d7df44ca128d89d8cd04d3b7fdd455241bb34ecd688c8042a020c4a36
 DIST pdns-recursor-4.1.3.tar.bz2 1223928 BLAKE2B a4896504768073576d3fa9070e661ea55540321ba3823d62971a4fdd088d6b3394e5a123ad9e071addb6c36d9344296494bac60623f91972bb5f2f0c1d79ebfc SHA512 5ea7e027131143b3ca45ca4a97316f52207a55cf5498a136e44cf5ee78bee00efecf3cd7c9c46261002cbd6e4ea0cd2af62c456b71fd2366729242950b7c060d
+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.1.ebuild 1826 BLAKE2B dc2c0474c4d91a7b50732a2f58833d5cb24762c1d27905506fb805f68de4378a9f6aca9dc35d9eb022dcd218f3c128b50bc022ba03606f136d6a4d528a1aa073 SHA512 b8f1f253ee793c7a5b97e4007ec513b798da985e945fccf931f366d8d42c8aac30462c40627974a128ffc3fb5beb2f779a2b98f27ce8bbbeb3351974b136e5b7
 EBUILD pdns-recursor-4.1.2.ebuild 1826 BLAKE2B dc2c0474c4d91a7b50732a2f58833d5cb24762c1d27905506fb805f68de4378a9f6aca9dc35d9eb022dcd218f3c128b50bc022ba03606f136d6a4d528a1aa073 SHA512 b8f1f253ee793c7a5b97e4007ec513b798da985e945fccf931f366d8d42c8aac30462c40627974a128ffc3fb5beb2f779a2b98f27ce8bbbeb3351974b136e5b7
 EBUILD pdns-recursor-4.1.3.ebuild 1826 BLAKE2B dc2c0474c4d91a7b50732a2f58833d5cb24762c1d27905506fb805f68de4378a9f6aca9dc35d9eb022dcd218f3c128b50bc022ba03606f136d6a4d528a1aa073 SHA512 b8f1f253ee793c7a5b97e4007ec513b798da985e945fccf931f366d8d42c8aac30462c40627974a128ffc3fb5beb2f779a2b98f27ce8bbbeb3351974b136e5b7
+EBUILD pdns-recursor-4.1.4.ebuild 1826 BLAKE2B dc2c0474c4d91a7b50732a2f58833d5cb24762c1d27905506fb805f68de4378a9f6aca9dc35d9eb022dcd218f3c128b50bc022ba03606f136d6a4d528a1aa073 SHA512 b8f1f253ee793c7a5b97e4007ec513b798da985e945fccf931f366d8d42c8aac30462c40627974a128ffc3fb5beb2f779a2b98f27ce8bbbeb3351974b136e5b7
 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
new file mode 100644
index 000000000000..7e2d4e9bfdb5
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs flag-o-matic eutils versionator
+
+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"
+DEPEND="${DEPEND}
+	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
+		version_compare ${old} 4.0.0-r1
+		[[ $? -eq 1 ]] || 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
+}