gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /sys-cluster
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
179 files changed, 2132 insertions, 5878 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index d2c8f41b5862..a2e1d116a269 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ccs/Manifest b/sys-cluster/ccs/Manifest
deleted file mode 100644
index 8bffe23c9d27..000000000000
--- a/sys-cluster/ccs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ccs-2.03.09-mkostemp.patch 477 BLAKE2B 487404f76d771852290b6968af427fa9f5725afb3bb166b6c8b6467b0c922b17bde6823c4dec69c06ee41f1c62627d802914c7e8691b6ca30ed14072195bcf37 SHA512 5c90b896829457d17294e44eeb70418128b84c701908a78c74b5c2bae2eb45ba18c17412c9415671757070f77ed0607d8f6c8c21992b568552af9307ea515397
-DIST cluster-2.03.09.tar.gz 1784357 BLAKE2B bf024c93fd5ccd9b7410abc2a3bd792c55c3937604d750019a20190753d95d19b2232923a7a76463ccff592bde7fed942aa679af9e39158fef6041258eaf6eb7 SHA512 5dbcf978336a6b7998df0d3dfcff037e1e77e9e69b43d78eb573a65432445e572e69d7783e7874e9edf2632627f02426f428103831e10f5d1f338afa91a62c28
-EBUILD ccs-2.03.09.ebuild 1389 BLAKE2B d07e76ed58d53c6f5c03b68ee81f5ef3ef73ea3d71bf49693c3eda400a6feaa59e38914790d3d36ad34afb0fb632038b883fbbd388c6b0d6ec357b6c7e7a7aab SHA512 498a4094de175dbadf2b216d1a74bf1b699268311aa159edcb8d3bb0c6d1d28c713e83ee5b5d903e11483541ca3a734dce6ea91cb630e864d4899503e66c74d3
-MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-cluster/ccs/ccs-2.03.09.ebuild b/sys-cluster/ccs/ccs-2.03.09.ebuild
deleted file mode 100644
index 7e91ed7abca9..000000000000
--- a/sys-cluster/ccs/ccs-2.03.09.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
-
-DESCRIPTION="cluster configuration system to manage the cluster config file"
-HOMEPAGE="https://sourceware.org/cluster/wiki/"
-SRC_URI="ftp://sourceware.org/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="=sys-cluster/cman-lib-${CLUSTER_RELEASE}*"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	sys-libs/zlib"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/ccs-2.03.09-mkostemp.patch || die
-}
-
-src_compile() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc=$(tc-getCC) \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--cmanlibdir=/usr/lib \
-			--cmanincdir=/usr/include \
-	) || die "configure problem"
-
-	# fix the manual pages have executable bit
-	sed -i -e '
-		/\tinstall -d/s/install/& -m 0755/; t
-		/\tinstall/s/install/& -m 0644/' \
-		man/Makefile
-
-	#rm -f "${S}"/lib/log.c || die
-
-	emake clean || die "clean problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-}
diff --git a/sys-cluster/ccs/files/ccs-2.03.09-mkostemp.patch b/sys-cluster/ccs/files/ccs-2.03.09-mkostemp.patch
deleted file mode 100644
index 42e2de6ac4ff..000000000000
--- a/sys-cluster/ccs/files/ccs-2.03.09-mkostemp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cluster-2.03.09/ccs/ccs_tool/upgrade.c.orig	2008-11-13 01:31:14.000000000 +0100
-+++ cluster-2.03.09/ccs/ccs_tool/upgrade.c	2008-11-13 01:31:34.000000000 +0100
-@@ -223,7 +223,7 @@
-   memset(tmp_file, 0, 128);
-   sprintf(tmp_file, "/tmp/ccs_tool_tmp_XXXXXX");
- 
--  tmp_fd = mkostemp(tmp_file, O_RDWR | O_CREAT |O_TRUNC);
-+  tmp_fd = mkstemp(tmp_file);
-   if(tmp_fd < 0){
-     fprintf(stderr, "Unable to create temporary archive: %s\n", strerror(errno));
-     error = -errno;
diff --git a/sys-cluster/ccs/metadata.xml b/sys-cluster/ccs/metadata.xml
deleted file mode 100644
index 4a09d7ba8d61..000000000000
--- a/sys-cluster/ccs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cluster@gentoo.org</email>
-	<name>Gentoo Cluster Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 49e4d9a00e70..3737b903bf28 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -29,6 +29,8 @@ AUX ceph-osd_at.service.conf 115 BLAKE2B d234b9bd718585baf43f229f583e211607aab02
 AUX ceph.confd-r1 69 BLAKE2B 2e75612a1c36057ab41939b4022c8211e32082a812e9636862fd97b4250594fbf3fbd6739e4faf84c056a8b5402a9089250ea84ce504f2bf2453c09f34dc2fee SHA512 b7f7ebb48b94398eaabb6df2cf3a5697d9a055ea4dd9b73c40d2bbf0e1445f418ed760b1f4ebb13cbb7315b2583847eb97b8649f67b6b7cf98081c0599c86aaa
 AUX ceph.confd-r3 1315 BLAKE2B bf5c573be6bcfd2c7f077087c36f8e918f027ad81b18ec496348ed155c97332ad6d1567a9c69a3c887fa0bdd184b98cbe7b73198db32aae248e31c7599857a96 SHA512 1d192cc8eec9b294440ee6c43966ccc36669b94007dd6b990c5ee8d18ee1b36730a9a0082ef7170846dcc64adcc61481808e854b6c9bdb2eb1db1c71435d3f05
 AUX ceph.confd-r4 1502 BLAKE2B 51b3d14ce7078a1ba3c458e3c028ceb8b7de02f8187b242c856efab51e64f36ae5435bec761bd85f7b42bfe78ebc28c267ba80ee0b4123b960ffaf35b749ff25 SHA512 ea3e7b668f6fcdf7f1884968a33d06c86448426a83cb132f927c32d83e28adaf8789489e7e817d4349479e3647577ef40190fc75fa88553aac1c7b4f515184c9
+AUX ceph.confd-r5 619 BLAKE2B 6d495b970c7ff14972845e46aafc55d227c45817f5f8a9a1cad2e242398cc49f2c53896affe1373433db4175c426f1148242588207c7dee60f28a8c3ee543e5f SHA512 288560fee187c496402d46e3fa17fe99c4d3f2c0bbb389a5a91384a1015939f2389a81398045f0d1c978c4da5a1400e97126b98374185424bc5501d0b821ad5c
+AUX ceph.initd-r10 2771 BLAKE2B a10cc830065d2a836253925af908a405ea41c518a43d5cc3abbb909f0d87ada0500f5ca5354b34dce7ef76be28a4ad5e74b5cbc3ad7a620054d67b0719dd6bd6 SHA512 7d39caf261c4f354eb03ad1802749a103fea22699b6599a29726a520a56a2600b0eaf6f4284ecfb5979302493af5d7501e6399240478bdbdb1976ae99146f6ad
 AUX ceph.initd-r2 958 BLAKE2B 9aeda4d2a0bad2fc1c190b19b78dd165230aeef932a5335038e650439ff3420a41d2a43ac527fadf700919ba9944b6da551b2fc5a665f915104717ef45474421 SHA512 6f42b8540797d3f55d64b9842e190ca2973c1779c720b7c9923b8bcc06dddf95672bee066275599e4feafeff38652235746433305dd4d7df8ad086a8deb960c0
 AUX ceph.initd-r7 2197 BLAKE2B 7df3ab975cd14a3cc782ed58f8e6c2f0bfdc3f1b96383400490d7cab27b4d5afa6381cdb02843c1bbfe30f62e5d801ccecf2b61178013855e13ec504da84aa4c SHA512 93890b9e049ff5925ce56b524389873e22560315bf25c40ac86ec11dd2375d184215e7a217d863d4e32bb817a3e0577fdea71a76bb5d5c28ecbeb8544f1b763c
 AUX ceph.initd-r8 2363 BLAKE2B 43dd8f5eb9516b76609a91b1884cbe81d3afbd7634bc39987ecceab612a431e6b967d07c9b7d4a02352fe6545d999eaf1a137bb8d49865830a865ff2ed979186 SHA512 9061c97848e1826ae731202c763d8464f09dff013ae5855ce698d839f99d5184a533c3a81bba223d8f50051573e1fec92e915db32b26ac278b01bf17406cbba8
@@ -42,6 +44,7 @@ AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
 DIST ceph-10.2.10.tar.gz 14573701 BLAKE2B 78c68deb8537cae8394b4d35569983431e938eff42b01f448dea68016b33ca5770c83d1e1d382bfd6c8164d5259e821779c6515f8c8fb4d5d52ee90b7df43180 SHA512 883d1b8340aaefc7a1eee4bbfb5b1d1cc15bffed8f35fb1e8fb86b1208a4d0d16753eb6c688ea0e661c4877d3d148b2b6c2b41620c4e8a61e47c69f46f98e537
 DIST ceph-10.2.3.tar.gz 11596171 BLAKE2B c24c879649f0d42f58cfb1d03701797bc685d83c157031156d13308c731412a4a0149b658193722b358ebf0c4f9760d9664668cd797b69d207e81dc572f49700 SHA512 9de1e6851fc343d2c52c72cec3f7887d998d5b588f1251ee3a1fda14427badfa10408e6691fb03a374a10f4ec9844868423fee70fbbe2c0d962af98481412f19
+DIST ceph-12.2.10.tar.gz 78884870 BLAKE2B 321d8256fc6659be3da2ce348e022e79ded63783925c02d3140ffa7fed5528a2b03388f0dfcdf536c81eec7b2484c6db9def8aefb1d5d335c86bad525977977b SHA512 2195a04bf937dba6af61389132240661126ef32e9fd86ca75af27a33c712053b15aa89b52c91ced04f06dc880d7c018afa3f26fff78bf313603f4fb73331b80c
 DIST ceph-12.2.7.tar.gz 78783279 BLAKE2B 9058a5e408b3431cf0e8c28b44f95f6eb12f029697348eb6879efa9db4ad6a3b52b1040f484919a3f1781ac3a4aa72af3b8905760480fd3f3724dbceeab4eb07 SHA512 dde75a41c31cca54d4a680b0b93e28680a23f912a348cccca65e55e600c315bbfe3ced008d758fe8ba1e801a9d6e5f8079cc157ec5eef8916b86f487f42064ea
 DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac
 DIST ceph-12.2.9.tar.gz 77300470 BLAKE2B 3d3fe24986b890e7dcfc790441a80ad56b9c26f500811d524d0889773d425c88f278135d85cd84036973deb5aa58c4cd1cc9cead60db3f0f825349d73140be73 SHA512 93da6f9012fdb65e74dc1917f54839cb19a25672d53e7ee253553e93abb1a2afb51cd18b27bc82559108e2085e463a3b46003b03627e06a6e2e2312b54d86e92
@@ -51,9 +54,10 @@ DIST ceph-13.2.2-frontend-node-modules.tar.xz 45100632 BLAKE2B c3929a6c5e6ec3da5
 DIST ceph-13.2.2.tar.gz 90840817 BLAKE2B db5933f358a1ae6888030bca7522e20545a2e107055dca44b371e295537c854568682fa558d3f90193e0dfe618947918ce21816b5e20795fff8a14bc837216bb SHA512 37c4845ae52550428c7f1e0d77d9d671ea1d6f5cad5bce0713dce97b54f3abe7346daa2cbd44b76638fb74fe7bdc4797033a4bf808253cfc8bec0fa495ec7e03
 EBUILD ceph-10.2.10-r2.ebuild 7629 BLAKE2B 1aa3f1ada65198fa2591c51871c76158d60f64f2e631cdd3c8e87e7d5e76812365db79321ce01d642a400e5a2656aed57876ab2fa9713723ec3f88150ea59056 SHA512 f735d0c6642e80ce689a00719d4225effc113fc537668178a95914471065fa95dd65f21ba55cea2075c83541a74ceca4309097d86d3e16db3f8a6d5eefc54638
 EBUILD ceph-10.2.3-r2.ebuild 6108 BLAKE2B fa77d99bce7fbc4cc135a0f705551564e484659a5471d87edf9d412ca4b6f0d58b0f6f0f217a9487660f5040b0b5c73afcbb6b8e9d0ab9d2c087710f388dac52 SHA512 d0bfa7305db9b82be225871b1784a4b33bc7d8ff32a1cfabf441592ac9a5f161efb8df4bb06ed15ac56d61108c4a379c7ac30f8ef1d27b144123bc0f1d8f681f
+EBUILD ceph-12.2.10.ebuild 8037 BLAKE2B 2c6d6f203aa2705b95559667a8a9174d44b7262a5c7bf4abaf3405c29b320d06a47ec83f12caa1d17c46fcd0b3b8e774713ff8fec44f2d09317869ab200b5e4c SHA512 65ff0201abef681ba8888c8093f33ac4f7a3d000ad089e1b6c1a96da5464c96d6001e784d39904b96fb9152686694105320ac15c4c96401e17ba7906470d927e
 EBUILD ceph-12.2.7.ebuild 7886 BLAKE2B ce57a94c7a55e88ecc8729fc3a46433854d65d222561b418416b3aab52c689cca2487304b4925a070834e75e3bf82d82dded2207683d4374fd7314d8fe0aeb36 SHA512 69b46ff16141c2efeb0e650b3f0f48905608f33ca8316a6b394262cfb12d54b65ec07a5805053aae71533f5eb62314d5435f25a835635b7d3fc13666865d0615
 EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B 3be53d0061849ec367a2612bf6a67b94b97eb7e3f1ab2902eddbfe6e45bd4065fe38ad41e3306b83bb6a622854efa8239d2ff716933e59bf06d343fe341823d2 SHA512 c96e0af6586053b8ff827c049acc8e6cafc2ec31052ed90d2b1d6b3f4daa30ffd41d162eba3aa279b2a07190ed21840032589f88a21be730d06885814eb5f4a5
 EBUILD ceph-12.2.9-r1.ebuild 8026 BLAKE2B 99ae7bab9bc17382c9226f966101cb6a6315403494c83e8973d12b1bd669517a103c52a003f8dfbe487a6558b138200a34eafe6ccf96080915b0344ab78074a4 SHA512 cc49eec85c6010d7cda157fa8adfe92db10946474fa36a4e75452c2f66004f2a3c65c75ccfb885e50f0009bd38ccbf23755b95223f4ada974000986e920bf79b
 EBUILD ceph-13.2.1-r1.ebuild 9212 BLAKE2B dc1bad7c2e864edcd301097937894aa58abbadbcee9b2cd6d33b10c2366ac5bc9000460465910bf72b8c30a60b74a6be8ccc7591c1b9ddbc912182dd4dc4179f SHA512 365777bb2ebff564a503a6816e257c95ef0e3414f274b9613acb561d5744738b43aebb8488e09da5d230ee59e02003dc560f6216531dbb04c6c6a172475f011d
-EBUILD ceph-13.2.2-r2.ebuild 9935 BLAKE2B 96d852665ac14c07e1ae9d86cbf04b464cb90929a0a0f2cef9ed9e3bc6c14df72ad96ed6570d692324d8d1699fa552713d7c9f3d764bbd9a27a838129adff275 SHA512 482b5c17c20a04a41e9574ae4d3e93d35c990872d97cead7afb6da8d2cb4ba45cbb647f412faacb66b74d9e561748652b7c2d19baac6f596b87aeb8b4fe89e6e
+EBUILD ceph-13.2.2-r3.ebuild 9936 BLAKE2B 6229c6c6bb2d188159c4988f50a3803f9c1f98a363fca8d1e1d2994f3a25e8b8e07fe21789381a597047b7e6b69c3951d7d10a4d0a0fd1d7b8808d018b44aaea SHA512 c7898b7a57a243a79d0150dafbcb8cb0bcafadc1c8960c8117b046c43092bce8970bad8572e2b9ea286c7a18cac652a0bd2e784efeb80f290034470eff40d0e9
 MISC metadata.xml 1730 BLAKE2B 0cf24323ef1e88d95e448ecaa2df8a4b2a1ac9baf3f433931cd588bdb34b2f268a280a0756402787c73e4ac33dceb60042bafee1d3124dc6e98ba33abc541c73 SHA512 e54693fd32f6ecc16ca244067ce1ebf63ea5939926be2466a9d88a5373b25651bb5c25984ee6dbeecf0099be0988f002ed824b874c5a308fd4fbe35b87dcb53a
diff --git a/sys-cluster/ceph/ceph-12.2.10.ebuild b/sys-cluster/ceph/ceph-12.2.10.ebuild
new file mode 100644
index 000000000000..58e624596ede
--- /dev/null
+++ b/sys-cluster/ceph/ceph-12.2.10.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2018 Gentoo Authors
+# Copyright 2017-2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
+	python-r1 udev user readme.gentoo-r1 systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl"
+IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+# unbundling code commented out pending bugs 584056 and 584058
+#>=dev-libs/jerasure-2.0.0-r1
+#>=dev-libs/gf-complete-2.0.0
+COMMON_DEPEND="
+	virtual/libudev:=
+	app-arch/bzip2:=[static-libs?]
+	app-arch/lz4:=[static-libs?]
+	app-arch/snappy:=[static-libs?]
+	app-arch/zstd:=[static-libs?]
+	app-misc/jq:=[static-libs?]
+	<dev-libs/crypto++-7.0:=[static-libs?]
+	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
+	dev-libs/libaio:=[static-libs?]
+	dev-libs/libxml2:=[static-libs?]
+	sys-apps/keyutils:=[static-libs?]
+	sys-apps/util-linux:=[static-libs?]
+	sys-libs/zlib:=[static-libs?]
+	babeltrace? ( dev-util/babeltrace )
+	ldap? ( net-nds/openldap:=[static-libs?] )
+	lttng? ( dev-util/lttng-ust:= )
+	nss? ( dev-libs/nss:= )
+	fuse? ( sys-fs/fuse:0=[static-libs?] )
+	ssl? ( <dev-libs/openssl-1.1:=[static-libs?] )
+	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
+	zfs? ( sys-fs/zfs:=[static-libs?] )
+	radosgw? (
+		dev-libs/expat:=[static-libs?]
+		<dev-libs/openssl-1.1:=[static-libs?]
+		net-misc/curl:=[curl_ssl_openssl,static-libs?]
+	)
+	system-boost? (
+		=dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+	)
+	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
+	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
+	${PYTHON_DEPS}
+	"
+DEPEND="${COMMON_DEPEND}
+	app-arch/cpio
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/gperf
+	dev-util/valgrind
+	sys-apps/which
+	sys-devel/bc
+	virtual/pkgconfig
+	test? (
+		dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-block/parted
+	sys-fs/e2fsprogs
+	sys-fs/cryptsetup
+	sys-fs/lvm2
+	!<sys-apps/openrc-0.26.3
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	"
+REQUIRED_USE="
+	$(python_gen_useflags 'python2*')
+	${PYTHON_REQUIRED_USE}
+	?? ( ssl nss )
+	?? ( jemalloc tcmalloc )
+	"
+
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI="no"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+UNBUNDLE_LIBS=(
+	src/erasure-code/jerasure/jerasure
+	src/erasure-code/jerasure/gf-complete
+)
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-12.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-12.2.4-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
+	"${FILESDIR}/ceph-12.2.5-no-werror.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+)
+
+check-reqs_export_vars() {
+	if use amd64; then
+		CHECKREQS_DISK_BUILD="12G"
+		CHECKREQS_DISK_USR="460M"
+	else
+		CHECKREQS_DISK_BUILD="1400M"
+		CHECKREQS_DISK_USR="450M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+user_setup() {
+	enewgroup ceph ${CEPH_GID}
+	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup 'python2*'
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+	user_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-boost; then
+		eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch"
+	fi
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t
+
+	#rm -rf "${UNBUNDLE_LIBS[@]}"
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_NSS=$(usex nss)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '')
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_RDMA=no
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
+	cmake-utils_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+
+	ceph_src_configure
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	cmake-utils_src_make all
+
+	# we have to do this here to prevent from building everything multiple times
+	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
+	python_foreach_impl python_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${D}" emake install
+	popd >/dev/null || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_foreach_impl python_install
+
+	prune_libtool_files --all
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r1 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r10" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+	fi
+
+	udev_dorules udev/*.rules
+
+	readme.gentoo_create_doc
+
+	python_setup 'python2*'
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
+		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/ceph/ceph-13.2.2-r2.ebuild b/sys-cluster/ceph/ceph-13.2.2-r3.ebuild
index 3035155be5e3..12a47de10f3b 100644
--- a/sys-cluster/ceph/ceph-13.2.2-r2.ebuild
+++ b/sys-cluster/ceph/ceph-13.2.2-r3.ebuild
@@ -331,8 +331,8 @@ src_install() {
 	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
 
 	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r9" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r10" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
 
 	insinto /etc/sysctl.d
 	newins "${FILESDIR}"/sysctld 90-${PN}.conf
diff --git a/sys-cluster/ceph/files/ceph.confd-r5 b/sys-cluster/ceph/files/ceph.confd-r5
new file mode 100644
index 000000000000..5d114392d164
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.confd-r5
@@ -0,0 +1,15 @@
+# Example
+
+# default ceph conf file
+#ceph_conf="/etc/ceph/ceph.conf"
+
+# Set RADOSGW_WANT_NAME_PARAM=y in order to make the init script add
+# a --name=client.${RC_SVCNAME} parameter to command_args for radosgw.*
+# service instances. This will make the service use a key by the name
+# of client.${RC_SVCNAME} instead of the default client.admin key.
+# A setting like this in the ceph config file can be used to customize
+# the rgw_data and keyring paths used by radosgw instances:
+# [client]
+# rgw_data = /var/lib/ceph/radosgw/$cluster-$id
+# keyring = /var/lib/ceph/radosgw/$cluster-$id/keyring
+RADOSGW_WANT_NAME_PARAM=n
diff --git a/sys-cluster/ceph/files/ceph.initd-r10 b/sys-cluster/ceph/files/ceph.initd-r10
new file mode 100644
index 000000000000..2f5150fc340e
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.initd-r10
@@ -0,0 +1,108 @@
+#!/sbin/openrc-run
+
+ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
+extra_commands="reload"
+daemon_type="${RC_SVCNAME#ceph-}"
+daemon_type="${daemon_type%%.*}"
+daemon_id="${RC_SVCNAME#ceph-*.}"
+daemon_id="${daemon_id:-0}"
+: ${rundir:=/run/ceph}
+: ${user:=ceph}
+: ${group:=ceph}
+: ${rc_ulimit:=-n 1048576 -u 1048576}
+
+pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
+daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
+
+command="/usr/bin/${RC_SVCNAME%%.*}"
+command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
+command_args_foreground="--foreground"
+
+retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
+start_stop_daemon_args="--user ${user} --group ${group}"
+supervise_daemon_args="--user ${user} --group ${group}"
+
+: ${supervisor:=supervise-daemon}
+: ${stdout:=/var/log/ceph/ceph}
+: ${stderr:=/var/log/ceph/ceph}
+: ${respawn_delay:=10}
+: ${respawn_max:=5}
+: ${respawn_period:=1800}
+
+: ${osd_respawn_delay:=15}
+: ${osd_respawn_max:=10}
+
+: ${radosgw_respawn_max:=5}
+: ${radosgw_respawn_period:=30}
+
+depend() {
+	use dns logger
+	after net ntpd ntp-client chronyd
+	before netmount
+}
+
+is_type_valid() {
+	case ${daemon_type} in
+		mon|mds|osd|mgr|radosgw) return 0;;
+		*) return 1;;
+	esac
+}
+
+start_pre() {
+	local logdir
+	export CEPH_CONF="${ceph_conf}"
+
+	checkpath -d -q -o "${user}:${group}" "${rundir}"
+
+	if ! is_type_valid ;then
+		eerror "Please give valid Ceph Server Type: mds, mon, osd"
+		return 1
+
+	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
+		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
+		return 1
+	fi
+
+	if [ -n "${bluestore_osd_fsid}" ]; then
+		einfo "Mounting Bluestore"
+		ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd
+	fi
+
+	if [ ${daemon_type} = radosgw ] && [ ${RADOSGW_WANT_NAME_PARAM} = y ]; then
+		command_args="${command_args} --name client.${daemon_id}"
+	fi
+
+	local arg_name arg_val
+	for arg_name in std{out,err} respawn_{delay,max,period}; do
+		eval arg_val="\${${daemon_type}_${arg_name}}"
+
+		if [ -z "${arg_val}" ]; then
+			eval arg_val="\${${arg_name}}"
+		else
+			eval "${arg_name}=\"${arg_val}\""
+		fi
+
+		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
+			local log_file log_postfix
+			log_postfix=".${daemon_id}-${arg_name}.log"
+			log_file="${arg_val}"
+
+			if [ "${log_file}" != /dev/null ]; then
+				log_file="${log_file}${log_postfix}"
+			fi
+
+			log_dir="$(dirname "${log_file}")"
+			checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}"
+
+			supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}"
+		fi
+	done
+}
+
+reload() {
+	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
+	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
+	eend ${?}
+}
+
+# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index c1382f66d6e7..f5ba711f1ac3 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,8 +1,12 @@
 DIST charliecloud-0.9.1.tar.gz 194937 BLAKE2B 2ef2ee70cee3293ec4f7f589c9a034afa82835981132ea433d720b2a2750df68adb261540c98bc04e7f8904375dd8804819fb3015dc6e65bbe097fa55d558976 SHA512 6a54912ceb3ea99e9d3d1fa8469d7288df0b71872c6cb1d5a4d324f6f84754b7e4804ec1a3c2a30e7dd6377a3b474fea849eb42014f3599ad27a3f6214642a2b
 DIST charliecloud-0.9.3.tar.gz 200507 BLAKE2B debd06bd6158a473d07618bc8fd9ae8c431212eef87699cdd412cf29390e25f6f9e596ac93eb0d663c47ca0b8243cfbcbfc634066f6de03bb673488471e7ef01 SHA512 d312a583438d579ef4ddd6b1d78cc2c6b32e352dad99dcff93f7e0a346aa11fa534091ad6446217bc6fe0dc6d7299d99ffb2c7bb1a441353fd9b2f118ead2c80
 DIST charliecloud-0.9.4.tar.gz 205882 BLAKE2B 2e669581ed0d672b4b4658aafeb5b14b67ee4f506459f00e19fc094e468c91763587b0c29ffd3d85ea8d1ab043fde0363baa925923bd20af77082a3a17da22bd SHA512 7ea58a372b1287b8ce38640ce31fdf6a131275807dc8194b1e302f9cfae0e220868f37fa6deb7f263e9f3f52a173f42b0f2f4c2e8f5a2e8699639ee5f680880f
+DIST charliecloud-0.9.5.tar.gz 205980 BLAKE2B 9bd7a9817bb394fb4920b0647f0537618b77cdf80a7e4aca74491d041db4c9c60a088c6582cc62a76051393b3ed806819ea851c6fd964390e46f1e1376cca259 SHA512 9e147dec059bc729e7d94496587241e6a4e66c0dbef3dfd8e3d35993cc32555975f6fa9eb5288d7ea14e6d9243fcbfa8020bd1fdaa067d659923ba493b2a70d3
+DIST charliecloud-0.9.6.tar.gz 205380 BLAKE2B 2e95f5486ea6d2306512378290cd29114bc688717741436ae9cc8c1dd2679c22ab21059574d62222cd14063bacecc6a7005b216cd9e2ed01fe1593a3b69871b0 SHA512 55af3e57ef6c2b81ae10bd50d149872af50d508392b271bdaa75cf3b655659ec7da5016a9deeea15aaa20e265e8066d1ed982c122cb5e62ee6d47f25d367410f
 EBUILD charliecloud-0.9.1.ebuild 1505 BLAKE2B 6b84d37c066ef552272760ab0e635d23dfaaee7db75b462e42da32699580f08940c75362de64c5d864cb3e88d5751f75386ed2ce68982ae59adcd46ea7c8c01d SHA512 80edeab864fc47f0f634edafa4bcf3c9ceed3e9ad4451f48974ed2a3c5a9cc432b5b1fe7c2391e88f2de74c94016ca3788cc40e58408a0a7491217052621a7da
 EBUILD charliecloud-0.9.3.ebuild 1505 BLAKE2B 6b84d37c066ef552272760ab0e635d23dfaaee7db75b462e42da32699580f08940c75362de64c5d864cb3e88d5751f75386ed2ce68982ae59adcd46ea7c8c01d SHA512 80edeab864fc47f0f634edafa4bcf3c9ceed3e9ad4451f48974ed2a3c5a9cc432b5b1fe7c2391e88f2de74c94016ca3788cc40e58408a0a7491217052621a7da
 EBUILD charliecloud-0.9.4.ebuild 1502 BLAKE2B b7dee3131b106eaa6ef4ec023339efcf33b24d9e684e0f3b0b9e246676f4868394e6a4a7e23cb66296c355de32cee0cc2425c8ca7241a3743787849bfdf80f4b SHA512 ad33df1b66ffab1b882b5799c89df2f03a3458c0bfc5e172eed3da9f37490db535c447ba9e4b177bdb747b43e3b042b9f88fac5021d7a1356bd70f32d1d18344
+EBUILD charliecloud-0.9.5.ebuild 1502 BLAKE2B b7dee3131b106eaa6ef4ec023339efcf33b24d9e684e0f3b0b9e246676f4868394e6a4a7e23cb66296c355de32cee0cc2425c8ca7241a3743787849bfdf80f4b SHA512 ad33df1b66ffab1b882b5799c89df2f03a3458c0bfc5e172eed3da9f37490db535c447ba9e4b177bdb747b43e3b042b9f88fac5021d7a1356bd70f32d1d18344
+EBUILD charliecloud-0.9.6.ebuild 1502 BLAKE2B b7dee3131b106eaa6ef4ec023339efcf33b24d9e684e0f3b0b9e246676f4868394e6a4a7e23cb66296c355de32cee0cc2425c8ca7241a3743787849bfdf80f4b SHA512 ad33df1b66ffab1b882b5799c89df2f03a3458c0bfc5e172eed3da9f37490db535c447ba9e4b177bdb747b43e3b042b9f88fac5021d7a1356bd70f32d1d18344
 EBUILD charliecloud-9999.ebuild 1505 BLAKE2B 6b84d37c066ef552272760ab0e635d23dfaaee7db75b462e42da32699580f08940c75362de64c5d864cb3e88d5751f75386ed2ce68982ae59adcd46ea7c8c01d SHA512 80edeab864fc47f0f634edafa4bcf3c9ceed3e9ad4451f48974ed2a3c5a9cc432b5b1fe7c2391e88f2de74c94016ca3788cc40e58408a0a7491217052621a7da
 MISC metadata.xml 699 BLAKE2B 778ae447db939c0593dd147ad669e07fe8de217079988f82bd21ca545f1afe8056347173028056a9f0407a72b435dfc021dccbed1d860491712351ae727906b3 SHA512 2b19c7878b104128f537b3b5ab2070a3f643ae536af3f91ab52284aa13ae5752e4e8c012a51fa4261e140154f0c2c49f1aa480b22ace552fdab5067174247515
diff --git a/sys-cluster/charliecloud/charliecloud-0.9.5.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.5.ebuild
new file mode 100644
index 000000000000..3fd8f0d7646a
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-0.9.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# User namespaces don't play well with the sandbox.
+RESTRICT="test"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
+HOMEPAGE="https://hpc.github.io/charliecloud/"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+IUSE="doc examples +pv test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	pv? ( sys-apps/pv )
+	doc? ( dev-python/sphinx
+	       dev-python/sphinx_rtd_theme
+	       net-misc/rsync )
+	test? ( app-arch/pigz )"
+
+DOCS=(
+	README.rst
+)
+
+src_compile() {
+	emake
+	use doc && emake -C doc-src
+}
+
+src_install() {
+	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${ED}"
+	if use doc; then
+		mv doc html || die
+		local HTML_DOCS=(html/.)
+	fi
+	if use examples; then
+		docompress -x "${EPREFIX}/usr/share/doc/${PF}/examples"
+		DOCS+=(examples)
+	fi
+	rm -rf "${ED}/usr/share/doc/charliecloud" || die
+	einstalldocs
+}
+
+src_test() {
+	cd "${S}/test" || die
+	export CH_TEST_TARDIR="${T}/tarballs"
+	export CH_TEST_IMGDIR="${T}/images"
+
+	# Do not run tests requiring root.
+	export CH_TEST_PERMDIRS="skip"
+	export CH_TEST_SKIP_DOCKER=yes
+	sed -i 's/CHTEST_HAVE_SUDO=yes/CHTEST_HAVE_SUDO=no/' "${S}/test/common.bash" || die
+
+	emake test-quick
+}
diff --git a/sys-cluster/charliecloud/charliecloud-0.9.6.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.6.ebuild
new file mode 100644
index 000000000000..3fd8f0d7646a
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-0.9.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# User namespaces don't play well with the sandbox.
+RESTRICT="test"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
+HOMEPAGE="https://hpc.github.io/charliecloud/"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+IUSE="doc examples +pv test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	pv? ( sys-apps/pv )
+	doc? ( dev-python/sphinx
+	       dev-python/sphinx_rtd_theme
+	       net-misc/rsync )
+	test? ( app-arch/pigz )"
+
+DOCS=(
+	README.rst
+)
+
+src_compile() {
+	emake
+	use doc && emake -C doc-src
+}
+
+src_install() {
+	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${ED}"
+	if use doc; then
+		mv doc html || die
+		local HTML_DOCS=(html/.)
+	fi
+	if use examples; then
+		docompress -x "${EPREFIX}/usr/share/doc/${PF}/examples"
+		DOCS+=(examples)
+	fi
+	rm -rf "${ED}/usr/share/doc/charliecloud" || die
+	einstalldocs
+}
+
+src_test() {
+	cd "${S}/test" || die
+	export CH_TEST_TARDIR="${T}/tarballs"
+	export CH_TEST_IMGDIR="${T}/images"
+
+	# Do not run tests requiring root.
+	export CH_TEST_PERMDIRS="skip"
+	export CH_TEST_SKIP_DOCKER=yes
+	sed -i 's/CHTEST_HAVE_SUDO=yes/CHTEST_HAVE_SUDO=no/' "${S}/test/common.bash" || die
+
+	emake test-quick
+}
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index e57f50fb515a..9936c40777aa 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -3,13 +3,16 @@ AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fe
 DIST cinder-11.1.1.tar.gz 5808526 BLAKE2B 1b773e45673c35faff1a327d73608949e088f3635adb6dd6c7e779e708dd8f2270b85086378d48042b86e60ad7ca94754d56c1d0193f1d715112a03cf3163c77 SHA512 10ecf0068c57077a24bb0445a0901e07e7ad211cd7fac67ed016b770b477e9ba0e9954de70f165aae69e079f6b2e9416d8292ec701db4c97b987c7dac8f69a43
 DIST cinder-12.0.4.tar.gz 5349921 BLAKE2B 168beb53879656956a97a4e787aba200b119e80e3b787fa94534c7ca8a68fb641df47069e19759ef022103a3f306402711ec315bc61d6387b427c6f5672919fc SHA512 0a139c25458020a869ab9395f42cd31b83cbfb65640a41ef0039aef48a92fd641a0084c5fd8fbdc35b6c8b6e9250e1d0a845816b92a882358acf4e2793be536c
 DIST cinder-13.0.1.tar.gz 5457335 BLAKE2B 5f8db00c5dc4e8e05c40d77f06561be352d42091e996cb2e87cbf590361ee1537903876ebf353d5dcf277decdceae82b6066a62e0b8ff4e2f58370ce3661de8a SHA512 9dd64ed77a2c6bb4ddcd6dfa38510e5f37a7bde5ee8f967c9dad884a30e655bb75becd76d91ac4973f5a20b9a2e3ce064262dc1760da5629fcd04499a26ed220
+DIST cinder-13.0.2.tar.gz 5463591 BLAKE2B d146e43bdd97bd15aeaf7c582c8cbe37080a7a1e8b5090c2727fb2dfbfc953121c0bb4c2adfce5f09d3e43e02093335dcce655dcc64abfa98d58b08327257950 SHA512 04ea9c0dafcc98858b587bf94e5afa20cfbfdd1aebd615ac62cfc7821a8dc6106b695071d68dc369bff014e877fc188216f3b05a9a08ea94a1b99712eca25c92
 DIST cinder.conf.sample-13.0.1 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
+DIST cinder.conf.sample-13.0.2 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2018.2.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868 SHA512 12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654
 DIST queens-cinder.conf.sample 179467 BLAKE2B 00c229a6d9882740460c633db69bf3f5ff3d77a2a8e78f38528f1b5e6e03c2371141ba219c24b8dc82e51c20a5e784af142c1a0192791ff356e5841a9991d713 SHA512 346f9ad4ddcfed26dd3b9b34e65c2edaf08a7d649d4af5bd3a5ebf1047c78d6cdc4e4712666e022f56acd3b2a0b323850b40cc4d0008f2c140507342a00b2908
 EBUILD cinder-11.1.1.ebuild 7748 BLAKE2B fee1f56d529fd4aa3969d4af66d793c419f1c2215d4e8715d8a4faa0c4cc82c5af2e125ea8de35e3496354c323bf0fbd55159fde814ff070415b025c0a435a34 SHA512 ff37f6b3906eba212691312b9c689d62a848e2db4c05e20acf233edf502423b4ac466639f9c073d9c70e08e570e8a411513b224c881b227fae52f0cedb72fd7d
 EBUILD cinder-12.0.4.ebuild 8042 BLAKE2B 16b2d4ec01110d1dd9a7f176963182b2d9aaa76866cec22030aa263c96a1929a106bc08c48928ccf27301266abac1dbeb21080be0964cdaaf75784933cb87a05 SHA512 e7f2182ecb303de8e92a5e8a30d4bd5ab842b3592e32088fb6df9b5f071331b9ac9eb884490d02af6f742b57197b6a0768096f05b0298c02c34f25436aa7b8dc
 EBUILD cinder-13.0.1.ebuild 7809 BLAKE2B 6cccea4fe5e344a68ccf332d00ceabf0b0b9239c2195529906c594eda1237028185325a4d8ebab9ccaf6f7ca09cf493c76fb49155805b63d49677f1f735c4e72 SHA512 d76b40f51177aa545ff001c78f41add0fd8df45869a60df9eaf7b6a58d3f77b54d2cba9d5c53ac8e4f3e7e0b6260556f1bfe93d92e3af05b63479aba3d2f23bb
+EBUILD cinder-13.0.2.ebuild 7811 BLAKE2B c82bc03380bed951753d9ab270404f15c4e7b465d298932c36e0c2477ff7a3d8a87201c11c0083831bb815fc265d33331f799e313fad7eba6e1162dc2c2d9e03 SHA512 55450aa65a0e451832f17c3bbbe04cbc1016e7830783916ad9a30dcac6e2462442ba50a10701d7599ef17ae819935858f89cdc429ad80c911f4a1bdc82ac3630
 EBUILD cinder-2017.2.9999.ebuild 7774 BLAKE2B f1c7f6f21eed9724ca1ba3a4461be1c1c8c7d17b6bd6e0d7eaa2f3f9ad56cf6c96946266eaafca58624a5501d5560307a776cb8c4209f18525589738aa388b16 SHA512 0d985ee9d439aaaad712d065ed66c3b603688f516172d50f004c4a4793554755fc7bcf2c787bd85ecc7076ea2b489f971567efa042a718764b64c23edaa21ddf
 EBUILD cinder-2018.1.9999.ebuild 8047 BLAKE2B 9d4be05868caddcf9d8bc1d7355c1c9efba7860f5d3adc01fac2be8376ea7c6dbda724de54c5cd5bc505c01dd36962c24d0e53eb8e6dfb749bacfa7676c0c2f1 SHA512 4ccc67e7c2a7603b48268f548662e0b974e688383f546b4b35346cd248705221536f25408936cac050c1b366ffa4a06b7d9254a9480c4e6c656440743247bed1
 EBUILD cinder-2018.2.9999.ebuild 7814 BLAKE2B 6755862a53601c6f2afce2f3d07583e59b737cb8d3ff788099b4f9bccb8cc6a7084306fb999c55be18cf7281b62cae16625b4125b166dc68281d845e57fa0b3a SHA512 35ff4a9673ff4ba9af192853ee30997b86cf28866951a520d34149c02f8196365754bcaf8337834b4254581abd9e3067e09439840a1d97d8333bf2aa290c4270
diff --git a/sys-cluster/cinder/cinder-13.0.2.ebuild b/sys-cluster/cinder/cinder-13.0.2.ebuild
new file mode 100644
index 000000000000..995a9db17c09
--- /dev/null
+++ b/sys-cluster/cinder/cinder-13.0.2.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+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"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+	EGIT_BRANCH="stable/rocky"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+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/defusedxml-0.5.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/greenlet-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.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.16.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.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-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${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
+	# only used for docs
+	sed -i '/^sphinx-feature-classification/d' 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" 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/resource_filters.json"
+	newins "${DISTDIR}/cinder.conf.sample-${PV}" "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/cman/Manifest b/sys-cluster/cman/Manifest
deleted file mode 100644
index 337dd0615fc8..000000000000
--- a/sys-cluster/cman/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX cman.confd 2797 BLAKE2B 6956396fcd87cb9312f2f19c1f2da96ee635dd3d56d1f41867c3cc26b80f18174d3b88744f5b5ab8b7478b9129e75c09486f9dbd0532ece94e60d1c137bc19f3 SHA512 97cfe35230198091261ab3202c2c4eb2683f43ae311c07a6d34d9ae9c47c71c004ce615993ad25189ee536cbf2863fb721a57c520b439de2e70a7cd3d84ae3fe
-AUX cman.initd 7115 BLAKE2B 0f9e5a10e280678437a29c68b4a6899597a111e129833d86a360308093f0f8eaa9768fb03620ab8566a9c851a782e3b40b95133921fb0d0f4d2167404e6ce0c8 SHA512 b3b0f4c5902431b02bc75aef42f7f463d9e6aec9c4895384997df4ff9806fe0bd7f88e4260da6cbea84fa479010f893271acf3e34f84aef0256e8f78edb655f4
-AUX cman.initd-3.1.5-r1 7860 BLAKE2B 96599c5331f3de69101bae29ce918bd3ea320e5e1ad122a2d3f79178f228c7e48ca5f8172fed67fc01c69dc4cc9698c3721c2409aa3a89048c8391b9a9fd3a2b SHA512 9dbc73c7753ffdb5119160cbe544f74f14de77cd71cbe76975603ff3be7c601e6fd8084a7ae0acf44096b5b10448ba563453e7871aa035e7e706437b5088d717
-DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a
-DIST cluster-3.2.0.tar.gz 688411 BLAKE2B b1218e74bd0d9f1d25d8a01659d5a038f3a5380e6d6e04f02138d13ef3de1e3f96d6aac680c2858ac6bd0e830d227474af9ec82ea8bbefd3f33b88bbe2d5ffc6 SHA512 00620b89564c4f9b67b679695749cd7515f49af43ace6a565e32e020ee66db219f3db3f53420d6460ea8c1cab03258305735fe5db81aab3953777015119533e9
-EBUILD cman-3.1.5-r1.ebuild 2593 BLAKE2B f80aece804dc080f109252a706ee5dfe27ed1f62db8de7d294bd738399ac3eb9a88d00578dc5b90da0837dd8d2751dd41eed6b48dec83c6dd11200557abf100c SHA512 214a919410d3c0c533ce0da251d9290ba7a4f98788c63b392d7494ff64b16636a5db7d5b27896c9de2d018ebe730e265b009d5fcd12e00ad404af44c102afea4
-EBUILD cman-3.1.5.ebuild 2584 BLAKE2B 51e61b2f84a3daed5daaab82909cb8be4ad6a3e9e83ad55ea10619c78dd14d3cd0fe0ade6b51e77bba05eaef92925fc75e1d994c60ceabf324c59019d261038c SHA512 0215864ff1847aa753fb44e4d2c275223d9775202a52d101b5c8f5579a330390508a4d08fc83e70360a5e02169e921a1de8e7076b933ba1b202a361abf005b87
-EBUILD cman-3.2.0.ebuild 2593 BLAKE2B ad0cb03e0ad66e948f9cc7f46c4ce53199511c5596480c745d1294e4ac205505702106f9a615d75a20cde30eca4a3785a3b3bec7432691bfe657a33090ca11ee SHA512 391c839a011888c5a2a4d7d82f8018a421762030422e894b8836f44a1170a64ba06672b23d08d062f42adc5e79bc1bd62ab455d4d04ff2ce203dae32f41edcbd
-MISC metadata.xml 309 BLAKE2B 103428f61eb60addcd4e1b1fa0a3ce6b8ce79fb1eb98fe94e92af33087e7fe9faacaaa4b4aebfc31f38c9e0b9874cdb72d28465d92764cb7cf9f41203e7b18eb SHA512 63af840873be4c3b0656822e4d1d36a1b30cea6d1f295cf0084e3a9fdf2f589bb6923dfed365ad6399842a0d8388607f9988000843c35549900db94acd9f9863
diff --git a/sys-cluster/cman/cman-3.1.5-r1.ebuild b/sys-cluster/cman/cman-3.1.5-r1.ebuild
deleted file mode 100644
index ebddee75dd57..000000000000
--- a/sys-cluster/cman/cman-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit linux-info multilib toolchain-funcs versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Cluster Manager"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="dbus ldap"
-
-RDEPEND="dev-libs/libxml2
-	dev-libs/libxslt
-	dbus? ( sys-apps/dbus )
-	ldap? ( net-nds/openldap )
-	sys-cluster/corosync
-	sys-cluster/openais
-	~sys-cluster/libccs-${PV}
-	~sys-cluster/libfence-${PV}
-	~sys-cluster/libcman-${PV}
-	~sys-cluster/libdlm-${PV}
-	~sys-cluster/liblogthread-${PV}
-	!sys-cluster/dlm
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.24"
-
-S="${WORKDIR}/${MY_P}"
-
-# TODO:
-# * Gentoo'ise the init script
-
-src_configure() {
-	# cluster libs have their own separate packages
-	sed -i -e 's|lib||' "${S}/cman/Makefile" || die
-	sed -i -e 's|liblogthread||' "${S}/common/Makefile" || die
-	sed -i -e 's|libs||' "${S}/config/Makefile" || die
-	sed -i -e 's|libdlm libdlmcontrol||' "${S}/dlm/Makefile" || die
-	sed -i -e 's|libfence libfenced||' "${S}/fence/Makefile" || die
-	sed -i -e 's|fence/libfenced||' "${S}/Makefile" || die
-
-	sed -i \
-		-e 's|\(^all:.*\)depends |\1|' \
-		config/tools/ccs_tool/Makefile \
-		fence/fence{d,_node,_tool}/Makefile \
-		cman/{cman_tool,daemon,tests,qdisk,notifyd}/Makefile \
-		dlm/{tool,tests/usertest}/Makefile \
-		|| die "sed failed"
-
-	if ! use ldap ; then
-		sed -i -e 's|ldap||' config/plugins/Makefile || die "sed failed"
-	fi
-	local myopts=""
-	use dbus || myopts="--disable_dbus"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=${KERNEL_DIR} \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--without_rgmanager \
-		--without_bindings \
-		${myopts} \
-		|| die "configure problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# we have to create it in the init.d script anyway
-	rmdir "${D}"/var/run/{cluster,}
-
-	keepdir /var/{lib,log}/cluster
-	keepdir /etc/cluster/cman-notify.d
-
-	rm -rf "${D}/usr/share/doc"
-	dodoc \
-		doc/{usage.txt,cman_notify_template.sh} \
-		config/plugins/ldap/*.ldif
-	dohtml doc/*.html
-
-	# lib-specific man pages are provided by the corresponding packages
-	rm "${D}/usr/share/man/man3/libdlm.3"
-
-	newinitd "${FILESDIR}/${PN}.initd-3.1.5-r1" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-}
diff --git a/sys-cluster/cman/cman-3.1.5.ebuild b/sys-cluster/cman/cman-3.1.5.ebuild
deleted file mode 100644
index f97954b26b3c..000000000000
--- a/sys-cluster/cman/cman-3.1.5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit linux-info multilib toolchain-funcs versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Cluster Manager"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="dbus ldap"
-
-RDEPEND="dev-libs/libxml2
-	dev-libs/libxslt
-	dbus? ( sys-apps/dbus )
-	ldap? ( net-nds/openldap )
-	sys-cluster/corosync
-	sys-cluster/openais
-	~sys-cluster/libccs-${PV}
-	~sys-cluster/libfence-${PV}
-	~sys-cluster/libcman-${PV}
-	~sys-cluster/libdlm-${PV}
-	~sys-cluster/liblogthread-${PV}
-	!sys-cluster/dlm
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.24"
-
-S="${WORKDIR}/${MY_P}"
-
-# TODO:
-# * Gentoo'ise the init script
-
-src_configure() {
-	# cluster libs have their own separate packages
-	sed -i -e 's|lib||' "${S}/cman/Makefile" || die
-	sed -i -e 's|liblogthread||' "${S}/common/Makefile" || die
-	sed -i -e 's|libs||' "${S}/config/Makefile" || die
-	sed -i -e 's|libdlm libdlmcontrol||' "${S}/dlm/Makefile" || die
-	sed -i -e 's|libfence libfenced||' "${S}/fence/Makefile" || die
-	sed -i -e 's|fence/libfenced||' "${S}/Makefile" || die
-
-	sed -i \
-		-e 's|\(^all:.*\)depends |\1|' \
-		config/tools/ccs_tool/Makefile \
-		fence/fence{d,_node,_tool}/Makefile \
-		cman/{cman_tool,daemon,tests,qdisk,notifyd}/Makefile \
-		dlm/{tool,tests/usertest}/Makefile \
-		|| die "sed failed"
-
-	if ! use ldap ; then
-		sed -i -e 's|ldap||' config/plugins/Makefile || die "sed failed"
-	fi
-	local myopts=""
-	use dbus || myopts="--disable_dbus"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=${KERNEL_DIR} \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--without_rgmanager \
-		--without_bindings \
-		${myopts} \
-		|| die "configure problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# we have to create it in the init.d script anyway
-	rmdir "${D}"/var/run/{cluster,}
-
-	keepdir /var/{lib,log}/cluster
-	keepdir /etc/cluster/cman-notify.d
-
-	rm -rf "${D}/usr/share/doc"
-	dodoc \
-		doc/{usage.txt,cman_notify_template.sh} \
-		config/plugins/ldap/*.ldif
-	dohtml doc/*.html
-
-	# lib-specific man pages are provided by the corresponding packages
-	rm "${D}/usr/share/man/man3/libdlm.3"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-}
diff --git a/sys-cluster/cman/cman-3.2.0.ebuild b/sys-cluster/cman/cman-3.2.0.ebuild
deleted file mode 100644
index 2b59cd78f283..000000000000
--- a/sys-cluster/cman/cman-3.2.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit linux-info multilib toolchain-funcs versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Cluster Manager"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="dbus ldap"
-
-RDEPEND="dev-libs/libxml2
-	dev-libs/libxslt
-	dbus? ( sys-apps/dbus )
-	ldap? ( net-nds/openldap )
-	sys-cluster/corosync
-	sys-cluster/openais
-	~sys-cluster/libccs-${PV}
-	~sys-cluster/libfence-${PV}
-	~sys-cluster/libcman-${PV}
-	~sys-cluster/libdlm-${PV}
-	~sys-cluster/liblogthread-${PV}
-	!sys-cluster/dlm
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.24"
-
-S="${WORKDIR}/${MY_P}"
-
-# TODO:
-# * Gentoo'ise the init script
-
-src_configure() {
-	# cluster libs have their own separate packages
-	sed -i -e 's|lib||' "${S}/cman/Makefile" || die
-	sed -i -e 's|liblogthread||' "${S}/common/Makefile" || die
-	sed -i -e 's|libs||' "${S}/config/Makefile" || die
-	sed -i -e 's|libdlm libdlmcontrol||' "${S}/dlm/Makefile" || die
-	sed -i -e 's|libfence libfenced||' "${S}/fence/Makefile" || die
-	sed -i -e 's|fence/libfenced||' "${S}/Makefile" || die
-
-	sed -i \
-		-e 's|\(^all:.*\)depends |\1|' \
-		config/tools/ccs_tool/Makefile \
-		fence/fence{d,_node,_tool}/Makefile \
-		cman/{cman_tool,daemon,tests,qdisk,notifyd}/Makefile \
-		dlm/{tool,tests/usertest}/Makefile \
-		|| die "sed failed"
-
-	if ! use ldap ; then
-		sed -i -e 's|ldap||' config/plugins/Makefile || die "sed failed"
-	fi
-	local myopts=""
-	use dbus || myopts="--disable_dbus"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=${KERNEL_DIR} \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--without_rgmanager \
-		--without_bindings \
-		${myopts} \
-		|| die "configure problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# we have to create it in the init.d script anyway
-	rmdir "${D}"/var/run/{cluster,}
-
-	keepdir /var/{lib,log}/cluster
-	keepdir /etc/cluster/cman-notify.d
-
-	rm -rf "${D}/usr/share/doc"
-	dodoc \
-		doc/{usage.txt,cman_notify_template.sh} \
-		config/plugins/ldap/*.ldif
-	dohtml doc/*.html
-
-	# lib-specific man pages are provided by the corresponding packages
-	rm "${D}/usr/share/man/man3/libdlm.3"
-
-	newinitd "${FILESDIR}/${PN}.initd-3.1.5-r1" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-}
diff --git a/sys-cluster/cman/files/cman.confd b/sys-cluster/cman/files/cman.confd
deleted file mode 100644
index 14b7ea791614..000000000000
--- a/sys-cluster/cman/files/cman.confd
+++ /dev/null
@@ -1,67 +0,0 @@
-CCSD_OPTS=
-
-# CMAN_CLUSTER_TIMEOUT -- amount of time to wait for joinging a cluster
-#     before giving up.  If CMAN_CLUSTER_TIMEOUT is positive, then we will
-#     wait CMAN_CLUSTER_TIMEOUT seconds before giving up and failing when
-#     a cluster is not joined.  If CMAN_CLUSTER_TIMEOUT is zero, then
-#     wait indefinately for a cluster join.  If CMAN_CLUSTER_TIMEOUT is
-#     negative, do not check to see that the cluster has been joined
-CMAN_CLUSTER_TIMEOUT=120
-
-# CMAN_QUORUM_TIMEOUT -- amount of time to wait for a quorate cluster on
-#     startup quorum is needed by many other applications, so we may as
-#     well wait here.  If CMAN_QUORUM_TIMEOUT is less than 1, quorum will
-#     be ignored.
-CMAN_QUORUM_TIMEOUT=300
-
-# CMAN_SHUTDOWN_TIMEOUT -- amount of time to wait for cman to become a
-#     cluster member before calling cman_tool leave during shutdown.
-#     default is 60 seconds
-CMAN_SHUTDOWN_TIMEOUT=60
-
-# CMAN_JOIN_OPTIONS
-#CMAN_JOIN_OPTS="-c ...."
-
-# CMAN_LEAVE_OPTIONS
-#CMAN_LEAVE_OPTS=""
-
-
-# ex: FENCED_OPTS="-w -t 300"
-FENCED_OPTS=""
-
-
-# TODO ?
-# CMAN_NOTIFYD_START - control the startup behaviour for cmannotifyd
-# the variable can take 3 values:
-# yes                   | will always start cmannotifyd
-# no                    | will never start cmannotifyd
-# conditional (default) | will start cmannotifyd only if scriptlets
-#                         are found in @NOTIFYDDIR@
-[ -z "$CMAN_NOTIFYD_START" ] && CMAN_NOTIFYD_START=conditional
-
-# CMAN_SSHD_START - control sshd startup behaviour
-# the variable can take 2 values:
-# yes                   | cman will start sshd as early as possible
-# no (default)          | cman will not start sshd
-[ -z "$CMAN_SSHD_START" ] && CMAN_SSHD_START=no
-
-# FENCE_JOIN_TIMEOUT -- seconds to wait for fence domain join to
-#     complete.  If the join hasn't completed in this time, fence_tool join
-#     exits with an error, and this script exits with an error.  To wait
-#     indefinitely set the value to -1.
-[ -z "$FENCE_JOIN_TIMEOUT" ] && FENCE_JOIN_TIMEOUT=20
-
-# FENCED_MEMBER_DELAY -- amount of time to delay fence_tool join to allow
-#     all nodes in cluster.conf to become cluster members.  In seconds.
-[ -z "$FENCED_MEMBER_DELAY" ] && FENCED_MEMBER_DELAY=45
-
-# FENCE_JOIN -- boolean value used to control whether or not this node
-#     should join the fence domain. If FENCE_JOIN is set to "no", then
-#     the script will not attempt to the fence domain. If FENCE_JOIN is
-#     set to "yes", then the script will attempt to join the fence domain.
-#     If FENCE_JOIN is set to any other value, the default behavior is
-#     to join the fence domain (equivalent to "yes").
-[ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
-
-# FENCED_OPTS -- allow extra options to be passed to fence daemon.
-[ -z "$FENCED_OPTS" ] && FENCED_OPTS=""
-\ No newline at end of file
diff --git a/sys-cluster/cman/files/cman.initd b/sys-cluster/cman/files/cman.initd
deleted file mode 100644
index 68c34c146818..000000000000
--- a/sys-cluster/cman/files/cman.initd
+++ /dev/null
@@ -1,318 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CMAN_TOOL="/usr/sbin/cman_tool"
-FENCE_TOOL="/usr/sbin/fence_tool"
-GFS_CONTROLD="/usr/sbin/gfs_controld"
-DLM_CONTROLD="/usr/sbin/dlm_controld"
-GROUPD="/usr/sbin/groupd"
-FENCED="/usr/sbin/fenced"
-CCSD="/usr/sbin/ccsd"
-
-[ -z "$CCSD_OPTS" ] && CCSD_OPTS=""
-[ -z "$CMAN_CLUSTER_TIMEOUT" ] && CMAN_CLUSTER_TIMEOUT=120
-[ -z "$CMAN_QUORUM_TIMEOUT" ] && CMAN_QUORUM_TIMEOUT=0
-[ -z "$CMAN_SHUTDOWN_TIMEOUT" ] && CMAN_SHUTDOWN_TIMEOUT=60
-[ -z "$FENCED_START_TIMEOUT" ] && FENCED_START_TIMEOUT=300
-[ -z "$FENCED_MEMBER_DELAY" ] && FENCED_MEMBER_DELAY=300
-
-depend() {
-	use net
-	after xend
-	after xendomains
-	provide cman
-}
-
-load_modules() {
-	local module modules
-	modules=$1
-
-	for module in ${modules}; do
-		ebegin "Loading ${module} kernel module"
-		modprobe ${module} > /dev/null
-		eend $? "Failed to load ${module} kernel module"
-	done
-}
-
-unload_modules() {
-	local module modules
-	modules=$1
-
-	for module in ${modules}; do
-		ebegin "Unloading ${module} kernel module"
-		modprobe -r ${module} > /dev/null
-		eend $? "Failed to unload ${module} kernel module"
-	done
-}
-
-check_configfs() {
-	awk '{ print $2 }' /etc/mtab | grep "/sys/kernel/config" &> /dev/null\
-		&& awk '{ print $3 }' /etc/mtab | grep "configfs" &> /dev/null
-
-	if [ $? -ne 0 ]; then
-		ewarn "Please add the following line to /etc/fstab:"
-		ewarn "none configfs /sys/kernel/config defaults 0 0"
-		eend 1 "configfs not mounted at /sys/kernel/config"
-	fi
-}
-
-mount_configfs()
-{
-	local module=$(awk '$2 == "configfs" { print $2 }' /proc/filesystems)
-
-	if [ -z "${module}" ]; then
-		load_modules "configfs"
-		sleep 1s
-	fi
-
-	# configfs
-	awk '{ print $2 }' /etc/mtab | grep "/sys/kernel/config" &> /dev/null \
-		&& awk '{ print $3 }' /etc/mtab | grep "configfs" &> /dev/null
-
-	if [ $? -ne 0 ]
-	then
-		ebegin "Mounting ConfigFS"
-		/bin/mount -t configfs none /sys/kernel/config 2>&1
-		eend $?
-	fi
-	return 0
-}
-
-umount_configfs() {
-	local sig retry
-	local entry entries
-
-	entries="$(awk '$3 == "configfs" { print $2 }' /proc/mounts | sort -r)"
-
-	for entry in $entries; do
-		ebegin "Unmounting ConfigFS"
-		umount $entry &>/dev/null
-		eend $?
-	done
-
-	local module=$(awk '$1 == "configfs" { print $1 }' /proc/modules)
-
-	if [ ! -z "${module}" ]; then
-		unload_modules "configfs"
-		sleep 1s
-	fi
-}
-
-umount_gfs_filesystems() {
-	local sig retry
-	local remaining="$(awk '$3 == "gfs" || $3 == "gfs2" { print $2 }' /proc/mounts | sort -r)"
-
-	if [ -n "${remaining}" ]
-	then
-		sig=
-		retry=3
-		while [ -n "${remaining}" -a "${retry}" -gt 0 ]
-		do
-			if [ "${retry}" -lt 3 ]
-			then
-				ebegin "Unmounting GFS filesystems (retry)"
-				umount ${remaining} &>/dev/null
-				eend $? "Failed to unmount GFS filesystems this retry"
-			else
-				ebegin "Unmounting GFS filesystems"
-				umount ${remaining} &>/dev/null
-				eend $? "Failed to unmount GFS filesystems"
-			fi
-			remaining="$(awk '$3 == "gfs" || $3 == "gfs2" { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
-			[ -z "${remaining}" ] && break
-			/bin/fuser -k -m ${sig} ${remaining} &>/dev/null
-			sleep 5
-			retry=$((${retry} -1))
-			sig=-9
-		done
-	fi
-}
-
-unload_allmodules() {
-	local modules
-
-	modules=$(awk '$1 == "lock_gulm" || \
-		$1 == "lock_dlm" || $1 == "dlm" || \
-		$1 == "lock_harness" || $1 == "gfs2" || \
-		$1 == "gfs" { print $1 }' /proc/modules)
-
-	#modules=$(awk '$1 == "lock_harness" || \
-	#	$1 == "gfs" { print $1 }' /proc/modules)
-
-	unload_modules "${modules}"
-}
-
-start_ccsd() {
-	ebegin "Starting ccsd"
-	start-stop-daemon --start --quiet --exec ${CCSD} -- ${CCSD_OPTS}
-	eend $?
-}
-
-stop_ccsd() {
-	ebegin "Stopping ccsd"
-	start-stop-daemon --stop --quiet -s 9 --exec ${CCSD}
-	eend $?
-}
-
-start_cman() {
-	${CMAN_TOOL} status &> /dev/null
-	if [ $? -ne 0 ]
-	then
-	        ebegin "Starting cman"
-        	${CMAN_TOOL} -t ${CMAN_CLUSTER_TIMEOUT} \
-                	-w join ${CMAN_JOIN_OPTS} &> /dev/null
-
-	        if [ "$?" -ne 0 ]
-        	then
-                	eend 1 "Failed to start cman"
-	        else
-        	        eend 0
-
-                	# make sure that we are quorate?
-	                if [ ${CMAN_QUORUM_TIMEOUT} -gt 0 ]
-        	        then
-                	        ebegin "Waiting for quorum (${CMAN_QUORUM_TIMEOUT} secs)"
-                        	${CMAN_TOOL} -t ${CMAN_QUORUM_TIMEOUT} -q wait
-	                        eend $?
-        	        fi
-	        fi
-	else
-		einfo "cman already running"
-	fi
-}
-
-stop_cman() {
-	ebegin "Stopping cman"
-	local stat=0
-	${CMAN_TOOL} status > /dev/null 2>&1
-	if [ $? -eq 0 ]; then
-		retry=3
-		stat=1
-		while [ "${stat}" -eq 1 -a "${retry}" -gt 0 ]
-		do
-			#sleep 2
-			#${CMAN_TOOL} -w -t ${CMAN_SHUTDOWN_TIMEOUT} \
-			#	leave remove ${CMAN_LEAVE_OPTS} > /dev/null
-			${CMAN_TOOL} leave -t ${CMAN_SHUTDOWN_TIMEOUT} ${CMAN_LEAVE_OPTS} \
-				remove &> /dev/null
-				stat=$?
-				retry=$((${retry} -1))
-		done
-	fi
-	eend ${stat}
-}
-
-start_groupd() {
-	ebegin "Starting groupd"
-	start-stop-daemon --start --exec ${GROUPD} --name groupd
-	eend $?
-}
-
-stop_groupd() {
-	ebegin "Stopping groupd"
-	start-stop-daemon --stop --exec ${GROUPD} --name groupd
-	eend $?
-}
-
-start_fenced() {
-	ebegin "Starting fenced"
-	start-stop-daemon --start --exec ${FENCED} --name fenced
-	eend $?
-
-	${CMAN_TOOL} status | grep Flags | grep 2node &> /dev/null
-	local errmsg=$?
-
-	ebegin "Joining fence domain"
-	if [ "${errmsg}" -ne 0 ]
-	then
-		${FENCE_TOOL} join -t $FENCED_START_TIMEOUT &> /dev/null
-		[ $? -eq 0 ] && errmsg=$? || errmsg=1
-	else
-		${FENCE_TOOL} join -m $FENCED_MEMBER_DELAY &> /dev/null
-		[ $? -eq 0 ] && errmsg=$? || errmsg=1
-	fi
-	eend $errmsg
-}
-
-stop_fenced() {
-	# fenced services
-#	local fence_status="$( ${CMAN_TOOL} services | awk '$1 ~ /fence/ { print $3 }')"
-#	if [ -n "${fence_status}" ]; then
-#		if [ -x ${FENCE_TOOL} ]; then
-#			ebegin "Leaving fence domain"
-#			${FENCE_TOOL} leave > /dev/null 2>&1
-#			eend $?
-#		fi
-#	fi
-
-	if [ -x ${FENCE_TOOL} ]; then
-		if ${FENCE_TOOL} ls >/dev/null 2>&1; then
-			ebegin "Leaving fence domain"
-			${FENCE_TOOL} leave > /dev/null 2>&1
-			eend $?
-		fi
-	fi
-
-	ebegin "Stopping fenced"
-	start-stop-daemon --stop --exec ${FENCED} --name fenced
-	eend $?
-}
-
-start_gfs_controld() {
-	ebegin "Starting gfs_controld"
-	start-stop-daemon --start --exec ${GFS_CONTROLD} --name gfs_controld
-	eend $?
-}
-
-stop_gfs_controld() {
-	ebegin "Stopping gfs_controld"
-	start-stop-daemon --stop --exec ${GFS_CONTROLD} --name gfs_controld
-	eend $?
-}
-
-start_dlm_controld() {
-	ebegin "Starting dlm_controld"
-	start-stop-daemon --start --exec ${DLM_CONTROLD} --name dlm_controld
-	eend $?
-}
-
-stop_dlm_controld() {
-	ebegin "Stopping dlm_controld"
-	start-stop-daemon --stop --exec ${DLM_CONTROLD} --name dlm_controld
-	eend $?
-}
-
-start() {
-	load_modules "dlm"
-
-    mkdir -p /var/run/cluster
-
-	mount_configfs
-#	start_ccsd
-	start_cman
-	start_fenced
-	start_groupd
-	start_dlm_controld
-#	start_gfs_controld
-}
-
-stop() {
-
-# umount GFS filesystems
-#	umount_gfs_filesystems
-
-	stop_dlm_controld
-	stop_groupd
-	stop_fenced
-	stop_cman
-
-	#stop_gfs_controld
-	#stop_dlm_controld
-	#stop_groupd
-
-	unload_modules "dlm"
-#	stop_ccsd
-#	unload_allmodules
-	umount_configfs
-}
diff --git a/sys-cluster/cman/files/cman.initd-3.1.5-r1 b/sys-cluster/cman/files/cman.initd-3.1.5-r1
deleted file mode 100644
index 04cf5f2e7f9e..000000000000
--- a/sys-cluster/cman/files/cman.initd-3.1.5-r1
+++ /dev/null
@@ -1,349 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CMAN_TOOL="/usr/sbin/cman_tool"
-FENCE_TOOL="/usr/sbin/fence_tool"
-GFS_CONTROLD="/usr/sbin/gfs_controld"
-DLM_CONTROLD="/usr/sbin/dlm_controld"
-GROUPD="/usr/sbin/groupd"
-FENCED="/usr/sbin/fenced"
-CCSD="/usr/sbin/ccsd"
-
-[ -z "$CCSD_OPTS" ] && CCSD_OPTS=""
-[ -z "$CMAN_CLUSTER_TIMEOUT" ] && CMAN_CLUSTER_TIMEOUT=120
-[ -z "$CMAN_QUORUM_TIMEOUT" ] && CMAN_QUORUM_TIMEOUT=0
-[ -z "$CMAN_SHUTDOWN_TIMEOUT" ] && CMAN_SHUTDOWN_TIMEOUT=60
-[ -z "$FENCED_START_TIMEOUT" ] && FENCED_START_TIMEOUT=300
-[ -z "$FENCED_MEMBER_DELAY" ] && FENCED_MEMBER_DELAY=300
-
-depend() {
-	use net
-	after xend
-	after xendomains
-	provide cman
-}
-
-load_modules() {
-	local module modules
-	modules=$1
-
-	rcS=0 # catch the first error here
-	[ -f /proc/modules ] && for module in ${modules}; do
-		ebegin "Loading ${module} kernel module"
-		modprobe -q ${module}
-		rc=$? # error for this modprobe call
-		eend $rc "Failed to load ${module} kernel module"
-		[ $rc -ne 0 ] && rcS=$rc
-	done
-	return $rcS
-}
-
-unload_modules() {
-	local module modules
-	modules=$1
-
-	[ -f /proc/modules ] && for module in ${modules}; do
-		ebegin "Unloading ${module} kernel module"
-		modprobe -r ${module} > /dev/null
-		eend $? "Failed to unload ${module} kernel module"
-	done
-}
-
-check_configfs() {
-	awk '{ print $2 }' /proc/mounts | grep -sq "/sys/kernel/config" \
-		&& awk '{ print $3 }' /proc/mounts | grep -sq "configfs"
-
-	if [ $? -ne 0 ]; then
-		ewarn "Please add the following line to /etc/fstab:"
-		ewarn "none configfs /sys/kernel/config defaults 0 0"
-		eend 1 "configfs not mounted at /sys/kernel/config"
-	fi
-}
-
-mount_configfs()
-{
-	local module=$(awk '$2 == "configfs" { print $2 }' /proc/filesystems)
-
-	if [ -z "${module}" ]; then
-		load_modules "configfs"
-		rc=$?
-		sleep 1s
-		[ $rc -ne 0 ] && return 1
-	fi
-
-	# configfs
-	awk '{ print $2 }' /proc/mounts | grep -sq "/sys/kernel/config" \
-		&& awk '{ print $3 }' /proc/mounts | grep -sq "configfs" 
-	rc=$?
-
-	if [ $rc -ne 0 ]
-	then
-		ebegin "Mounting ConfigFS"
-		/bin/mount -t configfs none /sys/kernel/config 2>&1
-		rc=$?
-		eend $rc
-	fi
-
-	return $rc
-}
-
-umount_configfs() {
-	local sig retry
-	local entry entries
-
-	entries="$(awk '$3 == "configfs" { print $2 }' /proc/mounts | sort -r)"
-
-	for entry in $entries; do
-		ebegin "Unmounting ConfigFS"
-		umount $entry >/dev/null 2>&1
-		eend $?
-	done
-
-	local module=$(awk '$1 == "configfs" { print $1 }' /proc/modules)
-
-	if [ ! -z "${module}" ]; then
-		unload_modules "configfs"
-		sleep 1s
-	fi
-}
-
-umount_gfs_filesystems() {
-	local sig retry
-	local remaining="$(awk '$3 == "gfs" || $3 == "gfs2" { print $2 }' /proc/mounts | sort -r)"
-
-	if [ -n "${remaining}" ]
-	then
-		sig=
-		retry=3
-		while [ -n "${remaining}" -a "${retry}" -gt 0 ]
-		do
-			if [ "${retry}" -lt 3 ]
-			then
-				ebegin "Unmounting GFS filesystems (retry)"
-				umount ${remaining} >/dev/null 2>&1
-				eend $? "Failed to unmount GFS filesystems this retry"
-			else
-				ebegin "Unmounting GFS filesystems"
-				umount ${remaining} >/dev/null 2>&1
-				eend $? "Failed to unmount GFS filesystems"
-			fi
-			remaining="$(awk '$3 == "gfs" || $3 == "gfs2" { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
-			[ -z "${remaining}" ] && break
-			/bin/fuser -k -m ${sig} ${remaining} >/dev/null 2>&1
-			sleep 5
-			retry=$((${retry} -1))
-			sig=-9
-		done
-	fi
-}
-
-unload_allmodules() {
-	local modules
-
-	modules=$(awk '$1 == "lock_gulm" || \
-		$1 == "lock_dlm" || $1 == "dlm" || \
-		$1 == "lock_harness" || $1 == "gfs2" || \
-		$1 == "gfs" { print $1 }' /proc/modules)
-
-	#modules=$(awk '$1 == "lock_harness" || \
-	#	$1 == "gfs" { print $1 }' /proc/modules)
-
-	unload_modules "${modules}"
-}
-
-start_ccsd() {
-	ebegin "Starting ccsd"
-	start-stop-daemon --start --quiet --exec ${CCSD} -- ${CCSD_OPTS}
-	eend $?
-}
-
-stop_ccsd() {
-	ebegin "Stopping ccsd"
-	start-stop-daemon --stop --quiet -s 9 --exec ${CCSD}
-	eend $?
-}
-
-start_cman() {
-	${CMAN_TOOL} status >/dev/null 2>&1
-	if [ $? -ne 0 ]
-	then
-	        ebegin "Starting cman"
-        	${CMAN_TOOL} -t ${CMAN_CLUSTER_TIMEOUT} \
-                	-w join ${CMAN_JOIN_OPTS} >/dev/null 2>&1
-
-	        if [ "$?" -ne 0 ]
-        	then
-                	eend 1 "Failed to start cman"
-					return 1
-	        else
-        	        eend 0
-
-                	# make sure that we are quorate?
-	                if [ ${CMAN_QUORUM_TIMEOUT} -gt 0 ]
-        	        then
-                	        ebegin "Waiting for quorum (${CMAN_QUORUM_TIMEOUT} secs)"
-                        	${CMAN_TOOL} -t ${CMAN_QUORUM_TIMEOUT} -q wait
-							rc=$?
-	                        eend $rc
-							return $rc
-        	        fi
-	        fi
-	else
-		einfo "cman already running"
-	fi
-}
-
-stop_cman() {
-	ebegin "Stopping cman"
-	local stat=0
-	${CMAN_TOOL} status > /dev/null 2>&1
-	if [ $? -eq 0 ]; then
-		retry=3
-		stat=1
-		while [ "${stat}" -eq 1 -a "${retry}" -gt 0 ]
-		do
-			#sleep 2
-			#${CMAN_TOOL} -w -t ${CMAN_SHUTDOWN_TIMEOUT} \
-			#	leave remove ${CMAN_LEAVE_OPTS} > /dev/null
-			${CMAN_TOOL} leave -t ${CMAN_SHUTDOWN_TIMEOUT} ${CMAN_LEAVE_OPTS} \
-				remove >/dev/null 2>&1
-				stat=$?
-				retry=$((${retry} -1))
-		done
-	fi
-	eend ${stat}
-}
-
-start_groupd() {
-	ebegin "Starting groupd"
-	start-stop-daemon --start --exec ${GROUPD} --name groupd
-	eend $?
-}
-
-stop_groupd() {
-	ebegin "Stopping groupd"
-	start-stop-daemon --stop --exec ${GROUPD} --name groupd
-	eend $?
-}
-
-start_fenced() {
-	ebegin "Starting fenced"
-	start-stop-daemon --start --exec ${FENCED} --name fenced
-	eend $?
-
-	${CMAN_TOOL} status | grep Flags | grep 2node >/dev/null 2>&1
-	local errmsg=$?
-
-	ebegin "Joining fence domain"
-	if [ "${errmsg}" -ne 0 ]
-	then
-		${FENCE_TOOL} join -t $FENCED_START_TIMEOUT >/dev/null 2>&1
-		[ $? -eq 0 ] && errmsg=$? || errmsg=1
-	else
-		${FENCE_TOOL} join -m $FENCED_MEMBER_DELAY >/dev/null 2>&1
-		[ $? -eq 0 ] && errmsg=$? || errmsg=1
-	fi
-	eend $errmsg
-}
-
-stop_fenced() {
-	# fenced services
-#	local fence_status="$( ${CMAN_TOOL} services | awk '$1 ~ /fence/ { print $3 }')"
-#	if [ -n "${fence_status}" ]; then
-#		if [ -x ${FENCE_TOOL} ]; then
-#			ebegin "Leaving fence domain"
-#			${FENCE_TOOL} leave > /dev/null 2>&1
-#			eend $?
-#		fi
-#	fi
-
-	if [ -x ${FENCE_TOOL} ]; then
-		if ${FENCE_TOOL} ls >/dev/null 2>&1; then
-			ebegin "Leaving fence domain"
-			${FENCE_TOOL} leave > /dev/null 2>&1
-			eend $?
-		fi
-	fi
-
-	ebegin "Stopping fenced"
-	start-stop-daemon --stop --exec ${FENCED} --name fenced
-	eend $?
-}
-
-start_gfs_controld() {
-	ebegin "Starting gfs_controld"
-	start-stop-daemon --start --exec ${GFS_CONTROLD} --name gfs_controld
-	eend $?
-}
-
-stop_gfs_controld() {
-	ebegin "Stopping gfs_controld"
-	start-stop-daemon --stop --exec ${GFS_CONTROLD} --name gfs_controld
-	eend $?
-}
-
-start_dlm_controld() {
-	ebegin "Starting dlm_controld"
-	start-stop-daemon --start --exec ${DLM_CONTROLD} --name dlm_controld
-	eend $?
-}
-
-stop_dlm_controld() {
-	ebegin "Stopping dlm_controld"
-	start-stop-daemon --stop --exec ${DLM_CONTROLD} --name dlm_controld
-	eend $?
-}
-
-start() {
-	if ! mount_configfs ; then
-		eerror "ConfigFS & DLM are required to use cman"
-		return 1
-	fi
-
-	[ -e /sys/module/dlm ] || [ -e /sys/kernel/dlm ] || load_modules "dlm"
-	if [ ! -e /sys/kernel/dlm ]; then
-		eerror "ConfigFS & DLM are required to use cman"
-		return 1
-	fi
-    mkdir -p /var/run/cluster
-
-#	start_ccsd
-	if ! start_cman ; then
-		eerror "Failed to start cman"
-		return 1
-	fi
-	if ! start_fenced; then
-		eerror "Failed to start fenced"
-		return 1
-	fi
-	if ! start_groupd; then
-		eerror "Failed to start groupd"
-		return 1
-	fi
-	if ! start_dlm_controld; then
-		eerror "Failed to start dlm_controld"
-		return 1
-	fi
-#	start_gfs_controld
-}
-
-stop() {
-
-# umount GFS filesystems
-#	umount_gfs_filesystems
-
-	stop_dlm_controld
-	stop_groupd
-	stop_fenced
-	stop_cman
-
-	#stop_gfs_controld
-	#stop_dlm_controld
-	#stop_groupd
-
-	unload_modules "dlm"
-#	stop_ccsd
-#	unload_allmodules
-	umount_configfs
-}
diff --git a/sys-cluster/cman/metadata.xml b/sys-cluster/cman/metadata.xml
deleted file mode 100644
index ca6ebb8ce738..000000000000
--- a/sys-cluster/cman/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<longdescription>Cluster Manager</longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/fence-agents/Manifest b/sys-cluster/fence-agents/Manifest
deleted file mode 100644
index 57ea0d4c2dc5..000000000000
--- a/sys-cluster/fence-agents/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST fence-agents-3.1.5.tar.gz 897416 BLAKE2B 5eaae8cd03af16c9a071f110dc3b7151b9dcb2176942e04c95b464644ed7e6b44972b0fefaee72e08855e6b27b0f6b177eb887e3f856529103e1c3508dda196a SHA512 3941e2ec9f7db8dfe9fbf8aa360359fa1ff4f3c2d3e6e778289f0bbc39481a54915dbf93d9a9b66f6953ddd2c81562daa7c90e6c0f59ec42e9bfb779ae242992
-EBUILD fence-agents-3.1.5-r1.ebuild 1683 BLAKE2B 94f5be38404e29b495a7f036d7d44c5a2f7c8ed3b283819088171a54643930b0f07ecdc522b1343205b77ed6904287e3ecba5d9339c4b03d1a842d54ce12c005 SHA512 42049b456c003eabd8b3e1ee850de1496b2a224aec7824215c367f0a5d86e6dc42c7f29d8272a67eeb87b4ed1f2cdbcb62bd3fd5759dbca3ba5018b3afceb8b9
-EBUILD fence-agents-3.1.5-r2.ebuild 1836 BLAKE2B 949f4ba572933ea95fd10cd0f19384d2c0a1dfa9aac1f60682b92c48fe79eabfed3c4b240f9327b876ee8f70a7c71c33e2adb81ca95a4909dd90f5d28658aaed SHA512 340384527415bd8593d5b81fdc3a50fc10603ee93fc8df1e3f7f28031fc28136ee91b904750c19ce0a52e997aafbf0800ce70598f373c6977847d86fb666dcad
-MISC metadata.xml 323 BLAKE2B 5e4be67c1adc13cde9aa864ef0f8320057022077348ed7d7d77bc509482e1ee057b570558548e9e89544b612feef0655ba39d4453c16fc039ba84ccabe0ba297 SHA512 771302bd401362ba141c27bd7c8b34c2a7f1b2ad310035f5af2aab1188b9451d9189536a5ec607479ccfabd7a35bb4fab84e713c5aa9ea85948397ad5c6609a4
diff --git a/sys-cluster/fence-agents/fence-agents-3.1.5-r1.ebuild b/sys-cluster/fence-agents/fence-agents-3.1.5-r1.ebuild
deleted file mode 100644
index a1e725a143fa..000000000000
--- a/sys-cluster/fence-agents/fence-agents-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Cluster Fencing Agents"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/f/e/${PN}/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~sys-cluster/libccs-${PV}"
-DEPEND="${RDEPEND}
-	dev-python/pexpect
-	dev-libs/libxslt
-	dev-python/pexpect
-	dev-python/pycurl
-	dev-python/suds"
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${P} \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var
-}
-
-src_install() {
-	default
-	# dont force /var/run creation on installation wrt #451798
-	rm -rf "${D}"/var/run
-}
-
-pkg_postinst() {
-	if [[ "${ROOT}" != "/" ]] ; then
-		ewarn "You have to run 'ccs_update_schema' in the chroot-environment"
-		ewarn "to update the schema file for the cluster configuration."
-		ewarn "Otherwise you will not be able to define ressources."
-	else
-		elog "Running ccs_update_schema to update the configuration file schema"
-		/usr/sbin/ccs_update_schema -v -f
-	fi
-}
-
-pkg_postrm() {
-	if [[ "${ROOT}" != "/" ]] ; then
-		ewarn "You have to run 'ccs_update_schema' in the chroot-environment"
-		ewarn "to update the schema file for the cluster configuration."
-		ewarn "Otherwise you may be able to define ressources even though they"
-		ewarn "are not present anymore."
-	else
-		elog "Running ccs_update_schema to update the configuration file schema"
-		/usr/sbin/ccs_update_schema -v -f
-	fi
-}
diff --git a/sys-cluster/fence-agents/fence-agents-3.1.5-r2.ebuild b/sys-cluster/fence-agents/fence-agents-3.1.5-r2.ebuild
deleted file mode 100644
index 674b1ea1bb1c..000000000000
--- a/sys-cluster/fence-agents/fence-agents-3.1.5-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit multilib python-any-r1 versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Cluster Fencing Agents"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/f/e/${PN}/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="~sys-cluster/libccs-${PV}"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxslt
-	$(python_gen_any_dep '
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/suds[${PYTHON_USEDEP}]
-	')"
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${P} \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var
-}
-
-src_install() {
-	default
-	# dont force /var/run creation on installation wrt #451798
-	rm -rf "${ED}"/var/run || die
-}
-
-pkg_postinst() {
-	if [[ "${EROOT}" != "/" ]] ; then
-		ewarn "You have to run 'ccs_update_schema' in the chroot-environment"
-		ewarn "to update the schema file for the cluster configuration."
-		ewarn "Otherwise you will not be able to define ressources."
-	else
-		elog "Running ccs_update_schema to update the configuration file schema"
-		ccs_update_schema -v -f
-	fi
-}
-
-pkg_postrm() {
-	if [[ "${EROOT}" != "/" ]] ; then
-		ewarn "You have to run 'ccs_update_schema' in the chroot-environment"
-		ewarn "to update the schema file for the cluster configuration."
-		ewarn "Otherwise you may be able to define ressources even though they"
-		ewarn "are not present anymore."
-	else
-		elog "Running ccs_update_schema to update the configuration file schema"
-		ccs_update_schema -v -f
-	fi
-}
diff --git a/sys-cluster/fence-agents/metadata.xml b/sys-cluster/fence-agents/metadata.xml
deleted file mode 100644
index 5e3ac099a8b6..000000000000
--- a/sys-cluster/fence-agents/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>cluster@gentoo.org</email>
-    <name>Gentoo Cluster Project</name>
-  </maintainer>
-  <longdescription>Cluster Fencing Agents</longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index b3a3c70d2f27..54ef0def2183 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -11,7 +11,9 @@ AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bc
 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7
 DIST glusterfs-4.0.0.tar.gz 7632629 BLAKE2B 9367d2c99452d261d889cf564f3a055e1459ee54377cbf8cf6cc46c8d7f153bb258892fb73fc492d1dc6c5bea156d204971256fefc96f9f4825583d9c1086563 SHA512 acd3c462a8e15fb31f4b30d2e217928488e32d66ae7d1061df3e166354a4ddcdeb0ba0bcc994b7563f83376c882800fad07e190e0086fda987915c195266421f
 DIST glusterfs-4.0.2.tar.gz 7643713 BLAKE2B 6314f81fe1474bcf8c577aa68a32c46a6d1e586b32c698a9e30850080408958c0541c1afe72520574fcabebb0884cf3bf315b22582d932876bbb5a4393e167f0 SHA512 33afed4fb4f6d63f1d2b7caedae1ce41e7f6aa4299fb4a7ee2f5e4bc14c97d66f68097171fded6d1f2141dd7127eb408596cce4f5f7287038a14e387ad5ec5e6
+DIST glusterfs-4.1.5.tar.gz 7783999 BLAKE2B ac1e7732430fe25eec34a8b85b9cd5ce4f43076befec2d91c0156959887d8a0589adb8afb1ee9290e436ce40ab7e5567c3c4ec90017b4398919637e2047f18b9 SHA512 ae557472b6a263e815b8c4d630b606f8e1334b6604799e499e6f53ea6ff60c2a696160fa427943cc3d01ffee91a57787c91f93a1b914179679038e63d291401f
 EBUILD glusterfs-4.0.0-r1.ebuild 6833 BLAKE2B 1cc152dd9040a1186f3948742141895e5465e8d0148f8bd613f1dc51fac107037358dd2cd26a1d0c6179ed3dc088be07304ebff577475c69ba9deed73ec4dd13 SHA512 71876a48177fb52e11ae3c33085fb5266e74e9e7e96fb24b558df125bcb2ad5d5fb2b68d0687a85bb551b15665d7042cc96732fb17cc8f930df3f0d0246cadb1
-EBUILD glusterfs-4.0.2.ebuild 6973 BLAKE2B 0120718997945fac6d71817264302b16fb49205b48fe36ab8d500b46ed6068f02f9dd9a4c1208db2d66aa887b10282b0f697b33caa8d1eca87785837da4e5c49 SHA512 75f08a1add41fcfaf9a0ad65051d5d8964081f7bf79bd6c86e54c35563d3f69447b2a4c7683d9b4a7c0e0d877055e8d5f969b0a853daaa0fc536138e974cd7e0
-EBUILD glusterfs-9999.ebuild 6958 BLAKE2B f7aae180dee4548b93b6c228d473bb335fd804a1e6af07c8fe929b91cbb69d0ea75788c866f7ada44d47ba9c0a426cc775fd6eccad83eb71d0c14725b097108a SHA512 ac0a9ba3d3c33a9c3e86dee2fa6a462e4790616ee535dd53f9f64af68a5172b328b8c7dada8f58966bb965ef117a5803d4ce31d3d124ce7fd42fc63971e4cffc
+EBUILD glusterfs-4.0.2.ebuild 6969 BLAKE2B 7c68b82b15d0754a5b41c9c4a04f4aa2fdcf13215d1af453c726566f7256c646e3cc6da66ac96697d842089a66a0f4e41244d789449a58d5fcb03d7f5d4c18ca SHA512 7a08d139a1c9c81a51d3456c70208c6c2649cd1f124742c3310fa3c33d15d74da54ac115fc7dcccffa4d4473cd88380c8ecb5c85be326a9dd947906369961350
+EBUILD glusterfs-4.1.5.ebuild 6773 BLAKE2B 95ed052a25b4b66c72a95f5cbff2757ff8aa7d567b8555d266f96ea36b6490e06d45ce861e53b5caa2fa2da1cc163eead934ba728525c81666f108c50bb51e7d SHA512 6b4a5fdbacedcfe7f01e3ec9ae45e418f1baeda22a32aa6cfe0dc1516f7237b3e7aa28c306c0974e1e8236785bf62b0c45a9e9b143953211e6952e83a9db3b01
+EBUILD glusterfs-9999.ebuild 6779 BLAKE2B 0461134fcea8e8f237c6fcd4a7579426fa107e1d2c642ac009381e8a102623d37b15c33b696ecd5c127fe2db96e050dcccb2d100539fc16a506dd71a749401b4 SHA512 437fc1cda7440cf04a1c35c8d724542b20faf71fe70da2bf2f4a7048902c576fd5c4c4ee055585fa685933116e60eb161370faf1997bf35497faeb8c7fcad174
 MISC metadata.xml 1724 BLAKE2B 8d164da1feb4e49490543de9841ec60282199451f2dcd6920c6781bcff41cb1248fcea7895501db0501f01a1b87b27e91a068adacd87842630f17efebf4d8954 SHA512 5bc076910d574a03f1b29db15fe1933e1b9b6f0f2cde654a6934397f7fa6f10c5063dd0318248d522da508af1ce56d16f1a204bc4be8429430f189143baaf043
diff --git a/sys-cluster/glusterfs/glusterfs-4.0.2.ebuild b/sys-cluster/glusterfs/glusterfs-4.0.2.ebuild
index 0ee1825274ab..fd1498eb3770 100644
--- a/sys-cluster/glusterfs/glusterfs-4.0.2.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-4.0.2.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=6
@@ -12,7 +12,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
 else
 	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
diff --git a/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild b/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild
new file mode 100644
index 000000000000..4e83d53ebf84
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-4.1.5.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools elisp-common python-single-r1 systemd user
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
+else
+	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut '1-2')/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 x86"
+fi
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 libressl +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+	glupy? ( ${PYTHON_REQUIRED_USE} )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="bd-xlator? ( sys-fs/lvm2 )
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	emacs? ( virtual/emacs )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	qemu-block? ( dev-libs/glib:2 )
+	systemtap? ( dev-util/systemtap )
+	tiering? ( dev-db/sqlite:3 )
+	xml? ( dev-libs/libxml2 )
+	sys-libs/readline:=
+	dev-libs/libaio
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+	dev-libs/userspace-rcu:=
+	net-libs/rpcsvc-proto
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	virtual/acl
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
+	"${FILESDIR}/${PN}-4.1.0-silent_rules.patch"
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python2*"
+	python-single-r1_pkg_setup
+
+	# Needed for statedumps
+	# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
+	enewgroup gluster
+	enewuser gluster -1 -1 "${EPREFIX}"/var/run/gluster gluster
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am |
+		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-silent-rules \
+		--disable-fusermount \
+		$(use_enable debug) \
+		$(use_enable bd-xlator) \
+		$(use_enable crypt-xlator) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable glupy) \
+		$(use_enable infiniband ibverbs) \
+		$(use_enable qemu-block) \
+		$(use_enable static-libs static) \
+		$(use_enable syslog) \
+		$(use_enable systemtap) \
+		$(use_enable test cmocka) \
+		$(use_enable tiering) \
+		$(use_enable xml xml-output) \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
+		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+	fi
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	if use georeplication ; then
+		# move the gsync-sync-gfid tool to a binary path
+		# and set a symlink to be compliant with all other distros
+		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
+		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
+	fi
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	# fix all shebang for python2 #560750
+	python_fix_shebang "${ED}"
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+pkg_postinst() {
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild
index 3284a29382b8..9110a2d46e73 100644
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9999.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools elisp-common python-single-r1 systemd user versionator
+inherit autotools elisp-common python-single-r1 systemd user
 
 if [[ ${PV#9999} != ${PV} ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
 else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
+	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut '1-2')/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.gluster.org/"
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0"
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
+IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 libressl +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
 
 REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
 	glupy? ( ${PYTHON_REQUIRED_USE} )
@@ -44,7 +44,8 @@ RDEPEND="bd-xlator? ( sys-fs/lvm2 )
 	xml? ( dev-libs/libxml2 )
 	sys-libs/readline:=
 	dev-libs/libaio
-	dev-libs/openssl:=[-bindist]
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
 	dev-libs/userspace-rcu:=
 	net-libs/rpcsvc-proto
 	sys-apps/util-linux"
@@ -100,10 +101,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# --without-ipv6-default and --with-libtirpc don't do what you they
-	# do. Chewi has given up fighting with upstream about this.
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1553926
-
 	econf \
 		--disable-dependency-tracking \
 		--disable-silent-rules \
@@ -219,7 +216,7 @@ pkg_postinst() {
 	ewarn "run GlusterFS."
 	echo
 	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(get_version_component_range '1-2')/"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
 
 	use emacs && elisp-site-regen
 }
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 8a27b86b940f..a20f4dd70875 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,8 +1,10 @@
 DIST hpx_0.9.99.tar.gz 3779841 BLAKE2B fae6b06a303964e3d52d68fcfd980f89625bfd2a7c04f3a4b027c47814c677bdcf7f367434aee912be08b67afbb6cfe811831dfdc284c0b785d7eaf8838566a9 SHA512 57c03c01c4a9f770e56a60645ec352338365fe05c544b18ff2e944044284315a7e76bbdc2c7193fe55e6992dcb51a51d1042372fdd141b572bd8e18bf1afc363
 DIST hpx_1.0.0.tar.gz 3972403 BLAKE2B 737282f2b547c2ce7e6e0367df64beaf22760d73840f2f1b983e8b970baef074b376f264a97f8c67873eedc24255ec2515bbf2a5bbcb364f89284f48ac18b177 SHA512 42c155654f118bff34b48d929b1732fd56126b8fd3e7657b5bd2f84275288ddf538572ed1152883c4aed5e9683de53b9b1f1c3613e5092e7bd1a5e165bed606d
 DIST hpx_1.1.0.tar.gz 4374855 BLAKE2B 17caeb085e0167d51a1a89c73bce653938d9918776b9db07ae9171cb11570a440e2f88cea86d8b8066b7d102e9a24f1e8304b47b2ade161cbe4e27cce91e3b84 SHA512 09b69a5f14bdb4cbf629bc3a10a4e1dc4c0ab35efdb74386fc7f0135558db5f9557ae8de4edd0ade12cfb91a78e6cc2fac25efbdf9a21042abcb0f303eda1938
+DIST hpx_1.2.0.tar.gz 3918088 BLAKE2B 7c5eccef6a58f683f94e59e3773e949945652e1fc7c883d134da5b6d32f21bb9a2f526d073260561657da518687ac96487f058715e51236a334b97b27a414451 SHA512 e2dec9484490f5a5fa7d60f712989f70068bcddac643d8b730d2d52aa2a7e49260b28c3becd519925a8e96e9a703473f19955adce087061cf50b861f4fed8ab1
 EBUILD hpx-0.9.99.ebuild 1890 BLAKE2B 4dfb8ac3b1aab563e889b3ea89f9ed0fe8dbb09fe7da47293d03f829dd92fa7a429e55228546d6dbd03c5070a0c9356f56a44b5fc71640586aaf4d122336c76f SHA512 8300f95ef02cbad1e959f6958d680f1cbd46729adf813af54063652ad5e3413e67664be743fe8950ae743d9074cc58c3f0175d3dcbe014e1d734844f2bb50e21
 EBUILD hpx-1.0.0.ebuild 1946 BLAKE2B 948184f9c8be17b11a3b089e39c782bbc2abd858c5bcf1bdb115b8a7cff6a9d5044d872340acf07f1b08d4acf6898435149cc2319f22fe206a270bc3bd1c58f5 SHA512 adacf71dc11747e3d1535044929a3a8f379f46a63c3e95e70eec96f0766eb39f921914899033a8250804930e38796cccdfc5afee6b3b5e617e916ea416339658
 EBUILD hpx-1.1.0.ebuild 1943 BLAKE2B ccfea8c0fd8ef2f50655b82e950ea26a2f9c3a28c31525f6ffe9fee29b75f136fdd301c7d46c550065360a805f767ee8f42d2a4fd3bf17d29cec14ef902c5d3f SHA512 bb4406c69b03d8286ffe21ef322907903846aff77223cef3e1bd9c99b96c78135ca4634c24474a270b7d10f3e2dfb3d7cdebe2f8cca865b85aa1a5eebf5953b5
+EBUILD hpx-1.2.0.ebuild 1943 BLAKE2B ccfea8c0fd8ef2f50655b82e950ea26a2f9c3a28c31525f6ffe9fee29b75f136fdd301c7d46c550065360a805f767ee8f42d2a4fd3bf17d29cec14ef902c5d3f SHA512 bb4406c69b03d8286ffe21ef322907903846aff77223cef3e1bd9c99b96c78135ca4634c24474a270b7d10f3e2dfb3d7cdebe2f8cca865b85aa1a5eebf5953b5
 EBUILD hpx-9999.ebuild 1943 BLAKE2B ccfea8c0fd8ef2f50655b82e950ea26a2f9c3a28c31525f6ffe9fee29b75f136fdd301c7d46c550065360a805f767ee8f42d2a4fd3bf17d29cec14ef902c5d3f SHA512 bb4406c69b03d8286ffe21ef322907903846aff77223cef3e1bd9c99b96c78135ca4634c24474a270b7d10f3e2dfb3d7cdebe2f8cca865b85aa1a5eebf5953b5
 MISC metadata.xml 1015 BLAKE2B 10711221bc93b52b674b0179b1d27ab762fc4f9de3a97e3af2e26296f7b42097aa75ab9acc0f6a5ed3faf053c31a575dd50dd2f1b7a69eb1ad4c7a745a547992 SHA512 a0215ad65388b911bb093d58903fb0b4948bfaaf32db26223c21ee2bd63bc7797f14f01d9a8e1203a27dea6bb6ea70c8f34bbeb22b53f49f70971d5e60ba8949
diff --git a/sys-cluster/hpx/hpx-1.2.0.ebuild b/sys-cluster/hpx/hpx-1.2.0.ebuild
new file mode 100644
index 000000000000..98afc4e22e11
--- /dev/null
+++ b/sys-cluster/hpx/hpx-1.2.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+if [ ${PV} == 9999 ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"
+else
+	SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}_${PV}"
+fi
+
+inherit cmake-utils fortran-2 multilib python-any-r1
+
+DESCRIPTION="C++ runtime system for parallel and distributed applications"
+HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
+
+SLOT="0"
+LICENSE="Boost-1.0"
+IUSE="doc examples jemalloc papi +perftools tbb test"
+
+RDEPEND="
+	tbb? ( dev-cpp/tbb )
+	>=dev-libs/boost-1.49
+	papi? ( dev-libs/papi )
+	perftools? ( >=dev-util/google-perftools-1.7.1 )
+	>=sys-apps/hwloc-1.8
+	>=sys-libs/libunwind-1
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+	doc? ( >=dev-libs/boost-1.56.0-r1:=[tools] )
+"
+REQUIRED_USE="
+	jemalloc? ( !perftools !tbb )
+	perftools? ( !jemalloc !tbb )
+	tbb? ( !jemalloc !perftools )
+	"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE=Release
+	local mycmakeargs=(
+		-DHPX_BUILD_EXAMPLES=OFF
+		-DHPX_MALLOC=system
+		-DLIB=$(get_libdir)
+		-Dcmake_dir=cmake
+		-DHPX_BUILD_DOCUMENTATION=$(usex doc)
+		-DHPX_JEMALLOC=$(usex jemalloc)
+		-DBUILD_TESTING=$(usex test)
+		-DHPX_GOOGLE_PERFTOOLS=$(usex perftools)
+		-DHPX_PAPI=$(usex papi)
+	)
+
+	use perftools && mycmakeargs+=( -DHPX_MALLOC=tcmalloc )
+	use jemalloc && mycmakeargs+=( -DHPX_MALLOC=jemalloc )
+	use tbb && mycmakeargs+=( -DHPX_MALLOC=tbbmalloc )
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# avoid over-suscribing
+	cmake-utils_src_make -j1 tests
+}
+
+src_install() {
+	cmake-utils_src_install
+	mv "${D}/usr/bin/spin" "${D}/usr/bin/hpx_spin"
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 7f8d16d62a33..4e337a913db0 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -10,5 +10,5 @@ DIST keepalived-1.4.5.tar.gz 749813 BLAKE2B ff379d46b5f5a4912feeb1e9a039a95a7602
 DIST keepalived-2.0.10.tar.gz 927631 BLAKE2B 0cb4c5c613ae2c58f993930c446cdcafdff8a049a9fb1e31f61d7afe2406b2dde2258d450913577ef8ee18d0171f57e4ad01727d9e0f489cfe25b35826770181 SHA512 e76562e5d9d9dc945f0c9702f5f3c6be6acd8c66a59aea1f8287810a2eeb4c65b6cb7e1cd84c1e478978f7db94dba7f8a918ca4847f90a6554b20d757addd2db
 EBUILD keepalived-1.4.3.ebuild 1588 BLAKE2B 883a6e48223274e117fe82c86e02a3a7358ce4d8f8aeec823701d72f795680526248475caa163c44696007cd07183fe84490ff519805069d559b7f74292df668 SHA512 360c4e72a3e88903f99e8a2ed91df6b914254e42236cb974162bc67f0f392ecc50444d17bd1a6233d2fa8ec0fa981891dbd8eb4cb789d495a82912ae32cdd0ce
 EBUILD keepalived-1.4.5.ebuild 1595 BLAKE2B d58bf0c8d4ca830f54a427886abc61fe3190460c9d70df3f4d5801aaedb6792bef21dc7bb96986490366558693014475a4b4fc021fbd9234e0770796be74c1d3 SHA512 19d32a2f32bb3b554ee727b6561e3514ba4e4d3e1a386d629e09b1d943260a50de8a866a50f20a2bfe3e70cecdccefc01c3160ac19377d2aac40e4169856e764
-EBUILD keepalived-2.0.10-r1.ebuild 1777 BLAKE2B 437b7bb72f0b4a63ef35cdde21cbf1cf54428dfc62c1633cff40359aaf6fbfdc118f0dd246dda12c5f41b47a235bc1baa6e07635c063044446ad4d62422a0bd0 SHA512 2a6867ddd3c85d5160fdb4b6c6beb6cf10f5664ffd5c105f7274edf2045c30361cae0131735f4bd920653a8497f1ad14d157f932163a0ca231518c1f6f3389da
+EBUILD keepalived-2.0.10-r1.ebuild 1797 BLAKE2B a658ff206c2e2de5ee314ad67ca190373a2faa976b5c5c6cc15ff93fb2d6fbacdcd04d3046bf569a93e20a2ec392cf5508b742203427645bc2fed3e750d64bbe SHA512 12f04ee5c99d58a4fb1ad4c02be0b643b71caac7780fe6a6b2ee2f385e19d95330a2519c8217bbec05e1b2491d59680f754387ee718b5aa646ea8023330691aa
 MISC metadata.xml 471 BLAKE2B 2dfba9fe3d7d39f8484baa1f1be9a59b5da8f6cc0da4a3af1ec07e5daf4f2522f802af51048463dfad54bfbffe0286ce8a3b9ff8889139ca32693bad378937e3 SHA512 203c93aaf60f7d0dcc6150fff2a4a3dd61fa4d6cfab26452d8efeed1d79096b17db7e47700582475b7e6607ae70521c32cc91015e7852dde22a7d828740946af
diff --git a/sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild b/sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild
index a9e8dd029002..ca1663917158 100644
--- a/sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ~ppc64 ~s390 sparc x86"
 IUSE="dbus debug ipv6 -json snmp"
 
 RDEPEND="dev-libs/libnl:=
@@ -43,6 +43,7 @@ src_prepare() {
 src_configure() {
 	STRIP=/bin/true \
 	econf \
+		--with-init=custom \
 		--with-kernel-dir=/usr \
 		--enable-sha1 \
 		--enable-vrrp \
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index c68951adc858..bdb29d73b806 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,30 +1,12 @@
 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.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
-DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
-DIST kubernetes-1.10.9.tar.gz 25071180 BLAKE2B 851b99258c61ef238c92ee2bc6918d53fe09299997ce15ec4c38f4061746b01215aad8b6832a044ec96c5f88d61f7629722621c7bb0f4a53176f3c76a2aad4ec SHA512 ebc859304c337b4dc92f4e1122a6ff8ef8e0564757bd1dea5050f7a295da752fe72f81f2fc86aea45dcba9b9c3690140c75f461951b839761d5c636b9b0d2a5b
-DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
-DIST kubernetes-1.11.2.tar.gz 24780381 BLAKE2B 020768d7acfbcd2feebea677db52bda785bbe9862327a0734cd8b2f66439c9e0538caebd12c706aada2513b277d37c3e3a3ff47e9eaeff31e75b06040b0b853a SHA512 1e61c3ee5f74e9320d8887c9869c3e2cc1ca57f1e8eb83b92c39a8b1a81a82568b966219696ff420f9c0798f6793b311a959294e6f4b0fd9be59daf180147271
-DIST kubernetes-1.11.3.tar.gz 24788666 BLAKE2B b388132696b901901cdd5a9f0ab35ebea9533fe178bdf62bf0f1524b92bbb74e5d39c79c045ce0358ceabc8d68e87cb5e1603b0acf6a29f9bb557815e1ebed7e SHA512 f25f7e7738b75bbea62e9c5b0a73f93086f460277acac864c06baf69f565b8fcfb6b09836b8c7fbb8dcec9efc4943b88f5fd8a361007270c7900e7e48c1d5cc5
-DIST kubernetes-1.11.4.tar.gz 24804063 BLAKE2B b102f143bfa62258ed78b03fd1e246481661d12a9c8a871e7ca3683b5f17ed7de9116e507a3e4af533e79bd279021f65f5e19cde41e0d5a87ac69ae271db7100 SHA512 4d57c96b5bc734e0493ed05ee948381cb50b11dfbcb12377b31404afb1a6b10ad0709c13b953be145fb3eb79f27ab54d7672aa92f856f1ccfbb8000479ac063b
-DIST kubernetes-1.12.0.tar.gz 27995428 BLAKE2B 5665425ec3cab7128e33c2e8bff49a66c306284604af88fa9a914d148638b1e894645cfd822bc288b567e97238018725bcefba89ba697734c5f74971358ad73a SHA512 6e5286d4817b1fbb4677277674e48758c9a5f820fe7d839162e6298736233143feccdbfb8fd14a64d0fb72a25abe18818cf9852737932e878b25efcf333d983f
-DIST kubernetes-1.12.2.tar.gz 28035976 BLAKE2B 4e6d0895a03bdf176fef46641a8e0e7ba440828a2a5852f57976c92bc1c95e6ede879cb17d45e26dd66a20777dad4d063b2b0fb541172c97a0886309df033202 SHA512 7d59a28465ceacc0559da0436f0459192977447f622b9b1b7c323b2cc4a7c38d5a4100e00287c37251d1da641c04692813afa65df4051436b9144e438396cbb2
-DIST kubernetes-1.9.10.tar.gz 23592498 BLAKE2B 021ffbb933a5b541d43617fe36967b91cb1895d4fb6ce7f3651b682976699288646b45d5d0a5698131eedc19f4aa7a125d353971d2ecd44a2fd8510a95fac423 SHA512 621a2c1c76f993ad61087916fc5946aa3f1b3dec93c7024e518de613063a605500d38e763ed55a35967acb8548d63b65a7d8482f68695dc7600c23d3c38187e9
+DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
+DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
+DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
-DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
-DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
-EBUILD kube-apiserver-1.10.4.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
-EBUILD kube-apiserver-1.10.5.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
-EBUILD kube-apiserver-1.10.9.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
-EBUILD kube-apiserver-1.11.1.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
-EBUILD kube-apiserver-1.11.2.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
-EBUILD kube-apiserver-1.11.3.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
-EBUILD kube-apiserver-1.11.4.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
-EBUILD kube-apiserver-1.12.0.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
-EBUILD kube-apiserver-1.12.2.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
-EBUILD kube-apiserver-1.9.10.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
+EBUILD kube-apiserver-1.10.11.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
+EBUILD kube-apiserver-1.11.5.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
+EBUILD kube-apiserver-1.12.3.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
 EBUILD kube-apiserver-1.9.11.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
-EBUILD kube-apiserver-1.9.8.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
-EBUILD kube-apiserver-1.9.9.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.10.9.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.10.11.ebuild
index 6e2ee447e5a0..6e2ee447e5a0 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.10.9.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.10.11.ebuild
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.10.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.10.4.ebuild
deleted file mode 100644
index 2cef73774731..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.10.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-apiserver/kube-apiserver-1.10.5.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.10.5.ebuild
deleted file mode 100644
index 2cef73774731..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.10.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-apiserver/kube-apiserver-1.11.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.11.1.ebuild
deleted file mode 100644
index 2cef73774731..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.11.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-apiserver/kube-apiserver-1.11.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.11.2.ebuild
deleted file mode 100644
index 2cef73774731..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.11.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-apiserver/kube-apiserver-1.11.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.11.3.ebuild
deleted file mode 100644
index 2cef73774731..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.11.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-apiserver/kube-apiserver-1.11.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.11.5.ebuild
index 6e2ee447e5a0..6e2ee447e5a0 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.11.4.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.11.5.ebuild
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.12.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.12.2.ebuild
deleted file mode 100644
index 6e2ee447e5a0..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.12.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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-apiserver/kube-apiserver-1.12.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.12.3.ebuild
index 6e2ee447e5a0..6e2ee447e5a0 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.12.0.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.12.3.ebuild
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.9.10.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.9.10.ebuild
deleted file mode 100644
index 2cef73774731..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.9.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-apiserver/kube-apiserver-1.9.8.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.9.8.ebuild
deleted file mode 100644
index 2cef73774731..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.9.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-apiserver/kube-apiserver-1.9.9.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.9.9.ebuild
deleted file mode 100644
index 2cef73774731..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.9.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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 17c3a089f9c0..a12702902af2 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,30 +1,12 @@
 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.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
-DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
-DIST kubernetes-1.10.9.tar.gz 25071180 BLAKE2B 851b99258c61ef238c92ee2bc6918d53fe09299997ce15ec4c38f4061746b01215aad8b6832a044ec96c5f88d61f7629722621c7bb0f4a53176f3c76a2aad4ec SHA512 ebc859304c337b4dc92f4e1122a6ff8ef8e0564757bd1dea5050f7a295da752fe72f81f2fc86aea45dcba9b9c3690140c75f461951b839761d5c636b9b0d2a5b
-DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
-DIST kubernetes-1.11.2.tar.gz 24780381 BLAKE2B 020768d7acfbcd2feebea677db52bda785bbe9862327a0734cd8b2f66439c9e0538caebd12c706aada2513b277d37c3e3a3ff47e9eaeff31e75b06040b0b853a SHA512 1e61c3ee5f74e9320d8887c9869c3e2cc1ca57f1e8eb83b92c39a8b1a81a82568b966219696ff420f9c0798f6793b311a959294e6f4b0fd9be59daf180147271
-DIST kubernetes-1.11.3.tar.gz 24788666 BLAKE2B b388132696b901901cdd5a9f0ab35ebea9533fe178bdf62bf0f1524b92bbb74e5d39c79c045ce0358ceabc8d68e87cb5e1603b0acf6a29f9bb557815e1ebed7e SHA512 f25f7e7738b75bbea62e9c5b0a73f93086f460277acac864c06baf69f565b8fcfb6b09836b8c7fbb8dcec9efc4943b88f5fd8a361007270c7900e7e48c1d5cc5
-DIST kubernetes-1.11.4.tar.gz 24804063 BLAKE2B b102f143bfa62258ed78b03fd1e246481661d12a9c8a871e7ca3683b5f17ed7de9116e507a3e4af533e79bd279021f65f5e19cde41e0d5a87ac69ae271db7100 SHA512 4d57c96b5bc734e0493ed05ee948381cb50b11dfbcb12377b31404afb1a6b10ad0709c13b953be145fb3eb79f27ab54d7672aa92f856f1ccfbb8000479ac063b
-DIST kubernetes-1.12.0.tar.gz 27995428 BLAKE2B 5665425ec3cab7128e33c2e8bff49a66c306284604af88fa9a914d148638b1e894645cfd822bc288b567e97238018725bcefba89ba697734c5f74971358ad73a SHA512 6e5286d4817b1fbb4677277674e48758c9a5f820fe7d839162e6298736233143feccdbfb8fd14a64d0fb72a25abe18818cf9852737932e878b25efcf333d983f
-DIST kubernetes-1.12.2.tar.gz 28035976 BLAKE2B 4e6d0895a03bdf176fef46641a8e0e7ba440828a2a5852f57976c92bc1c95e6ede879cb17d45e26dd66a20777dad4d063b2b0fb541172c97a0886309df033202 SHA512 7d59a28465ceacc0559da0436f0459192977447f622b9b1b7c323b2cc4a7c38d5a4100e00287c37251d1da641c04692813afa65df4051436b9144e438396cbb2
-DIST kubernetes-1.9.10.tar.gz 23592498 BLAKE2B 021ffbb933a5b541d43617fe36967b91cb1895d4fb6ce7f3651b682976699288646b45d5d0a5698131eedc19f4aa7a125d353971d2ecd44a2fd8510a95fac423 SHA512 621a2c1c76f993ad61087916fc5946aa3f1b3dec93c7024e518de613063a605500d38e763ed55a35967acb8548d63b65a7d8482f68695dc7600c23d3c38187e9
+DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
+DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
+DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
-DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
-DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
-EBUILD kube-controller-manager-1.10.4.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
-EBUILD kube-controller-manager-1.10.5.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
-EBUILD kube-controller-manager-1.10.9.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
-EBUILD kube-controller-manager-1.11.1.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
-EBUILD kube-controller-manager-1.11.2.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
-EBUILD kube-controller-manager-1.11.3.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
-EBUILD kube-controller-manager-1.11.4.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
-EBUILD kube-controller-manager-1.12.0.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
-EBUILD kube-controller-manager-1.12.2.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
-EBUILD kube-controller-manager-1.9.10.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
+EBUILD kube-controller-manager-1.10.11.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
+EBUILD kube-controller-manager-1.11.5.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
+EBUILD kube-controller-manager-1.12.3.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
 EBUILD kube-controller-manager-1.9.11.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
-EBUILD kube-controller-manager-1.9.8.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
-EBUILD kube-controller-manager-1.9.9.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.10.9.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.11.ebuild
index f985f1f4f06f..f985f1f4f06f 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.9.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.11.ebuild
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.4.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.4.ebuild
deleted file mode 100644
index 3a0b835d0991..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-controller-manager/kube-controller-manager-1.10.5.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.5.ebuild
deleted file mode 100644
index 3a0b835d0991..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-controller-manager/kube-controller-manager-1.11.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.1.ebuild
deleted file mode 100644
index 3a0b835d0991..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-controller-manager/kube-controller-manager-1.11.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.2.ebuild
deleted file mode 100644
index 3a0b835d0991..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-controller-manager/kube-controller-manager-1.11.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.3.ebuild
deleted file mode 100644
index 3a0b835d0991..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-controller-manager/kube-controller-manager-1.11.4.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.5.ebuild
index f985f1f4f06f..f985f1f4f06f 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.4.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.5.ebuild
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.12.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.12.2.ebuild
deleted file mode 100644
index f985f1f4f06f..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.12.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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-controller-manager/kube-controller-manager-1.12.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.12.3.ebuild
index f985f1f4f06f..f985f1f4f06f 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.12.0.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.12.3.ebuild
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.10.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.10.ebuild
deleted file mode 100644
index 3a0b835d0991..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-controller-manager/kube-controller-manager-1.9.8.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.8.ebuild
deleted file mode 100644
index 3a0b835d0991..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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-controller-manager/kube-controller-manager-1.9.9.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.9.ebuild
deleted file mode 100644
index 3a0b835d0991..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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 5e770c1869bf..9c814c166989 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,30 +1,12 @@
 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.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
-DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
-DIST kubernetes-1.10.9.tar.gz 25071180 BLAKE2B 851b99258c61ef238c92ee2bc6918d53fe09299997ce15ec4c38f4061746b01215aad8b6832a044ec96c5f88d61f7629722621c7bb0f4a53176f3c76a2aad4ec SHA512 ebc859304c337b4dc92f4e1122a6ff8ef8e0564757bd1dea5050f7a295da752fe72f81f2fc86aea45dcba9b9c3690140c75f461951b839761d5c636b9b0d2a5b
-DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
-DIST kubernetes-1.11.2.tar.gz 24780381 BLAKE2B 020768d7acfbcd2feebea677db52bda785bbe9862327a0734cd8b2f66439c9e0538caebd12c706aada2513b277d37c3e3a3ff47e9eaeff31e75b06040b0b853a SHA512 1e61c3ee5f74e9320d8887c9869c3e2cc1ca57f1e8eb83b92c39a8b1a81a82568b966219696ff420f9c0798f6793b311a959294e6f4b0fd9be59daf180147271
-DIST kubernetes-1.11.3.tar.gz 24788666 BLAKE2B b388132696b901901cdd5a9f0ab35ebea9533fe178bdf62bf0f1524b92bbb74e5d39c79c045ce0358ceabc8d68e87cb5e1603b0acf6a29f9bb557815e1ebed7e SHA512 f25f7e7738b75bbea62e9c5b0a73f93086f460277acac864c06baf69f565b8fcfb6b09836b8c7fbb8dcec9efc4943b88f5fd8a361007270c7900e7e48c1d5cc5
-DIST kubernetes-1.11.4.tar.gz 24804063 BLAKE2B b102f143bfa62258ed78b03fd1e246481661d12a9c8a871e7ca3683b5f17ed7de9116e507a3e4af533e79bd279021f65f5e19cde41e0d5a87ac69ae271db7100 SHA512 4d57c96b5bc734e0493ed05ee948381cb50b11dfbcb12377b31404afb1a6b10ad0709c13b953be145fb3eb79f27ab54d7672aa92f856f1ccfbb8000479ac063b
-DIST kubernetes-1.12.0.tar.gz 27995428 BLAKE2B 5665425ec3cab7128e33c2e8bff49a66c306284604af88fa9a914d148638b1e894645cfd822bc288b567e97238018725bcefba89ba697734c5f74971358ad73a SHA512 6e5286d4817b1fbb4677277674e48758c9a5f820fe7d839162e6298736233143feccdbfb8fd14a64d0fb72a25abe18818cf9852737932e878b25efcf333d983f
-DIST kubernetes-1.12.2.tar.gz 28035976 BLAKE2B 4e6d0895a03bdf176fef46641a8e0e7ba440828a2a5852f57976c92bc1c95e6ede879cb17d45e26dd66a20777dad4d063b2b0fb541172c97a0886309df033202 SHA512 7d59a28465ceacc0559da0436f0459192977447f622b9b1b7c323b2cc4a7c38d5a4100e00287c37251d1da641c04692813afa65df4051436b9144e438396cbb2
-DIST kubernetes-1.9.10.tar.gz 23592498 BLAKE2B 021ffbb933a5b541d43617fe36967b91cb1895d4fb6ce7f3651b682976699288646b45d5d0a5698131eedc19f4aa7a125d353971d2ecd44a2fd8510a95fac423 SHA512 621a2c1c76f993ad61087916fc5946aa3f1b3dec93c7024e518de613063a605500d38e763ed55a35967acb8548d63b65a7d8482f68695dc7600c23d3c38187e9
+DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
+DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
+DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
-DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
-DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
-EBUILD kube-proxy-1.10.4.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
-EBUILD kube-proxy-1.10.5.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
-EBUILD kube-proxy-1.10.9.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
-EBUILD kube-proxy-1.11.1.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
-EBUILD kube-proxy-1.11.2.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
-EBUILD kube-proxy-1.11.3.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
-EBUILD kube-proxy-1.11.4.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
-EBUILD kube-proxy-1.12.0.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
-EBUILD kube-proxy-1.12.2.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
-EBUILD kube-proxy-1.9.10.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
+EBUILD kube-proxy-1.10.11.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
+EBUILD kube-proxy-1.11.5.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
+EBUILD kube-proxy-1.12.3.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
 EBUILD kube-proxy-1.9.11.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
-EBUILD kube-proxy-1.9.8.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
-EBUILD kube-proxy-1.9.9.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.10.9.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.10.11.ebuild
index ecd6ebd729ef..ecd6ebd729ef 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.10.9.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.10.11.ebuild
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.10.4.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.10.4.ebuild
deleted file mode 100644
index 882a7f40ebcc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.10.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 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-proxy/kube-proxy-1.10.5.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.10.5.ebuild
deleted file mode 100644
index 882a7f40ebcc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.10.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 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-proxy/kube-proxy-1.11.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.11.1.ebuild
deleted file mode 100644
index 882a7f40ebcc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.11.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 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-proxy/kube-proxy-1.11.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.11.2.ebuild
deleted file mode 100644
index 882a7f40ebcc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.11.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 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-proxy/kube-proxy-1.11.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.11.3.ebuild
deleted file mode 100644
index 882a7f40ebcc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.11.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 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-proxy/kube-proxy-1.11.4.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.11.5.ebuild
index ecd6ebd729ef..ecd6ebd729ef 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.11.4.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.11.5.ebuild
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.12.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.12.2.ebuild
deleted file mode 100644
index ecd6ebd729ef..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.12.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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-proxy/kube-proxy-1.12.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.12.3.ebuild
index ecd6ebd729ef..ecd6ebd729ef 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.12.0.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.12.3.ebuild
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.9.10.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.9.10.ebuild
deleted file mode 100644
index 882a7f40ebcc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.9.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 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-proxy/kube-proxy-1.9.8.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.9.8.ebuild
deleted file mode 100644
index 882a7f40ebcc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.9.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 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-proxy/kube-proxy-1.9.9.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.9.9.ebuild
deleted file mode 100644
index 882a7f40ebcc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.9.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 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 244ab81e32cf..d855d0ff0c2c 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,30 +1,12 @@
 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.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
-DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
-DIST kubernetes-1.10.9.tar.gz 25071180 BLAKE2B 851b99258c61ef238c92ee2bc6918d53fe09299997ce15ec4c38f4061746b01215aad8b6832a044ec96c5f88d61f7629722621c7bb0f4a53176f3c76a2aad4ec SHA512 ebc859304c337b4dc92f4e1122a6ff8ef8e0564757bd1dea5050f7a295da752fe72f81f2fc86aea45dcba9b9c3690140c75f461951b839761d5c636b9b0d2a5b
-DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
-DIST kubernetes-1.11.2.tar.gz 24780381 BLAKE2B 020768d7acfbcd2feebea677db52bda785bbe9862327a0734cd8b2f66439c9e0538caebd12c706aada2513b277d37c3e3a3ff47e9eaeff31e75b06040b0b853a SHA512 1e61c3ee5f74e9320d8887c9869c3e2cc1ca57f1e8eb83b92c39a8b1a81a82568b966219696ff420f9c0798f6793b311a959294e6f4b0fd9be59daf180147271
-DIST kubernetes-1.11.3.tar.gz 24788666 BLAKE2B b388132696b901901cdd5a9f0ab35ebea9533fe178bdf62bf0f1524b92bbb74e5d39c79c045ce0358ceabc8d68e87cb5e1603b0acf6a29f9bb557815e1ebed7e SHA512 f25f7e7738b75bbea62e9c5b0a73f93086f460277acac864c06baf69f565b8fcfb6b09836b8c7fbb8dcec9efc4943b88f5fd8a361007270c7900e7e48c1d5cc5
-DIST kubernetes-1.11.4.tar.gz 24804063 BLAKE2B b102f143bfa62258ed78b03fd1e246481661d12a9c8a871e7ca3683b5f17ed7de9116e507a3e4af533e79bd279021f65f5e19cde41e0d5a87ac69ae271db7100 SHA512 4d57c96b5bc734e0493ed05ee948381cb50b11dfbcb12377b31404afb1a6b10ad0709c13b953be145fb3eb79f27ab54d7672aa92f856f1ccfbb8000479ac063b
-DIST kubernetes-1.12.0.tar.gz 27995428 BLAKE2B 5665425ec3cab7128e33c2e8bff49a66c306284604af88fa9a914d148638b1e894645cfd822bc288b567e97238018725bcefba89ba697734c5f74971358ad73a SHA512 6e5286d4817b1fbb4677277674e48758c9a5f820fe7d839162e6298736233143feccdbfb8fd14a64d0fb72a25abe18818cf9852737932e878b25efcf333d983f
-DIST kubernetes-1.12.2.tar.gz 28035976 BLAKE2B 4e6d0895a03bdf176fef46641a8e0e7ba440828a2a5852f57976c92bc1c95e6ede879cb17d45e26dd66a20777dad4d063b2b0fb541172c97a0886309df033202 SHA512 7d59a28465ceacc0559da0436f0459192977447f622b9b1b7c323b2cc4a7c38d5a4100e00287c37251d1da641c04692813afa65df4051436b9144e438396cbb2
-DIST kubernetes-1.9.10.tar.gz 23592498 BLAKE2B 021ffbb933a5b541d43617fe36967b91cb1895d4fb6ce7f3651b682976699288646b45d5d0a5698131eedc19f4aa7a125d353971d2ecd44a2fd8510a95fac423 SHA512 621a2c1c76f993ad61087916fc5946aa3f1b3dec93c7024e518de613063a605500d38e763ed55a35967acb8548d63b65a7d8482f68695dc7600c23d3c38187e9
+DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
+DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
+DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
-DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
-DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
-EBUILD kube-scheduler-1.10.4.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
-EBUILD kube-scheduler-1.10.5.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
-EBUILD kube-scheduler-1.10.9.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
-EBUILD kube-scheduler-1.11.1.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
-EBUILD kube-scheduler-1.11.2.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
-EBUILD kube-scheduler-1.11.3.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
-EBUILD kube-scheduler-1.11.4.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
-EBUILD kube-scheduler-1.12.0.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
-EBUILD kube-scheduler-1.12.2.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
-EBUILD kube-scheduler-1.9.10.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
+EBUILD kube-scheduler-1.10.11.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
+EBUILD kube-scheduler-1.11.5.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
+EBUILD kube-scheduler-1.12.3.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
 EBUILD kube-scheduler-1.9.11.ebuild 1220 BLAKE2B 032c4eb322e2c7f7d9a898472b0b68a5907f963119b53098bed3bb3336af5098546a273c4c4493e20d3881bd94db22f36a8956832241be7845f16c565cdd7d8e SHA512 c1f9ab8c156c9ce96ab8e4fd31b811739d9859f17b502e32922e904805d791b85fb6529b7e305791ce8329b34a189a0c4a941e11961960cf01aa8b6abb4537f7
-EBUILD kube-scheduler-1.9.8.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
-EBUILD kube-scheduler-1.9.9.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.10.9.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.10.11.ebuild
index 81b22a7c9dea..81b22a7c9dea 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.10.9.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.10.11.ebuild
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.10.4.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.10.4.ebuild
deleted file mode 100644
index 576989d30fd3..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.10.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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 Scheduler"
-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-scheduler/kube-scheduler-1.10.5.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.10.5.ebuild
deleted file mode 100644
index 576989d30fd3..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.10.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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 Scheduler"
-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-scheduler/kube-scheduler-1.11.1.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.11.1.ebuild
deleted file mode 100644
index 576989d30fd3..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.11.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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 Scheduler"
-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-scheduler/kube-scheduler-1.11.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.11.2.ebuild
deleted file mode 100644
index 576989d30fd3..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.11.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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 Scheduler"
-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-scheduler/kube-scheduler-1.11.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.11.5.ebuild
index 81b22a7c9dea..81b22a7c9dea 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.11.3.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.11.5.ebuild
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.12.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.12.0.ebuild
deleted file mode 100644
index 81b22a7c9dea..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.12.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 Scheduler"
-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-scheduler/kube-scheduler-1.12.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.12.2.ebuild
deleted file mode 100644
index 81b22a7c9dea..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.12.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 Scheduler"
-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-scheduler/kube-scheduler-1.11.4.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.12.3.ebuild
index 81b22a7c9dea..81b22a7c9dea 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.11.4.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.12.3.ebuild
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.9.10.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.9.10.ebuild
deleted file mode 100644
index 170c510184ff..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.9.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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/kube-scheduler/kube-scheduler-1.9.8.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.9.8.ebuild
deleted file mode 100644
index 170c510184ff..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.9.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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/kube-scheduler/kube-scheduler-1.9.9.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.9.9.ebuild
deleted file mode 100644
index 170c510184ff..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.9.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 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 349a8d8e5f94..70826ab116e3 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,25 +1,13 @@
-DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
-DIST kubernetes-1.10.9.tar.gz 25071180 BLAKE2B 851b99258c61ef238c92ee2bc6918d53fe09299997ce15ec4c38f4061746b01215aad8b6832a044ec96c5f88d61f7629722621c7bb0f4a53176f3c76a2aad4ec SHA512 ebc859304c337b4dc92f4e1122a6ff8ef8e0564757bd1dea5050f7a295da752fe72f81f2fc86aea45dcba9b9c3690140c75f461951b839761d5c636b9b0d2a5b
-DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
-DIST kubernetes-1.11.2.tar.gz 24780381 BLAKE2B 020768d7acfbcd2feebea677db52bda785bbe9862327a0734cd8b2f66439c9e0538caebd12c706aada2513b277d37c3e3a3ff47e9eaeff31e75b06040b0b853a SHA512 1e61c3ee5f74e9320d8887c9869c3e2cc1ca57f1e8eb83b92c39a8b1a81a82568b966219696ff420f9c0798f6793b311a959294e6f4b0fd9be59daf180147271
-DIST kubernetes-1.11.3.tar.gz 24788666 BLAKE2B b388132696b901901cdd5a9f0ab35ebea9533fe178bdf62bf0f1524b92bbb74e5d39c79c045ce0358ceabc8d68e87cb5e1603b0acf6a29f9bb557815e1ebed7e SHA512 f25f7e7738b75bbea62e9c5b0a73f93086f460277acac864c06baf69f565b8fcfb6b09836b8c7fbb8dcec9efc4943b88f5fd8a361007270c7900e7e48c1d5cc5
-DIST kubernetes-1.11.4.tar.gz 24804063 BLAKE2B b102f143bfa62258ed78b03fd1e246481661d12a9c8a871e7ca3683b5f17ed7de9116e507a3e4af533e79bd279021f65f5e19cde41e0d5a87ac69ae271db7100 SHA512 4d57c96b5bc734e0493ed05ee948381cb50b11dfbcb12377b31404afb1a6b10ad0709c13b953be145fb3eb79f27ab54d7672aa92f856f1ccfbb8000479ac063b
-DIST kubernetes-1.12.0.tar.gz 27995428 BLAKE2B 5665425ec3cab7128e33c2e8bff49a66c306284604af88fa9a914d148638b1e894645cfd822bc288b567e97238018725bcefba89ba697734c5f74971358ad73a SHA512 6e5286d4817b1fbb4677277674e48758c9a5f820fe7d839162e6298736233143feccdbfb8fd14a64d0fb72a25abe18818cf9852737932e878b25efcf333d983f
-DIST kubernetes-1.12.2.tar.gz 28035976 BLAKE2B 4e6d0895a03bdf176fef46641a8e0e7ba440828a2a5852f57976c92bc1c95e6ede879cb17d45e26dd66a20777dad4d063b2b0fb541172c97a0886309df033202 SHA512 7d59a28465ceacc0559da0436f0459192977447f622b9b1b7c323b2cc4a7c38d5a4100e00287c37251d1da641c04692813afa65df4051436b9144e438396cbb2
-DIST kubernetes-1.9.10.tar.gz 23592498 BLAKE2B 021ffbb933a5b541d43617fe36967b91cb1895d4fb6ce7f3651b682976699288646b45d5d0a5698131eedc19f4aa7a125d353971d2ecd44a2fd8510a95fac423 SHA512 621a2c1c76f993ad61087916fc5946aa3f1b3dec93c7024e518de613063a605500d38e763ed55a35967acb8548d63b65a7d8482f68695dc7600c23d3c38187e9
+DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
+DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
+DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
+DIST kubernetes-1.13.0.tar.gz 28687604 BLAKE2B 9ea15d385a99a53a658f5e5d29e2fb84034a5abde9dca090294091e0b54aa695fabaccdce91595547303cc29e86c872f4bab8dca2d8a69992d056fd24c1865e8 SHA512 df5357c339eaa2299c08fcc9de24eb5ad90cd960af9cca356f404d500344d74ef1d682115d75d5ff8496cd7c24c84ece9452189d5a31b3f9e745721b9b98fbe2
+DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
-DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
-DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
-EBUILD kubectl-1.10.5.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
-EBUILD kubectl-1.10.9.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
-EBUILD kubectl-1.11.1.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
-EBUILD kubectl-1.11.2.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
-EBUILD kubectl-1.11.3.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
-EBUILD kubectl-1.11.4.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
-EBUILD kubectl-1.12.0.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
-EBUILD kubectl-1.12.2.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
-EBUILD kubectl-1.9.10.ebuild 1217 BLAKE2B bc8d5c0dea2db716297e051807bce2ab809dcf59d02a145221c502965993873b82d1df96dcdbed218a488b70e3241323e138817e9fcecd4e10f2d549f4c4073c SHA512 65e0bb08dec59b7f8c211766ff5aff25b0bb12819072834e2d86e768ba175b45b125b04dd0a316f47169e1ae2c9199e44d66408efeff067c8c2cbba248bb534b
-EBUILD kubectl-1.9.11.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
-EBUILD kubectl-1.9.8.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
-EBUILD kubectl-1.9.9.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
+EBUILD kubectl-1.10.11.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
+EBUILD kubectl-1.11.5.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
+EBUILD kubectl-1.12.3.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
+EBUILD kubectl-1.13.0.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
+EBUILD kubectl-1.13.1.ebuild 1238 BLAKE2B 3ad462c2d023292f9a96a4b091f8143ee57105d1b921205e5bf82f6cd18fbf57c3c2d0a9b86637a16190969f0837fc88c23c29d8d82c159f648a9d8ccaf87730 SHA512 73730998885fe748c361d6991c0eb9703363ebdbf2db778ab7ff9333e1a9579973b7dcf0ebcb4d02fea764625f5b8e80aa8aabc38d21a8230d28b3742bc23156
+EBUILD kubectl-1.9.11.ebuild 1217 BLAKE2B bc8d5c0dea2db716297e051807bce2ab809dcf59d02a145221c502965993873b82d1df96dcdbed218a488b70e3241323e138817e9fcecd4e10f2d549f4c4073c SHA512 65e0bb08dec59b7f8c211766ff5aff25b0bb12819072834e2d86e768ba175b45b125b04dd0a316f47169e1ae2c9199e44d66408efeff067c8c2cbba248bb534b
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.10.9.ebuild b/sys-cluster/kubectl/kubectl-1.10.11.ebuild
index f12e63e59957..f12e63e59957 100644
--- a/sys-cluster/kubectl/kubectl-1.10.9.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.10.11.ebuild
diff --git a/sys-cluster/kubectl/kubectl-1.10.5.ebuild b/sys-cluster/kubectl/kubectl-1.10.5.ebuild
deleted file mode 100644
index 14674478c43c..000000000000
--- a/sys-cluster/kubectl/kubectl-1.10.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 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/kubectl/kubectl-1.11.1.ebuild b/sys-cluster/kubectl/kubectl-1.11.1.ebuild
deleted file mode 100644
index 14674478c43c..000000000000
--- a/sys-cluster/kubectl/kubectl-1.11.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 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/kubectl/kubectl-1.11.2.ebuild b/sys-cluster/kubectl/kubectl-1.11.2.ebuild
deleted file mode 100644
index 14674478c43c..000000000000
--- a/sys-cluster/kubectl/kubectl-1.11.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 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/kubectl/kubectl-1.11.3.ebuild b/sys-cluster/kubectl/kubectl-1.11.3.ebuild
deleted file mode 100644
index 14674478c43c..000000000000
--- a/sys-cluster/kubectl/kubectl-1.11.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 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/kubectl/kubectl-1.11.4.ebuild b/sys-cluster/kubectl/kubectl-1.11.5.ebuild
index f12e63e59957..f12e63e59957 100644
--- a/sys-cluster/kubectl/kubectl-1.11.4.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.11.5.ebuild
diff --git a/sys-cluster/kubectl/kubectl-1.12.0.ebuild b/sys-cluster/kubectl/kubectl-1.12.3.ebuild
index f12e63e59957..f12e63e59957 100644
--- a/sys-cluster/kubectl/kubectl-1.12.0.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.12.3.ebuild
diff --git a/sys-cluster/kubectl/kubectl-1.12.2.ebuild b/sys-cluster/kubectl/kubectl-1.13.0.ebuild
index f12e63e59957..f12e63e59957 100644
--- a/sys-cluster/kubectl/kubectl-1.12.2.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.13.0.ebuild
diff --git a/sys-cluster/kubectl/kubectl-1.13.1.ebuild b/sys-cluster/kubectl/kubectl-1.13.1.ebuild
new file mode 100644
index 000000000000..776d0d2bd8b7
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.13.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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-lang/go-1.11
+	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/kubectl/kubectl-1.9.10.ebuild b/sys-cluster/kubectl/kubectl-1.9.10.ebuild
deleted file mode 100644
index 2ed18931e635..000000000000
--- a/sys-cluster/kubectl/kubectl-1.9.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/kubectl/kubectl-1.9.11.ebuild b/sys-cluster/kubectl/kubectl-1.9.11.ebuild
index f12e63e59957..2ed18931e635 100644
--- a/sys-cluster/kubectl/kubectl-1.9.11.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.9.11.ebuild
@@ -6,7 +6,7 @@ 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"
+KEYWORDS="amd64"
 
 DESCRIPTION="CLI to run commands against Kubernetes clusters"
 HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
diff --git a/sys-cluster/kubectl/kubectl-1.9.8.ebuild b/sys-cluster/kubectl/kubectl-1.9.8.ebuild
deleted file mode 100644
index 14674478c43c..000000000000
--- a/sys-cluster/kubectl/kubectl-1.9.8.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 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/kubectl/kubectl-1.9.9.ebuild b/sys-cluster/kubectl/kubectl-1.9.9.ebuild
deleted file mode 100644
index 14674478c43c..000000000000
--- a/sys-cluster/kubectl/kubectl-1.9.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 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 911964d2a4ea..cc1dc6559a93 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,30 +1,12 @@
 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.10.4.tar.gz 24773451 BLAKE2B 8ee589b12a9e594dc5858473f543ef704ba772d48d565bfe3095cf9fb0588cd1ab602f092cc0fdba533cdf6c50c12f18431416640ad55867590940f34ebf5987 SHA512 cf1ea11fd721a800a6fdb51ed795f7a225577f1d93661ad98929c00a57ba55f31ac3b3d34e6276da997665734375455668b396289badaaed9825a48f33bdace3
-DIST kubernetes-1.10.5.tar.gz 25046108 BLAKE2B 4e3d85e872e13a11d7f1fe030d9c6ba62c56b37788c31d6460c7d149c47a59a18a9cbfc791092183977089f4d612b690138faee46383c1b3b7e65adfdd3a0276 SHA512 55ac294297385cf6a69a48193c691744b886a5fa5d22b7a3a601d39aacd4cd898edccfcdc186bb1845e257f0f177d330af15d29d1419caab03f863bfa095eddf
-DIST kubernetes-1.10.9.tar.gz 25071180 BLAKE2B 851b99258c61ef238c92ee2bc6918d53fe09299997ce15ec4c38f4061746b01215aad8b6832a044ec96c5f88d61f7629722621c7bb0f4a53176f3c76a2aad4ec SHA512 ebc859304c337b4dc92f4e1122a6ff8ef8e0564757bd1dea5050f7a295da752fe72f81f2fc86aea45dcba9b9c3690140c75f461951b839761d5c636b9b0d2a5b
-DIST kubernetes-1.11.1.tar.gz 24774820 BLAKE2B 2b4ffda2258fbdf7f05eeea57f7fad8ca2eb574895d016475ceae35d8506d9c09d5874e689c0f25c806d0b0b957fca166a8930a8fc5aca98cbe3174dfd217653 SHA512 4afb54ae389aa414c7e64a7ab60d586c8f3c75afe4da00bcf2221b4b273e164a09548e61c24a0cdaf9d0e52394c3421e6c70f4fbfc80ed62c40ba7816b03afcf
-DIST kubernetes-1.11.2.tar.gz 24780381 BLAKE2B 020768d7acfbcd2feebea677db52bda785bbe9862327a0734cd8b2f66439c9e0538caebd12c706aada2513b277d37c3e3a3ff47e9eaeff31e75b06040b0b853a SHA512 1e61c3ee5f74e9320d8887c9869c3e2cc1ca57f1e8eb83b92c39a8b1a81a82568b966219696ff420f9c0798f6793b311a959294e6f4b0fd9be59daf180147271
-DIST kubernetes-1.11.3.tar.gz 24788666 BLAKE2B b388132696b901901cdd5a9f0ab35ebea9533fe178bdf62bf0f1524b92bbb74e5d39c79c045ce0358ceabc8d68e87cb5e1603b0acf6a29f9bb557815e1ebed7e SHA512 f25f7e7738b75bbea62e9c5b0a73f93086f460277acac864c06baf69f565b8fcfb6b09836b8c7fbb8dcec9efc4943b88f5fd8a361007270c7900e7e48c1d5cc5
-DIST kubernetes-1.11.4.tar.gz 24804063 BLAKE2B b102f143bfa62258ed78b03fd1e246481661d12a9c8a871e7ca3683b5f17ed7de9116e507a3e4af533e79bd279021f65f5e19cde41e0d5a87ac69ae271db7100 SHA512 4d57c96b5bc734e0493ed05ee948381cb50b11dfbcb12377b31404afb1a6b10ad0709c13b953be145fb3eb79f27ab54d7672aa92f856f1ccfbb8000479ac063b
-DIST kubernetes-1.12.0.tar.gz 27995428 BLAKE2B 5665425ec3cab7128e33c2e8bff49a66c306284604af88fa9a914d148638b1e894645cfd822bc288b567e97238018725bcefba89ba697734c5f74971358ad73a SHA512 6e5286d4817b1fbb4677277674e48758c9a5f820fe7d839162e6298736233143feccdbfb8fd14a64d0fb72a25abe18818cf9852737932e878b25efcf333d983f
-DIST kubernetes-1.12.2.tar.gz 28035976 BLAKE2B 4e6d0895a03bdf176fef46641a8e0e7ba440828a2a5852f57976c92bc1c95e6ede879cb17d45e26dd66a20777dad4d063b2b0fb541172c97a0886309df033202 SHA512 7d59a28465ceacc0559da0436f0459192977447f622b9b1b7c323b2cc4a7c38d5a4100e00287c37251d1da641c04692813afa65df4051436b9144e438396cbb2
-DIST kubernetes-1.9.10.tar.gz 23592498 BLAKE2B 021ffbb933a5b541d43617fe36967b91cb1895d4fb6ce7f3651b682976699288646b45d5d0a5698131eedc19f4aa7a125d353971d2ecd44a2fd8510a95fac423 SHA512 621a2c1c76f993ad61087916fc5946aa3f1b3dec93c7024e518de613063a605500d38e763ed55a35967acb8548d63b65a7d8482f68695dc7600c23d3c38187e9
+DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
+DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
+DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
-DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
-DIST kubernetes-1.9.9.tar.gz 23588721 BLAKE2B 0fdf1d934692df14d519b23ca3c5ff4fb887eefd7cc56a7ca51dde384e713f65fd48049a9b3376a7c36e0e32da05c472a704521ce8a66a0987e9e49c26f84b58 SHA512 0203fce2646c0221be95b22315f7f62340043542d7213f3020f1012ab016ee47b958d69399b4eaa36bdc219c1c3d3916a7fcff6fbd1975e2a91087bc866b3135
-EBUILD kubelet-1.10.4.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
-EBUILD kubelet-1.10.5.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
-EBUILD kubelet-1.10.9.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
-EBUILD kubelet-1.11.1.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
-EBUILD kubelet-1.11.2.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
-EBUILD kubelet-1.11.3.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
-EBUILD kubelet-1.11.4.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
-EBUILD kubelet-1.12.0.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
-EBUILD kubelet-1.12.2.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
-EBUILD kubelet-1.9.10.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
+EBUILD kubelet-1.10.11.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
+EBUILD kubelet-1.11.5.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
+EBUILD kubelet-1.12.3.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
 EBUILD kubelet-1.9.11.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
-EBUILD kubelet-1.9.8.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
-EBUILD kubelet-1.9.9.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.10.9.ebuild b/sys-cluster/kubelet/kubelet-1.10.11.ebuild
index 27288752d60b..27288752d60b 100644
--- a/sys-cluster/kubelet/kubelet-1.10.9.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.10.11.ebuild
diff --git a/sys-cluster/kubelet/kubelet-1.10.4.ebuild b/sys-cluster/kubelet/kubelet-1.10.4.ebuild
deleted file mode 100644
index e1a41e8ec6bc..000000000000
--- a/sys-cluster/kubelet/kubelet-1.10.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 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/kubelet/kubelet-1.10.5.ebuild b/sys-cluster/kubelet/kubelet-1.10.5.ebuild
deleted file mode 100644
index e1a41e8ec6bc..000000000000
--- a/sys-cluster/kubelet/kubelet-1.10.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 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/kubelet/kubelet-1.11.1.ebuild b/sys-cluster/kubelet/kubelet-1.11.1.ebuild
deleted file mode 100644
index e1a41e8ec6bc..000000000000
--- a/sys-cluster/kubelet/kubelet-1.11.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 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/kubelet/kubelet-1.11.2.ebuild b/sys-cluster/kubelet/kubelet-1.11.2.ebuild
deleted file mode 100644
index e1a41e8ec6bc..000000000000
--- a/sys-cluster/kubelet/kubelet-1.11.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 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/kubelet/kubelet-1.11.3.ebuild b/sys-cluster/kubelet/kubelet-1.11.3.ebuild
deleted file mode 100644
index e1a41e8ec6bc..000000000000
--- a/sys-cluster/kubelet/kubelet-1.11.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 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/kubelet/kubelet-1.11.4.ebuild b/sys-cluster/kubelet/kubelet-1.11.5.ebuild
index 27288752d60b..27288752d60b 100644
--- a/sys-cluster/kubelet/kubelet-1.11.4.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.11.5.ebuild
diff --git a/sys-cluster/kubelet/kubelet-1.12.2.ebuild b/sys-cluster/kubelet/kubelet-1.12.2.ebuild
deleted file mode 100644
index 27288752d60b..000000000000
--- a/sys-cluster/kubelet/kubelet-1.12.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/kubelet/kubelet-1.12.0.ebuild b/sys-cluster/kubelet/kubelet-1.12.3.ebuild
index 27288752d60b..27288752d60b 100644
--- a/sys-cluster/kubelet/kubelet-1.12.0.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.12.3.ebuild
diff --git a/sys-cluster/kubelet/kubelet-1.9.10.ebuild b/sys-cluster/kubelet/kubelet-1.9.10.ebuild
deleted file mode 100644
index e1a41e8ec6bc..000000000000
--- a/sys-cluster/kubelet/kubelet-1.9.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 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/kubelet/kubelet-1.9.8.ebuild b/sys-cluster/kubelet/kubelet-1.9.8.ebuild
deleted file mode 100644
index e1a41e8ec6bc..000000000000
--- a/sys-cluster/kubelet/kubelet-1.9.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 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/kubelet/kubelet-1.9.9.ebuild b/sys-cluster/kubelet/kubelet-1.9.9.ebuild
deleted file mode 100644
index e1a41e8ec6bc..000000000000
--- a/sys-cluster/kubelet/kubelet-1.9.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 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/libccs-perl/Manifest b/sys-cluster/libccs-perl/Manifest
deleted file mode 100644
index 5aee783d9933..000000000000
--- a/sys-cluster/libccs-perl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a
-EBUILD libccs-perl-3.1.5.ebuild 993 BLAKE2B 98732a396ed87d9c72dfc170f1929b6165e6eda460cb27d508c67efd003315e800e21c0e6e6410166b5bbb8d3597fa01a93a0a54bc391680888f3821dc054e7c SHA512 0bf725bdc87e0a5ae89e846443ff6b8e6df01f2a4c75f4957fae6a20d964975e13b9f897cd82f088ffa26ca761bd4481c21ff2c04b649187612b81d86bdc31e0
-MISC metadata.xml 344 BLAKE2B c627ae30f292b8dfdc4ac0b78df00a7f34da55abf0167b15bf31e1102f3438ddfcb279b163c653c9473b94dc45358ae1099007191cf84e328e589f974795f509 SHA512 4cf5ea22bcee5e35cb8857ab36527a52a407b9c0321251037932fc5ae73b96824aa4f4b7259871dac5021cd311f8a5d26c95b880e27f5cd4186e0b5e3689a379
diff --git a/sys-cluster/libccs-perl/libccs-perl-3.1.5.ebuild b/sys-cluster/libccs-perl/libccs-perl-3.1.5.ebuild
deleted file mode 100644
index da075781e5b0..000000000000
--- a/sys-cluster/libccs-perl/libccs-perl-3.1.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit linux-info versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Cluster Configuration System Library Perl-Bindings"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-cluster/libccs"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.24"
-
-S="${WORKDIR}/${MY_P}/bindings/perl"
-
-src_configure() {
-	cd "${WORKDIR}/${MY_P}"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=${KERNEL_DIR} \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--ccslibdir=/usr/$(get_libdir) \
-		--ccsincdir=/usr/include \
-	    || die "configure problem"
-}
diff --git a/sys-cluster/libccs-perl/metadata.xml b/sys-cluster/libccs-perl/metadata.xml
deleted file mode 100644
index 05ae0dded68b..000000000000
--- a/sys-cluster/libccs-perl/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<longdescription>Cluster Configuration System Library Perl-Bindings</longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/libccs/Manifest b/sys-cluster/libccs/Manifest
deleted file mode 100644
index 63f30bd99502..000000000000
--- a/sys-cluster/libccs/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a
-DIST cluster-3.2.0.tar.gz 688411 BLAKE2B b1218e74bd0d9f1d25d8a01659d5a038f3a5380e6d6e04f02138d13ef3de1e3f96d6aac680c2858ac6bd0e830d227474af9ec82ea8bbefd3f33b88bbe2d5ffc6 SHA512 00620b89564c4f9b67b679695749cd7515f49af43ace6a565e32e020ee66db219f3db3f53420d6460ea8c1cab03258305735fe5db81aab3953777015119533e9
-EBUILD libccs-3.1.5.ebuild 1143 BLAKE2B 6e65f26b925bb4d9930dfed498f607f3d4094ce573ff23bc3b1805d18c26cf39f2c0fabad75a5403c55d5bdf1b0d5be886284725cbf8a666af5b5e265dd0229e SHA512 2e1e70d6bf0d7c2b2d9a2d26304952a4ada7b81cd1ca45630f31cdce0f6b3bd02029833f25af0acab41c40ab51e1ed8e55072a70d02018f4901056d565cb2a59
-EBUILD libccs-3.2.0.ebuild 1150 BLAKE2B a20b0e49a9975600162e8741c3c44cbfe67de7765373ab375b480dee76400929084b9fa34b0e409fd2c1b1da4ba31066af4cd9b745648baac3ef5fb17778c6e0 SHA512 8a549d811818855a77bbed18b7629ea8a51a832cf5b88c45a4a78f4a97f21cc1e07fe0299051685c0d44832031c419b0b620bca50ca7e3376cdc4820c7271235
-MISC metadata.xml 330 BLAKE2B 8afd3bd0da95a465c739e4f22d4d700b837f1a2bddff0fdd8fc01a5c35692a3ca6707a01db254cdf1f9138a149cdbe445fa60f030912e9e9c26346198534614b SHA512 e41d0df2a7bd4e11f561ffb239ea5fc9b74b0607bb05a7e5e8f4f9a6ab0b7482067ab2d255862b7a891d773b1bb8753b7bdbb5e63dfa734264ad2285b768ccc2
diff --git a/sys-cluster/libccs/libccs-3.1.5.ebuild b/sys-cluster/libccs/libccs-3.1.5.ebuild
deleted file mode 100644
index d5dc0d2fea45..000000000000
--- a/sys-cluster/libccs/libccs-3.1.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit linux-info multilib toolchain-funcs versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Cluster Configuration System Library"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	=sys-cluster/corosync-1.4.7
-	dev-libs/libxml2
-	!sys-cluster/ccs"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.24"
-
-S="${WORKDIR}/${MY_P}/config/libs"
-
-src_configure() {
-	cd "${WORKDIR}/${MY_P}"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=${KERNEL_DIR} \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--ccslibdir=/usr/$(get_libdir) \
-		--ccsincdir=/usr/include \
-	    || die "configure problem"
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${D}"/usr/lib*/*.a
-}
diff --git a/sys-cluster/libccs/libccs-3.2.0.ebuild b/sys-cluster/libccs/libccs-3.2.0.ebuild
deleted file mode 100644
index fa9307da647e..000000000000
--- a/sys-cluster/libccs/libccs-3.2.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit linux-info multilib toolchain-funcs versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Cluster Configuration System Library"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	=sys-cluster/corosync-1.4.7
-	dev-libs/libxml2
-	!sys-cluster/ccs"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.24"
-
-S="${WORKDIR}/${MY_P}/config/libs"
-
-src_configure() {
-	cd "${WORKDIR}/${MY_P}"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=${KERNEL_DIR} \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--ccslibdir=/usr/$(get_libdir) \
-		--ccsincdir=/usr/include \
-	    || die "configure problem"
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${D}"/usr/lib*/*.a
-}
diff --git a/sys-cluster/libccs/metadata.xml b/sys-cluster/libccs/metadata.xml
deleted file mode 100644
index 7c52bc7fad7b..000000000000
--- a/sys-cluster/libccs/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<longdescription>Cluster Configuration System Library</longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/libcman/Manifest b/sys-cluster/libcman/Manifest
deleted file mode 100644
index 2e44c262b22f..000000000000
--- a/sys-cluster/libcman/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a
-DIST cluster-3.2.0.tar.gz 688411 BLAKE2B b1218e74bd0d9f1d25d8a01659d5a038f3a5380e6d6e04f02138d13ef3de1e3f96d6aac680c2858ac6bd0e830d227474af9ec82ea8bbefd3f33b88bbe2d5ffc6 SHA512 00620b89564c4f9b67b679695749cd7515f49af43ace6a565e32e020ee66db219f3db3f53420d6460ea8c1cab03258305735fe5db81aab3953777015119533e9
-EBUILD libcman-3.1.5.ebuild 1069 BLAKE2B f9046f43b35d736ea38a6c77673130d48202f5d170e1db3b23a4abae2b104d5f2e91e7f76bdc2baafc81058d5d87cd9a2a93ea18e7d6e68484d10da751e60033 SHA512 4f030908790a3e7d12b5d72cc76a41656203a34a583baf4d985b0e5eb624c6f18d49b5a09799e52d0eaa4060326bac04677ea7c1b9406534f9ca471f54ac2815
-EBUILD libcman-3.2.0.ebuild 1076 BLAKE2B 45252dde739e23c4ee3275a16a4c9419d61ffc823a42b702efc49e5138e77564b1e285ffe0e75b422941b09a961fee6aceaeb9583376ff178a967eee9fc549cf SHA512 5625f1adfd52cccad9f8649a5e380532a65563e6e14e40db41e6f4d82dd7b0f703c7a8e13941b3eea58e2bebc3a8a7ca3b3baaa8a309426930812fa693a9bb55
-MISC metadata.xml 317 BLAKE2B 19c069f2b86caea85387609faafd7a828a19d51ecaebdb14c3c567a653358651ee28421485d49dc0f92ce6775a2049ac3d44a27de42f7058cb90038276d80fde SHA512 797aa2cfe7f61965454cce0043d86979f978fb6f6eee1e0bfc85dc03e776815e5b5b544a58e8ac842df50d14d4e32f14c159e71a4451d50d49377e1bd47d86e9
diff --git a/sys-cluster/libcman/libcman-3.1.5.ebuild b/sys-cluster/libcman/libcman-3.1.5.ebuild
deleted file mode 100644
index d5cc61b46a93..000000000000
--- a/sys-cluster/libcman/libcman-3.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit linux-info multilib toolchain-funcs versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Cluster Manager Library"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-2.6.24"
-RDEPEND="!sys-cluster/cman-lib"
-
-S="${WORKDIR}/${MY_P}/cman/lib"
-
-src_configure() {
-	cd "${WORKDIR}/${MY_P}"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=${KERNEL_DIR} \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--cmanlibdir=/usr/$(get_libdir) \
-		--cmanincdir=/usr/include \
-		|| die "configure failed"
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${D}"/usr/lib*/*.a
-}
diff --git a/sys-cluster/libcman/libcman-3.2.0.ebuild b/sys-cluster/libcman/libcman-3.2.0.ebuild
deleted file mode 100644
index 226432d5ce8a..000000000000
--- a/sys-cluster/libcman/libcman-3.2.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=4
-
-inherit linux-info multilib toolchain-funcs versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Cluster Manager Library"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-2.6.24"
-RDEPEND="!sys-cluster/cman-lib"
-
-S="${WORKDIR}/${MY_P}/cman/lib"
-
-src_configure() {
-	cd "${WORKDIR}/${MY_P}"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=${KERNEL_DIR} \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--cmanlibdir=/usr/$(get_libdir) \
-		--cmanincdir=/usr/include \
-		|| die "configure failed"
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${D}"/usr/lib*/*.a
-}
diff --git a/sys-cluster/libcman/metadata.xml b/sys-cluster/libcman/metadata.xml
deleted file mode 100644
index d1b9efcd225a..000000000000
--- a/sys-cluster/libcman/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<longdescription>Cluster Manager Library</longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/libdlm/Manifest b/sys-cluster/libdlm/Manifest
deleted file mode 100644
index 0565ab4aabe6..000000000000
--- a/sys-cluster/libdlm/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libdlm-3.2.0-sysmacros.patch 416 BLAKE2B 1c1e621e2321196d6ba769dc761170c3b7b146d24d133128d1318ecd28232d688f5b9193e34afb1172544c249039b64eef0b2f90d2fe2bb288af48238c8c5dfd SHA512 acc5f156651a7389b5bd6c64bb0df7bedf95c5a77e6e9bb2f669c25a1beadd924cff5004b784f51c45ad0a646ae0c476290fa6c89136f5c6c492ef70565ef9cf
-DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a
-DIST cluster-3.2.0.tar.gz 688411 BLAKE2B b1218e74bd0d9f1d25d8a01659d5a038f3a5380e6d6e04f02138d13ef3de1e3f96d6aac680c2858ac6bd0e830d227474af9ec82ea8bbefd3f33b88bbe2d5ffc6 SHA512 00620b89564c4f9b67b679695749cd7515f49af43ace6a565e32e020ee66db219f3db3f53420d6460ea8c1cab03258305735fe5db81aab3953777015119533e9
-EBUILD libdlm-3.1.5.ebuild 1435 BLAKE2B 3b068b281d94e72a57bad70b988d172fbd6ed42bc897af76936bb15721cbb796db48805772e4ae855c898b9bf2eac785236f61c621b6012cbac6034ee36de8b5 SHA512 ee6463c25df6bcd045bbe8cc2b3ea14fa2873fe8b209af6dccb5252c4ae82f0b3288f96699568ee5f7e7f33af5b1ac1ed8ad3dd93ca579a7d9707fc7f2953ad0
-EBUILD libdlm-3.2.0.ebuild 1649 BLAKE2B 79aff4a167928626940cefcd66ae7d738ff5c7143466a762166ef1ab2c161a5301dffee3f590c9d7bb7812f0ad9b1b411e805ba140a85e4a5324996ceaf3118d SHA512 86efcb3ccd29f2c139ac639a815aeec1959faa4fb1f2946a80f368e8a849b40dd97fe606bf9f8fab7809c20c8c52f6d10e2fe6918e496781ad0953c06e4821ed
-MISC metadata.xml 342 BLAKE2B 4ee7c616a4c41808d0e5fbbb8171f31e3158fd22a76975b3a48d6710f1ef8986446f46c88c212ac4a4c80b4dfce91acf9c84bdc3779e7fc9ce03968c55c40c23 SHA512 2acce7a5bf8ca7cdc148b258f9a64c4ad1a3eb7e4385cf4394f0d55891d649c6d7ab1efe5e1235a39afe9a8782b9c7ab36dec4a87f78f1a81cb2df6662ffd6c9
diff --git a/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch b/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch
deleted file mode 100644
index 3a8a8b11fa15..000000000000
--- a/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN cluster-3.2.0.orig/dlm/libdlm/libdlm.c cluster-3.2.0/dlm/libdlm/libdlm.c
---- cluster-3.2.0.orig/dlm/libdlm/libdlm.c	2012-11-26 05:13:22.000000000 +0100
-+++ cluster-3.2.0/dlm/libdlm/libdlm.c	2018-04-29 23:46:57.591160008 +0200
-@@ -5,6 +5,7 @@
- #include <sys/ioctl.h>
- #include <sys/param.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <stdint.h>
- #include <stdlib.h>
- #include <inttypes.h>
diff --git a/sys-cluster/libdlm/libdlm-3.1.5.ebuild b/sys-cluster/libdlm/libdlm-3.1.5.ebuild
deleted file mode 100644
index 8c6593cb92b6..000000000000
--- a/sys-cluster/libdlm/libdlm-3.1.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="General-purpose Distributed Lock Manager Library"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	!sys-cluster/dlm-headers
-	!sys-cluster/dlm-kernel
-	!sys-cluster/dlm-lib"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.24"
-
-S=${WORKDIR}/${MY_P}/dlm
-
-src_configure() {
-	cd "${WORKDIR}/${MY_P}"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=/usr/ \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--dlmlibdir=/usr/$(get_libdir) \
-		--dlmincdir=/usr/include \
-		--dlmcontrollibdir=/usr/$(get_libdir) \
-		--dlmcontrolincdir=/usr/include \
-	    || die "configure problem"
-}
-
-src_compile() {
-	for i in libdlm libdlmcontrol; do
-		emake -C ${i}
-	done
-}
-
-src_install() {
-	for i in libdlm libdlmcontrol; do
-		emake DESTDIR="${D}" -C ${i} install
-	done
-	use static-libs || rm -f "${D}"/usr/lib*/*.a
-	doman man/libdlm.3
-	dodoc doc/{libdlm.txt,example.c,user-dlm-overview.txt}
-}
diff --git a/sys-cluster/libdlm/libdlm-3.2.0.ebuild b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
deleted file mode 100644
index aebc2e1b0eab..000000000000
--- a/sys-cluster/libdlm/libdlm-3.2.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs versionator epatch
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="General-purpose Distributed Lock Manager Library"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa x86"
-IUSE="static-libs"
-
-RDEPEND="
-	!sys-cluster/dlm-headers
-	!sys-cluster/dlm-kernel
-	!sys-cluster/dlm-lib"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.24"
-
-S="${WORKDIR}/${MY_P}/dlm"
-
-src_prepare() {
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|g" \
-		"${WORKDIR}/${MY_P}/make/install.mk" || die "sed failed"
-	epatch "${FILESDIR}/${P}-sysmacros.patch"
-}
-
-src_configure() {
-	cd "${WORKDIR}/${MY_P}"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=/usr/ \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--dlmlibdir=/usr/$(get_libdir) \
-		--dlmincdir=/usr/include \
-		--dlmcontrollibdir=/usr/$(get_libdir) \
-		--dlmcontrolincdir=/usr/include \
-	    || die "configure problem"
-}
-
-src_compile() {
-	for i in libdlm libdlmcontrol; do
-		emake -C ${i}
-	done
-}
-
-src_install() {
-	for i in libdlm libdlmcontrol; do
-		emake DESTDIR="${D}" -C ${i} install
-	done
-	mv "${D}"/$(get_libdir) "${D}"/lib
-	use static-libs || rm -f "${D}"/usr/lib*/*.a
-	doman man/libdlm.3
-	dodoc doc/{libdlm.txt,example.c,user-dlm-overview.txt}
-}
diff --git a/sys-cluster/libdlm/metadata.xml b/sys-cluster/libdlm/metadata.xml
deleted file mode 100644
index d3f8da79cd5a..000000000000
--- a/sys-cluster/libdlm/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<longdescription>General-purpose Distributed Lock Manager Library</longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/libfence/Manifest b/sys-cluster/libfence/Manifest
deleted file mode 100644
index b5e4053c37aa..000000000000
--- a/sys-cluster/libfence/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a
-DIST cluster-3.2.0.tar.gz 688411 BLAKE2B b1218e74bd0d9f1d25d8a01659d5a038f3a5380e6d6e04f02138d13ef3de1e3f96d6aac680c2858ac6bd0e830d227474af9ec82ea8bbefd3f33b88bbe2d5ffc6 SHA512 00620b89564c4f9b67b679695749cd7515f49af43ace6a565e32e020ee66db219f3db3f53420d6460ea8c1cab03258305735fe5db81aab3953777015119533e9
-EBUILD libfence-3.1.5.ebuild 1365 BLAKE2B c1f1682142cb94ba7da00ed0d2038beee2075b56ac9ba15418dfc47bbe8ea2a637c9d4e67411e4eaf0b90529dc87345713517aca034714b6d560c22001dd0fc8 SHA512 5883b357716337ebaaf0d4aa36ae61362e17e3e8010d6159ed4595702695e54f587a6d40161866ea9a98f40463e7c971c8684ac4cb3ebdb15ee1a382be31a148
-EBUILD libfence-3.2.0.ebuild 1372 BLAKE2B 12c9d2fb708ee188fc3edb8612c9c12c438d6c56a0849d4d41f108bc4ef3a7468de82e930b0e494995fdb911edcf4627b962f3035bb34304216cac10f90f4854 SHA512 da502b73bf72ab22eb8227cac52d6f3d5b06bcff3a80b930310ecc897572d6614f3ddd3347d056556cafdb03e733197c5eaeaeb8bece5904dba8749f83f7bc66
-MISC metadata.xml 317 BLAKE2B 731180437463ea16584c0a99eca4b6470c599be30bf24728424d1d225e82a59bd72dedd40cb211cecb48c56ce43e75ee85bd9dca238997d763ff3d41820d6c70 SHA512 1622dc57ee420ab60a653ab370f0a3142a93efc865c2f8c47c8d0931b8aeeb9bfaef841ce9e9834985630193511002655fb0da2a10fa16707b2d0f4ecd51db05
diff --git a/sys-cluster/libfence/libfence-3.1.5.ebuild b/sys-cluster/libfence/libfence-3.1.5.ebuild
deleted file mode 100644
index 024a3122df91..000000000000
--- a/sys-cluster/libfence/libfence-3.1.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit linux-info multilib toolchain-funcs versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Cluster Fencing Library"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="static-libs"
-
-RDEPEND="~sys-cluster/libccs-${PV}"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.24"
-
-S="${WORKDIR}/${MY_P}/fence"
-
-src_configure() {
-	cd "${WORKDIR}/${MY_P}"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=${KERNEL_DIR} \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--fencelibdir=/usr/$(get_libdir) \
-		--fenceincdir=/usr/include \
-		--fencedlibdir=/usr/$(get_libdir) \
-		--fencedincdir=/usr/include \
-		--ccslibdir=/usr/$(get_libdir) \
-		--ccsincdir=/usr/include \
-	    || die "configure problem"
-}
-
-src_compile() {
-	for i in libfence libfenced; do
-		emake -C ${i}
-	done
-}
-
-src_install() {
-	for i in libfence libfenced; do
-		emake DESTDIR="${D}" -C ${i} install
-	done
-	use static-libs || rm -f "${D}"/usr/lib*/*.a
-}
diff --git a/sys-cluster/libfence/libfence-3.2.0.ebuild b/sys-cluster/libfence/libfence-3.2.0.ebuild
deleted file mode 100644
index 165a3bc5561d..000000000000
--- a/sys-cluster/libfence/libfence-3.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit linux-info multilib toolchain-funcs versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Cluster Fencing Library"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
-IUSE="static-libs"
-
-RDEPEND="~sys-cluster/libccs-${PV}"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.24"
-
-S="${WORKDIR}/${MY_P}/fence"
-
-src_configure() {
-	cd "${WORKDIR}/${MY_P}"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=${KERNEL_DIR} \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--fencelibdir=/usr/$(get_libdir) \
-		--fenceincdir=/usr/include \
-		--fencedlibdir=/usr/$(get_libdir) \
-		--fencedincdir=/usr/include \
-		--ccslibdir=/usr/$(get_libdir) \
-		--ccsincdir=/usr/include \
-	    || die "configure problem"
-}
-
-src_compile() {
-	for i in libfence libfenced; do
-		emake -C ${i}
-	done
-}
-
-src_install() {
-	for i in libfence libfenced; do
-		emake DESTDIR="${D}" -C ${i} install
-	done
-	use static-libs || rm -f "${D}"/usr/lib*/*.a
-}
diff --git a/sys-cluster/libfence/metadata.xml b/sys-cluster/libfence/metadata.xml
deleted file mode 100644
index 0a34fce91e47..000000000000
--- a/sys-cluster/libfence/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<longdescription>Cluster Fencing Library</longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/liblogthread/Manifest b/sys-cluster/liblogthread/Manifest
deleted file mode 100644
index baad7d7c8d2e..000000000000
--- a/sys-cluster/liblogthread/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a
-DIST cluster-3.2.0.tar.gz 688411 BLAKE2B b1218e74bd0d9f1d25d8a01659d5a038f3a5380e6d6e04f02138d13ef3de1e3f96d6aac680c2858ac6bd0e830d227474af9ec82ea8bbefd3f33b88bbe2d5ffc6 SHA512 00620b89564c4f9b67b679695749cd7515f49af43ace6a565e32e020ee66db219f3db3f53420d6460ea8c1cab03258305735fe5db81aab3953777015119533e9
-EBUILD liblogthread-3.1.5.ebuild 1067 BLAKE2B e05db949421b183a20937396cf874a4e57d5453a3a426c252458e64fe4131bca5f40d2ee9ed9d426d80c68ac2a455ae75e7b8e2c3abbd4c27b6d98767ffe51f7 SHA512 4a60cd5d2cd7e4662d0fab9261a86e1be54a9b9654fe0640e4edda338b86763c2711c4a04d027025df7256fb31ddf04be434ab245e314b8542ce5e65aa253f8d
-EBUILD liblogthread-3.2.0.ebuild 1074 BLAKE2B da4013676c8d9b2da7fea1742eb299bce4701d84aad5e90937e9b0cdf8a2d8b72199fb8446b6baf6a8bf5980ffc85679b398f2d6873d79d3d9a504443a1bfcb1 SHA512 decf3a30f60aabcd387f87cc759a3a9019da9fbb9a54f4d461686759e27b0122db04f2576451e6439170005ec2d9813dfbc60a27c005abdb64cace970d14ffb3
-MISC metadata.xml 328 BLAKE2B bb070e05c2c327d6b02173166e887e34b85bbf19389091e6c02b12ccf31b94e05741ff51e1eaccbe78e65d720a54477c7e574e2f82a48bd96d48067d98cd159d SHA512 30edf69ff0d4929a2938cf4c42e173563af4e3f0edeec5ad900fd38858fb8a6d3a0bfa7013982166bb84878120b485bb99da523c5f0169a36dd53c4c9642394a
diff --git a/sys-cluster/liblogthread/liblogthread-3.1.5.ebuild b/sys-cluster/liblogthread/liblogthread-3.1.5.ebuild
deleted file mode 100644
index 6f0b960e7dcf..000000000000
--- a/sys-cluster/liblogthread/liblogthread-3.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit linux-info multilib toolchain-funcs versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Thread-Safe Syslog Logging Library"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND=">=sys-kernel/linux-headers-2.6.24"
-
-S="${WORKDIR}/${MY_P}/common/${PN}"
-
-src_configure() {
-	cd "${WORKDIR}/${MY_P}"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=${KERNEL_DIR} \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--logtlibdir=/usr/$(get_libdir) \
-		--logtincdir=/usr/include \
-	    || die "configure problem"
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${D}"/usr/lib*/*.a
-}
diff --git a/sys-cluster/liblogthread/liblogthread-3.2.0.ebuild b/sys-cluster/liblogthread/liblogthread-3.2.0.ebuild
deleted file mode 100644
index 7f6669c154f4..000000000000
--- a/sys-cluster/liblogthread/liblogthread-3.2.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=4
-
-inherit linux-info multilib toolchain-funcs versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Thread-Safe Syslog Logging Library"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND=">=sys-kernel/linux-headers-2.6.24"
-
-S="${WORKDIR}/${MY_P}/common/${PN}"
-
-src_configure() {
-	cd "${WORKDIR}/${MY_P}"
-	./configure \
-		--cc=$(tc-getCC) \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--kernel_src=${KERNEL_DIR} \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--logtlibdir=/usr/$(get_libdir) \
-		--logtincdir=/usr/include \
-	    || die "configure problem"
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${D}"/usr/lib*/*.a
-}
diff --git a/sys-cluster/liblogthread/metadata.xml b/sys-cluster/liblogthread/metadata.xml
deleted file mode 100644
index 94c3766e291a..000000000000
--- a/sys-cluster/liblogthread/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<longdescription>Thread-Safe Syslog Logging Library</longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index 91294ae98304..7a62cf0077b1 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1,12 +1,5 @@
-DIST minikube-0.28.0.tar.gz 20350636 BLAKE2B 002bf7a45483a724d9ebc4f2fa3bad5b9451d9d550211e3e93f8b75555a39358fe11798d0c4b1632c3235ee21e82adc18c9b2f6f4ba9590eb998901f870b7d52 SHA512 bbcc8540b9d64a0ac9da93f912d44c66991d8377fdb96b02a656a8919347b4dd40669c08850582ea54adce6b1ef132c41376f21f4e3cc07e5776df9a3286f4e7
-DIST minikube-0.28.1.tar.gz 20075323 BLAKE2B 47444de4c2245d13108b5f98544f5127565ab40178f0bfdda35f710d594b36f8d98dbde8157361172a3486411f7ce32689e87d6b126ba29d21c9061dd0b22fa9 SHA512 80591777cc419ac9dc3b27d444a5d8aa04f2482bd3c47edfbb6b8a74b3552610125dfc5244bbd2659ea46600ed17577e90bcf98e0806d12932dd88c46fd0283a
-DIST minikube-0.28.2.tar.gz 20077130 BLAKE2B 0d8047debc0ce633fe6696d760e838d5ade80128d319e66b19c6f34e34ff95a401102c5c177a4e9de9f2a46f9dbf97de675137881f84849002814f94f14d40d7 SHA512 ee2a08a7b6fa4d18c4c04fc51ac17eb0b8bc8e092c489db53bf2734c45afac919735d046a07a7b8af6a8ef41c97fcb87124409081751da9134cfe032ca86aacb
-DIST minikube-0.29.0.tar.gz 9176207 BLAKE2B 54099d2d42f9cd155748ed0d476659214b3ca0edb5a9ee39c7ff0468175596dcbb3d729b6e19099a339300b0611aa6956c929e591d855c0fd0b00d41dae3af95 SHA512 9a897012333a325c4880e55d69fb71d3537d10a15e3c7214da0232f23fd07128dd788f04c15ce622ef7669034ff06214b72e2fd1713a76f9d8faf43641061955
 DIST minikube-0.30.0.tar.gz 9180859 BLAKE2B cd6efd166e01ea14b7593530ac3b7448851c5666146b7f1fac06a2c931ae3781d522fb3be1970663db1dcc51b41ca5382048e4ce9d3c4d747cd8e0f5d29715ee SHA512 1c78caf2865c0ea200de9cc2f6fa0de7f9f8170e9c4927dc3190e6658d69a59cfb57b05e947c22d60d8990f62bc7b625f86b18a548981fbd6e2c73d69607683f
-EBUILD minikube-0.28.0-r1.ebuild 1396 BLAKE2B 385a36de987144b41ab2fc7595d09d247fcbad570ae4b696c9b60821ac66c86b7deea861662c04aa4b25a6602bc1784b06a3d2164976235ea9d1c3cf649a7948 SHA512 8f2edd6af2b0a811d0a650cd77cb8a2625f9a5b475ff09c818ed52556a04908ea6e502ad2514179a0f2b0dd5caff059e3f01b1271d35f1c3f8008a88915070aa
-EBUILD minikube-0.28.0.ebuild 1253 BLAKE2B 90c331c2f4a98e774edc39993b849e370376ecc50d644f4f6a56070617eff8bdce141ae4f9131dd92d492b1b101c2f5f699f9da96d5e3cd04c11d0dd2e428a9e SHA512 d43962f11e8f1566f56663a8553e7e2fee45440a568e0d167654b8eb0e8a12128f2b7a26f3063223f7aa2b6df1f49d9b5da2f55369434bb11a9533b856c05dd5
-EBUILD minikube-0.28.1.ebuild 1491 BLAKE2B b3ad1951a44ebbc52fe1456eea11230a7a6944d27aa1f5d053caa0feb8df37234ab1c4eb22774f0516ae3e23c0e56c89772b6e63a44b7a661e731805a55fc5fe SHA512 057df45317b4f4f7c2d170efce625e30a9c4f9397ee0a5aeca05b4bafc5526882b5a795b0924989f2905f6289b36c4784e29a34bf1295088954ff0681522cd7a
-EBUILD minikube-0.28.2.ebuild 1646 BLAKE2B d18bac524a7a719188d1eb47201053aa75efa283db9e23c6109a6751be38b1e3d34be783e64c68c627be4510b0597a2073ce901ea586095c2ad2396ea7a95c84 SHA512 1e7c472fd74e6e5da75f3670d427988ac6d5a8ec7d4673a9eaa24f05dec02e57464a5d572bc51f312d8c4d1f57efe01d7f3215048eb32b6ce8cbb749f2c74821
-EBUILD minikube-0.29.0.ebuild 1622 BLAKE2B bc9bfd9a6b693bc71719750f01b81a313eabbd4bea23604a939588f06a3783604ae264f49376883b83a8599c5bca2259c4043afa3e1fbf3dfe9fe020467be13a SHA512 41801a7f65a66a4b0a6fbfeefde14b5f32fe09246bd76967ca34c28b56a0008acf0f7ffd6d7705966a83fa3d3e6f89063774b228bef59310e085d4ece9f2a39c
+DIST minikube-0.31.0.tar.gz 9213283 BLAKE2B 97440d26d724e54d265ee9c3602c2dc0cfd455d75616b4053d1ab8a04efbcbe93c74535577c3a881d665374dd753d629f16f90210c50066180e1fe2baaa733a0 SHA512 5f2d911deac1e51f82e27d174bf8be4dd1ceb5ce29aa45865077e0cf3524b8f62b2717e95a19d636e0c65d39748ef7522c9379a9d85839c7c97f4fe67d2f4a92
 EBUILD minikube-0.30.0.ebuild 1622 BLAKE2B bc9bfd9a6b693bc71719750f01b81a313eabbd4bea23604a939588f06a3783604ae264f49376883b83a8599c5bca2259c4043afa3e1fbf3dfe9fe020467be13a SHA512 41801a7f65a66a4b0a6fbfeefde14b5f32fe09246bd76967ca34c28b56a0008acf0f7ffd6d7705966a83fa3d3e6f89063774b228bef59310e085d4ece9f2a39c
+EBUILD minikube-0.31.0.ebuild 1622 BLAKE2B bc9bfd9a6b693bc71719750f01b81a313eabbd4bea23604a939588f06a3783604ae264f49376883b83a8599c5bca2259c4043afa3e1fbf3dfe9fe020467be13a SHA512 41801a7f65a66a4b0a6fbfeefde14b5f32fe09246bd76967ca34c28b56a0008acf0f7ffd6d7705966a83fa3d3e6f89063774b228bef59310e085d4ece9f2a39c
 MISC metadata.xml 394 BLAKE2B ca9fbc7af4a84d99a6d22c00cb28c09747675dc66ef21a43b3011bdccd129df698cacad0375f4ef360de2874d1cf6282834c6b901cd86c6c4dd213f67f006f45 SHA512 0690f97963d432904a0f002273d73ac4d998cde1d2f2fafddc2eeb5d841970b634c58ffa534fd5982a8166a40159164422771baa000566561b4f428ebe818bd8
diff --git a/sys-cluster/minikube/minikube-0.28.0-r1.ebuild b/sys-cluster/minikube/minikube-0.28.0-r1.ebuild
deleted file mode 100644
index 4c4e0c4d484f..000000000000
--- a/sys-cluster/minikube/minikube-0.28.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit python-any-r1 golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/minikube"
-ARCHIVE_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Single Node Kubernetes Cluster"
-HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	${PYTHON_DEPS}"
-RDEPEND=">=sys-cluster/kubectl-1.9.4"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e 's/ -s -w/ -w/' -e 's#.*GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' -e 's#$(GOPATH)/bin/go-bindata#/usr/bin/go-bindata#g' src/${EGO_PN}/Makefile || die
-	sed -i -e "s/get_commit(), get_tree_state(), get_version()/get_commit(), 'gitTreeState=clean', get_version()/"  src/${EGO_PN}/hack/get_k8s_version.py || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN} out/docker-machine-driver-kvm2 out/localkube out/minikube-linux-amd64
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	newbin out/minikube-linux-amd64 minikube
-	dobin out/{docker-machine-driver-kvm2,localkube}
-	dodoc -r docs CHANGELOG.md README.md
-	popd || die
-}
diff --git a/sys-cluster/minikube/minikube-0.28.0.ebuild b/sys-cluster/minikube/minikube-0.28.0.ebuild
deleted file mode 100644
index 95a40e3451b8..000000000000
--- a/sys-cluster/minikube/minikube-0.28.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit python-any-r1 golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/minikube"
-ARCHIVE_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Single Node Kubernetes Cluster"
-HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	${PYTHON_DEPS}"
-RDEPEND=">=sys-cluster/kubectl-1.9.4"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e 's/ -s -w/ -w/' -e 's#*GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' -e 's#$(GOPATH)/bin/go-bindata#/usr/bin/go-bindata#g' src/${EGO_PN}/Makefile || die
-	sed -i -e "s/get_commit(), get_tree_state(), get_version()/get_commit(), 'gitTreeState=clean', get_version()/"  src/${EGO_PN}/hack/get_k8s_version.py || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin out/minikube
-	dodoc -r docs CHANGELOG.md README.md
-	popd || die
-}
diff --git a/sys-cluster/minikube/minikube-0.28.1.ebuild b/sys-cluster/minikube/minikube-0.28.1.ebuild
deleted file mode 100644
index 93f14a46204d..000000000000
--- a/sys-cluster/minikube/minikube-0.28.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit python-any-r1 golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/minikube"
-ARCHIVE_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Single Node Kubernetes Cluster"
-HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened libvirt"
-
-DEPEND="dev-go/go-bindata
-	${PYTHON_DEPS}
-	libvirt? ( app-emulation/libvirt[qemu] )"
-RDEPEND=">=sys-cluster/kubectl-1.9.4"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e 's/ -s -w/ -w/' -e 's#.*GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' -e 's#$(GOPATH)/bin/go-bindata#/usr/bin/go-bindata#g' src/${EGO_PN}/Makefile || die
-	sed -i -e "s/get_commit(), get_tree_state(), get_version()/get_commit(), 'gitTreeState=clean', get_version()/"  src/${EGO_PN}/hack/get_k8s_version.py || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN}  $(usex libvirt "out/docker-machine-driver-kvm2" "") out/localkube out/minikube-linux-amd64
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	newbin out/minikube-linux-amd64 minikube
-	dobin $(usex libvirt "out/docker-machine-driver-kvm2" "") out/localkube
-	dodoc -r docs CHANGELOG.md README.md
-	popd || die
-}
diff --git a/sys-cluster/minikube/minikube-0.28.2.ebuild b/sys-cluster/minikube/minikube-0.28.2.ebuild
deleted file mode 100644
index bf8d0dce0d11..000000000000
--- a/sys-cluster/minikube/minikube-0.28.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit python-any-r1 golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/minikube"
-ARCHIVE_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Single Node Kubernetes Cluster"
-HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened libvirt"
-
-DEPEND="dev-go/go-bindata
-	${PYTHON_DEPS}
-	libvirt? ( app-emulation/libvirt[qemu] )"
-RDEPEND=">=sys-cluster/kubectl-1.10.0"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e 's/ -s -w/ -w/' -e 's#.*GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' -e 's#$(GOPATH)/bin/go-bindata#/usr/bin/go-bindata#g' src/${EGO_PN}/Makefile || die
-	sed -i -e "s/get_commit(), get_tree_state(), get_version()/get_commit(), 'gitTreeState=clean', get_version()/"  src/${EGO_PN}/hack/get_k8s_version.py || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN}  $(usex libvirt "out/docker-machine-driver-kvm2" "") out/localkube out/minikube-linux-amd64
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	newbin out/minikube-linux-amd64 minikube
-	dobin $(usex libvirt "out/docker-machine-driver-kvm2" "") out/localkube
-	dodoc -r docs CHANGELOG.md README.md
-	popd || die
-}
-
-pkg_postinst() {
-	elog "You may want to install the following optional dependency:"
-	elog "  app-emulation/virtualbox or app-emulation/virtualbox-bin"
-}
diff --git a/sys-cluster/minikube/minikube-0.29.0.ebuild b/sys-cluster/minikube/minikube-0.31.0.ebuild
index 4a324bff4ad4..4a324bff4ad4 100644
--- a/sys-cluster/minikube/minikube-0.29.0.ebuild
+++ b/sys-cluster/minikube/minikube-0.31.0.ebuild
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 83d79119b1f0..2bf2318a1e09 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -6,37 +6,25 @@ AUX neutron-openvswitch-agent.confd 142 BLAKE2B 32c521f734854608173a41625bc037ee
 AUX neutron-server.confd 70 BLAKE2B 88309872ce864e4dfa9072c1472bd6f1e8116f71106ff7e055f6386563ef1077b41f538a72e183ae00e700262d2bcf82434077f0b7e5753389077be3f276b178 SHA512 79f1a40486c37b2c3486b4ef015864f6b20ee89b05d788ce6ade8af934e2c160da9e0495d22e941a717072c1d8ca3b77963a3ec06f3ec25a3f8af8b24a4e40a0
 AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d75eab5f547be35fa5adb792db8960f71a98bbeb71d56b29e5f5166a47735ebe85804019aa4e1f11 SHA512 c9c7386ae8d97205859f02edb0c7d601059af78def3f232f87e676131c5e6fcdb6e880ccee5b1b15397b1dffe83446421145c90ed448f5e9d55994efd1629f92
 AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366
