gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /net-dns
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
60 files changed, 471 insertions, 1611 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b37dafdd4624..939015e7a2e0 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 f441484b2e94..f94e06d43df8 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -8,6 +8,6 @@ EBUILD bind-tools-9.11.2_p1.ebuild 3150 BLAKE2B d27676a209a1c10af67af40fb8e4cca5
 EBUILD bind-tools-9.11.4_p2.ebuild 3208 BLAKE2B 2283d2ace001715cb60542f169c5604fa049b2105a848991b4b7b2a2b66d8630c10e1d65cb832209ff74a26184e1dd93762fbd63348fa9bfe1850cfce1634f4d SHA512 7d5e6d989b952e6400e272fa02383c201342c0373f36a8561f22df549ec12fb7d414adf60689bb9801006e552779b13f5efd1b339ca1a161c1b9166bf4e0f92b
 EBUILD bind-tools-9.12.1.ebuild 3368 BLAKE2B 800b01b9fb04b2729beb94f422b64dbff471e21490a1f70864f2a535426194960430de58e0547e487a8f95b6898f5557a5776bded565aded00b8d50548432c89 SHA512 d787f6ce937c47a94eb9e1e9654647403746056f2b0fd4d8a57615de03bd490fa50ad7651ab7cea6a9818a85de0d4926e6c07f868755c92e551d8734285c3a8b
 EBUILD bind-tools-9.12.2_p1.ebuild 3439 BLAKE2B 3b924df8db1dd9034ea43e9f12da6f180fec964d146820a0b3dc1b4395b4fad579ea98be33f7e38da7ddedf02808274237b5af69231044c55192f1c80c776bba SHA512 65f9e22ba1c9816865abf24b6746b3f519b61ee3a79ccff5b198a0b8399cc96e7aabbc99c3e98f4251fee3f18d96b8ef135699c0411cdd3c0b1c3af519c68a57
-EBUILD bind-tools-9.12.2_p2-r1.ebuild 3572 BLAKE2B 16beb0371cccbabab3467707f04a969c8982bce2a73f28d8c414b0aae5d1d8ac27231e40e06d7d377b2dfc4906e5faff9962a49716c8855ccd746335f7daaa23 SHA512 079c76b455386a3edfb32af07d0763dbbdaa89e1b1eecce1b31f7fb11c2f4be034c9108ef547f4948b92d86d712bb593f830c36f1be0f86640e533b4619a1df8
+EBUILD bind-tools-9.12.2_p2-r1.ebuild 3567 BLAKE2B 0dae73150ab67611c9eedc6aed1a240e7752da730c2c50631eeb2ad910257df59576fec517901df420455b101c293b436d5103a525c60c02f852c073acb9ed3c SHA512 05fc8f6115e3a178f347914cd35faf87f9a42e8b6dbb47e37618f2ebcc529cbffc37a95c5f0b2c0a5a9de0fcee3f774517e470537343c43c6b9c08113f116ee9
 EBUILD bind-tools-9.12.2_p2.ebuild 3500 BLAKE2B f4cd34890a0427f88efddc39d1c13ac5ad6ddbf556c5341dd755d71d9b573e9664a00a0362bc5b58a3d1a5931e85dd9537b7225a7382bc2e68ec505b980624cd SHA512 902440e7475a939acbfe67a4ce56edcb2ddfda46424d320f160b72dbef3387c183d707035157a5ae918e4b266768da880fc8219594a75f575daec9543988b2ab
 MISC metadata.xml 640 BLAKE2B e563c600c07069fbcf6b9c6a650c4ea47004973757ee685ef12d88c012d70dc2d50831f238aa0ce557531dc91fe8dbb606e526a3b3a72d56725024d76329bcf7 SHA512 e87aa31e416bf3051f213c22b744262a6f4700254a42ab684da2a99eb2b9efb848ccbd2ec747f7c9f309556e6ba5426edaaf3a877cc620758cbde0b40d8c6b37
diff --git a/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild b/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
index 1a4d28b1b3dc..e2618ed763a1 100644
--- a/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 6e6bdfb0ef2b..ad27fe4a4393 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -21,6 +21,6 @@ EBUILD bind-9.11.3-r1.ebuild 12181 BLAKE2B 8efe68cae507e1d58df6081419c9db121d7b5
 EBUILD bind-9.11.4_p2.ebuild 12227 BLAKE2B f92c267892ca96749ab23e61a958fc2d7d1e0750cdc461d8a7f28967fd3936e9c72bac0875a690237e3e5c104a0495ed6c76bbd74f47cc026c054ddfb1b728e6 SHA512 282fea5fa00fa226a983e6321bebba11c5abf321baa632296a40d66ba9b0c77977cba8e299130883081bfbb6a58e48c9e154ce6635cfd725f9ab72a14a8df169
 EBUILD bind-9.12.1_p2-r1.ebuild 12140 BLAKE2B 3c4198382162186541ca90b176b5c3bed82be1e38d48f2e5b2a3d2329e9a9b757b7b69362e5c9276ca158e250a3764d411aad3e55655f21ef92c3bade0dd0890 SHA512 e36ce712b00c80f4518907e7e58e01a1d83b0118544ee3ea5cf15d8906574e09d834831c6af6da23e0cd1884bc1b070720cc85f52a02ff11b13ab3d3b3983236
 EBUILD bind-9.12.2_p1.ebuild 12169 BLAKE2B 365eee1da0687002f634366c1cee23c5dc89457a17d55d2bdad09cb4dee212a22d8059048c4b1bebac77454d9420dc02671879ec3256241a412653c012af98b2 SHA512 e7624673a93893b33bb9c4307968d5673d9cf5ce97eb7c5f99d51ad56da80befee7cb10cc0363a014f2a1707e7951da61c662b928860b74cc848ac9fe8e32518
-EBUILD bind-9.12.2_p2-r1.ebuild 12364 BLAKE2B 4e5d2bf2c084816096507685f10445e91dc6b2df20021cfcb85291c8c17048812178258d32ee8ca1e959663732ef2e54b33eb69afd4cc885a8c9994bec59ea42 SHA512 58ff37176886e83e325f7012d8241a2002cdadf120bc88e005b49cc9fc563c22a09660cdf33158ac8c94afadaaaa9ef067e2dde460e26ba6c6225106bb860e9d
+EBUILD bind-9.12.2_p2-r1.ebuild 12359 BLAKE2B 0525a4e9db74c589cbbd37297eef8d3719c118915747de1829e1e066e9b90f7362c339f33c56d720bf87f96d0fa0fdadf36947b128c6c800abf9283b569343cd SHA512 65dc6934bf8cf7345cef52e2d640d73652a68fd77caddd995708c87e08b6a2ced1317d54c993a2ff1cf1d7cd17f88b2073c5b42d44a872ff35efcdec2380e97c
 EBUILD bind-9.12.2_p2.ebuild 12291 BLAKE2B 4753e676680d30b6335b2345851dcd05a4d29404f2d543f47dbb80007748ef1e474e4e4671b682a4f5af857b7df78fd1ceaf1afc5685897c5232767ee3cdb9e8 SHA512 75c3631b02a630c7e2a7e452ed65b0ef355b9108b4db84aedd44f7cfbb282aa22f8f5392a2c23f7aefa832a23c7a1c9032ea5037be5a6680269c008e038c1cd4
 MISC metadata.xml 1352 BLAKE2B 89e5d161d824bd1b9a9e9c6ab49457b12d856a8eeb4dba9fb2f3ea987fb88ef708aca88d0d654aeba4ade9d49dc190f9d3e18f86e2c2c874e017aabe7ea8f079 SHA512 47171fcafd8b7b316166e8ba565cc3126ccf2cca4b447abffb7120c34f9ea22243539857d040bf17c509862a9d42d564ccbe151e533a4961516799c5d73d30ab
diff --git a/net-dns/bind/bind-9.12.2_p2-r1.ebuild b/net-dns/bind/bind-9.12.2_p2-r1.ebuild
index 4cfbecad39a2..908689d620a2 100644
--- a/net-dns/bind/bind-9.12.2_p2-r1.ebuild
+++ b/net-dns/bind/bind-9.12.2_p2-r1.ebuild
@@ -36,7 +36,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi idn ipv6
 json ldap libidn2 libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs
diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest
index 1b30924fc1bc..b40de0b50b3d 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -1,22 +1,31 @@
+AUX coredns.confd 39 BLAKE2B 5db4c5b9e992dc7beff0ba80a7cc5337d5ddad132c2467b64b5214d9e4fabfaf1821bb61e727a49d052196f64bf2ece1f40f4c665d8ca53f17a98d2251c0731e SHA512 ade2ce80cf2a1f0bdc5d2de3a80194973289e3d62cbd349cfc7f03fa3bc8c3afc95a7a8dc4a46eda0c401239c226c55acb50b71d5596ed65e9afc56be6dfbb97
+AUX coredns.initd 497 BLAKE2B 3e29d701123c0b039312c9d7306aa81aecbbec3dfa654da382ae9598b3bd6c2b3e224d0faef8549d37606055a49e9d78413e7aff552148bc417cebf3ecd5d960 SHA512 afc2a20c1a2918292931cf27446ac817df1a9e88a4c3ffe7fee50c4424c1c8ae7dd084753a624d382ad2158020fb565ba6151c3eaca2ff4d80c9640e566529a1
+AUX coredns.logrotated 81 BLAKE2B 7fe70e32133a9470a60834dee5632151ed215e478a9de697dbca3ee553e5a8719bc941251c6a37723625b7c59f10f5050c79edb94ac8d4127561c12813ba6a27 SHA512 c697c08c3b1153ae224a1eeb3521f9ee594de4852bc6ef78d94dc7f6f680517659a653ab5c13ea03918deb79e6654ef11512ba4c90fe06ea4591fefbab876ece
 DIST coredns-1.0.5.tar.gz 5016183 BLAKE2B 93bc88a1fdd792b357ac7678a75a415fd4fbfb29e6c75768e6c444cd547abe1a7166e5d3645f360790209c4fa437170cd33bcdb097242db06fd08170ab77067a SHA512 ef5b9704932b972cd38f5eb160b1c0c405943dbb19af77db7358f1eeaf7d11d73b589e6de9dfb62f75bbf37db351cd856ae0aac2b7b1a1a909b01f4895406b81
 DIST coredns-1.1.1.tar.gz 5087192 BLAKE2B 21ca6975c56bace24d9c63581b37be6bfef54055332dc13171d93698003a848d775f4806d6276ca120703a11088a4afc9fc827f8b14a16e11d61320c31a1364f SHA512 53434a73c7899ed0b0b126ace4466b91d0529cad305dc10d3b83dd011c97fec969a669fc1ef38337957bfa16af404af0a088daaf62af715abf0414797de6eee0
 DIST coredns-1.2.0.tar.gz 7321954 BLAKE2B 08118dff6a3dc0a9e36db53125bae426c270a96df7076de23e9d5b3931cf58347082315f1ea15e0fa3ae081dd0e0ddeeb05c33a0044454220fbef027e2ac67c9 SHA512 c4b9c18337f4b55ed90b0c48ce278042c540017b556587075d4bb74666f98a7e2317416d1105cdb92e7fc0111d4bb953473e8ab25798b67da75b9114868394e3
+DIST coredns-1.3.0.tar.gz 6503544 BLAKE2B b285743b2aa41c29f7c6e77615205ba09d856914d592e1906de36c60048ac0342416d3719b36a7dda635a0801c3a78478f6e07dc98e908b88f34410db7db5937 SHA512 d525ea7f224343f677842f17939207bf7719d81e21015c1e4ff298627d14fcdd9e8bd93833d28929ce19e782857018f45eb0be07d73926edc5ec54e3071b96b3
 DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
 DIST github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 BLAKE2B 057738aefe26d3d42ba1bc0906675403512a7bab1161bc1015f6d833296778f2236cb2b99bbebd5c7db2384634fef62d2afbfc8dd59bfb1320bc6184105aa437 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32
 DIST github.com-golang-net-b68f30494add4df6bd8ef5e82803f308e7f7c59c.tar.gz 938028 BLAKE2B 04b66e87d3664ccff451349146ca886f56d8d306a82ceac0931b6b714cfd0e0fa88221986233f38a4f1dcac09be2222e23f03ecd761ff4cddaf422dd98a79641 SHA512 2f7120e4b3d6496f6e3e01d9df1c41e81b1fb7874fae1f6dfda1928f0df2dfa1a08f2522d44ef2209a3b251f6da4fb9a67041dc22a6f8262d7ae6701ddb6cc5b
 DIST github.com-golang-net-cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb.tar.gz 936963 BLAKE2B 19f9996d10bd9f5aecd2bba512301519c65acd6d1c11e97617e69c4fe810f3558b05e1a3d546d3ee75c6eda96d310f63906a9217505d16d35438ca8544de4f68 SHA512 48e12282dc20ee3c614a7622ea10d986071976e3c3ea04eae01469d5e50495f9b22ccc70f0dc1ac00a5a8fda86ecb350acc6708d9467fc588a0aafc9e3641f7c
 DIST github.com-golang-text-9e2b64d659da1afe07ce1c9c1dfefc09d188f21e.tar.gz 6112515 BLAKE2B 1c28dd8598c700c9c1d83ba7ba43cc97993c7261253bcac9f49a9fa0aababf05f2d522cf7ae4549d1679bf6a49ae9d0840863bcc9fa23ed1ba789904e42e853d SHA512 0b483eb86a2681264f66b320a25524690a86a56d28e97c2e91ff7cf7d8b8d531e2d5cd96cd4b842d33ea01355eadae6b6856195a0bd6c128b380b5e16fcbc286
 DIST github.com-golang-text-ece95c760240037f89ebcbdd7155ac8cb52e38fa.tar.gz 6563431 BLAKE2B b889252096070044687cc804b828a9b55a444895fde87a75d1ed7de89a9953d208ef7cf54ecd501ebd8240a9f42e7bcc2c6ed09cb76256e235b94cac122abd61 SHA512 0c1814462560a3cb3e5f1b8a82a321a66baae712cd415043b2c910427ec5217f5cc65cf0d64b07c113c3e06aca9260c28a06e19f1a535fa457a3c2a67e683b07
