gentoo resync : 27.03.2021

10 files changed, 3 insertions, 426 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 3268dd16c7c7..6117a616d790 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index cf77fd8cb86c..5635a87f884e 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -19,7 +19,6 @@ AUX ceph-15.2.0-rocksdb-cmake.patch 703 BLAKE2B 1c99a1a89be22cedf39326cbf7d6e381
 AUX ceph-15.2.2-systemd-unit.patch 682 BLAKE2B 1ec8c0a23fc7d572c79ca24aaf82100e108e2bb4f99ca2c695efcbefdc9543f853fff16c3f7b4636a38260e5ab9251228e9da1bf1a5cbc7a237c78e52bc8bf3a SHA512 8be953b7873f7e45f7f859ac9074b0f446a2ae6954997f93bcb2bdb2c1d85d36bb3fee571b3e57590131bbca3ff202911e0b31340cec8e39d447163c36bfdc1b
 AUX ceph-15.2.3-spdk-compile.patch 376 BLAKE2B 073cee321c1a99f9a161fbec8f9e33bb13df14574e48300d1331dc2b31353f1ccac40f723de501c6e33bc6f065f4b4500048de9d9b0bae646c76ba715eab580a SHA512 c2890202820d022bf610d6317b0a6e3521da2060bb12e39ba1a5c347096d5688adcd98b1cbf25ad33ddfa78d3cae42669c21f4e1dbe6eceb150e4ee17bece582
 AUX ceph-15.2.4-system-uring.patch 2170 BLAKE2B aabfb8c5085de8d69c9afedd20cb99161fd556148f1e6c88c35ed1bdb83dafe28ddbe75ac1e579e23d0728856bb2c650895ab4c0791b0f8e6acf2652822b14f1 SHA512 8258661e56b5360f4260fdd29b07bac4d415068a112b61ca8c55c529fb1593d8d61a0d59a4eec8f1567b97167c058082198d008f55f8ee701cb46489df5f7823
-AUX ceph-15.2.5-glibc-2.32.patch 511 BLAKE2B d2327c3108355d6b25bd020539cb938e5969def1c0b6392cba546b0aa8b555388f5cab6534aebfde17a55e59baf8a0b6cbea2be77cbac5062b7f89c296a53a60 SHA512 491c4a8d4120c6620960d349effd76fcc780995c7a0ed4e9264642e40970a05c4238952a2b8355ad35268f0a9410be9bc38f6c77ddb8f55ad72adf294a0043c6
 AUX ceph-15.2.5-missing-includes.patch 435 BLAKE2B 66c4b30629203694bd0d5c82f5977a0576c67b3cb14d678e6ab60bc7a933e65306b122e253856bae7862637564e14a93b9cd2c48c9b510e01cc316fc7be9f218 SHA512 84de66f64ea96cd59b40dfb5b8c5d093fe49df1139b45ad9d1bd6b9ebd2f1200b6e931adcf032639a4995af322cf05c1ef9050eb1cb6673e29e040d4e348b3d5
 AUX ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch 901 BLAKE2B 63c2fa7df27a1e60a88a7a3c3509aa834f4d67b1935958aa821db1c2136146819bfa8ae51a3156ba9ae4669c09eee8103181a4dc6a313fb2aee6e2804b6066a9 SHA512 1b681f50d646c04b7e22b214884bcee52866576b22370c32dec034d2119bd86cf767f48f2699ad482686c79c7b2e6b8d8f699f5ee1a58431dd6f1d0f2170b3ec
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
@@ -42,6 +41,6 @@ DIST ceph-15.2.10.tar.gz 148500214 BLAKE2B c24679bc5e41da45b093dcd01fa103fd3dff4
 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-14.2.18.ebuild 10515 BLAKE2B 85f6922697dd9de98808319a1a7d1063efb62a1bdeb03413e92db79ac976a009dd3d48b48ac1c49c9cf06696af27da9e836adc7ec1b43413862a0a074bf6b8ae SHA512 e385fbf5b06da07bba48ac5a492dc329558e7749f38f906cbf3662276d6efa55083907613bcc0087af0635a6f80f5dc67ac0d581c214a6e2815eb457f76b2012
