gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /sys-cluster
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
71 files changed, 1125 insertions, 1271 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 42295265df67..664c136b4806 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index ef8bd8b56266..6306fdda3374 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,12 +1,15 @@
 AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
 DIST cinder-13.0.6.tar.gz 5474090 BLAKE2B 564cace126d1b4ae9b08852d294b3a1a8acacebdb40530b24ef51a445c250c0ca290ea0edc7b517bbb46f785b029e284b6d4651b47a92ad59a07e288a6653776 SHA512 03ed956fe906969f9064692cd0bda9e966287245f7f038024024a9b0dc32c5ddf7b8cf91ec503a35c3628d1126c2522f74cdfe686067b8893c800df2ec53dfd3
+DIST cinder-13.0.7.tar.gz 5477179 BLAKE2B 210abb3b1e961eae43edb598deaeddee8ac2ff948519cacf8410d42d306b7e3476e46ecd0acc9392453647ca886bea512c5b7c48f8ae83e2ddf012c4556a8d18 SHA512 4ae3939b5b43ede09d36aeafc623baa4b2dd55b801b22d95230ff3fa2130c84cd2891351d14caf5516982294fcbcab7fd5f4f59a63e8e46e63d5493ba94f9d98
 DIST cinder-14.0.1.tar.gz 5504153 BLAKE2B 1f895cd93a433e93907e5c8eb69675084f3d2f4f3fd5e605e1bbc505795bd853bca15acc1e6af86a0dea88063e9ee5d95dad17dc62abf2ee2a8a4db8efe962b3 SHA512 f2ba53f67fe15216c4f7296fbf5135e9289ead41e6ca94d1b9a003d21000cf0b178c156b100868796c6f36a4bb2bc1cf081fca5c30e6d4cc3ee36d396a3d53f3
 DIST cinder.conf.sample-13.0.6 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
+DIST cinder.conf.sample-13.0.7 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-14.0.1 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2018.2.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2019.1.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 EBUILD cinder-13.0.6.ebuild 7807 BLAKE2B 4f8fcb254a66c4cdafbdc760d6640136b97e48c857aa868f08a379695d7529fa2f8fb05c20e6aeed33ec56b9ee66ec040bdd382ab1517231329d7084f94c758d SHA512 8b4f16da33f2c868dcee627275aed329cc9676f8509e5be763226b9453bff26ecf5dfbd85b3bc06198210e44ff8a07b56eb48b931b18517f2f7cd78ca89c3d54
+EBUILD cinder-13.0.7.ebuild 7809 BLAKE2B 25e88e7eeeab5230ed34fde72301ca280da38b3c2a37e28fc2474d7e8252bfd0bfea6025a10ede5166f4335cd869e7baa8f2a95bf2138c8cc8c5b7a18b888924 SHA512 e662bb768f38ea5f972118a0bdafd963a89f04b96ee784475ec7002f4fd2f7b1434e13d5517d1250d481eba995d2b44f0ac4a1717b8b5885d3c57433f7187413
 EBUILD cinder-14.0.1.ebuild 7816 BLAKE2B 80417911501fdf0749bbc7dc633a6a4acb210faa2cdaf96ef2b836365a5bb348c199711b3ab07c367addb14eab568be23ae4b72a42c1b482822b7df7bbe2461c SHA512 9d63f69225be43b41483d2ff42ed2278efcad71e900e89ea42ba1d273302f0f6760782283680e1eb8988000000908a3a546ce5aef3ad6e9d01d3bc7dd581376b
 EBUILD cinder-2018.2.9999.ebuild 7809 BLAKE2B 25e88e7eeeab5230ed34fde72301ca280da38b3c2a37e28fc2474d7e8252bfd0bfea6025a10ede5166f4335cd869e7baa8f2a95bf2138c8cc8c5b7a18b888924 SHA512 e662bb768f38ea5f972118a0bdafd963a89f04b96ee784475ec7002f4fd2f7b1434e13d5517d1250d481eba995d2b44f0ac4a1717b8b5885d3c57433f7187413
 EBUILD cinder-2019.1.9999.ebuild 7818 BLAKE2B da3671b1b1b1153ad9bac111d63e2d408989107817e8efae04bbf9e77b8c1886e413786c2ca2185c0d78b935ab55afbc086443eec4265e6dbea305df85d214d9 SHA512 eb9c70b521aebc02f3d699b480f2a83e913143a67c5521c6b8a7c75e3ff1b59fc0bd499810da89ea048b939bda3b143ee9e1f40a7943a0a21d59cf331ac2825d
