gentoo resync : 19.01.2018

30 files changed, 68 insertions, 1015 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 9c42098f6529..8cf652648abb 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index a09929a5d009..26cbb5b4dc27 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -8,7 +8,6 @@ AUX etc.liberty/policy.json 4623 BLAKE2B da2096563f5293ae348227208ef7218d605ea7f
 AUX etc.liberty/rootwrap.conf 973 BLAKE2B e4448e6fea2bb4e5eee4429d548e579a8948de61a15914f6f35d28b7d2902743c1a476e7efe3e6c7fd3fa07f6a000383edbe8ab1ebb4a0a035757b7bc432a5ec SHA512 f4a52193883bae792e202711979c7d850f5823ca1bdca4fa6b32e89f0ea13af92e8065ffb39c363b2ce6220c039d1a1ff23fa1af381e68714eba6ff76c16a9f7
 AUX etc.liberty/rootwrap.d/volume.filters 9478 BLAKE2B 612af74195df43ae5b5ae1cfa0d765a425167189e393c60fa170716e21bb94fa88cd249658408cd58d33a2a8b4303a896b73b8442e62b8a4e6bad57f1c7353e8 SHA512 ed5f9456eee9c72aa5e72a745f6f4958bade85d34cd7ee6cdf6c082d69a20bf4f9e46e600b3944dcf63cb744d3ffb3c9c4412e50b8762f254d7b59bb561500d5
 DIST cinder-10.0.6.tar.gz 4624145 BLAKE2B c3e12c4f49b9b06b674d12354e867328eaaef565930ac1d3078c4611f14f61463d458a2bfd679a0a6cb8ce5b677b037618a800d229bf352797b20b57c8383e6b SHA512 28c84260909d0c1a9b0cd6a7409dad3e09d0d7bd662b8ca61c6c3ca04fb797723bc0f4df7db3a6951d1ce354a84b907bf1832190c02a5992c8ac70cf95fb00b9
-DIST cinder-11.0.1.tar.gz 5805313 BLAKE2B 00ce0b1992d561c25052c4b810b1e1c8a2f5610d7f3d20c25007a9f59e639e9a5b549f13d454632a432cb81d1d9c75cfb5f6683c688185645bfc0e4cb41e18fe SHA512 b870a3faca9c8c02866f3e1856abf3d170e63876cb7cd5056167136e4f36b1c5a668e79e15fd17cb363f4c7e206a7ee2762a9296730d33526460f50de59e81ed
 DIST cinder-11.0.2.tar.gz 5794973 BLAKE2B a7b59afbe3e27a2fde28a3dcb2ba3707c67223ae7e98cb34d0ac92beb16ab8f10c07f22fda091c9db9a02fd2eff4769a6e574a94cb19df1e9506c36321a12014 SHA512 6340150aa010a4372a7e51dc976974839f89b180eef61c9307c5b477dae98c8629a3f54cbc3d114dca28ca75c715930357cfc96d08f80acaabacee8f8c0bf3a6
 DIST cinder-9.1.4.tar.gz 4195597 BLAKE2B a35b3c588d0589baf2887ebe6c9c6c4803a6819476c822fa3d314b8cb74f4fabae19cf224a3b9dc2c6255338eff6413be189e3555f5e49578451604f091169ba SHA512 8039d5208296ea54fc869fb05dd91451ac3575eb3dd2ed97d0c63120d18b67b02b835a849cd1ec3dae349920895e13665c15a6daa53f67138823053c49ab87a9
 DIST newton-cinder-policy.json 6412 BLAKE2B 90c6a2733b0c20a95375e9a588c311e48f9f189aff43ce9a89a808e6693b2f14ca0485fbea4d000674414081171989dc8050c0079e4e137f728decbdf8a5cec0 SHA512 3473b5790487bd037d54e4a1a89bab9d145bc34d137d52da2b6b311d2dfee2344fec75c6c96bc518a3e0b175fbd6cde71fb546406c0ef835898e3c1c88eb6d56
@@ -19,8 +18,7 @@ DIST ocata-cinder-volume.filters 11067 BLAKE2B 84e642296960124126155ab725cbbb175
 DIST ocata-cinder.conf.sample 173024 BLAKE2B 11c53b4507d8ad53cfb49fa4c79760f2d3d8bf65f142a4bdec6731e732e5503a217ae5ab1c7220f73fea4ff2d91b5a84b6230484df672b5022c66d7f4f3eefa0 SHA512 bbecf45ad20b3193023a137b5c3237dfc15bd6a232dda5de631096bf55916eb0fffba7506eeffdc1a3c848ac042cb286dea44387ff0eef84ec7bbcaffb4aa58e
 DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868 SHA512 12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654
 EBUILD cinder-10.0.6.ebuild 7077 BLAKE2B 7a79cf9f50919344ac2cbda06aa4df24000cd2c0fd62208da375567cb579b9d06576de2de47b53bc5fd6f0cc8ac98fe5d3e5e8915003381895c67c3ddf9a9600 SHA512 3f1927bd233f73687f25d27d99455fbea611e12e335295eabf9752cc287cf5fa128b2d43f49d08186a0f61dda7f935338b81fc63a534292ad5170b94827ea458
