[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2024-04-23 Thread Sam James
commit: 464b59121d8856da622708e86ca943f6538b9333
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 23 20:32:55 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 23 20:33:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464b5912

sci-libs/gmsh: add subslot dep on sci-libs/hdf5

Signed-off-by: Sam James  gentoo.org>

 sci-libs/gmsh/{gmsh-4.11.1-r1.ebuild => gmsh-4.11.1-r2.ebuild} | 4 ++--
 sci-libs/gmsh/{gmsh-4.12.2.ebuild => gmsh-4.12.2-r1.ebuild}| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild 
b/sci-libs/gmsh/gmsh-4.11.1-r2.ebuild
similarity index 98%
rename from sci-libs/gmsh/gmsh-4.11.1-r1.ebuild
rename to sci-libs/gmsh/gmsh-4.11.1-r2.ebuild
index 0cb64ad8928e..deffafdf47c5 100644
--- a/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild
+++ b/sci-libs/gmsh/gmsh-4.11.1-r2.ebuild
@@ -42,14 +42,14 @@ RDEPEND="
)
cgns? (
sci-libs/cgnslib
-   sci-libs/hdf5[mpi=]
+   sci-libs/hdf5:=[mpi=]
)
eigen? ( dev-cpp/eigen )
gmm? ( sci-mathematics/gmm )
jpeg? ( media-libs/libjpeg-turbo )
med? (
sci-libs/med[mpi=]
-   sci-libs/hdf5[mpi=]
+   sci-libs/hdf5:=[mpi=]
)
metis? ( >=sci-libs/metis-5.2.0 )
mpi? ( virtual/mpi[cxx] )

diff --git a/sci-libs/gmsh/gmsh-4.12.2.ebuild 
b/sci-libs/gmsh/gmsh-4.12.2-r1.ebuild
similarity index 98%
rename from sci-libs/gmsh/gmsh-4.12.2.ebuild
rename to sci-libs/gmsh/gmsh-4.12.2-r1.ebuild
index bbc3d11637b6..60c811c184fd 100644
--- a/sci-libs/gmsh/gmsh-4.12.2.ebuild
+++ b/sci-libs/gmsh/gmsh-4.12.2-r1.ebuild
@@ -42,14 +42,14 @@ RDEPEND="
)
cgns? (
sci-libs/cgnslib
-   sci-libs/hdf5[mpi=]
+   sci-libs/hdf5:=[mpi=]
)
eigen? ( dev-cpp/eigen )
gmm? ( sci-mathematics/gmm )
jpeg? ( media-libs/libjpeg-turbo )
med? (
sci-libs/med[mpi=]
-   sci-libs/hdf5[mpi=]
+   sci-libs/hdf5:=[mpi=]
)
metis? ( >=sci-libs/metis-5.2.0 )
mpi? ( virtual/mpi[cxx] )



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2024-03-24 Thread Andreas Sturmlechner
commit: 8b8ba7f1e16e0d6b4811e8ced708041bcc9a4208
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 10 20:58:44 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 24 21:33:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b8ba7f1

sci-libs/gmsh: drop 4.9.5-r3, 4.10.3-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/gmsh/Manifest  |   2 -
 sci-libs/gmsh/gmsh-4.10.3-r1.ebuild | 117 
 sci-libs/gmsh/gmsh-4.9.5-r3.ebuild  |  81 -
 3 files changed, 200 deletions(-)

diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index e46c8c64722c..4fffd0a60ba7 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,3 +1 @@
-DIST gmsh-4.9.5-source.tgz 14921704 BLAKE2B 
e805bd786154bf6ce8bebb2d2c38204a88d06a251c45fbe6dd37641a15e02291993c244f26a01faad2a6445a4852274e5481d4236b7a3d9b7ee65fc863f1b880
 SHA512 
4da61bdf03fb9466af80ac790e83cbab755c78d860d601474d7ebca220ac51cba620db310165021412dbecc1cf187ccdff47b8a78e0579339bb72cfa6484
-DIST gmsh-4.10.3-source.tgz 14994941 BLAKE2B 
b9229f81fc8daabdb3b3db3acd50a0a0e602fec1423bc67a0033a02217c908910eeb1f9bd1cbc57fe2d24b566f256b969fe92e9e9ceefe4cd5af34dd07cf1a9e
 SHA512 
863c5a7fe13095afad37b4450855b2079d034222b5a595fc25b2b0d840d8ef63ceafbbf56ea642b3c3e9277faabe08a2cc19a7a3126a8e12e9d4117243244653
 DIST gmsh-4.11.1-source.tgz 17985611 BLAKE2B 
087664cfbfec758eaa3740a65920ccf673dbcc97a1ef8010222da64b8c586334ed1a77904e94061bdf34e714aae34311ee4f6fb38740473046f99ad6c1e0984c
 SHA512 
8f2a71d6db80dd6bacde6dc1ccd120c7f83609dd69a84a910455a21a43b7392cd7e0e7b4d37aaa6a1b1cbfdb816646cd4828d2ac6d784edba072167280432e4c

diff --git a/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild 
b/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild
deleted file mode 100644
index 83ebb5ce37b9..
--- a/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake fortran-2 python-any-r1 toolchain-funcs
-
-DESCRIPTION="Three-dimensional finite element mesh generator"
-HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh;
-SRC_URI="https://gmsh.info/src/${P}-source.tgz;
-S="${WORKDIR}/${P}-source"
-
-LICENSE="
-   GPL-2+ free-noncomm
-   alglib? ( MIT )
-   gmm? ( LGPL-2.1+ )
-   metis? ( Apache-2.0 )
-   netgen? ( LGPL-2.1+ )
-   voro? ( BSD )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-## cgns is not compiling ATM, maybe fix cgns lib first
-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="
-   ^^ ( blas eigen )
-   mumps? ( blas )
-   slepc? ( petsc )
-   "
-
-RDEPEND="
-   virtual/fortran
-   X? ( x11-libs/fltk:1[xft] )
-   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=]
-   sci-libs/hdf5[mpi=]
-   )
-   metis? ( https://gmsh.info/ https://gitlab.onelab.info/gmsh/gmsh;
-SRC_URI="https://gmsh.info/src/${P}-source.tgz;
-S="${WORKDIR}/${P}-source"
-
-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"
-
-REQUIRED_USE="med? ( mpi )"
-
-RDEPEND="
-   virtual/fortran
-   X? ( x11-libs/fltk:1[xft] )
-   blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
-   cgns? ( sci-libs/cgnslib )
-   jpeg? ( media-libs/libjpeg-turbo )
-   med? ( sci-libs/med[mpi] )
-   metis? ( 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2024-03-14 Thread Sam James
commit: fa871c9fd0a3141e362e986e8dbf4e35135e1868
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 15 01:36:37 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 15 01:36:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa871c9f

sci-libs/gmsh: update HOMEPAGE (add self-hosted gitlab)

Signed-off-by: Sam James  gentoo.org>

 sci-libs/gmsh/gmsh-4.10.3-r1.ebuild | 4 ++--
 sci-libs/gmsh/gmsh-4.11.1-r1.ebuild | 4 ++--
 sci-libs/gmsh/gmsh-4.9.5-r3.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild 
b/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild
index 3e5432701c03..83ebb5ce37b9 100644
--- a/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild
+++ b/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..11} )
 inherit cmake fortran-2 python-any-r1 toolchain-funcs
 
 DESCRIPTION="Three-dimensional finite element mesh generator"
-HOMEPAGE="https://gmsh.info;
+HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh;
 SRC_URI="https://gmsh.info/src/${P}-source.tgz;
 S="${WORKDIR}/${P}-source"
 

diff --git a/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild 
b/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild
index ee7ff513289d..0cb64ad8928e 100644
--- a/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild
+++ b/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..11} )
 inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="Three-dimensional finite element mesh generator"
-HOMEPAGE="https://gmsh.info;
+HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh;
 SRC_URI="https://gmsh.info/src/${P}-source.tgz;
 S="${WORKDIR}/${P}-source"
 

diff --git a/sci-libs/gmsh/gmsh-4.9.5-r3.ebuild 
b/sci-libs/gmsh/gmsh-4.9.5-r3.ebuild
index 9f6486414bc6..1b6a01dc2b79 100644
--- a/sci-libs/gmsh/gmsh-4.9.5-r3.ebuild
+++ b/sci-libs/gmsh/gmsh-4.9.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..10} )
 inherit cmake fortran-2 python-any-r1 toolchain-funcs
 
 DESCRIPTION="Three-dimensional finite element mesh generator"
-HOMEPAGE="https://gmsh.info/;
+HOMEPAGE="https://gmsh.info/ https://gitlab.onelab.info/gmsh/gmsh;
 SRC_URI="https://gmsh.info/src/${P}-source.tgz;
 S="${WORKDIR}/${P}-source"
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/

2023-05-03 Thread Andrew Ammerlaan
commit: b62ee8825bd6ac801dc982d5850b222c9eb0c37c
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed May  3 14:50:55 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed May  3 14:52:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62ee882

sci-libs/gmsh: fix build with metis-5.2

Closes: https://bugs.gentoo.org/905650
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/gmsh/files/gmsh-4.11.1-metis-5-2.patch   | 19 +++
 .../{gmsh-4.10.3.ebuild => gmsh-4.10.3-r1.ebuild} |  7 ---
 .../{gmsh-4.11.1.ebuild => gmsh-4.11.1-r1.ebuild} |  8 +---
 .../{gmsh-4.9.5-r2.ebuild => gmsh-4.9.5-r3.ebuild}|  7 ---
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/sci-libs/gmsh/files/gmsh-4.11.1-metis-5-2.patch 
b/sci-libs/gmsh/files/gmsh-4.11.1-metis-5-2.patch
new file mode 100644
index ..c7413e6e4bf4
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-4.11.1-metis-5-2.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 63fb873..2563850 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -860,11 +860,12 @@ endif()
+ 
+ if(HAVE_MESH OR HAVE_SOLVER)
+   if(ENABLE_METIS)
+-find_library(METIS_LIB metis PATH_SUFFIXES lib)
++find_library(METIS_LIB metis PATH_SUFFIXES lib64 REQUIRED)
++find_library(GKLIB_LIB GKlib PATH_SUFFIXES lib64 REQUIRED)
+ find_path(METIS_INC "metis.h" PATH_SUFFIXES include)
+ if(ENABLE_SYSTEM_CONTRIB AND METIS_LIB AND METIS_INC)
+   message(STATUS "Using system version of METIS")
+-  list(APPEND EXTERNAL_LIBRARIES ${METIS_LIB})
++  list(APPEND EXTERNAL_LIBRARIES ${METIS_LIB} ${GKLIB_LIB})
+   list(APPEND EXTERNAL_INCLUDES ${METIS_INC})
+   set_config_option(HAVE_METIS "Metis")
+ elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/metis)

