gentoo resync : 22.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
commit: 908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree: c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /sys-cluster
parent: 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
60 files changed, 3176 insertions, 20 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 93d0a8b7dfa4..24138d300824 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 0ea27a5deade..b3d8ae0a4162 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -46,12 +46,18 @@ AUX rbdmap.initd-r1 2372 BLAKE2B dee62cc3e92425bccfce86009be0fbecc84d55923a7dde3
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
 DIST ceph-14.2.19.tar.gz 129290834 BLAKE2B d1de69afcdacd4507a4d1d230a9a4cbd75067f7efa67c01b9f7100d29bf91b7196a36df6514d307affc3194bd83f1e91b5c274b424d0cb1931c9457f6321dc36 SHA512 69e3adba292d003e364f3b7eb16878992a3f3015a1ad0b73a9bd9b4ccb2f2f46518833346d40e024b62274985d30b684e1927e533a34a1e357a1780812c231fa
 DIST ceph-14.2.20.tar.gz 129271968 BLAKE2B 45abcd35d4c854fcd7920ce19ea8d4369e567a77e89afb63d470220a2c5854cf5cad410dfd8f52f40fec732bc7e18cc3cdb93ecd7e4542866da9fd8fee4f1d92 SHA512 e67baabaf611dc9a52fb0114a491f72666f87ec7dd4dbd63448581baebaa9cd1e70a4e90b2f2db06bf675b778858d1b057aa39986ac858de7f3894b24b07bf7e
+DIST ceph-14.2.21.tar.gz 129272778 BLAKE2B f82f452e0f0c40a95ea1bdb3654c2d322caa3edeeb05e41247e02a8ffe731c570d9e49aefa61c447a8b73620d4a9b9872335171f1e08fbd9a08eea930ccbfe76 SHA512 39b4a0624dcab2bafa50f51a42155fcf96dad74531a001d75009ad246a8ca80ce81ae538b34c0a1b773691c363626f1d0342f2439b711bd0dd16214592171884
 DIST ceph-15.2.11.tar.gz 149695132 BLAKE2B 2dcb335a289314aaf6f68fc44950459c978dfd60fc0c064479f3230957a755d6a9bc238b57d3ec354efdfa5483461bac1080dd0afd7e4e2cd0a20c9410ae1a10 SHA512 e1b0627b7e4212c63b2ea2eb612247fcc9235247e63accc1fe456643b192275eea538e095cc859dbdffd5e00fe1c315563940f258708c8584ac0d0ad0641276f
+DIST ceph-15.2.12.tar.gz 148509713 BLAKE2B 4962e7d574b38592a874a1b3fa8610bb2d0afc8713d995d67a790c025bb086cb619cbbaec76482ec096b4c55b9f1df383f5bd4806a231bc88e70ac3efbac24b5 SHA512 08266a2e9a7ca5a37e03f340873571fd012c630dd898a87241cd97c29760b2bf41fe64c8883e7b08e0f83c26245072cd26e69ecb1db02378d1ec38335ba1cd0f
 DIST ceph-16.2.1.tar.gz 155832182 BLAKE2B 9331d74ada9fb37e59f60daa813cdfe4711000f916365818435580c11d3295db5a13f98c2d2493cccf84cb4c6896c5a8137e3fe9b7a32ff0bedc0b524a0744b1 SHA512 42e404aa41565485dc4c08b66efb3de719adee72cfc535586992e15ab4601bfbd909ef61abf412badbbfa7ef13bf91a7c0576fbbf3f9f687bc7b465b21a8c416
 DIST ceph-16.2.3.tar.gz 155866118 BLAKE2B 7b1766effaa7b72697fad06e43eb1a3f2450b64fe970857cefc1d05271611a50b8cf55c574163b3f43d4a42b35b0bc0236c9089ac88b149f9b4d7fd706887db9 SHA512 07bc2b386fb0607df3128c151ee41565afe28b5efe3d907972198fc7fff9cecbafd51570d1b2624d1f921b259f788f0c3d133fb31f11bf6650cb2552f72f8047
+DIST ceph-16.2.4.tar.gz 155840423 BLAKE2B a803ffa61ac9fd6d42790d6d8e12aa8df843968627df0051475355f3ba0dc1272afa3d9e2716115ad769b2f322d7bd239d99b89e51610e89ce9efe39af4f01ae SHA512 8904e7fcabd50276e4e86735fd85dba96f417c194c219025146f994707def7abe372528b0f2e862e274b2f405d7b791bac86b6cbb8d57cecd6f44023a2ffb6f6
 EBUILD ceph-14.2.19.ebuild 10514 BLAKE2B d4f43c7ccba4ea386f6ca7f68b143ec55115c1c21a6cc170b8925de8a314d4a5529581727b873ca5507e037033688d6d25506f9ebae9700dff710160ee82fca6 SHA512 d15fcdecd4e79c990edb1a04df8330282b3b861fe525f8620e7a48fdaeb411649deabfaab4d8c4fa874a2614aa24b10b98251b14071462baf1e502ccb3d58331
 EBUILD ceph-14.2.20.ebuild 10515 BLAKE2B 85f6922697dd9de98808319a1a7d1063efb62a1bdeb03413e92db79ac976a009dd3d48b48ac1c49c9cf06696af27da9e836adc7ec1b43413862a0a074bf6b8ae SHA512 e385fbf5b06da07bba48ac5a492dc329558e7749f38f906cbf3662276d6efa55083907613bcc0087af0635a6f80f5dc67ac0d581c214a6e2815eb457f76b2012
+EBUILD ceph-14.2.21.ebuild 10515 BLAKE2B 85f6922697dd9de98808319a1a7d1063efb62a1bdeb03413e92db79ac976a009dd3d48b48ac1c49c9cf06696af27da9e836adc7ec1b43413862a0a074bf6b8ae SHA512 e385fbf5b06da07bba48ac5a492dc329558e7749f38f906cbf3662276d6efa55083907613bcc0087af0635a6f80f5dc67ac0d581c214a6e2815eb457f76b2012
 EBUILD ceph-15.2.11.ebuild 10863 BLAKE2B 5c0396ea965b1b642989d6c1d311ac87ebdb66a75f17d1c462ebd8df41b2d135009cbd25a7a95dba248811fd1bb04f80feca25aa719ffc05498aac7395c39c54 SHA512 63b2d038a3d274a7c2aeec8322898f2aeacd76a95ef2d848aec84161ba2e1ab5dbe23ee9a6677eba41065f210333100d1aed437ceef6fad6af4e32e5d84895d6
+EBUILD ceph-15.2.12.ebuild 10863 BLAKE2B 5c0396ea965b1b642989d6c1d311ac87ebdb66a75f17d1c462ebd8df41b2d135009cbd25a7a95dba248811fd1bb04f80feca25aa719ffc05498aac7395c39c54 SHA512 63b2d038a3d274a7c2aeec8322898f2aeacd76a95ef2d848aec84161ba2e1ab5dbe23ee9a6677eba41065f210333100d1aed437ceef6fad6af4e32e5d84895d6
 EBUILD ceph-16.2.1.ebuild 11914 BLAKE2B f08082ab1b541fec43d245b766f19826f28304c9beb70de5d9f3ddd66259bfbb81ad5ba930bb01fdc43bd6f5e7818b1cc770082886363f11d5597454f7f9df59 SHA512 d66477c158df48531441448fcb03de8a6bc4768ad806b3fb99118ae486a5520d55eceb498a2acf79771bebbd736e3b4b4259a3aa0d9bdb18b1fbbd8e5ba70981
 EBUILD ceph-16.2.3.ebuild 11959 BLAKE2B ae99609c4f5f303c42f23b8941a4acea81696ca47a00bb0f0cf1e39edab32b3ac2b1dd20e0493deccee71bde402bacce390656af5ad536b736d95cd6a1abcbf2 SHA512 0cca6494dd99fa508ea61b3f08aee6bb0d205860aa8b410ee773f9855edbc823655c58a2ac51edeb2c1199c1158adf526ddd11237d8cda29d3ac4568e99476dc
+EBUILD ceph-16.2.4.ebuild 11959 BLAKE2B ae99609c4f5f303c42f23b8941a4acea81696ca47a00bb0f0cf1e39edab32b3ac2b1dd20e0493deccee71bde402bacce390656af5ad536b736d95cd6a1abcbf2 SHA512 0cca6494dd99fa508ea61b3f08aee6bb0d205860aa8b410ee773f9855edbc823655c58a2ac51edeb2c1199c1158adf526ddd11237d8cda29d3ac4568e99476dc
 MISC metadata.xml 2318 BLAKE2B f9cf86426b0d8ea87cb80cb03315e9b0b581f604b2e1f28011dd49ab885232184fbcb6e496e8305d92e2c45bea973b8627235115e6bc7b7590874ac2ce9a00cc SHA512 e4eb8fb92dfe9161c217d880db3733aec36efc74431f529b12212702abbf633647bb8a22bfe7864d7389e8ed893bc37518e228ce165140058f98aec534b8f3de
