This update to _p6 from -r6 changes nothing functionally. Just a saner nameing convention, and no clobbering the global context with the cat | sed business, and also no overriding of and so on

(Portage version: 2.0.51.19)

4 files changed, 41 insertions, 30 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index 00e2581cde48..7fced4406900 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,18 @@
 # 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.8 2005/02/20 09:41:03 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.9 2005/03/15 21:59:03 seemant Exp $
+
+*torque-1.0.1_p6 (15 Mar 2005)
+
+  15 Mar 2005; Seemant Kulleen <seemant@gentoo.org> -torque-1.0.1-r6.ebuild,
+  +torque-1.0.1_p6.ebuild:
+  This update to _p6 from -r6 changes nothing functionally. Just a saner
+  nameing convention, and no clobbering the global context with the cat | sed
+  business, and also no overriding of and so on
+
+  15 Mar 2005; Seemant Kulleen <seemant@gentoo.org> torque-1.0.1-r6.ebuild:
+  fix the sed in global scope nonsense, though I do believe the package itself
+  should not depend on the revision number
 
   20 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
   Add metadata -- owned by cluster herd.
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 2818e5f854c1..8a3f94d919d4 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,8 +1,8 @@
-MD5 966146ac84e88ff472372b190a2d3a9a ChangeLog 1385
-MD5 36da8365261951c8ea73a22748ba3614 torque-1.0.1-r6.ebuild 1852
-MD5 8793a7d52ddfd3bbf47ab3d9f40ef88a torque-1.2.0_p1.ebuild 2039
+MD5 029a1e959eeb4f5fafc66531802c45ab ChangeLog 1584
 MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160
-MD5 49d4d243a6dd96ba20531b240a7a32b6 files/digest-torque-1.0.1-r6 67
-MD5 aa9daa3694ffc472849365fdda73b0f9 files/pbs.rc 2138
-MD5 640bc8217559fa4bc7086a9eb9045b1e files/digest-torque-1.2.0_p1 67
+MD5 8793a7d52ddfd3bbf47ab3d9f40ef88a torque-1.2.0_p1.ebuild 2039
+MD5 4f876b65984e7e76105633feeefeec99 torque-1.0.1_p6.ebuild 1749
 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
diff --git a/sys-cluster/torque/files/digest-torque-1.0.1-r6 b/sys-cluster/torque/files/digest-torque-1.0.1_p6
index 2bb2c16ed385..2bb2c16ed385 100644
--- a/sys-cluster/torque/files/digest-torque-1.0.1-r6
+++ b/sys-cluster/torque/files/digest-torque-1.0.1_p6
diff --git a/sys-cluster/torque/torque-1.0.1-r6.ebuild b/sys-cluster/torque/torque-1.0.1_p6.ebuild
index ce31bc80b43c..5293fe2d5e9b 100644
--- a/sys-cluster/torque/torque-1.0.1-r6.ebuild
+++ b/sys-cluster/torque/torque-1.0.1_p6.ebuild
@@ -1,12 +1,12 @@
 # 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-r6.ebuild,v 1.8 2005/02/20 09:40:02 spyderous Exp $
-
-S=${WORKDIR}/`echo ${A} | sed -e 's/\.tar\.gz//g'`
+# $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 $
 
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_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/torque-1.0.1p6.tar.gz"
+SRC_URI="http://supercluster.org/downloads/torque/${MY_P}.tar.gz"
 LICENSE="openpbs"
 
 SLOT="0"
@@ -19,26 +19,22 @@ DEPEND="virtual/libc
 RDEPEND="net-misc/openssh"
 
 src_unpack() {
-	cd ${WORKDIR}
-	unpack ${A}
-	cd ${S}
+	unpack ${A}; cd ${S}
 	# 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 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
+	sed -i -e "s|prefix=@prefix@|prefix=\${D}@prefix@|" \
+		-e "s|\(PBS_SERVER_HOME=\)\(@PBS_SERVER_HOME@\)|\1\${D}\2|" \
+		-e "s|\(PBS_DEFAULT_FILE=\)\(@PBS_DEFAULT_FILE@\)|\1\${D}\2|" \
+		-e "s|\(PBS_ENVIRON=\)\(@PBS_ENVIRON@\)|\1\${D}\2|" \
+			pbs_mkdirs.in
+
+	# Is this one needed??
+	#	-e "s|\(PBS_DEFAULT_SERVER=\)\(@PBS_DEFAULT_SERVER@\)|\1\${D}\2|" \
 }
 
 src_compile() {
-	local myconf
-	use X || myconf="--disable-gui"
-	use tcltk && myconf="${myconf} --with-tcl"
-
-	./configure ${myconf} \
+	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--enable-docs \
@@ -46,16 +42,19 @@ src_compile() {
 		--enable-mom \
 		--enable-clients \
 		--set-server-home=/usr/spool/PBS \
-		--set-environ=/etc/pbs_environment || die "./configure failed"
+		--set-environ=/etc/pbs_environment \
+		`use_enable X gui` \
+		`use_with tcltk tcl` || die "./configure failed"
 
 	make || die
 }
 
 src_install() {
-	make prefix=${D}/usr \
-		 mandir=${D}/usr/share/man \
-		 PBS_SERVER_HOME=${D}/usr/spool/PBS \
-	     install || die
+	make \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		PBS_SERVER_HOME=${D}/usr/spool/PBS \
+		install || die
 
 	dodoc INSTALL PBS_License.text Read.Me Release_Notes
 	exeinto /etc/init.d ; newexe ${FILESDIR}/pbs.rc pbs