gentoo resync : 29.12.2022

5 files changed, 163 insertions, 18 deletions

diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index f76e4aff6141..d99868f2dc62 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,3 +1,6 @@
+AUX gmsh-4.9.5-opencascade.patch 1136 BLAKE2B 3613e9a19c76c107eec2090a0a12474d94ac1d548cf6b5137644e3a7834c12a9a8c6dc63d217b8473c385b2ea5bd1ea3d9699e61cbc897bf7cdd121ba00bdff2 SHA512 3774335121ae1d7b4a2369b36e1dab84e9b08eb6336ad1ed6893e0b2260402cb750e202f0244d61c8772d809dd31d95adfb19d8deee5255185c968838e495cd5
+DIST gmsh-4.10.3-source.tgz 14994941 BLAKE2B b9229f81fc8daabdb3b3db3acd50a0a0e602fec1423bc67a0033a02217c908910eeb1f9bd1cbc57fe2d24b566f256b969fe92e9e9ceefe4cd5af34dd07cf1a9e SHA512 863c5a7fe13095afad37b4450855b2079d034222b5a595fc25b2b0d840d8ef63ceafbbf56ea642b3c3e9277faabe08a2cc19a7a3126a8e12e9d4117243244653
 DIST gmsh-4.9.5-source.tgz 14921704 BLAKE2B e805bd786154bf6ce8bebb2d2c38204a88d06a251c45fbe6dd37641a15e02291993c244f26a01faad2a6445a4852274e5481d4236b7a3d9b7ee65fc863f1b880 SHA512 4da61bdf03fb9466af80ac790e83c8888bab755c78d860d601474d7ebca220ac51cba620db310165021412dbecc1cf187ccdff47b8a78e0579339bb72cfa6484
-EBUILD gmsh-4.9.5-r1.ebuild 1839 BLAKE2B 410b50fbde4f16a87bf96c61a2971b43a8361e066755eefde825767a4766a7d37496a961a340ece6747f84ba50d8c93dd7c7308930782dc4d2931e00ab345c8d SHA512 d7aa4fb98209e3f1f447be4656148faa11c4dca0e0797defc7ca4ec86bde4140fd473d2d0449f1a6df15ee4a8c88ae002b58e16fbda3adbac1ecf1fae3f52bf4
-MISC metadata.xml 802 BLAKE2B 5ddd7f70af792e529ca9b5197b80775cea3390fdb04fdc65df5e43333aac0ac3f1d5f2fc16c32c5eb5336f3ec12ad4b2fefd6b055a3f2361f42a2bd77aa83b47 SHA512 08356d610e96e262c6d2b49647835e8dfc96ebb7efa3b9c078f5d930c83eb23211c9b61bd57fdcdbc067d957b47ab0c8c650b15169fa40c3a8da5aab8b325666
+EBUILD gmsh-4.10.3.ebuild 2640 BLAKE2B c0e979a42b57d719bc98962515676fde72740f481d53a214509452c2e4d057b9afacfe40abd4af46b0ff38ad900fb24563e71475ab751b92ef36856910f5a84b SHA512 579b92da1da3480491a2c1be72dfb2acc0fe6cc0715c892ea5bc162085d63d92e2b026f2fbfe0a07cebc1d2fb213e6839a1bd0cdb2ea4e2e09d1a9e5cb0f5508
+EBUILD gmsh-4.9.5-r2.ebuild 1914 BLAKE2B ba0bc6302edfa5e3cc21ae2dee9d4dcb30af22a1941b50bca489382fb93a50d98907bea6a1eb335eb24dc5bfbc797360965cf744f284ec47d1f15e81507695e5 SHA512 c8098c5fd7aa38efa369f3938c8ea958e6a6db91bf57a552e6d32427c1e5de3772520bf4d8980c9767f3eb05b520b872ab0544bceea5b5347b8d3d7855d21537
+MISC metadata.xml 1216 BLAKE2B d7a71c97766032f77b2152313368a583168c20a38b065b048bfdfc774c2b4006939806994751d0aecabd53372f587f846da3e8b7c04baf0e5beaefffc9163702 SHA512 b5cabe48e5ab3ba2e18bded74c15d7c886aac9421e0b18edffc81995cfacf5b11ab787fb68f890c3910e6a99a83ceb3bfef74bb6ce164b536b038c4d40ee6574
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 000000000000..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.10.3.ebuild b/sci-libs/gmsh/gmsh-4.10.3.ebuild
new file mode 100644
index 000000000000..81dc07c58474
--- /dev/null
+++ b/sci-libs/gmsh/gmsh-4.10.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+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"
+
+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)"
+		-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
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples ; then
+		dodoc -r examples tutorials
+		docompress -x /usr/share/doc/${PF}/{examples,tutorials}
+	fi
+}
diff --git a/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild b/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
index 902c8379230d..48328b69280e 100644
--- a/sci-libs/gmsh/gmsh-4.9.5-r1.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"
@@ -24,7 +24,7 @@ RDEPEND="
 	X? ( x11-libs/fltk:1[xft] )
 	blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
 	cgns? ( sci-libs/cgnslib )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo )
 	med? ( sci-libs/med[mpi] )
 	opencascade? ( sci-libs/opencascade:* )
 	png? ( media-libs/libpng:0 )
@@ -38,10 +38,9 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig:0 )
 	"
 
-S=${WORKDIR}/${P}-source
+S="${WORKDIR}"/${P}-source
 
-PATCHES=(
-)
+PATCHES=( "${FILESDIR}"/${P}-opencascade.patch )
 
 pkg_setup() {
 	fortran-2_pkg_setup
@@ -53,7 +52,7 @@ src_configure() {
 	use blas && \
 		mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
 
-	local mycmakeargs+=(
+	mycmakeargs+=(
 		-DENABLE_BLAS_LAPACK="$(usex blas)"
 		-DENABLE_BUILD_DYNAMIC="$(usex shared)"
 		-DENABLE_CGNS="$(usex cgns)"
@@ -65,6 +64,7 @@ src_configure() {
 		-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
@@ -74,7 +74,7 @@ src_install() {
 	cmake_src_install
 
 	if use examples ; then
-		dodoc -r demos tutorial
-		docompress -x /usr/share/doc/${PF}/{demos,tutorial}
+		dodoc -r examples tutorials
+		docompress -x /usr/share/doc/${PF}/{examples,tutorials}
 	fi
 }
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>