+DIST github.com-mholt-caddy-6f580c6aa36c54c3e1c65b5c609550a8a2508e3e.tar.gz 2918590 BLAKE2B 44e50f98c48687d0d5a2155bb7f093ef7e18b6a0f0a23186ee6be28866b9e7dd79a8e0b5223f8a2250f710b2d290d7274195cdaced8b25eb6c478c7e00a2dc43 SHA512 ebf7dfa6376d9bf9f487919a630148c9870fadc23beed12b70837ed73b72852bb0373407f3e994903bba2365ce1233f79c786465f2bc1c99f64718dd8e14d844
 DIST github.com-mholt-caddy-9619fe224c96d0c4a060e83badbf95b6bd69a0ac.tar.gz 2712643 BLAKE2B 96f529d158a4133c266d54530a895d5b5b5e9bb0960569e42c14b1152677fdb06be91a9ba9d25eb92cdf858827983aa247b7e162feaf9f16819d22d19b4f5fc5 SHA512 f48d4d211ba182a7b3ef4322329167d8ec01ee92010b85fe67a663780b4771445d9ce1297ed38ff572b15b0649c9fe9cb321e45bb7131755e57c66ca59fea89b
 DIST github.com-mholt-caddy-b33b24fc9e9d50ce73ec386e44c316d70c47642c.tar.gz 2910394 BLAKE2B e52576f5f952dea15c43f66b6a088f29caa0fa4534727897f8a2134c90425b5b97dcf4d5a45d310be5da8b51d3704382be8c2e191b062f026f9847d2cee85eec SHA512 1e03a9a2ca4e2a1be27e9ca69a2382a1749ce31a472716b3390bbf7dffcd36ea1569b2f2982efb0fe292307bc72cfd34af1431ae993151315007065383b8eb3e
 DIST github.com-miekg-dns-5364553f1ee9cddc7ac8b62dce148309c386695b.tar.gz 2517679 BLAKE2B ad17feb9fe826f84d65e6fe85f10cf6cf901bc6cf593d9e44a02edce72e399b0184a29617cb67f38b2fb0278ffa46d872c32f997c3facc2154a23cceec046bdd SHA512 d4f6709e2c20a3d639b167c0d0e7f987cd2e2d849899460ed26cc7e7f4ce682b45eb3be59a4be91e872a9eea29130f72a7de4f3c1006d99449c6f762f993b9bb
 DIST github.com-miekg-dns-5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1.tar.gz 2522486 BLAKE2B eb77d61519b72d059e7058fd4064edef049f523e04d84374cfc1f05b419ec258c7d38bd039e4e89287c572cf989a4cc91b1e163ea25d33db8b5b48e27b73532b SHA512 1f1e140de386daff78612cf66fa4083a42be91221b09cda8e81cd614566202b704f9ce9bbdb1afa7049eb539c4b888517f29e746aa4f8e259f04937c9d00ce5e
+DIST github.com-miekg-dns-7586a3cbe8ccfc63f82de3ab2ceeb08c9939af72.tar.gz 3886474 BLAKE2B d844c4c6c5749c7fde4712ed87f2bda7f8f048a1694ec8f22e811b4c0d1e8b2ceffba88921ecf965efa65d7290c436744ec17cda3f00ed3df3aba08bbc6be796 SHA512 63f08795063d48a15bae40c55d5edd997b1b341dead43c908fc9b9be71c7876c19f28965d9dc58b81ce48eeefcf09e3f1832141b6e2e3850e138dd727f64995d
 DIST github.com-miekg-dns-d174bbf0a57b4ab555db36b0e55f692d5e8dfca8.tar.gz 2517044 BLAKE2B 7577220d999ad5e9f77e5d9f08e7cf22f390122f35994742a566c28583d491785070e13a5ba2f39a79da8f377ed421466cf914eb34647fa68106fe811a64ba99 SHA512 7a6fc4c95762e4439cd9ae880f019f041e2a67fc3b0ada24394d8388fba3a83888ad9b53a9f308955ef8c139e545a4848fecde63baa1969923bd17bad2b05078
+DIST github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz 130114 BLAKE2B df1149ebda18c7940ea35fbe09b08be6437a8d4c4f812e3b4b088da8a374718212f0b10a153f3e04a6ffbe0bac109a92e5eca8b95814d221cd6a01d5fcfd48c5 SHA512 27a3cd10256ba6784b2f1318919ad6ce9e2a15c029c18961cd760a7569d5c683097c7407478b2ec96852163a321cda854aba18b0a73e0dda836480d05451bd62
 DIST github.com-prometheus-client_golang-e69720d204a4aa3b0c65dc91208645ba0a52b9cd.tar.gz 106879 BLAKE2B 788fbe906d4e2fe4c9e61c95256d7ec8e70b038438fb9afc69dcdc402f9c52509fe2645e0b1929dd0595ea75f160013c1b71f82d5320775724a60b34d22c1877 SHA512 27fd454387c730704b2e44e40d873843a5d36894307587a8eea3ddf0604052e9ecbef36ca37cb6a2153452ff7e1c1294d8e1cbdde7b11742db74be55bd4e2b7a
 DIST github.com-prometheus-client_golang-f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz 106949 BLAKE2B b5ee911f6d478ae21a71c2827f541ecd174dee7dbf23fff58a517e739f0e16bf91451a6aabf3f3f786b62256e2c4ee8481cc3169d01819425d56a0eb802a36c9 SHA512 234ad2fa57751901ab2a0e5843bce17689166d8fc285d63f9de0da412cfe7176e8a9f96c0bf5342184985fbb564def31087255bf11766331636c3624fe85eb62
+DIST github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz 61606 BLAKE2B f67de9c0f3e8d814bed1711f0e0771c13e7d4d8d9dcc67ede3615bb80f8a8f20bbcf9ef65e46dff4a41cc587ef10ad54ffdb6909fbe83f19993422ed5714dd81 SHA512 8cabd997ac2405fe53aa507b6755aff7aa4ae2a1fdb3711abfac5d29bdd369412a17359c3d9c3ebc4945d1b6310c2fadd25201ec7b040b20e2ac5d27b56c564b
 DIST github.com-prometheus-procfs-282c8707aa210456a825798969cc27edda34992a.tar.gz 54057 BLAKE2B f6b5f64f85c153a8423d83ac8f8b810a4ba1fee716a597b9030b54524932513fa92139ecc363a0e89b9198092c88477cace244a4a5cf03075ce37cecf8a503be SHA512 2fb6b399eea1bebfcf1fde8dbe6443a5906834ea4a9738230b407610ef22f8726be13cf713a354a084ed3f27bf77ea7dbe5dedf20c7a9f6efe3e36f074aaee38
 DIST github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz 56873 BLAKE2B 31ae12d51b6a28c285bd5854b137d2634499d0db3c2c65c0404ca5a902ffec2e9bf689261ea51c2fe1643733f09a780c437f7a7899a5e6c3e3d100a36e07b897 SHA512 a548c6bc71456c9878cb34ad1514d92c8737e01b555e953f848cc1ae7944424b06a14a8ab0c6de4d99dbb189a0f29e2bb9ae09b5adffc327c28f5c50c2819892
 EBUILD coredns-1.0.5.ebuild 1314 BLAKE2B 0ab37dc4194fd5a16a8fc3c35519c2883a4ce364a17305bc4f22f19cda9db094ef1135053a39c2ab5fbb34296f3758dc194d0fe18b9432c038050a550d29274f SHA512 13892b631ac55ae1e026ba59730ead8b60cc85c6221b9a2bb214a12afdd038ab30286e6703ac7de0a0b3856498559c52d99cafdfabc0dbeee8d61d53165e84b8
 EBUILD coredns-1.1.1.ebuild 1314 BLAKE2B dc1ae9b46b2301944ad6b5784b4e404c7e74e993df2d9d941ce51ce9fcdb35a61c4677697a2ce0a61180b2eef9a227cb99f33091c5212db071cf03cbf16b51f2 SHA512 865d5643bb73e5ab2339d00fb41c00b3d4701f624b820e882140fc44b6a25ac868aa342e3108327e7c7555754ddc7b929b490427d68043ebc8ef4c62c68e5517
 EBUILD coredns-1.2.0.ebuild 1314 BLAKE2B e24c7be69f865fc2ea28806fbc0b1ab21882789ac64851b3142f1fabba8fd5d62d518943ca5e67c7b0d22632d54f982a9e40aab3116ee89c07c46f9843152b95 SHA512 60d66dfabd1d841040b9182a66a29b5737fbaeb62c3d5da8d8f175a0039d369847bfeebfb12c93499c8010c32d1fa2d03a44bf27ee86136bec3ed775a35fb68f
+EBUILD coredns-1.3.0.ebuild 1325 BLAKE2B dd12e68824ba9d0d19888d1ae3b1243b2eb516f80e033d5c6f9ecc8e7628874383dbb2dd1ccf2fd33675f4647ccedb882853324a6237cae0dd6387fbb83e8d7e SHA512 6d9097ce0e665f3c6805edc1268280eaa8dabe762e8931bd3bca0257e8979c2497619fd0c42f3400b2a5e22319b45d4ead509ae4b1637b5e989f263aaae862de
 MISC metadata.xml 252 BLAKE2B 7baf6a36298a65278df45bc6e36a8ad2e613e3442ce78d334635f1ea2550695e12883bf64e5648ce684803ed18014e70898f719db30558367e4012a63ca121ab SHA512 0b024640287c05805bfd170d1c38b1de9c1165ad20548d52a89650b39d6da814a27718d739252c2d2a57b8694ddae913fffc4af7bb78bb2a3985475a88c19d7c
