gentoo resync : 08.10.2021

7 files changed, 146 insertions, 186 deletions

diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index c59554818489..36bf5e279c61 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,10 +1,7 @@
-AUX sundials-3.2.1-fix-license-install-path.patch 335 BLAKE2B ac9a2c33fabf13cb55876f39836006b1b145395311800bd052f5e0784b7926fab4ffd4abf2bb0047d69fbd5feccdec026bf7f7c115fb4f130c8419c6e8986dcb SHA512 7ac45a8932a273330fcf6fecb355cbbcf83038240fd06db6e20eb54a51a137266d033c7fe513f73b72e252509b0105d4de48fffedb4adff2ce8e5187e26b7ac3
 AUX sundials-5.2.0-fix-license-install-path.patch 468 BLAKE2B e2c9963f3c528cbe84a00e9ad98511bc6bfee8cd5d18c7d94661e25ea7cf6feae3c510a3c8532de61f40a2c351597ddee40a0c3fd35cec85002b9702352cbc3f SHA512 33c16064576d28d1768ec1c7232b5f1d9dbb786e24a390d970ba05b1b14df1b5589e6d6857ef84e66f2e4541a995509754f1abcf55e9e2e6dfbead81233efd8b
-AUX sundials-5.7.0-fix-license-install-path.patch 529 BLAKE2B 71aaf0c6362e77379f0f6f7dcfcf77b6746e61d8f015ce78a13f73d4e890e8aea3693ca8d37a0cf0b43fa1fa524dbef7e468f511fe34b65cb93fb911d22f4c72 SHA512 0290df4ec9394f56487d03b6d5a320f252ab60193c1003bcdfc1ead8118beae2fe90c153f8c0c31df9052e4148d27681f557f3c96ff7e43f1946d380cbeae6e5
-DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
+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.7.0.tar.gz 22612286 BLAKE2B a21db0d07b8f2056ba244ca52f13bde51a2f745535c7381a4eecf9d8037df3d50f010c8fecd8e37d71150f101c8177b2e3f0ffbed8139702993e01b8ad52e707 SHA512 5e2b6145fdaa72e7d13f43e75e5bc08b9d7eb5b9e048207d5772ddab767e198af5be24b73a942a564a49d56ca0b47fe6493bd2de34a8a93948ccd1c13e5dd170
-EBUILD sundials-3.2.1.ebuild 2132 BLAKE2B b3ee9f4c99687181f963f5cdbd9d769293af28133c45513827081bd3708e6146afec228185355ec04e0204e8408ed70647e98655cb81c8d37e7fca06b739f2a9 SHA512 53c7d6434c0e32de3ce2e7975ec8dbcce0df268081bc0a1fe3372ca0e8c1223001e75f6ddbef7be66b1da3f5d2b9b0d715690c3985031731200480fe5b39f7ae
+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.7.0.ebuild 2191 BLAKE2B 7cae104967366aa6fe22b7974b4f5d827672d56a16a416cba9dfc7ee405d0c206bf9423b76e08d6dd3da6f91a749ea1d0beb33554cbd68a571e4a6c6b63ce727 SHA512 d6535c05b58aa9eee2c58744c7e748cfd79a7a064311184cab3fd4819ccf06b9fa8f576a8e2b87b6e9ac42b97ab650ab9eaa46ae8cb72e18778aac2f88f59b81
+EBUILD sundials-5.8.0.ebuild 2712 BLAKE2B 1ee3ce42085318b74dfc64299c6323c81fa18a57adb809994e732dbd445f7342832ab761eba74e16b748b3280cfc9e626a0f4525c3be407302702742ef5d0098 SHA512 1a7ce334cacdddd40ffeb0f73be4b9f5aec8b16663ed4c7d5cedd201c4f145d0d5e978df86f80866db2701bb8140a70c7d1ba7a12cdfe437453160fcb6edf0db
 MISC metadata.xml 1060 BLAKE2B 279da603d6a362703f8142772042d94eca792aa1690988f1fa8efc16d7e125cb70408f11ba26bdabf2e3e121f2a71e09dc7d467f82475eee6dc72696ccf74316 SHA512 6bc695f162e38e409f71185a4ce57a6b87c456aee1c63c62135ed89293c5affeefb9dd87d2e6e8296f6c5c4385cfbf3a914cacc5570d340915617cc52ce8a82f
