commit: 15f33031b800eba31732bd4b2acd7ce659162d47 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Tue Aug 22 14:30:18 2023 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Tue Aug 22 14:32:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15f33031
sci-mathematics/vampire: drop old 4.7-r1 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> sci-mathematics/vampire/Manifest | 1 - .../vampire/files/vampire-4.6.1-musl.patch | 40 -------------- sci-mathematics/vampire/vampire-4.7-r1.ebuild | 63 ---------------------- 3 files changed, 104 deletions(-) diff --git a/sci-mathematics/vampire/Manifest b/sci-mathematics/vampire/Manifest index 1432854a8700..34007ddf898b 100644 --- a/sci-mathematics/vampire/Manifest +++ b/sci-mathematics/vampire/Manifest @@ -1,2 +1 @@ -DIST vampire-4.7.tar.gz 1462358 BLAKE2B 10fdf4076bbcd7113da575d19890634a5142dd6917c028eb7ae0e94405df9e6915fc6127956d39b6f9f97242958b0fa04fa9e835853f09cec381786862009ef5 SHA512 978169a9b4d561dce1d55aa9a61a8b302657ff758036309d9c5f58a5d9271b874ac020d110fbb2a16d34f2ccdd10a497eb469829c91d58530dba5e1cd8978d78 DIST vampire-4.8-casc2023.tar.gz 1527236 BLAKE2B fb6ce26bb31996529e2b4d76173a1cb8d2c796aa6a5a2581515c516b5f07e9d4efc6040db1ac7f65388d723ee5080d62fb9c2b6ec88f58babd892fd96c0bf0ba SHA512 d6349ab23a289101a0d9f3caa5190df065dfbbe4e2e999e7d5b97ff738c8355b35848d93423ec3a0b0f88d4ac806173493f9a2de4e31945bb09c500c64eb5028 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?= <[email protected]> -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ć <[email protected]> ---- - 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 -}
