gentoo resync : 16.04.2022

4 files changed, 97 insertions, 27 deletions

diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 04106f49edb8..75e94f61b4cc 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,4 +1,5 @@
-AUX lapack-3.9.0-build-tests.patch 591 BLAKE2B 3db7dad6b798e5e9a4d050b05ef318aebd564d7fca3b3ac12c44f460eb6653693476f016c8a4d6369e4f4e4aa06aa7bf4a1cea38083758e8257f8cfd36c41d9f SHA512 642073d65ab1d5b7beb06e90cd4777ed89f4a76dcd5ec26025fa254ab243c8c09dcd4ca17b8d406e55cdbd302eab36f34a429dc3963a11827209246ebf2251cd
 DIST lapack-3.10.0.tar.gz 7630775 BLAKE2B fd2f920dd3f69eab471aa8c20d1b8178fb5c6e80337a2ed6948aba3ec639a816f8d368bb59ff6fb513b2f5cda9e61c2a547182f22fbc84a8c34191acefc3406a SHA512 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf
-EBUILD lapack-3.10.0.ebuild 3063 BLAKE2B 7f3fe2ba2104f4a04ebecae2e9159f59cb8e0b742920e6bfcbecc84174404064ddee45e7753815eb7dc7e2dbe555c1f7b570422d92e6fed659d7d608785026c7 SHA512 80423a2c878b688f38a4daa11bbc661b64493a550398d7d8a40ce71ee394444f8fe2a6ad99d3b72d1d48980ff13dbe7bcc8580027a45015f134462412382e3de
+DIST lapack-3.10.1.tar.gz 7632257 BLAKE2B f2653239029ed9c136173fc2e54773a785ad3e469d581ca2b7f6a72697e6bb9d22879edaf8327ada510df259c08fe984202d14cb3860c0d2a711eb55a1cc11dd SHA512 0500bbbb48483208c0a35b74972ff0059c389da6032824a2079637266a99fa980882eedf7f1fc490219ee4ff27812ac8c6afe118e25f40a9c2387e7b997762fb
+EBUILD lapack-3.10.0.ebuild 3004 BLAKE2B d30beb1a09b7f69bd0dca44ffb013e1fa3646017c527b41a6453de3dc6f01ac61fa409855c510ab4164f6e939b059d2b8479751601c12564faae3c1fdd55026b SHA512 8e58ec461d8a7b14b1df611743f8fdfe41022c5a01873fc367781545bfbea407502661129078bb3172a9ca4a031209b713862f38e9d7648834563e9af68608ad
+EBUILD lapack-3.10.1.ebuild 2974 BLAKE2B 065a365797777b8e332c6af0a20854f7bdec6b203484c5d58c570c5210801fe368aeffd7509b68dbab60fe3461d89c216c9999a5d3fa2a320c4a00f1b2328d1b SHA512 30b03f9078b18dafddafd45faa07b9e9913f06cfbb9e154723f93c051ea5feb5505abe8afe7ac82bbc7577844be8c1c645075d01c2ff6aa7ec0c8042633f8b8d
 MISC metadata.xml 1583 BLAKE2B 8db26f3744a6ee5f88f7ad37e749843eb8b63cd11af4182dd9d6408a854a5b060a651abd5f2f2098252a38b68b34c464a99f9654be9e6cba8f444eff23e4e297 SHA512 d8e8eb140e1a05f297b9e6edcc9aeb48e958baa7741be2a693ea4fca1a6d3f66a60d72c4c61e2dac8b8efd6210daf10ea9350fdbcfbaf801ac6366d0025ad2ca
diff --git a/sci-libs/lapack/files/lapack-3.9.0-build-tests.patch b/sci-libs/lapack/files/lapack-3.9.0-build-tests.patch
deleted file mode 100644
index 1dbcd6d9f677..000000000000
--- a/sci-libs/lapack/files/lapack-3.9.0-build-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d9dbf97..9635ba4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -127,7 +127,7 @@ set(PKG_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- 
- # --------------------------------------------------
- # Testing
--option(BUILD_TESTING "Build tests" ${_is_coverage_build})
-+option(BUILD_TESTING "Build tests")
- include(CTest)
- message(STATUS "Build tests: ${BUILD_TESTING}")
- 
-@@ -443,4 +443,4 @@ install(FILES
-   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
-   COMPONENT Development
-   )
--  
-\ No newline at end of file
-+  
diff --git a/sci-libs/lapack/lapack-3.10.0.ebuild b/sci-libs/lapack/lapack-3.10.0.ebuild
index af0b1bcc0c31..0c071e5d12d0 100644
--- a/sci-libs/lapack/lapack-3.10.0.ebuild
+++ b/sci-libs/lapack/lapack-3.10.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,10 +27,6 @@ RDEPEND="
 	doc? ( app-doc/blas-docs )"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	#"${FILESDIR}"/${PN}-3.9.0-build-tests.patch
-)
-
 src_prepare() {
 	cmake_src_prepare
 }
diff --git a/sci-libs/lapack/lapack-3.10.1.ebuild b/sci-libs/lapack/lapack-3.10.1.ebuild
new file mode 100644
index 000000000000..962b68b1d175
--- /dev/null
+++ b/sci-libs/lapack/lapack-3.10.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
+HOMEPAGE="https://www.netlib.org/lapack/"
+SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+# TODO: static-libs 64bit-index
+IUSE="lapacke deprecated doc eselect-ldso test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	!app-eselect/eselect-cblas
+	virtual/fortran
+	eselect-ldso? (
+		>=app-eselect/eselect-blas-0.2
+		>=app-eselect/eselect-lapack-0.2
+	)
+	doc? ( app-doc/blas-docs )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCBLAS=ON
+		-DLAPACKE=$(usex lapacke)
+		-DBUILD_DEPRECATED=$(usex deprecated)
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	use eselect-ldso || return
+	# Create private lib directory for eselect::blas (ld.so.conf)
+	dodir /usr/$(get_libdir)/blas/reference
+	dosym ../../libblas.so usr/$(get_libdir)/blas/reference/libblas.so
+	dosym ../../libblas.so.3 usr/$(get_libdir)/blas/reference/libblas.so.3
+	dosym ../../libcblas.so usr/$(get_libdir)/blas/reference/libcblas.so
+	dosym ../../libcblas.so.3 usr/$(get_libdir)/blas/reference/libcblas.so.3
+
+	# Create private lib directory for eselect::lapack (ld.so.conf)
+	dodir /usr/$(get_libdir)/lapack/reference
+	dosym ../../liblapack.so usr/$(get_libdir)/lapack/reference/liblapack.so
+	dosym ../../liblapack.so.3 usr/$(get_libdir)/lapack/reference/liblapack.so.3
+}
+
+pkg_postinst() {
+	use eselect-ldso || return
+
+	local me=reference libdir=$(get_libdir)
+	# check eselect-blas
+	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_blas} == ${me} || -z ${current_blas} ]]; then
+		eselect blas set ${libdir} ${me}
+		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+		elog "To use blas [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect blas set ${libdir} ${me}"
+	fi
+
+	# check eselect-lapack
+	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_lapack} == ${me} || -z ${current_lapack} ]]; then
+		eselect lapack set ${libdir} ${me}
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+	else
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+		elog "To use lapack [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${libdir} ${me}"
+	fi
+}
+
+pkg_postrm() {
+	use eselect-ldso || return
+
+	eselect blas validate
+	eselect lapack validate
+}