gentoo auto-resync : 15:09:2022 - 11:12:38

5 files changed, 42 insertions, 303 deletions

diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index dbb81245e95b..e9295dc1cac9 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,11 +1,10 @@
 AUX logrotate 360 BLAKE2B 36c5ce908a6434f03a3e140cd1fc0bfec50a6fa89d6120061a5a83d3b12d9a6137ae2fa3a83bd36f55f48c79d140f24d6933cda18fc79674e8b758cacc34a948 SHA512 f6edceef15960accbe72ddd34ff34934fa46b6d647c83e0d3a512d2ddc1ae6c60352e377cfa5332fd5cd817689e23680f7384f1b27fc49677b2e671e1bfe86b9
-AUX slurm-20.11.0.1_autoconf-lua.patch 1769 BLAKE2B 6a77e3bfde6e18a14e07f07a9fb3c334732e4becce39ecf4c6352d06622999aa08c9cfe455b03656836ae6f3d6af7ad64e36851b66c1a6e724b6236fd08c3cdb SHA512 f142484dcaeac6496095e894de0a6288a15189e04d7ac32a353923b4dfedc1dcb3da9bfacb9bc6c7dae37d554194b937c59de2943785a2e71797c8b35832cc7f
+AUX slurm-22.05.3_autoconf-lua.patch 1754 BLAKE2B 6968fdbd6520346b60ba88225cdca18b66cde2bad210d61c00cad725e88dd215b4c166aaf69e751c227679245d1c6d7949be381c89aa7629984efa6194878261 SHA512 46e1d8514cc07974477abf397b9b2ec591ae18c202e3447a3016fa6d1bdaa8ff66630eeedcc0dc3fae680f08206b0de87c3c2f9fc16ddf8863b6b845a5fd33a3
 AUX slurm.confd 155 BLAKE2B 4f0793808328b88ffa2b32b1accab6c0dfe0b01dc84210fee6a674361ddf9ea7b3f15ccc775c354198577849ab0791d403b153adee476fc7f1237d2177275bab SHA512 e4d21cdb6a427f0beaef0e157202308f9e86a41dea4532ee98b274a5979b5e82ec2ca4ca2996f6cb59045fd8b01e815aaad71673e2011cead788de3d879aa11f
 AUX slurm.tmpfiles 31 BLAKE2B f08dbc53517cc15463be5264505d858fcf1f2196565868d164463a167459082a23eea25fa22edf2987e52c71f953160c12b29cdb5e5f437a3bdc89f1cd8395b5 SHA512 b7f116687e0dee0377b43cbb49f63569088d6f5f9b1514014999b1135b1b4da462e04887851b753161d7b9691436048b692b7697ffee2a4e45daa339a412c93c
 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-20-11-0-1.tar.gz 8762691 BLAKE2B 1e24a04b3faf97f4df98bd982d67d47f79670b863f466326e45e00fac0b99124122e94e30054a97471e4337234cbd213806791bdd5b3bddfeb05bef55f42931e SHA512 9a57f2610f7294ba6cd265746b874e32a7930100f30c0adf41d95b261787c441bdcacaa641f0b9785150b94fc7d6b5b7608ec618f668bffcae6f774752f17678
