| 1 |
commit: fa05bf27b53d4abb7a79fb6a35fe2054874ce807 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 4 15:39:40 2020 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 4 16:13:13 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa05bf27 |
| 7 |
|
| 8 |
sci-libs/dealii: update live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
| 11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-libs/dealii/dealii-9999.ebuild | 13 ++++--------- |
| 14 |
sci-libs/dealii/metadata.xml | 2 +- |
| 15 |
2 files changed, 5 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild |
| 18 |
index c13b60b4952..e7437c82a96 100644 |
| 19 |
--- a/sci-libs/dealii/dealii-9999.ebuild |
| 20 |
+++ b/sci-libs/dealii/dealii-9999.ebuild |
| 21 |
@@ -31,8 +31,8 @@ SLOT="0" |
| 22 |
IUSE=" |
| 23 |
adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f |
| 24 |
cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 |
| 25 |
- +lapack metis mpi muparser nanoflann opencascade netcdf p4est petsc |
| 26 |
- scalapack slepc +sparse static-libs sundials symengine +tbb trilinos |
| 27 |
+ +lapack metis mpi muparser opencascade p4est petsc |
| 28 |
+ scalapack slepc +sparse static-libs sundials symengine trilinos |
| 29 |
" |
| 30 |
|
| 31 |
# TODO: add slepc use flag once slepc is packaged for gentoo-science |
| 32 |
@@ -44,6 +44,7 @@ REQUIRED_USE=" |
| 33 |
RDEPEND="dev-libs/boost |
| 34 |
app-arch/bzip2 |
| 35 |
sys-libs/zlib |
| 36 |
+ dev-cpp/cpp-taskflow |
| 37 |
adolc? ( sci-libs/adolc ) |
| 38 |
arpack? ( sci-libs/arpack[mpi=] ) |
| 39 |
assimp? ( media-libs/assimp ) |
| 40 |
@@ -56,8 +57,6 @@ RDEPEND="dev-libs/boost |
| 41 |
metis? ( >=sci-libs/parmetis-4 ) |
| 42 |
mpi? ( virtual/mpi ) |
| 43 |
muparser? ( dev-cpp/muParser ) |
| 44 |
- nanoflann? ( sci-libs/nanoflann ) |
| 45 |
- netcdf? ( sci-libs/netcdf-cxx:0 ) |
| 46 |
opencascade? ( sci-libs/opencascade:* ) |
| 47 |
p4est? ( sci-libs/p4est[mpi] ) |
| 48 |
petsc? ( sci-mathematics/petsc[mpi=] ) |
| 49 |
@@ -66,7 +65,6 @@ RDEPEND="dev-libs/boost |
| 50 |
sparse? ( sci-libs/umfpack ) |
| 51 |
sundials? ( <sci-libs/sundials-4:= ) |
| 52 |
symengine? ( >=sci-libs/symengine-0.4:= ) |
| 53 |
- tbb? ( dev-cpp/tbb ) |
| 54 |
trilinos? ( sci-libs/trilinos )" |
| 55 |
|
| 56 |
DEPEND="${RDEPEND} |
| 57 |
@@ -85,7 +83,6 @@ src_configure() { |
| 58 |
-DDEAL_II_PACKAGE_VERSION=9999 |
| 59 |
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF |
| 60 |
-DDEAL_II_ALLOW_AUTODETECTION=OFF |
| 61 |
- -DDEAL_II_ALLOW_BUNDLED=OFF |
| 62 |
-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF |
| 63 |
-DDEAL_II_COMPILE_EXAMPLES=OFF |
| 64 |
-DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html" |
| 65 |
@@ -109,8 +106,6 @@ src_configure() { |
| 66 |
-DDEAL_II_WITH_METIS="$(usex metis)" |
| 67 |
-DDEAL_II_WITH_MPI="$(usex mpi)" |
| 68 |
-DDEAL_II_WITH_MUPARSER="$(usex muparser)" |
| 69 |
- -DDEAL_II_WITH_NANOFLANN="$(usex nanoflann)" |
| 70 |
- -DDEAL_II_WITH_NETCDF="$(usex netcdf)" |
| 71 |
-DOPENCASCADE_DIR="${CASROOT}" |
| 72 |
-DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)" |
| 73 |
-DDEAL_II_WITH_P4EST="$(usex p4est)" |
| 74 |
@@ -122,7 +117,7 @@ src_configure() { |
| 75 |
-DDEAL_II_WITH_UMFPACK="$(usex sparse)" |
| 76 |
-DBUILD_SHARED_LIBS="$(usex !static-libs)" |
| 77 |
-DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)" |
| 78 |
- -DDEAL_II_WITH_THREADS="$(usex tbb)" |
| 79 |
+ -DDEAL_II_WITH_TASKFLOW=ON |
| 80 |
-DDEAL_II_WITH_TRILINOS="$(usex trilinos)" |
| 81 |
) |
| 82 |
|
| 83 |
|
| 84 |
diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml |
| 85 |
index 90bacf01225..cfcb25d9e50 100644 |
| 86 |
--- a/sci-libs/dealii/metadata.xml |
| 87 |
+++ b/sci-libs/dealii/metadata.xml |
| 88 |
@@ -25,10 +25,10 @@ and extra output. If you want to get meaningful backtraces see |
| 89 |
<flag name="gmsh">Add support for gmsh (<pkg>sci-libs/gmsh</pkg>)</flag> |
| 90 |
<flag name="metis">Add support for metis (<pkg>sci-libs/metis</pkg>)</flag> |
| 91 |
<flag name="muparser">Add support for muparser (<pkg>dev-cpp/muParser</pkg>)</flag> |
| 92 |
- <flag name="nanoflann">Adds support for nanoflann (<pkg>sci-libs/nanoflann</pkg>)</flag> |
| 93 |
<flag name="opencascade">Add support for opencascade (<pkg>sci-libs/opencascade</pkg>)</flag> |
| 94 |
<flag name="p4est">Add support for p4est (<pkg>sci-libs/p4est</pkg>)</flag> |
| 95 |
<flag name="petsc">Add support for petsc (<pkg>sci-mathematics/petsc</pkg>)</flag> |
| 96 |
+ <flag name="nanoflann">Adds support for nanoflann (<pkg>sci-libs/nanoflann</pkg>)</flag> |
| 97 |
<flag name="scalapack">Add support for ScaLAPACK (<pkg>sci-libs/scalapack</pkg>)</flag> |
| 98 |
<flag name="slepc">Add support for slepc (<pkg>sci-mathematics/slepc</pkg>)</flag> |
| 99 |
<flag name="sparse">Add support for suitesparse (<pkg>sci-libs/suitesparse</pkg>)</flag> |
Archives