gentoo resync : 24.02.2018

14 files changed, 241 insertions, 111 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 7c8530be46ec..836102789f23 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index e20411a2c823..8d2caffacf79 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -1,4 +1,6 @@
 AUX c-ares-1.12.0-remove-tests.patch 422 BLAKE2B 37b7a7a85f053d6a2231b46ca244ffb449bb011fb3567bfdd601dd7e598e72bf70ffb209ddaf23cb3a2b06f2bc38ff34e1a6bec7cbfafd2d25516f1a24780ace SHA512 53a9c126183c811b1f68c12014e4123d250447925ded472ff1fb6b57d254730206becd4182692ad5958b14ba0b929a2713df6988c0306872b046aa49bd70e743
 DIST c-ares-1.13.0.tar.gz 1446797 BLAKE2B 9d7daaad8e35242f110ee8b4abf20619e46beb3fcf49a1b6d7df596fd4129b56cb92f4aeba10845aeb6ed4f4d789ac11745ddc87803ca5bf27fed1aebdb4286c SHA512 4a7942e754673f5b8d55a7471e31b0f390e8324b14c12077580c956147fad4d165c7fe8a3190199b1add95c710ceeb1a7957706d4f0d6299d39c5dddc719bd9d
+DIST c-ares-1.14.0.tar.gz 1335940 BLAKE2B d62a0b6d5ea4a2926ff8f2f719d267f9a0c97fa9756b80fcf7c97822f3dd7a1ce9587d9db0ea5217f052f54f5858c68e71c78c33f32fe60df81f456cd9719ac6 SHA512 30cd3f8c4eea15f994b2ceb44d84e506858f69f624e651e39bb4db523fea9ad5e8906b75abf07131ae364be19172274ed4053059669091f21ce4463cdbb857bf
 EBUILD c-ares-1.13.0.ebuild 989 BLAKE2B 16aba10685811ef10e6c182c31e7bf1f65e2f8b4871236bbff3faf244c00176924eb785282b785c8db5ebff04e7602b3a54290ea8dfc06d5b63206da73cdc8f8 SHA512 095501b4eb92c4863cab287f7caa2c0846a5190facabbba4c5da0402ffb3765487e55eb9d6abaee672f2c60f3a1a28e7effc5a88b8306be0b61ce01cc3afe245
+EBUILD c-ares-1.14.0.ebuild 1002 BLAKE2B 37190ab3adfd0541385f7dc56ab7bc90a860da5d1fbd6baaec3131bccf59ae72c18f7043fea38949a029a965329cd8f1ab66be39c954ece949e26b183a21a6a3 SHA512 3010b8ea2d31509c9fe3e57eaa2da23d7ceed5b88081280f4f092f1a6287b49a14ed1e34c3b6449bff5f1d6b9cb2186bbd22ebeaa97955ba45d5fba369cb912a
 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.14.0.ebuild b/net-dns/c-ares/c-ares-1.14.0.ebuild
new file mode 100644
index 000000000000..7358658308ce
--- /dev/null
+++ b/net-dns/c-ares/c-ares-1.14.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="C library that resolves names asynchronously"
+HOMEPAGE="http://c-ares.haxx.se/"
+SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
+
+LICENSE="MIT"
+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 ~x86-macos ~sparc64-solaris"
+IUSE="static-libs"
+
+# Subslot = SONAME of libcares.so.2
+SLOT="0/2"
+
+DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ares_build.h
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.12.0-remove-tests.patch
+	eapply_user
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-nonblocking \
+		--enable-symbol-hiding \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+}
diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest
index b3e1afcfed1b..8a6c29c361aa 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -1,7 +1,16 @@
 DIST coredns-0.9.9.tar.gz 4756460 BLAKE2B a3cd452c37d4f3fbe516318c8596d80ebe3c1dbb3600dd80bc1a7e9f20cf9680c21c0152e9e9d26749913ecf81cf09a5ed13361565a9f2372f2fe5cda83086d4 SHA512 340dacfbd65e964a9ab7602024c08d8ab5c04f9748b0975c2cf0000a664672415fbcce809450e54fca8ef838f15deb9258c99eddc98bf4a82e96dacd26050de6