-EBUILD slurm-20.11.0.1-r104.ebuild 8019 BLAKE2B c381365a04ecebcb814a0e021995c6cb13ed51757463f895fe84a7902af361fa5d2114111536d747a81082a13e64931ecdb6fb3ad6e6b06b9c09ed7b5b77d420 SHA512 fcc42bdf19234fb54031acec779db758ddb6b79f6176c63f43a139cb3af43a077665cd1014ee279714e1a374369eba198971ede0c5fae05eaf9edb4a37126f1c
-EBUILD slurm-20.11.0.1-r105.ebuild 7963 BLAKE2B 1c36790cabba918296a53cd86dc56623c002d631d861358e87bcace6fd5382bea1167358900ac62d1009f0e2f48ee17736927f496ef49c3d9f52973bb6c1eaec SHA512 e807d0e55d1c7a788b8c49947c97d6c7474d82998dd79198e9e4f76f40c4f23b466f70cdc90b617cf96912be313df4c2baea6e7cc8de5bdb6503574cabcdb19e
-MISC metadata.xml 1092 BLAKE2B fc708ed8e57e531f3c2b10be663f2d64d2aa6606972ee0e5030e0d2fb2916f3b67947407c5a0505bd315dc7cfb91a49ef9b5db49a7134260fdbe6570cbca8710 SHA512 74d0cc46c6b4fbf7728cdf01c021c06c944797cc8a35d32e8b155920f2b9ff9240c5c8e8e4b7ce5b1ea435c36d4da95a36a3ef2875c2ff93f4820e6b4bc1214a
+DIST slurm-22.05.3.tar.bz2 7098045 BLAKE2B 597d297bf5f98a6aa98f1cc3047f9d0e88051f80e0d55e931d53a9b3e6bfa5911fe8aa486f56fef2d8f8d3a02fe41cf89625ae65e3737c87ceb9d123f03beb0d SHA512 a500fb657f7d4d3d063307e176e26e537962434ff73ad8d13e16c34c70e94916fdab4e08e23d40aedec7edd86be996d2366e82fcb952c83f5498e59ca47c3f21
+EBUILD slurm-22.05.3.ebuild 8324 BLAKE2B caeae4b5ae1cf478c2c8fc9b6a4bca43fbd9118000cb515f693e1589831791f666c78f88ef0ed2d0bceffdcecb00455a15d3d03151b170c353cfdd6230230678 SHA512 bd7907b542bb30fee149497c13d3f4b28ce00db285a72879eb8ff6d6ec8b95b0cd256631fe2bd322e7de27571e2574c681550d67d3c810696096406e6373050d
+MISC metadata.xml 1264 BLAKE2B 8b3c6605d1bffc0de20ab50973011670ad4a0fd75cba6f788f6d1a9ab7a5f27e2a61963f2b3cae0e22dbe1a8259c9ffcfc062dc39f9f4bd8e97f05cde86ce095 SHA512 e040ec231269d7325691a3bff83fe78b4fef6635cc74d953f33cdb9ae101b47ceaaeeca5e0c447df531db95081e6bbca46896efa4c25a86aec8913c5bdeadf21
diff --git a/sys-cluster/slurm/files/slurm-20.11.0.1_autoconf-lua.patch b/sys-cluster/slurm/files/slurm-22.05.3_autoconf-lua.patch
index f17039e0b59d..f5723f7b85bc 100644
--- a/sys-cluster/slurm/files/slurm-20.11.0.1_autoconf-lua.patch
+++ b/sys-cluster/slurm/files/slurm-22.05.3_autoconf-lua.patch
@@ -1,23 +1,22 @@
-Prevent automagical detection of Lua, abort if Lua support has been
-requested but Lua cannot be found with pkg-config, and use the Lua
-pkg-config module set up by the eclass-provided wrapper (or unslotted Lua)
-instead of enumerating installed versions.
-
+diff --git a/auxdir/x_ac_lua.m4 b/auxdir/x_ac_lua.m4
+index 6941281bd5..206498191f 100644
 --- a/auxdir/x_ac_lua.m4
 +++ b/auxdir/x_ac_lua.m4
