diff options
Diffstat (limited to 'sci-mathematics')
| -rw-r--r-- | sci-mathematics/Manifest.gz | bin | 19003 -> 19007 bytes | |||
| -rw-r--r-- | sci-mathematics/opensmt/Manifest | 3 | ||||
| -rw-r--r-- | sci-mathematics/opensmt/files/opensmt-2.4.3-musl.patch | 132 | ||||
| -rw-r--r-- | sci-mathematics/opensmt/opensmt-2.5.1.ebuild | 72 | ||||
| -rw-r--r-- | sci-mathematics/vampire/Manifest | 3 | ||||
| -rw-r--r-- | sci-mathematics/vampire/files/vampire-4.6.1-musl.patch | 40 | ||||
| -rw-r--r-- | sci-mathematics/vampire/vampire-4.7-r1.ebuild | 63 |
7 files changed, 0 insertions, 313 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz Binary files differindex 7ba8d0b49339..b63f9c8d3d82 100644 --- a/sci-mathematics/Manifest.gz +++ b/sci-mathematics/Manifest.gz diff --git a/sci-mathematics/opensmt/Manifest b/sci-mathematics/opensmt/Manifest index fcc63f0a8fb6..8bcf183d7189 100644 --- a/sci-mathematics/opensmt/Manifest +++ b/sci-mathematics/opensmt/Manifest @@ -1,6 +1,3 @@ -AUX opensmt-2.4.3-musl.patch 4317 BLAKE2B 7f1349452d31edac8e90ba322396fd4725399512481b035f6996b5ec4ad09cc1af3579668ee4da79deb198befdde2cd2fbb9fcc4159ec97b0aaedfce9e73a443 SHA512 09c2cea9928e89806136c5cae2403eb4168bf3984974f6212c0c1b9857affd3b1559bf6cb1bb5a0b8a3a6d9a340cca559446fe4d535b87b1f5b2cdc176f7b7ad -DIST opensmt-2.5.1.tar.gz 1943888 BLAKE2B 17b58fc3e693e77ce70835820f7361db9efe1cac561f1fa3480a839fbdf003d2566617cd97a3e2772ad8e890356b6a5761457779c0ac3b0841c2df6aee74946e SHA512 359ff968d7dbd8d94d6c5687d5b84e19c47016df5b1c0d80374743b395b6257cb4b97aa354b264103bd19c522f55912f1c938e646daf37f6b413488db917fc61 DIST opensmt-2.5.2.tar.gz 1935650 BLAKE2B 85cd171d56591d2f1162a41ff8a425fc818238a2820aab0f75cc75ece8898c5e7de1478aeab93e8905a1aedad85a6df03062fefaad69bea043dce1f3f3d531f5 SHA512 c22d17d3aee33a3360f8ea552c82151eafdef7cc89e6750d34b4ff2a011675a5a5f04a7cb68ff984dd6a5332b2f180fb8abc529e64c3970aba6b7eb60408f198 -EBUILD opensmt-2.5.1.ebuild 1528 BLAKE2B 80e35f101980d464a7c28ed4be5bea57fd78236bf870013afe80c6a9707feca47f8883af1041753c7435238e6af3dd94d1c1f7bdcd75174f23a05707900ae60b SHA512 cd5a803bb256a73fb442f2048ac6f7f5b9e1e4c2e3ccd8b38216414745d0da878c234fe876771007e310a4be86a639a4c74478e6b93c39543690528d8a0856aa EBUILD opensmt-2.5.2.ebuild 1528 BLAKE2B 80e35f101980d464a7c28ed4be5bea57fd78236bf870013afe80c6a9707feca47f8883af1041753c7435238e6af3dd94d1c1f7bdcd75174f23a05707900ae60b SHA512 cd5a803bb256a73fb442f2048ac6f7f5b9e1e4c2e3ccd8b38216414745d0da878c234fe876771007e310a4be86a639a4c74478e6b93c39543690528d8a0856aa MISC metadata.xml 798 BLAKE2B 173b47beab9c5ecc15caf32dd0514230f5dbefea8a9c75b33ab4f4cc51bc7e66e1a90240c3d0ba55f09959accf4203136c2b1ab400c2289e8329906cc0aabb56 SHA512 e3acadb473098ff0985b15ce2fb7ffcd8ef2f29fde2736a9c7e5d297a0857e358cdfa508b9f030add29f8bd808ce1594961e9a92768cbc8cff155a8195bd392e diff --git a/sci-mathematics/opensmt/files/opensmt-2.4.3-musl.patch b/sci-mathematics/opensmt/files/opensmt-2.4.3-musl.patch deleted file mode 100644 index 5f80a0de116c..000000000000 --- a/sci-mathematics/opensmt/files/opensmt-2.4.3-musl.patch +++ /dev/null @@ -1,132 +0,0 @@ -From e88b83b3b52ebc6ff4cdf1f92a876861fc2c5598 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org> -Date: Mon, 6 Feb 2023 17:27:34 +0100 -Subject: [PATCH] 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> ---- - bin/opensmt.C | 4 ++-- - src/bin/opensmt.cc | 2 +- - src/minisat/core/Main.C | 4 ++-- - src/minisat/simp/Main.C | 4 ++-- - src/minisat/utils/System.h | 2 +- - src/parallel/opensmtSplitter.cc | 4 ++-- - 6 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/bin/opensmt.C b/bin/opensmt.C -index cb9c8943b..898a8fdd3 100644 ---- a/bin/opensmt.C -+++ b/bin/opensmt.C -@@ -44,7 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #include <csignal> - #include <iostream> - --#if defined(__linux__) -+#if defined(__GLIBC__) - #include <fpu_control.h> - #endif - -@@ -84,7 +84,7 @@ int main( int argc, char * argv[] ) - // the repeatability of experiments that might be compromised - // by the floating point unit approximations on doubles - // --#if defined(__linux__) && !defined( SMTCOMP ) -+#if defined(__GLIBC__) && !defined( SMTCOMP ) - fpu_control_t oldcw, newcw; - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); - #endif -diff --git a/src/bin/opensmt.cc b/src/bin/opensmt.cc -index 6db12ffd8..67bfcd712 100644 ---- a/src/bin/opensmt.cc -+++ b/src/bin/opensmt.cc -@@ -47,7 +47,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #endif - #endif // ENABLE_LINE_EDITING - --#if defined(__linux__) -+#if defined(__GLIBC__) - #include <fpu_control.h> - #endif - -diff --git a/src/minisat/core/Main.C b/src/minisat/core/Main.C -index acef32cd5..2c232b71b 100644 ---- a/src/minisat/core/Main.C -+++ b/src/minisat/core/Main.C -@@ -74,7 +74,7 @@ static inline uint64_t memUsed(void) { - static inline uint64_t memUsed() { return 0; } - #endif - --#if defined(__linux__) -+#if defined(__GLIBC__) - #include <fpu_control.h> - #endif - -@@ -287,7 +287,7 @@ int main(int argc, char** argv) - - - reportf("This is MiniSat 2.0 beta\n"); --#if defined(__linux__) -+#if defined(__GLIBC__) - fpu_control_t oldcw, newcw; - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); - reportf("WARNING: for repeatability, setting FPU to use double precision\n"); -diff --git a/src/minisat/simp/Main.C b/src/minisat/simp/Main.C -index b6d194631..a3f22fb4f 100644 ---- a/src/minisat/simp/Main.C -+++ b/src/minisat/simp/Main.C -@@ -74,7 +74,7 @@ static inline uint64_t memUsed(void) { - static inline uint64_t memUsed() { return 0; } - #endif - --#if defined(__linux__) -+#if defined(__GLIBC__) - #include <fpu_control.h> - #endif - -@@ -244,7 +244,7 @@ const char* hasPrefix(const char* str, const char* prefix) - int main(int argc, char** argv) - { - reportf("This is MiniSat 2.0 beta\n"); --#if defined(__linux__) -+#if defined(__GLIBC__) - fpu_control_t oldcw, newcw; - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); - reportf("WARNING: for repeatability, setting FPU to use double precision\n"); -diff --git a/src/minisat/utils/System.h b/src/minisat/utils/System.h -index 5f9dc3f53..4b7f9c9f5 100644 ---- a/src/minisat/utils/System.h -+++ b/src/minisat/utils/System.h -@@ -21,7 +21,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/src/parallel/opensmtSplitter.cc b/src/parallel/opensmtSplitter.cc -index 05246e187..4b8c01a1a 100644 ---- a/src/parallel/opensmtSplitter.cc -+++ b/src/parallel/opensmtSplitter.cc -@@ -27,7 +27,7 @@ - #endif - #endif // ENABLE_LINE_EDITING - --#if defined(__linux__) -+#if defined(__GLIBC__) - #include <fpu_control.h> - #endif - -@@ -55,7 +55,7 @@ int main( int argc, char * argv[] ) - // the repeatability of experiments that might be compromised - // by the floating point unit approximations on doubles - // --#if defined(__linux__) -+#if defined(__GLIBC__) - fpu_control_t oldcw, newcw; - _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); - #endif diff --git a/sci-mathematics/opensmt/opensmt-2.5.1.ebuild b/sci-mathematics/opensmt/opensmt-2.5.1.ebuild deleted file mode 100644 index 04e39c2ae269..000000000000 --- a/sci-mathematics/opensmt/opensmt-2.5.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Compact and open-source SMT-solver written in C++" -HOMEPAGE="http://verify.inf.usi.ch/opensmt/ - https://github.com/usi-verification-and-security/opensmt/" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/usi-verification-and-security/${PN}.git" -else - SRC_URI="https://github.com/usi-verification-and-security/${PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0/${PV}" -IUSE="debug libedit +readline test" -REQUIRED_USE="?? ( libedit readline )" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/gmp:=[cxx] - readline? ( sys-libs/readline:= ) - libedit? ( dev-libs/libedit:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/bison - sys-devel/flex - test? ( dev-cpp/gtest ) -" - -# PATCHES=( "${FILESDIR}"/${PN}-2.4.3-musl.patch ) - -src_prepare() { - cmake_src_prepare - - echo "add_subdirectory(unit)" > "${S}"/test/CMakeLists.txt || die -} - -src_configure() { - local CMAKE_BUILD_TYPE - if use debug ; then - CMAKE_BUILD_TYPE=Debug - else - CMAKE_BUILD_TYPE=Release - fi - - local -a mycmakeargs=( - -DPACKAGE_TESTS=$(usex test) - -DUSE_READLINE=$(usex readline) - ) - if use readline || use libedit ; then - mycmakeargs+=( -DENABLE_LINE_EDITING=ON ) - fi - cmake_src_configure -} - -src_install() { - cmake_src_install - - rm "${ED}"/usr/lib/libopensmt.a || die - - dolib.so "${ED}"/usr/lib/libopensmt.* - rm "${ED}"/usr/lib/libopensmt.* || die -} diff --git a/sci-mathematics/vampire/Manifest b/sci-mathematics/vampire/Manifest index f0e1f2677098..98e6460d38b6 100644 --- a/sci-mathematics/vampire/Manifest +++ b/sci-mathematics/vampire/Manifest @@ -1,6 +1,3 @@ -AUX vampire-4.6.1-musl.patch 1538 BLAKE2B 50162dd493cc004643b895a62b6a07abc08e3d8ac5e53e8f523bcf6fc3d7f0847f0f1dfa25107aadff7bbc4d51bd9299e5f11cdfa7f3247254c7d6c2847026f6 SHA512 b94095925b55ce17aae299c7259bab3b062cae7640a24600f6dd0da02da2cff7d3e505abfe08816363c5a27bd4346536dcf6a33975490b9a6a037c3bf617d862 -DIST vampire-4.7.tar.gz 1462358 BLAKE2B 10fdf4076bbcd7113da575d19890634a5142dd6917c028eb7ae0e94405df9e6915fc6127956d39b6f9f97242958b0fa04fa9e835853f09cec381786862009ef5 SHA512 978169a9b4d561dce1d55aa9a61a8b302657ff758036309d9c5f58a5d9271b874ac020d110fbb2a16d34f2ccdd10a497eb469829c91d58530dba5e1cd8978d78 DIST vampire-4.8-casc2023.tar.gz 1527236 BLAKE2B fb6ce26bb31996529e2b4d76173a1cb8d2c796aa6a5a2581515c516b5f07e9d4efc6040db1ac7f65388d723ee5080d62fb9c2b6ec88f58babd892fd96c0bf0ba SHA512 d6349ab23a289101a0d9f3caa5190df065dfbbe4e2e999e7d5b97ff738c8355b35848d93423ec3a0b0f88d4ac806173493f9a2de4e31945bb09c500c64eb5028 -EBUILD vampire-4.7-r1.ebuild 1466 BLAKE2B 6b0dfdd8976d71f7a6d20821a9e42e3e93e0fc10dcd9e650ef589fe38077c335137b3667e11c742ce2ec327c5929eed447019def81c83fa40561a9c39a9d8a76 SHA512 8ae1f1bc249627085a8aa58f778a9a826fc9d5a1a703bc1fc7e84c3d66c960974705ca069a5674c669c908b728d91859b3e79d8067a07f15b703392a25532977 EBUILD vampire-4.8.ebuild 1424 BLAKE2B 024de9192ad510aff6d79b79bbd41593ae5916efb012cae57df3425202dc9b4e971316d8774160c33ce81a3c1704d3bf2e6f647cd46be449c0266693d6397bb2 SHA512 c1a15a86f129361758303d0b834542b0cd6405574a2a7a611821bcade52929f06aef0f43fec1af5a3b0320651c8e06a51d4ff2e527a6b90eb1b0fa6559034eda 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 deleted file mode 100644 index 4d3d4c56041e..000000000000 --- a/sci-mathematics/vampire/files/vampire-4.6.1-musl.patch +++ /dev/null @@ -1,40 +0,0 @@ -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.7-r1.ebuild b/sci-mathematics/vampire/vampire-4.7-r1.ebuild deleted file mode 100644 index 975da65ac817..000000000000 --- a/sci-mathematics/vampire/vampire-4.7-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -[[ ${PV} == 4.7 ]] && COMMIT=2d02e4655e1b08d1ca9ee7c0aade40f59f046460 # "bump to 4.7" - -inherit flag-o-matic cmake - -DESCRIPTION="The Vampire Prover, theorem prover for first-order logic" -HOMEPAGE="https://vprover.github.io" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vprover/${PN}.git" - EGIT_SUBMODULES=() -else - SRC_URI="https://github.com/vprover/${PN}/archive/${COMMIT}.tar.gz - -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${COMMIT} - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD" -SLOT="0/${PV}" -IUSE="debug +z3" -# debug mode needs to be enabled for tests -# https://github.com/vprover/vampire/blob/8197e1d2d86a0b276b5fcb6c02d8122f66b7277e/CMakeLists.txt#L38 -RESTRICT="!debug? ( test )" - -RDEPEND=" - z3? ( - dev-libs/gmp:= - >=sci-mathematics/z3-4.11.2:= - ) -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-4.6.1-musl.patch ) - -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 - else - CMAKE_BUILD_TYPE=Release - fi - - local mycmakeargs=( -DZ3_DIR=$(usex z3 "/usr/$(get_libdir)/cmake/z3/" "") ) - cmake_src_configure -} - -src_install() { - local bin_name=$(find "${BUILD_DIR}"/bin/ -type f -name "${PN}*") - dobin "${bin_name}" - dosym $(basename "${bin_name}") /usr/bin/${PN} - - einstalldocs -} |