-DIST neutron-11.0.5.tar.gz 10508647 BLAKE2B f1a44d78bf3464c825f104411e5fb388f464fb7ddc0c4a4607a32233a9ec820196b0efbb6d143c428dea301d5eb4ecc97bc7c8120190a9b4a590f872745e2f8e SHA512 73f31156b9771aa404a116b7a3b8a8f9a6b97adf155fc9790b405a7b75cc4c9c6693b5984bcdd10453f85b63a1081fb28262cba4cf09de34a1e24017a920337f
 DIST neutron-11.0.6.tar.gz 10516797 BLAKE2B 3d7ece145a96a299a2619e592b1d055365495938506ea357f10bfc951a5ac76588c18c3201f239529e999c670d483ee91b867db61d49948fd5edf0a1aff6ff0f SHA512 35e1e95ff5a08986577b95457d09da078bcc5d9f67d3c0f325d2f934a489bc0481a2e3b6300ac37d91e4ba4c3a3523e39ff1bc53dc9cc7e757d12648f3f7ab1e
-DIST neutron-12.0.4.tar.gz 10438689 BLAKE2B c22470d8675e52bd7414a3c9b08a7cfd9dd151138a0c11d3eda66b310608dbb2230c77d3c3aa82d0b74256013e2ee716877faa59d6ad622cce5a2f0783797a7f SHA512 fc6f9d8a180836124aa842c64840aefbe99f6489d6b6b9078fae6330177cf6b567016f09f9f97d32399dcc62eef4a8002e05c9f1784343424e7becbf64bb607b
 DIST neutron-12.0.5.tar.gz 10454003 BLAKE2B 9aa617a824e00dcb8979e476bd902940f306a44d7b92f22e273e7793d93d121c0b2a5ab2d2ee21962b3aee124d00a31187df6cffa2319f799add1494fecd9afb SHA512 a9e54ab43ae0a2b6798d37aad6a7cfa87ef6fa80d6121ca1b01817b93bf9480d436cffd0c526fe5d08a46256d885eb1d610039a0412a7a8cc69641db8bf1562b