-@@ -12,18 +12,21 @@
+@@ -12,20 +12,21 @@
  
  AC_DEFUN([X_AC_LUA],
  [
 -	x_ac_lua_pkg_name="lua"
--	#check for 5.3 then 5.2 then 5.1
--	PKG_CHECK_EXISTS([lua5.3], [x_ac_lua_pkg_name=lua5.3],
+-	#check for 5.4, 5.3, 5.2 and then 5.1
+-	PKG_CHECK_EXISTS([lua5.4], [x_ac_lua_pkg_name=lua5.4],
+-		[PKG_CHECK_EXISTS([lua-5.4], [x_ac_lua_pkg_name=lua-5.4],
+-		[PKG_CHECK_EXISTS([lua5.3], [x_ac_lua_pkg_name=lua5.3],
 -		[PKG_CHECK_EXISTS([lua-5.3], [x_ac_lua_pkg_name=lua-5.3],
 -		[PKG_CHECK_EXISTS([lua5.2], [x_ac_lua_pkg_name=lua5.2],
 -		[PKG_CHECK_EXISTS([lua-5.2], [x_ac_lua_pkg_name=lua-5.2],
 -		[PKG_CHECK_EXISTS([lua5.1], [x_ac_lua_pkg_name=lua5.1],
 -		[PKG_CHECK_EXISTS([lua-5.1], [x_ac_lua_pkg_name=lua-5.1],
--	        [x_ac_lua_pkg_name="lua >= 5.1"])])])])])])
+-	        [x_ac_lua_pkg_name="lua >= 5.1"])])])])])])])])
 -	PKG_CHECK_MODULES([lua], ${x_ac_lua_pkg_name},
 -                [x_ac_have_lua="yes"],
 -                [x_ac_have_lua="no"])
@@ -39,7 +38,7 @@ instead of enumerating installed versions.
  
  	if test "x$x_ac_have_lua" = "xyes"; then
  	  saved_CFLAGS="$CFLAGS"
-@@ -52,8 +55,6 @@
+@@ -60,8 +61,6 @@ AC_DEFUN([X_AC_LUA],
  	  fi
  	  CFLAGS="$saved_CFLAGS"
  	  LIBS="$saved_LIBS"
diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml
index fbaaba0061db..5f5481fc23fa 100644
--- a/sys-cluster/slurm/metadata.xml
+++ b/sys-cluster/slurm/metadata.xml
@@ -10,16 +10,20 @@
 		<name>Gentoo Cluster Project</name>
 	</maintainer>
 	<use>
+		
 		<flag name="html">Build html documentation</flag>
 		<flag name="ipmi">Build support for collecting some ipmi stats</flag>
 		<flag name="json">Add support for json-persing via json-c</flag>
 		<flag name="munge">Enable authentication via munge</flag>
 		<flag name="multiple-slurmd">Allow multiple slurmd to run</flag>
-		<flag name="netloc">Add support for netloc (amd64 only)</flag>
 		<flag name="numa">Add NUMA awareness</flag>
+		<flag name="nvml">Enable the NVML device discovery</flag>
 		<flag name="ofed">Add Infiniband support via ofed</flag>
+		<flag name="rrdtool">Enable RRD export plugin</flag>
 		<flag name="slurmdbd">Install SQL server for slurmdbd</flag>
+		<flag name="slurmrestd">Enable interface to Slurm via REST API</flag>
 		<flag name="torque">Enable perl scripts that emulates pbs (qstat, qsub etc.)</flag>
 		<flag name="ucx">Enable Unified Communication X library support</flag>
+		<flag name="yaml">Enable YAML support</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild
deleted file mode 100644
index 0445fde0fe39..000000000000
--- a/sys-cluster/slurm/slurm-20.11.0.1-r105.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-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 ~arm64 ~riscv ~x86"
-fi
-
-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"
-
-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? ( ${LUA_DEPS} )
-	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-cluster/rdma-core )
-	ucx? ( sys-cluster/ucx )
-	X? ( net-libs/libssh2 )
-	>=sys-apps/hwloc-1.1.1-r1:=
-	sys-libs/ncurses:0=
-	app-arch/lz4:0=
-	dev-libs/glib:2=
-	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="lua? ( ${LUA_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"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.11.0.1_autoconf-lua.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-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 lua) \
-		$(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}" perl-module_src_configure
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" 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
-
-	tmpfiles_process slurm.conf
-
-	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.11.0.1-r104.ebuild b/sys-cluster/slurm/slurm-22.05.3.ebuild
index ffd4361860d3..0b5e602258f3 100644
--- a/sys-cluster/slurm/slurm-20.11.0.1-r104.ebuild
+++ b/sys-cluster/slurm/slurm-22.05.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} )
+LUA_COMPAT=( lua5-{1..4} )
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
@@ -15,10 +15,10 @@ else
 	else
 		MY_PV=$(ver_rs 1-4 '-') # stable releases
 	fi
