(#115189) Bump, finally. Thanks to Sebastien Fabbro for maintaining this in the science overlay, and Lukasz Flis, Eric Thibodeau et al. on the original bug.

Package-Manager: portage-2.1.2_pre1-r1

6 files changed, 200 insertions, 3 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 80f71deb2c99..5cb65a3cfba1 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.28 2006/08/27 05:47:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.29 2006/09/25 05:11:16 dberkholz Exp $
+
+*torque-2.1.2 (25 Sep 2006)
+
+  25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; +torque-2.1.2.ebuild:
+  (#115189) Bump, finally. Thanks to Sebastien Fabbro for maintaining this in
+  the science overlay, and Lukasz Flis, Eric Thibodeau et al. on the original
+  bug.
 
   27 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
   torque-1.2.0_p5-r1.ebuild:
diff --git a/sys-cluster/torque/files/digest-torque-1.2.0_p5-r1 b/sys-cluster/torque/files/digest-torque-1.2.0_p5-r1
index 91c2fc5d0a65..0068b2388775 100644
--- a/sys-cluster/torque/files/digest-torque-1.2.0_p5-r1
+++ b/sys-cluster/torque/files/digest-torque-1.2.0_p5-r1
@@ -1,5 +1,15 @@
-MD5 d76042cb056a09fc3e544193b478c825 torque-1.2.0p5.tar.gz 2322590
 MD5 d92cc9e8b1d5af38457abc6137bf1b4d torque-1.2.0_p1-respect-destdir.patch.gz 3456
+RMD160 c9390a8d4d618ed9d64513a2e93335b9e091af64 torque-1.2.0_p1-respect-destdir.patch.gz 3456
+SHA256 10b6e7c6c15d3f925695dc014573f7af3ec9a5c44a05d6f7c7f6bc0a5d70c752 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
+RMD160 4a1b622178a925ae938394c16f1cd7e8b0c4c372 torque-1.2.0_p1-respect-ldflags.patch.gz 717
+SHA256 922cbe1e693d75c0eaa0278a4462882629587948a4d3cb708404ca71915ebecb torque-1.2.0_p1-respect-ldflags.patch.gz 717
 MD5 0f24a10ecabc81d458b0ff82c7e36c52 torque-1.2.0p5-jobdepterm2.patch 1421
+RMD160 0943489a76e8836c1292cc8f4c723d3e9ba1f7db torque-1.2.0p5-jobdepterm2.patch 1421
+SHA256 7cf91b5c2ef2db737b7cbbdfcf3d2cef25aed40839cb5809173cfa5430ad444c torque-1.2.0p5-jobdepterm2.patch 1421
+MD5 e55ec294bb0af1fb9b1f7ebe2571f02d torque-1.2.0p5-jobnanny.patch 8853
+RMD160 869efc5c67983406c6ae611ad5f083c74beb5858 torque-1.2.0p5-jobnanny.patch 8853
+SHA256 017d20a888e7198542cec28f183c6c0e3b09351d07a0f27ed6836f6840dcaa92 torque-1.2.0p5-jobnanny.patch 8853
+MD5 d76042cb056a09fc3e544193b478c825 torque-1.2.0p5.tar.gz 2322590
+RMD160 ac27ad6ca4dff3b10060db6e5599a1403ec28c65 torque-1.2.0p5.tar.gz 2322590
+SHA256 13f416c3d32f0dd679b92bbbd9dbdf2b2567a5c85eb9e5385331d066b091e02d torque-1.2.0p5.tar.gz 2322590
diff --git a/sys-cluster/torque/files/digest-torque-1.2.0_p5-r2 b/sys-cluster/torque/files/digest-torque-1.2.0_p5-r2
index 935c7182575d..0068b2388775 100644
--- a/sys-cluster/torque/files/digest-torque-1.2.0_p5-r2
+++ b/sys-cluster/torque/files/digest-torque-1.2.0_p5-r2
@@ -1,5 +1,15 @@
 MD5 d92cc9e8b1d5af38457abc6137bf1b4d torque-1.2.0_p1-respect-destdir.patch.gz 3456
+RMD160 c9390a8d4d618ed9d64513a2e93335b9e091af64 torque-1.2.0_p1-respect-destdir.patch.gz 3456
+SHA256 10b6e7c6c15d3f925695dc014573f7af3ec9a5c44a05d6f7c7f6bc0a5d70c752 torque-1.2.0_p1-respect-destdir.patch.gz 3456
 MD5 a1b825dcf759b97ca78cd5a00d5ecbf0 torque-1.2.0_p1-respect-ldflags.patch.gz 717
+RMD160 4a1b622178a925ae938394c16f1cd7e8b0c4c372 torque-1.2.0_p1-respect-ldflags.patch.gz 717
+SHA256 922cbe1e693d75c0eaa0278a4462882629587948a4d3cb708404ca71915ebecb torque-1.2.0_p1-respect-ldflags.patch.gz 717
 MD5 0f24a10ecabc81d458b0ff82c7e36c52 torque-1.2.0p5-jobdepterm2.patch 1421
+RMD160 0943489a76e8836c1292cc8f4c723d3e9ba1f7db torque-1.2.0p5-jobdepterm2.patch 1421
+SHA256 7cf91b5c2ef2db737b7cbbdfcf3d2cef25aed40839cb5809173cfa5430ad444c torque-1.2.0p5-jobdepterm2.patch 1421
 MD5 e55ec294bb0af1fb9b1f7ebe2571f02d torque-1.2.0p5-jobnanny.patch 8853
+RMD160 869efc5c67983406c6ae611ad5f083c74beb5858 torque-1.2.0p5-jobnanny.patch 8853
+SHA256 017d20a888e7198542cec28f183c6c0e3b09351d07a0f27ed6836f6840dcaa92 torque-1.2.0p5-jobnanny.patch 8853
 MD5 d76042cb056a09fc3e544193b478c825 torque-1.2.0p5.tar.gz 2322590
+RMD160 ac27ad6ca4dff3b10060db6e5599a1403ec28c65 torque-1.2.0p5.tar.gz 2322590
+SHA256 13f416c3d32f0dd679b92bbbd9dbdf2b2567a5c85eb9e5385331d066b091e02d torque-1.2.0p5.tar.gz 2322590
diff --git a/sys-cluster/torque/files/digest-torque-2.1.2 b/sys-cluster/torque/files/digest-torque-2.1.2
new file mode 100644
index 000000000000..5bb1ccd8379b
--- /dev/null
+++ b/sys-cluster/torque/files/digest-torque-2.1.2
@@ -0,0 +1,3 @@
+MD5 f1b37efb5d4770a0105c66294a05d140 torque-2.1.2.tar.gz 2686724
+RMD160 7ba5cf4b4655d6e77c705be30c539380ca5863c1 torque-2.1.2.tar.gz 2686724
+SHA256 c7bade897fc12f27f128e4081c8ed1f3137bf42684ca239c48b18eb01314710a torque-2.1.2.tar.gz 2686724
diff --git a/sys-cluster/torque/files/torque-setuid-safety.patch b/sys-cluster/torque/files/torque-setuid-safety.patch
new file mode 100644
index 000000000000..81dba4b143fc
--- /dev/null
+++ b/sys-cluster/torque/files/torque-setuid-safety.patch
@@ -0,0 +1,24 @@
+diff -Naur torque-2.1.0p0/src/iff/Makefile.in torque-2.1.0p0.new/src/iff/Makefile.in
+--- torque-2.1.0p0/src/iff/Makefile.in	2006-04-06 22:56:32.000000000 +0100
++++ torque-2.1.0p0.new/src/iff/Makefile.in	2006-05-19 23:51:52.000000000 +0100
+@@ -146,7 +146,7 @@
+ am_pbs_iff_OBJECTS = iff2.$(OBJEXT)
+ pbs_iff_OBJECTS = $(am_pbs_iff_OBJECTS)
+ pbs_iff_DEPENDENCIES = ../lib/Libpbs/libtorque.la
+-pbs_iff_LDFLAGS =
++pbs_iff_LDFLAGS = -Wl,-z,now
+ 
+ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/src/include
+diff -Naur torque-2.1.0p0/src/mom_rcp/Makefile.in torque-2.1.0p0.new/src/mom_rcp/Makefile.in
+--- torque-2.1.0p0/src/mom_rcp/Makefile.in	2006-04-06 22:56:34.000000000 +0100
++++ torque-2.1.0p0.new/src/mom_rcp/Makefile.in	2006-05-19 23:52:42.000000000 +0100
+@@ -145,7 +145,7 @@
+ pbs_rcp_OBJECTS = $(am_pbs_rcp_OBJECTS)
+ pbs_rcp_LDADD = $(LDADD)
+ pbs_rcp_DEPENDENCIES =
+-pbs_rcp_LDFLAGS =
++pbs_rcp_LDFLAGS = -Wl,-z,now
+ 
+ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/src/include
diff --git a/sys-cluster/torque/torque-2.1.2.ebuild b/sys-cluster/torque/torque-2.1.2.ebuild
new file mode 100644
index 000000000000..f24ce32310ff
--- /dev/null
+++ b/sys-cluster/torque/torque-2.1.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.1.2.ebuild,v 1.1 2006/09/25 05:11:16 dberkholz Exp $
+
+
+inherit autotools flag-o-matic eutils
+
+MY_P="${P/_}"
+DESCRIPTION="Resource manager and queuing system based on OpenPBS"
+HOMEPAGE="http://www.clusterresources.com/products/torque/"
+SRC_URI="http://www.clusterresources.com/downloads/${PN}/${MY_P}.tar.gz"
+
+LICENSE="openpbs"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="tk scp server"
+PROVIDE="virtual/pbs"
+
+# ed is used by makedepend-sh
+DEPEND_COMMON="virtual/libc
+	sys-libs/ncurses
+	sys-libs/readline
+	tk? ( dev-tcltk/tclx )
+	!virtual/pbs"
+
+DEPEND="${DEPEND_COMMON}
+	sys-apps/ed"
+
+RDEPEND="${DEPEND_COMMON}
+	scp? ( net-misc/openssh )
+	!scp? ( net-misc/netkit-rsh )"
+
+PDEPEND=">=sys-cluster/openpbs-common-1.1.1"
+
+S="${WORKDIR}/${MY_P}"
+
+SPOOL_LOCATION="/var/spool" # this needs to move to /var later on
+PBS_SERVER_HOME="${SPOOL_LOCATION}/PBS/"
+
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch ${FILESDIR}/${PN}-setuid-safety.patch
+}
+
+
+
+src_compile() {
+
+	local myconf
+	if use server; then
+		myconf="--enable-server  --with-default-server=$(hostname)"
+	elif [[ -n ${PBS_SERVER_NAME} ]]; then
+		myconf="--disable-server --with-default-server=${PBS_SERVER_NAME}"
+	else
+		myconf="--disable-server --with-default-server=$(hostname)"
+	fi
+
+	if use scp; then
+		myconf="${myconf} --with-rcp=scp"
+	else
+		myconf="${myconf} --with-rcp=mom_rcp"
+	fi
+
+	econf \
+		$(use_enable tk gui) \
+		--libdir="\${exec_prefix}/$(get_libdir)/pbs" \
+		--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
+	for a in \
+			0755:${s} 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 "${root}${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 "make install failed"
+	dodoc CHANGELOG DEVELOPMENT README.* Release_Notes doc/admin_guide.ps
+
+	# 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}var/spool/PBS/server_name" ]; then
+		cp "${ROOT}var/spool/PBS/server_name" "${D}/var/spool/PBS/server_name"
+	fi
+
+	# 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
+}
+
+pkg_postinst() {
+	# make sure the directories exist
+	pbs_createspool "${ROOT}"
+	[ ! -f "${ROOT}etc/pbs_environment" ] && \
+		touch "${ROOT}etc/pbs_environment"
+}