-DIST neutron-13.0.1.tar.gz 10595397 BLAKE2B 83cfeafa09028e27e6d092b228f986d85af27190f79f11c56cc7599c74f6a85031be729020fddf6ce4fec316fed4ce394aa664bfb8de80b7d89e876309ff05d1 SHA512 70333df77979f5d8408e2b9f67a1169aab3387b2ffdaf84c2a51d38652af66fee5867d36541f718b930c68738a9e7cf3ba3757025dcde215e54addb9be492dd6
 DIST neutron-13.0.2.tar.gz 10596419 BLAKE2B 5d18c5ada86c2676ecab1c0121834c04e5c12d2c81a42ddb9554d0bdc2b7d472b5941b7290dc701c22b21b69442d04a44768c9423ff5d317b51d8cd37aa076bf SHA512 4fb343039a6f6a6930d9770b02d58be732c57910e36739c8364bf8027a7ed55dafc40201ef8c349278310afc2ab6ee80fea562af94896e38891c35eaeb1faced
-DIST neutron-configs-11.0.5.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a
 DIST neutron-configs-11.0.6.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a
-DIST neutron-configs-12.0.4.tar.gz 26252 BLAKE2B c1493e313dc590445e60dcf8df9fc2b89a8e96e57ce072577b3a73fe247218a9ef9805ca9c61b79d2bd4c7aa088933762389258c1184e4572975db03c1674869 SHA512 05c8774d142a59da3e294f2351f1cc89f8cd275aedf3771c11d8176305ceec472980673f0ed07b3f4219a8ff4b4bb6e79f836a1f11ddd8e003d1ccd49051e5ac
 DIST neutron-configs-12.0.5.tar.gz 26252 BLAKE2B c1493e313dc590445e60dcf8df9fc2b89a8e96e57ce072577b3a73fe247218a9ef9805ca9c61b79d2bd4c7aa088933762389258c1184e4572975db03c1674869 SHA512 05c8774d142a59da3e294f2351f1cc89f8cd275aedf3771c11d8176305ceec472980673f0ed07b3f4219a8ff4b4bb6e79f836a1f11ddd8e003d1ccd49051e5ac