-	MY_P="${PN}-${MY_PV}"
+	MY_P="${P}"
 	INHERIT_GIT=""
-	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+	SRC_URI="https://download.schedmd.com/slurm/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
 inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
@@ -28,7 +28,7 @@ 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"
+IUSE="X debug hdf5 html ipmi json lua multiple-slurmd +munge mysql numa nvml ofed pam perl rrdtool slurmdbd slurmrestd static-libs torque ucx yaml"
 
 # See bug #813924 for hdf5lib < dep, needs proper fix
 COMMON_DEPEND="
@@ -40,21 +40,27 @@ COMMON_DEPEND="
 		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
 		slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
 		)
+	slurmrestd? (
+		net-libs/http-parser
+	)
 	munge? ( sys-auth/munge )
 	pam? ( sys-libs/pam )
 	lua? ( ${LUA_DEPS} )
 	ipmi? ( sys-libs/freeipmi )
 	json? ( dev-libs/json-c:= )
-	amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0:=[netloc] ) )
 	hdf5? ( <sci-libs/hdf5-1.12:= )
 	numa? ( sys-process/numactl )
+	nvml? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers )
 	ofed? ( sys-cluster/rdma-core )
+	rrdtool? ( net-analyzer/rrdtool )
 	ucx? ( sys-cluster/ucx )
+	yaml? ( dev-libs/libyaml )
 	X? ( net-libs/libssh2 )
 	>=sys-apps/hwloc-1.1.1-r1:=
 	sys-libs/ncurses:0=
 	app-arch/lz4:0=
 	dev-libs/glib:2=
+	sys-apps/dbus
 	sys-libs/readline:0="
 
 DEPEND="${COMMON_DEPEND}
@@ -66,9 +72,10 @@ RDEPEND="${COMMON_DEPEND}
 	dev-libs/libcgroup"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	torque? ( perl )"
+	torque? ( perl )
+	slurmrestd? ( json ) "
 
-S="${WORKDIR}/${PN}-${MY_P}"
+S="${WORKDIR}/${MY_P}"
 
 LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
 LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
@@ -76,7 +83,7 @@ LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-20.11.0.1_autoconf-lua.patch
+	"${FILESDIR}"/${PN}-22.05.3_autoconf-lua.patch
 )
 
 pkg_setup() {
@@ -124,6 +131,7 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
+		CPPFLAGS="-I/opt/cuda/include"
 		--sysconfdir="${EPREFIX}/etc/${PN}"
 		--with-hwloc="${EPREFIX}/usr"
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
@@ -139,9 +147,13 @@ src_configure() {
 		$(use_with munge) \
 		$(use_with json) \
 		$(use_with hdf5) \
+		$(use_with nvml) \
 		$(use_with ofed) \
+		$(use_with rrdtool) \
 		$(use_with ucx) \
+		$(use_with yaml) \
 		$(use_enable static-libs static) \
+		$(use_enable slurmrestd) \
 		$(use_enable multiple-slurmd)
 
 	# --htmldir does not seems to propagate... Documentations are installed
@@ -157,9 +169,9 @@ src_configure() {
 		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}" perl-module_src_configure
+		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
 		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_configure
+		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
@@ -231,7 +243,7 @@ pkg_preinst() {
 create_folders_and_fix_permissions() {
 	einfo "Fixing permissions in ${@}"
 	mkdir -p ${@} || die
-	chown -R ${PN}:${PN} ${@} || die
+	chown ${PN}:${PN} ${@} || die
 }
 
 pkg_postinst() {