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

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

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 000000000000..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
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? ( <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,8 +69,6 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig:0 )
 	"
 
-S="${WORKDIR}"/${P}-source
-
 PATCHES=( "${FILESDIR}"/${PN}-4.9.5-opencascade.patch )
 
 pkg_setup() {
diff --git a/sci-libs/gmsh/gmsh-4.11.1.ebuild b/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild
index faf9c16b04ea..ee7ff513289d 100644
--- a/sci-libs/gmsh/gmsh-4.11.1.ebuild
+++ b/sci-libs/gmsh/gmsh-4.11.1-r1.ebuild
@@ -10,6 +10,7 @@ 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"
+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
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? ( <sci-libs/metis-5.2.0 )
 	opencascade? ( sci-libs/opencascade:* )
 	png? ( media-libs/libpng:0 )
 	petsc? ( sci-mathematics/petsc[mpi=] )
 	zlib? ( sys-libs/zlib )
-	mpi? ( virtual/mpi[cxx] )"
+	mpi? ( virtual/mpi[cxx] )
+	"
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -38,8 +41,6 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig:0 )
 	"
 
-S="${WORKDIR}"/${P}-source
-
 PATCHES=( "${FILESDIR}"/${P}-opencascade.patch )
 
 pkg_setup() {