Fix bugs #97548 and #97552 - use proper DESTDIR for install and libs into /usr/$libdir/torque/.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 568 insertions, 12 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index ac567d3bf1b3..ea4ed91c4558 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.10 2005/06/10 20:13:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.11 2005/07/05 01:11:23 robbat2 Exp $
+
+*torque-1.2.0_p1-r1 (05 Jul 2005)
+
+  05 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/1.2.0_p1-respect-destdir.patch, +torque-1.2.0_p1-r1.ebuild:
+  Fix bugs #97548 and #97552 - use proper DESTDIR for install and libs into
+  /usr/$libdir/torque/.
 
   10 Jun 2005; Robin H. Johnson <robbat2@gentoo.org> torque-1.0.1_p6.ebuild,
   torque-1.2.0_p1.ebuild:
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 0e82d9c8220d..c1b5d052fec1 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 7dd1a27cf57520610867640d86e91ba3 torque-1.2.0_p1-r1.ebuild 1874
 MD5 c6f3121536e6adce335641c7a3c961ae torque-1.2.0_p1.ebuild 2312
 MD5 38ff4b249a54a78f0a2d720fbf20b534 torque-1.0.1_p6.ebuild 1910
-MD5 2d1e36fc700ac11c309df596bdbd2ab4 ChangeLog 2094
+MD5 68527e9f8b2b0c45d3ca6ae1508bb588 ChangeLog 2352
 MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160
