gentoo auto-resync : 20:06:2023 - 07:15:40

4 files changed, 129 insertions, 3 deletions

diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest
index 7801bd6825cd..d264b9a707ab 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -1,3 +1,5 @@
+DIST SuiteSparse-7.0.0.gh.tar.gz 64884962 BLAKE2B 06c6cf54ffae188f5179e0cd45523700448d8999b44d6b1aeb3dfb99ccf34a570f6aff600988a144c68a4a2d8f41e32f7145e09349aed3bd889501ea031c8340 SHA512 50b1cd7bab6e4c063984162ed803fd13b69df7f67efe8ce7af15eace6b0ccd1669b6e57daa59511fd9531a847433cda49c1f52bfff234031af0d79e7fbd6423e
 DIST spqr-2.0.9.tar.bz2 2161068 BLAKE2B a662983d2543a65ce36a367749db5585308acb56b016f69a35c46a84e9c12a678f57a3cfd459cc2e887fff2819b00f99981efaadb73831f1b4c54cbef5e1c367 SHA512 54b203e0d68b266473b8a2b7b3b3a55476df54a3ebd5748b70faa7bad1d0a5a7387197f0674ba5f9a5d45887daa736117f8d6ffbbc2eb02482b3374a3babf721
-EBUILD spqr-2.0.9-r2.ebuild 1114 BLAKE2B 91ab25af3d46aefa0b384121b3a3632e1988f7dee1ed2df2fbb4fd677142f1a0d6a39e95c70f6b20aea638da5d4132677d62e8766fb8c79cd3b5a5b965fb4271 SHA512 6a413073ac9e96a2a2e4731c92ae5e8c3391c9487f065abfb61630d45259dc8b3aa3da8caf1afbe01d50fa321fb72a61dcc635640c274fd04ba47642116047ca
-MISC metadata.xml 852 BLAKE2B 9480a2097af529f47896d300d8654b791ef1ea3989b97d8aef287dbe5b322167ef7a425016894b14c975205ebdc35cc5a1f187026688e0cbd7497b51657d0181 SHA512 51150e01477f24a382731c273f83aeb8fa646a7f897e4f6e8ffff4d4050fbf9ff589b7036134d9faf4da2c07a16654b01d1923003bc1e30c380b6fc46a3207f9
+EBUILD spqr-2.0.9-r3.ebuild 1114 BLAKE2B babdca5f656859ecd31db115926d7cca559d14694fc18cb4e6a29f2946ef28872b522452f971d433576ca0791791413840ca4488e49dc0f2d696edccae122d8f SHA512 5d5e22824f64627f4467e31232383879f369fb7fc6aa4234dacf9714da22db63e232c6d1cc57860b0a7f8ed90ac18f56e74af7ee457b820f513bee0469006067
+EBUILD spqr-3.0.3.ebuild 5123 BLAKE2B 1fbc782524b85b8432b621935e5f9a1ff4fd79fdf020804a358bdcb36a3a7609884244f8d1c86988cddf3b026c481602386ebc80282c674f4723cd070fce28ad SHA512 f8d1cfb5e56cdd0f7fead65b967f8585097f926261972b742b379327131910ead7cf5e6faf498a8c5f2dd7e5c5760ba668fcacb409f62a4a8b867212537c3998
+MISC metadata.xml 946 BLAKE2B d4051a416ebcfe046be31a02b3fca1d9b2e694d19b9f5c978ed927ce4dd4475f30025f011de24e93f1dedd5fcf3a779702d8467bdcc6a10324dc4ff9262eda97 SHA512 bb5d99a561952a29d16710c6730312f32a7d8ca8eb57a8a2479ee32a5612414e9ff00c0427c5a2962b7b3cf4b9a8b57caaace65e34f20b9fcc87714b493db157
diff --git a/sci-libs/spqr/metadata.xml b/sci-libs/spqr/metadata.xml
index d4b1f066575e..ca887f817722 100644
--- a/sci-libs/spqr/metadata.xml
+++ b/sci-libs/spqr/metadata.xml
@@ -19,4 +19,7 @@
   <flag name="tbb">Enable multithreading with the Intel Threads
   Building Block <pkg>dev-cpp/tbb</pkg></flag>
 </use>
