Bump. Works with PBS installed to /usr/libdir/pbs/lib, so blocks on older openpbs. May not work on torque 1.x either.

Package-Manager: portage-2.1.2_pre1-r3

9 files changed, 163 insertions, 12 deletions

diff --git a/sys-cluster/maui/ChangeLog b/sys-cluster/maui/ChangeLog
index 761cc23a2c5d..489ae55a2baa 100644
--- a/sys-cluster/maui/ChangeLog
+++ b/sys-cluster/maui/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/maui
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/maui/ChangeLog,v 1.4 2006/09/25 05:56:33 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/maui/ChangeLog,v 1.5 2006/09/26 04:33:09 dberkholz Exp $
+
+*maui-3.2.6_p16 (26 Sep 2006)
+
+  26 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/3.2.6_p16-autoconf-2.60-compat.patch,
+  +files/3.2.6_p16-link-pbs-after-moab.patch,
+  +files/3.2.6_p16-set-pbs-cflags-ldflags.patch, +maui-3.2.6_p16.ebuild:
+  Bump. Works with PBS installed to /usr/libdir/pbs/lib, so blocks on older
+  openpbs. May not work on torque 1.x either.
 
   25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   maui-3.2.6_p13-r1.ebuild:
diff --git a/sys-cluster/maui/Manifest b/sys-cluster/maui/Manifest
index a8fcd5a6d220..aea5f435701a 100644
--- a/sys-cluster/maui/Manifest
+++ b/sys-cluster/maui/Manifest
@@ -1,4 +1,17 @@
-DIST maui-3.2.6p13.tar.gz 883810
+AUX 3.2.6_p16-autoconf-2.60-compat.patch 590 RMD160 46160839c59dc8bf43504fb6358471fc55b6b612 SHA1 7be0dd5845aec81ba8c39275bb00c62ad27f1475 SHA256 0a0594c0cc80adbd04758c2dd4d29b5f1c36596ac1075bce2c7979f3e3210e95
+MD5 ed0eebb50a6be65330c35a4763d21846 files/3.2.6_p16-autoconf-2.60-compat.patch 590
+RMD160 46160839c59dc8bf43504fb6358471fc55b6b612 files/3.2.6_p16-autoconf-2.60-compat.patch 590
+SHA256 0a0594c0cc80adbd04758c2dd4d29b5f1c36596ac1075bce2c7979f3e3210e95 files/3.2.6_p16-autoconf-2.60-compat.patch 590
+AUX 3.2.6_p16-link-pbs-after-moab.patch 842 RMD160 d445a3c73c4e7edf218a76e6128bf03d90001cd9 SHA1 b4569937a4f80f26f167867b47e35f0f76fa63ff SHA256 4509b88c7bf7c17bff510d153614327472f0a93f1446c77e82b2fcbe77cf46ed
+MD5 6dc912695d966f3ff65ca8bc3dd8cf7f files/3.2.6_p16-link-pbs-after-moab.patch 842
+RMD160 d445a3c73c4e7edf218a76e6128bf03d90001cd9 files/3.2.6_p16-link-pbs-after-moab.patch 842
+SHA256 4509b88c7bf7c17bff510d153614327472f0a93f1446c77e82b2fcbe77cf46ed files/3.2.6_p16-link-pbs-after-moab.patch 842
+AUX 3.2.6_p16-set-pbs-cflags-ldflags.patch 792 RMD160 baba9015f4b3a8102d078742f18dff1525dfcd33 SHA1 9a5592a8a2a92f9dfd45a05f1cb2a0c9e7b6e57e SHA256 71f989f594ca5537bc163763b224552a18b69a767e232cf51ff9ed08034137cb
+MD5 03f613210ba9d8145f519ee476804243 files/3.2.6_p16-set-pbs-cflags-ldflags.patch 792
+RMD160 baba9015f4b3a8102d078742f18dff1525dfcd33 files/3.2.6_p16-set-pbs-cflags-ldflags.patch 792
+SHA256 71f989f594ca5537bc163763b224552a18b69a767e232cf51ff9ed08034137cb files/3.2.6_p16-set-pbs-cflags-ldflags.patch 792
+DIST maui-3.2.6p13.tar.gz 883810 RMD160 e712802cf9c39305844e017f604f2f6e0d9dd85d SHA1 ab11473448b085dedfbe5a2cb2caf7ed19762136 SHA256 a13d347c087300e1dd92d48dd7fbdbe54881be4adc89441dbfc53ff85eb8cf7c
+DIST maui-3.2.6p16.tar.gz 900100 RMD160 a5b73924fa56013675b3e7563f2c5a4193a73bcb SHA1 d6acdc8f52056f415a2d566c5fc63d6d0b763f42 SHA256 6b86bd90f9e4339f22fc19e1396a0f4c4f453d0274d711373a993ae3d2bcfffb
 EBUILD maui-3.2.6_p13-r1.ebuild 1173 RMD160 6ab82c25675a70feda0f6856027fc2967665650d SHA1 330e376e010d035ca06988ebe0d1c1eddc349826 SHA256 1bc0608d82dd38000e25f0af57959db2c3c4bd02e3ca6a2fd7dcfdf49315e930
 MD5 0276e7912e617824d26f2f31ecccdf45 maui-3.2.6_p13-r1.ebuild 1173
 RMD160 6ab82c25675a70feda0f6856027fc2967665650d maui-3.2.6_p13-r1.ebuild 1173