diff --git a/sys-cluster/ceph/ceph-14.2.21.ebuild b/sys-cluster/ceph/ceph-14.2.21.ebuild
new file mode 100644
index 000000000000..9b819976edd8
--- /dev/null
+++ b/sys-cluster/ceph/ceph-14.2.21.ebuild
@@ -0,0 +1,394 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+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 lttng +mgr numa 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/rocksdb-6.15:=
+	dev-libs/xmlsec:=[openssl]
+	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:=
+		dev-libs/openssl:=
+		net-misc/curl:=[curl_ssl_openssl]
+	)
+	ssl? ( dev-libs/openssl:= )
+	system-boost? ( dev-libs/boost[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-2.0[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		diskprediction? (
+			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
+		)
+		sci-libs/scikit-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 )
+	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-build-without-mgr.patch"
+	"${FILESDIR}/ceph-14.2.11-systemd-unit-fix.patch"
+	"${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.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 -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		-i src/bash_completion/CMakeLists.txt || die
+
+	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i 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_SYSTEM_ROCKSDB=ON
+		-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
+
+	# needed for >=glibc-2.32
+	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON)
+
+	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-15.2.12.ebuild b/sys-cluster/ceph/ceph-15.2.12.ebuild
new file mode 100644
index 000000000000..d90c82927bc0
--- /dev/null
+++ b/sys-cluster/ceph/ceph-15.2.12.ebuild
@@ -0,0 +1,405 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+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 ~arm64 ~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 lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk
+	system-boost systemd +tcmalloc test uring 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-cpp/gflags:=
+	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
+	dev-libs/libfmt:=
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
+	<dev-libs/rocksdb-6.15:=
+	dev-libs/xmlsec:=[openssl]
+	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:= )
+	pmdk? ( dev-libs/pmdk:= )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
+	radosgw? (
+		dev-libs/expat:=
+		dev-libs/openssl:=
+		net-misc/curl:=[curl_ssl_openssl]
+	)
+	rbd-rwl? ( dev-libs/pmdk:= )
+	ssl? ( dev-libs/openssl:= )
+	system-boost? ( >=dev-libs/boost-1.72[threads,context,python,${PYTHON_USEDEP}] )
+	uring? ( sys-libs/liburing:= )
+	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/nvme-cli
+	>=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/python-dateutil[${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/jsonpatch[${PYTHON_USEDEP}]
+		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 '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
+		)
+		sci-libs/scikit-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 )
+	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-15.2.0-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-15.2.0-rocksdb-cmake.patch"
+	"${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
+	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
+	"${FILESDIR}/ceph-15.2.4-system-uring.patch"
+	"${FILESDIR}/ceph-15.2.5-missing-includes.patch"
+	"${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="5400M"
+	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 -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		-i src/bash_completion/CMakeLists.txt || die
+
+	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i 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_BLUESTORE_PMEM=$(usex pmdk)
+		-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_RBD_RWL=$(usex rbd-rwl)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_LIBURING=$(usex uring)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED="ON"
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_PMDK=$(usex pmdk 'YES' "$(usex rbd-rwl)")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_SYSTEM_ROCKSDB=ON
+		-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
+
+	# needed for >=glibc-2.32
+	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON)
+
+	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-r1" 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-16.2.4.ebuild b/sys-cluster/ceph/ceph-16.2.4.ebuild
new file mode 100644
index 000000000000..8775e532d158
--- /dev/null
+++ b/sys-cluster/ceph/ceph-16.2.4.ebuild
@@ -0,0 +1,449 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_OPTIONAL=1
+LUA_COMPAT=( lua5-3 )
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
+		lua-single 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 ~arm64 ~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=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana
+	jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq
+	+radosgw rbd-rwl rbd-ssd rgw-lua +ssl spdk +sqlite system-boost systemd
+	+tcmalloc test uring xfs zbd zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+DEPEND="
+	${LUA_DEPS}
+	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-cpp/gflags:=
+	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
+	dev-libs/libfmt:=
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
+	dev-libs/libevent:=
+	<dev-libs/rocksdb-6.15:=
+	dev-libs/xmlsec:=[openssl]
+	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:= )
+	jaeger? ( dev-cpp/nlohmann_json:= )
+	kafka? ( dev-libs/librdkafka:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lttng? ( dev-util/lttng-ust:= )
+	pmdk? ( dev-libs/pmdk:= )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
+	radosgw? (
+		dev-libs/icu:=
+		dev-libs/expat:=
+		dev-libs/openssl:=
+		net-misc/curl:=[curl_ssl_openssl]
+	)
+	rbd-rwl? ( dev-libs/pmdk:= )
+	ssl? ( dev-libs/openssl:= )
+	sqlite? ( dev-db/sqlite:= )
+	system-boost? ( >=dev-libs/boost-1.72[threads,context,python,${PYTHON_USEDEP}] )
+	uring? ( sys-libs/liburing:= )
+	xfs? ( sys-fs/xfsprogs:= )
+	zbd? ( sys-block/libzbd:= )
+	zfs? ( sys-fs/zfs:= )
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	amd64? ( dev-lang/nasm )
+	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
+	jaeger? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+	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/nvme-cli
+	>=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/python-dateutil[${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/jsonpatch[${PYTHON_USEDEP}]
+		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? (
+			>=dev-python/scipy-1.4.0[${PYTHON_USEDEP}]
+		)
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+# diskprediction needs older scipy not compatible with py38
+# bug #724438
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	${LUA_REQUIRED_USE}
+	?? ( jemalloc tcmalloc )
+	jaeger? ( !system-boost )
+	diskprediction? ( mgr )
+	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-16.2.2-cflags.patch"
+	"${FILESDIR}/ceph-16.2.2-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-16.2.0-rocksdb-cmake.patch"
+	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
+	"${FILESDIR}/ceph-16.2.0-install-libblk.patch"
+	"${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch"
+	"${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch"
+	"${FILESDIR}/ceph-16.2.0-liburing.patch"
+	"${FILESDIR}/ceph-16.2.2-system-zstd.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="6G"
+
+	if use system-boost; then
+		CHECKREQS_DISK_USR="350M"
+	else
+		CHECKREQS_DISK_USR="510M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup
+	lua_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 -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		-i src/bash_completion/CMakeLists.txt || die
+
+	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
+
+	if ! use diskprediction; then
+		rm -rf src/pybind/mgr/diskprediction_local || die
+	fi
+
+	# force lua version to use selected version
+	local lua_version
+	lua_version=$(ver_cut 1-2 $(lua_get_version))
+	sed -i "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" src/CMakeLists.txt
+
+	# 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_BLUESTORE_PMEM=$(usex pmdk)
+		-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_RADOSGW_LUA_PACKAGES=$(usex rgw-lua "$(usex radosgw)" "NO")
+		-DWITH_RBD_RWL=$(usex rbd-rwl)
+		-DWITH_RBD_SSD_CACHE=$(usex rbd-ssd)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_LIBURING=$(usex uring)
+		-DWITH_SYSTEM_LIBURING=$(usex uring)
+		-DWITH_LIBCEPHSQLITE=$(usex sqlite)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZBD=$(usex zbd)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED="ON"
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_PMDK=$(usex pmdk 'YES' "$(usex rbd-rwl)")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_SYSTEM_ROCKSDB=ON
+		-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
+	)
+
+	# this breaks when re-configuring for python impl
+	[[ ${EBUILD_PHASE} == configure ]] && mycmakeargs+=(-DWITH_JAEGER=$(usex jaeger))
+
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			case "${flag}" in
+				avx*)
+					local var=${flag%f}
+					mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_NASM_X64_${var^^}=1")")
+				;;
+				*) mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")");;
+			esac
+		done
+	fi
+
+	# needed for >=glibc-2.32
+	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON)
+
+	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-r1" 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/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index d40c581ca60c..348ada29e1b7 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,6 +1,7 @@
+AUX charliecloud-0.22-sphinx-4.patch 838 BLAKE2B 09fbf97c9145ca050ffb56215c5e114354c6fad39eda5e9876427b8272c700a495137dbeac1972eb3aaf525322634f5250595293f9f5af04421b6cc85ba89732 SHA512 1743e8fd6619185059892e70c1906d99d60c9fd27392eab331dd8f624c842aa1426f77da4f7b826cf0025d92777d30aba137f9d3685037607af66560031e3bd1
 DIST charliecloud-0.22.tar.gz 402106 BLAKE2B 4c2d4bf77424c5b46e5593bc28bbe10891c353c23c8d382a9ca7515187538f5fef4d90b95f34572f65223f27433ccab9021bf9e4bc31931787894924d1dd02e2 SHA512 c528ffa9ecddbd4a26b0a8b6cc593340f3aaa0911cf45e1f6a5fe860178917f069ca9b31b7c1aee6220762bbe4b75114219eac4cdd3987bcb3f3338e2b6fb18e
 DIST charliecloud-0.23.tar.gz 403281 BLAKE2B f7a6824782e7bf3bdb51ae791fdca2f5929f5c713590ff49cc8a7e1e1c1758e83bdd429a99497dd15e565d01f0f66f2873f64edddacf24ea78f68c2326669db7 SHA512 35543ed3d838b80fbb64fe3e658993fe9f7ded2d1dfd92e0e9a7725fab6d872503a790964c0f3fabb6438c8bd872b5b00cdf31a028f26588b318b9d0dc568119
-EBUILD charliecloud-0.22.ebuild 2068 BLAKE2B 8b2bcda1299d983bc7a3a94ad0fcb967924cc8a3f2e2038d188cb5fd5cdb9ffbc3431617a82f301b6bc876e3d5ddaa831533214658e5cde21a749107b35c5868 SHA512 0962bbf85a3217a7a3530e7688963dc9aeff6e5aa4e841cc30c068b89f64b47dbe15a855c65b4cb518334f6e490448453806ff56cc30ffdd3300ac8e8ac637bd
-EBUILD charliecloud-0.23.ebuild 2070 BLAKE2B b703c4d5bc566cca1acf2f5555208d5ebc9457d3f3cce1141e86b3f08c5a26902ff3ebc4f21cbd456cca09c1e48f862745f181f26917a90da563cec68eebb70a SHA512 12a3d6d5a77fabf562cacf533ff6a52b24118a153e9342fd7c49359213882e2a5c17b7df247040aa270787af9f34f89f984f93ba304b7f50d32c1d0a11d0d7b6
+EBUILD charliecloud-0.22.ebuild 2122 BLAKE2B fc09d9bae83760a95aa4811b83fc0672f27dbabd08608cfb44d505eb8a4fdfa21bcaac0c52017b8fd867a23ecfbe061c364d0dac43e7f3de82f3393b54007b7a SHA512 7b4aa4a31a76e2b6dc5b2266f7963df4ea57ff36eccc8a8d3c7a591790d49608cddf2f42278503df66600fd692d9cefb94392aeb6a565250165d121c5edc025a
+EBUILD charliecloud-0.23.ebuild 2124 BLAKE2B 672e1584fc4cd100a77618bd6a3b2f7fa1b7fa850f573e2c80ad946834bc138e626de483fd123d4eb4a9494f037219b83d2079fa3c4f4d1844a27039e5050375 SHA512 02fa7e8b8343850ababaee5eab491325aa2c1e598dcb0a871dd57b1fd44d04c8941949b09ee946f295ebd52efda4e172d5ce9405d17a536b6d68a3904ce5c372
 EBUILD charliecloud-9999.ebuild 2070 BLAKE2B b703c4d5bc566cca1acf2f5555208d5ebc9457d3f3cce1141e86b3f08c5a26902ff3ebc4f21cbd456cca09c1e48f862745f181f26917a90da563cec68eebb70a SHA512 12a3d6d5a77fabf562cacf533ff6a52b24118a153e9342fd7c49359213882e2a5c17b7df247040aa270787af9f34f89f984f93ba304b7f50d32c1d0a11d0d7b6
 MISC metadata.xml 617 BLAKE2B 1c9b75dc0e15fec82053803042667d20b9b3cf49bc90a2630bc7dd3139de79d1d1791e5677640d510a3641ab7d117037bb5134ccb336f5027b5ea7105f63eafb SHA512 8fb83c8b9c57c98893ebfc724026a88e484ef2f7d50c6ede3dcd982978cf428b699126c5eb5e7cec3c3308c875b657bca53dc879030b54fd3c0d03282cd1776f
