gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-cluster
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
92 files changed, 2514 insertions, 1722 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index ffa43009e683..dbedbacab1a9 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 3ecf36e6c648..c1ca78736c5d 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -19,7 +19,8 @@ AUX ceph-14.2.0-cython-0.29.patch 946 BLAKE2B c251b6a171e5e0bab3f8716b79eb3138a1
 AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d089db5b5ab0b30fd24c0ac10270ce930ce3049f1b22af71e5b39a6e323c672245fb78753e7ed901055afac8371cbcb9f SHA512 ece01fcaf0b82c441618eea1f37fc2658aa356de1128121d368769fdbf6316b226ea15a781353b115c0a81921c8872bb3d003ecbb1e8f1b456bb8cf6db8f091e
 AUX ceph-14.2.0-link-crc32-statically.patch 428 BLAKE2B d324855dab736eeecf5835e79c4f2fad9ea4d10aa29b2b03ab6274efa2f54a5cfdad710552662a49d5f61466e1cd9d6c2fc8a42373961e3334f39b806e647feb SHA512 3efe70f826ebc207f1ce8744483c9a82ebbf8f3cfa81c9cbb3152b40f5b540cc9cc21e6bd3370197bee9a27a01c3e3725754d044069bb760c3dbfbc97fe4276d
 AUX ceph-14.2.0-mgr-python-version.patch 685 BLAKE2B fbd36e0f5fe45be7cc58cf11b2b83613c2f7f7fdfd64d4f04729c36e5ebc110341aa4c5521d9be590bfb7a7812525130e773a346827461df0a108fbde359b161 SHA512 af0851913cf8b42bad71ece4e41017f71e91db19aeeebb5ea0306055d6d6d9e7eb9ba34224bb2583ca437d44827de8852727e8a9dd809d942d4c277ec3da3214
-AUX ceph-14.2.10-missing-includes.patch 635 BLAKE2B 22d26c1aa7815f1acd2fbfd7b3350775d8c1d3bc70b70943aba28c3974d4e115050cb8e0f2dacd9ada7b3dca41b329f83db55e51d7b3dc883458d56eddd98b7d SHA512 eb5707835859669ddd9d817513eddafe738af3c2f2755ad2288aa2f628e90dacc9cd5656dba4db2bcdf5ebcffb450f17fb9dd125bf157faeaeec284d4da6aa9d
+AUX ceph-14.2.10-build-without-mgr.patch 3248 BLAKE2B a0d435b1e5572d29f5d961bdb5e27da10060777d02c07616cd57abf0a734af0595093f3ead54be6ea74e450543917df55657b08d5f04681468d166c7dd0570ab SHA512 e03cd8dd9f08f348805d04e554e8a4c9bb2d83e931d1ba27c4265084b899031ddee12e3cc289aa927994c35b75a1bc383a0ee6648c7f8fee6864d775bb800fbf
+AUX ceph-14.2.10-missing-includes.patch 634 BLAKE2B 2c12c908e74a93de06a8d554057a2b45cbf3969c0eee51402e31f713ecae7394d195e0a85433d90be944b9df4aee93259fd8a50663cad1c3a7a798defb71f5de SHA512 4b5cf3201b03e9c92260bf01966aa4f6992fe9ba76f2b2f4c3211bcd2f978a76e9b7d4820d79dfbbf9e3f98ccda1929ae92343397db29724120047ce0bbd25d2
 AUX ceph-14.2.10-python-warnings.patch 1536 BLAKE2B 49ce59204096e02f9e10037dcd365fdc6e95cabf69602592019470cc069835b139b6ac2664aff94ddf6226998fa63337db751b9daa7c9ec87eb4729063a34f4e SHA512 c9ebdfaa9d93ca8e287059f817df01294d0a523831e4212e534cfbcabfc70d4e11d154fce42931f8e65926cb7e5cff09dc9c8165268bf24010533e471e370aa1
 AUX ceph-14.2.3-dpdk-compile-fix-1.patch 4729 BLAKE2B 96e709b592a7ea9324f54acf75ac3f78334a0d2b155f6d4b5360df8b13e2c9c8e5f6d6b19da5ddb7760c56d9307e056db9aeecec1926dddec88b6b685eb55374 SHA512 d0849fa120b3d7c26106e75bd830874854ee4214ac867b577f4486e4a033b2f555fa6745910f90d26f7fa5280bff01f5880eda9a2bc6edc856400a5756a8346b
 AUX ceph-14.2.4-python-executable.patch 922 BLAKE2B a5c9e8c70de62a974ea0bea4159874447d725a566d75a026ca125a7db0f24a8d92212d067c8dd91b75ec1e2aab12e46da464f320c7e696cc916e29a4e0d28f93 SHA512 b263de28897f05fc3a201622b90a222bb2c6605d4e6d8921d3c8101247a41a44e1f9da4242f208e1ef4d10ae028917510f4390cc69595b77b723545f0f72eeb2
@@ -29,6 +30,7 @@ AUX ceph-15.2.0-no-virtualenvs.patch 3197 BLAKE2B 356a5d465e449b9de1ec2e0f1f1b38
 AUX ceph-15.2.0-rocksdb-cmake.patch 703 BLAKE2B 1c99a1a89be22cedf39326cbf7d6e381c76598ceb8efd4dc6e9f97033c8e654314b8a59c147a7d5daf0305aaedbb4ceb14b9c14e79f61e8fa789e74c0205b1f4 SHA512 20256de5c3227caa149f8285bcc90fcbd67be8cefa568fb72ad0d43688f1f62db7c7fc231dfd4ecf2dd11be68bf1ccc284ebbc691a82a26f3968200f12c82097
 AUX ceph-15.2.2-systemd-unit.patch 682 BLAKE2B 1ec8c0a23fc7d572c79ca24aaf82100e108e2bb4f99ca2c695efcbefdc9543f853fff16c3f7b4636a38260e5ab9251228e9da1bf1a5cbc7a237c78e52bc8bf3a SHA512 8be953b7873f7e45f7f859ac9074b0f446a2ae6954997f93bcb2bdb2c1d85d36bb3fee571b3e57590131bbca3ff202911e0b31340cec8e39d447163c36bfdc1b
 AUX ceph-15.2.3-spdk-compile.patch 376 BLAKE2B 073cee321c1a99f9a161fbec8f9e33bb13df14574e48300d1331dc2b31353f1ccac40f723de501c6e33bc6f065f4b4500048de9d9b0bae646c76ba715eab580a SHA512 c2890202820d022bf610d6317b0a6e3521da2060bb12e39ba1a5c347096d5688adcd98b1cbf25ad33ddfa78d3cae42669c21f4e1dbe6eceb150e4ee17bece582
+AUX ceph-15.2.4-system-uring.patch 2170 BLAKE2B aabfb8c5085de8d69c9afedd20cb99161fd556148f1e6c88c35ed1bdb83dafe28ddbe75ac1e579e23d0728856bb2c650895ab4c0791b0f8e6acf2652822b14f1 SHA512 8258661e56b5360f4260fdd29b07bac4d415068a112b61ca8c55c529fb1593d8d61a0d59a4eec8f1567b97167c058082198d008f55f8ee701cb46489df5f7823
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
@@ -44,10 +46,12 @@ AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
 DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc
 DIST ceph-14.2.10.tar.gz 129274835 BLAKE2B b3f14897db478418b982281bf367a0c497cdfa8991a73e277b5582663c159550f3eff5bdc78a506e267eae8d59c59b19b8a9294802cb532fd7dfa9f612ed0e53 SHA512 5ec95b933a360183f89404446c5e1912a81853dfb1134bb8868bc6675a0185420c2bf1eba72308014a008f617aeb8733d51eb8c8eea5d472c32514cf483f4ea6
+DIST ceph-14.2.11.tar.gz 129327263 BLAKE2B fb04f3fde6642905dd21836c7472cf3b6cb484f69367ecf01b7d427c757e0fd1db4bd483bf9b0e485e1f8924a8e9201e8d47713a1de9281d5d96e45939bd1078 SHA512 765e8982d457cfd900acddc8f82c23824b32dc6d925d45e7693cba48c06fab798b6d57991dc9ad18a9ace9aff6fb2b917bd97f2d6435a7caceb03c9733e9602a
 DIST ceph-14.2.9.tar.gz 128419205 BLAKE2B bace7469d9066a3da7320a0eb894013fae5b7139c15679dddae7df28c593a1029956234a1ba0d3bbdf1639e3a975aa776c695efefb915113a16099c80d563675 SHA512 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e
 DIST ceph-15.2.4.tar.gz 148011928 BLAKE2B c0222725227cf922ed10bb19840b8cbfe0c0b8ae77a4f83f03a95c3fc198165740f7a1dee5e1983e9403634ce389c858e71ed3f2731202630e19961a5de0247a SHA512 94e9b4c87d9f27dbfc9961b853f2cf159d65b614bf50ac3dabad9d801a181c547550ab4bca1f48c7a6e11aa6188e5858b110a9023dc214a043ed5ba375b3dee2
 EBUILD ceph-12.2.12-r3.ebuild 8084 BLAKE2B 10c1bb21651ca274643565a22794b4c6d8c61c9baa19fca9ffa396d6cbbf22b72b5601457b01ba62c1cdd6400ca965c6a8bdc638a959df315c57f0d272e36b5a SHA512 2cfdd77569da5c05354036e3d3864abab69e889e1cee142ed10782fb989353a8c9d7c491ef8e3fd6a872700b6a341413a591e0a341aa1a1ffca988be5b6a9af0
-EBUILD ceph-14.2.10.ebuild 10315 BLAKE2B 5adabc0a98e42439edf9392ba551c2eaeb4a8b25507f21e34237cd05b7ad49324a8f91c2ad38a91f514a28e664d62b6eb045e2dcff8fd88d5ede201ab020ab64 SHA512 1830b220bbd13bd7f95810076a89b64f1b754ef716d69c8f7701e81b2159bffe4e2c14f49f80511c7e02dde10584fb6ff9c742905949b49c251cf109898c73eb
-EBUILD ceph-14.2.9-r1.ebuild 9631 BLAKE2B 2f486712c825e24b7708e581fe2c9c9d7c1e6321ee32174f8b5b5c14e643ec2369639340452a79608061f573069fc5e7940e43b555d51a1ddd8e155d208d6cc9 SHA512 8847c34ad72f931d464aafdbe62c37e80f5f16fa8be419a736c8f25109e03e73540bc83fec6a4a690cc6ad61342113b136a16faae7bc3666aef041f4cca23fbb
-EBUILD ceph-15.2.4.ebuild 10480 BLAKE2B 8ac84238977e0000aa4c58ff2886b7a9a5076da5f28b5e559c27d7a09d06731ec7c97ff370eda16a3e32507767006f9344adfdc19919173ab264e9c0891f57dc SHA512 a63f78f11b3ab68b5dcd7e2a01261e815b7302bacd3f231fadb6a8abeefc4e726f4413846497612cf7ba6071e70a6841c80824adfabeb33b64bf3a4852239b40
+EBUILD ceph-14.2.10-r3.ebuild 10415 BLAKE2B c451da4a3173128e3c63367f016d04d27c4202a5c280b90be55adf414924eba33e7a5dff9720bbdc9efca6ec9746b26f63e465bc8cffe551cb96f0a00ec29ac3 SHA512 9c9676f2193722bbf7d0fe8bfcaf36349b9afb29c6085c2d3f2c6cbb44bc39391c00aa14bad77c3fa47aac3be7baebe8cdae629f102d7a43b54f268362da022c
+EBUILD ceph-14.2.11.ebuild 10415 BLAKE2B c451da4a3173128e3c63367f016d04d27c4202a5c280b90be55adf414924eba33e7a5dff9720bbdc9efca6ec9746b26f63e465bc8cffe551cb96f0a00ec29ac3 SHA512 9c9676f2193722bbf7d0fe8bfcaf36349b9afb29c6085c2d3f2c6cbb44bc39391c00aa14bad77c3fa47aac3be7baebe8cdae629f102d7a43b54f268362da022c
+EBUILD ceph-14.2.9-r1.ebuild 9418 BLAKE2B e812e6c8faac19ab948ee56d6e7489082c0b1679d939c74df5d51b25da1b516752796a30182bec44e9abc995568287c206cc2bd3c1b0f3faddd8cdc3e01ae001 SHA512 da2f554fadb2e4bc060fed4fc949d444beae7b94eaa361a8da435e2375d03427d251da03cd64dd81098ddcde53a5ff3093e376ca48249d0692054f4cde5919f0
+EBUILD ceph-15.2.4-r3.ebuild 10574 BLAKE2B 2cc2d72e8e636026e13dd036d3d530eff53854922e9222ca9e30f4eba151241e55889ce5d0073a985535f17209ce7d2429691df45af3e6c09c6c61fc9d308244 SHA512 ae06483ef26e4dcbb6ec3627e30109f040fce767242d724fea3b3d574bd721d206c8666ebd0d679ea78a0479b14b267eefc5c0dac702de66c9cc45a9f978030a
 MISC metadata.xml 2117 BLAKE2B 5aacfd24e535c6941c3b53ac2ecea9a8837511f2656ac1447b004fc6949818826321c455c0d401e79dcc21d6f5686162f69da9b6994dd4427157db47eab7894e SHA512 126776f9836132f200496c1a5eccd2bf069b8e962b47defd1b01e65d4b58204565ab8a1736d40f49e0c7b733c43bf4507fe2fc19b62c5d3935061da7980f203c
diff --git a/sys-cluster/ceph/ceph-14.2.10.ebuild b/sys-cluster/ceph/ceph-14.2.10-r3.ebuild
index f335155f0e1e..9da1e1fe06c8 100644
--- a/sys-cluster/ceph/ceph-14.2.10.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.10-r3.ebuild
@@ -32,7 +32,7 @@ IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
 	spdk system-boost systemd +tcmalloc test xfs zfs"
 IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 
-COMMON_DEPEND="
+DEPEND="
 	acct-group/ceph
 	acct-user/ceph
 	virtual/libudev:=
@@ -122,7 +122,7 @@ BDEPEND="
 		sys-fs/btrfs-progs
 	)
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	app-admin/sudo
 	net-misc/socat
 	sys-apps/gptfdisk
@@ -173,6 +173,9 @@ RESTRICT="test? ( userpriv )"
 # distribution tarball does not include everything needed for tests
 RESTRICT+=" test"
 
+# create a non-debug release
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
 # false positives unless all USE flags are on
 CMAKE_WARN_UNUSED_CLI=no
 
@@ -192,6 +195,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
 	"${FILESDIR}/ceph-14.2.10-missing-includes.patch"
 	"${FILESDIR}/ceph-14.2.10-python-warnings.patch"
