| 1 |
commit: ab9cc6472cc0c8e661e494f13cc5c91f8fd5a339 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 2 05:37:00 2021 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 2 06:50:03 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9cc647 |
| 7 |
|
| 8 |
sci-libs/dealii: update live ebuild |
| 9 |
|
| 10 |
- fix dependency |
| 11 |
- migrate away from cmake-utils.eclass |
| 12 |
|
| 13 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
| 14 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 15 |
|
| 16 |
sci-libs/dealii/dealii-9999.ebuild | 20 +++++++++++++++----- |
| 17 |
1 file changed, 15 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild |
| 20 |
index 61619c7dc3d..341f45931fb 100644 |
| 21 |
--- a/sci-libs/dealii/dealii-9999.ebuild |
| 22 |
+++ b/sci-libs/dealii/dealii-9999.ebuild |
| 23 |
@@ -3,7 +3,7 @@ |
| 24 |
|
| 25 |
EAPI=7 |
| 26 |
|
| 27 |
-inherit cmake-utils multilib |
| 28 |
+inherit cmake multilib |
| 29 |
|
| 30 |
# deal.II uses its own FindLAPACK.cmake file that calls into the system |
| 31 |
# FindLAPACK.cmake module and does additional internal setup. Do not remove |
| 32 |
@@ -40,10 +40,16 @@ REQUIRED_USE=" |
| 33 |
slepc? ( petsc ) |
| 34 |
trilinos? ( mpi )" |
| 35 |
|
| 36 |
+# FIXME: The opencascade-7.5.1 ebuild uses a new file system layout where |
| 37 |
+# the names of the correct include and library directories are not easily |
| 38 |
+# accessible. Just fix the version for the time being. |
| 39 |
+CAS_VERSION=7.5.1 |
| 40 |
+ |
| 41 |
RDEPEND="dev-libs/boost |
| 42 |
app-arch/bzip2 |
| 43 |
sys-libs/zlib |
| 44 |
dev-cpp/cpp-taskflow |
| 45 |
+ dev-cpp/tbb |
| 46 |
adolc? ( sci-libs/adolc ) |
| 47 |
arpack? ( sci-libs/arpack[mpi=] ) |
| 48 |
assimp? ( media-libs/assimp ) |
| 49 |
@@ -56,7 +62,7 @@ RDEPEND="dev-libs/boost |
| 50 |
metis? ( >=sci-libs/parmetis-4 ) |
| 51 |
mpi? ( virtual/mpi ) |
| 52 |
muparser? ( dev-cpp/muParser ) |
| 53 |
- opencascade? ( sci-libs/opencascade:* ) |
| 54 |
+ opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= ) |
| 55 |
p4est? ( sci-libs/p4est[mpi] ) |
| 56 |
petsc? ( sci-mathematics/petsc[mpi=] ) |
| 57 |
scalapack? ( sci-libs/scalapack ) |
| 58 |
@@ -116,12 +122,16 @@ src_configure() { |
| 59 |
-DDEAL_II_WITH_UMFPACK="$(usex sparse)" |
| 60 |
-DBUILD_SHARED_LIBS="$(usex !static-libs)" |
| 61 |
-DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)" |
| 62 |
+ -DDEAL_II_WITH_TBB=ON |
| 63 |
-DDEAL_II_WITH_TASKFLOW=ON |
| 64 |
-DDEAL_II_WITH_TRILINOS="$(usex trilinos)" |
| 65 |
) |
| 66 |
|
| 67 |
# Do a little dance for purely cosmetic "QA" reasons. |
| 68 |
- use opencascade && mycmakeargs+=( -DOPENCASCADE_DIR="${CASROOT}" ) |
| 69 |
+ use opencascade && mycmakeargs+=( |
| 70 |
+ -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade-${CAS_VERSION}" |
| 71 |
+ -DOPENCASCADE_INCLUDE_DIR="${CASROOT}/include/opencascade-${CAS_VERSION}" |
| 72 |
+ ) |
| 73 |
|
| 74 |
# Do a little dance for purely cosmetic "QA" reasons. The build system |
| 75 |
# does query for the highest instruction set first and skips the other |
| 76 |
@@ -134,7 +144,7 @@ src_configure() { |
| 77 |
mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes ) |
| 78 |
fi |
| 79 |
|
| 80 |
- cmake-utils_src_configure |
| 81 |
+ cmake_src_configure |
| 82 |
} |
| 83 |
|
| 84 |
src_install() { |
| 85 |
@@ -147,7 +157,7 @@ src_install() { |
| 86 |
's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \ |
| 87 |
"${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed" |
| 88 |
fi |
| 89 |
- cmake-utils_src_install |
| 90 |
+ cmake_src_install |
| 91 |
|
| 92 |
# decompress the installed example sources: |
| 93 |
use examples && docompress -x /usr/share/doc/${PF}/examples |
Archives