diff --git a/sys-cluster/charliecloud/charliecloud-0.22.ebuild b/sys-cluster/charliecloud/charliecloud-0.22.ebuild
index b96285971254..a2e756974dbc 100644
--- a/sys-cluster/charliecloud/charliecloud-0.22.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.22.ebuild
@@ -46,6 +46,10 @@ DEPEND="
 		net-misc/rsync
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.22-sphinx-4.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/sys-cluster/charliecloud/charliecloud-0.23.ebuild b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
index ae43a8ed1073..a210608743e5 100644
--- a/sys-cluster/charliecloud/charliecloud-0.23.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
@@ -46,6 +46,10 @@ DEPEND="
 		net-misc/rsync
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.22-sphinx-4.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch b/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch
new file mode 100644
index 000000000000..474fa1efbbea
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch
@@ -0,0 +1,25 @@
+From f424c4078eab817b4af712b85184c4f07e2289c6 Mon Sep 17 00:00:00 2001
+From: Reid Priedhorsky <1682574+reidpr@users.noreply.github.com>
+Date: Wed, 12 May 2021 15:18:15 -0600
+Subject: [PATCH] PR #1062: configure Sphinx 4.x behavior to match 3.x (closes
+ #1060)
+
+---
+ doc/conf.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/doc/conf.py b/doc/conf.py
+index 53a187bbb..417c91629 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -238,6 +238,10 @@
+ 
+ # -- Options for manual page output --------------------------------------------
+ 
++# Put all man pages in one directory regardless of section. Default changes to
++# True in Sphinx 4.0, which broke our builds (#1060).
++man_make_section_directory = False
++
+ # One entry per manual page. List of tuples
+ # (source start file, name, description, authors, manual section).
+ man_pages = [
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index fb1f855b4dc3..763e1cd15e74 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,5 +1,6 @@
 AUX 50glusterfs-mode-gentoo.el 169 BLAKE2B 461afb9f17ef9dee79348279e861039193400d61a926e9d8499351b7e42377cc1bffce6dc2c2d7f3b50b1de016a336bad69c7a79bb800b973288eef542baed85 SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804
 AUX glusterd-r3.initd 755 BLAKE2B 6b402725a6a53839ff718ae19f4917b61330f78ae6657480a218f06657d5d7db1c4b57efa275159be76bc84fd5b600a22bd4b374a8a6fbb56576799650ce89fe SHA512 d6f46374f48cf78c4114c786fbba4412764527cec020f43ab2a46000fcada98bdb6dfb67ba9db2be3e39a851cba1db97a7154e4cab6df7ce541c0157c781706c
+AUX glusterd-r4.initd 747 BLAKE2B f0c1c6947e6c42d3fa1e52b7ee4d856aad9fb9218ae07df35d90039038437ca05bd5c382de609de9a8e35aea24592499dbd0f44d6f3c827e2667229242c3dc21 SHA512 9341b4f998bf5f0da24b84e5e83b2534b5693d018961800ac5ae19ab7246fe60b90b3a66f4c5576d7e1beebd3624e3e2d2c426d44f2ea4f766e1014b69441f60
 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
@@ -8,11 +9,13 @@ AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ce
 DIST glusterfs-7.9.tar.gz 7702149 BLAKE2B e23b5a45a8c2c4f02f0992dfc78bea942a1dcc621082cb5c6aebf73e0cba17a7c0334700aec8c82dc7d093fbddcf9f579320561412b94ec010cf51c0210f2654 SHA512 5683bf2ff3550b8286e27b70981cb176c445e432624db79f065eb5928bc4afdf009f54f3b1d5abde1f6d2c532c9c4820860685aea0d0f709dc78fcf35bfea688
 DIST glusterfs-8.3.tar.gz 7829522 BLAKE2B 1ba60f7209db4f1ce21237c3adea94df1b9eae04d15f99eb414bf961ea67aa7e08d01ea47c8793a33afbc0ff6cf63ecb81f78fa1ba74d66e2d4358ef2bdadacc SHA512 7ca9d3d8938eb27a7347461a07457e90d1ee6e8d5417970e38245c819cf09bf2ecf9de3954b75edf5cf14816e1059fb381b95935ae1f973ebd14ee7531322aa9
 DIST glusterfs-8.4.tar.gz 7833014 BLAKE2B c67f510c655465e9fbecaa7f391531543e37a2a84917592e699d88564b24fe55689b95770f385ac5b645069f287d4af974db76a77c0f44ea5d2e88f995b427f7 SHA512 a81394b3584c2e6c27060367b443c0879512054ed9287740bc24308603b9e3c11376179ed6589d5d38441982cd6415e3612f98ae4c97ddf7d5c747b42171d796
-DIST glusterfs-9.0.tar.gz 8171193 BLAKE2B f9f9905515607b4877432bde264075f73c4c076ae435a67ab803affc468f5f88d02235419fea6e25db19adecff9b797a41eb5ac63772fe81251c064389f7aca6 SHA512 daa5a7342c067c75668910e8fed17145636e7a576830b4cd68e81d9fceedaab918228b8780ebd5014e2397e0606858af650cd2c52bec0883ccd2126955ad07e7
+DIST glusterfs-8.5.tar.gz 7873397 BLAKE2B 6ababf15fda216c9a47c05859f7123847d711dd5a12e3ec2c5dcf8475f35830c9a32f7b21ad763ab1be59b06f1d93f83acc0cbb8f7635456a3638be73b162aa4 SHA512 e256141a76deb9a255be31422d76b0c81aad4a7e5b166d2be90a79d340ceb811cbff11f469166ef7582f40f58f47fb056aa05aafd4b35f094bf9c21a5c08f3bb
 DIST glusterfs-9.1.tar.gz 8206207 BLAKE2B dea099eb1d366704010247964c24de404fb09c00a375dde4af30a2af836d3b35689fab91a75268aa01dba45860eb50a6e0572913c059e53fb5799d2302c2f005 SHA512 2c26813f12fed7a0640cc470badc2b83f156b660ef475487a689dca6c3fa407192f4959aeaf7a981969a079cf5d2c7aace85ff818ea6133d5a085d90d226e1da
+DIST glusterfs-9.2.tar.gz 8212980 BLAKE2B 7fb42186c5d309c357f72e3037fc09d8b15f32770d74173dd4779bab91056d1ceb78a4a651fec2018faf1597357576d41593e9d7b04cf9af7f4742301b284b01 SHA512 34a0a1745029e2fad3c8fc6a044b4e4645f8cf11eddc3c8c8e94cce9733449248c577ce6066bc49010a65121d991daf67766393fe513ac694082f0efa1d4ef95
 EBUILD glusterfs-7.9.ebuild 5879 BLAKE2B 3ce9d8f2b643ebae7c6d611985a67b2d1a033bce3a4a8dee15266fefc862cf4f99914420616b27770e2cb650b1a031e9592d6f526f0f158b804b66076390ea17 SHA512 09a332a7215f08148a512dfbc4dae9d17a812ceb75ac02dc84d3c59b8b6b157ee0a3a96c6a858d9dd3963e5c17c216d9c33d1e67ab67f9bc93e12378635fdbbf
 EBUILD glusterfs-8.3.ebuild 5393 BLAKE2B 355898682abe9959bab05d84f82965ce6becb4552291fb6ae82b67c6b7116f7514d75f963da529cf98b0f4a19f92cd8eaee4b1772fdf09cf60d1f87ba17b9fde SHA512 fd7b898ffa4fb6d340599a34a005a64a237aa7184ba76fce052d4e94904c582ae00f031f8ead2b143d4e96e0bee991db70405795cd54ffdbcaef7f8469c6a188
-EBUILD glusterfs-8.4.ebuild 5397 BLAKE2B ca7003592d3dcde38025a0670605e0400593284aa225edea7bd38047abd5254fc9becb5ee770f4aa4b0862a08a05cbaae464401811a1f2a96374bd46b673f2d3 SHA512 6fb2836bd047ca08d5467926eadcf697257509561633c3e6e9f3548426880b8f3dacf7899726b5c4d0bb8ff7f1519bd7967e4b6d430d44b3ca42bf7c40981654
-EBUILD glusterfs-9.0.ebuild 5397 BLAKE2B ca7003592d3dcde38025a0670605e0400593284aa225edea7bd38047abd5254fc9becb5ee770f4aa4b0862a08a05cbaae464401811a1f2a96374bd46b673f2d3 SHA512 6fb2836bd047ca08d5467926eadcf697257509561633c3e6e9f3548426880b8f3dacf7899726b5c4d0bb8ff7f1519bd7967e4b6d430d44b3ca42bf7c40981654
+EBUILD glusterfs-8.4.ebuild 5393 BLAKE2B 355898682abe9959bab05d84f82965ce6becb4552291fb6ae82b67c6b7116f7514d75f963da529cf98b0f4a19f92cd8eaee4b1772fdf09cf60d1f87ba17b9fde SHA512 fd7b898ffa4fb6d340599a34a005a64a237aa7184ba76fce052d4e94904c582ae00f031f8ead2b143d4e96e0bee991db70405795cd54ffdbcaef7f8469c6a188
+EBUILD glusterfs-8.5.ebuild 5436 BLAKE2B 01f8f50b06fbfb310d4896db8dd4740ca004f6f6aa23e8f1ab45232366743a18098f5b4a6192fcc610bc25a9c5d86cb4524e4238aef31c07a32a79ce0432eba3 SHA512 3f735a25e9e300dc31bff6eb004393a0172943c6279a9004c2698f3c3cacee3c523521541b0c6ddb909e499ebc5d1797b8595e2433e3d8023331d69c60b7191c
 EBUILD glusterfs-9.1.ebuild 5418 BLAKE2B a5c1bf500d67d35cbf68df34cf96f441f385e16c7a2c04a3834050cfdaf6f9039ec6b98eb5c645af45888d8c27f12266a9976f79cf47d1025326c6c9cf0f8af5 SHA512 d020ae1f6981b5e1bfff52be7c63d9b1a57947e05695710ff125d229d2961148bb9d58a55928b45591302f3fe6c1ed9d61ecb7b52b4b1d2906eaab467f957275
+EBUILD glusterfs-9.2.ebuild 5475 BLAKE2B fede47057496f728c837b1ec65235b922b7c44e9b8e89ef444f72a9b027abe31ae3d7c46cea60daaee2fe6157f8a9989d3baf244d164548eb638f846def06657 SHA512 c8af2c524b82a65a0f3cc172323e6abecbcfcc5a391682993697a72227993ef7dd348871a9be1d048ed5473a7be8f5b6e091bcb3f75eb098596fb1ca40c48ac6
 MISC metadata.xml 1516 BLAKE2B dc32b16a9cc12174d5cf6a82f8d45920392d43545a4ed9be1c6a0ec3bc50b7c51a647b049c1b74971e95a4de949c9205ad168bfc8f074ca4c535d2999b917d3a SHA512 04542d21102f1722d8f82e498f38e91316932d96f0a05eec74180e4ad133b83fd26d58d3591d2906995072c184822d7ed16357d741b7de99a0c7ff7571da6a08
diff --git a/sys-cluster/glusterfs/files/glusterd-r4.initd b/sys-cluster/glusterfs/files/glusterd-r4.initd
new file mode 100644
index 000000000000..ba4749aef072
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd-r4.initd
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Gluster elastic volume management daemon"
+command="/usr/sbin/glusterd"
+pidfile="/run/${SVCNAME}.pid"
+command_args="-N"
+
+command_background="yes"
+
+depend() {
+	need net
+	before netmount
+}
+
+start_pre() {
+	# Ensure that the GlusterFS auxiliary mount parent directory exists
+	checkpath --directory --owner gluster:gluster --mode 0775 /run/gluster
+}
+
+start_post() {
+	local c=0
+	ebegin "Waiting for glusterd to start up"
+	while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
+		(( ++c ))
+	done
+	[ "${c}" -lt "${glusterd_max_wait_start-60}" ]
+	eend $?
+
+	return 0
+}
diff --git a/sys-cluster/glusterfs/glusterfs-8.4.ebuild b/sys-cluster/glusterfs/glusterfs-8.4.ebuild
index a95eb88996f4..eb0826d32139 100644
--- a/sys-cluster/glusterfs/glusterfs-8.4.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 inherit autotools elisp-common python-single-r1 systemd
 
 SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
 HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
diff --git a/sys-cluster/glusterfs/glusterfs-9.0.ebuild b/sys-cluster/glusterfs/glusterfs-8.5.ebuild
index a95eb88996f4..2a8426c43e14 100644
--- a/sys-cluster/glusterfs/glusterfs-9.0.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.5.ebuild
@@ -5,16 +5,16 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit autotools elisp-common python-single-r1 systemd
-
-SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+inherit autotools elisp-common python-single-r1 tmpfiles
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
 HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
 IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
 
 REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
@@ -98,7 +98,7 @@ src_configure() {
 		$(use_enable xml xml-output) \
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
 		--localstatedir="${EPREFIX}"/var
 }
 
@@ -107,6 +107,10 @@ src_compile() {
 	use emacs && elisp-compile extras/glusterfs-mode.el
 }
 
+src_test() {
+	./run-tests.sh || die
+}
+
 src_install() {
 	default
 
@@ -143,7 +147,7 @@ src_install() {
 	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
 
 	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
+	newinitd "${FILESDIR}/glusterd-r4.initd" glusterd
 	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
 
 	keepdir /var/log/${PN}
@@ -158,10 +162,6 @@ src_install() {
 	python_optimize "${ED}"
 }
 
-src_test() {
-	./run-tests.sh || die
-}
-
 pkg_postinst() {
 	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
 	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
@@ -184,6 +184,8 @@ pkg_postinst() {
 	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')/"
 
+	tmpfiles_process glusterfs.conf
+
 	use emacs && elisp-site-regen
 }
 
diff --git a/sys-cluster/glusterfs/glusterfs-9.2.ebuild b/sys-cluster/glusterfs/glusterfs-9.2.ebuild
new file mode 100644
index 000000000000..de88d7560193
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-9.2.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools elisp-common python-single-r1 tmpfiles
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/"
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml )
+	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/liburing:=
+	sys-libs/readline:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	xml? ( dev-libs/libxml2 )
+	!elibc_glibc? ( sys-libs/argp-standalone )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	dev-libs/openssl:=[-bindist]
+"
+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 )
+
+# 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 -exec \
+		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 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}"/usr/lib/tmpfiles.d \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+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
+
+	insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+	insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+
+	# 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
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r4.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
+
+	python_optimize "${ED}"
+}
+
+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')/"
+
+	tmpfiles_process /usr/lib/tmpfiles.d/gluster.conf
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index ba179a9a293c..b2fd68436f26 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,9 +1,12 @@
 AUX keepalived.confd-r1 63 BLAKE2B 8925b12c9936aaccf828132720a0cb74fddc4a4c8642aaa2ad08099e17e5db0170070966a4465de7bfc06317f812194d9a7928da2559ea41a994c5f8e832b9c7 SHA512 8aed0ece9d67956006c5056543bbb31c354b73b7b555f6cce039f9507da24e40e2ad15ac057dd2e39244de5319f5b9a19659e8ee5c2c7116e202f18c88e6ed74
 AUX keepalived.init-r1 539 BLAKE2B 90675bc2863c7a2b704c14807ca39c7cd35e2f9281384700a7bc4e1a381f106a4734f19e3f740ad00a83c065f45ac620d8224fd125f76ed0a96ec285d3abf393 SHA512 5a5057f50c29c6e2c9f2451acf1e2aa2cdd9218a5882d3eea1a148a4ae8b259b5937387b95feab919b242a65d706e48c5afa3ed280215092295b8e8d44d1f543
 AUX keepalived.service 293 BLAKE2B e80be18a91569d73e64d12ff74622c866efc03522640f33e1cb89e4d232f39bb65b3d2aa7c093e93a5fbe41937a5ab4fe3a77d6864f335e04dea6bf898d4ba84 SHA512 c9d9c190a7892b3c9535ab51da45893bf6ff6738e64f832f52e22f435e4ef4e014f74dcb63f51b76a624ba39dc4dbd3542ada1971d361fd3da966bb649355ec7
