Merge branch 'vbraun' import newer suitesparse

cschwan · Jan 11, 2024 · ec5a2ff · ec5a2ff
2 parents f8462bb + c690e01
commit ec5a2ff
Show file tree

Hide file tree

Showing 37 changed files with 92 additions and 377 deletions.
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
diff --git a/dev-python/cvxopt/cvxopt-1.3.2-r1.ebuild b/dev-python/cvxopt/cvxopt-1.3.2-r1.ebuild
diff --git a/dev-python/cvxopt/metadata.xml b/dev-python/cvxopt/metadata.xml
diff --git a/profiles/package.mask b/profiles/package.mask
@@ -1,17 +1 @@
 # Kept for any experimental package not to be merged by users
-# suitesparse 7.4.0 is breaking things because headers are moved to usr/include/suitesparse
->=sci-libs/suitesparseconfig-7.4.0
->=sci-libs/amd-3.3.0
->=sci-libs/camd-3.3.0
->=sci-libs/colamd-3.3.0
->=sci-libs/ccolamd-3.3.0
->=sci-libs/cholmod-5.1.0
->=sci-libs/spqr-4.3.0
->=sci-libs/spex-2.3.0
->=sci-libs/rbio-4.3.0
->=sci-libs/btf-2.3.0
->=sci-libs/cxsparse-4.3.0
->=sci-libs/klu-2.3.0
->=sci-libs/ldl-3.3.0
->=sci-libs/umfpack-6.3.0
-=dev-python/cvxopt-1.3.2-r1
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
@@ -1,2 +1,2 @@
 DIST SuiteSparse-7.3.1.gh.tar.gz 65341950 BLAKE2B b54735c9bc85df153e0fdfbe074bd6cc5d7e5a7d8b7c704d5e0b9538c224d37e374eb8ceaed145d064e37f0f1a4651c68cb48d5dc877fe5596920db7d085ccd8 SHA512 681d64349360246aaebea3246a87a7415c3528b4cde4aef6def3988e19087d7184ce1bf1fad0f80f7ea312d59f6f207dc2195f6be100871c5714115705c243f6
-DIST SuiteSparse-7.4.0.gh.tar.gz 85395023 BLAKE2B 7b7740820d84ab3e02560cb6cdefeb5a3ba89cffe7f0a5aca84bf2bec88227c62d9f5e07480ca147228f8abddc1c10e190fe67d30b5a9364b024ffff6ec8d2c8 SHA512 c0a256ffeb1b974a8bff6e8cb01ed0f5e48e27e408b56c7ddb4fadab579b2bf1bdd71beafffe497aa9c3b6bc7dde879adc0e2bd74960008d97e406c896c2ea03
+DIST SuiteSparse-7.5.0.gh.tar.gz 85458240 BLAKE2B 7ec1c8b09404c81c560a183f1d18217471f1d8db16c0a6fbc971165431f586d81f057463cd0d68f316374e82a396979681103906b96750511438532ac0631e4c SHA512 378e694e762bac3c6352da15570d6e2d69ad29d2fa2dc68117d0e2528f7880ac0ba3f357a44a5c8ca4a0f8effc99af8603cdc74d76461506ab67077e70afa55f
diff --git a/sci-libs/amd/amd-3.3.0.ebuild → sci-libs/amd/amd-3.3.1.ebuild b/sci-libs/amd/amd-3.3.0.ebuild → sci-libs/amd/amd-3.3.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 FORTRAN_NEEDED="fortran"
 inherit cmake fortran-2
 
-Sparse_PV="7.4.0"
+Sparse_PV="7.5.0"
 Sparse_P="SuiteSparse-${Sparse_PV}"
 DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
 HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
@@ -29,6 +29,7 @@ src_configure() {
 		-DNSTATIC=ON
 		-DSUITESPARSE_USE_FORTRAN=$(usex fortran ON OFF)
 		-DSUITESPARSE_DEMOS=$(usex test)
+		-DSUITESPARSE_INCLUDEDIR_POSTFIX=""
 	)
 	cmake_src_configure
 }

diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
@@ -1,2 +1,2 @@
 DIST SuiteSparse-7.3.1.gh.tar.gz 65341950 BLAKE2B b54735c9bc85df153e0fdfbe074bd6cc5d7e5a7d8b7c704d5e0b9538c224d37e374eb8ceaed145d064e37f0f1a4651c68cb48d5dc877fe5596920db7d085ccd8 SHA512 681d64349360246aaebea3246a87a7415c3528b4cde4aef6def3988e19087d7184ce1bf1fad0f80f7ea312d59f6f207dc2195f6be100871c5714115705c243f6
-DIST SuiteSparse-7.4.0.gh.tar.gz 85395023 BLAKE2B 7b7740820d84ab3e02560cb6cdefeb5a3ba89cffe7f0a5aca84bf2bec88227c62d9f5e07480ca147228f8abddc1c10e190fe67d30b5a9364b024ffff6ec8d2c8 SHA512 c0a256ffeb1b974a8bff6e8cb01ed0f5e48e27e408b56c7ddb4fadab579b2bf1bdd71beafffe497aa9c3b6bc7dde879adc0e2bd74960008d97e406c896c2ea03
+DIST SuiteSparse-7.5.0.gh.tar.gz 85458240 BLAKE2B 7ec1c8b09404c81c560a183f1d18217471f1d8db16c0a6fbc971165431f586d81f057463cd0d68f316374e82a396979681103906b96750511438532ac0631e4c SHA512 378e694e762bac3c6352da15570d6e2d69ad29d2fa2dc68117d0e2528f7880ac0ba3f357a44a5c8ca4a0f8effc99af8603cdc74d76461506ab67077e70afa55f
diff --git a/sci-libs/btf/btf-2.3.0.ebuild → sci-libs/btf/btf-2.3.1.ebuild b/sci-libs/btf/btf-2.3.0.ebuild → sci-libs/btf/btf-2.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake
 
-Sparse_PV="7.4.0"
+Sparse_PV="7.5.0"
 Sparse_P="SuiteSparse-${Sparse_PV}"
 DESCRIPTION="Algorithm for matrix permutation into block triangular form"
 HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
@@ -23,6 +23,7 @@ S="${WORKDIR}/${Sparse_P}/${PN^^}"
 src_configure() {
 	local mycmakeargs=(
 		-DNSTATIC=ON
+		-DSUITESPARSE_INCLUDEDIR_POSTFIX=""
 	)
 	cmake_src_configure
 }
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
@@ -1,2 +1,2 @@
 DIST SuiteSparse-7.3.1.gh.tar.gz 65341950 BLAKE2B b54735c9bc85df153e0fdfbe074bd6cc5d7e5a7d8b7c704d5e0b9538c224d37e374eb8ceaed145d064e37f0f1a4651c68cb48d5dc877fe5596920db7d085ccd8 SHA512 681d64349360246aaebea3246a87a7415c3528b4cde4aef6def3988e19087d7184ce1bf1fad0f80f7ea312d59f6f207dc2195f6be100871c5714115705c243f6
-DIST SuiteSparse-7.4.0.gh.tar.gz 85395023 BLAKE2B 7b7740820d84ab3e02560cb6cdefeb5a3ba89cffe7f0a5aca84bf2bec88227c62d9f5e07480ca147228f8abddc1c10e190fe67d30b5a9364b024ffff6ec8d2c8 SHA512 c0a256ffeb1b974a8bff6e8cb01ed0f5e48e27e408b56c7ddb4fadab579b2bf1bdd71beafffe497aa9c3b6bc7dde879adc0e2bd74960008d97e406c896c2ea03
+DIST SuiteSparse-7.5.0.gh.tar.gz 85458240 BLAKE2B 7ec1c8b09404c81c560a183f1d18217471f1d8db16c0a6fbc971165431f586d81f057463cd0d68f316374e82a396979681103906b96750511438532ac0631e4c SHA512 378e694e762bac3c6352da15570d6e2d69ad29d2fa2dc68117d0e2528f7880ac0ba3f357a44a5c8ca4a0f8effc99af8603cdc74d76461506ab67077e70afa55f
diff --git a/sci-libs/camd/camd-3.3.0.ebuild → sci-libs/camd/camd-3.3.1.ebuild b/sci-libs/camd/camd-3.3.0.ebuild → sci-libs/camd/camd-3.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake
 
