gentoo auto-resync : 29:12:2022 - 02:14:02

4 files changed, 218 insertions, 14 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 6872dc933b90..05130dc6907b 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 29ba0e054430..944f03ed7640 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -15,4 +15,5 @@ DIST torque-6.0.4-gcc7.patch 50412 BLAKE2B 43748e9bfd3811abdfeb56f93dd517fcb07a6
 DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94
 DIST torque-6.0.4-glibc-2.34-pthread.patch.bz2 6266 BLAKE2B b5175b8bfe2deabe86b067f1ec5269770bcf096c6e875b8fd3cb404a976c9cb550ddcbe6e4ebb1e59c96044f95c285519e70fb4acd5c9db86c3050093ff65b3b SHA512 dbe0bd6000c140e1fe9b36e55c1a844701406a563bd178b9c972793b83282f3434e2160da5280666dcc0934c2b88e36c0a2b9518ffe7695b23d73fce0a07388d
 EBUILD torque-6.0.4-r2.ebuild 5952 BLAKE2B 8ab710b71a0f7911949a0560aa263675e6e7820bdf23b046646bcbe692a3f26c03f67671ae5e742db0a093f2564ce5beaabe094849534f785e0a11ece9a4114d SHA512 609c0ef88c19549f3b60f7cdb3c3963ac78d48aa814dfe00155bfd75d71f0f735fe32ea8a898338343a120a32c2e804e12d3e097a11c528b51764afcdec7dd5b
