Version bumped. Reorganized patches, added new patch. Closes #113172.

Package-Manager: portage-2.1_pre2

9 files changed, 117 insertions, 60 deletions

diff --git a/sys-cluster/openpbs/ChangeLog b/sys-cluster/openpbs/ChangeLog
index b965e1539e28..eab2cc128e6c 100644
--- a/sys-cluster/openpbs/ChangeLog
+++ b/sys-cluster/openpbs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/openpbs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openpbs/ChangeLog,v 1.20 2005/09/05 13:26:52 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openpbs/ChangeLog,v 1.21 2005/12/29 00:35:44 tantive Exp $
+
+*openpbs-2.3.16-r3 (29 Dec 2005)
+
+  29 Dec 2005; Michael Imhof <tantive@gentoo.org>
+  +files/openpbs-2.3.16-errno-fixup.patch,
+  -files/openpbs-2.3.16-r1-errno-fixup.patch, +files/openpbs-gcc32.patch,
+  -files/openpbs-2.3.16-r2-errno-fixup.patch, openpbs-2.3.16-r1.ebuild,
+  openpbs-2.3.16-r2.ebuild, +openpbs-2.3.16-r3.ebuild:
+  Version bumped. Reorganized patches, added new patch. Closes #113172.
 
   05 Sep 2005; Michael Imhof <tantive@gentoo.org>
   +files/openpbs-2.3.16-r2-errno-fixup.patch, openpbs-2.3.16-r1.ebuild,
diff --git a/sys-cluster/openpbs/Manifest b/sys-cluster/openpbs/Manifest
index c1ededb4f73a..fc1447bb300d 100644
--- a/sys-cluster/openpbs/Manifest
+++ b/sys-cluster/openpbs/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
-MD5 fd8e8f95c74945f84d9c5318f6c3c24f openpbs-2.3.16-r1.ebuild 2238
-MD5 2ee291121aa126f00f15b0f2794590ea ChangeLog 2804
-MD5 2d8a496fec89f313c73085a241bb9cdc openpbs-2.3.16-r2.ebuild 2311
-MD5 b0aa1dcd6dafcc6dc4f45dbceb41d6a1 files/pbs.rc 2255
+MD5 62a2c56da2cc98ee2a6350d3a20b3e6f ChangeLog 3205
 MD5 49fb3f2f647a254c00afde279a3bd724 files/digest-openpbs-2.3.16-r1 67
-MD5 ae564f0950612dba4e6fea5b2b8e8065 files/openpbs-2.3.16-r1-errno-fixup.patch 1212
-MD5 26475a5f76dd888dfbc3b5fa49f7238a files/makedepend-sh-gcc3.patch 549
-MD5 9e55c4fa7219df24902d986e5b485bb0 files/openpbs-2.3.16-r2-errno-fixup.patch 1212
 MD5 49fb3f2f647a254c00afde279a3bd724 files/digest-openpbs-2.3.16-r2 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDHEgnKtJO8LeSoosRAn08AJ4orgVws+AMSNsXvNJxRNbthgCFhQCfU0Mn
-gcazqycf1e36YY4r7PVdniQ=
-=nCHS
------END PGP SIGNATURE-----
+MD5 49fb3f2f647a254c00afde279a3bd724 files/digest-openpbs-2.3.16-r3 67
+MD5 26475a5f76dd888dfbc3b5fa49f7238a files/makedepend-sh-gcc3.patch 549
+MD5 8bac0d7e9a355ce743ef9557a96c8798 files/openpbs-2.3.16-errno-fixup.patch 1209
+MD5 b91fe9abd830fd429cc275b6eebb872d files/openpbs-gcc32.patch 284
+MD5 b0aa1dcd6dafcc6dc4f45dbceb41d6a1 files/pbs.rc 2255
+MD5 41664043c4624dedcfeeb07950f08d13 metadata.xml 312
+MD5 cfaa20aba3dbcf6937c040e874165d17 openpbs-2.3.16-r1.ebuild 2246
+MD5 f085829b794e5f73beb27612c853b34c openpbs-2.3.16-r2.ebuild 2319
+MD5 1e0929b916d1f3354fdaee837150754b openpbs-2.3.16-r3.ebuild 2360
diff --git a/sys-cluster/openpbs/files/digest-openpbs-2.3.16-r3 b/sys-cluster/openpbs/files/digest-openpbs-2.3.16-r3
new file mode 100644
index 000000000000..2918ceafa227
--- /dev/null
+++ b/sys-cluster/openpbs/files/digest-openpbs-2.3.16-r3
@@ -0,0 +1 @@
+MD5 42be627d513839a2daf258692b0092aa OpenPBS_2_3_16.tar.gz 1307483
diff --git a/sys-cluster/openpbs/files/openpbs-2.3.16-r1-errno-fixup.patch b/sys-cluster/openpbs/files/openpbs-2.3.16-errno-fixup.patch
index 9bc646ed9e16..2578c77839cb 100644
--- a/sys-cluster/openpbs/files/openpbs-2.3.16-r1-errno-fixup.patch
+++ b/sys-cluster/openpbs/files/openpbs-2.3.16-errno-fixup.patch
@@ -14,7 +14,7 @@ diff -urN src-old/scheduler.basl/af_resmom.c src/scheduler.basl/af_resmom.c
 --- src-old/scheduler.basl/af_resmom.c	2003-07-30 17:04:56.000000000 -0500
 +++ src/scheduler.basl/af_resmom.c	2003-07-30 17:04:00.000000000 -0500
 @@ -103,7 +103,7 @@
