[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/why3-for-spark/files/, sci-mathematics/why3-for-spark/

[Alfredo Tupone]

commit:     5180293d985699615c664fd41f6ca48e5d3db1ff
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 17:08:37 2025 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 17:09:31 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5180293d

sci-mathematics/why3-for-spark: fix for spark

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 .../files/why3-for-spark-2023.12.13-spark.patch               | 11 +++++++++++
 ...23.12.13-r1.ebuild => why3-for-spark-2023.12.13-r2.ebuild} |  5 ++---
 2 files changed, 13 insertions(+), 3 deletions(-)

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
similarity index 96%
rename from sci-mathematics/why3-for-spark/why3-for-spark-2023.12.13-r1.ebuild
rename to 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