gentoo auto-resync : 07:08:2022 - 02:11:02

6 files changed, 19 insertions, 7 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index f57c7b7e74f8..caac2d43de6f 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/stp/Manifest b/sci-mathematics/stp/Manifest
index a3e1e0ee2d0d..725f20c6f849 100644
--- a/sci-mathematics/stp/Manifest
+++ b/sci-mathematics/stp/Manifest
@@ -3,5 +3,5 @@ AUX stp-stp.py-library_path.patch 372 BLAKE2B 1e36f48d2c403cdea156157826a1b3c3e4
 DIST stp-2.3.3.tar.gz 2577550 BLAKE2B 9ebedf3cb8e6b50d037cfacbc14826bd4e6505d29a53b1fcc6580749f0637fe5f96619c166babdb3a52b18fb6337e49c02f5693e233effe84d0131d0e7402381 SHA512 a0b1bf419d8230e40ce0aee90d9c8c9d814aca300831c24b3576c75623362942abf20673c419f9f0ea1e0505bfae000dc65fdd818179f5759879b0b255f1b99a
 DIST stp-2.3.3_OutputCheck.tar.gz 12002 BLAKE2B f8fafba8f7957f3d0ee480b9e1e8c8923c373cf134512d6329adf84a96f3177ad07d00eae4dc6dd8d4b09ca82dfc8b425602f1926e3f88ccb2556b4b7121e5b9 SHA512 36012ae2b2aee1ff3f36ba1678a4bcbfeb590e01c2042ca35eb2f49b6a890b767c1809d1415e7b03f2118204361f834ad9caf70319b59fd14b2c140bf858d16e
 DIST stp-2.3.3_gtest.tar.gz 469100 BLAKE2B 386444657d3f23e54f01dac8e0ac36da4d97c3eebcc8cf79bfc754c474a5ed64765a0ad389fef358667e468469c47d02a407e13e6882d426a4defb0102e4a758 SHA512 2fc79fe9c8a4e0487e7e76db9508fd2207df0cfe3940a51aeac32e4440afab9e265bfe553b1cd66086cd5a574d8bf99dbb9e1d9c4a70fafd7b31f38825914aa1
-EBUILD stp-2.3.3-r1.ebuild 2162 BLAKE2B 349a76a00f6a2e05b5984b87b6fd79b2ee233ec430aa4be21763200900293a578b08b0cd569cb1056c1b327c099b418e11782af0d7c51debd88bf4846965aee4 SHA512 a131a42160283c5d3326a325b8f884d830bbf9f851e4625f751f42362ca40e61e2eaa52147daf3764873ed85977d71bcf84fd52073d52e76bc3a4c55a18c21b9
+EBUILD stp-2.3.3-r1.ebuild 2226 BLAKE2B 75dcdf8ac6b409bbfa046c9f89d1577be646f0246de3bf716b91559954be4ae8e80c1466a7f12021336c318c9e06c13b58fd6ff1b9bffacb005e5c4a18c9a03a SHA512 a92f8a0834c4e479050bf2b52efbcf75914b855f99d6b8217952ffe172a90e2abf7a08cfd879c15350eddb6d996051d30ef43a6a336aa1d2b8539761f462a703
 MISC metadata.xml 1110 BLAKE2B e13b9420b7f730e6b9e2571e3f4e8a48cf7f54b16fa767fce48099549071c4c819e16a5da25b6779c77a5a7a7f21c3ec61eeb2719867f874a1c4fa21b84e32f2 SHA512 aa3ddfd8d3bf4647f230f0ca55b6f70f9f82f2ae63fe21edad637397fb1bd2779241a2e439a48bed59bd1de11ef3b4e275731c6a90873ec5d86bb5897bf2a9f0
diff --git a/sci-mathematics/stp/stp-2.3.3-r1.ebuild b/sci-mathematics/stp/stp-2.3.3-r1.ebuild
index 367251ea5f8f..67fbceb1ce9d 100644
--- a/sci-mathematics/stp/stp-2.3.3-r1.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ GT_H=2ad076167a676e3ed62f90b754b30fac5caa1f88
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit python-single-r1 cmake
+inherit flag-o-matic python-single-r1 cmake
 
 DESCRIPTION="Simple Theorem Prover, an efficient SMT solver for bitvectors"
 HOMEPAGE="https://stp.github.io/"
@@ -71,12 +71,16 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr warnings, bug #863263
+	filter-lto
+
 	local CMAKE_BUILD_TYPE
 	if use debug ; then
 		CMAKE_BUILD_TYPE=Debug
 	else
 		CMAKE_BUILD_TYPE=Release
 	fi
