gentoo Easter resync : 12.04.2020

4 files changed, 97 insertions, 3 deletions

diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index d9dd41871e15..fdb64f5cd4ea 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,3 +1,4 @@
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
-EBUILD lapack-3.8.0.ebuild 2960 BLAKE2B 15840b6e805fd1fcd78efb9ca8e80439e02e72e2730a3b36af10725642edecfbdc764850bdd46e00981d0c930ede0362b6b5608b2233dfdd843d34c6735ed393 SHA512 293ea329ee66748b4eb2182eedc4d1ec3149645cf4170e6ca010e2782ea16e9638709f60d39130b9c8a2996bb459f40a62bfeefd19df89dbcf95031e38dd34d1
-MISC metadata.xml 1423 BLAKE2B 2ec6d7c07c4827cca666cddb7e7b2e47238ff3fd40fd5e15463196812a7a82e0b85e5d36ae2a2c3315c3b4e0b5f3d4a79a953cb1703836b20dc14862956bcf29 SHA512 39a5e8738999caaf00b4f7fcdb3afdd1405a7c817920b9247a76dbc64e06f8c2011763031a058673ac8a411cad2219cbd7c8664d379535e2afea72d2bd578fbe
+EBUILD lapack-3.8.0-r1.ebuild 3018 BLAKE2B 6db2da7db3213d7899b2becf2eebf348443d0730b5e3277545380aafdbc93bab9b75d5fa398e1daa7a4b4ed9740bb93138d3206c37ea6df89bc11b1e5d610cc4 SHA512 4e7762e8298aa856aeadb5496d578efcdef2b2ee3163b8ac8ad5423746a8a878475aa9629912bb2ddf00ebb81be68f4a0f2a67a098a052420dd1824a3d19fe6f
+EBUILD lapack-3.8.0.ebuild 2961 BLAKE2B 3dc6ec8426220f56b7d3df421bbfb9bb667121a8972b3b54ca6c299d45a78becd893d3d5567b09fc10f1846fce4842799624237c7194711c648c6d900afd49c5 SHA512 704b45f86f862c69ab68a6b6ec7f1ff610a64a662f6939dc18bbbb441b4b51e928a67a7b985bf835193e3add85f9d9a408ab86fdb47a4e3730be95156c02c77b
+MISC metadata.xml 1490 BLAKE2B bcb933b7cc3c3ae6f33e7c8ae9ef12475477ecd3351901cfba5dc955430def35df18e5ab41624cb99f2c1551fc38153138195e4e95ab40d3cf92e5685ce68fc5 SHA512 a99af3086d63488e7a2b8cda2f3727ce31eb0e62dd75a9cf64e44a203068866a06c7d6e119665e663c49a1afccb7a70982fd831735d958b73b6dcdf52c8ef5b1
diff --git a/sci-libs/lapack/lapack-3.8.0-r1.ebuild b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..bf8ffd460297
--- /dev/null
+++ b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake-utils
+
+DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
+HOMEPAGE="http://www.netlib.org/lapack/"
+SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="lapacke deprecated doc eselect-ldso"
+# TODO: static-libs 64bit-index
+
+RDEPEND="
+	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
+	>=app-eselect/eselect-lapack-0.2 )
+	!app-eselect/eselect-cblas
+	!sci-libs/blas-reference
+	!sci-libs/cblas-reference
+	!sci-libs/lapack-reference
+	!sci-libs/lapacke-reference
+	virtual/fortran
+	doc? ( app-doc/blas-docs )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCBLAS=ON
+		-DLAPACKE=$(usex lapacke)
+		-DBUILD_DEPRECATED=$(usex deprecated)
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_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
+}
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index 7aee557bc78a..00c22e49a877 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="lapacke doc eselect-ldso"
 # TODO: static-libs 64bit-index
 
diff --git a/sci-libs/lapack/metadata.xml b/sci-libs/lapack/metadata.xml
index adc276993c4f..e4cd26e0166e 100644
--- a/sci-libs/lapack/metadata.xml
+++ b/sci-libs/lapack/metadata.xml
@@ -23,6 +23,7 @@ that has found extensive use in the scientific community.
 This package installs the reference FORTRAN 77 implementation from Netlib.
   </longdescription>
   <use>
+    <flag name="deprecated">Also build deprecated functions</flag>
     <flag name="lapacke">Build LAPACKE</flag>
     <flag name="eselect-ldso">Enable runtime library switching by
     eselect and ld.so.</flag>