* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2016-06-01 23:06 Justin Bronder
0 siblings, 0 replies; 32+ messages in thread
From: Justin Bronder @ 2016-06-01 23:06 UTC (permalink / raw
To: gentoo-commits
commit: a5da7812c93de7caaadcca05098d4ae7b781691b
Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 1 23:02:48 2016 +0000
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Wed Jun 1 23:02:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5da7812
sys-cluster/torque: dropping jsbronder as maintainer
Package-Manager: portage-2.2.26
sys-cluster/torque/metadata.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml
index f9ad73d..73c49bd 100644
--- a/sys-cluster/torque/metadata.xml
+++ b/sys-cluster/torque/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>jsbronder@gentoo.org</email>
- </maintainer>
<maintainer type="project">
<email>cluster@gentoo.org</email>
<name>Gentoo Cluster Project</name>
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2016-06-02 16:56 Ian Stakenvicius
0 siblings, 0 replies; 32+ messages in thread
From: Ian Stakenvicius @ 2016-06-02 16:56 UTC (permalink / raw
To: gentoo-commits
commit: 0b8827fead88ff96a29c0850f873b7d64a329b3e
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 15:24:14 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 16:56:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b8827fe
sys-cluster/torque: add myself to the maintainer list in metadata.xml
Package-Manager: portage-2.2.28
sys-cluster/torque/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml
index 73c49bd..b47af35 100644
--- a/sys-cluster/torque/metadata.xml
+++ b/sys-cluster/torque/metadata.xml
@@ -5,6 +5,10 @@
<email>cluster@gentoo.org</email>
<name>Gentoo Cluster Project</name>
</maintainer>
+ <maintainer type="person">
+ <email>axs@gentoo.org</email>
+ <name>Ian Stakenvicius</name>
+ </maintainer>
<use>
<flag name="cpusets">Enable pbs_mom to utilize linux cpusets if available</flag>
<flag name="drmaa">Enable the Distributed Resource Management Application API</flag>
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2016-06-02 16:56 Ian Stakenvicius
0 siblings, 0 replies; 32+ messages in thread
From: Ian Stakenvicius @ 2016-06-02 16:56 UTC (permalink / raw
To: gentoo-commits
commit: 134584b2d81b9928835d5ea44bbb6a2e146b2ef5
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 16:22:53 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 16:56:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=134584b2
sys-cluster/torque: dependency cleanup
Dependency atoms listed in the ebuild were rather significantly mis-matching what
is actually linked to. Cleaned them up, added slot and slot-operators as needed.
Added libressl to IUSE but didn't test if libressl is a drop-in replacement for
openssl -- the situation should be better either way since it was a magic dep
until now.
Also bumped EAPI for torque-2.x so it is no longer deprecated, and adjusted how
the cpusets flag is added to configure.
Package-Manager: portage-2.2.28
...orque-2.5.13.ebuild => torque-2.5.13-r1.ebuild} | 26 ++++++++++----------
...{torque-4.1.7.ebuild => torque-4.1.7-r1.ebuild} | 27 ++++++++++++---------
...rque-4.2.9-r4.ebuild => torque-4.2.9-r5.ebuild} | 28 +++++++++++++---------
3 files changed, 47 insertions(+), 34 deletions(-)
diff --git a/sys-cluster/torque/torque-2.5.13.ebuild b/sys-cluster/torque/torque-2.5.13-r1.ebuild
similarity index 94%
rename from sys-cluster/torque/torque-2.5.13.ebuild
rename to sys-cluster/torque/torque-2.5.13-r1.ebuild
index 252ac35..82934c0 100644
--- a/sys-cluster/torque/torque-2.5.13.ebuild
+++ b/sys-cluster/torque/torque-2.5.13-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=5
inherit autotools-utils eutils flag-o-matic linux-info
@@ -17,16 +17,21 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="cpusets +crypt doc drmaa kernel_linux munge server static-libs +syslog threads tk xml"
# ed is used by makedepend-sh
-DEPEND_COMMON="sys-libs/ncurses
- sys-libs/readline
+DEPEND_COMMON="
+ sys-libs/readline:0=
munge? ( sys-auth/munge )
- tk? ( dev-lang/tk )
+ tk? (
+ dev-lang/tk:0=
+ dev-lang/tcl:0=
+ )
syslog? ( virtual/logger )
- !games-util/qstat"
+ !!games-util/qstat"
+# libncurses.so is just needed so that configure will pass for the readline check
DEPEND="${DEPEND_COMMON}
+ sys-libs/ncurses:*
sys-apps/ed
- !sys-cluster/slurm"
+ !!sys-cluster/slurm"
RDEPEND="${DEPEND_COMMON}
crypt? ( net-misc/openssh )
@@ -49,12 +54,11 @@ pkg_setup() {
fi
fi
- USE_CPUSETS="--disable-cpuset"
if use cpusets; then
if ! use kernel_linux; then
einfo
elog " Torque currently only has support for cpusets in linux."
- elog "Assuming you didn't really want this USE flag."
+ elog "Assuming you didn't really want this USE flag and ignoring."
einfo
else
linux-info_pkg_setup
@@ -68,7 +72,6 @@ pkg_setup() {
elog "your kernel with CONFIG_CPUSETS enabled."
einfo
fi
- USE_CPUSETS="--enable-cpuset"
fi
fi
}
@@ -92,7 +95,6 @@ src_configure() {
local myeconfargs=( --with-rcp=mom_rcp )
use crypt && myeconfargs=( --with-rcp=scp )
-
myeconfargs+=(
$(use_enable tk gui)
$(use_enable tk tcl-qstat)
@@ -102,12 +104,12 @@ src_configure() {
$(use_enable threads high-availability)
$(use_enable xml server-xml)
$(use_enable munge munge-library)
+ $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset)
--with-server-home=${PBS_SERVER_HOME}
--with-environ=/etc/pbs_environment
--with-default-server=${PBS_SERVER_NAME}
--disable-gcc-warnings
--with-tcp-retry-limit=2
- ${USE_CPUSETS}
)
autotools-utils_src_configure
}
diff --git a/sys-cluster/torque/torque-4.1.7.ebuild b/sys-cluster/torque/torque-4.1.7-r1.ebuild
similarity index 92%
rename from sys-cluster/torque/torque-4.1.7.ebuild
rename to sys-cluster/torque/torque-4.1.7-r1.ebuild
index ea148c3..86dfeb5 100644
--- a/sys-cluster/torque/torque-4.1.7.ebuild
+++ b/sys-cluster/torque/torque-4.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,20 +15,27 @@ SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=1690 -> ${P}.tar.gz"
LICENSE="torque-2.5"
SLOT="0"
KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk"
+IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk"
DEPEND_COMMON="
- sys-libs/ncurses
- sys-libs/readline
+ sys-libs/zlib
+ sys-libs/readline:0=
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
cpusets? ( sys-apps/hwloc )
munge? ( sys-auth/munge )
nvidia? ( >=x11-drivers/nvidia-drivers-275 )
- tk? ( dev-lang/tk )
+ tk? (
+ dev-lang/tk:0=
+ dev-lang/tcl:0=
+ )
syslog? ( virtual/logger )
- !games-util/qstat"
+ !!games-util/qstat"
+# libncurses.so is only needed for the configure check on readline to pass
DEPEND="${DEPEND_COMMON}
- !sys-cluster/slurm"
+ sys-libs/ncurses:*
+ !!sys-cluster/slurm"
RDEPEND="${DEPEND_COMMON}
crypt? ( net-misc/openssh )
@@ -53,12 +60,11 @@ pkg_setup() {
fi
fi
- USE_CPUSETS="--disable-cpuset"
if use cpusets; then
if ! use kernel_linux; then
einfo
elog " Torque currently only has support for cpusets in linux."
- elog "Assuming you didn't really want this USE flag."
+ elog "Assuming you didn't really want this USE flag, and ignoring its state."
einfo
else
linux-info_pkg_setup
@@ -68,7 +74,6 @@ pkg_setup() {
elog "your kernel with CONFIG_CPUSETS enabled."
einfo
fi
- USE_CPUSETS="--enable-cpuset"
fi
fi
}
@@ -100,13 +105,13 @@ src_configure() {
$(use_enable drmaa) \
$(use_enable munge munge-auth) \
$(use_enable nvidia nvidia-gpus) \
+ $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \
--with-server-home=${PBS_SERVER_HOME} \
--with-environ=/etc/pbs_environment \
--with-default-server=${PBS_SERVER_NAME} \
--disable-gcc-warnings \
--with-tcp-retry-limit=2 \
--without-loadlibfile \
- ${USE_CPUSETS} \
${myconf}
}
diff --git a/sys-cluster/torque/torque-4.2.9-r4.ebuild b/sys-cluster/torque/torque-4.2.9-r5.ebuild
similarity index 89%
rename from sys-cluster/torque/torque-4.2.9-r4.ebuild
rename to sys-cluster/torque/torque-4.2.9-r5.ebuild
index 372a4a1..601227f 100644
--- a/sys-cluster/torque/torque-4.2.9-r4.ebuild
+++ b/sys-cluster/torque/torque-4.2.9-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,20 +15,28 @@ SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=2849 -> ${P}.tar.gz"
LICENSE="torque-2.5"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk"
+IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk"
DEPEND_COMMON="
- sys-libs/ncurses
- sys-libs/readline:*
+ sys-libs/zlib
+ sys-libs/readline:0=
+ dev-libs/libxml2
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
cpusets? ( sys-apps/hwloc )
munge? ( sys-auth/munge )
nvidia? ( >=x11-drivers/nvidia-drivers-275 )
- tk? ( dev-lang/tk:0 )
+ tk? (
+ dev-lang/tk:0=
+ dev-lang/tcl:0=
+ )
syslog? ( virtual/logger )
- !games-util/qstat"
+ !!games-util/qstat"
+# libncurses.so is only needed for configure check on readline
DEPEND="${DEPEND_COMMON}
- !sys-cluster/slurm"
+ sys-libs/ncurses:*
+ !!sys-cluster/slurm"
RDEPEND="${DEPEND_COMMON}
crypt? ( net-misc/openssh )
@@ -53,12 +61,11 @@ pkg_setup() {
fi
fi
- USE_CPUSETS="--disable-cpuset"
if use cpusets; then
if ! use kernel_linux; then
einfo
elog " Torque currently only has support for cpusets in linux."
- elog "Assuming you didn't really want this USE flag."
+ elog "Assuming you didn't really want this USE flag and ignoring its state."
einfo
else
linux-info_pkg_setup
@@ -68,7 +75,6 @@ pkg_setup() {
elog "your kernel with CONFIG_CPUSETS enabled."
einfo
fi
- USE_CPUSETS="--enable-cpuset"
fi
fi
}
@@ -100,13 +106,13 @@ src_configure() {
$(use_enable drmaa) \
$(use_enable munge munge-auth) \
$(use_enable nvidia nvidia-gpus) \
+ $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \
--with-server-home=${PBS_SERVER_HOME} \
--with-environ=/etc/pbs_environment \
--with-default-server=${PBS_SERVER_NAME} \
--disable-gcc-warnings \
--with-tcp-retry-limit=2 \
--without-loadlibfile \
- ${USE_CPUSETS} \
${myconf}
}
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2016-06-08 2:33 Ian Stakenvicius
0 siblings, 0 replies; 32+ messages in thread
From: Ian Stakenvicius @ 2016-06-08 2:33 UTC (permalink / raw
To: gentoo-commits
commit: d016c84152e02f19059e8d1f243f052587d2e3aa
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 3 16:12:57 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Jun 8 02:11:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d016c841
sys-cluster/torque: introduce v6.0.1 with cgroups support
So far there has been very little testing done with this version, and the in-ebuild
cgroups support needs to be expanded (checks against kernel settings added, etc).
Package-Manager: portage-2.2.28
sys-cluster/torque/Manifest | 1 +
sys-cluster/torque/metadata.xml | 1 +
sys-cluster/torque/torque-6.0.1.ebuild | 176 +++++++++++++++++++++++++++++++++
3 files changed, 178 insertions(+)
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 2b20c8a..7b15779 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,3 +1,4 @@
DIST torque-2.5.13.tar.gz 5854910 SHA256 ab59d4c8e8b45383ddd8202fa83956816175e348bb955a4ad5f7e3cd4dde5ff9 SHA512 e08ddf3950bb32177f4bc504a502fae3928a616739c28ca9687c5207606817d4589583306508a2c568cf19fc8c5617dc4a9decc81576c2875660b715c256cfcf WHIRLPOOL 29eefb89d1eb9d6a81735aa117922a1eb0b72e14eeccab7dbd70cdcf01431b7ecd9c3927e1c5c28b7f42d6739b28f45386740b92adb790ccdf9803e4c6e38534
DIST torque-4.1.7.tar.gz 6218108 SHA256 3c86b2d84589f54ac222e81dd1953d153e1d836163d2000412369fefd25fb2af SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6 WHIRLPOOL cae9216f0cebc22927eec2d1f007b1a3c4a6cc619f2926c40a5f46e0bd0eec19691f9aafcad4fe727e2c5ed2485d11c972603cca613269f82147ff1dc41f1ba4
DIST torque-4.2.9.tar.gz 6294022 SHA256 46f1f319683af6d3820e18cda69ce59113c9a5c192e1f07826007be69385889b SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 WHIRLPOOL e65be66b056a519ebd1c30c2c1ae2ddf43bc4e617a52d3caced1e6dfd2b0d8b2a83c26a0f2e6e41cfae791aca68b6f91424745b2baffa2085fccc8f6ae9b8e04
+DIST torque-6.0.1.tar.gz 41229268 SHA256 39623e364a87976a8d657fa47965703ca7ae7c32110ff18eccc6282dc609f3de SHA512 63251ec163feb8d6be788db79de497b2bb1cb98b0d62e2c43fa50d1a4b25b0f8075072c22c3aa4535d6a83a6be987c6cddda47829778bbef3b5006bba936ed87 WHIRLPOOL 98aaf09965416a8e227ef3cdae59f690e4581a2ecde6c5c6e5aa5e99f08ac14012ffb8611b29624f6302098495b94f8e79084fa8478160d71c07f8343ec81839
diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml
index b47af35..b1e48d8 100644
--- a/sys-cluster/torque/metadata.xml
+++ b/sys-cluster/torque/metadata.xml
@@ -10,6 +10,7 @@
<name>Ian Stakenvicius</name>
</maintainer>
<use>
+ <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="drmaa">Enable the Distributed Resource Management Application API</flag>
<flag name="munge">Enable authentication via munge</flag>
diff --git a/sys-cluster/torque/torque-6.0.1.ebuild b/sys-cluster/torque/torque-6.0.1.ebuild
new file mode 100644
index 0000000..caed69c
--- /dev/null
+++ b/sys-cluster/torque/torque-6.0.1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic eutils linux-info
+
+DESCRIPTION="Resource manager and queuing system based on OpenPBS"
+HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
+# TODO: hopefully moving to github tags soon
+# http://www.supercluster.org/pipermail/torquedev/2013-May/004519.html
+SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=3032 -> ${P}.tar.gz"
+
+LICENSE="torque-2.5"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cgroups cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk"
+
+DEPEND_COMMON="
+ sys-libs/zlib
+ sys-libs/readline:0=
+ dev-libs/libxml2
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ 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}"/${P}-1456945733_daea91b
+
+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 "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then
+ PBS_SERVER_NAME="$(<${ROOT}${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() {
+ # 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
+}
+
+src_configure() {
+ econf \
+ $(use_enable tk gui) \
+ $(use_enable tk tcl-qstat) \
+ $(use_enable syslog) \
+ $(use_enable server) \
+ $(use_enable drmaa) \
+ $(use_enable munge munge-auth) \
+ $(use_enable nvidia nvidia-gpus) \
+ $(usex crypt --with-rcp --with-rcp scp mom_rcp) \
+ $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \
+ $(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \
+ --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_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}
+}
+
+pkg_preinst() {
+ if [[ -f "${ROOT}etc/pbs_environment" ]]; then
+ cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die
+ fi
+
+ if use server && [[ -f "${ROOT}${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() {
+ 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/${PN//./-}/Content/topics/1-installConfig/initializeConfigOnServer.htm"
+ if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then
+ echo
+ elog "Important 4.0+ updates"
+ elog " - The on-wire protocol version has been changed."
+ elog " Versions of Torque before 4.0.0 are no longer able to communicate."
+ elog " - pbs_iff has been replaced by trqauthd, you will now need to add"
+ elog " trqauthd to your default runlevel."
+ fi
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2017-01-26 23:13 David Seifert
0 siblings, 0 replies; 32+ messages in thread
From: David Seifert @ 2017-01-26 23:13 UTC (permalink / raw
To: gentoo-commits
commit: 377114623c0510d8287fbc7b70dabdc7dedac78c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 23:10:11 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 23:13:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37711462
Partially revert "profiles/base/package.use.mask: force off rust on www-client/firefox"
This reverts commit a47178b2b36a03e644f4bd37a1688edb666e5d53.
sys-cluster/torque/{torque-6.1.0.ebuild => torque-6.0.1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/sys-cluster/torque/torque-6.1.0.ebuild b/sys-cluster/torque/torque-6.0.1.ebuild
similarity index 100%
rename from sys-cluster/torque/torque-6.1.0.ebuild
rename to sys-cluster/torque/torque-6.0.1.ebuild
^ permalink raw reply [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2017-04-27 3:15 Ian Stakenvicius
0 siblings, 0 replies; 32+ messages in thread
From: Ian Stakenvicius @ 2017-04-27 3:15 UTC (permalink / raw
To: gentoo-commits
commit: 91549ddad6a280e772bd4d1557e7c026c287b8e8
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 03:14:54 2017 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 03:15:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91549dda
sys-cluster/torque: version bump, fix boost dependency, add some new flags
Added USE flags to enable AUTORUN_JOBS and QUICKCOMMIT code
Fixed missing boost dependency, bug 616520
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-cluster/torque/Manifest | 2 +-
sys-cluster/torque/metadata.xml | 2 ++
.../torque/{torque-6.0.1.ebuild => torque-6.0.3.ebuild} | 17 ++++++++++-------
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 7b157794bdf..dd1e9790410 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,4 +1,4 @@
DIST torque-2.5.13.tar.gz 5854910 SHA256 ab59d4c8e8b45383ddd8202fa83956816175e348bb955a4ad5f7e3cd4dde5ff9 SHA512 e08ddf3950bb32177f4bc504a502fae3928a616739c28ca9687c5207606817d4589583306508a2c568cf19fc8c5617dc4a9decc81576c2875660b715c256cfcf WHIRLPOOL 29eefb89d1eb9d6a81735aa117922a1eb0b72e14eeccab7dbd70cdcf01431b7ecd9c3927e1c5c28b7f42d6739b28f45386740b92adb790ccdf9803e4c6e38534
DIST torque-4.1.7.tar.gz 6218108 SHA256 3c86b2d84589f54ac222e81dd1953d153e1d836163d2000412369fefd25fb2af SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6 WHIRLPOOL cae9216f0cebc22927eec2d1f007b1a3c4a6cc619f2926c40a5f46e0bd0eec19691f9aafcad4fe727e2c5ed2485d11c972603cca613269f82147ff1dc41f1ba4
DIST torque-4.2.9.tar.gz 6294022 SHA256 46f1f319683af6d3820e18cda69ce59113c9a5c192e1f07826007be69385889b SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1 WHIRLPOOL e65be66b056a519ebd1c30c2c1ae2ddf43bc4e617a52d3caced1e6dfd2b0d8b2a83c26a0f2e6e41cfae791aca68b6f91424745b2baffa2085fccc8f6ae9b8e04
-DIST torque-6.0.1.tar.gz 41229268 SHA256 39623e364a87976a8d657fa47965703ca7ae7c32110ff18eccc6282dc609f3de SHA512 63251ec163feb8d6be788db79de497b2bb1cb98b0d62e2c43fa50d1a4b25b0f8075072c22c3aa4535d6a83a6be987c6cddda47829778bbef3b5006bba936ed87 WHIRLPOOL 98aaf09965416a8e227ef3cdae59f690e4581a2ecde6c5c6e5aa5e99f08ac14012ffb8611b29624f6302098495b94f8e79084fa8478160d71c07f8343ec81839
+DIST torque-6.0.3-1485300822_19e79ad.tar.gz 41660338 SHA256 dcbc806379596848f9887ff3b518d4ca7031e888d29d0b12e4e270c0e677dd80 SHA512 40531f2e7732a11ffc224c536f61adc48ce5699a7caebb8aa1fbe7536b5ca4ed66c8436420bc918f7538ef980818141888aa26390a5a2c8185c8cc57373a0ac1 WHIRLPOOL f504106f33a031f9e578b5aa9992423ecc50fad88ec0b380e10284007d1271aeee10da494b32d9a3f7da5a012eeaadbbae2f91f0180ef0abcda9309942eb7777
diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml
index b1e48d8659e..ce0da419e92 100644
--- a/sys-cluster/torque/metadata.xml
+++ b/sys-cluster/torque/metadata.xml
@@ -10,11 +10,13 @@
<name>Ian Stakenvicius</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="drmaa">Enable the Distributed Resource Management Application API</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>
</pkgmetadata>
diff --git a/sys-cluster/torque/torque-6.0.1.ebuild b/sys-cluster/torque/torque-6.0.3.ebuild
similarity index 90%
rename from sys-cluster/torque/torque-6.0.1.ebuild
rename to sys-cluster/torque/torque-6.0.3.ebuild
index 81660c9a75b..74409b48eef 100644
--- a/sys-cluster/torque/torque-6.0.1.ebuild
+++ b/sys-cluster/torque/torque-6.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,19 +7,19 @@ inherit flag-o-matic eutils linux-info
DESCRIPTION="Resource manager and queuing system based on OpenPBS"
HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-# TODO: hopefully moving to github tags soon
-# http://www.supercluster.org/pipermail/torquedev/2013-May/004519.html
-SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=3032 -> ${P}.tar.gz"
+DISTFILEHASH="1485300822_19e79ad"
+SRC_URI="http://wpfilebase.s3.amazonaws.com/torque/${P}-${DISTFILEHASH}.tar.gz"
LICENSE="torque-2.5"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cgroups cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk"
+IUSE="autorun cgroups cpusets +crypt doc drmaa kernel_linux libressl munge nvidia quickcommit server +syslog tk"
DEPEND_COMMON="
sys-libs/zlib
sys-libs/readline:0=
dev-libs/libxml2
+ >=dev-libs/boost-1.41
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
cpusets? ( sys-apps/hwloc )
@@ -47,7 +47,7 @@ RDEPEND="${DEPEND_COMMON}
# by the configure.ac and Makefile.am are missing.
# http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html
-S="${WORKDIR}"/${P}-1456945733_daea91b
+S="${WORKDIR}"/${P}-${DISTFILEHASH}
pkg_setup() {
PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}"
@@ -95,9 +95,12 @@ src_configure() {
$(use_enable drmaa) \
$(use_enable munge munge-auth) \
$(use_enable nvidia nvidia-gpus) \
- $(usex crypt --with-rcp --with-rcp scp mom_rcp) \
+ $(usex crypt "--with-rcp=scp" "--with-rcp=mom_rcp") \
$(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \
+ $(usex kernel_linux $(use_enable cpusets geometry-request) --disable-geometry-request) \
$(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} \
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2019-03-07 17:37 Ian Stakenvicius
0 siblings, 0 replies; 32+ messages in thread
From: Ian Stakenvicius @ 2019-03-07 17:37 UTC (permalink / raw
To: gentoo-commits
commit: ce0f064025bf0d46de8c07f3372f32569a4e80b2
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 17:16:51 2019 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 17:37:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce0f0640
sys-cluster/torque: bump to 6.0.4
Source tarball is from latest 6.0 github commit, snapshot from 2018-08-29
Signed-off-by: Ian Stakenvicius <axs <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-cluster/torque/Manifest | 2 +-
.../{torque-6.0.3.ebuild => torque-6.0.4.ebuild} | 18 +++++++++++-------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 7126d842443..14f7f301012 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,3 +1,3 @@
DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910fa5632b9f6b82e08b3afb8c54e8775c38bc8e5c959aa99d0647c54c7c348cd07bcbe11add8bfab5f3f06a4c80 SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6
DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa
-DIST torque-6.0.3-1485300822_19e79ad.tar.gz 41660338 BLAKE2B 5e6c2e4bfffbe96d3a3e441f4c4420b4cb81a882bc498c4bf9474cf15a6808234f444183876a5ccfd46b6a9e4113d404cf72359ab3166146c3040854485f807d SHA512 40531f2e7732a11ffc224c536f61adc48ce5699a7caebb8aa1fbe7536b5ca4ed66c8436420bc918f7538ef980818141888aa26390a5a2c8185c8cc57373a0ac1
+DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94
diff --git a/sys-cluster/torque/torque-6.0.3.ebuild b/sys-cluster/torque/torque-6.0.4.ebuild
similarity index 92%
rename from sys-cluster/torque/torque-6.0.3.ebuild
rename to sys-cluster/torque/torque-6.0.4.ebuild
index 75508148652..42f1f078421 100644
--- a/sys-cluster/torque/torque-6.0.3.ebuild
+++ b/sys-cluster/torque/torque-6.0.4.ebuild
@@ -1,14 +1,13 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit flag-o-matic eutils linux-info
+inherit autotools flag-o-matic linux-info
DESCRIPTION="Resource manager and queuing system based on OpenPBS"
HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-DISTFILEHASH="1485300822_19e79ad"
-SRC_URI="http://wpfilebase.s3.amazonaws.com/torque/${P}-${DISTFILEHASH}.tar.gz"
+SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> ${P}-gh-20170829.tar.gz"
LICENSE="torque-2.5"
SLOT="0"
@@ -47,7 +46,11 @@ RDEPEND="${DEPEND_COMMON}
# by the configure.ac and Makefile.am are missing.
# http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html
-S="${WORKDIR}"/${P}-${DISTFILEHASH}
+S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch
+)
pkg_setup() {
PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}"
@@ -81,10 +84,11 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-fix-emptystring-comparison.patch
+ 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() {
@@ -165,7 +169,7 @@ pkg_preinst() {
}
pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ 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/${PN//./-}/adminGuide/help.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm"
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2019-03-07 17:37 Ian Stakenvicius
0 siblings, 0 replies; 32+ messages in thread
From: Ian Stakenvicius @ 2019-03-07 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 0a2e7d8868e0456a25b56f0a52724c8d5ca12f3c
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 21:01:33 2019 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 17:37:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a2e7d88
sys-cluster/torque: cleanup old
- Dropped buggy 4.2.9-r5
- Dropped very old 2.5 series
Signed-off-by: Ian Stakenvicius <axs <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
sys-cluster/torque/Manifest | 2 -
sys-cluster/torque/torque-2.5.13-r1.ebuild | 253 -----------------------------
sys-cluster/torque/torque-4.2.9-r5.ebuild | 183 ---------------------
3 files changed, 438 deletions(-)
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 7b5ca3a6350..7126d842443 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,5 +1,3 @@
-DIST torque-2.5.13.tar.gz 5854910 BLAKE2B 47fa519cbd2d9aeecb3bc323ba3f08f871b2259eb9c83335449a1f7c0d382fdffd0ced4f3ef09707c50a222d77ca0e5a39536b5c0f734bee37d3b50aec710430 SHA512 e08ddf3950bb32177f4bc504a502fae3928a616739c28ca9687c5207606817d4589583306508a2c568cf19fc8c5617dc4a9decc81576c2875660b715c256cfcf
DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910fa5632b9f6b82e08b3afb8c54e8775c38bc8e5c959aa99d0647c54c7c348cd07bcbe11add8bfab5f3f06a4c80 SHA512 5a085c0a7b205fed075bff4599db90ca5c4bb5f22d87d76fd56539d5cc1935bb8eeffcd4d18ba84401bd4ca128718070b69c8b91ab6814a4638622ba351654e6
DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa
-DIST torque-4.2.9.tar.gz 6294022 BLAKE2B 2a57bebd7d9160deb3c610c21e1014a813c6e53771aadd65241d5fc623d41dca314e7b391cb218e0c9e917936c0547d1ba4c184442c20cef8bb62f98072537cc SHA512 898703fa1d02310c22e2a02b86d67ca52ebed46684597931944edebb39f8293746739c8dca9cd10e07c2e7274c3dd7f65a5664d1980817e3feec58952c4cf4d1
DIST torque-6.0.3-1485300822_19e79ad.tar.gz 41660338 BLAKE2B 5e6c2e4bfffbe96d3a3e441f4c4420b4cb81a882bc498c4bf9474cf15a6808234f444183876a5ccfd46b6a9e4113d404cf72359ab3166146c3040854485f807d SHA512 40531f2e7732a11ffc224c536f61adc48ce5699a7caebb8aa1fbe7536b5ca4ed66c8436420bc918f7538ef980818141888aa26390a5a2c8185c8cc57373a0ac1
diff --git a/sys-cluster/torque/torque-2.5.13-r1.ebuild b/sys-cluster/torque/torque-2.5.13-r1.ebuild
deleted file mode 100644
index 7a45fb1c900..00000000000
--- a/sys-cluster/torque/torque-2.5.13-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils eutils flag-o-matic linux-info
-
-DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=1643 -> ${P}.tar.gz"
-
-LICENSE="torque-2.5"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="cpusets +crypt doc drmaa kernel_linux munge server static-libs +syslog threads tk xml"
-
-# ed is used by makedepend-sh
-DEPEND_COMMON="
- sys-libs/readline:0=
- munge? ( sys-auth/munge )
- tk? (
- dev-lang/tk:0=
- dev-lang/tcl:0=
- )
- syslog? ( virtual/logger )
- !!games-util/qstat"
-
-# libncurses.so is just needed so that configure will pass for the readline check
-DEPEND="${DEPEND_COMMON}
- sys-libs/ncurses:*
- sys-apps/ed
- !!sys-cluster/slurm"
-
-RDEPEND="${DEPEND_COMMON}
- crypt? ( net-misc/openssh )
- !crypt? ( net-misc/netkit-rsh )"
-
-DOCS=( Release_Notes )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
- PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/torque}"
-
- # 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 "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then
- PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)"
- else
- PBS_SERVER_NAME=$(hostname -f)
- fi
- fi
-
- if use cpusets; then
- if ! use kernel_linux; then
- einfo
- elog " Torque currently only has support for cpusets in linux."
- elog "Assuming you didn't really want this USE flag and ignoring."
- einfo
- else
- linux-info_pkg_setup
- einfo
- elog " Torque support for cpusets is still in development, you may"
- elog "wish to disable it for production use."
- einfo
- 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() {
- epatch "${FILESDIR}"/CVE-2013-4319-2.x-root-submit-fix.patch
- epatch "${FILESDIR}"/tcl8.6.patch
-
- # 510726
- epatch "${FILESDIR}"/CVE-2014-0749.patch
-
- # 491270
- epatch "${FILESDIR}"/CVE-2013-4495.patch
-
- # Unused and causes breakage when switching from glibc to tirpc.
- # https://github.com/adaptivecomputing/torque/pull/148
- sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die
-}
-
-src_configure() {
- local myeconfargs=( --with-rcp=mom_rcp )
-
- use crypt && myeconfargs=( --with-rcp=scp )
- myeconfargs+=(
- $(use_enable tk gui)
- $(use_enable tk tcl-qstat)
- $(use_enable syslog)
- $(use_enable server)
- $(use_enable drmaa)
- $(use_enable threads high-availability)
- $(use_enable xml server-xml)
- $(use_enable munge munge-library)
- $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset)
- --with-server-home=${PBS_SERVER_HOME}
- --with-environ=/etc/pbs_environment
- --with-default-server=${PBS_SERVER_NAME}
- --disable-gcc-warnings
- --with-tcp-retry-limit=2
- )
- autotools-utils_src_configure
-}
-
-# WARNING
-# OpenPBS is extremely stubborn about directory permissions. Sometimes it will
-# just fall over with the error message, but in some spots it will just ignore
-# you and fail strangely. Likewise it also barfs on our .keep files!
-pbs_createspool() {
- local root="$1"
- local s="$(dirname "${PBS_SERVER_HOME}")"
- local h="${PBS_SERVER_HOME}"
- local sp="${h}/server_priv"
- einfo "Building spool directory under ${D}${h}"
- local a d m
- local dir_spec="
- 0755:${h}/aux 0700:${h}/checkpoint
- 0755:${h}/mom_logs 0751:${h}/mom_priv 0751:${h}/mom_priv/jobs
- 1777:${h}/spool 1777:${h}/undelivered"
-
- if use server; then
- dir_spec="${dir_spec} 0755:${h}/sched_logs
- 0755:${h}/sched_priv/accounting 0755:${h}/server_logs
- 0750:${h}/server_priv 0755:${h}/server_priv/accounting
- 0750:${h}/server_priv/acl_groups 0750:${h}/server_priv/acl_hosts
- 0750:${h}/server_priv/acl_svr 0750:${h}/server_priv/acl_users
- 0750:${h}/server_priv/jobs 0750:${h}/server_priv/queues"
- fi
-
- for a in ${dir_spec}; do
- d="${a/*:}"
- m="${a/:*}"
- if [[ ! -d "${root}${d}" ]]; then
- install -d -m${m} "${root}${d}" || die
- else
- chmod ${m} "${root}${d}" || die
- fi
- # (#149226) If we're running in src_*, then keepdir
- if [[ "${root}" = "${D}" ]]; then
- keepdir ${d}
- fi
- done
-}
-
-src_install() {
- # Make directories first
- pbs_createspool "${D}"
-
- autotools-utils_src_install
-
- use doc && dodoc doc/admin_guide.ps doc/*.pdf
-
- # 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 "${D}" -iname tclIndex`; do
- sed -e "s/${D//\// }/ /" "${file}" > "${file}.new"
- mv "${file}.new" "${file}" || die
- 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}"/torque-conf.d-munge torque
- newenvd "${FILESDIR}"/torque-env.d 25torque
-}
-
-pkg_preinst() {
- if [[ -f "${ROOT}etc/pbs_environment" ]]; then
- cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment || die
- fi
-
- echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name" || die
-
- # Fix up the env.d file to use our set server home.
- sed -i \
- "s:/var/spool/torque:${PBS_SERVER_HOME}:g" "${D}"/etc/env.d/25torque \
- || die
-
- if use munge; then
- sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/torque || die
- fi
-}
-
-pkg_postinst() {
- pbs_createspool "${ROOT}"
- 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://www.clusterresources.com/wiki/doku.php?id=torque:torque_wiki"
- echo
- elog " For a basic setup, you may use emerge --config ${PN}"
-}
-
-# root will be setup as the primary operator/manager, the local machine
-# will be added as a node and we'll create a simple queue, batch.
-pkg_config() {
- local h="$(echo "${ROOT}/${PBS_SERVER_HOME}" | sed 's:///*:/:g')"
- local rc=0
-
- ebegin "Configuring Torque"
- einfo "Using ${h} as the pbs homedir"
- einfo "Using ${PBS_SERVER_NAME} as the pbs_server"
-
- # Check for previous configuration and bail if found.
- if [ -e "${h}/server_priv/acl_svr/operators" ] \
- || [ -e "${h}/server_priv/nodes" ] \
- || [ -e "${h}/mom_priv/config" ]; then
- ewarn "Previous Torque configuration detected. Press Enter to"
- ewarn "continue or Control-C to abort now"
- read
- fi
-
- # pbs_mom configuration.
- echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config" || die
- echo "\$logevent 255" >> "${h}/mom_priv/config" || die
-
- if use server; then
- local qmgr="${ROOT}/usr/bin/qmgr -c"
- # pbs_server bails on repeated backslashes.
- if ! "${ROOT}"/usr/sbin/pbs_server -f -d "${h}" -t create; then
- eerror "Failed to start pbs_server"
- rc=1
- else
- ${qmgr} "set server operators = root@$(hostname -f)" ${PBS_SERVER_NAME} \
- && ${qmgr} "create queue batch" ${PBS_SERVER_NAME} \
- && ${qmgr} "set queue batch queue_type = Execution" ${PBS_SERVER_NAME} \
- && ${qmgr} "set queue batch started = True" ${PBS_SERVER_NAME} \
- && ${qmgr} "set queue batch enabled = True" ${PBS_SERVER_NAME} \
- && ${qmgr} "set server default_queue = batch" ${PBS_SERVER_NAME} \
- && ${qmgr} "set server resources_default.nodes = 1" ${PBS_SERVER_NAME} \
- && ${qmgr} "set server scheduling = True" ${PBS_SERVER_NAME} \
- || die
-
- "${ROOT}"/usr/bin/qterm -t quick ${PBS_SERVER_NAME} || rc=1
-
- # Add the local machine as a node.
- echo "$(hostname -f) np=1" > "${h}/server_priv/nodes" || die
- fi
- fi
- eend ${rc}
-}
diff --git a/sys-cluster/torque/torque-4.2.9-r5.ebuild b/sys-cluster/torque/torque-4.2.9-r5.ebuild
deleted file mode 100644
index d972010f7c7..00000000000
--- a/sys-cluster/torque/torque-4.2.9-r5.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic eutils linux-info
-
-DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-# TODO: hopefully moving to github tags soon
-# http://www.supercluster.org/pipermail/torquedev/2013-May/004519.html
-SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=2849 -> ${P}.tar.gz"
-
-LICENSE="torque-2.5"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk"
-
-DEPEND_COMMON="
- sys-libs/zlib
- sys-libs/readline:0=
- dev-libs/libxml2
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- 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
-
-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 "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then
- PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)"
- else
- PBS_SERVER_NAME=$(hostname -f)
- fi
- fi
-
- if use cpusets; then
- if ! use kernel_linux; then
- einfo
- elog " Torque currently only has support for cpusets 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() {
- # Unused and causes breakage when switching from glibc to tirpc.
- # https://github.com/adaptivecomputing/torque/pull/148
- sed -i '/rpc\/rpc\.h/d' src/lib/Libnet/net_client.c || die
-
- # 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
-
- epatch "${FILESDIR}"/${P}-tcl8.6.patch
-
- # 524362
- epatch "${FILESDIR}"/TRQ-2885-limit-tm_adopt-to-only-adopt-a-session-id-t.patch
-}
-
-src_configure() {
- local myconf="--with-rcp=mom_rcp"
-
- use crypt && myconf="--with-rcp=scp"
-
- econf \
- $(use_enable tk gui) \
- $(use_enable syslog) \
- $(use_enable server) \
- $(use_enable drmaa) \
- $(use_enable munge munge-auth) \
- $(use_enable nvidia nvidia-gpus) \
- $(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \
- --with-server-home=${PBS_SERVER_HOME} \
- --with-environ=/etc/pbs_environment \
- --with-default-server=${PBS_SERVER_NAME} \
- --disable-gcc-warnings \
- --with-tcp-retry-limit=2 \
- --without-loadlibfile \
- ${myconf}
-}
-
-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}
-}
-
-pkg_preinst() {
- if [[ -f "${ROOT}etc/pbs_environment" ]]; then
- cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die
- fi
-
- if use server && [[ -f "${ROOT}${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() {
- 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/${PN//./-}/Content/topics/1-installConfig/initializeConfigOnServer.htm"
- if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then
- echo
- elog "Important 4.0+ updates"
- elog " - The on-wire protocol version has been changed."
- elog " Versions of Torque before 4.0.0 are no longer able to communicate."
- elog " - pbs_iff has been replaced by trqauthd, you will now need to add"
- elog " trqauthd to your default runlevel."
- fi
-}
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2019-03-07 17:37 Ian Stakenvicius
0 siblings, 0 replies; 32+ messages in thread
From: Ian Stakenvicius @ 2019-03-07 17:37 UTC (permalink / raw
To: gentoo-commits
commit: caea5bc25186343247d5a68dfac73c3a0430ba58
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 27 17:22:26 2019 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 17:37:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caea5bc2
sys-cluster/torque: fix documentation URLs in postinst message
Closes: https://bugs.gentoo.org/666224
Signed-off-by: Ian Stakenvicius <axs <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
sys-cluster/torque/torque-4.2.10-r1.ebuild | 2 +-
sys-cluster/torque/torque-6.0.3.ebuild | 16 +++++-----------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/sys-cluster/torque/torque-4.2.10-r1.ebuild b/sys-cluster/torque/torque-4.2.10-r1.ebuild
index 7c06eb30b27..bf8705f64b4 100644
--- a/sys-cluster/torque/torque-4.2.10-r1.ebuild
+++ b/sys-cluster/torque/torque-4.2.10-r1.ebuild
@@ -175,7 +175,7 @@ pkg_postinst() {
showmessage=0;
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/${PN//./-}/Content/topics/1-installConfig/initializeConfigOnServer.htm"
+ elog "http://docs.adaptivecomputing.com/torque/${PN//./-}/help.htm#topics/1-installConfig/initializeConfigOnServer.htm"
elog
else
for i in ${REPLACING_VERSIONS} ; do
diff --git a/sys-cluster/torque/torque-6.0.3.ebuild b/sys-cluster/torque/torque-6.0.3.ebuild
index ec9563e95bf..75508148652 100644
--- a/sys-cluster/torque/torque-6.0.3.ebuild
+++ b/sys-cluster/torque/torque-6.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -165,15 +165,9 @@ pkg_preinst() {
}
pkg_postinst() {
- 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/${PN//./-}/Content/topics/1-installConfig/initializeConfigOnServer.htm"
- if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then
- echo
- elog "Important 4.0+ updates"
- elog " - The on-wire protocol version has been changed."
- elog " Versions of Torque before 4.0.0 are no longer able to communicate."
- elog " - pbs_iff has been replaced by trqauthd, you will now need to add"
- elog " trqauthd to your default runlevel."
+ 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/${PN//./-}/adminGuide/help.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm"
fi
}
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2019-07-14 18:27 Hans de Graaff
0 siblings, 0 replies; 32+ messages in thread
From: Hans de Graaff @ 2019-07-14 18:27 UTC (permalink / raw
To: gentoo-commits
commit: d03fd226cd4766b5f090433aae8c288187f1a7a6
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 10:25:43 2019 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 18:27:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d03fd226
sys-cluster/torque: also drop actual dependencies
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
sys-cluster/torque/torque-6.0.4-r1.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild
index 4cfac4df5ce..bc520dc0ace 100644
--- a/sys-cluster/torque/torque-6.0.4-r1.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild
@@ -19,8 +19,6 @@ DEPEND_COMMON="
sys-libs/readline:0=
dev-libs/libxml2
>=dev-libs/boost-1.41
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
cpusets? ( sys-apps/hwloc )
munge? ( sys-auth/munge )
nvidia? ( >=x11-drivers/nvidia-drivers-275 )
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2019-10-15 20:44 Ian Stakenvicius
0 siblings, 0 replies; 32+ messages in thread
From: Ian Stakenvicius @ 2019-10-15 20:44 UTC (permalink / raw
To: gentoo-commits
commit: 625bf1cca355fde685db06db9325a7cf7c50219c
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 20:43:34 2019 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 20:44:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625bf1cc
sys-cluster/torque: adjust flags for modern toolchains
This is a workaround patch that supports building toqrue on
an at-time-of-commit stable stage3 environment.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Ian Stakenvicius <axs <AT> gentoo.org>
sys-cluster/torque/torque-6.0.4-r1.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild
index bc520dc0ace..1607c10d62d 100644
--- a/sys-cluster/torque/torque-6.0.4-r1.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild
@@ -91,6 +91,10 @@ src_prepare() {
}
src_configure() {
+ append-cflags "-fpermissive"
+ use kernel_linux && append-cflags "-Dlinux"
+ append-cxxflags "-std=c++03"
+
econf \
$(use_enable tk gui) \
$(use_enable tk tcl-qstat) \
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2020-03-05 19:16 Ian Stakenvicius
0 siblings, 0 replies; 32+ messages in thread
From: Ian Stakenvicius @ 2020-03-05 19:16 UTC (permalink / raw
To: gentoo-commits
commit: e9eca8ffeb8fb002255605616789264880d3a2d2
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 5 19:15:56 2020 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Mar 5 19:16:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9eca8ff
sys-cluster/torque: drop broken USE=drmaa, fix doc and econf warn
-Fixed the documentation link in pkg_postinst
-Dropped USE=drmaa as its broken and upstream hasn't done anything with
the code since torque-2
-Removed the --disable-geometry-request config option
Closes: https://bugs.gentoo.org/697124
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Ian Stakenvicius <axs <AT> gentoo.org>
sys-cluster/torque/torque-6.0.4-r1.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild
index 456675c959f..6f18c025266 100644
--- a/sys-cluster/torque/torque-6.0.4-r1.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921
LICENSE="torque-2.5"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="autorun cgroups cpusets +crypt doc drmaa kernel_linux libressl munge nvidia quickcommit server +syslog tk"
+IUSE="autorun cgroups cpusets +crypt doc kernel_linux libressl munge nvidia quickcommit server +syslog tk"
DEPEND_COMMON="
sys-libs/zlib
@@ -100,12 +100,11 @@ src_configure() {
$(use_enable tk tcl-qstat) \
$(use_enable syslog) \
$(use_enable server) \
- $(use_enable drmaa) \
+ --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 cpusets geometry-request) --disable-geometry-request) \
$(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \
$(use_enable autorun) \
$(use_enable quickcommit) \
@@ -113,6 +112,7 @@ src_configure() {
--with-environ=/etc/pbs_environment \
--with-default-server=${PBS_SERVER_NAME} \
--disable-gcc-warnings \
+ --disable-silent-rules \
--with-tcp-retry-limit=2 \
--without-loadlibfile
}
@@ -174,6 +174,6 @@ 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/${PN//./-}/adminGuide/help.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm"
+ elog "http://docs.adaptivecomputing.com/torque/${PV//./-}/adminGuide/torquehelp.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm"
fi
}
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2020-04-19 14:23 Sergei Trofimovich
0 siblings, 0 replies; 32+ messages in thread
From: Sergei Trofimovich @ 2020-04-19 14:23 UTC (permalink / raw
To: gentoo-commits
commit: ca6424f438c1e888a7cf643b65927b03864e14c2
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 19 14:23:19 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 14:23:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca6424f4
sys-cluster/torque: drop lexicographical version compare
torque < 4 is not in tree for a while. Let's just drop dead code.
Closes: https://bugs.gentoo.org/705278
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-cluster/torque/torque-4.1.7-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/torque/torque-4.1.7-r1.ebuild b/sys-cluster/torque/torque-4.1.7-r1.ebuild
index 6e27735c337..12099f7e7c5 100644
--- a/sys-cluster/torque/torque-4.1.7-r1.ebuild
+++ b/sys-cluster/torque/torque-4.1.7-r1.ebuild
@@ -174,7 +174,7 @@ pkg_postinst() {
echo ""
elog " For a basic setup, you may use emerge --config ${PN}"
echo ""
- if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
elog "Important 4.0+ updates"
elog " - The on-wire protocol version has been changed."
elog " Versions of Torque before 4.0.0 are no longer able to communicate."
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2020-05-22 18:50 Sergei Trofimovich
0 siblings, 0 replies; 32+ messages in thread
From: Sergei Trofimovich @ 2020-05-22 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 133b4c5bd87f478f8445cdc73d079617dcb0a66b
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 18:50:31 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri May 22 18:50:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=133b4c5b
sys-cluster/torque: use integer comparison, bug #705278
Use integer comparison instead of lexicographical one.
Bug: https://bugs.gentoo.org/705278
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-cluster/torque/torque-4.2.10-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/torque/torque-4.2.10-r1.ebuild b/sys-cluster/torque/torque-4.2.10-r1.ebuild
index bf8705f64b4..c992fb2b62c 100644
--- a/sys-cluster/torque/torque-4.2.10-r1.ebuild
+++ b/sys-cluster/torque/torque-4.2.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -184,7 +184,7 @@ pkg_postinst() {
fi
done
fi
- if [[ ${showmessage} > 0 ]]; then
+ if [[ ${showmessage} -gt 0 ]]; then
elog "Important v4.x changes:"
elog " - The on-wire protocol version has been changed."
elog " Versions of Torque before 4.0.0 are no longer able to communicate."
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2021-05-01 7:29 Mikle Kolyada
0 siblings, 0 replies; 32+ messages in thread
From: Mikle Kolyada @ 2021-05-01 7:29 UTC (permalink / raw
To: gentoo-commits
commit: bb6c46a340049c9fd74df1a0ec88553868ed5453
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat May 1 07:15:34 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat May 1 07:15:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb6c46a3
sys-cluster/torque: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
sys-cluster/torque/torque-4.1.7-r1.ebuild | 5 ++---
sys-cluster/torque/torque-4.2.10-r1.ebuild | 5 ++---
sys-cluster/torque/torque-6.0.4-r1.ebuild | 4 ++--
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/sys-cluster/torque/torque-4.1.7-r1.ebuild b/sys-cluster/torque/torque-4.1.7-r1.ebuild
index ea5c56333ff..4246e10b66c 100644
--- a/sys-cluster/torque/torque-4.1.7-r1.ebuild
+++ b/sys-cluster/torque/torque-4.1.7-r1.ebuild
@@ -14,13 +14,12 @@ SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=1690 -> ${P}.tar.gz"
LICENSE="torque-2.5"
SLOT="0"
KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk"
+IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk"
DEPEND_COMMON="
sys-libs/zlib
sys-libs/readline:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
+ dev-libs/openssl:0=
cpusets? ( sys-apps/hwloc )
munge? ( sys-auth/munge )
nvidia? ( >=x11-drivers/nvidia-drivers-275 )
diff --git a/sys-cluster/torque/torque-4.2.10-r1.ebuild b/sys-cluster/torque/torque-4.2.10-r1.ebuild
index 46e0fd38f96..682843cf7e6 100644
--- a/sys-cluster/torque/torque-4.2.10-r1.ebuild
+++ b/sys-cluster/torque/torque-4.2.10-r1.ebuild
@@ -15,14 +15,13 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/ddf5c4f40091b615716
LICENSE="torque-2.5"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk"
+IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk"
DEPEND_COMMON="
sys-libs/zlib
sys-libs/readline:0=
dev-libs/libxml2
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
cpusets? ( sys-apps/hwloc )
munge? ( sys-auth/munge )
nvidia? ( >=x11-drivers/nvidia-drivers-275 )
diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild
index b551a3e0669..3def8e696c1 100644
--- a/sys-cluster/torque/torque-6.0.4-r1.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921
LICENSE="torque-2.5"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="autorun cgroups cpusets +crypt doc kernel_linux libressl munge nvidia quickcommit server +syslog tk"
+IUSE="autorun cgroups cpusets +crypt doc kernel_linux munge nvidia quickcommit server +syslog tk"
DEPEND_COMMON="
sys-libs/zlib
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2021-07-05 16:53 Marek Szuba
0 siblings, 0 replies; 32+ messages in thread
From: Marek Szuba @ 2021-07-05 16:53 UTC (permalink / raw
To: gentoo-commits
commit: f232d851252f75f2a0c88f4fec781630e2808fd6
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 5 15:55:04 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Jul 5 16:53:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f232d851
sys-cluster/torque: keyword 6.0.4-r1 for ~riscv
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-cluster/torque/torque-6.0.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild
index 3def8e696c1..0ec3060e1d8 100644
--- a/sys-cluster/torque/torque-6.0.4-r1.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921
LICENSE="torque-2.5"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="autorun cgroups cpusets +crypt doc kernel_linux munge nvidia quickcommit server +syslog tk"
DEPEND_COMMON="
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2021-10-29 22:44 Sam James
0 siblings, 0 replies; 32+ messages in thread
From: Sam James @ 2021-10-29 22:44 UTC (permalink / raw
To: gentoo-commits
commit: e2aac6d8fbc7c5809f384d5251323995da94081a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 22:40:08 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 22:43:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2aac6d8
sys-cluster/torque: add hwloc subslot operator
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/torque/{torque-4.1.7-r1.ebuild => torque-4.1.7-r2.ebuild} | 2 +-
sys-cluster/torque/{torque-4.2.10-r1.ebuild => torque-4.2.10-r2.ebuild} | 2 +-
sys-cluster/torque/{torque-6.0.4-r1.ebuild => torque-6.0.4-r2.ebuild} | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-cluster/torque/torque-4.1.7-r1.ebuild b/sys-cluster/torque/torque-4.1.7-r2.ebuild
similarity index 99%
rename from sys-cluster/torque/torque-4.1.7-r1.ebuild
rename to sys-cluster/torque/torque-4.1.7-r2.ebuild
index 4246e10b66c..1b91e3e2602 100644
--- a/sys-cluster/torque/torque-4.1.7-r1.ebuild
+++ b/sys-cluster/torque/torque-4.1.7-r2.ebuild
@@ -20,7 +20,7 @@ DEPEND_COMMON="
sys-libs/zlib
sys-libs/readline:0=
dev-libs/openssl:0=
- cpusets? ( sys-apps/hwloc )
+ cpusets? ( sys-apps/hwloc:= )
munge? ( sys-auth/munge )
nvidia? ( >=x11-drivers/nvidia-drivers-275 )
tk? (
diff --git a/sys-cluster/torque/torque-4.2.10-r1.ebuild b/sys-cluster/torque/torque-4.2.10-r2.ebuild
similarity index 99%
rename from sys-cluster/torque/torque-4.2.10-r1.ebuild
rename to sys-cluster/torque/torque-4.2.10-r2.ebuild
index 682843cf7e6..3366b0f2853 100644
--- a/sys-cluster/torque/torque-4.2.10-r1.ebuild
+++ b/sys-cluster/torque/torque-4.2.10-r2.ebuild
@@ -22,7 +22,7 @@ DEPEND_COMMON="
sys-libs/readline:0=
dev-libs/libxml2
dev-libs/openssl:0=
- cpusets? ( sys-apps/hwloc )
+ cpusets? ( sys-apps/hwloc:= )
munge? ( sys-auth/munge )
nvidia? ( >=x11-drivers/nvidia-drivers-275 )
tk? (
diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
similarity index 99%
rename from sys-cluster/torque/torque-6.0.4-r1.ebuild
rename to sys-cluster/torque/torque-6.0.4-r2.ebuild
index 0ec3060e1d8..982514daa40 100644
--- a/sys-cluster/torque/torque-6.0.4-r1.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -20,7 +20,7 @@ DEPEND_COMMON="
sys-libs/readline:0=
dev-libs/libxml2
>=dev-libs/boost-1.41
- cpusets? ( sys-apps/hwloc )
+ cpusets? ( sys-apps/hwloc:= )
munge? ( sys-auth/munge )
nvidia? ( >=x11-drivers/nvidia-drivers-275 )
tk? (
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2022-01-04 10:30 David Seifert
0 siblings, 0 replies; 32+ messages in thread
From: David Seifert @ 2022-01-04 10:30 UTC (permalink / raw
To: gentoo-commits
commit: 0b89563ac6dc41357e636b6d5d83940b2ef279e6
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 4 10:29:58 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 4 10:29:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b89563a
sys-cluster/torque: remove implicit kernel_linux
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-cluster/torque/torque-4.1.7-r2.ebuild | 4 ++--
sys-cluster/torque/torque-4.2.10-r2.ebuild | 4 ++--
sys-cluster/torque/torque-6.0.4-r2.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-cluster/torque/torque-4.1.7-r2.ebuild b/sys-cluster/torque/torque-4.1.7-r2.ebuild
index 1b91e3e2602d..c6ced6d96c39 100644
--- a/sys-cluster/torque/torque-4.1.7-r2.ebuild
+++ b/sys-cluster/torque/torque-4.1.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.adaptivecomputing.com/index.php?wpfb_dl=1690 -> ${P}.tar.gz"
LICENSE="torque-2.5"
SLOT="0"
KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk"
+IUSE="cpusets +crypt doc drmaa munge nvidia server +syslog tk"
DEPEND_COMMON="
sys-libs/zlib
diff --git a/sys-cluster/torque/torque-4.2.10-r2.ebuild b/sys-cluster/torque/torque-4.2.10-r2.ebuild
index 3366b0f28533..07f2642850af 100644
--- a/sys-cluster/torque/torque-4.2.10-r2.ebuild
+++ b/sys-cluster/torque/torque-4.2.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/ddf5c4f40091b615716
LICENSE="torque-2.5"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpusets +crypt doc drmaa kernel_linux munge nvidia server +syslog tk"
+IUSE="cpusets +crypt doc drmaa munge nvidia server +syslog tk"
DEPEND_COMMON="
sys-libs/zlib
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index 982514daa400..feb8fad349fe 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921
LICENSE="torque-2.5"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="autorun cgroups cpusets +crypt doc kernel_linux munge nvidia quickcommit server +syslog tk"
+IUSE="autorun cgroups cpusets +crypt doc munge nvidia quickcommit server +syslog tk"
DEPEND_COMMON="
sys-libs/zlib
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2022-01-23 16:56 Sam James
0 siblings, 0 replies; 32+ messages in thread
From: Sam James @ 2022-01-23 16:56 UTC (permalink / raw
To: gentoo-commits
commit: 55542ecffa3a87159287157e9514795b27c41799
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 16:55:44 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 16:56:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55542ecf
sys-cluster/torque: fix multiple build issues
- Pull in Fedora patch which sorts out autoconf quoting problems
- Build with CC=CXX given odd upstream naming (.c is C++ there)
- Fix glibc-2.34 build too
Closes: https://bugs.gentoo.org/827474
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/torque/Manifest | 1 +
sys-cluster/torque/torque-6.0.4-r2.ebuild | 9 ++++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 712c69b3f5a5..8c324318e59e 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -2,3 +2,4 @@ DIST torque-4.1.7.tar.gz 6218108 BLAKE2B 6c1ad0f1bb3f364603ad7f498999bd910491910
DIST torque-4.2.10-gh-20150517.tar.gz 5836286 BLAKE2B 7108f1adcb6f674526b7db97df4ebcee04ae5c818d4f35ed1230a4e72e52ec0bc3b44e17334a143b21bcd3acccefc3927eca4f98d54d37745c8bb46a75e07045 SHA512 600bb5389b6a4161732b7aa82627f1ebeae238d7091aa2e223d9a14c44bf4668662f664b976f62ba3f1d8a366f90fb6058a8c904e20c26432dccd6abcd9c57fa
DIST torque-6.0.4-gcc7.patch 50412 BLAKE2B 43748e9bfd3811abdfeb56f93dd517fcb07a6902194120e2c9e16bbe5bbe0f04afd3f898616d46e0310902a6376671be0c8f3865e8f7dd5381fca46e7ad62fc8 SHA512 430ae6a80ebbfb2066831326f8ce25a34cb6fc17c1fbe4a202c495baceb2b7011c9f6782da31b78c34287f26765c76c587611d689791523b8bd53d634e3681b6
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
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index feb8fad349fe..cbf64c077648 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -8,7 +8,8 @@ inherit autotools flag-o-matic linux-info
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/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> ${P}-gh-20170829.tar.gz
- https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch"
+ https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch
+ https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.0.4-glibc-2.34-pthread.patch.bz2"
LICENSE="torque-2.5"
SLOT="0"
@@ -52,6 +53,7 @@ PATCHES=(
"${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
)
pkg_setup() {
@@ -118,6 +120,11 @@ src_configure() {
--without-loadlibfile
}
+src_compile() {
+ # The .c files are C++, and $(CC) is misused.
+ emake CC="$(tc-getCXX)"
+}
+
src_install() {
local dir
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2022-01-23 16:59 Sam James
0 siblings, 0 replies; 32+ messages in thread
From: Sam James @ 2022-01-23 16:59 UTC (permalink / raw
To: gentoo-commits
commit: ac47de30a1d630a0fdc9979f41425600feda7f58
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 16:56:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 16:56:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac47de30
sys-cluster/torque: fix IndirectInherits
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/torque/torque-6.0.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index cbf64c077648..4bedb3628c5b 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit autotools flag-o-matic linux-info
+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"
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2022-01-23 16:59 Sam James
0 siblings, 0 replies; 32+ messages in thread
From: Sam James @ 2022-01-23 16:59 UTC (permalink / raw
To: gentoo-commits
commit: a279fc20a5d8d1c869c71edb5e066753909d86ae
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 16:58:21 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 16:59:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a279fc20
sys-cluster/torque: update EAPI 6 -> 8
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/torque/torque-6.0.4-r2.ebuild | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index 4bedb3628c5b..ad1d843840bc 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit autotools flag-o-matic linux-info toolchain-funcs
@@ -61,9 +61,9 @@ pkg_setup() {
# 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 "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then
- PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)"
+ 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
@@ -149,6 +149,7 @@ src_install() {
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
@@ -156,13 +157,13 @@ src_install() {
}
pkg_preinst() {
- if [[ -f "${ROOT}etc/pbs_environment" ]]; then
- cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die
+ if [[ -f "${EROOT}/etc/pbs_environment" ]]; then
+ cp "${EROOT}/etc/pbs_environment" "${ED}"/etc/pbs_environment || die
fi
- if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
+ if use server && [[ -f "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
cp \
- "${EROOT}${PBS_SERVER_HOME}/server_priv/nodes" \
+ "${EROOT}/${PBS_SERVER_HOME}/server_priv/nodes" \
"${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die
fi
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2022-02-02 6:21 Sam James
0 siblings, 0 replies; 32+ messages in thread
From: Sam James @ 2022-02-02 6:21 UTC (permalink / raw
To: gentoo-commits
commit: 0fa5efd95174940319fc65e53bf30ea29aa408e8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 2 06:20:51 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 2 06:20:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa5efd9
sys-cluster/torque: Keyword 6.0.4-r2 arm64, #829381
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/torque/torque-6.0.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index ad1d843840bc..a9c2d9cf37c6 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921
LICENSE="torque-2.5"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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="
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2022-03-07 1:55 Sam James
0 siblings, 0 replies; 32+ messages in thread
From: Sam James @ 2022-03-07 1:55 UTC (permalink / raw
To: gentoo-commits
commit: 3aa8ff69e3c60516b404e79439be5b19d3af2abf
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 7 01:55:16 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 01:55:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aa8ff69
sys-cluster/torque: Stabilize 6.0.4-r2 amd64, #689876
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/torque/torque-6.0.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index 41b0211bd754..c6014ac21c1a 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e921
LICENSE="torque-2.5"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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="
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2022-03-07 3:42 Sam James
0 siblings, 0 replies; 32+ messages in thread
From: Sam James @ 2022-03-07 3:42 UTC (permalink / raw
To: gentoo-commits
commit: c893375b79b2873c2819f7c41267eee3d3d7f7ca
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 7 03:42:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 03:42:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c893375b
sys-cluster/torque: fix UnusedLocalUse
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/torque/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys-cluster/torque/metadata.xml b/sys-cluster/torque/metadata.xml
index 012610ab3874..afd1ec84a4a9 100644
--- a/sys-cluster/torque/metadata.xml
+++ b/sys-cluster/torque/metadata.xml
@@ -9,7 +9,6 @@
<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="drmaa">Enable the Distributed Resource Management Application API</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>
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2022-09-04 13:03 David Seifert
0 siblings, 0 replies; 32+ messages in thread
From: David Seifert @ 2022-09-04 13:03 UTC (permalink / raw
To: gentoo-commits
commit: 1a785d4a142bc1b8dc49d559bba5da18d56e9ab0
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 4 13:03:34 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep 4 13:03:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a785d4a
sys-cluster/torque: remove stale boost lower bounds
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-cluster/torque/torque-6.0.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index c6014ac21c1a..9019fab049ec 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -20,7 +20,7 @@ DEPEND_COMMON="
sys-libs/zlib
sys-libs/readline:0=
dev-libs/libxml2
- >=dev-libs/boost-1.41
+ dev-libs/boost
cpusets? ( sys-apps/hwloc:= )
munge? ( sys-auth/munge )
nvidia? ( >=x11-drivers/nvidia-drivers-275 )
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2022-09-30 23:24 Sam James
0 siblings, 0 replies; 32+ messages in thread
From: Sam James @ 2022-09-30 23:24 UTC (permalink / raw
To: gentoo-commits
commit: 726262fb39d0220b2a19552f323504c8d68a7831
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 23:22:28 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 23:24:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=726262fb
sys-cluster/torque: use variable for snapshot commit
Was going to fix version but tags have.. disappeared?
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/torque/torque-6.0.4-r2.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index 9019fab049ec..b3886f93053d 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -3,11 +3,12 @@
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/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> ${P}-gh-20170829.tar.gz
+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}/${PN}-6.0.4-glibc-2.34-pthread.patch.bz2"
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2022-12-28 21:01 Sam James
0 siblings, 0 replies; 32+ messages in thread
From: Sam James @ 2022-12-28 21:01 UTC (permalink / raw
To: gentoo-commits
commit: a69a6f22169f6190713f6202f3a068d88fbaeebd
Author: Marco Scardovi <mscardovi <AT> icloud <DOT> com>
AuthorDate: Wed Dec 28 00:34:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 21:00:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a69a6f22
sys-cluster/torque: revbump, fix .la error
Closes: https://bugs.gentoo.org/852089
Signed-off-by: Marco Scardovi <mscardovi <AT> icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/28868
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/torque/torque-6.0.4-r3.ebuild | 200 ++++++++++++++++++++++++++++++
1 file changed, 200 insertions(+)
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
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2022-12-28 21:01 Sam James
0 siblings, 0 replies; 32+ messages in thread
From: Sam James @ 2022-12-28 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 1d2eedbdf40f9d5b439501b49b94282b254453f0
Author: Marco Scardovi <mscardovi <AT> icloud <DOT> com>
AuthorDate: Wed Dec 28 00:26:40 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 21:00:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d2eedbd
sys-cluster/torque: add github upstream metadata
Signed-off-by: Marco Scardovi <mscardovi <AT> icloud.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/torque/metadata.xml | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
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>
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2023-01-09 12:46 Joonas Niilola
0 siblings, 0 replies; 32+ messages in thread
From: Joonas Niilola @ 2023-01-09 12:46 UTC (permalink / raw
To: gentoo-commits
commit: 0d45e3b7b11d506d82c24e9b1c83647749c719cc
Author: Marco Scardovi <mscardovi <AT> icloud <DOT> com>
AuthorDate: Wed Dec 28 22:17:10 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 12:46:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d45e3b7
sys-cluster/torque: update HOMEPAGE
Closes: https://bugs.gentoo.org/881819
Signed-off-by: Marco Scardovi <mscardovi <AT> icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/28881
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-cluster/torque/torque-6.0.4-r2.ebuild | 4 ++--
sys-cluster/torque/torque-6.0.4-r3.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index b3886f93053d..b4fd6981da11 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,7 +7,7 @@ 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"
+HOMEPAGE="https://adaptivecomputing.com/cherry-services/torque-resource-manager/ https://github.com/adaptivecomputing/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}/${PN}-6.0.4-glibc-2.34-pthread.patch.bz2"
diff --git a/sys-cluster/torque/torque-6.0.4-r3.ebuild b/sys-cluster/torque/torque-6.0.4-r3.ebuild
index 6799806e325e..268b518c340b 100644
--- a/sys-cluster/torque/torque-6.0.4-r3.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,7 +7,7 @@ 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"
+HOMEPAGE="https://adaptivecomputing.com/cherry-services/torque-resource-manager/ https://github.com/adaptivecomputing/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
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2023-05-11 20:03 Sam James
0 siblings, 0 replies; 32+ messages in thread
From: Sam James @ 2023-05-11 20:03 UTC (permalink / raw
To: gentoo-commits
commit: a241313aab5e249e3709bf378b451718b189844a
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon May 8 20:56:04 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 11 20:03:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a241313a
sys-cluster/torque: switch to virtual/openssh
Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/torque/{torque-6.0.4-r2.ebuild => torque-6.0.4-r4.ebuild} | 2 +-
sys-cluster/torque/{torque-6.0.4-r3.ebuild => torque-6.0.4-r5.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r4.ebuild
similarity index 99%
rename from sys-cluster/torque/torque-6.0.4-r2.ebuild
rename to sys-cluster/torque/torque-6.0.4-r4.ebuild
index b4fd6981da11..00bf710749ed 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r4.ebuild
@@ -38,7 +38,7 @@ DEPEND="${DEPEND_COMMON}
!!sys-cluster/slurm"
RDEPEND="${DEPEND_COMMON}
- crypt? ( net-misc/openssh )
+ crypt? ( virtual/openssh )
!crypt? ( net-misc/netkit-rsh )
!dev-libs/uthash"
diff --git a/sys-cluster/torque/torque-6.0.4-r3.ebuild b/sys-cluster/torque/torque-6.0.4-r5.ebuild
similarity index 99%
rename from sys-cluster/torque/torque-6.0.4-r3.ebuild
rename to sys-cluster/torque/torque-6.0.4-r5.ebuild
index 268b518c340b..4148d1591d59 100644
--- a/sys-cluster/torque/torque-6.0.4-r3.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r5.ebuild
@@ -44,7 +44,7 @@ DEPEND="
RDEPEND="
${DEPEND_COMMON}
- crypt? ( net-misc/openssh )
+ crypt? ( virtual/openssh )
!crypt? ( net-misc/netkit-rsh )
!dev-libs/uthash
"
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2023-08-02 13:19 Sam James
0 siblings, 0 replies; 32+ messages in thread
From: Sam James @ 2023-08-02 13:19 UTC (permalink / raw
To: gentoo-commits
commit: 2bf156fb65cc27c6d2a2e0310ce9e892e0361b48
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 2 13:18:39 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 2 13:18:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bf156fb
sys-cluster/torque: Stabilize 6.0.4-r6 amd64, #909658
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/torque/torque-6.0.4-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/torque/torque-6.0.4-r6.ebuild b/sys-cluster/torque/torque-6.0.4-r6.ebuild
index 3e838b63737d..56c733157562 100644
--- a/sys-cluster/torque/torque-6.0.4-r6.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="torque-2.5"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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="
^ permalink raw reply related [flat|nested] 32+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/
@ 2024-08-12 3:29 Eli Schwartz
0 siblings, 0 replies; 32+ messages in thread
From: Eli Schwartz @ 2024-08-12 3:29 UTC (permalink / raw
To: gentoo-commits
commit: 10f6df4224f83524bf5cd3cf38d1b2f9c4ab8faa
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 01:49:51 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 03:29:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f6df42
sys-cluster/torque: mark as LTO-unsafe
The project appears to have gone source-unavailable and all-in on AI.
There are 6.x versions available mysteriously as some git branch with no
distfiles (Fedora packages this) and a 7.x version is announced on their
website but you have to contact sales to find out more. They haven't
communicated on github in years.
Not only is reporting a bug an exercise in futility, I'm not super
interested in trying to begin with.
Closes: https://bugs.gentoo.org/863737
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
sys-cluster/torque/torque-6.0.4-r6.ebuild | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sys-cluster/torque/torque-6.0.4-r6.ebuild b/sys-cluster/torque/torque-6.0.4-r6.ebuild
index 56c733157562..df2482d2514f 100644
--- a/sys-cluster/torque/torque-6.0.4-r6.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -107,6 +107,13 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/863737
+ #
+ # The project went source-unavailable and doesn't respond on github.
+ # No bug reported.
+ filter-lto
+
append-cflags "-fpermissive"
# Force Bash for configure as there's a lot of issues with configure.ac and such here
^ permalink raw reply related [flat|nested] 32+ messages in thread
end of thread, other threads:[~2024-08-12 3:30 UTC | newest]
Thread overview: 32+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-28 21:01 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/torque/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-08-12 3:29 Eli Schwartz
2023-08-02 13:19 Sam James
2023-05-11 20:03 Sam James
2023-01-09 12:46 Joonas Niilola
2022-12-28 21:01 Sam James
2022-09-30 23:24 Sam James
2022-09-04 13:03 David Seifert
2022-03-07 3:42 Sam James
2022-03-07 1:55 Sam James
2022-02-02 6:21 Sam James
2022-01-23 16:59 Sam James
2022-01-23 16:59 Sam James
2022-01-23 16:56 Sam James
2022-01-04 10:30 David Seifert
2021-10-29 22:44 Sam James
2021-07-05 16:53 Marek Szuba
2021-05-01 7:29 Mikle Kolyada
2020-05-22 18:50 Sergei Trofimovich
2020-04-19 14:23 Sergei Trofimovich
2020-03-05 19:16 Ian Stakenvicius
2019-10-15 20:44 Ian Stakenvicius
2019-07-14 18:27 Hans de Graaff
2019-03-07 17:37 Ian Stakenvicius
2019-03-07 17:37 Ian Stakenvicius
2019-03-07 17:37 Ian Stakenvicius
2017-04-27 3:15 Ian Stakenvicius
2017-01-26 23:13 David Seifert
2016-06-08 2:33 Ian Stakenvicius
2016-06-02 16:56 Ian Stakenvicius
2016-06-02 16:56 Ian Stakenvicius
2016-06-01 23:06 Justin Bronder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox