gentoo resync : 30.05.2020

5 files changed, 6 insertions, 801 deletions

diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 32165f939a1b..cbc32c18e168 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -5,12 +5,6 @@ AUX slurm.tmpfiles 31 BLAKE2B f08dbc53517cc15463be5264505d858fcf1f2196565868d164
 AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf48433a54fd34f49d2f4f95b5c6dd9e4ab1f40938c274be6be2e88cdb8959ecb12b4a86d07bc0a5bc86 SHA512 4356552630d1a154bbf369012c0315baf08b5b98ff6411d66ea3b1b039bfff5f105091b110e8fa1e64209eb0990038abda86d980cf2316ca97a5c10a43243df6
 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
-DIST slurm-19-05-4-1.tar.gz 8446001 BLAKE2B d3b1524a72d7969b14788b93c7d64b03faf159b71b1ed8fb30782980b7b39e9f4a1d1435f4fbdce722ed9585e7d3285f9a84322c5a5d2f44d5e084bb38019ae4 SHA512 ecee26b23fc72ea4b6eb3039aada1814b5932d75eaf61501a31b97ac8f7b600864f2429a36de068f1f1cde178fa1383f2c53192af5b1a62766e3ffe48be4395c
-DIST slurm-19-05-5-1.tar.gz 8447611 BLAKE2B 052d6a9c7e196546a2a7ca0c8e324d3728177e06a6b82150d6888cf5f6aa4b0f6612e09e928b2224be412971b4e40318d3b03e27068ed7c2256036a417ebf9c5 SHA512 612ce1c476de3d08d4003c48df65883880e697652ef8b0847cd87719e91196f489409b27c67ef040ab9ffe0c9d824cdae6441608e9af9619abcf11ebf0d464be
-DIST slurm-20-02-0-1.tar.gz 8657581 BLAKE2B 402bb9c9a87055940ca525eb5c5e37cb62ad8957ae626682109e885834e6e17e93e3964f65b66c17c5ecc611271bd19709290f7ab79398c8c6b5aa762e476b50 SHA512 2c27133c8598cbb4ad0e6d186732f83cfb1b12460fddd89646b41a4d7c8239afff795db22345216f76ba5b666f1d5c2642dcfcbf38285f66d748424b60f9598a
-DIST slurm-20-02-1-1.tar.gz 8660993 BLAKE2B 8f3a6ce0177410ae25490bb995fc14696002a22a8a0ec82d97f697fe5898c8c7d07fe2ad4ab824e1056f3be59adb2cb30b3e89a50a529e786a59aacab5cc6673 SHA512 a0974f52a561dc7596a9a7aeea4f09075a97dc30c729e59aef625584264e5b4ae003466275be379bae42a2a0e0be0c910b9349d3e7c6631f18969518ac9a0910
-EBUILD slurm-19.05.4.1.ebuild 7964 BLAKE2B 448fb69fe8bf9cfe76329910c7bf14e5725fe3b19da23cee5cf7cd3f784e92d70477a881374cabc042679f2ac280ffe216814f4a402bb76101c3117ff7c06b80 SHA512 fe105bd1dd4797935fab2487f47bb57e91526760e4f7099624bafa42c916d0ffe2a839b8d0f75b45f01551e58d534ac5eb3a11c139cc072de87e8e224be50a79
-EBUILD slurm-19.05.5.1.ebuild 7957 BLAKE2B 6626fe4f6d3aa9de349c9526b8d267d06b22c0b77b3902c6d12d563f874d01984743e5f2d11e0c791d322f1f951115c8c750b8ef6bc75bc37efa686d9075746e SHA512 85308f3cb07b6db25391d23778999f3341705b40ee6b11c25eada41ceb8c62b5947be9e8ebae2fef37cc43e26e3bed6600d699ec94b867117ca0b91704fd6156
-EBUILD slurm-20.02.0.1.ebuild 7943 BLAKE2B 16bb5fa3d8fc4f7b4c4f514b4be8376127309c65a866cffd33ec524b97826c1d0b417f7a11a3a5d628c1b623f9ad54550ad337a0a8bcf0049d646b8b5321f725 SHA512 0c3c6e85f9018ce6cbe7c8bf35532286f808d1db95f087aec294b13c00568d367f2ceec642a38afc548d8b78197345ac2e927ba304d3339973a2c08bbf600a04
-EBUILD slurm-20.02.1.1.ebuild 7943 BLAKE2B 16bb5fa3d8fc4f7b4c4f514b4be8376127309c65a866cffd33ec524b97826c1d0b417f7a11a3a5d628c1b623f9ad54550ad337a0a8bcf0049d646b8b5321f725 SHA512 0c3c6e85f9018ce6cbe7c8bf35532286f808d1db95f087aec294b13c00568d367f2ceec642a38afc548d8b78197345ac2e927ba304d3339973a2c08bbf600a04
+DIST slurm-20-02-3-1.tar.gz 8686608 BLAKE2B bbb1776c6c39ea81d636f0bf8f8534c508c1842e93d5bd70e49f8b63cf78b9d7be46f6cf2855517ebaaf294d00048f65b17dba91f2316ab0706342f68f7c2c3a SHA512 4c9f847b18052f9373694f91346eb8e0532c3a71060e5b8e4fd837534014ad5813adb93d2b60f7047e355f57919f2bef59b10c6540e13576aaa47ee0ba2b5a22
+EBUILD slurm-20.02.3.1.ebuild 7983 BLAKE2B ccd5ca18d4f4b55a81eed7d621b4457e7fc64a833724d47b50bae87e5e6a0ec00ff41b86fdb41a42b427e286a94cbb5007c833143eb646e71637da537afbd9fd SHA512 4ce444a5c5298f7f87f56ee50f2a62d20642dc85b8554508bd7d7b65122d2dbc3483c2386352db35d3c66b6f5438db2b6812cc05ae41cc42a398744ec9537a47
 MISC metadata.xml 1199 BLAKE2B b52e7cae7554d439e7f25da2a80d98993d5c7f7abd5ba8b76c09bf60731b035040f976ac1bfc3c153f81b8feed89e2ceb5e6b676c25cc7b6219c4bcd87bd7e50 SHA512 8f48d582e61789373fc07ffd1db123cb8f43d337b03611972e480179ca5b43f2866392203f470d3d69784f2aae79cbcffdf583cba0aa4a9c25969f2c72a3f55f