diff --git a/sys-cluster/cinder/cinder-13.0.7.ebuild b/sys-cluster/cinder/cinder-13.0.7.ebuild
new file mode 100644
index 000000000000..dedea484546e
--- /dev/null
+++ b/sys-cluster/cinder/cinder-13.0.7.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{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/corosync/Manifest b/sys-cluster/corosync/Manifest
index cdef3afb8503..714106ac2e64 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -9,8 +9,8 @@ DIST corosync-2.3.3.tar.gz 411784 BLAKE2B a709fe7889fbbddc37f2915d49740fe0061e3d
 DIST corosync-2.3.4.tar.gz 420184 BLAKE2B 3d83a7990ba98a8a026c8e50e7b972de5e5cdf7154658c5dd914537bcf9c2016ef6f7e5fa3b18bb025b24c2eb6c64185ea9627ba1d607135562d55d930758ead SHA512 30914552b8af69ce37a5ea98f17a41f30fa01204ca8beee8218d94b8421769504b90c8e62f1e7222afb6429ead8a2d09ca36e71461c767a2b9bf662637f78bb0
 DIST corosync-2.3.5.tar.gz 428253 BLAKE2B be9fc2b27b60357acee6dee013bc95c08045c114acafc62eaa82a1821f07ff76b8821b9d06f31246b9978f8aef46e3a9e1a2d61ca74465bc74d4140c0ad0d0fa SHA512 212a95d8a68a2941f27c9ec22750a88598744d6fd4db6b46abe0b4cdfa988d3906f760bdf67c403d8c6d0a04da64f29ec744fb68ca51c7269ba58e306553cee9
 DIST corosync-2.4.2.tar.gz 547204 BLAKE2B 1b440e84b25263ea866bd66f9837a3bdbbc790d26a38d10a033d67bb0ba48dd58d6b515879dd0ece75ffe78c8a150c1e5ab8d0eb312e701abdc36eb5cb4dc520 SHA512 45a4d2570d5d096e6f42070f701fdb2aaed26812b6a75f73ea415cf409b33343f8bc090b4fcf851ab971ca4b17925f239c31a3d9eafe4841dfbeb56537b2c78c
-EBUILD corosync-1.3.5.ebuild 1288 BLAKE2B c1adb94e02e97a1a97943aa6966f41e3ce5ce19faeb33dee59b22bba183ccb0b24a958391d6c326fd928fa7e76a3ef6c3e590410362fe14e30912ccaa295a6be SHA512 dc6b07ff7d254e4985b7ae7611e5f820f3ba687b684a8c92703ad2ded562beed2e1ab81e7e1bfdca755ee95e7870b6f9e8f960921a129383082790fb35b4b902
-EBUILD corosync-1.4.7.ebuild 1398 BLAKE2B 8be3182e56e8120910b0d3850310537918b3e8885ec2f16fe7eb476febbd633e9a9c9767164ebd83630a543d9a9001d1581e439017b8359b6445d5629778b2c6 SHA512 5c2ff4b91c6b2a444fbc77422a7f3e1c71e43b9eee9d51d491186988a4831ca13e96494353ce94ad2fbc60aa9b3c2605489310fc9b061f0409f591310c66456d
+EBUILD corosync-1.3.5.ebuild 1278 BLAKE2B a876ca4e049995a3191c383b20fe58368c2fa706ad244310963acb91db978fd299ad577ffad44d5c08c2efb51b430b6c14c8ccb2bff2076a0057cb5a3e761394 SHA512 5b1f58f7b3871327419ae92ff942c15322d318e735858f63e561b439228fb29c4a9e852fd5cbda4569d03c874df132250d2c7ba5c7dcceaef185c388e0171ca0
+EBUILD corosync-1.4.7.ebuild 1388 BLAKE2B a831d2b50bef790120138c1125fca8356333d88d249c30e0b4ae4e9dc802a5f5d91e2eceda59568c936c9b400dd9acfbda055db60b1172b7d0ce9683cc3ec61f SHA512 1afed4ea8c3e3d719dceaee3c261151108b852232c4c0b4235b9b65df09b96c545c983e8a7762956535cd66d5b12f275f570a0d51374e02daf70eea9b9ea74c9
 EBUILD corosync-2.3.3.ebuild 1926 BLAKE2B 5171b894ebabbb3c14e786985851a1d1b83833cbc470825e4dcc8d54bd0eb645a7ea26a8b377b8198532c5b437c889431d6a3f81ef9ca433db2871b9a10b2755 SHA512 4717b0c7c6a8be4d849d528fd0819b8d43b4e16770ffc9022d0ebe837e2c2845a955276912b32a9796faa3d274f6a076dd3cd320503519f76bb2f31f95c42f51
 EBUILD corosync-2.3.4-r1.ebuild 1926 BLAKE2B 7357e0385bad23ad81cf6bc5a48590cba619e18fa759e0d63c7e676be84664f90596c50908daca7531bc7da06c309fa6c34aab8f690958bde87609a1844c6f4a SHA512 115d63649487c591284afbccdac27f6297bb8df7874062098a232a0bd516ede0163151f8be6b420ee8de11e84fe4f5d315cdb7dbb3e603d57b7489947d63e17b
 EBUILD corosync-2.3.5.ebuild 2052 BLAKE2B 884a7252bfa4d6295957bfb9d23e40a545f82e4c749f6905b1cf9dac97c215e3c84eeb3d185e6ab2cbc4c082052a9a18f2d95fc2d97fb8cf29cdcfa0077ffa72 SHA512 8415aec44086036714b824be3285cbee49a5c3987771ac04c971b3f9f0f0b09a045775c2095d6044357d76b7c44d9c75205f27a109596dd6586cc5f4fb67984c
diff --git a/sys-cluster/corosync/corosync-1.3.5.ebuild b/sys-cluster/corosync/corosync-1.3.5.ebuild
index bde57a61886f..a0dfc3dd2950 100644
--- a/sys-cluster/corosync/corosync-1.3.5.ebuild
+++ b/sys-cluster/corosync/corosync-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp:${PN}.org@${PN}.org/downloads/${P}/${P}.tar.gz"
 
 LICENSE="BSD-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="doc infiniband ssl static-libs"
 
 RDEPEND="!sys-cluster/heartbeat
diff --git a/sys-cluster/corosync/corosync-1.4.7.ebuild b/sys-cluster/corosync/corosync-1.4.7.ebuild
index 7c1866699e7a..80a190fe8286 100644
--- a/sys-cluster/corosync/corosync-1.4.7.ebuild
+++ b/sys-cluster/corosync/corosync-1.4.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://build.clusterlabs.org/corosync/releases/${P}.tar.gz"
 
 LICENSE="BSD-2 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 hppa x86"
 IUSE="doc infiniband ssl static-libs"
 
 RDEPEND="!sys-cluster/heartbeat
diff --git a/sys-cluster/feedbackd-agent/Manifest b/sys-cluster/feedbackd-agent/Manifest
deleted file mode 100644
index 19538c6f54bb..000000000000
--- a/sys-cluster/feedbackd-agent/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX feedbackd-agent-0.4-asneeded.patch 1079 BLAKE2B 685e53aae155ab5fe83e459b0480931ca7b384605ee73a7aea33c612c77021bee1655bba27360404e8ddd7057b68f608ff89a95391a7da05208477dd8fab9732 SHA512 957a197678eb6ac99e16d655987e1f5c18a28604c5252f3ff248548f7025aded50891e90cd126b4786d81a79ef6a1de915e2e7f28df2c98e9340cc718241b302
-DIST feedbackd-agent-0.4.tar.gz 69078 BLAKE2B eb48484e8fad9836109bb46914fbff9de9cb95f9688380cbe1374d999bee961d3a048b1113630540b73e8a62d6cf03f0ac6f42379f2421b3676db6ce36ade14a SHA512 e7bdb3f547d59d63fff8c55b4bfd6229dd60c9183694d9f68ac899fcf3a3de47fc05473b514f8c13ea921bf619bf09f242c337245a78eb1a9de03e938069e380
-EBUILD feedbackd-agent-0.4.ebuild 809 BLAKE2B e706bc077e1c124104aecdfdc3eb6fef6836801532ba1c53665d6620ab44b747f08da21bcaf7dccc0d23e0d6b9a74588581c0cfef7733909c19a886133c87674 SHA512 e01fd61fd04df88df94e8dc614d27022a6fa1920309b8d4e1edd568a3ac333aa6b42315f0347f4136e14c2933f49033625b55353d49369c0760f7568a1f9f800
-MISC metadata.xml 336 BLAKE2B dbf9a81fc25b7ce54158e0f47fcf9014558bc292d2a0e951320490eb4be75421afebb067750f541c8172a37d55ff3f86a1cf64366d8172e8ecfeeb3728568903 SHA512 bb519790cc800117748b4968cecd1a99e395a23731b3bc20c481b84f8ed8b46a293a50b1724c68cd6573345db097a919b348c685e74d0da3bed80c7b72c4a76f
diff --git a/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild b/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild
deleted file mode 100644
index 288c301e2e34..000000000000
--- a/sys-cluster/feedbackd-agent/feedbackd-agent-0.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=0
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Dynamic feedback of server loads in a Linux Virtual Server (LVS)-based cluster"
-HOMEPAGE="http://ozlabs.org/~jk/projects/feedbackd/"
-SRC_URI="mirror://sourceforge/feedbackd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="dev-libs/libxml2
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-}
-
-src_compile() {
-	econf \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-xml-config=/usr/bin/xml2-config \
-		--with-perl=/usr/bin/perl \
-		|| die "bad ./configure"
-
-	emake || die
-}
-
-src_install() {
-	#make DESTDIR=${D} install || die
-	einstall || die
-	dodoc ChangeLog NEWS README
-}
diff --git a/sys-cluster/feedbackd-agent/files/feedbackd-agent-0.4-asneeded.patch b/sys-cluster/feedbackd-agent/files/feedbackd-agent-0.4-asneeded.patch
deleted file mode 100644
index 9a29a3fa59eb..000000000000
--- a/sys-cluster/feedbackd-agent/files/feedbackd-agent-0.4-asneeded.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -34,13 +34,16 @@
- # build flags
- CFLAGS = @CFLAGS@
- CPPFLAGS = @CPPFLAGS@ @DEFS@ -I.
--LDFLAGS = @LDFLAGS@ @LIBS@
-+LDFLAGS = @LDFLAGS@ 
-+LIBS = @LIBS@
- 
- XML_CFLAGS = @XML_CFLAGS@
--XML_LDFLAGS = @XML_LDFLAGS@ @XML_LIBS@
-+XML_LDFLAGS = @XML_LDFLAGS@ 
-+LIBS += @XML_LIBS@
- 
- PERL_CFLAGS = @PERL_CFLAGS@
--PERL_LDFLAGS = @PERL_LDFLAGS@ @PERL_LIBS@
-+PERL_LDFLAGS = @PERL_LDFLAGS@ 
-+LIBS += @PERL_LIBS@
- 
- # build targets
- PLUGINS = @PLUGINS@
-@@ -63,7 +66,7 @@
- # feedbackd-agent main program
- $(AGENT): src/feedbackd-agent
- 
--src/feedbackd-agent: $(foreach f, $($(AGENT)_objs), src/$(f).o)
-+src/feedbackd-agent: $(foreach f, $($(AGENT)_objs), src/$(f).o) $(LIBS)
- 
- src/feedbackd-agent: CFLAGS  += $(XML_CFLAGS)
- src/feedbackd-agent: LDFLAGS += $(XML_LDFLAGS)
-@@ -75,7 +78,7 @@
- $(PLUGINS) : % : src/plugins/%.so
- 
- src/plugins/%.so: src/plugins/%.o
--	$(CC) -shared -nostartfiles $(LDFLAGS) -o $@ $^
-+	$(CC) -shared -nostartfiles $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- src/plugins/%.so: CFLAGS+=-fPIC $(XML_CFLAGS)
- src/plugins/%.so: LDFLAGS+=$(XML_LDFLAGS)
diff --git a/sys-cluster/feedbackd-agent/metadata.xml b/sys-cluster/feedbackd-agent/metadata.xml
deleted file mode 100644
index 311ccb6812d8..000000000000
--- a/sys-cluster/feedbackd-agent/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="sourceforge">feedbackd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-cluster/feedbackd-master/Manifest b/sys-cluster/feedbackd-master/Manifest
deleted file mode 100644
index a9c0ecae71ff..000000000000
--- a/sys-cluster/feedbackd-master/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST feedbackd-master-0.4.tar.gz 73715 BLAKE2B b0c0877052955055e1c51857ac287f21939ac9d1c329cc9a1c63e6e3d41b1e0b6519823c768845db07af039173c065020ad170ae3cb1adcde9cbb1a98db47a82 SHA512 3aed02c18b4f820b71587668aeaad4cacf314a548a2ec5995ae7656d63761d0e69ceb6f3a3fd946c1a305982406d0b2b6709c0b943f52a707e4aa7c142df4e10
-EBUILD feedbackd-master-0.4.ebuild 710 BLAKE2B ac95fa1ddd1cfed7221211d0ae728f57c3d84a42299a071dddb9cb9e62ae914914a34cef931d68a081a9f772af8db705129d0516be0042dd2b0a46bd2c689360 SHA512 2d767082f0dd365db25fc067d1f5422be3d910b1d78832afcec00a218b33ad419394cd89b162c77c166c3877b6391b893faf062835b2d37926defbac29d12a35
-MISC metadata.xml 502 BLAKE2B f1171ff1d0104d7155177b0abb862dad6b85734777e86c96fb417b13c0b1713729f95ecd6dfc5aa0fc4eb5c90d2a8ebc0ed469eb07becfc2e313818e5a01f84e SHA512 59132889cdf9287c28118028d0066ca01690290d3783c70f7873287106ea359868f45c9c3c2df516f8cebaefd4013bcca74309cd9a8e2cf2bd842782b38c911c
diff --git a/sys-cluster/feedbackd-master/feedbackd-master-0.4.ebuild b/sys-cluster/feedbackd-master/feedbackd-master-0.4.ebuild
deleted file mode 100644
index 99abf16c57e6..000000000000
--- a/sys-cluster/feedbackd-master/feedbackd-master-0.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Linux Virtual Server (LVS) addon for dynamic server health feedback"
-
-HOMEPAGE="http://ozlabs.org/~jk/projects/feedbackd/"
-LICENSE="GPL-2"
-DEPEND="dev-libs/libxml2
-	>=sys-cluster/ipvsadm-1.24
-	dev-lang/perl"
-
-SRC_URI="mirror://sourceforge/feedbackd/${P}.tar.gz"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="x86"
-
-src_compile() {
-	einfo "Note: feedbackd-master needs a kernel with ipvs support and with ipvs enabled"
-
-	econf \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		|| die "bad ./configure"
-
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc ChangeLog NEWS README
-}
diff --git a/sys-cluster/feedbackd-master/metadata.xml b/sys-cluster/feedbackd-master/metadata.xml
deleted file mode 100644
index e25e8d479ca4..000000000000
--- a/sys-cluster/feedbackd-master/metadata.xml
+++ /dev/null
@@ -1,14 +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>
-    Feedbackd is an add-on to the Linux Virtual Server project (LVS) to provide dynamic feedback of server health.
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">feedbackd</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index e9c05e348989..647686306cf7 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,22 +1,10 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
-DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337
-DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
 DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299
-<<<<<<< HEAD
-=======
 DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097
->>>>>>> next
-EBUILD kube-apiserver-1.13.10.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.14.6.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.14.7.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.15.3.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.15.4.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-<<<<<<< HEAD
-=======
 EBUILD kube-apiserver-1.16.0.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
->>>>>>> next
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.13.10.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.13.10.ebuild
deleted file mode 100644
index a1931590ff31..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.13.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 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
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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.14.6.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.14.6.ebuild
deleted file mode 100644
index a1931590ff31..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.14.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 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
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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.15.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.3.ebuild
deleted file mode 100644
index a1931590ff31..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.15.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 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
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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 21cb6a5e0e8d..9707b6d2980e 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,22 +1,10 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
-DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337
-DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
 DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299
-<<<<<<< HEAD
-=======
 DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097
->>>>>>> next
-EBUILD kube-controller-manager-1.13.10.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.14.6.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.14.7.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.15.3.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.15.4.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-<<<<<<< HEAD
-=======
 EBUILD kube-controller-manager-1.16.0.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
->>>>>>> next
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.10.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.10.ebuild
deleted file mode 100644
index 6aa71f51b8b1..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 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
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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.14.6.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.6.ebuild
deleted file mode 100644
index 6aa71f51b8b1..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 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
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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.15.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.3.ebuild
deleted file mode 100644
index 6aa71f51b8b1..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 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
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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 3a95bc3d0543..60e54e20a442 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,22 +1,10 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
-DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
-<<<<<<< HEAD
-=======
 DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337
