6 files changed, 72 insertions, 40 deletions
diff --git a/sys-cluster/maui/ChangeLog b/sys-cluster/maui/ChangeLog
index aa592fe566ef..4c7d1ba2dd65 100644
--- a/sys-cluster/maui/ChangeLog
+++ b/sys-cluster/maui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/maui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/maui/ChangeLog,v 1.21 2011/06/30 08:28:12 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/maui/ChangeLog,v 1.22 2011/07/03 23:19:35 alexxy Exp $
+
+*maui-3.3.1-r2 (03 Jul 2011)
+
+  03 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> -maui-3.3.1-r1.ebuild,
+  +maui-3.3.1-r2.ebuild, files/maui.initd:
+  Add slurm || pbs support to maui
 
   30 Jun 2011; Kacper Kowalik <xarthisius@gentoo.org> maui-3.3.1-r1.ebuild:
   maui->PN, fix order of vars
diff --git a/sys-cluster/maui/Manifest b/sys-cluster/maui/Manifest
index 8664ff99cbb1..264e870b03c6 100644
--- a/sys-cluster/maui/Manifest
+++ b/sys-cluster/maui/Manifest
@@ -6,7 +6,7 @@ AUX 3.2.6_p16-link-pbs-after-moab.patch 842 RMD160 d445a3c73c4e7edf218a76e6128bf
 AUX 3.2.6_p16-set-pbs-cflags-ldflags.patch 792 RMD160 baba9015f4b3a8102d078742f18dff1525dfcd33 SHA1 9a5592a8a2a92f9dfd45a05f1cb2a0c9e7b6e57e SHA256 71f989f594ca5537bc163763b224552a18b69a767e232cf51ff9ed08034137cb
 AUX 3.2.6_p21-autoconf-2.60-compat.patch 476 RMD160 85ccd551828eb0d969feb78cda69595135d22357 SHA1 e5d7ae9b7bf24d281ae3356829672cf6e447bce9 SHA256 52847580ae728a650c9812d017323d2ca9b2ee8b60fb4a81e8c6d68f213156c0
 AUX maui-3.2.6_p21-pbs-nodefile.patch 554 RMD160 9a9f86f35f12d6ad72b3387f8ee70f4a17aaf2c9 SHA1 b908d56184616b30468fbecd8f2ef19b05eb4925 SHA256 3030b9fcdffdb67fca02e691206cfe0acbbcadd5427cbdf05bb903fec6a9f02e
-AUX maui.initd 1077 RMD160 e915fb11e6056b89ab3b6544746e739cd7e3afb4 SHA1 134b25a591236679d63fb20ff7feb69ce3809661 SHA256 ccfe9ec04a60b0296a968cfbc5d3dee8f9b4097d318fd0356e645ce269647466
+AUX maui.initd 584 RMD160 ed101f6f6ceba7556cf58dbd6fd07fbc598f29a5 SHA1 9a12e3d567c6805287fa448cd390a5a2a6b9f048 SHA256 360c1a9b9cf43732bf2e71f7acfd94f3e5769941f22265a7d0a070aeae967879
 DIST maui-3.2.6p16.tar.gz 900100 RMD160 a5b73924fa56013675b3e7563f2c5a4193a73bcb SHA1 d6acdc8f52056f415a2d566c5fc63d6d0b763f42 SHA256 6b86bd90f9e4339f22fc19e1396a0f4c4f453d0274d711373a993ae3d2bcfffb
 DIST maui-3.2.6p21.tar.gz 990182 RMD160 ed2b88575332e2f7ecfa537930c66720dd75dc16 SHA1 554c0a38ed089430843dcfaf4bb8e22c8f487a99 SHA256 929ffa51aa753f58bcc62de9876c23677895742f63511c2df4b0048b9353b27e
 DIST maui-3.3.1.tar.gz 901179 RMD160 9636cf3c215fd25cfd4ad3a5a782b36df592e2bb SHA1 1bb926c701adafb0bdda1c3c253c324b6809b81e SHA256 033a1ab40da69bc091ce5d01199ac599de0b6bbdfa404b9b1631ee964dc711a1
