commit:     09becb405464e5c6411fb43899ec9016914d0672
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Fri Jun  3 10:23:23 2022 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 05:49:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09becb40

sci-libs/gmsh: clean and fix USE flags

Signed-off-by: Fabio Rossi <rossi.f <AT> inwind.it>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sci-libs/gmsh/gmsh-4.10.3.ebuild | 43 +++++++++++++++++++++++++++++++++-------
 sci-libs/gmsh/metadata.xml       | 18 +++++++++++------
 2 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/sci-libs/gmsh/gmsh-4.10.3.ebuild b/sci-libs/gmsh/gmsh-4.10.3.ebuild
index 139dbbd52704..d99cb533e574 100644
--- a/sci-libs/gmsh/gmsh-4.10.3.ebuild
+++ b/sci-libs/gmsh/gmsh-4.10.3.ebuild
@@ -15,22 +15,43 @@ LICENSE="GPL-3 free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 ## cgns is not compiling ATM, maybe fix cgns lib first
-IUSE="blas cgns examples jpeg med metis mpi netgen opencascade petsc png 
python shared X zlib"
+IUSE="+alglib blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen 
opencascade petsc pdf png python shared slepc X voro zlib"
 
-REQUIRED_USE="med? ( mpi )"
+REQUIRED_USE="
+       ^^ ( blas eigen )
+       mumps? ( blas )
+       slepc? ( petsc )
+       "
 
 RDEPEND="
        virtual/fortran
        X? ( x11-libs/fltk:1[xft] )
-       blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
-       cgns? ( sci-libs/cgnslib )
+       alglib? ( sci-libs/alglib )
+       blas? (
+               virtual/blas
+               virtual/lapack
+               sci-libs/fftw:3.0
+       )
+       cgns? (
+               sci-libs/cgnslib
+               sci-libs/hdf5[mpi=]
+       )
+       eigen? ( dev-cpp/eigen )
+       gmm? ( sci-mathematics/gmm )
        jpeg? ( media-libs/libjpeg-turbo )
-       med? ( sci-libs/med[mpi] )
+       med? (
+               sci-libs/med[mpi=]
+               sci-libs/hdf5[mpi=]
+       )
+       mpi? ( virtual/mpi[cxx] )
+       mumps? ( sci-libs/mumps[mpi=] )
        opencascade? ( sci-libs/opencascade:* )
+       pdf? ( app-text/poppler:= )
        png? ( media-libs/libpng:0 )
        petsc? ( sci-mathematics/petsc[mpi=] )
-       zlib? ( sys-libs/zlib )
-       mpi? ( virtual/mpi[cxx] )"
+       slepc? ( sci-mathematics/slepc[mpi=] )
+       voro? ( sci-libs/voro++ )
+       zlib? ( sys-libs/zlib )"
 
 DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
@@ -53,18 +74,26 @@ src_configure() {
                mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
 
        mycmakeargs+=(
+               -DENABLE_ALGLIB="$(usex alglib)"
                -DENABLE_BLAS_LAPACK="$(usex blas)"
                -DENABLE_BUILD_DYNAMIC="$(usex shared)"
                -DENABLE_CGNS="$(usex cgns)"
+               -DENABLE_EIGEN="$(usex eigen)"
                -DENABLE_FLTK="$(usex X)"
+               -DENABLE_GMM="$(usex gmm)"
                -DENABLE_GRAPHICS="$(usex X)"
                -DENABLE_MED="$(usex med)"
                -DENABLE_MPI="$(usex mpi)"
                -DENABLE_METIS="$(usex metis)"
+               -DENABLE_MUMPS="$(usex mumps)"
                -DENABLE_NETGEN="$(usex netgen)"
                -DENABLE_OCC="$(usex opencascade)"
                -DENABLE_PETSC="$(usex petsc)"
+               -DENABLE_POPPLER="$(usex pdf)"
+               -DENABLE_SLEPC="$(usex slepc)"
                -DENABLE_PRIVATE_API="$(usex shared)"
+               -DENABLE_SYSTEM_CONTRIB="YES"
+               -DENABLE_VOROPP="$(usex voro)"
                -DENABLE_WRAP_PYTHON="$(usex python)")
 
        cmake_src_configure

diff --git a/sci-libs/gmsh/metadata.xml b/sci-libs/gmsh/metadata.xml
index 896b5d03abdb..79e8c7790e0a 100644
--- a/sci-libs/gmsh/metadata.xml
+++ b/sci-libs/gmsh/metadata.xml
@@ -10,12 +10,18 @@
                <name>Gentoo Science Project</name>
        </maintainer>
        <use>
-               <flag name="cgns"> Enables cgns output support</flag>
-               <flag name="metis"> Enables metis support</flag>
-               <flag name="med"> Enables med support</flag>
-               <flag name="netgen"> Enable 3D Frontal triangulation using 
netgen lib</flag>
-               <flag name="petsc"> Enable sci-mathematics/petsc support</flag>
-               <flag name="opencascade"> Enable OpenCASCADE support</flag>
+               <flag name="alglib">Enable alglib support for mesh 
optimizers</flag>
+               <flag name="cgns">Enables cgns output support</flag>
+               <flag name="eigen">Build matrix manipulation with 
dev-cpp/eigen</flag>
+               <flag name="gmm">A simple alternative to petsc based on 
sci-mathematics/gmm</flag>
+               <flag name="metis">Enables metis support</flag>
+               <flag name="med">Enables med support</flag>
+               <flag name="mumps">Enables mumps solver support</flag>
+               <flag name="netgen">Enable 3D Frontal triangulation using 
netgen lib</flag>
+               <flag name="petsc">Enable sci-mathematics/petsc support</flag>
+               <flag name="opencascade">Enable OpenCASCADE support</flag>
                <flag name="shared">Install shared library and headers</flag>
+               <flag name="slepc">Enable sci-mathematics/slepc support</flag>
+               <flag name="voro">Enable support to sci-libs/voro++ 
meshing</flag>
        </use>
 </pkgmetadata>

Reply via email to