-Sparse_PV="7.4.0"
+Sparse_PV="7.5.0"
 Sparse_P="SuiteSparse-${Sparse_PV}"
 DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
 HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
@@ -27,6 +27,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DNSTATIC=ON
 		-DSUITESPARSE_DEMOS=$(usex test)
+		-DSUITESPARSE_INCLUDEDIR_POSTFIX=""
 	)
 	cmake_src_configure
 }

diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
@@ -1,2 +1,2 @@
 DIST SuiteSparse-7.3.1.gh.tar.gz 65341950 BLAKE2B b54735c9bc85df153e0fdfbe074bd6cc5d7e5a7d8b7c704d5e0b9538c224d37e374eb8ceaed145d064e37f0f1a4651c68cb48d5dc877fe5596920db7d085ccd8 SHA512 681d64349360246aaebea3246a87a7415c3528b4cde4aef6def3988e19087d7184ce1bf1fad0f80f7ea312d59f6f207dc2195f6be100871c5714115705c243f6
-DIST SuiteSparse-7.4.0.gh.tar.gz 85395023 BLAKE2B 7b7740820d84ab3e02560cb6cdefeb5a3ba89cffe7f0a5aca84bf2bec88227c62d9f5e07480ca147228f8abddc1c10e190fe67d30b5a9364b024ffff6ec8d2c8 SHA512 c0a256ffeb1b974a8bff6e8cb01ed0f5e48e27e408b56c7ddb4fadab579b2bf1bdd71beafffe497aa9c3b6bc7dde879adc0e2bd74960008d97e406c896c2ea03
+DIST SuiteSparse-7.5.0.gh.tar.gz 85458240 BLAKE2B 7ec1c8b09404c81c560a183f1d18217471f1d8db16c0a6fbc971165431f586d81f057463cd0d68f316374e82a396979681103906b96750511438532ac0631e4c SHA512 378e694e762bac3c6352da15570d6e2d69ad29d2fa2dc68117d0e2528f7880ac0ba3f357a44a5c8ca4a0f8effc99af8603cdc74d76461506ab67077e70afa55f
diff --git a/sci-libs/ccolamd/ccolamd-3.3.0.ebuild → sci-libs/ccolamd/ccolamd-3.3.1.ebuild b/sci-libs/ccolamd/ccolamd-3.3.0.ebuild → sci-libs/ccolamd/ccolamd-3.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake
 
-Sparse_PV="7.4.0"
+Sparse_PV="7.5.0"
 Sparse_P="SuiteSparse-${Sparse_PV}"
 DESCRIPTION="Constrained Column approximate minimum degree ordering algorithm"
 HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
@@ -26,6 +26,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DNSTATIC=ON
 		-DSUITESPARSE_DEMOS=$(usex test)
+		-DSUITESPARSE_INCLUDEDIR_POSTFIX=""
 	)
 	cmake_src_configure
 }

diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
@@ -1,2 +1,2 @@
 DIST SuiteSparse-7.3.1.gh.tar.gz 65341950 BLAKE2B b54735c9bc85df153e0fdfbe074bd6cc5d7e5a7d8b7c704d5e0b9538c224d37e374eb8ceaed145d064e37f0f1a4651c68cb48d5dc877fe5596920db7d085ccd8 SHA512 681d64349360246aaebea3246a87a7415c3528b4cde4aef6def3988e19087d7184ce1bf1fad0f80f7ea312d59f6f207dc2195f6be100871c5714115705c243f6
-DIST SuiteSparse-7.4.0.gh.tar.gz 85395023 BLAKE2B 7b7740820d84ab3e02560cb6cdefeb5a3ba89cffe7f0a5aca84bf2bec88227c62d9f5e07480ca147228f8abddc1c10e190fe67d30b5a9364b024ffff6ec8d2c8 SHA512 c0a256ffeb1b974a8bff6e8cb01ed0f5e48e27e408b56c7ddb4fadab579b2bf1bdd71beafffe497aa9c3b6bc7dde879adc0e2bd74960008d97e406c896c2ea03
+DIST SuiteSparse-7.5.0.gh.tar.gz 85458240 BLAKE2B 7ec1c8b09404c81c560a183f1d18217471f1d8db16c0a6fbc971165431f586d81f057463cd0d68f316374e82a396979681103906b96750511438532ac0631e4c SHA512 378e694e762bac3c6352da15570d6e2d69ad29d2fa2dc68117d0e2528f7880ac0ba3f357a44a5c8ca4a0f8effc99af8603cdc74d76461506ab67077e70afa55f
diff --git a/sci-libs/cholmod/cholmod-5.1.0.ebuild → sci-libs/cholmod/cholmod-5.1.1.ebuild b/sci-libs/cholmod/cholmod-5.1.0.ebuild → sci-libs/cholmod/cholmod-5.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake toolchain-funcs
 
