gentoo resync : 29.12.2022

4 files changed, 137 insertions, 12 deletions

diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index afb5b6d03aa9..100da425d423 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -2,6 +2,8 @@ AUX sundials-5.2.0-fix-license-install-path.patch 468 BLAKE2B e2c9963f3c528cbe84
 AUX sundials-5.8.0-fix-license-install-path.patch 874 BLAKE2B 134158ced2c1850aedb7599f6c2de33adc7b63f60ccce831f494006b41664acf31ccf838ca9715c4470309648935b194a0706f487cdc6e4b1a3ba52c0ca3c941 SHA512 7775dd78cd4dfbf647087058126314305232657c6f32d4811bc181902d925cee51142e92e2f50c15c02475b2b6c4f1c7be70a223dbf838b9205a811ed9fca4a9
 DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
 DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2bc52be6f1ad290b91ab83a3414ae83bc64503126af8772daa000f58a89855d7ca35fe74fa21bd91180695582442c7 SHA512 d22e699aaddaeef026e91e18dd070d06278c75b6980b36c6fb2e50203ba6445420e4a8e0612a6317dcaa521aeffbdf62ab88737be235ef70cef3a8be02a13dbb
-EBUILD sundials-5.2.0.ebuild 2191 BLAKE2B 522ba0de818acec9ae05b929a032b6ae43389b215d53ff84ef296024fe18c893d60af374d3a1433ca8c46b5e32f0163c4142b1ba5d00ce3ffe76acc7bdf6e3b2 SHA512 4c1b05f3c4bb9160d20bff5e43a1b7d1d05529cacc8676f19056a7865f52081d1c9e07b8c535b7e8b8ad2c163f76622c5063d43003ee365f7cb591dcfdd2a9ef
-EBUILD sundials-5.8.0.ebuild 2777 BLAKE2B 5bc6e47e4dc53fe64453b27e682f9b4abd56c72b4cfb840706e995894156deef3069dcc62a3e3ba2a653270f0bdb91ad07feb0670336864bfddb60a82049f1a7 SHA512 47ce09f541247c8892310d547506529a94e8b3b56a90d829c1ce93b69401370206ca3567a2286150588c1b5bfbf97b3849d6bb33b137102f306e02e2028697a3
+DIST sundials-6.2.0.tar.gz 82410068 BLAKE2B c6aa9735198465bb458590ef1a90101e246202632afd6bd7f48970b9a2752810ce8c5be7983097cd816189cb994efbddf8d34706665846c67d6442bd7c12db38 SHA512 0dd0a2bf6390a13a5846caf440aa6d459f3890f6d13c0eff8c8180a92a636d6eae7f64679d45acd2048de742d4c644e2ae112cb09028b3fdef10a247bee44c0b
+EBUILD sundials-5.2.0.ebuild 2173 BLAKE2B c7765f5fbb12395c2474f352a3200225cb2ec75360fa2089bf34ee0ddb313d136b0e66ad1955936bac2bf6f6e63bca055e7077d46fb92a69771417c51b86fb9a SHA512 00d5b62fabe026e5637cd655dc53ba12e4ff8db286b451e79a993b18ef09dcbce58805424c903bfb35ebbfcd2881873f91cfb63faa353f1789bd95fba7f17a17
+EBUILD sundials-5.8.0.ebuild 2759 BLAKE2B 2f2872218e337cda6e067925f4f67ce4021a284d0d4badb31737efd6fc0917808769c24b74df4086aaef08384bd36dd744358b9d797da08c40d34f5b1aa34bdc SHA512 7cdaed08db6eab4713df5477d3051d009881cb1ef38714496618f56f831ab9e3973a0b37092cc716512c5d8dc6ed73cbb7da2fb46d0373b066290c48993cd805
+EBUILD sundials-6.2.0.ebuild 2724 BLAKE2B 6fcb90fccbe4129c3a1f60f79016f0f1ec49c123628d73368c29b9d1678ef93188280a890816ae18c46601b922a3ddffa923e14021cde909197780351c12284e SHA512 c3041f39a729f7cffd7d7b4ba8529d29ce2966ca182125a89ad11d0d86be27b5aa7590aacc85dd2d1b2a1a57fe1339ff00c10ae647a5f9c8a1e0fa7f8d5c1ac4
 MISC metadata.xml 1131 BLAKE2B f898dfbe0da057432c5c0549d850293224137cb07d234721894752821b638f3002a1d17a06c4258b94fbc2d0e4ce5e9ee2b06c1099c473989de36b62001f2d63 SHA512 f53a7aec4b5ebc0f7737938f811e4c87842a07b03c423715296ad2992e353f661022eb2bb344e33fb03d70af6e4ffdf1908a34bdbafc3ebe9d30fa7f4bd7cad1
diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild
index c99c2b643966..5af24cd4ed75 100644
--- a/sci-libs/sundials/sundials-5.2.0.ebuild
+++ b/sci-libs/sundials/sundials-5.2.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
@@ -31,11 +31,13 @@ DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use fortran && fortran-2_pkg_setup
 }
 
 src_prepare() {
diff --git a/sci-libs/sundials/sundials-5.8.0.ebuild b/sci-libs/sundials/sundials-5.8.0.ebuild
index 623a8cee16ed..517e32342ded 100644
--- a/sci-libs/sundials/sundials-5.8.0.ebuild
+++ b/sci-libs/sundials/sundials-5.8.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=8
@@ -39,11 +39,13 @@ PATCHES=(
 		"${FILESDIR}"/${P}-fix-license-install-path.patch
 )
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use fortran && fortran-2_pkg_setup
 }
 
 src_prepare() {
diff --git a/sci-libs/sundials/sundials-6.2.0.ebuild b/sci-libs/sundials/sundials-6.2.0.ebuild
new file mode 100644
index 000000000000..bc44870f0732
--- /dev/null
+++ b/sci-libs/sundials/sundials-6.2.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90 2003"
+# if FFLAGS and FCFLAGS are set then should be equal
+
+inherit cmake flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computing.llnl.gov/projects/sundials"
+SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
+REQUIRED_USE="
+	fortran? ( static-libs )
+	hypre? ( mpi )
+"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	lapack? ( virtual/lapack )
+	mpi? (
+		sci-libs/hypre:=[fortran?,mpi?]
+		virtual/mpi[fortran?]
+	)
+	sparse? ( sci-libs/klu )
+	superlumt? ( sci-libs/superlu_mt:=[int64=] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8.0-fix-license-install-path.patch
+)
+
+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() {
+	# bug #707240
+	append-cflags -fcommon
+	use threads && append-ldflags -pthread
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DBUILD_FORTRAN_MODULE_INTERFACE=$(usex fortran)
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DENABLE_HYPRE=$(usex hypre)
+		-DENABLE_KLU=$(usex sparse)
+		-DENABLE_LAPACK=$(usex lapack)
+		-DENABLE_MPI=$(usex mpi)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PTHREAD=$(usex threads)
+		-DENABLE_SUPERLUMT=$(usex superlumt)
+		-DEXAMPLES_INSTALL=ON
+		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+		-DSUNDIALS_INDEX_SIZE="$(usex int64 64 32)"
+		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
+		-DUSE_GENERIC_MATH=ON
+	)
+
+	if use examples; then
+		mycmakeargs+=(
+			-DEXAMPLES_ENABLE_C=ON
+			-DEXAMPLES_ENABLE_CXX=ON
+		)
+		if use fortran; then
+			mycmakeargs+=(
+				-DEXAMPLES_ENABLE_F77=ON
+				-DEXAMPLES_ENABLE_F90=ON
+				-DEXAMPLES_ENABLE_F2003=ON
+			)
+		fi
+	fi
+
+	if use fortran; then
+		mycmakeargs+=(
+			-DFortran_INSTALL_MODDIR="${EPREFIX}/usr/$(get_libdir)/fortran"
+		)
+	fi
+
+	if use hypre; then
+		mycmakeargs+=(
+			-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+			-DHYPRE_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libHYPRE.so"
+		)
+	fi
+
+	if use sparse; then
+		mycmakeargs+=(
+			-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc doc/*/*.pdf
+}