torque: version bump to 2.1.0

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@202 32389bae-6d03-0410-99cf-db05cde120eb

5 files changed, 178 insertions, 1 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 9557fb428..11c52d67f 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*torque-2.1.0_p0 (20 May 2006)
+
+  20 May 2006; Sebastien Fabbro <seb@ist.utl.pt>;
+  +torque-2.1.0_p0.ebuild
+  +files/torque-2.0.0_p8-setuid-safety.patch
+  Version bump.
+	
 *torque-2.0.0_p8 (20 Mar 2006)
 
   20 Mar 2006; Sebastien Fabbro <seb@ist.utl.pt>;
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index b18dbb01b..72de7a05c 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,10 +1,13 @@
-MD5 249df5a7a372b24e503305e3bde8791a ChangeLog 5434
+MD5 e1dc292a9a7eecfa7cb0f7c3051e843d ChangeLog 5605
 MD5 cf4938ca2752c9563ec72aac156f6b47 files/digest-torque-2.0.0_p8 67
+MD5 c7e2da6c8a84178e8ce9e5c0a85f455b files/digest-torque-2.1.0_p0 67
 MD5 7647c23d0d5189ae7a9c2a4322ce1bb6 files/torque-2.0.0_p8-destdir-fixes.patch 539
 MD5 9f25beb5f23e2ec65b02a6dc174fc452 files/torque-2.0.0_p8-libpbs-pic.patch 557
 MD5 5f41eb14cea3408472c133849550faef files/torque-2.0.0_p8-makedepend.patch 754
 MD5 b551147a374f034bf251490ce985be6b files/torque-2.0.0_p8-respect-destdir.patch 21832
 MD5 3ea9d3a2e1cff3ccd224f0e0b33da6d5 files/torque-2.0.0_p8-respect-ldflags.patch 2710
 MD5 f362dc4addcab08a5d537913b99c9484 files/torque-2.0.0_p8-setuid-safety.patch 997
+MD5 a62390b5bf5adb5fdc7091326cf7b396 files/torque-2.1.0_p0-setuid-safety.patch 1020
 MD5 873d7e3e93527942f580edbddb57061b metadata.xml 647
 MD5 5578565d8e5d8a91274c5bcec2aa5ab4 torque-2.0.0_p8.ebuild 4601
+MD5 69d8d60bbcd9756fe1620a71de8da2f5 torque-2.1.0_p0.ebuild 3734
diff --git a/sys-cluster/torque/files/digest-torque-2.1.0_p0 b/sys-cluster/torque/files/digest-torque-2.1.0_p0
new file mode 100644
index 000000000..d2b420600
--- /dev/null
+++ b/sys-cluster/torque/files/digest-torque-2.1.0_p0
@@ -0,0 +1 @@
+MD5 4f18b56dbc01ba9a519709cc620d9eae torque-2.1.0p0.tar.gz 2649041
diff --git a/sys-cluster/torque/files/torque-2.1.0_p0-setuid-safety.patch b/sys-cluster/torque/files/torque-2.1.0_p0-setuid-safety.patch
new file mode 100644
index 000000000..81dba4b14
--- /dev/null
+++ b/sys-cluster/torque/files/torque-2.1.0_p0-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.0_p0.ebuild b/sys-cluster/torque/torque-2.1.0_p0.ebuild
new file mode 100644
index 000000000..1e9a2f581
--- /dev/null
+++ b/sys-cluster/torque/torque-2.1.0_p0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+
+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 ~x86"
+IUSE="tcltk scp server"
+PROVIDE="virtual/pbs"
+
+# ed is used by makedepend-sh
+DEPEND_COMMON="virtual/libc
+	sys-libs/ncurses
+	sys-libs/readline
+	tcltk? ( 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}/${P}-setuid-safety.patch
+}
+
+
+
+src_compile() {
+
+	local myconf
+	if use server; then
+		myconf="--enable-server  --with-default-server=$(hostname)"
+	elif [ -z "${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 tcltk 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() {
+	root="$1"
+	s="${SPOOL_LOCATION}"
+	h="${PBS_SERVER_HOME}"
+	sp="${h}/server_priv"
+	einfo "Building spool directory under ${D}${h}"
+	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 damn directories exist
+	pbs_createspool "${ROOT}"
+	[ ! -f "${ROOT}/etc/pbs_environment" ] && \
+		touch "${ROOT}/etc/pbs_environment"
+}