+AUX keepalived.service-r1 349 BLAKE2B 8ad78799046d586a5f98ebd53b9f449918bea5947a818b88d92135f7269ec583e6c52c90f2e8ed365b8c96b66d019753a7f139b63d0cfd361d924372672a3d50 SHA512 4850d785ff6761c75a7f1a5cbf2d8ad0f96ab46287992123a3a8ae4085d7102fd8bbbbb6104ad35747beb8f04c9e0e3a0aceb95a900bb03f3b5575a9d8814d2e
 AUX keepalived.service.conf 47 BLAKE2B b6e32bf8c8a602186af776d85c6c457aad2408becfd24af4db6db6123946fba2443f51fae3df0d220a4ebf9ae81a02f4bc1ee0d1d1a7a4b050802336c029c87e SHA512 ecf081bd59c57d6be3627ab42183bdebe58f65355c9cfa3e753a9b1fbf64e7731a7b26ec3ef2bf0422c1a6de4eb1d8d84787ca4d3def2d1f12caed9b64b5063a
 DIST keepalived-2.0.20.tar.gz 1036063 BLAKE2B 217dee8c6dcb148119822f3c6a0b57482e91a17671a35333d0dccf04a3f7c6606a1c9e0b3f2a3adeab838fd91b7c714a0bf11895fe0c7d90d836d3585620c8e2 SHA512 36bbc4aa0a1045486e608c9f4ed73f4335b871dae88beaed10d86445474c462136885225cd6b61219a36fca2ff43771623bc6d072e406cf684acc2ca8f2a38f6
 DIST keepalived-2.1.5.tar.gz 1081559 BLAKE2B 791de7f24d012d77fbf9573713ab158cd91c08b969982b5d6bb86e5e6ed347281378dd5106a05db2f37fd9ab2eb479c131333b4b8c6983671b18652122fdbe37 SHA512 107d071aa1546023a3eb7c2cba4707ab6fbb10af62984ab41c9358b5e28289f8f277456983fe8649a15a77939734d3af573b8b050500d9eb521b4b0537f97aa6
+DIST keepalived-2.2.2.tar.gz 1159896 BLAKE2B 42ff86b4aa7c0a45a3472102107701262b44b780987ed93f3dde7005f61699c1488fd92fccb75f77ef5dcc83461428bbad79cc59cd4648a824a8bfbe7fbd2c34 SHA512 05bb589c76faa4d3f734ecb1a3e5ac40af006fe5dce962bcd9617f192e59bb5336a911b148c1530fb864333da87c3d42a6fbf7d0ef074f6a53ce5a71db8ec706
 EBUILD keepalived-2.0.20.ebuild 2001 BLAKE2B 2207a4c15a10335c03f8277eafe2f29cdd6c593c7ec918c15824e526d7d509afa4dfb3cca36e600e727a956a088df4310f86111db96451fc64a883595ced705c SHA512 7c61d2129c2a64b7ac27daeb0264df6837780dec2bc81a79cb7951d99ffa450b279141802b3e693b80ea066a8a377a2f67561516ff34e40efefae51f68bfdc37
 EBUILD keepalived-2.1.5.ebuild 2001 BLAKE2B 2207a4c15a10335c03f8277eafe2f29cdd6c593c7ec918c15824e526d7d509afa4dfb3cca36e600e727a956a088df4310f86111db96451fc64a883595ced705c SHA512 7c61d2129c2a64b7ac27daeb0264df6837780dec2bc81a79cb7951d99ffa450b279141802b3e693b80ea066a8a377a2f67561516ff34e40efefae51f68bfdc37
+EBUILD keepalived-2.2.2.ebuild 2148 BLAKE2B 9919920dea2bce53487693d68fce791766eba82b66e38beffe5687f5d0cafbd5636647a313fb2972ccc43571b018bc0d4f9b6c7e7c0e9c386761038acc4ff776 SHA512 6c0001610733bec4fb151ceb45345bd3539d8d8cf75301e16a1112df1ea4fd913abe62b3e2a8c8ceb5a53551f289816ceed1c01f535cdeb6fdda54a982c932f6
 MISC metadata.xml 529 BLAKE2B e20e135a1037fe1ce32a4321858160594512de8c13bb8bf67655fc431c7d6ebf8806db518a09c59e6724842577647a23bb7f310638025a85c5ee8e5fee4ee877 SHA512 3925927d7e0866283769f5582e77bfadf1708162e6aae6a5d1a605fda4a2b4c3de631b96718f5ea69ed5335445523ea1ec1e121a1372641dbec751285cb35dd2
diff --git a/sys-cluster/keepalived/files/keepalived.service-r1 b/sys-cluster/keepalived/files/keepalived.service-r1
new file mode 100644
index 000000000000..a3624ed41f63
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived.service-r1
@@ -0,0 +1,15 @@
+[Unit]
+Description=LVS and VRRP High Availability Monitor
+After=network-online.target syslog.target
+Wants=network-online.target
+
+[Service]
+Type=notify
+NotifyAccess=all
+PIDFile=/run/keepalived.pid
+KillMode=process
+ExecStart=/usr/sbin/keepalived --dont-fork $KEEPALIVED_OPTIONS
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-cluster/keepalived/keepalived-2.2.2.ebuild b/sys-cluster/keepalived/keepalived-2.2.2.ebuild
new file mode 100644
index 000000000000..395a98ee08f7
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-2.2.2.ebuild
@@ -0,0 +1,90 @@
+# 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 -json regex snmp systemd"
+
+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 )
+	systemd? ( sys-apps/systemd )"
+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() {
+	local init
+	if use systemd; then
+		init=systemd
+	else
+		init=custom
+	fi
+
+	# 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=${init} \
+		--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) \
+		$(use_enable systemd)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
+	newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${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/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 1e5f8e361088..6ba87de84170 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -2,11 +2,19 @@ AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
 DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
+DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
 DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
+DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
 DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
+DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
 DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
+DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
 EBUILD kube-apiserver-1.18.18.ebuild 975 BLAKE2B bef47882dfc4d6ff525c792b23a7578715f8868c1f7d1417adbf10688130ef79dc7a3f352b811bdd5f05857d3c16be2eca17cc7bbae0edef222a18f01fd2d1ad SHA512 e1d3c64092bb131439115024ab9fa5f51289fc0f29d7f2fdde32e184371a57b6a8b1a57dfc407358200ff573cb2fc6097f1c3dd579cf57f47528f0f581323dbe
+EBUILD kube-apiserver-1.18.19.ebuild 976 BLAKE2B 812d6dedcd0657a5132b6ddb630a82ad8bc017536beec23d688cd4bd2d30aae0804d3768e9ede78ada2691dd621cf9f96af132b9d265c8432d5624a3381c81e6 SHA512 0f5348ce253d37772042fb19f6bcd037cd0f88f8ce5ec146e8a927a594a72a52bfa7fd35e7b4906369705522aaebac4d669aed232dba59965c430e527cfac586
 EBUILD kube-apiserver-1.19.10.ebuild 1011 BLAKE2B e379517c1e19e309e5151e8919d04dcee5573c36da9cc6794c3b523da3b65e929a68dc10c86e22330e94f710005b07936fb252df8f2f7f730910705e92a56129 SHA512 c0bff494da8b557f348ca19d92d748a9490e03b7eef4cf80239a2ac01478cd3fbe3b8c477034e95d9b8405936daefe47cf47371378188a3a989368e3dade5b6d
+EBUILD kube-apiserver-1.19.11.ebuild 1012 BLAKE2B 06cc1b6c301fc5ee4e7e9aff9bfec6c0e51764494609e2c154ad8e0cb33cb1dcf493cd99fbb0ed8bcdb753db31b142ffa50d11e666d01e6f10352d41d3582c7a SHA512 9c46b95d73968b35414d69e16bb18b56fad6abe9d0aab2c84d855cd9dc1e75f53406d6fea8fa4da9971747bbb84c021227684898e7f4d3f6b9bd699a8c1f417c
 EBUILD kube-apiserver-1.20.6.ebuild 1011 BLAKE2B e379517c1e19e309e5151e8919d04dcee5573c36da9cc6794c3b523da3b65e929a68dc10c86e22330e94f710005b07936fb252df8f2f7f730910705e92a56129 SHA512 c0bff494da8b557f348ca19d92d748a9490e03b7eef4cf80239a2ac01478cd3fbe3b8c477034e95d9b8405936daefe47cf47371378188a3a989368e3dade5b6d
+EBUILD kube-apiserver-1.20.7.ebuild 1012 BLAKE2B 06cc1b6c301fc5ee4e7e9aff9bfec6c0e51764494609e2c154ad8e0cb33cb1dcf493cd99fbb0ed8bcdb753db31b142ffa50d11e666d01e6f10352d41d3582c7a SHA512 9c46b95d73968b35414d69e16bb18b56fad6abe9d0aab2c84d855cd9dc1e75f53406d6fea8fa4da9971747bbb84c021227684898e7f4d3f6b9bd699a8c1f417c
 EBUILD kube-apiserver-1.21.0.ebuild 1012 BLAKE2B d3f9db4f7631a00bee5bec5e14addbaa8f16c1fcdd499b434d5dc255acba09e0c6c537607e4a2ad3b9f027bc7a24000b44826eb8e25aa3fc5b4236695ea14f67 SHA512 643bd11525041d2507413fac4998100281c9b784a52cf814849d61bb374d17ff66644ca4c857968c08554eaa1f77481a0406bb8002695e72d1c8f677ee9326ab
+EBUILD kube-apiserver-1.21.1.ebuild 1012 BLAKE2B d3f9db4f7631a00bee5bec5e14addbaa8f16c1fcdd499b434d5dc255acba09e0c6c537607e4a2ad3b9f027bc7a24000b44826eb8e25aa3fc5b4236695ea14f67 SHA512 643bd11525041d2507413fac4998100281c9b784a52cf814849d61bb374d17ff66644ca4c857968c08554eaa1f77481a0406bb8002695e72d1c8f677ee9326ab
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.18.19.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.18.19.ebuild
new file mode 100644
index 000000000000..49d7e68c4096
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.18.19.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.19.11.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.19.11.ebuild
new file mode 100644
index 000000000000..eddbed5f2447
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.19.11.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.20.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.20.7.ebuild
new file mode 100644
index 000000000000..eddbed5f2447
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.20.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.21.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.21.1.ebuild
new file mode 100644
index 000000000000..4ad13d1aaaca
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.21.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 20b9ad770488..c2c2a5ebf0bd 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -2,11 +2,19 @@ AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2c
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
 DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
+DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
 DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
+DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
 DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
+DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
 DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
+DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
 EBUILD kube-controller-manager-1.18.18.ebuild 966 BLAKE2B 8c9c1778634b786e9eeef0e554e512fb28abcd615cd7e1c7de19e4a55a5d1abccaac1da3efd9552234da0479519a1573e62a5eaf529092e1188aa7e455b52404 SHA512 b5544a072376fdf94fb8dfd39e3c940d47b656f31bc2027621c5c2ee1b071521c8a368d26f64070228c1488b4d0c910540e8c3cedda49a8b70e8a7b29e0eee66
+EBUILD kube-controller-manager-1.18.19.ebuild 967 BLAKE2B f3bd71d34cc101f228dfd1a9a96b342493f5546d6f408076908efb7e134bcc6bd9a898908fd85a71889a2d5360e96cf7f09ab1320db0d237240992250d8e5d51 SHA512 10cfe6208b1ee4252aeb659a15bd256177c8699aae94d0d2bacc51e617adad9b6ff9c297acedbdd2711b5c6cf979087a45620e0b14c5d9ee8e5a59749bb39463
 EBUILD kube-controller-manager-1.19.10.ebuild 1013 BLAKE2B ece69494aaf4069df77f5b59f69194bc9026ff0ff9c99c26d01871c79d79cdb9690b6ef0e23548aa9d949fc2a3d498d90ae3343d718d75f8c5fc064f15fc82f4 SHA512 b4cd7597206d1a0689ae8fc8592ecf2b438e386d8a65057b60aafc8fb2614d1ce0a16ef92d3e807c4dc93177786f93f9a10f00d0dfe091abd3a6c01ec34c5142
+EBUILD kube-controller-manager-1.19.11.ebuild 1014 BLAKE2B bf46369c9a72568037c40455a8342cc94c7f6a928bbd4012cadf2aed7c057f3f1490dc232e4aee7c2848e4591a10ebfcfb50b08170cfbc1015ffd8a0894ac2a9 SHA512 5c88fc9377e1244a97eb0b23458c1b7e935d749aea5b7f045a6e32607bd2dd9a04321167dd5d4915aa78aadd75798e388cd2cb40277b787daccbd750e765210f
 EBUILD kube-controller-manager-1.20.6.ebuild 1013 BLAKE2B ece69494aaf4069df77f5b59f69194bc9026ff0ff9c99c26d01871c79d79cdb9690b6ef0e23548aa9d949fc2a3d498d90ae3343d718d75f8c5fc064f15fc82f4 SHA512 b4cd7597206d1a0689ae8fc8592ecf2b438e386d8a65057b60aafc8fb2614d1ce0a16ef92d3e807c4dc93177786f93f9a10f00d0dfe091abd3a6c01ec34c5142
+EBUILD kube-controller-manager-1.20.7.ebuild 1014 BLAKE2B bf46369c9a72568037c40455a8342cc94c7f6a928bbd4012cadf2aed7c057f3f1490dc232e4aee7c2848e4591a10ebfcfb50b08170cfbc1015ffd8a0894ac2a9 SHA512 5c88fc9377e1244a97eb0b23458c1b7e935d749aea5b7f045a6e32607bd2dd9a04321167dd5d4915aa78aadd75798e388cd2cb40277b787daccbd750e765210f
 EBUILD kube-controller-manager-1.21.0.ebuild 1014 BLAKE2B fff067c08b078e53395d941ce9b944510376aa4f16d7534ab0512492ff94a4a458590d45176ae1d9f55921de7c80a0a38b017de4dfa00e7de19d07ed1b384449 SHA512 6554108b79864865e2e7e3921573925b99d4b1257c38fb81cff2f932ae74ed06c6e090c66a108c90348266c0146bfb34230b2543f41aee933104e7ef3e116d16
+EBUILD kube-controller-manager-1.21.1.ebuild 1014 BLAKE2B fff067c08b078e53395d941ce9b944510376aa4f16d7534ab0512492ff94a4a458590d45176ae1d9f55921de7c80a0a38b017de4dfa00e7de19d07ed1b384449 SHA512 6554108b79864865e2e7e3921573925b99d4b1257c38fb81cff2f932ae74ed06c6e090c66a108c90348266c0146bfb34230b2543f41aee933104e7ef3e116d16
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.19.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.19.ebuild
new file mode 100644
index 000000000000..fd520d1073ea
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.19.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.11.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.11.ebuild
new file mode 100644
index 000000000000..e61ad6675f61
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.11.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.7.ebuild
new file mode 100644
index 000000000000..e61ad6675f61
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.1.ebuild
new file mode 100644
index 000000000000..68d01d0642b7
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.21.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 331379da3af6..a30b5e7598ec 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -2,11 +2,19 @@ AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
 DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
+DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
 DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
+DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
 DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
+DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
 DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
+DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
 EBUILD kube-proxy-1.18.18.ebuild 892 BLAKE2B 6c1ee99fe5ec365d42060d191849745a6324e4dfc9d21dc3794dd2750e951e35c2202ed9bb70b136bcf7d4f7bcbf7eb12dba02af8264de29699b02fbad7dfb4e SHA512 a35e418cbdac12f0ab44f690f368ea302e50c182d08e86ffb6f6eb344e646ea2e2a95d075c3be479f8e7d7f9b876a2e1674a3a1c06d3b99719435cfc000791f7
+EBUILD kube-proxy-1.18.19.ebuild 893 BLAKE2B fb0815f05971fdcbf04f6b94850dcc5a3c1bd6692fcbf2c1bb6b5f9a5df5d21f25d44d4bafacd21ea9cd6cb5a52d47e9c6e26b9bf76c5139d3ba734b383c5c6b SHA512 5121058bbd622bfd4bb9b4a60a86ed6d7ed72ab581f72178a500d13a8a588404e639ae350242a22d4acc386209a2dce39103a5606ded2a6a677c201ce6f7a449
 EBUILD kube-proxy-1.19.10.ebuild 928 BLAKE2B 34644b672e168243d5589eca39c2bad64d5b5fdd41d022cad64a9d9792a14856e5ed55f7868739af44ee039d8184c2a57e0c076adf59498be9d961f312a3cb17 SHA512 0372233c7948b6206d4aada693a4093fc439dd7390de682b6a363fcf8a3e5915213065b30773cdbaa2e2557e3c19db721df1ce4239cf01ae88366fba525bfc68
+EBUILD kube-proxy-1.19.11.ebuild 929 BLAKE2B 81abfe44a4025e907542f6935af1c953920d3c730008b4db082800626542265955c07b4277e39d9b8517273fc89bb87e7ca29217dd68cad235d8138fb005232b SHA512 fe6d3657c95c46a1bc87f2c0abb9e8e98eeb11c8cd48810ae94a49739b04f401b32b00522c14a488d7f043d721cda9967937b1c177765cdfa07c9add4300a99c
 EBUILD kube-proxy-1.20.6.ebuild 928 BLAKE2B 34644b672e168243d5589eca39c2bad64d5b5fdd41d022cad64a9d9792a14856e5ed55f7868739af44ee039d8184c2a57e0c076adf59498be9d961f312a3cb17 SHA512 0372233c7948b6206d4aada693a4093fc439dd7390de682b6a363fcf8a3e5915213065b30773cdbaa2e2557e3c19db721df1ce4239cf01ae88366fba525bfc68
+EBUILD kube-proxy-1.20.7.ebuild 929 BLAKE2B 81abfe44a4025e907542f6935af1c953920d3c730008b4db082800626542265955c07b4277e39d9b8517273fc89bb87e7ca29217dd68cad235d8138fb005232b SHA512 fe6d3657c95c46a1bc87f2c0abb9e8e98eeb11c8cd48810ae94a49739b04f401b32b00522c14a488d7f043d721cda9967937b1c177765cdfa07c9add4300a99c
 EBUILD kube-proxy-1.21.0.ebuild 929 BLAKE2B 457168acecb296450df17416cccfa8c23a41236489150d3e47da3287b0e43d0e2ae1a24b4088685c7a9e40a71218a56ee30b718464e158874482b15a5dd335ac SHA512 8dbb6193562898f48c70a83d5b1ae8f3109f05bcab2208031f285bb8a90a3c828761b0144234ae2963eecb7dac10fccccf586d566b7314bcf4f14947064483bb
+EBUILD kube-proxy-1.21.1.ebuild 929 BLAKE2B 457168acecb296450df17416cccfa8c23a41236489150d3e47da3287b0e43d0e2ae1a24b4088685c7a9e40a71218a56ee30b718464e158874482b15a5dd335ac SHA512 8dbb6193562898f48c70a83d5b1ae8f3109f05bcab2208031f285bb8a90a3c828761b0144234ae2963eecb7dac10fccccf586d566b7314bcf4f14947064483bb
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.18.19.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.18.19.ebuild
new file mode 100644
index 000000000000..dc462bedf2c4
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.18.19.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.19.11.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.19.11.ebuild
new file mode 100644
index 000000000000..d62b6c41d8fd
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.19.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.20.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.20.7.ebuild
new file mode 100644
index 000000000000..d62b6c41d8fd
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.20.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.21.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.21.1.ebuild
new file mode 100644
index 000000000000..6c8c309ffd31
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.21.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 964b7f6a3710..1171c1e4503d 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -2,11 +2,19 @@ AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c26912
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
+DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
 DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
+DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
 DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
+DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
 DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
+DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
 EBUILD kube-scheduler-1.18.18.ebuild 950 BLAKE2B 50d52255a541215f588090cb9029c8b9d395b8561bb04d5558edfea37f3bae0c9ec3ff99219c7eeb0dd7c98b6285d696ee756d36003923d804f59b929ac588a5 SHA512 44f9f88d549d5c9001efb7e8e94cc4b56a1f5716b49e5f5686efe46e94e4c9b5857b1f78b710e24b5addf980b2c94729ffc9a97b248189b6a8b41737ea08025a
+EBUILD kube-scheduler-1.18.19.ebuild 951 BLAKE2B 9a79b2d2568fd0666080b980a2f47094ea036d8352345b4a0489f48a950946c88eb85ff7950234ecef0f43e3ae5885b254b19ad3a7d1adaeabb696ca42f32ab0 SHA512 d177752bc34802343e103bed6dadc1900766727c4b3251003df10b20ab744b4d44be1abc6297143b481872c7a74990f980bb39a65300ac8a5f5d46ed515b79ef
 EBUILD kube-scheduler-1.19.10.ebuild 986 BLAKE2B dfd44bf7514501fb504941a0d39760affed4d7a40b1de38569ede78e5882976ba99cebaf5470ad5286026373cc89e33cd13f48a4aeafedca34ec157e02ab70d8 SHA512 7ec037243377d2caf291d3c48ab3c4b7804a8c414d0527e13a0b9a4750a7ef2abee5eb580ce307937516878b79fc6795e5407c36188fc94c8eff9f98aac90ded
+EBUILD kube-scheduler-1.19.11.ebuild 987 BLAKE2B 2bb55884a676b43cd0678ed33f450622a4503b72e3f6a94c511b56c6c148bc8c606f79a07a0e4160c85a8369dffd3b09e3cd6e48b6fb06f4bc8b407fff01dd30 SHA512 f95df23f7b81dcd24ab696830e58eac93da20653e31b3486b2781540b4d138c5390503fb15b498a67ac6253c779e83677915f4f13f41c08a7d79acf6a9666485
 EBUILD kube-scheduler-1.20.6.ebuild 986 BLAKE2B dfd44bf7514501fb504941a0d39760affed4d7a40b1de38569ede78e5882976ba99cebaf5470ad5286026373cc89e33cd13f48a4aeafedca34ec157e02ab70d8 SHA512 7ec037243377d2caf291d3c48ab3c4b7804a8c414d0527e13a0b9a4750a7ef2abee5eb580ce307937516878b79fc6795e5407c36188fc94c8eff9f98aac90ded
+EBUILD kube-scheduler-1.20.7.ebuild 987 BLAKE2B 2bb55884a676b43cd0678ed33f450622a4503b72e3f6a94c511b56c6c148bc8c606f79a07a0e4160c85a8369dffd3b09e3cd6e48b6fb06f4bc8b407fff01dd30 SHA512 f95df23f7b81dcd24ab696830e58eac93da20653e31b3486b2781540b4d138c5390503fb15b498a67ac6253c779e83677915f4f13f41c08a7d79acf6a9666485
 EBUILD kube-scheduler-1.21.0.ebuild 987 BLAKE2B 60f25a20a95753c4a57a7962c98fbc8fa6d2948ed783b50ce281238b484355ffa037c5201bf02a4d1db8c3824cf07b0cadf4edf094e943506850582e8fb89cfd SHA512 def9c3a32e1b7fb792f029302d29cb4d5d19cb9c91b5f5011c98e6c4cf8d243aa5861ced10436e93c8f5b057eb0532137bc14182e14777977ca0393c636af3ec
+EBUILD kube-scheduler-1.21.1.ebuild 987 BLAKE2B 60f25a20a95753c4a57a7962c98fbc8fa6d2948ed783b50ce281238b484355ffa037c5201bf02a4d1db8c3824cf07b0cadf4edf094e943506850582e8fb89cfd SHA512 def9c3a32e1b7fb792f029302d29cb4d5d19cb9c91b5f5011c98e6c4cf8d243aa5861ced10436e93c8f5b057eb0532137bc14182e14777977ca0393c636af3ec
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.18.19.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.18.19.ebuild
new file mode 100644
index 000000000000..68467bd70d77
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.18.19.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.19.11.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.19.11.ebuild
new file mode 100644
index 000000000000..98230502bf76
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.19.11.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.20.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.20.7.ebuild
new file mode 100644
index 000000000000..98230502bf76
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.20.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.21.1.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.21.1.ebuild
new file mode 100644
index 000000000000..0e9f9a6dd32b
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.21.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index a885bc31c9d2..1d4b74cb5964 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,9 +1,17 @@
 DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
+DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
 DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
+DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
 DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
+DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
 DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
+DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
 EBUILD kubeadm-1.18.18.ebuild 872 BLAKE2B 55dda0d985be0c38976b72f818e77d6e3dc3e89da5f9d3adf4d87939f5153467f6d98cabb89c22713bb48774ea8a413f26ddf5de3938245b1e402bdc9ef61645 SHA512 e49be0b2e02a5cc27366f16d86e472ea3caaa700586ec879f84d76c8d7ce0e24ca2dfe6bc6dc4b36c9dd771d501ff93178fffc4388a922b2ba2ad7f0b0ba6199
+EBUILD kubeadm-1.18.19.ebuild 873 BLAKE2B caa208d5cc70aeae8698a818fd5ba149796697eee8297966b71a6355b4feadb1b8b5a07ad0cd7bb4510dbeeed9bd30b78416a49a8d8c1d8d4b942bbccbd14458 SHA512 5482f2f8b4c9538894008358257e468f7ff8f1c2a936edb923775c955e1a8ceadf484987fb102b218548061480912f93af0351938fda9324b05f7d0bf15b5c81
 EBUILD kubeadm-1.19.10.ebuild 906 BLAKE2B 5efec4d82bb7d0197af8b423a5a503c2c00ebfd21aa1790aa4eef89968832811278b836ba256910df9b14010c64cbb367e2331dbfe74891045e872d40e6bfe14 SHA512 d7caf5711538385a89329ec6118ccacc05452549e06bf1fd54cae4e90e7508c5e7e0207cfc65e5d0e9a7a88964b122ba1649b1850a94c62ce914c7967e63535f
+EBUILD kubeadm-1.19.11.ebuild 907 BLAKE2B 5e04bb4a35a8a99082f8b6b656ce6498e2121ab448f2a02b109ea84cd50d99b71e24f39e6cb4f39de0212d45629c3e533b45a9073afb4a368b593ad8ad1c4b8f SHA512 8baef54420d2354ef809920131cd7ee027030020f4a239534fba3e838807e1b95092ea692feaf4b7dfdd4a297a37a21413bf3a5f0ec0eca603abad652890ab8d
 EBUILD kubeadm-1.20.6.ebuild 906 BLAKE2B 5efec4d82bb7d0197af8b423a5a503c2c00ebfd21aa1790aa4eef89968832811278b836ba256910df9b14010c64cbb367e2331dbfe74891045e872d40e6bfe14 SHA512 d7caf5711538385a89329ec6118ccacc05452549e06bf1fd54cae4e90e7508c5e7e0207cfc65e5d0e9a7a88964b122ba1649b1850a94c62ce914c7967e63535f
+EBUILD kubeadm-1.20.7.ebuild 907 BLAKE2B 5e04bb4a35a8a99082f8b6b656ce6498e2121ab448f2a02b109ea84cd50d99b71e24f39e6cb4f39de0212d45629c3e533b45a9073afb4a368b593ad8ad1c4b8f SHA512 8baef54420d2354ef809920131cd7ee027030020f4a239534fba3e838807e1b95092ea692feaf4b7dfdd4a297a37a21413bf3a5f0ec0eca603abad652890ab8d
 EBUILD kubeadm-1.21.0.ebuild 907 BLAKE2B 9afd971b3448c327ce26750d0d90ff79d4416a158e0cafb37bf834ef47056e9e087cc06cdeabeec88b9c1426cf0106c1e7c7e1945b8523e518ac8e69c51e87ff SHA512 0861a7d79b74f60623f11c7de08306732793ba1edcf185e7abc8e779757c744b94191f4a829932818468de05b350636a81d36344d3a128e404a7a1b33526a0d0
+EBUILD kubeadm-1.21.1.ebuild 907 BLAKE2B 9afd971b3448c327ce26750d0d90ff79d4416a158e0cafb37bf834ef47056e9e087cc06cdeabeec88b9c1426cf0106c1e7c7e1945b8523e518ac8e69c51e87ff SHA512 0861a7d79b74f60623f11c7de08306732793ba1edcf185e7abc8e779757c744b94191f4a829932818468de05b350636a81d36344d3a128e404a7a1b33526a0d0
 MISC metadata.xml 917 BLAKE2B ead95efd60868ca415983905cf72f7a3b00dd7048fe6fad5caf52fa78ab1ce77109e3e29ac5708b5240dc27b58b69858ca23b6952f2b087f5e311359e9929010 SHA512 3be4ae4aec07e6cdfb6eb1aebabb71fd49e9e9dbf9a183c4a1b19c74f3419c32a01b537425f30844ad642e04d72411ecfafd19c2ebdb0df8715ae139d9145949
diff --git a/sys-cluster/kubeadm/kubeadm-1.18.19.ebuild b/sys-cluster/kubeadm/kubeadm-1.18.19.ebuild
new file mode 100644
index 000000000000..b7becaae8f36
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.18.19.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/kubeadm
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.19.11.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.11.ebuild
new file mode 100644
index 000000000000..e8e9bef16ed9
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.19.11.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.20.7.ebuild b/sys-cluster/kubeadm/kubeadm-1.20.7.ebuild
new file mode 100644
index 000000000000..e8e9bef16ed9
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.20.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.21.1.ebuild b/sys-cluster/kubeadm/kubeadm-1.21.1.ebuild
new file mode 100644
index 000000000000..b98e9b739641
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.21.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 67fb6d813f26..6c0b883b56c3 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,9 +1,17 @@
 DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
+DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
 DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
+DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
 DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
+DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
 DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
+DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
 EBUILD kubectl-1.18.18.ebuild 871 BLAKE2B 989edf4c75a9e841fbad5223602146e128fa7d60fff7eee080b87f4263328359742d9c7368d6ffdd063a33ba4a5d907d3a2edbeddfa48ef4daa94bd06cbeb451 SHA512 f47a8cc3af8d9685608a232000c26b60d83c5669bc42a16077c9990014c0632deffe4af1970e086039a16aa98ea740cc6fb136139ae17418db1e9c490deaf6e6
+EBUILD kubectl-1.18.19.ebuild 872 BLAKE2B 6630bf8f8b331fdeae6f434d2d13699ffcfa38fa14ba897317a492997d153f1c9cea7dc57923d948ca6661b2077fe606bd34cd8523bcbd4a47f81a6c66aa766c SHA512 3fd64b13dfda775b85e8679d8f6cba25ea3d9bab6b040cd6653439a2f405b1745000ca242de4d5f13e431aa4b256c88c714dfea259866489977c2beaffe2688f
 EBUILD kubectl-1.19.10.ebuild 901 BLAKE2B 928a7f93d2de11e0f5671a40819a54d0ba59284e7036fc166d9af399495bc897fa9508e9b69f2d00e36c467135fc2fd61b642fe0a88a9aa21afc3ec4fc07c0f8 SHA512 0becacf2403f7b2baa65a4f482d7caf36414ebe328e57e2f88987d706698810aa69375e90e743d655e56fc4278016564b2578d2812b3d72785c8a80b4920f999
+EBUILD kubectl-1.19.11.ebuild 902 BLAKE2B 6f454846b9f0f28044dd85192f039fb6dedd3643d91e13c67b219a49cf011fa6c3c3eed9995b6c7ec0bfcca0150a7d2118d9a6c9d24d1da9de28dc06f6bd2bc0 SHA512 15c047f5caf38d5d6e550609c376ceb558542846077f7433d48261a8f60b9aaa9700a87dd63b52d0a4be0aa6453bd500171877ec038fdd4e010723d7582768e9
 EBUILD kubectl-1.20.6.ebuild 901 BLAKE2B 928a7f93d2de11e0f5671a40819a54d0ba59284e7036fc166d9af399495bc897fa9508e9b69f2d00e36c467135fc2fd61b642fe0a88a9aa21afc3ec4fc07c0f8 SHA512 0becacf2403f7b2baa65a4f482d7caf36414ebe328e57e2f88987d706698810aa69375e90e743d655e56fc4278016564b2578d2812b3d72785c8a80b4920f999
+EBUILD kubectl-1.20.7.ebuild 902 BLAKE2B 6f454846b9f0f28044dd85192f039fb6dedd3643d91e13c67b219a49cf011fa6c3c3eed9995b6c7ec0bfcca0150a7d2118d9a6c9d24d1da9de28dc06f6bd2bc0 SHA512 15c047f5caf38d5d6e550609c376ceb558542846077f7433d48261a8f60b9aaa9700a87dd63b52d0a4be0aa6453bd500171877ec038fdd4e010723d7582768e9
 EBUILD kubectl-1.21.0.ebuild 902 BLAKE2B 5907f4fb13676ce0fddae866a732043d9c965f1f201b65ed0077240fe1f7fd7df28ea180a2541085486f4c0f612e604bd6e357fe038edc72abff6538b276a57d SHA512 4b717de62be84d6237e8b87b8550687bf8451d1a635b06b2f07567fb00a13f62b4d16f488074e10d0eacdc9dd9020ef7e5e1469bad3993e4350c8adbf1b51223
+EBUILD kubectl-1.21.1.ebuild 902 BLAKE2B 5907f4fb13676ce0fddae866a732043d9c965f1f201b65ed0077240fe1f7fd7df28ea180a2541085486f4c0f612e604bd6e357fe038edc72abff6538b276a57d SHA512 4b717de62be84d6237e8b87b8550687bf8451d1a635b06b2f07567fb00a13f62b4d16f488074e10d0eacdc9dd9020ef7e5e1469bad3993e4350c8adbf1b51223
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubectl/kubectl-1.18.19.ebuild b/sys-cluster/kubectl/kubectl-1.18.19.ebuild
new file mode 100644
index 000000000000..1e44048f862a
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.18.19.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.19.11.ebuild b/sys-cluster/kubectl/kubectl-1.19.11.ebuild
new file mode 100644
index 000000000000..99f1f19c12d4
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.19.11.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.20.7.ebuild b/sys-cluster/kubectl/kubectl-1.20.7.ebuild
new file mode 100644
index 000000000000..99f1f19c12d4
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.20.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.21.1.ebuild b/sys-cluster/kubectl/kubectl-1.21.1.ebuild
new file mode 100644
index 000000000000..5603ed030db7
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.21.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 2c8bb6cdf5bb..70da8261809b 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -4,11 +4,19 @@ AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a005854898
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
 DIST kubernetes-1.18.18.tar.gz 32427845 BLAKE2B 10e04ac2097a01702ea227f217b2346378b17a4040ac677ecde592544febe204c443c0a722d34617a8cc7db7d7909a9f9b6cfd84bc3e36e7862a72273bc45ef3 SHA512 8305cff40d08a40c6c8e71e9056fac6b76856a6e39ac8d2e3952c155a8c70a9d7c269725d55df180dd906d0ff6d9c8b9e17a58b00a08c86438f1435058163fd3
+DIST kubernetes-1.18.19.tar.gz 32437793 BLAKE2B d5212b8eb29635d8269f91880420bbc9c16e472583ffd659a08362e80f79beb9fb48945a48dacf0f68b6b4383db0d1e615b432ea1687c015f78e4bc7aef94189 SHA512 aba80c2d5d2296bc2453a1519c29034a4f5e52373dc366186c295154960744f2d7fbae0b9cd1c64044bbb5cd9007b182dc4f60e57e991d28b3c8f0fc8cb279fb
 DIST kubernetes-1.19.10.tar.gz 33529312 BLAKE2B 8566eaf43beab26fe781e3520be147620a256d2b9fc895d51c3707dfb34c8e53667527bab23d6b1b5a64dee291893ec69a3bfa54b72da0e0e9a7f27acbd0c7d1 SHA512 7a69062be5a2fd0522f03077edb023e59f4887580f3018e4a3c1726c888d1123e3beb1adce58e7ff4b658bd3f1eb8e650f022f88c2d0abbc561acec164028cf5
+DIST kubernetes-1.19.11.tar.gz 33549052 BLAKE2B 5c17aae668a1e8c2eb656330a990786edf18a72d655ef23e55d9b02aa2a23ac07eeab5fdf4bfda2141e8ae2e9db3559bf8f402c8b984ae152aa955cff0ee3e22 SHA512 42a8c65eac4d4c2b9531fab578c9f605a1d57b3d892e2650ec87e3b1972e58f438dbf9f5c05ec2eb529218c43c8e391e3a294467c82ceffe94cc90b35e619242
 DIST kubernetes-1.20.6.tar.gz 34478669 BLAKE2B 82e3aac07e9f360cda6854f4ff51082e96648c1a78888a6dd43530b31404089cd1eaa2805fa9896dfa1bdef03ebdd04b6dda8ba948d8b16be28534390554da5e SHA512 b3df8266c597b3e2270e7caea24129ebc8fa258e32e747c1e48ede5ad0244c791f9da39bcaf7c08df8c1b314976742db23ecaa4623ab241f87a80d4834a0948f
+DIST kubernetes-1.20.7.tar.gz 34486823 BLAKE2B b0467ecb4527a6de3955185ea377248bbf0b83624af8afd4bf8f33cb2a5e33d0433ea98b3f984a38c59ad9fd6a8cf3e8124eadc81cbe337ca7bc4bce53d4f9ed SHA512 ccb8ac6f1d9535791386ee73ba5008180e1a77fcdc320363248037117547eb6c59d25c46ea1d5bb49043717e2b6a1796470b3b677229a7a40fd6cd1f4b8ab695
 DIST kubernetes-1.21.0.tar.gz 37484462 BLAKE2B 78ae44985eccf9e17d58ccb3f9c98dcc469059e17375b016d82df6d5ce02451e0bcac49cdd89d5ae82bd718191e83fbf6e128ae3a4d14569460febd0c027edf3 SHA512 f5928f5aad0ce1dee7db145a798c5038aa5ca085a09ba9a2da5cabb36c54f2adc86ec5948d4cf344544c45c29d18e7b9f04bf14c4a91aab637c7244fcf3f80d8
+DIST kubernetes-1.21.1.tar.gz 35982846 BLAKE2B 3852fbaa07b622561f88cd1821b87fe08e04a34cbf4538f63c2ed325789c9263eddc8844a35eae3394795abd25096bdfa00df7584d5fc7006886bc3099924de2 SHA512 d3257566a07e1c08bfcbce85775af8c2d7dfbc7df4aa8692e6a0a6f8590f7eeb9fc6802b715ee8b0f67b2f41344e926a0a955afa68e2b8d518a7d8160771dfcc
 EBUILD kubelet-1.18.18.ebuild 967 BLAKE2B 6bd0e20b204adbde178c2276a81d69b4d027f9b38ccf40f7641bf6d45fa1e746b59ef666dfc91ff1b14a332f6b8da266e431e39db020203c9f527222564847a8 SHA512 6654316a5b37260aec1f728619e485ab709938e8f2a006a5673085e97fabb4a259425cd903c7578c2d69d36287fa0db01f47f369030e30d1e55b926baf72b6c7
+EBUILD kubelet-1.18.19.ebuild 968 BLAKE2B f677dcad1302346ca4763a62da621f7f7f96b3927d298eb854cb842fb332cc4d21e3fdc8fd79f07f9b5843eb53cc523419d9c7a8ba29bf48b9545a1af0c37d95 SHA512 2d8118164c53702d34080ae0f68669cb95c146afa537dd5d0a3c97020a85cc52aba7e96621a8fd11b765a96cfd28f1b421632c5bb788e013fb5e306951bb5035
 EBUILD kubelet-1.19.10.ebuild 1003 BLAKE2B 8c7e0e91a3108a6fa20ffa4ca7ecc247cf19f3ca2fa22f4c69795abc4430c1068ec854bed768ccb8caede6427456d5f8b43ff1aa018a3f9a2875a62c32d5ced8 SHA512 55923ca8b0a637bf9e710be0f2f217ab17ab4aa37785c6da7c2d5d28b62dbfdf4f1df425f1b8770c2051335a57911b919188e8a587bc08a32058601e9fe456e9
+EBUILD kubelet-1.19.11.ebuild 1004 BLAKE2B ae16a92a877501f8a611ad0f34065652b0819d753277857698dc6cbb007eb273722b596a375047247d6f6625f124f7b5e7407e7b350fb8a4b6641afcc35f37e2 SHA512 0c0474deb8a6fa845e2bd0d0e27d432ca2f0888246454ea91feb265cb490a8c4b3722f79a19c3732f80df3b7ad9f87992ef92e8577b9520e9d92c18010a6714f
 EBUILD kubelet-1.20.6.ebuild 1003 BLAKE2B 8c7e0e91a3108a6fa20ffa4ca7ecc247cf19f3ca2fa22f4c69795abc4430c1068ec854bed768ccb8caede6427456d5f8b43ff1aa018a3f9a2875a62c32d5ced8 SHA512 55923ca8b0a637bf9e710be0f2f217ab17ab4aa37785c6da7c2d5d28b62dbfdf4f1df425f1b8770c2051335a57911b919188e8a587bc08a32058601e9fe456e9
+EBUILD kubelet-1.20.7.ebuild 1004 BLAKE2B ae16a92a877501f8a611ad0f34065652b0819d753277857698dc6cbb007eb273722b596a375047247d6f6625f124f7b5e7407e7b350fb8a4b6641afcc35f37e2 SHA512 0c0474deb8a6fa845e2bd0d0e27d432ca2f0888246454ea91feb265cb490a8c4b3722f79a19c3732f80df3b7ad9f87992ef92e8577b9520e9d92c18010a6714f
 EBUILD kubelet-1.21.0.ebuild 1004 BLAKE2B f88397138d1ad4d29a043f56763236cf87f6c219c6d4ee45fc9d45df3f1a6758a10ebdf6cfdb2757fd420595c5720e9d0bd3df0dbb159859cedfc40f2662f5dd SHA512 fdcb1d7d2e8959cfbe3e6c3d138cc2f20cea6024f3cb89959bb8a7f68d5e2188d1b5bffd299a9484c4e37e446e128470a1f56d9278c46ce2c539ccabf2444ce3
+EBUILD kubelet-1.21.1.ebuild 1004 BLAKE2B f88397138d1ad4d29a043f56763236cf87f6c219c6d4ee45fc9d45df3f1a6758a10ebdf6cfdb2757fd420595c5720e9d0bd3df0dbb159859cedfc40f2662f5dd SHA512 fdcb1d7d2e8959cfbe3e6c3d138cc2f20cea6024f3cb89959bb8a7f68d5e2188d1b5bffd299a9484c4e37e446e128470a1f56d9278c46ce2c539ccabf2444ce3
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubelet/kubelet-1.18.19.ebuild b/sys-cluster/kubelet/kubelet-1.18.19.ebuild
new file mode 100644
index 000000000000..53a67a3c87c8
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.18.19.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.19.11.ebuild b/sys-cluster/kubelet/kubelet-1.19.11.ebuild
new file mode 100644
index 000000000000..78302b14a815
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.19.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.20.7.ebuild b/sys-cluster/kubelet/kubelet-1.20.7.ebuild
new file mode 100644
index 000000000000..78302b14a815
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.20.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.21.1.ebuild b/sys-cluster/kubelet/kubelet-1.21.1.ebuild
new file mode 100644
index 000000000000..25f142b537a3
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.21.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index f7eecf588a0a..c4ade3d6c2bf 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -8,16 +8,20 @@ AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d7
 AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366
 DIST neutron-16.3.1.tar.gz 12880968 BLAKE2B 2915490523578f10f067682ad393c06bc7f793a736f94282e79e82e4f0108fa20a99d8a91f4344094de394316a71c4a5fdd2995db212ddd90fd7cdeddd00787b SHA512 8518f706d4bcb4bf44e2ef9b35b858f08f2e7ac20211944ca0d4df6e2be029817bc541f2fff497bd40b4a85621ee4aa8ac433fbdd19a5d8597df0725a377ae91
 DIST neutron-17.1.1.tar.gz 12925243 BLAKE2B f95068d1a85a508e447fc5de28ef6555252fdfe3deb8b0dd94a2e20f28663dc610bbb5e32fb69e0d80fbe9917c387b0c095fb43370ddfe2bbb05327553cb8e58 SHA512 cd707d4adaa6a6b606940370606fcef61a35af0d1f1108f24891d2f88611f4f2812c061d3b7a9540d4b6df882615a9366d39273184a791a911775e7c9f4402b8
+DIST neutron-17.1.2.tar.gz 12930231 BLAKE2B 865e849fb811b3abf8b589ea5752c9305962ed24bcd69a4998425a1d56abcadd87f224e883269b780655f252d40dd050805782080385d94163b5488ffbdbf52a SHA512 1320c96ba5b3b2de5feb313b564baa7308b3b964c628afa57e60ed8f541549b11ddaa0ea1e4025dc0265ad1d962f0961fdc93924fcdde98c9b7c3c23728a3ebd
 DIST neutron-configs-16.3.1.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-configs-17.1.1.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
+DIST neutron-configs-17.1.2.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
 DIST neutron-configs-2020.1.9999.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-configs-2020.2.9999.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
 DIST neutron-ml2-plugins-16.3.1.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 DIST neutron-ml2-plugins-17.1.1.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
+DIST neutron-ml2-plugins-17.1.2.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
 DIST neutron-ml2-plugins-2020.1.9999.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 DIST neutron-ml2-plugins-2020.2.9999.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
 EBUILD neutron-16.3.1.ebuild 8434 BLAKE2B 88f051d11d85ce9e908ad043e87b4e7e7a62335fa7526b198e010a32018e553cb375c7b9d8f44e9232d5d7e7533f44eedcb1e63f03e7fb0c6df9943ce803353b SHA512 4ba4ecf390628b5a72df8821677e525fb38552e0aaf3d47eb80703fb3f435436370d5031d1adca08874c3bea3cc149cec7f1b03f622f794111fc5fef79e00672
 EBUILD neutron-17.1.1.ebuild 8313 BLAKE2B c9d35e0376d141e9f7b183cac8585f922303f0d203173b96aeacb6cdc278441ad444d1a9b75fd093ba10d9d140691bd4c46b20091b2754051ccce4a79a938e7b SHA512 fe2f179c4505ee8794991f047521cde5cefb8058cf15ec1c45429ae16ad91ae712028e05a741225bbeeb053544b6abd4c304f2bd2d3f0a3e5546f8c9210d3320
+EBUILD neutron-17.1.2.ebuild 8315 BLAKE2B fa52a494ae8ac76d7fcb824243c8bad91afe71c109ef4c45c6126a0a08b81553c418d2531688b1dc2f5f2ca0d5a7318b21b8271c507fcac7088baaf4b79d6ef3 SHA512 c25ab2bb8f98080a2a7d29e509d09a9a2bf644ccf0ad9cd828ab5d4c4a887538da57eb884b0c3a5a3f1837998e8bdf050a1a7c1f0ebab0100f20d2539ebc3822
 EBUILD neutron-2020.1.9999.ebuild 8433 BLAKE2B 05813a35255dbb7e8c9e62d4d6ba849455e5945006843fb27babe335945036b18948d4c1d08bb75b3abc69d0f929b0dc53e25a2fa0783f81a3ef826e69a0fcd5 SHA512 0f7f4436b8ee80b0a392116a20f8a1e049b90562591af37d9a81dd47fdd0a74d1db4e67d717c292093744549a6fcb6f144361f30a5f32471c0ffede6f5bca3e2
 EBUILD neutron-2020.2.9999.ebuild 8312 BLAKE2B 3f0f0cf2650fb39a72413d83572080c3183062d2eb741a5424252795c80a1e8a9d00e285fbbb44c20cebc3256c4bb03f0554009a47d6e9eb4cf113abf9109f39 SHA512 0e9f51194d66df4bff15e2b321851cf9df1de88088fac830e4fdea466a12dd64f3979da37772cc57ab7540c6d5f9591fe741800889ccd47fa1048af1a8b812bb
 MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/neutron-17.1.2.ebuild b/sys-cluster/neutron/neutron-17.1.2.ebuild
new file mode 100644
index 000000000000..7ba8c9f50879
--- /dev/null
+++ b/sys-cluster/neutron/neutron-17.1.2.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 linux-info
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
+	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
+	EGIT_BRANCH="stable/victoria"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+						|| ( openvswitch linuxbridge ) )"
+
+DEPEND="
+	>=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]
+	app-admin/sudo
+"
+RDEPEND="
+	>=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-6.0.0[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/ovsdbapp-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.5.13[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/iputils[arping]
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	net-firewall/conntrack-tools
+	haproxy? ( net-proxy/haproxy )
+	openvswitch? ( net-misc/openvswitch )
+	ipv6? (
+		net-misc/radvd
+		>=net-misc/dibbler-1.0.1
+	)
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )
+	acct-group/neutron
+	acct-user/neutron"
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_DEFRAG_IPV4 NF_NAT NF_CONNTRACK \
+	IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g neutron
+
+	doins etc/*
+	# stupid renames
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
+	doins "etc/rootwrap.conf"
+	doins -r "etc/neutron/rootwrap.d"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	# add generated configs
+	cd "${D}/etc/neutron" || die
+	unpack "neutron-configs-${PV}.tar.gz"
+	cd "${D}/etc/neutron/plugins/ml2" || die
+	unpack "neutron-ml2-plugins-${PV}.tar.gz"
+
+	# correcting perms
+	fowners neutron:neutron -R "/etc/neutron"
+	fperms o-rwx -R "/etc/neutron/"
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
+}
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 2423f56bc812..9747fbb1b3e4 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -5,12 +5,15 @@ AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
 DIST nova-21.2.0.tar.gz 9319254 BLAKE2B fb87dcffa40ae38f05ab82c7bd328a3b9e98101598b42ddce318315f431b0c26822ffdfc588ba9c5f60691ad2100201c08309bb0bf3b419b5a9fa4b13f232637 SHA512 c3ad8be452fe68b3552355c8be751823ef067107c4ad8a499fb222951ee429d65ea4e1d8bfa0dfe2a9135ae8140de3b191ee12c3a1df2260cdddd2be36cdbea2
 DIST nova-22.2.0.tar.gz 9271449 BLAKE2B c7b52f4d7e819152971c67f5f0a9f2b191e0235917efd04c799413ebfbf44500c64bae9ddd6082ef7b347c500d346f46fd07bad45a7fc4e5c397713867681dbe SHA512 acb9745b2bebd669f919a2d3d73e9dc5dad5aa3de49690daddd779fb6467139f857d67c6d8af3761f12db9bf6c5120d1af7bee3e73b3c0e0c44d6b41cafe7883
+DIST nova-22.2.1.tar.gz 9274586 BLAKE2B fb44f5cbd544c08d92aef48ef2858806245f1f36f2edc1a86a03189b460431add656d00dea830bf4fd324c79bf0d0e057b06836b25f554eea6416af3c2821bce SHA512 59df339bb00d4a7e087cc9caf6d6efcb1e5205ea8889502d00c4c22eb4acc6c0f19383de76f260382d56e145fad01088c3fd28f41d26441303e13b3b839ddcce
 DIST nova.conf.sample-2020.1.9999 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 DIST nova.conf.sample-2020.2.9999 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
 DIST nova.conf.sample-21.2.0 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 DIST nova.conf.sample-22.2.0 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
+DIST nova.conf.sample-22.2.1 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
 EBUILD nova-2020.1.9999.ebuild 7626 BLAKE2B 98608ff335503b676bc1dee5f04dddebfee3a2f955f7b93d68c85dff2b9edf6a2ce6471492487a6f9eddf0035b394f1a42e1770a1ef68863bc5c513efec4b1bf SHA512 bbc8d788b09d99f72aadc7c7d20085a4170ec151835415ed4529dc074c4ccf04eea06c2fe22c0a5ea933ec455bcc829c947e74018d425b7f8b82e0ae9a6add53
 EBUILD nova-2020.2.9999.ebuild 7491 BLAKE2B 6a19d8df373bb00317f19741efcb6c2c8877ecfbc8b4222118fbf483b36fcc69b70296a7ebedf755d4285360c7bc71334993bbc17fbe5ac9aad789bdcb6517e2 SHA512 9dc92dcef5c25660f42d71a54c987a8af350ecb47a81d45510fe50ad76dff3cec4ef1aa0770f2e834686d95943f1f53d7f1d8829bfb5415bbf17be45c8b01184
 EBUILD nova-21.2.0.ebuild 7649 BLAKE2B 95bf74ebcffa2993a89a68ad4d3549fffbb69e264f670f45044b90eb6e95294068d76a0e86afbeb55fd8dad5c55bfff0718f720d2f6fa1477995115d20858194 SHA512 282fd0cc09f3c16114cf59c20b8550e46ebdebcd98130ccef6753eb957d74b269c948817a735f1a1ab26c2d42ae32ea4f0bf1c06a4d01d8dc0bc6b2481d14a49
 EBUILD nova-22.2.0.ebuild 7489 BLAKE2B c762b4206bb0d8cbc326b66b65297b612b37634d05e95cb739c57c484cdd210ba9fa9639e7428ba0f220812a1832c80f64a7ad0437ed994041cacd4675b82b89 SHA512 015ea91cb59b4c98a147aba211384cbcd165eab6519c95bf6c4dbae59f0868ace7652c71e5b39d43e36b05dc8dea74b6b6c9e4a232098885cf83ee7b32ecbdfc
+EBUILD nova-22.2.1.ebuild 7491 BLAKE2B 6a19d8df373bb00317f19741efcb6c2c8877ecfbc8b4222118fbf483b36fcc69b70296a7ebedf755d4285360c7bc71334993bbc17fbe5ac9aad789bdcb6517e2 SHA512 9dc92dcef5c25660f42d71a54c987a8af350ecb47a81d45510fe50ad76dff3cec4ef1aa0770f2e834686d95943f1f53d7f1d8829bfb5415bbf17be45c8b01184
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-22.2.1.ebuild b/sys-cluster/nova/nova-22.2.1.ebuild
new file mode 100644
index 000000000000..dfcfea0843c0
--- /dev/null
+++ b/sys-cluster/nova/nova-22.2.1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 linux-info multilib udev
+
+DESCRIPTION="Cloud computing fabric controller"
+HOMEPAGE="https://launchpad.net/nova"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/victoria"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.15[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-10.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.4[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	app-emulation/spice-html5
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)
+	acct-user/nova
+	acct-group/nova"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use !compute-only; then
+		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
+	doins "${S}/etc/nova/"*
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/compute.filters"
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+	rm -r "${ED}/usr/etc"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 81284aacf8ea..99ca0b744b26 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,3 +1,3 @@
 DIST singularity-3.7.3.tar.gz 6444607 BLAKE2B eb37944f443e73ad258ba2b0f5e769c0e531fc9adc29ed1241940739b549b1bb409dfd8aff729229515c993ee2f842eb0ee00f0f52fec4d2e406f719c0f6e03c SHA512 56e797eb29a2fafaf6ccd730fb8cc9e35713020dacb4d19be02a7204272894360b0d254bd8066d9f14181b935f7179effbac2dfa776b2ff3e0e201388c372836
-EBUILD singularity-3.7.3.ebuild 1922 BLAKE2B a3dc8db3e639bb4283e0bdc67ed5895615e2f46eabad0f7d0d0adf56036c4d5559e0fe3d984e3a6aeef048769b265c22dec4465078be44f333ad75044f77e468 SHA512 f7a2963da1560cfbc5a94f77a8c54b3417615ae45295aa20000ab53fa9c9538b1b759a9f60b9bb73a43f2133a7127f7d047f1318ba8f4407abc04988fc1e39c4
+EBUILD singularity-3.7.3.ebuild 1920 BLAKE2B dfb08d92fd548420df98f8f7a231840b13c6fcab2f74a673c324a2f123a212128eb4a0968f3834b6a2b11c5239b42ce80f0f78906bec6de40a5f81efa96f771e SHA512 e420cac5eea34e0d6dab96bbd02dfacfc7fcea64469fa2d542dd474249f88fa37367792d7d124b7fbe923da60ef66c817b4f4a69c50a722c8ed5166a5a48c48d
 MISC metadata.xml 451 BLAKE2B 0cca32721561e4100348cd884b88edad067a426736df27d4be6926525f9dd1315387dbefff84b983e69ab1972a44cd3a3a2c643bae676b413dab3482005d4ceb SHA512 da6f640f7df71bfe98fdabfe8ea69b1929b80b3c23d869dc496515a76d3f76c5d89d38843faf850184ddd7f624dd1e821dd50103f92e81aeb620a4bcd7151609
diff --git a/sys-cluster/singularity/singularity-3.7.3.ebuild b/sys-cluster/singularity/singularity-3.7.3.ebuild
index 50873aff393c..c018b5042e0b 100644
--- a/sys-cluster/singularity/singularity-3.7.3.ebuild
+++ b/sys-cluster/singularity/singularity-3.7.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network +suid"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 48069a807b95..7f64e783ce98 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -7,7 +7,7 @@ DIST swift-2.26.0.tar.gz 3235050 BLAKE2B 33b46ebc3bd57b6ca6ccb65e96dd11a754fa1b4
 DIST swift-2.27.0.tar.gz 3464571 BLAKE2B 9495abc39b150615a8f7f1900573c643b4f2edd5c187c4d525c4ad7d7e0c2d54eeec0f9b3d8711ed2028cf4d606dee532bd8e4af4b3e1527f3cee5bcc8e62835 SHA512 c9abfa16cfb4964bd774a3dd50c847bf1912e5f87edc8693746e2dcb5863289b9afd2b69b0cc0940aa3fbb49694851b0b6418462367078d0c40d2b724b135467
 EBUILD swift-2.25.1.ebuild 3550 BLAKE2B a6b1ecaffa458adbec2fb65b94f12b0bceb61985c41eb48fd1eb73dae9586e73acd645e59959dce61016efd8de4ee3bb5c8e278f6ab77285614337624d7bde13 SHA512 39a8de0a0f32a1c47e8e0d78e6264e6e6ee9475fe805f20cc9da3285d75720f8de726adabc7025780b69b31f826b63e7fceaefdfef9fd088d03cffb498810ada
 EBUILD swift-2.26.0.ebuild 3551 BLAKE2B 7d79373037f37579aa1d8d8019d2c8f3886bb7d326ccca9fdf4b9f7a4732dc7cdfddeefd1a19a570df05cf159cb6f8bee74e647c6131562df0a0bd1898075cb2 SHA512 f94a07835a79f4d8f1411fa9885955740281ad3b003df5aed6ffc5de525e776fff78f10e90f4ac0fb5b0a5586f1ab7ccb28e0837164501a6888be5715ecd85c5
-EBUILD swift-2.27.0.ebuild 3644 BLAKE2B 300dc9da50345c68212842840f7a2aed32a47e6feddc1a22735bd4b682f834cf309dbf36ed8f78c68d39aa84bdcce6c111ebfeab8da2c2fdb0e63ce8bc67428b SHA512 cb2b0b9f927689078da08d0bdd0605f5c834a0d8f0f12d02cc55cc7c36a2c6bd7bdaa0405e50375a85e4b9dbcf00289425b3294875867039fa00e5b381aa74ee
+EBUILD swift-2.27.0.ebuild 3642 BLAKE2B ceaf12489692366095be856d60f5e27038b38e192acbe3705859871d7f5a7528585a614dbb0d223f3eaff40ab9f8d5bfe74198ea0d8eab7084d6cf54fd598405 SHA512 7cc862f1b610a7d5c3f02d232eb5c96538877b20edc746539efbea5b3115136de953284c1c171deb1159cf0c34d03fb920374df840348376f3eafee955576c3f
 EBUILD swift-2020.1.9999.ebuild 3552 BLAKE2B 05fb421532a000eaa46dba8b41cde74da2423bec06cf7c596159f44efc21983eb9561aa0625b8b7300376b1c01442d17c554ce1cbab74a5d77e01fa70a0aa524 SHA512 8f337d966dee28ae4e42b99c5adbfb824c3af2094836d4e25eeeba7f2de796278d42763a8e9e425471858163b2e1adb4497149b6a7e40607209bb47145e556dc
 EBUILD swift-2020.2.9999.ebuild 3553 BLAKE2B 3c493c7099d4be7105ef00b6fd2b8c8c5e0e1aa6f0f56299d9e3cd41779ee1a97df75154b6837201948065a7ebe113da3bb34d00a962b2a6e971e2999a0fb6c0 SHA512 3d4c9528e09c0b5374cac4f95a8f866ae30cc88e8e0091fd39c8e761606b60cfd85d22577340f85ce38fac7ca06359c698a6e4b335ed2f59f190dca360280af0
 EBUILD swift-2021.1.9999.ebuild 3643 BLAKE2B 0d8de5d8a465c21e2e39314cbaab8ecd88e2040b6dfc1abb1f4f52855fe3e21a510d236231dd6d167a1b69c888573a869cb04cc1d0a34af6980b6ea28e3f3b2d SHA512 e404553e06de853322088268c90042b67c3c0dd34f81a741aebe57c46718042ea8b2df948c6c4a120c224486dde9b9e189a315774cad41a176b9f7e6d8571b8c
diff --git a/sys-cluster/swift/swift-2.27.0.ebuild b/sys-cluster/swift/swift-2.27.0.ebuild
index 35794a21e22a..80af007635e8 100644
--- a/sys-cluster/swift/swift-2.27.0.ebuild
+++ b/sys-cluster/swift/swift-2.27.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="stable/victoria"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
commit	908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree	c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /sys-cluster
parent	185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)