gentoo resync : 24.07.2021

36 files changed, 119 insertions, 647 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 806aa22205fd..ad0a4c24b6fe 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 96941eb47f0a..4f324be36c9f 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -57,6 +57,6 @@ EBUILD ceph-14.2.21-r2.ebuild 10431 BLAKE2B da08ec46959c57da162051019010c20bd718
 EBUILD ceph-14.2.22.ebuild 10379 BLAKE2B 970b467d01d8b294f5c886e843e0f85c19dccf6bfe17726f7e6a34ec2e34557b90a96305d2b62e45a9e3264e5eb9335b1f29cc37a52fb116387b85aa62d685f6 SHA512 f64bf074c77fc603b4ade5c2ac341218c932f4058eadbaeff29bbf6f10facf60b09698bf0a6fa2de6d7feb6271dbe2ff9ad41e2e60b8b0d57ab2a9517f346775
 EBUILD ceph-15.2.12-r2.ebuild 10780 BLAKE2B c3ceaef839451ad3c05d8d3ffa389a3e8a2a65563a0276c3b5b6f9e81a02590a77561d5a1ee7ac6842ad1295d3f2908fe3c4aede5edb50f15eaec2ebe2dbeae2 SHA512 f2d503964a06f6ebab1e080ae574744c455ba34323ab04de7d98ff7f6b33b8d0439b179412fd3410ab2602443f2c5757621238a4006edc73aaddb001b9b81c8b
 EBUILD ceph-15.2.13-r2.ebuild 10676 BLAKE2B df69ca97ef59cd7934aab08fa4e754e69ccf0a000e06523bd444681fde18171adc71acd4b99d5935174542cc0c3eb12ae39e557a078bc296e482047092514b1d SHA512 474f065867fbdf66832e4d910d90447406dcb0483727ce42e8e5ae13b8222294e05838fa18990998b3cb693a27e0fc2de4a06402120535088a12c374ede8f814
-EBUILD ceph-16.2.4-r2.ebuild 11991 BLAKE2B 62c9ee82927b0ae110e8bad74e76a39cf3ccbf1e4d5d247784d4962fa619fceec2c463885c574fedb5ec75d4f369a0152afd007550d60fe8833dd1faa0c71d26 SHA512 09d8ce0d5aa9ae0b11b6c2918ef06807a9065b8d4341df7c0ff9b5f87ef1896589d2d1437eb70a4ed0cf5f0a29c01d998318797a358a96b5b56fe5caa8dbbeeb
+EBUILD ceph-16.2.4-r2.ebuild 11990 BLAKE2B 396daa63143a2e70921039f3dff9af8107d9d708c1864994f64ea5b251924f72af92af2fb0e512d0d7b8545ab32c7b70078e2f076a7a4939999611316d55015e SHA512 44a6d31278d8885398af0bcafd36e16a0abd25dfc66d4242294ae84c3db631967bbc786cafaa54abeda5d981e8711453732e9ecc8332213cac224b357b8f7f17
 EBUILD ceph-16.2.5.ebuild 11991 BLAKE2B 62c9ee82927b0ae110e8bad74e76a39cf3ccbf1e4d5d247784d4962fa619fceec2c463885c574fedb5ec75d4f369a0152afd007550d60fe8833dd1faa0c71d26 SHA512 09d8ce0d5aa9ae0b11b6c2918ef06807a9065b8d4341df7c0ff9b5f87ef1896589d2d1437eb70a4ed0cf5f0a29c01d998318797a358a96b5b56fe5caa8dbbeeb
 MISC metadata.xml 2318 BLAKE2B f9cf86426b0d8ea87cb80cb03315e9b0b581f604b2e1f28011dd49ab885232184fbcb6e496e8305d92e2c45bea973b8627235115e6bc7b7590874ac2ce9a00cc SHA512 e4eb8fb92dfe9161c217d880db3733aec36efc74431f529b12212702abbf633647bb8a22bfe7864d7389e8ed893bc37518e228ce165140058f98aec534b8f3de
diff --git a/sys-cluster/ceph/ceph-16.2.4-r2.ebuild b/sys-cluster/ceph/ceph-16.2.4-r2.ebuild
index 834efe8eb5e6..ab8e538d648c 100644
--- a/sys-cluster/ceph/ceph-16.2.4-r2.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.4-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	KEYWORDS="amd64 ~arm64 ~ppc64"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index b90cece11767..bd2537be43f4 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -2,7 +2,7 @@ AUX charliecloud-0.22-sphinx-4.patch 838 BLAKE2B 09fbf97c9145ca050ffb56215c5e114
 AUX charliecloud-0.24-dash.patch 779 BLAKE2B 5062e284c59b63a20e2e291c0674d832fb7a9b0546c4fff515f48bb8944548c6f673db286551f0d16740c38885a3f9ca3a08c60c98bfdc984d958abffd2ddff7 SHA512 111f4db9a39f03710317af68a321ab496930ce4f8dd32ec8b8c47a5e9489d2313f0175d7580d25cb095e86b3d9148262fb4d4a1862c235739e39fc6732eb45bc
 DIST charliecloud-0.23.tar.gz 403281 BLAKE2B f7a6824782e7bf3bdb51ae791fdca2f5929f5c713590ff49cc8a7e1e1c1758e83bdd429a99497dd15e565d01f0f66f2873f64edddacf24ea78f68c2326669db7 SHA512 35543ed3d838b80fbb64fe3e658993fe9f7ded2d1dfd92e0e9a7725fab6d872503a790964c0f3fabb6438c8bd872b5b00cdf31a028f26588b318b9d0dc568119
 DIST charliecloud-0.24.tar.gz 420852 BLAKE2B ca55231c74012a678c24133b28e341392865a562653086766e6b5e570744f31ce69d1afa2bbb2cc85d5e52b6ed6e9f42f67187d9998afd3852a10fd4a8ff29d3 SHA512 41f44ef5f12dc35d7972923a84044b7255801705d4fcabf76e675dcb70a9f25422e7d584a7b49135ef2ae5dc1751a39efd84f8eb719653a769b41f46bd558fd2
-EBUILD charliecloud-0.23.ebuild 2161 BLAKE2B afb61b96bcc421d8b12e57b140847dafd6de6b7276bd73dd98847c469e584cc2905c6446b9ca72f6b800717b72ac29f7335ce98ac1c97919232525e7f409084e SHA512 66d8c7ef58d8d70a8336b055f1c0a1697d171262e406888172da39db988587e3ced07ebe9fc7cfa5863199badcff576fe1decdbc66c20868c5dc4179ce8a11a3
-EBUILD charliecloud-0.24.ebuild 2120 BLAKE2B 60548b6ea87b1fbcb8314eba4f01d3a9df7e79ea4efb62f57371d4dda459fd94fc8042c98a30c2dd60d4caa12a3699ec9d4713f0fb1fe2476e5c4df76274d427 SHA512 4a2f9fa0332f446a110adec9ad9c670ec0c980f1481809aa8301d8567c53a4c6034d6e8ec58566a04fc49fd12f0b25f0fa2010f14a7a3fe45e8a8ccdd47e4465
-EBUILD charliecloud-9999.ebuild 2070 BLAKE2B b703c4d5bc566cca1acf2f5555208d5ebc9457d3f3cce1141e86b3f08c5a26902ff3ebc4f21cbd456cca09c1e48f862745f181f26917a90da563cec68eebb70a SHA512 12a3d6d5a77fabf562cacf533ff6a52b24118a153e9342fd7c49359213882e2a5c17b7df247040aa270787af9f34f89f984f93ba304b7f50d32c1d0a11d0d7b6
+EBUILD charliecloud-0.23.ebuild 2135 BLAKE2B 10dc6c2b9868f78187aefe278d84cbb5d5a2c6cd3171d654a6492d43900819f3da6fc68ebdd5db5dc17659cae45b4043e81ab5c4c1a2d86754d656b0d20a4cf4 SHA512 2fa0001a06fb162d74f174ae3999facd2c596f86c61a71fc993500c82fb9b3e4cd5ae0bfbaed1783ebb1d43e50efb8af1c34bc5fdfb59769ea8bac8feaf11121
+EBUILD charliecloud-0.24.ebuild 2094 BLAKE2B b8cb9d6b8ae0572a4627df81862f306f5fdbe8ad78113138294d7d90ddf1caa76cedd8f08f0712b1eaf4bcf1e0afb2cf41dd0201b53f8684914e347c690f8f9c SHA512 c3fe87c6eb12e77f1ebddff61a3d0dec32cb79f0adb0148008b2b602ad8fd306bb1f200f771d4100672cabc58bf62bc08f9fff3ed541b31949d0b7db2bc92275
+EBUILD charliecloud-9999.ebuild 2044 BLAKE2B 2d16f1e2434e94fc78ae6bbd5e5b7775a0c74b901df37eefe4e2484d62242c779b0ac9f88fa059941e13541dd7b08af805424b3a3be0946b4b4a111aea096ca8 SHA512 b7a09c5842074a2cef33ae22d96410f8947011a8a4875cba6ca635f642b45804d9acdc68262ddc2ee7dcd4495fead73c30ebc03530fe03c8692876af7350c75f
 MISC metadata.xml 617 BLAKE2B 1c9b75dc0e15fec82053803042667d20b9b3cf49bc90a2630bc7dd3139de79d1d1791e5677640d510a3641ab7d117037bb5134ccb336f5027b5ea7105f63eafb SHA512 8fb83c8b9c57c98893ebfc724026a88e484ef2f7d50c6ede3dcd982978cf428b699126c5eb5e7cec3c3308c875b657bca53dc879030b54fd3c0d03282cd1776f
