From efedd6cd8ef5fc98119b3ea13e9fb3765e04f42e Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Mon, 4 May 2026 17:23:04 +0200
Subject: [PATCH] sci-libs/spqr: depend on cholmod:=

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44994
Signed-off-by: Sam James <sam@gentoo.org>
---
 sci-libs/spqr/spqr-2.0.9-r4.ebuild | 13 +++++++++----
 sci-libs/spqr/spqr-3.0.3.ebuild    | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/sci-libs/spqr/spqr-2.0.9-r4.ebuild b/sci-libs/spqr/spqr-2.0.9-r4.ebuild
index c7f54ac0f17ea..975f72260efdf 100644
--- a/sci-libs/spqr/spqr-2.0.9-r4.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9-r4.ebuild
@@ -14,17 +14,22 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="doc partition tbb"
 
-BDEPEND="virtual/pkgconfig
-	doc? ( virtual/latex-base )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )
+"
 # We require the cholmod supernodal module that is enabled with
 # USE=lapack, and cholmod has to have partition support if spqr is going
 # to have it (the ./configure script for spqr checks this). Note that
 # spqr links to metis directly, too.
 DEPEND="
 	virtual/lapack
-	=sci-libs/cholmod-3*[lapack,partition?]
+	=sci-libs/cholmod-3*:=[lapack,partition?]
+	sci-libs/suitesparseconfig
+
 	partition? ( >=sci-libs/metis-5.1.0 )
-	tbb? ( <dev-cpp/tbb-2021:= )"
+	tbb? ( <dev-cpp/tbb-2021:= )
+"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/sci-libs/spqr/spqr-3.0.3.ebuild b/sci-libs/spqr/spqr-3.0.3.ebuild
index 27d1fec07706b..5b2b67d6b45c5 100644
--- a/sci-libs/spqr/spqr-3.0.3.ebuild
+++ b/sci-libs/spqr/spqr-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,6 +10,7 @@ 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"
+S="${WORKDIR}/${Sparse_P}/${PN^^}"
 
 LICENSE="GPL-2+"
 SLOT="0/3"
@@ -17,15 +18,17 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc openmp test"
 RESTRICT="!test? ( test )"
 
-DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}
+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"
+	>=sci-libs/cholmod-4.0.3:=
+	virtual/blas
+"
 RDEPEND="${DEPEND}"
-BDEPEND="doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${Sparse_P}/${PN^^}"
+BDEPEND="
+	doc? ( virtual/latex-base )
+"
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp