gentoo resync : 29.12.2022

4 files changed, 127 insertions, 22 deletions

diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest
index d6e2ca21d138..85b4beed0c6c 100644
--- a/sci-libs/hypre/Manifest
+++ b/sci-libs/hypre/Manifest
@@ -1,5 +1,7 @@
 DIST hypre-2.20.0.tar.gz 5971556 BLAKE2B 63cef33913f1f4c569c396dd18227ae4346807e659306521e9340789944e22dc70be3b9baec7fb1385f562b53045e5c87fcad604aa242a941199ff9fe0a0c21d SHA512 842868b494960506fa3df4e72abb42084d701ec14305f9b040b9dcb578b4bbdaa8afb079057a7e53ad721b440c72ee804775c3b8319f2d01a2f281920a9cd350
 DIST hypre-2.21.0.tar.gz 6017038 BLAKE2B 500885cbd9f2b79c8740d1031a3dd9e5fd141dccfe2101ceed555cb7cbef77989b6af2c80f9b08e8efd6e2401269415532614d40512f93371397389e0fb15595 SHA512 20f860b0c25190608b50d577e03ab241d8caa1dbf7a7e56484e984710a586b1f4b63c72135488a756f42aa6a58d0a26b0c4e6e1680c3f7faabdf68e2559293b0
-EBUILD hypre-2.20.0.ebuild 2786 BLAKE2B e83539542a2b250cc17700f72a3835978d33e5b9681100c219b23eb45cb65a7e0c5ec704dca793bf75dabc6e68b24604079c57655ffb16c444c693ceb633e241 SHA512 b214006890a03be04184e0c4bbfebd2480fd2d9e586bc6735a1b6af430bba808fedd31f9f98002ae69f0d7ba47f67c3aee264e37e6595f30ec96f7bb8c3a1eab
-EBUILD hypre-2.21.0.ebuild 2779 BLAKE2B f71b1e6911f8a6e586c6b8d0a0d7a7a87038c0fa78548f21251f3c702d208f13ebb42a48e0c6447e6ece36eafd2003a7730b14f0f4381deea49736615a8b52c4 SHA512 82912a5d3327850a6ba4bfaa88d2a33fd06e58e2c5e4e264df0f8139847be20361c1520e5e98b1b77e3d678d9ea8d6c9a627214a8a0d931703149063b28b7939
+DIST hypre-2.24.0.tar.gz 6116863 BLAKE2B fade61df0dcef3a93c8f4ff32eb72adbef56d572b8ef18202d8cdbbbd4c53a46a21f3478cf10720c64b1eaf0731e5a6f2236736ec9631f8500ce966f55d03cfe SHA512 4f27e99ba2923c6394ccc3705930897430becef840415004d6fae2fa311fef5b2399265ec1211364f883b35d00933523e65888419890902bcd4e1e6942b66560
+EBUILD hypre-2.20.0.ebuild 2601 BLAKE2B 8369a62a5984128a6c16241afd3e888634176bed2ca65e1bae0bbd98c32a09b42ddd8e01ac72a392d5fd693ec4105b9ee65b8c7ca83945f9a972ce964c357447 SHA512 b72eb3ad60e1f2640cbdff6ae85025794d49cba2d7813cef8719c9667bec9aa37e14230c495799de2728280d7bf2909458165694ff8a4908048d77b15288d207
+EBUILD hypre-2.21.0.ebuild 2594 BLAKE2B 5f2114028d0b4e79be150d198f5e1dcb09c54384d4dd3e19da7d2886d3d3e101e1f8b3696fad65ae3c9bd4c0dd0a646aa9d3b0571bd605e36657aa10af67f046 SHA512 00f80fc4a1a3fe80fcfa0b3c37aa99721f29a3e7efcbb11d1c73d6807d8599d30eed5bc3d33fb1f28d1225a96debf0aab6fdbe07c19d0f06912e282a7e48c5b4
+EBUILD hypre-2.24.0.ebuild 2594 BLAKE2B 5f2114028d0b4e79be150d198f5e1dcb09c54384d4dd3e19da7d2886d3d3e101e1f8b3696fad65ae3c9bd4c0dd0a646aa9d3b0571bd605e36657aa10af67f046 SHA512 00f80fc4a1a3fe80fcfa0b3c37aa99721f29a3e7efcbb11d1c73d6807d8599d30eed5bc3d33fb1f28d1225a96debf0aab6fdbe07c19d0f06912e282a7e48c5b4
 MISC metadata.xml 616 BLAKE2B e048d1098bac6c90fe41d2971044618675902957e8b2e1acbc6b4a0b1ad045d33d43f7fecea667848e533796ce05cd5735fecbea9b84bd8950f3bf38d84e11fc SHA512 c24906c2f269b820f3d926b805e5debac9d2fa864f15e800da698a93f517f6b6d2c14987d8edac0691627e892d3c2a2b8e58075feb8db2c701200861fdb05195