->>>>>>> next
-DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
 DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299
 DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097
-EBUILD kube-proxy-1.13.10.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.14.6.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-<<<<<<< HEAD
-=======
 EBUILD kube-proxy-1.14.7.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
->>>>>>> next
-EBUILD kube-proxy-1.15.3.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.15.4.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.16.0.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.13.10.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.13.10.ebuild
deleted file mode 100644
index f519690e8b2f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.13.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 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
-	>=dev-lang/go-1.11"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" 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.14.6.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.14.6.ebuild
deleted file mode 100644
index f519690e8b2f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.14.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 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
-	>=dev-lang/go-1.11"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" 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.15.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.15.3.ebuild
deleted file mode 100644
index f519690e8b2f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.15.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 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
-	>=dev-lang/go-1.11"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" 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 da4c2a5519fc..1f9fff31bb2a 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,22 +1,10 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
-DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337
-DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
 DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299
-<<<<<<< HEAD
-=======
 DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097
->>>>>>> next
-EBUILD kube-scheduler-1.13.10.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.14.6.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.14.7.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.15.3.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.15.4.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-<<<<<<< HEAD
-=======
 EBUILD kube-scheduler-1.16.0.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
->>>>>>> next
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.13.10.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.13.10.ebuild
deleted file mode 100644
index 2830ac40ff36..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.13.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 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
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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.14.6.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.14.6.ebuild
deleted file mode 100644
index 2830ac40ff36..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.14.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 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
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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.15.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.3.ebuild
deleted file mode 100644
index 2830ac40ff36..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.15.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 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
-	>=dev-lang/go-1.11"
-
-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" -e "s/-s -w/-w/" 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/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 105dcafbd3ab..8af30a76012c 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,20 +1,8 @@
 AUX kubeadm-1.14-openrc.patch 3523 BLAKE2B bbcc45a82984afe2a8ab567ce1319b6c14c84eade26aba21393ba6fe44de35b654000468e15fd44e49da329c85cd4d3dac3fe643d8c83183ab126edaf4a5f4c9 SHA512 8aec0a1cda24fcd7001e34ff6163aee7eaf679dea953068b58df3578c016f70e1406903e032a51519bc16ac0dbe583159d1cf4d504adbb2930d811cc2f762cfe
-DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
-DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
-<<<<<<< HEAD
-=======
 DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337
->>>>>>> next
-DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
 DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299
 DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097
-EBUILD kubeadm-1.13.10.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
-EBUILD kubeadm-1.14.6.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
-<<<<<<< HEAD
-=======
 EBUILD kubeadm-1.14.7.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
->>>>>>> next
-EBUILD kubeadm-1.15.3.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
 EBUILD kubeadm-1.15.4.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
 EBUILD kubeadm-1.16.0.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
 MISC metadata.xml 1128 BLAKE2B b5ad31ef126f2d95646a37c256b82d2ad5e008968f928fb56b05c39514d4a9e0a252ebcefbeac8679f5349acac170886859af44f095aafea97fc8bf00a34bc44 SHA512 b9246624712068cf304fc5329ae851c26d52204b684b5f547892b23e68948b04b4ed4654a49d7bb5fe7eea658b58fbdbbe51a7a9ba1f4a94c5d0499a033b7f5a
diff --git a/sys-cluster/kubeadm/kubeadm-1.13.10.ebuild b/sys-cluster/kubeadm/kubeadm-1.13.10.ebuild
deleted file mode 100644
index 6c4b699b7594..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.13.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 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 Easily bootstrap a secure Kubernetes cluster"
-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" -e "s/-s -w/-w/" 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/kubeadm/kubeadm-1.14.6.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.6.ebuild
deleted file mode 100644
index 763c3838067b..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.14.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 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 Easily bootstrap a secure Kubernetes cluster"
-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.12
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-	pushd src/${EGO_PN} || die
-	eapply "${FILESDIR}/${PN}-1.14-openrc.patch"
-	popd || 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/kubeadm/kubeadm-1.15.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.15.3.ebuild
deleted file mode 100644
index ffd3646b62e1..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.15.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 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 Easily bootstrap a secure Kubernetes cluster"
-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.12
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" 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/Manifest b/sys-cluster/kubectl/Manifest
index a919cb1c5689..79db88119eb4 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -6,12 +6,8 @@ DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec
 DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097
 EBUILD kubectl-1.13.10.ebuild 1254 BLAKE2B 2743900120a1056c1a533a63144ffb2c2f76efdc4bc9efed8689126396ce83a80f55b9c65cfeb20e859471c3cb6f8a60d6c0c7e61a0bbcfb059858b72caa45a1 SHA512 b5d88e62e375cf74e1ffac496f5a931fe2df7fd119618cb0e0f6e062940a1f566cff14dcd74d27f0455b303b309de2f184a960a66d2e5e8b0f72572a6b699ce1
 EBUILD kubectl-1.14.6.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
-<<<<<<< HEAD
-EBUILD kubectl-1.14.7.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
-=======
 EBUILD kubectl-1.14.7.ebuild 1254 BLAKE2B 3184f7cccfcc48fa97f23af40cdc5fbf6903741a78c1c1936e8aa1915b0e7d1f4ad8e263769eda8093a0b9cc2224c4992c201e5df0b214d88235e605223e38a3 SHA512 4392b86b8ef111139cea7abf6017becd26b292e2f0b3c4b0bbdc124ba5308752c4935049e7cf0cab76ca8d41b74bfc51eb35a72e1ac3010ddc9d9d9e4bdf1d78
->>>>>>> next
-EBUILD kubectl-1.15.3.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
-EBUILD kubectl-1.15.4.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
-EBUILD kubectl-1.16.0.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
+EBUILD kubectl-1.15.3.ebuild 1287 BLAKE2B 7ad8382c1d26cf19add47a321d36002be4af02839058cede08914b060487537d3d96364a5230a9e24f2e6c8043ab0adb3f0e443ab310462507fe880fdf35998f SHA512 f2771b09d63bd9b4a5ff836d45dbc44d92c4de6915f008755cc9eed84f47901ed0d0b1ec250849261c6f6fb209fc0bfba0cb8c8a3244e761f5d07dcf00d294e6
+EBUILD kubectl-1.15.4.ebuild 1287 BLAKE2B 7ad8382c1d26cf19add47a321d36002be4af02839058cede08914b060487537d3d96364a5230a9e24f2e6c8043ab0adb3f0e443ab310462507fe880fdf35998f SHA512 f2771b09d63bd9b4a5ff836d45dbc44d92c4de6915f008755cc9eed84f47901ed0d0b1ec250849261c6f6fb209fc0bfba0cb8c8a3244e761f5d07dcf00d294e6
+EBUILD kubectl-1.16.0.ebuild 1287 BLAKE2B 7ad8382c1d26cf19add47a321d36002be4af02839058cede08914b060487537d3d96364a5230a9e24f2e6c8043ab0adb3f0e443ab310462507fe880fdf35998f SHA512 f2771b09d63bd9b4a5ff836d45dbc44d92c4de6915f008755cc9eed84f47901ed0d0b1ec250849261c6f6fb209fc0bfba0cb8c8a3244e761f5d07dcf00d294e6
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.14.7.ebuild b/sys-cluster/kubectl/kubectl-1.14.7.ebuild
index eaf9590fedad..f7acff2e23b4 100644
--- a/sys-cluster/kubectl/kubectl-1.14.7.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.14.7.ebuild
@@ -6,11 +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"
-<<<<<<< HEAD
-KEYWORDS="~amd64"
-=======
 KEYWORDS="amd64"
->>>>>>> next
 
 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.15.3.ebuild b/sys-cluster/kubectl/kubectl-1.15.3.ebuild
