gentoo resync : 07.10.2018

10 files changed, 108 insertions, 27 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index d86accf04ad9..a41568b15e2c 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 46f9ae4bc7db..27575aec9b2e 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.16.tar.gz 3770249 BLAKE2B e6dc40ec503cff11e4deec1a243875fff42ec7ecba8c7c3552b69322d405c762fa152e7e9417baf944e2a476715f00813a305c20db583970520d35acd378f1d4 SHA512 f138df20560dd440a2ed390c1468d630191ae7b0e50521b4dde3fa7ef4377c3ae6409e8c547858bace53216c84aeeea6794305546b9ff87832f704c160c6782f
-DIST dnscrypt-proxy-da5ee45b8ceb9233f4bc21b2a5f1eb7c875947cc.tar.gz 3266257 BLAKE2B bc724b56ef75faf1e2416e81fe3e68947f1581ef1c85575b8c7c5bde721f41f32604835678923dd12654b23a2c97a7e84d598eb8c7a7f553cb59c998141ff19c SHA512 cd23bc4cee7a1d9337ad5a41cf49c5603d9bfb8b7a0458532de68df35f8bd1bb75c39c069dc692506673bdba485e360b23712e997072ed86b541597aa3ea9b12
+DIST dnscrypt-proxy-2.0.17.tar.gz 3364933 BLAKE2B 65f2f1c91cc175a3bc92103dd0a2984dfccf5b961d070097035e8bd8058c7eab41c05cd3fabbff729f9521b16ebbfb188008c65efa5c89578b4b54ce43348d05 SHA512 c1cb2cfff4a5f6eba81ac3b520ddb3acb311031588495b9f94a7ee5ab35ed0827a856369ce0ac7ff206445dbf24f7931cf937ccd9f724b4e38c97f10814df129
 EBUILD dnscrypt-proxy-2.0.16-r1.ebuild 2906 BLAKE2B 00c7405d34cbfa51c219ad0e708f9bc93eb3517dbaf6484ad46ad9116a4e489e0c10495c4c10e710a5434bbd26f3bd1f54b61bcafdfec35ebd96ec71f2569aaf SHA512 00e944487ddaafb9b55cf67ebfce3b7d3e13f4a931c21e1770a3beeeb140dc1dc3f65f8308180dfe9fbda1d53aa6a2e04bc3fc87a63fbb1f83c299887e556b35
-EBUILD dnscrypt-proxy-2.0.17_pre20180903.ebuild 3340 BLAKE2B f6041dc3e96600aabbe7f2d4719c810f92e720c1f25a25bafe8ddadc2dc211c0370d764936b67b6b2314870c2dfedf336633b29e12c95ba80e2d00c66f28bdf9 SHA512 a90d21da4eb6bccde4d11bf7bb23e623d0a8dc66a39ec9012e5e82c1c2d2978fb6ff6c6907ac3cfb9624080cdc8dbd5c27b8a1f662cb84d67cb88c2e0f46376f
+EBUILD dnscrypt-proxy-2.0.17.ebuild 3049 BLAKE2B cecaec499e9351f833e675c48d6f0792b03fdfe90edb9fa7d62c3ed7e0c0a0bf9bc8805380f48df0b80986d3f8866ef7fc98cf829942257aa8a6cdf9da4b6030 SHA512 8842a6f5b6deb814355e17961cd6f107347751c017dab9ea15925079199e83618c866778d4a5e712e1eb02d263ac362970430bff5d3a009b6d6a0b26349fd31a
 EBUILD dnscrypt-proxy-9999.ebuild 3052 BLAKE2B f159a8b16482f32aa5eae337cb425a1800c6bdeb58c503ba0981f5e5cb8184c6d6b749602a113a7fe4b7738ac3dd5b08fe6fb99351d59259e1d91897a8b20d23 SHA512 151ef1a5565e836e2eb0bc4854ef1b89f5c3311ffd49ca760d466692190b819b5dd3742f6905221facd190b2e2d2170c8aa11c5ff7bfdcd8c54b2a0042dbb9bd
 MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17_pre20180903.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17.ebuild