diff --git a/sci-libs/hypre/hypre-2.20.0.ebuild b/sci-libs/hypre/hypre-2.20.0.ebuild
index c7a163995f57..f1b93093da7b 100644
--- a/sci-libs/hypre/hypre-2.20.0.ebuild
+++ b/sci-libs/hypre/hypre-2.20.0.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
@@ -27,16 +27,12 @@ DEPEND="${RDEPEND}"
 DOCS=( CHANGELOG COPYRIGHT README )
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
-		tc-check-openmp
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then
-		ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
-		die "Need an OpenMP capable compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use fortran && fortran-2_pkg_setup
 }
 
 src_prepare() {
@@ -60,8 +56,9 @@ src_configure() {
 	tc-export CC CXX
 	append-flags -Dhypre_dgesvd=dgesvd_
 
-	if use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
-		append-flags -fopenmp && append-ldflags -fopenmp
+	if use openmp ; then
+		append-flags -fopenmp
+		append-ldflags -fopenmp
 	fi
 
 	if use mpi ; then
diff --git a/sci-libs/hypre/hypre-2.21.0.ebuild b/sci-libs/hypre/hypre-2.21.0.ebuild
index dea4da0e5cd7..8c9d5ab220f1 100644
--- a/sci-libs/hypre/hypre-2.21.0.ebuild
+++ b/sci-libs/hypre/hypre-2.21.0.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
@@ -28,16 +28,12 @@ DEPEND="${RDEPEND}"
 DOCS=( CHANGELOG COPYRIGHT README )
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
-		tc-check-openmp
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then
-		ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
-		die "Need an OpenMP capable compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use fortran && fortran-2_pkg_setup
 }
 
 src_prepare() {
@@ -61,8 +57,9 @@ src_configure() {
 	tc-export CC CXX
 	append-flags -Dhypre_dgesvd=dgesvd_
 
-	if use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
-		append-flags -fopenmp && append-ldflags -fopenmp
+	if use openmp ; then
+		append-flags -fopenmp
+		append-ldflags -fopenmp
 	fi
 
 	if use mpi ; then
diff --git a/sci-libs/hypre/hypre-2.24.0.ebuild b/sci-libs/hypre/hypre-2.24.0.ebuild
new file mode 100644
index 000000000000..8c9d5ab220f1
--- /dev/null
+++ b/sci-libs/hypre/hypre-2.24.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="Parallel matrix preconditioners library"
+HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods"
+SRC_URI="https://github.com/hypre-space/hypre/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples fortran int64 openmp mpi"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	sci-libs/superlu:=
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG COPYRIGHT README )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# link with system superlu and propagate LDFLAGS
+	sed -e "s:@LIBS@:@LIBS@ $($(tc-getPKG_CONFIG) --libs superlu):" \
+		-e 's:_SHARED@:_SHARED@ $(LDFLAGS):g' \
+		-i src/config/Makefile.config.in || die
+
+	sed -e '/HYPRE_ARCH/s: = :=:g' \
+		-i src/configure || die
+
+	# link with system blas and lapack
+	sed -e '/^BLASFILES/d' \
+		-e '/^LAPACKFILES/d' \
+		-i src/lib/Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX
+	append-flags -Dhypre_dgesvd=dgesvd_
+
+	if use openmp ; then
+		append-flags -fopenmp
+		append-ldflags -fopenmp
+	fi
+
+	if use mpi ; then
+		CC=mpicc
+		FC=mpif77
+		CXX=mpicxx
+	fi
+
+	cd src || die
+
+	# without-superlu: means do not use bundled one
+	econf \
+		--enable-shared \
+		--with-blas-libs="$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's/-l//g')" \
+		--with-blas-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L blas | sed -e 's/-L//g')" \
+		--with-lapack-libs="$($(tc-getPKG_CONFIG) --libs-only-l lapack | sed -e 's/-l//g')" \
+		--with-lapack-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L lapack | sed -e 's/-L//g')" \
+		--with-timing \
+		--without-superlu \
+		$(use_enable debug) \
+		$(use_enable openmp hopscotch) \
+		$(use_enable int64 bigint) \
+		$(use_enable fortran) \
+		$(use_with openmp) \
+		$(use_with mpi MPI)
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/src/lib:${LD_LIBRARY_PATH}" \
+		PATH="${S}/src/test:${PATH}" \
+		emake -C src check
+}
+
+src_install() {
+	emake -C src install \
+		HYPRE_INSTALL_DIR="${ED}" \
+		HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
+		HYPRE_INC_INSTALL="${ED}/usr/include/hypre"
+
+	if use examples; then
+		dodoc -r src/examples
+	fi
+}