index 7a61b25dce90..2ab1aefbcfc3 100644
--- a/sys-cluster/kubectl/kubectl-1.15.3.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.15.3.ebuild
@@ -25,6 +25,7 @@ src_prepare() {
 	default
 	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+	rm src/${EGO_PN}/go.mod || die
 }
 
 src_compile() {
diff --git a/sys-cluster/kubectl/kubectl-1.15.4.ebuild b/sys-cluster/kubectl/kubectl-1.15.4.ebuild
index 7a61b25dce90..2ab1aefbcfc3 100644
--- a/sys-cluster/kubectl/kubectl-1.15.4.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.15.4.ebuild
@@ -25,6 +25,7 @@ src_prepare() {
 	default
 	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+	rm src/${EGO_PN}/go.mod || die
 }
 
 src_compile() {
diff --git a/sys-cluster/kubectl/kubectl-1.15.4.ebuild~merged b/sys-cluster/kubectl/kubectl-1.15.4.ebuild~merged
deleted file mode 100644
index 7a61b25dce90..000000000000
--- a/sys-cluster/kubectl/kubectl-1.15.4.ebuild~merged
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 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.12
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" 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.16.0.ebuild b/sys-cluster/kubectl/kubectl-1.16.0.ebuild
index 7a61b25dce90..2ab1aefbcfc3 100644
--- a/sys-cluster/kubectl/kubectl-1.16.0.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.16.0.ebuild
@@ -25,6 +25,7 @@ src_prepare() {
 	default
 	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
 	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+	rm src/${EGO_PN}/go.mod || die
 }
 
 src_compile() {
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 8a5444585d91..de89a258dbdf 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,22 +3,10 @@ AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbc
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
-DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
-DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
-<<<<<<< HEAD
-=======
 DIST kubernetes-1.14.7.tar.gz 28086210 BLAKE2B 5731ce2796f4d5178ec3ee01c340c48af88fdfc7330b53bf04933ff26c00be0092f55f7e8717e60415423f74369db465ab260ac7ff60a9787b76e085c0e07301 SHA512 cc5eb12c4337a72c234fcc1bc660fa8e6f95957b53c774e2dafa2974a2eb5f0b05532766bac8dfc2f45d1f683ed6de425978c71a633a5782843aebed192f0337
->>>>>>> next
-DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
 DIST kubernetes-1.15.4.tar.gz 26643115 BLAKE2B 7fa68a2deae73d92526a65a0c70f697ec831e158417a607ab1884ade53c652123370e0fdfb13bc6804fc3fece03d2a29d3bd91fd27f767585f3ea05eec759b47 SHA512 046305e572b743c4eb59fd9ee05af197961d1a5b47cf88d30cbcbb9be4cc7dddc497738cd3700a4ff047deb8c0057d809b2c7b98fcf160657b94ae7b71ea3299
 DIST kubernetes-1.16.0.tar.gz 31159351 BLAKE2B e140a8bcbd753e29dfe4367c5a81578327239e72e51d1dd9402094c7482ba159a27ba5fb9df9825e5c7f3e428a6855c598670932f53d63845cf18fcdec6a0a54 SHA512 2019c15ea952b9dea7cb2a1ce6df0402f8addc9e5786413cc9a734923c0fa0256881e59b9a36f859cac9072c91754baf2ba235793296ec870e1aee5a64c4a097
-EBUILD kubelet-1.13.10.ebuild 1370 BLAKE2B 266582d9525e760a83c267cee55e51402121c8b70f5392cfb428eb47da7a5087a3d8c419f22ee8d1f17ff8471e610b0cb29605079118f64470b0b3ebc4198731 SHA512 8efbd5783cf009f22ee4687d20fb09ad495cd8cb65be297c168f47871ed1d7a945066ad49b114511987d97c6196dc30c58e774a9ddbee3d5b292807ec9abae3a
-EBUILD kubelet-1.14.6.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-<<<<<<< HEAD
-=======
 EBUILD kubelet-1.14.7.ebuild 1370 BLAKE2B 266582d9525e760a83c267cee55e51402121c8b70f5392cfb428eb47da7a5087a3d8c419f22ee8d1f17ff8471e610b0cb29605079118f64470b0b3ebc4198731 SHA512 8efbd5783cf009f22ee4687d20fb09ad495cd8cb65be297c168f47871ed1d7a945066ad49b114511987d97c6196dc30c58e774a9ddbee3d5b292807ec9abae3a
->>>>>>> next
-EBUILD kubelet-1.15.3.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.15.4.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.16.0.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.13.10.ebuild b/sys-cluster/kubelet/kubelet-1.13.10.ebuild
deleted file mode 100644
index 447655a3a284..000000000000
--- a/sys-cluster/kubelet/kubelet-1.13.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-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
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" 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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.14.6.ebuild b/sys-cluster/kubelet/kubelet-1.14.6.ebuild
deleted file mode 100644
index f38ce59e625d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.14.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-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
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" 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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.15.3.ebuild b/sys-cluster/kubelet/kubelet-1.15.3.ebuild
deleted file mode 100644
index f38ce59e625d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.15.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-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
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" 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}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/lspbs/Manifest b/sys-cluster/lspbs/Manifest
deleted file mode 100644
index f2a17bd1a3c9..000000000000
--- a/sys-cluster/lspbs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lspbs-1.1.tar.gz 69265 BLAKE2B 6daf02e03effb8ef4f54a1e016881e8d38803c4aee56c6942d1ccb5736d02aea696a7045d8afce3da06326a1d1c2974fe36d7d1dcde5b51dcafcd3e467c4b7b2 SHA512 4732767968d3226a88617fd60796811c8fef6e7ba717e66e31867b06045a1483d4be65f795a8fde81598efdd5e6cdaf688d52cac9cb0c8f888d9420f539b2730
-EBUILD lspbs-1.1-r1.ebuild 692 BLAKE2B b1839399906e049c78b0a64b99c10a679eb4d64342bdd0b070755a4407d5d976f27b28b77c041b7029f688061142fdcad4a1e341ed2149c243c7fa96e508c590 SHA512 b13fc5edbdbf483fc8aee0d2a13644afa93f5b04c193896264c3226024dac60fbd2101650fd6d65c8326dcfdc5e4509c9bdff74822cd27c113d17407b87fa189
-MISC metadata.xml 833 BLAKE2B a943d1a2ab78896ce6c055ebef5b6ed79f1aa778c818497801548f3d5e5bccf0cfdb1695cf38654656ba55808f6ade3d67848099f46814bcfccf7f879c0f8762 SHA512 939ff6cd4dcfadca5196014cd570cbf51dfbd5af543a99768d43b3c7c76193f83305d13c718da26e7cc806703067dab6cf5482e8323bd9036895b23ce61ba824
diff --git a/sys-cluster/lspbs/lspbs-1.1-r1.ebuild b/sys-cluster/lspbs/lspbs-1.1-r1.ebuild
deleted file mode 100644
index 5da338aa2062..000000000000
--- a/sys-cluster/lspbs/lspbs-1.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Displays clear, concise and up-to-date PBS node and CPU usage information"
-SRC_URI="http://homepages.inf.ed.ac.uk/s0239160/misc/lspbs/${P}.tar.gz"
-HOMEPAGE="http://homepages.inf.ed.ac.uk/s0239160/misc/lspbs/lspbs.html"
-IUSE=""
-
-DEPEND="sys-cluster/torque"
-RDEPEND="${DEPEND}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc README || die "dodoc failed"
-
-	doman "${D}"/usr/share/lspbs.1 || die "doman failed"
-	rm -f "${D}"/usr/share/lspbs.1 || die "failed to remove old man page"
-}
diff --git a/sys-cluster/lspbs/metadata.xml b/sys-cluster/lspbs/metadata.xml
deleted file mode 100644
index e40efc65cc22..000000000000
--- a/sys-cluster/lspbs/metadata.xml
+++ /dev/null
@@ -1,18 +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>
-    Lspbs is a lightweight alternative to the xpbsmon utility, which
-    is part of the OpenPBS package. It uses the color xterm to
-    display clear, concise and up-to-date node and CPU usage
-    information. Lspbs also supports unformatted printing and can
-    filter nodes by their properties and current state. This generic
-    filtering feature extends the simplistic functionality provided by
-    the pbsnodes utility, which is also part of the OpenPBS
-    package. This makes lspbs useful for managing PBS-based clusters.
-  </longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index d57a71b5f736..d5a54ea98a8d 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -4,13 +4,19 @@ 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-18.2.2.tar.gz 11441554 BLAKE2B 7d92017bbf6370bf99358e5992aaf7f1a667d74d3893920910ae004a4e334fdb416fe8eba3ab3762b8811df495a641b6c9a604e6b690b7aa2431b71dc3ea7703 SHA512 7dbd46d44d66da041ad47dccf856dbbb09360384f452d544681610d95d568bd940f42ef8dc7c8e5ee95fd7bc3edefe0cff665d55a7d708d3315633367ea0fec4
+DIST nova-18.2.3.tar.gz 11450952 BLAKE2B 1e0b0afefe8281ab9024394194697d3aea81169da7a003a07890dfc11bd38511d39315152dab1b9a1d17b2d1c8109102112b245957e727d053de7fd67ad0c757 SHA512 1dcb3fa2ea80afcd5739efad01f3d65723a754fc8d79639e54cd3fbd6e4e4125593799a123b4572c63f8c074a10c244d91814f15d2c7135066d55cd2a991f7fc
 DIST nova-19.0.2.tar.gz 11629406 BLAKE2B 026c123fc8ac98b6852a5fc8dfdeac7b46c913064e23723c4d322350d121dc2fb8258e24336eadab75f3da31cbac33e57ec2bb5d5e7bac0107dafb05420f21fb SHA512 a9bbdda3433a0f503029cc00a05d002088f3a8ac974c2775bfd77b0145ad2d4b76c07cacda3f21b40e5b2f1658718004b3bc5c276d2c8f9a10a52c10b8a7f9e3
+DIST nova-19.0.3.tar.gz 11646820 BLAKE2B 31aa6ef44609f5698f24168fc79cd9c6d5dd2c5b0da5eed277ccd8d1aa4ee7d6a07a1318bd7f964dd141dbca8f0297a2d677ad2fdf949fcc7a72970d099197e9 SHA512 4869d705c165a909e13b27ac383b7be52f9d5925fbe9d8779f773d0b1ce87b6ae7642c4551e01f57c24221e6fe120a3e2b5de41d73dfdcd73f82252b48a2af39
 DIST nova.conf.sample-18.2.2 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
+DIST nova.conf.sample-18.2.3 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
 DIST nova.conf.sample-19.0.2 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
+DIST nova.conf.sample-19.0.3 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
 DIST nova.conf.sample-2018.2.9999 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
 DIST nova.conf.sample-2019.1.9999 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
 EBUILD nova-18.2.2.ebuild 9493 BLAKE2B 1b9ec29a2a6ff3eb43933d2871d5c7c2caec586cbd2e15df1b79e98a39e852de164b43647c1c00ff2a3557d39c6b697686bee3a3c53a9201a8b0726e88406356 SHA512 fbb3e4561c7b5ff86da1216ad3ab9e891da0564ce77b290d1abeec910a13738da14b46caf902ddf388513f835e15dd0774811ec885ba6b919894db349c9a7b57
+EBUILD nova-18.2.3.ebuild 9495 BLAKE2B 633aee31386dc637e9123e0c5b81f800b62a63dfef15f04e67c31be91f941181421bc9cfeaeb334b99a5d65649d04b4125029807e6db6d56bd7bd1cf2e3690a8 SHA512 a7c54a76052c62bd65782e62daedbb61b57de0aa12049b3d399b8a1c5c780ba3afb3b1b92a15e7e9b49f97a9b00eab348264db4b9afff18eaa714535022ce724
 EBUILD nova-19.0.2.ebuild 9582 BLAKE2B 285306242428951b117928d492e8babe5786e03e4065e8556395c7cf67afaea3c10d04acc6cb74907a23aa44535b4c8661635dafe0727ade47fdae1359395a38 SHA512 9d61543f6809972a18843d122a3c098f956f27f1954e179fb0bbe235c974bc01c255c400563b4c21d4ffcb991174792548991c402aebedb76851d05cb9c15486
+EBUILD nova-19.0.3.ebuild 9584 BLAKE2B 1a7eea28b4e868740a02a5882e55f88ff401011e2fbf376b2204369c604fd7a212d4f1b26b7e8a1b15e5935f9cf188a4c1c196ecf9419f1d3fa54979c1cb8806 SHA512 a8a8182045b8f399d2b0fc1cb278f6490eb4c2656803433e80650bbd039fb8ce084d3de8d130d0fbd7e39164258d1af28524038c0ddf5b5e26275ed4e50b0b70
 EBUILD nova-2018.2.9999.ebuild 9496 BLAKE2B c962c25fe0107327d30eb0fde3163e4722763db4e2b3b0ff0250f9dbee071807db7a5dd9404e4425d758cb6408efafa571f79fa50cd0756355ca6754513668e6 SHA512 62756e826de4bed6fa6d185e92defe459e9e32ca53b7b860c882896e0dd306d04918cd932c25311d0700ccefc3effb16e5fadcc4e17d7e2074088d90e3f49734
 EBUILD nova-2019.1.9999.ebuild 9354 BLAKE2B 92302f07eb36bcf62aaefaa51cec5795692823fa886978c70bbbcae000fa46f6b4baeb355831fa58bc8a9bd8fd57fe4dde23c7d50a250d6492c080929979c375 SHA512 cca0284a3e11f5b4509bc755e1390aa383809d8acb7baaa40345d41d09da9222ac7aa968fe14fa95528268410a1bc5f474c3acc7145256709109a4c26278ebd4
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-18.2.3.ebuild b/sys-cluster/nova/nova-18.2.3.ebuild
new file mode 100644
index 000000000000..f8e837d3b199
--- /dev/null
+++ b/sys-cluster/nova/nova-18.2.3.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{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)
+	python_moduleinto db/sqlalchemy/migrate_repo
+	python_domodule 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/nova/nova-19.0.3.ebuild b/sys-cluster/nova/nova-19.0.3.ebuild
new file mode 100644
index 000000000000..f7cb6377e81d
--- /dev/null
+++ b/sys-cluster/nova/nova-19.0.3.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+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/stein/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/stein/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[${PYTHON_USEDEP}]"
+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.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.44.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.32.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.34.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.33.3[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.14.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/futurist-1.8.0[$(python_gen_usedep 'python2_7')]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	app-emulation/spice-html5
+	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
+	rm -r "${ED}/usr/etc"
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	python_moduleinto db/sqlalchemy/migrate_repo
+	python_domodule 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/ocfs/Manifest b/sys-cluster/ocfs/Manifest
deleted file mode 100644
index d1798cb4c52f..000000000000
--- a/sys-cluster/ocfs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocfs-1.0.14.tar.gz 467237 BLAKE2B 5736e144746b6b8055551ac7388397c3cf78502f962a7ce83fcae2e1a28e88c15c790025c4680b94bca4f183be0cf0cfa942a21236690e7fa04e47ecb965b90b SHA512 0a081806ef65bb988a85d65221210748b3b6eaeb1191dde333120090c8d54818549bdeadd72dd814497d3aa4053ef474ade18c4ced8cbf3423785ff6fb404264
-EBUILD ocfs-1.0.14.ebuild 1052 BLAKE2B 5e947095fa481155e4f498e495f8e41c828014186be41133a5f929988c351b059a4f7ac5aefcc41f6e5736c36c5f883dfce644d1af8e4ebacadfaeedb77b37ff SHA512 28e6c22c19ac14e54d93a4df12779739e641bc82157a83dd8e8720f5434f7a1f4d09728599b5148fee60cbacba4dc5c8b5e77ad8725a17e0eb543a4d583304ad
-MISC metadata.xml 307 BLAKE2B 59ad9ddb6ae3479e674b65229a8421d91835713704a6047fd4aeccba46e541c4dda3ffeb0077d0c2b7daeb71358030b7cf7e9599fb817e9374b3f98dcc467a3f SHA512 4373d384ed9713aca4b4b69e7aaa5d1d0c700e9d43a5c23a66bd736fa3b7cecb5dfe0f1a314296a6235e48af76529875425fd9ef0582d8583fc8e1b5a5012461
diff --git a/sys-cluster/ocfs/metadata.xml b/sys-cluster/ocfs/metadata.xml
deleted file mode 100644
index cacaf0222b69..000000000000
--- a/sys-cluster/ocfs/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-<use>
-	<flag name="aio">Add aio support</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-cluster/ocfs/ocfs-1.0.14.ebuild b/sys-cluster/ocfs/ocfs-1.0.14.ebuild
deleted file mode 100644
index 5fdceaf23645..000000000000
--- a/sys-cluster/ocfs/ocfs-1.0.14.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit linux-mod
-
-DESCRIPTION="The Oracle Cluster Filesystem"
-SRC_URI="http://oss.oracle.com/projects/ocfs/dist/files/source/${P}.tar.gz"
-HOMEPAGE="http://oss.oracle.com/projects/ocfs"
-LICENSE="GPL-2"
-
-DEPEND="virtual/linux-sources"
-
-IUSE="aio"
-SLOT="0"
-KEYWORDS="~x86"
-
-pkg_setup() {
-	if kernel_is -ge 2 6; then
-		die "${P} supports only 2.4 kernels"
-	fi
-}
-
-src_compile() {
-	set_arch_to_kernel
-	local myconf
-	use aio && myconf="--enable-aio=yes" || myconf="--enable-aio=no"
-
-	econf \
-		--with-kernel=${KV_DIR} \
-		${myconf} \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	einstall DESTDIR=${D} || die "Failed to install"
-
-	dodir /etc/ocfs
-	insinto /etc/ocfs
-	doins ocfs2/ocfs.conf
-
-	dodoc README docs/ocfs_doc.zip || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!"
-	einfo ""
-	einfo "Please edit the configuration file /etc/ocfs/ocfs.conf"
-	einfo ""
-}
diff --git a/sys-cluster/openais/Manifest b/sys-cluster/openais/Manifest
index 7c4cb2845ae4..ae2ae79906a1 100644
--- a/sys-cluster/openais/Manifest
+++ b/sys-cluster/openais/Manifest
@@ -1,3 +1,3 @@
 DIST openais-1.1.4.tar.gz 566559 BLAKE2B 47857bd4257a12af612311d422c861f6ce97988c06fbe7aa677f91342be3d4e27cd584fe8947eccc0559e07f6a09f9db8e270194b809d68495735abfa9b5a14f SHA512 9dab2d0c3ac1996fd76385cc89071dc84268065e6992642fefe005962e8367170681fed626c5bd863a8ea24abe57e2b8b3eddc20bc38b14104c729c599f3c79e
-EBUILD openais-1.1.4-r1.ebuild 1065 BLAKE2B 4230eccf2412509d1604da529cd868672c5d8d2145e95585cbb56f2c76818b8aa3d2903dc31e0676af4c7449d25083eceab12992737b5c7ec99ad9625b85ae06 SHA512 c5dcd6a023cf796e58e839a4e34f6f4253d80417baebe7a5ceea68b8d76e90ff1e30a0ed82f6c27db690363e352084f0f4894c2227e0ded66e45180fa0698d72
+EBUILD openais-1.1.4-r1.ebuild 1055 BLAKE2B 633c4759890cfc793aeaf1dfeed86497472b7dadc60dbd31b9aa1478bc81310c79aed4eda73c8922488eaa2a02ede2873069621410511d836528885709796103 SHA512 4976ea88318f2af9a1d049a2001403648fb454ac2bc7f457e03881c92ab40cdba0535b05b87255986c39f2023dc9302685430979d283315f88802e0c9715c20f
 MISC metadata.xml 822 BLAKE2B 5d37bbc89a82b4e32c67e753be3ad850efa9326efe0c1ad43c3ea252a7bb72732630aab2983fc53cfde9e73b160c1f1f3e199f08ec123a723292275341669ea9 SHA512 85eb8ae73ebc0614b240733110eecf256f00cd694c303c1dc5b42d5b038f8cef72adf65a99866cd270d6cdbc229e6730d947fcfedb2b59e2a51bf8b8a4f12aa3
diff --git a/sys-cluster/openais/openais-1.1.4-r1.ebuild b/sys-cluster/openais/openais-1.1.4-r1.ebuild
index e052e5a0af63..891ec6e819dc 100644
--- a/sys-cluster/openais/openais-1.1.4-r1.ebuild
+++ b/sys-cluster/openais/openais-1.1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp:${PN}.org@${PN}.org/downloads/${P}/${P}.tar.gz"
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 hppa x86"
 IUSE="static-libs"
 
 RDEPEND="<sys-cluster/corosync-2.0.0"
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 36b018820331..eb849e38165f 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -28,4 +28,4 @@ EBUILD openmpi-2.1.6.ebuild 5606 BLAKE2B 2303401b7048a5e5a05552f79e964e45f1d0df2
 EBUILD openmpi-3.0.4.ebuild 5492 BLAKE2B 18dcd4347f186116781da19bce63083d0f0bda9c4096e8a38bcd066bea3d655fa348fed4a5b8ac760e110ec91ec205fc33d91dd407d57165362b3c03ae4e37e5 SHA512 fe63abca4c2883e5801ef1886a06e0300031400bdb2a28f39099159185c33f9998b6bc3066f4b9b9b6e0d7d86f98e8bdbe724050b7eeead3c83320bd1148588e
 EBUILD openmpi-3.1.4.ebuild 5492 BLAKE2B 18dcd4347f186116781da19bce63083d0f0bda9c4096e8a38bcd066bea3d655fa348fed4a5b8ac760e110ec91ec205fc33d91dd407d57165362b3c03ae4e37e5 SHA512 fe63abca4c2883e5801ef1886a06e0300031400bdb2a28f39099159185c33f9998b6bc3066f4b9b9b6e0d7d86f98e8bdbe724050b7eeead3c83320bd1148588e
 EBUILD openmpi-4.0.1-r1.ebuild 5434 BLAKE2B 30b8695cacf0f65506d99a63df4cccac15af7aaac3ad54b75ca3240b646fe6a6efc5952426b61b12fa1c35c9aab1303d98a9ecc19293dd9804f4bb9e5efa7aa9 SHA512 de78d49aea8df2db7e9e2c43d8d577e95c5a3064afe2f988ad45fa463d5ae8b3e87d12c626b24048354ece58bfdb50b7894e634d00f2b5a9febfea2bc7eabaf0
-MISC metadata.xml 820 BLAKE2B b606cd3e91faba78d213cd55ef0f23f03085b78374b604dfa5f2f4ff3add9a6cc4c42b071579e30f9b72197c2b41dbb302d8f393881392f400296ff6b59fe0db SHA512 9025216b610924a248c80843da4e90e615078933d332ca06f4ac9c1fa46bf94a444c6b2704f1ad470f7beed797c66ee59cb961cd88e17c5b5c18d315a2233f5d
+MISC metadata.xml 928 BLAKE2B f6cacb50815977ad28b83ec24725021a140db9592152d2a9e238da051058287c01c73ac557392946f83949caee2f75a847ba5e82c4b6f816ab3f8288aa38b719 SHA512 a7ba5e4bfc8e6c1a74667f31c4d8df580699fa84766cbc597a66c1a0ed12ece60bf1f683fcbd30529b042588ae4460741b4eef407e232532a3eede1766326f1e
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index e319ff476a17..60cccf3815b5 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index a2bc01f1093e..32e07cc48362 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -4,7 +4,9 @@ AUX optional_pandoc.patch 1611 BLAKE2B 5f6c4f8ebe1379cf733b4b1829f39bfc34ff2715c
 AUX srpd.init 546 BLAKE2B 40a03607fd4a85b821a71b98373b5c59f721bb2da78afbede8299ae6eedd402776c4ee3b4965c7df0b8b1816969a715351a1e659e4a26abc99808e93ef69f6c9 SHA512 14c1dac4581943855c362d7a37ef31a87be458123dd890bdcfb75c35b71b0a6e789a819c768ea352b3846af29ab5c3b1872cbe27a2e127b8fc8c93a835428190
 DIST rdma-core-24.0.tar.gz 1219485 BLAKE2B 400076305ca634a14d8f46df3477f9e3e753b95840237a217cfffe1a78e93ee90994e628f2a0693bde588ce15965df0014acb55bc92c36e3c45011cc69e9898a SHA512 0ef2b2b4250a1738adec964911a286f60e2310472c943dac1be45c70974a8bd1f32ee96013bff9e492132403af810aee1350d404a87ae7671731f7a5bd80c655
 DIST rdma-core-25.0.tar.gz 1494005 BLAKE2B 406926ae57ae4914a77c82025906270bbc45632ed1e0ecb44b1662d797066bf27275c8b4c4bee40795880bdb4ed06f8f9d3714cfffc64132c00395328ee0527f SHA512 b2c6eaf16f89fb913e35b0eb602f60e8bf45979673597c34006ed78c2e671cf1e50b1cc0752740dc474a58fc94eb0c3f66175183e6b903605ff1512469ceef38
+DIST rdma-core-26.0.tar.gz 1444585 BLAKE2B 148b25f6108199b3845446e9f45a59d089e7f546218d70abeadffd5cf3e0b26569bc5099abfb6152f376689e04a493529a61fc1d6b40c153aca23b5df2776bf7 SHA512 7dfdd93d10e4c56cac5ac0c1b46900fe7a6c634920e470ebc582abd7a0f57c57d585b4e0dbbb5ad84f46ca8518132e684d44d33c62b0509461ed5b62b7e0f19b
 EBUILD rdma-core-24.0.ebuild 2394 BLAKE2B 41d23a8da59916065bba0a78ea358e2557f9f81ae1e3fe2ae430e1e98758d015ed72f8da5266dba850933bdcdc3b7ecc17889334480126604e486e50aaa7967c SHA512 2867f122ef0466090ec1fb8a199300f7c5b52fe68a2b57692c96583ea9d5d669d0df6cd0b2c5436d0085cc2a07a0412bce72fb66e2b6e2f4340c020f8a8abecc
 EBUILD rdma-core-25.0.ebuild 2443 BLAKE2B 8544079e018f49322806151b8e90738b565c02ebed4982954c558fe982d46f06b981258a9b1d7f824e3a500cd035f98d1bba50dabbf12866ade7097978adcd5a SHA512 2e7e2d490c870768ecbece72858bff12a732d72ba6da99ce5ff247712d199583fbdcae7699b544c62053f8d679aecb243bf4e4f02d364e3cd4d3f219c0832cd5
+EBUILD rdma-core-26.0.ebuild 2443 BLAKE2B fc1eead938c226fd7c238eacd6d70660fd2bb5e92b8ab3cc6a4edcbfe16ac424ffc6ab15d8ebb368991fe70c51234797416ca90abca4c7bedcc566e4802f33c9 SHA512 2a96af59412d92a230f354db417f68ebb31cb40f6d5be1ab6f630675076184e71b75d6ee9b3b0d6b134b9c2cd9be0432dfd2dfffef7a052fc7370f166390cefb
 EBUILD rdma-core-9999.ebuild 2390 BLAKE2B 77f3af5fe37f08c92427e3e9d546ff3d4577d8c754274ab77633d93a5a44edca95e883a7d089cfb482f0cfaa9f375a65ac79f7bf77d285be4951cf7b9fdab4ec SHA512 e4df896afa8585fa3e58f55e1f7da6470ab08e7a8d3e5b36f29fb77b3d01cadda2d51e126a845bff76a51101d9211bcd517258813d4205a778c1cbd802b699a9
 MISC metadata.xml 559 BLAKE2B 1526777511ab5118d4de73361959107221858659ebbc60f52eb09b45d0798d969f847e4f157501ed6e8c85c2cee1c93d0b26989b357141bba45af946e2e5b0a1 SHA512 5d69acf3d0a323c0d2ee66971fd058c6c0ebf59e4fac0d4777b15bfcc7db8f515b67e6059d204346404ce3b26cdd77c2bea21e1132f418498fe1523eb16dccbb
diff --git a/sys-cluster/rdma-core/rdma-core-26.0.ebuild b/sys-cluster/rdma-core/rdma-core-26.0.ebuild
new file mode 100644
index 000000000000..3e47003b5b6b
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-26.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils python-single-r1 udev systemd
+
+DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
+HOMEPAGE="https://github.com/linux-rdma/rdma-core"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
+else
+	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
+SLOT="0"
+IUSE="neigh python static-libs systemd valgrind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	virtual/libudev:=
+	neigh? ( dev-libs/libnl:3 )
+	systemd? ( sys-apps/systemd:= )
+	valgrind? ( dev-util/valgrind )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${COMMON_DEPEND}
+	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-fabric/infiniband-diags
+	!sys-fabric/libibverbs
+	!sys-fabric/librdmacm
+	!sys-fabric/libibumad
+	!sys-fabric/ibacm
+	!sys-fabric/libibmad
+	!sys-fabric/srptools
+	!sys-fabric/infinipath-psm
+	!sys-fabric/libcxgb3
+	!sys-fabric/libcxgb4
+	!sys-fabric/libmthca
+	!sys-fabric/libmlx4
+	!sys-fabric/libmlx5
+	!sys-fabric/libocrdma
+	!sys-fabric/libnes"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/optional_pandoc.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_FULL_RUNDIR=/run
+		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
+		-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes
+		$(ver_test -ge 25 && echo -DCMAKE_DISABLE_FIND_PACKAGE_rst2man=yes)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
+		-DENABLE_VALGRIND="$(usex valgrind)"
+		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
+		-DENABLE_STATIC="$(usex static-libs)"
+	)
+
+	if use python; then
+		mycmakeargs+=( -DNO_PYVERBS=OFF )
+	else
+		mycmakeargs+=( -DNO_PYVERBS=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	udev_dorules "${D}"/etc/udev/rules.d/70-persistent-ipoib.rules
+	rm -r "${D}"/etc/{udev,init.d} || die
+
+	newinitd "${FILESDIR}"/ibacm.init ibacm
+	newinitd "${FILESDIR}"/iwpmd.init iwpmd
+	newinitd "${FILESDIR}"/srpd.init srpd
+}
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index c3643de514fb..8c1e56b51675 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -8,6 +8,6 @@ AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e6
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
 DIST slurm-17.11.13-2.tar.bz2 6261416 BLAKE2B bca7a06e703799371da11a7427ce009784c7236569f4b24b278078231192bb0e90604fb90a61f8269881ccacd154cbf03174b3e4600410a8c726beccf4aefd18 SHA512 d419984bfa1bf1be20d3439672eaf868e3e0c45549b8d696bb6f588a57e1bc1e765dbca8a9a62c54bf27c3dfbbd0f165f573459a22ef87d976bc511c22fde639
 DIST slurm-18.08.7.tar.bz2 6186006 BLAKE2B a5458f72cbe93bc1103c2c7f3d428ae14239cb092edad2c683e448dda35f3e108fef0d9a3a86599da6058c9c98a86dafed9a087ffe6e8d7425db9cdb879954b3 SHA512 d0047086f1b716877cc5bb39539bf96a8fd08b1851c85fd85112c6432c1ce2a0f29fc9dd8803094c8fa44d063cec5f417e6bed231b6d338934ff4b48424a5a93
-EBUILD slurm-17.11.13.2.ebuild 8464 BLAKE2B 2d582884dae80e2c1fc23ec0f7a8aa9c14a008099e7d10e0dca181d92f40318ddfb8cb400cfcef22a542937e571a65758b41bee8d2fb8627c4158b71134c0285 SHA512 2597c10b2ac53a6b5b77e18e116d50bcb6fc74a88d8ffe66f9261f7efced99bad558b796fc0c4db775d2ecfbd5cbf58dcb7b9a636952d3fb6aca19073d944e57
-EBUILD slurm-18.08.7.ebuild 8058 BLAKE2B 8b08ed9e4972ada3232de444474ad3575aca94170164934a5cc9b497041c7692033268279199de77a2cc8ecb10e1c56c7d730f14b8c71b64aa6ab487d9e2a86f SHA512 eb098d75bc15241b858691a0f0f6b36231673bd273a7643e52557308e752476d2cc2789a1a63e0969f46a342aca18062b326a1e12013cf48da95fcbde66bd149
-MISC metadata.xml 987 BLAKE2B 437f5ddd9768d7d21efabae900345440521d913f2f6011bc3bf3bfa2548c13e16b24f6c5f2fa049eee9fff93a2e01545ed60a30614b45707ca5fc0e42e11d20d SHA512 3cc2b3000186f45e5a51cc5253cc7a28e6f8d52bdec2bcb7115c660d66fc5b73e15cf338f1b4aa22cf2193e3a0e183d1681aee8930883171af72a9045656f7f8
+EBUILD slurm-17.11.13.2.ebuild 8465 BLAKE2B cd0224921c0c2ded50e8a3143be3f30234b52ac5713c12aef1c1f31abe2f1cc302f8b5e2bbf003c692c568819a7a38ec19bf6fbba78fe4ba1ca732a169274830 SHA512 04616ec7aa3d9348156ac5a4232feb6e256b7e6fd11f7a0f38acd64f5762e1c996954f5a825f8d40de2b01fbd164a567e45b8e5379ef2a2f43f89e45f5d386b7
+EBUILD slurm-18.08.7.ebuild 8059 BLAKE2B b4f8fe8b77382da1370b53be41aae40b45959e53585e8505b80c3874daf1e68f0057c2e115087ca17e2874cbce813d2378937ebaf7e592cacdf240b5bfa73552 SHA512 be171643e43c58e9c778a6b530aeed8de38b8aa8aa47f901e51d315a1a915945df2b317edf8d13850176a7bc971d35a1e48b436559200409e935177b6d8e4c2a
+MISC metadata.xml 1126 BLAKE2B efecf11f76fd3ce8f09198a93cc05b22f1c7239eafe3f762c8938876d4265dad1134dbfd02c4391bd083e551f45a7b9be7bde0f8362d59d2236ef19dc6e9a4b2 SHA512 c856522195f9b0dcbcf7abc4eaf236f704d1a870aff91e59defb19c553b7737efecd429c30e905f3b8816b6751d59c08e5b8ce3b7137de51b768970a43875b99
diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml
index ddcebd29a672..c588bb7a9527 100644
--- a/sys-cluster/slurm/metadata.xml
+++ b/sys-cluster/slurm/metadata.xml
@@ -3,6 +3,11 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetsov</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
diff --git a/sys-cluster/slurm/slurm-17.11.13.2.ebuild b/sys-cluster/slurm/slurm-17.11.13.2.ebuild
index d669350a8a3e..1f9e31f25080 100644
--- a/sys-cluster/slurm/slurm-17.11.13.2.ebuild
+++ b/sys-cluster/slurm/slurm-17.11.13.2.ebuild
@@ -42,7 +42,7 @@ CDEPEND="
 		slurmdbd? ( || ( dev-db/mariadb dev-db/mysql ) )
 		)
 	munge? ( sys-auth/munge )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	ssl? ( dev-libs/openssl:0= )
 	lua? ( dev-lang/lua:0= )
 	!lua? ( !dev-lang/lua )
diff --git a/sys-cluster/slurm/slurm-18.08.7.ebuild b/sys-cluster/slurm/slurm-18.08.7.ebuild
index 5a7bf934b197..b8797d5c1323 100644
--- a/sys-cluster/slurm/slurm-18.08.7.ebuild
+++ b/sys-cluster/slurm/slurm-18.08.7.ebuild
@@ -42,7 +42,7 @@ CDEPEND="
 		slurmdbd? ( || ( dev-db/mariadb dev-db/mysql ) )
 		)
 	munge? ( sys-auth/munge )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	ssl? ( dev-libs/openssl:0= )
 	lua? ( dev-lang/lua:0= )
 	!lua? ( !dev-lang/lua )
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index ac986f886456..f91111a89e3a 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -5,9 +5,12 @@ AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0e
 DIST swift-2.20.0.tar.gz 3012428 BLAKE2B 48cfb52bce8d89836ede3d82cde197e282b55cec7fa9366c18102a2259a2c96553c573c92b884e6471a3ff5a5fc88ff3eeadbb200c691db3c6b20b6881132576 SHA512 15f1082a94f16684001b1d6eaa635500d41dd2ed0b65b87d8fc2363f96179cbc4d40a6faee10e966ad954e45035ed77c31dc265daa2c7c9d17a0e81890e6bc79
 DIST swift-2.21.0.tar.gz 3025042 BLAKE2B 847b11fa61620cdd07acadd1d4fcc43c9fc53ecfc958e8cb617dde6b643bce116662df74b9b2a01df8551847c4577fedd25aab3951ce437cf5d046552e3b22e0 SHA512 ceb96401aa5d1ab36dc0a08455970f9c1704868d778970cad9783463bf8a25dddc7431df0aa73e4d2d7d4f6ef2908fa5faede749fe94e32d5f67e61768edd964
 DIST swift-2.22.0.tar.gz 3070436 BLAKE2B 53049ba901cf5a46d4567c7fa3620b0ad486d88897beb75887d81c5beb747a08ff52e7eba93eab9e9e087c82447d99f0fd85c97211fb4e930ce5b27a1bba41f1 SHA512 855f9d35399251ac86d687b652a9372da4d2f03dff8dee1743357c14c79f6ea8903b7c67d99fed08b6b4cdfa2cfd6ecb78b010b2ee83195eda30c4a9463a5a0c
