gentoo auto-resync : 13:02:2025 - 00:12:52

6 files changed, 17 insertions, 6 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 239c5934a998..c14bfffc294a 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/manifold/Manifest b/sci-mathematics/manifold/Manifest
index 5f8ebed69bef..40addbf39909 100644
--- a/sci-mathematics/manifold/Manifest
+++ b/sci-mathematics/manifold/Manifest
@@ -1,5 +1,5 @@
 DIST manifold-3.0.0_pre20241115.tar.gz 29143605 BLAKE2B 84c3e4c98a9279187660f31e4010097de431472412f2591943c99195edad9f700115df4b362d968b95e3ee136c699eecf2dc9845001019f71e9cf7b0cbca4d0e SHA512 bae671d190d8fbfc0ee12989a73a38d7d0ddf0e0081db8f56a446c09998e24f43828d70731f97d6948599f31ef6734f86183debc09f4cec07983af317ce0dba8
 DIST manifold-3.0.1.tar.gz 29246794 BLAKE2B 342cc6a3f125613e2d8837f04936bfce0fd2bf6cc6390bf2924916f74e5528d0f082c17a646a52255f4c4087359fd312ee43a4b5661d6682fd8f1e98eaa905cf SHA512 6970d7b30a0174eacd0a7f74d8e9647150f44144237815d6539a0669fcc74b5ddf336d12d1ee57b18ad6a97d8b58501cfe4072f9fd12c88395714471cb654f5a
 EBUILD manifold-3.0.0_pre20241115.ebuild 1386 BLAKE2B e1f704f06c217079f7f162b6a4930b951d5e996dfdb4b850940de9aee186a57e64b7c7291875e2af79ddbd52501984701b5b83afffbf641a9e32383d174d7e4a SHA512 821e47176c75c4d3ab5d4dd8471725e064df2f7668b801ed0736ec28a2dc85ec458f4b4568538fc9f9ad453a2e9a313e4391218ef1b2455329967e154141ab7f
-EBUILD manifold-3.0.1.ebuild 1725 BLAKE2B 0aca4377ec0939337389f6adac21e933b0f6e3c26d8e2ca41befe95072a2e191f612f56baeb319733d787611d5414be3f0731dd9ef0c6533ca36493c710ca80b SHA512 18ab5e84e08bf795e39610fc8a947c86a5480d0d0c7bddc15b4c0ece7dfbb59d0b5e09679ceb1df3c418014547aca75cbee21c0187740f17e0db2a708655dc6f
+EBUILD manifold-3.0.1.ebuild 1724 BLAKE2B 371738ad08cbcd7cca9947e3dbfd632de1514f691b05d3c6b039ec649dd7f72efe362f081b90c3c5b55e3f2256f6acdb562855673da6d15b3a2ae44633824246 SHA512 e06e336aff8482bc0e4c8ce4fd260e8ee86c6312d4e042408da30ffba744929eca9a680f2bc573b78f841850e5eec740a762618b75eb4be1c6909d6c79a8664f
 MISC metadata.xml 575 BLAKE2B f8f7e2de3f7c2198603a2315148bb25c6230d5fca15aa123f84a4449b6017872f2a1f6be8ac80f7d86143153f741cdb626e0ece3d3801abc2ba1eff88ba6d246 SHA512 ada6bf6ce31c171009b7238ba9e9079b6aff961cbf3aec6f2427793a004c5a4e1cd8ccb7a86d9c2d7f20c831fce790de4c3c386c1d2fa6927c779fffe73da4e8
diff --git a/sci-mathematics/manifold/manifold-3.0.1.ebuild b/sci-mathematics/manifold/manifold-3.0.1.ebuild
index 966bc371e5ed..61fcfb984a91 100644
--- a/sci-mathematics/manifold/manifold-3.0.1.ebuild
+++ b/sci-mathematics/manifold/manifold-3.0.1.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_URI="https://github.com/elalish/manifold/releases/download/v${PV}/${P}.tar.gz"
 	fi
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index 68816295ed9a..d6a1977106ef 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -3,8 +3,9 @@ AUX why3-for-spark-2020-gentoo.patch 332 BLAKE2B d71897d1d253a95f2a783483ee7bb0d
 AUX why3-for-spark-2021-flags.patch 1234 BLAKE2B 617040fbf9204382adda8161a07ab5244bb60daf1936a8c549ccd3c28a10e447c80cf8875ef2d16103751dfc9881c15e0a8f39f2877fe7d0adf9a8dd374e1e21 SHA512 abbe1b1f9ed6b5aedf0521e0f8d19b6f0267c5304000419f6df91b581bfa99a46c4b46ceed5a294ffc47c0b2f987666c6cd5801049da14b79f24885cbd227bcb
 AUX why3-for-spark-2021-make.patch 350 BLAKE2B 970a7ba442a22d96e5807aacd07997587c20a53660045392229e2069801ae4b8f92c5385fa732341acb2498dbcf515d51aa5f2e96d6375006dfedc7ee2eea53f SHA512 b729369bb74e3a8546b449f186cac490d83e764a4fe801de9dd9cb134a8e21dcd9b45af6c63733d953b3072e4363e95599d0cd8e6dfdb936648c3acb9918828e
 AUX why3-for-spark-2023.12.13-flags.patch 863 BLAKE2B c6456f944667dc72eb87b2e76d3ac0537208bbbda6b9fa4584295380fab030a2b3751cf1cf490c88e78beb1547ac2daaec2e8246258a640d0d94d56ddeb9425b SHA512 f5db8c0c03eff52bfe9f675dc7e784d8dd86e37e070fa5756dbc7065b88577c7006d9d132fc4093b25abde692b114facf9445965b5485bea56c97290b5087af5