@@ -14,16 +14,24 @@ DIST maui-3.3.tar.gz 898673 RMD160 cef44d21b40d7635d435664f3fa5293b36d98d19 SHA1
 EBUILD maui-3.2.6_p16.ebuild 1115 RMD160 353cfc2bdd5dc082dd4035467129c8423be40e22 SHA1 be7f93efd04dfd51ab00af70044c44dd7dea5129 SHA256 88714ec89a2102cdce55a34ba1de8763a23b7795a7ecc2f121b4547781729ec9
 EBUILD maui-3.2.6_p21-r1.ebuild 1177 RMD160 959a17528590b7c401a9aa8bcf50786c54b0c6f3 SHA1 0ba91ab883468bfba5b25a9c1eee8c51c0ac26ce SHA256 293263ba0181cfd0e6585ff158209b6008234b4fc08313c736d4b276b8957224
 EBUILD maui-3.2.6_p21.ebuild 1044 RMD160 5a49f5ab1483caeb34ba87ca733ff8a30ceee895 SHA1 2a361d30dee84391897e91953c2976e5cd557b49 SHA256 4aefd6e7889d28777f4fae27728fbd0bd6e80fdf2f4210eec6e6aa99086dbe80
-EBUILD maui-3.3.1-r1.ebuild 1194 RMD160 6ae0fce01c61b03c21cab9648189a9f7ac9e88fd SHA1 9abbff9188224a850b96f826c9ad6f4e9bff1a94 SHA256 e1df62351fa14d72af25dad7a23b2f441078a8f7eb0eed7761d3050003634158
+EBUILD maui-3.3.1-r2.ebuild 1353 RMD160 e46d438da749e4c8702801304892fa9252d882f3 SHA1 04da309015425b5508c8afc9ca75acc7428dec2e SHA256 eebf8d6ae48ec22e3efdfecd8ce9f2ccc758331d5c16b05352e3db0b83c65342
 EBUILD maui-3.3.ebuild 1235 RMD160 699b0248a7a1215d088e16d6c61508efb81b49e2 SHA1 a0f2cfbc6846ebec43a7a800ef57c3f2f87f9c3d SHA256 256b31b6ce1339a3d967562fb30253256ddd88d632e016ca2cc76f26ba5f76af
-MISC ChangeLog 3370 RMD160 6877cbacabff80051337128eebd69eef611ded94 SHA1 8442a0071c9c39d4ecbb53a3477c395abf43cae2 SHA256 4b7a03b7c1c538aa2117c8d34b07e1ac5dc70fa8a59cb241a80e5621cba34f53
-MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
+MISC ChangeLog 3549 RMD160 1ef5468e4766aa5a0c9cc052cac262ebfe3ab11a SHA1 e949be538c5d7be466d88962dfe493a9ef22dd2f SHA256 066c07600a9c41013affda4b67a4fe81a423ded9ae4220b548a6d7f8663f58c6
+MISC metadata.xml 278 RMD160 bae9594437848a5170c1e5b1d6d0e408e26bdccc SHA1 1906ae3c9ed1bb671da07b243df4908cf3174773 SHA256 cd5c812a3eb46f603a10f9aec07bb6e155e174825fb367faa2e7b5bc7a1b7403
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk4MM6gACgkQIiMqcbOVdxTaEwP/UTfORxTKJMMs1ZZss3pkxwBx
-+87h8Jgsn9hWLgQVpBY1ADDRHVFH4FT3lzu5vVOK2xYXSFl3tZBpEq1bD5g62Uvi
-5d32jR1+MaC404Zjdevx/DSFfpwokYlf7dyzM4DapwJxCT8tuaz2+jde0/qidcoF
-NQJfTy2WBhzaWGNhIdQ=
-=wR4w
+iQIcBAEBCAAGBQJOEPj8AAoJEOf+E+/4L5LmND8QAISCMr53kDY1NzhrXPP/eraE
+9fMcPXvVczm3os6v1J1EaA+cfQ7IW3YtsgFcje0E8gj8N10oWCiSrlfQ6znQ6sxR
+EDbVyeSdGeSzRetWdAl/LLGPdEEY+V3+mSW4bV3IoaRtGKI/YIxw9aVbxWQKzCxA
+NS4ApAlgIGp4L4ySl4hzpNAh8zb5/ncEqcG6HC0Ct9Xj5jlBcXwHex+Didci7sNS
+Z53o6TsXQK80VqHkLvNnCOhwj3F0qnA2MRrkn00+9OKkAlgWlhBkmrckW8aW1lzy
+SadFKHklJvsM//sCd+ASHg8tStjAn3RVjRCiR4wjOfYad9+jLTkNY0eqO4PV0N9K
+v6zx03q5fput/EtmYWBtR3725GeJC02MEYnJNTuascWUucBjLZ5Laa5QxE45tzU6
+vo24Qk5Pc0Y8wE7ol/45DKX+AnG58NUIRCV04GQqVeGOYaAxWAUmH0OsXtp1Ce2x
+Ocf2repA/X4fkUNrJWWe4D08aKH1AIemJyyVNTjbZIo4lRHVB3LdW3cn9p1zIclt
+K5hOw7fTZswOBkUcuD5VPG8nDnZgKRCBRBgqEXKD11Ng0vTWGg4SGZxYBJvXuNSe
+EEk4suQoksCNOlb3Dh2C3bZE+qAHQNrjFgmJ6EmaqNRXg2iF7UXqobo9VgKySvRh
+5nZ8wpWc1GOjjdl35yjQ
+=yEuo
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/maui/files/maui.initd b/sys-cluster/maui/files/maui.initd
index 0bfce8a267ec..b8d747e1c4b8 100644
--- a/sys-cluster/maui/files/maui.initd
+++ b/sys-cluster/maui/files/maui.initd
@@ -1,38 +1,17 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/maui/files/maui.initd,v 1.2 2011/06/29 16:15:04 alexxy Exp $
-
-. /etc/conf.d/torque 
-PBS_SERVER_HOME="$(. /etc/env.d/25torque; echo ${PBS_SERVER_HOME})"
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/maui/files/maui.initd,v 1.3 2011/07/03 23:19:35 alexxy Exp $
 
 depend() {
     need net
-    after pbs_server
-    before pbs_mom
+    after pbs_server slurmctld
+    before pbs_mom slurmd
     after logger
 }
 
