Version bump.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 155 insertions, 2 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 4e03a262bec8..4b06ba5439a6 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.18 2005/08/11 18:09:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.19 2005/08/11 20:51:30 robbat2 Exp $
+
+*torque-1.2.0_p5 (11 Aug 2005)
+
+  11 Aug 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +torque-1.2.0_p5.ebuild:
+  Version bump.
 
   11 Aug 2005; Robin H. Johnson <robbat2@gentoo.org>
   torque-1.2.0_p1-r3.ebuild:
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 06a4c0ab1661..9d83cbe2a368 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -2,13 +2,15 @@ MD5 7dd1a27cf57520610867640d86e91ba3 torque-1.2.0_p1-r1.ebuild 1874
 MD5 c6f3121536e6adce335641c7a3c961ae torque-1.2.0_p1.ebuild 2312
 MD5 f241bd8e1631adacb8f98ea6de70cf99 torque-1.2.0_p1-r3.ebuild 3893
 MD5 38ff4b249a54a78f0a2d720fbf20b534 torque-1.0.1_p6.ebuild 1910
+MD5 e1a954f5f40711c02a127c7e9a1c1a66 torque-1.2.0_p5.ebuild 4520
 MD5 d18ea01c292ee1127343a7143f8af6f7 torque-1.2.0_p1-r2.ebuild 2405
-MD5 b51efd66d2318327681ef764ff2880df ChangeLog 3594
+MD5 199ecd785dc3a12f41d23f5046ef9ba3 ChangeLog 3723
 MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160
 MD5 0358ef5f33cbdf1c0f764f1407677480 files/1.2.0_p1-respect-destdir.patch 21686
 MD5 aa9daa3694ffc472849365fdda73b0f9 files/pbs.rc 2138
 MD5 49d4d243a6dd96ba20531b240a7a32b6 files/digest-torque-1.0.1_p6 67
 MD5 640bc8217559fa4bc7086a9eb9045b1e files/digest-torque-1.2.0_p1 67
+MD5 fecc46e66800def43afc2718cfc6f428 files/digest-torque-1.2.0_p5 379
 MD5 e26e30bb1e82820df08330a7a9755aae files/1.2.0_p1-respect-ldflags.patch 2709
 MD5 640bc8217559fa4bc7086a9eb9045b1e files/digest-torque-1.2.0_p1-r1 67
 MD5 640bc8217559fa4bc7086a9eb9045b1e files/digest-torque-1.2.0_p1-r2 67
