commit:     b9f726a4c8c73356f8abb48e1096dd56d833b123
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 11 02:59:32 2023 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 02:59:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f726a4

sci-libs/dealii: update live ebuild

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

 sci-libs/dealii/dealii-9999.ebuild | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/sci-libs/dealii/dealii-9999.ebuild 
b/sci-libs/dealii/dealii-9999.ebuild
index 3d175695c483..c6d3a65a9086 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -31,7 +31,7 @@ IUSE="
        adolc arborx assimp arpack cgal cpu_flags_x86_avx cpu_flags_x86_avx512f
        cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
        +lapack metis mpi muparser opencascade p4est petsc scalapack slepc
-       +sparse static-libs sundials symengine trilinos
+       +sparse sundials symengine trilinos
 "
 
 # TODO: add slepc use flag once slepc is packaged for gentoo-science
@@ -70,7 +70,12 @@ RDEPEND="dev-libs/boost:=
        sparse? ( sci-libs/umfpack )
        sundials? ( sci-libs/sundials:= )
        symengine? ( >=sci-libs/symengine-0.4:= )
-       trilinos? ( sci-libs/trilinos )"
+       trilinos? ( sci-libs/trilinos )
+       || (
+               dev-cpp/kokkos
+               sci-libs/trilinos
+       )
+       "
 
 DEPEND="${RDEPEND}
        virtual/pkgconfig
@@ -109,7 +114,6 @@ src_configure() {
                -DDEAL_II_WITH_GMSH="$(usex gmsh)"
                -DDEAL_II_WITH_GSL="$(usex gsl)"
                -DDEAL_II_WITH_HDF5="$(usex hdf5)"
-               -DDEAL_II_WITH_KOKKOS="$(usex trilinos)"
                -DDEAL_II_WITH_LAPACK="$(usex lapack)"
                -DDEAL_II_WITH_METIS="$(usex metis)"
                -DDEAL_II_WITH_MPI="$(usex mpi)"
@@ -122,8 +126,6 @@ src_configure() {
                -DDEAL_II_WITH_SUNDIALS="$(usex sundials)"
                -DDEAL_II_WITH_SYMENGINE="$(usex symengine)"
                -DDEAL_II_WITH_UMFPACK="$(usex sparse)"
-               -DBUILD_SHARED_LIBS="$(usex !static-libs)"
-               -DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
                -DDEAL_II_WITH_TBB=ON
                -DDEAL_II_WITH_TASKFLOW=OFF
                -DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
@@ -147,11 +149,6 @@ src_configure() {
                append-cxxflags "-msse2"
        fi
 
-       # Unconditionally enable strict C++17 standard. This is necessary for
-       # USE=cgal and USE=kokkos and safe to set for all presently supported
-       # compilers
-       append-cxxflags "-std=c++17"
-
        cmake_src_configure
 }
 

Reply via email to