+DIST coredns-1.0.5.tar.gz 5016183 BLAKE2B 93bc88a1fdd792b357ac7678a75a415fd4fbfb29e6c75768e6c444cd547abe1a7166e5d3645f360790209c4fa437170cd33bcdb097242db06fd08170ab77067a SHA512 ef5b9704932b972cd38f5eb160b1c0c405943dbb19af77db7358f1eeaf7d11d73b589e6de9dfb62f75bbf37db351cd856ae0aac2b7b1a1a909b01f4895406b81
+DIST github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 BLAKE2B 057738aefe26d3d42ba1bc0906675403512a7bab1161bc1015f6d833296778f2236cb2b99bbebd5c7db2384634fef62d2afbfc8dd59bfb1320bc6184105aa437 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32
 DIST github.com-golang-net-c73622c77280266305273cb545f54516ced95b93.tar.gz 926104 BLAKE2B c5b31791af99bfd82edcf233dd9291df58102383786b77dd131af858e5f7868dfb4faa63de5c85218b2458fc9dd9f8a0d735aaf28b4f6f2a1835201ce0f93b3a SHA512 ce014933d3b8a30057c99bca54e9ba630e1940d1afbba3b9c7ef9d4f3e78d2ad26fa5ea9f0cbb0ada877d651b67d449e099d287b4af1d320fbf0b9d50d8d169a
+DIST github.com-golang-net-cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb.tar.gz 936963 BLAKE2B 19f9996d10bd9f5aecd2bba512301519c65acd6d1c11e97617e69c4fe810f3558b05e1a3d546d3ee75c6eda96d310f63906a9217505d16d35438ca8544de4f68 SHA512 48e12282dc20ee3c614a7622ea10d986071976e3c3ea04eae01469d5e50495f9b22ccc70f0dc1ac00a5a8fda86ecb350acc6708d9467fc588a0aafc9e3641f7c
 DIST github.com-golang-text-6eab0e8f74e86c598ec3b6fad4888e0c11482d48.tar.gz 4625238 BLAKE2B a6bcc608bcbe42e03b19c2e8777623088fce206d2595444ad756f34982f50eb884aa87c92d7f23816b91d4e1b3f86e4d638c47866152f385674c7186debdcc67 SHA512 98c651a37fd60e62109d0eac3fe2a21473d7f270ec7a941f4a84485d3276da84b526d406baa185360ac842348320e9f373c124f9d88675e34d8126e71a9e8de9
+DIST github.com-golang-text-9e2b64d659da1afe07ce1c9c1dfefc09d188f21e.tar.gz 6112515 BLAKE2B 1c28dd8598c700c9c1d83ba7ba43cc97993c7261253bcac9f49a9fa0aababf05f2d522cf7ae4549d1679bf6a49ae9d0840863bcc9fa23ed1ba789904e42e853d SHA512 0b483eb86a2681264f66b320a25524690a86a56d28e97c2e91ff7cf7d8b8d531e2d5cd96cd4b842d33ea01355eadae6b6856195a0bd6c128b380b5e16fcbc286
+DIST github.com-mholt-caddy-9619fe224c96d0c4a060e83badbf95b6bd69a0ac.tar.gz 2712643 BLAKE2B 96f529d158a4133c266d54530a895d5b5b5e9bb0960569e42c14b1152677fdb06be91a9ba9d25eb92cdf858827983aa247b7e162feaf9f16819d22d19b4f5fc5 SHA512 f48d4d211ba182a7b3ef4322329167d8ec01ee92010b85fe67a663780b4771445d9ce1297ed38ff572b15b0649c9fe9cb321e45bb7131755e57c66ca59fea89b
 DIST github.com-mholt-caddy-c4dfbb9956095c92d0586a52723748c070c7b459.tar.gz 2708435 BLAKE2B 13f5b0f7072e55be4fb3ec1656f880b1ee2eddaaa70ee9ea3d9b881a2dd9865c9338fc7d0246e9766adb9bf71083eaacf55296d1d2ca49b6cf6ee62276c13edd SHA512 6b51fb8bb6689ca15317a8c82d438636975698e900f251081147aab5366829e19c1e8b4710024480e169669c70550e4c802abe40c21fb1c8487025477be49516