diff --git a/net-dns/coredns/coredns-1.3.0.ebuild b/net-dns/coredns/coredns-1.3.0.ebuild
new file mode 100644
index 000000000000..e7bd00feea36
--- /dev/null
+++ b/net-dns/coredns/coredns-1.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/mholt/caddy 6f580c6aa36c54c3e1c65b5c609550a8a2508e3e"
+	"github.com/miekg/dns 7586a3cbe8ccfc63f82de3ab2ceeb08c9939af72"
+	"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
+	"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+	"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
+)
+
+EGO_PN="github.com/${PN}/${PN}"
+
+inherit golang-build golang-vcs-snapshot
+
+GITCOMMIT="c8f0e94026b5f3530064dd3266eef1a80e3b0f1c"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A DNS server that chains middleware"
+HOMEPAGE="https://github.com/coredns/coredns"
+
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -v -ldflags="-X github.com/coredns/coredns/coremain.GitCommit=${GITCOMMIT}" || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN}
+	dobin ${PN}
+	dodoc README.md
+	doman man/*
+	popd || die
+
+	newinitd "${FILESDIR}"/coredns.initd coredns
+	newconfd "${FILESDIR}"/coredns.confd coredns
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/coredns.logrotated coredns
+}
diff --git a/net-dns/coredns/files/coredns.confd b/net-dns/coredns/files/coredns.confd
new file mode 100644
index 000000000000..3e7e56c9a2d0
--- /dev/null
+++ b/net-dns/coredns/files/coredns.confd
@@ -0,0 +1,4 @@
+###
+# CoreDNS config
+#
+command_args=""
diff --git a/net-dns/coredns/files/coredns.initd b/net-dns/coredns/files/coredns.initd
new file mode 100644
index 000000000000..bea612d7d5e0
--- /dev/null
+++ b/net-dns/coredns/files/coredns.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2017-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="CoreDNS service"
+pidfile=${pidfile:-"/run/${SVCNAME}.pid"}
+user=${user:-root}
+group=${group:-root}
+
+command="/usr/bin/coredns"
+command_args="${command_args}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
+	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
+
+depend() {
+	after net
+}
diff --git a/net-dns/coredns/files/coredns.logrotated b/net-dns/coredns/files/coredns.logrotated
new file mode 100644
index 000000000000..19572fbcad9c
--- /dev/null
+++ b/net-dns/coredns/files/coredns.logrotated
@@ -0,0 +1,7 @@
+/var/log/coredns/*.log {
+	missingok
+	size 5M
+	rotate 3
+	compress
+	copytruncate
+}
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index cf5055574a19..58c910993913 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -3,6 +3,7 @@ AUX ddclient-3.9.0-use_iproute2.patch 1388 BLAKE2B da84054c603cccdaa45d4be9b11b9
 AUX ddclient.confd-r1 98 BLAKE2B e92bca71a65504290fc928c2f477f58f1d830de5f8a1181e715c9804d74d4f8b1e57b9cd22f12965f232527a8e7d65fbbf654f786c23cbe3859d78f20e843c74 SHA512 a74a3b0863fc20d740de07bfc37bee0aff6d7316ee72152241929e0a058ec34a5d76bc4429eedd69b03047f081cc0601543988b066ee246d671945a01fa0876d
 AUX ddclient.initd-r3 1312 BLAKE2B fb00fcd594117af5d147d507f66516db42ac8d09f2dcedb62b312b87129f23eeecb39af244283c0bb3d201651ae5bac70e23fd3605ab8027a86737aa10c7dda8 SHA512 388725815c3fea9df57b6cd73ab9a549967aba2add3be9fe5153f57e20635c037985c28b1f1ebcb8a122737cdc6277f0711029375f7d62e03491457959ae8dd1
 AUX ddclient.initd-r5 577 BLAKE2B 5cf4b239e15bed86f98b65891c471a52179d3c7435a0a371e3568eaea0911625fa58faf466dae49e3abf6858a5d2bdb6e682fbaae78dc80e34092c95664292f7 SHA512 3b26160d1e651f418324b3544f8ae01781db32de8040d88fb48710f776f475332c3fdf36906331039c20cd47f5400c3ea47adf8dd7fbc7d6ea78cccb47a43c4e
+AUX ddclient.initd-r6 584 BLAKE2B 6f1c9ddf862e50013208adbbd77f471ed03faf59381ed30fc7aa80dea7ec83c5c3122ee3a8b38f7192d4e940658a28afba2c1130f629f360e3d82d72d0336227 SHA512 636fb2ae3def5f3127c6fbecacdb16250dc843775a831877ab2e7dfc9695d48303d3a3e3f35c5d092c557df2f83493b4db78cc74ca0379b92054d9eec6291516
 AUX ddclient.service 234 BLAKE2B c9f9c224742f9047e12677b6e3ece8206a26b72953bc6b1695db39e397c8b1fbbd08b8fa2acdd739391a4fae379570488db9b2d4c274950e5881b50028f07fc2 SHA512 e3c36148804ca7ea29f2d030128941a5d5a7edc6ce3a223b8e72ea8800d622169d3825d2ede6e69630e9ca57e8c62b6f3af97269e9d671e6f2d2973b4a43602f
 AUX ddclient.service-r1 235 BLAKE2B 204793b269c65d7ed77f89c1d5f191298a7b03f44dc22526331fe28585ad1abc2c19fb3f2c65df1dd32bd20f3f121bf2f7d936ed42831067fc232024383c768a SHA512 1bcceae10d8076cb3fa5cb0215c0eaf17588e943d802c40cf5334f125a3697b103646bc393ba4db90845ad8e6ff1d4301b86afba5609ecb3bff98a5623f09195
 AUX ddclient.tmpfiles 149 BLAKE2B 0ad955937dd6cf714530429ffb423e0acc7033bdf7e2486a99d50d055edb85adff869209631cdfd8c2aa49263c31817868b765e7af27e222ad9f0b19bf439d74 SHA512 13c6e541ff23575d799eee943b8e10e277e5073732cd7c9705c23ee557bd99978435c0fe8b546fa3122a60cfb0499e27853e1968f0c1e0225890b68ae678e0c7
@@ -10,5 +11,6 @@ AUX iproute2.patch 1394 BLAKE2B c0f9bc4d3086bc70fbc033a3e2c55479fbb29ae0c051ed1c
 DIST ddclient-3.8.1.tar.gz 48600 BLAKE2B a945adcb42bd298422c71c0eea6bea36c6b266ce39e97ebfd833b29819a2f30f2651d7f7b17dbfc0720b6209d0c0ed94bf2673624777f07e6de83a7081471995 SHA512 d6722582dffe0c5a806176f24bd3d9117bc1210ea0137aa92138390be16e67d47b746777dc431282a664849c91626969a5e267777126bac03304c7aa34a9dad7
 DIST ddclient-3.9.0.tar.gz 59018 BLAKE2B b9b58108d9f124fcd5a72cc57bfb0e6a5bc2e115edc27a1d5950a929670d67d5c703b09f51e7e82e977ccfb544d115da177b0ac8dc06a76a800aa207cde5a42d SHA512 ae314c96a37dd90256d6acf62f4a4523b72f540194131e351a032239b00b4520351f6549d3b20a9209fe49ccc6de7ce158ffa8635d341066ea71b789dc667438
 EBUILD ddclient-3.8.1-r5.ebuild 1416 BLAKE2B ea2a67f9e888bbeea5208309ee71c87d35c98fd36a94bcd445224c40915226a81ba70d253bac29f55c0b87649ba15122115c854b40b06d67ff85bd85c6ab7b78 SHA512 a9215c25bd9c90042267eb9c1f0c2258d86c814ac3d343c8c795ecf8eb7eda6cc3ce7fbf1823f917b60724232d118d5904cb55afa1549f875466fcefb7dfb2bb
-EBUILD ddclient-3.9.0-r1.ebuild 1530 BLAKE2B c1995e8173488cb0215199a8116ecf37ca101a695404357cd7d3c06a26646483b56fe75006a4dbabd4d96f3735b341c5238396cf638a983355ddcf9d6a9cee94 SHA512 1eda1446c9932640c3dcde63cdb94626ae14cdf8b191cc3aab5ff104e70650a7ebbc8630e49861d322d53f5d49bfbed7ca0925d84138b87b4ba80b1169859a68
+EBUILD ddclient-3.9.0-r1.ebuild 1535 BLAKE2B 6304fbf340d44c30b0d4ed060e56e41d70a8e32ce0636e3ea578469bc7f0c3eeb3b694d7dffe7819b87f1dadbfc61b3983d2903ca8a9c0e00410f354e41abf68 SHA512 8507246a45980ca67dfc94e688593bdd67284e8a906cc57b96b7346113db7d088036ee94061895e80c589c549364bb40652faf8eb37aaad243d30ac12f0f89ca
+EBUILD ddclient-3.9.0-r2.ebuild 1538 BLAKE2B fb5522ecbf2f59b24bbc7e9283272edc2a5a001fae408c2d84fe36d8ec74ea466aee6a0d93957995d5ea55f9bc84c673da89e99d9ce6fa8bd929286fabf06f80 SHA512 eb625c2004b9b93be9218d7ac01014d0f464e31ae6e83e4d77aa6a31f59c42bb960f859284aa911940c5485ed0b96d7a558afdd44319219b5b4422e584db26b7
 MISC metadata.xml 1204 BLAKE2B ac62d1bf7734e1374f7dc93c6ee580695326c8a849e632f0249d282040436e78a09853a8dd1b455c53ef6e4e4411041c72ce95e30c85969d9bcf15b54b3ff2bb SHA512 ac78082e28503857341d5ef0ec7a6c2d29b9d47c502c303878501c3bbc929627add8e6646afb692f786c44d09916f4cdcc1a8e2e6c6b5fd1fe8389a39a950aaa
diff --git a/net-dns/ddclient/ddclient-3.9.0-r1.ebuild b/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
index 5a6da8fa1772..0f551c6eae4a 100644
--- a/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Perl client used to update dynamic DNS entries"
 HOMEPAGE="https://sourceforge.net/projects/ddclient/"
 SRC_URI="mirror://sourceforge/ddclient/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="examples iproute2"
diff --git a/net-dns/ddclient/ddclient-3.9.0-r2.ebuild b/net-dns/ddclient/ddclient-3.9.0-r2.ebuild
new file mode 100644
index 000000000000..dddb32450e97
--- /dev/null
+++ b/net-dns/ddclient/ddclient-3.9.0-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd user
+
+DESCRIPTION="Perl client used to update dynamic DNS entries"
+HOMEPAGE="https://sourceforge.net/projects/ddclient/"
+SRC_URI="mirror://sourceforge/ddclient/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="examples iproute2"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Data-Validate-IP
+	dev-perl/Digest-SHA1
+	dev-perl/IO-Socket-INET6
+	dev-perl/IO-Socket-SSL
+	virtual/perl-Digest-SHA
+	virtual/perl-JSON-PP
+	iproute2? ( sys-apps/iproute2 )
+"
+
+pkg_setup() {
+	enewgroup ddclient
+	enewuser ddclient -1 -1 -1 ddclient
+}
+
+src_prepare() {
+	# Remove PID setting, to reliably setup the environment for the init script
+	sed -e '/^pid/d' -i sample-etc_ddclient.conf || die
+
+	# Remove windows executable
+	if use examples; then
+		rm sample-etc_dhcpc_dhcpcd-eth0.exe || die
+	fi
+
+	# Use sys-apps/iproute2 instead of sys-apps/net-tools
+	use iproute2 && eapply "${FILESDIR}"/${P}-use_iproute2.patch
+
+	default
+}
+
+src_install() {
+	dobin ddclient
+
+	insinto /etc/ddclient
+	insopts -m 0600 -o ddclient -g ddclient
+	newins sample-etc_ddclient.conf ddclient.conf
+
+	newinitd "${FILESDIR}"/ddclient.initd-r6 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.initd-r6 b/net-dns/ddclient/files/ddclient.initd-r6
new file mode 100644
index 000000000000..7bdc433d1ed1
--- /dev/null
+++ b/net-dns/ddclient/files/ddclient.initd-r6
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# 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() {
+	need net
+	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/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index f0dba1f8b97b..f7661971ba1d 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -4,8 +4,8 @@ AUX dnscrypt-proxy.initd 632 BLAKE2B 6f82264977f3ca795d4f92919cf7da606c02a0d10ce
 AUX dnscrypt-proxy.service 1198 BLAKE2B 14db1a48f94b07622e0f52d8510e6c1634013e66ab5e5cdd7ddf7c0cde4441fd78b71134e4cfb6f122ba4a191ec032d54e92b1be97e4bd49af61a873431ea002 SHA512 c7dfe482a8ea17cb67681b92ac65a2d2d58d2be364351d131b0b689905d80390c5df794f6c7fb944bd508f69af72af96d36c1b7f7c5c70af7ee636423ab77e11
 AUX dnscrypt-proxy.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36
 DIST dnscrypt-proxy-2.0.17.tar.gz 3364933 BLAKE2B 65f2f1c91cc175a3bc92103dd0a2984dfccf5b961d070097035e8bd8058c7eab41c05cd3fabbff729f9521b16ebbfb188008c65efa5c89578b4b54ce43348d05 SHA512 c1cb2cfff4a5f6eba81ac3b520ddb3acb311031588495b9f94a7ee5ab35ed0827a856369ce0ac7ff206445dbf24f7931cf937ccd9f724b4e38c97f10814df129
-DIST dnscrypt-proxy-2.0.18.tar.gz 3334780 BLAKE2B df72449c6aef65d2cd91eca135bc0a2e1480f87cd06a368ffdb2edb4d5ec0901264a02121ec0ff2f2c9a55d8c2253cb2085f0e27b140420ee4f4cb1ddb854c87 SHA512 e37d100a7394cc46e0fbe054c988fca887584cf58c9101a7fb59a6554dc50a864a4f9fc6d403694292bc57aa29f477172011e9c6ba0df8f1bbf96cfbaa5862af
+DIST dnscrypt-proxy-2.0.19.tar.gz 3339713 BLAKE2B e65b5ed8243aa6cf471700c6edba6e843fdf6482443335ec74201363657b23a7c6e432318e4de508120b6210cecd02666d97bb62a5f2968ce7d4813518eb3997 SHA512 4501a64717c0f2a9313e9328340e466c9ec325d09ef548f6af9a7855ff3497fb741269a17b397a36e2a120519820378e9f98a6a768a3678ea8144ee4690364f6
 EBUILD dnscrypt-proxy-2.0.17.ebuild 3049 BLAKE2B cecaec499e9351f833e675c48d6f0792b03fdfe90edb9fa7d62c3ed7e0c0a0bf9bc8805380f48df0b80986d3f8866ef7fc98cf829942257aa8a6cdf9da4b6030 SHA512 8842a6f5b6deb814355e17961cd6f107347751c017dab9ea15925079199e83618c866778d4a5e712e1eb02d263ac362970430bff5d3a009b6d6a0b26349fd31a
-EBUILD dnscrypt-proxy-2.0.18.ebuild 3049 BLAKE2B cecaec499e9351f833e675c48d6f0792b03fdfe90edb9fa7d62c3ed7e0c0a0bf9bc8805380f48df0b80986d3f8866ef7fc98cf829942257aa8a6cdf9da4b6030 SHA512 8842a6f5b6deb814355e17961cd6f107347751c017dab9ea15925079199e83618c866778d4a5e712e1eb02d263ac362970430bff5d3a009b6d6a0b26349fd31a
+EBUILD dnscrypt-proxy-2.0.19.ebuild 3049 BLAKE2B cecaec499e9351f833e675c48d6f0792b03fdfe90edb9fa7d62c3ed7e0c0a0bf9bc8805380f48df0b80986d3f8866ef7fc98cf829942257aa8a6cdf9da4b6030 SHA512 8842a6f5b6deb814355e17961cd6f107347751c017dab9ea15925079199e83618c866778d4a5e712e1eb02d263ac362970430bff5d3a009b6d6a0b26349fd31a
 EBUILD dnscrypt-proxy-9999.ebuild 3049 BLAKE2B cecaec499e9351f833e675c48d6f0792b03fdfe90edb9fa7d62c3ed7e0c0a0bf9bc8805380f48df0b80986d3f8866ef7fc98cf829942257aa8a6cdf9da4b6030 SHA512 8842a6f5b6deb814355e17961cd6f107347751c017dab9ea15925079199e83618c866778d4a5e712e1eb02d263ac362970430bff5d3a009b6d6a0b26349fd31a
 MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.18.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.19.ebuild
index e2157844bf14..e2157844bf14 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.18.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.19.ebuild
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 9f518c17cee0..d2cda00f2658 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -8,5 +8,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 4740 BLAKE2B c7ed685f2713f23b9e29d1d1c18a52997b7f68e080a8ff23e9bd393eae755be65f52525c40e6ad2ce370eceb79f585b7a28672e00753e89b35b69bd93e42f458 SHA512 87512e61093cbcf24326a29bafb72f850f30e6099c8253acb41c1f10f4909d774e0d94e32a48d787117723817f547e6686464b523c1ae668b8b8f0779143574d
+EBUILD dnsmasq-2.80.ebuild 4745 BLAKE2B b0947292ed5aba9b62f5200c5f3f8a6dab2872b7cae377ed952b7cf336adcbe22003013df4598f8bea9281200e1da56a969522544f2351f6fdfe223c5069aff4 SHA512 8c9508ac2a46a1694bab2fe4d28d4e22277355f8f78a4b1639facefe40c2c92ab2e2205a421acbf08c75560080330327de955e428e72b97e12f9bf2c06686029
 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 5976927532a0..f1a640437b55 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"
@@ -37,14 +37,14 @@ COMMON_DEPEND="dbus? ( sys-apps/dbus:= )
 DEPEND="${COMMON_DEPEND}
 	dnssec? (
 		dev-libs/nettle:=[gmp]
-		static? ( dev-libs/nettle[static-libs(+)] )
+		static? ( >=dev-libs/nettle-3.4[static-libs(+)] )
 	)
 "
 
 RDEPEND="${COMMON_DEPEND}
 	dnssec? (
 		!static? (
-			dev-libs/nettle:=[gmp]
+			>=dev-libs/nettle-3.4:=[gmp]
 		)
 	)
 	selinux? ( sec-policy/selinux-dnsmasq )
diff --git a/net-dns/dnssec-check/Manifest b/net-dns/dnssec-check/Manifest
index 57be8ec58e43..0d7e41c5ff45 100644
--- a/net-dns/dnssec-check/Manifest
+++ b/net-dns/dnssec-check/Manifest
@@ -1,3 +1,3 @@
 DIST dnssec-check-2.2.tar.gz 174081 BLAKE2B ba150154448e2ac93e1a334165406c78d83bf1e9df53617161dc39fa6d5524bbd18e02659241cffa38a98ca76fb7ac2bad3c71c3896e2eb4f6cc86dd0f9b741c SHA512 8c417d2ee04e4f05b0a8978560ada0167e8d7cd0ae3bc365e83adb4ff06bd0526a25a971c7663651b38b53c4982f4406afddb0310bde10cc8c83dbc8da14aca5
-EBUILD dnssec-check-2.2.ebuild 667 BLAKE2B 91e92df290bf7915109a212a59fa1629376d9a6ff98af3faabd8a6c7a80f81b165d8771c42b1365b42a015d6cbfea0aceb99c95afa476dc4798f291aec787217 SHA512 f724527a05b260130536ff7b451d3daf6af7635ec2fd68edb41a2e40d36c3ec6f8db3948add3eff33611665936daa3934e4cb0dbe4c5e11ae1bb7b017f2f5c6b
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+EBUILD dnssec-check-2.2.ebuild 664 BLAKE2B d4b976dff48d1ff57d234059496e5df33bc9af83c2569658a90ab14b957a6d25e9cab1d7d631a3bedc9f24d98d1a60b170312764db1b29921853ea021d5178de SHA512 19db982057c380ab218baa38ac71e677f57626856e8cc4377afb95d8814b9cc31fc34757282a1a21f75fcc8fc0ec018aae73aa51adfcdd8bd8888128dc655900
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/dnssec-check/dnssec-check-2.2.ebuild b/net-dns/dnssec-check/dnssec-check-2.2.ebuild
index b4393686aeee..e8ecc70c6826 100644
--- a/net-dns/dnssec-check/dnssec-check-2.2.ebuild
+++ b/net-dns/dnssec-check/dnssec-check-2.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils qmake-utils
+inherit desktop qmake-utils
 
-DESCRIPTION="tests local resolver for support of DNSSEC validation"
+DESCRIPTION="Tests local resolver for support of DNSSEC validation"
 HOMEPAGE="https://www.dnssec-tools.org"
 SRC_URI="https://www.dnssec-tools.org/download/${P}.tar.gz"
 
@@ -14,13 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="net-dns/dnssec-validator[threads]
-	dev-qt/qtdeclarative:5"
+RDEPEND="
+	dev-qt/qtdeclarative:5
+	net-dns/dnssec-validator[threads]
+"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	sed -e '/Exec=/s:/opt::' \
-		-i ${PN}.desktop || die
+	sed -e '/Exec=/s:/opt::' -i ${PN}.desktop || die
 }
 
 src_configure() {
diff --git a/net-dns/dnssec-check/metadata.xml b/net-dns/dnssec-check/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/net-dns/dnssec-check/metadata.xml
+++ b/net-dns/dnssec-check/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-dns/dnssec-root/Manifest b/net-dns/dnssec-root/Manifest
index 0336ce2823ae..c33629dfdf39 100644
--- a/net-dns/dnssec-root/Manifest
+++ b/net-dns/dnssec-root/Manifest
@@ -12,4 +12,4 @@ DIST root-anchors-20170203.p7s 4095 BLAKE2B 21c3d482cd2faa7dd85b45385b4dd4a00c8f
 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 2787 BLAKE2B 32f4af0a3afbfd9a80fa5aac8245e4d6cc383a0518d04a1f9b06af6c96ddc15ead0c56f901b0ff6b45a35e79ff39193e05f5871e440d18bc0128cba74eb2d8d2 SHA512 94b89d0fca2dafbbf84f0845ed0ef9958d4bb77e8ed588633595ed9c026987897e45bf65cc8d3f5892f0dc0d29807b3e34121013953ad173cf3b125ab91524b8
-MISC metadata.xml 327 BLAKE2B 62401c527b8fc9b2bbcfe6502060fe06543e2fbebcea988e0b0c50223aec705d6c0e04e7233f5aedcf4694889fa23397c03b1048df07ec8de59f7bac3c3efdc0 SHA512 27361587e570a2f35e178724db7cf89cafc4da8e64984c7fd79971a469f96c128ed488b03e59fc3de4a1d1012664aaa66540dc79f0a85c9f191c19bc864bb1fc
+MISC metadata.xml 449 BLAKE2B a4d0bb439c17b336bc45bb943266a63b12eebb8c16346d6bb50f2a5af10dc7470150d75dd77ee3503f28f4886335efedacd3629874f89322b71d4b23520e7857 SHA512 f4006edfc6d2283d607a3ed38afb76843b4eeb891739f706f1398de845d711203176e2e97b8583b109fb3a26dc5c7b79dd05adff6196db56d7f37873f006b895
diff --git a/net-dns/dnssec-root/metadata.xml b/net-dns/dnssec-root/metadata.xml
index c6775aa5c0c2..9484e0fc3438 100644
--- a/net-dns/dnssec-root/metadata.xml
+++ b/net-dns/dnssec-root/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>xmw@gentoo.org</email>
-  <name>Michael Weber</name>
-</maintainer>
-<longdescription>This package distributes the ICANN DNSSEC root key</longdescription>
+	<maintainer type="person">
+		<email>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<longdescription>This package distributes the ICANN DNSSEC root key</longdescription>
 </pkgmetadata>
diff --git a/net-dns/dnssec-tools/Manifest b/net-dns/dnssec-tools/Manifest
index 0ce7b8bd7dbd..55b37f6d4baf 100644
--- a/net-dns/dnssec-tools/Manifest
+++ b/net-dns/dnssec-tools/Manifest
@@ -5,6 +5,8 @@ AUX donutsd.service 152 BLAKE2B 4663f200f1f5194b0a2d5c94938640d2c621cdf93faef534
 AUX rollerd.confd 234 BLAKE2B 9a360e3c66bbc785b0a925991ae954e16808922b44a597949f79bf0e9df3bfb99a9f355c916b5e93f90327fff7e3cb7098d19171dc037675d283fab74106572e SHA512 a368b1f288c382d265a437798ffd0d09adc1898caf00d5eff63487f0551a19d023d3a5dda514b574a8cd723b6fb657ea588f5ca206321535a3e3b99a90af3a65
 AUX rollerd.initd 409 BLAKE2B d3f545fa48d061c0bff8d7a73352f4307678e14006ecb51cb78d32854685d422f269a436ab64307295aab700481bf601de5f3315b1677ac594319e341b15c423 SHA512 1d50ea92a5cd63f77bdf3c780cf33f1d540fc5dbcfd0bd5eea5cc1f156a15c872b2f6b3bbfdf57bb72a99527ce0a6d1bded254d153dc28df51bfab8e6dcd4d9d
 AUX rollerd.service 202 BLAKE2B 8d3841fdaa9a8a5503eba707e22ba66d62a5b28fea3ab1b7a689958f66dd4a3ae53a613f622093846f2dbfa1fdb52fc30bfe772def34d6180e88079b5b3d2bd6 SHA512 5eb0786a0fcad3fe88db3d2391a2ec3dd272818aed0c17a664fff7f126da467ef2e47671212c86c7cc27f0e62873c63968cdbdff6c561499639f8a608e93648b
+DIST dnssec-tools-2.2.3.tar.gz 42941393 BLAKE2B b7b6a54113fb5cf030bd60e18f5446b02d1ceba3564ac854b0305225672545e802fecfa1169dc81e68ffe195533e06082dc22500a51b48965aa9c0fc32c915ed SHA512 fd2467f116f77089bddf9311706f356957f4ae735d827d393534e4001b621c9dfc904ff3d4da698d37e8e97b1be9448ab2fd5455c124656399aac30f1f642baf
 DIST dnssec-tools-2.2.tar.gz 4430138 BLAKE2B 52683f19d66066b2938ef3667d066a6ab59b4579cb2cbba87c79b42700d3f70bfe84c0f712bca607ee3023d152b16b0ba1a9635e7779cc61aab7a2c8f9d05830 SHA512 5d0d936a2dabc648033cbd74ff6f1b309ae66bf3f2ab1223c8be5879fa4385bfdfd8cee2b4005b0d0e7ed85eeb1b81a9a4092d300fa725d4b19a84bf2619a280
 EBUILD dnssec-tools-2.2-r1.ebuild 1743 BLAKE2B aa9d666f251118863a65410ec534219732cf07a2794c290e231492e3908a179f1d8db3a4d9a467a233b1707d96b634e1bc458af61b0c86857d9955cf3e4d288e SHA512 74c273b9f4e55ed261450ffcf1b4b8a5bb45d248040e75e6167e257c6eb008452f64b1283e8c3fc8a4dab39cbaa2fd4f478a9e9c164a09d794877e4af8e25628
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+EBUILD dnssec-tools-2.2.3.ebuild 1841 BLAKE2B b39a326d15fb4b5c321882f44884812b426c10b0d5cf015dd992edffeebd489e830fdbe20597dcbbb152f5ef2cd9f464ffcca4799e4664cddd0394127af14fc3 SHA512 4a1bcc954ef7363a4558105834abf481829c0f7ff31cde5a6ef8645b4e642a206fc447544ec9e72ee8a97dd73578ee070c2b0721f31fe292e9a4ffca585fb1c7
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/dnssec-tools/dnssec-tools-2.2.3.ebuild b/net-dns/dnssec-tools/dnssec-tools-2.2.3.ebuild
new file mode 100644
index 000000000000..ea911238a3b0
--- /dev/null
+++ b/net-dns/dnssec-tools/dnssec-tools-2.2.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 systemd
+
+DESCRIPTION="Tools to ease the deployment of DNSSEC related technologies"
+HOMEPAGE="https://dnssec-tools.org/"
+SRC_URI="https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/CGI
+	dev-perl/Crypt-OpenSSL-Random
+	dev-perl/Getopt-GUI-Long
+	dev-perl/GraphViz
+	dev-perl/MailTools
+	dev-perl/Net-DNS
+	dev-perl/Net-DNS-SEC
+	dev-perl/XML-Simple"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/DNSSEC-Tools-${P}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0-dtinitconf.patch )
+
+src_prepare() {
+	default
+	sed -e '/^maninstall:/,+3s:$(MKPATH) $(mandir)/$(man1dir):$(MKPATH) $(DESTDIR)/$(mandir)/$(man1dir):' \
+		-i Makefile.in || die
+	sed -e 's:/usr/local/etc:/etc:g' \
+		-e 's:/usr/local:/usr:g' \
+		-i tools/donuts/donuts \
+		-i tools/etc/dnssec-tools/dnssec-tools.conf \
+		-i tools/scripts/genkrf || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-bind-checks
+		--without-validator
+		--with-perl-build-args=INSTALLDIRS=vendor
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/rollerd.initd rollerd
+	newconfd "${FILESDIR}"/rollerd.confd rollerd
+	systemd_dounit "${FILESDIR}"/rollerd.service
+
+	newinitd "${FILESDIR}"/donutsd.initd donutsd
+	newconfd "${FILESDIR}"/donutsd.confd donutsd
+	systemd_dounit "${FILESDIR}"/donutsd.service
+
+	find "${ED}" -name "*.la" -delete || die
+	readme.gentoo_create_doc
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Please run 'dtinitconf' in order to set up the required
+/etc/dnssec-tools/dnssec-tools.conf file
+
+DNSSEC Validator has been split into net-dns/dnssec-validator
+"
diff --git a/net-dns/dnssec-tools/metadata.xml b/net-dns/dnssec-tools/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/net-dns/dnssec-tools/metadata.xml
+++ b/net-dns/dnssec-tools/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-dns/dnssec-validator/Manifest b/net-dns/dnssec-validator/Manifest
index ae10593a93b9..bd7f46e0e490 100644
--- a/net-dns/dnssec-validator/Manifest
+++ b/net-dns/dnssec-validator/Manifest
@@ -2,4 +2,4 @@ AUX dnssec-validator-2.1-respect-LDFLAGS.patch 529 BLAKE2B b4e3199c1263973e93b74
 AUX dnssec-validator-2.2-glib-2.25.patch 5308 BLAKE2B 169c0163926388243d22f3ee5e73a30966525975c9dea800170dc82f61113902cb2d5d5e61bd4edab28ab41b9f0fd1cb2978f1433a1e75cc710cc481786bbc62 SHA512 17aa048f52c7fafc0074c83a725a6b487e88c4a55e3f3f082fa876b2d7ad95cbc3506401991de64546dd97f1ab75421dc3079a0b2d9dd02a26f90658830bf6af
 DIST dnsval-2.2.tar.gz 1060434 BLAKE2B 3a19d5f4128e32f81ae824a128c65b5c5b6f21cef2786d1050631db10084a479614241d869bb33d054d96e7a1e286c472296edf8c4c7e45abd84aaa4df599f28 SHA512 1a01911b08e447d992f4843db8e10bc91041f9e3eaa8a3c050f71f0d7028292145379d1b769e69a837a157443abfa8b0b8ecc289c1b2fa4d33a9234282e9ae05
 EBUILD dnssec-validator-2.2-r1.ebuild 1097 BLAKE2B 98c4b321fac53ce8241c5d8d1cca0e52d4518d6ad93921e2d1bde07fadacafa13700cbbd595001a9e3e770c07ac34e7733845413324018817e6ed338a4a8f827 SHA512 96b4fe7ac902f4da7c53c3e7319d4199ba30730b6d8151d0bddc9659d692b1c5f52d8b5d4a5efd3d0405786905880efa532c6a5df7ee788ef449283c2868f78a
-MISC metadata.xml 310 BLAKE2B 16857a33a25e737e90d9ddb904f807971bba345a8372f15c927447c54571982136277175a315b62132c683b9645d959ff79fc5b192595b68bf5f3d3c95747b0b SHA512 0b345a842da8774a69de31efa6be5c693c8bef93d1a045541702b607c167787dd7edb6ceb30dbf05fd9fbb4ed0a3f5ac8ec87d33f98decd4b5ed9928c97bdec1
+MISC metadata.xml 239 BLAKE2B f1367162a3bbf8737d7129bcb1ee99aa11ec6997aeb9639a47ee317c9ef8ea255e2e751b17e5f667f9508738c92f042410c0e4a89e49a83541b0c92cd8aff342 SHA512 5b2f99d6bce800e4e2548e35b89acfe6d916ec5e7b61a6106d16fea44751dde528b0dd06b9ccb16c1f3259fc94e7e1af509a444302d887d576752c740bfd8ec5
diff --git a/net-dns/dnssec-validator/metadata.xml b/net-dns/dnssec-validator/metadata.xml
index 6f3178436bbc..7206094d0b09 100644
--- a/net-dns/dnssec-validator/metadata.xml
+++ b/net-dns/dnssec-validator/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="ecdsa-check">Requires openssl[-bindist]</flag>
 </use>
diff --git a/net-dns/dnstop/Manifest b/net-dns/dnstop/Manifest
index 313c2f99fb51..19270758428c 100644
--- a/net-dns/dnstop/Manifest
+++ b/net-dns/dnstop/Manifest
@@ -2,4 +2,4 @@ AUX dnstop-20140915-pkg-config.patch 966 BLAKE2B df7deb0cf71854795135798f7c38337
 DIST dnstop-20140915.tar.gz 77917 BLAKE2B afe9cdebc7d71c9bc5ec76ba133170809cdf135d6320ff7e057e6e7d81f3cdc6aed379567c113b34e863d0c39a26e0b6c7ac52a6000f9482fa10917afd000a45 SHA512 902cf96f7366983cae4bf684e44fbe12f6e982cee8ff489329e25e1a13de60870d356906a99fee56c6da2258c4a39074a504389549c6c2e239a4ea94d8b9a65d
 EBUILD dnstop-20140915-r2.ebuild 653 BLAKE2B ddb1ce77d510c5c3f05b90945f7799df858e7fbe634ee315191a4fd8cc93d8d24a34c28fad3182550821e1aee27d6c7012d34e4b5846ad31a1090730ed82ac53 SHA512 06771a541002736dfaee9722b13670da9ed0051a4adb50b905a78e97de4b9912f1a4becc538c4f694a9f0ad3dd628e04bda1695bef5ba68eae05f92d6bae01cf
 EBUILD dnstop-20140915.ebuild 601 BLAKE2B 8f5a95ec9575f32e6edaa88cf70342b193052d30044ec532f1e20fb2dc5af3d1942161a0721c6273863bd635f9042e273a2cd6cd9a36152dbd34b158637cd660 SHA512 83f9814532177cb0e1bb55a6a0446bed90655229334a007b673fb8e0f0ec41607092b9cd30e762ceebbfff846a00ce9757fd6f7534fab2be8c44a7a3732b0582
-MISC metadata.xml 651 BLAKE2B 895ca3453f27e532843c3be0ab1436c18acee9ef541bd22905c087efbfe6d2137c6902bddbea4636cd00e2875e520576b8c32ca112417c212e652737fcf45221 SHA512 ae97fbd5d24ef68a1377bbf67fda439c34bf2c4e32266aa489cec9537e9452afcbfa073a4a522c899ed0a1662fbe4e95a44ec329bf493025fe866bb60d1e1795
+MISC metadata.xml 549 BLAKE2B f71cce458d7ba4963e42bd48a127f2db3ac92e72dd99d1538182ab80d54c00a4eef5732a3069b28cbf3cd1d58792249e5813aadc978945c1d6e2c4b246f327eb SHA512 98f7f5b54cf40197b5d3d5218f8a16f76d039155aba0d2f9e042f3d3706c35138234c5b7d17a8a80a4d88bcce926f0c694e133cf58e59f520daad53202add426
diff --git a/net-dns/dnstop/metadata.xml b/net-dns/dnstop/metadata.xml
index 869cb9ae09ae..b8fe5c1e5d64 100644
--- a/net-dns/dnstop/metadata.xml
+++ b/net-dns/dnstop/metadata.xml
@@ -5,10 +5,6 @@
   <email>hendrik@consetetur.de</email>
   <name>Hendrik v. Raven</name>
 </maintainer>
-<maintainer type="person">
-  <email>xmw@gentoo.org</email>
-  <name>Michael Weber</name>
-</maintainer>
 <maintainer type="project">
   <email>proxy-maint@gentoo.org</email>
   <name>Proxy Maintainers</name>
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 11a79bd4d92d..c940cde5397f 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -4,7 +4,9 @@ AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11
 DIST knot-2.6.9.tar.xz 1126872 BLAKE2B c15b7e61ccad5417ce53f3d3895014931a2825835958735bdd9459634d9d9f39d6bb3681036772e6a510570a7f6a8afc8b0de5e77e67778831dc6415378889fe SHA512 80fcbef17c3e6685c09eb57e59001a5f298a083c18ce077dc2f2d1fadbe7c36e543c205c0820bc7971a8ed7547897aec408f51e1a9555a50dae82d047fac471b
 DIST knot-2.7.2.tar.xz 1148880 BLAKE2B bf3042d762d2b66f47dbd27a1c9ecd03d111259c7db82254c1175e660497fd8343c3f1cf1cc14e6068cb3d3618931b659888a7b97d7d6e4ba9d0e74c00540e31 SHA512 e09f8a38e975ff4f90db59db9ae8a6baaca9b0cbc9c2ecd37225febfe718b7c2038ae45481ed830dc66f2b70d8312266e2dc7cb54a0aa0fdc02c87ca42bac96d
 DIST knot-2.7.3.tar.xz 1146456 BLAKE2B d584db01b2354c259cf5e5cdfeb2dff677b04e76b68156a2c672fffe95ee8c6516f82b8e199d8ec8cacfcd93f15b370a25172826460b82c5964f38207c9818f2 SHA512 ba735eb06d99f8cb41619f44413f6450178ab249ef9ff282bae36e8e965cb421f082852bbf0ae5814e3e3148f27431fc1f2b4ed30e21bfd0cbea1be189bdadfd
+DIST knot-2.7.4.tar.xz 1148652 BLAKE2B 081a23a0429b4fec1feebbe417bc95fe24d11404a2a6b9e4e71d89f99bc9cf2a5ed2bdc3a0fd2727cc4d45629b71faefda179e68c4781f8b21c475a7b1fe8bdd SHA512 e5f60a23817503468b18eaea517c5936945b901f568c56cb1ca67a208cc6206ff103e9ca03f1bf05018d13a688f54580ae816a5d70510f28a98ae31116a3f674
 EBUILD knot-2.6.9.ebuild 1862 BLAKE2B 223fc993fa63c312c51b6974b0dcba3ce00c8d9206b60f563a289bc3e584eee118aa11d12a44c7bf4e1c3b06e88a13015ee3dda6ed08fe7e07ef47362cacbb8e SHA512 663f320d82ba76a7a665ad8f54b959bcb589edb43ccd07f682941f2940c4b7d392e91790454e4e25d7c199360980157f8e1e795386b597158ab45972030a51b8
 EBUILD knot-2.7.2.ebuild 1907 BLAKE2B 672aac16fe71caa8ecc6b4567cac0240d34670516de51fe0fd8a7ffc319acc8ed7962c6d0db7c28d773cfd0e19e9c4d001ec541ec32468ccd73921ebc125e574 SHA512 0d187cde9dd27b81538e2d5652dd15931472fbc1249369cebc5df20008b2a734d75611af9d398b2ac9636a11c8bd2d1d97893ed80f8cf4792ccd6b68c7dc2ebf
 EBUILD knot-2.7.3.ebuild 1920 BLAKE2B 984190266bb6783ecb922b6673388ae694f303d4e46d2a232251b9edc73e84059cecb808dea861b000af05ec4afedf4a1a0cc8deff934190f2e5c0b73d1a81b2 SHA512 1423c1bd19a24dc927e237ab145dd736aa6ddee1653c02ee9ff59b88c7b9f58a0bf8153c2da93aa4ce82b260e4d89141c84b9f16676d28bfff0d271e1c5e94bc
+EBUILD knot-2.7.4.ebuild 1923 BLAKE2B 188b6e9f09fdfe7a2c2d8e608e67833ca97a7b355987ae28668b21dda27ae3e4aec16466c897cdf7b67be6aa20e3db27b6ce2db2a37a76ef3cca02733baa3abf SHA512 31c5bd0cca511d35d661de2593c4d467d32d6dbde95f58a9e5f0a40d4bd923932bd141aeb5deaea1daa8d742ea9be21dafdcdae9ac9ba7335f5f565853a6305b
 MISC metadata.xml 1776 BLAKE2B 704ee480034e47aa62a552ae559671728d96df078dca931c9acc1ab58bcd502188c21820cc8300f536e793515765ed32f6e9cc8f48d9b01b91a959df98a9aa92 SHA512 57ec897a014478f4f5693cd242ecf76215dcf2c331e951bc2a5c0f7b492a76a49cb86d54885325fff2777470119da2f8ea140afece4b70ae410ffe50a4a4679a
diff --git a/net-dns/knot/knot-2.7.4.ebuild b/net-dns/knot/knot-2.7.4.ebuild
new file mode 100644
index 000000000000..ce8659e1fd17
--- /dev/null
+++ b/net-dns/knot/knot-2.7.4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 )
+"
+BDEPEND="${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/nsd/Manifest b/net-dns/nsd/Manifest
index e5ae46ad0be2..48f6a7a52a5b 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,9 +1,10 @@
+AUX nsd-4.1.26-dnstap_noipv6_fix.patch 352 BLAKE2B 69ce2000ddbe4b6767d702aa1759cae2b771aa637824781a9f756cf7663bca4e55bd552d1d98e78fca6c8a81f378937539d57228e53c73bce373dedfecf10b4c SHA512 a7d3f97962e824859268d9716705769dd264506b8723fa8128d66cbaa71bc2561526ae1699f347ee0896a7c30db8d76897451060999eb819cc8fdf218f6e1f53
 AUX nsd.initd-r1 1386 BLAKE2B d3a5ca31ffd06d9cf4da09617f523f61e5b8aea4e3217bf11431f32b5e7e5b59c96de3c5e1806b3e2c74cc96527e41e609e693ad88dfbcf19262b7dc5d0369fc SHA512 a8dc5b4dd6b8d763f96e46bb9bc8a43ce7518455c6efaee7061b47b477b380f47d831b993966fc4fe253657f2a3d16077dfda5c900d5788d5b991f5f9d92e618
 AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1df39ceb58b92a44c48cb21583a480e622f72d07650f410f2e0703f1d16af08152aed16982ab8da2 SHA512 c06d0b035387e7be79cfa8fedf8afb3900772146c6d4090ac39ea2ef165772d875b222ef467bd73422078ef57818bcc931ca67fa290bd99a7a9456efa5448853
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
-DIST nsd-4.1.24.tar.gz 1107574 BLAKE2B 9e22d6a07bc7c63efb41b0b4e1a0e1e36d94db9bf79f31a704bd1ec7ba371b059669feebca4b6ed9427ba41017f661ebd8a30a26ee433b45374df75d2c182cb2 SHA512 68f7f62c740e5a73d1b9da4b6d593ff1b728bc398ad126a75febaa523a2117c80315bf90ca6a60aabf38539181e00524cedb106a32b4883aa8ed021462d47762
 DIST nsd-4.1.25.tar.gz 1108285 BLAKE2B 29428e59c0913e9eb6936b577c02b03136ae51e47d58f5d476368b4e6614e240a735a29ec5f224dbca6f76068fa81f0eed32fad75bf647673f35641ac414e3a6 SHA512 3a1de59d799a94aeb236139bf52f1d2e2139002ec8a033948a2324680df513e6c333e3564f526ca4fa106b42e50ae2bc67edadaeee72f608dabed962aacb5423
-EBUILD nsd-4.1.24.ebuild 2935 BLAKE2B d0b6febc24f042d518d85787cb107ccf84988c292ed35f09bc52a89c5e9282dff7ec49eb5fa8b7adee3fad4035d193654d982a33bd29108cb6bdeb03d01d0b22 SHA512 6e47eea4e97455959f5782652e0369e99eadf59fd18be8af5780d52039b1ae97dd5ac1bcd1c1767b1070e75a832ac3273f46d52e429f6b4fd8058d43afac38a5
-EBUILD nsd-4.1.25.ebuild 2937 BLAKE2B b167d5163b6ec650997b70b8b48d878164fba78aa7a09fac72c0cc9c7e92a7cc73b57c4a8fc48d26d6c11fc94f650121c4c374a66662c7d8f9134c1a7adca62a SHA512 de3629cd62543e497059c8e3d8fb24977895ff53709da9ead0d94a4a3e08d81fdc4d71a6b463851b8bbc7bfe02b2b47a6fc518901b90bfbbe89d6883f17971f9
-MISC metadata.xml 1013 BLAKE2B b989a1ccafac96d48d6f1b72bace164fcb1c04885ec9436e37fb29d94bf8c5feb4a02a1b4fc04241b6fa3c9d6d89ec993e3a06b6efc7ccd45d4ace3fad16cb18 SHA512 e7c0d6a267fd06546ac58278ffb75280aa0c0ed55ddf0097614906c1863e55cf572ff7660e021ac8861c506ed0de126c0c5e68dd2d88aea1a395be3234607ce5
+DIST nsd-4.1.26.tar.gz 1127895 BLAKE2B b132022b846cffffa0ca34fff189f95c26dc7646648773d455ad7835c42718b1a00645b3b686e5c211432ef4bb83a3618ae6b675b9b53fd40ecf7a9f6d9ec5ba SHA512 49c07ad79e4e056bd519dad157a44d5cc55cd9a28723fd910159dc761d4ba56ef86cb7bf289dc5d1b363a49b999232bb7ec1afa737ca5c2659c4c9893e93494b
+EBUILD nsd-4.1.25.ebuild 2929 BLAKE2B 0cec048c4ad8c25831da05e5c46aeff51b89b9b222041f8611389a9603dafca4e0a9fb680cf6629a4f41f3e39e4e51091a9e2cfb4382dba6b2d0f037694c7890 SHA512 8bda60f6858025c0cae80115aa87842b6b242bc3fddecbd55f0cd5bae0bec1114c48cfda752373a74387ba287b45868ef6a47d67e6fc6fab58e6eb6189fed018
+EBUILD nsd-4.1.26.ebuild 3120 BLAKE2B 24c13aab7d796e72e0b4254a3f0fd9d105bb41d4d5f8abe5e726a218ba06dabb6de21fc6e062cceb071815b6a219181cf5c7a7a7f7a45702d8a5716aa45233fa SHA512 af2fe234655ebb5d25d412fc4fb11ba38f0799d5573d95ddd66a12b51c5c8fa7fd8b834cc72b789d5f1e6b09584fed9a920a0bef74ba5195f0eeb9d8aa0ede23
+MISC metadata.xml 1082 BLAKE2B c44a5b7b9cb5ad52ebc55dd52a584cd8b0700977a19d541df1b415164250e390941ef35a0e8633a975e6cbae402719d8c5fe7d452dde5623223b01a7ec4320ac SHA512 a66e71346c6742c77ce38ca73f600dde471f3256928bab79f2015cb88c2f3237a4d69f7b9127ea90c58f584b60b8b676416b0704761ee1455479644fd2cd5a8d
diff --git a/net-dns/nsd/files/nsd-4.1.26-dnstap_noipv6_fix.patch b/net-dns/nsd/files/nsd-4.1.26-dnstap_noipv6_fix.patch
new file mode 100644
index 000000000000..be19e337f3d9
--- /dev/null
+++ b/net-dns/nsd/files/nsd-4.1.26-dnstap_noipv6_fix.patch
@@ -0,0 +1,13 @@
+https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=4213
+
+--- nsd-4.1.26/dnstap/dnstap.c
++++ nsd-4.1.26/dnstap/dnstap.c
+@@ -319,7 +319,7 @@
+ 		*has_port = 1;
+ 	} else if (ss->ss_family == AF_INET) {
+ #else
+-	if (ss->ss_family == AF_INET) {
++	if (ss->sin_family == AF_INET) {
+ #endif /* INET6 */
+ 		struct sockaddr_in *s = (struct sockaddr_in *) ss;
+ 
diff --git a/net-dns/nsd/metadata.xml b/net-dns/nsd/metadata.xml
index 0d66874728b4..80941c35662f 100644
--- a/net-dns/nsd/metadata.xml
+++ b/net-dns/nsd/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="bind8-stats">Enables BIND8 like NSTATS and XSTATS</flag>
+		<flag name="dnstap">Enable the structured binary log format</flag>
 		<flag name="libevent">Use libevent or libev, useful when zone
 			count is high</flag>
 		<flag name="minimal-responses">If minimal responses are disabled,