+	"${FILESDIR}/ceph-14.2.10-build-without-mgr.patch"
 )
 
 check-reqs_export_vars() {
@@ -241,7 +245,7 @@ ceph_src_configure() {
 		-DWITH_CEPHFS=$(usex cephfs)
 		-DWITH_CEPHFS_SHELL=$(usex cephfs)
 		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_DPDK=$(usex spdk)
+		-DWITH_SPDK=$(usex spdk)
 		-DWITH_FUSE=$(usex fuse)
 		-DWITH_LTTNG=$(usex lttng)
 		-DWITH_GSSAPI=$(usex kerberos)
diff --git a/sys-cluster/ceph/ceph-14.2.11.ebuild b/sys-cluster/ceph/ceph-14.2.11.ebuild
new file mode 100644
index 000000000000..9da1e1fe06c8
--- /dev/null
+++ b/sys-cluster/ceph/ceph-14.2.11.ebuild
@@ -0,0 +1,396 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+CMAKE_MAKEFILE_GENERATOR=emake
+
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
+		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
+	kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl
+	spdk system-boost systemd +tcmalloc test xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+DEPEND="
+	acct-group/ceph
+	acct-user/ceph
+	virtual/libudev:=
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/zstd:=
+	app-shells/bash:0
+	app-misc/jq:=
+	dev-libs/crypto++:=
+	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
+	dev-libs/xmlsec:=[!openssl?,!libressl?]
+	dev-cpp/yaml-cpp:=
+	dev-libs/nss:=
+	dev-libs/protobuf:=
+	net-dns/c-ares:=
+	net-libs/gnutls:=
+	sys-auth/oath-toolkit:=
+	sys-apps/coreutils
+	sys-apps/grep
+	sys-apps/hwloc:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
+	sys-apps/sed
+	sys-apps/util-linux
+	sys-libs/libcap-ng:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	sys-process/numactl:=
+	x11-libs/libpciaccess:=
+	babeltrace? ( dev-util/babeltrace )
+	fuse? ( sys-fs/fuse:0= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	kafka? ( dev-libs/librdkafka:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lttng? ( dev-util/lttng-ust:= )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
+	radosgw? (
+		dev-libs/expat:=
+		openssl? (
+			dev-libs/openssl:=
+			net-misc/curl:=[curl_ssl_openssl]
+		)
+		libressl? (
+			dev-libs/libressl:=
+			net-misc/curl:=[curl_ssl_libressl]
+		)
+	)
+	ssl? (
+		openssl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-boost? ( =dev-libs/boost-1.72*[threads,context,python,${PYTHON_USEDEP}] )
+	xfs? ( sys-fs/xfsprogs:= )
+	zfs? ( sys-fs/zfs:= )
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	>=dev-util/cmake-3.5.0
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	dev-util/gperf
+	dev-util/ragel
+	dev-util/valgrind
+	sys-apps/coreutils
+	sys-apps/findutils
+	sys-apps/grep
+	sys-apps/sed
+	sys-apps/which
+	sys-devel/bc
+	sys-devel/patch
+	virtual/pkgconfig
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+"
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	net-misc/socat
+	sys-apps/gptfdisk
+	>=sys-apps/smartmontools-7.0
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lsscsi
+	sys-fs/lvm2[-device-mapper-only(-)]
+	virtual/awk
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	mgr? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		diskprediction? (
+			$(python_gen_cond_dep '<sci-libs/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
+		)
+		sci-libs/scikits_learn[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+# diskprediction needs older scipy not compatible with py38
+# bug #724438
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	?? ( jemalloc tcmalloc )
+	^^ ( openssl libressl )
+	diskprediction? ( mgr !python_targets_python3_8 )
+	kafka? ( radosgw )
+	mgr? ( cephfs )
+	rabbitmq? ( radosgw )
+"
+RESTRICT="!test? ( test )"
+
+# the tests need root access
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# create a non-debug release
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI=no
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-14.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-13.2.0-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
+	"${FILESDIR}/ceph-14.2.5-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
+	"${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
+	"${FILESDIR}/ceph-14.2.4-python-executable.patch"
+	"${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
+	"${FILESDIR}/ceph-14.2.10-missing-includes.patch"
+	"${FILESDIR}/ceph-14.2.10-python-warnings.patch"
+	"${FILESDIR}/ceph-14.2.10-build-without-mgr.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="5200M"
+	CHECKREQS_DISK_USR="510M"
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use system-boost; then
+		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
+			| xargs --null sed -r \
+			-e 's|Boost::|boost_|g' \
+			-e 's|Boost_|boost_|g' \
+			-e 's|[Bb]oost_boost|boost_system|g' -i || die
+	fi
+
+	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		src/bash_completion/CMakeLists.txt || die
+
+	if ! use diskprediction; then
+		rm -rf src/pybind/mgr/diskprediction_local || die
+	fi
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_CEPHFS_SHELL=$(usex cephfs)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_SPDK=$(usex spdk)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_GSSAPI=$(usex kerberos)
+		-DWITH_GRAFANA=$(usex grafana)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND=OFF
+		-DWITH_NUMA=$(usex numa)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PYTHON3=3
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
+		-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED="ON"
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_RDMA=OFF
+		-DWITH_TBB=OFF
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-Wno-dev
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
+		|| die "failed to remove cmake cache"
+
+	cmake_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 clean
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	cmake_build VERBOSE=1 all
+
+	# we have to do this here to prevent from building everything multiple times
+	python_copy_sources
+	python_foreach_impl python_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${ED}" emake VERBOSE=1 install
+	popd >/dev/null || die
+
+	python_optimize
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners -R ceph:ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+
+	fi
+
+	udev_dorules udev/*.rules
+	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
+
+	readme.gentoo_create_doc
+
+	python_setup
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
+
+	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${ED}}"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/ceph/ceph-14.2.9-r1.ebuild b/sys-cluster/ceph/ceph-14.2.9-r1.ebuild
index 8fbefa08d5f3..8f7886000139 100644
--- a/sys-cluster/ceph/ceph-14.2.9-r1.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.9-r1.ebuild
@@ -215,7 +215,7 @@ ceph_src_configure() {
 	local mycmakeargs=(
 		-DWITH_BABELTRACE=$(usex babeltrace)
 		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi)
+		-DWITH_CEPHFS_SHELL=$(usex cephfs)
 		-DWITH_DPDK=$(usex dpdk)
 		-DWITH_DPDK=$(usex spdk)
 		-DWITH_FUSE=$(usex fuse)
@@ -226,9 +226,9 @@ ceph_src_configure() {
 		-DWITH_MGR_DASHBOARD_FRONTEND=NO
 		-DWITH_NUMA=$(usex numa)
 		-DWITH_OPENLDAP=$(usex ldap)
-		-DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
-		-DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
-		-DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
+		-DMGR_PYTHON_VERSION=3
+		-DWITH_PYTHON3=ON
+		-DWITH_PYTHON2=OFF
 		-DWITH_RADOSGW=$(usex radosgw)
 		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
 		-DWITH_SSL=$(usex ssl)
diff --git a/sys-cluster/ceph/ceph-15.2.4.ebuild b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
index dc446889a8fc..a81fe959935e 100644
--- a/sys-cluster/ceph/ceph-15.2.4.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
@@ -32,7 +32,7 @@ IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
 	rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs"
 IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 
-COMMON_DEPEND="
+DEPEND="
 	acct-group/ceph
 	acct-user/ceph
 	virtual/libudev:=
@@ -124,7 +124,7 @@ BDEPEND="
 		sys-fs/btrfs-progs
 	)
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	app-admin/sudo
 	net-misc/socat
 	sys-apps/gptfdisk
@@ -178,6 +178,9 @@ RESTRICT="test? ( userpriv )"
 # distribution tarball does not include everything needed for tests
 RESTRICT+=" test"
 
+# create a non-debug release
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
 # false positives unless all USE flags are on
 CMAKE_WARN_UNUSED_CLI=no
 
@@ -195,6 +198,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
 	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
 	"${FILESDIR}/ceph-14.2.10-python-warnings.patch"
+	"${FILESDIR}/ceph-15.2.4-system-uring.patch"
 )
 
 check-reqs_export_vars() {
@@ -245,7 +249,7 @@ ceph_src_configure() {
 		-DWITH_CEPHFS=$(usex cephfs)
 		-DWITH_CEPHFS_SHELL=$(usex cephfs)
 		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_DPDK=$(usex spdk)
+		-DWITH_SPDK=$(usex spdk)
 		-DWITH_FUSE=$(usex fuse)
 		-DWITH_LTTNG=$(usex lttng)
 		-DWITH_GSSAPI=$(usex kerberos)
diff --git a/sys-cluster/ceph/files/ceph-14.2.10-build-without-mgr.patch b/sys-cluster/ceph/files/ceph-14.2.10-build-without-mgr.patch
new file mode 100644
index 000000000000..0742945c0184
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.10-build-without-mgr.patch
@@ -0,0 +1,111 @@
+commit 41c1cee88b38bc43002b232ede42dc157364f61a
+Author: Casey Bodley <cbodley@redhat.com>
+Date:   Fri Nov 1 16:04:37 2019 -0400
+
+    cmake: define mgr_cap_obj library when WITH_MGR=OFF
+    
+    resolves the cmake error when WITH_MGR=OFF:
+    
+      Error evaluating generator expression:
+    
+        $<TARGET_OBJECTS:mgr_cap_obj>
+    
+      Objects of target "mgr_cap_obj" referenced but no such target exists.
+    Call Stack (most recent call first):
+      src/mon/CMakeLists.txt:34 (add_library)
+    
+    Signed-off-by: Casey Bodley <cbodley@redhat.com>
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 275a8ebd17..c2a9d7a669 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -473,9 +473,7 @@ if(WITH_LIBRADOSSTRIPER)
+   add_subdirectory(libradosstriper)
+ endif()
+ 
+-if(WITH_MGR)
+-  add_subdirectory(mgr)
+-endif()
++add_subdirectory(mgr)
+ 
+ set(librados_config_srcs
+   librados-config.cc)
+diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
+index 79227bcc1d..e69335eb69 100644
+--- a/src/mgr/CMakeLists.txt
++++ b/src/mgr/CMakeLists.txt
+@@ -1,37 +1,39 @@
+ add_library(mgr_cap_obj OBJECT
+   MgrCap.cc)
+ 
+-set(mgr_srcs
+-  ${CMAKE_SOURCE_DIR}/src/ceph_mgr.cc
+-  ${CMAKE_SOURCE_DIR}/src/mon/PGMap.cc
+-  ActivePyModule.cc
+-  ActivePyModules.cc
+-  BaseMgrModule.cc
+-  BaseMgrStandbyModule.cc
+-  ClusterState.cc
+-  DaemonHealthMetricCollector.cc
+-  DaemonServer.cc
+-  DaemonState.cc
+-  Gil.cc
+-  Mgr.cc
+-  MgrStandby.cc
+-  OSDPerfMetricTypes.cc
+-  OSDPerfMetricCollector.cc
+-  PyFormatter.cc
+-  PyModule.cc
+-  PyModuleRegistry.cc
+-  PyModuleRunner.cc
+-  PyOSDMap.cc
+-  StandbyPyModules.cc
+-  mgr_commands.cc
+-  $<TARGET_OBJECTS:mgr_cap_obj>)
+-add_executable(ceph-mgr ${mgr_srcs})
+-target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
+-target_link_libraries(ceph-mgr
+-  osdc client heap_profiler
+-  global-static ceph-common
+-  Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
+-  ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
+-set_target_properties(ceph-mgr PROPERTIES
+-  POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
+-install(TARGETS ceph-mgr DESTINATION bin)
++if(WITH_MGR)
++  set(mgr_srcs
++    ${CMAKE_SOURCE_DIR}/src/ceph_mgr.cc
++    ${CMAKE_SOURCE_DIR}/src/mon/PGMap.cc
++    ActivePyModule.cc
++    ActivePyModules.cc
++    BaseMgrModule.cc
++    BaseMgrStandbyModule.cc
++    ClusterState.cc
++    DaemonHealthMetricCollector.cc
++    DaemonServer.cc
++    DaemonState.cc
++    Gil.cc
++    Mgr.cc
++    MgrStandby.cc
++    OSDPerfMetricTypes.cc
++    OSDPerfMetricCollector.cc
++    PyFormatter.cc
++    PyModule.cc
++    PyModuleRegistry.cc
++    PyModuleRunner.cc
++    PyOSDMap.cc
++    StandbyPyModules.cc
++    mgr_commands.cc
++    $<TARGET_OBJECTS:mgr_cap_obj>)
++  add_executable(ceph-mgr ${mgr_srcs})
++  target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
++  target_link_libraries(ceph-mgr
++    osdc client heap_profiler
++    global-static ceph-common
++    Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
++    ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
++  set_target_properties(ceph-mgr PROPERTIES
++    POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
++  install(TARGETS ceph-mgr DESTINATION bin)
++endif()
diff --git a/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch b/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch
index 59663028cfa4..aaa6ee080a33 100644
--- a/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch
+++ b/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch
@@ -7,7 +7,7 @@ index c4c24f6a75..b5631e8b84 100644
  #define CEPH_COMMON_BIT_STR_H
  
 +#include <cstdint>
-+#include <ostream>
++#include <iosfwd>
  #include <functional>
  
  namespace ceph {
diff --git a/sys-cluster/ceph/files/ceph-15.2.4-system-uring.patch b/sys-cluster/ceph/files/ceph-15.2.4-system-uring.patch
new file mode 100644
index 000000000000..64df81bf97b5
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-15.2.4-system-uring.patch
@@ -0,0 +1,66 @@
+diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
+index 760244b9b4..7f83923671 100644
+--- a/src/os/CMakeLists.txt
++++ b/src/os/CMakeLists.txt
+@@ -134,27 +134,6 @@ if(WITH_EVENTTRACE)
+ endif()
+ 
+ if(WITH_LIBURING)
+-  include(ExternalProject)
+-  if("${CMAKE_GENERATOR}" MATCHES "Make")
+-    set(make_cmd "$(MAKE)")
+-  else()
+-    set(make_cmd "make")
+-  endif()
+-  ExternalProject_Add(liburing_ext
+-    DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/src/
+-    GIT_REPOSITORY http://git.kernel.dk/liburing
+-    GIT_TAG "4e360f71131918c36774f51688e5c65dea8d43f2"
+-    SOURCE_DIR ${CMAKE_BINARY_DIR}/src/liburing
+-    CONFIGURE_COMMAND <SOURCE_DIR>/configure
+-    BUILD_COMMAND env CC=${CMAKE_C_COMPILER} ${make_cmd} -C src -s
+-    BUILD_IN_SOURCE 1
+-    INSTALL_COMMAND "")
+-  unset(make_cmd)
+-  add_library(liburing STATIC IMPORTED GLOBAL)
+-  add_dependencies(liburing liburing_ext)
+-  set_target_properties(liburing PROPERTIES
+-    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+-    IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/src/liburing/src/liburing.a")
+-  target_link_libraries(os liburing)
+-  target_include_directories(os SYSTEM PRIVATE "${CMAKE_BINARY_DIR}/src/liburing/src/include")
++  pkg_check_modules(LIBURING REQUIRED IMPORTED_TARGET liburing)
++  target_link_libraries(os uring)
+ endif(WITH_LIBURING)
+diff --git a/src/os/bluestore/io_uring.cc b/src/os/bluestore/io_uring.cc
+index 54fa0f9535..4ba83cf172 100644
+--- a/src/os/bluestore/io_uring.cc
++++ b/src/os/bluestore/io_uring.cc
+@@ -7,6 +7,8 @@
+ 
+ #include "liburing.h"
+ #include <sys/epoll.h>
++#include <unistd.h>
++#include <sys/syscall.h>
+ 
+ /* Options */
+ 
+@@ -134,8 +136,7 @@ int ioring_queue_t::init(std::vector<int> &fds)
+   if (ret < 0)
+     return ret;
+ 
+-  ret = io_uring_register(d->io_uring.ring_fd, IORING_REGISTER_FILES,
+-			  &fds[0], fds.size());
++  ret = io_uring_register_files(&d->io_uring, &fds[0], fds.size());
+   if (ret < 0) {
+     ret = -errno;
+     goto close_ring_fd;
+@@ -214,7 +215,7 @@ bool ioring_queue_t::supported()
+   struct io_uring_params p;
+ 
+   memset(&p, 0, sizeof(p));
+-  int fd = io_uring_setup(16, &p);
++  int fd = syscall(SYS_io_uring_setup, 16, &p);
+   if (fd < 0)
+     return false;
+ 
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 671d9ffbf85d..1c9296bcf2fc 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,9 +1,6 @@
-AUX charliecloud-0.10-fix-hardcoded-gcc.patch 1944 BLAKE2B 920697592b47f532a335c493ffa381b08852d628f76bf1e7abbdad299ca5d3431e2bb9d3713cb12dc6e532fc9e1a3a8bda3acc2639c6a0a309fe13347763a8cd SHA512 0c911ec270bdda5d2025faf09ce45961dfaf307b03e9d293630adc49747e1f750273a8ce5c0f46a2756d3ef97312684f7afbfc125c80cbd61384722437bc0dfd
-DIST charliecloud-0.10.tar.gz 301083 BLAKE2B be0c650bebc12fd047b1afc61588b4b9cfc0d0addfddb808765d8e125c70329d6c06a86144b4167e5abaf64392ad1891319aabd2ba8fb528de2d9789d040fc0c SHA512 681e2f30f730b42b55b4097dba78e41924b17990354b866e04e09e6d2e4bb584211c130f9a04619dcdd38f2a3eaaad7615ee5ec20a266ee2332b0a512492331f
 DIST charliecloud-0.15.tar.gz 346718 BLAKE2B a3710814864904c5db282d092f64faf9a11aeea016c788ee4be62f11257b5b5200d0c1887150b93f18446034d7919df933d3badcf33907a81c0b33e65a5e9f78 SHA512 70f6c9a18f613d05396eda5d41044ec699cf6366ae1bf43839275e62ac317231bb1c3278469040faa03af007260d84e2d718c0fb3fb45e6ace8fb733c6275a84
 DIST charliecloud-0.16.tar.gz 356118 BLAKE2B 72e7640feb23fbc55c515fd841cf90562b7800a83673b6a786c8162229b6714ed6a98d3c5066e42ce75a58935e085e86e42ae927cd5f14e6e54ffe6e9863629e SHA512 bf37b5ea2d139635f3207475497bd90595ce625ce9ad05eef5fcd19ec3252e4843eba2bd457587cd9c4ab860aa1e40ec01ac5cd073414bb5a4f89b5c4488bceb
-EBUILD charliecloud-0.10-r1.ebuild 1559 BLAKE2B e33fd6a6dcd8bf6823e9d79a005050c56ff40f4d86a63805997f15c0b2620fea00b726a9734f7c2d6ccc97132b3f83990a6cb5a3d5e16090f51ac8c4e7ba4a35 SHA512 c04634bbaa51798f5d969657608f11008af026781d6eddd1350bd98415dc38d5dadb4aff252fdfdbc3073b72a29e46209c2792675414749649ce8befd2ead13d
-EBUILD charliecloud-0.15.ebuild 1979 BLAKE2B dc1016a9437a8ce7219b5ee62eec43cc28c35dc514c7d51ef693140abe2a3626b3ce17b2d182ab705e067af3de0c60b2c991bf3b1c72da96b2828f7611943874 SHA512 919c24c2c48bdc7b2d46415dcc69c478f77502a0b4748a3d6f520376adbdaed5eda1d120496ecb89fb29cb81d7a2315763f4cf73b7a4d8093163264308bcd21b
-EBUILD charliecloud-0.16.ebuild 1979 BLAKE2B dc1016a9437a8ce7219b5ee62eec43cc28c35dc514c7d51ef693140abe2a3626b3ce17b2d182ab705e067af3de0c60b2c991bf3b1c72da96b2828f7611943874 SHA512 919c24c2c48bdc7b2d46415dcc69c478f77502a0b4748a3d6f520376adbdaed5eda1d120496ecb89fb29cb81d7a2315763f4cf73b7a4d8093163264308bcd21b
-EBUILD charliecloud-9999.ebuild 1979 BLAKE2B dc1016a9437a8ce7219b5ee62eec43cc28c35dc514c7d51ef693140abe2a3626b3ce17b2d182ab705e067af3de0c60b2c991bf3b1c72da96b2828f7611943874 SHA512 919c24c2c48bdc7b2d46415dcc69c478f77502a0b4748a3d6f520376adbdaed5eda1d120496ecb89fb29cb81d7a2315763f4cf73b7a4d8093163264308bcd21b
-MISC metadata.xml 937 BLAKE2B e57547bd213b476c45d79c716af07e58d5097637fe86f3a65215eea57348dd94b93176239b4275660c5a50d370937cd9cfb340205b0ad556163f8ec7c5896a51 SHA512 69b8c1bec13e3ab80a277c7e24070a707b72dc0cb82de2bd2f75236e06185489692da07bfd5504f61a2b096b77bf9ca10ee8b66252031e3587855559919ccd7d
+EBUILD charliecloud-0.15.ebuild 2022 BLAKE2B c1a239810992cfaa61c161217532f7f9f5843bdabd6268fdd6e2f8fc5e502987704673521ac23e9ece6ec2ec69906f8b3749a3b8a1a59df664660307a1684a9f SHA512 e7c520841250e501a6b7172dba590f74820b4b44faa3a7e8c521ff93f85ae59f6c5c5aeb4a5dfbdc6422f75b8ecb1dfe6ac3b7160fb58e25f4b9ace6297541ef
+EBUILD charliecloud-0.16.ebuild 2022 BLAKE2B c1a239810992cfaa61c161217532f7f9f5843bdabd6268fdd6e2f8fc5e502987704673521ac23e9ece6ec2ec69906f8b3749a3b8a1a59df664660307a1684a9f SHA512 e7c520841250e501a6b7172dba590f74820b4b44faa3a7e8c521ff93f85ae59f6c5c5aeb4a5dfbdc6422f75b8ecb1dfe6ac3b7160fb58e25f4b9ace6297541ef
+EBUILD charliecloud-9999.ebuild 2022 BLAKE2B c1a239810992cfaa61c161217532f7f9f5843bdabd6268fdd6e2f8fc5e502987704673521ac23e9ece6ec2ec69906f8b3749a3b8a1a59df664660307a1684a9f SHA512 e7c520841250e501a6b7172dba590f74820b4b44faa3a7e8c521ff93f85ae59f6c5c5aeb4a5dfbdc6422f75b8ecb1dfe6ac3b7160fb58e25f4b9ace6297541ef
+MISC metadata.xml 809 BLAKE2B 9dc29bca33e3a641ba5ddd913ee58d8c7703c55ca0e32db18a4f20ea70f871bf834637a1dab8934ef0034362dedf6b609acfcc5d534ac72d29b15ae32a56a17a SHA512 212cd70ac3e9fe0b91bc14feceef1f23e90c40c520ea8f9861847c93c6e341ca7f021a61d3608b3fd4a237c7681aa3fa7917c4ef1d849531eda0f3ca10ce4616
diff --git a/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild b/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild
deleted file mode 100644
index b1560f0ec968..000000000000
--- a/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
-HOMEPAGE="https://hpc.github.io/charliecloud/"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="doc examples +pv squashfuse"
-
-# Extensive test suite exists, but downloads container images
-# directly and via Docker and installs packages inside using apt/yum.
-# Additionally, clashes with portage namespacing and sandbox.
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	pv? ( sys-apps/pv )
-	squashfuse? ( sys-fs/squashfuse )
-"
-DEPEND="
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
-		')
-		net-misc/rsync
-	)"
-
-PATCHES=(
-	# See upstream bug: https://github.com/hpc/charliecloud/pull/481/
-	"${FILESDIR}"/"${PN}-${PV}"-fix-hardcoded-gcc.patch
-)
-
-src_compile() {
-	emake
-	use doc && emake -C doc-src
-}
-
-src_install() {
-	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" LIBEXEC_DIR="libexec/${PF}"
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	einstalldocs
-}
diff --git a/sys-cluster/charliecloud/charliecloud-0.15.ebuild b/sys-cluster/charliecloud/charliecloud-0.15.ebuild
index 54113d039cd4..b56fa3f93688 100644
--- a/sys-cluster/charliecloud/charliecloud-0.15.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.15.ebuild
@@ -51,6 +51,7 @@ DEPEND="
 
 src_prepare() {
 	default
+	sed -i 's/ -Werror//' configure.ac || die
 	eautoreconf
 }
 
diff --git a/sys-cluster/charliecloud/charliecloud-0.16.ebuild b/sys-cluster/charliecloud/charliecloud-0.16.ebuild
index 54113d039cd4..b56fa3f93688 100644
--- a/sys-cluster/charliecloud/charliecloud-0.16.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.16.ebuild
@@ -51,6 +51,7 @@ DEPEND="
 
 src_prepare() {
 	default
+	sed -i 's/ -Werror//' configure.ac || die
 	eautoreconf
 }
 
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index 54113d039cd4..b56fa3f93688 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -51,6 +51,7 @@ DEPEND="
 
 src_prepare() {
 	default
+	sed -i 's/ -Werror//' configure.ac || die
 	eautoreconf
 }
 
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch b/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch
deleted file mode 100644
index 07e72b2fbd3e..000000000000
--- a/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From bae9f01ed5ad0ef5d6c0b48cbc1a7fde73ae45ae Mon Sep 17 00:00:00 2001
-From: Oliver Freyermuth <o.freyermuth@googlemail.com>
-Date: Mon, 15 Jul 2019 18:36:24 +0200
-Subject: [PATCH] test/Makefile: Remove hardcoded call to gcc, error out if
- CC=icc.
-
----
- test/Makefile | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/test/Makefile b/test/Makefile
-index 97a9316b..7c28ce2a 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -10,7 +10,7 @@ images_eg := $(sort $(wildcard ../examples/*/*/Build)) \
-              $(sort $(wildcard ../examples/*/*/Docker_Pull)) \
-              $(sort $(wildcard ../examples/*/*/Docker_Pull.*))
- images := $(images_ch) $(images_eg)
--sotests := sotest/bin/sotest sotest/lib/libsotest.so.1.0
-+sotests := check-no-icc sotest/bin/sotest sotest/lib/libsotest.so.1.0
- 
- # Favor embedded Bats, if installed, over system Bats.
- export PATH := $(CURDIR)/bats/bin:$(PATH)
-@@ -76,13 +76,18 @@ sotest/bin/sotest: sotest/sotest
- sotest/lib/libsotest.so.1.0: sotest/libsotest.so.1.0
- 	cp -a $^ $@
- 
--# We hardcode gcc here because some other compilers (hello, Intel) link the
-+# We exclude icc here because it links the
- # resulting binaries with extra shared libraries that are then not copied into
- # the container. (Issue #227.)
- 
-+check-no-icc:
-+ifeq ($(patsubst %icc,,$(lastword $(CC))),)
-+	$(error ICC not supported since it overlinks extra shared libraries)
-+endif
-+
- sotest/sotest: sotest/sotest.c sotest/libsotest.so.1.0
--	gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^
-+	$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^
- sotest/libsotest.so.1.0: sotest/libsotest.c
--	gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
-+	$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
- 	ln -f -s libsotest.so.1.0 sotest/libsotest.so
- 	ln -f -s libsotest.so.1.0 sotest/libsotest.so.1
diff --git a/sys-cluster/charliecloud/metadata.xml b/sys-cluster/charliecloud/metadata.xml
index 61291d6ce81d..85cf8536faf3 100644
--- a/sys-cluster/charliecloud/metadata.xml
+++ b/sys-cluster/charliecloud/metadata.xml
@@ -5,10 +5,6 @@
     <email>o.freyermuth@googlemail.com</email>
     <name>Oliver Freyermuth</name>
   </maintainer>
-  <maintainer type="person">
-    <email>junghans@gentoo.org</email>
-    <name>Christoph Junghans (proxy)</name>
-  </maintainer>
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
diff --git a/sys-cluster/corosync/Manifest b/sys-cluster/corosync/Manifest
index 46b490eaf20e..019035170fe2 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -4,5 +4,5 @@ AUX corosync.logrotate 93 BLAKE2B cc8f22c668dfde3fe4dac13fb295be81ff1ca13c808155
 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-2.3.5.ebuild 1734 BLAKE2B 6357e43ade6d4dd035eb9b8221b0c057a594f8eceb11ea0a5f7245416188e5eab47309f94d5c35a1c3a34a2f89c5d49f55d00626ad4d5b700cbeaa6536f6f90e SHA512 877e3f6103294a8b74cad41f9c044ef18e70e91956c49bf63d0ea80744274b2acc91ac095c43469d3b17c31deef3f3a235b3c237d4884471246f4b592bb71c50
-EBUILD corosync-2.4.2.ebuild 1697 BLAKE2B e7c1a72e2196446528b4f92b726ce52cb6cb9c4a07c3cf08d5d0a699f73c6df087dc99ac94ab9d9a9709ce407e0205b375ade16eff9599c8a2a6aade1f24c940 SHA512 f79e0b72e5a4328f38056c72aaa96a3943ba391e0385beb6e771e6344e88018426b009b50519a4ff49af5c4038a6f6e30615b511dfbf568b14dbd465741b82ee
+EBUILD corosync-2.4.2.ebuild 1702 BLAKE2B dbf853cd542094bb4edd03a50c76895d83ae886cefb67115790a408f6e565d4d46e8a9a377e239bf233905cf6ff7771cb372ab5173d90a5ee158fa696fba890e SHA512 a012365a627b1813af9b109460b37c8a3a6d3e34ee533253524dd48b54f370c43dea425ae475ac681d387bdf5271020c6d3645e196f9984b1bd5137b2d31c91a
 MISC metadata.xml 447 BLAKE2B 660930ff9e96851aa0272fafb5547be824e424f9d866e58a13699608eda86c9c45533218d6c1647028bb1c8e5bb6e738087b8ad8f7ddbe7ae94a2ea9eb47ec47 SHA512 9897d127e1d47ee58213ea00d4ebdb536e2316c13633331194ac118ec5a2e782e515a6f1ccb01cd7eafae34bfb032fc2c9ea61a549b9da34bc3e96a988457d03
diff --git a/sys-cluster/corosync/corosync-2.4.2.ebuild b/sys-cluster/corosync/corosync-2.4.2.ebuild
index bdea670c8da2..a5382c7f7f8e 100644
--- a/sys-cluster/corosync/corosync-2.4.2.ebuild
+++ b/sys-cluster/corosync/corosync-2.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc infiniband static-libs systemd xml"
 
 # TODO: support those new configure flags
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index c418652770d7..bae97b2412f9 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,6 +1,7 @@
 AUX 50glusterfs-mode-gentoo.el 169 BLAKE2B 461afb9f17ef9dee79348279e861039193400d61a926e9d8499351b7e42377cc1bffce6dc2c2d7f3b50b1de016a336bad69c7a79bb800b973288eef542baed85 SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804
 AUX glusterd-r3.initd 755 BLAKE2B 6b402725a6a53839ff718ae19f4917b61330f78ae6657480a218f06657d5d7db1c4b57efa275159be76bc84fd5b600a22bd4b374a8a6fbb56576799650ce89fe SHA512 d6f46374f48cf78c4114c786fbba4412764527cec020f43ab2a46000fcada98bdb6dfb67ba9db2be3e39a851cba1db97a7154e4cab6df7ce541c0157c781706c
 AUX glusterfs-6.7-fix-seek.patch 1247 BLAKE2B 77ede2514e3afcca12a0d2fef7d24ed66924ffe9ff804bbd48b56a04f27268b8b09471368afaececf9c6c7a304889c5f5271207442ff134d0ad215b46ac2ddf7 SHA512 839eb1d2bb87cae9adbfcc1f81c6187697e0b9c69fcd4c6aea9182c45fef09e3fe3ed3be210c8321a4530f4b9a6a140429ca2437bf5daf8357518ac1732f8434
+AUX glusterfs-7.7-flock.patch 2112 BLAKE2B d3fb045d06a1e574f162369b4730c8d88ddc880384e20a3ec13b0324e22728244b940c8533edbb8da1c8f9d6b331258778dd5975371e969a02ff27487fc8bff4 SHA512 9648371fb438e35b01c021e5cdf31b97d5107b9766e616178388dfa0978f981fde6463a5dec0083d5fadf3300dc27faf35ed00f69138a24697b7fcaea2489765
 AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d665f0bbffb59bbd2f81b314df62b8aab4eab5c4d23b9e88f43168160cb0faedece3307ddf2347f5282311 SHA512 28c5f401b2ff017d8faf7b290fa265cc5f1a9d60edf11dbae5801e943e7e0833fa8267880efa80c4fc07048d75afd446808c583d2b62a6c5a6bde25d317bde97
 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4
 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791
@@ -9,9 +10,11 @@ DIST glusterfs-6.8.tar.gz 7572097 BLAKE2B 76b7c699a4fc864d8074b591b3583030d837a0
 DIST glusterfs-6.9.tar.gz 7580928 BLAKE2B 655544b7ffa70ac9980e1a1041af538f473b6b6c8cb77f6e3447908b903b3a2b3ee0234c18fb71f997f31f24f8a790ab2f5a05a6b392090601db455ac726262a SHA512 3bf167aed4f572f94ad4708c5fff7b578a334af1eb0322c36e15127a2089b6359e8d91a36793d8af93c8f76dbdf6ded649c3e0a6c1a879163c8d8b640cea334b
 DIST glusterfs-7.5.tar.gz 7649044 BLAKE2B 01088654051a33c3a009b42c6e7adf7cabc52927a83a3331eced428ed3e6bfb3f7198fcc53a2b1dce678ac58c2f2619d02cce72a9850a50f3a26b37d39baeeaa SHA512 dfd8f04fb398daa7d7f58ef978ab69c0a55a313ac2af3287f7e1e7044f708317227c8749af5fd8d56844dfb8ad47bbd3214c42b806e2e21191a6a8617ab0be38
 DIST glusterfs-7.6.tar.gz 7653500 BLAKE2B ff3d4817f2a8b85126669cfbe6f58990aaccfffd91464d7acd97d7092c8eb94c21552eaf5e2301e3e6a7f99534b40c2afce1ade593d8ac559baee2d175538333 SHA512 c26b2046e7afdbb37fdd395fd9f692a0513ebb58c91ea223fbbaf9f8b41641b1fd009f2975e187f0feb8d83fb5cd4a8a0c2fdf4591a8a31e920d6bba75ae7c0f
+DIST glusterfs-7.7.tar.gz 7675420 BLAKE2B cadd415053d791f5fe4fddbc45bf237275b29fb0340202eaf81bbd2e98c8e7a1b59fa276b8b47679224198675759287a2245095a751602a866d512155dfa73c8 SHA512 0a301802920e337a4931ed36133c76ef551e0c1794d324e5a0a120d289a53fb8a4a2fd8adaa7abe5a40b8b17cc2bb18d01426c9f18d91f68b1589429ddbaa125
 EBUILD glusterfs-6.8.ebuild 6113 BLAKE2B 32f0c68de4c61fef290d80d13de98240e3da590e6ae60a0b5f9088e92d5b7ada00d7e46d55f15209e053a9b1502b49453f910b3af3e05bfdcb5163638d3b82f8 SHA512 0977bd902bc225f0ea0005ef7d057b72669cb002cf1ca35d7f24a036a45321f81ae981eca7ad69275138fdd08d2fcae4971e2302a41ba3f4e01a4bfa677a96bb
 EBUILD glusterfs-6.9.ebuild 6116 BLAKE2B e7ee1fe782c1ff3fdbd6ecbbd14494654826de439fd95b137546fd9f7259b14788b6caf1d042780579ecbe630e5fe8e1d1261d6d55b7318aa1ca506c1f3768ee SHA512 0464665f3b72f9fecf6bdbea8c3c19c38c780a9288780ba9390920e23ecb089875801b5f625bc47ad84cce9107e58dd14adbc29478a27ffdcfcf6a0b17dc6475
 EBUILD glusterfs-7.5.ebuild 6117 BLAKE2B a2f6a3c7f3e9071066dbdf85c9ae072757160de16eccabbd2fe08ba3fc805220451ff77b3bb3819c41199de61435067234de6ab0d98eb1b6695e5d88a0a8bfce SHA512 2c5ea8cd5d9a6f1957a699248678955c01b64125a9bb35bdbd8f71db6424819213f60c3bc69132dca7e89de3ed7ee497dd656d2eff67c3a1a3ea549466c0bb9f
 EBUILD glusterfs-7.6.ebuild 6116 BLAKE2B e7ee1fe782c1ff3fdbd6ecbbd14494654826de439fd95b137546fd9f7259b14788b6caf1d042780579ecbe630e5fe8e1d1261d6d55b7318aa1ca506c1f3768ee SHA512 0464665f3b72f9fecf6bdbea8c3c19c38c780a9288780ba9390920e23ecb089875801b5f625bc47ad84cce9107e58dd14adbc29478a27ffdcfcf6a0b17dc6475
+EBUILD glusterfs-7.7.ebuild 6025 BLAKE2B dd301333d2a89a836bbb427a1b509cbc6405f125ecde11cb81c10912e841c7b686dbf563ae070dfd5eba79ea52754c6562e7ae0676f49ff89d6875f9f8703522 SHA512 f53a4b1cfe74537e4271ad6e982f883b31c7a256685c382583ecea5e8c280a87d73b3e3c9aaab43772cc16e03e64406538340f8521e358e373abef1decb97164
 EBUILD glusterfs-9999.ebuild 5975 BLAKE2B e7dff556a3ce1af02657aa623f86870c574524a731ac24b15890e49c1ac1d7c80224354141b4aa59b64c47f851996aafb76ce34fc790b88ba8a8faf12f34bd4d SHA512 6daf0254c09e6d04580a3dfb819380f50fb4721b1afb2c2e765f9c1f80acaa7bfbe131d587ec0a5d44cb56263e03808422b60731eb9b2209698b66a28ccde9c8
-MISC metadata.xml 1291 BLAKE2B 72dac243dd9994bc08e89169ab70d5d1e096b0cf7a2aa7b47a04c17ff3711ffec3a42c9c43a10c6d5a5a544ab189913efe1405400bdf213f1566d84732077b6a SHA512 4260fbc16780f89d233100581973ed4fd480c19ffe514b1c8091d553bb1f83a475219918784d4d9a8b985b7a88e57c9ce3912cf5857c76cb2487282f26677df8
+MISC metadata.xml 1361 BLAKE2B 3a105a6248cd2b4c785b15518bca119697aa9b7d3b8609cc38fdd4ec8a401caff9c772f900c65de9b75050994d5b147dd5461747b10b4aac5080ee3c83e8efb1 SHA512 d4aa9447507f9e3e145765e048089e31eac7b5969844798429a142e0089568254ff5ce1401db62addfa4584022f5e84bc1756cb0c7338f4fe08ac348feba77ae
diff --git a/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch b/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch
new file mode 100644
index 000000000000..f7930406cd18
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch
@@ -0,0 +1,65 @@
+# https://bugs.gentoo.org/733228
+# https://bugzilla.redhat.com/show_bug.cgi?id=1718562
+# https://bugzilla.redhat.com/show_bug.cgi?id=1776152
+# https://review.gluster.org/#/c/glusterfs/+/23794/8/xlators/features/locks/src/common.c
+
+From 6ef82683064a87c434bd67e2004935281e4c04cc Mon Sep 17 00:00:00 2001
+From: l17zhou <cynthia.zhou@nokia-sbell.com>
+Date: Tue, 03 Dec 2019 07:43:35 +0200
+Subject: [PATCH] add clean local after grant lock
+
+found by flock test, without correct ref number of fd,
+lock will not be correctly released.
+
+Fixes: bz#1779089
+Change-Id: I3e466b17c852eb219c8778e43af8ad670a8449cc
+Signed-off-by: l17zhou <cynthia.zhou@nokia-sbell.com>
+---
+
+diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c
+index c78d537..4c6b78c 100644
+--- a/xlators/features/locks/src/common.c
++++ b/xlators/features/locks/src/common.c
+@@ -962,7 +962,7 @@
+     struct list_head granted_list;
+     posix_lock_t *tmp = NULL;
+     posix_lock_t *lock = NULL;
+-
++    pl_local_t *local = NULL;
+     INIT_LIST_HEAD(&granted_list);
+ 
+     pthread_mutex_lock(&pl_inode->mutex);
+@@ -977,9 +977,9 @@
+ 
+         pl_trace_out(this, lock->frame, NULL, NULL, F_SETLKW, &lock->user_flock,
+                      0, 0, NULL);
+-
+-        STACK_UNWIND_STRICT(lk, lock->frame, 0, 0, &lock->user_flock, NULL);
+-
++        local = lock->frame->local;
++        PL_STACK_UNWIND_AND_FREE(local, lk, lock->frame, 0, 0,
++                                 &lock->user_flock, NULL);
+         __destroy_lock(lock);
+     }
+ 
+@@ -999,6 +999,7 @@
+     struct list_head granted_list;
+     posix_lock_t *tmp = NULL;
+     posix_lock_t *lock = NULL;
++    pl_local_t *local = NULL;
+ 
+     int ret = -1;
+ 
+@@ -1026,9 +1027,9 @@
+ 
+         pl_trace_out(this, lock->frame, NULL, NULL, F_SETLKW, &lock->user_flock,
+                      0, 0, NULL);
+-
+-        STACK_UNWIND_STRICT(lk, lock->frame, 0, 0, &lock->user_flock, NULL);
+-
++        local = lock->frame->local;
++        PL_STACK_UNWIND_AND_FREE(local, lk, lock->frame, 0, 0,
++                                 &lock->user_flock, NULL);
+         __destroy_lock(lock);
+     }
+ 
diff --git a/sys-cluster/glusterfs/glusterfs-7.7.ebuild b/sys-cluster/glusterfs/glusterfs-7.7.ebuild
new file mode 100644
index 000000000000..2f3011803d87
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-7.7.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools elisp-common python-single-r1 systemd
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
+else
+	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="
+	acct-group/gluster
+	acct-user/gluster
+	dev-libs/libaio
+	dev-libs/userspace-rcu:=
+	net-libs/rpcsvc-proto
+	sys-apps/util-linux
+	sys-libs/readline:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
+	xml? ( dev-libs/libxml2 )
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/acl
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.7-flock.patch"
+)
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python3*"
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am |
+		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-fusermount \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable infiniband ibverbs) \
+		$(use_enable static-libs static) \
+		$(use_enable syslog) \
+		$(use_enable test cmocka) \
+		$(use_enable xml xml-output) \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
+		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+	fi
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	if use georeplication ; then
+		# move the gsync-sync-gfid tool to a binary path
+		# and set a symlink to be compliant with all other distros
+		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
+		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
+	fi
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+pkg_postinst() {
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml
index cbd9d0546eb1..2b36a91f63e6 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>jaco@uls.co.za</email>
-		<name>Jaco Kroon</name>
-		<description>Please CC on bugs</description>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>proxy maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
 		GlusterFS is a cluster file-system capable of scaling to several peta-bytes. It aggregates various storage bricks over Infiniband RDMA or TCP/IP interconnect into one large parallel network file system. GlusterFS is based on a stackable user space design without compromising performance.
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 41b8c041c95b..de6a8c5bde2d 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -2,6 +2,6 @@ AUX heat.initd 463 BLAKE2B c855fe1b4fe73fe93874add659c49133d1f83653acbb37e7ab992
 DIST heat.conf.sample-14.0.0 76935 BLAKE2B 7d664c9ec9a9efdcd851ed9f864cfa0d07dd68d3698243182f41d7df5f14711c14fb0e9390fb367ac3715f3b69dab09e4a6e0cb1c6a308470cdc9eba836726c3 SHA512 ccf53ac37ac5424c228ff430855fd5af65aa70df2ca3c21b04a64deec8a01a65be3d5b9367c512148e82f44eba327b31007b952d930820cb773219950d4398b0
 DIST heat.conf.sample-2020.1.9999 76935 BLAKE2B 7d664c9ec9a9efdcd851ed9f864cfa0d07dd68d3698243182f41d7df5f14711c14fb0e9390fb367ac3715f3b69dab09e4a6e0cb1c6a308470cdc9eba836726c3 SHA512 ccf53ac37ac5424c228ff430855fd5af65aa70df2ca3c21b04a64deec8a01a65be3d5b9367c512148e82f44eba327b31007b952d930820cb773219950d4398b0
 DIST openstack-heat-14.0.0.tar.gz 2393821 BLAKE2B 93d4728166496213447571afe9745d217431c1871ee415d413ff96e940c7fe0e9e7d97512cec8dc864564796ac15dd8c5f16e62ecabd6603939074ebba81612a SHA512 973818f33d24d057ce84c8826f50516566ae47386e9559ea2124d5c68f7cfbdf53390bcc7786e1cd29482c3f63ecfee2a10c01bb542fa59141f36cf52b0a5ec3
-EBUILD heat-14.0.0.ebuild 6498 BLAKE2B 5a97e04d2e831d121fd09d8e344fdd5e86e803506a22a7adbea723f6471de54a40197fab78749f1ae81ca6dbb24f07db5bfc580c90bb87243217606d4907a6d7 SHA512 9a11c0e3d0012d5b62ce3dd6c0c791902714bc18f256ced5ee8ba3be4f0c0b46b450f4cb857e0ef1a61800c00f31d3613dbfc4057e7993498aeeca5407648791
-EBUILD heat-2020.1.9999.ebuild 6500 BLAKE2B 68b28ca976bfed7f3b5e31a1b46c1a929aac88716a9c06fd6aaa4f6cf3d6668bdbbf4a2c286d96cf85f266fa633baf417a8b143d7d963c019b71750a1ec01fae SHA512 dcaa1c15c85ebd6988745d25de517f5cd955d5d617d01dbd8c6d1f070949be6fe43937900d05be98d9412cac4d1e2955910b53b253b62241e55185669a404b6c
+EBUILD heat-14.0.0.ebuild 6529 BLAKE2B d9c6b39c099e96a0a715356739880a48dc5be65a56a48a11a5e277e08dad8ffb17d095ce3d325c89d7cd1d4b7bd0333bc554dc7e1e373d11ae690850e6ec585f SHA512 6dd0af2530aa4699846ed8839e1ed58fbb1649c9c5ae58e82c3f3af5b81848db0d2f6b1541cfeec6fa82234540ff41794f763cdb7e83a876a9756f945a3a3fc7
+EBUILD heat-2020.1.9999.ebuild 6531 BLAKE2B ffaf6103096abc1556430a00ddb44766016b2bc4fb016816d66aebb81f21782d792939c0a9592ab704df10e8371986f256dd7f1f343789430362152c73c7907c SHA512 caf8b1e706e5d915c72bb15aa72292738b5a107dffe071fd2d71d8ba171a158a0da6e190512cb6275e12a611ff4b06a20369d9f60b2fbb477ee2fb32bfc74cac
 MISC metadata.xml 631 BLAKE2B 566d35b5533177a6d8b0ef428c9bd1a320aace6b43e186139c4b53cde224c1bf488340be8b6bcac14bf6c7a51212952dc13940d34edc38e24d7d2fbea5ce0c68 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429
diff --git a/sys-cluster/heat/heat-14.0.0.ebuild b/sys-cluster/heat/heat-14.0.0.ebuild
index d5378e3e674e..3503f3b00f49 100644
--- a/sys-cluster/heat/heat-14.0.0.ebuild
+++ b/sys-cluster/heat/heat-14.0.0.ebuild
@@ -18,6 +18,7 @@ else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> heat.conf.sample-${PV}
 		https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
 	KEYWORDS="amd64 ~arm64 x86"
+	S="${WORKDIR}/openstack-${P}"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/heat/heat-2020.1.9999.ebuild b/sys-cluster/heat/heat-2020.1.9999.ebuild
index c779dc23fa99..16a42a5729f3 100644
--- a/sys-cluster/heat/heat-2020.1.9999.ebuild
+++ b/sys-cluster/heat/heat-2020.1.9999.ebuild
@@ -18,6 +18,7 @@ else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> heat.conf.sample-${PV}
 		https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/openstack-${P}"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 8588e1de67f9..dc892f0c221a 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -3,6 +3,6 @@ AUX hpx-1.4.1-disable-failing-tests.patch 5828 BLAKE2B 2f550b50c8090b5ae88f665c0
 AUX hpx-1.4.1-placeholder.patch 3760 BLAKE2B da3f34201c7be713f559d1573037fad9b979fea74791dfc3ee14a41245420962bed2dc4dc1a1ee98e5c6e87a66ea89de6c3dac590d83d1cfab102ea0de3707e8 SHA512 7af105e8855cd6ff1160f2fb0400095a1674470b2cf5447cdf3391fcd478bd1c80f35451b30eedd97d46016db74a5dc789cae83b58244163ff2fe5951b693f15
 AUX hpx-1.4.1-python.patch 1095 BLAKE2B e0bf47364e01f96b065af8d3a1e0a23c536f66a56baa71903778528c801dd6ea6d7acf9a3f2acbb580f75d1493752b1c0c30c8ed3c9ee7f71da8c007c93739e3 SHA512 4eee43504e1e60b0ee61fc9d2ea2c61c3b1c7ef00dea38d3b913e7cd8ebbeb9561394ad4680a9b6e9e995a2d3b8478abea9d8221de055f3d810f24db39bf7760
 DIST hpx_1.4.1.tar.gz 4213023 BLAKE2B dc8a9cda3061359ea1bb8eba9ccee60dea308f5425cfe0f18d9003032726962d74d417b8748124c8e6a0b207624093ccf625c82e9e1a71fce8dde74d41d987d2 SHA512 f110d5e5c10ec396f6e762568c9ecd5b767cb6efe91168b5caa8fe1e07bb5870cd13b3392fa4e008a2cc0e044b02084a35b0866e943d9b9c7435599c131f1582
-EBUILD hpx-1.4.1.ebuild 2604 BLAKE2B 6a8fdb61793c2e50ec3891c03e1db3e7a27a8c2cf92a7849790c145b8b2666ae384c7d4e9024ee2d1bc98c4bc581a5dbd1e16412ce7f5770935d54d22c48dbac SHA512 6cc73c8841dec9f3663537c581fd6be8207834dc07a709664bd9ab04574502f76660b6ff42382da573058bca82261e9e41dd0a417975f686ae824abfc6e976de
-EBUILD hpx-9999.ebuild 2440 BLAKE2B 2ad7756b471e832b5b6a7890686ca6c2dfc942bf0ea3ae6e92607b5709dd301d8a5ce121c78155ab730147cf4f767d436f979c9d83934bc5e11ccf1154416710 SHA512 5d683f05438d5e2f08d6872e6955cf8806d72f2f3bdb234b693bec0505263f1330d3bb8f196b104e08342e36e22cf442b2e7b77047c0a5f1715e1e31269bcbcd
+EBUILD hpx-1.4.1.ebuild 2631 BLAKE2B 997699c6aa2fed7931c8d02017e30451b55e9e9bb111c60f254f6a7cb1964531b64f8281e955e93250b5451f905319b30fa510619cf42e9817f8f004f0b2e057 SHA512 7ef33709056d72e2cf2ae1cee64e85dba1726512eb10518c811a661a97ff76e5d321882f003b0cfa94f4260c3bafada799a7ff6ab53921e1c6b6f47187ece34a
+EBUILD hpx-9999.ebuild 2467 BLAKE2B f2a23526f597068da79cb5772cab64be8789b3c082357d911ec2961be41648a16cf7dc67b1e32f15c8dc5291734e0baa0b38959a0b739c2d250a8430f0ed0e17 SHA512 00d128ba1f4d1aef610c13fc4b69408db557092d467e4a31286a26f4c0970c29b1422491ed0a87f17f0446782e3adc43ddfeb7ffc15fbaecc0846e8908a48c70
 MISC metadata.xml 1189 BLAKE2B a6fedaeaa9c32038109691eb64fd62dd0cf0bc2104710fa49d57a95b09674a23d4e38d03fa2e306734b587a8682c1a7007ed078988226c39f17ccacece740a52 SHA512 eddd398a02bfa3716a373a6cb909a881efd72c11d7e4ce05a722da1fb5d5e464b59999d5bf0de2e608f768d6ceb50ccd64d43e77088c19fa1b28a19b404469da
diff --git a/sys-cluster/hpx/hpx-1.4.1.ebuild b/sys-cluster/hpx/hpx-1.4.1.ebuild
index 964325329bb6..7206bca40824 100644
--- a/sys-cluster/hpx/hpx-1.4.1.ebuild
+++ b/sys-cluster/hpx/hpx-1.4.1.ebuild
@@ -12,7 +12,7 @@ else
 	SRC_URI="https://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
-inherit cmake fortran-2 python-single-r1 check-reqs
+inherit cmake fortran-2 python-single-r1 check-reqs multiprocessing
 
 DESCRIPTION="C++ runtime system for parallel and distributed applications"
 HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
@@ -65,7 +65,7 @@ hpx_memory_requirement() {
 	if [[ -z ${MAKEOPTS} ]] ; then
 		echo "2G"
 	else
-		local jobs=`echo ${MAKEOPTS} | cut -d j -f 2`
+		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
 		echo "${jobs}G"
 	fi
 }
diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild
index 25019566f392..168825c65b05 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.ebuild
@@ -12,7 +12,7 @@ else
 	SRC_URI="https://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
-inherit cmake fortran-2 python-single-r1 check-reqs
+inherit cmake fortran-2 python-single-r1 check-reqs multiprocessing
 
 DESCRIPTION="C++ runtime system for parallel and distributed applications"
 HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
@@ -58,7 +58,7 @@ hpx_memory_requirement() {
 	if [[ -z ${MAKEOPTS} ]] ; then
 		echo "2G"
 	else
-		local jobs=`echo ${MAKEOPTS} | cut -d j -f 2`
+		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
 		echo "${jobs}G"
 	fi
 }
diff --git a/sys-cluster/k9scli/Manifest b/sys-cluster/k9scli/Manifest
index 88c078419643..1c0f30326d1e 100644
--- a/sys-cluster/k9scli/Manifest
+++ b/sys-cluster/k9scli/Manifest
@@ -115,15 +115,18 @@ DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.m
 DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod 37 BLAKE2B 109f32f2dc537cfeff1699937e93eed980f34a37faa111ad3831be6dbbb1df965c56ef266deba48aa1390fd94bdedfda9ba3a51f4f6d9519ae24db6b99dfe1d4 SHA512 6485196f4703578401e82673647b49d58fe60d7f90c311294096504d3e11477c75fa50684f00c7b378b2566e6e8683cf18d99f2ac78043b077318a643fb11720
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.zip 2350671 BLAKE2B a92ca77a13f725d8200c54b38feaa8bb930e3f1bacafe8ba58da87d8a10a2997b3128d169ebe815b44b3e49aff3c5da59aaa844d585974a78ae67c46e2ad868d SHA512 20785f6bc9c10177063825a51a4afec84bd069f1876f5caf633379f1c638467cc94f5a4841d245a95e403d075643b7d975cb487b9b3a8c4800c23c320b917770
 DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
 DIST github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 8c1815001cb2ba1108f60c9959fc87e81146ab7a716f48de7c679e793ccdec03d7324413333cf9dc6adae620298b5c637e0a126eeb6361c82ad16138749ea759 SHA512 5617723462dc0028176687327ac1144b1046a84c9bcf518e2c553a94c9549594c28345a5b875cfbefec148d625ff3525bfec17a97e4a84831dac4fd65d61f886
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip 109838 BLAKE2B 82e02c44f4fa60aa7257b79e385af47e23508e260415f0f768e4f7aac6a5962c713488458a50f1bc98308446ee3f45de973d5240811dc5a113e5b9577f33bab3 SHA512 7acd6ca00d067e6a81fbb12697ae9d46fa9880834934065549bb23671153012a8596d4c7875705578ca58a259ff81b1165e45aa65c93406d2c324c61954ea4df
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip 57782 BLAKE2B cdd50ecc0cbd0c7e58f3e6ff91cd26f7a212f4f62cb10358e1729b6b8be346390f1659ec7443a0c48f280c4a499f399b3ab3c03ba897ba8a7a61c336ff6f7c29 SHA512 e0ac39873cc584e40df505c3c01d20771d3a5e06f1c2c78a046971a220f029795b4cce7da71b497bfb618c0159897640c6606a4bd0d446826b142430f7f66204
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
@@ -146,6 +149,10 @@ DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.3.mod 725 BLAKE2B dddaa547394fba
 DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.3.zip 4478248 BLAKE2B 9a64789b53fbb6ff80a8ef6aa81e96f22ba3b610a9ef6707457cbd2a2102e5555c43389451cb4936562dd3637337f68bffb1d2d479a2f72a43c908f76e7a53e8 SHA512 da92a431b50e59ed5df4e6fd18476ca9f97702f18d73f1e93f6020786c0a4b0f078a803472ee37e12f4e3692979352368119f3c53ad1d25b37dd459560558f6e
 DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.4.mod 725 BLAKE2B 947b367f0783a5fd824474df83e235749c7c2cd1a3b24ac337b2fc4718f819d41f389db7a00d248c0dee2da19cfc6ef3c7223d94fe46a642db0f7910f7c88503 SHA512 a354139499286819e52ffda134d6cd21ceeca7841e02dca248e58f914033ef826aeec4985dbd8d7c3b879dc80f206e82a79c0d81d5d2db5da6ddcb619a63399b
 DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.4.zip 4479757 BLAKE2B a08236dfadcac32cabe45f2b2e206ab268e2ce0ab12118fbf2b43c8ffb7a35d874d76b4e7892d5d7595ea36040787aea763354919c4ce59bcce741a43263dcfa SHA512 0c91cfe16b6f14f10cd0b91307897f0124f85cb8b0e75e14ddd9dc6de00fd2ed52e73564c0d7361a2b818af05d8d40fff6be47ab1f53a6bb3ca6276a0ce557f6
+DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.5.mod 725 BLAKE2B 947b367f0783a5fd824474df83e235749c7c2cd1a3b24ac337b2fc4718f819d41f389db7a00d248c0dee2da19cfc6ef3c7223d94fe46a642db0f7910f7c88503 SHA512 a354139499286819e52ffda134d6cd21ceeca7841e02dca248e58f914033ef826aeec4985dbd8d7c3b879dc80f206e82a79c0d81d5d2db5da6ddcb619a63399b
+DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.5.zip 4481688 BLAKE2B ecc13ca8856a3b459cb28940b74a55ad5ba23b96ad4adabd1b042f9f07f62d41f85e39fc0d7c2db47d0c405d3f5e229a7012d0537ca747a8b635da33973dc0d0 SHA512 e9af598ff52940e2f20377032bfd9a0d843eb8a5699e5810d0d1830f1e8e3de14456d0e7de2f014012abf2a1f7e2dea792c573a7d02e5115cf219175d4580e87
+DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.6.mod 725 BLAKE2B 947b367f0783a5fd824474df83e235749c7c2cd1a3b24ac337b2fc4718f819d41f389db7a00d248c0dee2da19cfc6ef3c7223d94fe46a642db0f7910f7c88503 SHA512 a354139499286819e52ffda134d6cd21ceeca7841e02dca248e58f914033ef826aeec4985dbd8d7c3b879dc80f206e82a79c0d81d5d2db5da6ddcb619a63399b
+DIST github.com%2Fderailed%2Fpopeye%2F@v%2Fv0.8.6.zip 4481957 BLAKE2B 56e506edd8bf6ebdd21d64339c515f056514221d473fb4db8d33cc480044276553d8dcdca80d546f871f9abf5412694c2cda0a3b69f14356fafcff6cc3c96a09 SHA512 06f4b8b8adb380588d468c1877a590c2cb886535c8fa6088a121ffbde70ec97853e84b51cc3be903896bcf0919d77e6271f655c24b7e6301ab3539a8d562104a
 DIST github.com%2Fderailed%2Ftview%2F@v%2Fv0.3.10.mod 383 BLAKE2B 0975855b1416708452ca216ddd1fc3b8f6ce8ea664d19dceb53ad4ece0bf57206374e753755eecc88837e1caa7679001124074a7c23dcd1ed5ea3e1c4956b9d4 SHA512 c3d74d0613e418d91d582337f4a51bcf08501c6185065fd0b30d787e2a772aa3b0f4768aad0007d78c8d0177e9c3f17e9d64482e542f8b3479311c3ed9c9ffdc
 DIST github.com%2Fderailed%2Ftview%2F@v%2Fv0.3.10.zip 2948704 BLAKE2B bdaaf1c57f838467f51b40eb6082e8b4e33dbc8b0a25877684eb6c0d6e0e8fae4e215ed4ba2519092992967fb3a622c02c186bc5e94e75ea50d914f8134d2b7a SHA512 ae1b8844ef70bc156bbc905207a809b31c7798174832757f3096a5cff8f0e296c029593685cda515fa1ed2938685b1c02eb773561b2e4dcdfd62a95132b091b4
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
@@ -411,6 +418,8 @@ DIST github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip 114746 BLAKE2B 19f9157f1a163b5dfd9e
 DIST github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod 36 BLAKE2B 16dded88c0f04a1444be329ce01bc4e336b1205b962021589dd7f8d999285da6517a4a332f585e129250cbf7387157e713f0a6703dc0b316c4581e7782dc199f SHA512 7c71255a224e45b30037823ae51ac2805b91238b6e9e5cfe295d822428af95760718e2c955f15ad672011d317516657a568b412dc2e184f068d1bc18c2eaca47
 DIST github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip 14370 BLAKE2B f420806544c85e8956e5588873c10e604c75f6a830510a1e163fc278ce802de4b444a15b01522249749abd4ae77510cee97eb7f4e391e22c9f4469bc705a97e7 SHA512 b535bf7bba884b24e7a97c82b12a48954a4b5b7510c3383d37bdee5963457d3122ed648f91432f9259e6606927fc2e9fedd56902ec20223c8478c2a0650b3b8c
 DIST github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod 35 BLAKE2B 9177d5e73b349b57f364f3bd14e835a38cb33ae37d914454aafca908004c23c3902eebd21e9841f93b9728dc40d061a78aaca599e1edc1df0c941fdc1e972791 SHA512 f91dfedfb737f905f20c50323be91dc990ef172727da91efea0fbf25de48f1f4fa8e288032ecd89af0fea177b905be7986ebd1cdc7e64853fe7fbcef8fee436f
+DIST github.com%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20200102142835-e9ef32dff381.mod 37 BLAKE2B 400e3fd523a0995770046676b3a848d776c64948653c3730929e39e0c0a9fb2ffdddd8405359f676375bc506efb05bbb9423af6b6674d16baa16d53f264d64e8 SHA512 37c8088012b54286571d11de7e6b59d68a0c5b79542c35c31c30187ac3586f57466354498960aeb500226d740eaf62601ed6e569ee82039efc546a3bbcc7ec73
+DIST github.com%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20200102142835-e9ef32dff381.zip 145657 BLAKE2B 3793be0d53804898271e9cfb16878ca730c02fed4e3922b64b3898dd7402d44924f5581621b863246dc3a682ab46bbf25b1cfdb27b0d0fb7b07a5e1e318373e1 SHA512 43ef93cfa5b818f57cc4b183c186b748a6d162f36dd5bfa0ff2e9657c8af9dbce276b043ea695d6d4484ef51cda05fb9e44c389979131c2d6d8931898520541e
 DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod 98 BLAKE2B 074cd6d5ef6f25ec043afc4f23272f5fad1d7bf100e75122f85c49ee93fc3c6205c72a1e5b4227ca45f3267be1b2001e743b51e54ca5f11302c2610e93630858 SHA512 f7ddb2f6ef35b65ae4a9106e31cbbbd08a7d011d3d9d5827445bf35ec0243041c3e4881a850161134d62ff822610d3aeeab2941472dc7ff0d664edabf2ec4eb9
 DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip 442733 BLAKE2B 17af8168c2253f09f1ff15c5d78359bd8449c84027b10594eb5878fbba0ed2ecb250b34809693ab75869ab02d7677f874029e85ed352295896f9658293ecf4ea SHA512 b1515c6fce781a653025c41ef164ca2a625879b2f7ba1349c470cb9afab9b92b173a89513bf601ef7dcf53e0665010a12d44311f75c9282c244d58a154af781b
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
@@ -909,6 +918,7 @@ DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod 164 BLAKE2B cd
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip 147166 BLAKE2B a9d5897231997c8184aba7c58d6b31fa8413d7c94e48f52fb59f171f537d0e9a047055a5e717e411c7f0dbc63bf1794c2a425c278724eeb73de59e7bbd8d2ee0 SHA512 49641d1a253a5469d9dec1e104b5ecbd7033e28f8ab08c351edea432687fb1bf902d9fbf3ea2ef217b82ab06ca3f2453a1dccf03468d38281c847e19477641df
 DIST k9scli-0.20.5.tar.gz 6075161 BLAKE2B 4de3f1f354e56b6d7d8fd2f9cf30ffa1b45e780e3db63e3b18833a5f25448c6a726962388b3569b877389f30367e94534bcf025791e2382838e531667bcaa08f SHA512 5d03f07140c6f0ee41c5cee548539cb97a2a005271217d82b582255852f17821ba8c40ee415151a11636ae637d910416112dfed75a46da83ad3206106fb52f4e
+DIST k9scli-0.21.2.tar.gz 6080523 BLAKE2B d739c87054e6e15c7e1d0787e6fc507c19a74e1f416f96c673e126552f71b8b5b85fbbcfb452329a8391aaf31bc9e727699c82264927aebe8284d5dd2f783af4 SHA512 36f424c8290d1a033be7d39ee953d054ab99b171de4bf6aeeef304ad5aec4c58583ea9e85efde43395b114ac9859544c2cbfe86622eeda365db2b13a9bdd4b4e
 DIST modernc.org%2Fcc%2F@v%2Fv1.0.0.mod 22 BLAKE2B 26488aa7e4d0339d58279e663998091c24b5a6d4d026ea71166c06695034ffb5011d20f49c151c6a41481c6cb5648806ae5201bffcf4e2e49b6e7ec9375d9469 SHA512 22847329a9a431f222a2bde9c743aa5d76e737e2535b53273c31cb641c89fa4b73e51de12f84fb6da532b060a1daa084c5150502e3ab4e311eaff351f10617fa
 DIST modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod 25 BLAKE2B 5ae90f4bebc5486b84fbad78cbb9e747a2b1710805a35eefb93fb5f860c7850242067bf79c38a7a076f9f5823995cb4a2fa0120491258cfee9e87fd5996cbbf2 SHA512 764e7459060a8e7e90c8b8714926cb8b1eeb130789d1d89eb52e4dec5be83298bfe03647720c0e84d5aa9cf293a38f041e1696ccfe60a87cd1ef7316190b41ac
 DIST modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod 28 BLAKE2B d93ac859fd33dd8b36dcb992876edf1470206d4a455f6dbfc3a8be76aa84cd3b1a16a12e23d857b090ee5b18ba51441c90bc5d6a4bb35430193d7f99d61a3725 SHA512 53b0f0324ef1cc51f322d535b2199362be3962aa8e2d1c32b0c58da2fd4f65f8f19450089d78fc58aa89ff5903500ae2cb60ba38d89373c9f58f075db0ba80fa
@@ -930,4 +940,5 @@ DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod 20 BLAKE2B 981
 DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20180919145318-efcd4e0f9787.mod 20 BLAKE2B 9817a2968dcdd45e9e5d40b93cb54e6002d0aa6613f241bd77d448b3173b639f58a88d25899734be39a822473b4aac69ad947878006d5bb266a13f24637b0082 SHA512 b052661c1a3c2599fa350578cde2899166b39b71c65a6414ca7ea33e8d5186e85895ebd948819313781041d06fac3292cb08ad12447060df3860a86402344c24
 DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20180919145318-efcd4e0f9787.zip 27414 BLAKE2B 08374a4660b0e6df098a45358a92ce99c9bd1c4536db1f9a608aac56fdda8f14fe84ffcd8e74a920750a073482e119fc65812e328558fff113f3ff03707cd602 SHA512 35bb1f5b2fbd6cc0563dde73e0841c29802e63b873c64f89461d39dd2b6725bda2eafd7249784a2a7358f11cb3498f64e30bc5d64749c2a205ab3924dd77d5cb
 EBUILD k9scli-0.20.5.ebuild 50088 BLAKE2B 88ab0f13f47a3a9115655e0144109694ec8d2107f1904b55160d23cbeefe9c7aae6d142672871e0d2adc366ba9dee734295718fa6ed301cbb7143790e9899e72 SHA512 a0b87d079c582a342e9cf27697c3e4ee1a1a7a7b9c0a70a8b4d79f1c51e74288a10843ebebd2a2b5a7c4ac80bfb6ee48b16c4305a864108a41f66e1d1517f940
+EBUILD k9scli-0.21.2.ebuild 50567 BLAKE2B 98c612f12e26587dd7881a58f9cc9cc905289948b99aac05b35206677da767b9b1c997e4b45399e60f19b72056f794a4d74ea70a86391ea94f61d1ebf6181645 SHA512 695815277f7b21e4d1d7d195132ee9282b4a78d21b826894227c84acf01c5f641b7d30cfd6107b6acc88b29c0f2ddbcf0a5d62fb372f126f0474383de2695d34
 MISC metadata.xml 257 BLAKE2B 8a445824133c1734e7b46cdd3a60bb4ac98fb4159b48856d0e296c796c700a2d9ec9ae3c94072f07aaaed98ac22088892b03c358e577df9cfbafa40194e756ee SHA512 9d6339780243409ea9233a9f5faa5c1f5b13431d35792fc6986ed5c3e9ae2e21139f44c11140519ea6cf10ab6db1d06408c1305af9e99cbbd1f2d4b27361a13c
diff --git a/sys-cluster/k9scli/k9scli-0.21.2.ebuild b/sys-cluster/k9scli/k9scli-0.21.2.ebuild
new file mode 100644
index 000000000000..ff8f54d7cf47
--- /dev/null
+++ b/sys-cluster/k9scli/k9scli-0.21.2.ebuild
@@ -0,0 +1,975 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+GIT_COMMIT=9777916
+
+DESCRIPTION="terminal based UI to manage kubernetes clusters"
+HOMEPAGE="https://k9scli.io"
+
+EGO_SUM=(
+	"9fans.net/go v0.0.2"
+	"9fans.net/go v0.0.2/go.mod"
+	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest v10.8.1+incompatible"
+	"github.com/Azure/go-autorest v10.8.1+incompatible/go.mod"
+	"github.com/Azure/go-autorest v14.0.0+incompatible"
+	"github.com/Azure/go-autorest v14.0.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.10.0"
+	"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.3.3"
+	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod"
+	"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
+	"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver/v3 v3.0.3"
+	"github.com/Masterminds/semver/v3 v3.0.3/go.mod"
+	"github.com/Masterminds/semver/v3 v3.1.0"
+	"github.com/Masterminds/semver/v3 v3.1.0/go.mod"
+	"github.com/Masterminds/sprig/v3 v3.0.2"
+	"github.com/Masterminds/sprig/v3 v3.0.2/go.mod"
+	"github.com/Masterminds/sprig/v3 v3.1.0"
+	"github.com/Masterminds/sprig/v3 v3.1.0/go.mod"
+	"github.com/Masterminds/squirrel v1.2.0"
+	"github.com/Masterminds/squirrel v1.2.0/go.mod"
+	"github.com/Masterminds/vcs v1.13.1/go.mod"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+	"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
+	"github.com/agnivade/levenshtein v1.0.1/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496"
+	"github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod"
+	"github.com/atotto/clipboard v0.1.2"
+	"github.com/atotto/clipboard v0.1.2/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.11/go.mod"
+	"github.com/aws/aws-sdk-go v1.29.32"
+	"github.com/aws/aws-sdk-go v1.29.32/go.mod"
+	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bitly/go-simplejson v0.5.0/go.mod"
+	"github.com/blang/semver v3.1.0+incompatible/go.mod"
+	"github.com/blang/semver v3.5.0+incompatible/go.mod"
+	"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
+	"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
+	"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
+	"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+	"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
+	"github.com/containerd/containerd v1.3.2"
+	"github.com/containerd/containerd v1.3.2/go.mod"
+	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod"
+	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.7/go.mod"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
+	"github.com/deislabs/oras v0.8.1"
+	"github.com/deislabs/oras v0.8.1/go.mod"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod"
+	"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
+	"github.com/derailed/popeye v0.8.1"
+	"github.com/derailed/popeye v0.8.1/go.mod"
+	"github.com/derailed/popeye v0.8.2"
+	"github.com/derailed/popeye v0.8.2/go.mod"
+	"github.com/derailed/popeye v0.8.3"
+	"github.com/derailed/popeye v0.8.3/go.mod"
+	"github.com/derailed/popeye v0.8.4"
+	"github.com/derailed/popeye v0.8.4/go.mod"
+	"github.com/derailed/popeye v0.8.5"
+	"github.com/derailed/popeye v0.8.5/go.mod"
+	"github.com/derailed/popeye v0.8.6"
+	"github.com/derailed/popeye v0.8.6/go.mod"
+	"github.com/derailed/tview v0.3.10"
+	"github.com/derailed/tview v0.3.10/go.mod"
+	"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492"
+	"github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod"
+	"github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod"
+	"github.com/docker/distribution v2.7.1+incompatible"
+	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+	"github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod"
+	"github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce"
+	"github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce/go.mod"
+	"github.com/docker/docker-credential-helpers v0.6.3"
+	"github.com/docker/docker-credential-helpers v0.6.3/go.mod"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
+	"github.com/docker/go-units v0.3.3/go.mod"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/drone/envsubst v1.0.2"
+	"github.com/drone/envsubst v1.0.2/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/emicklei/go-restful v2.9.5+incompatible"
+	"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/evanphx/json-patch v4.5.0+incompatible"
+	"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
+	"github.com/fatih/camelcase v1.0.0"
+	"github.com/fatih/camelcase v1.0.0/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
+	"github.com/gdamore/encoding v1.0.0"
+	"github.com/gdamore/encoding v1.0.0/go.mod"
+	"github.com/gdamore/tcell v1.1.2/go.mod"
+	"github.com/gdamore/tcell v1.3.0"
+	"github.com/gdamore/tcell v1.3.0/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
+	"github.com/go-ini/ini v1.25.4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
+	"github.com/go-openapi/analysis v0.17.0/go.mod"
+	"github.com/go-openapi/analysis v0.18.0/go.mod"
+	"github.com/go-openapi/analysis v0.19.2/go.mod"
+	"github.com/go-openapi/analysis v0.19.5/go.mod"
+	"github.com/go-openapi/errors v0.17.0/go.mod"
+	"github.com/go-openapi/errors v0.18.0/go.mod"
+	"github.com/go-openapi/errors v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.3"
+	"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/jsonreference v0.17.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.18.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.3"
+	"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+	"github.com/go-openapi/loads v0.17.0/go.mod"
+	"github.com/go-openapi/loads v0.18.0/go.mod"
+	"github.com/go-openapi/loads v0.19.0/go.mod"
+	"github.com/go-openapi/loads v0.19.2/go.mod"
+	"github.com/go-openapi/loads v0.19.4/go.mod"
+	"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
+	"github.com/go-openapi/runtime v0.19.0/go.mod"
+	"github.com/go-openapi/runtime v0.19.4/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/spec v0.17.0/go.mod"
+	"github.com/go-openapi/spec v0.18.0/go.mod"
+	"github.com/go-openapi/spec v0.19.2/go.mod"
+	"github.com/go-openapi/spec v0.19.3"
+	"github.com/go-openapi/spec v0.19.3/go.mod"
+	"github.com/go-openapi/strfmt v0.17.0/go.mod"
+	"github.com/go-openapi/strfmt v0.18.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.3/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-openapi/swag v0.17.0/go.mod"
+	"github.com/go-openapi/swag v0.18.0/go.mod"
+	"github.com/go-openapi/swag v0.19.2/go.mod"
+	"github.com/go-openapi/swag v0.19.5"
+	"github.com/go-openapi/swag v0.19.5/go.mod"
+	"github.com/go-openapi/validate v0.18.0/go.mod"
+	"github.com/go-openapi/validate v0.19.2/go.mod"
+	"github.com/go-openapi/validate v0.19.5/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobuffalo/envy v1.7.0/go.mod"
+	"github.com/gobuffalo/envy v1.7.1/go.mod"
+	"github.com/gobuffalo/logger v1.0.1/go.mod"
+	"github.com/gobuffalo/packd v0.3.0/go.mod"
+	"github.com/gobuffalo/packr/v2 v2.7.1/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+	"github.com/gofrs/flock v0.7.1/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod"
+	"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod"
+	"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/googleapis/gnostic v0.1.0"
+	"github.com/googleapis/gnostic v0.1.0/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod"
+	"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
+	"github.com/gorilla/mux v1.6.2/go.mod"
+	"github.com/gorilla/mux v1.7.2"
+	"github.com/gorilla/mux v1.7.2/go.mod"
+	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gosuri/uitable v0.0.4"
+	"github.com/gosuri/uitable v0.0.4/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/huandu/xstrings v1.2.0"
+	"github.com/huandu/xstrings v1.2.0/go.mod"
+	"github.com/huandu/xstrings v1.3.1"
+	"github.com/huandu/xstrings v1.3.1/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.7"
+	"github.com/imdario/mergo v0.3.7/go.mod"
+	"github.com/imdario/mergo v0.3.8"
+	"github.com/imdario/mergo v0.3.8/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmoiron/sqlx v1.2.0"
+	"github.com/jmoiron/sqlx v1.2.0/go.mod"
+	"github.com/joho/godotenv v1.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.8/go.mod"
+	"github.com/json-iterator/go v1.1.9"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.5/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lann/builder v0.0.0-20180802200727-47ae307949d0"
+	"github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod"
+	"github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0"
+	"github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/lib/pq v1.2.0/go.mod"
+	"github.com/lib/pq v1.3.0"
+	"github.com/lib/pq v1.3.0/go.mod"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
+	"github.com/lithammer/dedent v1.1.0/go.mod"
+	"github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381"
+	"github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.2"
+	"github.com/lucasb-eyer/go-colorful v1.0.2/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/magiconair/properties v1.8.1"
+	"github.com/magiconair/properties v1.8.1/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+	"github.com/mailru/easyjson v0.7.0"
+	"github.com/mailru/easyjson v0.7.0/go.mod"
+	"github.com/marstr/guid v1.1.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-runewidth v0.0.5/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mattn/go-shellwords v1.0.9/go.mod"
+	"github.com/mattn/go-shellwords v1.0.10/go.mod"
+	"github.com/mattn/go-sqlite3 v1.9.0/go.mod"
+	"github.com/mattn/go-sqlite3 v1.12.0/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/morikuni/aec v1.0.0"
+	"github.com/morikuni/aec v1.0.0/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/ncw/swift v1.0.47/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.2/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.11.0"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.7.0"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/image-spec v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+	"github.com/opencontainers/runc v0.1.1"
+	"github.com/opencontainers/runc v0.1.1/go.mod"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+	"github.com/openfaas/faas v0.0.0-20200207215241-6afae214e3ec"
+	"github.com/openfaas/faas v0.0.0-20200207215241-6afae214e3ec/go.mod"
+	"github.com/openfaas/faas-cli v0.0.0-20200124160744-30b7cec9634c"
+	"github.com/openfaas/faas-cli v0.0.0-20200124160744-30b7cec9634c/go.mod"
+	"github.com/openfaas/faas-provider v0.15.0"
+	"github.com/openfaas/faas-provider v0.15.0/go.mod"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/petergtz/pegomock v2.7.0+incompatible"
+	"github.com/petergtz/pegomock v2.7.0+incompatible/go.mod"
+	"github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
+	"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.5.1"
+	"github.com/prometheus/client_golang v1.5.1/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.9.1"
+	"github.com/prometheus/common v0.9.1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/prometheus/procfs v0.0.8"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rakyll/hey v0.1.3"
+	"github.com/rakyll/hey v0.1.3/go.mod"
+	"github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod"
+	"github.com/rivo/tview v0.0.0-20191018115645-bacbf5155bc1/go.mod"
+	"github.com/rivo/uniseg v0.0.0-20190513083848-b9f5b9457d44/go.mod"
+	"github.com/rivo/uniseg v0.1.0"
+	"github.com/rivo/uniseg v0.1.0/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.2/go.mod"
+	"github.com/rogpeppe/go-internal v1.4.0/go.mod"
+	"github.com/rs/xid v1.2.1/go.mod"
+	"github.com/rs/zerolog v1.18.0"
+	"github.com/rs/zerolog v1.18.0/go.mod"
+	"github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3"
+	"github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/go-glob v1.0.0"
+	"github.com/ryanuber/go-glob v1.0.0/go.mod"
+	"github.com/sahilm/fuzzy v0.1.0"
+	"github.com/sahilm/fuzzy v0.1.0/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cast v1.3.1"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/cobra v0.0.6"
+	"github.com/spf13/cobra v0.0.6/go.mod"
+	"github.com/spf13/cobra v1.0.0"
+	"github.com/spf13/cobra v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+	"github.com/tidwall/pretty v1.0.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/vektah/gqlparser v1.1.2/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+	"github.com/xeipuuv/gojsonschema v1.1.0"
+	"github.com/xeipuuv/gojsonschema v1.1.0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1"
+	"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
+	"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
+	"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
+	"github.com/zenazn/goji v0.9.0/go.mod"
+	"github.com/ziutek/mymysql v1.5.4/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+	"go.mongodb.org/mongo-driver v1.0.3/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.1/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/goleak v0.10.0"
+	"go.uber.org/goleak v0.10.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod"
+	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod"
+	"golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod"
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
+	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904"
+	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
+	"golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod"
+	"golang.org/x/net v0.0.0-20181017193950-04a2e542c03f/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200519113804-d87ec0cfa476"
+	"golang.org/x/net v0.0.0-20200519113804-d87ec0cfa476/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
+	"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299"
+	"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
+	"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
+	"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
+	"golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod"
+	"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod"
+	"golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod"
+	"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
+	"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod"
+	"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.29.1"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/gorp.v1 v1.7.2"
+	"gopkg.in/gorp.v1 v1.7.2/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.5/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gotest.tools v2.2.0+incompatible"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"helm.sh/helm/v3 v3.1.2"
+	"helm.sh/helm/v3 v3.1.2/go.mod"
+	"helm.sh/helm/v3 v3.2.0-rc.1"
+	"helm.sh/helm/v3 v3.2.0-rc.1/go.mod"
+	"helm.sh/helm/v3 v3.2.0"
+	"helm.sh/helm/v3 v3.2.0/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"k8s.io/api v0.17.2/go.mod"
+	"k8s.io/api v0.18.0"
+	"k8s.io/api v0.18.0/go.mod"
+	"k8s.io/api v0.18.2"
+	"k8s.io/api v0.18.2/go.mod"
+	"k8s.io/apiextensions-apiserver v0.17.2"
+	"k8s.io/apiextensions-apiserver v0.17.2/go.mod"
+	"k8s.io/apiextensions-apiserver v0.18.0"
+	"k8s.io/apiextensions-apiserver v0.18.0/go.mod"
+	"k8s.io/apimachinery v0.17.2/go.mod"
+	"k8s.io/apimachinery v0.18.0"
+	"k8s.io/apimachinery v0.18.0/go.mod"
+	"k8s.io/apimachinery v0.18.2"
+	"k8s.io/apimachinery v0.18.2/go.mod"
+	"k8s.io/apiserver v0.17.2/go.mod"
+	"k8s.io/apiserver v0.18.0/go.mod"
+	"k8s.io/cli-runtime v0.17.2/go.mod"
+	"k8s.io/cli-runtime v0.18.0"
+	"k8s.io/cli-runtime v0.18.0/go.mod"
+	"k8s.io/cli-runtime v0.18.2"
+	"k8s.io/cli-runtime v0.18.2/go.mod"
+	"k8s.io/client-go v0.17.2/go.mod"
+	"k8s.io/client-go v0.18.0"
+	"k8s.io/client-go v0.18.0/go.mod"
+	"k8s.io/client-go v0.18.2"
+	"k8s.io/client-go v0.18.2/go.mod"
+	"k8s.io/code-generator v0.17.2/go.mod"
+	"k8s.io/code-generator v0.18.0/go.mod"
+	"k8s.io/code-generator v0.18.2/go.mod"
+	"k8s.io/component-base v0.17.2/go.mod"
+	"k8s.io/component-base v0.18.0"
+	"k8s.io/component-base v0.18.0/go.mod"
+	"k8s.io/component-base v0.18.2"
+	"k8s.io/component-base v0.18.2/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod"
+	"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.0/go.mod"
+	"k8s.io/klog v1.0.0"
+	"k8s.io/klog v1.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c"
+	"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod"
+	"k8s.io/kubectl v0.17.2/go.mod"
+	"k8s.io/kubectl v0.18.0"
+	"k8s.io/kubectl v0.18.0/go.mod"
+	"k8s.io/kubectl v0.18.2"
+	"k8s.io/kubectl v0.18.2/go.mod"
+	"k8s.io/kubernetes v1.13.0/go.mod"
+	"k8s.io/metrics v0.17.2/go.mod"
+	"k8s.io/metrics v0.18.0"
+	"k8s.io/metrics v0.18.0/go.mod"
+	"k8s.io/metrics v0.18.2"
+	"k8s.io/metrics v0.18.2/go.mod"
+	"k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
+	"modernc.org/cc v1.0.0/go.mod"
+	"modernc.org/golex v1.0.0/go.mod"
+	"modernc.org/mathutil v1.0.0/go.mod"
+	"modernc.org/strutil v1.0.0/go.mod"
+	"modernc.org/xc v1.0.0/go.mod"
+	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod"
+	"sigs.k8s.io/kustomize v2.0.3+incompatible"
+	"sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06"
+	"sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.2.0"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
+	"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod"
+	"vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787"
+	"vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/derailed/k9s/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/k9s-${PV}"
+
+src_prepare() {
+	default
+	# I will look into opening an upstream PR to do this.
+	sed -i -e 's/-w -s -X/-X/' Makefile || die
+}
+
+src_compile() {
+	emake GIT=${GIT_COMMIT} VERSION=v${pv} build
+}
+
+src_install() {
+	dobin execs/k9s
+	dodoc -r change_logs plugins skins README.md
+}
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 033971953a5a..d3bdf28f71a4 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -2,12 +2,8 @@ AUX keepalived.confd-r1 63 BLAKE2B 8925b12c9936aaccf828132720a0cb74fddc4a4c8642a
 AUX keepalived.init-r1 539 BLAKE2B 90675bc2863c7a2b704c14807ca39c7cd35e2f9281384700a7bc4e1a381f106a4734f19e3f740ad00a83c065f45ac620d8224fd125f76ed0a96ec285d3abf393 SHA512 5a5057f50c29c6e2c9f2451acf1e2aa2cdd9218a5882d3eea1a148a4ae8b259b5937387b95feab919b242a65d706e48c5afa3ed280215092295b8e8d44d1f543
 AUX keepalived.service 293 BLAKE2B e80be18a91569d73e64d12ff74622c866efc03522640f33e1cb89e4d232f39bb65b3d2aa7c093e93a5fbe41937a5ab4fe3a77d6864f335e04dea6bf898d4ba84 SHA512 c9d9c190a7892b3c9535ab51da45893bf6ff6738e64f832f52e22f435e4ef4e014f74dcb63f51b76a624ba39dc4dbd3542ada1971d361fd3da966bb649355ec7
 AUX keepalived.service.conf 47 BLAKE2B b6e32bf8c8a602186af776d85c6c457aad2408becfd24af4db6db6123946fba2443f51fae3df0d220a4ebf9ae81a02f4bc1ee0d1d1a7a4b050802336c029c87e SHA512 ecf081bd59c57d6be3627ab42183bdebe58f65355c9cfa3e753a9b1fbf64e7731a7b26ec3ef2bf0422c1a6de4eb1d8d84787ca4d3def2d1f12caed9b64b5063a
-DIST keepalived-2.0.17.tar.gz 1003077 BLAKE2B 68ce64145f917267f6f156fc7b4ffb05ce0bd24b64ddfb3cb2ae8b54850586cffa04c0b617a0f1c6cffd659bba208c145051e436e002ee048908c44fa1c433ff SHA512 6bbcd76604785ef11af4df0a72015ff75a3f47fd04dbe15913f1a30bc80371a188f54020dca881a2b6a562e6ea0b1c5c9c4561c46aa4bdbb8c9f3c54b411d1df
-DIST keepalived-2.0.19.tar.gz 1025062 BLAKE2B 3a4164ea7468d5709dfc68da9008d83a15273b6a12679e67348b49fc9fba8938d2552f1cb905d0b6af497a5f4f6b3281b3478a4da8707ed35cd30a8601ed1e40 SHA512 68a510983bc043484e5edbc1d87563677a048282ec52873105f0af922e8b4de5b8e7176944010f9d4d6f65d1a4ebaf930c3d37273e28c1f115ed0fda245d8109
 DIST keepalived-2.0.20.tar.gz 1036063 BLAKE2B 217dee8c6dcb148119822f3c6a0b57482e91a17671a35333d0dccf04a3f7c6606a1c9e0b3f2a3adeab838fd91b7c714a0bf11895fe0c7d90d836d3585620c8e2 SHA512 36bbc4aa0a1045486e608c9f4ed73f4335b871dae88beaed10d86445474c462136885225cd6b61219a36fca2ff43771623bc6d072e406cf684acc2ca8f2a38f6
-DIST keepalived-2.1.3.tar.gz 1077888 BLAKE2B b9469cdabe2d7532d3b3489ae27ee273a0ae92fa4487f00ac845a8b78a79b09a6556630bd2c840b5b47c99b5dec3bf9432d41a30200d4d5f84a7e7eb483cb0f2 SHA512 f1353a2dbd62fcec9c799016aff7849fb1481005b9b26f9f392752539f3ab71e617d758000e2328d40179f947e29aeeab5581bbf143fdd39d125a8bcef0ac71d
-EBUILD keepalived-2.0.17.ebuild 2250 BLAKE2B b5b1a2593bf5e5637ac013c2f2dc8d220e1b9137fb02e342107cba898fc6d3888a567e5fa4b79240082bccd2e17b6bce7e564a1e1c9044e89001097830d5fe86 SHA512 cdfc2b4835e958ec1e1ad8e287ef47cc096b239b0f74849a491e7115fd15a3a1aba005c2ef6094d240884ef20e56656281f88d611bafed6b2200e208f6d4584a
-EBUILD keepalived-2.0.19.ebuild 2005 BLAKE2B 506a63c5683120982778e6696f476af785538cdcc81cbe1846918e652e2a53ce61cfd4cb782473134e6ca62b4788beae65d31b391a2c3681e2d119f4dc7bba3c SHA512 7e9bf4df9bb9a0123360f9e31f536c9ad83785c0737b1e22c64a0b2f801da099babf1272365ff7c8f959f465075b0c84223c2cfd9c0e6ccdf5d15ab5c6c34311
+DIST keepalived-2.1.5.tar.gz 1081559 BLAKE2B 791de7f24d012d77fbf9573713ab158cd91c08b969982b5d6bb86e5e6ed347281378dd5106a05db2f37fd9ab2eb479c131333b4b8c6983671b18652122fdbe37 SHA512 107d071aa1546023a3eb7c2cba4707ab6fbb10af62984ab41c9358b5e28289f8f277456983fe8649a15a77939734d3af573b8b050500d9eb521b4b0537f97aa6
 EBUILD keepalived-2.0.20.ebuild 2001 BLAKE2B 2207a4c15a10335c03f8277eafe2f29cdd6c593c7ec918c15824e526d7d509afa4dfb3cca36e600e727a956a088df4310f86111db96451fc64a883595ced705c SHA512 7c61d2129c2a64b7ac27daeb0264df6837780dec2bc81a79cb7951d99ffa450b279141802b3e693b80ea066a8a377a2f67561516ff34e40efefae51f68bfdc37
-EBUILD keepalived-2.1.3.ebuild 2005 BLAKE2B 9e8a0a9237d32facfbe26d8303e393c8e61abd521dd332346e5916b9fed328244905019eb9cdccfd8e04a079951c393bcad0d22008d89ae83e9d788b70745e2d SHA512 5d6fe1ff61c8b260df8e703ab075a33807f0d0bc6124cd75f7b9b54196e58177c5a1567cc10514cc924f4a80e54dc3fd5062a2405d65de06d08df18469e8864b
+EBUILD keepalived-2.1.5.ebuild 2005 BLAKE2B 9e8a0a9237d32facfbe26d8303e393c8e61abd521dd332346e5916b9fed328244905019eb9cdccfd8e04a079951c393bcad0d22008d89ae83e9d788b70745e2d SHA512 5d6fe1ff61c8b260df8e703ab075a33807f0d0bc6124cd75f7b9b54196e58177c5a1567cc10514cc924f4a80e54dc3fd5062a2405d65de06d08df18469e8864b
 MISC metadata.xml 640 BLAKE2B 5644b98bf487637c431299fe61e1185731d9fc22e9a19b9a3218855318a9c40500339c628671eb958c2bcee99d867a8e9c93903fdcdad25ad566659422dd2119 SHA512 6fd4981067e0a2e74511db7be79d656c62b39c1f43f860e0d981b6c9770cb2da6b4fd3e40af1ed23adc8bbbd01202e6c45e58b6f86480a807d193aae1a3f7ad3
diff --git a/sys-cluster/keepalived/keepalived-2.0.17.ebuild b/sys-cluster/keepalived/keepalived-2.0.17.ebuild
deleted file mode 100644
index 26a3a1aab2d5..000000000000
--- a/sys-cluster/keepalived/keepalived-2.0.17.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
-HOMEPAGE="https://www.keepalived.org/"
-SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-IUSE="+bfd dbus debug -json regex snmp"
-
-RDEPEND="dev-libs/libnl:=
-	dev-libs/openssl:=
-	dev-libs/popt
-	net-libs/libnfnetlink
-	sys-apps/iproute2
-	regex? ( >=dev-libs/libpcre2-8 )
-	dbus? ( sys-apps/dbus dev-libs/glib:2 )
-	json? ( dev-libs/json-c:= )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.4"
-
-DOCS=(
-	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
-	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# keepalived has support to dynamically use some libraries instead of
-	# linking them:
-	#--enable-dynamic-linking \
-	#--enable-libiptc-dynamic \
-	#--enable-libnl-dynamic \
-	#--enable-libxtables-dynamic \
-	STRIP=/bin/true \
-	econf \
-		--with-init=custom \
-		--with-kernel-dir=/usr \
-		--enable-sha1 \
-		--enable-vrrp \
-		$(use_enable bfd) \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus-create-instance) \
-		$(use_enable debug) \
-		$(use_enable json) \
-		$(use_enable regex) \
-		$(use_enable regex regex-timers ) \
-		$(use_enable snmp) \
-		$(use_enable snmp snmp-checker) \
-		$(use_enable snmp snmp-rfc) \
-		$(use_enable snmp snmp-rfcv2) \
-		$(use_enable snmp snmp-rfcv3) \
-		$(use_enable snmp snmp-vrrp)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
-	newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
-
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-
-	use snmp && dodoc doc/*MIB.txt
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
-	# Clean up sysvinit files
-	rm -rv "${ED}"/etc/sysconfig || die
-}
diff --git a/sys-cluster/keepalived/keepalived-2.0.19.ebuild b/sys-cluster/keepalived/keepalived-2.0.19.ebuild
deleted file mode 100644
index 1d751727227d..000000000000
--- a/sys-cluster/keepalived/keepalived-2.0.19.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
-HOMEPAGE="https://www.keepalived.org/"
-SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+bfd dbus -json regex snmp"
-
-RDEPEND="dev-libs/libnl:=
-	dev-libs/openssl:=
-	dev-libs/popt
-	net-libs/libnfnetlink
-	sys-apps/iproute2
-	regex? ( >=dev-libs/libpcre2-8 )
-	dbus? ( sys-apps/dbus dev-libs/glib:2 )
-	json? ( dev-libs/json-c:= )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.4"
-
-DOCS=(
-	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
-	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# keepalived has support to dynamically use some libraries instead of
-	# linking them:
-	#--enable-dynamic-linking \
-	#--enable-libiptc-dynamic \
-	#--enable-libnl-dynamic \
-	#--enable-libxtables-dynamic \
-	STRIP=/bin/true \
-	econf \
-		--with-init=custom \
-		--with-kernel-dir=/usr \
-		--enable-sha1 \
-		--enable-vrrp \
-		$(use_enable bfd) \
-		$(use_enable dbus) \
-		$(use_enable json) \
-		$(use_enable regex) \
-		$(use_enable snmp) \
-		$(use_enable snmp snmp-rfc)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
-	newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
-
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-
-	use snmp && dodoc doc/*MIB.txt
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
-	# Clean up sysvinit files
-	rm -rv "${ED}"/etc/sysconfig || die
-}
diff --git a/sys-cluster/keepalived/keepalived-2.1.3.ebuild b/sys-cluster/keepalived/keepalived-2.1.5.ebuild
index 12763f521185..12763f521185 100644
--- a/sys-cluster/keepalived/keepalived-2.1.3.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.1.5.ebuild
diff --git a/sys-cluster/knem/Manifest b/sys-cluster/knem/Manifest
index d7a684e6c061..ceb834aac38e 100644
--- a/sys-cluster/knem/Manifest
+++ b/sys-cluster/knem/Manifest
@@ -1,6 +1,6 @@
 AUX 45-knem.rules 28 BLAKE2B 4f7eb2b4c84bc786998ac8ad610626b6ca3e384777aeecd7bb18fb657ff095f7311670bb388d6e7c5f1da944428d6d088bd65d333d27cf67f3d1d532354aaaf6 SHA512 fc819a12ad7432cbf08450ebc36b469402753d8d363d72a46b71efb916391d320591eac0be9498a37a7bbc5ebe1b2725a2cbf37c7c69ed7d5c6e1ccf9ce0e51b
 AUX knem-1.1.3-setup_timer.patch 1965 BLAKE2B b70774ca235d159c4054a496e23e7e5205f504815878b0045ff80f91f7cda1fb3748d1fde16a6da6c6c67f2d8acfc4310a7e0cfa3ad1d461b89bc73d41af8f10 SHA512 ab87faded049f999638d4092a9758a542836e2c373c43e4f00141f54b8aa38ab2bbd288edf95a67f087b949864e4a00163cf2eff13f2b41a71677b72c4f9eb01
 DIST knem-1.1.3.tar.gz 330109 BLAKE2B 0aa5a2b5cd329e7183800b8b4e6b76297c85325cef218dc0ae27293ffb3aaf8a6896bc237ca745bb8df97a446c2ecc5542b96fc9eb4bbead6a1c9b894dd38f51 SHA512 ab72b3a803898c8de1bb775857da346e16ade285cdf17b9339eef3dc939c5d50ef5b3442e96418e414d64cd3e1e1a922b5e8c74462c5d6866b842ee9749db3eb
-EBUILD knem-1.1.3.ebuild 1661 BLAKE2B 654bc0267b05391d055733f09986a5c359c1445380d6aa0404a81689ed7748e93030ac195db928001286cae274f03aec5a6fc10bc09a35b4c3f803a7a750b3c2 SHA512 8d5aa292b5218c88399a3e26de8bb825df553f966227b64b92a6fe64fcda73787d03b6e93891da67bd3d401cc722d1993c3ba417c4d750ed76ae616b47400e5a
-EBUILD knem-9999.ebuild 1612 BLAKE2B 6d26ce474819784f09768a146071fb3f97ba1e1a2b7cb5f94a91312d009ba492bad3176a2a587092eec2cf7cbd86e64167af1b8f43030f7e2f6a9aa87873a726 SHA512 dd4164e693489685fb6d6a8ffcd75bea6c5271e70784053124f8d989f447c1b6432e0c6e1c238613b718a2ca9e01b58c4402f5aa3698c275bf8365f0f16389e5
+EBUILD knem-1.1.3-r2.ebuild 1665 BLAKE2B 17dea0891e477f24e2a32d135f2b5cfaae8f5403de1901213f7df78e6f64d4562b4cd88ba5200929270336d8f2c357c26edbd9c54f7db7c897f11c28eff7bb8a SHA512 fc25562fbd6c9958ffed7349c1ffbad2b1ff55068e6b8a58d0a9a674a17fafbfcac4c81d98dc75d9b685883b413d7da932b7d5a814d21ade5bb6b40528d0cebe
+EBUILD knem-9999.ebuild 1616 BLAKE2B c4d4ec6ab38f0e0f3d87bb7f5459a9d5c17b20006dc8a55b12143275a4871af8ea47dab45202bcb45a0792b4f6274c47fecc82bddd4b2c4e32021d8d432799e5 SHA512 b55c77c84b6be617f0a5262a20118ce0030089616b0779673308a683ec0ffa0d24970eee578009dfb810f702187f06e2f7cb6b8e382be41a19fa6fb752b5b503
 MISC metadata.xml 365 BLAKE2B ceba315f0fbd74cfc6ec310a70126108f304deef94ba49cc1a9f8291b9827fdea3e3224cd7a52265d98ec55e240496d943874301e7a51f29eef2d5f03a26842d SHA512 debd6bb734810af46390ed76b73151e5729999aff31956951cf9482e06ae6d08e4d642f9fc27ff99f0947b0b63214dc9ca6514e760d0d93a79bcd9ea79b60743
diff --git a/sys-cluster/knem/knem-1.1.3.ebuild b/sys-cluster/knem/knem-1.1.3-r2.ebuild
index b0608beda96b..640b8a3486ab 100644
--- a/sys-cluster/knem/knem-1.1.3.ebuild
+++ b/sys-cluster/knem/knem-1.1.3-r2.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 		virtual/linux-sources"
 RDEPEND="
 		sys-apps/hwloc
-		virtual/modutils"
+		sys-apps/kmod[tools]"
 
 MODULE_NAMES="knem(misc:${S}/driver/linux)"
 BUILD_TARGETS="all"
diff --git a/sys-cluster/knem/knem-9999.ebuild b/sys-cluster/knem/knem-9999.ebuild
index 6e9922630791..7863b80cb7e1 100644
--- a/sys-cluster/knem/knem-9999.ebuild
+++ b/sys-cluster/knem/knem-9999.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 		virtual/linux-sources"
 RDEPEND="
 		sys-apps/hwloc
-		virtual/modutils"
+		sys-apps/kmod[tools]"
 
 MODULE_NAMES="knem(misc:${S}/driver/linux)"
 BUILD_TARGETS="all"
diff --git a/sys-cluster/kube-router/Manifest b/sys-cluster/kube-router/Manifest
index bd4611c9e35f..2a2bd90fe1aa 100644
--- a/sys-cluster/kube-router/Manifest
+++ b/sys-cluster/kube-router/Manifest
@@ -1,8 +1,8 @@
 AUX kube-router.confd 320 BLAKE2B a3b4973007bab2d7b4bf4f21beb85c59adb0d66b2dd4bf1152d7818b1039e74624e0a2255123cbdace8e419aed1e0a9e87ba3c6b7fa7263cb4667fcabce6829b SHA512 cc150ad9dae389011449c31541a326625f781ead15cc12502bdb5704b13921e0a4a740abb27fafb7dc260c6d66f44e855ecf5ef1300077377a9aa0a08f50db1c
 AUX kube-router.initd 963 BLAKE2B 5226134d18790b246bcd516f72f54f992ebc61f69799a730e095e65bc4c805494d8760ec0ce9f564c8ee7856379993cf18b9e5ce3d10c25afbbc0937b1d075b8 SHA512 f6c41ae0ff20abd1e1f29ede282f49fad0112fa634104b6603d5a1d78ff6457e5739956b2e28353f2b21964b5ec11158626b1cbbb8cea510cdb5463a062e8d63
 AUX kube-router.logrotated 85 BLAKE2B 41c40f60ee686f7387e01c85345e6d8d3c562df2363ba3963a0f465d70a3439d2496931b94f05a1c607d04d4269fd087a4c0e1fd9c3a6f7db89d33bbc366bb30 SHA512 19e92adbc5ff8548784481cdc63d8010c386ea799350d7426c22f9b71c09c4ec9b1ec0a7e08069e1fb5cb51b0a37435ae42b12caf2d8679f2cb892fdc6bf96e1
-DIST kube-router-0.3.1.tar.gz 8468463 BLAKE2B 23ee608e6415b3627f5024c8778ae1f33c5db3c1c564d0eb1e0fcb45dd90ff4a148c39e7fd0a4888d6b4cf13b129c5249c2db868efa584f15e31c7ff539829d5 SHA512 185e3a58dc6112e33ed7dc5702795dd7be0a37b63c7c882a1c092060a57a755ea4ea5c2cc96c93210bee632a4a4c4b19f3506ceb44b96d4727cf62cb2f28818f
 DIST kube-router-0.4.0.tar.gz 8403982 BLAKE2B e5e9e92064f00d696ca1cde310813541910d3e37b9c31336b1f2729e63a963fb454a2a9d07b2394134b9ea96e64d6caa26b6230bfd214883f5951bcfdd30c674 SHA512 00617e434b770c1b5eeb3f2c85ae9b6f49157224a5df223f5d1ec514ba087164bb03f0e28a38c75d3149c0c028ed54ceccf898a77c474bbf64921f45db7c3e3c
-EBUILD kube-router-0.3.1.ebuild 1215 BLAKE2B 970ee268727734fe74f96249931407b509cd88459cec456ea777b4f59c11f4e118424678be89ff464a23434b8cedf3f324fe8cd3a8b8a9ad05698df0d356cde9 SHA512 f19fb68677601b84f7e846c9d07744f1098cd34c49ef31ed53af533a08773dbf0abdcb0f46c54846e2c61bfd4a6e9c6cea88e52967d1d1274482ab9230779e31
+DIST kube-router-1.0.1.tar.gz 8413249 BLAKE2B dd158fda5a25925d1f630764f7ad77a821c145def887093692333fcdb4e9a3d9736fe3243f7834abf60d71835fe37a81e4d0a9f20cb45e05d9bb817a50d81196 SHA512 a84176785367fb87562a9a410d87376d938fb32c8aec0cd71259ca3af2204b76ba083201b5f2ad38b395a83a321f0feec4b304a4f3add595b5eadf0837a6918b
 EBUILD kube-router-0.4.0.ebuild 5257 BLAKE2B ddde07a17a1683a0c4adb1fa99e78ac15850a762c1eaeed2e4cac1957fd7225a5c402795d817cc8e9700d3aa170ae004d5d16e9664304a74931c123e9a5436f8 SHA512 00aeb5a34a105d0e5ce74ec835ae2e8df56ec7f9994577d7bebe6a4c1e254977e96029573a0b6c29fcbff3ea2a9f1f7eff14f0d3171604bd6d910c06c0fbedcf
+EBUILD kube-router-1.0.1.ebuild 6423 BLAKE2B 6fe7a2501be0970e96f99a390bd26af361c244a7b2b8fe3b3daef3a2b75a8657256276551a6e1d849b65ce36c43476c7f22e474d2c64aa844c43458f615202df SHA512 ad87bf32a8475821ce9af56313c7882c854b417dcc1f073efe8675952a384b6683c377735912815930c5d0f5cf45191edfad6ab88bad23bd37c9b31abbde6fd7
 MISC metadata.xml 848 BLAKE2B 3ba78ece1af8cf69ab50f10afdd24ff8765b1bace2ba02ec094dde976d216d7cb1afc9a2d69d6b674aa03bd842bfa453f0583380119bf8595fbc524fc9fd0e51 SHA512 5746d825adf43cbf15d4d9886194c1ab351497a0dc8110d9e19c879c306ac1e808c1986346de5f842b8b3910febebbe7b81f6c909f3ccd7067507b83396b166e
diff --git a/sys-cluster/kube-router/kube-router-0.3.1.ebuild b/sys-cluster/kube-router/kube-router-0.3.1.ebuild
deleted file mode 100644
index c0be2fdbb4e0..000000000000
--- a/sys-cluster/kube-router/kube-router-0.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN="github.com/cloudnativelabs/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="A turnkey solution for Kubernetes networking"
-HOMEPAGE="https://kube-router.io"
-SRC_URI="https://github.com/cloudnativelabs/kube-router/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception"
-SLOT="0"
-
-RDEPEND="
-	net-firewall/iptables[conntrack]
-	net-firewall/ipset
-	sys-cluster/ipvsadm
-"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	GOPATH="${S}" go build -x -work -v \
-		-ldflags "-X 'github.com/cloudnativelabs/kube-router/pkg/cmd.version=${PV}' "\
-"-X 'github.com/cloudnativelabs/kube-router/pkg/cmd.buildDate=$(date -u +%FT%T%z)'" \
-		-o kube-router cmd/kube-router/kube-router.go || die
-	popd || die
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "${PN}"
-	dodoc *.md docs/*.md docs/*/*
-	popd || die
-
-	newinitd "${FILESDIR}"/kube-router.initd kube-router
-	newconfd "${FILESDIR}"/kube-router.confd kube-router
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/kube-router.logrotated kube-router
-}
diff --git a/sys-cluster/kube-router/kube-router-1.0.1.ebuild b/sys-cluster/kube-router/kube-router-1.0.1.ebuild
new file mode 100644
index 000000000000..f1c72e8048b8
--- /dev/null
+++ b/sys-cluster/kube-router/kube-router-1.0.1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN="github.com/cloudnativelabs/${PN}"
+
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="A turnkey solution for Kubernetes networking"
+HOMEPAGE="https://kube-router.io"
+SRC_URI="https://github.com/cloudnativelabs/kube-router/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception"
+
+SLOT="0"
+
+RDEPEND="
+	net-firewall/iptables[conntrack]
+	net-firewall/ipset
+	sys-cluster/ipvsadm
+"
+
+# Vendored dependencies (helps with LICENSE, see https://bugs.gentoo.org/694792):
+# github.com/PuerkitoBio/purell # BSD
+# github.com/PuerkitoBio/urlesc # BSD
+# github.com/armon/go-radix # MIT
+# github.com/aws/aws-sdk-go # Apache-2.0
+# github.com/beorn7/perks # MIT
+# github.com/containernetworking/cni # Apache-2.0
+# github.com/coreos/go-iptables # Apache-2.0
+# github.com/docker/distribution # Apache-2.0
+# github.com/docker/docker # Apache-2.0
+# github.com/docker/go-connections # Apache-2.0
+# github.com/docker/go-units # Apache-2.0
+# github.com/docker/libnetwork # Apache-2.0
+# github.com/davecgh/go-spew # ISC
+# github.com/dgryski/go-farm # MIT
+# github.com/eapache/channels # MIT
+# github.com/eapache/queue # MIT
+# github.com/emicklei/go-restful # MIT
+# github.com/emicklei/go-restful-swagger12 # MIT
+# github.com/fsnotify/fsnotify # BSD
+# github.com/ghodss/yaml # MIT BSD
+# github.com/go-ini/ini # Apache-2.0
+# github.com/go-openapi/jsonpointer # Apache-2.0
+# github.com/go-openapi/jsonreference # Apache-2.0
+# github.com/go-openapi/spec # Apache-2.0
+# github.com/go-openapi/swag # Apache-2.0
+# github.com/gogo/protobuf # BSD
+# github.com/golang/glog # Apache-2.0
+# github.com/golang/protobuf # BSD
+# github.com/google/btree # Apache-2.0
+# github.com/google/gofuzz # Apache-2.0
+# github.com/googleapis/gnostic # Apache-2.0
+# github.com/gregjones/httpcache # MIT
+# github.com/hashicorp/golang-lru # MPL-2.0
+# github.com/hashicorp/hcl # MPL-2.0
+# github.com/howeyc/gopass # ISC
+# github.com/imdario/mergo # BSD
+# github.com/influxdata/influxdb # MIT
+# github.com/jmespath/go-jmespath # Apache-2.0
+# github.com/json-iterator/go # MIT
+# github.com/juju/ratelimit # LGPL-3-with-linking-exception
+# github.com/magiconair/properties # BSD-2
+# github.com/mailru/easyjson # MIT
+# github.com/matttproud/golang_protobuf_extensions # Apache-2.0
+# github.com/mitchellh/mapstructure # MIT
+# github.com/modern-go/concurrent # Apache-2.0
+# github.com/modern-go/reflect2 # Apache-2.0
+# github.com/opencontainers/go-digest # Apache-2.0
+# github.com/opencontainers/image-spec # Apache-2.0
+# github.com/osrg/gobgp # Apache-2.0
+# github.com/pelletier/go-toml # MIT
+# github.com/peterbourgon/diskv # MIT
+# github.com/pkg/errors # BSD-2
+# github.com/prometheus/client_golang # Apache-2.0
+# github.com/prometheus/client_model # Apache-2.0
+# github.com/prometheus/common # Apache-2.0
+# github.com/prometheus/procfs # Apache-2.0
+# github.com/satori/go.uuid # MIT
+# github.com/sirupsen/logrus # MIT
+# github.com/spf13/afero # Apache-2.0
+# github.com/spf13/cast # MIT
+# github.com/spf13/jwalterweatherman # MIT
+# github.com/spf13/pflag # BSD
+# github.com/spf13/viper # MIT
+# github.com/vishvananda/netlink # Apache-2.0
+# github.com/vishvananda/netns # Apache-2.0
+# google.golang.org/genproto # Apache-2.0
+# google.golang.org/grpc # Apache-2.0
+# golang.org/x/crypto # BSD
+# golang.org/x/net # BSD
+# golang.org/x/sys # BSD
+# golang.org/x/text # BSD
+# k8s.io/api # Apache-2.0
+# k8s.io/apimachinery # Apache-2.0
+# k8s.io/client-go # Apache-2.0
+# k8s.io/kube-openapi # Apache-2.0
+# gopkg.in/inf.v0 # BSD
+# gopkg.in/tomb.v2 # BSD
+# gopkg.in/yaml.v2 # Apache-2.0 && MIT
+
+# Test dependencies:
+# github.com/onsi/ginkgo # MIT
+# github.com/onsi/gomega # MIT
+
+src_prepare() {
+	eapply_user
+	# we are going to remove some stuff that is not required for compoilation
+	# but may have some license issues
+	local unneeded_dir
+	local unneeded_dirs=(
+		github.com/howeyc/gopass/terminal_solaris.go
+		github.com/docker/libnetwork/client/mflag
+		github.com/prometheus/client_model/ruby
+		github.com/docker/docker/contrib
+
+		github.com/Microsoft/go-winio
+		github.com/inconshreveable/mousetrap
+
+		github.com/petar/GoLLRB
+		github.com/spf13/cobra
+	)
+	for unneeded_dir in ${unneeded_dirs[@]}; do
+		mv -v "${S}/src/${EGO_PN}/vendor/${unneeded_dir}" "${T}" || \
+			die "can't remove ${unneeded_dir}"
+	done
+}
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	GOPATH="${S}" go build -x -work -v \
+		-ldflags "-X 'github.com/cloudnativelabs/kube-router/pkg/cmd.version=${PV}' "\
+"-X 'github.com/cloudnativelabs/kube-router/pkg/cmd.buildDate=$(date -u +%FT%T%z)'" \
+		-o kube-router cmd/kube-router/kube-router.go || die
+	popd || die
+}
+
+src_test() {
+	local line
+	local testdirs="github.com/cloudnativelabs/kube-router/cmd/kube-router/
+		github.com/cloudnativelabs/kube-router/pkg/..."
+
+	local known_fail=(
+		Test_advertiseClusterIPs
+		Test_advertiseExternalIPs
+		Test_advertiseAnnotationOptOut
+		Test_advertiseAnnotationOptIn
+		Test_advertisePodRoute
+		Test_syncInternalPeers
+		Test_AddPolicies
+		Test_routeReflectorConfiguration
+	)
+
+	# concat as '|^Test1$|^Test2$|^Test3...$':
+	local known_fail_re="$(printf '|^%s$' "${known_fail[@]}" || die)"
+	# drop '|' in the begining:
+	known_fail_re="${known_fail_re:1}"
+
+	einfo "Looking for tests"
+	local working_tests_re="$(
+		# get list of all test:
+		{
+			GOFLLAGS="-mod=readonly" GOPATH="${S}" \
+				go test -list . ${testdirs} ||
+			die "Can't get list of tests";
+		} |
+		{ while read line; do echo "${line}"; echo "${line}" >&2; done; } |
+		# skip "no tests" messages as well as know failures:
+		{ grep -v -E " |${known_fail_re}" || die "Can't parse tests list"; } |
+		# format a regexp:
+		{ sed -z 's/\n/$|^/g' || die; }
+	)"
+	# drop '|^' in the end:
+	working_tests_re="^${working_tests_re::-2}"
+
+	GOFLLAGS="-mod=readonly" GOPATH="${S}" \
+		go test -v -timeout 30s -run "${working_tests_re}" ${testdirs} || \
+			die "Tests failed"
+	GOFLLAGS="-mod=readonly" GOPATH="${S}" \
+		go test -v -timeout 30s -run "${known_fail_re}" ${testdirs} || \
+			ewarn "Known test failure"
+}
+
+src_install() {
+	pushd "src/${EGO_PN}" || die
+	dobin "${PN}"
+	einstalldocs
+	popd || die
+
+	newinitd "${FILESDIR}"/kube-router.initd kube-router
+	newconfd "${FILESDIR}"/kube-router.confd kube-router
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/kube-router.logrotated kube-router
+}
diff --git a/sys-cluster/kubernetes/Manifest b/sys-cluster/kubernetes/Manifest
index da153ffc9b96..9826354be652 100644
--- a/sys-cluster/kubernetes/Manifest
+++ b/sys-cluster/kubernetes/Manifest
@@ -13,32 +13,18 @@ AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a
 AUX kubelet.confd 58 BLAKE2B 5c01a2146beacf3a024f312d1bd3422055887ba48d5d869a32a2be99585f260f9d9b9946e57290345e0d57870f7d4509892c53fe4c7a63b0111b1fa8f464daf0 SHA512 2ae3bbc8a66da644b59d7f753294ad43d5675edbe2e4769b91d7c988d0eeffd5b4209a10650ad937f9698b1b6050279d448c75274815a6b348ad2023f2fef08e
 AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbcd54756afb857928a1d5828e79d3a54f958ddc41e8129a1489927115d1fc7712cd682699d3ac6 SHA512 3359ef337a27ea41b3db216808bb0baa571916bab37f913da79e0c9270199d75cfbb1a5730739b9207525e6027e38e8467e4c0b98567499d36130804f218e006
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
-AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
+AUX kubelet.logrotated 81 BLAKE2B 3b4a10844eb7a65fc626a706c801c5a3ae4d47a08b03e2836007bf38b98808e31fdde6b31353936318257a2a679fb847f6c4c3f3b7c6315038e813ac46dd5c82 SHA512 dda5fb57b55926fd2e9cebe6c1593da699afba0398c58dfa8b923c53a9ae6e63d765778577211460047f20863a6095e8e2ab3e7769e38c4f6a1c55c0e3485501
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
-DIST kubernetes-1.16.10.tar.gz 31761409 BLAKE2B caef0b60045d134e5243558da56301dfe2ef844e7e80ca82d86bd79e5ce00bc9d9aa61550f3356dcc6ee31bf925a22a87364fcf971e353129adb0c0e376b26c0 SHA512 b81b34f12c6d835ef86df598bb13350b7a94b02cb493df9c8e8b605c541d9a9db16331b264f66ecdaaf5451e3a2d13cc104d3d6e5facbf31c4b6bd2cc2a1441f
-DIST kubernetes-1.16.11.tar.gz 31766900 BLAKE2B a3a099eaf82b7b818a237752885358752176bb1eade5f1623a1bd8920f37a43283fc0a712197153143b6d166bb0ecb45d9d1148cc766681f67f36281473b26e0 SHA512 153a44ce61d70074462c157ffbdb8c58a8807d205a315c2be3aabee80253cba362915f93c31fcbdbfcdc25161b9bc3ca0260b1cdab8f4d562fc69aa465fc476e
-DIST kubernetes-1.16.8.tar.gz 31731459 BLAKE2B 1d53c16586b5a7a41fc42d0fb3444b694531d3f04fb9e168a70d4b98f966f322bc82d39234612e38c71da052002c5bcc452c747d9f948dacbdd91ea40a9f5417 SHA512 04c8e9a9227ac9a98074cd52cbe90758134fedb10164fa69accbc19716a2f18dc133a4f880d0e35a3728c377faea431363f00ae9fe2ff5ca9e509444da9106c5
-DIST kubernetes-1.16.9.tar.gz 31752857 BLAKE2B 34c0ff54e60276bf41ce971a8a50d57256f696ac95b551a90a6d2ccf1540279010953119def539c0824217fbbfc287d24b6f080e1fefce8864c1eade72d0777f SHA512 08fffe855a433ad0cc7586afd12815adb3bcafcac86712181625198fedbfe170bc36ae31aca9783d30dd790c415d447f073234f621416a76a7e4e0de2eeb008d
-DIST kubernetes-1.17.4.tar.gz 31777775 BLAKE2B cd04e429d3f524f5dce7948db9b22230df8abdeb7570001ab985ffdb5b85709a8d1698490b9df13455d8f3968741db9571ee1ab3bc2a6fdd06a8c0fe274476e2 SHA512 fd1944d26c840bc1d2f585fccbabf48091fe8820ea089b3ea5c18652fd1edb3c8157a70ea19111b8b62aef16e0284a1607b583c3c1af79dd0dd266b99e20c549
-DIST kubernetes-1.17.5.tar.gz 31788321 BLAKE2B b7531b9ba07a20aba6829e3351b3b66a64251970be3a07d44f8b20ef2d44fa7d80f2528c1c0a6c3dcf3373cbb21e500d26c0a53c4ed4b66bb334860c5f8ce3b9 SHA512 2f7fd071a11a4f9d53cf0b23e381d0e864a6dc19e1dab88c2b5bcdade514328714f651bc0caa9c302e74fab7d2823a0d724fe0f5444e13afcf89b792377af283
-DIST kubernetes-1.17.6.tar.gz 31795648 BLAKE2B f6116bc65d08b99295a8e373470f411f5f6b11cad722a713f660f2d24798ee21e2286f4bd538bf53c94af3e9891c49f41ce3b8643ee18df908b0dca03643e007 SHA512 62eaa62a848d7650f29d014b710ca22a744cc1c6517b46a38b5363b3cf4618366d7de2df3f4fbcfe6fbcdde7428e169b9ce917444983049b55fcfff5f3f3217e
-DIST kubernetes-1.17.7.tar.gz 31808806 BLAKE2B b8c2d64bb2e307ca866465039a4e8d62f0f73d26ed7fe3e6906784369c214037672b80c0adf617c3b47abe213f4ee5e55af72943e742aaba645b0c7f69b984c1 SHA512 12ad9de52ac2028ace8b605ccf14b98c94363f17b56da6d5efbb63617d40898384ff88d88a33d47393c3e7b529f17d41c526340ddfbd4cc0eddb5341789436a4
-DIST kubernetes-1.18.0.tar.gz 32554015 BLAKE2B 24079970cc1887c6dad7b55d9f2fd80cd9f46f1b6c1240cf28abf2eb33b3809bcd858293bb800255533a13e24145fab580b0bd2eb0e06c15ca4e0feeedcf6ff2 SHA512 3298ec63a2fbcd396b415f27a581f4286317ae206c30b35457aed780baae4115059df20e40028df394984caccc8bb4ef6c879ae3c064771c8a5c045dee7998e8
-DIST kubernetes-1.18.1.tar.gz 32581783 BLAKE2B ffacdba21dd6d326ddf9733c49ed3a16ad679fbd25b4ddda44b047a402a163474033d6b2328a816e83ede505aae07e205b68938165c546202fa6df2d03609ead SHA512 c002153e16494cd74e6f0609847602d6dcf166c8bab020341f8302b7cad5d7452ed1c2e66b3b230731d13401493d2d02f0500abcd526dbff44ae3aeabd210577
-DIST kubernetes-1.18.2.tar.gz 32585912 BLAKE2B 1f8dbd6e7a8ba4257abaf2926ada656ec42eb7e0f502f2b4fc75b2a6cacd9a6e91624a717772f605a24b42421933580bc399aca4480aa1c88009016160485a77 SHA512 9786312b06aea5cbd4e786e4b6d639ec4750fa6c8ba469d860702b317103ec464f038015ef038ba21841a0d627d58902769eb73a5d2fdf4da2f0ae4c0ec14e85
-DIST kubernetes-1.18.3.tar.gz 32596732 BLAKE2B 067a0b74d3d8e63ba99da1828c7a3e905b235a8e5bee1eb11bbc0a5e12ab2d94c0b5dcf9febf6b0808c053eb81fa6ea4746aa42d6c0a19c02b834b44d25f095f SHA512 0bb1dc33802127b03480e43dcbdeb576188a2a50b0257bcf47a0efec7d504cbce9b61048cb87d2ae4148174fcb2e373298c5947d5130604f827b806d9d00c6a4
-DIST kubernetes-1.18.4.tar.gz 32605319 BLAKE2B 4cf10cadd2b45418f45517a0191d3650a2e36bd3dc69e3f472ac59735712261eebb38eccf7da4f8496ac60701602dbf4730176236486abae6279b1f71bae831f SHA512 b2a6f76b4b933012e39aa3df2510a6dd3a2d64452799fdd32b9d7c461930d273b0cacd46550aa963d809d7b075d6076a6d1a370322870204e1298811c14122a1
-EBUILD kubernetes-1.16.10.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
-EBUILD kubernetes-1.16.11.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
-EBUILD kubernetes-1.16.8.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
-EBUILD kubernetes-1.16.9.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
-EBUILD kubernetes-1.17.4.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
-EBUILD kubernetes-1.17.5.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
-EBUILD kubernetes-1.17.6.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
-EBUILD kubernetes-1.17.7.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
-EBUILD kubernetes-1.18.0.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
-EBUILD kubernetes-1.18.1.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
-EBUILD kubernetes-1.18.2.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
-EBUILD kubernetes-1.18.3.ebuild 2303 BLAKE2B 805c711559a39bcffdb24972db170d1b22018a52cc69d15488f2673a62bfbcf00a94ab4db48506e50a1b440489e28e7db1c3b276223c582991538264ff6d30e6 SHA512 4e7bd9452e329034035b84190289fbf37491b544bacc46f5f4e1556083f5f1f13fe13563a699412aa901cb3cb57e512a279b571defc4616b1a43a493392e25f7
-EBUILD kubernetes-1.18.4.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
+DIST kubernetes-1.16.13.tar.gz 31778355 BLAKE2B 81cfa9a2885577e16cc01f8ecd3e21991be388e129d46c2d8b4d6282eb8d46cc7c530394f743888767426874001619801e7b70feec93cf0142f4117d7d33ea34 SHA512 c4f1d39fb9c16e2bcd2ebd0f8e8dbc889e02c4c28814132fc3856b3bf68aa4867828802e9ff48ce18f2c9c0fc246c6fbf2d9e55ca5956b4aef9cf7b4ad15b225
+DIST kubernetes-1.16.14.tar.gz 31786081 BLAKE2B 7bb400050a309f6c97ac554131e888e6c342d844b0f34565302953d1614d332b8c258fd1252e11b9e6cdb58b3dc3d935ba090a8b014869f65f722f77818ca351 SHA512 72ce0525bb578b33f23960d32a3de42dc339c666912c21b041c901469041d598021e447c93416312b67b356dfd529f0f38bc24a587af16db2b7c7aa6e83b58bb
+DIST kubernetes-1.17.11.tar.gz 31829687 BLAKE2B 9684536fb19611f7da3889358bfa6044aebba8e5d3be83d7afe47ecd392d2f52011959abb1c1d4edcf3c48c8b499d40cc4e1d7751af3cfeadda16a33f3df67c3 SHA512 13853bd099c110df9f2dcf25e461c3c14aca48d77a3eaa6c040a4358edfa31462d0702e0544a187a17521e520ab7b545a6aeabfbfa2930946e15118e82a12369
+DIST kubernetes-1.17.9.tar.gz 31821854 BLAKE2B 62dffaa7ab671987aba9a477497dfa02943488d43ac42259706e21aa0d0520d76a6d0795db39b5025b23678ad0d36e0367e0bdda4b3e7c0c6a2ad409c29d02ad SHA512 c6c1c27a534b5b6dbbc3be34d9f8f321b0289e9032ad11549e1f028cd4cf6ba288cdc54283f5263b5e9cef017d535db911b5f7e5cbaccd2bee7d955ce2039696
+DIST kubernetes-1.18.6.tar.gz 32619242 BLAKE2B 7db8410b33b3748e2f391efa78fab2bff51c2f5cf9bc54ba74d5c0044f2ee453b1038f4edb206597be6cb0da7c9264988865bd94f1b99c308c350f04eaa232af SHA512 8715b5738ae13455e5f91f58d8922e7e87ed9441a5caf1233426df7dac552ddf2c4242d217d50b65ee264b8b55e6cc4e33081bf70dd74c47870c0eff682a9545
+DIST kubernetes-1.18.8.tar.gz 32619514 BLAKE2B cdeff1d4400e69bee3f675a6a8c111ec6c5e79d1a8610d986ad37891b6ffc6b12460503004803373a5e87d6eae5517bfc6278d6a2aced6a3f414a460a0177bec SHA512 04d41c3ce15b7679c7d605659c5c02873338d0d1e48d2b655852a31f897dd0842fc4eb839d132652b4483117b845b739b25cd219f12be0ef4d0058e6ea8f421e
+EBUILD kubernetes-1.16.13.ebuild 2303 BLAKE2B 34d570a6fdb6f1acb2088e0e5f970e7caeb49856120bc0f58e9af239ee421b75f9bc74ab64dec93e8f20da7fbc3be17aef1f4a16e59988d25f4d3bae5dbde45b SHA512 66e24673be6c12cb6f9b744ed10a61aa1ca70148a856ca2993f6d90ec75ed1e42004ec3e0da4c2295c445f053a539cd38bb2ca52faa26f815a10abd69960aaeb
+EBUILD kubernetes-1.16.14.ebuild 2304 BLAKE2B 3331be4e0311c55251e4ad205e27033e79a93df9a19d5d9372efc32bcf5505a23de44a7dcd48c05e55108d76f3e4472eef15b361b6631835553b63ad07972c69 SHA512 b08b169071ebb860449057269ed5956ba306254760e7f91925e014a7a994a15e2a98befec84836709b3188a638827d7fc93babb5a757fc5e4f161a14e54690ca
+EBUILD kubernetes-1.17.11.ebuild 2304 BLAKE2B 3331be4e0311c55251e4ad205e27033e79a93df9a19d5d9372efc32bcf5505a23de44a7dcd48c05e55108d76f3e4472eef15b361b6631835553b63ad07972c69 SHA512 b08b169071ebb860449057269ed5956ba306254760e7f91925e014a7a994a15e2a98befec84836709b3188a638827d7fc93babb5a757fc5e4f161a14e54690ca
+EBUILD kubernetes-1.17.9.ebuild 2303 BLAKE2B 34d570a6fdb6f1acb2088e0e5f970e7caeb49856120bc0f58e9af239ee421b75f9bc74ab64dec93e8f20da7fbc3be17aef1f4a16e59988d25f4d3bae5dbde45b SHA512 66e24673be6c12cb6f9b744ed10a61aa1ca70148a856ca2993f6d90ec75ed1e42004ec3e0da4c2295c445f053a539cd38bb2ca52faa26f815a10abd69960aaeb
+EBUILD kubernetes-1.18.6.ebuild 2303 BLAKE2B 34d570a6fdb6f1acb2088e0e5f970e7caeb49856120bc0f58e9af239ee421b75f9bc74ab64dec93e8f20da7fbc3be17aef1f4a16e59988d25f4d3bae5dbde45b SHA512 66e24673be6c12cb6f9b744ed10a61aa1ca70148a856ca2993f6d90ec75ed1e42004ec3e0da4c2295c445f053a539cd38bb2ca52faa26f815a10abd69960aaeb
+EBUILD kubernetes-1.18.8.ebuild 2304 BLAKE2B 3331be4e0311c55251e4ad205e27033e79a93df9a19d5d9372efc32bcf5505a23de44a7dcd48c05e55108d76f3e4472eef15b361b6631835553b63ad07972c69 SHA512 b08b169071ebb860449057269ed5956ba306254760e7f91925e014a7a994a15e2a98befec84836709b3188a638827d7fc93babb5a757fc5e4f161a14e54690ca
 MISC metadata.xml 719 BLAKE2B 4f7918cba4809becbff0cb1f6c6e9ce00e778c1a474955e64fccef68942a2e7fb337d5dbe8b01074b992497da913fbfbebe5705635245e8ce02f6daca4df7936 SHA512 9d4662622f1fa57b753018db9839b4399f3bb589a1e061821941738ea86a6d65cd0dbec31ffef658aeb14ac7d5c3840948694627b1fb32bc138b0f7dbf40a011
diff --git a/sys-cluster/kubernetes/files/kubelet.logrotated b/sys-cluster/kubernetes/files/kubelet.logrotated
index ddf8c1dd80f6..f87767fe985e 100644
--- a/sys-cluster/kubernetes/files/kubelet.logrotated
+++ b/sys-cluster/kubernetes/files/kubelet.logrotated
@@ -1,4 +1,4 @@
-/var/log/kubernetes/*.log {
+/var/log/kubelet/*.log {
 	missingok
 	size 5M
 	rotate 3
diff --git a/sys-cluster/kubernetes/kubernetes-1.16.10.ebuild b/sys-cluster/kubernetes/kubernetes-1.16.10.ebuild
deleted file mode 100644
index 08ecc8821c16..000000000000
--- a/sys-cluster/kubernetes/kubernetes-1.16.10.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="production-grade container orchestration"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-AGENT="kubelet"
-CLI="kubeadm kubectl"
-SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
-IUSE="hardened"
-for x in ${AGENT} ${CLI} ${SERVICES}; do
-	IUSE+=" +${x}"
-done
-
-BDEPEND=">=dev-lang/go-1.13"
-COMMON_DEPEND="
-	kube-apiserver? (
-		acct-group/kube-apiserver
-		acct-user/kube-apiserver
-	)
-	kube-controller-manager? (
-		acct-group/kube-controller-manager
-		acct-user/kube-controller-manager
-	)
-	kube-scheduler? (
-		acct-group/kube-scheduler
-		acct-user/kube-scheduler
-	)"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	kube-proxy? ( net-firewall/conntrack-tools )
-	!sys-cluster/kubeadm
-	!sys-cluster/kubectl
-	!sys-cluster/kubelet
-	!sys-cluster/kube-apiserver
-	!sys-cluster/kube-controller-manager
-	!sys-cluster/kube-proxy
-	!sys-cluster/kube-scheduler"
-
-RESTRICT+=" test"
-
-src_compile() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
-	done
-}
-
-src_install() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		dobin _output/bin/${x}
-		if has ${x} ${CLI}; then
-		_output/bin/${x} completion bash > ${x}.bash || die
-		_output/bin/${x} completion zsh > ${x}.zsh || die
-			newbashcomp ${x}.bash ${x}
-			insinto /usr/share/zsh/site-functions
-			newins ${x}.zsh _${x}
-			continue
-		fi
-		newinitd "${FILESDIR}"/${x}.initd ${x}
-		newconfd "${FILESDIR}"/${x}.confd ${x}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${x}.logrotated ${x}
-		keepdir /var/log/${x}
-		if [[ "$x" =~ kubelet ]]; then
-			systemd_dounit "${FILESDIR}"/${x}.service
-			insinto /etc/kubernetes
-			newins "${FILESDIR}"/${x}.env ${x}.env
-			keepdir /etc/kubernetes/manifests
-		fi
-		if [[ $x =~ kubelet|kube-proxy ]]; then
-			keepdir /var/lib/${x}
-		fi
-		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
-			fowners ${x}:${x} /var/log/${x}
-		fi
-	done
-}
diff --git a/sys-cluster/kubernetes/kubernetes-1.17.6.ebuild b/sys-cluster/kubernetes/kubernetes-1.16.13.ebuild
index 08ecc8821c16..71f306a509b0 100644
--- a/sys-cluster/kubernetes/kubernetes-1.17.6.ebuild
+++ b/sys-cluster/kubernetes/kubernetes-1.16.13.ebuild
@@ -20,7 +20,7 @@ for x in ${AGENT} ${CLI} ${SERVICES}; do
 	IUSE+=" +${x}"
 done
 
-BDEPEND=">=dev-lang/go-1.13"
+BDEPEND="=dev-lang/go-1.14*"
 COMMON_DEPEND="
 	kube-apiserver? (
 		acct-group/kube-apiserver
diff --git a/sys-cluster/kubernetes/kubernetes-1.16.11.ebuild b/sys-cluster/kubernetes/kubernetes-1.16.14.ebuild
index c333bbabb3b4..e558ad11199b 100644
--- a/sys-cluster/kubernetes/kubernetes-1.16.11.ebuild
+++ b/sys-cluster/kubernetes/kubernetes-1.16.14.ebuild
@@ -20,7 +20,7 @@ for x in ${AGENT} ${CLI} ${SERVICES}; do
 	IUSE+=" +${x}"
 done
 
-BDEPEND=">=dev-lang/go-1.13"
+BDEPEND="=dev-lang/go-1.14*"
 COMMON_DEPEND="
 	kube-apiserver? (
 		acct-group/kube-apiserver
diff --git a/sys-cluster/kubernetes/kubernetes-1.17.4.ebuild b/sys-cluster/kubernetes/kubernetes-1.17.11.ebuild
index c333bbabb3b4..e558ad11199b 100644
--- a/sys-cluster/kubernetes/kubernetes-1.17.4.ebuild
+++ b/sys-cluster/kubernetes/kubernetes-1.17.11.ebuild
@@ -20,7 +20,7 @@ for x in ${AGENT} ${CLI} ${SERVICES}; do
 	IUSE+=" +${x}"
 done
 
-BDEPEND=">=dev-lang/go-1.13"
+BDEPEND="=dev-lang/go-1.14*"
 COMMON_DEPEND="
 	kube-apiserver? (
 		acct-group/kube-apiserver
diff --git a/sys-cluster/kubernetes/kubernetes-1.17.7.ebuild b/sys-cluster/kubernetes/kubernetes-1.17.7.ebuild
deleted file mode 100644
index c333bbabb3b4..000000000000
--- a/sys-cluster/kubernetes/kubernetes-1.17.7.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="production-grade container orchestration"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-AGENT="kubelet"
-CLI="kubeadm kubectl"
-SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
-IUSE="hardened"
-for x in ${AGENT} ${CLI} ${SERVICES}; do
-	IUSE+=" +${x}"
-done
-
-BDEPEND=">=dev-lang/go-1.13"
-COMMON_DEPEND="
-	kube-apiserver? (
-		acct-group/kube-apiserver
-		acct-user/kube-apiserver
-	)
-	kube-controller-manager? (
-		acct-group/kube-controller-manager
-		acct-user/kube-controller-manager
-	)
-	kube-scheduler? (
-		acct-group/kube-scheduler
-		acct-user/kube-scheduler
-	)"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	kube-proxy? ( net-firewall/conntrack-tools )
-	!sys-cluster/kubeadm
-	!sys-cluster/kubectl
-	!sys-cluster/kubelet
-	!sys-cluster/kube-apiserver
-	!sys-cluster/kube-controller-manager
-	!sys-cluster/kube-proxy
-	!sys-cluster/kube-scheduler"
-
-RESTRICT+=" test"
-
-src_compile() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
-	done
-}
-
-src_install() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		dobin _output/bin/${x}
-		if has ${x} ${CLI}; then
-		_output/bin/${x} completion bash > ${x}.bash || die
-		_output/bin/${x} completion zsh > ${x}.zsh || die
-			newbashcomp ${x}.bash ${x}
-			insinto /usr/share/zsh/site-functions
-			newins ${x}.zsh _${x}
-			continue
-		fi
-		newinitd "${FILESDIR}"/${x}.initd ${x}
-		newconfd "${FILESDIR}"/${x}.confd ${x}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${x}.logrotated ${x}
-		keepdir /var/log/${x}
-		if [[ "$x" =~ kubelet ]]; then
-			systemd_dounit "${FILESDIR}"/${x}.service
-			insinto /etc/kubernetes
-			newins "${FILESDIR}"/${x}.env ${x}.env
-			keepdir /etc/kubernetes/manifests
-		fi
-		if [[ $x =~ kubelet|kube-proxy ]]; then
-			keepdir /var/lib/${x}
-		fi
-		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
-			fowners ${x}:${x} /var/log/${x}
-		fi
-	done
-}
diff --git a/sys-cluster/kubernetes/kubernetes-1.16.9.ebuild b/sys-cluster/kubernetes/kubernetes-1.17.9.ebuild
index 08ecc8821c16..71f306a509b0 100644
--- a/sys-cluster/kubernetes/kubernetes-1.16.9.ebuild
+++ b/sys-cluster/kubernetes/kubernetes-1.17.9.ebuild
@@ -20,7 +20,7 @@ for x in ${AGENT} ${CLI} ${SERVICES}; do
 	IUSE+=" +${x}"
 done
 
-BDEPEND=">=dev-lang/go-1.13"
+BDEPEND="=dev-lang/go-1.14*"
 COMMON_DEPEND="
 	kube-apiserver? (
 		acct-group/kube-apiserver
diff --git a/sys-cluster/kubernetes/kubernetes-1.18.0.ebuild b/sys-cluster/kubernetes/kubernetes-1.18.0.ebuild
deleted file mode 100644
index c333bbabb3b4..000000000000
--- a/sys-cluster/kubernetes/kubernetes-1.18.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="production-grade container orchestration"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-AGENT="kubelet"
-CLI="kubeadm kubectl"
-SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
-IUSE="hardened"
-for x in ${AGENT} ${CLI} ${SERVICES}; do
-	IUSE+=" +${x}"
-done
-
-BDEPEND=">=dev-lang/go-1.13"
-COMMON_DEPEND="
-	kube-apiserver? (
-		acct-group/kube-apiserver
-		acct-user/kube-apiserver
-	)
-	kube-controller-manager? (
-		acct-group/kube-controller-manager
-		acct-user/kube-controller-manager
-	)
-	kube-scheduler? (
-		acct-group/kube-scheduler
-		acct-user/kube-scheduler
-	)"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	kube-proxy? ( net-firewall/conntrack-tools )
-	!sys-cluster/kubeadm
-	!sys-cluster/kubectl
-	!sys-cluster/kubelet
-	!sys-cluster/kube-apiserver
-	!sys-cluster/kube-controller-manager
-	!sys-cluster/kube-proxy
-	!sys-cluster/kube-scheduler"
-
-RESTRICT+=" test"
-
-src_compile() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
-	done
-}
-
-src_install() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		dobin _output/bin/${x}
-		if has ${x} ${CLI}; then
-		_output/bin/${x} completion bash > ${x}.bash || die
-		_output/bin/${x} completion zsh > ${x}.zsh || die
-			newbashcomp ${x}.bash ${x}
-			insinto /usr/share/zsh/site-functions
-			newins ${x}.zsh _${x}
-			continue
-		fi
-		newinitd "${FILESDIR}"/${x}.initd ${x}
-		newconfd "${FILESDIR}"/${x}.confd ${x}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${x}.logrotated ${x}
-		keepdir /var/log/${x}
-		if [[ "$x" =~ kubelet ]]; then
-			systemd_dounit "${FILESDIR}"/${x}.service
-			insinto /etc/kubernetes
-			newins "${FILESDIR}"/${x}.env ${x}.env
-			keepdir /etc/kubernetes/manifests
-		fi
-		if [[ $x =~ kubelet|kube-proxy ]]; then
-			keepdir /var/lib/${x}
-		fi
-		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
-			fowners ${x}:${x} /var/log/${x}
-		fi
-	done
-}
diff --git a/sys-cluster/kubernetes/kubernetes-1.18.1.ebuild b/sys-cluster/kubernetes/kubernetes-1.18.1.ebuild
deleted file mode 100644
index c333bbabb3b4..000000000000
--- a/sys-cluster/kubernetes/kubernetes-1.18.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="production-grade container orchestration"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-AGENT="kubelet"
-CLI="kubeadm kubectl"
-SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
-IUSE="hardened"
-for x in ${AGENT} ${CLI} ${SERVICES}; do
-	IUSE+=" +${x}"
-done
-
-BDEPEND=">=dev-lang/go-1.13"
-COMMON_DEPEND="
-	kube-apiserver? (
-		acct-group/kube-apiserver
-		acct-user/kube-apiserver
-	)
-	kube-controller-manager? (
-		acct-group/kube-controller-manager
-		acct-user/kube-controller-manager
-	)
-	kube-scheduler? (
-		acct-group/kube-scheduler
-		acct-user/kube-scheduler
-	)"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	kube-proxy? ( net-firewall/conntrack-tools )
-	!sys-cluster/kubeadm
-	!sys-cluster/kubectl
-	!sys-cluster/kubelet
-	!sys-cluster/kube-apiserver
-	!sys-cluster/kube-controller-manager
-	!sys-cluster/kube-proxy
-	!sys-cluster/kube-scheduler"
-
-RESTRICT+=" test"
-
-src_compile() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
-	done
-}
-
-src_install() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		dobin _output/bin/${x}
-		if has ${x} ${CLI}; then
-		_output/bin/${x} completion bash > ${x}.bash || die
-		_output/bin/${x} completion zsh > ${x}.zsh || die
-			newbashcomp ${x}.bash ${x}
-			insinto /usr/share/zsh/site-functions
-			newins ${x}.zsh _${x}
-			continue
-		fi
-		newinitd "${FILESDIR}"/${x}.initd ${x}
-		newconfd "${FILESDIR}"/${x}.confd ${x}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${x}.logrotated ${x}
-		keepdir /var/log/${x}
-		if [[ "$x" =~ kubelet ]]; then
-			systemd_dounit "${FILESDIR}"/${x}.service
-			insinto /etc/kubernetes
-			newins "${FILESDIR}"/${x}.env ${x}.env
-			keepdir /etc/kubernetes/manifests
-		fi
-		if [[ $x =~ kubelet|kube-proxy ]]; then
-			keepdir /var/lib/${x}
-		fi
-		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
-			fowners ${x}:${x} /var/log/${x}
-		fi
-	done
-}
diff --git a/sys-cluster/kubernetes/kubernetes-1.18.2.ebuild b/sys-cluster/kubernetes/kubernetes-1.18.2.ebuild
deleted file mode 100644
index c333bbabb3b4..000000000000
--- a/sys-cluster/kubernetes/kubernetes-1.18.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="production-grade container orchestration"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-AGENT="kubelet"
-CLI="kubeadm kubectl"
-SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
-IUSE="hardened"
-for x in ${AGENT} ${CLI} ${SERVICES}; do
-	IUSE+=" +${x}"
-done
-
-BDEPEND=">=dev-lang/go-1.13"
-COMMON_DEPEND="
-	kube-apiserver? (
-		acct-group/kube-apiserver
-		acct-user/kube-apiserver
-	)
-	kube-controller-manager? (
-		acct-group/kube-controller-manager
-		acct-user/kube-controller-manager
-	)
-	kube-scheduler? (
-		acct-group/kube-scheduler
-		acct-user/kube-scheduler
-	)"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	kube-proxy? ( net-firewall/conntrack-tools )
-	!sys-cluster/kubeadm
-	!sys-cluster/kubectl
-	!sys-cluster/kubelet
-	!sys-cluster/kube-apiserver
-	!sys-cluster/kube-controller-manager
-	!sys-cluster/kube-proxy
-	!sys-cluster/kube-scheduler"
-
-RESTRICT+=" test"
-
-src_compile() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
-	done
-}
-
-src_install() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		dobin _output/bin/${x}
-		if has ${x} ${CLI}; then
-		_output/bin/${x} completion bash > ${x}.bash || die
-		_output/bin/${x} completion zsh > ${x}.zsh || die
-			newbashcomp ${x}.bash ${x}
-			insinto /usr/share/zsh/site-functions
-			newins ${x}.zsh _${x}
-			continue
-		fi
-		newinitd "${FILESDIR}"/${x}.initd ${x}
-		newconfd "${FILESDIR}"/${x}.confd ${x}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${x}.logrotated ${x}
-		keepdir /var/log/${x}
-		if [[ "$x" =~ kubelet ]]; then
-			systemd_dounit "${FILESDIR}"/${x}.service
-			insinto /etc/kubernetes
-			newins "${FILESDIR}"/${x}.env ${x}.env
-			keepdir /etc/kubernetes/manifests
-		fi
-		if [[ $x =~ kubelet|kube-proxy ]]; then
-			keepdir /var/lib/${x}
-		fi
-		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
-			fowners ${x}:${x} /var/log/${x}
-		fi
-	done
-}
diff --git a/sys-cluster/kubernetes/kubernetes-1.18.3.ebuild b/sys-cluster/kubernetes/kubernetes-1.18.3.ebuild
deleted file mode 100644
index 08ecc8821c16..000000000000
--- a/sys-cluster/kubernetes/kubernetes-1.18.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="production-grade container orchestration"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-AGENT="kubelet"
-CLI="kubeadm kubectl"
-SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
-IUSE="hardened"
-for x in ${AGENT} ${CLI} ${SERVICES}; do
-	IUSE+=" +${x}"
-done
-
-BDEPEND=">=dev-lang/go-1.13"
-COMMON_DEPEND="
-	kube-apiserver? (
-		acct-group/kube-apiserver
-		acct-user/kube-apiserver
-	)
-	kube-controller-manager? (
-		acct-group/kube-controller-manager
-		acct-user/kube-controller-manager
-	)
-	kube-scheduler? (
-		acct-group/kube-scheduler
-		acct-user/kube-scheduler
-	)"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	kube-proxy? ( net-firewall/conntrack-tools )
-	!sys-cluster/kubeadm
-	!sys-cluster/kubectl
-	!sys-cluster/kubelet
-	!sys-cluster/kube-apiserver
-	!sys-cluster/kube-controller-manager
-	!sys-cluster/kube-proxy
-	!sys-cluster/kube-scheduler"
-
-RESTRICT+=" test"
-
-src_compile() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
-	done
-}
-
-src_install() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		dobin _output/bin/${x}
-		if has ${x} ${CLI}; then
-		_output/bin/${x} completion bash > ${x}.bash || die
-		_output/bin/${x} completion zsh > ${x}.zsh || die
-			newbashcomp ${x}.bash ${x}
-			insinto /usr/share/zsh/site-functions
-			newins ${x}.zsh _${x}
-			continue
-		fi
-		newinitd "${FILESDIR}"/${x}.initd ${x}
-		newconfd "${FILESDIR}"/${x}.confd ${x}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${x}.logrotated ${x}
-		keepdir /var/log/${x}
-		if [[ "$x" =~ kubelet ]]; then
-			systemd_dounit "${FILESDIR}"/${x}.service
-			insinto /etc/kubernetes
-			newins "${FILESDIR}"/${x}.env ${x}.env
-			keepdir /etc/kubernetes/manifests
-		fi
-		if [[ $x =~ kubelet|kube-proxy ]]; then
-			keepdir /var/lib/${x}
-		fi
-		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
-			fowners ${x}:${x} /var/log/${x}
-		fi
-	done
-}
diff --git a/sys-cluster/kubernetes/kubernetes-1.18.4.ebuild b/sys-cluster/kubernetes/kubernetes-1.18.4.ebuild
deleted file mode 100644
index c333bbabb3b4..000000000000
--- a/sys-cluster/kubernetes/kubernetes-1.18.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="production-grade container orchestration"
-HOMEPAGE="https://kubernetes.io"
-SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-AGENT="kubelet"
-CLI="kubeadm kubectl"
-SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
-IUSE="hardened"
-for x in ${AGENT} ${CLI} ${SERVICES}; do
-	IUSE+=" +${x}"
-done
-
-BDEPEND=">=dev-lang/go-1.13"
-COMMON_DEPEND="
-	kube-apiserver? (
-		acct-group/kube-apiserver
-		acct-user/kube-apiserver
-	)
-	kube-controller-manager? (
-		acct-group/kube-controller-manager
-		acct-user/kube-controller-manager
-	)
-	kube-scheduler? (
-		acct-group/kube-scheduler
-		acct-user/kube-scheduler
-	)"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	kube-proxy? ( net-firewall/conntrack-tools )
-	!sys-cluster/kubeadm
-	!sys-cluster/kubectl
-	!sys-cluster/kubelet
-	!sys-cluster/kube-apiserver
-	!sys-cluster/kube-controller-manager
-	!sys-cluster/kube-proxy
-	!sys-cluster/kube-scheduler"
-
-RESTRICT+=" test"
-
-src_compile() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
-	done
-}
-
-src_install() {
-	local x
-	for x in ${AGENT} ${CLI} ${SERVICES}; do
-		use $x || continue
-		dobin _output/bin/${x}
-		if has ${x} ${CLI}; then
-		_output/bin/${x} completion bash > ${x}.bash || die
-		_output/bin/${x} completion zsh > ${x}.zsh || die
-			newbashcomp ${x}.bash ${x}
-			insinto /usr/share/zsh/site-functions
-			newins ${x}.zsh _${x}
-			continue
-		fi
-		newinitd "${FILESDIR}"/${x}.initd ${x}
-		newconfd "${FILESDIR}"/${x}.confd ${x}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/${x}.logrotated ${x}
-		keepdir /var/log/${x}
-		if [[ "$x" =~ kubelet ]]; then
-			systemd_dounit "${FILESDIR}"/${x}.service
-			insinto /etc/kubernetes
-			newins "${FILESDIR}"/${x}.env ${x}.env
-			keepdir /etc/kubernetes/manifests
-		fi
-		if [[ $x =~ kubelet|kube-proxy ]]; then
-			keepdir /var/lib/${x}
-		fi
-		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
-			fowners ${x}:${x} /var/log/${x}
-		fi
-	done
-}
diff --git a/sys-cluster/kubernetes/kubernetes-1.16.8.ebuild b/sys-cluster/kubernetes/kubernetes-1.18.6.ebuild
index 08ecc8821c16..71f306a509b0 100644
--- a/sys-cluster/kubernetes/kubernetes-1.16.8.ebuild
+++ b/sys-cluster/kubernetes/kubernetes-1.18.6.ebuild
@@ -20,7 +20,7 @@ for x in ${AGENT} ${CLI} ${SERVICES}; do
 	IUSE+=" +${x}"
 done
 
-BDEPEND=">=dev-lang/go-1.13"
+BDEPEND="=dev-lang/go-1.14*"
 COMMON_DEPEND="
 	kube-apiserver? (
 		acct-group/kube-apiserver
diff --git a/sys-cluster/kubernetes/kubernetes-1.17.5.ebuild b/sys-cluster/kubernetes/kubernetes-1.18.8.ebuild
index c333bbabb3b4..e558ad11199b 100644
--- a/sys-cluster/kubernetes/kubernetes-1.17.5.ebuild
+++ b/sys-cluster/kubernetes/kubernetes-1.18.8.ebuild
@@ -20,7 +20,7 @@ for x in ${AGENT} ${CLI} ${SERVICES}; do
 	IUSE+=" +${x}"
 done
 
-BDEPEND=">=dev-lang/go-1.13"
+BDEPEND="=dev-lang/go-1.14*"
 COMMON_DEPEND="
 	kube-apiserver? (
 		acct-group/kube-apiserver
diff --git a/sys-cluster/libqb/Manifest b/sys-cluster/libqb/Manifest
index a3f598de0005..716ea66dc037 100644
--- a/sys-cluster/libqb/Manifest
+++ b/sys-cluster/libqb/Manifest
@@ -5,5 +5,5 @@ DIST libqb-1.9.0.tar.gz 225147 BLAKE2B d8200d5eec8c05a18675de585e2f85694d3d062d8
 EBUILD libqb-0.17.2.ebuild 1155 BLAKE2B 3028a41671305e4202f7535905fb0d9636659456c254a7817d26ed8f1c77210d0bf551bd86a748e5ef114055a0ca2964155bb26f119a8af5c10b1cd71addf2f1 SHA512 89420a61581c365561d5cb25601efd84c0ef331e4b8666a80e64fc4d83b106e6518ae11d98079b5a37a8e63303e11186522fa45448c4751da7f4e7e95826270c
 EBUILD libqb-1.0.1.ebuild 1167 BLAKE2B cb36195482930926022160f4fcc37636f83726daee2a56f382370341e2b9a4729e875929a1f0a014b6d46511d920727b9c72b4ca838c4bca3bb70cb70d9f0ad0 SHA512 f6fa8cd1e1d2513827bacb46898596072bc3b5c2b9369b3ed29164585a83e4051aaa82e5d691f346d7c39ba3c63bac23c36dccbcd171d725c656b6bbd55a8dc1
 EBUILD libqb-1.0.5.ebuild 1004 BLAKE2B 8aeaecd43035bd49dc1ba587aa435fc295aa5bf59826bbb72d9c922f9b822f89c8dc046add84fd92639aa11ee88543eb6c4bdbd274def5e0461943c6fed141a7 SHA512 6101d690fd176d773a21e7b357ca9be5100a028b46736db385c22f5342a0a8f4f0b250cc9182f2b31460dd0f4cbfc211fd4cee6f181edcac0ec1b57e5ef18399
-EBUILD libqb-1.9.0.ebuild 1324 BLAKE2B c8d226238ef2a15b55e7796bc66dbd168bf538e6bd2ea00558bcb92073a2b3932959d09ceb0a6637e5eb6c5ba6cd8657be1a0d2636d1e54537fb7563a287a042 SHA512 d8b337bd282416ba5786035b22d89d652fe088350e7e44718e1ff3de6f452343f77b095516cc307c14fce4e8a1f687fc029e4099b0aa3c0c6e398b94cfa701f1
+EBUILD libqb-1.9.0.ebuild 1328 BLAKE2B c8ababd6a724d196249a05146224eb8e70e70fc0c58c7830585277cf55a384a8d18eea7a72d717cb88d107c93086d697d7f4bbd24e555d1400bc7c4a2a76247a SHA512 ddefa40b02e919296a5f6c08c0f00746d1c917499e6d8ad134c8fc884848c7207278c7f4b8e93629914dedb4f583f918da946f4f06b691ff4e83de4e540260a0
 MISC metadata.xml 339 BLAKE2B c62f10b2ef4d7efe87b20e68a511c136192cdf33cddb9dee961099a44c26179f78ccd2804dacc21f6e72c2a5266f2274b332f656c3e5a1ad4f0fdad7ad33a0ab SHA512 39cccac769c39f6b8f90500c1b8f21e6ab65429ec1d992e7aa0025bc161d1ceffa28796accba321af01b75671c11ae6cacb4c8b4ab5ef14dbc8ef103dfc9f0b3
diff --git a/sys-cluster/libqb/libqb-1.9.0.ebuild b/sys-cluster/libqb/libqb-1.9.0.ebuild
index 6ae629bdc2fe..fcdb691d7d07 100644
--- a/sys-cluster/libqb/libqb-1.9.0.ebuild
+++ b/sys-cluster/libqb/libqb-1.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/20"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~x86"
 IUSE="debug doc examples systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-cluster/lustre/Manifest b/sys-cluster/lustre/Manifest
index 4a7415896461..bca36cac823c 100644
--- a/sys-cluster/lustre/Manifest
+++ b/sys-cluster/lustre/Manifest
@@ -2,5 +2,5 @@ AUX lnet.initd 933 BLAKE2B b59c85c589adebc6ff65484546804ba3857a32ce226baab4dca16
 AUX lustre-2.13.0-gcc9.patch 14815 BLAKE2B 11a28292c2c3175e5da2cc0521fe63c5ebc7d3265ee7e23443f755ba8e92f6c3b83f1da71119091e5f706bbf3d90485488db442d16e8b4387479c8cc539ad5e8 SHA512 fcb3de98bcd64f3562444928aa1adc2d935b66a19330a7b8e485e8cd468f8517bb0862b89c468ee243dbf8689675c78fbf565cb371dc6eb95ebd1803bf2a4bf9
 AUX lustre-client.initd 1099 BLAKE2B 89508197c5101e0e382da13720424cf526a6c2503719cab411c3cf03711a8b69bb3e8b043c3555fe3cc01a2ac748234f24b311348941689ded17b708a7c49868 SHA512 b535e81208bed0fadad6e140a6b11ee1786a957f1628a819954de72af02d6794346dda0eb2fdcd8583a9aebd1832e70539d9ca292f2dc34e104f2f61caa8e1f9
 DIST lustre-2.13.0.tar.gz 14598623 BLAKE2B f53b7fa455144f50ed7dd12150b9195fbc6b951a663df2a1a914aeeae79723cc0c0515c0c501fd67769e163b7026a341d679dbddbb590f6c63d1af0498dd44fc SHA512 6da16abc1ecaa6711bf727925ad327164c5b0d9918a7c864be8c3aa36b31b191154139ba718a0f84e4905907c265a0ce2a5394b44f1b85cd90880b3bfcd0d69d
-EBUILD lustre-2.13.0.ebuild 2680 BLAKE2B 18b831187edf37b20aa16aa88bc737272dff9b58b42e5cda03218691c5a88c5443f08452f49b25c3099d7c3383db9ed0de361bc4051b0720835370e2407e96d9 SHA512 231a1a14fb15b852c248c2d99a864fcd5f52b7f7424ab608dfb0c7bc86844dc5208e2b6f389bf24f02e20dd81e1dc86f46c27192052e460ea3afdc3cc8c776ec
+EBUILD lustre-2.13.0-r1.ebuild 2680 BLAKE2B aa92d737a52872ccceb89f6de77ab59ffb97d1225074c18627ddcff942f0ebe4821e091248042b84abfefb7b1e11d399d2c247c5eaaa8d63505981e2cdb102b9 SHA512 4711f11d0f5afea2449ebed358e4ea68b208a068ea273d86a88c38838b7b55a67ffebff74a77efb4c82c6909dee2b7bd88290e9086e79d0223d90c722746e8c1
 MISC metadata.xml 799 BLAKE2B c09b90ad5217999be2aa9bf20b87ba422c9b900c82e3ceaebbb55c37c99958b3e0d9f15c8994dee1cd83e2e84d69625bdca2aa08d36c2959b3ebba09790b0af0 SHA512 b2349a99b6292589846929421a8569e0fd9b5dd8c7aefa5c3bb5c1e4cb9afb809f2fb6e63b163265a4402188344226bca85bff07c9f2da809ffc0d388e6c6d88
diff --git a/sys-cluster/lustre/lustre-2.13.0.ebuild b/sys-cluster/lustre/lustre-2.13.0-r1.ebuild
index adb48cea0e3b..a14ceb151065 100644
--- a/sys-cluster/lustre/lustre-2.13.0.ebuild
+++ b/sys-cluster/lustre/lustre-2.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,7 @@ RDEPEND="
 		>=sys-fs/zfs-0.8
 	)
 "
-BEPEND="${RDEPEND}
+DEPEND="${RDEPEND}
 	dev-python/docutils
 	virtual/linux-sources"
 
diff --git a/sys-cluster/nomad/Manifest b/sys-cluster/nomad/Manifest
new file mode 100644
index 000000000000..73cd58087f7b
--- /dev/null
+++ b/sys-cluster/nomad/Manifest
@@ -0,0 +1,6 @@
+AUX nomad.confd 70 BLAKE2B e7cd65e529d1a8d99212a3267d3dc8d6f6d8b310f7cbda77e31f6c6e26af41fe6866ea1c9dd579caa89b39edff2e7f70553d70d600e84cdc04dea25d50ed8883 SHA512 c4e646b97335123c6411b0a556eefb4a59198db3277ed5a833410b25a7ab9601548a5cb7dd041e031e55098e4d4c022d4b16b0ae9ba1a32358eb5d9403f4d7e9
+AUX nomad.initd 534 BLAKE2B 392ba0c199a401c278d47f2fb068831f331485d34eb6d81d7e14df60cbcc62f3ecc01a200e5a8ac00ab734789c07d6bcd73391e67d5141f04365c08935c07d62 SHA512 63920465cc4346e6d79b54afd0c0ad418a06c5f977edf8a49adb8b2895390cc13d48a18fc377de91c92449af5095347c36aecf67eda528da76209e77130f2b98
+AUX nomad.logrotated 83 BLAKE2B 2c970621c10520b2aaa17172d9c99a741737393db9a6424278e12d8b6676492c97b628d4be419ab921f7cf7685bae1a5e93eb04efa2ca6242012cfde203e02da SHA512 0ebdbeab15b01145eb2b33e0c6fd43dde3e4ac8eae9d8aff81797688276530732f613a39cd658fa4f5c2e8c99d70e6255f814ca5f3cd2bc5de259be324ab2851
+DIST nomad-0.12.3.tar.gz 51432205 BLAKE2B 77090f387e25f226c8d05b6ea16abfac0f4b710a40a3e7e5455bd6c8b7992080980967d4ebb92257348968dddbb45d2e5c3b58f143ae1205742bf08f0dec2a71 SHA512 17d361db11104ddbbae12a17301005c8eca3650e3fdda8f2fd6db8474728f31a2b6f828f2fba7e7d9d132b08cfb070799273353a17f5f66baa4dc5a0492562f8
+EBUILD nomad-0.12.3.ebuild 1152 BLAKE2B 5e46d8ab1d030bbbec3dc69ae154e2b362429c3256fd5689bed9ac5d108ac9d9a601a1e207a5b09f227d5ccff12ed4272a89b812cb21a0e9c94e4b0d5f3c1334 SHA512 7e922cd5d79af1d7d53f9304554ce11ff3dce19041b9a6571889888a081a3bd7f42f0ee284d12bd7ef5ab8cf71b0aceb148fb482d922bc57e4d5d994f3b1b1d8
+MISC metadata.xml 324 BLAKE2B bff415652c0d5fd2e56766c32b6e5df0d9bd00808cee31a70dc36db2e558383e2c489a5315273a42b5fa14723aa88fc659a248589f0d849425cafb5f78ec75c9 SHA512 b8e9827b4c5dd03abac84db21aab8f2743e1421c45aab547bf754165767307e9f60b29b541ab7cc4242347f1510226896db815832d4780fb606c92f9d804c163
diff --git a/sys-cluster/nomad/files/nomad.confd b/sys-cluster/nomad/files/nomad.confd
new file mode 100644
index 000000000000..b0a05ca40c60
--- /dev/null
+++ b/sys-cluster/nomad/files/nomad.confd
@@ -0,0 +1,2 @@
+# extra arguments for nomad
+command_args="agent -config=/etc/nomad.d"
diff --git a/sys-cluster/nomad/files/nomad.initd b/sys-cluster/nomad/files/nomad.initd
new file mode 100644
index 000000000000..2c3df5ff1e0e
--- /dev/null
+++ b/sys-cluster/nomad/files/nomad.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="simple and flexible workload orchestrator"
+command="/usr/bin/${RC_SVCNAME}"
+pidfile="/run/${RC_SVCNAME}.pid"
+command_background="true"
+start_stop_daemon_args="--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+stopsig=SIGINT
+extra_started_commands=reload
+
+depend() {
+	after net
+}
+
+reload() {
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+}
diff --git a/sys-cluster/nomad/files/nomad.logrotated b/sys-cluster/nomad/files/nomad.logrotated
new file mode 100644
index 000000000000..6cae2fdd4f76
--- /dev/null
+++ b/sys-cluster/nomad/files/nomad.logrotated
@@ -0,0 +1,7 @@
+/var/log/nomad/nomad.log {
+	missingok
+	size 5M
+	rotate 3
+	compress
+	copytruncate
+}
diff --git a/sys-cluster/nomad/metadata.xml b/sys-cluster/nomad/metadata.xml
new file mode 100644
index 000000000000..9f6cd416f2b5
--- /dev/null
+++ b/sys-cluster/nomad/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+		<use>
+			<flag name="nvidia">build with nvidia integration</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-cluster/nomad/nomad-0.12.3.ebuild b/sys-cluster/nomad/nomad-0.12.3.ebuild
new file mode 100644
index 000000000000..79ff227381ca
--- /dev/null
+++ b/sys-cluster/nomad/nomad-0.12.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=ef99996f1419334e1d9d23eba9d24e7d9404218f
+
+DESCRIPTION="A simple and flexible workload orchestrator "
+HOMEPAGE="https://nomadproject.io"
+SRC_URI="https://github.com/hashicorp/nomad/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="nvidia"
+
+RESTRICT+=" test"
+
+src_compile() {
+	local go_ldflags go_tags
+	go_ldflags="-X github.com/hashicorp/nomad/version.GitCommit=${GIT_COMMIT}"
+	go_tags="codegen_generated $(usex nvidia '' 'nonvidia')"
+	CGO_ENABLED=1 \
+		go build \
+		-trimpath \
+		-ldflags "${go_ldflags}" \
+		-mod=vendor \
+		-tags "${go_tags}" \
+		-o bin/${PN} || die "compile failed"
+}
+
+src_install() {
+	dobin bin/${PN}
+	systemd_dounit dist/systemd/nomad.service
+	insinto /etc/nomad.d
+	newins dist/client.hcl client.hcl.example
+	newins dist/server.hcl server.hcl.example
+	keepdir /var/lib/nomad /var/log/nomad
+	newconfd "${FILESDIR}/nomad.confd" nomad
+	newinitd "${FILESDIR}/nomad.initd" nomad
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/nomad.logrotated" nomad
+}
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 88cc7b7707d6..1987d84f0a0c 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -11,6 +11,7 @@ DIST openmpi-3.0.4.tar.bz2 9308341 BLAKE2B 84536082f8415c9a0e41db01d96d64bffc463
 DIST openmpi-3.1.4.tar.bz2 9468371 BLAKE2B 70a93aa170086f43b2eb4f9b7c74673065bd309ae7a4c8f478a6db7523167fd1d25af19f87661149f6dd6033898ab47b86690a0421a01aa6f5a4d70478072e0e SHA512 5b4aafffc79fd85cb94a11a6e2fac563b142ac532191009eb35826c432ed3c391a6616e2ca92eacbf36137468eadb7c0f7ddc787034bc95c4214232ed5128338
 DIST openmpi-4.0.2.tar.bz2 9819372 BLAKE2B 000faa8ff032f9aa6bf5f0a14fb9a363080cfcdd7c6f8ab90bc9507fd7a473d70502574ee1e75c88acecb06c516a643ef7b9e804fb580be9fc860b7b1fb1cc5d SHA512 634d45d989f1e0b8848bfb4eb4527c7edd76d4fccd77a5f8d85a46a5822f97ba653adf13df857c87ae56a8117b4ae2d45ec24249c6ee41a562446d4112ddb770
 DIST openmpi-4.0.3.tar.bz2 9856669 BLAKE2B 571e8038cdf125bfb452fbee44d8397f8e724498971409fb25e11cc90ad4d7f9106f4ad093d4722754303808b82c58bf3b39a72a2567192efd1b98422f09160f SHA512 01f773064c575a0fe6ab081c20c5cf07ba1c9eada5ecfe520d14ce2b9fc6d021d0f56a0159fa354fd6c8e2bb7354a272aa8d0063b351f59251deb56474849acc
+DIST openmpi-4.0.4.tar.bz2 9748444 BLAKE2B 3c3258b7cd71156deec317479ac1ea9766b09447b77174e448a63dab30f75a525c4142159ff58ad0b6208282e36d568e4cd4e7cc1f8b9b34cad8561ce2969a72 SHA512 6c193b4b5cbfd9d48fa5efcef01372c424b51ae5e9727ccf4235e3b14556dfeb010865e41a9473419ccda16559139aa469086b1fff9abfd337e87387fdec1c64
 EBUILD openmpi-1.10.7.ebuild 6265 BLAKE2B 33362f7aa92673ae525b737239a81d608db4b783e62130bf30a6cc1b29d6f59cf2f3bff21e3d0389e582d81b25e7949eab5de965e124e7b3d5b6b538343f33e8 SHA512 5434a10d4c06ad6cc4da12ec45192ce2f08ff0c95bf138487b75b81dfb6a6055b5bcb6d81827e885935ef8481907f631268e9d6065fba330ec3e553f9ce10806
 EBUILD openmpi-1.4.5.ebuild 2413 BLAKE2B 0e4c9ad51c2f7f44449b0a5d3e1400de600f5337d591dcb89eb938455afa24d891573e03abdfa7434432b8377ffb3f9aefc291881713de0b80fe50322b962ba7 SHA512 187962e3788b94607b9a22728c6f90405cd4c49007413e9d0cfb4df45d5e67f30bcd2129ae8132d08460d9760891f2b15539f995e481962d91c2b7c5a7005002
 EBUILD openmpi-1.6.5-r1.ebuild 4944 BLAKE2B 8e5686a037431c45d7ebde9e82e633f138dc887ca2f1cc2ae24e76dc800ace2a79f63f6c7804794cde1cad5ec7e84b00ded707d84424d7a6413da9c80359fb51 SHA512 008b5b5ad61126d5a758784f6c2c805a55837de6dc109c11758941e2e3a414d3361ba3dbb3959185e2b6b3f02eb7ecf4a8aadb76bea0b872e463c13620a48a08
@@ -22,4 +23,5 @@ EBUILD openmpi-3.0.4.ebuild 5379 BLAKE2B 7cede9248edcc56701ac64c26fdc16445b0dfbd
 EBUILD openmpi-3.1.4.ebuild 5379 BLAKE2B 7cede9248edcc56701ac64c26fdc16445b0dfbd1488b791638d50861dc301b36780abb49b23499d3551333fe4ec005428eb86cb3d546d21d6559a2b995dd38be SHA512 2ed00f544c10841e646a33e14255b17c86e6ef356d57ff94c3e6fca992b6f38957ec537f0d47812c74364b4bc7a00b79761093b3dab260de60a2e5ea1926a320
 EBUILD openmpi-4.0.2.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.3.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
+EBUILD openmpi-4.0.4.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 MISC metadata.xml 928 BLAKE2B f6cacb50815977ad28b83ec24725021a140db9592152d2a9e238da051058287c01c73ac557392946f83949caee2f75a847ba5e82c4b6f816ab3f8288aa38b719 SHA512 a7ba5e4bfc8e6c1a74667f31c4d8df580699fa84766cbc597a66c1a0ed12ece60bf1f683fcbd30529b042588ae4460741b4eef407e232532a3eede1766326f1e
diff --git a/sys-cluster/openmpi/openmpi-4.0.4.ebuild b/sys-cluster/openmpi/openmpi-4.0.4.ebuild
new file mode 100644
index 000000000000..082ecda8d6d3
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-4.0.4.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+	openmpi_fabrics_ofed
+	openmpi_fabrics_knem
+	openmpi_fabrics_psm"
+
+IUSE_OPENMPI_RM="
+	openmpi_rm_pbs
+	openmpi_rm_slurm"
+
+IUSE_OPENMPI_OFED_FEATURES="
+	openmpi_ofed_features_control-hdr-padding
+	openmpi_ofed_features_udcm
+	openmpi_ofed_features_rdmacm
+	openmpi_ofed_features_dynamic-sl"
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="https://www.open-mpi.org"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="cma cuda cxx fortran heterogeneous ipv6 java romio
+	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
+
+REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
+	openmpi_rm_pbs? ( !openmpi_rm_slurm )
+	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
+
+CDEPEND="
+	!sys-cluster/mpich
+	!sys-cluster/mpich2
+	!sys-cluster/nullmpi
+	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
+	openmpi_fabrics_knem? ( sys-cluster/knem )
+	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
+	openmpi_rm_pbs? ( sys-cluster/torque )
+	openmpi_rm_slurm? ( sys-cluster/slurm )
+	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.6 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpi.h
+	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
+
+	elog
+	elog "OpenMPI has an overwhelming count of configuration options."
+	elog "Don't forget the EXTRA_ECONF environment variable can let you"
+	elog "specify configure options if you find them necessary."
+	elog
+}
+
+src_prepare() {
+	default
+
+	# Necessary for scalibility, see
+	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+	echo 'oob_tcp_listen_mode = listen_thread' \
+		>> opal/etc/openmpi-mca-params.conf || die
+}
+
+multilib_src_configure() {
+	if use java; then
+		# We must always build with the right -source and -target
+		# flags. Passing flags to javac isn't explicitly supported here
+		# but we can cheat by overriding the configure test for javac.
+		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	fi
+
+	ECONF_SOURCE=${S} econf \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
+		--enable-pretty-print-stacktrace \
+		--enable-orterun-prefix-by-default \
+		--with-hwloc="${EPREFIX}/usr" \
+		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-libltdl="${EPREFIX}/usr" \
+		--with-libevent="${EPREFIX}/usr" \
+		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--enable-mpi-fortran=$(usex fortran all no) \
+		$(use_enable cxx mpi-cxx) \
+		$(use_with cma) \
+		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \
+		$(use_enable romio io-romio) \
+		$(use_enable heterogeneous) \
+		$(use_enable ipv6) \
+		$(multilib_native_use_enable java mpi-java) \
+		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
+		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
+		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
+		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
+		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
+		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
+		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
+		$(multilib_native_use_with openmpi_rm_pbs tm) \
+		$(multilib_native_use_with openmpi_rm_slurm slurm)
+}
+
+multilib_src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
+	if multilib_is_native_abi && use fortran; then
+		mkdir "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
+	else
+		# some fortran files get installed unconditionally
+		rm \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			|| die
+	fi
+}
+
+multilib_src_install_all() {
+	# fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
+	fi
+
+	# Remove la files, no static libs are installed and we have pkg-config
+	find "${ED}" -name '*.la' -delete || die
+
+	if use java; then
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
+		java-pkg_dojar "${mpi_jar}"
+		# We don't want to install the jar file twice
+		# so let's clean after ourselves.
+		rm "${mpi_jar}" || die
+	fi
+	einstalldocs
+}
diff --git a/sys-cluster/pmix/Manifest b/sys-cluster/pmix/Manifest
index 922bf10d696c..a01890afba52 100644
--- a/sys-cluster/pmix/Manifest
+++ b/sys-cluster/pmix/Manifest
@@ -1,3 +1,3 @@
 DIST pmix-2.1.1.tar.bz2 1063090 BLAKE2B 35a3bf7d297d399e897f9b9f748e176262cc0fde5afbfc9ea1e21e5c1550cf0081d9924692d7592fe1224eb727a9c3bb7b3fd216ae1b9e09dd29aefe83ac9eba SHA512 2e5d4b3c907ea9f54bb2b682c63fedb6e6c5cfad578c51bb64c805368ccd35adb317fc472867c717e0cd1d90bf13b18655a62041840c33b4a178c25bb3297d3d
 EBUILD pmix-2.1.1.ebuild 660 BLAKE2B 5306589085c75c03a54d21ee9a10d50edfa8cbc8b4f33ec91d3159fe20f40fe1f3e4239df51031e909f97859fe312a7d2610347f6f7d73b621072d6ffefd08a4 SHA512 9f978588d588a0fefe51a0302e9d3a558feadbab7b7ea86692edb333d23a971152fd21a7d6d38b9f8123872649ec8e707ecceabea3c5d814ce1da02774c99786
-MISC metadata.xml 493 BLAKE2B f00201c1cec238be71a02be6d1874f5b391d48313a3ddb28a4985e439aabd90370c6cb34a662adef299f02025795726a65b316211bb668e14d5f83dcac1f6850 SHA512 b7b360f154a771d0b4b2deb4485b5816584aa24ba2d32e88e1a8867d4acbe1180426b67d4166bf39bd7b083714920cd3dcd7bbec3d99e6fe7ab991598ab97754
+MISC metadata.xml 388 BLAKE2B 1a4d727781b9c8d7215016a8e044595c1ee381c60facfc627c56f1cf0562f71359a6792a72bc3b642d7552fb996e49e8c40fd2bf9784921c8ae70fa4d41bd5a9 SHA512 85180bd1290f9d6d2be3cb8f08a3b1c5038c9185854d8fcbb7875631b7ae7b964b67a78a2f7343c7d56f227d6609288a9986205ade028e7906e6d9e329ca6ca7
diff --git a/sys-cluster/pmix/metadata.xml b/sys-cluster/pmix/metadata.xml
index f0314db0b37c..72c4a4e8921b 100644
--- a/sys-cluster/pmix/metadata.xml
+++ b/sys-cluster/pmix/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jlec@gentoo.org</email>
-		<name>Justin Lecher</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 2fbddfbf3f52..f80765d369b6 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -2,17 +2,7 @@ AUX ibacm.init 211 BLAKE2B 4f3b2ffb7cbc7f42b14dad5c02bce698feaf079ff75a2f7a7c9d7
 AUX iwpmd.init 211 BLAKE2B ce37edeceae812b999cbcd15b9c9cae55125de0d94ac6983e953117a265c444ab4f9b7a09053c4303c260f1df59cc916ff7f1a89ca6f937a42c2cace6a2a88b4 SHA512 e08d8521d74aa4e266e11833750682974bede45e2b7c42ee3d4ba7cee5695f6e7f5c3c5963b57186f6f669a752faf4c5f4c51f92065425ff6ce859be9affdb07
 AUX optional_pandoc.patch 1611 BLAKE2B 5f6c4f8ebe1379cf733b4b1829f39bfc34ff2715cd3be172a609518560c97adbfeec15a648d3205a3016f24a0e99db4be6cb6602672046b96a01c998fd314b6f SHA512 b9c1be47aa530231d0becf6bd313d881262f5360985206371daf96377f657f4aa1b52227ae371e21154edcac48ccf6b1433f84b689cd373b02b844782654c2c2
 AUX srpd.init 546 BLAKE2B 40a03607fd4a85b821a71b98373b5c59f721bb2da78afbede8299ae6eedd402776c4ee3b4965c7df0b8b1816969a715351a1e659e4a26abc99808e93ef69f6c9 SHA512 14c1dac4581943855c362d7a37ef31a87be458123dd890bdcfb75c35b71b0a6e789a819c768ea352b3846af29ab5c3b1872cbe27a2e127b8fc8c93a835428190
-DIST rdma-core-26.0.tar.gz 1444585 BLAKE2B 148b25f6108199b3845446e9f45a59d089e7f546218d70abeadffd5cf3e0b26569bc5099abfb6152f376689e04a493529a61fc1d6b40c153aca23b5df2776bf7 SHA512 7dfdd93d10e4c56cac5ac0c1b46900fe7a6c634920e470ebc582abd7a0f57c57d585b4e0dbbb5ad84f46ca8518132e684d44d33c62b0509461ed5b62b7e0f19b
-DIST rdma-core-26.1.tar.gz 1601313 BLAKE2B 459baa80d5cb74386e567880ec7fd2de9e4aaea177e7022603db5dd70f633152d86618bbab637ca337a9314c0c19b5c0f6a51f281802fa0b8bedb8fad149f26c SHA512 98f0e3f3e951f3b2287711526a2a6c62cb4e0f5eb693894c7f44783c5eb6d4213c9eedc39b2370563e8bca17e133497e475392004ace0203d2a39de371254742
-DIST rdma-core-27.0.tar.gz 1445552 BLAKE2B a038653865f8d37b6599a54ca7fef97b2ac131b3a11ce8696b5c1ec558e85332e950f8d5104f250b23a186224735b2a338fc03f875979bff342ad26ebb5b74b2 SHA512 8a299f4d3fe6ea98d8fc8d8135295e55c8bbf5d0d5f2e5fd362a5eb96d86f5aa84263736ab80a3c0eb104c7fc5fb5d43a2077cc6a1fed3d346af89597a4ddee2
-DIST rdma-core-28.0.tar.gz 1455729 BLAKE2B cee2030bda14d3833fa6e851e85d92ec7f91363a09e11bb7ce939ae144e4edbe32653a759a573d94a735ba6766911cb491e7871722bad81e45c3744dc3b8683e SHA512 aec8b8a0d67bcfe42d9d4a53f93bf03ead14fc6f8887fc9f05b2f1ccfd1aae1214c49ecbc01f16b585f71369e3c7a7e2c8d2adc42aa9b31436939b3f3038fde8
-DIST rdma-core-29.0.tar.gz 1467415 BLAKE2B ecea77fcd4b4033f81aef9cd9b483cc97b1f4af7c73030c2f94e8242be178c53c5d62aef4d3db7de60e2b7a9cf068bbf851915385912c8ef795c406c4e45a4f9 SHA512 4b12cd0fdf01a827831081cbe9bbb927173cb600edc51e2befe5e6c3cd88c90069d2872d839ef98e87c59eee777da6429dbf5e8621b6e872e0cf99857fe6d78b
 DIST rdma-core-30.0.tar.gz 1485452 BLAKE2B 8774a41eaba486007a4b695fc5196935102c172607136ca37d03fa626c5bb0b75df7b9cc6a6126219111b4ba828984ffbb235e9afee1e941852650a2b2412dc7 SHA512 4a0ec689e27de71f33e21df9813f78bec81b99c941da234d8d4050a3e1a1b157488d7a4d58d7f62472f32061a36dadad43d986238dcbaf24a29dded3827ec374
-EBUILD rdma-core-26.0-r1.ebuild 2513 BLAKE2B 519c57cb9eb2e8ddbd666668c50e186b106eeff016f8be36ee3f15afadcc7851f65f16684355d4deee14ec66ef0770391fcd3f202423b6a6dc926c26c40afbcc SHA512 f81a43e2b04de7479b61fb626a1dc701ae21bf6c14af586574950965195d8541c09e663a678b5a28a3db658c57da2dc010e7071dcae2e32b465b140a18b3a7fb
-EBUILD rdma-core-26.1.ebuild 2514 BLAKE2B d63803233031ebe7765c685e24a28751f1e83433b49ad7dd6a167d97c007d4076fa3ba01015404ac24897997ce21ada5e634aad920911e9e3e0ee8f74c8517e6 SHA512 3b31ab7ec3630268d4f072046404ab129c3b5539054343d29361d56bdd493b01a04f05701f4bb7f6362787e6144f0dfbf43a6105426ab10b02aa3ed944922801
-EBUILD rdma-core-27.0-r1.ebuild 2545 BLAKE2B 3527d23b09d389391992ab23b3c54f328fd1ca6439ec45da9ddb90aa594a7aa917ffe29103713e9d2c761044e71fdcbcef55a0730d4a8e74cc4381813a1c61b1 SHA512 91230439a73aff381201d3b34076e1481e21fef3ff6d8760b90894bfa4512397c4d1d7a198e1a9430cd702c90e1e3379fd2e98c07946e9e3a62930b31106adb4
-EBUILD rdma-core-28.0.ebuild 2564 BLAKE2B 837c8f2ba32ba2f92e036d1787a35e94504817450f045a470657408b6de1bb6b1601921ca1b82f60f863db259970c049338f292edba422fb43af940b78a1944d SHA512 74da15e37968be9013b0d90f44f3e05b264bbf410aa703b64d94c045ef3bbc43b522fbd507c5d938a5177312449fa0c12e81d36dd4332ad5a0a76530dbd8cd2f
-EBUILD rdma-core-29.0.ebuild 2552 BLAKE2B 864eba031ea08c1bd5603e368ecbc93c3a3f2689e74624ba04509c35fe6369692aedbfa29c8a3429aa96a816531aca9e8f7e8b81dd44d1e06fdf5e771a51d966 SHA512 c1023e7c6368f19056802107e7e605aa8d74cbb55ac326882c28d1bda5c8ff7a8d5b16e805f632cefc19dcc1e98c3d39b3de008cb00006cbd32677782e464eeb
-EBUILD rdma-core-30.0.ebuild 2559 BLAKE2B 3272f98e3048bb752d0368b64f6ef7f5c8feebdb6b88e175e6dd55cc353a8cfb0450091398ab4d63fc9fed3c1579b192de009059ce0be845d681010278c9ab29 SHA512 374a5cefd7e7bb3c9f7c1ed9b5993b3980bcf005991489fbc3ec7dcc6ba2136d4b9639b092cbbce31d76c74e23a87a7b5c61f7c35d02a70076175a72daee0a0f
-EBUILD rdma-core-9999.ebuild 2472 BLAKE2B d1883898cc9fe6f89ce89377ec7f4141c60b7c945d7152c2c59548e396a5f771a4a2b75028886fc2131d51288005ca07de08e347c235d5bb4b75398f9b9b7d92 SHA512 2768d543d83416c519c7305af1ad66c9c7370d090a249fd5d9a5c79cb3245bd5c1824279f1cf8c7ecb26fabaf618adf96d1bcac1a243fb9c3c788d618fa2a8e7
+EBUILD rdma-core-30.0-r2.ebuild 2585 BLAKE2B 224cb66aa37702a2617b06832b9f465dbd7dbccdefacaa71644fb65c134f309adbadf3bf372d23be7259813fde6fee647d057ccdc5773e8c1741480fa1c14a9c SHA512 59b37e4fe68bf9949ed2c5c8d8fb5aa4ab26c255b4261c3c7effcee989204d4b69d9677523600d3b0807cdc88b2711211362a3834077cc8ec2f793c97239e2c8
+EBUILD rdma-core-9999.ebuild 2585 BLAKE2B 224cb66aa37702a2617b06832b9f465dbd7dbccdefacaa71644fb65c134f309adbadf3bf372d23be7259813fde6fee647d057ccdc5773e8c1741480fa1c14a9c SHA512 59b37e4fe68bf9949ed2c5c8d8fb5aa4ab26c255b4261c3c7effcee989204d4b69d9677523600d3b0807cdc88b2711211362a3834077cc8ec2f793c97239e2c8
 MISC metadata.xml 559 BLAKE2B 1526777511ab5118d4de73361959107221858659ebbc60f52eb09b45d0798d969f847e4f157501ed6e8c85c2cee1c93d0b26989b357141bba45af946e2e5b0a1 SHA512 5d69acf3d0a323c0d2ee66971fd058c6c0ebf59e4fac0d4777b15bfcc7db8f515b67e6059d204346404ce3b26cdd77c2bea21e1132f418498fe1523eb16dccbb
diff --git a/sys-cluster/rdma-core/rdma-core-26.1.ebuild b/sys-cluster/rdma-core/rdma-core-26.1.ebuild
deleted file mode 100644
index 39537f768f10..000000000000
--- a/sys-cluster/rdma-core/rdma-core-26.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_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
-
-	use python && python_optimize
-}
diff --git a/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild
deleted file mode 100644
index f8ee8760f4e5..000000000000
--- a/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_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
-
-	use python && python_optimize
-}
diff --git a/sys-cluster/rdma-core/rdma-core-28.0.ebuild b/sys-cluster/rdma-core/rdma-core-28.0.ebuild
deleted file mode 100644
index f476dc0f72b1..000000000000
--- a/sys-cluster/rdma-core/rdma-core-28.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_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
-
-	use python && python_optimize
-}
diff --git a/sys-cluster/rdma-core/rdma-core-29.0.ebuild b/sys-cluster/rdma-core/rdma-core-29.0.ebuild
deleted file mode 100644
index b5518fdad7d5..000000000000
--- a/sys-cluster/rdma-core/rdma-core-29.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_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
-
-	use python && python_optimize
-}
diff --git a/sys-cluster/rdma-core/rdma-core-26.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
index 39c6e4a73b19..6d11c3600ccd 100644
--- a/sys-cluster/rdma-core/rdma-core-26.0-r1.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit cmake-utils python-single-r1 udev systemd
+inherit cmake python-single-r1 udev systemd
 
 DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
 HOMEPAGE="https://github.com/linux-rdma/rdma-core"
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	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"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 fi
 
 LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
@@ -59,14 +59,14 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=( "${FILESDIR}"/optional_pandoc.patch )
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_FULL_RUNDIR=/run
+		-DCMAKE_INSTALL_RUNDIR=/run
 		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
 		-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d
 		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
@@ -84,19 +84,21 @@ src_configure() {
 		mycmakeargs+=( -DNO_PYVERBS=ON )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_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
+	if use neigh; then
+		newinitd "${FILESDIR}"/ibacm.init ibacm
+	fi
+
 	newinitd "${FILESDIR}"/iwpmd.init iwpmd
 	newinitd "${FILESDIR}"/srpd.init srpd
 
 	use python && python_optimize
-
 }
diff --git a/sys-cluster/rdma-core/rdma-core-30.0.ebuild b/sys-cluster/rdma-core/rdma-core-30.0.ebuild
deleted file mode 100644
index 66af444d7865..000000000000
--- a/sys-cluster/rdma-core/rdma-core-30.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_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
-
-	use python && python_optimize
-}
diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild b/sys-cluster/rdma-core/rdma-core-9999.ebuild
index a8c381b38698..6d11c3600ccd 100644
--- a/sys-cluster/rdma-core/rdma-core-9999.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit cmake-utils python-single-r1 udev systemd
+inherit cmake python-single-r1 udev systemd
 
 DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
 HOMEPAGE="https://github.com/linux-rdma/rdma-core"
@@ -14,8 +14,8 @@ 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/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~hppa ~x86"
+	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 fi
 
 LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
@@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPEND}
 	)"
 
 RDEPEND="${COMMON_DEPEND}
-	!!sys-fabric/infiniband-diags
+	!sys-fabric/infiniband-diags
 	!sys-fabric/libibverbs
 	!sys-fabric/librdmacm
 	!sys-fabric/libibumad
@@ -56,15 +56,17 @@ RDEPEND="${COMMON_DEPEND}
 
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/optional_pandoc.patch )
+
 pkg_setup() {
-	python-single-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_FULL_RUNDIR=/run
+		-DCMAKE_INSTALL_RUNDIR=/run
 		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
 		-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d
 		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
@@ -82,16 +84,19 @@ src_configure() {
 		mycmakeargs+=( -DNO_PYVERBS=ON )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_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
+	if use neigh; then
+		newinitd "${FILESDIR}"/ibacm.init ibacm
+	fi
+
 	newinitd "${FILESDIR}"/iwpmd.init iwpmd
 	newinitd "${FILESDIR}"/srpd.init srpd
 
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index b440b9b5a382..d8ed348f2180 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -1,7 +1,8 @@
+AUX sanlock-fence_sanlock-LDFLAGS.patch 504 BLAKE2B 11176057304ee5f841500921f1fa1ee4e97777547f7318d192f1b5bd94bfdb145db4bdc6eb6ecede2f7c5d0d9f29e85506283119d904a65735e5152a07167c97 SHA512 2c7d7204e369449c23f4641fae27ecbb35d0f1f670a580feab7982514a90e60eec3bcdaf01cbd1cf88e7a39050026474553eb10a48d57ab8b4e6549d574bcebf
 AUX sanlock.initd 249 BLAKE2B 18bafba28ab4449c7f25ab2d14b4ac2d3cc89cf79bfb8f802fd180584becde8a5b9d919ac9ab887a4ebdfe8ea64e53f30b3785bc32875ccd2e25fa99a9278081 SHA512 5ed7b2d96cb875e2db0914ec7232fe8443c05de69e07d214ffc0adfafac5123694173373f831c5acf46d11aa4fca304b88e6e4c4ee2fbe5b033d173eea5aec36
 AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a35e47c18ea2bcf5afdc386c0da98988bc9fae479a68b504c244b55ab389ac7f5304c34282ae SHA512 9c7e980817c1c76868caff229b42a3d70e912abfd8c974bf5b856067bef79fbd3a5942b30bcb7d02869e2eba85e6f6ba3c861e9780046b01b25df1b39661b6c0
 DIST sanlock-3.6.0.tar.gz 221666 BLAKE2B 7fe95bd6813c13b76993b343a5ad605c7ba642583987ffa5fef583f34c053ee62b0f9e5979f5b5cb9e4fcde53268ae3debc5ec36b04f6651cc4cb902dff52df9 SHA512 59eb2a6f12e95d54886fdf6d56fd9a6814dd20fe11f39664f2bb82a56326fee48c9465ae30e6d04f970c8f1b0d9c2e22b90d21ab1f657c6d6b61ff9f02332443
-DIST sanlock-3.8.0.tar.gz 262077 BLAKE2B c5638dc405cb22098f551d2c267fb13ef8b59422d5d5fb64ade5273d27d6ef772178c1283860a180d3da053da46387e3687c69369c5447d90d7b04a61da80b92 SHA512 ec4e40066c8f5f25287265247509bcb9d8ae24e5bafdd563cb090e94df3fa65881c4814edeb81c50188e71990774d29e330b1dda864c22052fc936a9e2a0892a
+DIST sanlock-3.8.2.tar.gz 266780 BLAKE2B 5248d08225bcc2a19594a3dcd3872c8c69ca8b217d31f6263f2717e4594180d4ba4685c9679ce2f31b6a2dcb4fe9f3e6a5dd5ac3ed073aea02599e7bbc04390c SHA512 2fa92e16eee4d2f3dac452400522f7e90b93b71349d322564d5957e2d87fb4bd69f0b5617b05f4b296c272d6da9a404fccadbbfff106354a0e302c436593eaac
 EBUILD sanlock-3.6.0.ebuild 2055 BLAKE2B ddf101be000bf9d0b081a50386bbd8947e025d8edb475457167cc460c4f3a44f9863d0a3db1720839d239da61b9b3925d8eb953a29029501281eb6e6873575c9 SHA512 1c651d40550f67858d4ff552f8cbeea125205396087cb2290e3b70d370a410fbdab29d7e2fc0da9d01593b59c29042080a463fff920601b37e5577a5cec125bb
-EBUILD sanlock-3.8.0.ebuild 2071 BLAKE2B c67135662be618ea3b705d44f628f3411ff950c82f025567c9ee71f57ad147459872d867a771fd0fe40da668167dfbc045d03e3eca6bcbb1406681f575fdd4c5 SHA512 223b02756c854c0e37a289f0735b2f091295ba46b20f75b5d380fd2c0eb08f874181188ea4c8e31b7646db932555b487e0e341002723d597333e218b9a412562
+EBUILD sanlock-3.8.2.ebuild 2090 BLAKE2B d8eca28a2869f76a0817e27b26632517ba8634fbe97a41bd4b19978519a2560c4382869bf776f3995eda9e50e66ba027cbb1f2ac4887917cbe31bcb2fa54d8e2 SHA512 b5250d978145ce6fab960531b7945e1195d5d6cfc9b91d80726ebdc3ed07fe538aecc3751ca15d039c94ca331a23232168418dc7df7f2f50ff85baf988b75508
 MISC metadata.xml 368 BLAKE2B a15a411ea20eb7649f299e38704b394344194d7526f9bc92b27c0a26760d7dba05b1e5d483ff5f9ce73a6d1cd527a18ac905344a614c8dc31a0c1180b2be07e7 SHA512 2cc3ec3c99cfff2e0c576ab6c7b0a39460af875ba826ce0cf3c5a1a4f0f3def6170753c8d42af2fc7a139ad7f2135e309c3165bde83b4e7574292768c96e8086
diff --git a/sys-cluster/sanlock/files/sanlock-fence_sanlock-LDFLAGS.patch b/sys-cluster/sanlock/files/sanlock-fence_sanlock-LDFLAGS.patch
new file mode 100644
index 000000000000..0fb00b364bad
--- /dev/null
+++ b/sys-cluster/sanlock/files/sanlock-fence_sanlock-LDFLAGS.patch
@@ -0,0 +1,12 @@
+diff -ur sanlock-3.8.2.orig/fence_sanlock/Makefile sanlock-3.8.2/fence_sanlock/Makefile
+--- sanlock-3.8.2.orig/fence_sanlock/Makefile   2020-08-21 19:48:12.695801870 +0200
++++ sanlock-3.8.2/fence_sanlock/Makefile        2020-08-21 19:47:50.477402437 +0200
+@@ -34,7 +34,7 @@
+ CFLAGS += -DVERSION=\"$(VER)\" -I../src -I../wdmd
+ CFLAGS += -fPIE -DPIE
+
+-LDFLAGS = -Wl,-z,now -Wl,-z,relro -pie
++LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
+ LDADD = -lrt -laio -lblkid -lsanlock -lwdmd
+
+ all: $(TARGET1) $(TARGET2)
diff --git a/sys-cluster/sanlock/sanlock-3.8.0.ebuild b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
index ae42ae240e21..449fd2f3274a 100644
--- a/sys-cluster/sanlock/sanlock-3.8.0.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
-inherit linux-info python-r1 systemd user
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit linux-info python-r1 systemd
 
 DESCRIPTION="shared storage lock manager"
 HOMEPAGE="https://pagure.io/sanlock"
@@ -18,12 +18,18 @@ IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
+	acct-user/${PN}
+	acct-group/${PN}
 	dev-libs/libaio
 	sys-apps/util-linux
 	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	${FILESDIR}/sanlock-fence_sanlock-LDFLAGS.patch
+)
+
 pkg_setup() {
 	local warning="You need to have CONFIG_SOFT_WATCHDOG enabled in your kernel for wdmd"
 	if linux_config_exists; then
@@ -39,12 +45,6 @@ pkg_setup() {
 	fi
 }
 
-pkg_preinst() {
-	enewgroup sanlock
-	enewuser sanlock -1 -1 -1 sanlock,disk
-
-}
-
 src_compile() {
 	for d in wdmd src fence_sanlock reset; do
 		cd $d; emake; cd ..
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index d44ceae3fbf5..ec54d4b30639 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,5 +1,5 @@
-DIST singularity-2.6.1.tar.gz 835029 BLAKE2B 4a581e1bc5df9d664d68f17e275f01081c850aa53f8a9bfcceaf5eb2b8f16e3a018f88669674c7427c60ab00ec0f21b4ec5e6ecaab261c16f70a998cb54ff855 SHA512 063327c67dae2629d1decebc060c474a72e6741f6dc9b6373734e429ccf11d53ee55c1578c28e74e8f8bcda87f3e0b735a3a0e982c9ea894f03a31eaaadf617c
-DIST singularity-3.5.3.tar.gz 7885009 BLAKE2B 8afa2223906e7abf5f3d796efe7cf243dd9d91e61c8ca143a755ad772618ed01d20b7f4a030e82767cf9bf2a7431848d8344e30bde38f413ecd2eef0a9bab53e SHA512 b8bb44539e78eaf74c1b97e5bae8fae1f390412456d76b573fffe2a90240b182db1aec60aee80715547c3edfbaa0607506e2727a575bc951223f9a7c3be0a97e
-EBUILD singularity-2.6.1.ebuild 881 BLAKE2B 3c1a3b59fb1634c196d83745cd7085cbc76374c9d4ee4aee1fbe8a35207e47b465faf49e62a5a593a79570f1a39a4fbc5ad9101ecaa2232317db71d76fa9893a SHA512 805828fb0ed5528782d656c170b3fdb66c64ebcda387c7ede5b8c805ae442e7039254e572b3e1326579f0ef587676e57d00ab7e81798c0306f30fc960d9bfb74
-EBUILD singularity-3.5.3-r1.ebuild 1808 BLAKE2B 423f260e996e91b4666e03c27ed038af1b587dfb787054a62d7c1903b0b514acdaba6b7feec7c1230568881191596f98a6ab7653e06ed7f6c30e8c70654e7aa0 SHA512 b2532538e7102ef908cb61b1aa8b4271da412ed80e5a2ed50d83a5e1c25a7f7a4908fd94581231eca8224b5e22321b9895d66ed34b4a620e9d4bbd8afb991915
-MISC metadata.xml 451 BLAKE2B d68571ca2f95ec8c3212a64b8fd77056ee933ddb4c4789899bacb590e6c52d4fee2b2a53cb7dbd8a109c616ae5464d97b37fc4dbb094b68cdf4abbba8def7c70 SHA512 88105dac9813ba9f7126adae945898ad15e79b7abcea6eda8b6231de72bc48392fd8029b9d6bcb2ec9b0f4dfb0b2d14d90096ac0080f2da200b9802a77ccf38a
+DIST singularity-3.6.0.tar.gz 6169388 BLAKE2B ea07da3d586a96625a1016f9b4aa6b99072c89393dcb7c80aab624807e51fc107eee2629020bf3e1c19d6103544b63aad960d2ac27804fa6e03323a806fdf270 SHA512 695f3b4c1bd8cc4049fc3e8e296b369f5aadcd6b4717521b9aca68d997fd8a8c0bf349a2851c31b8a22f37fa010b4c7b93562fd6ac24cdc9699230a182f36d29
+DIST singularity-3.6.1.tar.gz 6170806 BLAKE2B fa92bf4df3c2a4ab4345ab0022862f19dde240d7275a79c8433164f02bc495f33d44e4c63b39b9bd3de60361e49fec3f2d258a3bafaadeba34b5d4a7cd3f514e SHA512 3037a14fec086e17b42ee8306624af39fd87c80821c73e0e1ab3d8a717dbdad86237f042d97c6a7870fc6beeced67d6cd52c8e445c41c39cdab7ccce1ce6adb5
+EBUILD singularity-3.6.0.ebuild 1807 BLAKE2B 1a5c5680acf25ba25d2482882a94c61d5760e3799c4098e8dfc143854b75c5c71f8e24b39d129be298c16865f8a7f9266a7a9661312617b02854d14eccd843c0 SHA512 0f9ac71c473ceed3a3c679b5a85d20834059a9c0bf26c258e76d05a49a7c980e5932181291b7336aa0313054eba413c26b8698c16038430bd0ac3e40b9fe5a3b
+EBUILD singularity-3.6.1.ebuild 1807 BLAKE2B 1a5c5680acf25ba25d2482882a94c61d5760e3799c4098e8dfc143854b75c5c71f8e24b39d129be298c16865f8a7f9266a7a9661312617b02854d14eccd843c0 SHA512 0f9ac71c473ceed3a3c679b5a85d20834059a9c0bf26c258e76d05a49a7c980e5932181291b7336aa0313054eba413c26b8698c16038430bd0ac3e40b9fe5a3b
+MISC metadata.xml 451 BLAKE2B 0cca32721561e4100348cd884b88edad067a426736df27d4be6926525f9dd1315387dbefff84b983e69ab1972a44cd3a3a2c643bae676b413dab3482005d4ceb SHA512 da6f640f7df71bfe98fdabfe8ea69b1929b80b3c23d869dc496515a76d3f76c5d89d38843faf850184ddd7f624dd1e821dd50103f92e81aeb620a4bcd7151609
diff --git a/sys-cluster/singularity/metadata.xml b/sys-cluster/singularity/metadata.xml
index e7f7edb94ed6..d861fc51f09b 100644
--- a/sys-cluster/singularity/metadata.xml
+++ b/sys-cluster/singularity/metadata.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jlec@gentoo.org</email>
-		<name>Justin Lecher</name>
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<use>
 		<flag name="network">Install network plug-ins</flag>
 		<flag name="suid">Install SUID helper binary</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">sylabs/singularity</remote-id>
+		<remote-id type="github">hpcng/singularity</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/singularity/singularity-2.6.1.ebuild b/sys-cluster/singularity/singularity-2.6.1.ebuild
deleted file mode 100644
index 0ae3cb4ae918..000000000000
--- a/sys-cluster/singularity/singularity-2.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="Application containers for Linux"
-HOMEPAGE="https://sylabs.io"
-SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs +suid"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sys-fs/squashfs-tools:0
-"
-DEPEND=${PYTHON_DEPS}
-
-src_prepare() {
-	default
-	# automake version hardcoding
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-userns \
-		$(usex suid "" "--disable-suid") \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-	default
-	dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
-	use examples && dodoc -r examples
-}
diff --git a/sys-cluster/singularity/singularity-3.5.3-r1.ebuild b/sys-cluster/singularity/singularity-3.6.0.ebuild
index 16834ae083a3..202258ead7a6 100644
--- a/sys-cluster/singularity/singularity-3.5.3-r1.ebuild
+++ b/sys-cluster/singularity/singularity-3.6.0.ebuild
@@ -7,7 +7,7 @@ inherit linux-info
 
 DESCRIPTION="Application containers for Linux"
 HOMEPAGE="https://sylabs.io"
-SRC_URI="https://github.com/sylabs/${PN}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/sys-cluster/singularity/singularity-3.6.1.ebuild b/sys-cluster/singularity/singularity-3.6.1.ebuild
new file mode 100644
index 000000000000..202258ead7a6
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.6.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info
+
+DESCRIPTION="Application containers for Linux"
+HOMEPAGE="https://sylabs.io"
+SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples +network +suid"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+COMMON="sys-libs/libseccomp"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON}
+	>=dev-lang/go-1.13.0
+	app-crypt/gpgme
+	dev-libs/openssl
+	sys-apps/util-linux
+	sys-fs/cryptsetup"
+RDEPEND="${COMMON}
+	sys-fs/squashfs-tools"
+
+CONFIG_CHECK="~SQUASHFS"
+
+S=${WORKDIR}/${PN}
+
+src_configure() {
+	local myconfargs=(
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--runstatedir=/run \
+		--localstatedir=/var \
+		$(usex network "" "--without-network") \
+		$(usex suid "" "--without-suid")
+	)
+	./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig"
+}
+
+src_compile() {
+	emake -C builddir
+}
+
+src_install() {
+	emake DESTDIR="${ED}" -C builddir install
+	keepdir /var/singularity/mnt/session
+
+	# As of version 3.5.3 this seems to be very much broken, affecting
+	# commands which have got nothing to do with singularity (example:
+	# completion on 'udisks mount -b /dev/' rejects all files from that
+	# directory other than 'autofs'). Moreover, this should go into
+	# $(get_bashcompdir) (from bash-completion-r1.eclass) rather than /etc.
+	# Hopefully temporary, which is why we delete this at install time
+	# instead of patching build scripts not to generate bash-completion
+	# data in the first place.
+	rm -rf "${ED}"/etc/bash_completion.d || die
+
+	dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index dfb811354278..1c15e009219f 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -5,5 +5,5 @@ AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf4
 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
 DIST slurm-20-02-3-1.tar.gz 8686608 BLAKE2B bbb1776c6c39ea81d636f0bf8f8534c508c1842e93d5bd70e49f8b63cf78b9d7be46f6cf2855517ebaaf294d00048f65b17dba91f2316ab0706342f68f7c2c3a SHA512 4c9f847b18052f9373694f91346eb8e0532c3a71060e5b8e4fd837534014ad5813adb93d2b60f7047e355f57919f2bef59b10c6540e13576aaa47ee0ba2b5a22
-EBUILD slurm-20.02.3.1.ebuild 7984 BLAKE2B 055305d195fc04a978bf17c1b8a56f2bcfa97faabb0c8f117b3376c44a04d8329526da391d708ef26b7736d26972040fb32fba646e2449590ba7327b5e905cf7 SHA512 12c51e32ddfadd02f37654363ccacb869837bb2906bd3bcc98ac6d2a02b3e5d8dde84fa0ab05697916e83cbed151c825571d0c5967f7987dc0d89a5b9a4c8d53
+EBUILD slurm-20.02.3.1.ebuild 7988 BLAKE2B c95a6d86019b74668c7f3cdb46b0bddad929d438f6085b24edf4c44caf6c0a766251f05ebef3b77d675f5bab9e3c992185dea028d9d3334b3785f5b391b31cdc SHA512 ae6b7c18c32f217bc690ad53070e125e9259ba684e0683891f1ee61bb2b65189aad460e2eecca3fbc911a5abdabf83ba0b63fa3c1f56968c71bae2ad00983fa9
 MISC metadata.xml 1199 BLAKE2B b52e7cae7554d439e7f25da2a80d98993d5c7f7abd5ba8b76c09bf60731b035040f976ac1bfc3c153f81b8feed89e2ceb5e6b676c25cc7b6219c4bcd87bd7e50 SHA512 8f48d582e61789373fc07ffd1db123cb8f43d337b03611972e480179ca5b43f2866392203f470d3d69784f2aae79cbcffdf583cba0aa4a9c25969f2c72a3f55f
diff --git a/sys-cluster/slurm/slurm-20.02.3.1.ebuild b/sys-cluster/slurm/slurm-20.02.3.1.ebuild
index 53bcab470f73..74a772b3b669 100644
--- a/sys-cluster/slurm/slurm-20.02.3.1.ebuild
+++ b/sys-cluster/slurm/slurm-20.02.3.1.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
 	mysql? (
 		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
-		slurmdbd? ( || ( dev-db/mariadb dev-db/mysql ) )
+		slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
 		)
 	munge? ( sys-auth/munge )
 	pam? ( sys-libs/pam )
diff --git a/sys-cluster/spark-bin/Manifest b/sys-cluster/spark-bin/Manifest
index 15a470932c7d..3e78ce6cd5bb 100644
--- a/sys-cluster/spark-bin/Manifest
+++ b/sys-cluster/spark-bin/Manifest
@@ -1,6 +1,4 @@
 AUX 99spark 26 BLAKE2B c25fe3d379a16c8a51764ea5b4c27d8f34869687c882141f0428d102d921eb65fea8ac253e407fe07fd4cce1232dd513728b1340bc0bcd21bd19ce0aed0c2420 SHA512 6d64d751f1504bea332b16078804abcaf21c8ea9c69f94fef3a8929b6d6cb1107ec899a5dc49770997243cbfda61edbcfa4d505da29220a71f5be38c1008f4f0
-DIST spark-bin-2.3.1.tgz 225883783 BLAKE2B d89e83a54aaabd39c5fa0d9c51a1bb5635f60ded4869672a387d13d87fffbb48385d4fbf67b55a96e709f27348f73a089624a0563c98eaba31f93d74bf4548ee SHA512 dc3a97f3d99791d363e4f70a622b84d6e313bd852f6fdbc777d31eab44cbc112ceeaa20f7bf835492fb654f48ae57e9969f93d3b0e6ec92076d1c5e1b40b4696
-DIST spark-bin-2.4.5.tgz 232530699 BLAKE2B e67d728af9e40417afb09e342d515021146bebef9a27df12cab2b64f1eb3ed134bbb8eecd731b2e30c9c4c6042f6fb9d076da5ac5c654c9066d2f9c3ecd0c24c SHA512 2426a20c548bdfc07df288cd1d18d1da6b3189d0b78dee76fa034c52a4e02895f0ad460720c526f163ba63a17efae4764c46a1cd8f9b04c60f9937a554db85d2
-EBUILD spark-bin-2.3.1-r1.ebuild 1345 BLAKE2B 8e981f59a0cf2b62f38115b866aab1b31cc280accd02cc2e2c24342b3531302b3a38185a66894231589e0303afa11374919bae72c7ff9e357785b1e9b3566920 SHA512 36dcac657747a7b05f2048b7fe298d78425782d15c3d443cc5caec61785f2cb4eaf3aef82e1c5aa270b1ed6b7e283626b6e8180b2d99ccf8a3a34e8a1c0af04d
-EBUILD spark-bin-2.4.5.ebuild 1345 BLAKE2B add185c93644dab828fa9a9a63f2773eafe1a4f571f4ebbd0cb1246038d08e186fbc5ce4a47f0c73da4741c2a6f4d33124c650c095d00a20d6df8e6e8168a34a SHA512 ef52fd7edd4246e56cea4a69b014c0991026b64a2a012c3d3b34a14d2a0deda034dfa0f616a360cc0c0689a5387cd7f35585d1633fedf304bc5ff85d174f7abf
+DIST spark-bin-2.4.6.tgz 233215067 BLAKE2B f2208a59822c98d90be3df95ffb7593ffe4faa74e233771b467732bfc3e01c65866488c74ee5f14c341790308537153f895f14f56beb0194a088a68b52f4fda1 SHA512 3a9f401eda9b5749cdafd246b1d14219229c26387017791c345a23a65782fb8b25a302bf4ac1ed7c16a1fe83108e94e55dad9639a51c751d81c8c0534a4a9641
+EBUILD spark-bin-2.4.6.ebuild 1345 BLAKE2B add185c93644dab828fa9a9a63f2773eafe1a4f571f4ebbd0cb1246038d08e186fbc5ce4a47f0c73da4741c2a6f4d33124c650c095d00a20d6df8e6e8168a34a SHA512 ef52fd7edd4246e56cea4a69b014c0991026b64a2a012c3d3b34a14d2a0deda034dfa0f616a360cc0c0689a5387cd7f35585d1633fedf304bc5ff85d174f7abf
 MISC metadata.xml 499 BLAKE2B 7116e88708f7dafb75197e46237ea5d405bc703feadece0bb65766537f64bd2f7ea2b34cf4a4c94d4f25d74f040b6cf5eb0b0072a20600a9d206087b38f63831 SHA512 273279c1235d9888e5b30073044687584699f7f26fd696f019c5b11545f32095319b6bfe52196ed6846cf74c8ffaa2c7f6c9f3a29749fa3315f18adba917094c
diff --git a/sys-cluster/spark-bin/spark-bin-2.3.1-r1.ebuild b/sys-cluster/spark-bin/spark-bin-2.3.1-r1.ebuild
deleted file mode 100644
index b459784e9977..000000000000
--- a/sys-cluster/spark-bin/spark-bin-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-DESCRIPTION="Lightning-fast unified analytics engine"
-HOMEPAGE="https://spark.apache.org"
-SRC_URI="mirror://apache/spark/spark-${PV}/spark-${PV}-bin-hadoop2.7.tgz -> ${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-S="${WORKDIR}/spark-${PV}-bin-hadoop2.7"
-
-DOCS=( LICENSE NOTICE README.md RELEASE )
-
-# Nothing to compile here.
-src_compile() { :; }
-
-src_install() {
-	dodir usr/lib/spark
-	into usr/lib/spark
-
-	dobin bin/beeline \
-		bin/find-spark-home \
-		bin/pyspark \
-		bin/spark-class \
-		bin/spark-shell \
-		bin/spark-sql \
-		bin/spark-submit
-
-	insinto usr/lib/spark/bin
-	doins bin/load-spark-env.sh
-
-	insinto usr/lib/spark
-	doins -r conf
-	doins -r jars
-	doins -r python
-	doins -r sbin
-	doins -r yarn
-
-	dosym ../lib/spark/bin/beeline /usr/bin/beeline
-	dosym ../lib/spark/bin/find-spark-home /usr/bin/find-spark-home
-	dosym ../lib/spark/bin/pyspark /usr/bin/pyspark
-	dosym ../lib/spark/bin/spark-class /usr/bin/spark-class
-	dosym ../lib/spark/bin/spark-shell /usr/bin/spark-shell
-	dosym ../lib/spark/bin/spark-sql /usr/bin/spark-sql
-	dosym ../lib/spark/bin/spark-submit /usr/bin/spark-submit
-
-	doenvd "${FILESDIR}"/99spark
-	einstalldocs
-}
diff --git a/sys-cluster/spark-bin/spark-bin-2.4.5.ebuild b/sys-cluster/spark-bin/spark-bin-2.4.6.ebuild
index c178519a3a77..c178519a3a77 100644
--- a/sys-cluster/spark-bin/spark-bin-2.4.5.ebuild
+++ b/sys-cluster/spark-bin/spark-bin-2.4.6.ebuild
diff --git a/sys-cluster/ucx/Manifest b/sys-cluster/ucx/Manifest
index d5920b497b25..06efa2ccd8c6 100644
--- a/sys-cluster/ucx/Manifest
+++ b/sys-cluster/ucx/Manifest
@@ -4,4 +4,4 @@ DIST ucx-1.5.2.tar.gz 1844416 BLAKE2B 2e0296e34d8116a79c545fb3371dda1746517a18cc
 EBUILD ucx-1.2.2-r1.ebuild 657 BLAKE2B 0296b5fb569ebe585f28ad21a93db38ae8f7e067485bd2bde52e59ef1c55550b4580bb5fb7e3d3749d834fb98deca7992fb27fde1935f7ee416512a6614711e5 SHA512 18f24525c15aeb5c58488577a1fa895d11bd37dca8d18508fa3db09f6be142f7afc147d8b0d6014abcfcc3f1651b23ffc2436a5db16021fcde0ae23277508e30
 EBUILD ucx-1.3.0.ebuild 521 BLAKE2B 424edb7396cd501bfebaace337b0ffdca591e784b020d1f59ac768c576bb45177ace636584ddee803112ebfaf34c3bff11316fde49aa12ba0e923cc266ab8b8e SHA512 505e9fd473b6011b65b32ef657f2dd328e00647409b5ad5e9f1b4aa10ceb734eeb25ee8eaf7b8d70b5b5cce199ce546bf60bb2978b574beec7987f8a2b497d88
 EBUILD ucx-1.5.2.ebuild 608 BLAKE2B d6cd8284f1ba783ea6ef3471d6779859c3af572834b387a123e1829fc01240ab6a476188d290cbc593a07c0af3129c8492594a0947db70e3dc50eb881d5da351 SHA512 03fae77ea4880763d65f7a5332800438c7dcf9a9c6345fa31f486c4770be249012c05791e39e2e8e8e96cc6d6abad967d539f9cc2f5e80950414e770294d543c
-MISC metadata.xml 443 BLAKE2B 8dd81ad5620da74decf43d97ef37e29bbbac1d3016ac11ee7dc7368bacff1b17edb284bcfbf45000925a4837eb144b882b5cbc17dd99c4a24a429cd516ef6902 SHA512 3e82b7bc2aec1bf3cb98e70e20059e1f3575c5342c6163d4816064b9ff648671add1780b9524fbb14f2bf9de50ed58b09ae192b30732d25ad36ca63e2d92dc3a
+MISC metadata.xml 338 BLAKE2B dbdd073e20ffebe8d6f395884ac05724cf570177e255b2fa6eb18bbd0c2d67c2204a4a147c8845612ad5b1a30e1d6533cc1100cdb99fd7c189d470401f62cb45 SHA512 02807945577d260f9df5a30c4555c82e0cd0809af429fa98aa613a65bbbc4d7d24031c640cdd7ad50f101121d276593ac0c355da032eec2102a990651f8fd6f8
diff --git a/sys-cluster/ucx/metadata.xml b/sys-cluster/ucx/metadata.xml
index 6af00b86c7fa..b8d001c07302 100644
--- a/sys-cluster/ucx/metadata.xml
+++ b/sys-cluster/ucx/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jlec@gentoo.org</email>
-		<name>Justin Lecher</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-cluster
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)