+DIST github.com-miekg-dns-5364553f1ee9cddc7ac8b62dce148309c386695b.tar.gz 2517679 BLAKE2B ad17feb9fe826f84d65e6fe85f10cf6cf901bc6cf593d9e44a02edce72e399b0184a29617cb67f38b2fb0278ffa46d872c32f997c3facc2154a23cceec046bdd SHA512 d4f6709e2c20a3d639b167c0d0e7f987cd2e2d849899460ed26cc7e7f4ce682b45eb3be59a4be91e872a9eea29130f72a7de4f3c1006d99449c6f762f993b9bb
 DIST github.com-miekg-dns-822ae18e7187e1bbde923a37081f6c1b8e9ba68a.tar.gz 182599 BLAKE2B 0ab2de4bd707326b87377f099a3f9eb110dc41b64f5974aa0a389e20bc93579b8b495797ae218e4e2e5a9d6b8a475a7de593ce61c71d5abf49d6c7a44e844c26 SHA512 cdced57b5fc6093a4de6200efc5558417c13d3e7e82d10dcb58b11e7f827e82c747554e803c8b8fd4b27c086af6f25e27101ceb240d3fdef5698fe3614106b53
+DIST github.com-prometheus-client_golang-e69720d204a4aa3b0c65dc91208645ba0a52b9cd.tar.gz 106879 BLAKE2B 788fbe906d4e2fe4c9e61c95256d7ec8e70b038438fb9afc69dcdc402f9c52509fe2645e0b1929dd0595ea75f160013c1b71f82d5320775724a60b34d22c1877 SHA512 27fd454387c730704b2e44e40d873843a5d36894307587a8eea3ddf0604052e9ecbef36ca37cb6a2153452ff7e1c1294d8e1cbdde7b11742db74be55bd4e2b7a
+DIST github.com-prometheus-procfs-282c8707aa210456a825798969cc27edda34992a.tar.gz 54057 BLAKE2B f6b5f64f85c153a8423d83ac8f8b810a4ba1fee716a597b9030b54524932513fa92139ecc363a0e89b9198092c88477cace244a4a5cf03075ce37cecf8a503be SHA512 2fb6b399eea1bebfcf1fde8dbe6443a5906834ea4a9738230b407610ef22f8726be13cf713a354a084ed3f27bf77ea7dbe5dedf20c7a9f6efe3e36f074aaee38
 EBUILD coredns-0.9.9.ebuild 993 BLAKE2B 4e56dd34fc16751470517606d69edad48a2faa9983670b0528b0408a40fe106bffa98a5ea65f318e4d4848900c6eebc8cf1e489379d91f3e0cf119f2df8b63cd SHA512 5e7be9091711d82e7ae5803d74983f5de3d6a7f23067e407282a54de591eedaadb5a0e56b268879edf7c34bb2f67e791302760a79b9d60bc960c35356f075fc2
+EBUILD coredns-1.0.5.ebuild 1314 BLAKE2B 0ab37dc4194fd5a16a8fc3c35519c2883a4ce364a17305bc4f22f19cda9db094ef1135053a39c2ab5fbb34296f3758dc194d0fe18b9432c038050a550d29274f SHA512 13892b631ac55ae1e026ba59730ead8b60cc85c6221b9a2bb214a12afdd038ab30286e6703ac7de0a0b3856498559c52d99cafdfabc0dbeee8d61d53165e84b8
 MISC metadata.xml 335 BLAKE2B 61dbcf471a1e9c3714531b8f0de0a79577aa666966cf71b92855aeff383246895424d1681b1ba45f03092f7735a17d0223419bb1d76eded1bd93264ab06c8e2d SHA512 f520f2f4129fb9ce453cc95527d3ccd30029fdc45411cae376c85bc02870c01b880f593b92ce35cc083e0f65bf8e7a4e0ffc57cfca7cdad84cc41fec995e88ad