+DIST swift-2.23.0.tar.gz 3091166 BLAKE2B ec08e2617adc1dbe430215eca49728c7fd96e4b644a251852e4c90a709e8dde0e554e996cc4879efe32017a4e7098c0aa787bb344f79706eb2e0afcb2d7f977c SHA512 e90fc1ebc9613ab3da9300b18c15c4661b06dc11e527a665d9a186926ba5640f4f261841d03e6215f7b0bb01cb04b5e242280ffd178e5d7af9343b11e5a661e2
 EBUILD swift-2.20.0.ebuild 3930 BLAKE2B a34c98f02fe58bf7091945fc3730b40d8b8ffc4523dabf7b6e74daf665d5f41ace12f1907a2dafc96262ed13ab64601aef3d055963602d807d01da794a860ec9 SHA512 0e9f6d58e26c77ade950c749e91cfa0239c0f94ab116600ce20e4250c29618a56492ba93435225373edf2f165a9a6f4a2c3a6781381f571190d1e6e3db72f518
 EBUILD swift-2.21.0-r1.ebuild 4016 BLAKE2B 2234265b662c37a0dcaf5eaab7662d4e8c756c254e25fd95ad02ead7dcb78039d6af7d61f53e17a19f1571e32a612a958e83797e05f568ad33a73adfe5ab0e09 SHA512 4e5a3fd19e2689652f14246401da49245f9d84716b92f1593de2444b5d003218054b957449354a3308bb8af62aa9e27d8b51e9117d6d264cb261c5205403a138
 EBUILD swift-2.22.0.ebuild 3955 BLAKE2B 762991f57c3e94f7179f658402f864b3cb956c722725da35dd431c713e9cb15aa3e3a751513330bd7bb7a64df0d88955f21be73d4440c322f49364771dc4ec7f SHA512 5fd0d198687daf9da9ffe2d304620ed98355772071faa3929b83876599528837e47a732e534616d96b67d800ca94438bc14e52c9b4ee9f1499f55bffe2ecece6
