gentoo auto-resync : 06:02:2023 - 21:22:20

4 files changed, 52 insertions, 7 deletions

diff --git a/sci-mathematics/vampire/Manifest b/sci-mathematics/vampire/Manifest
index 23eeb3307578..6bacda87b101 100644
--- a/sci-mathematics/vampire/Manifest
+++ b/sci-mathematics/vampire/Manifest
@@ -1,5 +1,6 @@
+AUX vampire-4.6.1-musl.patch 1538 BLAKE2B 50162dd493cc004643b895a62b6a07abc08e3d8ac5e53e8f523bcf6fc3d7f0847f0f1dfa25107aadff7bbc4d51bd9299e5f11cdfa7f3247254c7d6c2847026f6 SHA512 b94095925b55ce17aae299c7259bab3b062cae7640a24600f6dd0da02da2cff7d3e505abfe08816363c5a27bd4346536dcf6a33975490b9a6a037c3bf617d862
 DIST vampire-4.6.1.tar.gz 1511760 BLAKE2B 52ede8ac009379b15bc57b2ffe45965cbaf772f0e90bc619d859b85b77ce81eadbdd7ddae7c5e0e9cc69564a07f0abefa17109f7192e6afe634a5a929817fe92 SHA512 7ffeee64e9e4666344c0f9155c7e980920666813388416062cee89e43003fef5a8a54b8656cc42d2fa58b6fb3b87ef7f2c671bfc6787075df4058dcc3a1d46e1
 DIST vampire-4.7.tar.gz 1462358 BLAKE2B 10fdf4076bbcd7113da575d19890634a5142dd6917c028eb7ae0e94405df9e6915fc6127956d39b6f9f97242958b0fa04fa9e835853f09cec381786862009ef5 SHA512 978169a9b4d561dce1d55aa9a61a8b302657ff758036309d9c5f58a5d9271b874ac020d110fbb2a16d34f2ccdd10a497eb469829c91d58530dba5e1cd8978d78
-EBUILD vampire-4.6.1-r2.ebuild 1291 BLAKE2B 030e21c423d15f868d605b509bc8028c0f11503535f0bbdf0e454d4cd375a1feb57ef898d0a38c9a2e7fa38efb48766aac024517b1d221020b510f7a8aff300b SHA512 a9df850052becd4b3093a24a26d6b598207db8513de7364636e89a0d3de9ed88cf66c50c6cc64e314bac0fc6bcb51f2ce55624ecaa8d720276a51a178c3e82e4
-EBUILD vampire-4.7-r1.ebuild 1379 BLAKE2B 24300b4f4dddc1755a28a4d08ced379050da9c7c10a4bb5900d4e8d44a865d73929b8729723c243ab2e37ffe17ba79c46e7fbe535c6d8f5279c8c27bfe5d7181 SHA512 8af44550e1b69848d883236b07713efb4bb0f4718aecf77eb3c05f8e7adbe5207fb01de5552e831bb2d18b32046c6431416dfdd37e225e6f7dc9d03a7a360e1b
+EBUILD vampire-4.6.1-r2.ebuild 1334 BLAKE2B c60fe0a9b8b030f3888aa88dfffb0a8626448dfa1957e3a87896d13bce97f451f16e136539141a5e86710e6e82719594c79bfee8f0a040207c79310c583e0055 SHA512 6c7f5fd966b8d15af8ab8db7c51d2873dba52e00555cf0e5490228bed16ba871cbf36d1131921ee48f7b17b6e03defb5cceed684f684c55c2f1a6d3444595e8c
+EBUILD vampire-4.7-r1.ebuild 1466 BLAKE2B 6b0dfdd8976d71f7a6d20821a9e42e3e93e0fc10dcd9e650ef589fe38077c335137b3667e11c742ce2ec327c5929eed447019def81c83fa40561a9c39a9d8a76 SHA512 8ae1f1bc249627085a8aa58f778a9a826fc9d5a1a703bc1fc7e84c3d66c960974705ca069a5674c669c908b728d91859b3e79d8067a07f15b703392a25532977
 MISC metadata.xml 1020 BLAKE2B 6e798243e207d09fac240c73cda8918b300706a19d53918b3ce78e847146ad3676a39d9be8e020b678c20d7fe02da0eab57519ea2c5841eeeea0b8a680045928 SHA512 dc82a586070c97db278ef17a24384436548b2a968d18ead7d148f654bab4ad846e685ac2ae2f7db8048b25115b673bcf8223fa2813b370f9d6b6ac01dcf9040e