-checkconfig() {
-    for i in "server_name"; do
-        if [ ! -e ${PBS_SERVER_HOME}/${i} ]; then
-            eerror "Missing config file ${PBS_SERVER_HOME}/${i}"
-            return 1
-        fi
-    done
-
-    if [ -z "$(grep 'queue_type' ${PBS_SERVER_HOME}/server_priv/queues/*)" ]; then
-        eerror "No queues have been defined yet."
-        return 1
-    fi
-}
-
 start() {
-    checkconfig || return 1
-	
     ebegin "Starting Maui scheduler"
-    local extra_args=""
-
     start-stop-daemon --start --exec /usr/sbin/maui 
     eend ${?}		
 }
diff --git a/sys-cluster/maui/maui-3.3.1-r1.ebuild b/sys-cluster/maui/maui-3.3.1-r2.ebuild
index d04ad58fb639..1ef2aeb762fc 100644
--- a/sys-cluster/maui/maui-3.3.1-r1.ebuild
+++ b/sys-cluster/maui/maui-3.3.1-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/maui/maui-3.3.1-r1.ebuild,v 1.3 2011/06/30 08:28:12 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/maui/maui-3.3.1-r2.ebuild,v 1.1 2011/07/03 23:19:35 alexxy Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit autotools eutils multilib
 
@@ -13,9 +13,13 @@ SRC_URI="http://www.adaptivecomputing.com/download/${PN}/${P}.tar.gz"
 LICENSE="maui"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
+IUSE="pbs slurm"
 
-DEPEND="sys-cluster/torque"
+REQUIRED_USE="^^ ( pbs slurm )"
+
+DEPEND="
+	pbs? ( sys-cluster/torque )
+	slurm? ( sys-cluster/slurm )"
 RDEPEND="${DEPEND}"
 
 RESTRICT="fetch mirror"
@@ -28,9 +32,12 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconf
+	use pbs && myconf="--with-pbs="${EPREFIX}"/usr"
+	use slurm && myconf="--with-wiki"
 	econf \
 		--with-spooldir="${EPREFIX}"/var/spool/${PN} \
