gentoo resync : 12.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
commit: 7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree: 56fae051db521b8fce8014cbc8b11484885b14b3 /sys-cluster
parent: 6d691ad5b6239929063441bbd14c489e92e7396e (diff)
26 files changed, 269 insertions, 143 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 186f4ed0ad65..bb265a58aebf 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index e3572ca48d2b..023f72ee5ca7 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -37,9 +37,9 @@ AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd
 AUX rbdmap.initd-r1 2372 BLAKE2B dee62cc3e92425bccfce86009be0fbecc84d55923a7dde302727d42f5f7703642121c690bdf079878c31b71d4c6c200ae6a7f595ede2dfe0bc46d8f6f9f5dd01 SHA512 d249d2299ef8dc4bbd12237cfe6ef626704872130b1092ab96d05894f04df09418364552433b264b80e49ee7e1587ebee71c1131fbbcd7d858cfadf1fe6357d5
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
 DIST ceph-14.2.16.tar.gz 130220625 BLAKE2B 30fcf971dd3ebaad8decf0d8d3ade1b554c0f97844db037ca618fd3f133964c08248067dc82c525cbc7deb04949a3a3d07850a5f56e75bcb8e359957d31df85f SHA512 94cab2c9711f5ee2c826ee27b474676c7bb8507c0761ed8d0a520a7e5182c4b353402061ffafbe9b95ac45603f023015752bffbbe0936f4835dfafc9476d3275
-DIST ceph-15.2.8.tar.gz 149565241 BLAKE2B 5b484734c0149aae95a5df2d4481c44e30bf23cdd25aa082084a7a69e5d3398711d45e7d634f98dc99d16a77d85456c13fe3fe0d241087a990e1524664597892 SHA512 66c7322575165b4747955ac9de34f9f9e2d4361c8cd8498819383883045601b92f786c4336c79369d6f019db1c4524c492faa40cdceed7fc1b2b373ca6ab5065
+DIST ceph-14.2.17.tar.gz 129270233 BLAKE2B 1e20185f24b7bc806a37ee59fee24138556837722e27a7fb36da268e5c330bb4dac3601dac4373f404c528e55fa79420f965807d215a54f5db9205ebb877166f SHA512 56ae460474afb8f208900c9ec6f55b120dd7229cb3297cb6f4f522cde8e693ede16d6064410074ea3c2a56df67c13fbbd102bce2d489e9b310544e374315b9eb
 DIST ceph-15.2.9.tar.gz 149518360 BLAKE2B 3d1d2cf7e356587d77c1ca3e6b05078a3de656607007d38ff0369f5a76fb9e12a3f06929bcbf19ed5d3de7c8e402dc0972c0b3c7245f64e6f5d94a4a78bb1d00 SHA512 1f55b0a13bf06df782831d0c9d5f8617c22442ab97fb186e6ccb08183e02bf1756caf8633fa6b1cf156c3fb7b1bdff90a60a1249adfad0b9450036e2329bf8ff
 EBUILD ceph-14.2.16-r3.ebuild 10514 BLAKE2B d4f43c7ccba4ea386f6ca7f68b143ec55115c1c21a6cc170b8925de8a314d4a5529581727b873ca5507e037033688d6d25506f9ebae9700dff710160ee82fca6 SHA512 d15fcdecd4e79c990edb1a04df8330282b3b861fe525f8620e7a48fdaeb411649deabfaab4d8c4fa874a2614aa24b10b98251b14071462baf1e502ccb3d58331
-EBUILD ceph-15.2.8-r1.ebuild 10839 BLAKE2B a3c4799a2bf7820bd804aa89235d1d810a93d6183dbb6763f83ca94b2bf2ca98f4368e198ac52e1c781225d8f33332b4644057b13dfbe4e1329d76a0f6abede1 SHA512 1d86affdad406dc3e36995b4cbe5fde081cb36c1fc1301becd1ec45707e535119c678c54184084454d5fd5982ea5e51eb033625562e3f6863f51d69a3f262eb8
+EBUILD ceph-14.2.17.ebuild 10515 BLAKE2B 85f6922697dd9de98808319a1a7d1063efb62a1bdeb03413e92db79ac976a009dd3d48b48ac1c49c9cf06696af27da9e836adc7ec1b43413862a0a074bf6b8ae SHA512 e385fbf5b06da07bba48ac5a492dc329558e7749f38f906cbf3662276d6efa55083907613bcc0087af0635a6f80f5dc67ac0d581c214a6e2815eb457f76b2012
 EBUILD ceph-15.2.9-r1.ebuild 10868 BLAKE2B 16bb7344e46c891c4727c85b9d345f62d92b61ffea615a67cc4e28426b1b1c652bfcdb36f81f429fe17086fda8ce85e8350bdaeb668bebaa193669fa55b91d75 SHA512 61116b159396fac0d65b9810722f32cb1c9ee4a07b9c909f44b82169dd430a2635491d337f56b0b98b0899bc72fb6cfb06279f1fdcb605abbf17cf080ed2a040
-MISC metadata.xml 2044 BLAKE2B f9a309d38c66cfb87071206331a6e2ba88366ed09802e949cb4499f1a0b2ee7a3ceca7df5653d1955c76ad2daf900aeee166265a2ced9c0b393e609f397dd563 SHA512 c051bacbbc9e64f0774714c1f6f8cf99990e1669de0ca1633173d870c03e04827cae993fd5e6846b310d838eead8471d2181a0678693ea43423e08795dfc0a47
+MISC metadata.xml 1980 BLAKE2B 3250403d1ba99c5b26b6dba381d2a3b01649ab23a2e2eb1cbc94a49888851d4faf19fc85ca54ad4a4c64394d8c00cefb571e27979c3482f0a60f2fc891476305 SHA512 343a75b9b4fdf88d7ad91b9a0fff154041a2a56ed0d07204b3af61b8605da969a736b6ef9a4b334a5f7d5257b9bbcbb705fd20f6def7dab767f4c9d9b600f2c4
diff --git a/sys-cluster/ceph/ceph-15.2.8-r1.ebuild b/sys-cluster/ceph/ceph-14.2.17.ebuild
index 246eace5c622..9b819976edd8 100644
--- a/sys-cluster/ceph/ceph-15.2.8-r1.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.17.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	KEYWORDS="~amd64 ~ppc64"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
@@ -29,8 +29,8 @@ SLOT="0"
 CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
 
 IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
-	kafka kerberos ldap libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw
-	rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs"
+	kafka kerberos ldap lttng +mgr numa rabbitmq +radosgw +ssl spdk system-boost
+	systemd +tcmalloc test xfs zfs"
 IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 
 DEPEND="
@@ -43,15 +43,13 @@ DEPEND="
 	app-arch/zstd:=
 	app-shells/bash:0
 	app-misc/jq:=
