gentoo resync : 18.12.2020

11 files changed, 329 insertions, 8 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 2cb2188296ec..6fa478a6f165 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index c26d116f73b7..ba179a9a293c 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -5,5 +5,5 @@ AUX keepalived.service.conf 47 BLAKE2B b6e32bf8c8a602186af776d85c6c457aad2408bec
 DIST keepalived-2.0.20.tar.gz 1036063 BLAKE2B 217dee8c6dcb148119822f3c6a0b57482e91a17671a35333d0dccf04a3f7c6606a1c9e0b3f2a3adeab838fd91b7c714a0bf11895fe0c7d90d836d3585620c8e2 SHA512 36bbc4aa0a1045486e608c9f4ed73f4335b871dae88beaed10d86445474c462136885225cd6b61219a36fca2ff43771623bc6d072e406cf684acc2ca8f2a38f6
 DIST keepalived-2.1.5.tar.gz 1081559 BLAKE2B 791de7f24d012d77fbf9573713ab158cd91c08b969982b5d6bb86e5e6ed347281378dd5106a05db2f37fd9ab2eb479c131333b4b8c6983671b18652122fdbe37 SHA512 107d071aa1546023a3eb7c2cba4707ab6fbb10af62984ab41c9358b5e28289f8f277456983fe8649a15a77939734d3af573b8b050500d9eb521b4b0537f97aa6
 EBUILD keepalived-2.0.20.ebuild 2001 BLAKE2B 2207a4c15a10335c03f8277eafe2f29cdd6c593c7ec918c15824e526d7d509afa4dfb3cca36e600e727a956a088df4310f86111db96451fc64a883595ced705c SHA512 7c61d2129c2a64b7ac27daeb0264df6837780dec2bc81a79cb7951d99ffa450b279141802b3e693b80ea066a8a377a2f67561516ff34e40efefae51f68bfdc37
-EBUILD keepalived-2.1.5.ebuild 2002 BLAKE2B a7257fddd2367482103956b845702805964da198679282c7e23b4f29914199074ab709126282b4de105d4018de7582d54f4532245019e0fa50de292d7d08e9d1 SHA512 667f1ae61d9fe73bd76f86be85aba7a20213150c672e160e9ef5efc16eb9db75379093b7614ec26aec655ec7af78f61961a283dc64bcb0cda6c07afe3057e867
+EBUILD keepalived-2.1.5.ebuild 2001 BLAKE2B 2207a4c15a10335c03f8277eafe2f29cdd6c593c7ec918c15824e526d7d509afa4dfb3cca36e600e727a956a088df4310f86111db96451fc64a883595ced705c SHA512 7c61d2129c2a64b7ac27daeb0264df6837780dec2bc81a79cb7951d99ffa450b279141802b3e693b80ea066a8a377a2f67561516ff34e40efefae51f68bfdc37
 MISC metadata.xml 529 BLAKE2B e20e135a1037fe1ce32a4321858160594512de8c13bb8bf67655fc431c7d6ebf8806db518a09c59e6724842577647a23bb7f310638025a85c5ee8e5fee4ee877 SHA512 3925927d7e0866283769f5582e77bfadf1708162e6aae6a5d1a605fda4a2b4c3de631b96718f5ea69ed5335445523ea1ec1e121a1372641dbec751285cb35dd2
diff --git a/sys-cluster/keepalived/keepalived-2.1.5.ebuild b/sys-cluster/keepalived/keepalived-2.1.5.ebuild
index b6c8c6ac769f..89feaa62df58 100644
--- a/sys-cluster/keepalived/keepalived-2.1.5.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="+bfd dbus -json regex snmp"
 
 RDEPEND="dev-libs/libnl:=
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index 022e0186f495..869e76a18ba5 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -4,5 +4,5 @@ AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a
 DIST sanlock-3.6.0.tar.gz 221666 BLAKE2B 7fe95bd6813c13b76993b343a5ad605c7ba642583987ffa5fef583f34c053ee62b0f9e5979f5b5cb9e4fcde53268ae3debc5ec36b04f6651cc4cb902dff52df9 SHA512 59eb2a6f12e95d54886fdf6d56fd9a6814dd20fe11f39664f2bb82a56326fee48c9465ae30e6d04f970c8f1b0d9c2e22b90d21ab1f657c6d6b61ff9f02332443
 DIST sanlock-3.8.2.tar.gz 266780 BLAKE2B 5248d08225bcc2a19594a3dcd3872c8c69ca8b217d31f6263f2717e4594180d4ba4685c9679ce2f31b6a2dcb4fe9f3e6a5dd5ac3ed073aea02599e7bbc04390c SHA512 2fa92e16eee4d2f3dac452400522f7e90b93b71349d322564d5957e2d87fb4bd69f0b5617b05f4b296c272d6da9a404fccadbbfff106354a0e302c436593eaac
 EBUILD sanlock-3.6.0.ebuild 2055 BLAKE2B ddf101be000bf9d0b081a50386bbd8947e025d8edb475457167cc460c4f3a44f9863d0a3db1720839d239da61b9b3925d8eb953a29029501281eb6e6873575c9 SHA512 1c651d40550f67858d4ff552f8cbeea125205396087cb2290e3b70d370a410fbdab29d7e2fc0da9d01593b59c29042080a463fff920601b37e5577a5cec125bb