diff --git a/sci-libs/gmsh/gmsh-4.10.3.ebuild 
b/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild
similarity index 96%
rename from sci-libs/gmsh/gmsh-4.10.3.ebuild
rename to sci-libs/gmsh/gmsh-4.10.3-r1.ebuild
index 11602e174471..3e5432701c03 100644
--- a/sci-libs/gmsh/gmsh-4.10.3.ebuild
+++ b/sci-libs/gmsh/gmsh-4.10.3-r1.ebuild
@@ -10,6 +10,7 @@ inherit cmake fortran-2 python-any-r1 toolchain-funcs
 DESCRIPTION="Three-dimensional finite element mesh generator"
 HOMEPAGE="https://gmsh.info;
 SRC_URI="https://gmsh.info/src/${P}-source.tgz;
+S="${WORKDIR}/${P}-source"
 
 LICENSE="
GPL-2+ free-noncomm
@@ -50,6 +51,7 @@ RDEPEND="
sci-libs/med[mpi=]
sci-libs/hdf5[mpi=]
)
+   metis? ( https://gmsh.info;
 SRC_URI="https://gmsh.info/src/${P}-source.tgz;
+S="${WORKDIR}/${P}-source"
 
 LICENSE="
GPL-2+ free-noncomm
@@ -50,6 +51,7 @@ RDEPEND="
sci-libs/med[mpi=]
sci-libs/hdf5[mpi=]
)
+   metis? ( >=sci-libs/metis-5.2.0 )
mpi? ( virtual/mpi[cxx] )
mumps? ( sci-libs/mumps[mpi=] )
opencascade? ( sci-libs/opencascade:* )
@@ -58,7 +60,8 @@ RDEPEND="
petsc? ( sci-mathematics/petsc[mpi=] )
slepc? ( sci-mathematics/slepc[mpi=] )
voro? ( sci-libs/voro++ )
-   zlib? ( sys-libs/zlib )"
+   zlib? ( sys-libs/zlib )
+   "
 
 DEPEND="${RDEPEND}
${PYTHON_DEPS}
@@ -66,11 +69,10 @@ DEPEND="${RDEPEND}
python? ( dev-lang/swig:0 )
"
 
-S="${WORKDIR}"/${P}-source
-
 PATCHES=(
"${FILESDIR}"/${PN}-4.9.5-opencascade.patch
"${FILESDIR}"/${P}_gcc13_fix_cstdint_include.patch
+   "${FILESDIR}"/${P}-metis-5-2.patch
 )
 
 pkg_setup() {

diff --git a/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild 
b/sci-libs/gmsh/gmsh-4.9.5-r3.ebuild
similarity index 95%
rename from sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
rename to sci-libs/gmsh/gmsh-4.9.5-r3.ebuild
index c41d139ad3b4..9f6486414bc6 100644
--- a/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
+++ b/sci-libs/gmsh/gmsh-4.9.5-r3.ebuild
@@ -10,6 +10,7 @@ inherit cmake fortran-2 python-any-r1 toolchain-funcs
 DESCRIPTION="Three-dimensional finite element mesh generator"
 HOMEPAGE="https://gmsh.info/;
 SRC_URI="https://gmsh.info/src/${P}-source.tgz;
+S="${WORKDIR}/${P}-source"
 
 LICENSE="GPL-3 free-noncomm"
 SLOT="0"
@@ -26,11 +27,13 @@ RDEPEND="
cgns? ( sci-libs/cgnslib )
jpeg? ( media-libs/libjpeg-turbo )
med? ( sci-libs/med[mpi] )
+   metis? ( 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/

2023-05-02 Thread Sam James
commit: 020a22ee51f59b72936943e69953b0971acf127f
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Tue May  2 17:14:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  2 17:44:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020a22ee

sci-libs/gmsh: 4.11.1 fix GCC-13 compatibility

Closes: https://bugs.gentoo.org/905445

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/30839
Signed-off-by: Sam James  gentoo.org>

 .../gmsh-4.11.1_gcc13_fix_cstdint_include.patch| 29 ++
 sci-libs/gmsh/gmsh-4.11.1.ebuild   |  5 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/sci-libs/gmsh/files/gmsh-4.11.1_gcc13_fix_cstdint_include.patch 
b/sci-libs/gmsh/files/gmsh-4.11.1_gcc13_fix_cstdint_include.patch
new file mode 100644
index ..2b1b491ef81f
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-4.11.1_gcc13_fix_cstdint_include.patch
@@ -0,0 +1,29 @@
+# Based on upstream patches:
+# https://gitlab.onelab.info/gmsh/gmsh/-/commit/fb81a9c90
+# https://gitlab.onelab.info/gmsh/gmsh/-/commit/aceb09c80
+#
+# Upstream issue: https://gitlab.onelab.info/gmsh/gmsh/-/issues/2416
+# Gentoo issue: https://bugs.gentoo.org/905445
+
+diff -Naur a/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h 
b/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h
+--- a/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h
 b/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h
+@@ -8,6 +8,7 @@
+ #pragma once
+ 
+ #include 
++#include 
+ #include "qmtMeshUtils.h"
+ 
+ class SurfaceProjector;
+diff -Naur a/src/mesh/meshGFacePack.cpp b/src/mesh/meshGFacePack.cpp
+--- a/src/mesh/meshGFacePack.cpp
 b/src/mesh/meshGFacePack.cpp
+@@ -8,6 +8,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include "gmsh.h"
+ #include "SPoint2.h"
+ #include "SVector3.h"

diff --git a/sci-libs/gmsh/gmsh-4.11.1.ebuild b/sci-libs/gmsh/gmsh-4.11.1.ebuild
index 5bbf22a1c4b1..faf9c16b04ea 100644
--- a/sci-libs/gmsh/gmsh-4.11.1.ebuild
+++ b/sci-libs/gmsh/gmsh-4.11.1.ebuild
@@ -68,7 +68,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${P}-source
 
-PATCHES=( "${FILESDIR}"/${PN}-4.9.5-opencascade.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.9.5-opencascade.patch
+   "${FILESDIR}"/${P}_gcc13_fix_cstdint_include.patch
+)
 
 pkg_setup() {
fortran-2_pkg_setup



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2023-05-01 Thread Andrew Ammerlaan
commit: dae904a2d9c40cd0a549576706abecd596692cfc
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Fri Apr 28 21:49:11 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon May  1 13:44:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dae904a2

sci-libs/gmsh: 4.11.1 version bump

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/30804
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/gmsh/Manifest   |   3 +-
 sci-libs/gmsh/gmsh-4.11.1.ebuild | 133 +++
 2 files changed, 135 insertions(+), 1 deletion(-)

diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 6438ce1deb83..e46c8c64722c 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,2 +1,3 @@
-DIST gmsh-4.10.3-source.tgz 14994941 BLAKE2B 
b9229f81fc8daabdb3b3db3acd50a0a0e602fec1423bc67a0033a02217c908910eeb1f9bd1cbc57fe2d24b566f256b969fe92e9e9ceefe4cd5af34dd07cf1a9e
 SHA512 
863c5a7fe13095afad37b4450855b2079d034222b5a595fc25b2b0d840d8ef63ceafbbf56ea642b3c3e9277faabe08a2cc19a7a3126a8e12e9d4117243244653
 DIST gmsh-4.9.5-source.tgz 14921704 BLAKE2B 
e805bd786154bf6ce8bebb2d2c38204a88d06a251c45fbe6dd37641a15e02291993c244f26a01faad2a6445a4852274e5481d4236b7a3d9b7ee65fc863f1b880
 SHA512 
4da61bdf03fb9466af80ac790e83cbab755c78d860d601474d7ebca220ac51cba620db310165021412dbecc1cf187ccdff47b8a78e0579339bb72cfa6484
+DIST gmsh-4.10.3-source.tgz 14994941 BLAKE2B 
b9229f81fc8daabdb3b3db3acd50a0a0e602fec1423bc67a0033a02217c908910eeb1f9bd1cbc57fe2d24b566f256b969fe92e9e9ceefe4cd5af34dd07cf1a9e
 SHA512 
863c5a7fe13095afad37b4450855b2079d034222b5a595fc25b2b0d840d8ef63ceafbbf56ea642b3c3e9277faabe08a2cc19a7a3126a8e12e9d4117243244653
+DIST gmsh-4.11.1-source.tgz 17985611 BLAKE2B 
087664cfbfec758eaa3740a65920ccf673dbcc97a1ef8010222da64b8c586334ed1a77904e94061bdf34e714aae34311ee4f6fb38740473046f99ad6c1e0984c
 SHA512 
8f2a71d6db80dd6bacde6dc1ccd120c7f83609dd69a84a910455a21a43b7392cd7e0e7b4d37aaa6a1b1cbfdb816646cd4828d2ac6d784edba072167280432e4c

diff --git a/sci-libs/gmsh/gmsh-4.11.1.ebuild b/sci-libs/gmsh/gmsh-4.11.1.ebuild
new file mode 100644
index ..5bbf22a1c4b1
--- /dev/null
+++ b/sci-libs/gmsh/gmsh-4.11.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Three-dimensional finite element mesh generator"
+HOMEPAGE="https://gmsh.info;
+SRC_URI="https://gmsh.info/src/${P}-source.tgz;
+
+LICENSE="
+   GPL-2+ free-noncomm
+   alglib? ( MIT )
+   gmm? ( LGPL-2.1+ )
+   metis? ( Apache-2.0 )
+   netgen? ( LGPL-2.1+ )
+   voro? ( BSD )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+## cgns is not compiling ATM, maybe fix cgns lib first
+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="
+   ^^ ( blas eigen )
+   mumps? ( blas )
+   slepc? ( petsc )
+   "
+
+RDEPEND="
+   virtual/fortran
+   X? ( x11-libs/fltk:1[xft] )
+   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=]
+   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=] )
+   slepc? ( sci-mathematics/slepc[mpi=] )
+   voro? ( sci-libs/voro++ )
+   zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+   python? ( dev-lang/swig:0 )
+   "
+
+S="${WORKDIR}"/${P}-source
+
+PATCHES=( "${FILESDIR}"/${PN}-4.9.5-opencascade.patch )
+
+pkg_setup() {
+   fortran-2_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=( )
+
+   use blas && \
+   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)"
+ 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2022-08-26 Thread Sam James
commit: 347b6349cade7b62b560288082ba5d4f2e6dd3ec
Author: Petr Vaněk  atlas  cz>
AuthorDate: Thu Aug 25 21:40:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 26 10:46:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=347b6349