+
 	local mycmakeargs=(
 		-DNOCRYPTOMINISAT=$(usex cryptominisat 'OFF' 'ON')  # double negation
 		-DENABLE_PYTHON_INTERFACE=$(usex python)
diff --git a/sci-mathematics/vampire/Manifest b/sci-mathematics/vampire/Manifest
index 2b29ee9ef592..a728f3024242 100644
--- a/sci-mathematics/vampire/Manifest
+++ b/sci-mathematics/vampire/Manifest
@@ -1,5 +1,5 @@
 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-r1.ebuild 1178 BLAKE2B 3c228c11fbf949144a453b9bef1545c149c52db79ee54b2ca1c42e8d8365e0da89b6f6c6ef3cac6b6180ba75b44fb0d1df7a2df7d5f20b4727192260a8c2fbc7 SHA512 a38bfddff1a2a69b65e927ff6d7cf68edf8ba5cfe621a6565317d925bf96d5620decd781c7ec23b1f88954043a793a2ea31176e7df9802b39cfdd93d187f787f
-EBUILD vampire-4.7.ebuild 1266 BLAKE2B 1355a5f6734f3e812c9f47d0ab044ebd5164c4ae6983be34ae33b0aed102306cc50062e2cc7b9d1921b03f939328e46356f3571875a51c83f5842dcc0e34f770 SHA512 69277d39e0e8a77cff1f3c72a23997367981bba9622abbe5308fc5bf6f5712c2a8b4c4ba26bca9b2045f5fe90942af18d9e26a15839fc74a0e3c58f9b2298a55
+EBUILD vampire-4.6.1-r1.ebuild 1288 BLAKE2B 1e94734a00faf106f986fa8562329b52e12403f7182275703c0777ba4e14df6641be10021557e2f650dcbc60fe5288f2c90e375431073c77541bd2f99964ba9b SHA512 8e32531549a8fc96da7ab5929084373c1e670c03e9c75be176fb4c65335f768c66a0eaab96ec71d1ff0373573a79fc75679300bdc59074d223a4ca3b0c82401d
+EBUILD vampire-4.7.ebuild 1376 BLAKE2B 47cce1ac958b4f8f74e496aaf01b74b6b65d2d76a9fbd63cab5c6a5dcdc1d19b17cd35e6bae72e5fec293e0499b9d0d44171faf9c7032b64ebd77ad9653171d9 SHA512 5d2ada29e0549b4602a2bf4b6725d4b107c5c23168ece132f383d861f06ace74175451cccea43c474c8f09a5ef1bf03219264eaf954fa6d6a159cd4d7a79ea70
 MISC metadata.xml 1020 BLAKE2B 6e798243e207d09fac240c73cda8918b300706a19d53918b3ce78e847146ad3676a39d9be8e020b678c20d7fe02da0eab57519ea2c5841eeeea0b8a680045928 SHA512 dc82a586070c97db278ef17a24384436548b2a968d18ead7d148f654bab4ad846e685ac2ae2f7db8048b25115b673bcf8223fa2813b370f9d6b6ac01dcf9040e
diff --git a/sci-mathematics/vampire/vampire-4.6.1-r1.ebuild b/sci-mathematics/vampire/vampire-4.6.1-r1.ebuild
index 2f7ceabc3b2c..98b642f86d90 100644
--- a/sci-mathematics/vampire/vampire-4.6.1-r1.ebuild
+++ b/sci-mathematics/vampire/vampire-4.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit flag-o-matic cmake
 
 DESCRIPTION="The Vampire Prover, theorem prover for first-order logic"
 HOMEPAGE="https://vprover.github.io"
@@ -33,6 +33,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_configure() {
+	# -Werror=strict-aliasing warnings, bug #863269
+	filter-lto
+	append-flags -fno-strict-aliasing
+
 	local CMAKE_BUILD_TYPE
 	if use debug; then
 		CMAKE_BUILD_TYPE=Debug
diff --git a/sci-mathematics/vampire/vampire-4.7.ebuild b/sci-mathematics/vampire/vampire-4.7.ebuild
index bd33eda2b980..19e7d9d57b7a 100644
--- a/sci-mathematics/vampire/vampire-4.7.ebuild
+++ b/sci-mathematics/vampire/vampire-4.7.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 H=2d02e4655e1b08d1ca9ee7c0aade40f59f046460  # "bump to 4.7"
 
-inherit cmake
+inherit flag-o-matic cmake
 
 DESCRIPTION="The Vampire Prover, theorem prover for first-order logic"
 HOMEPAGE="https://vprover.github.io"
@@ -37,6 +37,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_configure() {
+	# -Werror=strict-aliasing warnings, bug #863269
+	filter-lto
+	append-flags -fno-strict-aliasing
+
 	local CMAKE_BUILD_TYPE
 	if use debug ; then
 		CMAKE_BUILD_TYPE=Debug