gentoo auto-resync : 21:05:2024 - 00:05:35

4 files changed, 91 insertions, 3 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index b4a3ae43517e..d6ecc79b00a1 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index 52c6c0af33bf..e2064a794821 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1,6 +1,7 @@
 AUX cvc4-1.8-bash-5.2-fix.patch 1092 BLAKE2B 3a637ffb59bcfd6af253d2c7b2964025f66c7bb074e2bfecb21b26399b9582fa3b4cc1c89b7a773bd37f39fcfa79d7cb8f9535fd724538b6cede38c3e964e242 SHA512 a0c51df4013bae3b5990972f39edb9cddbf6f627dec4533b697546e27056b88aa54aa2714e97a6cf8ba8262f86feac0cbce47192527928e652ae7ff2e27dc777
 AUX cvc4-1.8-gentoo.patch 1983 BLAKE2B bd9e7f8b442e151fdc27b45866ed4374ffcbeb5d37edd192cda13ddb3ca547b6e29cfea7641973636a184c14a649bb2131beb4e9c9b90f329dfd0cec8aab0bf0 SHA512 3793c9e318ffb266e505627ac7ea3cbf6a7ba3837a419967b873b72b71bc2bb1a45ae9fd61abaa95af02802267823d8affc1faf077f8ee16eef00ed7715c2187
+AUX cvc4-1.8-musl.patch 3734 BLAKE2B 892dbba92594f7921932010327bc2110625a10d5cf6857e524c04e7266e7b335ff14d56b43c2b3d220c123a2af3a19ae7495b212896478d07a1da9faebb4d1fe SHA512 b82afaba8688da986b8578177c8e98b9586b63a5263cc9f9c001ec84390b3f7ba5f7028cf4b5a8cb026f980d285eabd68df7c0d93be063f720eae5eb168831a6
 AUX cvc4-1.8-toml.patch 1329 BLAKE2B 39def94cd357381b277c5d5e8b39edc5d9e48ea8ecccf190cea13995b4da54a896d9c0f8cf714b8c74425da1c8269fd1cddbef2619a4f59cbc4090bc31ec14a4 SHA512 ca999ee52e8e91259772cb0a4be7ca3149cf46196b599fb8f23301a5b4a4c5154b7419706ba9dd7f279f003692b10fcf406a4159542807baca85683595401479
 DIST cvc4-1.8.tar.gz 7554297 BLAKE2B f4d2b223ba2c01ef745520d8874381a1873358fbc7eca12559656512ffeefccec4eca3d73a26debf34110ca14a3bccf35ca87e2a49575b8b67484bed79df081c SHA512 d6b0153b0f5c4e615c995a8eecfbfd783cfc1004c5134c6880230044081c71d638fee39cceb987eb8d72e91b2b6596b184dc0daacec8880cfc176c6dee8aa445
-EBUILD cvc4-1.8-r5.ebuild 1424 BLAKE2B b3c337d08bff681b1bf4ae1b9be4b616d48773013654bb81c0e073590e099af677c3fbbf1fa536b2a1311d427625954c1a50efaf39576f423d2d7e6b6c7b2263 SHA512 31e77aa48109e19d0e2d69f8a4ec9ee517745781dbe0b36f8820518225171b6d2e62ee784eaec1f6bd0b2c66d081f2398d3e5a3e2aac49716dcba65555263b6a
+EBUILD cvc4-1.8-r5.ebuild 1531 BLAKE2B ba2c624ec0f9fc1dca5cbc9fa182be5abeda7195bb50adbe1eb0621b126869596d31651029ce0ebc9b211c695c0de8bfc7613b72cb55a8859fc038d07649ccac SHA512 4321dbf55bbe2269c443a7773fa3f274a3ccb64061ff8ab2fa750ce15a634a81d1f56eadb6de0d47fe0774dc1324b8aa5aab71dfc449de36ccd3a692f7a5a33e
 MISC metadata.xml 840 BLAKE2B d452e6a81280e47283c6ff9fa8a800d89c39920e95416e6b25a3bd55663b8ada050b6c7d21b65053ed2e94ae6affb570946fe699bc6efebb26dfcd06dcd0c184 SHA512 603da6ccd58f6d90f8738047c9f93d2c32583242711355fa619f8acaf8694f0cc1e22d41592914a154cc4cfa31b0ab7308e8584c8951bc78a3bdf8e5f130cb04
diff --git a/sci-mathematics/cvc4/cvc4-1.8-r5.ebuild b/sci-mathematics/cvc4/cvc4-1.8-r5.ebuild
index 6de0fc9372aa..4870f7af7ba6 100644
--- a/sci-mathematics/cvc4/cvc4-1.8-r5.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.8-r5.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) p
 HOMEPAGE="https://cvc4.github.io/"
 SRC_URI="https://github.com/CVC4/CVC4-archived/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}"/${PN^^}-archived-${PV}
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -28,8 +30,6 @@ BDEPEND="$(python_gen_any_dep '
 	')
 "
 