+<upstream>
+  <remote-id type="github">DrTimothyAldenDavis/SuiteSparse</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sci-libs/spqr/spqr-2.0.9-r2.ebuild b/sci-libs/spqr/spqr-2.0.9-r3.ebuild
index 725a9490aa41..b63bdbe966ea 100644
--- a/sci-libs/spqr/spqr-2.0.9-r2.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9-r3.ebuild
@@ -20,7 +20,7 @@ BDEPEND="virtual/pkgconfig
 # spqr links to metis directly, too.
 DEPEND="
 	virtual/lapack
-	>=sci-libs/cholmod-2[lapack,partition?]
+	=sci-libs/cholmod-3*[lapack,partition?]
 	partition? ( >=sci-libs/metis-5.1.0 )
 	tbb? ( <dev-cpp/tbb-2021:= )"
 RDEPEND="${DEPEND}"
diff --git a/sci-libs/spqr/spqr-3.0.3.ebuild b/sci-libs/spqr/spqr-3.0.3.ebuild
new file mode 100644
index 000000000000..2ccb6181a12e
--- /dev/null
+++ b/sci-libs/spqr/spqr-3.0.3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib toolchain-funcs
+
+Sparse_PV="7.0.0"
+Sparse_P="SuiteSparse-${Sparse_PV}"
+DESCRIPTION="Multithreaded multifrontal sparse QR factorization library"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
+SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc openmp test"
+RESTRICT="!test? ( test )"
+
+DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}
+	>=sci-libs/amd-3.0.3
+	>=sci-libs/colamd-3.0.3
+	>=sci-libs/cholmod-4.0.3
+	virtual/blas"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( virtual/latex-base )"
+
+S="${WORKDIR}/${Sparse_P}/${PN^^}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DNSTATIC=ON
+		-DNOPENMP=$(usex openmp OFF ON)
+		-DDEMO=$(usex test)
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# Run demo files
+	./qrsimple  < "${S}"/Matrix/ash219.mtx || die "failed testing"
+	./qrsimplec < "${S}"/Matrix/ash219.mtx || die "failed testing"
+	./qrsimple  < "${S}"/Matrix/west0067.mtx || die "failed testing"
+	./qrsimplec < "${S}"/Matrix/west0067.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/a2.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/r2.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/a04.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/a2.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/west0067.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/c2.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/a0.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/lfat5b.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/bfwa62.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/LFAT5.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/b1_ss.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/bcspwr01.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/lpi_galenet.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/lpi_itest6.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/ash219.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/a4.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/s32.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/c32.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/lp_share1b.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/a1.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/GD06_theory.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/GD01_b.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/Tina_AskCal_perm.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/Tina_AskCal.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/GD98_a.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/Ragusa16.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/young1c.mtx || die "failed testing"
+	./qrdemo < "${S}"/Matrix/lp_e226_transposed.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/a2.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/r2.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/a04.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/a2.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/west0067.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/c2.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/a0.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/lfat5b.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/bfwa62.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/LFAT5.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/b1_ss.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/bcspwr01.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/lpi_galenet.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/lpi_itest6.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/ash219.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/a4.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/s32.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/c32.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/lp_share1b.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/a1.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/GD06_theory.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/GD01_b.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/Tina_AskCal_perm.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/Tina_AskCal.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/GD98_a.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/Ragusa16.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/young1c.mtx || die "failed testing"
+	./qrdemoc < "${S}"/Matrix/lp_e226_transposed.mtx || die "failed testing"
+}
+
+multilib_src_install() {
+	if use doc; then
+		pushd "${S}/Doc"
+		emake clean
+		rm -rf *.pdf
+		emake
+		popd
+		DOCS="${S}/Doc/*.pdf"
+	fi
+	cmake_src_install
+}