gentoo resync : 27.03.2021

4 files changed, 127 insertions, 13 deletions

diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest
index 3955244a48f5..1ff7f15ff30f 100644
--- a/sci-libs/hypre/Manifest
+++ b/sci-libs/hypre/Manifest
@@ -1,3 +1,5 @@
 DIST hypre-2.18.2.tar.gz 5699792 BLAKE2B 6adb343d23594adea60a4009f589285236365a5769b1d5cb66908ce83984dd48b3be929e6c7298c7b9cb1e2d67b1fe7ea641c8a160562d223edb9809977fb684 SHA512 7b343a5c8530d7f5e31cad6c940c2f154b2b954566d4fe8525d690fec41db23936a46fb642a994791de32984e696c624804fb1fde1f0c9ce026f1a6e46b9c0f4
-EBUILD hypre-2.18.2.ebuild 2751 BLAKE2B 7bbde7d8fa2035ee2304da1589f766b5e6dedf5c6859324d54ff23d8d05e740dbbaa1ca579594b98da3e4c4640890de466eddfc95a98dc383e046f12ea013637 SHA512 50f6d8c66e1c1b98ba4ca54d78e4a34f807ee6aa5cacf3e9f28cf1f355d9f777286444270eca6946daf90411bfaf92c065d7971088a178d7bec30e2c95dc9744
-MISC metadata.xml 608 BLAKE2B b38da1761e74a20f40607ae258caf7e1482dfb6b0e85a770fd63d2cfb7c7a046667a0256409836859fe34900a8e4f7f1457a16aa8325c52a2c48da2db2658e88 SHA512 63208b23e52f588f7cd1931fa47cc6c9216c0b0d1ebb7d4e4d11a20e747a7f88d9be28e79e02c057c092c7b40f9d88ea91db2fbce2b4b8dbc83a38224b3e8d9e
+DIST hypre-2.20.0.tar.gz 5971556 BLAKE2B 63cef33913f1f4c569c396dd18227ae4346807e659306521e9340789944e22dc70be3b9baec7fb1385f562b53045e5c87fcad604aa242a941199ff9fe0a0c21d SHA512 842868b494960506fa3df4e72abb42084d701ec14305f9b040b9dcb578b4bbdaa8afb079057a7e53ad721b440c72ee804775c3b8319f2d01a2f281920a9cd350
+EBUILD hypre-2.18.2-r1.ebuild 2752 BLAKE2B 6998f04eecaa6fcf81e817a63b0f99423893fb2378e67de52ab860a37bc932d5be3391a9a753920eb3b3c597496afe0b6080dec95ede32f3fe8c012267d190fe SHA512 85b026a7842e7baa0371aba406f1f0412c36234ef3c9eea8f69d8370c2d04f256631b4b2387ed4369d5ad139cfe6e21f4398b28f9f55e46bed51eccbcd8731a6
+EBUILD hypre-2.20.0.ebuild 2787 BLAKE2B a317027bf74f9b09ed5a1c98a4a258a46cb40ee4dcdca817a7b6c9a7e76b744c805f68e0555b7404ecf24a1c5c2245fe947421673cd1fcd8cbb644a0157262ef SHA512 031f2da16f164276bbbfdca3566e3000bdc8ac1eff22a045db18487264f5c3de5985ca17811c1c75b274af84abd0a04699c963dbaea4a9c471bd54af4437383d
+MISC metadata.xml 615 BLAKE2B 8bd8c87a70e3203b79255f63bf25671cbaed470d177d2dca5ba77348fcf3430482f80b06d2f48beaa24eb49664aaaf2b93410d7240f402313694031362bcf899 SHA512 51002ae26a7957688265381df0619348726b6f6a39a036421e8574dc56382b21c1b642f3f0592f8eb02b1435979adcc0936fe734f1a01080093a0802af30d205
diff --git a/sci-libs/hypre/hypre-2.18.2.ebuild b/sci-libs/hypre/hypre-2.18.2-r1.ebuild
index 2b5614b59ac8..e47dfb45334e 100644
--- a/sci-libs/hypre/hypre-2.18.2.ebuild
+++ b/sci-libs/hypre/hypre-2.18.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cmake-utils fortran-2 toolchain-funcs flag-o-matic
+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"
@@ -16,24 +16,24 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~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}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 DOCS=( CHANGELOG COPYRIGHT README )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] &&\
-		use openmp && [[ $(tc-getCC)$ == *gcc* ]] && tc-check-openmp
+		use openmp && [[ $(tc-getCC) == *gcc* ]] && tc-check-openmp
 }
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]] && \
-		   use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp ; then
+		   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
@@ -56,11 +56,11 @@ src_prepare() {
 src_configure() {
 	tc-export CC CXX
 	append-flags -Dhypre_dgesvd=dgesvd_
-	use openmp && [[ $(tc-getCC)$ == *gcc* ]] && \
+	use openmp && [[ $(tc-getCC) == *gcc* ]] && \
 		append-flags -fopenmp && append-ldflags -fopenmp
 	use mpi && CC=mpicc FC=mpif77 CXX=mpicxx
 
-	cd src
+	cd src || die
 
 	# without-superlu: means do not use bundled one
 	econf \
@@ -93,7 +93,8 @@ src_install() {
 	emake -C src install \
 		  HYPRE_INSTALL_DIR="${ED}" \
 		  HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
-		  HYPRE_INC_INSTALL="${ED}$/usr/include/hypre"
+		  HYPRE_INC_INSTALL="${ED}/usr/include/hypre"
+
 	if use examples; then
 		dodoc -r src/examples
 	fi
diff --git a/sci-libs/hypre/hypre-2.20.0.ebuild b/sci-libs/hypre/hypre-2.20.0.ebuild
new file mode 100644
index 000000000000..4fec2500afed
--- /dev/null
+++ b/sci-libs/hypre/hypre-2.20.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 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/${PN}-space/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
+		tc-check-openmp
+	fi
+}
+
+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
+}
+
+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 && [[ $(tc-getCC) == *gcc* ]] ; 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
+}
diff --git a/sci-libs/hypre/metadata.xml b/sci-libs/hypre/metadata.xml
index d245803317be..0f8ab9b1a46c 100644
--- a/sci-libs/hypre/metadata.xml
+++ b/sci-libs/hypre/metadata.xml
@@ -10,7 +10,7 @@
     solution of large systems of linear equations.
   </longdescription>
     <upstream>
-    <remote-id type="github">LLNL/hypre</remote-id>
+    <remote-id type="github">hypre-space/hypre</remote-id>
   </upstream>
   <use>
     <flag name="int64">Build the 64 bits integer library</flag>