- static char ident[] = "@(#) $RCSfile: openpbs-2.3.16-r1-errno-fixup.patch,v $ $Revision: 1.1 $";
+ static char ident[] = "@(#) $RCSfile: openpbs-2.3.16-errno-fixup.patch,v $ $Revision: 1.1 $";
  
  /* External Variables */
 -extern int errno;
diff --git a/sys-cluster/openpbs/files/openpbs-2.3.16-r2-errno-fixup.patch b/sys-cluster/openpbs/files/openpbs-2.3.16-r2-errno-fixup.patch
deleted file mode 100644
index 4c308261036f..000000000000
--- a/sys-cluster/openpbs/files/openpbs-2.3.16-r2-errno-fixup.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN src-old/lib/Liblog/pbs_log.c src/lib/Liblog/pbs_log.c
---- src-old/lib/Liblog/pbs_log.c	2003-07-30 17:04:55.000000000 -0500
-+++ src/lib/Liblog/pbs_log.c	2003-07-30 17:04:00.000000000 -0500
-@@ -109,7 +109,7 @@
- 
- /* Global Data */
- 
--extern int errno;
-+#include <errno.h>
- char log_buffer[LOG_BUF_SIZE];
- char log_directory[_POSIX_PATH_MAX/2];
- 
-diff -urN src-old/scheduler.basl/af_resmom.c src/scheduler.basl/af_resmom.c
---- src-old/scheduler.basl/af_resmom.c	2003-07-30 17:04:56.000000000 -0500
-+++ src/scheduler.basl/af_resmom.c	2003-07-30 17:04:00.000000000 -0500
-@@ -103,7 +103,7 @@
- static char ident[] = "@(#) $RCSfile: openpbs-2.3.16-r2-errno-fixup.patch,v $ $Revision: 1.1 $";
- 
- /* External Variables */
--extern int errno;
-+#include <errno.h>
- 
- /* External Functions */
- extern int
-diff -urN src-old/server/svr_connect.c src/server/svr_connect.c
---- src-old/server/svr_connect.c	2003-07-30 17:04:56.000000000 -0500
-+++ src/server/svr_connect.c	2003-07-30 17:04:00.000000000 -0500
-@@ -113,7 +113,7 @@
- 
- struct connect_handle connection[PBS_NET_MAX_CONNECTIONS]; /* used by API */
- 
--extern int		 errno;
-+#include <errno.h>
- 
- extern int		 pbs_errno;
- extern unsigned int	 pbs_server_port_dis;
diff --git a/sys-cluster/openpbs/files/openpbs-gcc32.patch b/sys-cluster/openpbs/files/openpbs-gcc32.patch
new file mode 100644
index 000000000000..096cf1fb0b5d
--- /dev/null
+++ b/sys-cluster/openpbs/files/openpbs-gcc32.patch
@@ -0,0 +1,8 @@
+--- OpenPBS_2_3_16/buildutils/exclude_script	1998-10-14 23:46:20.000000000 +0100
++++ OpenPBS_2_3_16-patched/buildutils/exclude_script	2003-02-17 13:46:22.000000000 +0000
+@@ -1,3 +1,5 @@
+ / \/usr\/include\//d
+ / \/usr\/local\/lib\//d
+ / \/gcc-lib\//d
++/ \<built-in>//d
++/ \<command//d
diff --git a/sys-cluster/openpbs/openpbs-2.3.16-r1.ebuild b/sys-cluster/openpbs/openpbs-2.3.16-r1.ebuild
index ef52d43bb4ab..1fc4d8b41c33 100644
--- a/sys-cluster/openpbs/openpbs-2.3.16-r1.ebuild
+++ b/sys-cluster/openpbs/openpbs-2.3.16-r1.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/openpbs/openpbs-2.3.16-r1.ebuild,v 1.13 2005/09/05 13:26:52 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openpbs/openpbs-2.3.16-r1.ebuild,v 1.14 2005/12/29 00:35:45 tantive Exp $
 
 inherit eutils
 