-DIST neutron-configs-13.0.1.tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c
 DIST neutron-configs-13.0.2.tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c
 DIST neutron-configs-2017.2.9999.tar.gz 25030 BLAKE2B 6ca7507571983cdf576cb943bb2981623351c3de4220ccf990ba478147bcbaea06f4d5218ba6ad65c98f2a0c60c820be03429e8a22a624cf10339b80fcf17bbd SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a
 DIST neutron-configs-2018.1.9999.tar.gz 26252 BLAKE2B c1493e313dc590445e60dcf8df9fc2b89a8e96e57ce072577b3a73fe247218a9ef9805ca9c61b79d2bd4c7aa088933762389258c1184e4572975db03c1674869 SHA512 05c8774d142a59da3e294f2351f1cc89f8cd275aedf3771c11d8176305ceec472980673f0ed07b3f4219a8ff4b4bb6e79f836a1f11ddd8e003d1ccd49051e5ac
 DIST neutron-configs-2018.2.9999.tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c
-DIST neutron-ml2-plugins-11.0.5.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd
 DIST neutron-ml2-plugins-11.0.6.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd
-DIST neutron-ml2-plugins-12.0.4.tar.gz 7060 BLAKE2B 7690218233971ab50623900e01fe4311e2b599661838a232616cdc4b56bff1a7fd6e6c3b7fe77f79c78c024eb571525b0e21a306c18fd884bd0dfdd6b814f2b4 SHA512 259db5513c014c6dda97432834f90744dec3732292a2de71d488e537f0f660959ea09890cf3dd3d22206295b259dad83440a60ee28e84a5b125547f869e0016b
 DIST neutron-ml2-plugins-12.0.5.tar.gz 7060 BLAKE2B 7690218233971ab50623900e01fe4311e2b599661838a232616cdc4b56bff1a7fd6e6c3b7fe77f79c78c024eb571525b0e21a306c18fd884bd0dfdd6b814f2b4 SHA512 259db5513c014c6dda97432834f90744dec3732292a2de71d488e537f0f660959ea09890cf3dd3d22206295b259dad83440a60ee28e84a5b125547f869e0016b
