Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cvc4/, sci-mathematics/cvc4/files/
Date: Sun, 29 Jan 2023 13:13:51
Message-Id: 1674998013.b20b0dbffda6f89cf521ba6c714803d26054e177.tupone@gentoo
1 commit: b20b0dbffda6f89cf521ba6c714803d26054e177
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 29 13:11:43 2023 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 29 13:13:33 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b20b0dbf
7
8 sci-mathematics/cvc4: drop 1.7-r1
9
10 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
11
12 sci-mathematics/cvc4/Manifest | 1 -
13 sci-mathematics/cvc4/cvc4-1.7-r1.ebuild | 62 ------------------------
14 sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch | 43 ----------------
15 sci-mathematics/cvc4/metadata.xml | 1 -
16 4 files changed, 107 deletions(-)
17
18 diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
19 index fe5e434767b8..4326a842f502 100644
20 --- a/sci-mathematics/cvc4/Manifest
21 +++ b/sci-mathematics/cvc4/Manifest
22 @@ -1,2 +1 @@
23 -DIST cvc4-1.7.tar.gz 6969953 BLAKE2B 3a64db14a734e0314fb7d7b8dbed79e067c9bbf1723343dac1e9c47b3f09811b1a32ff0116412667bd0afefda2489c6c1679bf109710402a67bee0d91b62dd94 SHA512 b91dfac7ddf979a3474f562eb98f2d6f17a53efa38c1be5502429309a0c059e1f2b0d85ee95e5aee17d35f34c825f01f879ec4aaf26025b1fcac835c33a867c6
24 DIST cvc4-1.8.tar.gz 7554297 BLAKE2B f4d2b223ba2c01ef745520d8874381a1873358fbc7eca12559656512ffeefccec4eca3d73a26debf34110ca14a3bccf35ca87e2a49575b8b67484bed79df081c SHA512 d6b0153b0f5c4e615c995a8eecfbfd783cfc1004c5134c6880230044081c71d638fee39cceb987eb8d72e91b2b6596b184dc0daacec8880cfc176c6dee8aa445
25
26 diff --git a/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
27 deleted file mode 100644
28 index 340a8727e35b..000000000000
29 --- a/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
30 +++ /dev/null
31 @@ -1,62 +0,0 @@
32 -# Copyright 1999-2023 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -CMAKE_MAKEFILE_GENERATOR=emake
38 -PYTHON_COMPAT=( python3_{9..10} )
39 -inherit cmake python-any-r1
40 -
41 -DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) problems"
42 -HOMEPAGE="https://cvc4.github.io/"
43 -SRC_URI="https://github.com/CVC4/CVC4/archive/${PV}.tar.gz -> ${P}.tar.gz"
44 -
45 -LICENSE="GPL-2"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~x86"
48 -IUSE="+cln proofs readline replay +statistics"
49 -
50 -RDEPEND="dev-libs/antlr-c
51 - dev-java/antlr:3
52 - dev-libs/boost
53 - readline? ( sys-libs/readline:0= )
54 - cln? ( sci-libs/cln )
55 - !cln? ( dev-libs/gmp:= )"
56 -DEPEND="${RDEPEND}"
57 -BDEPEND="${PYTHON_DEPS}"
58 -
59 -S="${WORKDIR}"/${P^^}
60 -
61 -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
62 -
63 -src_configure() {
64 - local mycmakeargs=(
65 - -DANTLR_BINARY=/usr/bin/antlr3
66 - -DENABLE_GPL=ON
67 - -DENABLE_OPTIMIZED=ON
68 - -DUSE_CLN="$(usex cln ON OFF)"
69 - -DUSE_READLINE="$(usex readline ON OFF)"
70 - -DENABLE_STATISTICS="$(usex statistics ON OFF)"
71 - -DENABLE_PROOFS="$(usex proofs ON OFF)"
72 - -DENABLE_REPLAY="$(usex replay ON OFF)"
73 - )
74 - cmake_src_configure
75 -}
76 -
77 -src_test() {
78 - emake -C "${BUILD_DIR}" \
79 - examples \
80 - boilerplate \
81 - ouroborous \
82 - reset_assertions \
83 - sep_log_api \
84 - smt2_compliance \
85 - two_smt_engines \
86 - statistics
87 - cmake_src_test
88 -}
89 -
90 -src_install() {
91 - cmake_src_install
92 - mv "${D}"/usr/{lib,$(get_libdir)}
93 -}
94
95 diff --git a/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch b/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch
96 deleted file mode 100644
97 index 55331f6c39b8..000000000000
98 --- a/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch
99 +++ /dev/null
100 @@ -1,43 +0,0 @@
101 ---- a/CMakeLists.txt 2019-07-09 14:47:12.552425226 +0200
102 -+++ b/CMakeLists.txt 2019-07-09 14:50:02.595001358 +0200
103 -@@ -143,7 +143,7 @@
104 -
105 - # Note: Module CodeCoverage requires the name of the debug build to conform
106 - # to cmake standards (first letter uppercase).
107 --set(BUILD_TYPES Production Debug Testing Competition)
108 -+set(BUILD_TYPES Production Debug Testing Competition Gentoo)
109 -
110 - if(ENABLE_ASAN)
111 - #_cmake_modify_IGNORE set(CMAKE_BUILD_TYPE Debug)
112 -@@ -166,12 +166,10 @@
113 - endif()
114 -
115 - message(STATUS "Building ${CMAKE_BUILD_TYPE} build")
116 --include(Config${CMAKE_BUILD_TYPE})
117 -
118 - #-----------------------------------------------------------------------------#
119 - # Compiler flags
120 -
121 --add_check_c_cxx_flag("-O${OPTIMIZATION_LEVEL}")
122 - add_check_c_cxx_flag("-Wall")
123 - add_check_c_flag("-fexceptions")
124 - add_check_c_cxx_flag("-Wno-deprecated")
125 ---- a/test/regress/CMakeLists.txt 2019-07-14 09:49:38.429990489 +0200
126 -+++ b/test/regress/CMakeLists.txt 2019-07-14 09:50:28.854234838 +0200
127 -@@ -1810,7 +1810,7 @@
128 - regress4/C880mul.miter.shuffled-as.sat03-348.smt
129 - regress4/NEQ016_size5.smt
130 - regress4/bug143.smt
131 -- regress4/comb2.shuffled-as.sat03-420.smt
132 -+ #regress4/comb2.shuffled-as.sat03-420.smt
133 - regress4/hole10.cvc
134 - regress4/instance_1151.smt
135 - )
136 ---- a/src/CMakeLists.txt 2019-07-18 08:56:47.923025745 +0200
137 -+++ b/src/CMakeLists.txt 2019-07-18 08:58:10.584750385 +0200
138 -@@ -915,4 +915,4 @@
139 - # Note: This is a temporary fix until the new C++ API is in place.
140 - install(CODE "execute_process(COMMAND
141 - ${CMAKE_CURRENT_LIST_DIR}/fix-install-headers.sh
142 -- ${CMAKE_INSTALL_PREFIX})")
143 -+ \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})")
144
145 diff --git a/sci-mathematics/cvc4/metadata.xml b/sci-mathematics/cvc4/metadata.xml
146 index 012b2a3438e4..ca72f05fd75d 100644
147 --- a/sci-mathematics/cvc4/metadata.xml
148 +++ b/sci-mathematics/cvc4/metadata.xml
149 @@ -8,7 +8,6 @@
150 <use>
151 <flag name="cln">Use <pkg>sci-libs/cln</pkg></flag>
152 <flag name="statistics">Include statistics</flag>
153 - <flag name="replay">Turn on the replay feature</flag>
154 <flag name="proofs">Support for proof generation</flag>
155 </use>
156 <longdescription lang="en">