diff --git a/net-dns/coredns/coredns-1.0.5.ebuild b/net-dns/coredns/coredns-1.0.5.ebuild
new file mode 100644
index 000000000000..f0c125429945
--- /dev/null
+++ b/net-dns/coredns/coredns-1.0.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/mholt/caddy 9619fe224c96d0c4a060e83badbf95b6bd69a0ac"
+	"github.com/miekg/dns 5364553f1ee9cddc7ac8b62dce148309c386695b"
+	"github.com/prometheus/client_golang e69720d204a4aa3b0c65dc91208645ba0a52b9cd"
+	"github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
+	"github.com/prometheus/procfs 282c8707aa210456a825798969cc27edda34992a"
+	"golang.org/x/net cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb github.com/golang/net"
+	"golang.org/x/text 9e2b64d659da1afe07ce1c9c1dfefc09d188f21e github.com/golang/text"
+)
+
+EGO_PN="github.com/${PN}/${PN}"
+
+inherit golang-build golang-vcs-snapshot
+
+GITCOMMIT="ea95a2003a710b9057d7500bdca38f6394896294"
+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
+	popd || die
+}
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index a0c7503bf111..b989e30cf7c6 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -2,7 +2,7 @@ AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
 DIST knot-2.5.7.tar.xz 1084656 BLAKE2B c2d583625a19f6a61248b3b42cdf14f5bb2bdbafdb20be6b0813744095a4016a4be2eb5e2dfaff0628238c60153480175a86706db0b88569d76156f86ba33968 SHA512 96e375f556309bb89cea982dda169cef70c23d03c48282110e47a44849c1102cd37d98aa7650781b399f5d932b724b8a935f0b9e55e4920465ae7b74a0d1d55a
-DIST knot-2.6.4.tar.xz 1116928 BLAKE2B 7914addec8ff1826c81c2de098ed4e3b7686c877d40c727286d2d9c8c477fb02c1d0ad38befa77ccc92c5e068d6bc4c86e5df8ad9f5541cc0e3dc6f63192af58 SHA512 7242ef76bd3a379f574ca9af8fec96b0419c2209b6d8114c3b8e675cb5459ec70dab928a5a9ba9850fe1d7201729c9ff7e4c8800674e840e1cf04544c32a6f78
+DIST knot-2.6.5.tar.xz 1118084 BLAKE2B 941d90803e51c5af003fcdaaaa22ffede326492cf60836efc09a06e18740743cc9f806e4750934f6959ced88616f46fc5dbc6667099d53eb4a21fae524497c9c SHA512 ed0d1d30e6d8d802e669aac12c4fd0cec8e315eb0e2c05b722f49ada434c82b8caebf12568881e5fbba2f61a5027c44fbde42b543c9086ff2e9614caf42a6d12
 EBUILD knot-2.5.7.ebuild 1913 BLAKE2B df4f8dba2d9cf3b2a2905eee881bd57ec81d3086682c1791ea3c1a3a14df72997346873ff1f4bbaa08a70584123c260d27e4e436e76cf04840e379a58e3a143a SHA512 62e40fe7b3ddd94544cb1435f448ee3e9ed0175a1b68211ee0328c34163a52127d35fec146168a1846c4da44cca3098fe562828b8c62fef7238bfed3713596ed
-EBUILD knot-2.6.4.ebuild 1921 BLAKE2B bff2c62b91d762b3d06916e9d5a4569f09f6bdc0c0738afef5e5c0a6a7adcfd4c69a44066a0f3293aa76c2d1ef309151a63e8bdfd20e7f5e1542228a528a72a3 SHA512 5815ee23ff53f3a82dca8e113a667ff80371a6d8e57282d238a0b884bf3e5738d78bb633bc4f44b3aac513bbd3500c1f2f091f7a4f2829a6466c5800423b948f
+EBUILD knot-2.6.5.ebuild 1921 BLAKE2B bff2c62b91d762b3d06916e9d5a4569f09f6bdc0c0738afef5e5c0a6a7adcfd4c69a44066a0f3293aa76c2d1ef309151a63e8bdfd20e7f5e1542228a528a72a3 SHA512 5815ee23ff53f3a82dca8e113a667ff80371a6d8e57282d238a0b884bf3e5738d78bb633bc4f44b3aac513bbd3500c1f2f091f7a4f2829a6466c5800423b948f
 MISC metadata.xml 1539 BLAKE2B c07704f4bbf249b7953403a33c71d7565ef2219b019dbccdc15d9d459ff57f0aa200ed5ae9ab74b07e352d8dcd12f62f5d7bb392b064dbeedad3257ced653675 SHA512 8b39c687fb8b9fb4bf25e0baa8c851ffb4980c0028bf0f64a3c642146139429e292c6ca3fbd01b7bb311ecbbe7bf1df128885b53971b836f541fe97bedf6f056