-DIST neutron-ml2-plugins-13.0.1.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f
 DIST neutron-ml2-plugins-13.0.2.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f
 DIST neutron-ml2-plugins-2017.2.9999.tar.gz 6885 BLAKE2B c953d7222932d09c545dcfe01923f77cbc9e76157f78e5cb85a8e3bb03c8f3b4ab2bcc7eb2fc213578f71cf70543c4182c98bc6e5947fc1a0cbffe3d845bce20 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd
 DIST neutron-ml2-plugins-2018.1.9999.tar.gz 7060 BLAKE2B 7690218233971ab50623900e01fe4311e2b599661838a232616cdc4b56bff1a7fd6e6c3b7fe77f79c78c024eb571525b0e21a306c18fd884bd0dfdd6b814f2b4 SHA512 259db5513c014c6dda97432834f90744dec3732292a2de71d488e537f0f660959ea09890cf3dd3d22206295b259dad83440a60ee28e84a5b125547f869e0016b
 DIST neutron-ml2-plugins-2018.2.9999.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f
-EBUILD neutron-11.0.5.ebuild 9554 BLAKE2B 03b6296076c3c1dccf94fab538d89c6613ff02eee300a06f02a402c88382087e4fedce5a56427fd8bbf18f92f65b9e1ba00b9bd56c25987c9e436e6cb1f489a6 SHA512 36cabcb0a50151ee6da36a09c75037c8b78be8c187572d0b88d6d61fccc9d53f3b29f1cfa7b05a0ba82aea3cf9094a13183e0676fd47bc8dc5ff986fb2623129
-EBUILD neutron-11.0.6.ebuild 9553 BLAKE2B 37aa65b49e4e510dc4016b7f5cc1aafa0882bd6854c0ee90601ec12f26070a95538c42cb93524a7e6a4a569299ecbe3f8deec91cdc270db676cce22d519bfa06 SHA512 311a924d566611d279def90c92d8313b14d6894e68940128063078f77451eb4d2d68c76922e2d04478361a1c604257a7a865df9b121d1f8f89b0b040d5cb3474
-EBUILD neutron-12.0.4.ebuild 9619 BLAKE2B 8e3423b88c65b5ec4f1c58b594e6198891a28fb967614e6d08b5fa7908857bd3785ab6e8f2b3fb893e5c50a472f68d2ac12a53dc56e6143e2e44f717b4b4b5fa SHA512 a3b546c794742108b10608e95a0b919cad584fc62a65672617324e7d84be532b270c220bd4c45c70f0634af7f1cfd557d6c7fa141b891424ddb29ba929c5414f
-EBUILD neutron-12.0.5.ebuild 9621 BLAKE2B 492e8f850ab81648562ecead9b40bded03c2d2508ba35ac3974a1ce18ea346e5f8e2b7fe49c58e93e3186043ab0685f17e6e9e21bd61dc380ef8b4d55c994873 SHA512 28d072aa668524613b537d79a24a57e1fb7af53e4e4480a4c7221f37fb6bf58e9bb8fed9383bc303c9785a4b2e6ff43981036b5b497a94a01e6aa5b13a001d19
-EBUILD neutron-13.0.1.ebuild 8384 BLAKE2B b76635bbd652ac90fae2f24e65847ace07f6a2c319dac02a2cc6ec96c904b062b2736e4c98bfa0da83c1dff3f6be342c1c7921598e234dbae3810706f1856056 SHA512 08045fc1557a0ff576eba846a99001a045a0e3709831ff94a0659815d5c7365de130da7adc59b0ee1b8c96a2a6f5d5b3cfc31bd399c6d3dbb7106c61a3e3c568
-EBUILD neutron-13.0.2.ebuild 8386 BLAKE2B 43f5678705c84666e3a57dcdf9596541f847c27089c33597a59830eb04868662e6658b2d17c8a3109a226402bf19667543c42fbbe9eceeba4901ef61745f0c68 SHA512 a91fa3fd098ba331f640185730685d73f1593fc845e829c79b732d72b27d753aa89cf3af080da327b40e2630d482568b07493fb604a502490a629af3f448c982
-EBUILD neutron-2017.2.9999.ebuild 9578 BLAKE2B 8b9c4f2485d28faae0750908036507c9e562352332fdd13be3bfe8328ae6da2f65c40e440e08d551565b4195037d6b408af7a5fd7d64af27264c989432267001 SHA512 6799d979e5bf66e30ab5b057a1c68b159d0a4aca802a6aeafc137aa53a5bf5367cc51aac3cd0295f0b5c8b15ecc2f65ac7165306d12b0c18669c735df17cbe0d
-EBUILD neutron-2018.1.9999.ebuild 9624 BLAKE2B 7a7233550c83bbeada1da9d9694a5316804909b66ecbe398ea80e92c01cb5aa5386c4d92054aa48431ad05804f1a5ba12a56d8f31b32beb2f195759bef4a8f24 SHA512 df4b448dcc4a7182257ff2343863f36821fded6898bb083257781e5a3e34705d76b77bf743a5ed8bf1155b7a91116f7450de4d02d689f50d0ce21f86b681f060
-EBUILD neutron-2018.2.9999.ebuild 8389 BLAKE2B d2566f326efc80cdd99fcd36ce34b21606059db350346b900896895a05edab2a378175a1e316380187d244e051489760b8e98524cd27d72fce14b27fb057c8d0 SHA512 545060a4192020bee6b9f759abb25470f8cb614af73d73a64c606cd755492bdef8e8543ab1a1cb801d2e278f8a48df697a9449a08d4532d4a2b3923f49516229
+EBUILD neutron-11.0.6-r1.ebuild 9540 BLAKE2B d660158d15ededf0b56edd381ba8b84f8abd50abf50c6992eebae54f6234b37339ab16d3b65c7286c83d16c842166cb658dd51f74ee6ec94735d21abd2caf3f6 SHA512 9d5fceb7ec0e8ec95099e7d0f5cb5a85dc9783b21dbfe621cd0ab69895163d70fa80b7e7b420c1047dd7f8b97a24f72b89e656f3eb9a4223f28e07f4f866a254
+EBUILD neutron-12.0.5-r1.ebuild 9608 BLAKE2B 01d3ea631001259413f98e2c85e65c758cea115a64e78767d7c7732fcab258b1bf41ce366709d39d700fdbaf6658cc5bb63c182105945fa2311d1ee2e7d0de30 SHA512 e40030076c8992ec9da815983de458889973c6b60c9f32ce38b50bcc951bae0f1fcb10236016368f3d94017f014ff8028b4783bc076ed060aac6e2e715ea81b4
+EBUILD neutron-13.0.2-r1.ebuild 8373 BLAKE2B 1cec37720970b276e892e7e826ecab17e5d063d0cb5703df568aeb4ad8d97881d52dbc088554eddcda03f83309d4615e83949813bc9aca866cd1768bda090167 SHA512 1788a996f6525d0a7b9d1e1a9a2c4e8b14938afc8ebf32e598828c5de6af0bd7d20eb28429328c86cd6cee13289eea84f6b5047a3c7d1b6419c3c47401cdf794
+EBUILD neutron-2017.2.9999.ebuild 9564 BLAKE2B 6915b8a7c8aad305aa22e58121d927b476d5c5fc9758407f312716a20c5723df7fb5ea58090a0f91793125c877f20b545dcaa00a41ccfc04e19d95e628d05312 SHA512 dfac3573de2c88d918dcb287c55cdd9cda380122328deb9bafba0e2d73199ff2afa3b4116f8694ba6c18e860f1fbc6d62cd95cb3697a8e1cb1c1097dab17620c
+EBUILD neutron-2018.1.9999.ebuild 9610 BLAKE2B 4d5b83aeb400f971f6b885c4df3251f856f07dcecbd813b40a2ea7658b90d900695595e48e97ed806c9cd3262521fb51f5fcb2637809d652c3ea089e35e80120 SHA512 d40eb3e49940506840045983b235a2a7e9c34550758e81d08c510d087e13545c2cc7b10f6dbd0a4be995e2a7105b4a34e9ebca441d3b5099c7f1f715186ae9f0
+EBUILD neutron-2018.2.9999.ebuild 8375 BLAKE2B d88b9e1112d96c762185f2e376ae00e58457fdf22a1b869ca9610ba2d4bc4439aa58f571d7518653becda1e91eaa616cc6698c33802ea96da6e0955603d04979 SHA512 51bcb6827e7bcbb943de8978dd6ac8403b9f6ff9cadafee53ab641c1837df9c8dd051123e288366913a41de1c567aad7a6b8857df83cc54bd5036695d8083fde
 MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/neutron-11.0.5.ebuild b/sys-cluster/neutron/neutron-11.0.5.ebuild