diff --git a/net-dns/nsd/nsd-4.1.25.ebuild b/net-dns/nsd/nsd-4.1.25.ebuild
index 9a5fc16aa9bb..bef653ea457a 100644
--- a/net-dns/nsd/nsd-4.1.25.ebuild
+++ b/net-dns/nsd/nsd-4.1.25.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
 SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
 
 S="${WORKDIR}/${MY_P}"
@@ -93,7 +93,7 @@ src_install() {
 
 	# remove the /run directory that usually resides on tmpfs and is
 	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED%/}"/run || die "Failed to remove /run"
+	rm -r "${ED}"/run || die "Failed to remove /run"
 
 	keepdir /var/db/${PN}
 }
@@ -104,8 +104,8 @@ pkg_postinst() {
 	enewuser nsd -1 -1 -1 nsd
 
 	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
 
 	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
 }
diff --git a/net-dns/nsd/nsd-4.1.24.ebuild b/net-dns/nsd/nsd-4.1.26.ebuild
index bce39add9171..2d738583621d 100644
--- a/net-dns/nsd/nsd-4.1.24.ebuild
+++ b/net-dns/nsd/nsd-4.1.26.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools user systemd
 
@@ -15,12 +15,16 @@ HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
 SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
+KEYWORDS="~amd64 ~x86"
+IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
 
 S="${WORKDIR}/${MY_P}"
 
 RDEPEND="
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
 	libevent? ( dev-libs/libevent )
 	munin? ( net-analyzer/munin )
 	ssl? (
@@ -39,6 +43,9 @@ DEPEND="
 PATCHES=(
 	# Fix the paths in the munin plugin to match our install
 	"${FILESDIR}"/nsd_munin_.patch
+
+	# https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=4213
+	"${FILESDIR}"/${P}-dnstap_noipv6_fix.patch
 )
 
 src_prepare() {
@@ -60,6 +67,7 @@ src_configure() {
 		--with-zonesdir="${EPREFIX}"/var/lib/nsd
 		$(use_enable bind8-stats)
 		$(use_enable bind8-stats zone-stats)
+		$(use_enable dnstap)
 		$(use_enable ipv6)
 		$(use_enable minimal-responses)
 		$(use_enable mmap)
@@ -93,7 +101,7 @@ src_install() {
 
 	# remove the /run directory that usually resides on tmpfs and is
 	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED%/}"/run || die "Failed to remove /run"
+	rm -r "${ED}"/run || die "Failed to remove /run"
 
 	keepdir /var/db/${PN}
 }
@@ -104,8 +112,8 @@ pkg_postinst() {
 	enewuser nsd -1 -1 -1 nsd
 
 	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
 
 	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
 }
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 94a30bb5a150..0c68fd313cbb 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,4 +1,4 @@
 AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
-DIST pdns-recursor-4.1.7.tar.bz2 1237866 BLAKE2B f87263c0b4c40c8d5822edd75b338fc23609fb648c71b0665fc3cfd6b1d54679884dcdcc196580ab663f4fdeafaa72bee41308e3720b50374f2dfeb425259b6f SHA512 eb119b0da034624a95aadd4800e376b80f69b7151e773437c0f644bdc5a38a377c5547bcd57606367e148eaddf0b7de8f5f5ff3ab582b50ceb190f2fada5980a
-EBUILD pdns-recursor-4.1.7.ebuild 1756 BLAKE2B 1a3c13fc02d5b8a7a42ca513155ba244497ec3f667dcff34a51e9e7cf3b67534d66aacfb6498bb895edf952e96aaf247e8b67f321d0cbfe1d47b193b60e77e74 SHA512 a740b4dee0291128f4e58655975bbf32752906bdc0b75392026a7baef90adc8bd14c500df7b123c56bc883c38687ac64e936a8deb0f9bedccb02a3ee371ebcac
+DIST pdns-recursor-4.1.8.tar.bz2 1237750 BLAKE2B 1170198ea2ed9f1d16f7d8fa76e4c9f8bc56e3c72a391d094e7380d84657b55daa6f45acf4737a9d9b144f2deae64103c40dc3b95550a853ee6f41f0f8a92c78 SHA512 5c09b8ce3f2f3ed6bb350cbd20e6cad4b66f9db85677605d57eca67187c05ddde5071af246a7398e2821c9ed2e5ff101d2b4928366b3ddf12013020fa9b74e61
+EBUILD pdns-recursor-4.1.8.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.7.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.8.ebuild
index 2e627d8108a4..2e627d8108a4 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.7.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.8.ebuild
diff --git a/net-dns/totd/Manifest b/net-dns/totd/Manifest
index c32ba9027ffd..cb30c69deb85 100644
--- a/net-dns/totd/Manifest
+++ b/net-dns/totd/Manifest
@@ -2,4 +2,4 @@ AUX totd 703 BLAKE2B ff6438966449109cfe9d18cab97570a19876e467ae0e46e52c2431052e0
 AUX totd-1.5.1-no_werror.patch 528 BLAKE2B 8e310b080acf352ad01158b145b801454a9a019e4ecaeab98527fbee5501e647bf86b352a5570d7461f004275a03f79543c6faa0044ae09a09e8de97ff39a9ca SHA512 ae7dc467c1e404c705502b256635c62a80e6f087878af64e8a3d8367abad053fcfc1d2d1da47a772e57bd669bd26c409302b808eed2fe69bd64d3483c1f5c30c
 DIST totd-1.5.1.tar.gz 235809 BLAKE2B ceab2edbebe22162db7193a6e20b0ae2c960c1e613afc3a4ecf068c8f7f3d0f798d03d6c392955799c4fbd1fec10561502e4da08c4a5b39ce5d313a2c0e09663 SHA512 47087fd0478bc2952b25a0952ffb7273e4fdebda019f61fd0bad3c0305ab8f6e32b8f8dd042364f9ae6e6bd31c223e8fd3b17e3b4d44219fd6509f530f56025a
 EBUILD totd-1.5.1.ebuild 905 BLAKE2B 75d82649ec98fff8b8e7f93573ab047d2c16ff5f562bb37a87fd10a83cda430b91656113e13b4a05831b129281c50278db4e827acdd234773ed9b95dcae63832 SHA512 ca5087f4228d05228190dd158cd2972709a6c119cf38cb2ab991e26c7088d6d7b42daed91cf6e85a653e28c43485f480e50d9c57353351915d310d494b10107d
-MISC metadata.xml 471 BLAKE2B 16a02ff10a57ed96d84a08b862a6c800c528a174431d9bb86883db381bc30c7d24d4f0657438ca516fb60627512c0c268413cb5130b9af4114a978bf924a9520 SHA512 95d9e3644841041c2a873f098bc1fc79ba53f205edd0af389792f5c544e794ab8883a6f1dfc1de98b110fc3b04185e610c2ee67b7bea4d4878a7d3e6557c30f7
+MISC metadata.xml 395 BLAKE2B d4873364929e3fe57581648ad9ca585c12b141bd2da11c94aa6fec910fa2a719341f397cc6ec49450ffcdcd170e908bca580b0b97d7dc4ab6ad791c2864bdd68 SHA512 af806905403d42007aec9475bf059ac65957b83636bf93794dab668ecafb41a7df69c712531f1b3e38e4c23e7f9bed8173631773679035b5fd1175208235da06
diff --git a/net-dns/totd/metadata.xml b/net-dns/totd/metadata.xml
index d71991b3359b..df1c7e1ff533 100644
--- a/net-dns/totd/metadata.xml
+++ b/net-dns/totd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Totd ( Trick Or Treat Daemon ) is a small DNS proxy nameserver that
 		supports IPv6 only hosts/networks that communicate with the IPv4 world
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index d5ed933f99b0..45ced66bd6a8 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -1,38 +1,15 @@
-AUX 0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch 2032 BLAKE2B 26feb157c94ec4429a480a02ef7f178c98f9f7296dcbbda590619390fe71e9d5b9406ed0428a766da1a189b6672a1fc9beeefc5418013136becfbfb037afa4ef SHA512 1a28fca9fa39cf4c07e2f9b75058ca1d00a176ab4f0b96130fbe4773f503f39f7f16518e82f58d289001dd468e53e54f1e208e99eec713fda0efd35517c4bcb3
-AUX unbound-1.4.12-gentoo.patch 639 BLAKE2B b1541fd917de50c131d161de92ce3db6dd4627f01a69dbd71b8954f7eeedd2bec8b47e7607e088516a877de610bd64c6ce9d1ba0910ba32be4ae137bcbddf63d SHA512 81292d898284c27e0b30a90816d283d2fffd5810afb38b5a79ff4acc94d82c91bd5414d177f11745c5ee7e56d1600a67bdc4d7395504ff6266103b4e018baf6c
 AUX unbound-1.5.7-trust-anchor-file.patch 847 BLAKE2B ca8f093671264108c1da772e161ddf948cd27cdf4d3b6189023a6a9642ee308ab361befcab923ca61a21c4b151252f409177c8247ca683e63133284bd65efbba SHA512 bfbdd947cb3dda8d1dd009eb476fb2934fca80236e617f1596f308a063c575196e75c67b22bfbd739c06318d3227c9b2838fba0f381f8c73fdf5b7231cd1d746
 AUX unbound-1.6.3-pkg-config.patch 247 BLAKE2B af1a175a3944137fc7f4f4932182df5b278b7d88c4299e7ac5e520107fcfb5180d7e548c70b50794389d2c1406309f88e118acf9e065ab67cbb4c78fc0e4186f SHA512 06d8910ae6065c5a2bb2cc5a1935ae98688148b9c0af09622161b647775de00027ea4a22cb0d6b94f21d329c2d59ee56f67b073ee4042fbd4f78790d0c438ad7
 AUX unbound-anchor.service 263 BLAKE2B 098bdc6e06607e57980e0367496fd9a2fc02ef19611ac4474d703624c92df9c2e86f4dbb116622babcd7975b2e1353f6156d46bcc5639daabef648d670806364 SHA512 c0f8ff2df106d1f05786cf5d69b48cdf69ba2fd42645bf6b7fa2d34d6c3fdd1608fb470c4fb0216164386e8b22977292ae8932c784a6967774e3daae1b8aeb95
 AUX unbound-r1.confd 1553 BLAKE2B b3768275bd3f79f0076e9d80e9456c0829e42ba9bf815c70354e8386881147cc1afad6937ba7a2217845f70139cafd02f44150eaa5dd5d87f397a347f68078b0 SHA512 a6baf20b9911734b69784c393c8f38a0bf41c9621ab9332761ecb8b5fdcebf18be7f30a5a77bf3755aa45222b2f27f810a762436c43b03dd74e6806e04d5a90f
 AUX unbound-r1.initd 3901 BLAKE2B d8db1b5342781566f57d801d077aec20d7911a39d5a453f981b1a3400a18dfb8d10593889885bb9211d458a4165dded625bba2e7313c8d98fdb1beb585ed63d1 SHA512 ec3520094a679fee962244364d8093b471e7edd5fce434c6d307854952f2ad9d2f041ce5fd5f23ece93a856d59a966daaf5abc114b7d1f3519b930b2e8f14f62
-AUX unbound.confd 171 BLAKE2B 55e7b5379d50375ce0b6127cc63a09acea523a54cf1f4a8048534c9f26a87835dd809ee91ffa1ccc70e798079f75b303b7d1775666308b239ef94ec39551453c SHA512 e3e4c7f97c13d133724417a70e4f20dac6f1f4b5a4e2e573c410148059d9f722589249b3dd4668069d4e324abef60f5981f20b1797623f37db9c9422410dc13f
-AUX unbound.initd 1370 BLAKE2B 448e75551621df02899e4eb86a107da3dbed0510459931f749d0775c6c232ede14f359e47b6f072d71f0da60b54c024a7e02a283b47d432e020e3434b78f9534 SHA512 ee28d0fdc0abd10fbdeb3d2d01a6f06f4bfa83c78f0d64290cf187a76b31fee8f838c051ae962d90bf7c154678c3f866161564257f1834454e681775fd82fc49
 AUX unbound.service 247 BLAKE2B d986319f9b43600d4f6443f50e214efd39fd20be6a7067b55f98b82cb5d2c12c85b7db2a3c9ced0caf3db303f1ff0fd4eff511dbede3ab101e4b558681872351 SHA512 7904225d0e9fb3ea5b97521ed24f24fcc4db650cfff8523b896ddd9edfccbd61e817775ad0449acf30d02dba5f714d633b60cace6010d472f438df7c22381dfc
 AUX unbound.socket 101 BLAKE2B 4885d311873d7f3e5daf1c0a63798b13761b7c0bfb1bead0bde11bc2a2a994d55670c992b42ea1b4bbee98d04a12f4e7e7517bd0e9caa74d8cac2d1dc0c33274 SHA512 935ab3bd5bc3d3347e44c20482aa19396d243b89f2dbc7bf9f89b16a2559715866e16dfd9f5c4866222d8ee968f158a773475d94629f0ef9fa9b8fd23f0fbc2e
 AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a73b0c6148f4df336c4c07e8da19320df6bedb49cb6884da565543f78456d38dc3000ca2a1abde84816be SHA512 71bd8c422ffe57e448b66f97775075a407671757266d40294a670b41cd1a59f16b65488d30aa74b79b7536f0c4c50adb56e32377e8029fd6c327b85c022c5fe3
-DIST unbound-1.5.1.tar.gz 4805176 BLAKE2B f8c1f69d028ec61c5821926efb6c8311270b0e73b82315c96d7c8a832d86c80560187a44917325947658b4dc5695036c07b752910277d3871e5d8a8f382082c1 SHA512 85d7069cf47709aceb7d9457c8befb1b327adfb098d8aa98082fc9bf710274e8ba86b56d796c86917639bb7e57ab5c40af1bc79090de038c6375be2c3877e0c4
-DIST unbound-1.5.10.tar.gz 4941299 BLAKE2B 500c732403e627bdd037d622b509210f5c357da55f04713de3d02959d9480f85d48669007e11e03ab05ca75c4733642e32be013b5c28078c535b7da578f32bb6 SHA512 1c413886a12d4b626e03e076da6b9ccbcc8fd4769649fef8895eca74199bc22aec33c026e777524e8fe0327045a194f79b52282fe40674a9fb15cac58c4493f6
-DIST unbound-1.6.3.tar.gz 5381240 BLAKE2B eb10c20a7e7ddc106f5ec9552e516b329bdf74e2bd9dee25514e306d1e961f0d1f4eccefeb97f23ebce73b2022efcad1e3402af0ed863e5fef071076530b0248 SHA512 1d84fcc4c4b2a2b5cce6540cf252ff964f4acae3b6567c61cee69b76c6cee3e00270b1f7cc7ad83a2754afb33cc199c8b6e8116e5b587811714398b1d34de8a3
-DIST unbound-1.6.4.tar.gz 5477897 BLAKE2B b78c80e9a18649f6a12da820f15915f0508f4f01d93aa316fa413452545c93fd80a82f93f265291787210f90b888704671f840e12b1b13852c3a2aa017b4cf50 SHA512 1abf50552c97b304884f07372f9fb05f9f30354647cf5299192deac81fa28a41d89d84ee092baef644a6069d0f545d36e7e814c9b8f83f21a7a53572d9a91907
-DIST unbound-1.6.6.tar.gz 5460482 BLAKE2B af0d9ca0e5eeaebc3a2023dc7179a3bc80952d0e4c75ae92035ace648952f0ec1d0760aeb9d5104dda1abea2498a15f668b610c39ad79e86774c376647c94613 SHA512 910fd0956b8828d3db0511a85bf6ab6c4c3982f17c70ccb7123d1de1650d24c2906bc29ac4ea83fd7d95d8af29e2cbc88df666f365e51296f552292ef9753016
-DIST unbound-1.6.7.tar.gz 5466931 BLAKE2B 57a051d5ac6d7fbc3d51613305651987670d0f50fbebf661505b42b6c8980543b34b52a4f9ca9e6ee4dbad59d9acf547b78cf35a691d0c00884da979ae22d8c4 SHA512 6e3d1a057081252183343d0d1b8ace742ab15e8f5244e61287340f49289d7449bed93fbfdaa3194c0e99ca23948f4b33038f75af5c5b26c938004d06fc3031e0
-DIST unbound-1.6.8.tar.gz 5467536 BLAKE2B 06caffbd905c339b3d0667382114bb3e5d5da90988402c8f488f789f9bf6ab87377e6a26aa083a7e9ba3d023f37d3eeba1e069adf8a8a266b23fb8361aeb6e26 SHA512 653d88d5dbc8cf25f7261e4a9869b6591843c7ff27b5d63f979a94505daafbbb61e05d46bedd2d01230355d5f08dd9fe14ed04c5c7340f3f27581b61ad6edfa3
-DIST unbound-1.7.0.tar.gz 5538228 BLAKE2B a825e2cbef74b3a78f9802056d6f0992f77e0d40d4d28889c98b9ffa224ec3281b6873eab59134dcca8dc56bdd17202b3817dd28ab30d0a0bb72d749426b7675 SHA512 49b07643da2a89d8ceedce1295f550f74a76f4f11c2df54df55e9c42f03bad1b133789c7b36fb3c4f37d6b331ac302ecfd1249e8ebaaa4333beda8fa250b61d9
-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
-EBUILD unbound-1.6.4.ebuild 3689 BLAKE2B 8bdfd0f5b48ed66d7eb167e187cac4c64c3c0a044f0523662f253514717a273671fa15e6e931ec03f3ea16a6f2f727701811f41a10ecd49326a9c855f694a2d1 SHA512 15d464ec999b6c98e05d5904e52af977036c2c7ea2bf1d54cebf05f6841f8c28adda1b5d6fa9f344d12ea8417f512a1f0c0487aad62627a7761e97e71f3b018c
-EBUILD unbound-1.6.6.ebuild 3696 BLAKE2B 224feff7eaac4169dcd877ce794df745a5e67c73b8c3df2e4f15036de9003a67aea5233bda8289c1ac1d5f36bcc9fa6aef4adc6e20afb968041756a349f2ddae SHA512 8cfa83700c737afd168d4998de69eea199a3c695bd038315afb16a1aa8e3f141b2c7aa364a8efb0952179dc79b6a42ac43fb148394ae7c96e2bb29f72f070970
-EBUILD unbound-1.6.7.ebuild 3696 BLAKE2B 224feff7eaac4169dcd877ce794df745a5e67c73b8c3df2e4f15036de9003a67aea5233bda8289c1ac1d5f36bcc9fa6aef4adc6e20afb968041756a349f2ddae SHA512 8cfa83700c737afd168d4998de69eea199a3c695bd038315afb16a1aa8e3f141b2c7aa364a8efb0952179dc79b6a42ac43fb148394ae7c96e2bb29f72f070970
-EBUILD unbound-1.6.8-r2.ebuild 4814 BLAKE2B 4a22ffd38aa1a4c39d603f85a2fff0adb767bab5a1feea6386fb95f6f3d1dba5ed1749c99fe7f5d310fadfee95de628e077dca25c3800d1a1490ecea37341549 SHA512 8270d337d8b7241208406cd5b06320a624856aae1caa921b26d7115b77df27b93838c73ccb02ad0a5588e7bf41f82646f650c328b0c991afc9d319c77e59a303
-EBUILD unbound-1.6.8.ebuild 3696 BLAKE2B 2b520948c09e02bba9a1685e25a46b94280d9ef65fc69091b0a6a33b176b8538033d3347aa828e6bb66df85383d1b33f343085f52b3a1e3150e6aa1bf8808c37 SHA512 06c2a8cc24f9ef503eacfcc0a6dd19c63651163dc7b6523f75360f6902deb8f74b616d370c3f93b4633cc823a93be7dc833d8427c70c1b5530cf96a77b056ee9
-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 5354 BLAKE2B 7089f7d46a314234be51e3d848ccd517c4654dfb30030679e0c82c0e02092104f668a613c5f809e86c9f1a2e9bb4730dd011517e15979c60c6f4729f36b9f35b SHA512 8edf751c0287446d9910372a8a36f7f23fa408ab22f925d108f09fb8ef9218eb9b13e050475d3310afb8efb87c0f548084d0d652d5f27b55b89d8995c22e4bcb
-EBUILD unbound-1.8.1.ebuild 5359 BLAKE2B e4da9248acd01a82908bd859247358359a6a0b72837028dcb13ac90fb16b50294f0621bf68cd948c9b4909b167fb69ae9d3739fc7d8fd69036ac871102d13297 SHA512 03b019d9cc9a93e525846c44ef96e1db4cd7257db4334a0a1de4427e7839ab40e0acfe31e7c82d15057b9ec6c820dbd908dc786e0356da7b9b0f655ba3c08ab3
-MISC metadata.xml 1239 BLAKE2B b23dea4347aa4eff995ff69d8e708abbc46b4d222b65d2e87734e77925d8026003df95fe503d66a96dd9dc6a73c32b69e6bb2ad9678a40c5c01b028e5247013a SHA512 6aeb057a87d2705bc9b1c42458cbe27c2b8c21f16ad338ef4421716527347c207360e154c82821ae10b32a22868d16b24601c2d115bee9e70e00a60d7fc133af
+DIST unbound-1.8.3.tar.gz 5629180 BLAKE2B f3fe17df04100291aac752565b3afa859200c222e4fb8c2ed2d9903f7a38ede9965444237c34f3257d29bf367b56fd2a2d48648e7145c91e2dbbd0b79242451d SHA512 545486ccce288a6ef1937d82653a43a11dbd3aec7b8d0036e7fd107e537cdfc935def9db9178c2eb418d6f4b0849a242a0be1dea966f3e9e0145aa7266e483ad
+EBUILD unbound-1.8.0-r1.ebuild 5355 BLAKE2B f1c2b7694ebb346c0835801b559bfc069e3487e743fb467f21197154726ad553c94387cebbe3be8adb4758da27aebe7706ed47bb5583d5c22a19590ce1a061e9 SHA512 b58a369168357491a1b5149e4ea32f451c23275f69bddb5bb550f682939f7d8fb00f288eb041a04c817c52193f3123b065d2a3df8c871f898b8ceafddc6414a2
+EBUILD unbound-1.8.1.ebuild 5360 BLAKE2B debee5f87a838a19b9d018e5df91aca309a5c4c8e8e229ae0ec1df2278bd199755517d4d99d12c87298711157eaeffaaaf0078badabcd88c7424c1c3735570b0 SHA512 de4aae3c54f81752f98c862bb3a5a6d03248695d7e6bb0f380266668b4db73d734d081f15a1195b22b010563140932db9813143f4aaa104f1a37b9ddf0ca954e
+EBUILD unbound-1.8.3.ebuild 5378 BLAKE2B e949c9443bc32d3fb2656dbe8143b3b56cb521226d559e3b11d6b904d45a1bb08377bcbe7d2d3e9c98d5db1b66f565bc6b7e643ac4b5b2b97bde3d294b0a835f SHA512 f3557b42afeb9618bd09381cd94a1a8ec45744250815caa8a1a1e07e79034e3d509027d5467952b1d2b26818a3f3ddcf6deb5a3f7ceef89cc4e4dd2c5a3d18de
+MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/files/0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch b/net-dns/unbound/files/0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch
deleted file mode 100644
index c1be28cbc0db..000000000000
--- a/net-dns/unbound/files/0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 858da540f70a4411ad8fbe7144cef6ce9da18f89 Mon Sep 17 00:00:00 2001
-From: wouter <wouter@be551aaa-1e26-0410-a405-d3ace91eadb9>
-Date: Mon, 5 Jan 2015 13:51:22 +0000
-Subject: [PATCH] - Fix #634: fix fail to start on Linux LTS 3.14.X, ignores
- missing   IP_MTU_DISCOVER OMIT option.
-
---- a/services/listen_dnsport.c
-+++ b/services/listen_dnsport.c
-@@ -368,29 +368,47 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr,
-  * (and also uses the interface mtu to determine the size of the packets).
-  * So there won't be any EMSGSIZE error.  Against DNS fragmentation attacks.
-  * FreeBSD already has same semantics without setting the option. */
--#    if defined(IP_PMTUDISC_OMIT)
--		int action = IP_PMTUDISC_OMIT;
--#    else
--		int action = IP_PMTUDISC_DONT;
--#    endif
-+		int omit_set = 0;
-+		int action;
-+#   if defined(IP_PMTUDISC_OMIT)
-+		action = IP_PMTUDISC_OMIT;
- 		if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, 
- 			&action, (socklen_t)sizeof(action)) < 0) {
--			log_err("setsockopt(..., IP_MTU_DISCOVER, "
--#    if defined(IP_PMTUDISC_OMIT)
--				"IP_PMTUDISC_OMIT"
-+
-+			if (errno != EINVAL) {
-+				log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_OMIT...) failed: %s",
-+					strerror(errno));
-+
-+#    ifndef USE_WINSOCK
-+				close(s);
- #    else
--				"IP_PMTUDISC_DONT"
-+				closesocket(s);
- #    endif
--				"...) failed: %s",
--				strerror(errno));
-+				*noproto = 0;
-+				*inuse = 0;
-+				return -1;
-+			}
-+		}
-+		else
-+		{
-+		    omit_set = 1;
-+		}
-+#   endif
-+		if (omit_set == 0) {
-+   			action = IP_PMTUDISC_DONT;
-+			if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER,
-+				&action, (socklen_t)sizeof(action)) < 0) {
-+				log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_DONT...) failed: %s",
-+					strerror(errno));
- #    ifndef USE_WINSOCK
--			close(s);
-+				close(s);
- #    else
--			closesocket(s);
-+				closesocket(s);
- #    endif
--			*noproto = 0;
--			*inuse = 0;
--			return -1;
-+				*noproto = 0;
-+				*inuse = 0;
-+				return -1;
-+			}
- 		}
- #  elif defined(IP_DONTFRAG)
- 		int off = 0;
diff --git a/net-dns/unbound/files/unbound-1.4.12-gentoo.patch b/net-dns/unbound/files/unbound-1.4.12-gentoo.patch
deleted file mode 100644
index 57920689783e..000000000000
--- a/net-dns/unbound/files/unbound-1.4.12-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur unbound-1.4.12.orig/doc/example.conf.in unbound-1.4.12/doc/example.conf.in
---- unbound-1.4.12.orig/doc/example.conf.in	2011-07-14 17:33:37.000000000 +0900
-+++ unbound-1.4.12/doc/example.conf.in	2011-07-16 10:01:06.644402341 +0900
-@@ -334,7 +334,7 @@
- 	# with several entries, one file per entry.
- 	# Zone file format, with DS and DNSKEY entries.
- 	# Note this gets out of date, use auto-trust-anchor-file please.
--	# trust-anchor-file: ""
-+	# trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@"
- 	
- 	# Trusted key for validation. DS or DNSKEY. specify the RR on a
- 	# single line, surrounded by "". TTL is ignored. class is IN default.
diff --git a/net-dns/unbound/files/unbound.confd b/net-dns/unbound/files/unbound.confd
deleted file mode 100644
index b4de7cf1142e..000000000000
--- a/net-dns/unbound/files/unbound.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-# Settings should normally not need any changes.
-
-# Location of the unbound configuration file. Leave empty for the default.
-#UNBOUND_CONFFILE="/etc/unbound/unbound.conf"
diff --git a/net-dns/unbound/files/unbound.initd b/net-dns/unbound/files/unbound.initd
deleted file mode 100644
index b295f285dd1e..000000000000
--- a/net-dns/unbound/files/unbound.initd
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-name="unbound daemon"
-extra_commands="configtest"
-extra_started_commands="reload"
-description="unbound is a Domain Name Server (DNS) that is used to resolve host names to IP address."
-description_configtest="Run syntax tests for configuration files only."
-description_reload="Kills all children and reloads the configuration."
-
-
-UNBOUND_BINARY=${UNBOUND_BINARY:-/usr/sbin/unbound}
-UNBOUND_CHECKCONF=${UNBOUND_CHECKCONF:-/usr/sbin/unbound-checkconf}
-UNBOUND_CONFFILE=${UNBOUND_CONFFILE:-/etc/unbound/${SVCNAME}.conf}
-
-depend() {
-	need net
-	use logger
-	provide dns
-	after auth-dns
-}
-
-checkconfig() {
-	UNBOUND_PIDFILE=$("${UNBOUND_CHECKCONF}" -o pidfile "${UNBOUND_CONFFILE}")
-	return $?
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $?
-}
-
-start() {
-	checkconfig || return $?
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --pidfile "${UNBOUND_PIDFILE}" \
-		--exec "${UNBOUND_BINARY}" -- -c "${UNBOUND_CONFFILE}"
-	eend $?
-}
-
-stop() {
-	checkconfig || return $?
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile "${UNBOUND_PIDFILE}"
-	eend $?
-}
-
-reload() {
-	checkconfig || return $?
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile "${UNBOUND_PIDFILE}"
-	eend $?
-}
diff --git a/net-dns/unbound/metadata.xml b/net-dns/unbound/metadata.xml
index 322609af4ff1..64f0e795d58b 100644
--- a/net-dns/unbound/metadata.xml
+++ b/net-dns/unbound/metadata.xml
@@ -5,6 +5,10 @@
     <email>mschiff@gentoo.org</email>
     <name>Marc Schiffbauer</name>
   </maintainer>