-Sparse_PV="7.4.0"
+Sparse_PV="7.5.0"
 Sparse_P="SuiteSparse-${Sparse_PV}"
 DESCRIPTION="Sparse Cholesky factorization and update/downdate library"
 HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
@@ -18,12 +18,12 @@ IUSE="+cholesky cuda doc openmp +matrixops +modify +partition +supernodal test"
 RESTRICT="!test? ( test )"
 
 DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}
-	>=sci-libs/amd-3.3.0
-	>=sci-libs/colamd-3.3.0
+	>=sci-libs/amd-3.3.1
+	>=sci-libs/colamd-3.3.1
 	supernodal? ( virtual/lapack )
 	partition? (
-		>=sci-libs/camd-3.3.0
-		>=sci-libs/ccolamd-3.3.0
+		>=sci-libs/camd-3.3.1
+		>=sci-libs/ccolamd-3.3.1
 	)
 	cuda? (
 		dev-util/nvidia-cuda-toolkit
@@ -61,6 +61,7 @@ src_configure() {
 		-DCHOLMOD_PARTITION=$(usex partition)
 		-DCHOLMOD_SUPERNODAL=$(usex supernodal)
 		-DSUITESPARSE_DEMOS=$(usex test)
+		-DSUITESPARSE_INCLUDEDIR_POSTFIX=""
 	)
 	cmake_src_configure
 }

diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
@@ -1,2 +1,2 @@
 DIST SuiteSparse-7.3.1.gh.tar.gz 65341950 BLAKE2B b54735c9bc85df153e0fdfbe074bd6cc5d7e5a7d8b7c704d5e0b9538c224d37e374eb8ceaed145d064e37f0f1a4651c68cb48d5dc877fe5596920db7d085ccd8 SHA512 681d64349360246aaebea3246a87a7415c3528b4cde4aef6def3988e19087d7184ce1bf1fad0f80f7ea312d59f6f207dc2195f6be100871c5714115705c243f6
-DIST SuiteSparse-7.4.0.gh.tar.gz 85395023 BLAKE2B 7b7740820d84ab3e02560cb6cdefeb5a3ba89cffe7f0a5aca84bf2bec88227c62d9f5e07480ca147228f8abddc1c10e190fe67d30b5a9364b024ffff6ec8d2c8 SHA512 c0a256ffeb1b974a8bff6e8cb01ed0f5e48e27e408b56c7ddb4fadab579b2bf1bdd71beafffe497aa9c3b6bc7dde879adc0e2bd74960008d97e406c896c2ea03
+DIST SuiteSparse-7.5.0.gh.tar.gz 85458240 BLAKE2B 7ec1c8b09404c81c560a183f1d18217471f1d8db16c0a6fbc971165431f586d81f057463cd0d68f316374e82a396979681103906b96750511438532ac0631e4c SHA512 378e694e762bac3c6352da15570d6e2d69ad29d2fa2dc68117d0e2528f7880ac0ba3f357a44a5c8ca4a0f8effc99af8603cdc74d76461506ab67077e70afa55f
diff --git a/sci-libs/colamd/colamd-3.3.0.ebuild → sci-libs/colamd/colamd-3.3.1.ebuild b/sci-libs/colamd/colamd-3.3.0.ebuild → sci-libs/colamd/colamd-3.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake
 
-Sparse_PV="7.4.0"
+Sparse_PV="7.5.0"
 Sparse_P="SuiteSparse-${Sparse_PV}"
 DESCRIPTION="Column approximate minimum degree ordering algorithm"
 HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
@@ -26,6 +26,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DNSTATIC=ON
 		-DSUITESPARSE_DEMOS=$(usex test)