-	dev-cpp/gflags:=
 	dev-libs/crypto++:=
 	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
 	dev-libs/libaio:=
-	dev-libs/libfmt:=
 	dev-libs/libnl:3=
 	dev-libs/libxml2:=
 	<dev-libs/rocksdb-6.15:=
-	dev-libs/xmlsec:=[!openssl?,!libressl?]
+	dev-libs/xmlsec:=[openssl]
 	dev-cpp/yaml-cpp:=
 	dev-libs/nss:=
 	dev-libs/protobuf:=
@@ -81,21 +79,11 @@ DEPEND="
 	rabbitmq? ( net-libs/rabbitmq-c:= )
 	radosgw? (
 		dev-libs/expat:=
-		openssl? (
-			dev-libs/openssl:=
-			net-misc/curl:=[curl_ssl_openssl]
-		)
-		libressl? (
-			dev-libs/libressl:=
-			net-misc/curl:=[curl_ssl_libressl]
-		)
+		dev-libs/openssl:=
+		net-misc/curl:=[curl_ssl_openssl]
 	)
-	ssl? (
-		openssl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	system-boost? ( >=dev-libs/boost-1.72[threads,context,python,${PYTHON_USEDEP}] )
-	uring? ( sys-libs/liburing:= )
+	ssl? ( dev-libs/openssl:= )
+	system-boost? ( dev-libs/boost[threads,context,python,${PYTHON_USEDEP}] )
 	xfs? ( sys-fs/xfsprogs:= )
 	zfs? ( sys-fs/zfs:= )
 	${PYTHON_DEPS}
@@ -131,7 +119,6 @@ RDEPEND="${DEPEND}
 	app-admin/sudo
 	net-misc/socat
 	sys-apps/gptfdisk
-	sys-apps/nvme-cli
 	>=sys-apps/smartmontools-7.0
 	sys-block/parted
 	sys-fs/cryptsetup
@@ -140,7 +127,6 @@ RDEPEND="${DEPEND}
 	virtual/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/pecan[${PYTHON_USEDEP}]
@@ -149,10 +135,9 @@ RDEPEND="${DEPEND}
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/werkzeug[${PYTHON_USEDEP}]
 	mgr? (
-		dev-python/jsonpatch[${PYTHON_USEDEP}]
 		dev-python/more-itertools[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
+		<dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/routes[${PYTHON_USEDEP}]
 		diskprediction? (
@@ -167,7 +152,6 @@ RDEPEND="${DEPEND}
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	?? ( jemalloc tcmalloc )
-	^^ ( openssl libressl )
 	diskprediction? ( mgr !python_targets_python3_8 )
 	kafka? ( radosgw )
 	mgr? ( cephfs )
@@ -192,17 +176,18 @@ PATCHES=(
 	"${FILESDIR}/ceph-14.2.0-cflags.patch"
 	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
 	"${FILESDIR}/ceph-13.2.0-cflags.patch"
-	"${FILESDIR}/ceph-15.2.0-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
+	"${FILESDIR}/ceph-14.2.5-no-virtualenvs.patch"
 	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
 	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
 	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
 	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch"
-	"${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
-	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
-	"${FILESDIR}/ceph-15.2.4-system-uring.patch"
-	"${FILESDIR}/ceph-15.2.5-missing-includes.patch"
-	"${FILESDIR}/ceph-15.2.5-glibc-2.32.patch"
+	"${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
+	"${FILESDIR}/ceph-14.2.4-python-executable.patch"
+	"${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
+	"${FILESDIR}/ceph-14.2.10-build-without-mgr.patch"
+	"${FILESDIR}/ceph-14.2.11-systemd-unit-fix.patch"
+	"${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch"
 )
 
 check-reqs_export_vars() {
@@ -234,8 +219,10 @@ src_prepare() {
 			-e 's|[Bb]oost_boost|boost_system|g' -i || die
 	fi
 
-	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		src/bash_completion/CMakeLists.txt || die
+	sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		-i src/bash_completion/CMakeLists.txt || die
+
+	sed  -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die
 
 	if ! use diskprediction; then
 		rm -rf src/pybind/mgr/diskprediction_local || die
@@ -249,7 +236,6 @@ ceph_src_configure() {
 	local flag
 	local mycmakeargs=(
 		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_BLUESTORE_PMEM=$(usex pmdk)
 		-DWITH_CEPHFS=$(usex cephfs)
 		-DWITH_CEPHFS_SHELL=$(usex cephfs)
 		-DWITH_DPDK=$(usex dpdk)
@@ -266,11 +252,9 @@ ceph_src_configure() {
 		-DWITH_RADOSGW=$(usex radosgw)
 		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
 		-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
-		-DWITH_RBD_RWL=$(usex rbd-rwl)
 		-DWITH_SSL=$(usex ssl)
 		-DWITH_SYSTEMD=$(usex systemd)
 		-DWITH_TESTS=$(usex test)
-		-DWITH_LIBURING=$(usex uring)
 		-DWITH_XFS=$(usex xfs)
 		-DWITH_ZFS=$(usex zfs)
 		-DENABLE_SHARED="ON"
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index 141b26fdddb2..cd3df6b4e4c3 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -28,7 +28,6 @@
     <flag name="lttng">Add support for LTTng</flag>
     <flag name="mgr">Build the ceph-mgr daemon</flag>
     <flag name="numa">Use <pkg>sys-process/numactl</pkg> for numa support in rocksdb</flag>
-    <flag name="openssl">Use <pkg>dev-libs/openssl</pkg></flag>
     <flag name="pmdk">Enable PMDK libraries</flag>
     <flag name="rabbitmq">Use rabbitmq-c to build rgw amqp push endpoint</flag>
     <flag name="radosgw">Add radosgw support</flag>
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 69d039be5fa3..691202e5c742 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -2,12 +2,15 @@ AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
 DIST cinder-16.2.1.tar.gz 5531297 BLAKE2B c517515df669e9aafbc1b8d80e8f422bbe6cf55ded044d03fd21142fafdc2e81f5f211c5ce3f39f2fd965f324194635efa7b53aee05113abff8f9d2f6438f3f9 SHA512 37fd7025f4490a35214bf4ac90b5b8ec9d21752ab54295403e6d485e429ffe8172c33e692e5f516156a58358b35da60fc7a8f7f25daa4b0d405db25beadd59b7
 DIST cinder-17.0.1.tar.gz 5815391 BLAKE2B cae43e4668560b9a329e65738533a6c015b42210c45f10d82ab758509f676778503152ba75f0ac862b040b9a489b92cf59f8da83e36e9610696e14c9e0d573c8 SHA512 44cadb33ea22953c05105e336555798b2332b0c77f1e9baedeaef58fe300caa70174a5fa4ad94a515f1bd0c685b15ca639053001d4a5b12ad9cceb385f2a63ba
+DIST cinder-17.1.0.tar.gz 5823116 BLAKE2B 08f8c4e9acdd46d27ad5e35b8602dc7722ff0f08f577183860138f9085f6744abeccf6943d556419cc7584504c3245c19cfd4f17db4164cc8a4c144aa8c112bd SHA512 f3e91945e81e5bb7edefba62050d3750ae5ab870903e55f46e8f0a5d3c140eada1df466d5fcc6623df8ad9688cad3c6519c712494cd20b8cfeb4b992e8f516cc
 DIST cinder.conf.sample-16.2.1 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
 DIST cinder.conf.sample-17.0.1 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
+DIST cinder.conf.sample-17.1.0 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
 DIST cinder.conf.sample-2020.1.9999 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
 DIST cinder.conf.sample-2020.2.9999 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
 EBUILD cinder-16.2.1.ebuild 7626 BLAKE2B 4ee5a6b8642109db40af87b5d3653184e8754001fa9643d295c83e9eb86664206f57def3861fc601200b9107f17f438371f09d360014728ee2242de124d276d9 SHA512 7c0a7c404aeebede9a635da2c09b492a4bc969a50194eb048c2d0181f03f4d9872652051542d01d1a631c2071135d7dc7cb44fbebf61656dabd99b8cd992f404
 EBUILD cinder-17.0.1.ebuild 6816 BLAKE2B 20bbc45b13c84fd757fcb9a81250f1433d4de7bae16ae2125aafd5a29b4dd476cc0fd0dbdea29d30a8e5cc046972c6e7319f89aba12e8b9fbb0be1d3c0121e6c SHA512 5be7b0f976de53d4830e0056f810ec96e35a4d2cde853514552e0dd87dfe6e4ce9e5b281de4aea36672f5c045b5ab679c557999de59644a15b363b5d0c60947e
+EBUILD cinder-17.1.0.ebuild 6818 BLAKE2B 5bbf8ac03c283f95039d3d72c7eb8db99af19bd3c9234de42ec532531e04fb0763a25f5c837ba91b8e44af4fcaef34054ea8dcbfec170fbab2f2a90d1fac29ab SHA512 29e11ba54a48a06927a9bb8334dc8a5eadaae7d264efc5f751566b168e574b0b870055e7093461bbd37d2381d4f8dc3e1b5f7bcf024563504ed5663908b1a28e
 EBUILD cinder-2020.1.9999.ebuild 7628 BLAKE2B 89c1b14ec775f5635cb0a39ed2fe3b37678c2ae57dc968908b62b94296fb022b876c311eeb43898f8b0d96b1cde152799e7606237e8fa123ab8088e67b9247ad SHA512 62b9ea484e242f6a1bfbbc6ccaeba4a1c063300cc868f191c6980f4a8196409831df4acf82a5f89f8bb7dbed5da61381f2c019a225cfa7bf175c13d745305016
 EBUILD cinder-2020.2.9999.ebuild 6818 BLAKE2B 9ffb3360cbe44be93d6a498149f1846211ecfd0491cbbec89362663e6f69f9a7a68c979f750f9c6ed8ffd5106d2d282c23bdcba5885a88f155214e8703d34436 SHA512 309047d98b6c4a072a0d4b9cc779c66cc0077bec999292d6cd11f57b4d3666d4eb0b35629286e66cfb5ea720c805b23826058f9870b7289a187e91252ae4fae2
 MISC metadata.xml 1102 BLAKE2B 9ae7e7c1dc78a29aaa42da894b86bb674c080636008e95ec57f7eb0a483006f1128d5aa42fe6a673611732063f8e5bfbee0e4596af4196f23065f362d92a6860 SHA512 ee165a4bbe18345bd11de0590ec389c7ad1055a052470666939f77b4c5dce220e1400effd1b89a44ca515dcebd15c392b4bc4aa8d76ce23116ae8b5525197b42
diff --git a/sys-cluster/cinder/cinder-17.1.0.ebuild b/sys-cluster/cinder/cinder-17.1.0.ebuild
new file mode 100644
index 000000000000..57958dd85ddc
--- /dev/null
+++ b/sys-cluster/cinder/cinder-17.1.0.ebuild
@@ -0,0 +1,191 @@
+# 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
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/victoria/cinder.conf.sample -> cinder.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+	EGIT_BRANCH="stable/victoria"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/victoria/cinder.conf.sample -> cinder.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
+
+DEPEND=">=dev-python/pbr-5.4.1[${PYTHON_USEDEP}]
+	app-admin/sudo"
+
+#	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]  # do not include, upstream depricated
+RDEPEND="
+	>=dev-python/pbr-5.4.1[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.26.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.15[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.12[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2015.7[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.3.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[sqlite,${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[sqlite,${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.31.0[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8.5[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-6.1.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.24.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-2.35.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-4.0.1[${PYTHON_USEDEP}]
+	>=dev-python/os-win-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/zstd-1.4.5.0[${PYTHON_USEDEP}]
+	iscsi? (
+		tgt? ( sys-block/tgt )
+		sys-block/open-iscsi
+	)
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	app-emulation/qemu
+	sys-fs/sysfsutils
+	acct-user/cinder
+	acct-group/cinder"
+# qemu is needed for image conversion
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES=""
+	if use tcp; then
+		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
+	fi
+	if use rdma; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
+	fi
+	if use infiniband; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	fi
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# only used for docs
+	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
+
+	insinto /etc/cinder
+	insopts -m0640 -o cinder -g cinder
+	doins "etc/cinder/api-httpd.conf"
+	doins "etc/cinder/logging_sample.conf"
+	doins "etc/cinder/rootwrap.conf"
+	doins "etc/cinder/api-paste.ini"
+	doins "etc/cinder/resource_filters.json"
+	newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
+	insinto /etc/cinder/rootwrap.d
+	doins "etc/cinder/rootwrap.d/volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+	# stupid python
+	rm -r "${ED}"/usr/etc
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "Cinder needs tgtd to be installed and running to work with iscsi"
+		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+	fi
+}
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 98555ea6f6af..9504d22dd0cf 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -6,5 +6,5 @@ AUX run-lock.patch 564 BLAKE2B 53062442dcc45c71eedde79e9d09b543ca6b6b48f552a5de9
 DIST drbd-utils-8.9.6.tar.gz 788183 BLAKE2B 314c3c647f7fc52f82e94853949185daf4092e8c182c5799773e5d6b3e77995d2068087a10cf33133414c5fba91498a7cd1e5d487887aea03df3e18c0426dcb4 SHA512 cbdeeb7b298bc21de0d2188566362d7a634a72df243403f4bc91d5836c757f15ee86314b1385860aecda5657be5dc6309f2481b0403012bde841dd0618188938
 DIST drbd-utils-9.15.1.tar.gz 1229196 BLAKE2B c73cb624e4c35f2c5c001b4545c2ad806d3f13471aa25b0941d923020fe01a73405d1ed7c2ab2efe3afee0e59b8e9d401072edb788c57dc338fe3ddb4eebebf3 SHA512 bf9c46335500c0dd7afdc160221acaf8fd053afc453cb26cd76ef085c41580be5a62021ef1f1a57eac9df70d1158a008f489d1a8bb5c3329c5a187f79e4942de
 EBUILD drbd-utils-8.9.6-r1.ebuild 2478 BLAKE2B 5155f241126f545397c0ee4aead4dbfb2d291615f1d3e73ae81feacb9c806e25e02a8afbbf93b892c0488ed17801f43d548d671d2d66bbc69c04e758c2752fd3 SHA512 f4dbeeff4969083a531ccc164b14daa682b2f5cf5e375153c29ae1e5e698f15bcf70bf3b8584d5517820fc632bc984324ef74180e1cbb3aae5f67643bb29acef
-EBUILD drbd-utils-9.15.1.ebuild 2616 BLAKE2B f7802274022d0d2e66de8b6af9116c8be2aaa5b60d913cd3a7d89c7db4819d3794bd2ab3ee4498be95822f5160725c9ef204d187ab9f7e0f9b52677b7ce37559 SHA512 c895ab253628afd3c521f12da2741a7e2515349add4c44c9fa29d7db9d35ee30cc87c2cbc2c5aebf409e5dd18306435953803283a500d85eb88cf59c7bd9ee6d
+EBUILD drbd-utils-9.15.1.ebuild 2614 BLAKE2B 3ddcbdc367b19a44e8248c083929f54487adcfe70a3a685346e15df3f6128c24e2add56166fac8b0a1865e7cf2935f77a48b19d90b8a5094e85aab5ce19104e9 SHA512 9bdb178bdd5fd963d8d99f03cd901e7aa0c1b7b9e219cbd1fbc48bb8513ffcf2ff92ee43165b322f1464894eb3542577d71bc7755b4b520d8d5574cb7deb3083
 MISC metadata.xml 677 BLAKE2B 79183e6930396061e7cf5c881ced8b4e3082a2b0dfdb4520e9de6afd54269b35ba972efd7dd3c3bd67cd103fd7d40693575a9d87b7b437438d5226e6e3453b5e SHA512 b97a7c5bb6ffe6de872f535d595507cd155923c920b9e7836f9a50afa992300b0b27d43805491cbbe6c348ecf99fc24367c375b6416dae73bffb4b6706f4b89a
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
index c32a2837c949..adb7a23c4af1 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.linbit.com/drbd"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pacemaker +udev xen"
 
 DEPEND="
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 380ec58aa11d..f6b91f16409d 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -11,5 +11,5 @@ DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2
 EBUILD galera-25.3.28-r1.ebuild 1787 BLAKE2B dfe11ca3f23116f4d703a9e72ff09985919e87bbe86779d312d0358b3170c6c7341eca6e3a4889a759bee1aa12b6f4060f0982d3f5ed50395bf985666c7d05a0 SHA512 42e6b73db57e82986323a5856ff21ec8d422531f157b6ba986de60616644b1808fb26bc13ef677ba7f11cfd20f4c53412ab9659ad8e3193942088208f047d9d7
 EBUILD galera-25.3.32.ebuild 1726 BLAKE2B 69be6fa5fb2fcc79d844497c5e2c374caeefb7307620a66b93333330705a44587c0eedfa0eac8194606513bf453f42739f440e9f2704869d87ae20d02b58482a SHA512 cd89402a39cdc67e2d441106148de15928faa89d63cb93af57242ab95917467569b2342488b96dac860693dc4798627afb977ce30621edfe92f08eab46817858
 EBUILD galera-26.4.6.ebuild 1883 BLAKE2B 1c25c650cc1aaa24e15b5fe91075174ffe45292d184c78a4ad2a03c6f57576a1d27c428ad9d827308678920027061836e26679e0daf6132b51dbc1278e9c7d7e SHA512 50d2c6b0efb9e3d912ada92de0f1034bad21307b355b9bd3eb1b6edb9fa9c69e086a2dd10a257804377f03b76c60bfd134f70d7d460a95677efce8990aaaee5e
-EBUILD galera-26.4.7.ebuild 1782 BLAKE2B 3a0525342da587170fceb49d9911448dbbf3913afccb176399a579f941900c4b2eb04b85aadf2e225a9ab427225157a321707c8800ba8eb6ff259c2444dbbd2c SHA512 938729183d927c2241f2aff1ecd03e4ea05961213a0ebe48899597ada657984b17f68ff52eda905bce64824b23b8a215f99ed90086e2e4e118981068e2d7cdc9
+EBUILD galera-26.4.7.ebuild 1780 BLAKE2B 3d1481060258879c4b2efd30f3923f7f3fd7b37d177941ff1b2ec15606cd77f28e242baa94b8214460cf6301a4ab7f48984b0feab4850022dff56be693415761 SHA512 f28a2fb4215ae66a14d5fc640df8e1a9b124881da616ef74e7ce2d3050630c74753cb1edeaff3c843a04505c5a99d2ae02fbd2b2f829493bcaf89f60cec94fda
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-26.4.7.ebuild b/sys-cluster/galera/galera-26.4.7.ebuild
index beaa1ff4df96..4f013d349ddc 100644
--- a/sys-cluster/galera/galera-26.4.7.ebuild
+++ b/sys-cluster/galera/galera-26.4.7.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 BSD"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index a463c79ce174..7a6071a4a2e4 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -12,8 +12,8 @@ DIST glusterfs-8.3.tar.gz 7829522 BLAKE2B 1ba60f7209db4f1ce21237c3adea94df1b9eae
 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 6047 BLAKE2B d9774fd4008b3db282ec4552d617d8c5f6f4691ce5c5b6f8d10e2f49367ea8f9b231643993b64d1fdb8cdbeaa6b1eb5d5563ff09bc75611439986bf011641b1e SHA512 1f45d9004d11650333b5e8da161bd964cf63fa48423744f0a50b153bf5dd6523f0516ac107452c86cb048e5ebc7964fd7b577e63c8963dba9057935f0290093a
-EBUILD glusterfs-7.9.ebuild 6061 BLAKE2B 7baec7d360fcb47f0ef5bba76af5dce306a4fc2773d22d871081204a3b03dbcda22de73c4cf66fcfcbbff2ab7ad80e43a84a78c13bd5fa6fe01c0caa681511cc SHA512 40fb1926dd3e3cc2d8bd6b649635e111e8ede10abb65b29732737de837a6280287e42162f6d649b5905078173d2a467cddbda28cbd4cd2095f82bfa7c7f431e7
-EBUILD glusterfs-8.3.ebuild 5575 BLAKE2B 99f344c639b942e9313071560e745048c65a97bd0e97f39c897aa1e6630c87d020a4223d30a39d10c571cf4fb3a36c9c4c09802accea3bd83f854c6de769062b SHA512 befabf6d6aa1d0d73a87ffe59ebac6a6d3ac235104365ee3c4bbacf4e0c3125c671449973a8247241de93e0dd2fa72afd12b86988f1c55ce9a34b304423c97a5
+EBUILD glusterfs-7.9.ebuild 6057 BLAKE2B 830f2663d250a0a5d8fd416f64987903f57320159d70a66fd20047b22c6a7f5fddf129cab2cc984ad150736577071a33091bf95b01312f26dbd273c8dbc538ad SHA512 f354ef6c4325bd650a8b4d799604fc0adb3f75435912f8c3b70ac015778220a068439706b8616e5eed9b525841a7697a73be11d7913b84a72bc96db4d5d88267
+EBUILD glusterfs-8.3.ebuild 5571 BLAKE2B bee24160ef958ea64135b9bef14b86a057a76d0ad2f4d784019c850155650506451065c2848d6e783019b893312341b7c143d521e55acca3d7374e2a34574086 SHA512 0686cd96ef8dc5224cc288af1ae83c9b56815655c7a1806bcd1fef0a9f2202c1184c857c64e1e005265052793db3609abe00413edccc53afb1c73f0695675224
 EBUILD glusterfs-9.0.ebuild 5575 BLAKE2B 99f344c639b942e9313071560e745048c65a97bd0e97f39c897aa1e6630c87d020a4223d30a39d10c571cf4fb3a36c9c4c09802accea3bd83f854c6de769062b SHA512 befabf6d6aa1d0d73a87ffe59ebac6a6d3ac235104365ee3c4bbacf4e0c3125c671449973a8247241de93e0dd2fa72afd12b86988f1c55ce9a34b304423c97a5
 EBUILD glusterfs-9999.ebuild 5975 BLAKE2B fbdd9a5bc3f752562a77e6feeeb0fb675f285893923ce418f52158c3b9953348f6120f3537b8920d51a56f2b9748eacd17161e1cadbde879cdb3246e30084801 SHA512 8abe566a9400d78417a9d8cf1b1966bcf5afa2a2d1dd9e9a00a8b5325a57c6cdcfba6ef453d8a9db06c8fce4e0fa79af7e16c256a4812fb2f2dcda058317d58f
 MISC metadata.xml 1472 BLAKE2B d4aa7cc4c10e383af3c4cdb201894e8bdcf85822a98920c8ab7d262bf6c028b02ca0f4a06e6717c8bb4d11d803cba7daffa917be64392dd26dca677a00312af7 SHA512 0de0bb313c559ed3623e84960dee5e3c5628f8c793e7ed376fb7f88311f6879d15dfe112e27ce4dbcba69dbec00b73a03ed78e5d4eafcaec6383ea13908b6c31
diff --git a/sys-cluster/glusterfs/glusterfs-7.9.ebuild b/sys-cluster/glusterfs/glusterfs-7.9.ebuild
index 3b847b2aa4ac..45b362b492e5 100644
--- a/sys-cluster/glusterfs/glusterfs-7.9.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-7.9.ebuild
@@ -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/glusterfs/glusterfs-8.3.ebuild b/sys-cluster/glusterfs/glusterfs-8.3.ebuild
index f8603e0e9ea4..8354a144baa5 100644
--- a/sys-cluster/glusterfs/glusterfs-8.3.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-8.3.ebuild
@@ -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/lmod/Manifest b/sys-cluster/lmod/Manifest
index 75aaca81fee1..f33bc73f4b74 100644
--- a/sys-cluster/lmod/Manifest
+++ b/sys-cluster/lmod/Manifest
@@ -2,6 +2,6 @@ AUX 99lmod 22 BLAKE2B 6a470f0e5796f21f10e10161ee1fdb4fb3d794a9261bee9887c9e2d179
 AUX lmod-8.4.19-no-libsandbox.patch 374 BLAKE2B f4bf516a737f73cb547bd07933d2839748259bef017b740b2cb3e5e5fbba6909e932d3211edb1ba48fd16545ecfd7f3a2239046f5478bfad68f9d7ccdb296307 SHA512 9b5b5300588dda23efd82f8d55373be6f69289efad42260a721eb68dfc01475a8f18a9bba8eead8fe66724b8a8df0d75a4c6a85d51e0d3011cc1435cb8f148b6
 AUX module.1-8.4.20 7580 BLAKE2B 6b4f8f721178326a4124bb9c907d4dc0e7c1b7251c724af2826aa3f495af4702f0c9a8cbb06847fec5d44f525cd463b4f0ec898a6cd3074d11c3195ede191af5 SHA512 cfc9eb011f5e5fb2a40b9dfe71e6a888f573e17a55d0d34fe529dbb887ff7932e17c0172663c95dfbd00b67f883608921ae7bb19d352b6d9ce8207d13ca13c8b
 DIST lmod-8.4.20.tar.gz 19889342 BLAKE2B aef498ec8dd2b87aca02d66f394418aba4a81d1fec4684750e59d48d06bad16db7a24290920e40290ecba8a4bc65c7dbe5c23be28654db79433f41164fa4aaf6 SHA512 9749e34e7ad75531c87770b73fd20dab16c89c24e1a2d01e58f09f8510ffc8f896dfa7eab9dab26fe4d6d14ba04d331f98e08e92e0943aede9fe5131af038970
-EBUILD lmod-8.4.20.ebuild 3326 BLAKE2B 593228c6c7e2d21d7dda637f56ce99eae93bda463f2bc30f3e47f2dbf980a71c85543fd6095b085966ad1a43db6710a0ea09dfebe3824bd4ea1beda613d65c30 SHA512 f9e5d7ba6b9efa892db1470b1c0d2a5cc6986fad945d497d8645f1d54667621d98a9a893dca0de597bb1559ec8fb4cd10f51da10979b87b77a530883ff2ccf4d
+EBUILD lmod-8.4.20.ebuild 3333 BLAKE2B c21958369f2a0ae01a99698277f9a84b3d29476b2520633e8d26f76df7d78b7cc6a0fea1d0a2507345bf8bec3bc74d0c9ca7b01b7bbaa348be164baa9211adba SHA512 4077bab907a8b9a3ac64e048a63f8a5410ad317c035e0abc5a45328e239e3bbe8d20ec401e43af1b6d24b95e3b29d736ae83ef1ab8dee02f10882c4a9f781ea5
 EBUILD lmod-9999.ebuild 3326 BLAKE2B 593228c6c7e2d21d7dda637f56ce99eae93bda463f2bc30f3e47f2dbf980a71c85543fd6095b085966ad1a43db6710a0ea09dfebe3824bd4ea1beda613d65c30 SHA512 f9e5d7ba6b9efa892db1470b1c0d2a5cc6986fad945d497d8645f1d54667621d98a9a893dca0de597bb1559ec8fb4cd10f51da10979b87b77a530883ff2ccf4d
 MISC metadata.xml 1067 BLAKE2B f520242500e560deee88ce53601d1dfaa929e8228344ea89f0d08242b58e44b280e9b6b3a396f787d231f5f6062336f770512ca2430d8ff8d64ae10a1198ee67 SHA512 6425f204b774beb6aaed3be55d279eaee61f12ea0ace2a9b083a533b92421704b64eea37fd00575147050636ef16fa07ebaf5df2d96a2101c8821d360c4d24ba
diff --git a/sys-cluster/lmod/lmod-8.4.20.ebuild b/sys-cluster/lmod/lmod-8.4.20.ebuild
index 4cbf6b21b9b0..07c80afa972d 100644
--- a/sys-cluster/lmod/lmod-8.4.20.ebuild
+++ b/sys-cluster/lmod/lmod-8.4.20.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/TACC/Lmod/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/Lmod-${PV}
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/sys-cluster/lustre/Manifest b/sys-cluster/lustre/Manifest
index 98712d1ea4e6..c87302882a43 100644
--- a/sys-cluster/lustre/Manifest
+++ b/sys-cluster/lustre/Manifest
@@ -2,5 +2,5 @@ AUX lnet.initd 933 BLAKE2B b59c85c589adebc6ff65484546804ba3857a32ce226baab4dca16
 AUX lustre-2.13.0-gcc9.patch 14815 BLAKE2B 11a28292c2c3175e5da2cc0521fe63c5ebc7d3265ee7e23443f755ba8e92f6c3b83f1da71119091e5f706bbf3d90485488db442d16e8b4387479c8cc539ad5e8 SHA512 fcb3de98bcd64f3562444928aa1adc2d935b66a19330a7b8e485e8cd468f8517bb0862b89c468ee243dbf8689675c78fbf565cb371dc6eb95ebd1803bf2a4bf9
 AUX lustre-client.initd 1099 BLAKE2B 89508197c5101e0e382da13720424cf526a6c2503719cab411c3cf03711a8b69bb3e8b043c3555fe3cc01a2ac748234f24b311348941689ded17b708a7c49868 SHA512 b535e81208bed0fadad6e140a6b11ee1786a957f1628a819954de72af02d6794346dda0eb2fdcd8583a9aebd1832e70539d9ca292f2dc34e104f2f61caa8e1f9
 DIST lustre-2.13.0.tar.gz 14598623 BLAKE2B f53b7fa455144f50ed7dd12150b9195fbc6b951a663df2a1a914aeeae79723cc0c0515c0c501fd67769e163b7026a341d679dbddbb590f6c63d1af0498dd44fc SHA512 6da16abc1ecaa6711bf727925ad327164c5b0d9918a7c864be8c3aa36b31b191154139ba718a0f84e4905907c265a0ce2a5394b44f1b85cd90880b3bfcd0d69d
-EBUILD lustre-2.13.0-r1.ebuild 2667 BLAKE2B 4f4b38c7fcdad134d4b600a41c8835f9682be27eb2035a8b11c547f6753f8e6dd7d79a916da0483e4808a221f1e2f70f0719ae0d65c24f9495baa4893b376679 SHA512 fd08f39e5f6c98c6069f75163d8853b48ae0a7542c9bd3f21235f19b8fc776d3b9e22c4417d0a2b3f0496574a31ad4e56ae5727ad1611b9f07e6acd8a5389864
+EBUILD lustre-2.13.0-r1.ebuild 2662 BLAKE2B 7dc7091e37fc0c59e2dacc8af9ecdaed8c7646eefdf09b24c4d23a3ec9e274f23b6a09f24ce8c03006b1f6800e00b22de1b7b9c88ad7552e32a1cbaa257cf7ef SHA512 41dbc93259083f0b59b7bbe5ffd4560edc1297950bce4e21b216754276fc5589343a5209fd5e5b7cd2c75fa7383e93c0d93710d5956e91f618463469237cb9c4
 MISC metadata.xml 663 BLAKE2B 4ccb1eeeee19ba10feca23bec9d509dca908ad33e0d84626d9d5923aaaa808460ad5daa8745ff68c76e6c6bf58b7463c3f76794beec4f3ca340c6676f80a5054 SHA512 92ffb9f7db4cdf8988c60cf6af92c87fdac904603c4e8d7eea13d07a8c102dd75394791b80d761833783399f7b88a859c59daddd542d9d728c4cda43aaccd4cc
diff --git a/sys-cluster/lustre/lustre-2.13.0-r1.ebuild b/sys-cluster/lustre/lustre-2.13.0-r1.ebuild
index eb00424e5965..e6aa95831f00 100644
--- a/sys-cluster/lustre/lustre-2.13.0-r1.ebuild
+++ b/sys-cluster/lustre/lustre-2.13.0-r1.ebuild
@@ -21,7 +21,7 @@ fi
 SUPPORTED_KV_MAJOR=4
 SUPPORTED_KV_MINOR=19
 
-inherit ${scm} autotools linux-info linux-mod toolchain-funcs udev flag-o-matic
+inherit ${scm} autotools linux-info linux-mod toolchain-funcs flag-o-matic
 
 DESCRIPTION="Lustre is a parallel distributed file system"
 HOMEPAGE="http://wiki.whamcloud.com/"
@@ -69,7 +69,7 @@ pkg_setup() {
 
 src_prepare() {
 	if [ ${#PATCHES[0]} -ne 0 ]; then
-		epatch ${PATCHES[@]}
+		eapply ${PATCHES[@]}
 	fi
 
 	eapply_user
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 6ef3c875f1a8..cf4fc7495b57 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -1,3 +1,4 @@
+AUX mpich2-1.5-fno-common.patch 531 BLAKE2B 1b7823e5c597384eb3dea589dfca0caee8fee9ed2887ac25c5152812fa1ea4e3e6d31669945e9c0c16b443e85c6fc9e075ad54b3b5d7a60fbc1921917b023978 SHA512 2e71c542e7cf4237c723dea527be06b6f37fd7f338810cf5a544b39234dda089b06ed58dd8e0ff5b7cdd3c716a0bae90b6e47c0bb03c865a93c962567d3267f5
 DIST mpich2-1.5.tar.gz 22826035 BLAKE2B 75075fbdd0111725e5bce1e828561125cdba2c91ecfb5af7c6ebd0603f8de05aa5813e57bf05b276607d0a6c0a378862b5631ab988f87e67299e7f651efdc76b SHA512 01ef68accdd60af805705c1c7a144a570eee6f01984939fe151a093f963c956fba366247b1058885ba1a2ff626278d30e928e03d394bd6cf2a4b6dab99586c15
-EBUILD mpich2-1.5.ebuild 2675 BLAKE2B 0b1e111780f3c2194f35c5b90f8456753bd1a03656385c6b8a596d8fe5a278f8482a4bffb908c3d98c625a67935baf36af16ff1a8404d54c1ac4bb0e5c0363c2 SHA512 454d03d0c1f2ea6a7f7f8a7172e33f68893ff7057bad2dfd61077c637d6d6d7f608cab8e48a7e64ffdf6801d9ac65679e886935c519c26cddc9c14bb08b0cd1c
+EBUILD mpich2-1.5.ebuild 2720 BLAKE2B 5dc953ce5049427a8439ec5057862df3b798933f6799a0bd064f47f40fd5dd087babfa23a4c2f8680e5070d8c90fb552aeae911c8258a91b96a379269717d480 SHA512 31f8b34a24d8a51f6be787d39124c798126a4b5050b80ebbc641124622f3736e2d875d4383e0d4f94dee00d6652ede242bc0a1a25a08a687246afb9eb6f46885
 MISC metadata.xml 426 BLAKE2B c84c0b456040e5826bbe33d90969ce14cc9e7ed7e1724935ae785fe7dcd14c00e1abbd877e2b57860cc049fefe7483e1a4145270ebbe3b07ec716a43a595dd9a SHA512 b684cf0962e273dc2c9472c5e05575c1ad31801fa31e30bab9792e407269d436186063d9be3e63fb8417995689a4308442a100878f2d2e6946c49c3150ef3f7f
diff --git a/sys-cluster/mpich2/files/mpich2-1.5-fno-common.patch b/sys-cluster/mpich2/files/mpich2-1.5-fno-common.patch
new file mode 100644
index 000000000000..ce0c1911b16d
--- /dev/null
+++ b/sys-cluster/mpich2/files/mpich2-1.5-fno-common.patch
@@ -0,0 +1,21 @@
+--- a/src/pm/hydra/pm/pmiserv/pmip_cb.c
++++ b/src/pm/hydra/pm/pmiserv/pmip_cb.c
+@@ -12,7 +12,6 @@
+ #include "topo.h"
+ #include "hydt_ftb.h"
+ 
+-struct HYD_pmcd_pmip HYD_pmcd_pmip;
+ struct HYD_pmcd_pmip_pmi_handle *HYD_pmcd_pmip_pmi_handle = { 0 };
+ 
+ static int storage_len = 0;
+--- a/src/pm/hydra/pm/pmiserv/pmip.c
++++ b/src/pm/hydra/pm/pmiserv/pmip.c
+@@ -11,8 +11,6 @@
+ #include "topo.h"
+ #include "hydt_ftb.h"
+ 
+-struct HYD_pmcd_pmip HYD_pmcd_pmip;
+-
+ static HYD_status init_params(void)
+ {
+     HYD_status status = HYD_SUCCESS;
diff --git a/sys-cluster/mpich2/mpich2-1.5.ebuild b/sys-cluster/mpich2/mpich2-1.5.ebuild
index 1fc1095762f0..159474a613c1 100644
--- a/sys-cluster/mpich2/mpich2-1.5.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.5.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=5
@@ -43,6 +43,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-fno-common.patch"
+
 	# Using MPICH2LIB_LDFLAGS doesn't seem to full work.
 	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
 		src/packaging/pkgconfig/mpich2.pc.in \
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 28126ecac75c..58e14040c34e 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,7 +1,5 @@
-DIST singularity-3.6.4.tar.gz 6183277 BLAKE2B 9fe9b28828149268506e4db895767528a9397c347905c170e96d8e0d7b9d715e4c5f212bf04a2418689f448e8045e52a16c8cc4e93a8066d4d651f1eeb918e92 SHA512 c12cdc6baba6089576396c4391367451a264d6bfe7dd9a4b582d21ee5bd49aeea79372f3d008a4f2f535af307e0890a8d1a72773bb2c0898872eed8c82e48991
-DIST singularity-3.7.0.tar.gz 6097313 BLAKE2B 2fa8472bea80fec2613d1598d89354c3655eadee2292f0a4921d680300bc5793c5721f9640aeb398eba6cc91540f132b9d9b2afa175e74ac9f53c8847ff21e13 SHA512 25faadd9b1ec4b9751534cf1176f294696c9afde50adbc42f67d86584a5122fc78500e4ac6c502e5d90a66a9b44b9097a4d0231afcc2615b25d95feab8a3c967
 DIST singularity-3.7.1.tar.gz 6121297 BLAKE2B 10399692559dbaf1a855229f4d3ff845af5b923d9a5b959638481ba58fd5bd04035fb751e5000aa44f816947d88ead85fbdceb8ad5cdb94aa54b0986cb922044 SHA512 ed87bd13bb4bbdcb49981cc02bf37e1db9a5d8fab3ef4314a15cfa391cb2210b55b2e54500fb03811eda8f31499ea7cead9a368a486da0cea0ac71037908c7cc
-EBUILD singularity-3.6.4.ebuild 1921 BLAKE2B 5ebd469923ae0c46f60db2197c103d9e7177afdda7bec141673e102c0911486cd88697fbddd89e54e23e5871cf0d8e660cce81f72ce6987b0a8465a624404241 SHA512 e875a95330b35d61cd78261400cca0b2610e3e530f4aaebc3f00af0623986ea448f3fc144eff4fd2e8659fcbe56808e00bf9a4a12fbef88dfa6b172e3a96593f
-EBUILD singularity-3.7.0.ebuild 1921 BLAKE2B 5ebd469923ae0c46f60db2197c103d9e7177afdda7bec141673e102c0911486cd88697fbddd89e54e23e5871cf0d8e660cce81f72ce6987b0a8465a624404241 SHA512 e875a95330b35d61cd78261400cca0b2610e3e530f4aaebc3f00af0623986ea448f3fc144eff4fd2e8659fcbe56808e00bf9a4a12fbef88dfa6b172e3a96593f
+DIST singularity-3.7.2.tar.gz 6268044 BLAKE2B d5a316046037dcb9c386f2d3b45204b77394cae273d0daa561282a354a463823c4be3c56e0935ff0a8dc9671cb841ad8cb75364b7652dce93ce099ede3e12ee3 SHA512 f31e383e645d394cc29e5b38da84ca805545e3226b069c696e667e7dde1569fa2373613f624c739482459a938e76e4e513062c19474685ccbfa5bd6162244466
 EBUILD singularity-3.7.1.ebuild 1921 BLAKE2B 46a2ccd1a3d721406e7d482c2941a650ec3c3e2159723fe17399f9e6b03b246314e3abcb4f9b4aee5180d710cdd86df6f6ff2683dc6f30f9227ab926e918c8f4 SHA512 7aa07a5cfa72bd5ab4623e334461749371c312156224c60d134b96827ec45a599a71f48221e8ff7f0baf7de09949d988073cbcd9d0fb9da870e6a405f963b7fa
+EBUILD singularity-3.7.2.ebuild 1922 BLAKE2B a3dc8db3e639bb4283e0bdc67ed5895615e2f46eabad0f7d0d0adf56036c4d5559e0fe3d984e3a6aeef048769b265c22dec4465078be44f333ad75044f77e468 SHA512 f7a2963da1560cfbc5a94f77a8c54b3417615ae45295aa20000ab53fa9c9538b1b759a9f60b9bb73a43f2133a7127f7d047f1318ba8f4407abc04988fc1e39c4
 MISC metadata.xml 451 BLAKE2B 0cca32721561e4100348cd884b88edad067a426736df27d4be6926525f9dd1315387dbefff84b983e69ab1972a44cd3a3a2c643bae676b413dab3482005d4ceb SHA512 da6f640f7df71bfe98fdabfe8ea69b1929b80b3c23d869dc496515a76d3f76c5d89d38843faf850184ddd7f624dd1e821dd50103f92e81aeb620a4bcd7151609
diff --git a/sys-cluster/singularity/singularity-3.7.0.ebuild b/sys-cluster/singularity/singularity-3.7.0.ebuild
deleted file mode 100644
index 23232305c173..000000000000
--- a/sys-cluster/singularity/singularity-3.7.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 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
-}
diff --git a/sys-cluster/singularity/singularity-3.6.4.ebuild b/sys-cluster/singularity/singularity-3.7.2.ebuild
index 23232305c173..50873aff393c 100644
--- a/sys-cluster/singularity/singularity-3.6.4.ebuild
+++ b/sys-cluster/singularity/singularity-3.7.2.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 @@ 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.
+# Do not complain about CFLAGS etc. since go projects do not use them.
 QA_FLAGS_IGNORED='.*'
 
 COMMON="sys-libs/libseccomp"
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index fb8faca858c5..2a31c4accb35 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -6,6 +6,6 @@ AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf4
 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
 DIST slurm-20-11-0-1.tar.gz 8762691 BLAKE2B 1e24a04b3faf97f4df98bd982d67d47f79670b863f466326e45e00fac0b99124122e94e30054a97471e4337234cbd213806791bdd5b3bddfeb05bef55f42931e SHA512 9a57f2610f7294ba6cd265746b874e32a7930100f30c0adf41d95b261787c441bdcacaa641f0b9785150b94fc7d6b5b7608ec618f668bffcae6f774752f17678
-EBUILD slurm-20.11.0.1-r100.ebuild 7907 BLAKE2B ab2d9574430f650d9e216020bd7b68f7de3ddbd6d743cf422cfc57005705f6b0f021b818914ff2bf49bb0aa9b72c7866641e021f197f4e46b36ecea1c34dfe4b SHA512 fb202e3ca41c54a4f05c1bfce2770aa50b99bca9018a1e8e544316b2927a343bf4e727fbf004dd939ef24aade817633cff8f3e2d69c5dfcc7424c5ea4f95c4ee
-EBUILD slurm-20.11.0.1.ebuild 7764 BLAKE2B 252d3cb8c68645d40b1d0bfe28295d896985787c7b66213569f55ce39d40a2fbfdcac327963453e499948c11f81e9f278864a3174eb9fe3cf86bbe10b59af094 SHA512 3b69f91188cbd5cd436989c2f561c5cf553c2522c7fb46b072fd4b9e55f60f619a286f237f752f0c5072623989cbc7a5c89191a2b6d8144582219f1f1b7fc03c
+EBUILD slurm-20.11.0.1-r100.ebuild 7907 BLAKE2B 19d3c67a6f2eeb6038c728089c282138916a535f7672e5239de55a5bd281f9e2c78f7cf862c58ffa084c05aec36f6eff90cebc539f0f9bcbf73419e3398e1259 SHA512 59574c1f1709d4e578ab67c89a0bf284f428ca02e02132ba189beab2830611095277193df9b059e2d2f13792ee7f848d2612b53f07a95078322610e3b063764c
+EBUILD slurm-20.11.0.1.ebuild 7764 BLAKE2B f267fa66d56aa9302be62388baa58997a8db7022251a3a72d55dc5d387a3f21682274501385c8c5139077278a1516c31799188033c367db885c80b094bf30089 SHA512 a0bcfcb35b9931b3b9baec0e8e25426e24db6da89b45af81636b3c0b04031846681b870aa7c9de4be60ac6f3b123c6c905002becfbbb7873f6c0d40e188c0c9f
 MISC metadata.xml 1091 BLAKE2B fcacf65a8cde25fa09e7ab996cf85987f39879808819f7e6ec56de3e6535ed66adcdba88e346afd947753fee93b6014353e5418cc61b0e2bff196fb8492841e6 SHA512 3f1364da6cb3d8af99c2c061ee9667a0432d2ed440562b0c1c69815e4bc191bd68bcdfc8a3ce2e358d8b4171d2c7262e2aebd63e7788a5164a2e28b627ffd988
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild
index ab498c397291..860e614604ab 100644
--- a/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild
+++ b/sys-cluster/slurm/slurm-20.11.0.1-r100.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
@@ -21,7 +21,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT}
+inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
 
 DESCRIPTION="A Highly Scalable Resource Manager"
 HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
@@ -213,7 +213,7 @@ src_install() {
 		sreport sacctmgr squeue scancel sshare sbcast sinfo \
 		sprio sacct salloc sbatch srun sattach sdiag sstat
 	# install systemd files
-	systemd_newtmpfilesd "${FILESDIR}/slurm.tmpfiles" slurm.conf
+	newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf
 	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
 }
 
diff --git a/sys-cluster/slurm/slurm-20.11.0.1.ebuild b/sys-cluster/slurm/slurm-20.11.0.1.ebuild
index e74fe466f7ea..78837b1cd3d2 100644
--- a/sys-cluster/slurm/slurm-20.11.0.1.ebuild
+++ b/sys-cluster/slurm/slurm-20.11.0.1.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
@@ -19,7 +19,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT}
+inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
 
 DESCRIPTION="A Highly Scalable Resource Manager"
 HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
@@ -205,7 +205,7 @@ src_install() {
 		sreport sacctmgr squeue scancel sshare sbcast sinfo \
 		sprio sacct salloc sbatch srun sattach sdiag sstat
 	# install systemd files
-	systemd_newtmpfilesd "${FILESDIR}/slurm.tmpfiles" slurm.conf
+	newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf
 	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
commit	7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree	56fae051db521b8fce8014cbc8b11484885b14b3 /sys-cluster
parent	6d691ad5b6239929063441bbd14c489e92e7396e (diff)