commit: 2767c0b87b1a8036ef19966115445956fca8abaa Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Thu May 26 01:38:19 2022 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Thu May 26 01:38:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2767c0b8
sci-libs/dealii: ebuild maintenance - update opencascade handling - drop version dependency on opencascade - remove multilib eclass inherit Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> sci-libs/dealii/dealii-9.3.1-r4.ebuild | 7 +++---- sci-libs/dealii/dealii-9.3.3.ebuild | 7 +++---- sci-libs/dealii/dealii-9999.ebuild | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/sci-libs/dealii/dealii-9.3.1-r4.ebuild b/sci-libs/dealii/dealii-9.3.1-r4.ebuild index 9edb8b2d5a83..fd92a22d5d4f 100644 --- a/sci-libs/dealii/dealii-9.3.1-r4.ebuild +++ b/sci-libs/dealii/dealii-9.3.1-r4.ebuild @@ -8,7 +8,7 @@ EAPI=7 # any of these modules: CMAKE_REMOVE_MODULES_LIST="" -inherit cmake flag-o-matic multilib +inherit cmake flag-o-matic DESCRIPTION="Solving partial differential equations with the finite element method" HOMEPAGE="https://www.dealii.org/"; @@ -59,7 +59,7 @@ RDEPEND="dev-libs/boost:= ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) - opencascade? ( >=sci-libs/opencascade-7.6.0:= ) + opencascade? ( sci-libs/opencascade:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) @@ -123,9 +123,8 @@ src_configure() { -DDEAL_II_WITH_TRILINOS="$(usex trilinos)" ) - # Do a little dance for purely cosmetic QA reasons. use opencascade && mycmakeargs+=( - -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade" + -DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade" ) # Do a little dance for purely cosmetic QA reasons. The build system diff --git a/sci-libs/dealii/dealii-9.3.3.ebuild b/sci-libs/dealii/dealii-9.3.3.ebuild index 72eaba883927..22a232df4f6e 100644 --- a/sci-libs/dealii/dealii-9.3.3.ebuild +++ b/sci-libs/dealii/dealii-9.3.3.ebuild @@ -8,7 +8,7 @@ EAPI=7 # any of these modules: CMAKE_REMOVE_MODULES_LIST="" -inherit cmake flag-o-matic multilib +inherit cmake flag-o-matic DESCRIPTION="Solving partial differential equations with the finite element method" HOMEPAGE="https://www.dealii.org/"; @@ -59,7 +59,7 @@ RDEPEND="dev-libs/boost:= ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) - opencascade? ( >=sci-libs/opencascade-7.6.0:= ) + opencascade? ( sci-libs/opencascade:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) @@ -123,9 +123,8 @@ src_configure() { -DDEAL_II_WITH_TRILINOS="$(usex trilinos)" ) - # Do a little dance for purely cosmetic QA reasons. use opencascade && mycmakeargs+=( - -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade" + -DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade" ) # Do a little dance for purely cosmetic QA reasons. The build system diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild index dd7a675e4e6e..6772cef5a5b6 100644 --- a/sci-libs/dealii/dealii-9999.ebuild +++ b/sci-libs/dealii/dealii-9999.ebuild @@ -8,7 +8,7 @@ EAPI=7 # any of these modules: CMAKE_REMOVE_MODULES_LIST="" -inherit cmake flag-o-matic multilib +inherit cmake flag-o-matic DESCRIPTION="Solving partial differential equations with the finite element method" HOMEPAGE="https://www.dealii.org/"; @@ -60,7 +60,7 @@ RDEPEND="dev-libs/boost:= ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) - opencascade? ( >=sci-libs/opencascade-7.6.0:= ) + opencascade? ( sci-libs/opencascade:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) @@ -124,9 +124,8 @@ src_configure() { -DDEAL_II_WITH_TRILINOS="$(usex trilinos)" ) - # Do a little dance for purely cosmetic QA reasons. use opencascade && mycmakeargs+=( - -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade" + -DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade" ) # Do a little dance for purely cosmetic QA reasons. The build system