diff --git a/sys-cluster/torque/files/digest-torque-1.2.0_p5 b/sys-cluster/torque/files/digest-torque-1.2.0_p5
new file mode 100644
index 000000000000..91c2fc5d0a65
--- /dev/null
+++ b/sys-cluster/torque/files/digest-torque-1.2.0_p5
@@ -0,0 +1,5 @@
+MD5 d76042cb056a09fc3e544193b478c825 torque-1.2.0p5.tar.gz 2322590
+MD5 d92cc9e8b1d5af38457abc6137bf1b4d torque-1.2.0_p1-respect-destdir.patch.gz 3456
+MD5 a1b825dcf759b97ca78cd5a00d5ecbf0 torque-1.2.0_p1-respect-ldflags.patch.gz 717
+MD5 e55ec294bb0af1fb9b1f7ebe2571f02d torque-1.2.0p5-jobnanny.patch 8853
+MD5 0f24a10ecabc81d458b0ff82c7e36c52 torque-1.2.0p5-jobdepterm2.patch 1421
diff --git a/sys-cluster/torque/torque-1.2.0_p5.ebuild b/sys-cluster/torque/torque-1.2.0_p5.ebuild
new file mode 100644
index 000000000000..a7aea09fd317
--- /dev/null
+++ b/sys-cluster/torque/torque-1.2.0_p5.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-1.2.0_p5.ebuild,v 1.1 2005/08/11 20:51:30 robbat2 Exp $
+
+inherit flag-o-matic eutils
+
+MY_P="${P/_}"
+DESCRIPTION="A freely downloadable cluster resource manager and queuing system based on OpenPBS"
+HOMEPAGE="http://www.clusterresources.com/products/torque/"
+SRC_URI="http://www.clusterresources.com/downloads/torque/${MY_P}.tar.gz
+		 mirror://gentoo/${PN}-1.2.0_p1-respect-destdir.patch.gz
+		 mirror://gentoo/${PN}-1.2.0_p1-respect-ldflags.patch.gz
+		 http://www-rcf.usc.edu/~garrick/torque-1.2.0p5-jobnanny.patch
+		 http://www-rcf.usc.edu/~garrick/torque-1.2.0p5-jobdepterm2.patch"
+LICENSE="openpbs"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc tcltk X"
+PROVIDE="virtual/pbs"
+
+# ed is used by makedepend-sh
+DEPEND_COMMON="virtual/libc
+			   X? ( virtual/x11 )
+			   tcltk? ( dev-lang/tcl )
+			   !virtual/pbs"
+DEPEND="${DEPEND_COMMON}
+		sys-apps/ed"
+RDEPEND="${DEPEND_COMMON}
+		 net-misc/openssh"
+PDEPEND=">=sys-cluster/openpbs-common-1.1.0"
+
+S="${WORKDIR}/${MY_P}"
+
+SPOOL_LOCATION="/usr/spool" # this needs to move to /var later on
+PBS_SERVER_HOME="${SPOOL_LOCATION}/PBS/"
+
+src_unpack() {
+	append-ldflags -Wl,-z,now
+
+	unpack ${A}
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${PN}-1.2.0_p1-respect-ldflags.patch.gz || die "Failed to fix ldflags"
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${PN}-1.2.0_p1-respect-destdir.patch.gz || die "Failed to fix Makefiles for DESTDIR"
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${PN}-1.2.0p5-jobnanny.patch || die "Failed to apply job-nanny patch"
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${PN}-1.2.0p5-jobdepterm2.patch || die "Failed to apply job-dep cleanup patch"
+
+	# Tries to use absolute /tmp/ for tempfiles which fails miserably.
+	sed -i -e "s|/tmp/|\${TMPDIR}/|g" ${S}/buildutils/makedepend-sh || die "Failed TMPDIR change"
+}
+
+src_compile() {
+#	local myconf
+#	use X || myconf="--disable-gui"
+#	use tcltk && myconf="${myconf} --with-tcl"
+#	use doc && myconf="${myconf} --enable-docs"
+	append-flags -DJOB_DELETE_NANNY 
+
+	./configure \
+		$(use_enable X gui) \
+		$(use_with tcltk tcl) \
+		$(use_enable doc docs) \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--libdir="\${exec_prefix}/$(get_libdir)/pbs" \
+		--enable-server \
+		--enable-mom \
+		--enable-clients \
+		--enable-shared \
+		--enable-depend-cache \
+		$(use_with scp) \
+		$(use_enable tcltk tcl-qstat) \
+		--set-server-home=${PBS_SERVER_HOME} \
+		--set-environ=/etc/pbs_environment || die "./configure 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() {
+	root="$1"
+	s="${SPOOL_LOCATION}"
+	h="${PBS_SERVER_HOME}"
+	sp="${h}/server_priv"
+
+	chmod 755 ${root}${SPOOL_LOCATION} ${root}${PBS_SERVER_HOME}
+
+	for a in \
+			0755:${h} 0755:${h}/aux 0700:${h}/checkpoint \
+			0755:${h}/mom_logs 0751:${h}/mom_priv 0751:${h}/mom_priv/jobs \
+			0755:${h}/sched_logs 0750:${h}/sched_priv \
+			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 \
+			1777:${h}/spool 1777:${h}/undelivered ;
+	do
+		d="${a/*:}"
+		m="${a/:*}"
+		if [ ! -d "${d}" ]; then
+			install -d -m${m} ${root}${d}
+		else
+			chmod ${m} ${root}${d}
+		fi
+	done
+}
+
+src_install() {
+	# Make directories first
+	pbs_createspool "${D}"
+
+	make DESTDIR=${D} install || die
+
+	dodoc INSTALL PBS_License.txt README.torque Release_Notes
+	# Init scripts come from openpbs-common
+	#newinitd ${FILESDIR}/pbs-init.d pbs
+	#newconfd ${FILESDIR}/pbs-conf.d pbs
+	dosym /usr/$(get_libdir)/pbs/libpbs.a /usr/$(get_libdir)/libpbs.a
+
+	# this file MUST exist for PBS/Torque to work
+	# but try to preserve any customatizations that the user has made
+	dodir /etc
+	if [ -f ${ROOT}/etc/pbs_environment ]; then
+		cp ${ROOT}/etc/pbs_environment ${D}/etc/pbs_environment
+	else
+		touch ${D}/etc/pbs_environment
+	fi
+
+	if [ -f "${ROOT}/usr/spool/PBS/server_name" ]; then
+		cp "${ROOT}/usr/spool/PBS/server_name" "${D}/usr/spool/PBS/server_name"
+	fi
+}
+
+pkg_postinst() {
+	# make sure the damn directories exist
+	pbs_createspool "${ROOT}"
+}