diff --git a/sys-cluster/slurm/slurm-19.05.4.1.ebuild b/sys-cluster/slurm/slurm-19.05.4.1.ebuild
deleted file mode 100644
index e412669c3edf..000000000000
--- a/sys-cluster/slurm/slurm-19.05.4.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2020 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"
-	SRC_URI=""
-	KEYWORDS=""
-	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-3 '-') # 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}
-
-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/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="${OMMON_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
-	eapply "${FILESDIR}"/disable-sview.patch
-	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/"
-
-	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/bluegene.conf.example \
-		etc/cgroup.conf.example \
-		etc/slurm.conf.example \
-		etc/slurmdbd.conf.example
-	exeinto /etc/slurm
-	keepdir /etc/slurm/layouts.d
-	insinto /etc/slurm/layouts.d
-	newins etc/layouts.d.power.conf.example power.conf.example
-	newins etc/layouts.d.power_cpufreq.conf.example power_cpufreq.conf.example
-	newins etc/layouts.d.unit.conf.example unit.conf.example
-	# 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
-	systemd_newtmpfilesd "${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
-}
diff --git a/sys-cluster/slurm/slurm-19.05.5.1.ebuild b/sys-cluster/slurm/slurm-19.05.5.1.ebuild
deleted file mode 100644
index 770a3e533907..000000000000
--- a/sys-cluster/slurm/slurm-19.05.5.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2020 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"
-	SRC_URI=""
-	KEYWORDS=""
-	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-3 '-') # 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}
-
-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/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="${OMMON_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
-	eapply "${FILESDIR}"/disable-sview.patch
-	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/"
-
-	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
-	insinto /etc/slurm/layouts.d
-	newins etc/layouts.d.power.conf.example power.conf.example
-	newins etc/layouts.d.power_cpufreq.conf.example power_cpufreq.conf.example
-	newins etc/layouts.d.unit.conf.example unit.conf.example
-	# 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
-	systemd_newtmpfilesd "${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
-}
diff --git a/sys-cluster/slurm/slurm-20.02.1.1.ebuild b/sys-cluster/slurm/slurm-20.02.1.1.ebuild
deleted file mode 100644
index a2a4e4bd829b..000000000000
--- a/sys-cluster/slurm/slurm-20.02.1.1.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2020 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-3 '-') # 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}
-
-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/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="${OMMON_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
-	insinto /etc/slurm/layouts.d
-	newins etc/layouts.d.power.conf.example power.conf.example
-	newins etc/layouts.d.power_cpufreq.conf.example power_cpufreq.conf.example
-	newins etc/layouts.d.unit.conf.example unit.conf.example
-	# 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
-	systemd_newtmpfilesd "${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
-}
diff --git a/sys-cluster/slurm/slurm-20.02.0.1.ebuild b/sys-cluster/slurm/slurm-20.02.3.1.ebuild
index a2a4e4bd829b..1872358a4ee6 100644
--- a/sys-cluster/slurm/slurm-20.02.0.1.ebuild
+++ b/sys-cluster/slurm/slurm-20.02.3.1.ebuild
@@ -11,7 +11,7 @@ else
 	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
 		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
 	else
-		MY_PV=$(ver_rs 1-3 '-') # stable releases
+		MY_PV=$(ver_rs 1-4 '-') # stable releases
 	fi
 	MY_P="${PN}-${MY_PV}"
 	INHERIT_GIT=""
@@ -43,7 +43,7 @@ COMMON_DEPEND="
 	!lua? ( !dev-lang/lua )
 	ipmi? ( sys-libs/freeipmi )
 	json? ( dev-libs/json-c:= )
-	amd64? ( netloc? ( sys-apps/netloc ) )
+	amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) )
 	hdf5? ( sci-libs/hdf5:= )
 	numa? ( sys-process/numactl )
 	ofed? ( sys-fabric/ofed )
@@ -53,8 +53,10 @@ COMMON_DEPEND="
 	sys-libs/ncurses:0=
 	app-arch/lz4:0=
 	sys-libs/readline:0="
+
 DEPEND="${COMMON_DEPEND}
 	html? ( sys-apps/man2html )"
+
 RDEPEND="${OMMON_DEPEND}
 	acct-user/slurm
 	acct-group/slurm