gentoo (valentine's day) resync : 14.02.2021

5 files changed, 159 insertions, 10 deletions

diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 62b54c3630b4..de49f3def8b7 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,7 +1,8 @@
 AUX lapack-3.9.0-build-tests.patch 591 BLAKE2B 3db7dad6b798e5e9a4d050b05ef318aebd564d7fca3b3ac12c44f460eb6653693476f016c8a4d6369e4f4e4aa06aa7bf4a1cea38083758e8257f8cfd36c41d9f SHA512 642073d65ab1d5b7beb06e90cd4777ed89f4a76dcd5ec26025fa254ab243c8c09dcd4ca17b8d406e55cdbd302eab36f34a429dc3963a11827209246ebf2251cd
+AUX lapack-3.9.0-deprecated-headers.patch 7489 BLAKE2B c60377475eb9db34f9da1456358c6302fb9584212e74874d2f028fea895a272caa147fee64573d8aebfcfa58af4c6dab3e297b375af6353f5711b437e9a67533 SHA512 eae3c502354bc362612ede131f759f9f814ea80a8cf8597b553ac81d4d7e0910d4c75e56079ca012209f22c1f5a9160ac1f01fe7c7a6ca1238d245e9bc505f00
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
 DIST lapack-3.9.0.tar.gz 7534567 BLAKE2B 408013a11a72e0262d144adfdf6db28a6efa3bb5446f9ff959bb88fe10459dfa621149ed0144630a55e73e3b5be3c704269a716eb195f6db7b39d345b4db8270 SHA512 424956ad941a60a4b71e0d451ad48db12a692f8a71a90f3ca7f71d6ecc1922f392746ea84df1c47a46577ed2db32e9e47ec44ad248207c5ac7da179becb712ef
-EBUILD lapack-3.8.0-r1.ebuild 2890 BLAKE2B 9d7b6dd7d21698cb5ad5152dc1654b768e10baf6e5e18d591c5eb7c5902b7d938d0b617f450f10559c704c1575a7f8b95039714acbceb78e7f1af0e179d5c37c SHA512 26980d932c08e39b557e97c920d97f81176e7ccc65cc3143bb1b05ed2c2dca7005c90670dec7bd63b4f72e6100c5e87392e474b7a565dd1a9f53d2aa1e22dff0
-EBUILD lapack-3.8.0.ebuild 2838 BLAKE2B 13d79af69f82e52a71945292a129cafb3135415c9ec7d752521c8d18fbd1f6767ee5dc1a366fc48c8872f94a44d562f6e2ff154c58091e92e60e96faea04aaca SHA512 e8c302e454a2f507fa8ab700713fd02f5f7b3f8604180af9cade6bbd636aad02b723d69e60da0ef9e8b45d66bac20bb18247a0f88c8e994363f6d661a23f0464
-EBUILD lapack-3.9.0.ebuild 2966 BLAKE2B 5f547035a84f33613c4748bffb9b3a39028c7c4b62c583d807c58601402db2ffe2dfe14e5ba69fb6e43f672fbe9cc9a6ee80f36d401c0ced87e7fe5d85133d0b SHA512 5e20a9c4d1eabc5c2423bf798d2d7ba55a567f69a09be803a8dae10726d343ccd4f4f84275a8273ae35b44bc15b3e6690b34030b12f1d8f31d4901950e6fc307
+EBUILD lapack-3.8.0-r1.ebuild 2892 BLAKE2B 8aa139fdb09e219c539ade5c873dcc2f3d8e919daa4cefef4984484b0288799dbfddea33b74f2d5c88dbc7bab95109e4ad421aa32dde82059571cafb600fbbb0 SHA512 e8c1721460ed64ea9e1366c47fc36782f717d7bf87b3ab2ece988fe79373ec956f9c76cfcc729ddf5c984c3150ba4183ab5220da19f0fd3818a501b3f72c4aa1
+EBUILD lapack-3.8.0.ebuild 2840 BLAKE2B de601370663d749b99a65b28611ac24c73704c6ffa4998a5b430eba3ce70140de0a4ef3350cc564841fefd4d6fd0015602c481bfedc9165ab7e0fd894d46d72c SHA512 899e9d9e8687228ae8bb3f33badb7f2c102a3d1ec618d6236b35ffeaa2fcd6173e0b69bc2b60405cc319b5cf854738aaa6b28258442e7e242ff3ee697d70b1e1
+EBUILD lapack-3.9.0-r1.ebuild 3120 BLAKE2B ecafcba61f6320601aa3891f49f9a9a65eb5a029228d8d46cc0c44e06906f49922f94507c8d44751b701877b19ab42fc48047c6f49b8f827aa6b27cf8749d806 SHA512 49b6125480abf08914ebb1f8df85a1641edfa1d43e6f62a6c8e77ef9a38c40810692c7e02db1066d80611c11c85b7326613f88c1352bc8849846b7ef1d5431ed
 MISC metadata.xml 1490 BLAKE2B bcb933b7cc3c3ae6f33e7c8ae9ef12475477ecd3351901cfba5dc955430def35df18e5ab41624cb99f2c1551fc38153138195e4e95ab40d3cf92e5685ce68fc5 SHA512 a99af3086d63488e7a2b8cda2f3727ce31eb0e62dd75a9cf64e44a203068866a06c7d6e119665e663c49a1afccb7a70982fd831735d958b73b6dcdf52c8ef5b1
diff --git a/sci-libs/lapack/files/lapack-3.9.0-deprecated-headers.patch b/sci-libs/lapack/files/lapack-3.9.0-deprecated-headers.patch
new file mode 100644
index 000000000000..9b3fd93789ec
--- /dev/null
+++ b/sci-libs/lapack/files/lapack-3.9.0-deprecated-headers.patch
@@ -0,0 +1,141 @@
+https://sources.debian.org/patches/lapack/3.9.0-3/missing-lapacke-prototypes.patch/
+https://github.com/Reference-LAPACK/lapack/issues/365
+
+From 87536aa3c8bb0af00f66088fb6ac05d87509e011 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@debian.org>
+Date: Sat, 23 Nov 2019 12:22:20 +0100
+Subject: [PATCH] Restore missing prototypes for deprecated LAPACK functions
+
+Some LAPACK functions prototypes were inadvertedly dropped in 3.9.0. As a
+consequence, LAPACKE has several unresolved symbols.
+
+Closes #365
+---
+ LAPACKE/include/lapack.h | 100 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 100 insertions(+)
+
+diff --git a/LAPACKE/include/lapack.h b/LAPACKE/include/lapack.h
+index 3f425325f..5c131d844 100644
+--- a/LAPACKE/include/lapack.h
++++ b/LAPACKE/include/lapack.h
+@@ -1842,6 +1842,28 @@ void LAPACK_zgeqlf(
+     lapack_complex_double* work, lapack_int const* lwork,
+     lapack_int* info );
+ 
++#define LAPACK_sgeqpf LAPACK_GLOBAL(sgeqpf,SGEQPF)
++void LAPACK_sgeqpf( lapack_int* m, lapack_int* n, float* a, lapack_int* lda,
++                    lapack_int* jpvt, float* tau, float* work,
++                    lapack_int *info );
++
++#define LAPACK_dgeqpf LAPACK_GLOBAL(dgeqpf,DGEQPF)
++void LAPACK_dgeqpf( lapack_int* m, lapack_int* n, double* a, lapack_int* lda,
++                    lapack_int* jpvt, double* tau, double* work,
++                    lapack_int *info );
++
++#define LAPACK_cgeqpf LAPACK_GLOBAL(cgeqpf,CGEQPF)
++void LAPACK_cgeqpf( lapack_int* m, lapack_int* n, lapack_complex_float* a,
++                    lapack_int* lda, lapack_int* jpvt,
++                    lapack_complex_float* tau, lapack_complex_float* work,
++                    float* rwork, lapack_int *info );
++
++#define LAPACK_zgeqpf LAPACK_GLOBAL(zgeqpf,ZGEQPF)
++void LAPACK_zgeqpf( lapack_int* m, lapack_int* n, lapack_complex_double* a,
++                    lapack_int* lda, lapack_int* jpvt,
++                    lapack_complex_double* tau, lapack_complex_double* work,
++                    double* rwork, lapack_int *info );
++
+ #define LAPACK_cgeqp3 LAPACK_GLOBAL(cgeqp3,CGEQP3)
+ void LAPACK_cgeqp3(
+     lapack_int const* m, lapack_int const* n,
+@@ -3617,6 +3639,47 @@ void LAPACK_zggrqf(
+     lapack_complex_double* work, lapack_int const* lwork,
+     lapack_int* info );
+ 
++#define LAPACK_sggsvd LAPACK_GLOBAL(sggsvd,SGGSVD)
++lapack_int LAPACKE_sggsvd( int matrix_layout, char jobu, char jobv, char jobq,
++                           lapack_int m, lapack_int n, lapack_int p,
++                           lapack_int* k, lapack_int* l, float* a,
++                           lapack_int lda, float* b, lapack_int ldb,
++                           float* alpha, float* beta, float* u, lapack_int ldu,
++                           float* v, lapack_int ldv, float* q, lapack_int ldq,
++                           lapack_int* iwork );
++
++#define LAPACK_dggsvd LAPACK_GLOBAL(dggsvd,DGGSVD)
++lapack_int LAPACKE_dggsvd( int matrix_layout, char jobu, char jobv, char jobq,
++                           lapack_int m, lapack_int n, lapack_int p,
++                           lapack_int* k, lapack_int* l, double* a,
++                           lapack_int lda, double* b, lapack_int ldb,
++                           double* alpha, double* beta, double* u,
++                           lapack_int ldu, double* v, lapack_int ldv, double* q,
++                           lapack_int ldq, lapack_int* iwork );
++
++#define LAPACK_cggsvd LAPACK_GLOBAL(cggsvd,CGGSVD)
++lapack_int LAPACKE_cggsvd( int matrix_layout, char jobu, char jobv, char jobq,
++                           lapack_int m, lapack_int n, lapack_int p,
++                           lapack_int* k, lapack_int* l,
++                           lapack_complex_float* a, lapack_int lda,
++                           lapack_complex_float* b, lapack_int ldb,
++                           float* alpha, float* beta, lapack_complex_float* u,
++                           lapack_int ldu, lapack_complex_float* v,
++                           lapack_int ldv, lapack_complex_float* q,
++                           lapack_int ldq, lapack_int* iwork );
++
++#define LAPACK_zggsvd LAPACK_GLOBAL(zggsvd,ZGGSVD)
++lapack_int LAPACKE_zggsvd( int matrix_layout, char jobu, char jobv, char jobq,
++                           lapack_int m, lapack_int n, lapack_int p,
++                           lapack_int* k, lapack_int* l,
++                           lapack_complex_double* a, lapack_int lda,
++                           lapack_complex_double* b, lapack_int ldb,
++                           double* alpha, double* beta,
++                           lapack_complex_double* u, lapack_int ldu,
++                           lapack_complex_double* v, lapack_int ldv,
++                           lapack_complex_double* q, lapack_int ldq,
++                           lapack_int* iwork );
++
+ #define LAPACK_cggsvd3 LAPACK_GLOBAL(cggsvd3,CGGSVD3)
+ void LAPACK_cggsvd3(
+     char const* jobu, char const* jobv, char const* jobq,
+@@ -3679,6 +3742,43 @@ void LAPACK_zggsvd3(
+     lapack_int* iwork,
+     lapack_int* info );
+ 
++#define LAPACK_sggsvp LAPACK_GLOBAL(sggsvp,SGGSVP)
++lapack_int LAPACKE_sggsvp( int matrix_layout, char jobu, char jobv, char jobq,
++                           lapack_int m, lapack_int p, lapack_int n, float* a,
++                           lapack_int lda, float* b, lapack_int ldb, float tola,
++                           float tolb, lapack_int* k, lapack_int* l, float* u,
++                           lapack_int ldu, float* v, lapack_int ldv, float* q,
++                           lapack_int ldq );
++
++#define LAPACK_dggsvp LAPACK_GLOBAL(dggsvp,DGGSVP)
++lapack_int LAPACKE_dggsvp( int matrix_layout, char jobu, char jobv, char jobq,
++                           lapack_int m, lapack_int p, lapack_int n, double* a,
++                           lapack_int lda, double* b, lapack_int ldb,
++                           double tola, double tolb, lapack_int* k,
++                           lapack_int* l, double* u, lapack_int ldu, double* v,
++                           lapack_int ldv, double* q, lapack_int ldq );
++
++#define LAPACK_cggsvp LAPACK_GLOBAL(cggsvp,CGGSVP)
++lapack_int LAPACKE_cggsvp( int matrix_layout, char jobu, char jobv, char jobq,
++                           lapack_int m, lapack_int p, lapack_int n,
++                           lapack_complex_float* a, lapack_int lda,
++                           lapack_complex_float* b, lapack_int ldb, float tola,
++                           float tolb, lapack_int* k, lapack_int* l,
++                           lapack_complex_float* u, lapack_int ldu,
++                           lapack_complex_float* v, lapack_int ldv,
++                           lapack_complex_float* q, lapack_int ldq );
++
++#define LAPACK_zggsvp LAPACK_GLOBAL(zggsvp,ZGGSVP)
++lapack_int LAPACKE_zggsvp( int matrix_layout, char jobu, char jobv, char jobq,
++                           lapack_int m, lapack_int p, lapack_int n,
++                           lapack_complex_double* a, lapack_int lda,
++                           lapack_complex_double* b, lapack_int ldb,
++                           double tola, double tolb, lapack_int* k,
++                           lapack_int* l, lapack_complex_double* u,
++                           lapack_int ldu, lapack_complex_double* v,
++                           lapack_int ldv, lapack_complex_double* q,
++                           lapack_int ldq );
++
+ #define LAPACK_cggsvp3 LAPACK_GLOBAL(cggsvp3,CGGSVP3)
+ void LAPACK_cggsvp3(
+     char const* jobu, char const* jobv, char const* jobq,
diff --git a/sci-libs/lapack/lapack-3.8.0-r1.ebuild b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
index a64e00ff8933..d97667a141d8 100644
--- a/sci-libs/lapack/lapack-3.8.0-r1.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
@@ -6,8 +6,8 @@ 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"
+HOMEPAGE="https://www.netlib.org/lapack/"
+SRC_URI="https://www.netlib.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index 1abb3b17f3e5..72b89dba3ea2 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -6,8 +6,8 @@ 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"
+HOMEPAGE="https://www.netlib.org/lapack/"
+SRC_URI="https://www.netlib.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0-r1.ebuild
index 2d1c181e05db..06888886084a 100644
--- a/sci-libs/lapack/lapack-3.9.0.ebuild
+++ b/sci-libs/lapack/lapack-3.9.0-r1.ebuild
@@ -6,14 +6,14 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
-HOMEPAGE="http://www.netlib.org/lapack/"
+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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 # TODO: static-libs 64bit-index
-IUSE="lapacke doc eselect-ldso test"
+IUSE="lapacke deprecated doc eselect-ldso test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="virtual/pkgconfig"
@@ -28,13 +28,20 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.9.0-build-tests.patch"
+	"${FILESDIR}/${P}-build-tests.patch"
 )
 
+src_prepare() {
+	use deprecated && eapply "${FILESDIR}/${P}-deprecated-headers.patch"
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCBLAS=ON
 		-DLAPACKE=$(usex lapacke)
+		-DBUILD_DEPRECATED=$(usex deprecated)
 		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_TESTING=$(usex test)
 	)