-EBUILD cinder-11.0.1.ebuild 7750 BLAKE2B 8324189afd3e470d0d12e5e4a3983af02bb33578a2c3e42b653c9ea15cfda97a7e17f9e54d188c8323c82dc25a033ac2feece59337bcb89c61fca2871542fc53 SHA512 5b3f1b17225e66a0c169400fe9a65abe3e8842325daa0e7bf205c4a9306e625696f431a1b512e378a5da7534cf916f74afa352382ecb9721a1f8e95b35e6d7aa
-EBUILD cinder-11.0.2.ebuild 7752 BLAKE2B 6667d6ff147fb323a726a2b6049c643793679a1d2a71e9c4a57c541bd4eb5dc3ba4c2463027b003498a4d8caefb20b4e14c08c16ed54147f759e0b00c785c18d SHA512 ac97dae776ca224779a63f71a2eb7836b9acb69edfd5c88a53b43b08871e959f7daaf7082e98a7e003a5cadf9163753b0ed6d1b659b1d0aac1b601ecbefb6fd5
+EBUILD cinder-11.0.2.ebuild 7750 BLAKE2B 1cc62670da2205ba55edac8f12048c394079865cbad2debfe705c55c7ac3463c597ef46b2f201ecac0cebfd16ef37a6c7e17faf005ac1b4ffe9a16699d1fdc2d SHA512 3e0c7195e8081d95558be1e499813c639fc4efec173ac677f1157fa4ab6a07e31939357bc18fb48e9a99171804e374d6d07bf027b7d870b630be9ffac6182737
 EBUILD cinder-2016.2.9999.ebuild 7156 BLAKE2B 54ba18a47cf0b4af02c3cd66c6719426f3e74ecc69ca3caa232b905d80f5213ef3dfc9252b3397a09c2708022c8a97097f2af78ad12afc240532c4e14a1f0bbb SHA512 e4f341ae8f2cf9a6e3d4c59a8a84f7877bdee83dfd957fd9dc6d0073cd71befd67da1783e3875d68a750b30269903e6ea4184531a189e4b067c237d5b261d6cb
 EBUILD cinder-2017.1.9999.ebuild 7102 BLAKE2B e8ca1d59c278908d80c87550f86af56e4794a5815778501c4b53f04efae241c27eabfcc8ec8796f6267768c66955ad244286f075a31a20d9d98c325c7afe7bf7 SHA512 fe32fd7e9aa2320198b8fa4ecfb0d69fa1455c4e98ded2723ea84a33851f2e3c13959a586f7eb34879b09f49b249a7d43e317c0473d01cb7ec9817487737ae15
 EBUILD cinder-2017.2.9999.ebuild 7774 BLAKE2B 9a2af8d9967a80c8362cd9ed7332b7c8d6be901a2816d456131f8c289c09bfef8ead5e8169673e092d14cc95f47fca173e2f2059a4b06a5a131fb31629b0a196 SHA512 9c967bac3ff3b02e94de987de3260cbdd67608fdc97da30b77ca41aab41c8dc3372b8f40c6fd1d4c23cabdc2352e780a32bdaa6bcac129d0160a469447eeeb0c
diff --git a/sys-cluster/cinder/cinder-11.0.1.ebuild b/sys-cluster/cinder/cinder-11.0.1.ebuild
deleted file mode 100644
index 09d3aaee0a21..000000000000
--- a/sys-cluster/cinder/cinder-11.0.1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/pike/cinder.conf.sample -> pike-cinder.conf.sample
-https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
-	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd-2" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/policy.json"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/pike-cinder.conf.sample" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-11.0.2.ebuild b/sys-cluster/cinder/cinder-11.0.2.ebuild
index 26d79d759941..ed819298e2b2 100644
--- a/sys-cluster/cinder/cinder-11.0.2.ebuild
+++ b/sys-cluster/cinder/cinder-11.0.2.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
@@ -13,7 +13,7 @@ https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
 REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
 
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 892a2bc8cc49..808858cdd0cf 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,3 +1,4 @@
+AUX keepalived-1.4.0-fix-no-sorry-segfault.patch 1223 BLAKE2B 409ca766c9300301724134b316cf2f0d9fae0c9c95ab9eda518c0b2c14ae5cd13d3c123bcf0fd353186bccd99f499d0c61c34f0a9e92e42ce1da2ceb96c2981a SHA512 7f7a69ec8f77a8614c6d060b87b36c7cae173721df33febbb740b19a6dc56568b95f8ff41c5018755bd18dd40d6e70b9ade067e22ed91c3219851e262fb0fe82
 AUX keepalived.confd 171 BLAKE2B ad9baf96333182a2acdb10a4be7220de1dc0827c4932af07ae8aae17d72233c3cb9bac637acc4c918503da664c8612a8815f4e2eec0aa18d10715fb2e8e3a71f SHA512 468d176d22f1ce308871829f24624b33e6ba3b234a413395599a67a865f3cf815cc24a10c244dffd1421a0acf5352fe51027a2d3b282cd3822dfeadc8a1d4df0
 AUX keepalived.init 792 BLAKE2B a3e98861fbb9a193b4d63aabde8a44a041603b7983a02af7815c4db0062691dc2ea905c704d7d123588355a8cfbde124e2a5732d621eb5c664169a83ec81f6ed SHA512 240201b81bcca7b213bd3ec45fc286f0305d72a6952a3baf485d717df413df3a2da0f4b018eaa050b0b12cda78767f5c4ae60ec75e5802cfe57cb29951e86ba0
 DIST keepalived-1.2.24.tar.gz 601873 BLAKE2B d2bbf6189f789dd2b61207e80d4262ca6ff8a653268e9d5f4dada7def7cc6ab7d8f8fd49d9b97b228922ff56495213a22c459a44943a92a14abd91b787c491a8 SHA512 a5e555dd955173887896155a04b1f6bb0c2f2a758008472abd5433b057be3fd85e4f270a7b7eb2f36a1c16e46b235ef930b1844938276528ff61bbdd783bb1f5
@@ -5,5 +6,5 @@ DIST keepalived-1.3.5.tar.gz 683183 BLAKE2B 6242cbe61e8cbe80d094dbad3882b0116fc3
 DIST keepalived-1.4.0.tar.gz 731936 BLAKE2B b6adf7925cc81a4c6e6f69afaa28bd72f6c13076be03f2971775a63c823dac5c6fec46e0b6724af1a7ac9036a749b285429ba3ffad2d9ecc39ccc213cbe2cb28 SHA512 485eda5912d68663f011b8e79263ce1e38ed785919055b113536f63aab52c0d5f581a9ab1951c7f62362ac0a68ee921efc41934a4e535d6df7e59249ef32d6d3
 EBUILD keepalived-1.2.24.ebuild 1412 BLAKE2B 4319c70c9cf0acae2ed7e6cf283fee6aa86b2149367b94ba7500b5ac885a723cd6fc266f57c1e25618394f1f0ff114019b73c3ef1ea7fbf622870ee2a67973fb SHA512 3c4a6951cf0cb39bdd604af88f41f3895d5cf72c283d022b506c0fae841cb86adda7b11aa1d23247be17e26cd6cdf826fd45bae39b018f3477820a4dd2c26588
 EBUILD keepalived-1.3.5.ebuild 1534 BLAKE2B e2097ffe452503cfa4e3644b686dc29a8855a2a85fb5a9fa98fe889ecb50dab6c2640e00cd32e29cbd18cb9e734bbdb504243f42b518c25b27850ae200a07345 SHA512 cf2d0ebc28fe7ba59b5ac2f7c701971ade5518d972124a97a4777e30204188f78e192ca1c8c396c4b430050c763aeed59c8fb9686a6ba074ae4b9119a9701309