sci-libs/gmsh: use  tags in metadata.xml

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/gmsh/metadata.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-libs/gmsh/metadata.xml b/sci-libs/gmsh/metadata.xml
index 79e8c7790e0a..c7862eabe094 100644
--- a/sci-libs/gmsh/metadata.xml
+++ b/sci-libs/gmsh/metadata.xml
@@ -12,16 +12,16 @@

Enable alglib support for mesh 
optimizers
Enables cgns output support
-   Build matrix manipulation with 
dev-cpp/eigen
-   A simple alternative to petsc based on 
sci-mathematics/gmm
+   Build matrix manipulation with 
dev-cpp/eigen
+   A simple alternative to petsc based on 
sci-mathematics/gmm
Enables metis support
Enables med support
Enables mumps solver support
Enable 3D Frontal triangulation using 
netgen lib
-   Enable sci-mathematics/petsc support
+   Enable sci-mathematics/petsc 
support
Enable OpenCASCADE support
Install shared library and headers
-   Enable sci-mathematics/slepc support
-   Enable support to sci-libs/voro++ 
meshing
+   Enable sci-mathematics/slepc 
support
+   Enable support to sci-libs/voro++ 
meshing

 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2022-06-13 Thread Andrew Ammerlaan
commit: 78a43bb55ff8e9f6fa6d54a420efa996b7aa5ff8
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Jun  8 11:03:20 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Jun 13 12:38:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a43bb5

sci-libs/gmsh: minor ebuild improvements

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25806
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/gmsh/gmsh-4.10.3.ebuild   | 8 
 sci-libs/gmsh/gmsh-4.9.5-r2.ebuild | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sci-libs/gmsh/gmsh-4.10.3.ebuild b/sci-libs/gmsh/gmsh-4.10.3.ebuild
index dfcc71135808..9d7bf2310125 100644
--- a/sci-libs/gmsh/gmsh-4.10.3.ebuild
+++ b/sci-libs/gmsh/gmsh-4.10.3.ebuild
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake fortran-2 python-any-r1 toolchain-funcs
 
-DESCRIPTION="A three-dimensional finite element mesh generator"
-HOMEPAGE="http://www.geuz.org/gmsh/;
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz;
+DESCRIPTION="Three-dimensional finite element mesh generator"
+HOMEPAGE="https://gmsh.info;
+SRC_URI="https://gmsh.info/src/${P}-source.tgz;
 
 LICENSE="GPL-3 free-noncomm"
 SLOT="0"
@@ -61,7 +61,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${P}-source
 