+AUX why3-for-spark-2023.12.13-spark.patch 357 BLAKE2B 5382fc4b53392c237552110497d9a86f5f215f9b7b83ba8f1f0357fee9c8defdef73b6793efe4a82ebc3d57d00325d4db622f2ac7639f88e00b792e214b1a7c7 SHA512 910fbf286476510c3fcf1b4662694b67398ea35edd2e0c8f71a27f767a341ef472f9c74c754b185d59bbd11493f369dddc340ac80ba63f5734b9e6c84d1ca5f8
 DIST why3-2021-20210519-19ADF-src.tar.gz 10386938 BLAKE2B 93b6323c562126244f5cccef34088a521fe3dc1cec07c966e94472503ec8492707b20a641936449307f0439e711a82260d36679cbc69f53df8e7886a1d3673c3 SHA512 65e3c1430001962f2c7cce786f3e30f14b5295cff89c4087d95c1545e81743723319ba0309dbe15c4c46552110b25ff57addc3ee085dade02ea59a2273b127db
 DIST why3-for-spark-2023.12.13.tar.gz 7119379 BLAKE2B 4fd78efaabc2ca40853a905b1581ed976660f5b1b01ab9490c422022284132d8306289aad3eb2111d85d5cde5b50242b5d94d313e8d78a7443b7fcc4298fd11b SHA512 88220595eae9c5cf4125c0dc9d5176e637a1f1e355f61f51176bdb7643a000c837e501101e45c2b50ae3f41f81436e1133be241fd5fb0b6816823b2106113ae7
 EBUILD why3-for-spark-2021-r1.ebuild 3103 BLAKE2B fd8e8cd70d1d38c69fad088c3ba66f101e335bea625ab3dffe996d1462f364a2e4e5489869c462396b4a0ec7a4e418df593f1869927188840ffadd4b56a02cb6 SHA512 dc2472a0a6375bb8cf08760d438fdb4cd3f4dcc41063f6b4950657cf7d277c7b6506269fbbd8c711b951fc8cfb8d65fde9df5fa4af556c7a68814001961370e9
-EBUILD why3-for-spark-2023.12.13-r1.ebuild 3107 BLAKE2B 1477f170923229bd641f61f22259263a028777807b9c99adcf055b14ca1f773e31107d3ce0f347c14feac6e807754b7828cb63489513ef29a67a5ef7dcc0782b SHA512 516831ad8f2974dbaf39bc3de92108c73c12dee9a8a1e2d307ede4cfff3a8dae77aeb332d0a8e63765b63674052b7d2dba90eea0454cf7598692e6ac770e71e1
+EBUILD why3-for-spark-2023.12.13-r2.ebuild 3074 BLAKE2B 3291da81108b5c037654d03f72aca7fba045bdfa3628ac93730a3f246cf1d26be7faa72db79c4b080a8d21074077b0d92314e968c3ce42db55d78019e0dd0459 SHA512 a1200ca83c3c0cb0b4b602f77696d382e389004db9b11ae9649bfc75fc979bc630ebdfa9ddbc54683d58db944634819e12db31d33c309a23c348082fde34f73a
 MISC metadata.xml 1561 BLAKE2B 48c1ebe394b9a4152cd3b3a0560ff5e2d0e93e48422265d224b49b80b5b625b110f3561a09825e7e6efaf1dbb1dca8362612cfdccd43d954f4a848fb39624653 SHA512 02c1cecdd192e289d0146d0ba16148a2fcd9daddc39b6afbaa2a510594475a12cacd4b4c92d1c1b7bf40c291a90d66b887fdbf19fa82af45f197e2323e4b2b20
diff --git a/sci-mathematics/why3-for-spark/files/why3-for-spark-2023.12.13-spark.patch b/sci-mathematics/why3-for-spark/files/why3-for-spark-2023.12.13-spark.patch
new file mode 100644
index 000000000000..e61b8606c5fb
--- /dev/null
+++ b/sci-mathematics/why3-for-spark/files/why3-for-spark-2023.12.13-spark.patch
@@ -0,0 +1,11 @@
+--- a/src/gnat/gnat_util.ml	2025-02-10 23:34:07.591622078 +0100
++++ b/src/gnat/gnat_util.ml	2025-02-10 23:34:21.920445321 +0100
+@@ -41,7 +41,7 @@
+ let why3_prefix =
+   Filename.dirname (Filename.dirname Sys.executable_name)
+ let spark_prefix =
+-  Filename.dirname (Filename.dirname why3_prefix)
++  why3_prefix
+ 
+ let gnatprove_why3conf_file = "why3.conf"
+ 
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2023.12.13-r1.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2023.12.13-r2.ebuild
index 098fc91adf34..83f7bbf5a63b 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2023.12.13-r1.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2023.12.13-r2.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-flags.patch
 	"${FILESDIR}"/${PN}-2021-make.patch #Bug #883167
 	"${FILESDIR}"/${PN}-2020-bibtex.patch
+	"${FILESDIR}"/${P}-spark.patch
 )
 
 QA_FLAGS_IGNORED=(
@@ -106,15 +107,13 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" -j1 install
-	emake DESTDIR="${D}" -j1 install-lib
 	emake DESTDIR="${D}" install_spark2014_dev
 	local cmdPath=/usr/$(get_libdir)/why3/commands
 	dosym ../why3server ${cmdPath}/why3server
 	# Remove duplicated files
 	for filename in config.cmxs ide.cmxs realize.cmxs server session.cmxs; do
 		if [[ -e "${D}"${cmdPath}/why3${filename} ]]; then
-			rm "${D}"${cmdPath}/why3${filename}
+			rm "${D}"${cmdPath}/why3${filename} || die
 			dosym ../../../bin/why3${filename} ${cmdPath}/why3${filename}
 		fi
 	done