-EBUILD ceph-15.2.10.ebuild 10868 BLAKE2B 16bb7344e46c891c4727c85b9d345f62d92b61ffea615a67cc4e28426b1b1c652bfcdb36f81f429fe17086fda8ce85e8350bdaeb668bebaa193669fa55b91d75 SHA512 61116b159396fac0d65b9810722f32cb1c9ee4a07b9c909f44b82169dd430a2635491d337f56b0b98b0899bc72fb6cfb06279f1fdcb605abbf17cf080ed2a040
+EBUILD ceph-15.2.10-r1.ebuild 10863 BLAKE2B 5c0396ea965b1b642989d6c1d311ac87ebdb66a75f17d1c462ebd8df41b2d135009cbd25a7a95dba248811fd1bb04f80feca25aa719ffc05498aac7395c39c54 SHA512 63b2d038a3d274a7c2aeec8322898f2aeacd76a95ef2d848aec84161ba2e1ab5dbe23ee9a6677eba41065f210333100d1aed437ceef6fad6af4e32e5d84895d6
 EBUILD ceph-15.2.9-r1.ebuild 10868 BLAKE2B 16bb7344e46c891c4727c85b9d345f62d92b61ffea615a67cc4e28426b1b1c652bfcdb36f81f429fe17086fda8ce85e8350bdaeb668bebaa193669fa55b91d75 SHA512 61116b159396fac0d65b9810722f32cb1c9ee4a07b9c909f44b82169dd430a2635491d337f56b0b98b0899bc72fb6cfb06279f1fdcb605abbf17cf080ed2a040
 MISC metadata.xml 1980 BLAKE2B 3250403d1ba99c5b26b6dba381d2a3b01649ab23a2e2eb1cbc94a49888851d4faf19fc85ca54ad4a4c64394d8c00cefb571e27979c3482f0a60f2fc891476305 SHA512 343a75b9b4fdf88d7ad91b9a0fff154041a2a56ed0d07204b3af61b8605da969a736b6ef9a4b334a5f7d5257b9bbcbb705fd20f6def7dab767f4c9d9b600f2c4
diff --git a/sys-cluster/ceph/ceph-15.2.10.ebuild b/sys-cluster/ceph/ceph-15.2.10-r1.ebuild
index 2772dbbadd51..d90c82927bc0 100644
--- a/sys-cluster/ceph/ceph-15.2.10.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.10-r1.ebuild
@@ -145,7 +145,7 @@ RDEPEND="${DEPEND}
 		dev-python/jsonpatch[${PYTHON_USEDEP}]
 		dev-python/more-itertools[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		<dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/routes[${PYTHON_USEDEP}]
 		diskprediction? (
diff --git a/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch b/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch
deleted file mode 100644
index f8f7fad8b658..000000000000
--- a/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -NaurBwdp a/src/global/signal_handler.h src/global/b/signal_handler.h

---- a/src/global/signal_handler.h	2020-10-01 03:15:48.208164979 +0700

-+++ b/src/global/signal_handler.h	2020-10-01 03:15:40.655244081 +0700

-@@ -20,11 +20,7 @@

- 

- typedef void (*signal_handler_t)(int);

- 

--#ifndef HAVE_REENTRANT_STRSIGNAL

--# define sig_str(signum) sys_siglist[signum]

--#else

- # define sig_str(signum) strsignal(signum)

--#endif

- 

- void install_sighandler(int signum, signal_handler_t handler, int flags);

- 

diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index ec8071c92530..3fe463bcc480 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,10 +1,7 @@
 AUX drbd-utils-8.0.rc 3073 BLAKE2B 982d8e20bba38259cc9cb37c922a2653e65471cd7fc9a66ace58cfaaee7989b035076dac523484e0b9ba74a89e1a90f06844234aeb703556beaff66fc6564680 SHA512 9cd9de6d41552f080f3d590630ecd1686ea32b9e9db3b78a132e7fb55318a338331c09af5d80ba885d48a001ee3f7a6f791ddd806e834d2a7c72f01a00ec2f6c
-AUX drbd-utils-8.9.6-sysmacros.patch 1749 BLAKE2B 8d086d294c99f21c369821750b5772319f6cfe687251843cf741ac8c87f958986b2d464558b0dbe275e7a280eec9bc5ab6ce72a781d5c6b9f8d5dc25fac36855 SHA512 574c759a2125f2dbf240ab310cc57425773d75ec5e508693d09f506df704329c8a6e367f5621df5bb43fc1af22e65da1bd7631cb26715147b70c8704ab797d24
 AUX drbd-utils-9.15.1-run-lock.patch 564 BLAKE2B f09107b53ee522976c40a91a4d6e267f1effb2bf3afadf77b2138af2031c59a88debc40ed06e1fe0d6fafe6773f3bf5358c315081eca3182853bf132632c617f SHA512 62faedab4668d31d86cfb634bde68aaeb7d9329d0e6948d46e2c0a90cf1988b68438ef1b71f9d84a4dd2230f0cef5179be80cf4a5aef22c30f59a0ab2906523c
 AUX drbd-utils-9.15.1-sysmacros.patch 950 BLAKE2B d5a81c0e13715c595ec25ae8e78a8176b46b437e01efa8d3a44d3ad6b143ac6ae723fa7f563b5d930d6b9dd82107ed02b5d67406732e2ff2675e1fe180cba657 SHA512 471877458ac9f8fbfe6c223f35ec51e487dfe0e8448ccbc17aabcfec002e9eeb1a3ab6d3477cce7e9791cab9b9db506519c409eee91bf45069fd35bb8bc81d58
 AUX run-lock.patch 564 BLAKE2B 53062442dcc45c71eedde79e9d09b543ca6b6b48f552a5de95c14e5abc89296f111a11ffe109723de1602aab39dfccdfb016734b4ffceecb0a7bf94aa6ed8cea SHA512 779ad53c9f019b9dcc748177d6017ca06f1b450bf0889307c9660c574c09414964e4c5e4d6f2f3e8fc540ba14a1d489d09991b813af1581b2f6cd4ba491455ab
-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-r1.ebuild 2692 BLAKE2B 5edf2a0685826f55b27eb6d7fba7f5451ee96c34a179cca644144202a44b2e2b824fb97ccdd135b6514822f2ac88d9063f7622fa89d8bc8edf1d033861ba5ae9 SHA512 c671b8ae9954e77f900269771aa830ca841b548dc69ac8017ce6f1d92c3d3585255ca82ec4fc9a7088d60e196a5f59fefdbd805ace3646187c18302c6eae2147
-MISC metadata.xml 677 BLAKE2B 79183e6930396061e7cf5c881ced8b4e3082a2b0dfdb4520e9de6afd54269b35ba972efd7dd3c3bd67cd103fd7d40693575a9d87b7b437438d5226e6e3453b5e SHA512 b97a7c5bb6ffe6de872f535d595507cd155923c920b9e7836f9a50afa992300b0b27d43805491cbbe6c348ecf99fc24367c375b6416dae73bffb4b6706f4b89a
+MISC metadata.xml 616 BLAKE2B 8e32a41be277b39c78fa33a8907a62bd4aa5571a358728de67c0e284161cc7a865c4b0f35656d59af1580f1641551623b5bae9d6f37b793985219e531a2c5733 SHA512 97070dfdf6732630859a1d9590ce6893f3bb6f47096ef25820c79b00d236df950a6d0b287d0ee42f2ffaa56d38dfa984bd7a1efa28a391bd2d4b5077409cd61b
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
deleted file mode 100644
index 8295be34e7bc..000000000000
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils multilib udev versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${P/_/}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="amd64 x86"
-IUSE="heartbeat pacemaker +udev xen"
-SLOT="0"
-
-DEPEND="heartbeat? ( sys-cluster/heartbeat )
-	pacemaker? ( sys-cluster/pacemaker )
-	udev? ( virtual/udev )
-	!!sys-cluster/drbd"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/}"
-
-src_prepare() {
-	# respect LDFLAGS, #453442
-	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
-		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
-		-i user/*/Makefile.in || die
-
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/*/Makefile.in || die
-
-	# correct install paths (really correct this time)
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
-		scripts/Makefile.in || die
-
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-
-	epatch "${FILESDIR}"/run-lock.patch
-
-	# bug 616758
-	epatch "${FILESDIR}/${P}"-sysmacros.patch
-
-	autoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		--with-bashcompletion \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools install-doc
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
-
-	dodoc scripts/drbd.conf.example
-
-	dosym /usr/sbin/drbdadm /sbin/drbdadm
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch b/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch
deleted file mode 100644
index 135f7a8b3ff4..000000000000
--- a/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ruN drbd-utils-8.9.6.orig/user/shared/shared_tool.c drbd-utils-8.9.6/user/shared/shared_tool.c
---- drbd-utils-8.9.6.orig/user/shared/shared_tool.c	2018-05-04 20:13:51.959412972 +0200
-+++ drbd-utils-8.9.6/user/shared/shared_tool.c	2018-05-04 20:14:12.979679788 +0200
-@@ -8,6 +8,7 @@
- #define _FILE_OFFSET_BITS 64
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
- #include <fcntl.h>
-diff -ruN drbd-utils-8.9.6.orig/user/v83/drbdadm_adjust.c drbd-utils-8.9.6/user/v83/drbdadm_adjust.c
---- drbd-utils-8.9.6.orig/user/v83/drbdadm_adjust.c	2015-02-11 17:33:00.000000000 +0100
-+++ drbd-utils-8.9.6/user/v83/drbdadm_adjust.c	2018-05-04 20:15:08.060378940 +0200
-@@ -25,6 +25,7 @@
- #define _GNU_SOURCE
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
- #include <unistd.h>
-diff -ruN drbd-utils-8.9.6.orig/user/v84/drbdadm_adjust.c drbd-utils-8.9.6/user/v84/drbdadm_adjust.c
---- drbd-utils-8.9.6.orig/user/v84/drbdadm_adjust.c	2015-05-08 15:16:31.000000000 +0200
-+++ drbd-utils-8.9.6/user/v84/drbdadm_adjust.c	2018-05-04 20:14:42.192050588 +0200
-@@ -27,6 +27,7 @@
- #define _FILE_OFFSET_BITS 64
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
- #include <unistd.h>
-diff -ruN drbd-utils-8.9.6.orig/user/v9/drbdadm_adjust.c drbd-utils-8.9.6/user/v9/drbdadm_adjust.c
---- drbd-utils-8.9.6.orig/user/v9/drbdadm_adjust.c	2018-05-04 20:13:51.960412985 +0200
-+++ drbd-utils-8.9.6/user/v9/drbdadm_adjust.c	2018-05-04 20:14:12.980679801 +0200
-@@ -27,6 +27,7 @@
- #define _FILE_OFFSET_BITS 64
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
- #include <unistd.h>
diff --git a/sys-cluster/drbd-utils/metadata.xml b/sys-cluster/drbd-utils/metadata.xml
index 82f50565f990..7e160adde1c7 100644
--- a/sys-cluster/drbd-utils/metadata.xml
+++ b/sys-cluster/drbd-utils/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="xen">Enable Xen integration</flag>
 		<flag name="pacemaker">Enable Pacemaker integration</flag>
-		<flag name="heartbeat">Enable Heartbeat integration</flag>
 	</use>
 	<longdescription>
 		The user space tools to control, configure the DRBD driver, as well as integration programs and scripts
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 27982253c555..f9fa8605b41e 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -6,6 +6,5 @@ AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf4
 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
 DIST slurm-20-11-0-1.tar.gz 8762691 BLAKE2B 1e24a04b3faf97f4df98bd982d67d47f79670b863f466326e45e00fac0b99124122e94e30054a97471e4337234cbd213806791bdd5b3bddfeb05bef55f42931e SHA512 9a57f2610f7294ba6cd265746b874e32a7930100f30c0adf41d95b261787c441bdcacaa641f0b9785150b94fc7d6b5b7608ec618f668bffcae6f774752f17678
-EBUILD slurm-20.11.0.1-r1.ebuild 7741 BLAKE2B a9c6d0945fc2a4a0214e175a2553110fe0be0125f4eff168469ea29096307c2160ccc02bcf16b3d82396a713e77472f293bb2d0036f4d4ae6c9f321a517a9afc SHA512 03f20df0c5b5cfc9c083210b9400962ae93d52d00512c848fe7e1532aa3a47d4d5c88c73b9b37f42765789e7e0c893064c186106baf28ce05527146f3942c270
 EBUILD slurm-20.11.0.1-r101.ebuild 7884 BLAKE2B b852a52fd4ecc9a9d258c0365a926ce751c61049c1b7203f03a3535c56bd6592cdb9c554ffc257a55c08fc9582ff886e8ead998106a99da5cdfa4a15e271f13a SHA512 f4463448765e32713273cd0027b924464616c7651145f680dc655a1e62184fe9861004c15154b3eaa99fbd614df0ccf42acddfe4dbf9717b605b56420ed50a66
 MISC metadata.xml 1091 BLAKE2B fcacf65a8cde25fa09e7ab996cf85987f39879808819f7e6ec56de3e6535ed66adcdba88e346afd947753fee93b6014353e5418cc61b0e2bff196fb8492841e6 SHA512 3f1364da6cb3d8af99c2c061ee9667a0432d2ed440562b0c1c69815e4bc191bd68bcdfc8a3ce2e358d8b4171d2c7262e2aebd63e7788a5164a2e28b627ffd988
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild
deleted file mode 100644
index 9601550773f2..000000000000
--- a/sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
-	INHERIT_GIT="git-r3"
-	MY_P="${P}"
-else
-	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
-		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
-	else
-		MY_PV=$(ver_rs 1-4 '-') # stable releases
-	fi
-	MY_P="${PN}-${MY_PV}"
-	INHERIT_GIT=""
-	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X"
-
-COMMON_DEPEND="
-	!sys-cluster/torque
-	!net-analyzer/slurm
-	!net-analyzer/sinfo
-	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
-	mysql? (
-		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
-		slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
-		)
-	munge? ( sys-auth/munge )
-	pam? ( sys-libs/pam )
-	lua? ( dev-lang/lua:0= )
-	!lua? ( !dev-lang/lua )
-	ipmi? ( sys-libs/freeipmi )
-	json? ( dev-libs/json-c:= )
-	amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) )
-	hdf5? ( sci-libs/hdf5:= )
-	numa? ( sys-process/numactl )
-	ofed? ( sys-fabric/ofed )
-	ucx? ( sys-cluster/ucx )
-	X? ( net-libs/libssh2 )
-	>=sys-apps/hwloc-1.1.1-r1
-	sys-libs/ncurses:0=
-	app-arch/lz4:0=
-	sys-libs/readline:0="
-
-DEPEND="${COMMON_DEPEND}
-	html? ( sys-apps/man2html )"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-user/slurm
-	acct-group/slurm
-	dev-libs/libcgroup"
-
-REQUIRED_USE="torque? ( perl )"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
-
-RESTRICT="test"
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	tc-ld-disable-gold
-	default
-
-	# pids should go to /var/run/slurm
-	sed \
-		-e 's:/tmp:/var/tmp:g' \
-		-e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
-		-e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
-		-e "s:StateSaveLocation=.*:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
-		-e "s:SlurmdSpoolDir=.*:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
-		-i "${S}/etc/slurm.conf.example" \
-		|| die "Can't sed for /var/run/slurmctld.pid"
-	sed \
-		-e "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
-		-i "${S}/etc/slurmdbd.conf.example" \
-		|| die "Can't sed for /var/run/slurmdbd.pid"
-	# gentooify systemd services
-	sed \
-		-e 's:sysconfig/.*:conf.d/slurm:g' \
-		-e 's:var/run/:run/slurm/:g' \
-		-e '/^EnvironmentFile=.*/d' \
-		-i "${S}/etc"/*.service.in \
-		|| die "Can't sed systemd services for sysconfig or var/run/"
-
-	sed -e '/AM_PATH_GTK_2_0/d' -i configure.ac || die
-
-	hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--with-hwloc="${EPREFIX}/usr"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
-	use mysql || myconf+=( --without-mysql_config )
-	use amd64 && myconf+=( $(use_with netloc) )
-	econf "${myconf[@]}" \
-		$(use_enable debug) \
-		$(use_enable pam) \
-		$(use_enable X x11) \
-		$(use_with munge) \
-		$(use_with json) \
-		$(use_with hdf5) \
-		$(use_with ofed) \
-		$(use_with ucx) \
-		$(use_enable static-libs static) \
-		$(use_enable multiple-slurmd)
-
-	# --htmldir does not seems to propagate... Documentations are installed
-	# in /usr/share/doc/slurm-2.3.0/html
-	# instead of /usr/share/doc/slurm-2.3.0.2/html
-	sed \
-		-e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
-		-i doc/html/Makefile || die
-	if use perl ; then
-		# small hack to make it compile
-		mkdir -p "${S}/src/api/.libs" || die
-		mkdir -p "${S}/src/db_api/.libs" || die
-		touch "${S}/src/api/.libs/libslurm.so" || die
-		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${S}" || die
-		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
-	fi
-}
-
-src_compile() {
-	default
-	use pam && emake -C contribs/pam
-	if use perl ; then
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" perl-module_src_compile
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
-		cd "${S}" || die
-	fi
-	use torque && emake -C contribs/torque
-}
-
-src_install() {
-	default
-	use pam && emake DESTDIR="${D}" -C contribs/pam install
-	if use perl; then
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" perl-module_src_install
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
-		cd "${S}" || die
-	fi
-	if use torque; then
-		emake DESTDIR="${D}" -C contribs/torque
-		rm -f "${D}"/usr/bin/mpiexec || die
-	fi
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-	# install sample configs
-	keepdir /etc/slurm
-	insinto /etc/slurm
-	doins \
-		etc/prolog.example \
-		etc/cgroup.conf.example \
-		etc/slurm.conf.example \
-		etc/slurmdbd.conf.example
-	exeinto /etc/slurm
-	keepdir /etc/slurm/layouts.d
-	# install init.d files
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
-	# install conf.d files
-	newconfd "${FILESDIR}/slurm.confd" slurm
-	# install logrotate file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" slurm
-	# install bashcomp
-	newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
-	bashcomp_alias scontrol \
-		sreport sacctmgr squeue scancel sshare sbcast sinfo \
-		sprio sacct salloc sbatch srun sattach sdiag sstat
-	# install systemd files
-	newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf
-	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
-}
-
-pkg_preinst() {
-	if use munge; then
-		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die
-	fi
-}
-
-create_folders_and_fix_permissions() {
-	einfo "Fixing permissions in ${@}"
-	mkdir -p ${@} || die
-	chown -R ${PN}:${PN} ${@} || die
-}
-
-pkg_postinst() {
-	paths=(
-		"${EROOT}"/var/${PN}/checkpoint
-		"${EROOT}"/var/${PN}
-		"${EROOT}"/var/spool/${PN}/slurmd
-		"${EROOT}"/var/spool/${PN}
-		"${EROOT}"/var/log/${PN}
-		/var/tmp/${PN}/${PN}d
-		/var/tmp/${PN}
-		/run/${PN}
-	)
-	local folder_path
-	for folder_path in ${paths[@]}; do
-		create_folders_and_fix_permissions $folder_path
-	done
-	echo
-
-	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
-	elog "through a (javascript enabled) browser to create a configureation file."
-	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
-	echo
-	elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
-	elog "Your kernel must be compiled with the wanted cgroup feature:"
-	elog "    For the proctrack plugin:"
-	elog "        freezer"
-	elog "    For the task plugin:"
-	elog "        cpuset, memory, devices"
-	elog "    For the accounting plugin:"
-	elog "        cpuacct, memory, blkio"
-	elog "Then, set these options in /etc/slurm/slurm.conf:"
-	elog "    ProctrackType=proctrack/cgroup"
-	elog "    TaskPlugin=task/cgroup"
-	einfo
-	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
-	for folder_path in ${paths[@]}; do
-		ewarn "    ${folder_path}"
-	done
-}