Version bump to 2.2.1 (Bug 169087). Add separate init scripts (Bug 169176). Add config_protection (Bug 186513).

Package-Manager: portage-2.1.3.19

10 files changed, 412 insertions, 5 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 9adc71819234..8ecc52f10ab4 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.51 2007/05/21 18:24:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.52 2007/11/24 17:47:09 jsbronder Exp $
+
+*torque-2.2.1 (24 Nov 2007)
+
+  24 Nov 2007; <jbronder@gentoo.org> +files/pbs_mom-init.d-2.2.1,
+  +files/pbs_sched-init.d-2.2.1, +files/pbs_server-init.d-2.2.1,
+  +files/torque-conf.d-2.2.1, +files/torque-env.d-2.2.1,
+  +files/torque-setuid-safety-am.patch, +torque-2.2.1.ebuild:
+  Version bump to 2.2.1 (Bug 169087). Add separate init scripts (Bug 169176).
+  Add config_protection (Bug 186513). Changed pbs_server_home to
+  /var/spool/torque.
 
   21 May 2007; Jeroen Roovers <jer@gentoo.org> torque-2.1.6.ebuild:
   Stable for HPPA (bug #178510).
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index fcb740f3ebe2..b4194d6ff113 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,16 +1,45 @@
+AUX pbs_mom-init.d-2.2.1 1003 RMD160 97be9b485fabd022ff209c910ae3974a73ebbc30 SHA1 cf50bac5a12a07535104ff7f7dcdfd054c995b2b SHA256 ef010854efc7a5c310c34bc53d1d927b7928bfa0d48bb5d8ae76bd3453f37a25
+MD5 102952eb105094ac058e00f52f82f038 files/pbs_mom-init.d-2.2.1 1003
+RMD160 97be9b485fabd022ff209c910ae3974a73ebbc30 files/pbs_mom-init.d-2.2.1 1003
+SHA256 ef010854efc7a5c310c34bc53d1d927b7928bfa0d48bb5d8ae76bd3453f37a25 files/pbs_mom-init.d-2.2.1 1003
+AUX pbs_sched-init.d-2.2.1 1084 RMD160 a4f8b42dc5e004cbd9f8168cc39520d8bc1168d6 SHA1 57a9cb58ec8def6f3f51d7f76cf38c6375549fa1 SHA256 6efcf1b9f8f0f99599dacab686ce1e53b8202574d1a2ad7b138d1451cd466000
+MD5 2aa809039b01f7a571443f99a2766070 files/pbs_sched-init.d-2.2.1 1084
+RMD160 a4f8b42dc5e004cbd9f8168cc39520d8bc1168d6 files/pbs_sched-init.d-2.2.1 1084
+SHA256 6efcf1b9f8f0f99599dacab686ce1e53b8202574d1a2ad7b138d1451cd466000 files/pbs_sched-init.d-2.2.1 1084
+AUX pbs_server-init.d-2.2.1 1576 RMD160 f57eeea595c8d609346c0d0d4645decfab76cb5c SHA1 90ad4ff42cac937929bde4cbcf7f69460c2f630e SHA256 43a1ea111ca161d8bd496291a28fe3201e9080b97d3c746a29d820ec2cfbd9d7
+MD5 86cf6dbb5017ba7ce7d7b93c2e7a8fd3 files/pbs_server-init.d-2.2.1 1576
+RMD160 f57eeea595c8d609346c0d0d4645decfab76cb5c files/pbs_server-init.d-2.2.1 1576
+SHA256 43a1ea111ca161d8bd496291a28fe3201e9080b97d3c746a29d820ec2cfbd9d7 files/pbs_server-init.d-2.2.1 1576
+AUX torque-conf.d-2.2.1 816 RMD160 8bd7fd0c6566445c761da96859d86fbdb11d40f9 SHA1 da49ef33b73cab88c37bea20d26361c7a69cfb12 SHA256 ed982717cb8334a0a43e8807166bc10b5cbf39848e5729b321e946b31fa1c0c1
+MD5 69c65fc67b47e05155b335e607da8c4b files/torque-conf.d-2.2.1 816
+RMD160 8bd7fd0c6566445c761da96859d86fbdb11d40f9 files/torque-conf.d-2.2.1 816
+SHA256 ed982717cb8334a0a43e8807166bc10b5cbf39848e5729b321e946b31fa1c0c1 files/torque-conf.d-2.2.1 816
+AUX torque-env.d-2.2.1 337 RMD160 bb5341d647e6c4545077783dd2aa4135662276f8 SHA1 10910a42d419e552c42a098010d8360b496f7f72 SHA256 0c5abf36209d684e7c4f82749f6c06ad976f7c1f3f0e94731b42c1d1331c5bed
+MD5 88709ff161b21152c142ac7bb30ce104 files/torque-env.d-2.2.1 337
+RMD160 bb5341d647e6c4545077783dd2aa4135662276f8 files/torque-env.d-2.2.1 337
+SHA256 0c5abf36209d684e7c4f82749f6c06ad976f7c1f3f0e94731b42c1d1331c5bed files/torque-env.d-2.2.1 337
+AUX torque-setuid-safety-am.patch 546 RMD160 726578c77ebbc6a83ed8a258c31452c296109e6d SHA1 bd4ce2de39e3288c3fdd5bfad64f54e33c63ccdc SHA256 81c59eaa06eab86e684d21e7ec9d15b331473194ee1e367450816f6e0fd09bfb
+MD5 a526f0c918145bf2c2570a2728a54d0f files/torque-setuid-safety-am.patch 546
+RMD160 726578c77ebbc6a83ed8a258c31452c296109e6d files/torque-setuid-safety-am.patch 546
+SHA256 81c59eaa06eab86e684d21e7ec9d15b331473194ee1e367450816f6e0fd09bfb files/torque-setuid-safety-am.patch 546
 AUX torque-setuid-safety.patch 1020 RMD160 199a8d543c6f0de0934211ca248b637f61f1a0d0 SHA1 9a5d8d9aa6cc14a1be120f506a38b0910c9bfc16 SHA256 0770e6d88889224db2718c93846a55e1d17b6a457cbb2e80cd9d9e22a8d85e33
 MD5 a62390b5bf5adb5fdc7091326cf7b396 files/torque-setuid-safety.patch 1020
 RMD160 199a8d543c6f0de0934211ca248b637f61f1a0d0 files/torque-setuid-safety.patch 1020
 SHA256 0770e6d88889224db2718c93846a55e1d17b6a457cbb2e80cd9d9e22a8d85e33 files/torque-setuid-safety.patch 1020
 DIST torque-2.1.6.tar.gz 2708793 RMD160 6802c2d49a36624d34fce7b96b29551da3ff1106 SHA1 f0437e3f429c5cecb44a7f991f2b7bd58baa7a0a SHA256 e5ac494859df9951ca34149ae56b93fbfc83d7d4ba015bc8b67514b190e51c36
+DIST torque-2.2.1.tar.gz 5370260 RMD160 219e5a4234a1bbf0241c15f568a720752e48587c SHA1 fafa9d66aa8bf8daa9e8f660903aa1105ff14bda SHA256 6d2674d471e300df6ebda56ef80c2a7be0de33fc619f98ee78eee69af1d179b8
 EBUILD torque-2.1.6.ebuild 4011 RMD160 6c7adb692028e9e75f2980974f5a9f9e35930d95 SHA1 68b223668d45c178b934c749a26d274f216c2bd7 SHA256 e8d1c44427d396b35805240a6707013bed3010155189f6b8d6ce1eb914f573b2
 MD5 64ebd8ba4e9016d73054a98a2f258942 torque-2.1.6.ebuild 4011
 RMD160 6c7adb692028e9e75f2980974f5a9f9e35930d95 torque-2.1.6.ebuild 4011
 SHA256 e8d1c44427d396b35805240a6707013bed3010155189f6b8d6ce1eb914f573b2 torque-2.1.6.ebuild 4011
-MISC ChangeLog 9135 RMD160 529823582c5018619b178f4d864107806ffc9f28 SHA1 4856c5e069362fc308cc66904d6b673cb32d233a SHA256 fc01420938f9fb2647ca4adba35bf9796212e0f6bcef59742a55f8ccea27a1e6
-MD5 d221a80c662c40aaa10168688a179869 ChangeLog 9135
-RMD160 529823582c5018619b178f4d864107806ffc9f28 ChangeLog 9135
-SHA256 fc01420938f9fb2647ca4adba35bf9796212e0f6bcef59742a55f8ccea27a1e6 ChangeLog 9135
+EBUILD torque-2.2.1.ebuild 4811 RMD160 e0fb6426a93edbd3a7979b96e39f3aa1f5da627f SHA1 0434defbd3bd1dd8b8055cfa4783e6e484dd44fc SHA256 c9244d7a9aaf8182774cb44e3e6b9e89673aab648bd04d436a4fb0484157f26b
+MD5 7c5a278f449c4680b6cb40a1b942aa12 torque-2.2.1.ebuild 4811
+RMD160 e0fb6426a93edbd3a7979b96e39f3aa1f5da627f torque-2.2.1.ebuild 4811
+SHA256 c9244d7a9aaf8182774cb44e3e6b9e89673aab648bd04d436a4fb0484157f26b torque-2.2.1.ebuild 4811
+MISC ChangeLog 9585 RMD160 b9e7d9ed37800fb689ea3b52368301e6c402b746 SHA1 e1be9f6ba3d09872a5349f2f70f4cbbb499f90bb SHA256 f25d2f80ef367507aa8fff35ea948ee4882414016fcbb5b9827cae7ebd3108ea
+MD5 0a8187858d0e397065ca3a7237205afe ChangeLog 9585
+RMD160 b9e7d9ed37800fb689ea3b52368301e6c402b746 ChangeLog 9585
+SHA256 f25d2f80ef367507aa8fff35ea948ee4882414016fcbb5b9827cae7ebd3108ea ChangeLog 9585
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
 MD5 6be723a646638c71a36096e65e6ef8f0 metadata.xml 163
 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 metadata.xml 163
@@ -18,3 +47,6 @@ SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3 metadata
 MD5 3c33bcf081b50bf7efa5dd992d1b947c files/digest-torque-2.1.6 241
 RMD160 0db8600cc3dbef7d823a6c0540c398708c020d25 files/digest-torque-2.1.6 241
 SHA256 7d85354409634f1309ef89efd5812168bf83c7e3308a5de2fbc8a498677708f3 files/digest-torque-2.1.6 241
+MD5 95d6caaa274ac74afebc9cc7b4f035d1 files/digest-torque-2.2.1 241
+RMD160 64a7ab7930889079cf6a6b52266dc61660f7aaff files/digest-torque-2.2.1 241
+SHA256 ecc0ed9717146a57fd50befacefaabffeac1bdda405a9762d01b3ca78e04048a files/digest-torque-2.2.1 241
diff --git a/sys-cluster/torque/files/digest-torque-2.2.1 b/sys-cluster/torque/files/digest-torque-2.2.1
new file mode 100644
index 000000000000..a860e555ae54
--- /dev/null
+++ b/sys-cluster/torque/files/digest-torque-2.2.1
@@ -0,0 +1,3 @@
+MD5 4eebd8714435b52041ea99cc1a8beb03 torque-2.2.1.tar.gz 5370260
+RMD160 219e5a4234a1bbf0241c15f568a720752e48587c torque-2.2.1.tar.gz 5370260
+SHA256 6d2674d471e300df6ebda56ef80c2a7be0de33fc619f98ee78eee69af1d179b8 torque-2.2.1.tar.gz 5370260
diff --git a/sys-cluster/torque/files/pbs_mom-init.d-2.2.1 b/sys-cluster/torque/files/pbs_mom-init.d-2.2.1
new file mode 100644
index 000000000000..758134656e6f
--- /dev/null
+++ b/sys-cluster/torque/files/pbs_mom-init.d-2.2.1
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+. /etc/conf.d/torque 
+
+depend() {
+    need net
+    after pbs_server
+    after pbs_sched
+    after logger
+}
+
+checkconfig() {
+    for i in "server_name" "mom_priv/config"; do
+        if [ ! -e ${PBS_SERVER_HOME}/${i} ]; then
+            eerror "Missing config file ${PBS_SERVER_HOME}/${i}"
+            return 1
+        fi
+    done
+}
+
+start() {
+    checkconfig || return 1
+
+    ebegin "Starting Torque pbs_mom"
+    local extra_args=""
+    if [ -n "${PBS_MOM_LOG}" ]; then
+        extra_args="-- -L ${PBS_MOM_LOG}"
+    fi
+    start-stop-daemon  --start -p ${PBS_SERVER_HOME}/mom_priv/mom.lock \
+        --exec /usr/sbin/pbs_mom ${extra_args}
+    eend ${?}		
+}
+
+stop() {
+    ebegin "Stopping Torque pbs_mom"
+    /usr/sbin/momctl -s  || start-stop-daemon --stop -p ${PBS_SERVER_HOME}/mom_priv/mom.lock
+    eend ${?}
+}
+
+restart() {
+    svc_stop
+    sleep 3
+    svc_start
+}
+# vim:ts=4
diff --git a/sys-cluster/torque/files/pbs_sched-init.d-2.2.1 b/sys-cluster/torque/files/pbs_sched-init.d-2.2.1
new file mode 100644
index 000000000000..b882732cb9b2
--- /dev/null
+++ b/sys-cluster/torque/files/pbs_sched-init.d-2.2.1
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+. /etc/conf.d/torque 
+
+depend() {
+    need net
+    after pbs_server
+    before pbs_mom
+    after logger
+}
+
+checkconfig() {
+    for i in "server_name"; do
+        if [ ! -e ${PBS_SERVER_HOME}/${i} ]; then
+            eerror "Missing config file ${PBS_SERVER_HOME}/${i}"
+            return 1
+        fi
+    done
+
+    if [ -z "$(grep 'queue_type' ${PBS_SERVER_HOME}/server_priv/queues/*)" ]; then
+        eerror "No queues have been defined yet."
+        return 1
+    fi
+}
+
+start() {
+    checkconfig || return 1
+	
+    ebegin "Starting Torque pbs_sched"
+    local extra_args=""
+    if [ -n "${PBS_SCHED_LOG}" ]; then
+        extra_args="-- -L ${PBS_SCHED_LOG}"
+    fi
+
+    start-stop-daemon  --start -p ${PBS_SERVER_HOME}/sched_priv/sched.lock \
+        --exec /usr/sbin/pbs_sched ${extra_args}
+    eend ${?}		
+}
+
+stop() {
+    ebegin "Stopping Torque pbs_sched"
+    start-stop-daemon --stop -p ${PBS_SERVER_HOME}/sched_priv/sched.lock
+    eend ${?}
+}
+# vim:ts=4
diff --git a/sys-cluster/torque/files/pbs_server-init.d-2.2.1 b/sys-cluster/torque/files/pbs_server-init.d-2.2.1
new file mode 100644
index 000000000000..6d2cbf3cf614
--- /dev/null
+++ b/sys-cluster/torque/files/pbs_server-init.d-2.2.1
@@ -0,0 +1,61 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+. /etc/conf.d/torque 
+
+depend() {
+    need net
+    before pbs_sched
+    before pbs_mom
+    after logger
+}
+
+checkconfig() {
+    for i in "server_name" "server_priv/nodes"; do
+        if [ ! -e "${PBS_SERVER_HOME}/${i}" ]; then
+            eerror "Missing config file ${PBS_SERVER_HOME}/${i}"
+            return 1
+        fi
+    done
+
+    for i in "acl_svr/operators" "serverdb"; do
+        if [ ! -e "${PBS_SERVER_HOME}/server_priv/${i}" ]; then
+            eerror "Torque has not been fully configured to run."
+            eerror "Missing ${i}"
+            return 1
+        fi
+    done
+    
+    if [ -z "$(grep 'queue_type' ${PBS_SERVER_HOME}/server_priv/queues/*)" ]; then
+        eerror "No queues have been defined yet."
+        return 1
+    fi
+}
+
+start() {
+    checkconfig || return 1
+
+    ebegin "Starting Torque pbs_server"
+    local extra_args=""
+    if [ -n "${PBS_SERVER_LOG}" ]; then
+        extra_args="-- -L ${PBS_SERVER_LOG}"
+    fi
+
+    start-stop-daemon  --start -p ${PBS_SERVER_HOME}/server_priv/server.lock \
+        --exec /usr/sbin/pbs_server ${extra_args}
+    eend ${?}		
+}
+
+stop() {
+    ebegin "Stopping Torque pbs_server"
+    stop_type="${PBS_SERVER_STOP}"
+    if [ -z "${stop_type}" ]; then
+        ewarn "PBS_SERVER_STOP is not defined, defaulting to quick"
+        stop_type=quick
+    fi
+
+    /usr/bin/qterm -t ${stop_type} || start-stop-daemon --stop -p ${PBS_SERVER_HOME}/server_priv/server.lock
+    eend ${?}
+}
+# vim:ts=4
diff --git a/sys-cluster/torque/files/torque-conf.d-2.2.1 b/sys-cluster/torque/files/torque-conf.d-2.2.1
new file mode 100644
index 000000000000..66da9ee8edcd
--- /dev/null
+++ b/sys-cluster/torque/files/torque-conf.d-2.2.1
@@ -0,0 +1,19 @@
+# This is the default server-home set by the ebuild and upstream
+# If you change this, be sure to fix /etc/env.d/25torque as well.
+PBS_SERVER_HOME=/var/spool/torque
+
+
+# The default logging takes place in $PBS_SERVER_HOME/<mom/server/sched>_priv.
+# If you'd like to change that, use the following per service.
+PBS_SERVER_LOG=/var/log/pbs_server.log
+PBS_MOM_LOG=/var/log/pbs_mom.log
+PBS_SCHED_LOG=/var/log/pbs_sched.log
+
+
+# There are a number of ways to stop the pbs server.  For more details, man qterm
+# At the time of writing, checkpoint is probably not working.
+# immediate:  All jobs are killed.
+# delay:  Checkpoint, rerun or wait for jobs to finish before stopping
+# quick:  Remember running jobs, and let them run without interaction with pbs_server.
+#         This is the default action
+PBS_SERVER_STOP=quick
diff --git a/sys-cluster/torque/files/torque-env.d-2.2.1 b/sys-cluster/torque/files/torque-env.d-2.2.1
new file mode 100644
index 000000000000..fa68e7b7965c
--- /dev/null
+++ b/sys-cluster/torque/files/torque-env.d-2.2.1
@@ -0,0 +1,6 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+# Configuration files that are included in the initial Torque install
+CONFIG_PROTECT="/var/spool/torque/sched_priv/{holidays,resource_group,dedicated_time,sched_config} /var/spool/torque/{server_name,pbs_environment}"
+
diff --git a/sys-cluster/torque/files/torque-setuid-safety-am.patch b/sys-cluster/torque/files/torque-setuid-safety-am.patch
new file mode 100644
index 000000000000..737e82a815d7
--- /dev/null
+++ b/sys-cluster/torque/files/torque-setuid-safety-am.patch
@@ -0,0 +1,22 @@
+--- src/iff/Makefile.am.orig	2007-03-02 22:15:56.000000000 -0700
++++ src/iff/Makefile.am	2007-03-02 22:16:37.000000000 -0700
+@@ -6,6 +6,8 @@
+ 
+ pbs_iff_LDADD = $(PBS_LIBS)
+ 
++pbs_iff_LDFLAGS = -Wl,-z,now
++
+ pbs_iff_SOURCES = iff2.c
+ 
+ install-exec-hook:
+--- src/mom_rcp/Makefile.am.orig	2007-03-02 22:17:03.000000000 -0700
++++ src/mom_rcp/Makefile.am	2007-03-02 22:17:47.000000000 -0700
+@@ -4,6 +4,8 @@
+ 
+ pbs_rcp_SOURCES = rcp.c replace.c util.c extern.h  pathnames.h
+ 
++pbs_rcp_LDFLAGS = -Wl,-z,now
++
+ EXTRA_DIST = ReadMe
+ 
+ install-exec-hook:
diff --git a/sys-cluster/torque/torque-2.2.1.ebuild b/sys-cluster/torque/torque-2.2.1.ebuild
new file mode 100644
index 000000000000..922c6a0e535e
--- /dev/null
+++ b/sys-cluster/torque/torque-2.2.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.2.1.ebuild,v 1.1 2007/11/24 17:47:09 jsbronder Exp $
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="Resource manager and queuing system based on OpenPBS"
+HOMEPAGE="http://www.clusterresources.com/products/torque/"
+SRC_URI="http://www.clusterresources.com/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="openpbs"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="tk crypt server syslog doc"
+PROVIDE="virtual/pbs"
+
+# ed is used by makedepend-sh
+DEPEND_COMMON="virtual/libc
+	sys-libs/ncurses
+	sys-libs/readline
+	tk? ( dev-lang/tk )
+	syslog? ( virtual/logger )
+	!virtual/pbs
+	!sys-cluster/openpbs-common"
+
+DEPEND="${DEPEND_COMMON}
+	sys-apps/ed"
+
+RDEPEND="${DEPEND_COMMON}
+	crypt? ( net-misc/openssh )
+	!crypt? ( net-misc/netkit-rsh )"
+
+# TODO:  Conforming to FHS?  There are config files here
+# and files that are processed by the daemons.
+SPOOL_LOCATION="/var/spool"
+PBS_SERVER_HOME="${SPOOL_LOCATION}/torque/"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-setuid-safety-am.patch
+	# Otherwise we'll fail due to strings over ISO C89 defined length 509
+	sed -i 's:gcc_warning_flags="\(.*\)-Werror":gcc_warning_flags="\1":' configure.ac
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_compile() {
+	local myconf
+
+	if use crypt; then
+		myconf="--with-rcp=scp"
+	else
+		myconf="--with-rcp=mom_rcp"
+	fi
+	# TODO:  Allow cpusets
+	econf \
+		$(use_enable tk gui) \
+		$(use_enable syslog) \
+		$(use_enable server) \
+		--with-server-home=${PBS_SERVER_HOME} \
+		--with-environ=/etc/pbs_environment \
+		${myconf} \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+# 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="${SPOOL_LOCATION}"
+	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}"
+		else
+			chmod ${m} "${root}${d}"
+		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}"
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc CHANGELOG DEVELOPMENT README.* Release_Notes || die "dodoc failed"
+	if use doc; then
+		dodoc doc/admin_guide.ps doc/*.pdf || die "dodoc failed"
+	fi
+
+	# this file MUST exist for PBS/Torque to work
+	# but try to preserve any customatizations that the user has made
+	dodir /etc
+	mv "${D}"${PBS_SERVER_HOME}/pbs_environment "${D}"/etc/
+
+	# 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}"
+	done
+
+	if use server; then
+		newinitd "${FILESDIR}"/pbs_server-init.d-2.2.1 pbs_server
+		newinitd "${FILESDIR}"/pbs_sched-init.d-2.2.1 pbs_sched
+	fi
+	newinitd "${FILESDIR}"/pbs_mom-init.d-2.2.1 pbs_mom
+	newconfd "${FILESDIR}"/torque-conf.d-2.2.1 torque
+	newenvd "${FILESDIR}"/torque-env.d-2.2.1 25torque
+}
+
+pkg_preinst() {
+	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
+		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
+	fi
+	if [[ -f "${ROOT}${PBS_SERVER_HOME}server_name" ]]; then
+		cp "${ROOT}${PBS_SERVER_HOME}server_name" "${D}${PBS_SERVER_HOME}server_name"
+	fi
+}
+
+
+pkg_postinst() {
+	pbs_createspool "${ROOT}"
+	elog "If this is the first time torque has been installed, then you are not
+	ready to start the server.  Please refer to the documentation located at:
+	http://www.clusterresources.com/wiki/doku.php?id=torque:torque_wiki"
+
+	elog "There are a couple of changes in this ebuild.
+	1.) The pbs-server-home has been moved from /var/spool/PBS to
+	    /var/spool/torque.
+	2.) pbs_server, pbs_mom and pbs_sched now have separate init scripts"
+}