[gentoo-commits] proj/sci:master commit in: eclass/

[Christoph Junghans]

commit:     e509b30fbd0e5d72acdc19aa8dcd8027f4acb012
Author:     Justin Bronder <jbronder <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 01:29:49 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 00:09:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e509b30f

mpi:  support required threads and use deps for mpi packages

 eclass/mpi.eclass | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/eclass/mpi.eclass b/eclass/mpi.eclass
index 99685b8..c22940f 100644
--- a/eclass/mpi.eclass
+++ b/eclass/mpi.eclass
@@ -250,12 +250,23 @@ MPI_PKG_USE_CXX="${MPI_PKG_USE_CXX:-0}"
 # This feature requires EAPI 2 style use dependencies
 MPI_PKG_USE_FC="${MPI_PKG_USE_FC:-0}"
 
-
 # @ECLASS-VARIABLE: MPI_PKG_USE_ROMIO
 # @DESCRIPTION: Require a mpi implementation with romio enabled.
 # This feature requires EAPI 2 style use dependencies
 MPI_PKG_USE_ROMIO="${MPI_PKG_USE_ROMIO:-0}"
 
+# @ECLASS-VARIABLE: MPI_PKG_USE_THREADS
+# @DESCRIPTION: Require a mpi implementation with threads enabled.
+# This feature requires EAPI 2 style use dependencies
+MPI_PKG_USE_THREADS="${MPI_PKG_USE_THREADS:-0}"
+
+# @ECLASS-VARIABLE: MPI_PKG_USE_DEPS
+# @DESCRIPTION: Set the use deps for the virtual mpi package
+# directly.  For instance, if set to 'fortran=,threads?' then a dep on
+# virtual/mpi[fortran=,threads?] will be added.
+# This feature requires EAPI 2 style use dependencies
+MPI_PKG_USE_DEPS="${MPI_PKG_USE_DEPS}"
+
 
 # @FUNCTION: mpi_pkg_deplist
 # @USAGE:
@@ -265,13 +276,17 @@ mpi_pkg_deplist() {
        local pn pn2 ver usedeps invalid_imps inval
 
        case "${EAPI}" in
-               2|3|4)
+               2|3|4|5)
                        [[ ${MPI_PKG_USE_CXX} -ne 0 ]] \
                                && usedeps=",cxx"
                        [[ ${MPI_PKG_USE_FC} -ne 0 ]] \
-                               && usedeps="${use_deps},fortran"
+                               && usedeps="${usedeps},fortran"
                        [[ ${MPI_PKG_USE_ROMIO} -ne 0 ]] \
-                               && usedeps="${use_deps},romio"
+                               && usedeps="${usedeps},romio"
+                       [[ "${MPI_PKG_USE_THREADS}" -ne 0 ]] \
+                               && usedeps="${usedeps},threads"
+                       [ -n "${MPI_PKG_USE_DEPS}" ] \
+                               && usedeps="${usedeps},${MPI_PKG_USE_DEPS}"
                        ;;
                *)
                        ;;