diff --git a/net-dns/knot/knot-2.6.4.ebuild b/net-dns/knot/knot-2.6.5.ebuild
index 63edc2b56df8..63edc2b56df8 100644
--- a/net-dns/knot/knot-2.6.4.ebuild
+++ b/net-dns/knot/knot-2.6.5.ebuild
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 7d4219c8cf1c..9f657f0a39dd 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -2,8 +2,6 @@ AUX nsd.initd-r1 1386 BLAKE2B d3a5ca31ffd06d9cf4da09617f523f61e5b8aea4e3217bf114
 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.18.tar.gz 1095673 BLAKE2B e3dc86e64614323dbefb334769a8095dc674f422f8e62c91e2918f4622ceac0ebef7dec42d5a714b15ad2f3af368ba817239a0027d3a685abf603cf00e9fa9d1 SHA512 d9939b8813677127ccd3e87e709b27a8a4f96cc0221ab77563d9349cb6dd56ae39bb7349ede9aed9aaa07de9310bcaeb8be8b17f608e9c4714b4fb084f2e756f
-DIST nsd-4.1.19.tar.gz 1096567 BLAKE2B f6e700d0c6f539caa0f1ff94fb43091eb15b32421f4b952566ca5ae31b94922248cc5ffd28a97abd6870d6bdd8acd76e80b06717584c626634f0a01eed76ae51 SHA512 fc99590f84658311cf33428d87c84c73b231ac0c90f8ca47daedeb264642e291eb2e79f8dee304dd4dc3a73bd9c7fbe65f2bd164b120bd7b13429ad483882d82
-EBUILD nsd-4.1.18.ebuild 2794 BLAKE2B 35b9ba3fae0c9bbb5c34877eb810d9b1a45d4b9c386a41a805ea30c4928dfa6cf11157b68b5c8f963300156dd14524be331270d96559ee5b10baf1c6a090e707 SHA512 b4292ebe23c0a887da7a73b6b5af141eaec0aa8eebd0acb75708966ea8d25464a2626365986c6332d0696c529925725830f39e2e3718e19ecaacace2f9f8ea65
-EBUILD nsd-4.1.19.ebuild 2796 BLAKE2B b9974cfd43dbaecd1babb1cc477b8b2743679bb933407e4e39518b207b84de771e2b56057590dfc2178f8536323bc8ef9c7660e09ba6d8be6461f8f2a3f7d80f SHA512 744c2364db1b41edec79bbba3604c12417ece1bb1e0c0064d74dd72ce70b1dd19520845c48ce969055beca72a42a4ab5dda547cb0b6a7a235301d5e46d80b5b7
+DIST nsd-4.1.20.tar.gz 1096797 BLAKE2B aa1415933f8d1d1415349407c54cfdec581304ca27733110b45bc109288506ad2a92c110565695ac7cb4afae3b955fe09fe740196f268c810e0be992e4f55353 SHA512 4e646303d9da920a9ad567ea3e04a06d8b66bc0d84117908ae69126c131321d660548f32e7bb54e248dae4f48d5152c0a204bf8bf9262ac4394371c05305b21e
+EBUILD nsd-4.1.20.ebuild 2794 BLAKE2B 35b9ba3fae0c9bbb5c34877eb810d9b1a45d4b9c386a41a805ea30c4928dfa6cf11157b68b5c8f963300156dd14524be331270d96559ee5b10baf1c6a090e707 SHA512 b4292ebe23c0a887da7a73b6b5af141eaec0aa8eebd0acb75708966ea8d25464a2626365986c6332d0696c529925725830f39e2e3718e19ecaacace2f9f8ea65
 MISC metadata.xml 1013 BLAKE2B b989a1ccafac96d48d6f1b72bace164fcb1c04885ec9436e37fb29d94bf8c5feb4a02a1b4fc04241b6fa3c9d6d89ec993e3a06b6efc7ccd45d4ace3fad16cb18 SHA512 e7c0d6a267fd06546ac58278ffb75280aa0c0ed55ddf0097614906c1863e55cf572ff7660e021ac8861c506ed0de126c0c5e68dd2d88aea1a395be3234607ce5
