[gentoo-commits] repo/gentoo:master commit in: sci-libs/trilinos/

[Matthias Maier]

commit:     c4b2df23b4a28e62806cf3ee8e082d2b1a73e22f
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 02:57:48 2022 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon May 23 03:01:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b2df23

sci-libs/trilinos: ebuild maintenance

 - fix automagic detection of openmp
 - disable Adelus package

Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 ...ilinos-13.0.1-r2.ebuild => trilinos-13.0.1-r3.ebuild} | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/sci-libs/trilinos/trilinos-13.0.1-r2.ebuild 
b/sci-libs/trilinos/trilinos-13.0.1-r3.ebuild
similarity index 94%
rename from sci-libs/trilinos/trilinos-13.0.1-r2.ebuild
rename to sci-libs/trilinos/trilinos-13.0.1-r3.ebuild
index b4408c0d397a..29c01b3b1752 100644
--- a/sci-libs/trilinos/trilinos-13.0.1-r2.ebuild
+++ b/sci-libs/trilinos/trilinos-13.0.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SLOT="0"
 
 IUSE="
        adolc arprec clp cuda eigen glpk gtest hdf5 hwloc hypre
-       matio metis mkl mumps netcdf petsc qd scalapack scotch sparse
+       matio metis mkl mumps netcdf openmp petsc qd scalapack scotch sparse
        superlu taucs tbb test threads tvmet yaml zlib X
 "
 
@@ -69,6 +69,14 @@ PATCHES=(
        "${WORKDIR}"/patches
 )
 
+pkg_pretend() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 trilinos_conf() {
        local dirs libs d
        for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
@@ -95,11 +103,13 @@ src_configure() {
                -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
                
-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
                -DTrilinos_ENABLE_ALL_PACKAGES=ON
+               -DTrilinos_ENABLE_OpenMP="$(usex openmp)"
                -DTrilinos_ENABLE_PyTrilinos=OFF
-               -DTrilinos_ENABLE_SEACAS=OFF
                -DTrilinos_ENABLE_SEACASChaco=OFF
                -DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
                -DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)"
+               -DTrilinos_ENABLE_SEACAS=OFF
+               -DTrilinos_ENABLE_ADELUS=OFF
                -DTrilinos_ENABLE_TESTS="$(usex test)"
                -DTPL_ENABLE_BinUtils=ON
                -DTPL_ENABLE_BLAS=ON