summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Bronder <jsbronder@gentoo.org>2012-01-06 01:54:36 +0000
committerJustin Bronder <jsbronder@gentoo.org>2012-01-06 01:54:36 +0000
commit8fe4bd7c5f1c4a3c9f0dd198f754dff91a170e81 (patch)
tree6a6462306bb7f64f1c6435ccdd9312758fbca9b2 /sys-cluster
parentALPS Input mouse patch. Thanks to iamben (diff)
downloadgentoo-2-8fe4bd7c5f1c4a3c9f0dd198f754dff91a170e81.tar.gz
gentoo-2-8fe4bd7c5f1c4a3c9f0dd198f754dff91a170e81.tar.bz2
gentoo-2-8fe4bd7c5f1c4a3c9f0dd198f754dff91a170e81.zip
Version bump and misc fixes (#397525).
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/torque/ChangeLog8
-rw-r--r--sys-cluster/torque/torque-3.0.3.ebuild (renamed from sys-cluster/torque/torque-3.0.2.ebuild)60
2 files changed, 38 insertions, 30 deletions
diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 500088bf01f7..9cb526873fff 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-cluster/torque
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.127 2012/01/03 15:56:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.128 2012/01/06 01:54:36 jsbronder Exp $
+
+*torque-3.0.3 (06 Jan 2012)
+
+ 06 Jan 2012; Justin Bronder <jsbronder@gentoo.org> -torque-3.0.2.ebuild,
+ +torque-3.0.3.ebuild:
+ Version bump and misc fixes (#397525).
*torque-2.5.9 (03 Jan 2012)
diff --git a/sys-cluster/torque/torque-3.0.2.ebuild b/sys-cluster/torque/torque-3.0.3.ebuild
index 459a6e67bf13..a2886e44a331 100644
--- a/sys-cluster/torque/torque-3.0.2.ebuild
+++ b/sys-cluster/torque/torque-3.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-3.0.2.ebuild,v 1.1 2011/09/30 23:11:54 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-3.0.3.ebuild,v 1.1 2012/01/06 01:54:36 jsbronder Exp $
EAPI=2
inherit flag-o-matic eutils linux-info autotools
@@ -44,7 +44,7 @@ pkg_setup() {
fi
fi
- USE_CPUSETS="--disable-cpusets"
+ USE_CPUSETS="--disable-cpuset"
if use cpusets; then
if ! use kernel_linux; then
einfo
@@ -63,7 +63,7 @@ pkg_setup() {
elog "your kernel with CONFIG_CPUSETS enabled."
einfo
fi
- USE_CPUSETS="--enable-cpusets"
+ USE_CPUSETS="--enable-cpuset"
fi
fi
}
@@ -95,8 +95,7 @@ src_configure() {
--disable-gcc-warnings \
--with-tcp-retry-limit=2 \
${USE_CPUSETS} \
- ${myconf} \
- || die "econf failed"
+ ${myconf}
}
# WARNING
@@ -128,13 +127,13 @@ pbs_createspool() {
d="${a/*:}"
m="${a/:*}"
if [[ ! -d "${root}${d}" ]]; then
- install -d -m${m} "${root}${d}"
+ install -d -m${m} "${root}${d}" || die
else
- chmod ${m} "${root}${d}"
+ chmod ${m} "${root}${d}" || die
fi
# (#149226) If we're running in src_*, then keepdir
if [[ "${root}" = "${D}" ]]; then
- keepdir ${d}
+ keepdir ${d} || die
fi
done
}
@@ -143,7 +142,7 @@ src_install() {
# Make directories first
pbs_createspool "${D}"
- make DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${D}" install || die "make install failed"
dodoc CHANGELOG README.* Release_Notes || die "dodoc failed"
if use doc; then
@@ -154,27 +153,29 @@ src_install() {
# 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}"
+ 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
+ newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server || die
+ newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched || die
fi
- newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
- newconfd "${FILESDIR}"/torque-conf.d-munge torque
- newenvd "${FILESDIR}"/torque-env.d 25torque
+ newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom || die
+ newconfd "${FILESDIR}"/torque-conf.d-munge torque || die
+ newenvd "${FILESDIR}"/torque-env.d 25torque || die
}
pkg_preinst() {
if [[ -f "${ROOT}etc/pbs_environment" ]]; then
- cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
+ cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment || die
fi
- echo "${PBS_SERVER_NAME}" > "${D}${PBS_SERVER_HOME}/server_name"
+ 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
+ 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
@@ -217,8 +218,8 @@ pkg_config() {
fi
# pbs_mom configuration.
- echo "\$pbsserver ${PBS_SERVER_NAME}" > "${h}/mom_priv/config"
- echo "\$logevent 255" >> "${h}/mom_priv/config"
+ 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"
@@ -227,14 +228,15 @@ pkg_config() {
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}
+ ${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