diff --git a/sys-cluster/charliecloud/charliecloud-0.23.ebuild b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
index 612b89ec6158..b514ad3c817a 100644
--- a/sys-cluster/charliecloud/charliecloud-0.23.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools optfeature python-single-r1
 
@@ -34,14 +34,14 @@ RDEPEND="${PYTHON_DEPS}"
 DEPEND="
 	ch-image? (
 		$(python_gen_cond_dep '
-			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/lark-parser[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
 		')
 	)
 	doc? (
 		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 		')
 		net-misc/rsync
 	)"
diff --git a/sys-cluster/charliecloud/charliecloud-0.24.ebuild b/sys-cluster/charliecloud/charliecloud-0.24.ebuild
index d7ab23b95398..969b56a74d47 100644
--- a/sys-cluster/charliecloud/charliecloud-0.24.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools optfeature python-single-r1
 
@@ -34,14 +34,14 @@ RDEPEND="${PYTHON_DEPS}"
 DEPEND="
 	ch-image? (
 		$(python_gen_cond_dep '
-			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/lark-parser[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
 		')
 	)
 	doc? (
 		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 		')
 		net-misc/rsync
 	)"
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index ae43a8ed1073..20ef1b5db540 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools optfeature python-single-r1
 
@@ -34,14 +34,14 @@ RDEPEND="${PYTHON_DEPS}"
 DEPEND="
 	ch-image? (
 		$(python_gen_cond_dep '
-			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/lark-parser[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
 		')
 	)
 	doc? (
 		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 		')
 		net-misc/rsync
 	)"
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 871ce96dc9de..c799d76d344e 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1,4 +1,4 @@
 AUX charm-6.5.1-charmc-gentoo.patch 1305 BLAKE2B 21c85a455c6fbe0f0b745d6a3f9808a3d05f90a26cf0f0f9b66f8a12a34b53ffb9963512918c269506047675cbb24f7d1d2cb2ecaf986465b6c961a1df1c42a5 SHA512 994becbf0e40c0e181222a854df98e3c7b571b517a24a0548ad323ac116f146f11b7d2e6ec4f8289ffb5926dda57d92831412e9367951387d1e224208306ed03
 DIST charm-6.8.2.tar.gz 24420478 BLAKE2B b5035d29f90ec766dc49b94e76d68a9ce3d16f43037203baaa035cfa863c6ca063a81c5dc275c1517feabc3517201d5e854a2b1b4b1c492ff0433f692db39a34 SHA512 903aa47706c260d35a04e6002874d197439087d6bdbd4fe65a397a02096a2e53eeb93b64c57e5983f0190ca2dcef3a9b28a3b424207c9d3eb6e820659f5e00c1
-EBUILD charm-6.8.2.ebuild 5302 BLAKE2B 717b5a82859e72567db609dd86f5433dc2555fd798f3e8f4effd94915a98fc448ac014b191f787d1c7de945901e286db63808c2cd5e8dba186819285a653eeb7 SHA512 b0b6eabc6e971cd07183650884b10e7b6af21eed3c80d8b849801b78d09293951c3f913ef52d97439e37afa0839cc4012d138ec89ddd73601305a519e2af275e
+EBUILD charm-6.8.2.ebuild 5260 BLAKE2B f18ac35aabb158e3c473a12f30f2c8371944d24d6454e3fc54d508ca1709af9f56d477a9afb066bd68bab0db29f66b8d48237d2e6c370142282b751b3d454f0b SHA512 b33b90d8cf1d21277dd89414340f290de3b5eaefb6e827c9ef36c19c6bd0d5a77c4fcc1a48ec3980fb803b6814be69bd72f138d35be27646058162c15c5c08bd
 MISC metadata.xml 1012 BLAKE2B ee284d471b4f13534787629319734afacbb998fa7ea115377281648614693fd32b7ff91775eddf292b61f267fbfb9be81397be4f37bf1b4582de8cf06bc9364a SHA512 e8fd7cfac25aa8428adbe77922140eee5621b18afa5f10d1ed0c7b14960affc3a1dc0896b7ea034001855ef3e1c1f12791cada0f959eb210ba78f1be44b89ffc
diff --git a/sys-cluster/charm/charm-6.8.2.ebuild b/sys-cluster/charm/charm-6.8.2.ebuild
index c11f5157ca9d..1ff82273b8c5 100644
--- a/sys-cluster/charm/charm-6.8.2.ebuild
+++ b/sys-cluster/charm/charm-6.8.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 FORTRAN_STANDARD="90"
 
-inherit epatch flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs
+inherit flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs
 
 DESCRIPTION="Message-passing parallel language and runtime system"
 HOMEPAGE="http://charm.cs.uiuc.edu/"
@@ -19,9 +19,8 @@ IUSE="charmdebug charmtracing charmproduction cmkopt examples mlogft mpi ampi nu
 RDEPEND="mpi? ( virtual/mpi )"
 DEPEND="
 	${RDEPEND}
-	net-libs/libtirpc
-	virtual/pkgconfig
-"
+	net-libs/libtirpc"
+BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE="
 	cmkopt? ( !charmdebug !charmtracing )
@@ -98,6 +97,8 @@ src_prepare() {
 
 	# Fix QA notice. Filed report with upstream.
 	append-cflags -DALLOCA_H
+
+	eapply_user
 }
 
 src_compile() {
@@ -124,7 +125,7 @@ src_install() {
 	# Make charmc play well with gentoo before we move it into /usr/bin. This
 	# patch cannot be applied during src_prepare() because the charmc wrapper
 	# is used during building.
-	epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch"
+	eapply "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch"
 
 	sed -e "s|gentoo-include|${P}|" \
 		-e "s|gentoo-libdir|$(get_libdir)|g" \
@@ -160,12 +161,9 @@ src_install() {
 			i=$(readlink -e "${i}") || die
 		fi
 		[[ -s $i ]] || continue
-		[[ ${i} = *.so ]] && dolib.so "${i}" || dolib "${i}"
+		[[ ${i} = *.so ]] && dolib.so "${i}" || dolib.a "${i}"
 	done
 
-	# Basic docs.
-	dodoc CHANGES README
-
 	# Install examples.
 	if use examples; then
 		find examples/ -name 'Makefile' | xargs sed \
@@ -174,8 +172,8 @@ src_install() {
 		find examples/ -name 'Makefile' | xargs sed \
 			-r "s:./charmrun:./charmrun ++local:" -i || \
 			die "Failed to fix examples"
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/charm++/*
+		docinto examples
+		dodoc -r examples/charm++/*
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/sys-cluster/charmdebug/Manifest b/sys-cluster/charmdebug/Manifest
index c2834864be75..e6e4cb10e6ba 100644
--- a/sys-cluster/charmdebug/Manifest
+++ b/sys-cluster/charmdebug/Manifest
@@ -1,3 +1,3 @@
 DIST charmdebug_6.2.0.tar.gz 269703 BLAKE2B 1ec530fc1259e5772522aad28aa0e6112c132e297061997b43afdf093adb0a1252bd6b23abee4f2a099935c5c7972e8ddda7ec7c98a3226e1107cea38beeddc8 SHA512 03f894c36d4231381cac22c05bc08b6673c3df23259f44539b8bea5c8e812ce53124e832f0df789c45aa15cfbfb3edb69bc4634c1839cef3b42340b19094f5e2
-EBUILD charmdebug-6.2.0-r1.ebuild 637 BLAKE2B 9d95cf7513d193cfa06424914a6ca156d20dc8344a8792e965c90e1cd2895ad70d036238df06aa06b184a3d7a3c4b4571fe6a1784e2c13a5a58a6b3def4ef0bc SHA512 54537a76b89cff5d9bedb67fcb6b4dc42bb6d23c3740d8968dc43140571761b3a460aa177dd2df8166d2e20dee31fa8f8b7403226b3a404ed4c528bb48801cf8
+EBUILD charmdebug-6.2.0-r1.ebuild 634 BLAKE2B 7ae388a4783b9118d70fd62ad259bd5acacbfa4555b793d47128c383b7a192aeba2d7a7f1b9d5ee2ec0bd08dbed366a701aefea02a650bc4bf66446a6de130aa SHA512 0e35c3bea4e487dd3278d22ae807741623eba0e620d27fdaee173257c19afac1630395ca4df207b3b0e16ccdbd1840ae767b3d426c0cca3e69a8b63845c52664
 MISC metadata.xml 363 BLAKE2B cb9a59d42563980d281a41507415ae9dbbbc9f8cad94d71a271986cc54fe8b9053ced9f02f1c29d819461c33c471c7131bdadbe26ceac4da031ef28e6437afa4 SHA512 49a2f641562ba04ec39effc18cd4a917e6147307f6c780836d60db936b7d38ed9144a816420c00096290ca16256cb5cc88913d481a6e838498ab2ac9775c22d1
diff --git a/sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild b/sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild
index 117b686bf762..6ae34fcc64ae 100644
--- a/sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild
+++ b/sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit java-pkg-2
 
diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index 7f18cbec974c..dc82e7b5a5aa 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -1,7 +1,4 @@
 AUX heartbeat-logd.init 954 BLAKE2B b00280f93cb0a3f3f8f19d3170472e87d705f91113fc7d3fe1d0ecf45cb079673c5777acdc8ed3de63fb64848ce0e33e536f86e7dc74c86eb08e7a32da6e12fa SHA512 ef59ad02a608810750cc0241f4d0eb7584624e419f735e0e69b61c2865b68241e9b90a1d817bb838d744d955d9c67708fb89c36df35b17a0f8ef6243904b32c5
-DIST glue-1.0.11.tar.bz2 466057 BLAKE2B 929c9f803814fb1162d4058e0fb78deb96b6be9b4064dae96ea5653521f5dfb862850ab2c9010530ac652264c5e8e379cb397fc173f720d126540405b264ca5b SHA512 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
 DIST glue-1.0.12.tar.bz2 451569 BLAKE2B c074507563e797f105318bfcfab3e73eb1b62eb3037689c2b68f1b98f02b4a2c1da2e0b2931cd28ccc194d9f3b486733f642c6ff071c4f7629062d40c8d39427 SHA512 d5d2f6c426d2bed0d39269338fedfffe840a90ff56b05dff395243d0d8b803593bf35bbce5f7dce376120cd7ddef78400914cb7515b5451c287a1e9e74233122
-EBUILD cluster-glue-1.0.11.ebuild 2078 BLAKE2B 36377e5f84e8003c8e69a84756a51173de97e73c4a4d88b23db30d3fa9b986327514fa49e1ec5be35755fa9cb5c0c29e9a3879d04e24663859d417fdbe128abd SHA512 9e238976bb00e4a7b729b759725bef282dae2014bd55e424d8a03b889ac9112ca842dbf5704b8fe2eeadb329af410fc17e83aa5741a11569d91ee8321639b4b0
-EBUILD cluster-glue-1.0.12-r1.ebuild 2240 BLAKE2B de1e40f565e52e90b6842b35dd6ac49327073529aeeb31cec7e99ea172f652ef125b06e8d79ad02917d1ca49d8548965653261d8c123a8f2c0a643feadd63fd9 SHA512 6e9058ff4f8523196ec8d2a5282357c4c94d21eb9e790924ebb94754c6a4786b2143fccacbeb219830447bf84d9e62abee287af22692279b3ffb039d06cdce27
-EBUILD cluster-glue-1.0.12.ebuild 2096 BLAKE2B 3a99470b4c90567f6d3732b76b7b72204d0beee5fedd331e98f7b076765304abe7e20e756bfd4e629f0e8dfed549106516e3a9c43926ed62878fb697eaa3405d SHA512 bff597a019175f6d31e973130256a3543c69900e9874f26287305b2885aa13fa8ec693113e276cbe68dfff4b929deef98de0ababf1604ab3cc4ba9b155a1c85f
+EBUILD cluster-glue-1.0.12-r2.ebuild 2183 BLAKE2B dfbb68a8981c6ac1aa4b8d06dd4f5fa6877c8676e942c68dfabdade6ae495dfce68de7d0d018fd2edbf6fe2be7f8f94675685a872b38578a3f93738cb55e0901 SHA512 6ae8641950c8948fb1e633690904ef713fd1599bc83288290230b8a2b468767ebde3992ac6cef24b1d38b4e1d7f8f2e0c8c82f2b1d2b19d51a4ad4d441f2ba96
 MISC metadata.xml 582 BLAKE2B 5792be1499f85328ff85ec074189187e014c2eadf29b4ddaf4a64c71977ccf5ce91d86f251fe90f3540a7cfab8d52145cd5c085199c6e1099df5dbe801fc4291 SHA512 a2312279ff8e3e47db3d1a560699d76233dae3963cc094aefbbe965af053fe4299e95133d5f40aa69a565c91c21ce9d358020726d3c8c590255dcac72901d7e3
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
deleted file mode 100644
index b61d99db6fbe..000000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/cluster-}"
-inherit autotools multilib user
-
-DESCRIPTION="Library pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc libnet static-libs"
-
-RDEPEND="app-arch/bzip2
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/glib:2
-	dev-libs/libaio
-	libnet? ( net-libs/libnet:1.1 )
-	net-misc/curl
-	net-misc/iputils
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
-}
-
-src_prepare() {
-	default
-	sed -e '/ -ggdb3/d' -i configure.ac || die
-	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
-		-i doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
-		--with-daemon-user=hacluster --with-daemon-group=haclient
-}
-
-src_install() {
-	default
-
-	dodir /var/lib/heartbeat/cores
-	dodir /var/lib/heartbeat/lrm
-
-	keepdir /var/lib/heartbeat/cores
-	keepdir /var/lib/heartbeat/lrm
-
-	# init.d file
-	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-logd.init" || die
-# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd
-	rm "${D}"/etc/init.d/logd
-
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r2.ebuild
index e37323b4c22c..c3100b232fb4 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r2.ebuild
@@ -4,11 +4,13 @@
 EAPI=7
 
 MY_P="${P/cluster-}"
-inherit autotools flag-o-matic multilib user
+
+inherit autotools flag-o-matic multilib
 
 DESCRIPTION="Library pack for Heartbeat / Pacemaker"
 HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
 SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
+S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,6 +18,8 @@ KEYWORDS="amd64 ~hppa x86"
 IUSE="doc ipmilan libnet static-libs"
 
 RDEPEND="
+	acct-group/haclient
+	acct-user/hacluster
 	app-arch/bzip2
 	app-text/asciidoc
 	app-text/docbook-xml-dtd:4.4
@@ -29,18 +33,13 @@ RDEPEND="
 	net-misc/iputils
 	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 -1 /var/lib/heartbeat haclient
-}
+	)
+"
 
 src_prepare() {
 	default
@@ -52,20 +51,21 @@ src_prepare() {
 
 src_configure() {
 	append-cppflags -DOPENIPMI_DEFINE_SELECTOR_T
-	local myopts
 
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable ipmilan) \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
+	local myeconfargs=(
+		$(use_enable ipmilan)
+		$(use_enable libnet)
+		$(use_enable static-libs static)
+		$(usex doc '--enable-doc' '')
+		--disable-fatal-warnings
+		--localstatedir=/var
+		--with-ocf-root=/usr/$(get_libdir)/ocf
+		--with-group-id=$(id -g hacluster)
+		--with-ccmuser-id=$(id -u hacluster)
 		--with-daemon-user=hacluster --with-daemon-group=haclient
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -79,7 +79,7 @@ src_install() {
 	sed -i \
 		-e "s:%libdir%:$(get_libdir):" \
 		"${T}/heartbeat-logd.init" || die
-# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd
+	# newinitd "${T}/heartbeat-logd.init" heartbeat-logd
 	rm "${D}"/etc/init.d/logd
 
 	use static-libs || find "${D}" -type f -name "*.la" -delete
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
deleted file mode 100644
index ea054ce70395..000000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/cluster-}"
-inherit autotools multilib user
-
-DESCRIPTION="Library pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc libnet static-libs"
-
-RDEPEND="app-text/asciidoc
-	app-arch/bzip2
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/glib:2
-	dev-libs/libaio
-	libnet? ( net-libs/libnet:1.1 )
-	net-misc/curl
-	net-misc/iputils
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
-}
-
-src_prepare() {
-	default
-	sed -e '/ -ggdb/d' -i configure.ac || die
-	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
-		-i doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
-		--with-daemon-user=hacluster --with-daemon-group=haclient
-}
-
-src_install() {
-	default
-
-	dodir /var/lib/heartbeat/cores
-	dodir /var/lib/heartbeat/lrm
-
-	keepdir /var/lib/heartbeat/cores
-	keepdir /var/lib/heartbeat/lrm
-
-	# init.d file
-	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-logd.init" || die
-# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd
-	rm "${D}"/etc/init.d/logd
-
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 414443615a84..9bd7e38ad5ff 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,8 +1,5 @@
-AUX hpx-1.6.0-cmake.patch 1135 BLAKE2B f8568002d02a86da600e0efa740f0a73a5e01f8cf8cba925fee727d5ff76e7c5d98961aace52a7d8188c88154b294540d5f4c7ab1d2a888026ce9b2a0ec9e27c SHA512 cf93f71e52fd49ca5d1aaaaa128e69f13e8b3808e5ee3a70bba7ce47b4539e6761a56d6a15a6106e825f8c6a9fec36fb4d43ec221a857091972d1d9b0c900dc0
-AUX hpx-1.6.0-docs.patch 4445 BLAKE2B 82d6288d0743b2d512f37e22dda7f33226e76ace62d96dab4b2d78f95cf80ec8cf247952d1632daabd8acd7d5b5f475103b5f924f11e778c70ae138fb100a2d1 SHA512 bc121d3709312cc510547286d4e25002f87659b4eea8de2f2b3247811c02d04fc2d694d1403164e6942e8e6b8090e622f020d41e0100a5349a6c4330a3725702
-AUX hpx-1.6.0-python.patch 1099 BLAKE2B e38ee7c0a724e521f67f2e018e83739db14476126b4a81dbc474537ef350c47fe9cf14cbc8b8e194067098c88034834f70027df1098006486b2c561564ad9313 SHA512 943fdffc0fce180a69a57819a84eed97a335efdfe939e33834cc3ff6485db22760eee80accf1ec63b59872d2352ca100af4445dae5966f7315a43cd8b7ae0d78
-AUX hpx-1.6.0-tests.patch 4965 BLAKE2B dfbc54a24095ce171657185a3f9ee3c1574bd08647397a6be0e80abd9934548bf03e03fd846813ac2067db28ec2349f8a07f7e203292c7710108af4bdf8aee7d SHA512 765295865ee2d5c581c976a36def227361b26d8dfb3262d21956a954a63122722a4160d5c49168b1dcea1703e60bedc4e7bade5d44bf2fe1a159827327a9b606
-DIST hpx-1.6.0.tar.gz 4596486 BLAKE2B e19d88d70d3dec45536b4f174bc1bae49285bde3db37517381071bec318748913ff239c66f02acb15451dc2f38a7799e9424fc5269851478b33da81654bd6c16 SHA512 cd717db3812fc26117d72c8afa654972b16f7059d8e6965484edd938788f3369fcd5ca791eee80e803703d6f3c39b3a3cd0525ab9f58ff1312e1b49f06ce67bc
-EBUILD hpx-1.6.0.ebuild 2613 BLAKE2B d359f8307fa633ce2dd23ead6ebc0280548761c5f44ed9dcfd6520e0312678e831a4ad9b0c506c578a95f621ca10bcf57977027e77e3d45c079b1638bc589451 SHA512 7857998bea3fecaee3014a6c472a043362c3045b66653a14f9e09b2bac3964810ceb300fb06c73dc251fc1d1779dd01efc4255c916467375f5c41d2defb290a8
-EBUILD hpx-9999.ebuild 2479 BLAKE2B b231c4bd3c31aabe377d3eaac23233c6d52e589e08fe332ddacd88919de691e019bd9408ae25683623caf2f03b433f94fa8f1b201975e03e228964df0b0d37d4 SHA512 693efe1598700f659a804f89993a92acaf563cc378ae9c6a1753aa6470493e78767b8c1554bc5bb2eb2b9ebcdd7460aef0372e897c50126f12472b1a33098fdb
+AUX hpx-1.7.0-python.patch 873 BLAKE2B 825d41a28c2e97633d9dfbdb5efd2d2a2d92f7a064c92d709391f672dae7e01b14de8e60b9aed3b6dd72ec07f17ebd78831e35b76c3e57808d58c3d4cf1ffe11 SHA512 ce200541f91642a44a2d5c019e822fe2bc358bf6d9e362b75d2713c651a01aed07a6c46e8ca571d49b805c1bcadd6aa7eb39ad0e65e201d18d02c9884683818b
+DIST hpx-1.7.0.tar.gz 4729879 BLAKE2B 05be1461eb0867b690a8f34a7ddf46d4fa19e05b5666df6cf5a3dfd28fa6a6ecacf6305bf2eaa42a669f18264b61c9690988695b8748ba09a27011001b543952 SHA512 052b3278710d8047c8e0e0979a668aa5161c495fcd12b089dd5039c64bd414b4ec0b96dfcd414d68e0db5b31c360dffb84374413c53794f37ce77d9cabc89518
+EBUILD hpx-1.7.0.ebuild 2212 BLAKE2B a576d3f1c6a5ddbe1e6206e0a32ceed4eb11c485e6bc1ed87c34db13dace98239abdf3c473b343885ee66d341d0924eafc518e0f1825d383ea018670019f754c SHA512 b9c1eff106beae95826d1c27d2243b72cb9aef80be2463fa25472a675da8aeb23bd55a306b85a59eea0861f8938482ac1782ac4d831407224f7dbd3ddd6cd72f
+EBUILD hpx-9999.ebuild 2166 BLAKE2B 140771daafdbe48c992eac7c0672112ed738e7f71a8e837e5cf9a329adbd9ff026af6f3cba0e68f318f859500a8675f74d0384882eb2a584ae50c4dea80e08d7 SHA512 177ac7e60273d1b0a7eddb115f2ac5acd40c703bd3899f6dfa4bf69953bd1d8f68dc606615edd1cf9cdb7623f6403521d18bea79d25a2a00b9252df45ce78da2
 MISC metadata.xml 1219 BLAKE2B de2e75ab303cc78d91a327e4887bcb312095757503a93ecd646abbc7e8e44c9d9872768bdc5bdd8200894d904e6306cd6540edf5579a64e686ceed9694701715 SHA512 d696bba0202c159da2a1b887cb66838f1a967a0053ebce6d131dd3dc670a69cf6313ca027a3e2fe9f7c302fbcd1cafb1b3ffe7b057b8d268056640c44b2e3776
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch b/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch
deleted file mode 100644
index 646084e77294..000000000000
--- a/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 240f55e4bc57215e26fc0b0ae0ac0eca2eb93d65 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Sat, 19 Sep 2020 13:19:42 +0200
-Subject: [PATCH 2/3] tests: Remove unused cmake options
-
-This fixes the following warnings:
-
-| * One or more CMake variables were not used by the project:
-| *   BOOST_ROOT
-| *   SETUP_TYPE
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- tests/unit/build/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/unit/build/CMakeLists.txt b/tests/unit/build/CMakeLists.txt
-index 3798549da0a8..7d3bfea1044e 100644
---- a/tests/unit/build/CMakeLists.txt
-+++ b/tests/unit/build/CMakeLists.txt
-@@ -54,7 +54,7 @@ function(create_cmake_test name using_install_dir hpx_dir setup_type test_dir)
-     ${name}.make_configure
-     COMMAND
-       "${CMAKE_COMMAND}" -E chdir "${build_dir}" "${CMAKE_COMMAND}" ${test_dir}
--      -DHPX_DIR=${hpx_dir} -DBOOST_ROOT=${BOOST_ROOT}
-+      -DHPX_DIR=${hpx_dir}
-       ${ADDITIONAL_CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS_SAFE}
-       -DCMAKE_BUILD_TYPE=$<CONFIGURATION>
-     VERBATIM
--- 
-2.30.1
-
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-docs.patch b/sys-cluster/hpx/files/hpx-1.6.0-docs.patch
deleted file mode 100644
index 3823bab918bd..000000000000
--- a/sys-cluster/hpx/files/hpx-1.6.0-docs.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 1de9f65fac6c4b65ff280501d60b9b6dd46c6a8c Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Mon, 22 Feb 2021 20:36:14 +0100
-Subject: [PATCH 3/3] static_reinit: Remove export macro
-
-This macro leads to doc generation fail:
-
-|/home/kurt/git/hpx/build/docs/sphinx/libs/static_reinit/api.rst:29: WARNING:cpp:identifier reference target not found: HPX_EXPORT_REINITIALIZABLE_STATIC
-
-... and it results in an exception in sphinx:
-
-|Traceback (most recent call last):
-|  File "/usr/lib/python3.7/site-packages/sphinx/cmd/build.py", line 280, in build_main
-|    app.build(args.force_all, filenames)
-|  File "/usr/lib/python3.7/site-packages/sphinx/application.py", line 348, in build
-|    self.builder.build_update()
-|  File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 299, in build_update
-|    len(to_build))
-|  File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 361, in build
-|    self.write(docnames, list(updated_docnames), method)
-|  File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 535, in write
-|    self._write_serial(sorted(docnames))
-|  File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 542, in _write_serial
-|    doctree = self.env.get_and_resolve_doctree(docname, self)
-|  File "/usr/lib/python3.7/site-packages/sphinx/environment/__init__.py", line 539, in get_and_resolve_doctree
-|    self.apply_post_transforms(doctree, docname)
-|  File "/usr/lib/python3.7/site-packages/sphinx/environment/__init__.py", line 585, in apply_post_transforms
-|    transformer.apply_transforms()
-|  File "/usr/lib/python3.7/site-packages/sphinx/transforms/__init__.py", line 87, in apply_transforms
-|    super().apply_transforms()
-|  File "/usr/lib/python3.7/site-packages/docutils/transforms/__init__.py", line 171, in apply_transforms
-|    transform.apply(**kwargs)
-|  File "/usr/lib/python3.7/site-packages/sphinx/transforms/post_transforms/__init__.py", line 44, in apply
-|    self.run(**kwargs)
-|  File "/usr/lib/python3.7/site-packages/sphinx/transforms/post_transforms/__init__.py", line 88, in run
-|    typ, target, node, contnode)
-|  File "/usr/lib/python3.7/site-packages/sphinx/domains/cpp.py", line 7502, in resolve_xref
-|    target, node, contnode)[0]
-|  File "/usr/lib/python3.7/site-packages/sphinx/domains/cpp.py", line 7375, in _resolve_xref_inner
-|    assert parentSymbol  # should be there
-|AssertionError
-
-Actually the macro is not needed. So, just remove it until sphinx is fixed.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- .../hpx/static_reinit/reinitializable_static.hpp   | 14 ++------------
- 1 file changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp b/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
-index 51ccbf2481b2..b8661d1c84cb 100644
---- a/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
-+++ b/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
-@@ -18,14 +18,6 @@
- #include <mutex>
- #include <type_traits>
- 
--// clang-format off
--#if !defined(HPX_WINDOWS)
--#  define HPX_EXPORT_REINITIALIZABLE_STATIC HPX_CORE_EXPORT
--#else
--#  define HPX_EXPORT_REINITIALIZABLE_STATIC
--#endif
--// clang-format on
--
- namespace hpx { namespace util {
-     ///////////////////////////////////////////////////////////////////////////
-     //  Provides thread-safe initialization of a single static instance of T.
-@@ -40,11 +32,11 @@ namespace hpx { namespace util {
-     //  functions used by the HPX runtime system to reinitialize the held data
-     //  structures.
-     template <typename T, typename Tag = T, std::size_t N = 1>
--    struct HPX_EXPORT_REINITIALIZABLE_STATIC reinitializable_static;
-+    struct HPX_EXPORT reinitializable_static;
- 
-     //////////////////////////////////////////////////////////////////////////
-     template <typename T, typename Tag, std::size_t N>
--    struct HPX_EXPORT_REINITIALIZABLE_STATIC reinitializable_static
-+    struct HPX_EXPORT reinitializable_static
-     {
-     public:
-         HPX_NON_COPYABLE(reinitializable_static);
-@@ -160,5 +152,3 @@ namespace hpx { namespace util {
-     template <typename T, typename Tag, std::size_t N>
-     std::once_flag reinitializable_static<T, Tag, N>::constructed_;
- }}    // namespace hpx::util
--
--#undef HPX_EXPORT_REINITIALIZABLE_STATIC
--- 
-2.30.1
-
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-tests.patch b/sys-cluster/hpx/files/hpx-1.6.0-tests.patch
deleted file mode 100644
index 8a6884a57a1b..000000000000
--- a/sys-cluster/hpx/files/hpx-1.6.0-tests.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From e350546da5caee062684548b6727f4cb67981b7e Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Fri, 26 Feb 2021 18:28:14 +0100
-Subject: [PATCH] test: Disable failing tests
-
-The following tests fail within portage:
-
-|199 - tests.unit.modules.async_mpi.mpi_ring_async_executor (Timeout)
-|250 - tests.unit.modules.compute.numa_allocator (Failed)
-|268 - tests.regressions.modules.performance_counters.dynamic_counters_loaded_1508 (Failed)
-|318 - tests.unit.modules.segmented_algorithms.distributed.tcp.partitioned_vector_adjacent_find2
-|967 - tests.unit.parcelset.distributed.mpi.put_parcels_with_coalescing (Timeout)
-|968 - tests.unit.parcelset.distributed.tcp.put_parcels_with_coalescing (Failed)
-
-Disable them.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- libs/full/async_mpi/tests/unit/CMakeLists.txt      |  2 +-
- libs/full/compute/tests/unit/CMakeLists.txt        |  6 +++---
- .../tests/regressions/CMakeLists.txt               |  8 ++++----
- .../segmented_algorithms/tests/unit/CMakeLists.txt |  2 +-
- tests/unit/parcelset/CMakeLists.txt                | 14 +++++++-------
- 5 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/libs/full/async_mpi/tests/unit/CMakeLists.txt b/libs/full/async_mpi/tests/unit/CMakeLists.txt
-index 8f2d77fc3567..9cd7d39597b3 100644
---- a/libs/full/async_mpi/tests/unit/CMakeLists.txt
-+++ b/libs/full/async_mpi/tests/unit/CMakeLists.txt
-@@ -4,7 +4,7 @@
- # Distributed under the Boost Software License, Version 1.0. (See accompanying
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
--set(tests mpi_ring_async_executor)
-+# set(tests mpi_ring_async_executor)
- 
- set(mpi_ring_async_executor_PARAMETERS THREADS_PER_LOCALITY 4 LOCALITIES 2
-                                        RUNWRAPPER mpi
-diff --git a/libs/full/compute/tests/unit/CMakeLists.txt b/libs/full/compute/tests/unit/CMakeLists.txt
-index 7c700d5ae639..c655772234b8 100644
---- a/libs/full/compute/tests/unit/CMakeLists.txt
-+++ b/libs/full/compute/tests/unit/CMakeLists.txt
-@@ -7,9 +7,9 @@
- 
- set(tests block_allocator)
- 
--if(HPX_WITH_DISTRIBUTED_RUNTIME AND HPX_WITH_SHARED_PRIORITY_SCHEDULER)
--  set(tests ${tests} numa_allocator)
--endif()
-+# if(HPX_WITH_DISTRIBUTED_RUNTIME AND HPX_WITH_SHARED_PRIORITY_SCHEDULER)
-+#   set(tests ${tests} numa_allocator)
-+# endif()
- 
- # NB. threads = -2 = threads = 'cores' NB. threads = -1 = threads = 'all'
- set(numa_allocator_PARAMETERS
-diff --git a/libs/full/performance_counters/tests/regressions/CMakeLists.txt b/libs/full/performance_counters/tests/regressions/CMakeLists.txt
-index 9939ef701e3b..f0647b27a2dc 100644
---- a/libs/full/performance_counters/tests/regressions/CMakeLists.txt
-+++ b/libs/full/performance_counters/tests/regressions/CMakeLists.txt
-@@ -7,10 +7,10 @@
- 
- set(tests discover_counters_1787 statistics_2666 uptime_1737)
- 
--if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
--  set(tests ${tests} dynamic_counters_loaded_1508)
--  set(dynamic_counters_loaded_1508_FLAGS DEPENDENCIES memory_component)
--endif()
-+# if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+#   set(tests ${tests} dynamic_counters_loaded_1508)
-+#   set(dynamic_counters_loaded_1508_FLAGS DEPENDENCIES memory_component)
-+# endif()
- 
- foreach(test ${tests})
-   set(sources ${test}.cpp)
-diff --git a/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt b/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt
-index 7cfd7e596de5..b35c1de7ac94 100644
---- a/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt
-+++ b/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt
-@@ -8,7 +8,7 @@ set(tests
-     partitioned_vector_adjacent_difference1
-     partitioned_vector_adjacent_difference2
-     partitioned_vector_adjacent_find1
--    partitioned_vector_adjacent_find2
-+    # partitioned_vector_adjacent_find2
-     partitioned_vector_all_of1
-     partitioned_vector_all_of2
-     partitioned_vector_any_of1
-diff --git a/tests/unit/parcelset/CMakeLists.txt b/tests/unit/parcelset/CMakeLists.txt
-index 1981e2baf8cd..b374292ceee7 100644
---- a/tests/unit/parcelset/CMakeLists.txt
-+++ b/tests/unit/parcelset/CMakeLists.txt
-@@ -12,13 +12,13 @@ set(put_parcels_PARAMETERS LOCALITIES 2)
- set(put_parcels_FLAGS DEPENDENCIES iostreams_component)
- set(set_parcel_write_handler_PARAMETERS LOCALITIES 2)
- 
--if(HPX_WITH_PARCEL_COALESCING)
--  set(tests ${tests} put_parcels_with_coalescing)
--  set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2)
--  set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component
--                                        parcel_coalescing
--  )
--endif()
-+# if(HPX_WITH_PARCEL_COALESCING)
-+#   set(tests ${tests} put_parcels_with_coalescing)
-+#   set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2)
-+#   set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component
-+#                                         parcel_coalescing
-+#   )
-+# endif()
- 
- if(HPX_WITH_COMPRESSION_BZIP2
-    OR HPX_WITH_COMPRESSION_ZLIB
--- 
-2.30.1
-
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-python.patch b/sys-cluster/hpx/files/hpx-1.7.0-python.patch
index 412e7289bc5b..21b7ce3ceeff 100644
--- a/sys-cluster/hpx/files/hpx-1.6.0-python.patch
+++ b/sys-cluster/hpx/files/hpx-1.7.0-python.patch
@@ -1,19 +1,17 @@
 From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001
 From: Kurt Kanzenbach <kurt@kmk-computers.de>
 Date: Tue, 17 Mar 2020 16:20:35 +0100
-Subject: [PATCH 1/3] cmake: python: Use standard python interpreter
+Subject: [PATCH 1/4] cmake: python: Use standard python interpreter
 
 These scripts are needed during build and run time. So, use a python interpreter
 which works for both cases.
 
 Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
 ---
- cmake/templates/hpxcxx.in    | 2 +-
- cmake/templates/hpxrun.py.in | 2 +-
+ cmake/templates/hpxcxx.in    |    2 +-
+ cmake/templates/hpxrun.py.in |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/cmake/templates/hpxcxx.in b/cmake/templates/hpxcxx.in
-index 81f38f89367d..a0fd7837b066 100755
 --- a/cmake/templates/hpxcxx.in
 +++ b/cmake/templates/hpxcxx.in
 @@ -1,4 +1,4 @@
@@ -22,8 +20,6 @@ index 81f38f89367d..a0fd7837b066 100755
  #
  # Copyright (c) 2014 Steven R. Brandt
  #
-diff --git a/cmake/templates/hpxrun.py.in b/cmake/templates/hpxrun.py.in
-index 60e59cc118d9..0c32bba98917 100755
 --- a/cmake/templates/hpxrun.py.in
 +++ b/cmake/templates/hpxrun.py.in
 @@ -1,4 +1,4 @@
@@ -32,6 +28,3 @@ index 60e59cc118d9..0c32bba98917 100755
  #
  # Copyright (c) 2014 Thomas Heller
  #
--- 
-2.30.1
-
diff --git a/sys-cluster/hpx/hpx-1.6.0.ebuild b/sys-cluster/hpx/hpx-1.7.0.ebuild
index e5e15ce69bc6..2ab8ea741f30 100644
--- a/sys-cluster/hpx/hpx-1.6.0.ebuild
+++ b/sys-cluster/hpx/hpx-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -19,8 +19,9 @@ HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
 
 SLOT="0"
 LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc mpi papi +perftools tbb test"
-RESTRICT="!test? ( test )"
+IUSE="examples jemalloc mpi papi +perftools tbb"
+# tests fail to compile
+RESTRICT="test"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -29,22 +30,14 @@ REQUIRED_USE="
 
 BDEPEND="
 	virtual/pkgconfig
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
-			dev-python/breathe[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	test? ( ${PYTHON_DEPS} )
 "
 RDEPEND="
 	${PYTHON_DEPS}
+	dev-cpp/asio
 	dev-libs/boost:=
 	sys-apps/hwloc
 	sys-libs/zlib
+	jemalloc? ( dev-libs/jemalloc )
 	mpi? ( virtual/mpi )
 	papi? ( dev-libs/papi )
 	perftools? ( dev-util/google-perftools )
@@ -53,10 +46,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-docs.patch"
 	"${FILESDIR}/${P}-python.patch"
-	"${FILESDIR}/${P}-tests.patch"
 )
 
 hpx_memory_requirement() {
@@ -84,11 +74,11 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DHPX_WITH_EXAMPLES=OFF
-		-DHPX_WITH_DOCUMENTATION=$(usex doc)
+		-DHPX_WITH_DOCUMENTATION=OFF
 		-DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
 		-DHPX_WITH_PAPI=$(usex papi)
 		-DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
-		-DBUILD_TESTING=$(usex test)
+		-DBUILD_TESTING=OFF
 	)
 	if use jemalloc; then
 		mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc )
@@ -105,12 +95,6 @@ src_configure() {
 
 src_compile() {
 	cmake_src_compile
-	use test && cmake_build tests
-}
-
-src_test() {
-	# avoid over-suscribing
-	cmake_src_test -j1
 }
 
 src_install() {
diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild
index 93a9bd8f1bd3..7f80474d33a5 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.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=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -19,8 +19,9 @@ HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
 
 SLOT="0"
 LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc mpi papi +perftools tbb test"
-RESTRICT="!test? ( test )"
+IUSE="examples jemalloc mpi papi +perftools tbb"
+# tests fail to compile
+RESTRICT="test"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -29,22 +30,14 @@ REQUIRED_USE="
 
 BDEPEND="
 	virtual/pkgconfig
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/breathe-4.22[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	test? ( ${PYTHON_DEPS} )
 "
 RDEPEND="
 	${PYTHON_DEPS}
+	dev-cpp/asio
 	dev-libs/boost:=
 	sys-apps/hwloc
 	sys-libs/zlib
+	jemalloc? ( dev-libs/jemalloc )
 	mpi? ( virtual/mpi )
 	papi? ( dev-libs/papi )
 	perftools? ( dev-util/google-perftools )
@@ -77,11 +70,11 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DHPX_WITH_EXAMPLES=OFF
-		-DHPX_WITH_DOCUMENTATION=$(usex doc)
+		-DHPX_WITH_DOCUMENTATION=OFF
 		-DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
 		-DHPX_WITH_PAPI=$(usex papi)
 		-DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
-		-DBUILD_TESTING=$(usex test)
+		-DBUILD_TESTING=OFF
 	)
 	if use jemalloc; then
 		mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc )
@@ -98,12 +91,6 @@ src_configure() {
 
 src_compile() {
 	cmake_src_compile
-	use test && cmake_build tests
-}
-
-src_test() {
-	# avoid over-suscribing
-	cmake_src_test -j1
 }
 
 src_install() {
diff --git a/sys-cluster/libquo/Manifest b/sys-cluster/libquo/Manifest
index 6bcb1d57772b..7e8716eba592 100644
--- a/sys-cluster/libquo/Manifest
+++ b/sys-cluster/libquo/Manifest
@@ -1,4 +1,4 @@
-DIST libquo-1.2.9.tar.gz 788507 BLAKE2B c6240ea265dfc34fd02b04f5ff9dcfa194c82789d3caa9553eb65ad25e9e883dfd320d4b095693b88778e74cbd11c207bcc9c5c133f03ec5a25e7c633853cd0d SHA512 732a737b9d53ca7b530ae5ecfd79cc9200f86e6a39f4c529975b204631165a178f6bb87228985222bf623f2581ecc29c774e8480ce9ebfcace12e14c49f98e62
-EBUILD libquo-1.2.9.ebuild 748 BLAKE2B b72c7d2128efa255d527b50bf8f83ef108d7373947d9be889e01abb959f0d6dd82c22b50e2bc8f5f0efe08f85ed17e7cb517a16df8b4542283ff0dc839db0309 SHA512 aa39f78529087c644e05b72c6003530e761c21c83c86ac55dbdd7994e895fac73be0f31735e7687bf286d9e36c139fe62c59cc7169f3908c61f8e31c8c82661e
-EBUILD libquo-9999.ebuild 797 BLAKE2B 3f0cda11e4ed46cea03cef462c99ba5151e26b6869077d1015629e1d67b8665f7194f93ded85dca04dae7c6dba24e8885d0c35ae95c47c889457c49911c7baca SHA512 6c6e659fa9f7595a3750abdaaef7884eb57eb33d26d8a2d57c11636e213c8f273f4d6e80548d8966ed3ff86c0aa804210c9b23c1c37ed5e541247a4bfa9f4829
+DIST libquo-1.3.1.tar.gz 1020369 BLAKE2B d7c3906e1211239a1329fd17799b45441bdf45e252ba57d13e4faece8d89b5964c558ab5b71295541d76568fea7530f868f82979998402533506c8eaf6485229 SHA512 02ab71f0c35a143b4be1960cebef23fcfd2ad7cc81edfd917d09482662ba3993045434c623caf19cf2983b3790ebc0e53bba7d9895b089eadaf39589ddff1579
+EBUILD libquo-1.3.1.ebuild 797 BLAKE2B d0a6c0041957f2558d2b21c916c0b59cd7c10138ed157df5cc85136bb8e0092414394327e25281e6d3a4205fe095e1941e49898f3204e153a9cfa5d23e771c77 SHA512 394ab7af05b6cb84051e0193d5075f970bdefa9f96881dc52e2bf03673df21e4400fae5db8e2b8c07fd0ceaf726d5f8ed02552dcb80ffefa9d81ae51ae3fdd13
+EBUILD libquo-9999.ebuild 797 BLAKE2B d0a6c0041957f2558d2b21c916c0b59cd7c10138ed157df5cc85136bb8e0092414394327e25281e6d3a4205fe095e1941e49898f3204e153a9cfa5d23e771c77 SHA512 394ab7af05b6cb84051e0193d5075f970bdefa9f96881dc52e2bf03673df21e4400fae5db8e2b8c07fd0ceaf726d5f8ed02552dcb80ffefa9d81ae51ae3fdd13
 MISC metadata.xml 443 BLAKE2B 0473c666449ae5b5d1175a18ad8a014cba768c751a3f77027f227a1d1c59a061b06d0f25609297c3a7291d6fb80ed7a773043f04acc875a7f5d86510f99a54e1 SHA512 24f513273a47dfe443e18a9be97a710d523353daa131ea686de70ec13780d89c64bd7019ad83cf8aec8eeb1c63cd9cd3073cc86cdc27cfd361c5bc9197dba611
diff --git a/sys-cluster/libquo/libquo-1.2.9.ebuild b/sys-cluster/libquo/libquo-1.3.1.ebuild
index 9fec47663d07..04abe2b0571d 100644
--- a/sys-cluster/libquo/libquo-1.2.9.ebuild
+++ b/sys-cluster/libquo/libquo-1.3.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD=90
@@ -10,14 +10,13 @@ inherit fortran-2
 
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/lanl/${PN}.git"
-	inherit git-r3
-	AUTOTOOLS_AUTORECONF=1
+	inherit autotools git-r3
 else
 	SRC_URI="https://lanl.github.io/${PN}/dists/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
-DESCRIPTION="run-time tuning of process binding policies made easy"
+DESCRIPTION="Run-time tuning of process binding policies made easy"
 HOMEPAGE="https://lanl.github.io/libquo/"
 
 LICENSE="BSD"
@@ -32,6 +31,11 @@ DEPEND="
 	"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	default
+	[[ ${PV} = 9999 ]] && eautoreconf
+}
+
 src_configure() {
 	econf CC=mpicc FC=$(usex fortran mpif90 false)
 }
diff --git a/sys-cluster/libquo/libquo-9999.ebuild b/sys-cluster/libquo/libquo-9999.ebuild
index d63aea6b63ed..04abe2b0571d 100644
--- a/sys-cluster/libquo/libquo-9999.ebuild
+++ b/sys-cluster/libquo/libquo-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD=90
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-DESCRIPTION="run-time tuning of process binding policies made easy"
+DESCRIPTION="Run-time tuning of process binding policies made easy"
 HOMEPAGE="https://lanl.github.io/libquo/"
 
 LICENSE="BSD"
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 86b33f8fe4e3..11ebc43fa85f 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -7,12 +7,12 @@ DIST rdma-core-31.0.tar.gz 1501133 BLAKE2B 5e67d68ab8eb4019ffb18e7d1995caa8e84a2
 DIST rdma-core-32.0.tar.gz 1525119 BLAKE2B 8f754c04be3f13a90a162fde09f96b26d66534aa7284c12e6c0765390f00412cf34052cc1c313f01df8b8bc49cad459a72350cea6e08316387cd6016fd7cb019 SHA512 fbc458e47801b8869fa0a6a045c2ecf10b9021f8fe115cedad8601a4672f116f393a353dcac238ad297935950a09be4a6faa45e373ea6248711d077a57737c16
 DIST rdma-core-33.0.tar.gz 1549162 BLAKE2B 7b7c8711eaeb9e66159962bcf0f70644cbb4af96df70f3c9ee6e9d9c8c3e4de5d3248666a0b3fe490537f91cc18c5d09448c72b98c45585e0645594deedee071 SHA512 64ace358c6336519131aea858012e22791bf2ab95f06d655a87835361b5822f5ce0c29db8ddb83121a62f4606418d5fa11358e7ad84da4f93f6233fb3947e52c
 DIST rdma-core-34.0.tar.gz 1571236 BLAKE2B 1c6799ba742926ef99f8fa7a0e20d7b910e0f3157e5de4350f7068d7d6f4fa79b8fa6be631e9675517bd12b91083c5e92157a1c097691ead0888823702c3583a SHA512 33ce5fbf0d468a31f7ac0e513cf107e3d730f5db279368aa986536f70d684f40e7bacdf965d18b77922272b0420a6cd973c0b73371758107d8f7751be5851ee7
-EBUILD rdma-core-30.0-r2.ebuild 2612 BLAKE2B ac5fd647c8e3d284c3740d49c6ce3be1b67b3c03901140a3154f0e77cb4636b32e4f67df92b7fdd2ee9ce3b0c052eed2874dda9b2804008f5fb3ce3f52a18c5e SHA512 e9d13c3d92a8472de4e3ceca7d528cba38c0e2d324c502701b3e82e5b3e317d843b92aa381b0167b801ffffc5315fe9383cfbeadd72a88bfe9212d6899191e7a
-EBUILD rdma-core-31.0.ebuild 2619 BLAKE2B 2563779f64b2378d87cb5df47d7f3074b01b43339e2c7c6e93169204084dad5007247370d43423c3e6cac087dfba158b32fec71a1ce0ef199ddc556bdbccae24 SHA512 5c825e8d8b16be6e7580c17db834c8fe24d84b44a1c1b8d6204ff84070883cf2944d0e1497539d880148bb246430c2ade0ec9dd7c50227c1441dcec34c8e768d
-EBUILD rdma-core-32.0-r1.ebuild 2620 BLAKE2B d875ab3d3fe649f623868e503e28f535ad7f807395525220bce59ff88f23a69bfd62a714bee5f3622cd2f5598b2169ebbe44e15a47b4b58cee377aee933e8781 SHA512 95b564f900b303fcb5e653b36d3b63f265eacb2efe0b3adc629eb25fc59e2e2ac94d0d907fb4ce5dc5d730537359b8d5626727c0b5c1461a300fa0e6cd410487
-EBUILD rdma-core-32.0.ebuild 2618 BLAKE2B 71aa52d7b976db1818d97b0a7f4ad26d690b7d41712eaa5cea4815682c7fb2d967bbbf6110cf225269f2de4f08d5b2252d3f9a4a4c078c39e1cbe7948661ded8 SHA512 4dd03f4ccb4e215b8824dfb5a6a0cf403eaf75de391d9773e1cc19793e77b1f4a6003bdf759106a3fddd6828b0f01febfcd33a826b163581b59428464b328158
-EBUILD rdma-core-33.0-r1.ebuild 2619 BLAKE2B bc6af816ec30372d50ea5d9c37842b6e8e5a6eb5cfb38a10632c500c1f7662382d6b3baa33ff9fa6bbc43f639852d5814462616e8e3aa6a8c7b7b2352142e5e0 SHA512 31620a498137e0ae17f6142f3fdac394c0a6e8d7e4474ffe412aefd593be31fe858b89aeb3a0372b8edaeca9d202226a1abb3338f765ed5f3bdfb440f54c2de9
-EBUILD rdma-core-33.0.ebuild 2619 BLAKE2B 2563779f64b2378d87cb5df47d7f3074b01b43339e2c7c6e93169204084dad5007247370d43423c3e6cac087dfba158b32fec71a1ce0ef199ddc556bdbccae24 SHA512 5c825e8d8b16be6e7580c17db834c8fe24d84b44a1c1b8d6204ff84070883cf2944d0e1497539d880148bb246430c2ade0ec9dd7c50227c1441dcec34c8e768d
-EBUILD rdma-core-34.0.ebuild 2619 BLAKE2B bc6af816ec30372d50ea5d9c37842b6e8e5a6eb5cfb38a10632c500c1f7662382d6b3baa33ff9fa6bbc43f639852d5814462616e8e3aa6a8c7b7b2352142e5e0 SHA512 31620a498137e0ae17f6142f3fdac394c0a6e8d7e4474ffe412aefd593be31fe858b89aeb3a0372b8edaeca9d202226a1abb3338f765ed5f3bdfb440f54c2de9
-EBUILD rdma-core-9999.ebuild 2618 BLAKE2B ab7c9bff79ab80e1e767080dae7418b2a03f1bb267d5edf456078ea2aefe3e6f2b2fbe7e1462350d1ca70aa18022458b3014461d7175758f4f6242072dde5554 SHA512 d7e6e05f41b840d8e61459280483bb93ce0a7790f6a829f2267b6a76f4372916f0c200fb235af727b99cbda8fdff6e222a16f7f39cc8c717d826094d40f347f9
+EBUILD rdma-core-30.0-r2.ebuild 2602 BLAKE2B 8e5974940353bddc406142c15e3adfad07b4706d8196a194dd35ce9381c4e7b4e394de4f59d16f5ead5087a0db466d1c54ab17f55aff5ee759c645219636a34f SHA512 590d01af90cb6d5fff462a264e8d2688599ea190dc5f2f425189be316509d51a20c4035c7ac00dfc5e79d47a1e176ab914fe8f6ff0bafa618311cb3d58b3e985
+EBUILD rdma-core-31.0.ebuild 2609 BLAKE2B d8f57482d3ae5100a0bb6a70974df3fb91fb74e8945e4723206609322eb6ce3fd7a3a3505c2f40e98f64db65172e99d81101c3176e824eb370ce9578d8dfb939 SHA512 d6fe683f174cc3fd271081e3a9efc3e8d88127962fabe5e55ab0d5f38403cebeb4cb6b211a1552d36632515086b07bed08b19c95b17b8fb632c25b76676b04c1
+EBUILD rdma-core-32.0-r1.ebuild 2610 BLAKE2B af8b426ce6be058696ba668464734e3577987370a0cf9bd33f047c3dc3d54e09e01cde49b75ae100ae555b03dc7fe79901010e5cdf2d5dc9b57e86915b9b4be6 SHA512 44478c203f8bb06c7762c034f44e419d29897cca9107f2d4a24e2191a519aad042564affd4ec79907c613f9e21558507dde06a4380eebb888d1e824d99bf919a
+EBUILD rdma-core-32.0.ebuild 2608 BLAKE2B 235855c21f120e74a1367f5c564cb46991833cb248626c4fda210b46ed5d4965e38944c7b0e3f81951edbb09e1f3a7fc102be0869dc5b9039e96c7efd394446b SHA512 5b9b743e72f2b55570ec6ad6423dbe740322ef277b3380c41fd35e0c10b082b16a6f20a399d8d82b3c84eb443ea82731960097c68eac3aab474dcd865d09c9a0
+EBUILD rdma-core-33.0-r1.ebuild 2609 BLAKE2B 77e5b645f78c21892a1bc732119bafc31464fef1babe9756a90404d239fdea9212b7ce85578d46c616db60dbfbb38dc8c046eb944f92c1dbe2be4a6cd5603d54 SHA512 4bd352e52d03598b10a9aab90adf4078f1d814f34a1734d7918776902c15cda2ae80ea6302ec0dafdb0cd36ebd8939c70aff0fface1fb241654b2409ad1df5d1
+EBUILD rdma-core-33.0.ebuild 2609 BLAKE2B d8f57482d3ae5100a0bb6a70974df3fb91fb74e8945e4723206609322eb6ce3fd7a3a3505c2f40e98f64db65172e99d81101c3176e824eb370ce9578d8dfb939 SHA512 d6fe683f174cc3fd271081e3a9efc3e8d88127962fabe5e55ab0d5f38403cebeb4cb6b211a1552d36632515086b07bed08b19c95b17b8fb632c25b76676b04c1
+EBUILD rdma-core-34.0.ebuild 2609 BLAKE2B 77e5b645f78c21892a1bc732119bafc31464fef1babe9756a90404d239fdea9212b7ce85578d46c616db60dbfbb38dc8c046eb944f92c1dbe2be4a6cd5603d54 SHA512 4bd352e52d03598b10a9aab90adf4078f1d814f34a1734d7918776902c15cda2ae80ea6302ec0dafdb0cd36ebd8939c70aff0fface1fb241654b2409ad1df5d1
+EBUILD rdma-core-9999.ebuild 2608 BLAKE2B 2693dc295b8f2c8f7217d4837341704dfeb3f20cb77756cd7c09d5d7ddea1af3113656842606afd1531f2164518f60125c05907e7430486ea379db4b642cab64 SHA512 f3c011c46112b4fbbaf492ebfccd02627878ae68e7645b52122fd8e0acf15bf578b5ee6ec5c75604143e2b298fc876e34e1b3977d0ecfc69607f588b0835eeb3
 MISC metadata.xml 559 BLAKE2B 1526777511ab5118d4de73361959107221858659ebbc60f52eb09b45d0798d969f847e4f157501ed6e8c85c2cee1c93d0b26989b357141bba45af946e2e5b0a1 SHA512 5d69acf3d0a323c0d2ee66971fd058c6c0ebf59e4fac0d4777b15bfcc7db8f515b67e6059d204346404ce3b26cdd77c2bea21e1132f418498fe1523eb16dccbb
diff --git a/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild b/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
index ce83f105d8b7..8e0eb47b56e5 100644
--- a/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-31.0.ebuild b/sys-cluster/rdma-core/rdma-core-31.0.ebuild
index de6187a84feb..de6cba3f608f 100644
--- a/sys-cluster/rdma-core/rdma-core-31.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-31.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild
index ce3ac942f512..1be58becd2dc 100644
--- a/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-32.0.ebuild b/sys-cluster/rdma-core/rdma-core-32.0.ebuild
index 0eb085a071bc..978a54169e3f 100644
--- a/sys-cluster/rdma-core/rdma-core-32.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-32.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild
index 2eed6260b0d3..34e0711a9344 100644
--- a/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-33.0.ebuild b/sys-cluster/rdma-core/rdma-core-33.0.ebuild
index de6187a84feb..de6cba3f608f 100644
--- a/sys-cluster/rdma-core/rdma-core-33.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-33.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-34.0.ebuild b/sys-cluster/rdma-core/rdma-core-34.0.ebuild
index 2eed6260b0d3..34e0711a9344 100644
--- a/sys-cluster/rdma-core/rdma-core-34.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-34.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild b/sys-cluster/rdma-core/rdma-core-9999.ebuild
index e5d5b606af7f..8d9538a1c0b0 100644
--- a/sys-cluster/rdma-core/rdma-core-9999.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit cmake python-single-r1 udev systemd
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
 
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index b32f84d8f1c5..ad831a1c2115 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,5 +1,3 @@
-DIST singularity-3.7.4.tar.gz 6446703 BLAKE2B f9263a18c138cffa116ab06d59533948e48500fad69917598adc36b47fb0b8bf81e868ea924d1cd0e39ca6345a2fdc38a1c9788944729a43c4c8b63bbe82a184 SHA512 a02d8e5c3c229e454c7736173cbe3709ccaafb0ffedcf537501eb091cd3ee54899542e0c6e1221f35dcffbaf48d27be7e91a9bd510bdaacfd8a2285ea41e6f3d
 DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c SHA512 b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272
-EBUILD singularity-3.7.4.ebuild 1920 BLAKE2B dfb08d92fd548420df98f8f7a231840b13c6fcab2f74a673c324a2f123a212128eb4a0968f3834b6a2b11c5239b42ce80f0f78906bec6de40a5f81efa96f771e SHA512 e420cac5eea34e0d6dab96bbd02dfacfc7fcea64469fa2d542dd474249f88fa37367792d7d124b7fbe923da60ef66c817b4f4a69c50a722c8ed5166a5a48c48d
 EBUILD singularity-3.8.0.ebuild 1900 BLAKE2B a24c10ad485b5359a304caf1c85dcd1529e41d50070f842b9d36f1ef79c76edd51ed44f8bceddeea729038eb299e1a917036fef34f036413255033e3e4c0d3ae SHA512 32764eddc65b36a265c7527852b4b1709dca3f1cc17ad38ea75950fd2972643f0f13238df1e481fe392762ef6755e83707b64037b36f73dd18a923ee0f28058c
 MISC metadata.xml 451 BLAKE2B 0cca32721561e4100348cd884b88edad067a426736df27d4be6926525f9dd1315387dbefff84b983e69ab1972a44cd3a3a2c643bae676b413dab3482005d4ceb SHA512 da6f640f7df71bfe98fdabfe8ea69b1929b80b3c23d869dc496515a76d3f76c5d89d38843faf850184ddd7f624dd1e821dd50103f92e81aeb620a4bcd7151609
diff --git a/sys-cluster/singularity/singularity-3.7.4.ebuild b/sys-cluster/singularity/singularity-3.7.4.ebuild
deleted file mode 100644
index c018b5042e0b..000000000000
--- a/sys-cluster/singularity/singularity-3.7.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="Application containers for Linux"
-HOMEPAGE="https://sylabs.io"
-SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples +network +suid"
-
-# Do not complain about CFLAGS etc. since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-COMMON="sys-libs/libseccomp"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${COMMON}
-	>=dev-lang/go-1.13.0
-	app-crypt/gpgme
-	dev-libs/openssl
-	sys-apps/util-linux
-	sys-fs/cryptsetup"
-RDEPEND="${COMMON}
-	sys-fs/squashfs-tools"
-
-CONFIG_CHECK="~SQUASHFS"
-
-S=${WORKDIR}/${PN}
-
-src_configure() {
-	local myconfargs=(
-		-c "$(tc-getBUILD_CC)" \
-		-x "$(tc-getBUILD_CXX)" \
-		-C "$(tc-getCC)" \
-		-X "$(tc-getCXX)" \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--runstatedir=/run \
-		--localstatedir=/var \
-		$(usex network "" "--without-network") \
-		$(usex suid "" "--without-suid")
-	)
-	./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig"
-}
-
-src_compile() {
-	emake -C builddir
-}
-
-src_install() {
-	emake DESTDIR="${ED}" -C builddir install
-	keepdir /var/singularity/mnt/session
-
-	# As of version 3.5.3 this seems to be very much broken, affecting
-	# commands which have got nothing to do with singularity (example:
-	# completion on 'udisks mount -b /dev/' rejects all files from that
-	# directory other than 'autofs'). Moreover, this should go into
-	# $(get_bashcompdir) (from bash-completion-r1.eclass) rather than /etc.
-	# Hopefully temporary, which is why we delete this at install time
-	# instead of patching build scripts not to generate bash-completion
-	# data in the first place.
-	rm -rf "${ED}"/etc/bash_completion.d || die
-
-	dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
-	if use examples; then
-		dodoc -r examples
-	fi
-}