Merge branch 'vbraun' for 10.3.beta5 and mostly suitesparse 7.5.1

cschwan · Jan 15, 2024 · ea5a1d7 · ea5a1d7
2 parents ec5a2ff + 72cb019
commit ea5a1d7
Show file tree

Hide file tree

Showing 42 changed files with 125 additions and 988 deletions.
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
@@ -1,2 +1 @@
-DIST SuiteSparse-7.3.1.gh.tar.gz 65341950 BLAKE2B b54735c9bc85df153e0fdfbe074bd6cc5d7e5a7d8b7c704d5e0b9538c224d37e374eb8ceaed145d064e37f0f1a4651c68cb48d5dc877fe5596920db7d085ccd8 SHA512 681d64349360246aaebea3246a87a7415c3528b4cde4aef6def3988e19087d7184ce1bf1fad0f80f7ea312d59f6f207dc2195f6be100871c5714115705c243f6
-DIST SuiteSparse-7.5.0.gh.tar.gz 85458240 BLAKE2B 7ec1c8b09404c81c560a183f1d18217471f1d8db16c0a6fbc971165431f586d81f057463cd0d68f316374e82a396979681103906b96750511438532ac0631e4c SHA512 378e694e762bac3c6352da15570d6e2d69ad29d2fa2dc68117d0e2528f7880ac0ba3f357a44a5c8ca4a0f8effc99af8603cdc74d76461506ab67077e70afa55f
+DIST SuiteSparse-7.5.1.gh.tar.gz 85459098 BLAKE2B 5e3e216c2578a05a556e16fc6adcfde1068d2c605b0b09cf8d5b1862576e55144ad62d4a6886afd35511130e9f33cf2aa09498ce11594058daff270f7c7d36d8 SHA512 1265ab3795119925dab3bd3a96aed5f48547dc24014f2fd91847ce83f00733caf4ea4026825d01960c2d3a2a316ed3762ed815e9dccc8f7d9dd9e5bd7387c1a1
diff --git a/sci-libs/amd/amd-3.2.1.ebuild b/sci-libs/amd/amd-3.2.1.ebuild
diff --git a/sci-libs/amd/amd-3.3.1.ebuild b/sci-libs/amd/amd-3.3.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 FORTRAN_NEEDED="fortran"
 inherit cmake fortran-2
 
-Sparse_PV="7.5.0"
+Sparse_PV="7.5.1"
 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"