+MD5 0358ef5f33cbdf1c0f764f1407677480 files/1.2.0_p1-respect-destdir.patch 21686
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCqgZQI1lqEGTUzyQRAhxeAJ9QUd0c/EF8B6O8tkRFgMkoGMjQewCg2mA1
-ZErYQmmBASrVU8SvrTIz5iw=
-=VhVG
------END PGP SIGNATURE-----
+MD5 640bc8217559fa4bc7086a9eb9045b1e files/digest-torque-1.2.0_p1-r1 67
diff --git a/sys-cluster/torque/files/1.2.0_p1-respect-destdir.patch b/sys-cluster/torque/files/1.2.0_p1-respect-destdir.patch
new file mode 100644
index 000000000000..b68407ed5a46
--- /dev/null
+++ b/sys-cluster/torque/files/1.2.0_p1-respect-destdir.patch
@@ -0,0 +1,491 @@
+diff -urN torque-1.2.0p1.orig/buildutils/mkincludes/lib.mk.in torque-1.2.0p1/buildutils/mkincludes/lib.mk.in
+--- torque-1.2.0p1.orig/buildutils/mkincludes/lib.mk.in	2005-02-07 18:57:06.000000000 -0800
++++ torque-1.2.0p1/buildutils/mkincludes/lib.mk.in	2005-06-30 15:47:51.000000000 -0700
+@@ -16,7 +16,7 @@
+ 
+ install:: $(TARGET)
+ 	@# a two step process is best to work around broken installs
+-	$(INSTALL) -d $(libdir) && \
+-	$(INSTALL) -m 644 $(TARGET) $(libdir)/$(TARGET)
++	$(INSTALL) -d $(DESTDIR)$(libdir) && \
++	$(INSTALL) -m 644 $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
+ 
+ # END lib.mk
+diff -urN torque-1.2.0p1.orig/buildutils/pbs_mkdirs.in torque-1.2.0p1/buildutils/pbs_mkdirs.in
+--- torque-1.2.0p1.orig/buildutils/pbs_mkdirs.in	2005-02-14 14:01:39.000000000 -0800
++++ torque-1.2.0p1/buildutils/pbs_mkdirs.in	2005-06-30 16:59:10.000000000 -0700
+@@ -140,6 +140,7 @@
+ 	# dlist will contain a list of directory names to make
+ 	id_dlist=""
+ 
++	id_dname=${DESTDIR}$id_dname
+ 	while [ ! \( -z "$id_dname" -o "$id_dname" = / -o \
+ 		"$id_dname" = "." \) ]; do
+ 
+@@ -194,9 +195,9 @@
+ 	elif [ ! -d $idv_dname ] ; then
+ 		test -n "$verbose" && echo Creating $idv_dname
+ 		install_dir `dirname $idv_dname` 755 $idv_owner && \
+-		    mkdir $idv_dname && chmod $idv_mode $idv_dname || return 1
++		    mkdir ${DESTDIR}$idv_dname && chmod $idv_mode ${DESTDIR}$idv_dname || return 1
+ 		if test -n "$idv_owner"; then
+-			chown $idv_owner $idv_name || return 1
++			chown $idv_owner ${DESTDIR}$idv_name || return 1
+ 		fi
+  	
+ 	fi
+diff -urN torque-1.2.0p1.orig/doc/Makefile.in torque-1.2.0p1/doc/Makefile.in
+--- torque-1.2.0p1.orig/doc/Makefile.in	2005-02-07 18:57:06.000000000 -0800
++++ torque-1.2.0p1/doc/Makefile.in	2005-06-30 16:02:50.000000000 -0700
+@@ -192,44 +192,44 @@
+ 
+ install1:	${MAN1}
+ 	@echo Installing section 1 man pages
+-	@$(INSTALL) -d -m 755 $(PBS_MAN) && \
+-	$(INSTALL) -d -m 755 $(PBS_MAN1) && \
++	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \
++	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN1) && \
+ 	for t in $?; do \
+ 		tt=`basename $$t B`; \
+-		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \
+-		chmod 644 ${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \
++		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \
++		chmod 644 $(DESTDIR)${PBS_MAN1}/$${tt}$(MAN_SUFFIX); \
+ 	done
+ 
+ install3: $(MAN3)
+ 	@echo Installing section 3 man pages
+-	@$(INSTALL) -d -m 755 $(PBS_MAN) && \
+-	$(INSTALL) -d -m 755 $(PBS_MAN3) && \
++	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \
++	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN3) && \
+ 	for t in $?; do \
+ 		tt=`basename $$t B`; \
+-		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \
+-		chmod 644 ${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \
++		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \
++		chmod 644 $(DESTDIR)${PBS_MAN3}/$${tt}$(MAN_SUFFIX); \
+ 	done
+ 
+ install7: $(MAN7)
+ 	@echo Installing section 7 man pages
+-	@$(INSTALL) -d -m 755 $(PBS_MAN) && \
+-	$(INSTALL) -d -m 755 $(PBS_MAN7) && \
++	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \
++	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN7) && \
+ 	for t in $?;  do \
+ 		tt=`basename $$t B`; \
+-		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \
+-		chmod 644 ${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \
++		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \
++		chmod 644 $(DESTDIR)${PBS_MAN7}/$${tt}$(MAN_SUFFIX); \
+ 	done
+-	@rm -f ${PBS_MAN7}/pbs_resources.7$(MAN_SUFFIX)
+-	@ln ${PBS_MAN7}/pbs_resources_$(DEFAULT_MAN_RESOURCE_TYPE).7$(MAN_SUFFIX) ${PBS_MAN7}/pbs_resources.7$(MAN_SUFFIX)
++	@rm -f $(DESTDIR)${PBS_MAN7}/pbs_resources.7$(MAN_SUFFIX)
++	@( cd $(DESTDIR)${PBS_MAN7} && ln pbs_resources_$(DEFAULT_MAN_RESOURCE_TYPE).7$(MAN_SUFFIX) pbs_resources.7$(MAN_SUFFIX) )
+ 
+ install8: $(MAN8)
+ 	@echo Installing section 8 man pages
+-	@$(INSTALL) -d -m 755 $(PBS_MAN) && \
+-	$(INSTALL) -d -m 755 $(PBS_MAN8) && \
++	@$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN) && \
++	$(INSTALL) -d -m 755 $(DESTDIR)$(PBS_MAN8) && \
+ 	for t in $?; do \
+ 		tt=`basename $$t B`; \
+-		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \
+-		chmod 644 ${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \
++		${SOELIM} -d $(DOCSRC)/ers $$t | sed -e 's/^\.Sh/.SH/' >$(DESTDIR)${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \
++		chmod 644 $(DESTDIR)${PBS_MAN8}/$${tt}$(MAN_SUFFIX); \
+ 	done
+ 
+ depend::
+diff -urN torque-1.2.0p1.orig/src/cmds/Makefile.in torque-1.2.0p1/src/cmds/Makefile.in
+--- torque-1.2.0p1.orig/src/cmds/Makefile.in	2005-02-07 18:57:06.000000000 -0800
++++ torque-1.2.0p1/src/cmds/Makefile.in	2005-06-30 15:51:45.000000000 -0700
+@@ -135,12 +135,12 @@
+ 	$(PBS_MKDIRS) clients
+ 	$(PBS_MKDIRS) aux
+ 	$(PBS_MKDIRS) default
+-	$(INSTALL) -d -m 755 $(bindir) && \
++	$(INSTALL) -d -m 755 $(DESTDIR)$(bindir) && \
+ 	for f in $(USER) $(OPER) $(ADMN) $(SCRIPTS) ; do \
+-	    $(INSTALL) -m 755 $$f $(bindir)/$$f ; \
++	    $(INSTALL) -m 755 $$f $(DESTDIR)$(bindir)/$$f ; \
+ 	done
+ 	for f in $(SUPP) ; do \
+-	    $(INSTALL) -m 755 $$f $(sbindir)/$$f ; \
++	    $(INSTALL) -m 755 $$f $(DESTDIR)$(sbindir)/$$f ; \
+ 	done
+ 
+ #
+diff -urN torque-1.2.0p1.orig/src/gui/Ccode/Makefile.in torque-1.2.0p1/src/gui/Ccode/Makefile.in
+--- torque-1.2.0p1.orig/src/gui/Ccode/Makefile.in	2005-02-07 18:57:06.000000000 -0800
++++ torque-1.2.0p1/src/gui/Ccode/Makefile.in	2005-06-30 16:03:14.000000000 -0700
+@@ -115,9 +115,9 @@
+ build: $(TARGETS)
+ 
+ install: build
+-	-test -d $(XPBS_LIB)/bin || $(INSTALL) -d $(XPBS_LIB)/bin
++	-test -d $(DESTDIR)$(XPBS_LIB)/bin || $(INSTALL) -d $(DESTDIR)$(XPBS_LIB)/bin
+ 	for f in $(TARGETS); do \
+-	    $(INSTALL) -m 755 $$f $(XPBS_LIB)/bin; \
++	    $(INSTALL) -m 755 $$f $(DESTDIR)$(XPBS_LIB)/bin; \
+ 	done
+ 
+ DFLT_ACTION = $(CC) $(CFLAGS) $@.o -o $@ $(LIBRARIES)
+diff -urN torque-1.2.0p1.orig/src/gui/Makefile.in torque-1.2.0p1/src/gui/Makefile.in
+--- torque-1.2.0p1.orig/src/gui/Makefile.in	2005-02-14 13:46:19.000000000 -0800
++++ torque-1.2.0p1/src/gui/Makefile.in	2005-06-30 15:53:03.000000000 -0700
+@@ -133,34 +133,34 @@
+ 	@MAKE_POSIX_PLUS@@echo Making in Ccode for xpbs; cd Ccode; $(MAKE) all
+ 
+ install: build
+-	test -d $(XPBS_LIB) || $(INSTALL) -m 755 -d $(XPBS_LIB)
+-	test -d $(XPBS_LIB)/bitmaps || $(INSTALL) -m 755 -d $(XPBS_LIB)/bitmaps
+-	test -d $(XPBS_LIB)/help || $(INSTALL) -m 755 -d $(XPBS_LIB)/help
++	test -d $(DESTDIR)$(XPBS_LIB) || $(INSTALL) -m 755 -d $(DESTDIR)$(XPBS_LIB)
++	test -d $(DESTDIR)$(XPBS_LIB)/bitmaps || $(INSTALL) -m 755 -d $(DESTDIR)$(XPBS_LIB)/bitmaps
++	test -d $(DESTDIR)$(XPBS_LIB)/help || $(INSTALL) -m 755 -d $(DESTDIR)$(XPBS_LIB)/help
+ 	#
+ 	for f in $(srcdir)/bitmaps/*; do \
+-	    test -f $$f && $(INSTALL) -m 644 $$f $(XPBS_LIB)/bitmaps; \
++	    test -f $$f && $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBS_LIB)/bitmaps; \
+ 	done
+ 	#
+ 	for f in $(srcdir)/help/*.hlp; do \
+-	    $(INSTALL) -m 644 $$f $(XPBS_LIB)/help; \
++	    $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBS_LIB)/help; \
+ 	done
+ 	#
+ 	@cd Ccode; $(MAKE) install
+ 	#
+ 	for f in $(srcdir)/*.tcl $(srcdir)/*.tk; do \
+-	    $(INSTALL) -m 644 $$f $(XPBS_LIB); \
++	    $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBS_LIB); \
+ 	done
+ 	#
+ 	# install xpbs changing the location of libdir and appdefdir
+ 	#
+ 	@echo Install xpbs
+-	$(INSTALL) -m 755 xpbs $(bindir)/xpbs
++	$(INSTALL) -m 755 xpbs $(DESTDIR)$(bindir)/xpbs
+ 	@chmod 755 $(bindir)/xpbs 2> /dev/null
+ 	#
+-	$(INSTALL) -m 755 buildindex $(XPBS_LIB)
+-	$(INSTALL) -m 644 xpbsrc $(XPBS_LIB)
++	$(INSTALL) -m 755 buildindex $(DESTDIR)$(XPBS_LIB)
++	$(INSTALL) -m 644 xpbsrc $(DESTDIR)$(XPBS_LIB)
+ 	#
+-	cd $(XPBS_LIB) && ./buildindex $(XPBS_LIB) && chmod 644 tclIndex
++	cd $(DESTDIR)$(XPBS_LIB) && ./buildindex $(DESTDIR)$(XPBS_LIB) && chmod 644 tclIndex
+ 
+ 
+ distclean clean::
+diff -urN torque-1.2.0p1.orig/src/iff/Makefile.in torque-1.2.0p1/src/iff/Makefile.in
+--- torque-1.2.0p1.orig/src/iff/Makefile.in	2005-02-07 18:57:06.000000000 -0800
++++ torque-1.2.0p1/src/iff/Makefile.in	2005-06-30 16:13:54.000000000 -0700
+@@ -110,8 +110,8 @@
+ build: $(TARGET)
+ 
+ install: $(TARGET)
+-	@$(INSTALL) -d -m 755 $(sbindir) && \
+-	$(INSTALL) -m 4755 $(TARGET) $(sbindir)
++	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \
++	$(INSTALL) -m 4755 $(TARGET) $(DESTDIR)$(sbindir)
+ 
+ pbs_iff: $(OBJS) $(PBS_LIBS)
+ 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(PBS_LIBS) $(LIBS)
+diff -urN torque-1.2.0p1.orig/src/include/Makefile.in torque-1.2.0p1/src/include/Makefile.in
+--- torque-1.2.0p1.orig/src/include/Makefile.in	2005-02-07 18:57:06.000000000 -0800
++++ torque-1.2.0p1/src/include/Makefile.in	2005-06-30 15:53:38.000000000 -0700
+@@ -146,9 +146,9 @@
+ 
+ 
+ install:
+-	@$(INSTALL) -d -m 755 $(includedir) && \
++	@$(INSTALL) -d -m 755 $(DESTDIR)$(includedir) && \
+ 	for f in $(USERH); do \
+-	    $(INSTALL) -m 444 $$f $(includedir); \
++	    $(INSTALL) -m 444 $$f $(DESTDIR)$(includedir); \
+ 	done
+ 
+ clean::
+diff -urN torque-1.2.0p1.orig/src/mom_rcp/Makefile.in torque-1.2.0p1/src/mom_rcp/Makefile.in
+--- torque-1.2.0p1.orig/src/mom_rcp/Makefile.in	2005-02-07 18:57:06.000000000 -0800
++++ torque-1.2.0p1/src/mom_rcp/Makefile.in	2005-06-30 15:54:04.000000000 -0700
+@@ -111,8 +111,8 @@
+ build: $(TARGET)
+ 
+ install: $(TARGET)
+-	$(INSTALL) -d $(sbindir)
+-	$(INSTALL) -m 4755 $(TARGET) $(sbindir)
++	$(INSTALL) -d $(DESTDIR)$(sbindir)
++	$(INSTALL) -m 4755 $(TARGET) $(DESTDIR)$(sbindir)
+ 
+ $(TARGET): $(OBJS)
+ 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
+diff -urN torque-1.2.0p1.orig/src/resmom/Makefile.in torque-1.2.0p1/src/resmom/Makefile.in
+--- torque-1.2.0p1.orig/src/resmom/Makefile.in	2005-02-07 18:57:07.000000000 -0800
++++ torque-1.2.0p1/src/resmom/Makefile.in	2005-06-30 15:54:21.000000000 -0700
+@@ -142,8 +142,8 @@
+ install: build
+ 	$(PBS_MKDIRS) mom
+ 	$(PBS_MKDIRS) aux
+-	@$(INSTALL) -d -m 755 $(sbindir) && \
+-	$(INSTALL) -m 700 $(TARGET) $(sbindir)
++	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \
++	$(INSTALL) -m 700 $(TARGET) $(DESTDIR)$(sbindir)
+ 
+ pbs_mom: $(OBJS) $(PBSLIBS)
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(PBSLIBS) $(LIBS) $(MOMLIBS)
+diff -urN torque-1.2.0p1.orig/src/scheduler.basl/Makefile.in torque-1.2.0p1/src/scheduler.basl/Makefile.in
+--- torque-1.2.0p1.orig/src/scheduler.basl/Makefile.in	2005-02-07 18:57:07.000000000 -0800
++++ torque-1.2.0p1/src/scheduler.basl/Makefile.in	2005-06-30 15:50:37.000000000 -0700
+@@ -124,10 +124,10 @@
+ build: $(TARGETS)
+ 
+ install: build
+-	$(INSTALL) -d -m 755 $(bindir) &&    \
+-	$(INSTALL) -m 755 basl2c $(bindir) ; \
+-	$(INSTALL) -d -m 755 $(sbindir) &&   \
+-	$(INSTALL) -m 700 pbs_sched $(sbindir)
++	$(INSTALL) -d -m 755 $(DESTDIR)$(bindir) &&    \
++	$(INSTALL) -m 755 basl2c $(DESTDIR)$(bindir) ; \
++	$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) &&   \
++	$(INSTALL) -m 700 pbs_sched $(DESTDIR)$(sbindir)
+ 
+ basl2c: $(OBJS_COMMON) $(OBJS_COMP)
+ 	$(CC) $(CFLAGS) -o $@ $(OBJS_COMMON) $(OBJS_COMP) $(LIBRARIES)
+diff -urN torque-1.2.0p1.orig/src/scheduler.cc/Makefile.in torque-1.2.0p1/src/scheduler.cc/Makefile.in
+--- torque-1.2.0p1.orig/src/scheduler.cc/Makefile.in	2005-02-07 18:57:07.000000000 -0800
++++ torque-1.2.0p1/src/scheduler.cc/Makefile.in	2005-06-30 15:51:13.000000000 -0700
+@@ -123,8 +123,8 @@
+ 
+ install: build
+ 	@MAKE_POSIX_PLUS@@cd $(SCHD_BUILD) && $(MAKE) install
+-	@$(INSTALL) -d -m 755 $(sbindir) && \
+-	$(INSTALL) -m 700 $(TARGET) $(sbindir)
++	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \
++	$(INSTALL) -m 700 $(TARGET) $(DESTDIR)$(sbindir)
+ 
+ $(TARGET): $(OBJS) $(SCHEDLIB)
+ 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(SCHEDLIB) $(PBSLIBS) $(LIBS)
+diff -urN torque-1.2.0p1.orig/src/scheduler.cc/samples/cray_t3e/Makefile.in torque-1.2.0p1/src/scheduler.cc/samples/cray_t3e/Makefile.in
+--- torque-1.2.0p1.orig/src/scheduler.cc/samples/cray_t3e/Makefile.in	2005-02-07 18:57:07.000000000 -0800
++++ torque-1.2.0p1/src/scheduler.cc/samples/cray_t3e/Makefile.in	2005-06-30 17:02:28.000000000 -0700
+@@ -161,11 +161,11 @@
+ 
+ install:: $(TARGET)
+ 	@# a two step process is best to work around broken installs
+-	$(INSTALL) -d $(libdir) && \
+-	$(INSTALL) -m 644 $(TARGET) $(libdir)/$(TARGET)
++	$(INSTALL) -d $(DESTDIR)$(libdir) && \
++	$(INSTALL) -m 644 $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
+ 	@for f in $(SCHD_CONFIGS); do \
+-		test -f $(PBS_SERVER_HOME)/sched_priv/$$f || \
+-		$(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \
++		test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f || \
++		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \
+ 	done
+ 
+ @mk_cleanup@
+diff -urN torque-1.2.0p1.orig/src/scheduler.cc/samples/dec_cluster/Makefile.in torque-1.2.0p1/src/scheduler.cc/samples/dec_cluster/Makefile.in
+--- torque-1.2.0p1.orig/src/scheduler.cc/samples/dec_cluster/Makefile.in	2005-02-07 18:57:07.000000000 -0800
++++ torque-1.2.0p1/src/scheduler.cc/samples/dec_cluster/Makefile.in	2005-06-30 17:02:47.000000000 -0700
+@@ -109,8 +109,8 @@
+ install::
+ 	@echo Installing scheduler config file
+ 	@for f in $(SCHD_CONFIG); do \
+-	    test -f $(PBS_SERVER_HOME)/sched_priv/$$f || \
+-	        $(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \
++	    test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f || \
++	        $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \
+ 	done
+ 
+ @mk_cleanup@
+diff -urN torque-1.2.0p1.orig/src/scheduler.cc/samples/fifo/Makefile.in torque-1.2.0p1/src/scheduler.cc/samples/fifo/Makefile.in
+--- torque-1.2.0p1.orig/src/scheduler.cc/samples/fifo/Makefile.in	2005-02-07 18:57:07.000000000 -0800
++++ torque-1.2.0p1/src/scheduler.cc/samples/fifo/Makefile.in	2005-06-30 17:03:00.000000000 -0700
+@@ -110,8 +110,8 @@
+ install::
+ 	@echo Installing other scheduler config files
+ 	@for f in $(SCHD_CONFIGS); do \
+-	    test -f $(PBS_SERVER_HOME)/sched_priv/$$f || \
+-	        $(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \
++	    test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f || \
++	        $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \
+ 	done
+ 
+ @mk_cleanup@
+diff -urN torque-1.2.0p1.orig/src/scheduler.cc/samples/msic_cluster/Makefile.in torque-1.2.0p1/src/scheduler.cc/samples/msic_cluster/Makefile.in
+--- torque-1.2.0p1.orig/src/scheduler.cc/samples/msic_cluster/Makefile.in	2005-02-07 18:57:07.000000000 -0800
++++ torque-1.2.0p1/src/scheduler.cc/samples/msic_cluster/Makefile.in	2005-06-30 17:03:13.000000000 -0700
+@@ -130,8 +130,8 @@
+ install::
+ 	@echo Installing scheduler config file
+ 	@for f in $(SCHD_CONFIG); do \
+-	    test -f $(PBS_SERVER_HOME)/sched_priv/$$f || \
+-	        $(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \
++	    test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f || \
++	        $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \
+ 	done
+ 
+ @mk_cleanup@
+diff -urN torque-1.2.0p1.orig/src/scheduler.cc/samples/sgi_origin/Makefile.in torque-1.2.0p1/src/scheduler.cc/samples/sgi_origin/Makefile.in
+--- torque-1.2.0p1.orig/src/scheduler.cc/samples/sgi_origin/Makefile.in	2005-02-07 18:57:07.000000000 -0800
++++ torque-1.2.0p1/src/scheduler.cc/samples/sgi_origin/Makefile.in	2005-06-30 17:03:30.000000000 -0700
+@@ -165,11 +165,11 @@
+ 
+ install:: $(TARGET)
+ 	@# a two step process is best to work around broken installs
+-	$(INSTALL) -d $(libdir) && \
+-	$(INSTALL) -m 644 $(TARGET) $(libdir)/$(TARGET)
++	$(INSTALL) -d $(DESTDIR)$(libdir) && \
++	$(INSTALL) -m 644 $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
+ 	@for f in $(SCHD_CONFIGS); do \
+-		test -f $(PBS_SERVER_HOME)/sched_priv/$$f || \
+-		$(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \
++		test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f || \
++		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \
+ 	done
+ 
+ @mk_cleanup@
+diff -urN torque-1.2.0p1.orig/src/scheduler.cc/samples/umn_cluster/Makefile.in torque-1.2.0p1/src/scheduler.cc/samples/umn_cluster/Makefile.in
+--- torque-1.2.0p1.orig/src/scheduler.cc/samples/umn_cluster/Makefile.in	2005-02-07 18:57:07.000000000 -0800
++++ torque-1.2.0p1/src/scheduler.cc/samples/umn_cluster/Makefile.in	2005-06-30 17:03:46.000000000 -0700
+@@ -120,8 +120,8 @@
+ install::
+ 	@echo Installing scheduler config file
+ 	@for f in $(SCHD_CONFIG); do \
+-	    test -f $(PBS_SERVER_HOME)/sched_priv/$$f || \
+-	        $(INSTALL) -m 644 $(srcdir)/$$f $(PBS_SERVER_HOME)/sched_priv; \
++	    test -f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv/$$f || \
++	        $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(PBS_SERVER_HOME)/sched_priv; \
+ 	done
+ 
+ qschedule:
+diff -urN torque-1.2.0p1.orig/src/scheduler.tcl/Makefile.in torque-1.2.0p1/src/scheduler.tcl/Makefile.in
+--- torque-1.2.0p1.orig/src/scheduler.tcl/Makefile.in	2005-02-07 18:57:07.000000000 -0800
++++ torque-1.2.0p1/src/scheduler.tcl/Makefile.in	2005-06-30 15:54:37.000000000 -0700
+@@ -115,8 +115,8 @@
+ 
+ 
+ install: build
+-	@$(INSTALL) -d -m 755 $(sbindir) && \
+-	$(INSTALL) -m 700 $(TARGET) $(sbindir)
++	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \
++	$(INSTALL) -m 700 $(TARGET) $(DESTDIR)$(sbindir)
+ 
+ $(TARGET): $(OBJS)
+ 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBRARIES)
+diff -urN torque-1.2.0p1.orig/src/server/Makefile.in torque-1.2.0p1/src/server/Makefile.in
+--- torque-1.2.0p1.orig/src/server/Makefile.in	2005-02-07 18:57:06.000000000 -0800
++++ torque-1.2.0p1/src/server/Makefile.in	2005-06-30 15:49:27.000000000 -0700
+@@ -168,8 +168,8 @@
+ install: build
+ 	$(PBS_MKDIRS) server
+ 	$(PBS_MKDIRS) aux
+-	@$(INSTALL) -d -m 755 $(sbindir) && \
+-	$(INSTALL) -m 700 $(TARGET) $(sbindir)
++	@$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) && \
++	$(INSTALL) -m 700 $(TARGET) $(DESTDIR)$(sbindir)
+ 
+ pbs_server: $(OBJS) $(PBSLIBS) 
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(PBSLIBS) $(LIBS)
+diff -urN torque-1.2.0p1.orig/src/tools/Makefile.in torque-1.2.0p1/src/tools/Makefile.in
+--- torque-1.2.0p1.orig/src/tools/Makefile.in	2005-02-07 18:57:06.000000000 -0800
++++ torque-1.2.0p1/src/tools/Makefile.in	2005-06-30 15:55:05.000000000 -0700
+@@ -130,9 +130,9 @@
+ build: $(TARGETS)
+ 
+ install: build
+-	test -d $(bindir) || $(INSTALL) -m 755 -d $(bindir)
++	test -d $(bindir) || $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+ 	for f in $(TARGETS); do \
+-		$(INSTALL) -m 755 $$f $(bindir); \
++		$(INSTALL) -m 755 $$f $(DESTDIR)$(bindir); \
+ 	done
+ 	@MAKE_POSIX_PLUS@@if test -n "$(TK_VER)"; then { cd xpbsmon && $(MAKE) install;} ; fi
+ 
+diff -urN torque-1.2.0p1.orig/src/tools/xpbsmon/Makefile.in torque-1.2.0p1/src/tools/xpbsmon/Makefile.in
+--- torque-1.2.0p1.orig/src/tools/xpbsmon/Makefile.in	2005-02-14 13:47:13.000000000 -0800
++++ torque-1.2.0p1/src/tools/xpbsmon/Makefile.in	2005-06-30 15:56:11.000000000 -0700
+@@ -129,33 +129,33 @@
+ 
+ 
+ install: build
+-	test -d $(XPBSMON_LIB) || $(INSTALL) -m 755 -d $(XPBSMON_LIB)
+-	test -d $(XPBSMON_LIB)/bitmaps || \
+-	    $(INSTALL) -m 755 -d $(XPBSMON_LIB)/bitmaps
+-	test -d $(XPBSMON_LIB)/help || \
+-	    $(INSTALL) -m 755 -d $(XPBSMON_LIB)/help
++	test -d $(DESTDIR)$(XPBSMON_LIB) || $(INSTALL) -m 755 -d $(DESTDIR)$(XPBSMON_LIB)
++	test -d $(DESTDIR)$(XPBSMON_LIB)/bitmaps || \
++	    $(INSTALL) -m 755 -d $(DESTDIR)$(XPBSMON_LIB)/bitmaps
++	test -d $(DESTDIR)$(XPBSMON_LIB)/help || \
++	    $(INSTALL) -m 755 -d $(DESTDIR)$(XPBSMON_LIB)/help
+ 	#
+ 	for f in $(srcdir)/bitmaps/*; do \
+-	    test -f $$f && $(INSTALL) -m 644 $$f $(XPBSMON_LIB)/bitmaps; \
++	    test -f $$f && $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBSMON_LIB)/bitmaps; \
+ 	done
+ 	#
+ 	for f in $(srcdir)/help/*.hlp; do \
+-	    $(INSTALL) -m 644 $$f $(XPBSMON_LIB)/help; \
++	    $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBSMON_LIB)/help; \
+ 	done
+ 	#
+ 	for f in $(srcdir)/*.tcl $(srcdir)/*.tk; do \
+-	    $(INSTALL) -m 644 $$f $(XPBSMON_LIB); \
++	    $(INSTALL) -m 644 $$f $(DESTDIR)$(XPBSMON_LIB); \
+ 	done
+ 	#
+ 	# install xpbsmon changing the location of pbs_tclsh and libdir
+ 	#
+-	$(INSTALL) -m 755 xpbsmon $(bindir)/xpbsmon
+-	chmod 755 $(bindir)/xpbsmon 2> /dev/null
++	$(INSTALL) -m 755 xpbsmon $(DESTDIR)$(bindir)/xpbsmon
++	chmod 755 $(DESTDIR)$(bindir)/xpbsmon 2> /dev/null
+ 	#
+-	$(INSTALL) -m 755 buildindex $(XPBSMON_LIB)
+-	$(INSTALL) -m 644 xpbsmonrc $(XPBSMON_LIB)
++	$(INSTALL) -m 755 buildindex $(DESTDIR)$(XPBSMON_LIB)
++	$(INSTALL) -m 644 xpbsmonrc $(DESTDIR)$(XPBSMON_LIB)
+ 	#
+-	cd $(XPBSMON_LIB) && ./buildindex $(XPBSMON_LIB) && chmod 644 tclIndex
++	cd $(DESTDIR)$(XPBSMON_LIB) && ./buildindex $(DESTDIR)$(XPBSMON_LIB) && chmod 644 tclIndex
+ 
+ clean::
+ 	$(RM) tclIndex; exit 0
+--- torque-1.2.0p1/buildutils/pbs_mkdirs.in.old	2005-07-04 17:55:12.000000000 -0700
++++ torque-1.2.0p1/buildutils/pbs_mkdirs.in	2005-07-04 17:57:37.000000000 -0700
+@@ -325,6 +325,7 @@
+         #  if default already exists, leave alone 
+ 
+ 	# solaris fails on '-e', use '-f'
++	PBS_DEFAULT_FILE="${DESTDIR}${PBS_DEFAULT_FILE}"
+ 	if [ ! -f $PBS_DEFAULT_FILE ]; then
+ 	    rm -f $PBS_DEFAULT_FILE > /dev/null 2>&1
+ 	    echo $PBS_DEFAULT_SERVER > $PBS_DEFAULT_FILE && \
+--- torque-1.2.0p1/buildutils/pbs_mkdirs.in.old	2005-07-04 18:02:05.000000000 -0700
++++ torque-1.2.0p1/buildutils/pbs_mkdirs.in	2005-07-04 18:03:56.000000000 -0700
+@@ -189,8 +189,8 @@
+ 		echo $idv_dvarname exists and is not a directory 1>&2
+ 		return 1
+ 	elif [ -d $idv_dname ] ; then
+-		chmod $idv_mode $idv_dname > /dev/null 2>&1
+-		test -n "$idv_owner" && chown $idv_owner $idv_dname > /dev/null 2>&1
++		chmod $idv_mode ${DESTDIR}$idv_dname > /dev/null 2>&1
++		test -n "$idv_owner" && chown $idv_owner ${DESTDIR}$idv_dname > /dev/null 2>&1
+ 		return 0
+ 	elif [ ! -d $idv_dname ] ; then
+ 		test -n "$verbose" && echo Creating $idv_dname
+@@ -208,6 +208,7 @@
+ check_env()
+ {
+ 	test -n "$verbose" && echo Making environment file
++	PBS_ENVIRON="${DESTDIR}${PBS_ENVIRON}"
+ 	if [ ! -f $PBS_ENVIRON ] ; then
+ 		install_dir `dirname $PBS_ENVIRON`
+ 		echo "PATH=/bin:/usr/bin" > $PBS_ENVIRON
diff --git a/sys-cluster/torque/files/digest-torque-1.2.0_p1-r1 b/sys-cluster/torque/files/digest-torque-1.2.0_p1-r1
new file mode 100644
index 000000000000..d072639ecf37
--- /dev/null
+++ b/sys-cluster/torque/files/digest-torque-1.2.0_p1-r1
@@ -0,0 +1 @@
+MD5 7555d85cf2bacda2725e04d1efcf70ff torque-1.2.0p1.tar.gz 2202860
diff --git a/sys-cluster/torque/torque-1.2.0_p1-r1.ebuild b/sys-cluster/torque/torque-1.2.0_p1-r1.ebuild
new file mode 100644
index 000000000000..a3a3549c86d7
--- /dev/null
+++ b/sys-cluster/torque/torque-1.2.0_p1-r1.ebuild
@@ -0,0 +1,64 @@
+# 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-r1.ebuild,v 1.1 2005/07/05 01:11:23 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"
+LICENSE="openpbs"
+
+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 )
+		sys-apps/ed"
+RDEPEND="net-misc/openssh"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	append-ldflags -Wl,-z,now
+
+	unpack ${A}
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PV}-respect-ldflags.patch || die "Failed to fix ldflags"
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PV}-respect-destdir.patch || 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)/torque" \
+		--enable-server \
+		--enable-mom \
+		--enable-clients \
+		--set-server-home=/usr/spool/PBS \
+		--set-environ=/etc/pbs_environment || die "./configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc INSTALL PBS_License.txt README.torque Release_Notes
+	exeinto /etc/init.d ; newexe ${FILESDIR}/pbs.rc pbs
+}