diff --git a/sci-mathematics/vampire/files/vampire-4.6.1-musl.patch b/sci-mathematics/vampire/files/vampire-4.6.1-musl.patch
new file mode 100644
index 000000000000..4d3d4c56041e
--- /dev/null
+++ b/sci-mathematics/vampire/files/vampire-4.6.1-musl.patch
@@ -0,0 +1,40 @@
+From 48733f4e2d9500b3bdc54563cf117c7fa07193ed Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org>
+Date: Mon, 6 Feb 2023 14:34:05 +0100
+Subject: [PATCH] Minisat/utils/System.*: use fpu_control only on glibc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Maciej Barć <xgqt@gentoo.org>
+---
+ Minisat/utils/System.cc | 2 +-
+ Minisat/utils/System.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Minisat/utils/System.cc b/Minisat/utils/System.cc
+index 942ddb712..2936faa5d 100644
+--- a/Minisat/utils/System.cc
++++ b/Minisat/utils/System.cc
+@@ -104,7 +104,7 @@ double Minisat::memUsedPeak(bool) {
+ 
+ void Minisat::setX86FPUPrecision()
+ {
+-#if defined(__linux__) && defined(_FPU_EXTENDED) && defined(_FPU_DOUBLE) && defined(_FPU_GETCW)
++#if defined(__GLIBC__) && defined(_FPU_EXTENDED) && defined(_FPU_DOUBLE) && defined(_FPU_GETCW)
+     // Only correct FPU precision on Linux architectures that needs and supports it:
+     fpu_control_t oldcw, newcw;
+     _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+diff --git a/Minisat/utils/System.h b/Minisat/utils/System.h
+index ecdde991b..fd501eeec 100644
+--- a/Minisat/utils/System.h
++++ b/Minisat/utils/System.h
+@@ -26,7 +26,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
+ #ifndef Minisat_System_h
+ #define Minisat_System_h
+ 
+-#if defined(__linux__)
++#if defined(__GLIBC__)
+ #include <fpu_control.h>
+ #endif
+ 
diff --git a/sci-mathematics/vampire/vampire-4.6.1-r2.ebuild b/sci-mathematics/vampire/vampire-4.6.1-r2.ebuild
index d5579bce688d..0d3a66debc59 100644
--- a/sci-mathematics/vampire/vampire-4.6.1-r2.ebuild
+++ b/sci-mathematics/vampire/vampire-4.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,6 +32,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+
 src_configure() {
 	# -Werror=strict-aliasing warnings, bug #863269
 	filter-lto
diff --git a/sci-mathematics/vampire/vampire-4.7-r1.ebuild b/sci-mathematics/vampire/vampire-4.7-r1.ebuild
index 69e581237127..975da65ac817 100644
--- a/sci-mathematics/vampire/vampire-4.7-r1.ebuild
+++ b/sci-mathematics/vampire/vampire-4.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=2d02e4655e1b08d1ca9ee7c0aade40f59f046460  # "bump to 4.7"
+[[ ${PV} == 4.7 ]] && COMMIT=2d02e4655e1b08d1ca9ee7c0aade40f59f046460  # "bump to 4.7"
 
 inherit flag-o-matic cmake
 
@@ -15,9 +15,9 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/vprover/${PN}.git"
 	EGIT_SUBMODULES=()
 else
-	SRC_URI="https://github.com/vprover/${PN}/archive/${H}.tar.gz
+	SRC_URI="https://github.com/vprover/${PN}/archive/${COMMIT}.tar.gz
 		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${H}
+	S="${WORKDIR}"/${PN}-${COMMIT}
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -36,6 +36,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-4.6.1-musl.patch )
+
 src_configure() {
 	# -Werror=strict-aliasing warnings, bug #863269
 	filter-lto