[gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/

["Kacper Kowalik" <xarthisius@gentoo.org>]

commit:     cef4a93ada7063c58f6d026c73342e97c3966a07
Author:     Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 14 09:46:31 2011 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sun Aug 14 09:46:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cef4a93a

[sys-cluster/openmpi] Add slurm support by Nicolas Bigaouette <nbigaouette <AT> gmail.com>

---
 sys-cluster/openmpi/ChangeLog            |    3 +++
 sys-cluster/openmpi/openmpi-1.5.3.ebuild |   17 ++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 8224a92..3b69a84 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> openmpi-1.5.3.ebuild:
+  Add slurm support by Nicolas Bigaouette <nbigaouette@gmail.com>
+
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> openmpi-1.5.3.ebuild:
   Added fortran-2.eclass support
 

diff --git a/sys-cluster/openmpi/openmpi-1.5.3.ebuild b/sys-cluster/openmpi/openmpi-1.5.3.ebuild
index b69bc6b..6e124ae 100644
--- a/sys-cluster/openmpi/openmpi-1.5.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.5.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.2.4.ebuild,v 1.2 2007/12/13 22:39:53 jsbronder Exp $
 
-EAPI=3
+EAPI=4
 inherit eutils flag-o-matic fortran-2 mpi multilib toolchain-funcs
 
 MY_P=${P/-mpi}
@@ -14,18 +14,21 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v1.5/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cxx elibc_FreeBSD fortran heterogeneous infiniband ipv6 mpi-threads pbs romio threads vt"
+IUSE="+cxx elibc_FreeBSD fortran heterogeneous infiniband ipv6 mpi-threads pbs romio slurm threads vt"
 MPI_UNCLASSED_DEP_STR="
 	vt? (
 		!dev-libs/libotf
 		!app-text/lcdf-typetools
 	)"
 RDEPEND="pbs? ( sys-cluster/torque )
-		infiniband? ( sys-infiniband/libibverbs )
-		elibc_FreeBSD? ( dev-libs/libexecinfo )
-		>=sys-apps/hwloc-1.1.1
-		$(mpi_imp_deplist)"
+	slurm? ( sys-cluster/slurm )
+	infiniband? ( sys-infiniband/libibverbs )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	>=sys-apps/hwloc-1.1.1
+	$(mpi_imp_deplist)"
 DEPEND="${RDEPEND}"
+REQUIRED_USE="pbs? ( !slurm )
+	slurm? ( !pbs )"
 
 pkg_setup() {
 	fortran-2_pkg_setup
@@ -67,7 +70,6 @@ src_configure() {
 		--sysconfdir="${EPREFIX}/etc/${PN}"
 		--enable-pretty-print-stacktrace
 		--enable-orterun-prefix-by-default
-		--without-slurm
 		--with-hwloc=/usr
 		)
 
@@ -94,6 +96,7 @@ src_configure() {
 		$(use_enable romio io-romio) \
 		$(use_enable heterogeneous) \
 		$(use_with pbs tm) \
+		$(use_with slurm) \
 		$(use_enable ipv6) \
 		$(use_with infiniband openib)
 }