+  <maintainer type="person">
+    <email>whissi@gentoo.org</email>
+    <name>Thomas Deutschmann</name>
+  </maintainer>
   <longdescription lang="en">
   Unbound is a validating, recursive, and caching DNS resolver.
 
diff --git a/net-dns/unbound/unbound-1.5.1-r2.ebuild b/net-dns/unbound/unbound-1.5.1-r2.ebuild
deleted file mode 100644
index eeb41c65a8f5..000000000000
--- a/net-dns/unbound/unbound-1.5.1-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="http://unbound.net/"
-SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="debug dnstap +ecdsa gost python selinux static-libs 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[${MULTILIB_USEDEP}]
-	>=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}]
-	dnstap? (
-		dev-libs/fstrm[${MULTILIB_USEDEP}]
-		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
-	)
-	ecdsa? ( dev-libs/openssl:0[-bindist] )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup unbound
-	enewuser unbound -1 -1 /etc/unbound unbound
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# To avoid below error messages, set 'trust-anchor-file' to same value in
-	# 'auto-trust-anchor-file'.
-	# [23109:0] error: Could not open autotrust file for writing,
-	# /etc/dnssec/root-anchors.txt: Permission denied
-	epatch "${FILESDIR}"/${PN}-1.4.12-gentoo.patch
-	epatch "${FILESDIR}"/0001-fix-fail-to-start-on-Linux-LTS-3.14.X-ignore.patch
-
-	# 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 dnstap) \
-		$(use_enable ecdsa) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with python pythonmodule) \
-		$(multilib_native_use_with python pyunbound) \
-		$(use_with threads pthreads) \
-		--disable-flto \
-		--disable-rpath \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-pidfile="${EPREFIX}"/var/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() {
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound.initd unbound
-	newconfd "${FILESDIR}"/unbound.confd unbound
-
-	systemd_dounit "${FILESDIR}"/unbound.service
-	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
-}
diff --git a/net-dns/unbound/unbound-1.5.10.ebuild b/net-dns/unbound/unbound-1.5.10.ebuild
deleted file mode 100644
index 93b077ac9bc5..000000000000
--- a/net-dns/unbound/unbound-1.5.10.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="http://unbound.net/"
-SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 x86"
-IUSE="debug dnstap +ecdsa gost libressl python selinux static-libs 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}] )
-	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} )"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup unbound
-	enewuser unbound -1 -1 /etc/unbound unbound
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# To avoid below error messages, set 'trust-anchor-file' to same value in
-	# 'auto-trust-anchor-file'.
-	# [23109:0] error: Could not open autotrust file for writing,
-	# /etc/dnssec/root-anchors.txt: Permission denied
-	epatch "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
-
-	# 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 dnstap) \
-		$(use_enable ecdsa) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with python pythonmodule) \
-		$(multilib_native_use_with python pyunbound) \
-		$(use_with threads pthreads) \
-		--disable-flto \
-		--disable-rpath \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-pidfile="${EPREFIX}"/var/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() {
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound.initd unbound
-	newconfd "${FILESDIR}"/unbound.confd unbound
-
-	systemd_dounit "${FILESDIR}"/unbound.service
-	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
-}
diff --git a/net-dns/unbound/unbound-1.6.3.ebuild b/net-dns/unbound/unbound-1.6.3.ebuild
deleted file mode 100644
index 0eccb3d9a8d0..000000000000
--- a/net-dns/unbound/unbound-1.6.3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="http://unbound.net/"
-SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug dnscrypt dnstap +ecdsa gost libressl python 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} )"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)
-	systemd? ( sys-apps/systemd )
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup unbound
-	enewuser unbound -1 -1 /etc/unbound unbound
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# To avoid below error messages, set 'trust-anchor-file' to same value in
-	# 'auto-trust-anchor-file'.
-	# [23109:0] error: Could not open autotrust file for writing,
-	# /etc/dnssec/root-anchors.txt: Permission denied
-	epatch "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
-
-	# 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 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 \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-pidfile="${EPREFIX}"/var/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() {
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound.initd unbound
-	newconfd "${FILESDIR}"/unbound.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
-}
diff --git a/net-dns/unbound/unbound-1.6.4.ebuild b/net-dns/unbound/unbound-1.6.4.ebuild
deleted file mode 100644
index 0eccb3d9a8d0..000000000000
--- a/net-dns/unbound/unbound-1.6.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="http://unbound.net/"
-SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug dnscrypt dnstap +ecdsa gost libressl python 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} )"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)
-	systemd? ( sys-apps/systemd )
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup unbound
-	enewuser unbound -1 -1 /etc/unbound unbound
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# To avoid below error messages, set 'trust-anchor-file' to same value in
-	# 'auto-trust-anchor-file'.
-	# [23109:0] error: Could not open autotrust file for writing,
-	# /etc/dnssec/root-anchors.txt: Permission denied
-	epatch "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
-
-	# 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 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 \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-pidfile="${EPREFIX}"/var/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() {
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound.initd unbound
-	newconfd "${FILESDIR}"/unbound.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
-}
diff --git a/net-dns/unbound/unbound-1.6.6.ebuild b/net-dns/unbound/unbound-1.6.6.ebuild
deleted file mode 100644
index 122b95bc275d..000000000000
--- a/net-dns/unbound/unbound-1.6.6.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="http://unbound.net/"
-SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug dnscrypt dnstap +ecdsa gost libressl python 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} )"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)
-	systemd? ( sys-apps/systemd )
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup unbound
-	enewuser unbound -1 -1 /etc/unbound unbound
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# To avoid below error messages, set 'trust-anchor-file' to same value in
-	# 'auto-trust-anchor-file'.
-	# [23109:0] error: Could not open autotrust file for writing,
-	# /etc/dnssec/root-anchors.txt: Permission denied
-	epatch "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
-
-	# 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 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 \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-pidfile="${EPREFIX}"/var/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() {
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound.initd unbound
-	newconfd "${FILESDIR}"/unbound.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
-}
diff --git a/net-dns/unbound/unbound-1.6.7.ebuild b/net-dns/unbound/unbound-1.6.7.ebuild
deleted file mode 100644
index 122b95bc275d..000000000000
--- a/net-dns/unbound/unbound-1.6.7.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="http://unbound.net/"
-SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug dnscrypt dnstap +ecdsa gost libressl python 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} )"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)
-	systemd? ( sys-apps/systemd )
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup unbound
-	enewuser unbound -1 -1 /etc/unbound unbound
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# To avoid below error messages, set 'trust-anchor-file' to same value in
-	# 'auto-trust-anchor-file'.
-	# [23109:0] error: Could not open autotrust file for writing,
-	# /etc/dnssec/root-anchors.txt: Permission denied
-	epatch "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
-
-	# 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 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 \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-pidfile="${EPREFIX}"/var/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() {
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound.initd unbound
-	newconfd "${FILESDIR}"/unbound.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
-}
diff --git a/net-dns/unbound/unbound-1.6.8-r2.ebuild b/net-dns/unbound/unbound-1.6.8-r2.ebuild
deleted file mode 100644
index 9edf230ed88d..000000000000
--- a/net-dns/unbound/unbound-1.6.8-r2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="http://unbound.net/"
-SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug dnscrypt dnstap +ecdsa gost libressl python 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} )"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)
-	systemd? ( sys-apps/systemd )
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-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() {
-	# To avoid below error messages, set 'trust-anchor-file' to same value in
-	# 'auto-trust-anchor-file'.
-	# [23109:0] error: Could not open autotrust file for writing,
-	# /etc/dnssec/root-anchors.txt: Permission denied
-	epatch "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
-
-	# 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 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 \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-pidfile="${EPREFIX}"/var/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() {
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound.initd unbound
-	newconfd "${FILESDIR}"/unbound.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 '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' "${ED}/etc/unbound/unbound.conf"
-}
-
-pkg_postinst() {
-	# make var/ writable by unbound
-	if [[ -d "${ROOT}/etc/unbound/var" ]]; then
-		chown --no-dereference --from=root unbound: "${ROOT}/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: /etc/unbound/var/root-anchors.txt' in /etc/unbound/unbound.conf"
-	einfo "and run"
-	einfo ""
-	einfo "  su -s /bin/sh -c '/usr/sbin/unbound-anchor -a /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.6.8.ebuild b/net-dns/unbound/unbound-1.6.8.ebuild
deleted file mode 100644
index 4006dee6f049..000000000000
--- a/net-dns/unbound/unbound-1.6.8.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="http://unbound.net/"
-SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug dnscrypt dnstap +ecdsa gost libressl python 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} )"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)
-	systemd? ( sys-apps/systemd )
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup unbound
-	enewuser unbound -1 -1 /etc/unbound unbound
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# To avoid below error messages, set 'trust-anchor-file' to same value in
-	# 'auto-trust-anchor-file'.
-	# [23109:0] error: Could not open autotrust file for writing,
-	# /etc/dnssec/root-anchors.txt: Permission denied
-	epatch "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
-
-	# 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 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 \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-pidfile="${EPREFIX}"/var/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() {
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound.initd unbound
-	newconfd "${FILESDIR}"/unbound.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
-}
diff --git a/net-dns/unbound/unbound-1.7.0.ebuild b/net-dns/unbound/unbound-1.7.0.ebuild
deleted file mode 100644
index 9edf230ed88d..000000000000
--- a/net-dns/unbound/unbound-1.7.0.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="http://unbound.net/"
-SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug dnscrypt dnstap +ecdsa gost libressl python 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} )"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)
-	systemd? ( sys-apps/systemd )
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-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() {
-	# To avoid below error messages, set 'trust-anchor-file' to same value in
-	# 'auto-trust-anchor-file'.
-	# [23109:0] error: Could not open autotrust file for writing,
-	# /etc/dnssec/root-anchors.txt: Permission denied
-	epatch "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
-
-	# 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 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 \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-pidfile="${EPREFIX}"/var/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() {
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound.initd unbound
-	newconfd "${FILESDIR}"/unbound.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 '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' "${ED}/etc/unbound/unbound.conf"
-}
-
-pkg_postinst() {
-	# make var/ writable by unbound
-	if [[ -d "${ROOT}/etc/unbound/var" ]]; then
-		chown --no-dereference --from=root unbound: "${ROOT}/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: /etc/unbound/var/root-anchors.txt' in /etc/unbound/unbound.conf"
-	einfo "and run"
-	einfo ""
-	einfo "  su -s /bin/sh -c '/usr/sbin/unbound-anchor -a /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.7.1.ebuild b/net-dns/unbound/unbound-1.7.1.ebuild
deleted file mode 100644
index 9edf230ed88d..000000000000
--- a/net-dns/unbound/unbound-1.7.1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
-
-MY_P=${PN}-${PV/_/}
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="http://unbound.net/"
-SRC_URI="http://unbound.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug dnscrypt dnstap +ecdsa gost libressl python 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} )"
-
-DEPEND="${CDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)
-	systemd? ( sys-apps/systemd )
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-bind )"
-
-# bug #347415
-RDEPEND="${RDEPEND}
-	net-dns/dnssec-root"
-
-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() {
-	# To avoid below error messages, set 'trust-anchor-file' to same value in
-	# 'auto-trust-anchor-file'.
-	# [23109:0] error: Could not open autotrust file for writing,
-	# /etc/dnssec/root-anchors.txt: Permission denied
-	epatch "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
-
-	# 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 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 \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-pidfile="${EPREFIX}"/var/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() {
-	prune_libtool_files --modules
-	use python && python_optimize
-
-	newinitd "${FILESDIR}"/unbound.initd unbound
-	newconfd "${FILESDIR}"/unbound.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 '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' "${ED}/etc/unbound/unbound.conf"
-}
-
-pkg_postinst() {
-	# make var/ writable by unbound
-	if [[ -d "${ROOT}/etc/unbound/var" ]]; then
-		chown --no-dereference --from=root unbound: "${ROOT}/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: /etc/unbound/var/root-anchors.txt' in /etc/unbound/unbound.conf"
-	einfo "and run"
-	einfo ""
-	einfo "  su -s /bin/sh -c '/usr/sbin/unbound-anchor -a /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.8.0-r1.ebuild b/net-dns/unbound/unbound-1.8.0-r1.ebuild
index db6d5e3b03ba..f06bc36f2cd3 100644
--- a/net-dns/unbound/unbound-1.8.0-r1.ebuild
+++ b/net-dns/unbound/unbound-1.8.0-r1.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 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}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
 	dnstap? (
 		dev-libs/fstrm[${MULTILIB_USEDEP}]
diff --git a/net-dns/unbound/unbound-1.8.1.ebuild b/net-dns/unbound/unbound-1.8.1.ebuild
index 2073aa739bea..fc522c10b37b 100644
--- a/net-dns/unbound/unbound-1.8.1.ebuild
+++ b/net-dns/unbound/unbound-1.8.1.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 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}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
 	dnstap? (
 		dev-libs/fstrm[${MULTILIB_USEDEP}]
diff --git a/net-dns/unbound/unbound-1.7.3-r1.ebuild b/net-dns/unbound/unbound-1.8.3.ebuild
index ee301c92356f..930c5cadac36 100644
--- a/net-dns/unbound/unbound-1.7.3-r1.ebuild
+++ b/net-dns/unbound/unbound-1.8.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
 
@@ -12,9 +12,9 @@ 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/7" # ABI version of libunbound.so
+SLOT="0/8" # ABI version of libunbound.so
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug dnscrypt dnstap +ecdsa gost libressl python selinux static-libs systemd test threads"
+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
@@ -25,7 +25,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 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}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
 	dnstap? (
 		dev-libs/fstrm[${MULTILIB_USEDEP}]
@@ -34,7 +34,8 @@ CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 	ecdsa? (
 		!libressl? ( dev-libs/openssl:0[-bindist] )
 	)
-	python? ( ${PYTHON_DEPS} )"
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
 
 BDEPEND="virtual/pkgconfig"
 
@@ -95,6 +96,8 @@ multilib_src_configure() {
 		$(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) \
@@ -102,7 +105,11 @@ multilib_src_configure() {
 		$(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 \
@@ -145,6 +152,11 @@ multilib_src_install_all() {
 		"${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
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /net-dns
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)