gentoo (valentine's day) resync : 14.02.2021

36 files changed, 602 insertions, 536 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index a3756aead108..b068b9f2858a 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index e76b0c776f89..af5a04a64ec8 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -23,7 +23,6 @@ AUX ceph-15.2.3-spdk-compile.patch 376 BLAKE2B 073cee321c1a99f9a161fbec8f9e33bb1
 AUX ceph-15.2.4-system-uring.patch 2170 BLAKE2B aabfb8c5085de8d69c9afedd20cb99161fd556148f1e6c88c35ed1bdb83dafe28ddbe75ac1e579e23d0728856bb2c650895ab4c0791b0f8e6acf2652822b14f1 SHA512 8258661e56b5360f4260fdd29b07bac4d415068a112b61ca8c55c529fb1593d8d61a0d59a4eec8f1567b97167c058082198d008f55f8ee701cb46489df5f7823
 AUX ceph-15.2.5-glibc-2.32.patch 511 BLAKE2B d2327c3108355d6b25bd020539cb938e5969def1c0b6392cba546b0aa8b555388f5cab6534aebfde17a55e59baf8a0b6cbea2be77cbac5062b7f89c296a53a60 SHA512 491c4a8d4120c6620960d349effd76fcc780995c7a0ed4e9264642e40970a05c4238952a2b8355ad35268f0a9410be9bc38f6c77ddb8f55ad72adf294a0043c6
 AUX ceph-15.2.5-missing-includes.patch 435 BLAKE2B 66c4b30629203694bd0d5c82f5977a0576c67b3cb14d678e6ab60bc7a933e65306b122e253856bae7862637564e14a93b9cd2c48c9b510e01cc316fc7be9f218 SHA512 84de66f64ea96cd59b40dfb5b8c5d093fe49df1139b45ad9d1bd6b9ebd2f1200b6e931adcf032639a4995af322cf05c1ef9050eb1cb6673e29e040d4e348b3d5
-AUX ceph-15.2.5-systemd-unit-fix.patch 1114 BLAKE2B 589874deeda1bd21fb0aa83980083448b03f2185be15e23bc1a550f96d46f613d55f5134244f8b36f9e08883acdc3b49731ea5f56726c9ab2c455a1cdb0f796a SHA512 91fc1b88cba37d329f6280c94ed246bdaf5eb6e602a2537b130a764bad4179090bbb79e8a3e50e464e57703233da85da7e1a795987d28dd3aab7ef544d9af78a
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
diff --git a/sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch b/sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch
deleted file mode 100644
index a127ada181f2..000000000000
--- a/sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bd8b8540f6b67a25585ca9cf140d6de760bc2a43 Mon Sep 17 00:00:00 2001
-From: Jan Fajerski <jfajerski@suse.com>
-Date: Fri, 12 Jun 2020 09:27:36 +0200
-Subject: [PATCH] systemd/ceph-osd: ceph-osd-prestart.sh now lives in
- /usr/libexec
-
-Fixes: https://tracker.ceph.com/issues/45984
-Fixes: ed6552d5067c9f1d34c426f9ae18b0c37f2a9d29
-
-Signed-off-by: Jan Fajerski <jfajerski@suse.com>
----
- systemd/ceph-osd@.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in
-index a0067d347220..4a2254e99478 100644
---- a/systemd/ceph-osd@.service.in
-+++ b/systemd/ceph-osd@.service.in
-@@ -9,7 +9,7 @@ Environment=CLUSTER=ceph
- EnvironmentFile=-@SYSTEMD_ENV_FILE@
- Environment=CLUSTER=ceph
- ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
--ExecStartPre=/usr/libexec/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
-+ExecStartPre=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
- ExecReload=/bin/kill -HUP $MAINPID
- LockPersonality=true
- MemoryDenyWriteExecute=true
diff --git a/sys-cluster/corosync/Manifest b/sys-cluster/corosync/Manifest
index daf08081eff3..06299d000c76 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -1,10 +1,5 @@
-AUX corosync-2.3.4-docs.patch 842 BLAKE2B 363e26872497c2724ba54dee2e6458e5b101bbadec263ba8a230cca8d2187e37d36bf2f42a65a9b50e4cb1b870af204f0043f55b31342865a5a262dc5892177f SHA512 e73db019b1fbe8a030e530a0be55cdc33972d018a6415d17c7c425607613ef1f0695e9c4d231eddbce708710e1cb2341c42e911e59382974ba8b24204205896f
 AUX corosync.initd 668 BLAKE2B 52a838b1cc64103a69a3f67573b0b752ec9eef434c9fd2183478d32a6dfda825e96e41333e16f0aa7431937323ad3d5329c04037baec83717624a884d2480bcb SHA512 a514ac91e4b691c7e7e65a45dbb49c1da408690012d750ff3e4cb1c45e629df070019382f9b7c1dbcf8342b1edc15b296433d1f589334effde843434005f0969
 AUX corosync.logrotate 93 BLAKE2B cc8f22c668dfde3fe4dac13fb295be81ff1ca13c8081557f87570952117109b68c7101045990dfd8aea5f56c8a8078d12383f8cb040b098591678c8294dd52bc SHA512 3c65eb01a33a6fa51befa8ce466cc8a35a06a19816b77610b83c18f9372dccdbd33354fc8568e63fe165f2c2aa598b6a5d15615939f12e3385b4c3e1b91a6ec3
-DIST corosync-2.3.5.tar.gz 428253 BLAKE2B be9fc2b27b60357acee6dee013bc95c08045c114acafc62eaa82a1821f07ff76b8821b9d06f31246b9978f8aef46e3a9e1a2d61ca74465bc74d4140c0ad0d0fa SHA512 212a95d8a68a2941f27c9ec22750a88598744d6fd4db6b46abe0b4cdfa988d3906f760bdf67c403d8c6d0a04da64f29ec744fb68ca51c7269ba58e306553cee9
-DIST corosync-2.4.5.tar.gz 587015 BLAKE2B f1ef6b0a0f34e23a4ab5a5e9a6f21ba1886fb6cebec7d9440f6e189acb095cd825049dfceb174b490be1b6d85195ae4b99230ea44a31e427db9020257e8fc428 SHA512 e8476c006df8fd0c5291a8b0099c4756f884d41c7e9c13573c34458f63cd057d49d6fa0c1d5344d5fc44341186817ddee66997d51937339e6d70dcada0c402ee
 DIST corosync-3.1.0.tar.gz 447073 BLAKE2B 1a0d5b744ac5cba1d67fed6d58a159d8dfc63615aa6fbe5051b20f6e41da589871b6d0b59937db0ac31b4186e4f051378e48308ffc3e0743a5372e494485b3c7 SHA512 05be0d417f3ebbba993b92074f261dea3d951e20d2054817b9017eb04a8a017c9c3f3d0119dafd689944accb690beaafc9f11c1e67f53d978918ea49e51a5e6f
-EBUILD corosync-2.3.5.ebuild 1735 BLAKE2B 979a985503cbaaf0dd961604bc7022e5e4da046d78417543634c8a799d0ab1ab2e08b23789b310e7a58806e5031384ce7211e87802edd83c4a962732a85372e5 SHA512 803fa60d64bb64bd724852458231963021fbde8b374f115bcbf801aecacc83d2c5bd0b1191f187902bab3cbcf086937f06d6837454c4309c6071ea55e6ce5ea6
-EBUILD corosync-2.4.5.ebuild 1701 BLAKE2B fab0b3ebe9e7c1719f540f3cbc623ec337c7f417a8dd267ea3fd985afa922dfe96e4da8391191a67330571fa1ead235cb460b5a0bc3710c4053574145fdf8305 SHA512 f5a59951c08f89b915f5334f68818568fb27cb8137c81eab9c1c9bb43098f865bfdbdbd738082a19b72eb839bd30c191ba237f7ed9bde315777d8ef4a3280f6e
 EBUILD corosync-3.1.0.ebuild 2541 BLAKE2B 13efbcb042beccf4bb8fd9e4df443465df1b541639ecb007da5ec677fd95007f98ccf2405b3c595e9e539774c52a7a72b6e6428d8948b4b46ebe24a1c7f6ef60 SHA512 79a33de674e72a6afc9d5778ae52aa5ab33119f72285bc49c31d8956398751c160da2078d17198c2f65c5e907bb43b32104e06d580d7f754b9a3f7a45e075459
 MISC metadata.xml 568 BLAKE2B b37326b0f2809f7e67a1537b9a0a9126b7f6801559007fab15a2b90fa8bd094a907414eb6b384ebce9cfd32ff6dfa8e00e73b637a5629c5e56dad6217872a58e SHA512 1f37d14000dac9555b731071cef48a008a775893f200488b2acc55e5c90f789223202da8fb3f7a016db05e84b2c75b311baa5dc2a95f8f73a2ea9194c1d6a2ff
diff --git a/sys-cluster/corosync/corosync-2.3.5.ebuild b/sys-cluster/corosync/corosync-2.3.5.ebuild
deleted file mode 100644
index d1a1fc207d47..000000000000
--- a/sys-cluster/corosync/corosync-2.3.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_TREE="56ae8fe"
-
-DESCRIPTION="OSI Certified implementation of a complete cluster engine"
-HOMEPAGE="http://www.corosync.org/"
-SRC_URI="http://build.clusterlabs.org/corosync/releases/${P}.tar.gz"
-
-LICENSE="BSD-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="doc infiniband static-libs systemd xml"
-
-# TODO: support those new configure flags
-# --enable-augeas : Install the augeas lens for corosync.conf
-# --enable-snmp : SNMP protocol support
-# --enable-watchdog : Watchdog support
-RDEPEND="!sys-cluster/heartbeat
-	infiniband? (
-		sys-fabric/libibverbs:*
-		sys-fabric/librdmacm:*
-	)
-	dev-libs/nss
-	<=sys-cluster/libqb-0.17.2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( sys-apps/groff )"
-
-PATCHES=( "${FILESDIR}/${PN}-2.3.4-docs.patch" )
-
-DOCS=( README.recovery SECURITY AUTHORS )
-
-S="${WORKDIR}/${PN}-${PN}-${MY_TREE}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	default
-	# appends lib to localstatedir automatically
-	# FIXME: install just shared libs --disable-static does not work
-	econf_opts=(
-		--localstatedir=/var \
-		$(use_enable infiniband rdma) \
-		$(use_enable systemd) \
-		$(use_enable xml xmlconf)
-	)
-	use doc && econf_opts+=( --enable-doc )
-	econf "${econf_opts[@]}"
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	if use systemd; then
-		rm "${D}"/lib/systemd/system/corosync-notifyd.service || die
-	else
-		rm "${D}"/etc/init.d/corosync-notifyd || die
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-	keepdir /var/lib/corosync
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/*.{,l}a || die
-
-}
diff --git a/sys-cluster/corosync/corosync-2.4.5.ebuild b/sys-cluster/corosync/corosync-2.4.5.ebuild
deleted file mode 100644
index 53837dc49ef1..000000000000
--- a/sys-cluster/corosync/corosync-2.4.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="OSI Certified implementation of a complete cluster engine"
-HOMEPAGE="http://www.corosync.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc infiniband static-libs systemd xml"
-
-# TODO: support those new configure flags
-# --enable-augeas : Install the augeas lens for corosync.conf
-# --enable-snmp : SNMP protocol support
-# --enable-watchdog : Watchdog support
-RDEPEND="!sys-cluster/heartbeat
-	infiniband? (
-		sys-fabric/libibverbs:*
-		sys-fabric/librdmacm:*
-	)
-	dev-libs/nss
-	>=sys-cluster/libqb-0.14.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( sys-apps/groff )"
-
-PATCHES=( "${FILESDIR}/${PN}-2.3.4-docs.patch" )
-
-DOCS=( README.recovery SECURITY AUTHORS )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	default
-	# appends lib to localstatedir automatically
-	# FIXME: install just shared libs --disable-static does not work
-	econf_opts=(
-		--localstatedir=/var \
-		$(use_enable infiniband rdma) \
-		$(use_enable systemd) \
-		$(use_enable xml xmlconf)
-	)
-	use doc && econf_opts+=( --enable-doc )
-	econf "${econf_opts[@]}"
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	if use systemd; then
-		rm "${D}"/lib/systemd/system/corosync-notifyd.service || die
-	else
-		rm "${D}"/etc/init.d/corosync-notifyd || die
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-	keepdir /var/lib/corosync
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/*.{,l}a || die
-
-}
diff --git a/sys-cluster/corosync/files/corosync-2.3.4-docs.patch b/sys-cluster/corosync/files/corosync-2.3.4-docs.patch
deleted file mode 100644
index 53dbd7d29c75..000000000000
--- a/sys-cluster/corosync/files/corosync-2.3.4-docs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/configure.ac	2014-12-02 15:21:35.511819113 +0100
-+++ b/configure.ac	2014-12-02 15:23:02.162487868 +0100
-@@ -655,7 +655,7 @@
- INCLUDE_DIRS="$INCLUDE_DIRS -I\$(top_builddir)/include/corosync -I\$(top_srcdir)/include/corosync"
- 
- # final build of *FLAGS
--CFLAGS="$ENV_CFLAGS $lt_prog_compiler_pic $SEC_FLAGS $OPT_CFLAGS $GDB_FLAGS \
-+CFLAGS="$ENV_CFLAGS $lt_prog_compiler_pic $OS_CFLAGS \
- 	$COVERAGE_CFLAGS $EXTRA_WARNINGS \
- 	$WERROR_CFLAGS $NSS_CFLAGS $LIBQB_CFLAGS \
- 	$SNMP_INCLUDES"
-@@ -685,7 +685,10 @@
- AM_CONDITIONAL(AUGTOOL, test -n "${AUGTOOL}")
- AC_SUBST([NSS_LDFLAGS])
- 
--AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}")
-+AC_ARG_ENABLE([doc],
-+  AS_HELP_STRING([--enable-doc],[Build html documentation])
-+)
-+AM_CONDITIONAL(BUILD_HTML_DOCS, [test -n "${GROFF}" && test "x$enable_doc" = "xyes"] )
- 
- AC_SUBST([LINT_FLAGS])
- 
diff --git a/sys-cluster/crmsh/Manifest b/sys-cluster/crmsh/Manifest
index 8f68fe8d7887..b26494c5cdbb 100644
--- a/sys-cluster/crmsh/Manifest
+++ b/sys-cluster/crmsh/Manifest
@@ -1,5 +1,3 @@
-DIST crmsh-3.0.3.tar.gz 948573 BLAKE2B b4acb4420a7f447f0d50115ba449d506d2017e6f29221bd0b1ba45eb790e6472eadc62ff5ac6af367f4d5f2631cae162e770c0a6735dea42367248f2302cdcb4 SHA512 9dcb9560f8e23791340454e20f4e1ccd090230337357b93c2029f58ff9754756bc1eca5991c00290b937eeb3b42554989b5d6cc85a2eef5107f250d7acf570d3
-DIST crmsh-4.1.0.tar.gz 1002842 BLAKE2B 02505d9f10e2ac9525692a727d40a925d99f0035d1e372f0840b3072c4c016b55fced7ccaea8dbad9e475d7868e483e62944dbe45e5533eb4028eeda08b99c58 SHA512 3522a28c86069216222eb2efbb258014d74ce838e49885cd527a69d890415ea0899632b4cec095d2fde802b26cd7e673b0e9ea20e8d023fc7c4df140be600ef9
-EBUILD crmsh-3.0.3.ebuild 852 BLAKE2B 4516b4d8dd3c0542fae98667b79d6a268f81d74efd1fd3d532285c66aa37d08f5ee34b304a1f00c517d679a5d4655d99b77069e1beba28fe5780bbf4eab86354 SHA512 8ac8bea2f4bc864632e5313ec172b61587c6c46218e50f18e4bc693bed729cf3c3d54209b9de949b38c51306d24775b240c55b397f7fbc2daeeafc7370ab0925
-EBUILD crmsh-4.1.0.ebuild 896 BLAKE2B 0ed08bc14911820dfb682f15dc76e36989ccbaf520b3b156bf00c33d916485d4f8143c66383cc97f549f29f2c563d5fa54a3147e1521a13efdc582882903b0fa SHA512 dc12e031e63723977d9d5f94dd06c1963e11f3c007f8cb518dbb7cf795776c3b93c47e5500047a0a90dc82c28e2148aba1f60fd9a8c35980f5236ca67e0d3d13
+DIST crmsh-4.2.1.tar.gz 1058921 BLAKE2B 84d1f8685e792d9f453b2d185ccda4e8c2c9566becd85ed8308c014bd18e1479f601f3e89e4a1c3464c0d5bb797d7ddf9ddff479cd8c4c0d2998fd528f8ecbd2 SHA512 df0945f1b977993a0aca89af7c9030bc798aac4397a9d448d47bf68331e8aec83fa6155f2897f3c84573bcdb20fa384a1489b4f1d69fd1a831ece2fdb2b5b321
+EBUILD crmsh-4.2.1.ebuild 902 BLAKE2B c68805358b8d2783a3e74dbaf29ba291703f75a69cc11134cf054f8ed0855329892760e148ec18d3331155079f1ce773e57f75b68ced693218145e30ba4e1b0d SHA512 d4a7099f3ca3517b0f9ef720d61624ef03d481e907d3ab72d1fd0b20e772ee6de9de65c016ce5fc624fad72544bc7a5c2a4a0e6f8e999592af2b8f895ca19f8b
 MISC metadata.xml 343 BLAKE2B 7ecf74be968150181c3df6d9fd7f56957bbfc760390a428097d0033099120ca9ba1c14e50a4b084af8f60e84447a899e554b8f3933819f16ce5e8c149e787206 SHA512 0830e62f1461e108e47feed29a48d172e63003be6d55e10f647f9a02ef90c0c7b3ad0c1e6a805edef9ebe6b015adfa3b86fbc058d0c9e19188f9e9f8304a5d91
diff --git a/sys-cluster/crmsh/crmsh-3.0.3.ebuild b/sys-cluster/crmsh/crmsh-3.0.3.ebuild
deleted file mode 100644
index 353961fc730d..000000000000
--- a/sys-cluster/crmsh/crmsh-3.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-
-AUTOTOOLS_AUTORECONF=true
-KEYWORDS=""
-SRC_URI=""
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/crmsh/crmsh"
-	inherit git-2
-	S="${WORKDIR}/${PN}-${MY_TREE}"
-else
-	SRC_URI="https://github.com/crmsh/crmsh/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~hppa ~x86"
-fi
-
-inherit eutils python-r1
-
-DESCRIPTION="Pacemaker command line interface for management and configuration"
-HOMEPAGE="https://crmsh.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=sys-cluster/pacemaker-1.1.9"
-RDEPEND="${DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]"
-
-src_configure() {
-	./autogen.sh
-	econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/sys-cluster/crmsh/crmsh-4.1.0.ebuild b/sys-cluster/crmsh/crmsh-4.2.1.ebuild
index ca548d2da4af..312f01a1ed1b 100644
--- a/sys-cluster/crmsh/crmsh-4.1.0.ebuild
+++ b/sys-cluster/crmsh/crmsh-4.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 AUTOTOOLS_AUTORECONF=true
 KEYWORDS=""
@@ -11,7 +11,7 @@ SRC_URI=""
 
 if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/crmsh/crmsh"
-	inherit git-2
+	inherit git-3
 	S="${WORKDIR}/${PN}-${MY_TREE}"
 else
 	SRC_URI="https://github.com/crmsh/crmsh/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 260b79a944b9..380ec58aa11d 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,12 +1,9 @@
 AUX galera-25.3.32-respect-cflags.patch 1076 BLAKE2B 4deac59bbb865f8b58d87a963d0f7357a62d349b7b2e321f8da3e63c921a72e0bf376ec16791ac73a7d6f4625a52c6b3b5f3d3613fabfcd31bfd23de6cdda944 SHA512 428b3aff5d76d6f94a582daf5e156bad377f729de940431be6869e20d44224b10b85487da97f97a98ec963447ff9473d93b84918b4b983a2659f8995031db61a
-AUX galera-26.4.4-respect-AR.patch 396 BLAKE2B 17c0b47ce5d1a8326b9f11311647e77d12ae55570d30847d5f9bc3eaee0cc80b482375da0b4d4d398539e9763ba981b0135292c67a356df32a2f6453be71d7e3 SHA512 fa1014c1574e489e4903dbe583a4e981853d612ca2fffbe88010826a40f889a2bb20995699a520efe9bdb52595bb6afff115321505438387d564dd25f93dd140
 AUX galera-26.4.5-respect-toolchain.patch 1867 BLAKE2B ba2bf780717bfc9b778645366d933c234aad279985f8ddfe68c4d6d01b71baf7961bae0dc67c980d8b0271c63b567509a2dafb241aaf67e2cb06b018bda54d40 SHA512 34d23d1e9c0906e0b7bff357e76e547d1bd4e1d555a68ef64b8389ddc64af817832bcd4e04958b25d60ef9700dbe2df69a2e2acc5060d701496629b848bc7f7b
-AUX galera-26.4.5-strip-extra-cflags.patch 2235 BLAKE2B 95c0a28a34382e4ba9690fd2c1556574ebc7a4da93fa43f21cd1dddf99ceac357922ba325dbf8f5d110ea6fdea63fe3e7fecb10c2fdc83857b70410409437aa2 SHA512 ca979602feb222ab052971ab08bfee10efc7980f2c509d4bcf1476d052ad3793aab91c4daecb1c029408becac62607b04c91cfe81f0a9f8cf42b3ef0d0cc8d89
 AUX galera-26.4.6-strip-extra-cflags.patch 1065 BLAKE2B d2a6a3016f9fd423eb7ad6893532eee7602e1e8f93f51a9297f2b09ca0db608cc71d6371c72621b1376ef8cafed55519a3f1695c9f319e0bec9d243f9c8f4092 SHA512 7025cce58228fb7685006afc72ce7951abb0151d7444a47c721bf010e5796f6636423933b68a1a10803cadc10212a371f1465f052839b6a4dda10b593556edbe
 AUX galera-4.1-strip-extra-cflags.patch 2747 BLAKE2B 314e020bdbce2d3080d28c4d5bf5ad438affc8075736c38b77d713e59749a4eabce3a38b6c918b1768f48b99ec5c860813c3441291d0834ebf6d6ed545d30576 SHA512 0458705897861d4bc225326077ae379fb1c921aa65a102a24f2fba5c866c52a549c47bed929801c06ebb0c484136c1179a56b2fd750abd6aabc7a6a74fc18c2f
 AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c3b5f18dca3cfbe6a4a115c324c945f6949e8fe227b8b9e4e94816d48eda53e9e2723100e5 SHA512 97b921109b242ad1a19326564b5f9da8a09eadd4771c2c86c727c1c30e35f92ffadbb38ce7d81bc88572d2c7b04466ad212432954e09d81417c4ed7f69ec4648
 AUX garb.init 905 BLAKE2B a6f64183587ae9815aedb491dc9dd06f9a625ca4d935099bfbe80bd9a97f7a4020a8ca8d6d9056c0b6a7556aa750e08e232a656da38451d5ae0a47246be7e39a SHA512 716443592e1bb2c8071e3ab5267c6d46ab4c7a1aea25d7cb4f732ef5fd192aff1e439138cab01166539d9509ef75d71ead52a702567744af39df23c021c808a7
-AUX garb.sh 1029 BLAKE2B 452a4f3bf50b25f040784e03d428ba10a3580cee486a5cb283db90bee4bcefe951813fbfd4e38024fb05d1681adb74a697dfe48c4d0c47aaddf094204a818a95 SHA512 780eb8e7584d31ce24559e46724c7b981320f4706af0b9f0cd8d157247f853f51d3980178d0d234f64bcb097a4ee5493fe299d6800513403dbc7e0184c020902
 DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611 SHA512 8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
 DIST galera-25.3.32.tar.gz 1277302 BLAKE2B 061e146054e530d8e95139749d345ddf5a94bfd5861fad7e7c3612400e766f80618f79e18434f93bd188ebfe46f103e805f2ba18eeca81dfee34eb4212a9b3d2 SHA512 e9aa97c0d0de61c25bc11181a99ee38e24a6ffe5ed71769b5034ea7f232502f082f2c88ccacbc832ab37c19b8f647b5e2c4f2e67efcd7c6d3e5880c6a95eaa53
 DIST galera-26.4.7.tar.gz 1339462 BLAKE2B 9d8ef6ba9e153de848005195edbd99234f282c4e7bda4ddf42f3d6c99088fc3e57536863eb244bfb90d37dbdb6d0cc71661ee5297e59f2faf666da84ee731975 SHA512 ae9c898756ed6cd180bb7bc6a25e7e6b533e4a15a88d3820a936ca203cb0215aca5840599214d2236013da6759981471b47e0e0759d1ccd24c05b8e3c59f3a8c
diff --git a/sys-cluster/galera/files/galera-26.4.4-respect-AR.patch b/sys-cluster/galera/files/galera-26.4.4-respect-AR.patch
deleted file mode 100644
index 972bb9288a6e..000000000000
--- a/sys-cluster/galera/files/galera-26.4.4-respect-AR.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -213,6 +213,9 @@ if cxx != 'default':
- link = os.getenv('LINK', 'default')
- if link != 'default':
-     env.Replace(LINK = link)
-+ar = os.getenv('AR', 'default')
-+if ar != 'default':
-+    env.Replace(AR = ar)
-
- # Get compiler name/version, CXX may be set to "c++" which may be clang or gcc
- cc_version = str(read_first_line(env['CC'].split() + ['--version']))
diff --git a/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch
deleted file mode 100644
index ac99140b6c96..000000000000
--- a/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -87,7 +87,7 @@ Commandline Options:
- build_target = 'all'
- 
- # Optimization level
--opt_flags    = ' -g -O3 -DNDEBUG'
-+opt_flags    = ' -DNDEBUG'
- 
- # Architecture (defaults to build host type)
- compile_arch = ''
-@@ -133,26 +133,6 @@ if dbug:
- if gcov:
-     opt_flags = opt_flags + ' --coverage -g'
- 
--if sysname == 'sunos':
--    compile_arch = ' -mtune=native'
--elif x86:
--    if bits == 32:
--        if machine == 'x86_64':
--            compile_arch = ' -mx32'
--        else:
--            compile_arch = ' -m32 -march=i686'
--            if sysname == 'linux':
--                link_arch = ' -Wl,-melf_i386'
--    else:
--        compile_arch = ' -m64'
--        if sysname == 'linux':
--            link_arch = ' -Wl,-melf_x86_64'
--    link_arch = compile_arch + link_arch
--elif machine == 's390x':
--    compile_arch = ' -mzarch'
--    if bits == 32:
--        compile_arch += ' -m32'
--
- boost      = int(ARGUMENTS.get('boost', 1))
- boost_pool = int(ARGUMENTS.get('boost_pool', 0))
- system_asio= int(ARGUMENTS.get('system_asio', 1))
---- a/galerautils/src/SConscript
-+++ b/galerautils/src/SConscript
-@@ -1,4 +1,4 @@
--Import('env', 'x86', 'sysname')
-+Import('env', 'sysname')
- 
- libgalerautils_env = env.Clone()
- 
-@@ -39,21 +39,6 @@ crc32c_env.Append(CPPFLAGS = ' -DWITH_GALERA')
- crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
- crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
- 
--if x86:
--    crc32c_env.Append(CFLAGS = ' -msse4.2')
--    if sysname == 'sunos':
--        # Ideally we want to simply strip SSE4.2 flag from the resulting
--        # crc32.pic.o
--        # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html)
--        # but that requires some serious scons-fu, so we just don't
--        # compile hardware support in if host CPU does not have it.
--        from subprocess import check_call
--        try:
--            check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True);
--        except:
--            libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
--            crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
--
- libgalerautils_env.StaticLibrary('galerautils',
-                                  libgalerautils_objs + crc32c_objs)
- 
diff --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh
deleted file mode 100644
index f03eaffc076a..000000000000
--- a/sys-cluster/galera/files/garb.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-	after mysql
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	if [ -z "${GALERA_NODES}" ]; then
-		eerror "List of GALERA_NODES is not configured"
-		return 1
-	fi
-
-	if [ -z "${GALERA_GROUP}" ]; then
-		eerror "GALERA_GROUP name is not configured"
-		return 1
-	fi
-
-	GALERA_PORT="${GALERA_PORT:-4567}"
-
-	OPTIONS="-a gcomm://${GALERA_NODES// /,} -g ${GALERA_GROUP}"
-	[ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}"
-	[ -n "${LOG_FILE}" ]       && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
-	[ -n "${NODE_NAME}" ]      && OPTIONS="${OPTIONS} -n ${NODE_NAME}"
-
-	start-stop-daemon \
-		--start \
-		--exec /usr/bin/garbd \
-		--pidfile "${PIDFILE}" \
-		--make-pidfile \
-		--user garbd \
-		--group garbd \
-		--background \
-		-- ${OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon \
-		--stop \
-		--exec /usr/bin/garbd \
-		--pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 78e42bfe4fe0..954c408f4c5e 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -11,7 +11,7 @@ DIST glusterfs-7.9.tar.gz 7702149 BLAKE2B e23b5a45a8c2c4f02f0992dfc78bea942a1dcc
 DIST glusterfs-8.3.tar.gz 7829522 BLAKE2B 1ba60f7209db4f1ce21237c3adea94df1b9eae04d15f99eb414bf961ea67aa7e08d01ea47c8793a33afbc0ff6cf63ecb81f78fa1ba74d66e2d4358ef2bdadacc SHA512 7ca9d3d8938eb27a7347461a07457e90d1ee6e8d5417970e38245c819cf09bf2ecf9de3954b75edf5cf14816e1059fb381b95935ae1f973ebd14ee7531322aa9
 DIST glusterfs-9.0.tar.gz 8171193 BLAKE2B f9f9905515607b4877432bde264075f73c4c076ae435a67ab803affc468f5f88d02235419fea6e25db19adecff9b797a41eb5ac63772fe81251c064389f7aca6 SHA512 daa5a7342c067c75668910e8fed17145636e7a576830b4cd68e81d9fceedaab918228b8780ebd5014e2397e0606858af650cd2c52bec0883ccd2126955ad07e7
 EBUILD glusterfs-7.7.ebuild 6021 BLAKE2B 8fa14aca6d875f249394d2e789f24d6117be84fb843571ffe0801de154f9895d498ecec94ca19853d663cc91da8739c7f76d10254c8cf87dff99a59c104f4e97 SHA512 ae62b59e2a86455bded295bc228375278c20a087e4a0d1aa87d30557e5650d66299a8aaa01c4c83c1b12cf75f1f2bb49ebb6cf39610aab8cb3b242866d14d5d9
-EBUILD glusterfs-7.8-r1.ebuild 6051 BLAKE2B 92fcc53c076f7ad94eb21e73d3a18e1565b80edc4caf67fe72c7ad5f151a3ecd4a0dbe9a9cefa76ae1e7beaaf907e997d19e72b3b55df5b4cc1ee289b22fcc51 SHA512 e5e5083bc78e1b7e599a147bf7ce5a8c72ce8eaabfbd69a85988c1ef8bd5939bb490b52db2677f188cf40cef686c4ffdbd89099d97100428d8480968daac7128
+EBUILD glusterfs-7.8-r1.ebuild 6048 BLAKE2B bf6f45b09cd270bb0324ca44bd2770237d48406fc2284f09bc7c29f4ed92c5038811e915eb7d9923d3b83ea2dc33582d5b40f012f8e1d0bad3377d5d944e0797 SHA512 c3798461b8ca737291ff59ab20fc67fb1ff5f449b41fb9eb642436c53bdc01dbab381314ab19ee4fd36aaed36b6382e9177ce60a6032593accf32c6fc139c338
 EBUILD glusterfs-7.9.ebuild 6061 BLAKE2B 7baec7d360fcb47f0ef5bba76af5dce306a4fc2773d22d871081204a3b03dbcda22de73c4cf66fcfcbbff2ab7ad80e43a84a78c13bd5fa6fe01c0caa681511cc SHA512 40fb1926dd3e3cc2d8bd6b649635e111e8ede10abb65b29732737de837a6280287e42162f6d649b5905078173d2a467cddbda28cbd4cd2095f82bfa7c7f431e7
 EBUILD glusterfs-8.3.ebuild 5575 BLAKE2B 99f344c639b942e9313071560e745048c65a97bd0e97f39c897aa1e6630c87d020a4223d30a39d10c571cf4fb3a36c9c4c09802accea3bd83f854c6de769062b SHA512 befabf6d6aa1d0d73a87ffe59ebac6a6d3ac235104365ee3c4bbacf4e0c3125c671449973a8247241de93e0dd2fa72afd12b86988f1c55ce9a34b304423c97a5
 EBUILD glusterfs-9.0.ebuild 5575 BLAKE2B 99f344c639b942e9313071560e745048c65a97bd0e97f39c897aa1e6630c87d020a4223d30a39d10c571cf4fb3a36c9c4c09802accea3bd83f854c6de769062b SHA512 befabf6d6aa1d0d73a87ffe59ebac6a6d3ac235104365ee3c4bbacf4e0c3125c671449973a8247241de93e0dd2fa72afd12b86988f1c55ce9a34b304423c97a5
diff --git a/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild
index 0da6efef8911..26dd5ae27072 100644
--- a/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
 else
 	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 fi
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
diff --git a/sys-cluster/libqb/Manifest b/sys-cluster/libqb/Manifest
index 68c871b08145..7998e784dcfe 100644
--- a/sys-cluster/libqb/Manifest
+++ b/sys-cluster/libqb/Manifest
@@ -4,6 +4,6 @@ DIST libqb-1.9.0.tar.gz 225147 BLAKE2B d8200d5eec8c05a18675de585e2f85694d3d062d8
 DIST libqb-2.0.1.tar.xz 480516 BLAKE2B 402ca20f16a232497c9a363c557556bbdcfffff5d0f075898bf4008bb51b30771f284c29b64421be1dae8215e153b8978ac06c9bd10f3e5e23632b597549d2c7 SHA512 6d989d30b381253c7d7c4ff1e6400ad3445b92184906c859f10d6352dd604a309d7e2d9c8298d8b8d59a0e884e2d821608a39f043db7e96db2118a867ef57672
 EBUILD libqb-0.17.2.ebuild 1156 BLAKE2B ed266360fd089792e9b498bf0afd1f0cd57a82fefcf817f65cf019524d418380481f1281a8ee31bf7f857e9138f53380bbf76d9b9b097776e2ec6f872c7d3766 SHA512 6918bd4feeec474dcd88fb585f7a0a96e795297b6a44d622c56a8f9c883bcdc15f8a2dc457205138d91413690dc6327ff1438193ea68d70207ba49ee785c4353
 EBUILD libqb-1.0.5.ebuild 1004 BLAKE2B 8aeaecd43035bd49dc1ba587aa435fc295aa5bf59826bbb72d9c922f9b822f89c8dc046add84fd92639aa11ee88543eb6c4bdbd274def5e0461943c6fed141a7 SHA512 6101d690fd176d773a21e7b357ca9be5100a028b46736db385c22f5342a0a8f4f0b250cc9182f2b31460dd0f4cbfc211fd4cee6f181edcac0ec1b57e5ef18399
-EBUILD libqb-1.9.0.ebuild 1392 BLAKE2B 489d875e989bffced63f5a85f310f2f08d606894d6471d9ef19af801ae019680203f2070eb9a1537b69215962c23a338ac09bb3d127fe9acfde6e512ace505c2 SHA512 3babbfeb697e6c6524b613dcc79c1a268ecc07ee890b4b78b7ae59eb47c4e3d1242e1ccdc5919ba68003d32d6801a9f95c3762743e8e72afd0cbed1852d6aeb6
+EBUILD libqb-1.9.0.ebuild 1391 BLAKE2B 968c70eed5573536df473711c0878a71fe678dabcf5d9e1f49a24b82f18d8651694a65312da285e3d108505301ef6bc3312db6a3031f9f0901d21373ddf990f6 SHA512 8a6f04badb2746224f2cca41a74b898ac517bf048d8b7f2004976f21268b9dc830d2ca91c95ba913dcadf925f65907e2077bf25d595f557394bde9fd8ae30d74
 EBUILD libqb-2.0.1-r1.ebuild 1319 BLAKE2B 34c48eaaccc73a812736d84a3cbeaf1de5aba6a799042b852c28c2a4424dddeef3f70f774f7a3d548a185ea4bbf8888827d10cdead76a2dcbe26f84064f889f3 SHA512 f051492bf59671c5a7ac9840d990f2b680df081b4990ad8a330713155b035ddd4d11c84d0a706db58e5727f62ae2433736467f45b1c78c52583b56bbebbfb7c6
 MISC metadata.xml 339 BLAKE2B c62f10b2ef4d7efe87b20e68a511c136192cdf33cddb9dee961099a44c26179f78ccd2804dacc21f6e72c2a5266f2274b332f656c3e5a1ad4f0fdad7ad33a0ab SHA512 39cccac769c39f6b8f90500c1b8f21e6ab65429ec1d992e7aa0025bc161d1ceffa28796accba321af01b75671c11ae6cacb4c8b4ab5ef14dbc8ef103dfc9f0b3
diff --git a/sys-cluster/libqb/libqb-1.9.0.ebuild b/sys-cluster/libqb/libqb-1.9.0.ebuild
index 8e1b6edc04c9..9166158e3bac 100644
--- a/sys-cluster/libqb/libqb-1.9.0.ebuild
+++ b/sys-cluster/libqb/libqb-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/20"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
 IUSE="debug doc examples systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-cluster/nomad/Manifest b/sys-cluster/nomad/Manifest
index 9480cee1052a..c969346af726 100644
--- a/sys-cluster/nomad/Manifest
+++ b/sys-cluster/nomad/Manifest
@@ -3,6 +3,6 @@ AUX nomad.initd 534 BLAKE2B 392ba0c199a401c278d47f2fb068831f331485d34eb6d81d7e14
 AUX nomad.logrotated 83 BLAKE2B 2c970621c10520b2aaa17172d9c99a741737393db9a6424278e12d8b6676492c97b628d4be419ab921f7cf7685bae1a5e93eb04efa2ca6242012cfde203e02da SHA512 0ebdbeab15b01145eb2b33e0c6fd43dde3e4ac8eae9d8aff81797688276530732f613a39cd658fa4f5c2e8c99d70e6255f814ca5f3cd2bc5de259be324ab2851
 DIST nomad-0.12.8.tar.gz 51472616 BLAKE2B 17316e4305edc5a74d640d1bd46e1f997ae43727a6c6dcc5df19af64c659a9b00e4fa2c45c92d70ff70b465278b1bb5c03d81d041facf89549faba17d86efa96 SHA512 c4615043bd1ce3c28cc9a564d58cc0ebbd197b4761763f4d4106fc8d36678c1d8b5b697a38c5ec1093d7d3973b700cd5f32415ec10b8c00546aa1707dea25231
 DIST nomad-1.0.1.tar.gz 51101330 BLAKE2B ee955890e7d3cb093c05f91bb4ad4c33f65048875fbf626b8c40975b21c81b8c9802288cc90953a7639ae8b03ba01f1f65320d711bf884aa27c80bfcecccb73b SHA512 07032f965c5826882a4ce0acd7ef2a5d74cc5f0c439b030a4787e60c474070797c5f88d84353e5d423c1d0f6ac411119fd40eebb57848d4eecd8394477fbffa2
-EBUILD nomad-0.12.8.ebuild 1185 BLAKE2B 306a411bac4e1d87685c7fbdc62fc5ea223faf9d151bc1a307792a80f51d93468f643030b17b701be3fe8257738ecf5d4e14cc21664e2d75d306d2c52786216c SHA512 e6742079feb26c0b2d2beb13fe5923046bfd15677936207f55b7446edd257bf85ba7dc50ea56598fee5dcdd1bb9cd9ed0bda9d521f4d640ec469b2aa5cc80872
-EBUILD nomad-1.0.1.ebuild 1185 BLAKE2B 422e99b52c546e7d8adcaa6c286f8a2287af440542762a457b1cd732d94ca0d7acd942251057949ea005c00f5957c5c3b7260369a59e2fc76eede3e3540e0dfe SHA512 f79cc9b76ded38c88de6130db2cf1e3dd97041c09de7800ef25c96eca71e91abc7c213c82641b119597c1014f5308e4080cefc87fb7fb700bb7bac71709fdf82
+EBUILD nomad-0.12.8.ebuild 1190 BLAKE2B 20684482c8c77437e61fd82732278defbc8362c1338850e58acc908df3bdcbc09dee5c82ca32b3021b6836b4b240350de7c5d091c4da715f1046cba7e29b0d2c SHA512 700948255c637fa8fc995d98ea8940aafd3784bea073dff69b955c92f910615480bf31aa8f6a56c8f00d9eac4d6a8d8ef0820bffa53ed43e135b83eaeb08c207
+EBUILD nomad-1.0.1.ebuild 1190 BLAKE2B 8f8d6f08c3298488d71f16e300b295e623e68abaff2b8bcabe33ae291c4275bec239f3e10add205aedca4a829aba05873bc1e12da4b3352f3b574f5ac5d6d9d8 SHA512 e27089b484c15e76182482ef9d5835b8e6d8a2560d5ede471b512ec4a33f9726f4b1024b12336c35ccadcd49c2f45940a9ab50c24f1f392cb2134b0fcf600120
 MISC metadata.xml 324 BLAKE2B bff415652c0d5fd2e56766c32b6e5df0d9bd00808cee31a70dc36db2e558383e2c489a5315273a42b5fa14723aa88fc659a248589f0d849425cafb5f78ec75c9 SHA512 b8e9827b4c5dd03abac84db21aab8f2743e1421c45aab547bf754165767307e9f60b29b541ab7cc4242347f1510226896db815832d4780fb606c92f9d804c163
diff --git a/sys-cluster/nomad/nomad-0.12.8.ebuild b/sys-cluster/nomad/nomad-0.12.8.ebuild
index 3b9472c5d179..390774fda6af 100644
--- a/sys-cluster/nomad/nomad-0.12.8.ebuild
+++ b/sys-cluster/nomad/nomad-0.12.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit go-module systemd
 GIT_COMMIT=99fa2774301199ee20e661c7c1832a6ee1d5c553
 
-DESCRIPTION="A simple and flexible workload orchestrator "
+DESCRIPTION="A simple and flexible workload orchestrator"
 HOMEPAGE="https://nomadproject.io"
 SRC_URI="https://github.com/hashicorp/nomad/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -36,7 +36,7 @@ src_install() {
 	newins dist/client.hcl client.hcl.example
 	newins dist/server.hcl server.hcl.example
 	einstalldocs
-dodoc CHANGELOG.md
+	dodoc CHANGELOG.md
 	keepdir /var/lib/nomad /var/log/nomad
 	newconfd "${FILESDIR}/nomad.confd" nomad
 	newinitd "${FILESDIR}/nomad.initd" nomad
diff --git a/sys-cluster/nomad/nomad-1.0.1.ebuild b/sys-cluster/nomad/nomad-1.0.1.ebuild
index cf4c35f52785..78c2f6b12336 100644
--- a/sys-cluster/nomad/nomad-1.0.1.ebuild
+++ b/sys-cluster/nomad/nomad-1.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit go-module systemd
 GIT_COMMIT=52ec2e19f1d6e383b30a495b9bcdece315adac17
 
-DESCRIPTION="A simple and flexible workload orchestrator "
+DESCRIPTION="A simple and flexible workload orchestrator"
 HOMEPAGE="https://nomadproject.io"
 SRC_URI="https://github.com/hashicorp/nomad/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -36,7 +36,7 @@ src_install() {
 	newins dist/client.hcl client.hcl.example
 	newins dist/server.hcl server.hcl.example
 	einstalldocs
-dodoc CHANGELOG.md
+	dodoc CHANGELOG.md
 	keepdir /var/lib/nomad /var/log/nomad
 	newconfd "${FILESDIR}/nomad.confd" nomad
 	newinitd "${FILESDIR}/nomad.initd" nomad
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 0755010297d9..2b57fd8da96f 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -4,13 +4,19 @@ AUX nova.initd 747 BLAKE2B 2a20a632fcb66001e68f4d70fa11ba179db9b06a6f412115d7b89
 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
 DIST nova-21.1.1.tar.gz 9300545 BLAKE2B 757e7da69a10da73f7786e71e81ffc126304f8bff65910d3cb7ee8bf8fddc70490451b8173ac1a26e0b256e6cf54f4292617481c5fc7394e727ad2da20ed4607 SHA512 c44f0ca3b689cf3a3f364654bbdc8d4a425c702506be2d4e2d00002baf3395b5212807f1cc696488602d642c3565a7a84a407357d3621028c39e844c2ac4c466
+DIST nova-21.1.2.tar.gz 9306569 BLAKE2B 7b4a0d1a0b7432b027ffe3674ffa3db7ba75724342e1c5de833ed35bc03998057c05cc2e02383433440cda2c19d7a079f65d0d26c60061cd78cbb4d97af93695 SHA512 66dde411c7661d63b9a2104faf0e9dd82979579b9662083f2eb0b597aff960731c27ef1966995fc7eefc48c7d47d746982e995be76e844daa0512a2f8e38cf9c
 DIST nova-22.0.1.tar.gz 9254552 BLAKE2B b676ef872a9c14331860cd907a74c30f41dfb64908af9ac9e93bbc966a43daf1b3ef74d8a9e80e6f50ac25713a65a0082a02ecb276731ea3ea704dad210d6e7e SHA512 002b4fac8807b0a993e281fe6438b3e1db5cba31f12b2570c3bfd7cc495a5334668db4cc75a66f11186a8f0409f84e47e9e8b38220a1b3af762e543481ab0b7c
+DIST nova-22.1.0.tar.gz 9267366 BLAKE2B 0e10b22f5a149eb59b600545f2d2ac91366e13b2d94ca4781358bc6008b569e9f0791eed8f62cf204339b48a970ef47808a94bc4605ac1d1868c4be2fc7db0e0 SHA512 fb5353abd0b2e90f0903ab45690526ed6e0294d3d0a09ffc4acfda022fb0c170be20da406e71a8b303efaef0174ca273ff44dcae79bfc33ffd51e910f0d20fee
 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.1.1 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
+DIST nova.conf.sample-21.1.2 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 DIST nova.conf.sample-22.0.1 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
-EBUILD nova-2020.1.9999.ebuild 7628 BLAKE2B 3486d8ff71c4e70391cd416b6ef0cdf346ea8676d79cf594abaae8ea0f91dbe77a9a4a7fc720cbd4c6f910be91180b25251fa196878a33b4c8d114bb382c7e2a SHA512 d2a507f1fa6a00c2260f837cec8f02d6b151efbc7a50aecb6d50f30c1e56bd3cc708245ff7dec1a2d1a2601fb7a12a028a00ab3a7e75ff015500640c4b00c26a
-EBUILD nova-2020.2.9999.ebuild 7493 BLAKE2B 13c828ef32b49e6284464e2fe99d396412e1345b7b148368fbcf2eecfcf671d9653733e8c64729a548cacf3b149d89099421ac78bc9c5a4e5083f83273180d12 SHA512 e7e8dd5dfea3be846e769207859255c88ab04ea745fbaf8062c1763f34959241b09ba0a444967e8abc91a9c96bfea00e6861006597bf8571843de6050b9e3779
-EBUILD nova-21.1.1.ebuild 7651 BLAKE2B fef31b81037d3412567f60578d63732f08fa0e70697c8a936d31e6b1fe5868b0dbb722447826b918ecb1467df9b95d9efec07fbe7a94225efa3f0695825e3f41 SHA512 c1a64cea2dbed104b03330662349ac165e18e162b89812a4c101f28f539773bb8563a3a56656fe561109eaef54f7eb3eccc799d81ec35de420109f35ade74352
-EBUILD nova-22.0.1.ebuild 7491 BLAKE2B c7c9321f79801920a7f12e2c6ac50a822afa149f6563e6ecceded24c790369c47bd961c0902f43c79a97cdfefc5417f2c0fa6370ca3a8871a8adea5b9eb805d0 SHA512 cc9bd391e783872f7384e136725d132fc8c2dffbe57b4af3fd7216029183a6218714d4243e9f2d489d611b04c6992d91b678a3f1f0875a62f757de997bdc8cd1
+DIST nova.conf.sample-22.1.0 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
+EBUILD nova-2020.1.9999.ebuild 7633 BLAKE2B 7a9a900405589b3356673cee3a0d465e075b53fab5fcf84ddeaed587d11438bbcc838e3edb6409cc0e9cf6585d195b106a803bba5d950103b24018a047bbba49 SHA512 425b6951ad85c0e3e8e4600d670ba8f090469cf5f017693a4639a2cb27fc66b21aa75dc110d48d4623bd4f2aa612f85f20308b83677331bb8c1b348bb9af036c
+EBUILD nova-2020.2.9999.ebuild 7498 BLAKE2B 45329d98d262f46b12e79aea2a256372c43824577b5b45620195fef5ce9899a14c8b29e09acb7769c43ace5986aead38b87f9304420666ab5a185229b7b131dd SHA512 ff46e10838353976449927878edc096abc33287156721e17989dbb9ffcf5e1238dedd61000fc81e712e865d63414848ed8345ff11095ee8c7d300b37ba764111
+EBUILD nova-21.1.1.ebuild 7656 BLAKE2B 9715cf99a2213416d7bb6f2fcb4971b179948eb5da5c50d1b50256a6b17c040020fd398e574b55dac8353f3e3f2ced4c3841d9812661106e7df9ad3b46098b4d SHA512 49a1ccf6ec51b414031d8bdba6ed3246cabe265f9e2fe2ac7b09708abdde16eced12e5c8c1b7d37cbda0928e0492d6c7824b8309b28e4be2e440bdb7b16e50f5
+EBUILD nova-21.1.2.ebuild 7658 BLAKE2B cf41045236d69ca97f2e1b7c46cc5f49148d2ccb379b2fa09acab28ff3ee8b4d19040f247596f0bcd16ae649335096de615581e2f35fcc9ffe6915bf677a3274 SHA512 7584dbfcbb9334d940d9de0db02e85579a6987b142b73dc9e68d7dbac9646be827d25de99d53c0f64fcfa9b1dcfcb48068e97f6807d1bb9e1a99a77fee92ce3e
+EBUILD nova-22.0.1.ebuild 7496 BLAKE2B 9490d2b6faba72c8526f18aade9833abc81c0650ceb203b73ea0dfcd8f216a79af31b8b6c4196183140380d9a014e27084c2f77d1ebdeda5e0bea2c6df3b5115 SHA512 2b7e5a1fe04830b860fd6e0aa95324501ece938c7059fefb93dc2d4c21b8f0fcd7b87a01346d5823ba5a092540a1b86a40fbdd483b7c3a8c8553fbf6af2d37b3
+EBUILD nova-22.1.0.ebuild 7498 BLAKE2B 45329d98d262f46b12e79aea2a256372c43824577b5b45620195fef5ce9899a14c8b29e09acb7769c43ace5986aead38b87f9304420666ab5a185229b7b131dd SHA512 ff46e10838353976449927878edc096abc33287156721e17989dbb9ffcf5e1238dedd61000fc81e712e865d63414848ed8345ff11095ee8c7d300b37ba764111
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-2020.1.9999.ebuild b/sys-cluster/nova/nova-2020.1.9999.ebuild
index b3e54e918d9d..7a7b59e2390e 100644
--- a/sys-cluster/nova/nova-2020.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2020.1.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_7 )
-inherit distutils-r1 eutils linux-info multilib
+inherit distutils-r1 eutils linux-info multilib udev
 
 DESCRIPTION="Cloud computing fabric controller"
 HOMEPAGE="https://launchpad.net/nova"
@@ -87,7 +87,7 @@ RDEPEND="
 	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.21.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}]
diff --git a/sys-cluster/nova/nova-2020.2.9999.ebuild b/sys-cluster/nova/nova-2020.2.9999.ebuild
index 4f4d7b2b35ea..1469e1f90d46 100644
--- a/sys-cluster/nova/nova-2020.2.9999.ebuild
+++ b/sys-cluster/nova/nova-2020.2.9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 eutils linux-info multilib
+inherit distutils-r1 eutils linux-info multilib udev
 
 DESCRIPTION="Cloud computing fabric controller"
 HOMEPAGE="https://launchpad.net/nova"
diff --git a/sys-cluster/nova/nova-21.1.1.ebuild b/sys-cluster/nova/nova-21.1.1.ebuild
index f1651e868045..0c8937f383c8 100644
--- a/sys-cluster/nova/nova-21.1.1.ebuild
+++ b/sys-cluster/nova/nova-21.1.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_7 )
-inherit distutils-r1 eutils linux-info multilib
+inherit distutils-r1 eutils linux-info multilib udev
 
 DESCRIPTION="Cloud computing fabric controller"
 HOMEPAGE="https://launchpad.net/nova"
diff --git a/sys-cluster/nova/nova-21.1.2.ebuild b/sys-cluster/nova/nova-21.1.2.ebuild
new file mode 100644
index 000000000000..6e90915fb659
--- /dev/null
+++ b/sys-cluster/nova/nova-21.1.2.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+inherit distutils-r1 eutils 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/ussuri/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/ussuri"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/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-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	!~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.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.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.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.1.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.1.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.1.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.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.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/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=(
+#	"${FILESDIR}/filename"
+#)
+
+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/nova/nova-22.0.1.ebuild b/sys-cluster/nova/nova-22.0.1.ebuild
index ba69c65d6da4..c79122d7ce8e 100644
--- a/sys-cluster/nova/nova-22.0.1.ebuild
+++ b/sys-cluster/nova/nova-22.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 eutils linux-info multilib
+inherit distutils-r1 eutils linux-info multilib udev
 
 DESCRIPTION="Cloud computing fabric controller"
 HOMEPAGE="https://launchpad.net/nova"
diff --git a/sys-cluster/nova/nova-22.1.0.ebuild b/sys-cluster/nova/nova-22.1.0.ebuild
new file mode 100644
index 000000000000..1469e1f90d46
--- /dev/null
+++ b/sys-cluster/nova/nova-22.1.0.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 eutils 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/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 841d192bebfd..dd5d836ed139 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,10 +1,6 @@
-AUX pacemaker-1.1.24-python-fixes.patch 1097 BLAKE2B 0ae19b7c6110262728369f5368a80d2d80e1d2566cc7480a9419302c2e49d98d07df2d7222028076f517a7158ea8af6ea95e9c47b06881ee5140272203b3650a SHA512 d31f8a7ab06a6b0649bf5395bd722503ec58164f87db137cda7125e95cda4337cc754fce509d50706e9159e45b61e2593c2fd9cd132bd7e4467a077855308af5
-AUX pacemaker-1.1.24-qa-warnings.patch 492 BLAKE2B 9ff485f9d2af09d2ce736b4b8312a9ff9d799ad49db433c2353252fdfc6dc85d85fdf300127d35f2ce815770ff60ce0b8ac7536993841f8e0a962a685a00789c SHA512 736f13ddbe0013ad15c62acc469e97fb30eb12b9782e0c60338c5d8cfa87174e9c8e2b3b9d326b9228135709830749e4481a77bd088ca83027ba4472867147b3
 AUX pacemaker-2.0.4-qa-warnings.patch 819 BLAKE2B 5de3717c80c6aa0d81b66c2b16e0b15a272f2a67549ef22288f4feddd34ca498dd797744a94ebe5a7b05cf515a3f42f78e0281dfc805724a7aed957d966f58f8 SHA512 fad606290261b996dc5ed9c29388c245e1247d9816ef843360e36fac4360de0c95eda17ec3e254e7cb67921ab60263ae2acda46874c6d722f13b2e025a98ac94
 AUX pacemaker.initd 862 BLAKE2B 4da4af65887be567aa77fff2b3647b64fa86a9862a2269db1c27ab429759ac597f6eb5fcbadefc22ec64d0eb5983b3d7301c1867d056ef8332f241d967aae3c0 SHA512 9578a47ea9271a5b8b5939dc32ff49736504c2e6318f3e9f906b554b1b11a334c01cae8900e946318cdffd3cf9611d748013bdcc63b3ae68919709ebb12e7e7c
 AUX pacemaker.service 105 BLAKE2B 2b77b0c81427ab418bb5af372fb4938a7c630a9bb1e4128ed7335d9d1d11b5fbaf657e9ccabd6a7d4b1a120a00d7e46678f8a7a635b0dee7a2aa60559e78d50c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b
-DIST Pacemaker-1.1.24.tar.gz 5765945 BLAKE2B cdbba75b640adf6962d00a13a12045bf5d1e34dbdaf34d53797e8fea4fff9368dd3d771fe2d7f70813bb3cfab87a7daca3af56f4f5b343fb3ac3aec649f32316 SHA512 6eb5996ae135970cb7a04b81ad43d060e898566d0addd70da61085d47da6d7dc752e8e9df580e18c295c8b373bab6b4574ddb3a34cb7a1e29b2ed768a4f916bd
 DIST Pacemaker-2.0.5.tar.gz 5434850 BLAKE2B 4e3d24746978fe0785dd9c415cc3779a2bd06f78d8bcd3353cdab8c93b192db8a017d404f6d5e27852369e8db2dc1ee4a2c4c7806ebb1aad5381d1c5b5a681dc SHA512 5fd3614f0284297babb66ea2dc567583315052fcf77f49107c52161e8e8c164ae3169d98528fdc1316d8eabaacc98ed24e9c6e6c90b3286f2f012a4ee874bbba
-EBUILD pacemaker-1.1.24.ebuild 1674 BLAKE2B 6e607467e2c826b4c04f0d0c28fabd0869d9b8cafd74a0e2dfa4a7220300137a56c4fb16e757d7e0b086af138f729966e1a4712e72509aab59741e77ca86d298 SHA512 3c659b4c49adb1af40770fe1d9f1031e945560f22c180d22e283acdafcda515e3557c1068ab91a61335694a048e084c9cfed32c42b50a652c00e2d7fc4e9615d
-EBUILD pacemaker-2.0.5.ebuild 1577 BLAKE2B 78d047e985ea580589b93a49ccac054c52ad19b7366ea6ac213ac08293df4b1891d3fc16045902f85056a42e991544c49ce24c2aa447015ce9db9190b167e91c SHA512 b78df7f28f6b991b12eccab1a03111f7a0f08f7235c6f65c6fcdf331f3003f82edb300184e6127a8ef60a3fbc93ad85d2bbd9f39b0e6aafb46a027363a78932b
+EBUILD pacemaker-2.0.5.ebuild 1576 BLAKE2B 014f0d09c3c664a90e1ed6656fbf62aedee5b840a8ca092aba647f0e251cbb941a4cba778e2cf209a5555c60f4fb81ebd4ebb7ae0ed211eb76cb5e3a30c0751d SHA512 865d8da908694c7c799395f8d706cfc89508ce766854bfdcd2fa572c58818afc707fe8b4ee36e3a54c1a064b0c9d46d5fd00cbbf876505fa6a5270afe5190f6a
 MISC metadata.xml 808 BLAKE2B a4da9e3271b4b28e903675dafd9d7f89e04ba1f326a849bb61b74f9ee7a3d21acf32b64826752b5881e40a292e850242eb87d722a41caa2d6c5106fe7162a3d9 SHA512 a86d59e889206951e38efc0fb3ace9f54662abfc56edbf04e66f266e4d29c97bda968df5b16bc54150a5be24ccbb7f3ff3d04f8d527f12bc067fac02255b5119
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch
deleted file mode 100644
index 2428a399d5f0..000000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur pacemaker-Pacemaker-1.1.24-rc1.orig/cts/remote.py pacemaker-Pacemaker-1.1.24-rc1/cts/remote.py
---- pacemaker-Pacemaker-1.1.24-rc1.orig/cts/remote.py	2020-10-30 18:35:13.000000000 +0100
-+++ pacemaker-Pacemaker-1.1.24-rc1/cts/remote.py	2020-11-10 22:47:21.600435423 +0100
-@@ -125,7 +125,7 @@
-     '''
- 
-     def __init__(self, rsh, silent=False):
--        self.async = []
-+        self.hasync = []
-         self.rsh = rsh
-         self.silent = silent
-         self.logger = LogFactory()
-diff -ur pacemaker-Pacemaker-1.1.24-rc1.orig/cts/watcher.py pacemaker-Pacemaker-1.1.24-rc1/cts/watcher.py
---- pacemaker-Pacemaker-1.1.24-rc1.orig/cts/watcher.py	2020-10-30 18:35:13.000000000 +0100
-+++ pacemaker-Pacemaker-1.1.24-rc1/cts/watcher.py	2020-11-10 22:46:08.287258247 +0100
-@@ -140,8 +140,8 @@
-         self.logger.debug(message)
- 
-     def harvest(self, delegate=None):
--        async = self.harvest_async(delegate)
--        async.join()
-+        hasync = self.harvest_async(delegate)
-+        hasync.join()
- 
-     def harvest_async(self, delegate=None):
-         self.log("Not implemented")
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch
deleted file mode 100644
index 37346d6a396a..000000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur pacemaker-Pacemaker-1.1.24-rc1.orig/configure.ac pacemaker-Pacemaker-1.1.24-rc1/configure.ac
---- pacemaker-Pacemaker-1.1.24-rc1.orig/configure.ac	2020-10-30 18:35:13.000000000 +0100
-+++ pacemaker-Pacemaker-1.1.24-rc1/configure.ac	2020-11-10 23:21:04.728714112 +0100
-@@ -2198,7 +2198,7 @@
- 
- dnl Put the above variables to use
- LIBTOOL="${LIBTOOL} --tag=CC \$(QUIET_LIBTOOL_OPTS)"
--MAKE="${MAKE} \$(QUIET_MAKE_OPTS)"
-+MAKE="${MAKE} ${QUIET_MAKE_OPTS}"
- 
- AC_SUBST(CC)
- AC_SUBST(MAKE)
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild
deleted file mode 100644
index 994c508fc65a..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools python-single-r1
-
-MY_PN="${PN^}"
-MY_P="${MY_PN}-${PV/_/-}"
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="acl smtp snmp"
-
-DEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	sys-cluster/corosync
-	>=sys-cluster/libqb-0.14.0
-	sys-cluster/resource-agents
-
-	smtp?		( net-libs/libesmtp )
-	snmp?		( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.24-python-fixes.patch
-	"${FILESDIR}"/${PN}-1.1.24-qa-warnings.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	default
-	sed -i -e "s/ -ggdb//g" configure.ac || die
-	eautoreconf
-	python_fix_shebang .
-}
-
-src_configure() {
-	# appends lib to localstatedir automatically
-	local myconf=(
-		--localstatedir=/var
-		--disable-fatal-warnings
-		--disable-static
-		--without-cs-quorum
-		--without-cman
-		$(use_with acl)
-		--without-heartbeat
-		$(use_with smtp esmtp)
-		$(use_with snmp)
-		--with-ais
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}/var/run" "${D}/etc/init.d"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	if has_version "<sys-cluster/corosync-2.0"; then
-		insinto /etc/corosync/service.d
-		newins "${FILESDIR}/${PN}.service" "${PN}"
-	fi
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}
-	python_optimize
-}
diff --git a/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
index 8dfa4cc494f8..262f0c975432 100644
--- a/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="acl smtp snmp"
 
 DEPEND="${PYTHON_DEPS}
diff --git a/sys-cluster/zookeeper-bin/Manifest b/sys-cluster/zookeeper-bin/Manifest
index 89e9df51c873..7912d42c82f8 100644
--- a/sys-cluster/zookeeper-bin/Manifest
+++ b/sys-cluster/zookeeper-bin/Manifest
@@ -1,6 +1,10 @@
 AUX log4j.properties 2191 BLAKE2B 64ca568213fcc1168a10b8ca5914361f2d4543e8d5a2e22bf81ee807df2c4f7ca269a1f8d355ee8e889aa50c250e24f65c3900a32f06233e6c3dbc9b460c48b2 SHA512 a465aef274e3f325730c150fdebe3ca27f9debe723af6680b187daf83d6da663fa8a51bb9813ec8cba3b4d59c9e28848032083a44686b08fd2c246a461ada0c6
 AUX zookeeper.confd 398 BLAKE2B d49c6c7358ce2f6911d359142e0f6abe2662c0e5c2bcf1ac114cd272d44efcfad05d31d58ef368a470e6f844df999068b68a7c1e8392138fc07887333e7bd41f SHA512 76ad4796faa2d267ae30d85e573de2dbad00c566764cf6757d71c00c68b10c99383dd87d2352f521c872ce22edde85bb2d3896bb6258f57ce3fc6b423a16296f
 AUX zookeeper.initd 373 BLAKE2B c60740f691d186861e3f101c84e5904774de6235a0423f4f639843b105d6ce9b4ebd9555db13f5ac1447c154881b3c95fbd4738d496f6008d9e52de1cc3e74eb SHA512 34a4011ecb5d8739e57dbc9222b528a0b323c6aa0aa45391621e724106571a632908782e3a4e14e953be72fa0e525b4c7cab0440af37bbef26a100fd1d92da81
+DIST apache-zookeeper-3.5.9-bin.tar.gz 9623007 BLAKE2B cb8a599a86f57cb0eb91d58925d363271749e0ca93b0d40be5852f859848bf557f4bc6016707cb99ad75e95204b7b8e0417acdff5ebc8328e3a12c5fe7faf285 SHA512 0e5a64713abc6f36d961dd61a06f681868171a9d9228366e512a01324806d263e05508029c94d8e18307811867cdc39d848e736c252bf56c461273ef74c66a45
+DIST apache-zookeeper-3.6.2-bin.tar.gz 12515974 BLAKE2B 6770397b818558464843638bb9beebc1e23fc737ed88b28966494f69a28adb9624d9ea67225f8b528babd78a6ce7650218933b80db520ea08e31231e1bbe478c SHA512 caff5111bb6876b7124760bc006e6fa2523efa54b99321a3c9cd8192ea0d5596abc7d70a054b1aac9b20a411407dae7611c7aba870c23bff28eb1643ba499199
 DIST zookeeper-3.4.13.tar.gz 37191810 BLAKE2B 994eecf982a19bbf3ae648c5d140746f5836f0f5d8921ed005ebccdedf0098591005b9038eb75fc660b48ae12b09b8db9dd68d3ac3b4ac9f847de214996e1efd SHA512 3481bd19945d80848f81d9dc2896a682ae8b62269b8164ffbae532e55aa4219961403e0208c8e72cf784605eae436d70ddae2b26e0deba0f1f84c74188c32c0a
 EBUILD zookeeper-bin-3.4.13-r1.ebuild 1722 BLAKE2B 30ef5e55d7ca7fc1a98b905824ce0c015c8c1321c18d05e54157d10a026153fa444b0c4ce9615a0d96a3822ee2440059f88bab1abddba11af75b58962ceb370f SHA512 be88fae43276447a33e57986945da22b2f4f72140306b0878a9042ba107ec18107409c15eac9c065030ae9ec26f996b62d27392cb9d90147c8bd13829d49ac03
+EBUILD zookeeper-bin-3.5.9.ebuild 1484 BLAKE2B 432b26cb6fd433445fbb27bf12687e8b399d07ca50bbd4b1002459afa3e0263ab2420396f314e88d57ca7143abb90f8ab1c2145fbb53a6364e7ca658e995c7d6 SHA512 b73349b29730e7ca28983e4cd96c224a0b1d02c3b1db21b9644be6d634bdca514bdce37d53dde235a170440d5e794c9d4256b78fa6dd5854e8a8abd9ed38bbae
+EBUILD zookeeper-bin-3.6.2.ebuild 1484 BLAKE2B 432b26cb6fd433445fbb27bf12687e8b399d07ca50bbd4b1002459afa3e0263ab2420396f314e88d57ca7143abb90f8ab1c2145fbb53a6364e7ca658e995c7d6 SHA512 b73349b29730e7ca28983e4cd96c224a0b1d02c3b1db21b9644be6d634bdca514bdce37d53dde235a170440d5e794c9d4256b78fa6dd5854e8a8abd9ed38bbae
 MISC metadata.xml 377 BLAKE2B ab2582cf60510f072415cc1dd008bd744f66d76fe6b34b779eba8acf7c28a0d055d70d16c2712af7324b6b11193ed2526b6b8bb1b101084e8a5ca8d96993ef3d SHA512 2ad1600101d36b70c32cb76894e55f01717a544d689bd28ffb41a727d7d23b6f8e9565eea71f252a721bcd4e516692921796f24266485a216a6015a5a9e74f26
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.5.9.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.5.9.ebuild
new file mode 100644
index 000000000000..91ec7b758751
--- /dev/null
+++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.5.9.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-utils-2 user
+
+MY_P="apache-zookeeper"
+MY_PN=${MY_P}-${PV}-bin
+
+DESCRIPTION="A high-performance coordination service for distributed applications."
+HOMEPAGE="http://zookeeper.apache.org/"
+SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/${MY_PN}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror binchecks"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.7"
+
+S=${WORKDIR}/${MY_PN}
+
+INSTALL_DIR=/opt/${PN}
+export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
+
+pkg_setup() {
+	enewgroup zookeeper
+	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
+}
+
+src_install() {
+	local DATA_DIR=/var/lib/${MY_P}
+
+	# cleanup sources
+	rm bin/*.cmd || die
+
+	keepdir "${DATA_DIR}"
+	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
+	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
+
+	dodir "${INSTALL_DIR}"
+	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
+
+	# data dir perms
+	fowners zookeeper:zookeeper "${DATA_DIR}"
+
+	# log dir
+	keepdir /var/log/zookeeper
+	fowners zookeeper:zookeeper /var/log/zookeeper
+
+	# init script
+	newinitd "${FILESDIR}"/zookeeper.initd zookeeper
+	newconfd "${FILESDIR}"/zookeeper.confd zookeeper
+
+	# env file
+	cat > 99"${PN}" <<-EOF
+		PATH=${INSTALL_DIR}/bin
+		CONFIG_PROTECT=${INSTALL_DIR}/conf
+	EOF
+	doenvd 99"${PN}"
+}
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.2.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.2.ebuild
new file mode 100644
index 000000000000..91ec7b758751
--- /dev/null
+++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-utils-2 user
+
+MY_P="apache-zookeeper"
+MY_PN=${MY_P}-${PV}-bin
+
+DESCRIPTION="A high-performance coordination service for distributed applications."
+HOMEPAGE="http://zookeeper.apache.org/"
+SRC_URI="mirror://apache/zookeeper/zookeeper-${PV}/${MY_PN}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror binchecks"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.7"
+
+S=${WORKDIR}/${MY_PN}
+
+INSTALL_DIR=/opt/${PN}
+export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
+
+pkg_setup() {
+	enewgroup zookeeper
+	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
+}
+
+src_install() {
+	local DATA_DIR=/var/lib/${MY_P}
+
+	# cleanup sources
+	rm bin/*.cmd || die
+
+	keepdir "${DATA_DIR}"
+	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
+	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
+
+	dodir "${INSTALL_DIR}"
+	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
+
+	# data dir perms
+	fowners zookeeper:zookeeper "${DATA_DIR}"
+
+	# log dir
+	keepdir /var/log/zookeeper
+	fowners zookeeper:zookeeper /var/log/zookeeper
+
+	# init script
+	newinitd "${FILESDIR}"/zookeeper.initd zookeeper
+	newconfd "${FILESDIR}"/zookeeper.confd zookeeper
+
+	# env file
+	cat > 99"${PN}" <<-EOF
+		PATH=${INSTALL_DIR}/bin
+		CONFIG_PROTECT=${INSTALL_DIR}/conf
+	EOF
+	doenvd 99"${PN}"
+}