diff --git a/sci-libs/sundials/files/sundials-3.2.1-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-3.2.1-fix-license-install-path.patch
deleted file mode 100644
index eba90b52ac48..000000000000
--- a/sci-libs/sundials/files/sundials-3.2.1-fix-license-install-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nur old/CMakeLists.txt new/CMakeLists.txt
---- old/CMakeLists.txt	2018-10-11 22:22:09.000000000 +0300
-+++ new/CMakeLists.txt	2019-06-23 00:33:27.000000000 +0300
-@@ -1117,4 +1117,4 @@
- # install license file
- INSTALL(
-   FILES ${PROJECT_SOURCE_DIR}/LICENSE
--  DESTINATION include/sundials)
-+  DESTINATION share/doc/sundials-3.2.1)
diff --git a/sci-libs/sundials/files/sundials-5.7.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.7.0-fix-license-install-path.patch
deleted file mode 100644
index 88fb964f8995..000000000000
--- a/sci-libs/sundials/files/sundials-5.7.0-fix-license-install-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 40a650e..2133476 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -231,10 +231,10 @@ endif()
- 
- # install license and notice files
- install(FILES "${PROJECT_SOURCE_DIR}/LICENSE"
--        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sundials"
-+        DESTINATION share/doc/sundials-5.7.0
- )
- install(FILES "${PROJECT_SOURCE_DIR}/NOTICE"
--        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sundials"
-+        DESTINATION share/doc/sundials-5.7.0
- )
- 
- # create package version file
diff --git a/sci-libs/sundials/files/sundials-5.8.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.8.0-fix-license-install-path.patch
new file mode 100644
index 000000000000..d4e5fd929b3c
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-5.8.0-fix-license-install-path.patch
@@ -0,0 +1,29 @@
+From 554a760daeda3a04049bfa4cf882aae1207f833d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 30 Apr 2021 11:58:25 +0200
+Subject: [PATCH] fix license install path
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 40a650e..d57ca7b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -231,10 +231,10 @@ endif()
+ 
+ # install license and notice files
+ install(FILES "${PROJECT_SOURCE_DIR}/LICENSE"
+-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sundials"
++        DESTINATION "${CMAKE_INSTALL_DOCDIR}"
+ )
+ install(FILES "${PROJECT_SOURCE_DIR}/NOTICE"
+-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sundials"
++        DESTINATION "${CMAKE_INSTALL_DOCDIR}"
+ )
+ 
+ # create package version file
+-- 
+2.31.1
diff --git a/sci-libs/sundials/sundials-3.2.1.ebuild b/sci-libs/sundials/sundials-3.2.1.ebuild
deleted file mode 100644
index d58d6a9829ff..000000000000
--- a/sci-libs/sundials/sundials-3.2.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-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
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="${EPREFIX}/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	use sparse && mycmakeargs+=(
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-	)
-	use superlumt && mycmakeargs+=(
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="superlu_mt"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-}
diff --git a/sci-libs/sundials/sundials-5.7.0.ebuild b/sci-libs/sundials/sundials-5.7.0.ebuild
deleted file mode 100644
index dc933a9a83e0..000000000000
--- a/sci-libs/sundials/sundials-5.7.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-# if FFLAGS and FCFLAGS are set then should be equal
-
-inherit cmake fortran-2 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-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
-}
-
-src_prepare() {
-	# bug #707240
-	append-cflags -fcommon
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="${EPREFIX}/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" )
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc doc/*/*.pdf
-}
diff --git a/sci-libs/sundials/sundials-5.8.0.ebuild b/sci-libs/sundials/sundials-5.8.0.ebuild
new file mode 100644
index 000000000000..894e7ef201cf
--- /dev/null
+++ b/sci-libs/sundials/sundials-5.8.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 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://computation.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 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fortran hypre 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:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+		"${FILESDIR}"/${P}-fix-license-install-path.patch
+)
+
+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
+}
+
+src_prepare() {
+	# bug #707240
+	append-cflags -fcommon
+	use threads && append-ldflags -pthread
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DBUILD_FORTRAN77_INTERFACE=$(usex fortran)
+		-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"
+		-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
+}