diff options
| -rw-r--r-- | sys-cluster/torque/ChangeLog | 11 | ||||
| -rw-r--r-- | sys-cluster/torque/Manifest | 9 | ||||
| -rw-r--r-- | sys-cluster/torque/files/1.2.0_p1-respect-ldflags.patch | 60 | ||||
| -rw-r--r-- | sys-cluster/torque/files/digest-torque-1.2.0_p1 | 1 | ||||
| -rw-r--r-- | sys-cluster/torque/torque-1.0.1-r6.ebuild | 4 | ||||
| -rw-r--r-- | sys-cluster/torque/torque-1.2.0_p1.ebuild | 71 |
6 files changed, 149 insertions, 7 deletions
diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog index 349ec13f0e56..129b7a85a80b 100644 --- a/sys-cluster/torque/ChangeLog +++ b/sys-cluster/torque/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-cluster/torque -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.6 2004/08/08 00:41:24 slarti Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.7 2005/02/20 09:40:02 spyderous Exp $ + +*torque-1.2.0_p1 (20 Feb 2005) + + 20 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>; + +files/1.2.0_p1-respect-ldflags.patch, +torque-1.2.0_p1.ebuild: + (#74483) Version bump. Also cleaned up the ebuild a bit and silenced QA + warnings about lazily bound suid binaries. 08 Aug 2004; Tom Martin <slarti@gentoo.org> torque-1.0.1-r6.ebuild: Typo in DESCRIPTION: queueing -> queuing. Bug 59717. diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 5e05ab8e5259..14d8c8d6e0f1 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -1,4 +1,7 @@ -MD5 179bb10b73731199bf911e3a113359aa ChangeLog 997 -MD5 4db87296d01ff06f754bfc1bb5989025 torque-1.0.1-r6.ebuild 1849 -MD5 aa9daa3694ffc472849365fdda73b0f9 files/pbs.rc 2138 +MD5 21c70d42849232abea4c8879f39756f8 ChangeLog 1273 +MD5 36da8365261951c8ea73a22748ba3614 torque-1.0.1-r6.ebuild 1852 +MD5 8793a7d52ddfd3bbf47ab3d9f40ef88a torque-1.2.0_p1.ebuild 2039 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 e26e30bb1e82820df08330a7a9755aae files/1.2.0_p1-respect-ldflags.patch 2709 diff --git a/sys-cluster/torque/files/1.2.0_p1-respect-ldflags.patch b/sys-cluster/torque/files/1.2.0_p1-respect-ldflags.patch new file mode 100644 index 000000000000..8bdab247646e --- /dev/null +++ b/sys-cluster/torque/files/1.2.0_p1-respect-ldflags.patch @@ -0,0 +1,60 @@ +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-02-20 00:54:58.444042744 -0800 +@@ -114,7 +114,7 @@ + $(INSTALL) -m 4755 $(TARGET) $(sbindir) + + pbs_iff: $(OBJS) $(PBS_LIBS) +- $(CC) $(CFLAGS) -o $@ $(OBJS) $(PBS_LIBS) $(LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(PBS_LIBS) $(LIBS) + + @mk_cleanup@ + @mk_tail@ +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-02-20 00:55:10.253247472 -0800 +@@ -115,7 +115,7 @@ + $(INSTALL) -m 4755 $(TARGET) $(sbindir) + + $(TARGET): $(OBJS) +- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS) + + + # needed for make depend +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-02-20 01:11:02.760444368 -0800 +@@ -133,7 +133,7 @@ + $(CC) $(CFLAGS) -o $@ $(OBJS_COMMON) $(OBJS_COMP) $(LIBRARIES) + + pbs_sched: $(OBJS_COMMON) $(OBJS_SCHED) +- $(CC) $(CFLAGS) -o $@ $(OBJS_COMMON) $(OBJS_SCHED) $(LIBRARIES) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS_COMMON) $(OBJS_SCHED) $(LIBRARIES) + + pbs_sched.o: $(SCHD_SRC) $(srcdir)/af_system.h $(srcdir)/af_server.h basl2c + @if expr $(SCHD_SRC) : '.*\.basl$$' > /dev/null 2>&1; then \ +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-02-20 01:11:17.845151144 -0800 +@@ -127,7 +127,7 @@ + $(INSTALL) -m 700 $(TARGET) $(sbindir) + + $(TARGET): $(OBJS) $(SCHEDLIB) +- $(CC) $(CFLAGS) -o $@ $(OBJS) $(SCHEDLIB) $(PBSLIBS) $(LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(SCHEDLIB) $(PBSLIBS) $(LIBS) + + distclean:: + -(cd $(SCHD_BUILD) && $(MAKE) $@; exit 0) > /dev/null 2>&1 +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-02-20 01:11:37.748125432 -0800 +@@ -119,7 +119,7 @@ + $(INSTALL) -m 700 $(TARGET) $(sbindir) + + $(TARGET): $(OBJS) +- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBRARIES) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBRARIES) + + @mk_cleanup@ + @mk_tail@ diff --git a/sys-cluster/torque/files/digest-torque-1.2.0_p1 b/sys-cluster/torque/files/digest-torque-1.2.0_p1 new file mode 100644 index 000000000000..d072639ecf37 --- /dev/null +++ b/sys-cluster/torque/files/digest-torque-1.2.0_p1 @@ -0,0 +1 @@ +MD5 7555d85cf2bacda2725e04d1efcf70ff torque-1.2.0p1.tar.gz 2202860 diff --git a/sys-cluster/torque/torque-1.0.1-r6.ebuild b/sys-cluster/torque/torque-1.0.1-r6.ebuild index 510ee37ec6c3..ce31bc80b43c 100644 --- a/sys-cluster/torque/torque-1.0.1-r6.ebuild +++ b/sys-cluster/torque/torque-1.0.1-r6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# 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.7 2004/08/08 00:41:24 slarti Exp $ +# $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'` diff --git a/sys-cluster/torque/torque-1.2.0_p1.ebuild b/sys-cluster/torque/torque-1.2.0_p1.ebuild new file mode 100644 index 000000000000..7c695ae37db6 --- /dev/null +++ b/sys-cluster/torque/torque-1.2.0_p1.ebuild @@ -0,0 +1,71 @@ +# 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 $ + +inherit flag-o-matic + +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" + +DEPEND="virtual/libc + X? ( virtual/x11 ) + tcltk? ( dev-lang/tcl )" +RDEPEND="net-misc/openssh" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + append-ldflags -Wl,-z,now + + unpack ${A} + epatch ${FILESDIR}/${PV}-respect-ldflags.patch + + # 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 + 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 +} + +src_compile() { +# local myconf +# use X || myconf="--disable-gui" +# use tcltk && myconf="${myconf} --with-tcl" +# use doc && myconf="${myconf} --enable-docs" + +# ./configure ${myconf} \ + ./configure \ + $(use_enable X gui) \ + $(use_with tcltk tcl) \ + $(use_enable doc docs) \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-server \ + --enable-mom \ + --enable-clients \ + --set-server-home=/usr/spool/PBS \ + --set-environ=/etc/pbs_environment || die "./configure failed" + + emake || die +} + +src_install() { + make prefix=${D}/usr \ + mandir=${D}/usr/share/man \ + PBS_SERVER_HOME=${D}/usr/spool/PBS \ + install || die + + dodoc INSTALL PBS_License.txt README.torque Release_Notes + exeinto /etc/init.d ; newexe ${FILESDIR}/pbs.rc pbs +} |