diff --git a/net-dns/nsd/nsd-4.1.19.ebuild b/net-dns/nsd/nsd-4.1.19.ebuild
deleted file mode 100644
index 4a7e4dbabe2b..000000000000
--- a/net-dns/nsd/nsd-4.1.19.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd
-
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV="${PV/_rc/rc}"
-MY_PV="${MY_PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-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 libressl"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	virtual/yacc
-	libevent? ( dev-libs/libevent )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	munin? ( net-analyzer/munin )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/flex
-"
-
-src_prepare() {
-	# Fix the paths in the munin plugin to match our install
-	eapply "${FILESDIR}"/nsd_munin_.patch
-	eapply_user
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-pie
-		--enable-relro-now
-		--enable-largefile
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# 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"
-}
-
-pkg_postinst() {
-	# Do this in postinst to ensure the uid/gid is consistent for binpkgs
-	enewgroup nsd
-	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
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd
-}
diff --git a/net-dns/nsd/nsd-4.1.18.ebuild b/net-dns/nsd/nsd-4.1.20.ebuild
index 537cf030813c..537cf030813c 100644
--- a/net-dns/nsd/nsd-4.1.18.ebuild
+++ b/net-dns/nsd/nsd-4.1.20.ebuild
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index cd5e2a6df3cd..3c053a2fd95a 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -20,5 +20,6 @@ EBUILD unbound-1.6.3.ebuild 3669 BLAKE2B b56cdd1dd673807593d2b8b99a96c4ae43333b6
 EBUILD unbound-1.6.4.ebuild 3669 BLAKE2B b56cdd1dd673807593d2b8b99a96c4ae43333b69cb66cf30e73dba3c51e0b21df130da9fdcd35d458afff547960a27c690d13075c43a950d986b8f16e0ea88f5 SHA512 d7d1035bab213ff950883ecac04f7c3ff972b6f83465a2c09afba1339ef1e74e560cb9cc818800d02a79462d2b857832596bc80b2088b5db9083f82a9032a5a6
 EBUILD unbound-1.6.6.ebuild 3676 BLAKE2B 3e37f5afa3fea70e86648fe5e32a5c38e89b77c5c9a0126c2fe831cda94bc8de52b2493def4bd6500c3e970827a4a3c14a63e1704cd10d7a3bdd5a808f5bc3b1 SHA512 112962ccdb8e60f8fb195061e607c449416355bcc5524a7bd6df2964d5a1508d4ddd7f5969b9f2b2e3b0acefc4fa7b6f687ef634cbcf24dc416cecfd9964dc7d
 EBUILD unbound-1.6.7.ebuild 3676 BLAKE2B 3e37f5afa3fea70e86648fe5e32a5c38e89b77c5c9a0126c2fe831cda94bc8de52b2493def4bd6500c3e970827a4a3c14a63e1704cd10d7a3bdd5a808f5bc3b1 SHA512 112962ccdb8e60f8fb195061e607c449416355bcc5524a7bd6df2964d5a1508d4ddd7f5969b9f2b2e3b0acefc4fa7b6f687ef634cbcf24dc416cecfd9964dc7d
+EBUILD unbound-1.6.8-r1.ebuild 3914 BLAKE2B 099ec6eec6d3b4bc34f92d6ac47de922d2fdb49124cf73ac5c139f81545e93ad35d75950f4bdcda8289a601d0f72ef9250ec2581a9f2e0b33cb8963c63f60619 SHA512 0c4838263ef74dffbef0d8d36c05437fcef3909e92dcded3115c9fb1e9a0542616508d6f0199fad4f72b68310bc3523658976351850592bf955bf3dd6e421a6d
 EBUILD unbound-1.6.8.ebuild 3676 BLAKE2B 568771ffa57f6ec9711aafe2ba7e808772d898a3476a5d11c0aaeb40538e37a5a7d3a4b091a206b5828605162a59f33dfe50b6c0b4840794f655090c1a1bb641 SHA512 403febbc597a6beccce1eb4394df04dcbbec1c65cd1b8e4c444e53ace5fd6b3cf87dfaa1cf69c11203e3cdcb7c99de7d43f36a202188e4e6c58b4f8650d109ae
 MISC metadata.xml 1008 BLAKE2B 1852e514f97f9305848144ae0f9aaf8fb49546cd9afcd873ab67dcefee0503d5047809dc8c650006ccdb236c9ba9ff02cc5ecf726d61c25e17167409f91d3fb1 SHA512 f6654d6d254a4d51a8c454c542f1fbbff16bfeaa1cb681f110b9ae99a4231cdb7c073a5d42faba71168079330f9e01781df7a5b3e1bd70d771c874a5bbe9742a
