Redo spool directory stuff again, as torque still complains at me. Also move patches to mirrors, esp as the one is larger than the size limit.

(Portage version: 2.0.51.22-r2)

4 files changed, 121 insertions, 1 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 76a2a3ec86b1..d61e2d5518cf 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2005/07/12 09:36:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.16 2005/07/21 01:08:16 robbat2 Exp $
+
+*torque-1.2.0_p1-r3 (21 Jul 2005)
+
+  21 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +torque-1.2.0_p1-r3.ebuild:
+  Redo spool directory stuff again, as torque still complains at me. Also move
+  patches to mirrors, esp as the one is larger than the size limit.
 
   12 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
   torque-1.2.0_p1-r2.ebuild:
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 8057929a50c2..8ce1ffa8a42f 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,5 +1,6 @@
 MD5 7dd1a27cf57520610867640d86e91ba3 torque-1.2.0_p1-r1.ebuild 1874
 MD5 c6f3121536e6adce335641c7a3c961ae torque-1.2.0_p1.ebuild 2312
+MD5 2f8d4075ab808b7b799aaa38188ce592 torque-1.2.0_p1-r3.ebuild 3479
 MD5 38ff4b249a54a78f0a2d720fbf20b534 torque-1.0.1_p6.ebuild 1910
 MD5 d18ea01c292ee1127343a7143f8af6f7 torque-1.2.0_p1-r2.ebuild 2405
 MD5 3451ee8fe1ea06e1bf4224144114fb03 ChangeLog 2974
@@ -11,3 +12,4 @@ MD5 640bc8217559fa4bc7086a9eb9045b1e files/digest-torque-1.2.0_p1 67
 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
+MD5 92770be41a9332a0c3326cae44d55e93 files/digest-torque-1.2.0_p1-r3 232
diff --git a/sys-cluster/torque/files/digest-torque-1.2.0_p1-r3 b/sys-cluster/torque/files/digest-torque-1.2.0_p1-r3
new file mode 100644
index 000000000000..f05fca975f41
--- /dev/null
+++ b/sys-cluster/torque/files/digest-torque-1.2.0_p1-r3
@@ -0,0 +1,3 @@
+MD5 7555d85cf2bacda2725e04d1efcf70ff torque-1.2.0p1.tar.gz 2202860
+MD5 d92cc9e8b1d5af38457abc6137bf1b4d torque-1.2.0_p1-respect-destdir.patch.gz 3456
+MD5 a1b825dcf759b97ca78cd5a00d5ecbf0 torque-1.2.0_p1-respect-ldflags.patch.gz 717
diff --git a/sys-cluster/torque/torque-1.2.0_p1-r3.ebuild b/sys-cluster/torque/torque-1.2.0_p1-r3.ebuild
new file mode 100644
index 000000000000..89f130793ef5
--- /dev/null
+++ b/sys-cluster/torque/torque-1.2.0_p1-r3.ebuild
@@ -0,0 +1,108 @@
+# 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_p1-r3.ebuild,v 1.1 2005/07/21 01:08:16 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.supercluster.org/torque/"
+SRC_URI="http://supercluster.org/downloads/torque/${MY_P}.tar.gz
+		 mirror://gentoo/${P}-respect-destdir.patch.gz
+		 mirror://gentoo/${P}-respect-ldflags.patch.gz"
+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"
+
+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}/${P}-respect-ldflags.patch.gz || die "Failed to fix ldflags"
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${P}-respect-destdir.patch.gz || die "Failed to fix Makefiles for DESTDIR"
+
+	# 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"
+
+	./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 \
+		--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="${root}${SPOOL_LOCATION}"
+	h="${root}${PBS_SERVER_HOME}"
+	install -d -m0755 "${h}"
+	install -d -m1777 "${h}/spool" "${h}/undelivered"
+	install -d -m0700 "${h}/checkpoint"
+	install -d -m0755 "${h}/aux" "${h}/mom_logs" "${h}/sched_logs" "${h}/server_logs"
+	install -d -m0750 "${h}/sched_priv" "${h}/server_priv"
+	install -d -m0751 "${h}/mom_priv" "${h}/mom_priv/jobs"
+	sp="${h}/server_priv"
+	install -d -m0755 "${sp}/accounting"
+	install -d -m0750 "${sp}/acl_groups" "${sp}/acl_hosts" "${sp}/acl_svr" "${sp}/acl_users" "${sp}/jobs" "${sp}/queues"
+	# this file MUST exist for PBS/Torque to work
+	install -d -m0755 "${root}/etc"
+	touch ${root}/etc/pbs_environment
+	chmod 644 ${root}/etc/pbs_environment
+}
+
+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
+}
+
+pkg_postinst() {
+	# make sure the damn directories exist
+	pbs_createspool "${ROOT}"
+}