+EBUILD swift-2.23.0.ebuild 3958 BLAKE2B 5fbf673da99e0ce6b6bbf0afa77c1dc42dc5b6421b16bbcaccd18f63274fb012cf1f42f8afd1c0fc6a95c83c36c6baa308dc4cc7daf321d267721cf0f7fb099a SHA512 0791c7fd3b7791d89af332f00e24a88bd0e587e392ae246a58039deae1d91c3b1dd81d6c994adb600ebca0e90917013047a0f923347fbd46746cc24e5d350d68
 EBUILD swift-2018.2.9999.ebuild 3936 BLAKE2B 8aedceb1506d24c0a6f4c0d219c3d1a734eb220bb5528c1f4e71e036b78da65bb96a656ba1d253a2a2181362711ec3d121106b3bd2013f3db103f5a61f63745e SHA512 d14f2c823a0d900aab54f7d4c919874372f3f996a4dfcb54595564bc2bafdec9761c5fecb041c54308851b7a1ad1da0ccc3136a399ccf0dd9b94fd329c11918f
 EBUILD swift-2019.1.9999.ebuild 4018 BLAKE2B ded5587949b6bcb9db88032898134cf177990cc6248618cece257093e018253dd343887c8ec106025fa0d999a3f87ffac2e071706b9b968f4522ffe6a2e94557 SHA512 263739a2220d4933511bd3ca8f7d0525f3cfca78511924125d84a02ce7012bc63e7b6c284af31908e769dd0fbb5e2b69eb09b4a436470f17d873f27e92ad7093