-EBUILD keepalived-1.4.0.ebuild 1597 BLAKE2B 603fcdc04cc9906fd72a6075fbf1646569aa85cc6194a04db9b16cdbadd976bdfdb466e231cd0252a6ca45b20b807eace3c532fd0d6044c06247a67088e8876d SHA512 a88d95101d4a108b791d64050097fa6db3885e7f7f59b6c97d0068fd6823781b504e8291cbc114e5c1ea9c90641c6b011f37ff74751019b164dd15ab2c13a54a
+EBUILD keepalived-1.4.0-r1.ebuild 1656 BLAKE2B a50e03ce06a857e7fadd2b94be9ddf00d3a0e7fa0dcaa246be10545ca2bfbee430befae961415a12096ba26f4769851492215c4af8351f134ecacb56459e9087 SHA512 cf1237fced58729c7a1c325437f6de65ddb2bc69d78425dd8e765aca373273b5fae39c9e73b1503d4db354e65e41e181e4048fd653bc638a0a47742747583475
 MISC metadata.xml 471 BLAKE2B 2dfba9fe3d7d39f8484baa1f1be9a59b5da8f6cc0da4a3af1ec07e5daf4f2522f802af51048463dfad54bfbffe0286ce8a3b9ff8889139ca32693bad378937e3 SHA512 203c93aaf60f7d0dcc6150fff2a4a3dd61fa4d6cfab26452d8efeed1d79096b17db7e47700582475b7e6607ae70521c32cc91015e7852dde22a7d828740946af