deleted file mode 100644
index 1ba919af1291..000000000000
--- a/sys-cluster/neutron/neutron-11.0.5.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
-
-inherit distutils-r1 linux-info user
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
-						|| ( openvswitch linuxbridge ) )"
-
-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/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.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/pecan-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${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/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ryu-4.14[${PYTHON_USEDEP}]
-	compute-only? (
-		>=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}]
-	)
-	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/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.1[${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-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${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/ovs-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
-	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.2.0[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	sys-apps/iproute2
-	net-misc/iputils[arping]
-	net-misc/bridge-utils
-	net-firewall/ipset
-	net-firewall/iptables
-	net-firewall/ebtables
-	net-firewall/conntrack-tools
-	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
-	ipv6? (
-		net-misc/radvd
-		>=net-misc/dibbler-1.0.1
-	)
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
-	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-	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
-}
-
-pkg_setup() {
-	enewgroup neutron
-	enewuser neutron -1 -1 /var/lib/neutron neutron
-}
-
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	#add sudoers definitions for user neutron
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	# add generated configs
-	cd "${D}/etc/neutron" || die
-	unpack "neutron-configs-${PV}.tar.gz"
-	cd "${D}/etc/neutron/plugins/ml2" || die
-	unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-	# correcting perms
-	fowners neutron:neutron -R "/etc/neutron"
-	fperms o-rwx -R "/etc/neutron/"
-
-	#remove superfluous stuff
-	rm -R "${D}/usr/etc/"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
-	elog
-	elog "neutron-server's conf.d file may need updating to include additional ini files"
-	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
-	elog "on if you will use openvswitch or linuxbridge (or something else)"
-	elog
-	elog "Other conf.d files may need updating too, but should be good for the default use case"
-	elog
-}
diff --git a/sys-cluster/neutron/neutron-11.0.6.ebuild b/sys-cluster/neutron/neutron-11.0.6-r1.ebuild
index b4e678b3ad44..e365f19ed75b 100644
--- a/sys-cluster/neutron/neutron-11.0.6.ebuild
+++ b/sys-cluster/neutron/neutron-11.0.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/conf
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
 						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
@@ -135,7 +135,7 @@ RDEPEND="
 	net-firewall/ebtables
 	net-firewall/conntrack-tools
 	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
+	openvswitch? ( net-misc/openvswitch )
 	ipv6? (
 		net-misc/radvd
 		>=net-misc/dibbler-1.0.1
diff --git a/sys-cluster/neutron/neutron-12.0.4.ebuild b/sys-cluster/neutron/neutron-12.0.5-r1.ebuild
index dcc94ccde3b7..3713f7728404 100644
--- a/sys-cluster/neutron/neutron-12.0.4.ebuild
+++ b/sys-cluster/neutron/neutron-12.0.5-r1.ebuild
@@ -136,7 +136,7 @@ RDEPEND="
 	net-firewall/ebtables
 	net-firewall/conntrack-tools
 	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
+	openvswitch? ( net-misc/openvswitch )
 	ipv6? (
 		net-misc/radvd
 		>=net-misc/dibbler-1.0.1
diff --git a/sys-cluster/neutron/neutron-12.0.5.ebuild b/sys-cluster/neutron/neutron-12.0.5.ebuild
deleted file mode 100644
index 9ba383d1f146..000000000000
--- a/sys-cluster/neutron/neutron-12.0.5.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
-
-inherit distutils-r1 linux-info user
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
-	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/queens/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
-						|| ( openvswitch linuxbridge ) )"
-
-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/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.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/pecan-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${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/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ryu-4.14[${PYTHON_USEDEP}]
-	compute-only? (
-		>=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}]
-	)
-	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/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	sys-apps/iproute2
-	net-misc/iputils[arping]
-	net-misc/bridge-utils
-	net-firewall/ipset
-	net-firewall/iptables
-	net-firewall/ebtables
-	net-firewall/conntrack-tools
-	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
-	ipv6? (
-		net-misc/radvd
-		>=net-misc/dibbler-1.0.1
-	)
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
-	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-	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
-}
-
-pkg_setup() {
-	enewgroup neutron
-	enewuser neutron -1 -1 /var/lib/neutron neutron
-}
-
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	#add sudoers definitions for user neutron
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	# add generated configs
-	cd "${D}/etc/neutron" || die
-	unpack "neutron-configs-${PV}.tar.gz"
-	cd "${D}/etc/neutron/plugins/ml2" || die
-	unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-	# correcting perms
-	fowners neutron:neutron -R "/etc/neutron"
-	fperms o-rwx -R "/etc/neutron/"
-
-	#remove superfluous stuff
-	rm -R "${D}/usr/etc/"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
-	elog
-	elog "neutron-server's conf.d file may need updating to include additional ini files"
-	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
-	elog "on if you will use openvswitch or linuxbridge (or something else)"
-	elog
-	elog "Other conf.d files may need updating too, but should be good for the default use case"
-	elog
-}
diff --git a/sys-cluster/neutron/neutron-13.0.1.ebuild b/sys-cluster/neutron/neutron-13.0.2-r1.ebuild
index 2ba7a245995c..22f5e34848b2 100644
--- a/sys-cluster/neutron/neutron-13.0.1.ebuild
+++ b/sys-cluster/neutron/neutron-13.0.2-r1.ebuild
@@ -111,7 +111,7 @@ RDEPEND="
 	net-firewall/ebtables
 	net-firewall/conntrack-tools
 	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
+	openvswitch? ( net-misc/openvswitch )
 	ipv6? (
 		net-misc/radvd
 		>=net-misc/dibbler-1.0.1
diff --git a/sys-cluster/neutron/neutron-13.0.2.ebuild b/sys-cluster/neutron/neutron-13.0.2.ebuild
deleted file mode 100644
index cbcd62260d5e..000000000000
--- a/sys-cluster/neutron/neutron-13.0.2.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
-
-inherit distutils-r1 linux-info user
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
-	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
-	EGIT_BRANCH="stable/rocky"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
-						|| ( openvswitch linuxbridge ) )"
-
-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/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/pecan-1.1.1[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ryu-4.24[${PYTHON_USEDEP}]
-	compute-only? (
-		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.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.2.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	sys-apps/iproute2
-	net-misc/iputils[arping]
-	net-misc/bridge-utils
-	net-firewall/ipset
-	net-firewall/iptables
-	net-firewall/ebtables
-	net-firewall/conntrack-tools
-	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
-	ipv6? (
-		net-misc/radvd
-		>=net-misc/dibbler-1.0.1
-	)
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
-	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-	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
-}
-
-pkg_setup() {
-	enewgroup neutron
-	enewuser neutron -1 -1 /var/lib/neutron neutron
-}
-
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	#add sudoers definitions for user neutron
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	# add generated configs
-	cd "${D}/etc/neutron" || die
-	unpack "neutron-configs-${PV}.tar.gz"
-	cd "${D}/etc/neutron/plugins/ml2" || die
-	unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-	# correcting perms
-	fowners neutron:neutron -R "/etc/neutron"
-	fperms o-rwx -R "/etc/neutron/"
-
-	#remove superfluous stuff
-	rm -R "${D}/usr/etc/"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
-	elog
-	elog "neutron-server's conf.d file may need updating to include additional ini files"
-	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
-	elog "on if you will use openvswitch or linuxbridge (or something else)"
-	elog
-	elog "Other conf.d files may need updating too, but should be good for the default use case"
-	elog
-}
diff --git a/sys-cluster/neutron/neutron-2017.2.9999.ebuild b/sys-cluster/neutron/neutron-2017.2.9999.ebuild
index 70ec425c1af4..8c2472f7637e 100644
--- a/sys-cluster/neutron/neutron-2017.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2017.2.9999.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=6
@@ -136,7 +136,7 @@ RDEPEND="
 	net-firewall/ebtables
 	net-firewall/conntrack-tools
 	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
+	openvswitch? ( net-misc/openvswitch )
 	ipv6? (
 		net-misc/radvd
 		>=net-misc/dibbler-1.0.1
diff --git a/sys-cluster/neutron/neutron-2018.1.9999.ebuild b/sys-cluster/neutron/neutron-2018.1.9999.ebuild
index d70d082d35bf..46113c47be21 100644
--- a/sys-cluster/neutron/neutron-2018.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2018.1.9999.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=6
@@ -136,7 +136,7 @@ RDEPEND="
 	net-firewall/ebtables
 	net-firewall/conntrack-tools
 	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
+	openvswitch? ( net-misc/openvswitch )
 	ipv6? (
 		net-misc/radvd
 		>=net-misc/dibbler-1.0.1
diff --git a/sys-cluster/neutron/neutron-2018.2.9999.ebuild b/sys-cluster/neutron/neutron-2018.2.9999.ebuild
index a3844c8bfd2b..a848acb05761 100644
--- a/sys-cluster/neutron/neutron-2018.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2018.2.9999.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=6
@@ -111,7 +111,7 @@ RDEPEND="
 	net-firewall/ebtables
 	net-firewall/conntrack-tools
 	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
+	openvswitch? ( net-misc/openvswitch )
 	ipv6? (
 		net-misc/radvd
 		>=net-misc/dibbler-1.0.1
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index f5af254e51d9..4a8397683fb3 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -4,17 +4,26 @@ AUX nova.initd 745 BLAKE2B 3242a38313147eaffc096752b35cbed34e16f1133cb482515086a
 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
 DIST nova-16.1.6.tar.gz 10987755 BLAKE2B e536df63847bab971ed09ef91fb719f630ea7d61dfc209032ea7522551f79788fd1029f9abe87ceee485c6ccd144a9dae513f08d920b49b1fa7355cab2d4197c SHA512 c021e5535a1e27dbe6c93b19fbb71608d0a137b271605f24e8c1aa60ca5c0e55d075e298d2cba06d3eb4619215e512883bb071e24ddc439d420bc5681d861092
+DIST nova-16.1.7.tar.gz 11004656 BLAKE2B 342ab3efad95b85f07f9fcb6ac4de177270254f5f051348ac9a25992b9a118027965c60b06e56683484fe3c2c5227782991f0874dbcb9319bdccd37e6c60e263 SHA512 024694be9d9d5acc446ca89b6f8597dd9d255c72e32041c9a62200bf5ab72c7caee26e769a93c80b4e7cf144e4e03df1704aa12dc859e39e9835bbe80481021d
 DIST nova-17.0.7.tar.gz 11087543 BLAKE2B 4fbdafc24022da5eeec4bf81ec173578e8ff16cccca10381e7195b9f9ac45e1e178cfb70afdc1646b604b80021af19bf65ea25f5a3166471562ca086d29353af SHA512 23d6a0d0cd252f80d63063043c8ebe89d4614cc206a5de68d1e143894ca29c5e2e82217378af938c2abbbddb391585d434ef0d027931c9d5d8dd82e207f1d023
+DIST nova-17.0.9.tar.gz 11110881 BLAKE2B 9c6e79844462cce14d95bb8796c72e30a953e3fb4fa6de0ccdd359dc571997c06d34e0946f13dadd480661aee4ec9726ead099f1aa39085d64be41abe9d481af SHA512 4e0b487d6eeb17c8c2e34a1823170a2e1f12df1e048b15d67fab92f3d9d5d66bfa433ee6dc8316819ca9f2f23ac57714d5a8431f3e0017c8f71a6207a5ad33d0
 DIST nova-18.0.3.tar.gz 11375327 BLAKE2B eab1b57f1131a0083bafe45f314d2c3eec39ec0a205aed81797bae30a8dd2aa19d0acffe9bc3538009899f5b9691fc0f9fbe7df63e599cde308157d971b66236 SHA512 8903df3c4114a28d4e6e20da1a29cbc696033a6b952b8cea325fa083a261a2d071a4fc17b2fe02ed727929c816d9455b526f789c018a6634bb742d9c7cce89a4
+DIST nova-18.1.0.tar.gz 11391992 BLAKE2B 5dd417661908cae6e12b4a0f3af5c620bd29d3a022661c6f852cd8954940a3a0a2e84d0cf72d43ff926a13836aeb8ed2ecfe0e9be39dc882d705ab0389297891 SHA512 d5112d2528a70338a9293423ede81b9a5dee10cf7872e3070c33d0e16d728d1a1612b8af45ba8424400fd67322238dec299bc85bb84c10989272496b684f8cbd
 DIST nova.conf.sample-16.1.6 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
+DIST nova.conf.sample-16.1.7 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
 DIST nova.conf.sample-17.0.7 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
+DIST nova.conf.sample-17.0.9 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
 DIST nova.conf.sample-18.0.3 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
+DIST nova.conf.sample-18.1.0 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
 DIST nova.conf.sample-2017.2.9999 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
 DIST nova.conf.sample-2018.1.9999 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
 DIST nova.conf.sample-2018.2.9999 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
 EBUILD nova-16.1.6.ebuild 9542 BLAKE2B 85a1bae101ab87c6878f5bd75c2c2e44ae963a38cdb79aec2594d5293d654e58da96e4f47441523a2c6bc1874b93c8a17755b0a16d37e7c1f56ce2619f508353 SHA512 17c6fac5ec300e5327704632f5242420cab1d27f99bce15d02db5ff829829e6b75765c6fa1d7e0ce2f2590532b80f27cc5f164acacd7c1c2245a2b849e9f0595
+EBUILD nova-16.1.7.ebuild 9544 BLAKE2B e4d13559127100934e56430ed470b0c12ef32eee2bd6d9e8270d9674846225b78d0898d986927de870e4a1a81d3e2d22a169b8f9c77585a0c1deae6c1c545d1d SHA512 8707bc6796db9ff94047fd5ea37959a7213cad0d7a682a7cd531d59bde91fb0b2b1404a05f5393f1061f45f6c12a0192a795c809ec56070db872675ac042b4a9
 EBUILD nova-17.0.7.ebuild 9716 BLAKE2B eda0e0a5031e839951ce06fa051807f6610c494624fb04685d1c20b95924ac6f2f3eac82b0f19c3132581f313d9029284f8d54b920f064d81406803cefd2eff7 SHA512 a043c6053b73d14b607cdae8c4ca8d4680335dcf1aed24491ba4147eb9fcc2eca5651a4fee82b6bd4808eaa9a0eacf16ac807d22080a3389cea8903916a16ed3
+EBUILD nova-17.0.9.ebuild 9718 BLAKE2B 222c6fddb34f4ab546060f46fb1c401ded737359c7802a148001ea39c8c7c313e2ed4af0f31681b74bf752be3257c10be4c3e4f1f733fd5aa28c06a51c1d4d62 SHA512 eb199df413363313aa5e039cd3a384c64dc30f49e3ca608a852aea8ea09b0608dfe72d54dbc2c76ca0192f53db1092cc62bf554b4f2ce78be99756580ffe7ad1
 EBUILD nova-18.0.3.ebuild 9502 BLAKE2B e32c4586a6d54d24eabb8effb48791cef3a2048190fce677ab4eb6eb737e304ec449765d92c75404a70b7de514db840f774532f97db19a667492ba84d5af20c4 SHA512 80abc2c021039567cf12a5c37d4e8350ab97b76b13869ea2fc3fe74fb55460800b6a3c9da6300397dd4d1da7d6f53cf4dfdf5c207703e3b35d78c53308c74c9f
+EBUILD nova-18.1.0.ebuild 9504 BLAKE2B 82fe8c31223ba7d9f2ab137d1cdbc8801dd0377431c3f03cc3e8f7f08c28525ab88e4f91fcfcc40c8b3814fd49a239a9e7d1cdcb22bd3403a862da7066eab09c SHA512 7bbea11c0f4d57f29e7b285952c9bab51a2abf6a00a9db1e546abb60def27e8b02445f7d892a2ea0a95a03ad59dd0a23565b2b6b631be993503831fc87b0c754
 EBUILD nova-2017.2.9999.ebuild 9568 BLAKE2B 0b26430ff222e0b4d373a67a6f2d3bf116a147be3731d2fd891555b032de32b14fa08f3f6fbab5a7f0adfdb02772d76df04630c52ab66cee2633a8a36bbb9b4a SHA512 780468c60c5ec932044014d9e6e2e95eebaad6c668b8d8e226706f4044c0a16a4d3f5adebf3497a3877727f24e5ff9d7a7d02c455e521942ecad34cd092e511a
 EBUILD nova-2018.1.9999.ebuild 9721 BLAKE2B 60cde2747c9d1f3316988bedc480141d174abf3e647391b53708854abb6d1d6a55deb41f4e3896c21ff9cf3c4bdf6a5295cd6ec931c58d7075a99df0eb7bb534 SHA512 416f1b4c6295afe9d9a5b0c3aee22030fa1442e973b73a0b93ca2f064f2bfb89c8d3970163f2cfcd5d1f53bfa6130aae570d748a6f38869016217b5023da49a6
 EBUILD nova-2018.2.9999.ebuild 9507 BLAKE2B 8090cacd3c743e7c924d2b6774e68597c1fcad3cc6daa7abaac674716ed61d50a9bb73ebfa79a9de9e2a2a5bd33b496dc1709767ca229728daf7c22e5ae838cc SHA512 0c0665f8948c2a6d1b8296a6477bc9c7c9df93c3f79e1c83e5fe88dd697b9ad2a3b61ab53fe7094e941be99aebe89b579c4008538b92676b020adf4ee36e57f5
diff --git a/sys-cluster/nova/nova-16.1.7.ebuild b/sys-cluster/nova/nova-16.1.7.ebuild
new file mode 100644
index 000000000000..073e8f6c41a1
--- /dev/null
+++ b/sys-cluster/nova/nova-16.1.7.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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" "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-17.0.9.ebuild b/sys-cluster/nova/nova-17.0.9.ebuild
new file mode 100644
index 000000000000..2b93ede15012
--- /dev/null
+++ b/sys-cluster/nova/nova-17.0.9.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+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"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+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.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${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.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.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.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/os-vif-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.10[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${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" "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-18.1.0.ebuild b/sys-cluster/nova/nova-18.1.0.ebuild
new file mode 100644
index 000000000000..7802571382b4
--- /dev/null
+++ b/sys-cluster/nova/nova-18.1.0.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+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"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/rocky"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+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-21.0.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/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	!~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${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.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/os-vif-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/zVMCloudConnector-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/futures-3.0.0[$(python_gen_usedep 'python2_7')]
+	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" "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"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index bf7371321e49..e9d87b9558d7 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -2,6 +2,6 @@ AUX pacemaker.initd 862 BLAKE2B 4da4af65887be567aa77fff2b3647b64fa86a9862a2269db
 AUX pacemaker.service 105 BLAKE2B 2b77b0c81427ab418bb5af372fb4938a7c630a9bb1e4128ed7335d9d1d11b5fbaf657e9ccabd6a7d4b1a120a00d7e46678f8a7a635b0dee7a2aa60559e78d50c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd SHA512 967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
 DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2 SHA512 c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
-EBUILD pacemaker-1.1.16.ebuild 1800 BLAKE2B ecde13f0404966b2839eb47848a37760cfaad76878f6859967484c4e42e49527f7f1861538004aa2d7b651247671996cd0b61732421cc881434bf3d4a4550cab SHA512 549a2dc99b5d0df356c55bbd873cf96f3643e7b64984b3fa4687f0cafd5345cd57ce69ae5932a78687bbfa9b4bb861e032d311c0a5461397752dc78eb21e71bb
-EBUILD pacemaker-1.1.19.ebuild 1803 BLAKE2B 086752040b1730505957b802ae77efaa7c36eea0609255a7f6e3ff85e398863b8f2c0a0933a065853012289957c7168580e35e7d3808ce3ae5fceccb81c701a7 SHA512 7a0dcdf0c7cf699fe47d1748cf70f58f74e3b2073a13f574ac96231c6d8cdd464d96d7299ff6986639edd9317cab9e848faead72cb3e611cc18d114ed7eec493
-MISC metadata.xml 960 BLAKE2B a5d656c25a4a0663c4c9e9d01d69e5a84232d724f54ee895aa38a8d53e61f460b890df34d787536770ee64130799dc447dfb8dd2b32b984c933c71b38396c08a SHA512 1bec04a003d61dfcaffad2fa9ca2bcbf5504f35103c544749a9af251a32fe52c0b92cf4e0099eeffef63535b55d4393616093c13e7bee7e02170f57eca98e563
+EBUILD pacemaker-1.1.16.ebuild 1717 BLAKE2B bd304b1002434499f249ae7e1086137f2feff3d733924513f0d7ed1af3b6293ac4515844ff3360ecf319f2de77eb7fd3cace492e9641649f9ad1c8bbfe1da621 SHA512 2cde996f9d0eb1dec1f534adf05d3390ac2c78bb891898ebe5bcc6f27ec9d1eff571880441a25aa260c8fcfc4c61af8260ab47499e47f88dd377c252854d29ee
+EBUILD pacemaker-1.1.19.ebuild 1720 BLAKE2B 13e9d97d068ddfb22e41219d1a86471084132dcbaa78637a5d9f40a7ad291861b5f9ce9bfbb5ab26172e7b07726f2a92be97ace5cba26dc543ec7c9b7921752f SHA512 67d65c32128d13bc9403c55d736b7f4bceba9cfff49d6889798c6d86d69cea6812899119e391f33967f9adaf302182f33ba133ec1d0d10aa1d2c2eab16b4166e
+MISC metadata.xml 889 BLAKE2B 9b52f88582de605852765e0956640e713e68584066410f472beecccbf69db5a8b7226aaf4ce12851b45fd6945d0cde5cd7e524a873599bf35d4e3cf03a6dd8a5 SHA512 dbfaa3e72fbe361e1648a0a1dfd3e0f153489d005f052fc4ddd1468480d53c84a49bb18c0cfc16ac3f2f409f2ff673ec554faae562452420b898167b8650654f
diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml
index 0d3bda39fd28..4548b53178e8 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -12,7 +12,6 @@
 		capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).
 	</longdescription>
 	<use>
-		<flag name="cman">Enable <pkg>sys-cluster/cman</pkg> support.</flag>
 		<flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>
 		<flag name="smtp">Enable SMTP support via <pkg>net-libs/libesmtp</pkg></flag>
 	</use>
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
index a1744825da24..019e26300394 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -16,8 +16,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 hppa x86"
-REQUIRED_USE="cman? ( !heartbeat )"
-IUSE="acl cman heartbeat smtp snmp static-libs"
+IUSE="acl heartbeat smtp snmp static-libs"
 
 DEPEND="${PYTHON_DEPS}
 	app-text/docbook-xsl-stylesheets
@@ -25,7 +24,6 @@ DEPEND="${PYTHON_DEPS}
 	sys-cluster/cluster-glue
 	>=sys-cluster/libqb-0.14.0
 	sys-cluster/resource-agents
-	cman? ( sys-cluster/cman )
 	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
 	!heartbeat? ( sys-cluster/corosync )
 	smtp? ( net-libs/libesmtp )
@@ -58,8 +56,8 @@ src_configure() {
 		--disable-dependency-tracking \
 		--disable-fatal-warnings \
 		$(use_with acl) \
-		$(use_with cman cs-quorum) \
-		$(use_with cman cman) \
+		--without-cs-quorum \
+		--without-cman \
 		$(use_with heartbeat) \
 		$(use_with smtp esmtp) \
 		$(use_with snmp) \
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
index d53ebabf7236..610fa658e5fc 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
@@ -16,8 +16,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-REQUIRED_USE="cman? ( !heartbeat )"
-IUSE="acl cman heartbeat smtp snmp static-libs"
+IUSE="acl heartbeat smtp snmp static-libs"
 
 DEPEND="${PYTHON_DEPS}
 	app-text/docbook-xsl-stylesheets
@@ -25,7 +24,6 @@ DEPEND="${PYTHON_DEPS}
 	sys-cluster/cluster-glue
 	>=sys-cluster/libqb-0.14.0
 	sys-cluster/resource-agents
-	cman? ( sys-cluster/cman )
 	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
 	!heartbeat? ( sys-cluster/corosync )
 	smtp? ( net-libs/libesmtp )
@@ -58,8 +56,8 @@ src_configure() {
 		--disable-dependency-tracking \
 		--disable-fatal-warnings \
 		$(use_with acl) \
-		$(use_with cman cs-quorum) \
-		$(use_with cman cman) \
+		--without-cs-quorum \
+		--without-cman \
 		$(use_with heartbeat) \
 		$(use_with smtp esmtp) \
 		$(use_with snmp) \
diff --git a/sys-cluster/resource-agents/Manifest b/sys-cluster/resource-agents/Manifest
index 0cbd725f96b5..125b89fc81b2 100644
--- a/sys-cluster/resource-agents/Manifest
+++ b/sys-cluster/resource-agents/Manifest
@@ -3,4 +3,4 @@ DIST resource-agents-3.9.6.tar.gz 617790 BLAKE2B a158743dca379dd4bbc9fe1cf784bca
 DIST resource-agents-4.0.1.tar.gz 659123 BLAKE2B 47b976db2db2f82b2f5c300dbaa0e794d16f91425aa7641c18915cc2cc499af00a49d9990085ac069602d1bf6b8cf1ff5b477236254d16d15a0c48c6649a0350 SHA512 9c92bca7775e3c47c6463587fd7eea89f019997cfab0361ef37ee97192604d3b3d0dcd1cb70f774e01689b803dc856af170bd10e86a9d4824597293c264735d5
 EBUILD resource-agents-3.9.6.ebuild 1521 BLAKE2B 68b25e51f5cba968e60d66ff8f87941d6c266588c49601024cbcb25628bb1ce384902655f134cc0fe2aa6c5e091c6ec5c8de8adfe11c224d57bca680bd272899 SHA512 0bb816f54d9b9ad8ac3958cee5247fe85546245ae6327d61277163062a0d9aa2f90995a866c47775c69bc6572b878255f2e122a38db9b9db6e351ce8b7e6e095
 EBUILD resource-agents-4.0.1.ebuild 1524 BLAKE2B 5c76aba84df32581b318ee506a91e364a716baafafdd40bfd81cfc3198ad43e4688a7d7cfd75eed685c703f3d8938586ed100a1f64cc7c8079a37fdbc3eedce4 SHA512 dc5803facc4c2bfc64a8bd8f2ca96c6041ddfc81705d4c2b8cd2e50265e9638a8e4e1f381f96157378c8755a579732b1aba592fdca4efba354b081bba2d8935e
-MISC metadata.xml 888 BLAKE2B c71e380d4ca4aade4c3c7e06816e98ec51cc3ac8712430a42dc1aaf146c3a63359e7f8ac6743fcb7b3befd761ca179d5f2284d2c011eb3b2d61ce9e7ca6d7419 SHA512 e46229794660b7f8f870c66eee90a3450722a0ef4fcf07ec538b86059585ef8c849270ccec4062865d7505a45cad80dffb614a71a23a8155f34d6cfe86b4282d
+MISC metadata.xml 865 BLAKE2B d90a204c0f8c9785b85951208542e7a61599fd74bfad991fe12d3e9dce6c41bb8f4a4fe6b62ad9afacd8b6933881291272ba3a964d715084368bd9327667eb5e SHA512 954a7cf7c2905824442807d1c0221037321240a60db6400ccad6ea55bd6d0c1822b8e0d5d71537e3cb720e83868d5b56daedd6361571874401d7bc58591b585f
diff --git a/sys-cluster/resource-agents/metadata.xml b/sys-cluster/resource-agents/metadata.xml
index de22179c7fa9..46676fb0d455 100644
--- a/sys-cluster/resource-agents/metadata.xml
+++ b/sys-cluster/resource-agents/metadata.xml
@@ -14,7 +14,7 @@
 	</longdescription>
 	<use>
 		<flag name="libnet">Force use of <pkg>net-libs/libnet</pkg></flag>
-		<flag name="rgmanager">Install resources for <pkg>sys-cluster/rgmanager</pkg></flag>
+		<flag name="rgmanager">Install resources for rgmanager</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">ClusterLabs/resource-agents</remote-id>
diff --git a/sys-cluster/rgmanager-agents/Manifest b/sys-cluster/rgmanager-agents/Manifest
deleted file mode 100644
index 23cc727905ed..000000000000
--- a/sys-cluster/rgmanager-agents/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rgmanager-agents-3.9.2.tar.gz 1103104 BLAKE2B efa71a2924589d3669fd18598ee753f9fdd1984f61cd366dfaad2a389372a5670795e60bb0589d6db811595a1b8f4611ee2e5f6ea08f7da53aef97354e1f2512 SHA512 6ca12715ebbf43fda8acfe17932f79629f55e98e50f79f846c5d66c067389f72357a14474352cfb3bb545efaedde47ffc31b9f60b4237a374f9b76a586378935
-EBUILD rgmanager-agents-3.9.2.ebuild 1677 BLAKE2B 8571ad7cbf326358a551c04a0bb4fb53a8cf0a36f12e5dfe9e36ffffc9515807f478f0bf00ef20db5513166c57f632af0caf3c8f68a9dde09f887b44e0377972 SHA512 29a7d6e22ca5fe13fb0965da857e526dbd2f2460a2f8e8eb373e581b3fd9cda581e3a26f50f048134600893ff737264f8afa7878aa1635f305dd3fa4b273e1b7
-MISC metadata.xml 317 BLAKE2B 2902ea0425404e375147f5b95289a8d50c59c72f7933a49769622e35842ce1c0e1ee00dfbbc96cc93ec36af5458740e79bc6247c4415802fdf367aa5ec82bd07 SHA512 969b84373fae066dff00e89008411a4fc5e73270126aaf50fe731d54056d04491ad0641ebc7dcc8a8d0cad2c77053b48fa07031b09be4af2ad5d89dd3399525d
diff --git a/sys-cluster/rgmanager-agents/metadata.xml b/sys-cluster/rgmanager-agents/metadata.xml
deleted file mode 100644
index 70466e153364..000000000000
--- a/sys-cluster/rgmanager-agents/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<longdescription>Resource Manager Agents</longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/rgmanager-agents/rgmanager-agents-3.9.2.ebuild b/sys-cluster/rgmanager-agents/rgmanager-agents-3.9.2.ebuild
deleted file mode 100644
index 280fff2162e2..000000000000
--- a/sys-cluster/rgmanager-agents/rgmanager-agents-3.9.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit multilib versionator
-
-CLUSTER_RELEASE="3.1.5"
-MY_PN="resource-agents"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Resource Manager Agents"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/r/e/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~sys-cluster/rgmanager-${CLUSTER_RELEASE}
-	~sys-cluster/cman-${CLUSTER_RELEASE}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${P} \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		--sysconfdir=/etc \
-		--with-ras-set=rgmanager
-}
-
-src_install() {
-	default
-
-	# remove useless RHEV check script and log directory
-	rm -rf "${D}/usr/sbin" "${D}/var"
-}
-
-pkg_postinst() {
-	if [[ "${ROOT}" != "/" ]] ; then
-		ewarn "You have to run 'ccs_update_schema' in the chroot-environment"
-		ewarn "to update the schema file for the cluster configuration."
-		ewarn "Otherwise you will not be able to define ressources."
-	else
-		elog "Running ccs_update_schema to update the configuration file schema"
-		/usr/sbin/ccs_update_schema -v -f
-	fi
-}
-
-pkg_postrm() {
-	if [[ "${ROOT}" != "/" ]] ; then
-		ewarn "You have to run 'ccs_update_schema' in the chroot-environment"
-		ewarn "to update the schema file for the cluster configuration."
-		ewarn "Otherwise you may be able to define ressources even though they"
-		ewarn "are not present anymore."
-	else
-		elog "Running ccs_update_schema to update the configuration file schema"
-		/usr/sbin/ccs_update_schema -v -f
-	fi
-}
diff --git a/sys-cluster/rgmanager/Manifest b/sys-cluster/rgmanager/Manifest
deleted file mode 100644
index ad9ed402daae..000000000000
--- a/sys-cluster/rgmanager/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX rgmanager-2.03.09-CVE-2010-3389.patch 1404 BLAKE2B da5f4914dad78a60ec34e99c87ad9bc6f288b0735424ab566dc7c0a56bfd4842f1651c4750cfa704debd9cdc61482578484873992b5b3a8403cddca601509c22 SHA512 35a9654e074a04fe1fb8dbce8262dfeab1f011ce611e630ec21c4cc0e7f3c1586a53cdb803e155ebf738c6a2f1e08959f96b004c4d5ac3560c585975e93929c6
-AUX rgmanager-2.0x.conf 122 BLAKE2B 9b542920be739b7d008c7d326a85a90e8df55a557bc291c5e77d1fcd55425993a0a8150cb55fbb23886b9866f67ff17a9970316e46a138318cb70031ea412d1a SHA512 35e51d4ce26c51cf78ddf05aa82c03f168dff74c31aadba8a6435f57e8dd3c9db6a4ce6d7e763d7cef4f0e3c093382cb58c586c5d689129a655dc75543583110
-AUX rgmanager-2.0x.rc 1871 BLAKE2B 12554e199d9b4ce572332f0d762142a8f55c30e717e5b2c94ffc00c8474da5233a4a1bdd6a3d0a71efe6946b857476e5c89be7c27d83a72dd8ca4fc6508c9aba SHA512 f07f5a73b3c193e8ad80d43eeebd48c22bc7e77a3c51dc7a0cd5ffbea0b7bc9c00cdd949b21d640d56dd1726033dda346b76ca60b5ed01668f4dea93d08b8a7b
-AUX rgmanager-3.1.5-fix_libxml2.patch 731 BLAKE2B 5d5ec2ea3e241ba8386ab5c93f9ac147d6e947a5e8982ce9bbb42c658c6a68d92450211a7f2928b5091aba1e8a29e52726e840931b9de723cfda13afd3918482 SHA512 1ed141c77d138fd91e9ba290a43c1c2c90caa37746b9450ccd75fa1ec2633a8f718a8dece6f3819e8e8cb34ab6c4f1a1104fc5f52e9bcf664edd0f5b6e8022f9
-AUX rgmanager.confd 157 BLAKE2B cf0afbedd85f1abf927603b63f3c504dcf23add13dfc5afc280d8a86e0167c8921f2d20560b070c37bb08a38336f6bc3946e4c8e580612b0e7b89c90543b81f1 SHA512 ffda3bd80dccb70dd75723dd63185354a69380f076aecbbc5e13cd8949730a139c518e03f8e75aa99d6f12f6d6e7b577030c0763fc7a167002945b166aebc56f
-AUX rgmanager.initd 634 BLAKE2B 39708b2d045e05d1b683200d1f2bafed0362eedf7e4740e78c483be9e45ae6b28a7cab3a25c26464339302757cdd5aaf3a899e29c549b20024cc70bc071f5aea SHA512 345146c9f4bc7492a39b6a0b50d4529046843b353a2d66443ca35f8b759d7bec833addca650210b2a699b66012de09410ad86be49ad82cd92f84cd2754254559
-DIST cluster-2.03.09.tar.gz 1784357 BLAKE2B bf024c93fd5ccd9b7410abc2a3bd792c55c3937604d750019a20190753d95d19b2232923a7a76463ccff592bde7fed942aa679af9e39158fef6041258eaf6eb7 SHA512 5dbcf978336a6b7998df0d3dfcff037e1e77e9e69b43d78eb573a65432445e572e69d7783e7874e9edf2632627f02426f428103831e10f5d1f338afa91a62c28
-DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a
-EBUILD rgmanager-2.03.09-r1.ebuild 1530 BLAKE2B c4ac73b567d7c7f420421b6e20678344f7cac770cfe9c5444fcfe95ff41cc6b1e6c3f025b18efbd278a5608bef32729c4ba897ef7c925f890c3091fc024f3386 SHA512 4a8d4a655c8107f23e26844b5785fb1d44a9cb427a05e2a2c66ae5ac3b59df7b5f22e948ec2d127117c02ade4d70daaa7bd45e4d5aaa14878b9ce2a734fb4eef
-EBUILD rgmanager-3.1.5.ebuild 1400 BLAKE2B 92c92445fa8e13e222bcbcc460cdaf6f99b1fa5cea7cd7b1be81e02c5e0d87374f7dbdfaf0a4592cc423808b92a65d2008339305a2bb8e4e09039c67a8883cd1 SHA512 4292c6b6a31f136a963747698181b995c8e56a509f7db9a92f9c56860fdf7cad47d474a843c5060cd0388bad90c6a30cced047dfc0a497cf09e17697137669a2
-MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-cluster/rgmanager/files/rgmanager-2.03.09-CVE-2010-3389.patch b/sys-cluster/rgmanager/files/rgmanager-2.03.09-CVE-2010-3389.patch
deleted file mode 100644
index 86e1f138eed1..000000000000
--- a/sys-cluster/rgmanager/files/rgmanager-2.03.09-CVE-2010-3389.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=352213
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598549
-
-Patch by Jari Aalto <jari.aalto@cante.net>
---- a/rgmanager/src/resources/SAPDatabase
-+++ b/rgmanager/src/resources/SAPDatabase
-@@ -670,8 +670,11 @@
- fi
- 
- # as root user we need the library path to the SAP kernel to be able to call executables
--if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
--  LD_LIBRARY_PATH=$DIR_EXECUTABLE:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
-+if [ "$DIR_EXECUTABLE" ]; then
-+  if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
-+      LD_LIBRARY_PATH="$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-+      export LD_LIBRARY_PATH
-+  fi
- fi
- sidadm="`echo $SID | tr [:upper:] [:lower:]`adm"
- 
---- a/rgmanager/src/resources/SAPInstance
-+++ b/rgmanager/src/resources/SAPInstance
-@@ -382,8 +382,11 @@
- fi
- 
- # as root user we need the library path to the SAP kernel to be able to call sapcontrol
--if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
--  LD_LIBRARY_PATH=$DIR_EXECUTABLE:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
-+if [ "$DIR_EXECUTABLE" ]; then
-+  if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
-+    LD_LIBRARY_PATH="$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-+    export LD_LIBRARY_PATH
-+  fi
- fi
- sidadm="`echo $SID | tr [:upper:] [:lower:]`adm"
- 
diff --git a/sys-cluster/rgmanager/files/rgmanager-2.0x.conf b/sys-cluster/rgmanager/files/rgmanager-2.0x.conf
deleted file mode 100644
index ba5587060f76..000000000000
--- a/sys-cluster/rgmanager/files/rgmanager-2.0x.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-RGMGR_OPTS=""
diff --git a/sys-cluster/rgmanager/files/rgmanager-2.0x.rc b/sys-cluster/rgmanager/files/rgmanager-2.0x.rc
deleted file mode 100644
index d7d77d47fbe2..000000000000
--- a/sys-cluster/rgmanager/files/rgmanager-2.0x.rc
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Adaption of the original RedHat script
-# Original Copyright (C) 2003 Red Hat, Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-	need cman
-}
-
-# We'd like a reload method as well
-opts="${opts} reload"
-
-ID="Cluster Resource Manager"
-RGMGRD=$(which clurgmgrd)
-RMTABD=$(which clurmtabd)
-CFG_FILE="/etc/cluster/cluster.conf"
-
-LOG_ERR=3
-LOG_WARNING=4
-LOG_NOTICE=5
-LOG_INFO=6
-
-#
-# If we're not configured, then don't start anything.
-#
-[ -f "$CFG_FILE" ] || exit 0
-
-
-#
-# log_and_print <level> <message>
-#
-function log_and_print()
-{
-	if [ -z "$1" -o -z "$2" ]; then
-		return 1;
-	fi
-
-	clulog -p $$ -n "rgmanager" -s $1 "$2"
-	echo $2
-
-	return 0;
-}
-
-
-#
-# Bring down the cluster on a node.
-#
-function stop_cluster()
-{
-	kill -TERM $(pidof $RGMGRD)
-
-	while [ 0 ]; do
-		if [ -n "`pidof $RGMGRD`" ]; then
-			while [ -n "`pidof $RGMGRD`" ]; do
-				sleep 1
-			done
-			einfo "Waiting for $(basename ${RGMGRD})"
-		else
-			eend "Services are stopped."
-		fi
-
-		# Ensure all NFS rmtab daemons are dead.
-		killall $(basename ${RMTABD}) &> /dev/null
-		
-		rm -f /var/run/$(basename ${RGMGRD}).pid
-
-		return 0
-	done
-}
-
-
-
-function start() {
-	ebegin "Starting cluster resource manager"
-	start-stop-daemon --start --quiet --exec ${RGMGRD} ${RGMGR_OPTS}
-	ret=$?
-	if [ $ret -eq 0 ]; then
-		touch /var/lock/subsys/rgmanager
-	fi
-	eend $ret
-}
-
-function restart() {
-	pidof ${RGMGRD} &> /dev/null
-	if [ ${?} -ne 1 ]; then
-		svc_stop
-	fi
-	svc_start
-}
-
-function reload() {
-	clulog -p ${LOG_NOTICE} "Reloading Resource Configuration."
-	ebegin "Reloading Resource Configuration "
-	kill -s HUP $(pidof ${RGMGRD} )
-	rv=${?}
-	eend
-	exit ${rv}
-}
-
-function stop() {
-	ebegin "Shutting down cluster resource manager"
-	if [ -n "$(pidof ${RGMGRD})" ]; then
-		stop_cluster
-	fi
-	rm -f /var/lock/subsys/rgmanager
-	eend
-}
diff --git a/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch b/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch
deleted file mode 100644
index eff23ef495bc..000000000000
--- a/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-* Use double underline as header-protectors to avoid collision with icu's platform.h 
-* (pulled in via libxml2 when built with icu support) resulting in int64_t defined twice 
-* (once in icu's ptypes.h and once in stdint.h)
-* patch by Tiziano Mueller <dev-zero@gentoo.org>
---- a/rgmanager/include/platform.h	2011-03-07 19:58:22.000000000 +0100
-+++ b/rgmanager/include/platform.h	2011-03-08 15:59:36.773871936 +0100
-@@ -1,8 +1,8 @@
- /** @file
-  * Defines for byte-swapping
-  */
--#ifndef _PLATFORM_H
--#define _PLATFORM_H
-+#ifndef __PLATFORM_H
-+#define __PLATFORM_H
- 
- #include <endian.h>
- #include <sys/param.h>
-@@ -56,4 +56,4 @@
- #define PACKED __attribute__((packed))
- #endif
- 
--#endif /* _PLATFORM_H */
-+#endif /* __PLATFORM_H */
diff --git a/sys-cluster/rgmanager/files/rgmanager.confd b/sys-cluster/rgmanager/files/rgmanager.confd
deleted file mode 100644
index fa9f66830bd5..000000000000
--- a/sys-cluster/rgmanager/files/rgmanager.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PIDFILE="/var/run/rgmanager.pid"
-
-RGMGR_OPTS=""
-
diff --git a/sys-cluster/rgmanager/files/rgmanager.initd b/sys-cluster/rgmanager/files/rgmanager.initd
deleted file mode 100644
index caaa86f551e7..000000000000
--- a/sys-cluster/rgmanager/files/rgmanager.initd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Adaption of the original RedHat script
-# Original Copyright (C) 2003 Red Hat, Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-#	need cman
-}
-
-start() {
-	ebegin "Starting cluster resource manager"
-
-	# recreate run-directory
-	mkdir -p /var/run/cluster
-
-	start-stop-daemon \
-		--start \
-		--quiet \
-		--exec "/usr/sbin/rgmanager" \
-		--pidfile "${PIDFILE}" \
-		-- ${RGMGR_OPTS}
-	eend $ret
-}
-
-stop() {
-	ebegin "Shutting down cluster resource manager"
-	start-stop-daemon \
-		--stop \
-		--pidfile "${PIDFILE}" \
-		--retry 0
-	eend $?
-}
diff --git a/sys-cluster/rgmanager/metadata.xml b/sys-cluster/rgmanager/metadata.xml
deleted file mode 100644
index 4a09d7ba8d61..000000000000
--- a/sys-cluster/rgmanager/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cluster@gentoo.org</email>
-	<name>Gentoo Cluster Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild b/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild
deleted file mode 100644
index 916463bc0271..000000000000
--- a/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils multilib versionator
-
-CLUSTER_RELEASE=${PV}
-MY_P=cluster-${CLUSTER_RELEASE}
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
-
-DESCRIPTION="Clustered resource group manager"
-HOMEPAGE="https://sourceware.org/cluster/wiki/"
-SRC_URI="ftp://sourceware.org/pub/cluster/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
-	=sys-cluster/dlm-lib-${CLUSTER_RELEASE}*
-	=sys-cluster/cman-lib-${CLUSTER_RELEASE}*"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxml2[-icu]
-	=sys-libs/slang-2*"
-
-S=${WORKDIR}/${MY_P}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-CVE-2010-3389.patch
-	sed -i -e 's/-Werror//g' src/{clulib,utils,daemons}/Makefile || die
-}
-
-src_configure() {
-	(cd "${WORKDIR}"/${MY_P};
-		./configure \
-			--cc="$(tc-getCC)" \
-			--cflags="-Wall" \
-			--disable_kernel_check \
-			--somajor="$MAJ_PV" \
-			--sominor="$MIN_PV" \
-			--dlmlibdir=/usr/$(get_libdir) \
-			--dlmincdir=/usr/include \
-			--cmanlibdir=/usr/$(get_libdir) \
-			--cmanincdir=/usr/include \
-	) || die "configure problem"
-}
-
-src_compile() {
-	# There's a problem with -O2 right now, a patch was submitted.
-	env -u CFLAGS emake -j1 clean all || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die
-	newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die
-}
diff --git a/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild b/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
deleted file mode 100644
index 14508c6668c9..000000000000
--- a/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib versionator
-
-CLUSTER_RELEASE="${PV}"
-MY_P="cluster-${CLUSTER_RELEASE}"
-
-MAJ_PV="$(get_major_version)"
-MIN_PV="$(get_version_component_range 2-3)"
-
-DESCRIPTION="Clustered resource group manager"
-HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
-SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-
-DEPEND="~sys-cluster/libcman-${PV}
-	~sys-cluster/liblogthread-${PV}
-	~sys-cluster/libccs-${PV}
-	~sys-cluster/libdlm-${PV}
-	dev-libs/libxml2
-	=sys-libs/slang-2*
-	dbus? ( sys-apps/dbus )"
-RDEPEND="${DEPEND}
-	~sys-cluster/cman-${PV}"
-
-S=${WORKDIR}/${MY_P}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix_libxml2.patch"
-}
-
-src_configure() {
-	local myopts=""
-	use dbus || myopts="--disable_dbus"
-	cd "${WORKDIR}"/${MY_P}
-	./configure \
-		--cc="$(tc-getCC)" \
-		--cflags="-Wall" \
-		--libdir=/usr/$(get_libdir) \
-		--disable_kernel_check \
-		--somajor="$MAJ_PV" \
-		--sominor="$MIN_PV" \
-		--dlmlibdir=/usr/$(get_libdir) \
-		--dlmincdir=/usr/include \
-		--cmanlibdir=/usr/$(get_libdir) \
-		--cmanincdir=/usr/include \
-		${myopts} \
-		|| die "configure problem"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 8cd4962fce13..af75766c0bfc 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -5,9 +5,11 @@ AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0e
 DIST swift-2.16.0.tar.gz 2466084 BLAKE2B 9077e9745628ebd87f998ae963d19420e0410e29e02f8671dfb95b764d2bc4e5d97bd985e6d5d40496d152c6b931a03a789b372f94ad1b39cd17d3f0a6c9e658 SHA512 db67ee43931872dae9c8f7ff5732d0e075922e73a3660815f1ccb11a2310b94f887e293e9e5d4b1dda13c687365b7433ea9c575b209892f488647aed1a6f9696
 DIST swift-2.17.0.tar.gz 2527561 BLAKE2B baf8d2363bfd39062263542ddd01702e5f5847f3bbd2d227234da44ba742fa7e2bb6954569aab12082de67cfd785496a5530a0fc7613a0ad28d88bd62dbec9f8 SHA512 d5b13a63f549f1118eb1a27505a7444e09bedb532eed8e1ea34d370163dde2ce3e3911b9e4d6bea0d96f0a5c7d99bb103ed80ee8a547051fa29e9b4a09cced16
 DIST swift-2.19.0.tar.gz 2977206 BLAKE2B 05f53e7deb7948924ed36f7fcef164dd72254a90329e88a20ffae1f97ca632967d2e4de34a95c29008f8d636ec95b6860238f77f28b2f9f7ebe78ddb8c784a6c SHA512 fa6f08bacb7488762efaf8dd067cacd82adbc0ca773ee9b9c4a23d05d448eea9d79af2c9fbd619f4a458634e0af3cc3ce8fb8eb0d7cf0c10c7d3c28955000afd
+DIST swift-2.20.0.tar.gz 3012428 BLAKE2B 48cfb52bce8d89836ede3d82cde197e282b55cec7fa9366c18102a2259a2c96553c573c92b884e6471a3ff5a5fc88ff3eeadbb200c691db3c6b20b6881132576 SHA512 15f1082a94f16684001b1d6eaa635500d41dd2ed0b65b87d8fc2363f96179cbc4d40a6faee10e966ad954e45035ed77c31dc265daa2c7c9d17a0e81890e6bc79
 EBUILD swift-2.16.0.ebuild 3698 BLAKE2B 971a44109dc7fbc2230be6db33db966eb1596969953bb1ce03d9133683223f9c17553602397d5555dc88515e6dc5c283f829903ffbfcef1cd63c2cf855c9d8ef SHA512 5fa5c18cd19412aae6e41a544058b29cde20c3a9d84c89c27767ec7f8bff4021a559562e44bbd11b722fd6950b3529734ec42ab9a8bee930e6200160b873953e
 EBUILD swift-2.17.0.ebuild 3698 BLAKE2B 4b120f81788a76de5a14012714fe0dc94d9d51cc6261737d6498cdbd1130c32e6553128ee8e268553c1fc8b51277ceba6b61c32cdcbf087647d806718e83c51e SHA512 d805c50cec482f3a76a283c7f604a8de8e0c3b580f0c43ab9d2ce7c0cb4e4735cfb4e08fdba05598625bc4dc4ab7e2157acaafc70bf568b5a8fb928cb94c91ea
 EBUILD swift-2.19.0.ebuild 3930 BLAKE2B cc022f6b23f888b2f934ad55dc5ae71772cdfa98e5b1ea86b99e1ad42c3fa6f1945267d2494c5443f8b3210a7673bc12c11bb63aee88eb6d1fc25fce60ae7528 SHA512 71aaa9d9c9f21077e759857bffc22d7f8ae1f3d7b1517adae9365826a34d77ae0761e44d22e15ab6551e353744009a6238ae61068dd858da20108fd0e4b89410
+EBUILD swift-2.20.0.ebuild 3932 BLAKE2B 1037e13564f3c736e7aa60f702a6c9022dd61c7fdb102d1da59137ecfa389ac2e11a785b7d87c3d82b401886c2ef43fae7b66ad883998457d4a7e92e0e00ad22 SHA512 d37d3965cc3bda4ea288068ce23fe4519f64981d901830f73ed263e69062810e7f38e693ed1922462b5a519009f1559b12f1e7546c4e4404f557bfe07d4a1c9d
 EBUILD swift-2017.2.9999.ebuild 3711 BLAKE2B 1ede70612136464f13d35f97decc571eb37b28e2bbb9a5414e0b0d74d14bdc5d68e54123e74e066fa4eaeb4071b19816415faccf524b4a4aef79aa7709b2ffc0 SHA512 9aaf45d59410e93fe55c9aacdd2c0de697ce6d076af71b703b7c51df14eecf5fb1edc0d0e62a95240092a624f586a7e79167b33688087a2363208f22f4191bff
 EBUILD swift-2018.1.9999.ebuild 3840 BLAKE2B 1a700bd807c4cc9e6e62da8f29f72e8d45877230d08f7d8fc2047c936c7bfac9788e50c69215f47b6e6b498a8f8fa065b8bbf8c830dc5c6bb1fe10e6fed500fa SHA512 7aff849abb17a19ec0f9feb5c1d1d26428aaa91a764617e662c9bb89c4760d6ab2a36550b60f2674a4867a681af69b79ba3b6d69d9122f335b1c10345eb4187c
 EBUILD swift-2018.2.9999.ebuild 3936 BLAKE2B 8aedceb1506d24c0a6f4c0d219c3d1a734eb220bb5528c1f4e71e036b78da65bb96a656ba1d253a2a2181362711ec3d121106b3bd2013f3db103f5a61f63745e SHA512 d14f2c823a0d900aab54f7d4c919874372f3f996a4dfcb54595564bc2bafdec9761c5fecb041c54308851b7a1ad1da0ccc3136a399ccf0dd9b94fd329c11918f
diff --git a/sys-cluster/swift/swift-2.20.0.ebuild b/sys-cluster/swift/swift-2.20.0.ebuild
new file mode 100644
index 000000000000..d51f090760b4
--- /dev/null
+++ b/sys-cluster/swift/swift-2.20.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
+HOMEPAGE="https://launchpad.net/swift"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/swift.git"
+	EGIT_BRANCH="stable/pike"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="proxy account container object +memcached"
+REQUIRED_USE="|| ( proxy account container object )"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
+	memcached? ( net-misc/memcached )
+	net-misc/rsync[xattr]"
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
+	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
+	~ZFS"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewuser swift
+	enewgroup swift
+}
+
+src_prepare() {
+	sed -i 's/xattr/pyxattr/g' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+src_test () {
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
+	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/swift
+	insinto /etc/swift
+
+	newins "etc/swift.conf-sample" "swift.conf"
+	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
+	newins "etc/mime.types-sample" "mime.types-sample"
+	newins "etc/memcache.conf-sample" "memcache.conf-sample"
+	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
+	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
+
+	if use proxy; then
+		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
+		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
+		if use memcached; then
+			sed -i '/depend/a\
+    need memcached' "${D}/etc/init.d/swift-proxy"
+		fi
+	fi
+	if use account; then
+		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
+		newins "etc/account-server.conf-sample" "account-server.conf"
+	fi
+	if use container; then
+		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
+		newins "etc/container-server.conf-sample" "container-server.conf"
+	fi
+	if use object; then
+		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
+		newins "etc/object-server.conf-sample" "object-server.conf"
+		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
+	fi
+
+	fowners root:swift "/etc/swift" || die "fowners failed"
+	fperms 0750 /etc/swift
+}
+
+pkg_postinst() {
+	elog "Openstack swift will default to using insecure http unless a"
+	elog "certificate is created in /etc/swift/cert.crt and the associated key"
+	elog "in /etc/swift/cert.key.  These can be created with the following:"
+	elog "  * cd /etc/swift"
+	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /sys-cluster
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)