+EBUILD swift-2019.2.9999.ebuild 3958 BLAKE2B 5fbf673da99e0ce6b6bbf0afa77c1dc42dc5b6421b16bbcaccd18f63274fb012cf1f42f8afd1c0fc6a95c83c36c6baa308dc4cc7daf321d267721cf0f7fb099a SHA512 0791c7fd3b7791d89af332f00e24a88bd0e587e392ae246a58039deae1d91c3b1dd81d6c994adb600ebca0e90917013047a0f923347fbd46746cc24e5d350d68
 MISC metadata.xml 898 BLAKE2B 3d502769ba44cdc1e3a500929d60a1ed82d8540297b2dfddb6d6745ec9b5b56bd9fe7130a738858b9bac653b49634efae1841600325194d69ec30222b2e8b3f2 SHA512 3f9d2cf7538fe32010b811d3a49802eb085dde793b29d9590fe3032d63a743f620e3c1dcf1226b59aa5938ea239f440997a3d4d489f9887816621879e19a0c4c
diff --git a/sys-cluster/swift/swift-2.23.0.ebuild b/sys-cluster/swift/swift-2.23.0.ebuild
new file mode 100644
index 000000000000..73b14dde3ae6
--- /dev/null
+++ b/sys-cluster/swift/swift-2.23.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_6 python3_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/train"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="account container doc +memcached object proxy"
+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.15.0:0[$(python_gen_usedep 'python2_7')]
+	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.8[${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.10.0[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.0.2[${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
+
+	if use doc; then
+		doman doc/manpages/*
+		dodoc -r doc/{s3api,saio,source}
+	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"
+}
diff --git a/sys-cluster/swift/swift-2019.2.9999.ebuild b/sys-cluster/swift/swift-2019.2.9999.ebuild
new file mode 100644
index 000000000000..73b14dde3ae6
--- /dev/null
+++ b/sys-cluster/swift/swift-2019.2.9999.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_6 python3_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/train"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="account container doc +memcached object proxy"
+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.15.0:0[$(python_gen_usedep 'python2_7')]
+	>=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.8[${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.10.0[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.0.2[${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
+
+	if use doc; then
+		doman doc/manpages/*
+		dodoc -r doc/{s3api,saio,source}
+	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"
+}
diff --git a/sys-cluster/teleport/Manifest b/sys-cluster/teleport/Manifest
index ddeadaf12a28..be13fcdf3f81 100644
--- a/sys-cluster/teleport/Manifest
+++ b/sys-cluster/teleport/Manifest
@@ -3,9 +3,9 @@ AUX teleport.init.d 940 BLAKE2B a3b5fd197e6d8e173903aac6e9db4a684a986ab7d52227d4
 AUX teleport.service 310 BLAKE2B 410a8ca2e1273a0b9ef1ad93f4ff21f71ecedc979e52eb4f7e1b807b5434fba2b88bd1e0a5544ac68489d6e0db641cda4d76e606bed9cc96527156088b9b088b SHA512 72a43cce5f16bbed63e3b25917d3a4d63641b735acf63975c13c3cd2624c7971f40dc697d1da0d9b94b54e675e051d0a4e863696f7ebcea14f1c4b86e9e1218b
 AUX teleport.service.conf 90 BLAKE2B 7f12f281d73ac6573c882a7910e400f901ff6392e0c576e4b7076972f4ced046f709c8898766aaf38cc38fbfcf450b526d3045ff859eed2a48e19dbd92ec3131 SHA512 d17faa0deaf3c864e5159d3567e542e36d09c6ea0ac91c663d3ae9729d1bccf7d2139f1f48fec132eccc473e023ffdaed0b8f2ee75db5dedc6ff36f637f68e1c
 AUX teleport.yaml 10168 BLAKE2B c84b33deabb616f58eb7b42224040405eb524749a98647e94bde8d3044e39ef2cd79baff6e8135e61f4b5db86ebc20f7f24b819459b944427386140d716490b2 SHA512 9893764ff11d0c499b30b5dd41c2e56dcf5719baa2d172ee5d500b5c9f7f81af9901f8cd2de8799f5520793f5be6755efc757c518659eca5d1ef89f9fb7a9e24
-DIST teleport-3.2.6.tar.gz 22620079 BLAKE2B 07b4bcb5b53a511c25f0556fad33b461307b524554e993097f634b1751d7fd3c664de0478427efa18dc20e597fb73f3c5bd09ba961754456245e1306372ed0ee SHA512 20be34820f9b9f29c492f8dabe8914012b66ebfb9db51f3dff0e19b8a1f7b85b948cc1036861d03ca6de9e6f30ba0b43caf4760bc95c74e45a38f0cad080820c
-DIST teleport-4.0.1.tar.gz 34914632 BLAKE2B 88861a36b4cea94d24ccbb03294202a88845f444df31642b2878d8e3c9c0f46f4ed70b4f713e32889895e59be3629c1e861446c051ea5a74aaa4b7b044f17f6b SHA512 db5d477e430fc7d439e352a2e6605f6662a206b0395268f19d52422994344e1b26bb89f4eae0dd0a453cc0e3d19549bd03959e37e29dccf2b8504994922eb946
-EBUILD teleport-3.2.6.ebuild 1241 BLAKE2B b468b0c84cbdfe607997fec26b370bddbfc75dec5d48c8b08bd1b5202a6dbd97cb7b776dc4c91347bf581df76b0be496346d6a0d30755811e7089831880f378a SHA512 ad170ea36bcd2fc9122fefd2b7593b53d68443e2db64f75f2647c081f41b4869cf409964bcf2657d98900b7cb9c09cc50673fa6e7bf377d747a706c77d3dd669
-EBUILD teleport-4.0.1.ebuild 1241 BLAKE2B b468b0c84cbdfe607997fec26b370bddbfc75dec5d48c8b08bd1b5202a6dbd97cb7b776dc4c91347bf581df76b0be496346d6a0d30755811e7089831880f378a SHA512 ad170ea36bcd2fc9122fefd2b7593b53d68443e2db64f75f2647c081f41b4869cf409964bcf2657d98900b7cb9c09cc50673fa6e7bf377d747a706c77d3dd669
-EBUILD teleport-9999.ebuild 1229 BLAKE2B ea6d43ead9da031f93add1a53fdf77b4608d1b3a118d636e15379d1dde32ac3186834d072a8276dc7de5b31c03de7bb7be7ac773003e1e29df4e45ba81ecf7a7 SHA512 67f5f1e97a517fb5244a88b881b218da089e7b61dbf9797fa9f7fd50dfe040f74aa7c1e074da1ce3c62dd2ca4252fbe48e2915cb5db51ff83d8e3e1bb520f267
+DIST teleport-4.0.9.tar.gz 34927445 BLAKE2B 267ef0ab269efc405f0522a6442d9b626dea62c800717cf01a9f0bdf40a34015b218c58cbd0e5ccbdd17634e91516ece35f6bbfb17864411ef02ae60cf3391eb SHA512 6a9fb59780d4da7f62a2f204f7f2e4321a7b73d9fd60e2de7d7ac1cdcf05e24895115e754aacdbdb75f4c21d40f1e42808e7f4e6bbb54df461167b45ebb7de24
+DIST teleport-4.1.1.tar.gz 42243379 BLAKE2B e01a32546bf3ecf52162d004ad24661160193e1586a98d045d83df63f01fc519ae2a6d4ad945da25a6509c153aacc3e23429be343914c35720f1b62da28d3e72 SHA512 7ed950ac7089052ec54872d9cf2ee12351a944268169ff442f0b1c91b3ad58fdf49c3c17839c8f330ae3c6192e9f4244a41cc2ba88f58b8f5435e334007348a5
+EBUILD teleport-4.0.9.ebuild 1255 BLAKE2B 8d8e22edf8d468fc5348561291e273e72b40fd8a880a31f9f03464b745e813af576dd3ce8c70b4da638e7b4392b4e07d4ff8dc502b20c0c1f9d70fbcda90ed86 SHA512 1bc10a27fd1d9375f1a109b0f5bdd69d45c7399ab9a6c0cd8777c244f791cf01967847d3668a86723784588612539687f11a9bc1850fe79b92552d7b953c2c13
+EBUILD teleport-4.1.1.ebuild 1255 BLAKE2B 8d8e22edf8d468fc5348561291e273e72b40fd8a880a31f9f03464b745e813af576dd3ce8c70b4da638e7b4392b4e07d4ff8dc502b20c0c1f9d70fbcda90ed86 SHA512 1bc10a27fd1d9375f1a109b0f5bdd69d45c7399ab9a6c0cd8777c244f791cf01967847d3668a86723784588612539687f11a9bc1850fe79b92552d7b953c2c13
+EBUILD teleport-9999.ebuild 1243 BLAKE2B 58785b5537bcf47366cafe481ba1855e1acf1e6f4f1b5939195b58d3b3fced5690d9c0933c856111b834df50e9ab857d42ba826eb9664c2f51ee740c5a6e9442 SHA512 54b817d0e5be7872af7c52982842f94dee9573922c5450cd89aa3c507fc81d06e56eedcc505fda16ab0b96866184f5a226a7de2a745d121b9205ddaeb912f32a
 MISC metadata.xml 630 BLAKE2B ad22bb63ecf79ddd45b62fe0dcadd6d0d7fd475938b18ec868b56b0f4afe7ee5d3e0908eb0b13249a7c7b5031a3296bec406fea6fb487069a087c9e29dcf0ef2 SHA512 2aa911f2a91bfdea340b38715d69cbe59bcd460d34ac6d1d641f2badf2ba72f4e02cdd2f8a2ca387c9a9d19ea2c22e2be80ab4bb582d9395c1517b818f343c74
diff --git a/sys-cluster/teleport/teleport-3.2.6.ebuild b/sys-cluster/teleport/teleport-4.0.9.ebuild
index 546c0f2921f3..5421480e2d1b 100644
--- a/sys-cluster/teleport/teleport-3.2.6.ebuild
+++ b/sys-cluster/teleport/teleport-4.0.9.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit golang-build systemd
 
 DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
@@ -19,11 +20,11 @@ else
 fi
 
 IUSE="pam"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 MIT BSD ISC"
 RESTRICT="test strip"
 SLOT="0"
 
-DEPEND="app-arch/zip"
+BDEPEND="app-arch/zip"
 RDEPEND="pam? ( sys-libs/pam )"
 
 src_compile() {
diff --git a/sys-cluster/teleport/teleport-4.0.1.ebuild b/sys-cluster/teleport/teleport-4.1.1.ebuild
index 546c0f2921f3..5421480e2d1b 100644
--- a/sys-cluster/teleport/teleport-4.0.1.ebuild
+++ b/sys-cluster/teleport/teleport-4.1.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit golang-build systemd
 
 DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
@@ -19,11 +20,11 @@ else
 fi
 
 IUSE="pam"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 MIT BSD ISC"
 RESTRICT="test strip"
 SLOT="0"
 
-DEPEND="app-arch/zip"
+BDEPEND="app-arch/zip"
 RDEPEND="pam? ( sys-libs/pam )"
 
 src_compile() {
diff --git a/sys-cluster/teleport/teleport-9999.ebuild b/sys-cluster/teleport/teleport-9999.ebuild
index e68586870d20..a82f2fc86c92 100644
--- a/sys-cluster/teleport/teleport-9999.ebuild
+++ b/sys-cluster/teleport/teleport-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit golang-build systemd
 
 DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
@@ -19,11 +20,11 @@ else
 fi
 
 IUSE="pam"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 MIT BSD ISC"
 RESTRICT="test strip"
 SLOT="0"
 
-DEPEND="app-arch/zip"
+BDEPEND="app-arch/zip"
 RDEPEND="pam? ( sys-libs/pam )"
 
 src_compile() {
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 44270f1bf9cb..18b514abc2b7 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,5 +1,5 @@
 AUX vzctl-4.9.4-glibc225-2.patch 1196 BLAKE2B 4560cb8fc78163b0c397cbf89545aca9c7005f67d31eb41b6dcc2d6c0ab064298655d30eeb958e007320828d5ef7bd7bcb89e44e1b7f5b36c7d327f866f66d6f SHA512 70ec27c9067bdd7fa1e3e2aa32b32649aca8a2d357ffa583c29132d7339f52bbc19195fc9be304f977ee82d96978f3a51bc9cca23d124ce4946c48b6129bd714
 AUX vzctl-4.9.4-glibc225.patch 406 BLAKE2B abee2fcb861f755bd75840eb29ee4921c8580f18d5243cb9ac19bf4fe25e44474cb490d0f673e80a3bff8f17b8c93dd96c3b8b0e2e38dbda5721262b2f610d16 SHA512 db7778a15785e6d9d22d1102cb341647834b6b9eeb4fc26b6cbaa86af7317931d3571a2b7f03a3b419338e11427482dd831374144a67dda2f2f4fe11ff020f45
 DIST vzctl-4.9.4.tar.bz2 550370 BLAKE2B 173d6cfe93b15aef6cb1903a5d711e29190964479c146625a3f9d2ff872161c51b7632213a5f0d47d5a14ec34d7d80499c1bc17f11cfbb80318c26630c05fd71 SHA512 651aa7882ba77442666a09441769f821a7374f417199380667b27c9980203597575dfe12ad5c261da22941b6a2bc6e032d3f9c2d88dcb03af6412634cc5b4706
-EBUILD vzctl-4.9.4.ebuild 2203 BLAKE2B 8cd1aac8a26a291ed5a1e3230ae1275a59b6bc3c34a42a6a0bb7cd91f148621e4f1407cf6a7f0941afc9255625e0b6d60b4359670e6149613ef039a86812dc3a SHA512 98593c659fcdd06b727afbf36cb003471119cab6f29e407ab9b4fecadbdf443a85163bb74dc90cf298641498adeacc3c655dcc42f9ffe024be8385afafcfabf0
+EBUILD vzctl-4.9.4.ebuild 2178 BLAKE2B 69bc846d3bdde8c6b3d36c81044b7bba03be18e782cb9750fa21a4f396639aca3bb8a164c165b6cf28bd191eb893295c5142d5930741ff7869c4edcf2320ec16 SHA512 01486c1ae843b7550f743262d5f308c3299dcb4446f0806fa28bbab03a53647fda7c48d24e42f605b1321c34c426b7745ae46a342b13d26f0ae1b4de1c81528d
 MISC metadata.xml 476 BLAKE2B 6036f242ec8f7fe818244fd4d01d5d89b548c66fa2834127c66dadb4fe3a9d06643fab4ccd297c780e7f470eae8bc73a5d04a03ed15fd732c79c38a841373809 SHA512 0530fde605015304c81e13ae82da0fcd230a97766dcd775632515d7368d701b3ecae16988ad6447d0e77a1ae9d08f31bd28a3e0e3f5ce0f03b915ff2ad453389
diff --git a/sys-cluster/vzctl/vzctl-4.9.4.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
index 87cc19cf2b4c..97b9d64eb6e1 100644
--- a/sys-cluster/vzctl/vzctl-4.9.4.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 -amd64-fbsd -x86-fbsd"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="+ploop +vzmigrate"
 
 RDEPEND="net-firewall/iptables
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /sys-cluster
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)