-EBUILD sanlock-3.8.2.ebuild 2083 BLAKE2B 7d00563aabe44f1e0e4c2b6867c690ef3a62a2de5e886fbd5084b4f85812e05d2cf3ba7100de6cb8909bc25fe050e526891d59f147848455bef7d84763d18e0f SHA512 b05328ad208a5ab3fd962725213dae33cbb050549f8f798ee101598bfa7d654d371c10b7e0f9d3ccb8f16ab644f16bd53ce9ae59acaf5de57afb750e75347bc1
+EBUILD sanlock-3.8.2.ebuild 2082 BLAKE2B 7e15478bca6b0b452ec2118d3d291e3379573eeb78f4d32a7a6d254b2eb7b081844c46e387a7c91e1a1e74167d52d51259a7097006f83bd272e36b6ede2bdfdf SHA512 490e4e92569b49d1b4db7bc1862094dc761965a93f1dd73cb84c3c7541dc1324890bc5c379ac8bc5c293e7921f5cf647c32b2b2e55767b4189519c10d1324925
 MISC metadata.xml 368 BLAKE2B a15a411ea20eb7649f299e38704b394344194d7526f9bc92b27c0a26760d7dba05b1e5d483ff5f9ce73a6d1cd527a18ac905344a614c8dc31a0c1180b2be07e7 SHA512 2cc3ec3c99cfff2e0c576ab6c7b0a39460af875ba826ce0cf3c5a1a4f0f3def6170753c8d42af2fc7a139ad7f2135e309c3165bde83b4e7574292768c96e8086
diff --git a/sys-cluster/sanlock/sanlock-3.8.2.ebuild b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
index 7ddbde133ef4..8e147096a3aa 100644
--- a/sys-cluster/sanlock/sanlock-3.8.2.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2+ GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 030cc2728a4c..6e161b14b6e7 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,9 +1,11 @@
 AUX logrotate 360 BLAKE2B 36c5ce908a6434f03a3e140cd1fc0bfec50a6fa89d6120061a5a83d3b12d9a6137ae2fa3a83bd36f55f48c79d140f24d6933cda18fc79674e8b758cacc34a948 SHA512 f6edceef15960accbe72ddd34ff34934fa46b6d647c83e0d3a512d2ddc1ae6c60352e377cfa5332fd5cd817689e23680f7384f1b27fc49677b2e671e1bfe86b9
+AUX slurm-20.11.0.1_autoconf-lua.patch 1769 BLAKE2B 6a77e3bfde6e18a14e07f07a9fb3c334732e4becce39ecf4c6352d06622999aa08c9cfe455b03656836ae6f3d6af7ad64e36851b66c1a6e724b6236fd08c3cdb SHA512 f142484dcaeac6496095e894de0a6288a15189e04d7ac32a353923b4dfedc1dcb3da9bfacb9bc6c7dae37d554194b937c59de2943785a2e71797c8b35832cc7f
 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-r100.ebuild 7907 BLAKE2B ab2d9574430f650d9e216020bd7b68f7de3ddbd6d743cf422cfc57005705f6b0f021b818914ff2bf49bb0aa9b72c7866641e021f197f4e46b36ecea1c34dfe4b SHA512 fb202e3ca41c54a4f05c1bfce2770aa50b99bca9018a1e8e544316b2927a343bf4e727fbf004dd939ef24aade817633cff8f3e2d69c5dfcc7424c5ea4f95c4ee
 EBUILD slurm-20.11.0.1.ebuild 7764 BLAKE2B 252d3cb8c68645d40b1d0bfe28295d896985787c7b66213569f55ce39d40a2fbfdcac327963453e499948c11f81e9f278864a3174eb9fe3cf86bbe10b59af094 SHA512 3b69f91188cbd5cd436989c2f561c5cf553c2522c7fb46b072fd4b9e55f60f619a286f237f752f0c5072623989cbc7a5c89191a2b6d8144582219f1f1b7fc03c
 MISC metadata.xml 1199 BLAKE2B b52e7cae7554d439e7f25da2a80d98993d5c7f7abd5ba8b76c09bf60731b035040f976ac1bfc3c153f81b8feed89e2ceb5e6b676c25cc7b6219c4bcd87bd7e50 SHA512 8f48d582e61789373fc07ffd1db123cb8f43d337b03611972e480179ca5b43f2866392203f470d3d69784f2aae79cbcffdf583cba0aa4a9c25969f2c72a3f55f