@@ -37,7 +37,7 @@ src_unpack() {
 	# apply a patch I made for gcc3. 
 	# maybe this should be done with sed but I'm too lazy
 	epatch ${FILESDIR}/makedepend-sh-gcc3.patch
-	epatch ${FILESDIR}/${PF}-errno-fixup.patch
+	epatch ${FILESDIR}/openpbs-${PV}-errno-fixup.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 buildutils
diff --git a/sys-cluster/openpbs/openpbs-2.3.16-r2.ebuild b/sys-cluster/openpbs/openpbs-2.3.16-r2.ebuild
index 8e12b32e6200..5432fa764d59 100644
--- a/sys-cluster/openpbs/openpbs-2.3.16-r2.ebuild
+++ b/sys-cluster/openpbs/openpbs-2.3.16-r2.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/openpbs/openpbs-2.3.16-r2.ebuild,v 1.2 2005/09/05 13:26:52 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openpbs/openpbs-2.3.16-r2.ebuild,v 1.3 2005/12/29 00:35:45 tantive Exp $
 
 inherit eutils
 
@@ -40,7 +40,7 @@ src_unpack() {
 	# apply a patch I made for gcc3. 
 	# maybe this should be done with sed but I'm too lazy
 	epatch ${FILESDIR}/makedepend-sh-gcc3.patch
-	epatch ${FILESDIR}/${PF}-errno-fixup.patch
+	epatch ${FILESDIR}/openpbs-${PV}-errno-fixup.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 buildutils
diff --git a/sys-cluster/openpbs/openpbs-2.3.16-r3.ebuild b/sys-cluster/openpbs/openpbs-2.3.16-r3.ebuild
new file mode 100644
index 000000000000..f5a4013dc961
--- /dev/null
+++ b/sys-cluster/openpbs/openpbs-2.3.16-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openpbs/openpbs-2.3.16-r3.ebuild,v 1.1 2005/12/29 00:35:45 tantive Exp $
+
+inherit eutils
+
+NAME="${P/openpbs-/OpenPBS_}"
+NAME="${NAME//./_}"
+DESCRIPTION="The Portable Batch System (PBS) is a flexible batch queuing and workload management system"
+HOMEPAGE="http://www.openpbs.org/"
+SRC_URI="${NAME}.tar.gz"
+
+LICENSE="openpbs"
+PROVIDE="virtual/pbs"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="X tcltk crypt doc"
+RESTRICT="fetch"
+
+PROVIDE="virtual/pbs"
+DEPEND="virtual/libc
+		X? ( virtual/x11 )
+		tcltk? ( dev-lang/tcl )
+		!virtual/pbs"
+RDEPEND="${DEPEND}
+		crypt? ( net-misc/openssh )"
+PDEPEND="sys-cluster/openpbs-common"
+
+S="${WORKDIR}/${NAME}"
+
+pkg_nofetch() {
+	einfo "Please visit http://www.openpbs.org/."
+	einfo "You must register to download the archive."
+	einfo "Place ${A} in ${DISTDIR}."
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# apply a patch I made for gcc3. 
+	# maybe this should be done with sed but I'm too lazy
+	epatch ${FILESDIR}/makedepend-sh-gcc3.patch
+	epatch ${FILESDIR}/openpbs-${PV}-errno-fixup.patch
+	epatch ${FILESDIR}/openpbs-gcc32.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 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 crypt && myconf="${myconf} --with-scp"
+	use doc && myconf="${myconf} --enable-docs"
+
+	./configure ${myconf} \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--enable-server \
+		--enable-clients \
+		--set-server-home=/var/spool/PBS \
+		--set-environ=/etc/pbs_environment \
+		--enable-mom  || die "./configure failed"
+
+	make || die
+}
+
+src_install() {
+	make prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		PBS_SERVER_HOME=${D}/var/spool/PBS \
+		install || die
+
+	dodoc INSTALL PBS_License.text Read.Me Release_Notes
+}