[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/

["Benda XU" <heroxbd@gentoo.org>]

commit:     d091eed7f221f91edc00370b605d896eaa02e6b4
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 02:36:48 2024 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 13:38:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d091eed7

sys-cluster/slurm: all econf arguments into array.

Drop unnecessary htmldir hack.

Closes: https://github.com/gentoo/gentoo/pull/38928
Suggested-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sys-cluster/slurm/slurm-22.05.11.ebuild | 36 ++++++++++++++-------------------
 sys-cluster/slurm/slurm-24.05.3.ebuild  | 36 ++++++++++++++-------------------
 2 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/sys-cluster/slurm/slurm-22.05.11.ebuild b/sys-cluster/slurm/slurm-22.05.11.ebuild
index dedeb5773dae..e074bd8ddc39 100644
--- a/sys-cluster/slurm/slurm-22.05.11.ebuild
+++ b/sys-cluster/slurm/slurm-22.05.11.ebuild
@@ -139,31 +139,25 @@ src_configure() {
 		--sysconfdir="${EPREFIX}/etc/${PN}"
 		--with-hwloc="${EPREFIX}/usr"
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable debug)
+		$(use_enable lua)
+		$(use_enable pam)
+		$(use_enable X x11)
+		$(use_with munge)
+		$(use_with json)
+		$(use_with hdf5)
+		$(use_with nvml)
+		$(use_with ofed)
+		$(use_with ucx)
+		$(use_with yaml)
+		$(use_enable static-libs static)
+		$(use_enable slurmrestd)
+		$(use_enable multiple-slurmd)
 	)
 	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
 	use mysql || myconf+=( --without-mysql_config )
-	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 nvml) \
-		$(use_with ofed) \
-		$(use_with ucx) \
-		$(use_with yaml) \
-		$(use_enable static-libs static) \
-		$(use_enable slurmrestd) \
-		$(use_enable multiple-slurmd)
+	econf "${myconf[@]}"
 
-	# --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

diff --git a/sys-cluster/slurm/slurm-24.05.3.ebuild b/sys-cluster/slurm/slurm-24.05.3.ebuild
index f254ea437788..9c7134d77ef4 100644
--- a/sys-cluster/slurm/slurm-24.05.3.ebuild
+++ b/sys-cluster/slurm/slurm-24.05.3.ebuild
@@ -135,31 +135,25 @@ src_configure() {
 		--sysconfdir="${EPREFIX}/etc/${PN}"
 		--with-hwloc="${EPREFIX}/usr"
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable debug)
+		$(use_with lua)
+		$(use_enable pam)
+		$(use_enable X x11)
+		$(use_with munge)
+		$(use_with json)
+		$(use_with hdf5)
+		$(use_with nvml)
+		$(use_with ofed)
+		$(use_with ucx)
+		$(use_with yaml)
+		$(use_enable static-libs static)
+		$(use_enable slurmrestd)
+		$(use_enable multiple-slurmd)
 	)
 	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
 	use mysql || myconf+=( --without-mysql_config )
-	econf "${myconf[@]}" \
-		$(use_enable debug) \
-		$(use_with lua) \
-		$(use_enable pam) \
-		$(use_enable X x11) \
-		$(use_with munge) \
-		$(use_with json) \
-		$(use_with hdf5) \
-		$(use_with nvml) \
-		$(use_with ofed) \
-		$(use_with ucx) \
-		$(use_with yaml) \
-		$(use_enable static-libs static) \
-		$(use_enable slurmrestd) \
-		$(use_enable multiple-slurmd)
+	econf "${myconf[@]}"
 
-	# --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