+		-DSUITESPARSE_INCLUDEDIR_POSTFIX=""
 	)
 	cmake_src_configure
 }

diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
@@ -1,2 +1,2 @@
 DIST SuiteSparse-7.3.1.gh.tar.gz 65341950 BLAKE2B b54735c9bc85df153e0fdfbe074bd6cc5d7e5a7d8b7c704d5e0b9538c224d37e374eb8ceaed145d064e37f0f1a4651c68cb48d5dc877fe5596920db7d085ccd8 SHA512 681d64349360246aaebea3246a87a7415c3528b4cde4aef6def3988e19087d7184ce1bf1fad0f80f7ea312d59f6f207dc2195f6be100871c5714115705c243f6
-DIST SuiteSparse-7.4.0.gh.tar.gz 85395023 BLAKE2B 7b7740820d84ab3e02560cb6cdefeb5a3ba89cffe7f0a5aca84bf2bec88227c62d9f5e07480ca147228f8abddc1c10e190fe67d30b5a9364b024ffff6ec8d2c8 SHA512 c0a256ffeb1b974a8bff6e8cb01ed0f5e48e27e408b56c7ddb4fadab579b2bf1bdd71beafffe497aa9c3b6bc7dde879adc0e2bd74960008d97e406c896c2ea03
+DIST SuiteSparse-7.5.0.gh.tar.gz 85458240 BLAKE2B 7ec1c8b09404c81c560a183f1d18217471f1d8db16c0a6fbc971165431f586d81f057463cd0d68f316374e82a396979681103906b96750511438532ac0631e4c SHA512 378e694e762bac3c6352da15570d6e2d69ad29d2fa2dc68117d0e2528f7880ac0ba3f357a44a5c8ca4a0f8effc99af8603cdc74d76461506ab67077e70afa55f
diff --git a/sci-libs/cxsparse/cxsparse-4.3.0.ebuild → sci-libs/cxsparse/cxsparse-4.3.1.ebuild b/sci-libs/cxsparse/cxsparse-4.3.0.ebuild → sci-libs/cxsparse/cxsparse-4.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake
 
-Sparse_PV="7.4.0"
+Sparse_PV="7.5.0"
 Sparse_P="SuiteSparse-${Sparse_PV}"
 DESCRIPTION="Extended sparse matrix package"
 HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
@@ -26,6 +26,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DNSTATIC=ON
 		-DSUITESPARSE_DEMOS=$(usex test)
+		-DSUITESPARSE_INCLUDEDIR_POSTFIX=""
 	)
 	cmake_src_configure
 }

diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
@@ -1,2 +1,2 @@
 DIST SuiteSparse-7.3.1.gh.tar.gz 65341950 BLAKE2B b54735c9bc85df153e0fdfbe074bd6cc5d7e5a7d8b7c704d5e0b9538c224d37e374eb8ceaed145d064e37f0f1a4651c68cb48d5dc877fe5596920db7d085ccd8 SHA512 681d64349360246aaebea3246a87a7415c3528b4cde4aef6def3988e19087d7184ce1bf1fad0f80f7ea312d59f6f207dc2195f6be100871c5714115705c243f6
-DIST SuiteSparse-7.4.0.gh.tar.gz 85395023 BLAKE2B 7b7740820d84ab3e02560cb6cdefeb5a3ba89cffe7f0a5aca84bf2bec88227c62d9f5e07480ca147228f8abddc1c10e190fe67d30b5a9364b024ffff6ec8d2c8 SHA512 c0a256ffeb1b974a8bff6e8cb01ed0f5e48e27e408b56c7ddb4fadab579b2bf1bdd71beafffe497aa9c3b6bc7dde879adc0e2bd74960008d97e406c896c2ea03
+DIST SuiteSparse-7.5.0.gh.tar.gz 85458240 BLAKE2B 7ec1c8b09404c81c560a183f1d18217471f1d8db16c0a6fbc971165431f586d81f057463cd0d68f316374e82a396979681103906b96750511438532ac0631e4c SHA512 378e694e762bac3c6352da15570d6e2d69ad29d2fa2dc68117d0e2528f7880ac0ba3f357a44a5c8ca4a0f8effc99af8603cdc74d76461506ab67077e70afa55f