index c9ee2a53186f..e2157844bf14 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17_pre20180903.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17.ebuild
@@ -1,28 +1,30 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-EGIT_COMMIT="da5ee45b8ceb9233f4bc21b2a5f1eb7c875947cc"
 EGO_PN="github.com/jedisct1/${PN}"
-MY_P="${PN}-${EGIT_COMMIT}"
 
 inherit fcaps golang-build systemd user
 
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
 HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
 IUSE="pie test"
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
 
-S="${WORKDIR}/${MY_P}"
-
 pkg_setup() {
 	enewgroup dnscrypt-proxy
 	enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
@@ -40,18 +42,6 @@ src_configure() {
 	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
 }
 
-src_compile() {
-	ego_pn_check
-	GOPATH="${WORKDIR}/${MY_P}:$(get_golibdir_gopath)" \
-	go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_test() {
-	ego_pn_check
-	GOPATH="${WORKDIR}/${MY_P}:$(get_golibdir_gopath)" \
-	go test -v -work -x "${EGO_PN}"
-}
-
 src_install() {
 	dobin dnscrypt-proxy
 
diff --git a/net-dns/dnssec-root/Manifest b/net-dns/dnssec-root/Manifest
index 315e3e23df91..ba27085fd605 100644
--- a/net-dns/dnssec-root/Manifest
+++ b/net-dns/dnssec-root/Manifest
@@ -4,8 +4,12 @@ DIST Kjqmt7v-20100715.csr 765 BLAKE2B 7bb224d49a340d583c3bcfce7b8f9b1c12cb955998
 DIST Kjqmt7v-20150504.crt 974 BLAKE2B 24a4edd7638e14dd0983ea160f20613980342b78d8de0c9e7891e0b06c94c84e31ec2391cc40b745d1415310d6be0d11f415701feca288e253446101aeac886a SHA512 98adfc6a5d37c632eda9f642449ecd6c1bf1d49ebed2750cfe3bd99629b4935f51ecc4aafbd6ea69595b2f2cb15887bd9a1647aa255a564263f5c7b648c7adf1
 DIST icann-20110715.pgp 3401 BLAKE2B 0f1eabed0ab0d5ec78c5387c7f2b3a13a1da12643d6b60e39766d18ac603ef673e204bd7df5d600fa53cdbf51fcff5dfe6b690cddc3559cae95405ca96e7b391 SHA512 5fba8334850f2ae753f4f8a30d1e6c62abc341ece2dc83df4bc0f6db2b91ae68942c0d2a38eab3d33b5b91640cd1cf0970777225c15d5f961884c00077d539a2
 DIST icannbundle-20150504.pem 17435 BLAKE2B 3e532398142ebf62dc52174c4c705ebdd6a634a67e7ce6c1e0a38d41fdab548afd1b0b75f58481d69578fd0fd97b236c62fdbe65efc3ced132115826eff695d4 SHA512 f9b9e43ad71608921d1e79f25cd98ca8c712256d4e31b04035a9aac7b46f3ec951089ca23e84500c5901d53afb66991a30818b4cd6f6de6885a107f486f56994
+DIST icannbundle-20170203.pem 13026 BLAKE2B 36f760c69e8e22036d7d927071be25508b6906838f0f468900385d5a3b9ce301c5688f9bdcab471abc5445a14bfbbe34ecb39ca131b01d9e6bbebcc3f1481241 SHA512 6a8b8bec6d104d31253a8acafc1694a095714537a39a4dc53a379ac900c83715f85d75ea7322de430557691ff31ec95ae5104f47b050da3568dd68377c2d5767
 DIST root-anchors-20100715.asc 189 BLAKE2B b709f2f67cd3e197fcaf0ac2556434ff0b4fd86114084e3281f27b70ecb4770b81f22d22f46c6173f0eef384ce5440685af8e77b75c576ce55e8dbdc79d86c49 SHA512 e9c86b897d7e8edb979cba4bebe353b7c7f21b4061cd6f571c8671b02e73c2ea0b78a980169fa7d40987b9e962a0f1ba17dbb392b5ec6ad14fedce65a139c913
 DIST root-anchors-20100715.xml 418 BLAKE2B 71e809ed74c25283ea1db36707be57965d5b2dd28e6bf055851866746455bbc672e87b310b38b069936545a6ce99dbf67b1d542d78ef3ef84b76b31bd129ea8d SHA512 bca506c852bc83aa9d04ed0b52bef6d0baec745e466292273d52f49fd73cec73db4c6d55a9921fe086c7edc618f3ab21dc03146b6d617644495b3926e262e572
 DIST root-anchors-20150504.p7s 5001 BLAKE2B 088dc39160013dbc63a82fcb7666c7c73707958dddbaf730ea212a038301549ce19109ec2b11962a0855f864bc8675142b21aa65884be9eecdf5b9b9898e4f36 SHA512 af188871f2ef7f9efb0d3f4822754e962fb921d62de925823f90a0c7dbe80b7a0188534adbdb324680ae981912968fcfa851eb72fb37694df8701fd749e7ff51
-EBUILD dnssec-root-20150403.ebuild 2989 BLAKE2B dfc2115b1739d4405cb0f726d19062c2825c7c80a47e2476c60645aa49b303e2f1659cf59e5d3f3f1a015ca7f5223395b8ed381dd48e44fcdbfcf75fdefa8542 SHA512 bcd282c0096721ff0a0d4cf11be9f6d6206d5bc34e6f3b70a362a17548beba880feb4d6e1ecac10dfae0a7b07b59e141db2981030d0b3c95a7bc3868efdd7581
+DIST root-anchors-20170203.p7s 4095 BLAKE2B 21c3d482cd2faa7dd85b45385b4dd4a00c8f0f5e8060a9f99df4e309e6d11bd77ae2dcc68d51eefed685dc48e9bba578ef885a6058ee3862072cdc156d254c1f SHA512 caecf5fbe3b0db140ed506fc7a3711e89e1fc2dacbdc7aefb36766f07af4c97c42466000e51bc2e9cd46a3764ccd482b93da448861aaed90a0f5cf13103b4792
+DIST root-anchors-20170203.xml 651 BLAKE2B 0f2321e27cfbf88fecee0840db3b3265c6f062753b8a15d972dca12c19fdfea616470fe200b7ec4cb069553f532b6464a2784d56636d9096956eabc496eb4a6e SHA512 a0799cf2d5bec0d527d511e016a075ffd0af450eda010a4c780f7e12b2218ec577576137703cf1413352d3aac3cfda945a8a830dbb3618557f5e629049d763f4
+EBUILD dnssec-root-20150403.ebuild 2986 BLAKE2B 44564df76bd319bcd88b5ccce52e5e344183749e031de3b3e6dc32f4a4f393b43d13ab7ad5cc3d6c3453c0f655fb812775d966b9021529657eda19ae6f3aa90e SHA512 2fb3d178b75d08b8e47c46b704dcbce0e30ddfbe5b272e8741c5ba3fc5ba3847f6bf6db552d18b1d77f56f40b336e1df543bd07c36e32654cec888edd180642a
+EBUILD dnssec-root-20170203-r1.ebuild 2788 BLAKE2B d8da2d3d90de8302c3eedd1b47bc15616fa8901edcc492275e71aa8b94fcd0adf4334fe82149f6f01059f39fda8422e83109e31629bb9d96876b9c44fbe978d5 SHA512 1601381d7403e53d19721f0d5349b1b79a201ee19d78dc9abc123a4499ebc0a126b7d0bb0f9e9fcce67649da424619b976fe5fc5f0c2c8ccf7cccaec809b94d9
 MISC metadata.xml 327 BLAKE2B 62401c527b8fc9b2bbcfe6502060fe06543e2fbebcea988e0b0c50223aec705d6c0e04e7233f5aedcf4694889fa23397c03b1048df07ec8de59f7bac3c3efdc0 SHA512 27361587e570a2f35e178724db7cf89cafc4da8e64984c7fd79971a469f96c128ed488b03e59fc3de4a1d1012664aaa66540dc79f0a85c9f191c19bc864bb1fc
diff --git a/net-dns/dnssec-root/dnssec-root-20150403.ebuild b/net-dns/dnssec-root/dnssec-root-20150403.ebuild
index 658f6733f181..fd08ba9793e3 100644
--- a/net-dns/dnssec-root/dnssec-root-20150403.ebuild
+++ b/net-dns/dnssec-root/dnssec-root-20150403.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild b/net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild
new file mode 100644
index 000000000000..63c08e88bb7e
--- /dev/null
+++ b/net-dns/dnssec-root/dnssec-root-20170203-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="The DNSSEC root key(s)"
+HOMEPAGE="https://www.iana.org/dnssec/"
+SRC_URI="https://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-${PV}.xml
+	https://data.iana.org/root-anchors/root-anchors.p7s -> root-anchors-${PV}.p7s
+	https://data.iana.org/root-anchors/icannbundle.pem -> icannbundle-${PV}.pem"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=dev-perl/XML-XPath-1.420.0"
+
+src_unpack() {
+	mkdir "${S}" || die
+
+	cp -t "${S}" "${DISTDIR}"/root-anchors-${PV}.{p7s,xml} "${DISTDIR}"/icannbundle-${PV}.pem || die
+}
+
+src_prepare() {
+	mv root-anchors-${PV}.xml root-anchors.xml || die
+	mv root-anchors-${PV}.p7s root-anchors.p7s || die
+	mv icannbundle-${PV}.pem icannbundle.pem || die
+
+	if has_version "dev-libs/openssl" ; then
+		# Signature validating is optional:
+		#   - We are already downloading SRC, signature file & CA from same URI
+		#   - We store checksums for distfiles
+		einfo "dev-libs/openssl is available, will validate signature of root-anchors.xml"
+		openssl smime -verify \
+			-content root-anchors.xml \
+			-in root-anchors.p7s -inform der \
+			-CAfile icannbundle.pem || die "OpenSSL S/Mime verify failed"
+	else
+		einfo "dev-libs/openssl is not available, skipping optional validation root-anchors.xml"
+	fi
+
+	default
+}
+
+src_compile() {
+	local KEYTAGS="" ALGORITHMS="" DIGESTTYPES="" DIGESTS="" i=1
+
+	KEYTAGS=$(xpath -q -e '/TrustAnchor/KeyDigest/KeyTag/node()' root-anchors.xml)
+	ALGORITHMS=$(xpath -q -e '/TrustAnchor/KeyDigest/Algorithm/node()' root-anchors.xml)
+	DIGESTTYPES=$(xpath -q -e '/TrustAnchor/KeyDigest/DigestType/node()' root-anchors.xml)
+	DIGESTS=$(xpath -q -e '/TrustAnchor/KeyDigest/Digest/node()' root-anchors.xml)
+	while [ 1 ] ; do
+		KEYTAG=$(echo ${KEYTAGS} | cut -d" " -f$i)
+		[[ "${KEYTAG}" != "" ]] || break
+
+		ALGORITHM=$(echo ${ALGORITHMS} | cut -d" " -f$i)
+		[[ "${ALGORITHM}" == "" ]] && die "root-anchors.xml contains invalid key: ${KEYTAG} is missing algorithm"
+
+		DIGESTTYPE=$(echo ${DIGESTTYPES} | cut -d" " -f$i)
+		[[ "${DIGESTTYPE}" == "" ]] && die "root-anchors.xml contains invalid key: ${KEYTAG} is missing digest type"
+
+		DIGEST=$(echo ${DIGESTS} | cut -d" " -f$i)
+		[[ "${DIGEST}" == "" ]] && die "root-anchors.xml contains invalid key: ${KEYTAG} is missing digest"
+
+		echo ". IN DS $KEYTAG $ALGORITHM $DIGESTTYPE $DIGEST" >> root-anchors.txt
+		i=`expr $i + 1`
+	done
+
+	if [[ ! -s "root-anchors.txt" ]] ; then
+		die "Sanity check failed: root-anchors.txt is empty or does not exist!"
+	fi
+}
+
+src_install() {
+	insinto /etc/dnssec
+	doins root-anchors.{p7s,txt,xml} icannbundle.pem
+}
diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest
index dcd80529d38b..923ede801e0c 100644
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@@ -2,4 +2,4 @@ DIST s6-dns-2.2.0.1.tar.gz 76046 BLAKE2B c7c7e94fa47fc20e2a328f2fc22650585e9bd02
 DIST s6-dns-2.3.0.0.tar.gz 76476 BLAKE2B 6896bf534d872aac19dd6b2ad819d7aee6d52737f33106640ad1c3afc7f8857e5672f3e35f7f2064cb8085a79adc33bdd33a99dc656a656040a93f813a986717 SHA512 9afa98d0a7a9d84311f6f93d5c1742f7dcfb84c76ca363f9e09b3b40cd3faa1721aebb6e974a98991c037d82b2540c1edbc3cc13ea5f7e3dd95a96d14918e454
 EBUILD s6-dns-2.2.0.1.ebuild 1316 BLAKE2B e413614e39b05f07c616d83e5f3d7998ad33948bd67d96eb4653e1c81865b33209fe9efb16dc5731fd093f7ee87eb662974475426b9d8cc7b7590c879e8d09ad SHA512 a0153e3c80f54fd744dc5e1412672857280e3204da461e8eb75e2c06133a9d4162eccec950ebed272061a1614e00e04ce8024be8ac1a001ae0e57187ff064557
 EBUILD s6-dns-2.3.0.0.ebuild 1316 BLAKE2B 2c9dfe840307a11cf193077abc5011df5b01f455e1e0d8f5080061d8019c0824d12923c9182c8a6b3e84ab09fa0d7add2a8e99a9c9f27f8a3a74265042768a0b SHA512 61865257ed9b3e1321bd9aa0694cba91dc12402a76ed8db9c24f7d99566b4e060120d070122af7eb24cb13d7353f8ad16b8de252f39b5cd9e447dea67582ea73
-MISC metadata.xml 544 BLAKE2B 815c27188ff1bee0ac1324206a32bc885224c7148108cc4189d84aa4e2a9db77a493ff56da6d64792709154c0652ae604ad327babc9d421e6d4658af0a6f191d SHA512 3927f465e32d28b0b0571a472ab36c7e5cacbf8eb5303d044e735be4345cbd0e215bc167e25027c5e91c744df54b7c7f22b993cf6a4a1a7aa4b43ce5330526ed
+MISC metadata.xml 764 BLAKE2B 7e6f7e1ea30dcf3e0b8c08d90457019cfb0d577f2c7ad4d4664d2770c150ac2e51d38c047a7b41c5541c1a3771b8c18ad547f2a87cb4d13f49b6cf9141cf1aae SHA512 d49c08c4eb0bcdc6bade611ced7588ed1f6e8bb6c71a677b1b1ab1ef2357229a3a380858aecbf57a4fd9a75511fcd32cb7ea1ea91b75c7a0787518a83fd4ab62
diff --git a/net-dns/s6-dns/metadata.xml b/net-dns/s6-dns/metadata.xml
index e93f8569c708..d62b9e59590b 100644
--- a/net-dns/s6-dns/metadata.xml
+++ b/net-dns/s6-dns/metadata.xml
@@ -9,6 +9,14 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>aranea@aixah.de</email>
+		<name>Luis Ressel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		s6-dns is a suite of DNS client programs and libraries for Unix systems,
 		as an alternative to the BIND, djbdns or other DNS clients.
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 238d3fbc0202..96e51a0cdbf5 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -32,5 +32,5 @@ EBUILD unbound-1.6.8.ebuild 3696 BLAKE2B 2b520948c09e02bba9a1685e25a46b94280d9ef
 EBUILD unbound-1.7.0.ebuild 4814 BLAKE2B 4a22ffd38aa1a4c39d603f85a2fff0adb767bab5a1feea6386fb95f6f3d1dba5ed1749c99fe7f5d310fadfee95de628e077dca25c3800d1a1490ecea37341549 SHA512 8270d337d8b7241208406cd5b06320a624856aae1caa921b26d7115b77df27b93838c73ccb02ad0a5588e7bf41f82646f650c328b0c991afc9d319c77e59a303
 EBUILD unbound-1.7.1.ebuild 4814 BLAKE2B 4a22ffd38aa1a4c39d603f85a2fff0adb767bab5a1feea6386fb95f6f3d1dba5ed1749c99fe7f5d310fadfee95de628e077dca25c3800d1a1490ecea37341549 SHA512 8270d337d8b7241208406cd5b06320a624856aae1caa921b26d7115b77df27b93838c73ccb02ad0a5588e7bf41f82646f650c328b0c991afc9d319c77e59a303
 EBUILD unbound-1.7.3-r1.ebuild 4964 BLAKE2B 29c4159dce7346ffe39c78f7cc41be8d2f5a559579eaee964fa1c3bdba44af19233b7eb3ccd3ee53e331c582d32f3df786ea417a05d294f46a9424a42010b507 SHA512 9b39243fe41302474917d775574113ba697672453f439d3d31f02aac77f70f4a4f4b6fd404ff5ddfe5f4c52786ef7fdd223fdd540b0ac695ea5e53c914d50dfc
-EBUILD unbound-1.8.0-r1.ebuild 5362 BLAKE2B 4641dd8a572599793da384249d59a4f988847ebefdec73de43fb0320c212db63d60415cbf4d0c01f192e07f1977791d7be96c1eccc4637d33794336850e661df SHA512 f2216005d1fa1e5e1c73087af818c7767f446ab72e40358b4c30c02ee400e30c0c4c1517e2430739d363f3fc78979c42394ae97538e62cae4fc1d6b15d832f45
+EBUILD unbound-1.8.0-r1.ebuild 5357 BLAKE2B f502e7c2953e02706e0b960e289d262c02d7317af25c0715727dd9ec63ecff34da99818989ab5451a57ebf4a7aa61c3e8257a2d2e96c0463d885fc4028afed9f SHA512 62ed3dbb2460694c424923637d95e91e589ca3179b4885b3e2c4af7291401e53d1d8df09c82d02c17c6286ef0b79d1829a5d257c24aa160382feb0ea1d326ed1
 MISC metadata.xml 1239 BLAKE2B b23dea4347aa4eff995ff69d8e708abbc46b4d222b65d2e87734e77925d8026003df95fe503d66a96dd9dc6a73c32b69e6bb2ad9678a40c5c01b028e5247013a SHA512 6aeb057a87d2705bc9b1c42458cbe27c2b8c21f16ad338ef4421716527347c207360e154c82821ae10b32a22868d16b24601c2d115bee9e70e00a60d7fc133af
diff --git a/net-dns/unbound/unbound-1.8.0-r1.ebuild b/net-dns/unbound/unbound-1.8.0-r1.ebuild
index f294360a6d44..4a5830825022 100644
--- a/net-dns/unbound/unbound-1.8.0-r1.ebuild
+++ b/net-dns/unbound/unbound-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86"
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"