-MISC metadata.xml 787 BLAKE2B 9bc7fb21c260237df6dcb50fe453f4113be2927bbe7b9ebf3816cb734e0d5a52f9acac84834c3e38fd268823137f5ec0b7a971b0eb2f28e6c44fc3c8213d648b SHA512 8ba369e5064bb9b15cb8ef4c6265723e5cacf5ebb5efda56949b5e69b824d6b366adb0ab6a3f1d4ccd316999b13b6bdf98936af3f5528451a864a1f9b6314cb3
+EBUILD torque-6.0.4-r3.ebuild 5999 BLAKE2B 1054daf54b14a3407cf3196294458a8e6d005de58b2c9e47eed2b9aa61a856fb1c49d376e4473d70674e0b65ed646b5d53a264bd0489aaaa7a747672bce8cd6f SHA512 d438900d1e73c2544fb919d32d8665a7bb511d70e02bfb64d9eb95380856e2de724c4b4a4adedba444f820aacdbf2a16cd70f743be15eddc488368e178039bed
+MISC metadata.xml 854 BLAKE2B 77be0da422efef3efbe4a151f45b82f3cc5efdb2da91345bd245d23b1b3f93e8e9bbfff40c7aa4ab149a66574f8113360bf6cce8f630fa3ff17bbcf7a580c896 SHA512 a296b3a82abc530aff7672cf70fe06b26c61dff95476ca33a6692fb7cb5fabaa3873e6e1666721b8066ff524273ea6ebf20681a8418e849f94995b4493d4496f
diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml
index afd1ec84a4a9..4ce5f5914612 100644
--- a/sys-cluster/torque/metadata.xml
+++ b/sys-cluster/torque/metadata.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cluster@gentoo.org</email>
-    <name>Gentoo Cluster Project</name>
-  </maintainer>
-  <use>
-    <flag name="autorun">Enable the AUTORUN_JOBS codebase</flag>
-    <flag name="cgroups">Enable pbs_mom to use linux cgroups to isolate jobs</flag>
-    <flag name="cpusets">Enable pbs_mom to utilize linux cpusets if available</flag>
-    <flag name="munge">Enable authentication via munge</flag>
-    <flag name="nvidia">Enable management of Nvidia GPUs</flag>
-    <flag name="quickcommit">Enable the QUICKCOMMIT codebase</flag>
-    <flag name="server">Enable compilation of pbs_server and pbs_sched</flag>
-  </use>
+	<maintainer type="project">
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+	<use>
+		<flag name="autorun">Enable the AUTORUN_JOBS codebase</flag>
+		<flag name="cgroups">Enable pbs_mom to use linux cgroups to isolate jobs</flag>
+		<flag name="cpusets">Enable pbs_mom to utilize linux cpusets if available</flag>
+		<flag name="munge">Enable authentication via munge</flag>
+		<flag name="nvidia">Enable management of Nvidia GPUs</flag>
+		<flag name="quickcommit">Enable the QUICKCOMMIT codebase</flag>
+		<flag name="server">Enable compilation of pbs_server and pbs_sched</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">adaptivecomputing/torque</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/torque/torque-6.0.4-r3.ebuild b/sys-cluster/torque/torque-6.0.4-r3.ebuild
new file mode 100644
index 000000000000..6799806e325e
--- /dev/null
+++ b/sys-cluster/torque/torque-6.0.4-r3.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_COMMIT="6a0b37f85c7d644e9217cbab1542792d646f59a6"
+inherit autotools flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Resource manager and queuing system based on OpenPBS"
+HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
+SRC_URI="
+	https://github.com/adaptivecomputing/torque/archive/${MY_COMMIT}.tar.gz -> ${P}-gh-20170829.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glibc-2.34-pthread.patch.bz2
+"
+
+LICENSE="torque-2.5"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="autorun cgroups cpusets +crypt doc munge nvidia quickcommit server +syslog tk"
+
+DEPEND_COMMON="
+	sys-libs/zlib
+	sys-libs/readline:0=
+	dev-libs/libxml2
+	dev-libs/boost
+	cpusets? ( sys-apps/hwloc:= )
+	munge? ( sys-auth/munge )
+	nvidia? ( >=x11-drivers/nvidia-drivers-275 )
+	tk? (
+		dev-lang/tk:0=
+		dev-lang/tcl:0=
+	)
+	syslog? ( virtual/logger )
+	!!games-util/qstat
+"
+
+# libncurses.so is only needed for configure check on readline
+DEPEND="
+	${DEPEND_COMMON}
+	sys-libs/ncurses:*
+	!!sys-cluster/slurm
+"
+
+RDEPEND="
+	${DEPEND_COMMON}
+	crypt? ( net-misc/openssh )
+	!crypt? ( net-misc/netkit-rsh )
+	!dev-libs/uthash
+"
+
+# Torque should depend on dev-libs/uthash but that's pretty much impossible
+# to patch in as they ship with a broken configure such that files referenced
+# by the configure.ac and Makefile.am are missing.
+# http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html
+
+S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6
+
+PATCHES=(
+	"${DISTDIR}"/${P}-gcc7.patch
+	"${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch
+	"${FILESDIR}"/${P}-no-openssl.patch
+	"${FILESDIR}"/${P}-error_buf_overflow_prevent.patch
+	"${WORKDIR}"/${P}-glibc-2.34-pthread.patch
+	"${FILESDIR}"/${P}-pthreads-deux.patch
+)
+
+pkg_setup() {
+	PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}"
+
+	# Find a Torque server to use.  Check environment, then
+	# current setup (if any), and fall back on current hostname.
+	if [[ -z "${PBS_SERVER_NAME}" ]]; then
+		if [ -f "${EROOT}/${PBS_SERVER_HOME}/server_name" ]; then
+			PBS_SERVER_NAME="$(<${EROOT}/${PBS_SERVER_HOME}/server_name)"
+		else
+			PBS_SERVER_NAME=$(hostname -f)
+		fi
+	fi
+
+	if use cpusets || use cgroups; then
+		if ! use kernel_linux; then
+			einfo
+			elog "    Torque currently only has support for cpusets and cgroups in linux."
+			elog "Assuming you didn't really want this USE flag and ignoring its state."
+			einfo
+		else
+			linux-info_pkg_setup
+			if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then
+				einfo
+				elog "    Torque support for cpusets will require that you recompile"
+				elog "your kernel with CONFIG_CPUSETS enabled."
+				einfo
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	# We install to a valid location, no need to muck with ld.so.conf
+	# --without-loadlibfile is supposed to do this for us...
+	sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags "-fpermissive"
+
+	# Force Bash for configure as there's a lot of issues with configure.ac and such here
+	CONFIG_SHELL="${BROOT}/bin/bash" econf \
+		$(use_enable tk gui) \
+		$(use_enable tk tcl-qstat) \
+		$(use_enable syslog) \
+		$(use_enable server) \
+		--disable-drmaa \
+		$(use_enable munge munge-auth) \
+		$(use_enable nvidia nvidia-gpus) \
+		$(usex crypt "--with-rcp=scp" "--with-rcp=mom_rcp") \
+		$(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \
+		$(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \
+		$(use_enable autorun) \
+		$(use_enable quickcommit) \
+		--with-server-home=${PBS_SERVER_HOME} \
+		--with-environ=/etc/pbs_environment \
+		--with-default-server=${PBS_SERVER_NAME} \
+		--disable-gcc-warnings \
+		--disable-silent-rules \
+		--with-tcp-retry-limit=2 \
+		--without-loadlibfile
+}
+
+src_compile() {
+	# The .c files are C++, and $(CC) is misused.
+	emake CC="$(tc-getCXX)"
+}
+
+src_install() {
+	local dir
+
+	DOCS=( CHANGELOG README.* Release_Notes )
+	use doc && DOCS+=( doc/admin_guide.ps doc/*.pdf )
+
+	default
+
+	# The build script isn't alternative install location friendly,
+	# So we have to fix some hard-coded paths in tclIndex for xpbs* to work
+	for file in $(find "${ED}" -iname tclIndex); do
+		sed \
+			-e "s/${ED//\// }/ /" \
+			-i "${file}" || die
+	done
+
+	for dir in $(find "${ED}/${PBS_SERVER_HOME}" -type d); do
+		keepdir "${dir#${ED}}"
+	done
+
+	if use server; then
+		newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server
+		newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
+	fi
+
+	newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
+	newconfd "${FILESDIR}"/${PN}-conf.d-munge ${PN}
+	newinitd "${FILESDIR}"/trqauthd-init.d trqauthd
+	newenvd "${FILESDIR}"/${PN}-env.d 25${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	if [[ -f "${EROOT}/etc/pbs_environment" ]]; then
+		cp "${EROOT}/etc/pbs_environment" "${ED}"/etc/pbs_environment || die
+	fi
+
+	if use server && [[ -f "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
+		cp \
+			"${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" \
+			"${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die
+	fi
+
+	echo "${PBS_SERVER_NAME}" > "${ED}${PBS_SERVER_HOME}/server_name" || die
+
+	# Fix up the env.d file to use our set server home.
+	sed \
+		-e "s:/var/spool/${PN}:${PBS_SERVER_HOME}:g" \
+		-i "${ED}"/etc/env.d/25${PN} || die
+
+	if use munge; then
+		sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${ED}"/etc/conf.d/${PN} || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "If this is the first time torque has been installed, then you are not"
+		elog "ready to start the server.  Please refer to the documentation located at:"
+		elog "http://docs.adaptivecomputing.com/torque/${PV//./-}/adminGuide/torquehelp.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm"
+	fi
+}