@@ -7,17 +20,24 @@ EBUILD maui-3.2.6_p13.ebuild 1213 RMD160 ec5663f8442be6fb5e963eed6b32db2a202dadf
 MD5 f0f83d406a0af7ac1902aedae8b13467 maui-3.2.6_p13.ebuild 1213
 RMD160 ec5663f8442be6fb5e963eed6b32db2a202dadf3 maui-3.2.6_p13.ebuild 1213
 SHA256 89d5818df409627b2cba9e7168ef1fa90586c7811a5936e01a43ce6e398f90aa maui-3.2.6_p13.ebuild 1213
-MISC ChangeLog 861 RMD160 b3e267fc5beec892cca5d56de8711ac80688f989 SHA1 ab855ec326792b646bd72cfe8ea763393c5a0cb6 SHA256 da9fa9dac5e4af42b83bea1201c2b5c56af70d91282f3121753a2b50af2e1055
-MD5 24dc2fd01cd8a31f5b329dddd532a788 ChangeLog 861
-RMD160 b3e267fc5beec892cca5d56de8711ac80688f989 ChangeLog 861
-SHA256 da9fa9dac5e4af42b83bea1201c2b5c56af70d91282f3121753a2b50af2e1055 ChangeLog 861
+EBUILD maui-3.2.6_p16.ebuild 1157 RMD160 9e0ac33c982ceb5dba31199fe09a72544cdd2629 SHA1 28025f7bc742126180030532fc4f6922e26dd229 SHA256 55ad1e2c03ba7b333c3dbc0ad13b49e9835406d5594bef003f870e4af3255717
+MD5 f61ae386af8e348aafdeec641497d8f9 maui-3.2.6_p16.ebuild 1157
+RMD160 9e0ac33c982ceb5dba31199fe09a72544cdd2629 maui-3.2.6_p16.ebuild 1157
+SHA256 55ad1e2c03ba7b333c3dbc0ad13b49e9835406d5594bef003f870e4af3255717 maui-3.2.6_p16.ebuild 1157
+MISC ChangeLog 1236 RMD160 1a7f0c92274171ee64e519e7b184f0bf7fec1d24 SHA1 3aea576276317638b88b698b7df11514a7e8c42b SHA256 cdef8fd5e6d9b3b2560a90491d29be44c61f9261e7b5c404464d454be97eb359
+MD5 8f24f5266110e780c319c4678e588f87 ChangeLog 1236
+RMD160 1a7f0c92274171ee64e519e7b184f0bf7fec1d24 ChangeLog 1236
+SHA256 cdef8fd5e6d9b3b2560a90491d29be44c61f9261e7b5c404464d454be97eb359 ChangeLog 1236
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
 MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160
 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 metadata.xml 160
 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9 metadata.xml 160
