| 1 |
commit: 2767c0b87b1a8036ef19966115445956fca8abaa |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 26 01:38:19 2022 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 26 01:38:19 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2767c0b8 |
| 7 |
|
| 8 |
sci-libs/dealii: ebuild maintenance |
| 9 |
|
| 10 |
- update opencascade handling |
| 11 |
- drop version dependency on opencascade |
| 12 |
- remove multilib eclass inherit |
| 13 |
|
| 14 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 15 |
|
| 16 |
sci-libs/dealii/dealii-9.3.1-r4.ebuild | 7 +++---- |
| 17 |
sci-libs/dealii/dealii-9.3.3.ebuild | 7 +++---- |
| 18 |
sci-libs/dealii/dealii-9999.ebuild | 7 +++---- |
| 19 |
3 files changed, 9 insertions(+), 12 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sci-libs/dealii/dealii-9.3.1-r4.ebuild b/sci-libs/dealii/dealii-9.3.1-r4.ebuild |
| 22 |
index 9edb8b2d5a83..fd92a22d5d4f 100644 |
| 23 |
--- a/sci-libs/dealii/dealii-9.3.1-r4.ebuild |
| 24 |
+++ b/sci-libs/dealii/dealii-9.3.1-r4.ebuild |
| 25 |
@@ -8,7 +8,7 @@ EAPI=7 |
| 26 |
# any of these modules: |
| 27 |
CMAKE_REMOVE_MODULES_LIST="" |
| 28 |
|
| 29 |
-inherit cmake flag-o-matic multilib |
| 30 |
+inherit cmake flag-o-matic |
| 31 |
|
| 32 |
DESCRIPTION="Solving partial differential equations with the finite element method" |
| 33 |
HOMEPAGE="https://www.dealii.org/" |
| 34 |
@@ -59,7 +59,7 @@ RDEPEND="dev-libs/boost:= |
| 35 |
) |
| 36 |
mpi? ( virtual/mpi[cxx] ) |
| 37 |
muparser? ( dev-cpp/muParser ) |
| 38 |
- opencascade? ( >=sci-libs/opencascade-7.6.0:= ) |
| 39 |
+ opencascade? ( sci-libs/opencascade:= ) |
| 40 |
p4est? ( sci-libs/p4est[mpi] ) |
| 41 |
petsc? ( sci-mathematics/petsc[mpi=] ) |
| 42 |
scalapack? ( sci-libs/scalapack ) |
| 43 |
@@ -123,9 +123,8 @@ src_configure() { |
| 44 |
-DDEAL_II_WITH_TRILINOS="$(usex trilinos)" |
| 45 |
) |
| 46 |
|
| 47 |
- # Do a little dance for purely cosmetic QA reasons. |
| 48 |
use opencascade && mycmakeargs+=( |
| 49 |
- -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade" |
| 50 |
+ -DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade" |
| 51 |
) |
| 52 |
|
| 53 |
# Do a little dance for purely cosmetic QA reasons. The build system |
| 54 |
|
| 55 |
diff --git a/sci-libs/dealii/dealii-9.3.3.ebuild b/sci-libs/dealii/dealii-9.3.3.ebuild |
| 56 |
index 72eaba883927..22a232df4f6e 100644 |
| 57 |
--- a/sci-libs/dealii/dealii-9.3.3.ebuild |
| 58 |
+++ b/sci-libs/dealii/dealii-9.3.3.ebuild |
| 59 |
@@ -8,7 +8,7 @@ EAPI=7 |
| 60 |
# any of these modules: |
| 61 |
CMAKE_REMOVE_MODULES_LIST="" |
| 62 |
|
| 63 |
-inherit cmake flag-o-matic multilib |
| 64 |
+inherit cmake flag-o-matic |
| 65 |
|
| 66 |
DESCRIPTION="Solving partial differential equations with the finite element method" |
| 67 |
HOMEPAGE="https://www.dealii.org/" |
| 68 |
@@ -59,7 +59,7 @@ RDEPEND="dev-libs/boost:= |
| 69 |
) |
| 70 |
mpi? ( virtual/mpi[cxx] ) |
| 71 |
muparser? ( dev-cpp/muParser ) |
| 72 |
- opencascade? ( >=sci-libs/opencascade-7.6.0:= ) |
| 73 |
+ opencascade? ( sci-libs/opencascade:= ) |
| 74 |
p4est? ( sci-libs/p4est[mpi] ) |
| 75 |
petsc? ( sci-mathematics/petsc[mpi=] ) |
| 76 |
scalapack? ( sci-libs/scalapack ) |
| 77 |
@@ -123,9 +123,8 @@ src_configure() { |
| 78 |
-DDEAL_II_WITH_TRILINOS="$(usex trilinos)" |
| 79 |
) |
| 80 |
|
| 81 |
- # Do a little dance for purely cosmetic QA reasons. |
| 82 |
use opencascade && mycmakeargs+=( |
| 83 |
- -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade" |
| 84 |
+ -DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade" |
| 85 |
) |
| 86 |
|
| 87 |
# Do a little dance for purely cosmetic QA reasons. The build system |
| 88 |
|
| 89 |
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild |
| 90 |
index dd7a675e4e6e..6772cef5a5b6 100644 |
| 91 |
--- a/sci-libs/dealii/dealii-9999.ebuild |
| 92 |
+++ b/sci-libs/dealii/dealii-9999.ebuild |
| 93 |
@@ -8,7 +8,7 @@ EAPI=7 |
| 94 |
# any of these modules: |
| 95 |
CMAKE_REMOVE_MODULES_LIST="" |
| 96 |
|
| 97 |
-inherit cmake flag-o-matic multilib |
| 98 |
+inherit cmake flag-o-matic |
| 99 |
|
| 100 |
DESCRIPTION="Solving partial differential equations with the finite element method" |
| 101 |
HOMEPAGE="https://www.dealii.org/" |
| 102 |
@@ -60,7 +60,7 @@ RDEPEND="dev-libs/boost:= |
| 103 |
) |
| 104 |
mpi? ( virtual/mpi[cxx] ) |
| 105 |
muparser? ( dev-cpp/muParser ) |
| 106 |
- opencascade? ( >=sci-libs/opencascade-7.6.0:= ) |
| 107 |
+ opencascade? ( sci-libs/opencascade:= ) |
| 108 |
p4est? ( sci-libs/p4est[mpi] ) |
| 109 |
petsc? ( sci-mathematics/petsc[mpi=] ) |
| 110 |
scalapack? ( sci-libs/scalapack ) |
| 111 |
@@ -124,9 +124,8 @@ src_configure() { |
| 112 |
-DDEAL_II_WITH_TRILINOS="$(usex trilinos)" |
| 113 |
) |
| 114 |
|
| 115 |
- # Do a little dance for purely cosmetic QA reasons. |
| 116 |
use opencascade && mycmakeargs+=( |
| 117 |
- -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade" |
| 118 |
+ -DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade" |
| 119 |
) |
| 120 |
|
| 121 |
# Do a little dance for purely cosmetic QA reasons. The build system |
Archives