* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cvc4/, sci-mathematics/cvc4/files/
@ 2019-07-14 19:48 Alfredo Tupone
0 siblings, 0 replies; 2+ messages in thread
From: Alfredo Tupone @ 2019-07-14 19:48 UTC (permalink / raw
To: gentoo-commits
commit: 0165d1484b0c9ad0f2272960c80703e2c0b231f2
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 19:48:18 2019 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 19:48:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0165d148
sci-mathematics/cvc4: Bump to 1.7
Closes: https://bugs.gentoo.org/688652
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
sci-mathematics/cvc4/Manifest | 1 +
sci-mathematics/cvc4/cvc4-1.7.ebuild | 54 ++++++++++++++++++++++++
sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch | 35 +++++++++++++++
3 files changed, 90 insertions(+)
diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index 2b268f2188b..daaafcc4d44 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1 +1,2 @@
DIST cvc4-1.6.tar.gz 7815893 BLAKE2B 626e0dd49f911384e64d7e8ecf635aa12dad32830b2032bdcb96afd1a17c3566f56df51f75e9193cf365b562855733d0ea4ff3311ac99fc86e928a956298d2ad SHA512 0887b3f74a4b9e51e634591c7cf39d730110ca5d930149bab4816a49e383eeea8ccadf8474d22f5529cc03ddd045acacf8a2b92434b882adf352f4de4075fcd4
+DIST cvc4-1.7.tar.gz 6969953 BLAKE2B 3a64db14a734e0314fb7d7b8dbed79e067c9bbf1723343dac1e9c47b3f09811b1a32ff0116412667bd0afefda2489c6c1679bf109710402a67bee0d91b62dd94 SHA512 b91dfac7ddf979a3474f562eb98f2d6f17a53efa38c1be5502429309a0c059e1f2b0d85ee95e5aee17d35f34c825f01f879ec4aaf26025b1fcac835c33a867c6
diff --git a/sci-mathematics/cvc4/cvc4-1.7.ebuild b/sci-mathematics/cvc4/cvc4-1.7.ebuild
new file mode 100644
index 00000000000..0b192f12739
--- /dev/null
+++ b/sci-mathematics/cvc4/cvc4-1.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="automatic theorem prover for satisfiability modulo theories (SMT) problems"
+HOMEPAGE="http://cvc4.cs.stanford.edu/web/"
+SRC_URI="https://github.com/CVC4/CVC4/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cln"
+
+RDEPEND="dev-libs/antlr-c
+ dev-java/antlr:3
+ dev-libs/boost
+ cln? ( sci-libs/cln )
+ !cln? ( dev-libs/gmp:= )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/CVC4-${PV}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+ CMAKE_MAKEFILE_GENERATOR=emake
+ local mycmakeargs=(
+ -DANTLR_BINARY=/usr/bin/antlr3
+ -DENABLE_GPL=ON
+ -DUSE_CLN="$(usex cln ON OFF)"
+ )
+ cmake-utils_src_configure
+}
+
+src_test() {
+ emake -C "${BUILD_DIR}" \
+ examples \
+ boilerplate \
+ ouroborous \
+ reset_assertions \
+ sep_log_api \
+ smt2_compliance \
+ two_smt_engines \
+ statistics
+ cmake-utils_src_test
+}
+
+src_install() {
+ cmake-utils_src_install
+ mv "${D}"/usr/{lib,$(get_libdir)}
+}
diff --git a/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch b/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch
new file mode 100644
index 00000000000..849b4a8a429
--- /dev/null
+++ b/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch
@@ -0,0 +1,35 @@
+--- a/CMakeLists.txt 2019-07-09 14:47:12.552425226 +0200
++++ b/CMakeLists.txt 2019-07-09 14:50:02.595001358 +0200
+@@ -143,7 +143,7 @@
+
+ # Note: Module CodeCoverage requires the name of the debug build to conform
+ # to cmake standards (first letter uppercase).
+-set(BUILD_TYPES Production Debug Testing Competition)
++set(BUILD_TYPES Production Debug Testing Competition Gentoo)
+
+ if(ENABLE_ASAN)
+ #_cmake_modify_IGNORE set(CMAKE_BUILD_TYPE Debug)
+@@ -166,12 +166,10 @@
+ endif()
+
+ message(STATUS "Building ${CMAKE_BUILD_TYPE} build")
+-include(Config${CMAKE_BUILD_TYPE})
+
+ #-----------------------------------------------------------------------------#
+ # Compiler flags
+
+-add_check_c_cxx_flag("-O${OPTIMIZATION_LEVEL}")
+ add_check_c_cxx_flag("-Wall")
+ add_check_c_flag("-fexceptions")
+ add_check_c_cxx_flag("-Wno-deprecated")
+--- a/test/regress/CMakeLists.txt 2019-07-14 09:49:38.429990489 +0200
++++ b/test/regress/CMakeLists.txt 2019-07-14 09:50:28.854234838 +0200
+@@ -1810,7 +1810,7 @@
+ regress4/C880mul.miter.shuffled-as.sat03-348.smt
+ regress4/NEQ016_size5.smt
+ regress4/bug143.smt
+- regress4/comb2.shuffled-as.sat03-420.smt
++ #regress4/comb2.shuffled-as.sat03-420.smt
+ regress4/hole10.cvc
+ regress4/instance_1151.smt
+ )
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cvc4/, sci-mathematics/cvc4/files/
@ 2023-01-29 13:13 Alfredo Tupone
0 siblings, 0 replies; 2+ messages in thread
From: Alfredo Tupone @ 2023-01-29 13:13 UTC (permalink / raw
To: gentoo-commits
commit: b20b0dbffda6f89cf521ba6c714803d26054e177
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 13:11:43 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 13:13:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b20b0dbf
sci-mathematics/cvc4: drop 1.7-r1
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-mathematics/cvc4/Manifest | 1 -
sci-mathematics/cvc4/cvc4-1.7-r1.ebuild | 62 ------------------------
sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch | 43 ----------------
sci-mathematics/cvc4/metadata.xml | 1 -
4 files changed, 107 deletions(-)
diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index fe5e434767b8..4326a842f502 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1,2 +1 @@
-DIST cvc4-1.7.tar.gz 6969953 BLAKE2B 3a64db14a734e0314fb7d7b8dbed79e067c9bbf1723343dac1e9c47b3f09811b1a32ff0116412667bd0afefda2489c6c1679bf109710402a67bee0d91b62dd94 SHA512 b91dfac7ddf979a3474f562eb98f2d6f17a53efa38c1be5502429309a0c059e1f2b0d85ee95e5aee17d35f34c825f01f879ec4aaf26025b1fcac835c33a867c6
DIST cvc4-1.8.tar.gz 7554297 BLAKE2B f4d2b223ba2c01ef745520d8874381a1873358fbc7eca12559656512ffeefccec4eca3d73a26debf34110ca14a3bccf35ca87e2a49575b8b67484bed79df081c SHA512 d6b0153b0f5c4e615c995a8eecfbfd783cfc1004c5134c6880230044081c71d638fee39cceb987eb8d72e91b2b6596b184dc0daacec8880cfc176c6dee8aa445
diff --git a/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild b/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
deleted file mode 100644
index 340a8727e35b..000000000000
--- a/sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python3_{9..10} )
-inherit cmake python-any-r1
-
-DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) problems"
-HOMEPAGE="https://cvc4.github.io/"
-SRC_URI="https://github.com/CVC4/CVC4/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cln proofs readline replay +statistics"
-
-RDEPEND="dev-libs/antlr-c
- dev-java/antlr:3
- dev-libs/boost
- readline? ( sys-libs/readline:0= )
- cln? ( sci-libs/cln )
- !cln? ( dev-libs/gmp:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-S="${WORKDIR}"/${P^^}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
- local mycmakeargs=(
- -DANTLR_BINARY=/usr/bin/antlr3
- -DENABLE_GPL=ON
- -DENABLE_OPTIMIZED=ON
- -DUSE_CLN="$(usex cln ON OFF)"
- -DUSE_READLINE="$(usex readline ON OFF)"
- -DENABLE_STATISTICS="$(usex statistics ON OFF)"
- -DENABLE_PROOFS="$(usex proofs ON OFF)"
- -DENABLE_REPLAY="$(usex replay ON OFF)"
- )
- cmake_src_configure
-}
-
-src_test() {
- emake -C "${BUILD_DIR}" \
- examples \
- boilerplate \
- ouroborous \
- reset_assertions \
- sep_log_api \
- smt2_compliance \
- two_smt_engines \
- statistics
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
- mv "${D}"/usr/{lib,$(get_libdir)}
-}
diff --git a/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch b/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch
deleted file mode 100644
index 55331f6c39b8..000000000000
--- a/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/CMakeLists.txt 2019-07-09 14:47:12.552425226 +0200
-+++ b/CMakeLists.txt 2019-07-09 14:50:02.595001358 +0200
-@@ -143,7 +143,7 @@
-
- # Note: Module CodeCoverage requires the name of the debug build to conform
- # to cmake standards (first letter uppercase).
--set(BUILD_TYPES Production Debug Testing Competition)
-+set(BUILD_TYPES Production Debug Testing Competition Gentoo)
-
- if(ENABLE_ASAN)
- #_cmake_modify_IGNORE set(CMAKE_BUILD_TYPE Debug)
-@@ -166,12 +166,10 @@
- endif()
-
- message(STATUS "Building ${CMAKE_BUILD_TYPE} build")
--include(Config${CMAKE_BUILD_TYPE})
-
- #-----------------------------------------------------------------------------#
- # Compiler flags
-
--add_check_c_cxx_flag("-O${OPTIMIZATION_LEVEL}")
- add_check_c_cxx_flag("-Wall")
- add_check_c_flag("-fexceptions")
- add_check_c_cxx_flag("-Wno-deprecated")
---- a/test/regress/CMakeLists.txt 2019-07-14 09:49:38.429990489 +0200
-+++ b/test/regress/CMakeLists.txt 2019-07-14 09:50:28.854234838 +0200
-@@ -1810,7 +1810,7 @@
- regress4/C880mul.miter.shuffled-as.sat03-348.smt
- regress4/NEQ016_size5.smt
- regress4/bug143.smt
-- regress4/comb2.shuffled-as.sat03-420.smt
-+ #regress4/comb2.shuffled-as.sat03-420.smt
- regress4/hole10.cvc
- regress4/instance_1151.smt
- )
---- a/src/CMakeLists.txt 2019-07-18 08:56:47.923025745 +0200
-+++ b/src/CMakeLists.txt 2019-07-18 08:58:10.584750385 +0200
-@@ -915,4 +915,4 @@
- # Note: This is a temporary fix until the new C++ API is in place.
- install(CODE "execute_process(COMMAND
- ${CMAKE_CURRENT_LIST_DIR}/fix-install-headers.sh
-- ${CMAKE_INSTALL_PREFIX})")
-+ \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})")
diff --git a/sci-mathematics/cvc4/metadata.xml b/sci-mathematics/cvc4/metadata.xml
index 012b2a3438e4..ca72f05fd75d 100644
--- a/sci-mathematics/cvc4/metadata.xml
+++ b/sci-mathematics/cvc4/metadata.xml
@@ -8,7 +8,6 @@
<use>
<flag name="cln">Use <pkg>sci-libs/cln</pkg></flag>
<flag name="statistics">Include statistics</flag>
- <flag name="replay">Turn on the replay feature</flag>
<flag name="proofs">Support for proof generation</flag>
</use>
<longdescription lang="en">
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-29 13:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-29 13:13 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cvc4/, sci-mathematics/cvc4/files/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2019-07-14 19:48 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox