Add DEPEND on sys-apps/ed, and make sure makedepend-sh uses $TMPDIR.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 28 insertions, 14 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 7fced4406900..ac567d3bf1b3 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,10 @@
 # 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.9 2005/03/15 21:59:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.10 2005/06/10 20:13:41 robbat2 Exp $
+
+  10 Jun 2005; Robin H. Johnson <robbat2@gentoo.org> torque-1.0.1_p6.ebuild,
+  torque-1.2.0_p1.ebuild:
+  Add DEPEND on sys-apps/ed, and make sure makedepend-sh uses $TMPDIR.
 
 *torque-1.0.1_p6 (15 Mar 2005)
 
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index f8c7e1552c82..ccea2abbe0ed 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,8 +1,8 @@
-MD5 905e4c4f719d55cd78f5ba96a000c793 ChangeLog 1918
+MD5 c6f3121536e6adce335641c7a3c961ae torque-1.2.0_p1.ebuild 2312
+MD5 807bf5b17218fa4741a052cd390af5d7 torque-1.0.1_p6.ebuild 1910
+MD5 2d1e36fc700ac11c309df596bdbd2ab4 ChangeLog 2094
 MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160
-MD5 8793a7d52ddfd3bbf47ab3d9f40ef88a torque-1.2.0_p1.ebuild 2039
-MD5 a233d5a68b2744951e0438f2a21ecc18 torque-1.0.1_p6.ebuild 1747
-MD5 e26e30bb1e82820df08330a7a9755aae files/1.2.0_p1-respect-ldflags.patch 2709
-MD5 640bc8217559fa4bc7086a9eb9045b1e files/digest-torque-1.2.0_p1 67
 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 e26e30bb1e82820df08330a7a9755aae files/1.2.0_p1-respect-ldflags.patch 2709
diff --git a/sys-cluster/torque/torque-1.0.1_p6.ebuild b/sys-cluster/torque/torque-1.0.1_p6.ebuild
index 5293fe2d5e9b..8353b3a2ea80 100644
--- a/sys-cluster/torque/torque-1.0.1_p6.ebuild
+++ b/sys-cluster/torque/torque-1.0.1_p6.ebuild
@@ -1,6 +1,6 @@
 # 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.0.1_p6.ebuild,v 1.1 2005/03/15 21:59:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-1.0.1_p6.ebuild,v 1.2 2005/06/10 20:13:41 robbat2 Exp $
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="X tcltk"
 
-DEPEND="virtual/libc
+DEPEND="sys-apps/ed
+		virtual/libc
 		X? ( virtual/x11 )
 		tcltk? ( dev-lang/tcl )"
 RDEPEND="net-misc/openssh"
@@ -31,6 +32,9 @@ src_unpack() {
 
 	# Is this one needed??
 	#	-e "s|\(PBS_DEFAULT_SERVER=\)\(@PBS_DEFAULT_SERVER@\)|\1\${D}\2|" \
+	
+	# Tries to use absolute /tmp/ for tempfiles which fails miserably.
+	sed -i -e "s|/tmp/|\${TMPDIR}/|g" makedepend-sh || die "Failed TMPDIR change"
 }
 
 src_compile() {
diff --git a/sys-cluster/torque/torque-1.2.0_p1.ebuild b/sys-cluster/torque/torque-1.2.0_p1.ebuild
index 7c695ae37db6..f2376ccd7e60 100644
--- a/sys-cluster/torque/torque-1.2.0_p1.ebuild
+++ b/sys-cluster/torque/torque-1.2.0_p1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2005/02/20 09:40:02 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-1.2.0_p1.ebuild,v 1.2 2005/06/10 20:13:41 robbat2 Exp $
 
 inherit flag-o-matic
 
@@ -14,9 +14,11 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="doc tcltk X"
 
+# ed is used by makedepend-sh
 DEPEND="virtual/libc
 		X? ( virtual/x11 )
-		tcltk? ( dev-lang/tcl )"
+		tcltk? ( dev-lang/tcl )
+		sys-apps/ed"
 RDEPEND="net-misc/openssh"
 
 S="${WORKDIR}/${MY_P}"
@@ -25,17 +27,21 @@ src_unpack() {
 	append-ldflags -Wl,-z,now
 
 	unpack ${A}
-	epatch ${FILESDIR}/${PV}-respect-ldflags.patch
+	epatch ${FILESDIR}/${PV}-respect-ldflags.patch || die "Failed to fix ldflags"
 
 	# this thing doesn't use make install, but rather it's own install script
 	# fix it here so the install dirs are set to the ${D} directory
-	cd ${S}/buildutils
-	mv pbs_mkdirs.in pbs_mkdirs.in-orig
+	cd ${S}/buildutils && \
+	mv pbs_mkdirs.in pbs_mkdirs.in-orig && \
 	sed -e "s|prefix=@prefix@|prefix=\${D}@prefix@| ; \
 		s|PBS_SERVER_HOME=@PBS_SERVER_HOME@|PBS_SERVER_HOME=\${D}@PBS_SERVER_HOME@| ; \
 		s|PBS_DEFAULT_FILE=@PBS_DEFAULT_FILE@|PBS_DEFAULT_FILE=\${D}@PBS_DEFAULT_FILE@| ; \
 		s|PBS_ENVIRON=@PBS_ENVIRON@|PBS_ENVIRON=\${D}@PBS_ENVIRON@|" \
-			pbs_mkdirs.in-orig > pbs_mkdirs.in
+			pbs_mkdirs.in-orig > pbs_mkdirs.in || \
+	die 'Failed to set build to use $D'
+
+	# Tries to use absolute /tmp/ for tempfiles which fails miserably.
+	sed -i -e "s|/tmp/|\${TMPDIR}/|g" makedepend-sh || die "Failed TMPDIR change"
 }
 
 src_compile() {