diff --git a/sys-cluster/slurm/files/slurm-20.11.0.1_autoconf-lua.patch b/sys-cluster/slurm/files/slurm-20.11.0.1_autoconf-lua.patch
new file mode 100644
index 000000000000..f17039e0b59d
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm-20.11.0.1_autoconf-lua.patch
@@ -0,0 +1,50 @@
+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.
+
+--- a/auxdir/x_ac_lua.m4
++++ b/auxdir/x_ac_lua.m4
+@@ -12,18 +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],
+-		[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"])])])])])])
+-	PKG_CHECK_MODULES([lua], ${x_ac_lua_pkg_name},
+-                [x_ac_have_lua="yes"],
+-                [x_ac_have_lua="no"])
++	AC_MSG_CHECKING([whether to enable support for job scripts written in Lua])
++	AC_ARG_ENABLE(
++		[lua],
++		AS_HELP_STRING(--enable-lua, enable support for job scripts written in Lua),
++		[x_ac_enable_lua="$enableval"],
++		[x_ac_enable_lua=yes])
++	AC_MSG_RESULT([$x_ac_enable_lua])
++
++	x_ac_have_lua=no
++	if test "x$x_ac_enable_lua" = "xyes"; then
++		x_ac_lua_pkg_name="lua"
++		PKG_CHECK_MODULES([lua], ${x_ac_lua_pkg_name},
++        	        [x_ac_have_lua="yes"],
++        	        [AC_MSG_ERROR([Lua support requested but Lua not found])])
++	fi
+ 
+ 	if test "x$x_ac_have_lua" = "xyes"; then
+ 	  saved_CFLAGS="$CFLAGS"
+@@ -52,8 +55,6 @@
+ 	  fi
+ 	  CFLAGS="$saved_CFLAGS"
+ 	  LIBS="$saved_LIBS"
+-	else
+-	  AC_MSG_WARN([unable to locate lua package])
+ 	fi
+ 
+ 	AM_CONDITIONAL(HAVE_LUA, test "x$x_ac_have_lua" = "xyes")
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild
new file mode 100644
index 000000000000..ab498c397291
--- /dev/null
+++ b/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2020 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 ~x86"
+fi
+
+inherit autotools bash-completion-r1 lua-single 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? ( ${LUA_DEPS} )
+	ipmi? ( sys-libs/freeipmi )
+	json? ( dev-libs/json-c:= )
+	amd64? ( netloc? ( || ( sys-apps/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=
+	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
+)
+
+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}" 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
+	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/spark-bin/Manifest b/sys-cluster/spark-bin/Manifest
index 624f3b8ede7b..18183dfe9614 100644
--- a/sys-cluster/spark-bin/Manifest
+++ b/sys-cluster/spark-bin/Manifest
@@ -3,7 +3,7 @@ DIST spark-bin-2.4.3-nohadoop-scala212.tgz 141465231 BLAKE2B e29b534076b981e3408
 DIST spark-bin-2.4.7-nohadoop-scala211.tgz 168360525 BLAKE2B 9a8728a1c7450166d4d9635ff1be6a65d57df1832945672e92044e0fc88ef152e7e870d02ec590378ea97a47d4a68568da73e6a1e92f8eaaaa06f495ed9939ad SHA512 ff75e6db3c4ca5cece2a8a26ad7bd8a2c1c46b4f93e8f2922a31e6a8d98274bedc66bef3e469e862d249c5439355ccca83687a20d536a8400f2c058be553df57
 DIST spark-bin-2.4.7-nohadoop-scala212.tgz 146775712 BLAKE2B f0381e6aebeae90990d5ad19d8db923efd01e9b215ddfe34e34a8272942e57fe7ec6a53208146006ba5c4e76f8e44d202e0715f63b559cc8749b523710b92a5f SHA512 708a702af5c754dba0137c88e3c7055d7759593f013798755468638b6fdc583a707aae4c2a4e14648f91c16b963f9bba9f8c44d28341c08c4512590a425f70a8
 DIST spark-bin-3.0.1-nohadoop.tgz 156390722 BLAKE2B 9ac4645759ca0ec6d1501dfa79d149b9cbf49dee1c4b9dcf38f62490d3ad91db01ad61d9d6b1ef4dd7bcb81a868cb58b9251575dded823c8415801d10571afee SHA512 07fc6df224f303ef53189e6082004400d51cd6c2244d1851d90eabbe58404a69ff980bffe147a5259a34190e1e1c974c72d02470d10a783d2d87f43a8da0850b
-EBUILD spark-bin-2.4.3.ebuild 1780 BLAKE2B 7a6683b78de9dc64e7ca6c9ad4f47b4a99ee45fea600b1cc1c034066d8310c0ff787bf255ea791d2e003bd0af99a811145ecb3308016d7cfc0a74c7cee5a244b SHA512 5857f946263aac1aea87c9c36043c8470f8981a2a0cf4ace53f4f83c54c147a2e690c8fb17217dfb4d0320198a218e9c3ce7acda5b54e5ab8aedee7c60e9dadf
-EBUILD spark-bin-2.4.7-r1.ebuild 1780 BLAKE2B 7a6683b78de9dc64e7ca6c9ad4f47b4a99ee45fea600b1cc1c034066d8310c0ff787bf255ea791d2e003bd0af99a811145ecb3308016d7cfc0a74c7cee5a244b SHA512 5857f946263aac1aea87c9c36043c8470f8981a2a0cf4ace53f4f83c54c147a2e690c8fb17217dfb4d0320198a218e9c3ce7acda5b54e5ab8aedee7c60e9dadf
+EBUILD spark-bin-2.4.3.ebuild 1779 BLAKE2B 1be2f9bf46f2d41525473aeb980c0ed1543762a1fbbaf3f3a8c278273bd7171ea5737be2d4484011760fca853cec7aa12361b1cd27ab844835e77d9b25887de8 SHA512 91022933f4ee62904c8ec3346f0dedea160c7329a07edf9afa646b9934eaaddfda9903f38fa498e615d96008e7fa8e7bb800a58cb801b7de799f607c545f1584
+EBUILD spark-bin-2.4.7-r1.ebuild 1779 BLAKE2B 1be2f9bf46f2d41525473aeb980c0ed1543762a1fbbaf3f3a8c278273bd7171ea5737be2d4484011760fca853cec7aa12361b1cd27ab844835e77d9b25887de8 SHA512 91022933f4ee62904c8ec3346f0dedea160c7329a07edf9afa646b9934eaaddfda9903f38fa498e615d96008e7fa8e7bb800a58cb801b7de799f607c545f1584
 EBUILD spark-bin-3.0.1-r2.ebuild 1410 BLAKE2B 03148b1b46f5f3577230e85b4a312b27bd305d18060db84bea824d72903fbad5ee169db16ec82974e2fcd35961716842ae6ad9874ba83ac2c4ce9de6de2e9b74 SHA512 8d95f8129b55b3d6762c87e6da9a8991569c177af1c7207b800864ce34030cc44c14b3a04c538f8c741192c778868ea62b8efa91493c3e130fd5e32042169ad9
 MISC metadata.xml 674 BLAKE2B 8b9d5a6f5266d83bcb2f57738547d35347fb59f0e9d26c6368ef42a49ae92a911243430bfacdaf256012841f07f9a530ee28a59b0bd2a2e30a2511118644cc8b SHA512 a8b9fe7f3ab599508089cddcb3815d393b589c9d533ef51c13e0dc76aaf9a2889a7b2f1201ae03f7a1df38bfb9bf5feb5c1d029db885af6ba8707560b5e54abb
diff --git a/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild b/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild
index 68debb5ec8f3..363bc8a43f06 100644
--- a/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild
+++ b/sys-cluster/spark-bin/spark-bin-2.4.3.ebuild
@@ -18,7 +18,7 @@ LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="~amd64"
 
-IUSE="+scala211 scala212"
+IUSE="scala211 scala212"
 
 RDEPEND="
 	>=virtual/jre-1.8"
diff --git a/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild b/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild
index 68debb5ec8f3..363bc8a43f06 100644
--- a/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild
+++ b/sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="~amd64"
 
-IUSE="+scala211 scala212"
+IUSE="scala211 scala212"
 
 RDEPEND="
 	>=virtual/jre-1.8"