diff --git a/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch b/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch
new file mode 100644
index 000000000000..cbababb39802
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived-1.4.0-fix-no-sorry-segfault.patch
@@ -0,0 +1,28 @@
+From 49559856e19a1a9fad590cc640da7df57c6b9a66 Mon Sep 17 00:00:00 2001
+From: Quentin Armitage <quentin@armitage.org.uk>
+Date: Wed, 17 Jan 2018 12:08:07 +0000
+Subject: [PATCH] Fix segfault if no sorry server configured for a virtual
+ server
+
+Issue #751 identified a segfault in vs_end_handler(), and it
+transpires that the forwarding method of the sorry server was being
+checked without first testing that a sorry server had been configured.
+
+Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
+---
+ keepalived/check/check_parser.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/keepalived/check/check_parser.c b/keepalived/check/check_parser.c
+index b2518da7..170e47d4 100644
+--- a/keepalived/check/check_parser.c
++++ b/keepalived/check/check_parser.c
+@@ -120,7 +120,7 @@ vs_end_handler(void)
+ 
+ 	/* If the real (sorry) server uses tunnel forwarding, the address family
+ 	 * does not have to match the address family of the virtaul server */
+-	if (vs->s_svr->forwarding_method != IP_VS_CONN_F_TUNNEL) {
++	if (vs->s_svr && vs->s_svr->forwarding_method != IP_VS_CONN_F_TUNNEL) {
+ 		if (vs->af == AF_UNSPEC)
+ 			vs->af = vs->s_svr->addr.ss_family;
+ 		else if (vs->af != vs->s_svr->addr.ss_family) {
diff --git a/sys-cluster/keepalived/keepalived-1.4.0.ebuild b/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild
index 66d4382c86b0..1be5d090b408 100644
--- a/sys-cluster/keepalived/keepalived-1.4.0.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.4.0-r1.ebuild
@@ -25,12 +25,19 @@ RDEPEND="dev-libs/libnl:=
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-4.4"
 
-DOCS=( README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
-	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt )
+DOCS=(
+	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
+	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-no-sorry-segfault.patch"
+)
 
 src_prepare() {
-	eautoreconf
 	default
+
+	eautoreconf
 }
 
 src_configure() {
@@ -60,7 +67,7 @@ src_install() {
 	newdoc INSTALL INSTALL+HOWTO
 
 	# Security risk to bundle SSL certs
-	rm -f "${ED}"/etc/keepalived/samples/*.pem
+	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
 	# Clean up sysvinit files
-	rm -rf "${ED}"/etc/sysconfig "${ED}"/etc/rc.d/
+	rm -rv "${ED}"/etc/sysconfig || die
 }
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 56d7dafad152..6328518591cf 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,12 +1,10 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.8.5.tar.gz 23235782 BLAKE2B 923c4e5a0a3dc19d57665bf184bdd33fcbd9ffacf4aaf6a89553568631cdbc136f4bc0f6de0619bbabdc9f9bab05c495626bdccd1879bffb231fa31792707d08 SHA512 c4d6b2bafb4bc148ffe2273433241ff0564c6a452469180c2289f3f90fde72f0817881332502d08bcba3095809d71865255e8702d1e210dda81dff3310c24124
 DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
-DIST kubernetes-1.9.0.tar.gz 23346652 BLAKE2B 0ed7a0b77798feb75adb1261720d23d5bf0ec0b754ea5b1fa369140a324cdfe291c271dca4e0cec50e7484aa6cfdff9aa7f0d0ee0fd469622695c6742ff05e38 SHA512 dc418c46521e15e499bda2444b1fa096004cfbff7a18cf0079df8f939e716b0234246c5b77240b24fe862cb081a0bd91d8a309318ab0fd3494fb0cd8e7b59c12
+DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
 DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
-EBUILD kube-apiserver-1.8.5.ebuild 1289 BLAKE2B 7ae937843a1e671ab69bb54bc7f7a941e62428964c4f5a48ed4d54678b01c5a49c72aadfb7017476c0c638c561332969fdbbd52e39e38d1773a585f16a4b4975 SHA512 d9a3cda779df4a70bf733f30737c400c01f295bde3ef7ab86ed55197c3bdad9f180d3ba9590b59ac694c0d02d337e6f19d32c1a2d2f1484a071bfa413685c274
 EBUILD kube-apiserver-1.8.6.ebuild 1289 BLAKE2B 501e9f48b5a60d3dd1c2379c357a16c910b2e2bcbec744d5aa5cfad7ed3a0e887c3022e889e6a1871f613f79208a6c97ca7b8abc03bf5bd9346d5b804d46f06e SHA512 f066b123d33aca4da52c4e9518fcd86754445d0e3f99105ad3cf20e9bcc3fe88d7f7d57f825881cb3c03d45bc07b81d09ed367130b1b0e66c50a5513fd348c92
-EBUILD kube-apiserver-1.9.0.ebuild 1208 BLAKE2B 098cebf85204ce4e7789ebb89f59a948e59f03cb6c5c3fdc036ca1927616b24699ed3418fff297bb997ecdbb6270a48b2b782ad21b37bd2026d1dd43eca87bf4 SHA512 6d595a9ff51d84d6add3027de98a746320ba3c1786aa195f8153a649e3bed7686ee5026d66b5108ee1502f801222dbdacc1188757417210693d9a4962e2edc60
+EBUILD kube-apiserver-1.8.7.ebuild 1289 BLAKE2B 501e9f48b5a60d3dd1c2379c357a16c910b2e2bcbec744d5aa5cfad7ed3a0e887c3022e889e6a1871f613f79208a6c97ca7b8abc03bf5bd9346d5b804d46f06e SHA512 f066b123d33aca4da52c4e9518fcd86754445d0e3f99105ad3cf20e9bcc3fe88d7f7d57f825881cb3c03d45bc07b81d09ed367130b1b0e66c50a5513fd348c92
 EBUILD kube-apiserver-1.9.1.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.8.5.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.8.7.ebuild
index 920080a62a38..8855f7be7117 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.8.5.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.8.7.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
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.9.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.9.0.ebuild
deleted file mode 100644
index 9cfeaaab10b1..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 407929795f59..ff23aecd066c 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,12 +1,10 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.8.5.tar.gz 23235782 BLAKE2B 923c4e5a0a3dc19d57665bf184bdd33fcbd9ffacf4aaf6a89553568631cdbc136f4bc0f6de0619bbabdc9f9bab05c495626bdccd1879bffb231fa31792707d08 SHA512 c4d6b2bafb4bc148ffe2273433241ff0564c6a452469180c2289f3f90fde72f0817881332502d08bcba3095809d71865255e8702d1e210dda81dff3310c24124
 DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
-DIST kubernetes-1.9.0.tar.gz 23346652 BLAKE2B 0ed7a0b77798feb75adb1261720d23d5bf0ec0b754ea5b1fa369140a324cdfe291c271dca4e0cec50e7484aa6cfdff9aa7f0d0ee0fd469622695c6742ff05e38 SHA512 dc418c46521e15e499bda2444b1fa096004cfbff7a18cf0079df8f939e716b0234246c5b77240b24fe862cb081a0bd91d8a309318ab0fd3494fb0cd8e7b59c12
+DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
 DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
-EBUILD kube-controller-manager-1.8.5.ebuild 1297 BLAKE2B 4ccde72bf842070735214df423c38f7b096e23998889890ddf8f422b03bdc94541fc06f7763879023dc7a09662b73f1d68e65b87b1844346645d01ae96cb91ce SHA512 bd4208d50ba6705430ef824d2464ea2e52c1d09ea80c9d21723f8ada91cb027f3c107c26b8713fde4c290fd1cea490bf7171aa84ef142f5a7f3e199992ddaf88
 EBUILD kube-controller-manager-1.8.6.ebuild 1297 BLAKE2B 114a3171dc88b283b7adb97751502b18c1f414379b6dfc649dd1bbe74ae3bf4cd67daa2944e22271d72d81c043e28d82b294cbc3202191d8b957531f40932fc0 SHA512 299acc2a8f6821200dbddcdabcbec512e44a758fa3f14d0ec3c897782af5e30f6441ba0b28af8089f0d31433aa8931217c0e261b7d282fd7ef774e21a8a9d3ef
-EBUILD kube-controller-manager-1.9.0.ebuild 1216 BLAKE2B 71ce1fa0641458fc68aaa02af36ca5128b58514636afb7c7e15df297a8e65c854b690d7cb94eee0c51f464429fe8b470e96af2696439467a00c87dd85cf52510 SHA512 3612a038c2f7bddceee04d0415d1db3f22dbd8c6a85868b302794c93e4f33f455e05e24ce30bfebd5258f153ce93ed79c969b00dfbc675362ad4943bedec8cc2
+EBUILD kube-controller-manager-1.8.7.ebuild 1297 BLAKE2B 114a3171dc88b283b7adb97751502b18c1f414379b6dfc649dd1bbe74ae3bf4cd67daa2944e22271d72d81c043e28d82b294cbc3202191d8b957531f40932fc0 SHA512 299acc2a8f6821200dbddcdabcbec512e44a758fa3f14d0ec3c897782af5e30f6441ba0b28af8089f0d31433aa8931217c0e261b7d282fd7ef774e21a8a9d3ef
 EBUILD kube-controller-manager-1.9.1.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.5.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.7.ebuild
index 678bdaaf6a29..c1076001c2cd 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.5.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.7.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
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.0.ebuild
deleted file mode 100644
index d7a523ac4985..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index a6a5edec619f..4c10e90bbd8d 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,12 +1,10 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.8.5.tar.gz 23235782 BLAKE2B 923c4e5a0a3dc19d57665bf184bdd33fcbd9ffacf4aaf6a89553568631cdbc136f4bc0f6de0619bbabdc9f9bab05c495626bdccd1879bffb231fa31792707d08 SHA512 c4d6b2bafb4bc148ffe2273433241ff0564c6a452469180c2289f3f90fde72f0817881332502d08bcba3095809d71865255e8702d1e210dda81dff3310c24124
 DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
-DIST kubernetes-1.9.0.tar.gz 23346652 BLAKE2B 0ed7a0b77798feb75adb1261720d23d5bf0ec0b754ea5b1fa369140a324cdfe291c271dca4e0cec50e7484aa6cfdff9aa7f0d0ee0fd469622695c6742ff05e38 SHA512 dc418c46521e15e499bda2444b1fa096004cfbff7a18cf0079df8f939e716b0234246c5b77240b24fe862cb081a0bd91d8a309318ab0fd3494fb0cd8e7b59c12
+DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
 DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
-EBUILD kube-proxy-1.8.5.ebuild 1201 BLAKE2B 80e0e31d4003f5b8f96a56c2da008a3cb06fd9297be932a3f73c0af3385406f3b679b3eb054a74362afb4f27be8f52c1edff984b6a43149127988c7582786a0d SHA512 bee756c013fe7bc4c4de17949e65053030f508f3060ab2fef490001306cf870f7671ce573e1daf44ee61e90a4bca2761a709ca26d4e9eb6d6592f6ec4a1e646e
 EBUILD kube-proxy-1.8.6.ebuild 1201 BLAKE2B 25635f1829b35a5cc9f5e75a6ebbd61b20ece9a74d0319b685e11a8c788a2b89c27c07b33b664cda8a7d83f502394649675fec317fd7e1037701b63fe99a6146 SHA512 fcd7cff5c621f53e4d85f38b3131a030584a82fcdea056d483e3e50fd85c15f37dab907bc730092f3281067a502f95f6fbe3fb4e906ce3f41b731dd32f38eb98
-EBUILD kube-proxy-1.9.0.ebuild 1120 BLAKE2B 059d24f699963a1aded31700244bc4e1467c8df59bed0d91637a8de71264e58d9a02339be65580fbc611996bc7db59a4e2beb9962008e334ccb7c011560e1b0e SHA512 16d675a99db48a4bf305122c5992501fa39954653f0caf579c8d5f4c630b60e3c65b8f8d4ac3d10d3a470ac34bdac652d9732c4e3414623957814aa62a1f4850
+EBUILD kube-proxy-1.8.7.ebuild 1201 BLAKE2B 25635f1829b35a5cc9f5e75a6ebbd61b20ece9a74d0319b685e11a8c788a2b89c27c07b33b664cda8a7d83f502394649675fec317fd7e1037701b63fe99a6146 SHA512 fcd7cff5c621f53e4d85f38b3131a030584a82fcdea056d483e3e50fd85c15f37dab907bc730092f3281067a502f95f6fbe3fb4e906ce3f41b731dd32f38eb98
 EBUILD kube-proxy-1.9.1.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.8.5.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.8.7.ebuild
index 162ba7e725f9..b8b9ae3ea7fc 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.8.5.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.8.7.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
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.9.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.9.0.ebuild
deleted file mode 100644
index 8dbb5af7359f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.9.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 545080a15881..763d704bb3ce 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,12 +1,10 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.8.5.tar.gz 23235782 BLAKE2B 923c4e5a0a3dc19d57665bf184bdd33fcbd9ffacf4aaf6a89553568631cdbc136f4bc0f6de0619bbabdc9f9bab05c495626bdccd1879bffb231fa31792707d08 SHA512 c4d6b2bafb4bc148ffe2273433241ff0564c6a452469180c2289f3f90fde72f0817881332502d08bcba3095809d71865255e8702d1e210dda81dff3310c24124
 DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
-DIST kubernetes-1.9.0.tar.gz 23346652 BLAKE2B 0ed7a0b77798feb75adb1261720d23d5bf0ec0b754ea5b1fa369140a324cdfe291c271dca4e0cec50e7484aa6cfdff9aa7f0d0ee0fd469622695c6742ff05e38 SHA512 dc418c46521e15e499bda2444b1fa096004cfbff7a18cf0079df8f939e716b0234246c5b77240b24fe862cb081a0bd91d8a309318ab0fd3494fb0cd8e7b59c12
+DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
 DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
-EBUILD kube-scheduler-1.8.5.ebuild 1304 BLAKE2B f20d59da590a4ddf2f6b5e870bfba2e0efa6c494becf281e471572e16f3bf4a8f426da4f9b5812db53fdecea4b2839f41ee47e43e5e73f60bed3147cc91aa151 SHA512 83e1990377b2d5ba3b7dfb8550e6ea74cbdaa8c13095d4a3ac1d5abe3c26506b1a63f5fae9a477da84a1bbe297fef1baf58d0200a80582a0da85040cb46ea9ac
 EBUILD kube-scheduler-1.8.6.ebuild 1304 BLAKE2B 92c60fd4b1f8e38a8c2bbb17f6407a1bdcb1b49c42b81364950f54f52f26b2c96dc2c676e7201447923f63ee2f98f72d0d0de06b98a33a3c3e98fe5a563965a1 SHA512 f48fad46a2697caf4776d33f69cc05b750aafeeafc0ffc2558d00fa765da6d1d73233822aeb8b92b2ba8c20ca7328e2fadb645ebe2c4bbec77d728ea584062d6
-EBUILD kube-scheduler-1.9.0.ebuild 1223 BLAKE2B b9b7508abb2e5f1ddd11d82baa5afa40bb6004a7313ccae96cc40457d0ba4f2eb8b67fc08cf78c83bcfc62313fb6ce7e9d7a256c7fee2a43772be1e5ad02bef7 SHA512 e7ae7c36eae73cc67356a6b5c8e5a2177311247b184f88f7259acf855381d35638f4745911cb742ac2222aef6bf79cf7df37ff5323fd895d69d86f86fe90f6bb
+EBUILD kube-scheduler-1.8.7.ebuild 1304 BLAKE2B 92c60fd4b1f8e38a8c2bbb17f6407a1bdcb1b49c42b81364950f54f52f26b2c96dc2c676e7201447923f63ee2f98f72d0d0de06b98a33a3c3e98fe5a563965a1 SHA512 f48fad46a2697caf4776d33f69cc05b750aafeeafc0ffc2558d00fa765da6d1d73233822aeb8b92b2ba8c20ca7328e2fadb645ebe2c4bbec77d728ea584062d6
 EBUILD kube-scheduler-1.9.1.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.8.5.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.8.7.ebuild
index 61414d011f79..739becc5ded7 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.8.5.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.8.7.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
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.9.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.9.0.ebuild
deleted file mode 100644
index a57105d84650..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=plugin/cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 8ceaa21a5a1d..1ef09b221f8a 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,9 +1,7 @@
-DIST kubernetes-1.8.5.tar.gz 23235782 BLAKE2B 923c4e5a0a3dc19d57665bf184bdd33fcbd9ffacf4aaf6a89553568631cdbc136f4bc0f6de0619bbabdc9f9bab05c495626bdccd1879bffb231fa31792707d08 SHA512 c4d6b2bafb4bc148ffe2273433241ff0564c6a452469180c2289f3f90fde72f0817881332502d08bcba3095809d71865255e8702d1e210dda81dff3310c24124
 DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
-DIST kubernetes-1.9.0.tar.gz 23346652 BLAKE2B 0ed7a0b77798feb75adb1261720d23d5bf0ec0b754ea5b1fa369140a324cdfe291c271dca4e0cec50e7484aa6cfdff9aa7f0d0ee0fd469622695c6742ff05e38 SHA512 dc418c46521e15e499bda2444b1fa096004cfbff7a18cf0079df8f939e716b0234246c5b77240b24fe862cb081a0bd91d8a309318ab0fd3494fb0cd8e7b59c12
+DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
 DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
-EBUILD kubectl-1.8.5.ebuild 1302 BLAKE2B 3c788ff2e7701114dc5327d4cbe17e74460d18523cb1211d516fe46115440c383459649b39a2e51c047f2b1b431e89d5bd167ab5013fcca7746277896ad2e737 SHA512 e91d512394f2b28d8f5807f7248c5e52100d46b237094411c837baa56daa7940d7451aa4bad83482a33ac1e659b6fa14eedf350735e3b95ebfd9c02f0507c84b
 EBUILD kubectl-1.8.6.ebuild 1302 BLAKE2B 4f0ef54e33367ec2ad0ad4094de1ce2b5906605654dfa254e73529f430300f7b95191a78b068fbd03ed8b7748f5eff8292f60271a51eb554d373573dc1c38e23 SHA512 e441a14aa47be23dd788539a63f50ca804333be7776c40ec50ce20710d3a1739dd544ca3070dc5648da3f372b58325b76be1152bbc4b01785441b5eec9b50b0d
-EBUILD kubectl-1.9.0.ebuild 1221 BLAKE2B 05926e440fcd7dc91d0bfbed1d90586c284d6cff86175f16f498ae86ee62c5b91acca52a4534c985d1a732b865af8e0efe1aae60fc81dcc8156761c7c30ccaee SHA512 d95135264543a3269a1a034948b4b64b7e337c643929a56678c536ec456ab5bc1ba72a9a4dc8eddc06c0e04b09a9351e82bf53e5fc55692f4ebe7749aa6ca713
+EBUILD kubectl-1.8.7.ebuild 1302 BLAKE2B 4f0ef54e33367ec2ad0ad4094de1ce2b5906605654dfa254e73529f430300f7b95191a78b068fbd03ed8b7748f5eff8292f60271a51eb554d373573dc1c38e23 SHA512 e441a14aa47be23dd788539a63f50ca804333be7776c40ec50ce20710d3a1739dd544ca3070dc5648da3f372b58325b76be1152bbc4b01785441b5eec9b50b0d
 EBUILD kubectl-1.9.1.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.8.5.ebuild b/sys-cluster/kubectl/kubectl-1.8.7.ebuild
index 9a83dfbdf26d..101174d5c0e5 100644
--- a/sys-cluster/kubectl/kubectl-1.8.5.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.8.7.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
diff --git a/sys-cluster/kubectl/kubectl-1.9.0.ebuild b/sys-cluster/kubectl/kubectl-1.9.0.ebuild
deleted file mode 100644
index 617f656e265b..000000000000
--- a/sys-cluster/kubectl/kubectl-1.9.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index f1d2804701cb..92be3d61542c 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,12 +1,10 @@
 AUX kubelet.confd 58 BLAKE2B 5c01a2146beacf3a024f312d1bd3422055887ba48d5d869a32a2be99585f260f9d9b9946e57290345e0d57870f7d4509892c53fe4c7a63b0111b1fa8f464daf0 SHA512 2ae3bbc8a66da644b59d7f753294ad43d5675edbe2e4769b91d7c988d0eeffd5b4209a10650ad937f9698b1b6050279d448c75274815a6b348ad2023f2fef08e
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
-DIST kubernetes-1.8.5.tar.gz 23235782 BLAKE2B 923c4e5a0a3dc19d57665bf184bdd33fcbd9ffacf4aaf6a89553568631cdbc136f4bc0f6de0619bbabdc9f9bab05c495626bdccd1879bffb231fa31792707d08 SHA512 c4d6b2bafb4bc148ffe2273433241ff0564c6a452469180c2289f3f90fde72f0817881332502d08bcba3095809d71865255e8702d1e210dda81dff3310c24124
 DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
-DIST kubernetes-1.9.0.tar.gz 23346652 BLAKE2B 0ed7a0b77798feb75adb1261720d23d5bf0ec0b754ea5b1fa369140a324cdfe291c271dca4e0cec50e7484aa6cfdff9aa7f0d0ee0fd469622695c6742ff05e38 SHA512 dc418c46521e15e499bda2444b1fa096004cfbff7a18cf0079df8f939e716b0234246c5b77240b24fe862cb081a0bd91d8a309318ab0fd3494fb0cd8e7b59c12
+DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
 DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
-EBUILD kubelet-1.8.5.ebuild 1298 BLAKE2B 419836dfde6e4f2d39718ed6ac04765948e6576116e30199c759206be0be524d22a0be48bd3f2fe3a77f0fbb1fd26be3b23c022f99712309fe78ad49f8a31166 SHA512 35df955c8c56be6fe3666115d5f8ef93530a391516498b887581c88c7dd9daad83f22d5fd6470084244767bab9c794619e8a9651abe00aa2ae8c8268d1bc0f82
 EBUILD kubelet-1.8.6.ebuild 1298 BLAKE2B f455c1205f0a728f0cb79f729b90525446f51eaac9ac21d5761d43af9e3d517f408009a1a9e9dc8d5f9fa8703cc2d002ccfdfc9d2b4a92d6bc47a742cbac5c3e SHA512 e29b674d7ea27d067264b68bc327d9810ea543733635206e725e14279819e61db0f6d86c4d8fb129a5c44b2293a638eb6b5a0ac784b01a6feb89bfb6bf89643f
-EBUILD kubelet-1.9.0.ebuild 1217 BLAKE2B 4d10deeffd29e0b71034e56c262ec592398cea24605ea62bb80548604b2d98daa299a023dec64d1d4828c1f4bffb6bdd20cc726989f2412cfc2479562c5d6ec1 SHA512 e73ce9c5d33371b37daa34501b7340a12ed3ace526f3ad4b18dd5e27b3713f38f8dcbd82d03d6cccf6737c28362e91bc350208e920f2abb38e473f975c6b35e3
+EBUILD kubelet-1.8.7.ebuild 1298 BLAKE2B f455c1205f0a728f0cb79f729b90525446f51eaac9ac21d5761d43af9e3d517f408009a1a9e9dc8d5f9fa8703cc2d002ccfdfc9d2b4a92d6bc47a742cbac5c3e SHA512 e29b674d7ea27d067264b68bc327d9810ea543733635206e725e14279819e61db0f6d86c4d8fb129a5c44b2293a638eb6b5a0ac784b01a6feb89bfb6bf89643f
 EBUILD kubelet-1.9.1.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.8.5.ebuild b/sys-cluster/kubelet/kubelet-1.8.7.ebuild
index f50b649733f0..075fea2e83f6 100644
--- a/sys-cluster/kubelet/kubelet-1.8.5.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.8.7.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
diff --git a/sys-cluster/kubelet/kubelet-1.9.0.ebuild b/sys-cluster/kubelet/kubelet-1.9.0.ebuild
deleted file mode 100644
index 26ac4661f469..000000000000
--- a/sys-cluster/kubelet/kubelet-1.9.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 0d5baf04ff95..df22fff88e55 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -4,20 +4,14 @@ AUX nova.initd 944 BLAKE2B aa535734ce9df39c6c6fc254a30fa4fdc2858b846a252359e6d9c
 AUX nova.initd-2 745 BLAKE2B 8d2fb59480dd0c60bb2e46541d5c59d7497bda714377428a95e34178c77958dc3b5363e928f63167ad3263ecd2628dca95742b5b88537f3b0a981c35089b1c4b SHA512 859c2a55c7a91da4a83a8aad5396c4b692e91c170c70b7705620f90da461b78a9cae6ff1c734bee3b20d245f502c475847e0ec1525cca167693303f326e6e42c
 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
-DIST nova-15.0.8.tar.gz 5772381 BLAKE2B 483880fb2571314644b5229b5644ca8090928a799480bdc001382b42b3ab5710ad3e7cc7f28ebbcccd4d385df49b420e6b748454933290b36acd4812aee70040 SHA512 555a57219454f34511870bde1e794a8460a51ac4c11da26608635c3ff629388cdce2792cf67ae466b0e3f8b65ffad61549d294c2672c1f1719913cece82058ef
 DIST nova-15.1.0.tar.gz 5774942 BLAKE2B 6507658dabf1cc9da34c40bf3c5fb77c9e5692ceeea6fe4b38cca8be3cf532db6bbdd14dd71c78e1545791eaf26f60bd9337fca4561d811d1116a32458a86c6d SHA512 a35cc1a1891f0440470cb31cd23f835190d5961a962afc308f54ffe1bb0e47eb0e411915b47e8b89e7f76a2b3c348997848d86fd10123a375c7fbb8c118f66b0
-DIST nova-16.0.3.tar.gz 10920453 BLAKE2B 5b42039f7d8f1c5e5ffc57befc069d4a19b4cc305be603d76b5cd70aaad4ed96d7df554a58c8865a3105fe532071e87d2df574e07472d475c47b206591730d1b SHA512 fc17a214ac074a12995e75fe7e60dc1a9ab26a0b59e2462926c235e93c0f58b8d96e3043d4187a0f80d2a3feea5bd678d9b41e3496d4e472fa79e4650e14cb1e
 DIST nova-16.0.4.tar.gz 10922054 BLAKE2B 1fb76f0a06149cb67543921cc9f49cd869ebcb85a813079cdde7ed38aded81d0ec5f157b7d031a9269c3df66081cac1d0732286356dc9f8af58de02ba688a9c9 SHA512 8841faca0d3864a7f63f4c6eec637e6676df2b1473dacd0265a34ce4cf8e50bc587892de2f3d54d1e7a499adb8e9c06aca6d7956d010ddabae1ea61c7c5b0581
-DIST nova.conf.sample-15.0.8 344760 BLAKE2B 0c227259325b201740a6a6e0f9a174b8a463ad30b9b09ca819ba23d85ba5471c4e958e23cf96bc8b2dab358521dfc52c216dffc110b46338e80b1821face84e4 SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d
 DIST nova.conf.sample-15.1.0 344760 BLAKE2B 0c227259325b201740a6a6e0f9a174b8a463ad30b9b09ca819ba23d85ba5471c4e958e23cf96bc8b2dab358521dfc52c216dffc110b46338e80b1821face84e4 SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d
-DIST nova.conf.sample-16.0.3 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
 DIST nova.conf.sample-16.0.4 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
 DIST nova.conf.sample-2017.1.9999 344760 BLAKE2B 0c227259325b201740a6a6e0f9a174b8a463ad30b9b09ca819ba23d85ba5471c4e958e23cf96bc8b2dab358521dfc52c216dffc110b46338e80b1821face84e4 SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d
 DIST nova.conf.sample-2017.2.9999 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
-EBUILD nova-15.0.8.ebuild 8591 BLAKE2B 2c14c5a914910713d926aa8c885b62d7ce33d5041ec326c76fef098db14ce2ab92dc412764e5206c60757d8628bb6d68c9047d32ec9342d8c3570cd5705de2c2 SHA512 89db87c533edf932796f688fea8cac0f2db5e0fd5a950dd26e6560e7b69231379949ff537d9116ae75f57cdbaec6306baaee35d7610284484d08ca33134c961f
-EBUILD nova-15.1.0.ebuild 8593 BLAKE2B 9654aef7b2e2c0f1dfc17ace6c2aeddccfdf63dd336037039cc03a35c2e772b9b55b9c264f499f38cfff7723997b13e205707e5a4c072badcef926df729113ee SHA512 ca9e220ea23040de666786ec7e895bb32f32d151ee18951eb4d95149de3d1040c6975d19ead8d6be6147c1cdb13c856bf9e6861e8b81751e9ac2bfd2d822723b
-EBUILD nova-16.0.3.ebuild 9551 BLAKE2B 868bc5a61ee399acbea4dd3f40a95fa1fd32d2981ba830d533fc36fed04d7858b04a618f6e90b6102b068ad3586220b2184821881b91bed3317cbeab9abc468d SHA512 f4c4e83282dd32be8bf9ebeb89489e456e8ca7a647d5c1d9689556d8238d64d6f5b654be9c9839b17c6708efce9888cb28da98da2e4c179545ea4e3fbfe6d368
-EBUILD nova-16.0.4.ebuild 9553 BLAKE2B d7a9c0cfe0b55960287190face5e56ab0bfbc81659b6e1c284cf170393a944f74f2e4b882a9c2523fb01548b57bc37dfc5402b5a7e2af73778eaea3ae3410255 SHA512 42bae0c28bc130012b39e6fda0b18a38264e21cdba03b9a65e3100fbd81f42cc5fdb204d8a5463db65d0f5ac910156cc74f69b000fb0c559c0b1d4842c2ec688
+EBUILD nova-15.1.0.ebuild 8591 BLAKE2B d793f00f7a6304b0dda01f0916d2e150fda36248f85d57fbbff8091a258bc9edd3ce6ebda1e9e4ba81f7ed9b3dd14b314e81bfb7385b03a20eabaa145e722cec SHA512 b5af3e2303327b7500ac67b9d4f5c479d2a4034f95124baf0b24e81df0bf336f0e1022baeabeac89adc53c12b06a4e4b778ff0fb81b846326675706cb7996683
+EBUILD nova-16.0.4.ebuild 9551 BLAKE2B 9146aeb92c4bf9ca2dc5f934b89991baba322aeda126172e545fcf38a87d053c7730c699da55f78c60a45b46778e979ee877318db0ced3c3b27c153b5e9211a3 SHA512 4cad08472658e3e127761fd7c7db9e027b63106b1b6b2c4ad9df6fd18d9b9b7eae90ca6c27dabd5b011e864c18ed9b0cbe26de9e6aa37af07723be1a0afc92aa
 EBUILD nova-2017.1.9999.ebuild 8563 BLAKE2B fa3fd63355ae149de162b0a2322ebdc9bb8ced6cc62180055308d37b90310b46c8cfbba02e7716f1095f3e8cc864f8cb82311665fdb9c0d5c96a7ffdd976db0a SHA512 cea6cfbaafb3c5c0977cabbbc790da256daf851459079aa73c9d4ee0a9e81153051b2bd0cf62c18eeaee4be1c268a9cf35f671b839cc6a97316a8df80679f94a
 EBUILD nova-2017.2.9999.ebuild 9572 BLAKE2B e09e3d7a3d68fcea4b6dd54df53761b8a65a106f9cd8135fec4386a510db12219d296abfe5a9d6b6d52188daf6e73cd450259e1d045604cfd1229264d7de3a5c SHA512 51f966525ad1f5d7b5b611296bbccd2bf81ec58b7a2021e48cee28342f451c19a95158b21aaa4c4f1a03c5e7d7f104e997389905737d4108fb3c666e0566a86d
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-15.0.8.ebuild b/sys-cluster/nova/nova-15.0.8.ebuild
deleted file mode 100644
index b419a54d7128..000000000000
--- a/sys-cluster/nova/nova-15.0.8.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.1.1[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	# copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-15.1.0.ebuild b/sys-cluster/nova/nova-15.1.0.ebuild
index 99ed9c551819..51f6f6060bf6 100644
--- a/sys-cluster/nova/nova-15.1.0.ebuild
+++ b/sys-cluster/nova/nova-15.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ocata/nova.c
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
 REQUIRED_USE="
 	!compute-only? ( || ( mysql postgres sqlite ) )
diff --git a/sys-cluster/nova/nova-16.0.3.ebuild b/sys-cluster/nova/nova-16.0.3.ebuild
deleted file mode 100644
index 4bb4c81e0a24..000000000000
--- a/sys-cluster/nova/nova-16.0.3.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pypowervm-1.1.6[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd-2" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd-2" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd-2" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	# copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-16.0.4.ebuild b/sys-cluster/nova/nova-16.0.4.ebuild
index bc2f36d667b4..7fe984e7df04 100644
--- a/sys-cluster/nova/nova-16.0.4.ebuild
+++ b/sys-cluster/nova/nova-16.0.4.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
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.co
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
 REQUIRED_USE="
 	!compute-only? ( || ( mysql postgres sqlite ) )