diff --git a/net-dns/unbound/unbound-1.6.8-r1.ebuild b/net-dns/unbound/unbound-1.6.8-r1.ebuild
new file mode 100644
index 000000000000..07379f933b5c
--- /dev/null
+++ b/net-dns/unbound/unbound-1.6.8-r1.ebuild
@@ -0,0 +1,135 @@
+# 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 )
+	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
+}
diff --git a/net-dns/updatedd/Manifest b/net-dns/updatedd/Manifest
index c59f5e5b5b85..dc2c40fe21fe 100644
--- a/net-dns/updatedd/Manifest
+++ b/net-dns/updatedd/Manifest
@@ -3,6 +3,6 @@ AUX respect-docdir.patch 1189 BLAKE2B 45906d6aa2211bb1e28f46dd264e5fab5d49ab76ca
 AUX set-socket-timeouts-for-ipserv.patch 1001 BLAKE2B 0a2d769313f49bd198338af4ec43663cd2667b1ecbbcd5938398bc7bab3bd4389b56df90de322f2951cc5bc534753edc4e226af6558564d6e64804db89fccfdf SHA512 def30f688dbef6c6547a671914120b0da3fc6177236ed563e4a0f26f5c4200a393ce2fd6e48042cce3eca281c5073e0ad8c6aed98e507be9b52781f8e57b29bd
 AUX updatedd-2.6-options.patch 385 BLAKE2B 35a85ad990250a799d512bbb5494ac22acdee4567056ab09c92ccb4ff9641cf05d5a4e6cd3a768b6cd05f377f587a60c5203a3972737b3b8d414708662635ded SHA512 e509e177d0147cc047d8272051541f132a6b64beabff14db9fc7936e780b61947653cd9c501f76877c869ebbbcb052fc263d539ee42bba8eb46c47a6b24eac33
 DIST updatedd_2.6.tar.gz 667104 BLAKE2B 7cae9eab63c0dcf97203d5cd10527cbe8f937f048a2508983feb26d44755189af0789c0b741b41dad51abaad51e3e3aa1e3e77328094b04734552bb33e14cdf0 SHA512 f8a83dfc612d4f0dfc7ffabb9934fbfc236a21f7bbd38355dd1234e45cf5fa616c1cc48036a29a2b82195c0b9d1f9b6bb3b78a3acc8f28c1c65b87f27f2b832f
-EBUILD updatedd-2.6-r5.ebuild 710 BLAKE2B 22c7d325b497a01ee7e638092bbb6ba59914e60f69dcb526129ff8c680a6457d6e42e73dbbc3b04f485336c6928aa56626ad10fbb77437aa98181e8c8565cfff SHA512 3f69087934105235b677a105102bf7ab32132ba0be0f3322298f3f805c7f45c8c05bfafa15b6a46ae80f165c6d61126780c06580a84aaaaf1fa9702daf864eaa
+EBUILD updatedd-2.6-r5.ebuild 708 BLAKE2B 4fb404490389fac3fa3755100de114b276b23982f1fb0e8f616815683f55b60f0a2710033d6811d3d19bb09bab8f58d04d5b620b76d7655394feb45e7adb4eee SHA512 a007b01ea884963fdcd747e2d6fb1e61ca48bc546901c442f93675790ce62c478390bb9c3eff547c3e189a66820fd6ed8b18dc677fb6672e0d6bb80b90898660
 EBUILD updatedd-2.6.ebuild 616 BLAKE2B d9e5f1fdb3c0257e0b8eceb32b439a6c0e67edeaecfdc9dc6bf42ce698561bef098f4fdbcccd3b82076afbd89addb329904f64df27fa71fcc53c6aa0e3c07236 SHA512 ad3f43dad804ef81d39c0a428ab1536e0557f00391ea9b9943898bbe390f4685598fe87e7f32a78c68e4cb1cb2c99cbfe99443463207fd2de71b5bad9aaf6e01
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/updatedd/updatedd-2.6-r5.ebuild b/net-dns/updatedd/updatedd-2.6-r5.ebuild
index fae1a41e9e1b..bec393118371 100644
--- a/net-dns/updatedd/updatedd-2.6-r5.ebuild
+++ b/net-dns/updatedd/updatedd-2.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://savannah.nongnu.org/download/updatedd/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE=""
 
 DEPEND=""