-MD5 fde8f44cd269994249e50cb6d3440901 files/digest-maui-3.2.6_p13 65
-RMD160 8a7873986d1e88685eeadd60f20020f669d4c0e9 files/digest-maui-3.2.6_p13 65
-SHA256 1ad3d772c00f7fe39ff233936c0e8a168c85b45ebd4ed0010983ef23e94bb172 files/digest-maui-3.2.6_p13 65
-MD5 fde8f44cd269994249e50cb6d3440901 files/digest-maui-3.2.6_p13-r1 65
-RMD160 8a7873986d1e88685eeadd60f20020f669d4c0e9 files/digest-maui-3.2.6_p13-r1 65
-SHA256 1ad3d772c00f7fe39ff233936c0e8a168c85b45ebd4ed0010983ef23e94bb172 files/digest-maui-3.2.6_p13-r1 65
+MD5 cba30436cbbafe831c492f5b0a190a6b files/digest-maui-3.2.6_p13 241
+RMD160 4383afa155886093a204c29b1bf1742723ed9c6b files/digest-maui-3.2.6_p13 241
+SHA256 ef51c154d7876d6e102261fe2de7bfdd4958873dd142f2c56cb4222ec6e6181a files/digest-maui-3.2.6_p13 241
+MD5 cba30436cbbafe831c492f5b0a190a6b files/digest-maui-3.2.6_p13-r1 241
+RMD160 4383afa155886093a204c29b1bf1742723ed9c6b files/digest-maui-3.2.6_p13-r1 241
+SHA256 ef51c154d7876d6e102261fe2de7bfdd4958873dd142f2c56cb4222ec6e6181a files/digest-maui-3.2.6_p13-r1 241
+MD5 cbc8c4e489f07f959d7b66604d0edc77 files/digest-maui-3.2.6_p16 241
+RMD160 89e19e946e4d8c57ebedf9af634757a90476d1d2 files/digest-maui-3.2.6_p16 241
+SHA256 aacccdf928cfcfdb9b51c4f44eabe2074782973b69288e0183d2509360993521 files/digest-maui-3.2.6_p16 241
diff --git a/sys-cluster/maui/files/3.2.6_p16-autoconf-2.60-compat.patch b/sys-cluster/maui/files/3.2.6_p16-autoconf-2.60-compat.patch
new file mode 100644
index 000000000000..e22453dc0b1b
--- /dev/null
+++ b/sys-cluster/maui/files/3.2.6_p16-autoconf-2.60-compat.patch
@@ -0,0 +1,17 @@
+--- maui-3.2.6p16.orig/Makefile.in	2006-05-23 15:20:49.000000000 -0700
++++ maui-3.2.6p16/Makefile.in	2006-09-25 20:42:24.000000000 -0700
+@@ -18,7 +18,13 @@
+ # ============================
+ # Resource Manager section
+ # ============================
+-@ll_definitions@@sdr_definitions@@pbs_definitions@@sge_definitions@@lsf_definitions@@mx_definitions@@pcre_definitions@
++@ll_definitions@
++@sdr_definitions@
++@pbs_definitions@
++@sge_definitions@
++@lsf_definitions@
++@mx_definitions@
++@pcre_definitions@
+ 
+ # ============================
+ # Master Makefile for @PACKAGE_NAME@-@PACKAGE_VERSION@
diff --git a/sys-cluster/maui/files/3.2.6_p16-link-pbs-after-moab.patch b/sys-cluster/maui/files/3.2.6_p16-link-pbs-after-moab.patch
new file mode 100644
index 000000000000..a4675abe304a
--- /dev/null
+++ b/sys-cluster/maui/files/3.2.6_p16-link-pbs-after-moab.patch
@@ -0,0 +1,25 @@
+--- maui-3.2.6p16.orig/src/server/Makefile	2006-09-25 16:08:33.000000000 -0700
++++ maui-3.2.6p16/src/server/Makefile	2006-09-25 21:12:47.000000000 -0700
+@@ -88,11 +88,11 @@
+ 	$(CC) $(IP) $(DEFS) $(CFLAGS) $(SOURCE) -c $<
+ 
+ $(SERVER): $(SOBJECTS)
+-	$(LD) $(SOBJECTS) -o $(BIN)/$@ $(LP) $(LIBS) $(OSLDFLAGS) 
++	$(LD) $(SOBJECTS) -o $(BIN)/$@ $(LIBS) $(LP) $(OSLDFLAGS) 
+ 	chmod 711 $(BIN)/$@ || true
+ 
+ mclient: mclient.o
+-	$(LD) mclient.o -o $(BIN)/$@ $(OSLDFLAGS) $(LP) $(LIBS)     
++	$(LD) mclient.o -o $(BIN)/$@ $(OSLDFLAGS) $(LIBS) $(LP)    
+ 	chmod 751 $(BIN)/$@
+ 	for i in $(MCLIENTS); do \
+ 	  ln -f $(BIN)/$@ $(BIN)/$$i; \
+@@ -100,7 +100,7 @@
+ 	done
+ 
+ mprof:  $(POBJECTS)
+-	$(LD) $(POBJECTS) -o $(BIN)/$@ $(OSLDFLAGS) $(LP) $(LIBS)     
++	$(LD) $(POBJECTS) -o $(BIN)/$@ $(OSLDFLAGS) $(LIBS) $(LP)    
+ 	chmod 751 $(BIN)/$@
+ 
+ clean:
diff --git a/sys-cluster/maui/files/3.2.6_p16-set-pbs-cflags-ldflags.patch b/sys-cluster/maui/files/3.2.6_p16-set-pbs-cflags-ldflags.patch
new file mode 100644
index 000000000000..7455350a0dc0
--- /dev/null
+++ b/sys-cluster/maui/files/3.2.6_p16-set-pbs-cflags-ldflags.patch
@@ -0,0 +1,26 @@
+--- maui-3.2.6p16.orig/configure.ac	2006-09-25 16:08:33.000000000 -0700
++++ maui-3.2.6p16/configure.ac	2006-09-25 21:29:17.000000000 -0700
+@@ -149,13 +149,19 @@
+ 	else
+ 		AC_MSG_ERROR([Only one Resource Manager can be specified (PBS, $RMTYPE)])
+ 	fi
+-	if test "$OS" = "OSF"; then
+-		PBSLIBS="$PBSTARGETDIR/ilib/libnet.a -lpbs"
++	if pbs-config --cflags 1>/dev/null 2>&1;then
++		PBSCFLAGS=`pbs-config --cflags`
+ 	else
+-		PBSLIBS="-lnet -lpbs"
++		PBSCFLAGS=-I$PBSTARGETDIR/include
+ 	fi
++	if pbs-config --libs 1>/dev/null 2>&1;then
++		PBSLDFLAGS=`pbs-config --libs`
++	else
++		PBSLDFLAGS="-L$PBSTARGETDIR/lib -lnet -lpbs"
++	fi
++	AC_SUBST(PBSCFLAGS)
++	AC_SUBST(PBSLDFLAGS)
+ 	AC_SUBST(PBSTARGETDIR)
+-	AC_SUBST(PBSLIBS)
+ 	AC_SUBST_FILE(pbs_definitions)
+ 	pbs_definitions=include/Makefile.inc.pbs
+ fi
diff --git a/sys-cluster/maui/files/digest-maui-3.2.6_p13 b/sys-cluster/maui/files/digest-maui-3.2.6_p13
index 908a4a6baf89..5192daf5109e 100644
--- a/sys-cluster/maui/files/digest-maui-3.2.6_p13
+++ b/sys-cluster/maui/files/digest-maui-3.2.6_p13
@@ -1 +1,3 @@
 MD5 b330867069ded056f2cf33253fd34c7b maui-3.2.6p13.tar.gz 883810