-PATCHES=( "${FILESDIR}"/$PN-4.9.5-opencascade.patch )
+PATCHES=( "${FILESDIR}"/${PN}-4.9.5-opencascade.patch )
 
 pkg_setup() {
fortran-2_pkg_setup

diff --git a/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild 
b/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
index ece42634909b..48328b69280e 100644
--- a/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
+++ b/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake fortran-2 python-any-r1 toolchain-funcs
 
-DESCRIPTION="A three-dimensional finite element mesh generator"
-HOMEPAGE="http://www.geuz.org/gmsh/;
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz;
+DESCRIPTION="Three-dimensional finite element mesh generator"
+HOMEPAGE="https://gmsh.info/;
+SRC_URI="https://gmsh.info/src/${P}-source.tgz;
 
 LICENSE="GPL-3 free-noncomm"
 SLOT="0"
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${P}-source
 
-PATCHES=( "${FILESDIR}"/$P-opencascade.patch )
+PATCHES=( "${FILESDIR}"/${P}-opencascade.patch )
 
 pkg_setup() {
fortran-2_pkg_setup



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2022-06-13 Thread Andrew Ammerlaan
commit: 23bc105297c330485406b807e481aa45fb70162b
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Jun 13 12:36:05 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Jun 13 12:38:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23bc1052

sci-libs/gmsh: update LICENSE, enable py3.11

I got most of them, but there might still be some licenses missing

Bug: https://bugs.gentoo.org/723788
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/gmsh/gmsh-4.10.3.ebuild | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/sci-libs/gmsh/gmsh-4.10.3.ebuild b/sci-libs/gmsh/gmsh-4.10.3.ebuild
index 9d7bf2310125..81dc07c58474 100644
--- a/sci-libs/gmsh/gmsh-4.10.3.ebuild
+++ b/sci-libs/gmsh/gmsh-4.10.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake fortran-2 python-any-r1 toolchain-funcs
 
@@ -11,7 +11,14 @@ DESCRIPTION="Three-dimensional finite element mesh generator"
 HOMEPAGE="https://gmsh.info;
 SRC_URI="https://gmsh.info/src/${P}-source.tgz;
 
-LICENSE="GPL-3 free-noncomm"
+LICENSE="
+   GPL-2+ free-noncomm
+   alglib? ( MIT )
+   gmm? ( LGPL-2.1+ )
+   metis? ( Apache-2.0 )
+   netgen? ( LGPL-2.1+ )
+   voro? ( BSD )
+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 ## cgns is not compiling ATM, maybe fix cgns lib first



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

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

sci-libs/gmsh: clean and fix USE flags

Signed-off-by: Fabio Rossi  inwind.it>
Signed-off-by: Matthias Maier  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 @@
Gentoo Science Project


-Enables cgns output support
-Enables metis support
-Enables med support
-Enable 3D Frontal triangulation using 
netgen lib
-Enable sci-mathematics/petsc support
-Enable OpenCASCADE support
+   Enable alglib support for mesh 
optimizers
+   Enables cgns output support
+   Build matrix manipulation with 
dev-cpp/eigen
+   A simple alternative to petsc based on 
sci-mathematics/gmm
+   Enables metis support
+   Enables med support
+   Enables mumps solver support
+   Enable 3D Frontal triangulation using 
netgen lib
+   Enable sci-mathematics/petsc support
+   Enable OpenCASCADE support
Install shared library and headers
+   Enable sci-mathematics/slepc support
+   Enable support to sci-libs/voro++ 
meshing

 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/

2022-06-05 Thread Matthias Maier
commit: 7124c42f8e7ff9926f8474f49cc0c9a3870391d7
Author: Fabio Rossi  inwind  it>
AuthorDate: Tue May 24 11:57:04 2022 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Jun  6 05:49:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7124c42f

sci-libs/gmsh: various improvements

* removed deprecated dep
* fixed installation with USE=examples
* fixed detection of opencascade
* now the private API is also exported with USE=shared

Signed-off-by: Fabio Rossi  inwind.it>
Bug: https://bugs.gentoo.org/835702
Bug: https://bugs.gentoo.org/835194
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/files/gmsh-4.9.5-opencascade.patch | 20 ++
 sci-libs/gmsh/gmsh-4.9.5-r2.ebuild   | 80 
 2 files changed, 100 insertions(+)

diff --git a/sci-libs/gmsh/files/gmsh-4.9.5-opencascade.patch 
b/sci-libs/gmsh/files/gmsh-4.9.5-opencascade.patch
new file mode 100644
index ..63281d42e1f2
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-4.9.5-opencascade.patch
@@ -0,0 +1,20 @@
+--- ./CMakeLists.txt   2022-05-24 12:36:43.084752081 +0200
 ./CMakeLists.txt.new   2022-05-24 12:44:08.895710126 +0200
+@@ -1282,7 +1282,7 @@
+ else()
+   set(OCC_LIBS)
+   foreach(OCC ${OCC_LIBS_REQUIRED})
+-find_library(OCC_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES
++find_library(OCC_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES 
opencascade
+  lib ${OCC_SYS_NAME}/vc8/lib  ${OCC_SYS_NAME}/vc9/lib
+  ${OCC_SYS_NAME}/vc10/lib ${OCC_SYS_NAME}/vc11/lib
+  ${OCC_SYS_NAME}/vc12/lib ${OCC_SYS_NAME}/vc14/lib
+@@ -1308,7 +1308,7 @@
+   list(LENGTH OCC_CAF_LIBS_REQUIRED NUM_OCC_CAF_LIBS_REQUIRED)
+   set(OCC_CAF_LIBS)
+   foreach(OCC ${OCC_CAF_LIBS_REQUIRED})
+-find_library(OCC_CAF_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES
++find_library(OCC_CAF_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES 
opencascade
+  lib ${OCC_SYS_NAME}/vc8/lib  ${OCC_SYS_NAME}/vc9/lib
+  ${OCC_SYS_NAME}/vc10/lib ${OCC_SYS_NAME}/vc11/lib
+  ${OCC_SYS_NAME}/vc12/lib ${OCC_SYS_NAME}/vc14/lib

diff --git a/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild 
b/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
new file mode 100644
index ..ece42634909b
--- /dev/null
+++ b/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake fortran-2 python-any-r1 toolchain-funcs
+
+DESCRIPTION="A three-dimensional finite element mesh generator"
+HOMEPAGE="http://www.geuz.org/gmsh/;
+SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz;
+
+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"
+
+REQUIRED_USE="med? ( mpi )"
+
+RDEPEND="
+   virtual/fortran
+   X? ( x11-libs/fltk:1[xft] )
+   blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
+   cgns? ( sci-libs/cgnslib )
+   jpeg? ( media-libs/libjpeg-turbo )
+   med? ( sci-libs/med[mpi] )
+   opencascade? ( sci-libs/opencascade:* )
+   png? ( media-libs/libpng:0 )
+   petsc? ( sci-mathematics/petsc[mpi=] )
+   zlib? ( sys-libs/zlib )
+   mpi? ( virtual/mpi[cxx] )"
+
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+   python? ( dev-lang/swig:0 )
+   "
+
+S="${WORKDIR}"/${P}-source
+
+PATCHES=( "${FILESDIR}"/$P-opencascade.patch )
+
+pkg_setup() {
+   fortran-2_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=( )
+
+   use blas && \
+   mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
+
+   mycmakeargs+=(
+   -DENABLE_BLAS_LAPACK="$(usex blas)"
+   -DENABLE_BUILD_DYNAMIC="$(usex shared)"
+   -DENABLE_CGNS="$(usex cgns)"
+   -DENABLE_FLTK="$(usex X)"
+   -DENABLE_GRAPHICS="$(usex X)"
+   -DENABLE_MED="$(usex med)"
+   -DENABLE_MPI="$(usex mpi)"
+   -DENABLE_METIS="$(usex metis)"
+   -DENABLE_NETGEN="$(usex netgen)"
+   -DENABLE_OCC="$(usex opencascade)"
+   -DENABLE_PETSC="$(usex petsc)"
+   -DENABLE_PRIVATE_API="$(usex shared)"
+   -DENABLE_WRAP_PYTHON="$(usex python)")
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   if use examples ; then
+   dodoc -r examples tutorials
+   docompress -x /usr/share/doc/${PF}/{examples,tutorials}
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2022-06-05 Thread Matthias Maier
commit: 368d9fcbd0f08d8e1da7b8830606c4fd84595eaf
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Jun  6 05:35:55 2022 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Jun  6 05:49:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=368d9fcb

sci-libs/gmsh: set USE=+blas to satisfy "exactly one of" constraint

Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/gmsh-4.10.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/gmsh/gmsh-4.10.3.ebuild b/sci-libs/gmsh/gmsh-4.10.3.ebuild
index d99cb533e574..dfcc71135808 100644
--- a/sci-libs/gmsh/gmsh-4.10.3.ebuild
+++ b/sci-libs/gmsh/gmsh-4.10.3.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3 free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 ## cgns is not compiling ATM, maybe fix cgns lib first
-IUSE="+alglib blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen 
opencascade petsc pdf png python shared slepc X voro 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="
^^ ( blas eigen )



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2022-06-05 Thread Matthias Maier
commit: d5c81658aa0ba344a094a0012c6f4f57aa28662e
Author: Fabio Rossi  inwind  it>
AuthorDate: Tue May 24 12:14:04 2022 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Jun  6 05:49:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c81658

sci-libs/gmsh: removed bad version

Signed-off-by: Fabio Rossi  inwind.it>
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/gmsh-4.9.5-r1.ebuild | 80 --
 1 file changed, 80 deletions(-)

diff --git a/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild 
b/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild
deleted file mode 100644
index 902c8379230d..
--- a/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake fortran-2 python-any-r1 toolchain-funcs
-
-DESCRIPTION="A three-dimensional finite element mesh generator"
-HOMEPAGE="http://www.geuz.org/gmsh/;
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz;
-
-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"
-
-REQUIRED_USE="med? ( mpi )"
-
-RDEPEND="
-   virtual/fortran
-   X? ( x11-libs/fltk:1[xft] )
-   blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
-   cgns? ( sci-libs/cgnslib )
-   jpeg? ( virtual/jpeg:0 )
-   med? ( sci-libs/med[mpi] )
-   opencascade? ( sci-libs/opencascade:* )
-   png? ( media-libs/libpng:0 )
-   petsc? ( sci-mathematics/petsc[mpi=] )
-   zlib? ( sys-libs/zlib )
-   mpi? ( virtual/mpi[cxx] )"
-
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   virtual/pkgconfig
-   python? ( dev-lang/swig:0 )
-   "
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
-)
-
-pkg_setup() {
-   fortran-2_pkg_setup
-}
-
-src_configure() {
-   local mycmakeargs=( )
-
-   use blas && \
-   mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
-
-   local mycmakeargs+=(
-   -DENABLE_BLAS_LAPACK="$(usex blas)"
-   -DENABLE_BUILD_DYNAMIC="$(usex shared)"
-   -DENABLE_CGNS="$(usex cgns)"
-   -DENABLE_FLTK="$(usex X)"
-   -DENABLE_GRAPHICS="$(usex X)"
-   -DENABLE_MED="$(usex med)"
-   -DENABLE_MPI="$(usex mpi)"
-   -DENABLE_METIS="$(usex metis)"
-   -DENABLE_NETGEN="$(usex netgen)"
-   -DENABLE_OCC="$(usex opencascade)"
-   -DENABLE_PETSC="$(usex petsc)"
-   -DENABLE_WRAP_PYTHON="$(usex python)")
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   if use examples ; then
-   dodoc -r demos tutorial
-   docompress -x /usr/share/doc/${PF}/{demos,tutorial}
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2022-06-05 Thread Matthias Maier
commit: 73ddc4916985225d253684569fa364ed160be400
Author: Fabio Rossi  inwind  it>
AuthorDate: Sun May 29 10:26:14 2022 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Jun  6 05:49:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ddc491

sci-libs/gmsh: added latest version

Signed-off-by: Fabio Rossi  inwind.it>
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/Manifest   |  1 +
 sci-libs/gmsh/gmsh-4.10.3.ebuild | 80 
 2 files changed, 81 insertions(+)

diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 1acc490e0367..6438ce1deb83 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1 +1,2 @@
+DIST gmsh-4.10.3-source.tgz 14994941 BLAKE2B 
b9229f81fc8daabdb3b3db3acd50a0a0e602fec1423bc67a0033a02217c908910eeb1f9bd1cbc57fe2d24b566f256b969fe92e9e9ceefe4cd5af34dd07cf1a9e
 SHA512 
863c5a7fe13095afad37b4450855b2079d034222b5a595fc25b2b0d840d8ef63ceafbbf56ea642b3c3e9277faabe08a2cc19a7a3126a8e12e9d4117243244653
 DIST gmsh-4.9.5-source.tgz 14921704 BLAKE2B 
e805bd786154bf6ce8bebb2d2c38204a88d06a251c45fbe6dd37641a15e02291993c244f26a01faad2a6445a4852274e5481d4236b7a3d9b7ee65fc863f1b880
 SHA512 
4da61bdf03fb9466af80ac790e83cbab755c78d860d601474d7ebca220ac51cba620db310165021412dbecc1cf187ccdff47b8a78e0579339bb72cfa6484

diff --git a/sci-libs/gmsh/gmsh-4.10.3.ebuild b/sci-libs/gmsh/gmsh-4.10.3.ebuild
new file mode 100644
index ..139dbbd52704
--- /dev/null
+++ b/sci-libs/gmsh/gmsh-4.10.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake fortran-2 python-any-r1 toolchain-funcs
+
+DESCRIPTION="A three-dimensional finite element mesh generator"
+HOMEPAGE="http://www.geuz.org/gmsh/;
+SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz;
+
+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"
+
+REQUIRED_USE="med? ( mpi )"
+
+RDEPEND="
+   virtual/fortran
+   X? ( x11-libs/fltk:1[xft] )
+   blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
+   cgns? ( sci-libs/cgnslib )
+   jpeg? ( media-libs/libjpeg-turbo )
+   med? ( sci-libs/med[mpi] )
+   opencascade? ( sci-libs/opencascade:* )
+   png? ( media-libs/libpng:0 )
+   petsc? ( sci-mathematics/petsc[mpi=] )
+   zlib? ( sys-libs/zlib )
+   mpi? ( virtual/mpi[cxx] )"
+
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+   python? ( dev-lang/swig:0 )
+   "
+
+S="${WORKDIR}"/${P}-source
+
+PATCHES=( "${FILESDIR}"/$PN-4.9.5-opencascade.patch )
+
+pkg_setup() {
+   fortran-2_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=( )
+
+   use blas && \
+   mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
+
+   mycmakeargs+=(
+   -DENABLE_BLAS_LAPACK="$(usex blas)"
+   -DENABLE_BUILD_DYNAMIC="$(usex shared)"
+   -DENABLE_CGNS="$(usex cgns)"
+   -DENABLE_FLTK="$(usex X)"
+   -DENABLE_GRAPHICS="$(usex X)"
+   -DENABLE_MED="$(usex med)"
+   -DENABLE_MPI="$(usex mpi)"
+   -DENABLE_METIS="$(usex metis)"
+   -DENABLE_NETGEN="$(usex netgen)"
+   -DENABLE_OCC="$(usex opencascade)"
+   -DENABLE_PETSC="$(usex petsc)"
+   -DENABLE_PRIVATE_API="$(usex shared)"
+   -DENABLE_WRAP_PYTHON="$(usex python)")
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   if use examples ; then
+   dodoc -r examples tutorials
+   docompress -x /usr/share/doc/${PF}/{examples,tutorials}
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/files/

2022-03-26 Thread Andrew Ammerlaan
commit: 4bf71f99aac901a36aa3aa609a3ce8ef69218b7b
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar 13 10:07:24 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Mar 26 09:59:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bf71f99

sci-libs/gmsh: remove unused patch(es)

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/24532
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch | 80 --
 1 file changed, 80 deletions(-)

diff --git a/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch 
b/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch
deleted file mode 100644
index 3f16ef476d7f..
--- a/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-https://gitlab.onelab.info/gmsh/gmsh/-/commit/e7cd675083f72c6c01701cb0f16d1639aca121ba
-https://bugs.gentoo.org/800536
-
-From: Tristan Carel 
-Date: Wed, 28 Jul 2021 10:55:40 +0200
-Subject: [PATCH] Fix symbol conflict in picojson with GCC 11 internal macro
-
-Build issue on MacOS with GCC 11 from brew:
-```
-/usr/local/Cellar/gcc/11.1.0_1/lib/gcc/11/gcc/x86_64-apple-darwin20/11.1.0/include/serializeintrin.h:37:
 note: macro "_serialize" defined here
-   37 | #define _serialize()__builtin_ia32_serialize ()
-  |
-```
 a/Common/picojson.h
-+++ b/Common/picojson.h
-@@ -186,8 +186,8 @@ public:
- private:
-   template  value(const T *); // intentionally defined to block 
implicit conversion of pointer to bool
-   template  static void _indent(Iter os, int indent);
--  template  void _serialize(Iter os, int indent) const;
--  std::string _serialize(int indent) const;
-+  template  void serialize_(Iter os, int indent) const;
-+  std::string serialize_(int indent) const;
-   void clear();
- };
- 
-@@ -549,11 +549,11 @@ template  void serialize_str(const 
std::string , Iter oi) {
- }
- 
- template  void value::serialize(Iter oi, bool prettify) const {
--  return _serialize(oi, prettify ? 0 : -1);
-+  return serialize_(oi, prettify ? 0 : -1);
- }
- 
- inline std::string value::serialize(bool prettify) const {
--  return _serialize(prettify ? 0 : -1);
-+  return serialize_(prettify ? 0 : -1);
- }
- 
- template  void value::_indent(Iter oi, int indent) {
-@@ -563,7 +563,7 @@ template  void value::_indent(Iter oi, int 
indent) {
-   }
- }
- 
--template  void value::_serialize(Iter oi, int indent) const {
-+template  void value::serialize_(Iter oi, int indent) const {
-   switch (type_) {
-   case string_type:
- serialize_str(*u_.string_, oi);
-@@ -580,7 +580,7 @@ template  void value::_serialize(Iter oi, 
int indent) const {
-   if (indent != -1) {
- _indent(oi, indent);
-   }
--  i->_serialize(oi, indent);
-+  i->serialize_(oi, indent);
- }
- if (indent != -1) {
-   --indent;
-@@ -608,7 +608,7 @@ template  void value::_serialize(Iter oi, 
int indent) const {
-   if (indent != -1) {
- *oi++ = ' ';
-   }
--  i->second._serialize(oi, indent);
-+  i->second.serialize_(oi, indent);
- }
- if (indent != -1) {
-   --indent;
-@@ -628,9 +628,9 @@ template  void value::_serialize(Iter oi, 
int indent) const {
-   }
- }
- 
--inline std::string value::_serialize(int indent) const {
-+inline std::string value::serialize_(int indent) const {
-   std::string s;
--  _serialize(std::back_inserter(s), indent);
-+  serialize_(std::back_inserter(s), indent);
-   return s;
- }
- 
-GitLab



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2022-03-26 Thread Andrew Ammerlaan
commit: 3974a90619c6cd12a1d5610b5f2ab33962258450
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Mar 26 09:58:47 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Mar 26 09:59:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3974a906

sci-libs/gmsh: disable py3.7

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/gmsh/gmsh-4.9.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild 
b/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild
index af13e7d74515..902c8379230d 100644
--- a/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild
+++ b/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake fortran-2 python-any-r1 toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2022-03-11 Thread Matthias Maier
commit: da447180bc5ad6ee2e086078454d4e41ce241acf
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Mar 11 16:04:59 2022 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri Mar 11 16:04:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da447180

sci-libs/gmsh: fix dependency

Closes: https://bugs.gentoo.org/801295
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/{gmsh-4.9.5.ebuild => gmsh-4.9.5-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/gmsh/gmsh-4.9.5.ebuild 
b/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild
similarity index 98%
rename from sci-libs/gmsh/gmsh-4.9.5.ebuild
rename to sci-libs/gmsh/gmsh-4.9.5-r1.ebuild
index 7bfa0752988d..af13e7d74515 100644
--- a/sci-libs/gmsh/gmsh-4.9.5.ebuild
+++ b/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="med? ( mpi )"
 
 RDEPEND="
virtual/fortran
-   X? ( x11-libs/fltk:1 )
+   X? ( x11-libs/fltk:1[xft] )
blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
cgns? ( sci-libs/cgnslib )
jpeg? ( virtual/jpeg:0 )



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2022-03-11 Thread Matthias Maier
commit: 6e209f47ada09864211db37ff136ce2f35c5d73f
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Mar 11 15:58:51 2022 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri Mar 11 16:00:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e209f47

sci-libs/gmsh: add 4.9.5, drop 4.8.4

 - bump to EAPI=8
 - add missing python versions
 - port to cmake eclass

Closes: https://bugs.gentoo.org/832253
Closes: https://bugs.gentoo.org/811960
Bug: https://bugs.gentoo.org/801295

Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/Manifest |  2 +-
 sci-libs/gmsh/{gmsh-4.8.4.ebuild => gmsh-4.9.5.ebuild} | 13 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index d9e4bc7d1c18..1acc490e0367 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1 +1 @@
-DIST gmsh-4.8.4-source.tgz 13838352 BLAKE2B 
26c7f68e41d1c339c7d5fd499b2261c2ce79c38648df9f4f3853ba69421d59be36992d8aac1d1ebc1fe872bb828769693c12fd9770878fa3b59c179176105ea4
 SHA512 
c3880e67af03aa6d00300b5f56fd229ffe37da9af66e8c7c87a3bbf7abcb3a90b4858ec76093ef8f039a70d4da1d5cc7f7c687c05b6642299c95e1a07f9513bf
+DIST gmsh-4.9.5-source.tgz 14921704 BLAKE2B 
e805bd786154bf6ce8bebb2d2c38204a88d06a251c45fbe6dd37641a15e02291993c244f26a01faad2a6445a4852274e5481d4236b7a3d9b7ee65fc863f1b880
 SHA512 
4da61bdf03fb9466af80ac790e83cbab755c78d860d601474d7ebca220ac51cba620db310165021412dbecc1cf187ccdff47b8a78e0579339bb72cfa6484

diff --git a/sci-libs/gmsh/gmsh-4.8.4.ebuild b/sci-libs/gmsh/gmsh-4.9.5.ebuild
similarity index 88%
rename from sci-libs/gmsh/gmsh-4.8.4.ebuild
rename to sci-libs/gmsh/gmsh-4.9.5.ebuild
index 61d241a9af3a..7bfa0752988d 100644
--- a/sci-libs/gmsh/gmsh-4.8.4.ebuild
+++ b/sci-libs/gmsh/gmsh-4.9.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
-inherit cmake-utils flag-o-matic fortran-2 python-any-r1 toolchain-funcs
+inherit cmake fortran-2 python-any-r1 toolchain-funcs
 
 DESCRIPTION="A three-dimensional finite element mesh generator"
 HOMEPAGE="http://www.geuz.org/gmsh/;
@@ -41,7 +41,6 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P}-source
 
 PATCHES=(
-   "${FILESDIR}"/${P}-gcc11.patch
 )
 
 pkg_setup() {
@@ -54,7 +53,7 @@ src_configure() {
use blas && \
mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
 
-   mycmakeargs+=(
+   local mycmakeargs+=(
-DENABLE_BLAS_LAPACK="$(usex blas)"
-DENABLE_BUILD_DYNAMIC="$(usex shared)"
-DENABLE_CGNS="$(usex cgns)"
@@ -68,11 +67,11 @@ src_configure() {
-DENABLE_PETSC="$(usex petsc)"
-DENABLE_WRAP_PYTHON="$(usex python)")
 
-   cmake-utils_src_configure mycmakeargs
+   cmake_src_configure
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
 
if use examples ; then
dodoc -r demos tutorial



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2022-02-13 Thread Conrad Kostecki
commit: 39339f2e303f3a91a2849590b7462fb92062529d
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Feb 13 00:12:06 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Feb 13 21:07:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39339f2e

sci-libs/gmsh: fix DeprecatedInsinto

Signed-off-by: Conrad Kostecki  gentoo.org>

 sci-libs/gmsh/gmsh-4.8.4.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/gmsh/gmsh-4.8.4.ebuild b/sci-libs/gmsh/gmsh-4.8.4.ebuild
index 616a2fa69ffd..61d241a9af3a 100644
--- a/sci-libs/gmsh/gmsh-4.8.4.ebuild
+++ b/sci-libs/gmsh/gmsh-4.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -75,7 +75,7 @@ src_install() {
cmake-utils_src_install
 
if use examples ; then
-   insinto /usr/share/doc/${PF}
-   doins -r demos tutorial
+   dodoc -r demos tutorial
+   docompress -x /usr/share/doc/${PF}/{demos,tutorial}
fi
 }



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2022-01-03 Thread Matthias Maier
commit: 3ded1dcb3c80d0ba6214b8a33d809c54386d5c54
Author: Fabio Rossi  inwind  it>
AuthorDate: Fri Nov 26 18:36:03 2021 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Jan  3 21:37:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ded1dcb

sci-libs/gmsh: install also *.h and lib* files

The installation is conditional on the shared useflag

Closes: https://github.com/gentoo/gentoo/pull/23092
Closes: https://bugs.gentoo.org/827278
Signed-off-by: Fabio Rossi  inwind.it>
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/gmsh-4.8.4.ebuild | 3 ++-
 sci-libs/gmsh/metadata.xml  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-libs/gmsh/gmsh-4.8.4.ebuild b/sci-libs/gmsh/gmsh-4.8.4.ebuild
index 0c32a563f7a1..616a2fa69ffd 100644
--- a/sci-libs/gmsh/gmsh-4.8.4.ebuild
+++ b/sci-libs/gmsh/gmsh-4.8.4.ebuild
@@ -15,7 +15,7 @@ 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 X zlib"
+IUSE="blas cgns examples jpeg med metis mpi netgen opencascade petsc png 
python shared X zlib"
 
 REQUIRED_USE="med? ( mpi )"
 
@@ -56,6 +56,7 @@ src_configure() {
 
mycmakeargs+=(
-DENABLE_BLAS_LAPACK="$(usex blas)"
+   -DENABLE_BUILD_DYNAMIC="$(usex shared)"
-DENABLE_CGNS="$(usex cgns)"
-DENABLE_FLTK="$(usex X)"
-DENABLE_GRAPHICS="$(usex X)"

diff --git a/sci-libs/gmsh/metadata.xml b/sci-libs/gmsh/metadata.xml
index 4b35b67a85cd..896b5d03abdb 100644
--- a/sci-libs/gmsh/metadata.xml
+++ b/sci-libs/gmsh/metadata.xml
@@ -16,5 +16,6 @@
 Enable 3D Frontal triangulation using 
netgen lib
 Enable sci-mathematics/petsc support
 Enable OpenCASCADE support
+   Install shared library and headers

 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/

2021-12-02 Thread Sam James
commit: b72907b97d61fec2c9c3c10e1cc7bced23fd6741
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  2 18:43:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  2 18:43:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b72907b9

sci-libs/gmsh: add GCC 11 patch

Seems to build fine without this for me but it's reasonable, upstream,
and seems to help others.

Closes: https://bugs.gentoo.org/800536
Signed-off-by: Sam James  gentoo.org>

 sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch | 80 ++
 sci-libs/gmsh/gmsh-4.8.4.ebuild|  4 ++
 2 files changed, 84 insertions(+)

diff --git a/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch 
b/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch
new file mode 100644
index ..3f16ef476d7f
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch
@@ -0,0 +1,80 @@
+https://gitlab.onelab.info/gmsh/gmsh/-/commit/e7cd675083f72c6c01701cb0f16d1639aca121ba
+https://bugs.gentoo.org/800536
+
+From: Tristan Carel 
+Date: Wed, 28 Jul 2021 10:55:40 +0200
+Subject: [PATCH] Fix symbol conflict in picojson with GCC 11 internal macro
+
+Build issue on MacOS with GCC 11 from brew:
+```
+/usr/local/Cellar/gcc/11.1.0_1/lib/gcc/11/gcc/x86_64-apple-darwin20/11.1.0/include/serializeintrin.h:37:
 note: macro "_serialize" defined here
+   37 | #define _serialize()__builtin_ia32_serialize ()
+  |
+```
+--- a/Common/picojson.h
 b/Common/picojson.h
+@@ -186,8 +186,8 @@ public:
+ private:
+   template  value(const T *); // intentionally defined to block 
implicit conversion of pointer to bool
+   template  static void _indent(Iter os, int indent);
+-  template  void _serialize(Iter os, int indent) const;
+-  std::string _serialize(int indent) const;
++  template  void serialize_(Iter os, int indent) const;
++  std::string serialize_(int indent) const;
+   void clear();
+ };
+ 
+@@ -549,11 +549,11 @@ template  void serialize_str(const 
std::string , Iter oi) {
+ }
+ 
+ template  void value::serialize(Iter oi, bool prettify) const {
+-  return _serialize(oi, prettify ? 0 : -1);
++  return serialize_(oi, prettify ? 0 : -1);
+ }
+ 
+ inline std::string value::serialize(bool prettify) const {
+-  return _serialize(prettify ? 0 : -1);
++  return serialize_(prettify ? 0 : -1);
+ }
+ 
+ template  void value::_indent(Iter oi, int indent) {
+@@ -563,7 +563,7 @@ template  void value::_indent(Iter oi, int 
indent) {
+   }
+ }
+ 
+-template  void value::_serialize(Iter oi, int indent) const {
++template  void value::serialize_(Iter oi, int indent) const {
+   switch (type_) {
+   case string_type:
+ serialize_str(*u_.string_, oi);
+@@ -580,7 +580,7 @@ template  void value::_serialize(Iter oi, 
int indent) const {
+   if (indent != -1) {
+ _indent(oi, indent);
+   }
+-  i->_serialize(oi, indent);
++  i->serialize_(oi, indent);
+ }
+ if (indent != -1) {
+   --indent;
+@@ -608,7 +608,7 @@ template  void value::_serialize(Iter oi, 
int indent) const {
+   if (indent != -1) {
+ *oi++ = ' ';
+   }
+-  i->second._serialize(oi, indent);
++  i->second.serialize_(oi, indent);
+ }
+ if (indent != -1) {
+   --indent;
+@@ -628,9 +628,9 @@ template  void value::_serialize(Iter oi, 
int indent) const {
+   }
+ }
+ 
+-inline std::string value::_serialize(int indent) const {
++inline std::string value::serialize_(int indent) const {
+   std::string s;
+-  _serialize(std::back_inserter(s), indent);
++  serialize_(std::back_inserter(s), indent);
+   return s;
+ }
+ 
+GitLab

diff --git a/sci-libs/gmsh/gmsh-4.8.4.ebuild b/sci-libs/gmsh/gmsh-4.8.4.ebuild
index df5ea5533a0a..0c32a563f7a1 100644
--- a/sci-libs/gmsh/gmsh-4.8.4.ebuild
+++ b/sci-libs/gmsh/gmsh-4.8.4.ebuild
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P}-source
 
+PATCHES=(
+   "${FILESDIR}"/${P}-gcc11.patch
+)
+
 pkg_setup() {
fortran-2_pkg_setup
 }



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2021-09-19 Thread Andreas K. Hüttel
commit: e422c3e65fd1da9c1185ec6f24d7ff7fbffb399e
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Sep 19 16:35:54 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Sep 19 16:47:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e422c3e6

sci-libs/gmsh: Remove old

Bug: https://bugs.gentoo.org/786678
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas K. Huettel  gentoo.org>

 sci-libs/gmsh/Manifest  |  1 -
 sci-libs/gmsh/gmsh-4.6.0.ebuild | 76 -
 2 files changed, 77 deletions(-)

diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index d0057e753b7..d9e4bc7d1c1 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,2 +1 @@
-DIST gmsh-4.6.0-source.tgz 12048076 BLAKE2B 
2de1ded477ec675fa7bcb56c1e2a1352f6f6d642b9872dd5c167bafac0e7648cbbce6921b556d59796e035f40bc24e9ce38ccedb690ca54cbeab5f3ab94a
 SHA512 
9d6dde6b1f6b6193eb859cc6425a0161d42ccf449aeb84f43e1dba661b0ccb593821b9371272e06351c4dd26b7b8b6a5c39475c0f5b1332be188551abc88ae45
 DIST gmsh-4.8.4-source.tgz 13838352 BLAKE2B 
26c7f68e41d1c339c7d5fd499b2261c2ce79c38648df9f4f3853ba69421d59be36992d8aac1d1ebc1fe872bb828769693c12fd9770878fa3b59c179176105ea4
 SHA512 
c3880e67af03aa6d00300b5f56fd229ffe37da9af66e8c7c87a3bbf7abcb3a90b4858ec76093ef8f039a70d4da1d5cc7f7c687c05b6642299c95e1a07f9513bf

diff --git a/sci-libs/gmsh/gmsh-4.6.0.ebuild b/sci-libs/gmsh/gmsh-4.6.0.ebuild
deleted file mode 100644
index df5ea5533a0..000
--- a/sci-libs/gmsh/gmsh-4.6.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit cmake-utils flag-o-matic fortran-2 python-any-r1 toolchain-funcs
-
-DESCRIPTION="A three-dimensional finite element mesh generator"
-HOMEPAGE="http://www.geuz.org/gmsh/;
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz;
-
-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 X zlib"
-
-REQUIRED_USE="med? ( mpi )"
-
-RDEPEND="
-   virtual/fortran
-   X? ( x11-libs/fltk:1 )
-   blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
-   cgns? ( sci-libs/cgnslib )
-   jpeg? ( virtual/jpeg:0 )
-   med? ( sci-libs/med[mpi] )
-   opencascade? ( sci-libs/opencascade:* )
-   png? ( media-libs/libpng:0 )
-   petsc? ( sci-mathematics/petsc[mpi=] )
-   zlib? ( sys-libs/zlib )
-   mpi? ( virtual/mpi[cxx] )"
-
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   virtual/pkgconfig
-   python? ( dev-lang/swig:0 )
-   "
-
-S=${WORKDIR}/${P}-source
-
-pkg_setup() {
-   fortran-2_pkg_setup
-}
-
-src_configure() {
-   local mycmakeargs=( )
-
-   use blas && \
-   mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
-
-   mycmakeargs+=(
-   -DENABLE_BLAS_LAPACK="$(usex blas)"
-   -DENABLE_CGNS="$(usex cgns)"
-   -DENABLE_FLTK="$(usex X)"
-   -DENABLE_GRAPHICS="$(usex X)"
-   -DENABLE_MED="$(usex med)"
-   -DENABLE_MPI="$(usex mpi)"
-   -DENABLE_METIS="$(usex metis)"
-   -DENABLE_NETGEN="$(usex netgen)"
-   -DENABLE_OCC="$(usex opencascade)"
-   -DENABLE_PETSC="$(usex petsc)"
-   -DENABLE_WRAP_PYTHON="$(usex python)")
-
-   cmake-utils_src_configure mycmakeargs
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   if use examples ; then
-   insinto /usr/share/doc/${PF}
-   doins -r demos tutorial
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2021-06-19 Thread Matthias Maier
commit: eac3b3f1ac50642de1223f59b1e1ce28f379c765
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Jun 20 04:06:04 2021 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jun 20 04:06:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac3b3f1

sci-libs/gmsh: version bump to 4.8.4, fix gcc-11 compilation error

Closes: https://bugs.gentoo.org/786678
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/Manifest  |  1 +
 sci-libs/gmsh/gmsh-4.8.4.ebuild | 76 +
 2 files changed, 77 insertions(+)

diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 5caf274443b..d0057e753b7 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1 +1,2 @@
 DIST gmsh-4.6.0-source.tgz 12048076 BLAKE2B 
2de1ded477ec675fa7bcb56c1e2a1352f6f6d642b9872dd5c167bafac0e7648cbbce6921b556d59796e035f40bc24e9ce38ccedb690ca54cbeab5f3ab94a
 SHA512 
9d6dde6b1f6b6193eb859cc6425a0161d42ccf449aeb84f43e1dba661b0ccb593821b9371272e06351c4dd26b7b8b6a5c39475c0f5b1332be188551abc88ae45
+DIST gmsh-4.8.4-source.tgz 13838352 BLAKE2B 
26c7f68e41d1c339c7d5fd499b2261c2ce79c38648df9f4f3853ba69421d59be36992d8aac1d1ebc1fe872bb828769693c12fd9770878fa3b59c179176105ea4
 SHA512 
c3880e67af03aa6d00300b5f56fd229ffe37da9af66e8c7c87a3bbf7abcb3a90b4858ec76093ef8f039a70d4da1d5cc7f7c687c05b6642299c95e1a07f9513bf

diff --git a/sci-libs/gmsh/gmsh-4.8.4.ebuild b/sci-libs/gmsh/gmsh-4.8.4.ebuild
new file mode 100644
index 000..df5ea5533a0
--- /dev/null
+++ b/sci-libs/gmsh/gmsh-4.8.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit cmake-utils flag-o-matic fortran-2 python-any-r1 toolchain-funcs
+
+DESCRIPTION="A three-dimensional finite element mesh generator"
+HOMEPAGE="http://www.geuz.org/gmsh/;
+SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz;
+
+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 X zlib"
+
+REQUIRED_USE="med? ( mpi )"
+
+RDEPEND="
+   virtual/fortran
+   X? ( x11-libs/fltk:1 )
+   blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
+   cgns? ( sci-libs/cgnslib )
+   jpeg? ( virtual/jpeg:0 )
+   med? ( sci-libs/med[mpi] )
+   opencascade? ( sci-libs/opencascade:* )
+   png? ( media-libs/libpng:0 )
+   petsc? ( sci-mathematics/petsc[mpi=] )
+   zlib? ( sys-libs/zlib )
+   mpi? ( virtual/mpi[cxx] )"
+
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+   python? ( dev-lang/swig:0 )
+   "
+
+S=${WORKDIR}/${P}-source
+
+pkg_setup() {
+   fortran-2_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=( )
+
+   use blas && \
+   mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
+
+   mycmakeargs+=(
+   -DENABLE_BLAS_LAPACK="$(usex blas)"
+   -DENABLE_CGNS="$(usex cgns)"
+   -DENABLE_FLTK="$(usex X)"
+   -DENABLE_GRAPHICS="$(usex X)"
+   -DENABLE_MED="$(usex med)"
+   -DENABLE_MPI="$(usex mpi)"
+   -DENABLE_METIS="$(usex metis)"
+   -DENABLE_NETGEN="$(usex netgen)"
+   -DENABLE_OCC="$(usex opencascade)"
+   -DENABLE_PETSC="$(usex petsc)"
+   -DENABLE_WRAP_PYTHON="$(usex python)")
+
+   cmake-utils_src_configure mycmakeargs
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   if use examples ; then
+   insinto /usr/share/doc/${PF}
+   doins -r demos tutorial
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2021-04-09 Thread Matthias Maier
commit: 8802d5c036f208bf430aadfc1d14e2dbcceffc97
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Apr  9 16:30:47 2021 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri Apr  9 18:26:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8802d5c0

sci-libs/gmsh: add a useflag constraint

Closes: https://bugs.gentoo.org/771681
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/gmsh-4.6.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/gmsh/gmsh-4.6.0.ebuild b/sci-libs/gmsh/gmsh-4.6.0.ebuild
index 82c4c63a69b..df5ea5533a0 100644
--- a/sci-libs/gmsh/gmsh-4.6.0.ebuild
+++ b/sci-libs/gmsh/gmsh-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ RDEPEND="
med? ( sci-libs/med[mpi] )
opencascade? ( sci-libs/opencascade:* )
png? ( media-libs/libpng:0 )
-   petsc? ( sci-mathematics/petsc )
+   petsc? ( sci-mathematics/petsc[mpi=] )
zlib? ( sys-libs/zlib )
mpi? ( virtual/mpi[cxx] )"
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2020-12-20 Thread Marek Szuba
commit: 986f97e49405968bb1a9b65dabf30a6e13e84937
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Dec 20 13:39:26 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Dec 20 14:52:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986f97e4

sci-libs/gmsh: drop useless IUSE=lua

No mention of "Lua" anywhere in the source tarball, builds exactly
the same way regardless of the value of this USE flag as well as regardless
of whether or not Lua is present on the build system (unsurprising
given the above), and according to
http://www.geuz.org/pipermail/gmsh/2011/006218.html
gmsh Lua bindings got deprecated by Python ones almost a decade ago.

Bug: https://bugs.gentoo.org/752837
Signed-off-by: Marek Szuba  gentoo.org>

 sci-libs/gmsh/gmsh-4.6.0.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-libs/gmsh/gmsh-4.6.0.ebuild b/sci-libs/gmsh/gmsh-4.6.0.ebuild
index 9e50b09d304..a4df1e0d12e 100644
--- a/sci-libs/gmsh/gmsh-4.6.0.ebuild
+++ b/sci-libs/gmsh/gmsh-4.6.0.ebuild
@@ -15,7 +15,7 @@ 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 lua med metis mpi netgen opencascade petsc png 
python X zlib"
+IUSE="blas cgns examples jpeg med metis mpi netgen opencascade petsc png 
python X zlib"
 
 REQUIRED_USE="med? ( mpi )"
 
@@ -25,7 +25,6 @@ RDEPEND="
blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
cgns? ( sci-libs/cgnslib )
jpeg? ( virtual/jpeg:0 )
-   lua? ( dev-lang/lua:0 )
med? ( sci-libs/med[mpi] )
opencascade? ( sci-libs/opencascade:* )
png? ( media-libs/libpng:0 )



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2020-09-11 Thread Matthias Maier
commit: bce3c7d3c6e41e293ce3c69d97d2c21bd9ac771a
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Sep 11 14:53:39 2020 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri Sep 11 14:53:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bce3c7d3

sci-libs/gmsh: drop old

Closes: https://bugs.gentoo.org/693284
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/Manifest  |  1 -
 sci-libs/gmsh/gmsh-4.4.1.ebuild | 76 -
 2 files changed, 77 deletions(-)

diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 0c39d594595..5caf274443b 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,2 +1 @@
-DIST gmsh-4.4.1-source.tgz 13227645 BLAKE2B 
68df0a54655d2a85012d2961daafbe92f0295661f6f71b0be4c7a78b7c814af21b39b29e65a201c4918d7e31462ac391b208fcceca356c4d9974c5de3c88da13
 SHA512 
cfdd353de051d1deffca90bfa31a007a466d39c145e704612b92441556dec0c8d7b58ab07c2fa3166de893d99f0308ffb66b4f321172ea60da0b6db907aa7a2e
 DIST gmsh-4.6.0-source.tgz 12048076 BLAKE2B 
2de1ded477ec675fa7bcb56c1e2a1352f6f6d642b9872dd5c167bafac0e7648cbbce6921b556d59796e035f40bc24e9ce38ccedb690ca54cbeab5f3ab94a
 SHA512 
9d6dde6b1f6b6193eb859cc6425a0161d42ccf449aeb84f43e1dba661b0ccb593821b9371272e06351c4dd26b7b8b6a5c39475c0f5b1332be188551abc88ae45

diff --git a/sci-libs/gmsh/gmsh-4.4.1.ebuild b/sci-libs/gmsh/gmsh-4.4.1.ebuild
deleted file mode 100644
index af727805d6c..000
--- a/sci-libs/gmsh/gmsh-4.4.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils flag-o-matic fortran-2 python-any-r1 toolchain-funcs
-
-DESCRIPTION="A three-dimensional finite element mesh generator"
-HOMEPAGE="http://www.geuz.org/gmsh/;
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz;
-
-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 lua med metis mpi netgen opencascade petsc png 
python X zlib"
-
-REQUIRED_USE="med? ( mpi )"
-
-RDEPEND="
-   virtual/fortran
-   X? ( x11-libs/fltk:1 )
-   blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
-   cgns? ( sci-libs/cgnslib )
-   jpeg? ( virtual/jpeg:0 )
-   lua? ( dev-lang/lua:0 )
-   med? ( sci-libs/med )
-   opencascade? ( sci-libs/opencascade:* )
-   png? ( media-libs/libpng:0 )
-   petsc? ( sci-mathematics/petsc )
-   zlib? ( sys-libs/zlib )
-   mpi? ( virtual/mpi[cxx] )"
-
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   virtual/pkgconfig
-   python? ( dev-lang/swig:0 )
-   "
-
-S=${WORKDIR}/${P}-source
-
-pkg_setup() {
-   fortran-2_pkg_setup
-}
-
-src_configure() {
-   local mycmakeargs=( )
-
-   use blas && \
-   mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
-
-   mycmakeargs+=(
-   -DENABLE_BLAS_LAPACK="$(usex blas)"
-   -DENABLE_CGNS="$(usex cgns)"
-   -DENABLE_FLTK="$(usex X)"
-   -DENABLE_GRAPHICS="$(usex X)"
-   -DENABLE_MED="$(usex med)"
-   -DENABLE_METIS="$(usex metis)"
-   -DENABLE_NETGEN="$(usex netgen)"
-   -DENABLE_OCC="$(usex opencascade)"
-   -DENABLE_PETSC="$(usex petsc)"
-   -DENABLE_WRAP_PYTHON="$(usex python)")
-
-   cmake-utils_src_configure mycmakeargs
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   if use examples ; then
-   insinto /usr/share/doc/${PF}
-   doins -r demos tutorial
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2020-09-11 Thread Matthias Maier
commit: 1ccecb96f5cfc74b26a26dc13fa90e01cba4a598
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Sep 11 14:24:15 2020 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri Sep 11 14:50:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ccecb96

sci-libs/gmsh: fix MPI support

Closes: https://bugs.gentoo.org/694470
Closes: https://bugs.gentoo.org/693448
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/gmsh-4.6.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-libs/gmsh/gmsh-4.6.0.ebuild b/sci-libs/gmsh/gmsh-4.6.0.ebuild
index 06538f3d21c..9e50b09d304 100644
--- a/sci-libs/gmsh/gmsh-4.6.0.ebuild
+++ b/sci-libs/gmsh/gmsh-4.6.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
cgns? ( sci-libs/cgnslib )
jpeg? ( virtual/jpeg:0 )
lua? ( dev-lang/lua:0 )
-   med? ( sci-libs/med )
+   med? ( sci-libs/med[mpi] )
opencascade? ( sci-libs/opencascade:* )
png? ( media-libs/libpng:0 )
petsc? ( sci-mathematics/petsc )
@@ -57,6 +57,7 @@ src_configure() {
-DENABLE_FLTK="$(usex X)"
-DENABLE_GRAPHICS="$(usex X)"
-DENABLE_MED="$(usex med)"
+   -DENABLE_MPI="$(usex mpi)"
-DENABLE_METIS="$(usex metis)"
-DENABLE_NETGEN="$(usex netgen)"
-DENABLE_OCC="$(usex opencascade)"



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2020-09-11 Thread Matthias Maier
commit: 49db50cda939f4d0c931b1d962c20394affdfbac
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Sep 11 14:22:48 2020 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri Sep 11 14:50:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49db50cd

sci-libs/gmsh: version bump to 4.6.0

Closes: https://bugs.gentoo.org/715194
Closes: https://bugs.gentoo.org/708386
Closes: https://bugs.gentoo.org/735478
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/Manifest  |  1 +
 sci-libs/gmsh/gmsh-4.6.0.ebuild | 76 +
 2 files changed, 77 insertions(+)

diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 810e33fd344..0c39d594595 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1 +1,2 @@
 DIST gmsh-4.4.1-source.tgz 13227645 BLAKE2B 
68df0a54655d2a85012d2961daafbe92f0295661f6f71b0be4c7a78b7c814af21b39b29e65a201c4918d7e31462ac391b208fcceca356c4d9974c5de3c88da13
 SHA512 
cfdd353de051d1deffca90bfa31a007a466d39c145e704612b92441556dec0c8d7b58ab07c2fa3166de893d99f0308ffb66b4f321172ea60da0b6db907aa7a2e
+DIST gmsh-4.6.0-source.tgz 12048076 BLAKE2B 
2de1ded477ec675fa7bcb56c1e2a1352f6f6d642b9872dd5c167bafac0e7648cbbce6921b556d59796e035f40bc24e9ce38ccedb690ca54cbeab5f3ab94a
 SHA512 
9d6dde6b1f6b6193eb859cc6425a0161d42ccf449aeb84f43e1dba661b0ccb593821b9371272e06351c4dd26b7b8b6a5c39475c0f5b1332be188551abc88ae45

diff --git a/sci-libs/gmsh/gmsh-4.6.0.ebuild b/sci-libs/gmsh/gmsh-4.6.0.ebuild
new file mode 100644
index 000..06538f3d21c
--- /dev/null
+++ b/sci-libs/gmsh/gmsh-4.6.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake-utils flag-o-matic fortran-2 python-any-r1 toolchain-funcs
+
+DESCRIPTION="A three-dimensional finite element mesh generator"
+HOMEPAGE="http://www.geuz.org/gmsh/;
+SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz;
+
+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 lua med metis mpi netgen opencascade petsc png 
python X zlib"
+
+REQUIRED_USE="med? ( mpi )"
+
+RDEPEND="
+   virtual/fortran
+   X? ( x11-libs/fltk:1 )
+   blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
+   cgns? ( sci-libs/cgnslib )
+   jpeg? ( virtual/jpeg:0 )
+   lua? ( dev-lang/lua:0 )
+   med? ( sci-libs/med )
+   opencascade? ( sci-libs/opencascade:* )
+   png? ( media-libs/libpng:0 )
+   petsc? ( sci-mathematics/petsc )
+   zlib? ( sys-libs/zlib )
+   mpi? ( virtual/mpi[cxx] )"
+
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+   python? ( dev-lang/swig:0 )
+   "
+
+S=${WORKDIR}/${P}-source
+
+pkg_setup() {
+   fortran-2_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=( )
+
+   use blas && \
+   mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
+
+   mycmakeargs+=(
+   -DENABLE_BLAS_LAPACK="$(usex blas)"
+   -DENABLE_CGNS="$(usex cgns)"
+   -DENABLE_FLTK="$(usex X)"
+   -DENABLE_GRAPHICS="$(usex X)"
+   -DENABLE_MED="$(usex med)"
+   -DENABLE_METIS="$(usex metis)"
+   -DENABLE_NETGEN="$(usex netgen)"
+   -DENABLE_OCC="$(usex opencascade)"
+   -DENABLE_PETSC="$(usex petsc)"
+   -DENABLE_WRAP_PYTHON="$(usex python)")
+
+   cmake-utils_src_configure mycmakeargs
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   if use examples ; then
+   insinto /usr/share/doc/${PF}
+   doins -r demos tutorial
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2019-09-03 Thread Matthias Maier
commit: 556266fadda162b3ffcac90d1824a9960e1caae1
Author: Matthias Maier  gentoo  org>
AuthorDate: Tue Sep  3 22:33:56 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Sep  3 22:34:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=556266fa

sci-libs/gmsh: update dependencies for new med ebuild

Bug: https://bugs.gentoo.org/show_bug.cgi?id=693448
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/gmsh-4.4.1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/gmsh/gmsh-4.4.1.ebuild b/sci-libs/gmsh/gmsh-4.4.1.ebuild
index fa56d3eae13..af727805d6c 100644
--- a/sci-libs/gmsh/gmsh-4.4.1.ebuild
+++ b/sci-libs/gmsh/gmsh-4.4.1.ebuild
@@ -17,6 +17,8 @@ KEYWORDS="~amd64 ~x86"
 ## cgns is not compiling ATM, maybe fix cgns lib first
 IUSE="blas cgns examples jpeg lua med metis mpi netgen opencascade petsc png 
python X zlib"
 
+REQUIRED_USE="med? ( mpi )"
+
 RDEPEND="
virtual/fortran
X? ( x11-libs/fltk:1 )



[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/

2019-08-05 Thread Matthias Maier
commit: d391eb27ea4151ffd950c76f07d1b79c42d469c8
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Aug  5 05:42:52 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Aug  5 06:51:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d391eb27

sci-libs/gmsh: package migration from ::science overlay

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/gmsh/Manifest  |  1 +
 sci-libs/gmsh/gmsh-4.4.1.ebuild | 74 +
 sci-libs/gmsh/metadata.xml  | 20 +++
 3 files changed, 95 insertions(+)

diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
new file mode 100644
index 000..810e33fd344
--- /dev/null
+++ b/sci-libs/gmsh/Manifest
@@ -0,0 +1 @@
+DIST gmsh-4.4.1-source.tgz 13227645 BLAKE2B 
68df0a54655d2a85012d2961daafbe92f0295661f6f71b0be4c7a78b7c814af21b39b29e65a201c4918d7e31462ac391b208fcceca356c4d9974c5de3c88da13
 SHA512 
cfdd353de051d1deffca90bfa31a007a466d39c145e704612b92441556dec0c8d7b58ab07c2fa3166de893d99f0308ffb66b4f321172ea60da0b6db907aa7a2e

diff --git a/sci-libs/gmsh/gmsh-4.4.1.ebuild b/sci-libs/gmsh/gmsh-4.4.1.ebuild
new file mode 100644
index 000..fa56d3eae13
--- /dev/null
+++ b/sci-libs/gmsh/gmsh-4.4.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils flag-o-matic fortran-2 python-any-r1 toolchain-funcs
+
+DESCRIPTION="A three-dimensional finite element mesh generator"
+HOMEPAGE="http://www.geuz.org/gmsh/;
+SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz;
+
+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 lua med metis mpi netgen opencascade petsc png 
python X zlib"
+
+RDEPEND="
+   virtual/fortran
+   X? ( x11-libs/fltk:1 )
+   blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
+   cgns? ( sci-libs/cgnslib )
+   jpeg? ( virtual/jpeg:0 )
+   lua? ( dev-lang/lua:0 )
+   med? ( sci-libs/med )
+   opencascade? ( sci-libs/opencascade:* )
+   png? ( media-libs/libpng:0 )
+   petsc? ( sci-mathematics/petsc )
+   zlib? ( sys-libs/zlib )
+   mpi? ( virtual/mpi[cxx] )"
+
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+   python? ( dev-lang/swig:0 )
+   "
+
+S=${WORKDIR}/${P}-source
+
+pkg_setup() {
+   fortran-2_pkg_setup
+}
+
+src_configure() {
+   local mycmakeargs=( )
+
+   use blas && \
+   mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
+
+   mycmakeargs+=(
+   -DENABLE_BLAS_LAPACK="$(usex blas)"
+   -DENABLE_CGNS="$(usex cgns)"
+   -DENABLE_FLTK="$(usex X)"
+   -DENABLE_GRAPHICS="$(usex X)"
+   -DENABLE_MED="$(usex med)"
+   -DENABLE_METIS="$(usex metis)"
+   -DENABLE_NETGEN="$(usex netgen)"
+   -DENABLE_OCC="$(usex opencascade)"
+   -DENABLE_PETSC="$(usex petsc)"
+   -DENABLE_WRAP_PYTHON="$(usex python)")
+
+   cmake-utils_src_configure mycmakeargs
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   if use examples ; then
+   insinto /usr/share/doc/${PF}
+   doins -r demos tutorial
+   fi
+}

diff --git a/sci-libs/gmsh/metadata.xml b/sci-libs/gmsh/metadata.xml
new file mode 100644
index 000..20c781af95c
--- /dev/null
+++ b/sci-libs/gmsh/metadata.xml
@@ -0,0 +1,20 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   tam...@gentoo.org
+   Matthias Maier
+   
+   
+   s...@gentoo.org
+   Gentoo Science Project
+   
+   
+Enables cgns output support
+Enables metis support
+Enables med support
+Enable 3D Frontal triangulation using 
netgen lib
+Enable sci-mathematics/petsc support
+Enable OpenCASCADE support
+   
+