-		--with-pbs="${EPREFIX}"/usr
+		${myconf}
 }
 
 src_install() {
diff --git a/sys-cluster/maui/metadata.xml b/sys-cluster/maui/metadata.xml
index 348e6c4de815..3d65f12cae0c 100644
--- a/sys-cluster/maui/metadata.xml
+++ b/sys-cluster/maui/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+	<herd>cluster</herd>
+	<use>
+		<flag name='pbs'>Enable pbs integration</flag>
+		<flag name='slurm'>Enable slurm integration</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
new file mode 100644
index 000000000000..4687f1fd4a7c
--- /dev/null
+++ b/sys-cluster/slurm/Manifest
@@ -0,0 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX slurm.confd 135 RMD160 06c96613c42ec09d4a21ef3bf6334026e89d9838 SHA1 0f5ed287f8a6f7280ccf977dae8388811484bc34 SHA256 3cfc9c56046911d3e77214e35fbf6a5ffc153eb2205b2158986abbb111a49433
+AUX slurmctld.initd 1115 RMD160 2ac8fbf379c4ea5cf6b49d238b029de7ebe4d337 SHA1 3f8346cf3c0bd612e96f82dde75089442325344f SHA256 8753d99b93bde96580b411a33e40b7553908ac6b4499c5ddb748894df6388368
+AUX slurmd.initd 1081 RMD160 ab242c27063e75de12018e63c23c592d20994450 SHA1 16882746d0d74abc23ea7f42815c2a4ec6cd0f3c SHA256 fc2ff1456fcd71ca77e194df12769f844faf0eda676c8ba2e14864c4db7667b5
+AUX slurmdbd.initd 1000 RMD160 db8015c3faba28e1e3142b87ec8704e596957c93 SHA1 24374dae5d4091a55e5f3b28783dc28e6c080061 SHA256 17dc0b649b68dc89f0a94be04611eb40c5be1572124252bd48cecadb6ef6316b
+DIST slurm-2.2.7.tar.bz2 4454740 RMD160 37ee3ef3382e3ca00cff99901020825bbf0c0b03 SHA1 b5e62504f31007f593d6ce6d90415579273a7b0f SHA256 8dfd8ec1b447caa1c8d83817a90414e19bc5b8cc9caf2c7ec4b6d2cb6bcd0a7e
+EBUILD slurm-2.2.7.ebuild 3729 RMD160 c80ca1cc15384e418b37ae9a8589fa1b7fcbb6d3 SHA1 7ae1daf57ddc3b3f7f1f9f1f5afbb95cb5176739 SHA256 ead1857cbae1490a0b3031458decd35f1d035902b63750fe1e8bed41fcdcdc00
+MISC ChangeLog 432 RMD160 d8d7d2caa3879d0032c94213e551108759133b9f SHA1 2dfbc43939b59a253b90326c0e420fc3d34cea3c SHA256 ab8433ed3e60f206c2c6ad7f796e8fa3a39d31ae42b0eb4ba57066674a72ff79
+MISC metadata.xml 435 RMD160 ea0b8b3d7047969d1bd596705c6f3d0490903302 SHA1 8eb1331ae5fb6244de0f0c5c14f896866f92d1a6 SHA256 395334498b0744fc79cfc01ff81cb71836698bacd73b412fdf3c6a4f3c082c6b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOEPndAAoJEOf+E+/4L5LmlLEP/0pCDQctfAgKRaQMPSW8BDvD
+rmSqxj5MBvVwyxvCfdP7dOsGICCFdv8E++5KjPRknB5lWXmTjAqLyIJnQ5XcJsCX
+nzVtZ7ir/VUGzb3NOMyu4rtBLOIvSQY1eclBs0Q6Fi7eS32xyOctORqcE7nkoEzz
+Mosj/PtCvpKs5cvu7v3BBTnIunM33Zkra9BNXZNwDTfi3M0s1JN/nwFwbyAN+eZB
+xlsxfszzMeEwQFUKcaYSYLW9eM7XA54ay81Gwf4d/Qh12O1YIMgejlUMGSlpo8E5
+Ul5qFJggsNER55+/hdRaq3M62PhXtefVBnyw0GUGPpi9Fw6c8wLMAB28XEczvBzO
+AFTzlTPSwQ1ybvDMTp90x/7JVEhF85EHvPKbwz2IrLPNSG3xA2GiJwsRrHXcRPpF
+Jp+phlHKv2ulnEUZ0AdQ6IVBI20Gc//+ij1aSMIcEyTqsrVbuJnYBztLdty1q3xE
+9DfQ+TDko7r4vjzwNnxGgBvILxVM67fze1fAZo+8mlxnl+bIdSxofQo26Yz4Pv/C
+3AanJFLeTIh38yZ8fWDSEpEFyUNpeQ5okt+ELf++UOY04QwMEX4T8hzBJK8gTAxp
+s/KghLXHuZayESj25mxA6PTPVffvDYhMMZg6Mro4fTTqJelieg4hjJ+y3AuMIUjK
+euneV58qdVb2Zutar7vd
+=E/Yw
+-----END PGP SIGNATURE-----