+RMD160 e712802cf9c39305844e017f604f2f6e0d9dd85d maui-3.2.6p13.tar.gz 883810
+SHA256 a13d347c087300e1dd92d48dd7fbdbe54881be4adc89441dbfc53ff85eb8cf7c maui-3.2.6p13.tar.gz 883810
diff --git a/sys-cluster/maui/files/digest-maui-3.2.6_p13-r1 b/sys-cluster/maui/files/digest-maui-3.2.6_p13-r1
index 908a4a6baf89..5192daf5109e 100644
--- a/sys-cluster/maui/files/digest-maui-3.2.6_p13-r1
+++ b/sys-cluster/maui/files/digest-maui-3.2.6_p13-r1
@@ -1 +1,3 @@
 MD5 b330867069ded056f2cf33253fd34c7b maui-3.2.6p13.tar.gz 883810
+RMD160 e712802cf9c39305844e017f604f2f6e0d9dd85d maui-3.2.6p13.tar.gz 883810
+SHA256 a13d347c087300e1dd92d48dd7fbdbe54881be4adc89441dbfc53ff85eb8cf7c maui-3.2.6p13.tar.gz 883810
diff --git a/sys-cluster/maui/files/digest-maui-3.2.6_p16 b/sys-cluster/maui/files/digest-maui-3.2.6_p16
new file mode 100644
index 000000000000..bde967cb9c4f
--- /dev/null
+++ b/sys-cluster/maui/files/digest-maui-3.2.6_p16
@@ -0,0 +1,3 @@
+MD5 7f0da58f1dabb8343538506ac0a47895 maui-3.2.6p16.tar.gz 900100
+RMD160 a5b73924fa56013675b3e7563f2c5a4193a73bcb maui-3.2.6p16.tar.gz 900100
+SHA256 6b86bd90f9e4339f22fc19e1396a0f4c4f453d0274d711373a993ae3d2bcfffb maui-3.2.6p16.tar.gz 900100
diff --git a/sys-cluster/maui/maui-3.2.6_p16.ebuild b/sys-cluster/maui/maui-3.2.6_p16.ebuild
new file mode 100644
index 000000000000..fe34c3b6122d
--- /dev/null
+++ b/sys-cluster/maui/maui-3.2.6_p16.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/maui/maui-3.2.6_p16.ebuild,v 1.1 2006/09/26 04:33:09 dberkholz Exp $
+
+inherit autotools eutils multilib
+
+DESCRIPTION="Maui Cluster Scheduler"
+HOMEPAGE="http://www.clusterresources.com/products/maui/"
+SRC_URI="http://www.clusterresources.com/downloads/maui/${P/_/}.tar.gz"
+IUSE=""
+DEPEND="virtual/pbs
+	!<sys-cluster/openpbs-2.3.16-r4"
+RDEPEND="${DEPEND}
+		 virtual/libc"
+SLOT="0"
+LICENSE="maui"
+KEYWORDS="~x86 ~amd64"
+RESTRICT="fetch nomirror"
+
+S="${WORKDIR}/${P/_/}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-set-pbs-cflags-ldflags.patch
+	epatch "${FILESDIR}"/${PV}-autoconf-2.60-compat.patch
+	epatch "${FILESDIR}"/${PV}-link-pbs-after-moab.patch
+	sed -i \
+		-e "s~BUILDROOT=~BUILDROOT=${D}~" \
+		"${S}"/Makefile.in
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--with-spooldir=/usr/spool/maui \
+		--with-pbs=/usr/$(get_libdir)/pbs \
+		|| die "econf failed!"
+	emake || die "emake failed!"
+}
+
+src_install() {
+	make install INST_DIR=${D}/usr
+
+	cd docs
+	dodoc README mauidocs.html
+}