-S="${WORKDIR}"/${PN^^}-archived-${PV}
-
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-toml.patch
@@ -40,6 +40,13 @@ python_check_deps() {
 	python_has_version "dev-python/tomli[${PYTHON_USEDEP}]"
 }
 
+src_prepare() {
+	cmake_src_prepare
+	if use elibc_musl ; then
+		eapply "${FILESDIR}"/${P}-musl.patch
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DANTLR_BINARY=/usr/bin/antlr3
diff --git a/sci-mathematics/cvc4/files/cvc4-1.8-musl.patch b/sci-mathematics/cvc4/files/cvc4-1.8-musl.patch
new file mode 100644
index 000000000000..3448f9bab64f
--- /dev/null
+++ b/sci-mathematics/cvc4/files/cvc4-1.8-musl.patch
@@ -0,0 +1,80 @@
+--- a/src/prop/bvminisat/simp/Main.cc	2024-05-20 14:52:26.827202665 +0200
++++ b/src/prop/bvminisat/simp/Main.cc	2024-05-20 14:53:05.967758613 +0200
+@@ -80,11 +80,6 @@
+         setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n  where input may be either in plain or gzipped DIMACS.\n");
+         // printf("This is MiniSat 2.0 beta\n");
+         
+-#if defined(__linux__)
+-        fpu_control_t oldcw, newcw;
+-        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+-        printf("WARNING: for repeatability, setting FPU to use double precision\n");
+-#endif
+         // Extra options:
+         //
+         IntOption    verb   ("MAIN", "verb",   "Verbosity level (0=silent, 1=some, 2=more).", 1, IntRange(0, 2));
+--- a/src/prop/bvminisat/core/Main.cc	2024-05-20 14:52:35.361105845 +0200
++++ b/src/prop/bvminisat/core/Main.cc	2024-05-20 14:53:27.116518689 +0200
+@@ -80,11 +80,6 @@
+         setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n  where input may be either in plain or gzipped DIMACS.\n");
+         // printf("This is MiniSat 2.0 beta\n");
+         
+-#if defined(__linux__)
+-        fpu_control_t oldcw, newcw;
+-        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+-        printf("WARNING: for repeatability, setting FPU to use double precision\n");
+-#endif
+         // Extra options:
+         //
+         IntOption    verb   ("MAIN", "verb",   "Verbosity level (0=silent, 1=some, 2=more).", 1, IntRange(0, 2));
+--- a/src/prop/minisat/simp/Main.cc	2024-05-20 14:52:44.044007338 +0200
++++ b/src/prop/minisat/simp/Main.cc	2024-05-20 14:53:39.356379840 +0200
+@@ -81,11 +81,6 @@
+         setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n  where input may be either in plain or gzipped DIMACS.\n");
+         // printf("This is MiniSat 2.0 beta\n");
+         
+-#if defined(__linux__)
+-        fpu_control_t oldcw, newcw;
+-        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+-        printf("WARNING: for repeatability, setting FPU to use double precision\n");
+-#endif
+         // Extra options:
+         //
+         IntOption    verb   ("MAIN", "verb",   "Verbosity level (0=silent, 1=some, 2=more).", 1, IntRange(0, 2));
+--- a/src/prop/minisat/core/Main.cc	2024-05-20 14:52:50.063939036 +0200
++++ b/src/prop/minisat/core/Main.cc	2024-05-20 14:53:53.834215599 +0200
+@@ -79,11 +79,6 @@
+         setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n  where input may be either in plain or gzipped DIMACS.\n");
+         // printf("This is MiniSat 2.0 beta\n");
+         
+-#if defined(__linux__)
+-        fpu_control_t oldcw, newcw;
+-        _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+-        printf("WARNING: for repeatability, setting FPU to use double precision\n");
+-#endif
+         // Extra options:
+         //
+         IntOption    verb   ("MAIN", "verb",   "Verbosity level (0=silent, 1=some, 2=more).", 1, IntRange(0, 2));
+--- a/src/prop/bvminisat/utils/System.h	2024-05-20 14:54:23.301881326 +0200
++++ b/src/prop/bvminisat/utils/System.h	2024-05-20 14:54:42.030668881 +0200
+@@ -21,9 +21,6 @@
+ #ifndef BVMinisat_System_h
+ #define BVMinisat_System_h
+ 
+-#if defined(__linux__)
+-#include <fpu_control.h>
+-#endif
+ 
+ #include "prop/bvminisat/mtl/IntTypes.h"
+ 
+--- a/src/prop/minisat/utils/System.h	2024-05-20 14:54:28.650820656 +0200
++++ b/src/prop/minisat/utils/System.h	2024-05-20 14:54:55.435516829 +0200
+@@ -21,9 +21,6 @@
+ #ifndef Minisat_System_h
+ #define Minisat_System_h
+ 
+-#if defined(__linux__)
+-#include <fpu_control.h>
+-#endif
+ 
+ #include "prop/minisat/mtl/IntTypes.h"
+