@@ -25,6 +25,10 @@ BDEPEND="doc? ( virtual/latex-base )"
 S="${WORKDIR}/${Sparse_P}/${PN^^}"
 
 src_configure() {
+	# Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take
+	# the value suitesparse, and the include directory would be set to
+	# /usr/include/suitesparse
+	# This need to be set in all suitesparse ebuilds.
 	local mycmakeargs=(
 		-DNSTATIC=ON
 		-DSUITESPARSE_USE_FORTRAN=$(usex fortran ON OFF)
@@ -37,7 +41,7 @@ src_configure() {
 src_test() {
 	# Because we are not using cmake_src_test,
 	# we have to manually go to BUILD_DIR
-	cd "${BUILD_DIR}"
+	cd "${BUILD_DIR}" || die || die
 	# Run demo files
 	local demofiles=(
 		amd_demo
@@ -60,11 +64,11 @@ src_test() {
 
 src_install() {
 	if use doc; then
-		pushd "${S}/Doc"
+		pushd "${S}/Doc" || die
 		emake clean
-		rm -rf *.pdf
+		rm -rf *.pdf || die
 		emake
-		popd
+		popd || die
 		DOCS="${S}/Doc/*.pdf"
 	fi
 	cmake_src_install

diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
@@ -1,2 +1 @@
-DIST SuiteSparse-7.3.1.gh.tar.gz 65341950 BLAKE2B b54735c9bc85df153e0fdfbe074bd6cc5d7e5a7d8b7c704d5e0b9538c224d37e374eb8ceaed145d064e37f0f1a4651c68cb48d5dc877fe5596920db7d085ccd8 SHA512 681d64349360246aaebea3246a87a7415c3528b4cde4aef6def3988e19087d7184ce1bf1fad0f80f7ea312d59f6f207dc2195f6be100871c5714115705c243f6
-DIST SuiteSparse-7.5.0.gh.tar.gz 85458240 BLAKE2B 7ec1c8b09404c81c560a183f1d18217471f1d8db16c0a6fbc971165431f586d81f057463cd0d68f316374e82a396979681103906b96750511438532ac0631e4c SHA512 378e694e762bac3c6352da15570d6e2d69ad29d2fa2dc68117d0e2528f7880ac0ba3f357a44a5c8ca4a0f8effc99af8603cdc74d76461506ab67077e70afa55f
+DIST SuiteSparse-7.5.1.gh.tar.gz 85459098 BLAKE2B 5e3e216c2578a05a556e16fc6adcfde1068d2c605b0b09cf8d5b1862576e55144ad62d4a6886afd35511130e9f33cf2aa09498ce11594058daff270f7c7d36d8 SHA512 1265ab3795119925dab3bd3a96aed5f48547dc24014f2fd91847ce83f00733caf4ea4026825d01960c2d3a2a316ed3762ed815e9dccc8f7d9dd9e5bd7387c1a1
diff --git a/sci-libs/btf/btf-2.2.1.ebuild b/sci-libs/btf/btf-2.2.1.ebuild
diff --git a/sci-libs/btf/btf-2.3.1.ebuild b/sci-libs/btf/btf-2.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake
 
-Sparse_PV="7.5.0"
+Sparse_PV="7.5.1"
 Sparse_P="SuiteSparse-${Sparse_PV}"
 DESCRIPTION="Algorithm for matrix permutation into block triangular form"
 HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
@@ -21,6 +21,10 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${Sparse_P}/${PN^^}"
 
 src_configure() {
+	# Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take
+	# the value suitesparse, and the include directory would be set to
+	# /usr/include/suitesparse
+	# This need to be set in all suitesparse ebuilds.
 	local mycmakeargs=(
 		-DNSTATIC=ON
 		-DSUITESPARSE_INCLUDEDIR_POSTFIX=""

diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
@@ -1,2 +1 @@
-DIST SuiteSparse-7.3.1.gh.tar.gz 65341950 BLAKE2B b54735c9bc85df153e0fdfbe074bd6cc5d7e5a7d8b7c704d5e0b9538c224d37e374eb8ceaed145d064e37f0f1a4651c68cb48d5dc877fe5596920db7d085ccd8 SHA512 681d64349360246aaebea3246a87a7415c3528b4cde4aef6def3988e19087d7184ce1bf1fad0f80f7ea312d59f6f207dc2195f6be100871c5714115705c243f6
-DIST SuiteSparse-7.5.0.gh.tar.gz 85458240 BLAKE2B 7ec1c8b09404c81c560a183f1d18217471f1d8db16c0a6fbc971165431f586d81f057463cd0d68f316374e82a396979681103906b96750511438532ac0631e4c SHA512 378e694e762bac3c6352da15570d6e2d69ad29d2fa2dc68117d0e2528f7880ac0ba3f357a44a5c8ca4a0f8effc99af8603cdc74d76461506ab67077e70afa55f
+DIST SuiteSparse-7.5.1.gh.tar.gz 85459098 BLAKE2B 5e3e216c2578a05a556e16fc6adcfde1068d2c605b0b09cf8d5b1862576e55144ad62d4a6886afd35511130e9f33cf2aa09498ce11594058daff270f7c7d36d8 SHA512 1265ab3795119925dab3bd3a96aed5f48547dc24014f2fd91847ce83f00733caf4ea4026825d01960c2d3a2a316ed3762ed815e9dccc8f7d9dd9e5bd7387c1a1
diff --git a/sci-libs/camd/camd-3.2.1.ebuild b/sci-libs/camd/camd-3.2.1.ebuild
diff --git a/sci-libs/camd/camd-3.3.1.ebuild b/sci-libs/camd/camd-3.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake
 
-Sparse_PV="7.5.0"
+Sparse_PV="7.5.1"
 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"
@@ -24,6 +24,10 @@ BDEPEND="doc? ( virtual/latex-base )"
 S="${WORKDIR}/${Sparse_P}/${PN^^}"
 
 src_configure() {
+	# Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take
+	# the value suitesparse, and the include directory would be set to
+	# /usr/include/suitesparse
+	# This need to be set in all suitesparse ebuilds.
 	local mycmakeargs=(
 		-DNSTATIC=ON
 		-DSUITESPARSE_DEMOS=$(usex test)
@@ -35,7 +39,7 @@ src_configure() {
 src_test() {
 	# Because we are not using cmake_src_test,
 	# we have to manually go to BUILD_DIR
-	cd "${BUILD_DIR}"
+	cd "${BUILD_DIR}" || die
 	# Run demo files
 	local demofiles=(
 		camd_demo
@@ -52,11 +56,11 @@ src_test() {
 
 src_install() {
 	if use doc; then
-		pushd "${S}/Doc"
+		pushd "${S}/Doc" || die
 		emake clean
-		rm -rf *.pdf
+		rm -rf *.pdf || die
 		emake
-		popd
+		popd || die
 		DOCS="${S}/Doc/*.pdf"
 	fi
 	cmake_src_install

diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
@@ -1,2 +1 @@
-DIST SuiteSparse-7.3.1.gh.tar.gz 65341950 BLAKE2B b54735c9bc85df153e0fdfbe074bd6cc5d7e5a7d8b7c704d5e0b9538c224d37e374eb8ceaed145d064e37f0f1a4651c68cb48d5dc877fe5596920db7d085ccd8 SHA512 681d64349360246aaebea3246a87a7415c3528b4cde4aef6def3988e19087d7184ce1bf1fad0f80f7ea312d59f6f207dc2195f6be100871c5714115705c243f6
-DIST SuiteSparse-7.5.0.gh.tar.gz 85458240 BLAKE2B 7ec1c8b09404c81c560a183f1d18217471f1d8db16c0a6fbc971165431f586d81f057463cd0d68f316374e82a396979681103906b96750511438532ac0631e4c SHA512 378e694e762bac3c6352da15570d6e2d69ad29d2fa2dc68117d0e2528f7880ac0ba3f357a44a5c8ca4a0f8effc99af8603cdc74d76461506ab67077e70afa55f
+DIST SuiteSparse-7.5.1.gh.tar.gz 85459098 BLAKE2B 5e3e216c2578a05a556e16fc6adcfde1068d2c605b0b09cf8d5b1862576e55144ad62d4a6886afd35511130e9f33cf2aa09498ce11594058daff270f7c7d36d8 SHA512 1265ab3795119925dab3bd3a96aed5f48547dc24014f2fd91847ce83f00733caf4ea4026825d01960c2d3a2a316ed3762ed815e9dccc8f7d9dd9e5bd7387c1a1
diff --git a/sci-libs/ccolamd/ccolamd-3.2.1.ebuild b/sci-libs/ccolamd/ccolamd-3.2.1.ebuild
diff --git a/sci-libs/ccolamd/ccolamd-3.3.1.ebuild b/sci-libs/ccolamd/ccolamd-3.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake
 
-Sparse_PV="7.5.0"
+Sparse_PV="7.5.1"
 Sparse_P="SuiteSparse-${Sparse_PV}"
 DESCRIPTION="Constrained Column approximate minimum degree ordering algorithm"
 HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
@@ -23,6 +23,10 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${Sparse_P}/${PN^^}"
 
 src_configure() {
+	# Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take
+	# the value suitesparse, and the include directory would be set to
+	# /usr/include/suitesparse
+	# This need to be set in all suitesparse ebuilds.
 	local mycmakeargs=(
 		-DNSTATIC=ON
 		-DSUITESPARSE_DEMOS=$(usex test)
@@ -34,7 +38,7 @@ src_configure() {
 src_test() {
 	# Because we are not using cmake_src_test,
 	# we have to manually go to BUILD_DIR
-	cd "${BUILD_DIR}"
+	cd "${BUILD_DIR}" || die
 	# Run demo files
 	./ccolamd_example > ccolamd_example.out
 	diff "${S}"/Demo/ccolamd_example.out ccolamd_example.out || die "failed testing ccolamd_example"

diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
@@ -1,2 +1 @@
-DIST SuiteSparse-7.3.1.gh.tar.gz 65341950 BLAKE2B b54735c9bc85df153e0fdfbe074bd6cc5d7e5a7d8b7c704d5e0b9538c224d37e374eb8ceaed145d064e37f0f1a4651c68cb48d5dc877fe5596920db7d085ccd8 SHA512 681d64349360246aaebea3246a87a7415c3528b4cde4aef6def3988e19087d7184ce1bf1fad0f80f7ea312d59f6f207dc2195f6be100871c5714115705c243f6
-DIST SuiteSparse-7.5.0.gh.tar.gz 85458240 BLAKE2B 7ec1c8b09404c81c560a183f1d18217471f1d8db16c0a6fbc971165431f586d81f057463cd0d68f316374e82a396979681103906b96750511438532ac0631e4c SHA512 378e694e762bac3c6352da15570d6e2d69ad29d2fa2dc68117d0e2528f7880ac0ba3f357a44a5c8ca4a0f8effc99af8603cdc74d76461506ab67077e70afa55f
+DIST SuiteSparse-7.5.1.gh.tar.gz 85459098 BLAKE2B 5e3e216c2578a05a556e16fc6adcfde1068d2c605b0b09cf8d5b1862576e55144ad62d4a6886afd35511130e9f33cf2aa09498ce11594058daff270f7c7d36d8 SHA512 1265ab3795119925dab3bd3a96aed5f48547dc24014f2fd91847ce83f00733caf4ea4026825d01960c2d3a2a316ed3762ed815e9dccc8f7d9dd9e5bd7387c1a1