[gentoo-commits] repo/gentoo:master commit in: sci-libs/lapack/files/, sci-libs/lapack/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/lapack/files/, sci-libs/lapack/

[Sam James]

commit:     e299f36c470e4cdf7b2a97f8a9308da01aa80aa1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 21:21:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 21:29:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e299f36c

sci-libs/lapack: cleanup old, patch metadata

Bug: https://bugs.gentoo.org/702254
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/lapack-3.9.0-deprecated-headers.patch    |  3 +
 sci-libs/lapack/lapack-3.9.0.ebuild                | 96 ----------------------
 2 files changed, 3 insertions(+), 96 deletions(-)

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
index 9c0fb4e56e5..9b3fd93789e 100644
--- a/sci-libs/lapack/files/lapack-3.9.0-deprecated-headers.patch
+++ b/sci-libs/lapack/files/lapack-3.9.0-deprecated-headers.patch
@@ -1,3 +1,6 @@
+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

diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0.ebuild
deleted file mode 100644
index bf8674a2fab..00000000000
--- a/sci-libs/lapack/lapack-3.9.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-# TODO: static-libs 64bit-index
-IUSE="lapacke 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}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.9.0-build-tests.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCBLAS=ON
-		-DLAPACKE=$(usex lapacke)
-		-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/lapack/files/, sci-libs/lapack/

[Sam James]

commit:     3452a5d07e2f52b6d4a6a17316edde99ccc132cc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 15 04:20:02 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 04:20:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3452a5d0

sci-libs/lapack: backport test summary fix

Closes: https://bugs.gentoo.org/924929
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../lapack/files/lapack-3.12.0-test-summary.patch   | 21 +++++++++++++++++++++
 sci-libs/lapack/lapack-3.12.0-r1.ebuild             |  1 +
 2 files changed, 22 insertions(+)

diff --git a/sci-libs/lapack/files/lapack-3.12.0-test-summary.patch b/sci-libs/lapack/files/lapack-3.12.0-test-summary.patch
new file mode 100644
index 000000000000..1d2303cdb018
--- /dev/null
+++ b/sci-libs/lapack/files/lapack-3.12.0-test-summary.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/924929
+https://github.com/Reference-LAPACK/lapack/commit/a4298d5ff68047acfa44d6394ceb3a688a3b2534
+
+From 5b0687f429cf420629c0eeafba6a74a2564d4131 Mon Sep 17 00:00:00 2001
+From: Simon Maertens <simon@slmaertens.dev>
+Date: Fri, 1 Dec 2023 14:05:54 +0000
+Subject: [PATCH] Fixed search phrase for determining the amount of successful
+ tests
+
+--- a/lapack_testing.py
++++ b/lapack_testing.py
+@@ -136,7 +136,7 @@ def run_summary_test( f, cmdline, short_summary):
+         for line in pipe.readlines():
+             f.write(str(line))
+             words_in_line=line.split()
+-            if (line.find("run")!=-1):
++            if (line.find("run)")!=-1):
+ #                  print line
+                 whereisrun=words_in_line.index("run)")
+                 nb_test_run+=int(words_in_line[whereisrun-2])
+

diff --git a/sci-libs/lapack/lapack-3.12.0-r1.ebuild b/sci-libs/lapack/lapack-3.12.0-r1.ebuild
index b1b9e9824637..743021f3426f 100644
--- a/sci-libs/lapack/lapack-3.12.0-r1.ebuild
+++ b/sci-libs/lapack/lapack-3.12.0-r1.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	# https://github.com/Reference-LAPACK/lapack/issues/990#issuecomment-1973258284
 	# https://bugs.gentoo.org/878891
 	"${FILESDIR}"/lapack-3.12.0-correct-64bit-interface.patch
+	"${FILESDIR}"/lapack-3.12.0-test-summary.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/lapack/files/, sci-libs/lapack/

[Sam James]

commit:     0111bb49b8cf78873580aa187ecfc224711b3b7a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 00:52:41 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 00:52:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0111bb49

sci-libs/lapack: cleanup obsolete patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/lapack/files/lapack-3.9.0-build-tests.patch | 20 --------------------
 sci-libs/lapack/lapack-3.10.0.ebuild                 |  4 ----
 sci-libs/lapack/lapack-3.10.1.ebuild                 |  4 ----
 3 files changed, 28 deletions(-)

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..c42b60080848 100644
--- a/sci-libs/lapack/lapack-3.10.0.ebuild
+++ b/sci-libs/lapack/lapack-3.10.0.ebuild
@@ -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
index 4e1b7520afee..962b68b1d175 100644
--- a/sci-libs/lapack/lapack-3.10.1.ebuild
+++ b/sci-libs/lapack/lapack-3.10.1.ebuild
@@ -27,10 +27,6 @@ RDEPEND="
 	doc? ( app-doc/blas-docs )"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	#"${FILESDIR}"/${PN}-3.9.0-build-tests.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DCBLAS=ON

[gentoo-commits] repo/gentoo:master commit in: sci-libs/lapack/files/, sci-libs/lapack/

[Sam James]

commit:     1a9d2a5e0166770db4aefdd7f688e332a32f858a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 22:56:08 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 22:56:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9d2a5e

sci-libs/lapack: bump to 3.9.0

Closes: https://bugs.gentoo.org/738258
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/lapack/Manifest                           |  1 +
 .../lapack/files/lapack-3.9.0-build-tests.patch    | 20 +++++
 sci-libs/lapack/lapack-3.9.0.ebuild                | 95 ++++++++++++++++++++++
 3 files changed, 116 insertions(+)

diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index fe865c2bdc8..91b589d6e02 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1 +1,2 @@
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
+DIST lapack-3.9.0.tar.gz 7534567 BLAKE2B 408013a11a72e0262d144adfdf6db28a6efa3bb5446f9ff959bb88fe10459dfa621149ed0144630a55e73e3b5be3c704269a716eb195f6db7b39d345b4db8270 SHA512 424956ad941a60a4b71e0d451ad48db12a692f8a71a90f3ca7f71d6ecc1922f392746ea84df1c47a46577ed2db32e9e47ec44ad248207c5ac7da179becb712ef

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
new file mode 100644
index 00000000000..1dbcd6d9f67
--- /dev/null
+++ b/sci-libs/lapack/files/lapack-3.9.0-build-tests.patch
@@ -0,0 +1,20 @@
+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.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0.ebuild
new file mode 100644
index 00000000000..cc1fc963b7c
--- /dev/null
+++ b/sci-libs/lapack/lapack-3.9.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+#CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
+HOMEPAGE="http://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 ~x86-macos"
+IUSE="lapacke doc eselect-ldso test"
+# TODO: static-libs 64bit-index
+RESTRICT="!test? ( test )"
+
+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_SHARED_LIBS=ON
+		-DBUILD_TESTING=ON
+	)
+
+	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
+}