[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cvc3/, sci-mathematics/cvc3/files/, profiles/
commit: 118ae495ef2e4f65f8c48245dc6367da28bb8035
Author: Michał Górny gentoo org>
AuthorDate: Sat Sep 14 15:43:59 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Sep 14 15:43:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118ae495
sci-mathematics/cvc3: Remove last-rited pkg
Signed-off-by: Michał Górny gentoo.org>
profiles/package.mask | 1 -
sci-mathematics/cvc3/Manifest | 1 -
sci-mathematics/cvc3/cvc3-2.4.1-r1.ebuild | 141 -
sci-mathematics/cvc3/files/50cvc3-gentoo.el| 3 -
.../cvc3/files/cvc3-2.4.1-gccv6-fix.patch | 76 ---
sci-mathematics/cvc3/metadata.xml | 45 ---
6 files changed, 267 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 5ff22066369..0de8a394f4f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1118,7 +1118,6 @@ dev-util/deskzilla
media-sound/tuxguitar
sci-mathematics/isabelle
sci-chemistry/jmol
-sci-mathematics/cvc3
# Michał Górny (2019-08-14)
# No longer builds. Homepage is gone, and its keep-alive fork is also
diff --git a/sci-mathematics/cvc3/Manifest b/sci-mathematics/cvc3/Manifest
deleted file mode 100644
index 92a06778327..000
--- a/sci-mathematics/cvc3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cvc3-2.4.1.tar.gz 1196616 BLAKE2B
8d3f7cbd24a1ba7e558fa8f91f9dd8f3fdc1aee3dd0d0e460bfb6e7922ae54cebaad3696912d3d0fb735ce1f6d00ac32a7d65c0b01af870124e48d9c96855aac
SHA512
48e5cd82b3eb7506d762c2abc8db0c8fbc548575a1362dda53888075ac105a5bc0f0d58dfe01b60f207bc00ff8dfc39a5b3d9317784fe551658c884bb02e1ff2
diff --git a/sci-mathematics/cvc3/cvc3-2.4.1-r1.ebuild
b/sci-mathematics/cvc3/cvc3-2.4.1-r1.ebuild
deleted file mode 100644
index b51969ee713..000
--- a/sci-mathematics/cvc3/cvc3-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp-common
-
-DESCRIPTION="CVC3 is a theorem prover for Satisfiability Modulo Theories (SMT)
problems"
-HOMEPAGE="http://www.cs.nyu.edu/acsys/cvc3/index.html";
-SRC_URI="http://www.cs.nyu.edu/acsys/cvc3/releases/2.4.1/${P}.tar.gz";
-
-LICENSE="BSD MIT HPND zchaff? ( zchaff )"
-RESTRICT="mirror zchaff? ( bindist )"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs isabelle test zchaff"
-
-RDEPEND="dev-libs/gmp:0=
- isabelle? ( >=sci-mathematics/isabelle-2011.1-r1:= )"
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
- emacs? (
- virtual/emacs
- )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=( "${FILESDIR}/${P}-gccv6-fix.patch" )
-
-src_prepare() {
- default
-
- sed -e 's#prefix=@prefix@#prefix=$(patsubst %/,%,$(DESTDIR))@prefix@#' \
- -e 's#libdir=@libdir@#libdir=$(patsubst
%/,%,$(DESTDIR))@libdir@#' \
- -e 's#mandir=@mandir@#mandir=$(patsubst
%/,%,$(DESTDIR))@mandir@#' \
- -i "${S}/Makefile.local.in" \
- || die "Could not set DESTDIR in Makefile.local.in"
-}
-
-src_configure() {
- # --enable-static disables building of shared libraries, statically
- # links /usr/bin/cvc3 and installs static libraries.
- # --enable-static --enable-sharedlibs behaves the same as just
--enable-static
- econf \
- --enable-dynamic \
- $(use_enable zchaff)
-
- if use test; then
- sed -e 's@LD_LIBS = @LD_LIBS = -L'"${S}"'/lib
-Wl,-R'"${S}"'/lib @' \
- -i "${S}/test/Makefile" \
- || die "Could not set library paths in test/Makefile"
- fi
-}
-
-src_compile() {
- emake
-
- use doc && emake -C doc
-
- if use emacs; then
- pushd emacs >/dev/null || die
- elisp-compile *.el || die "emacs elisp compile failed"
- popd >/dev/null || die
- fi
-
- use test && emake -C test
-}
-
-src_test() {
- pushd test >/dev/null || die
- ./bin/test || die "Testsuite failed"
- popd >/dev/null || die
-}
-
-src_install() {
- use doc && local HTML_DOCS=( doc/html/*.{html,gif,png,css} )
- default
-
- if use emacs; then
- elisp-install ${PN} emacs/*.{el,elc}
- cp "${FILESDIR}"/${SITEFILE} "${S}" || die "Failed to copy
Emacs files"
- elisp-site-file-install ${SITEFILE}
- fi
-
- if use isabelle; then
- ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f
2)" \
- || die "isabelle getenv ISABELLE_HOME failed"
- [[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
- dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
- cat >> settings <<- EOF || die "Failed to create Isabelle
configuration for
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cvc3/, sci-mathematics/cvc3/files/
commit: abc1591d87c0376c9b344794658b8adb31c1d86e
Author: Matthew Dawson mjdsystems ca>
AuthorDate: Mon Oct 17 03:17:19 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sat Oct 29 22:30:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abc1591d
sci-mathematics/cvc3: Add a patch to fix compiling with GCC 6
Gentoo-bug: 593982
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2575
Signed-off-by: David Seifert gentoo.org>
sci-mathematics/cvc3/cvc3-2.4.1-r1.ebuild | 2 +
.../cvc3/files/cvc3-2.4.1-gccv6-fix.patch | 76 ++
2 files changed, 78 insertions(+)
diff --git a/sci-mathematics/cvc3/cvc3-2.4.1-r1.ebuild
b/sci-mathematics/cvc3/cvc3-2.4.1-r1.ebuild
index 8531710..705deae 100644
--- a/sci-mathematics/cvc3/cvc3-2.4.1-r1.ebuild
+++ b/sci-mathematics/cvc3/cvc3-2.4.1-r1.ebuild
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
SITEFILE="50${PN}-gentoo.el"
+PATCHES=( "${FILESDIR}/${P}-gccv6-fix.patch" )
+
src_prepare() {
default
diff --git a/sci-mathematics/cvc3/files/cvc3-2.4.1-gccv6-fix.patch
b/sci-mathematics/cvc3/files/cvc3-2.4.1-gccv6-fix.patch
new file mode 100644
index ..1fb3516
--- /dev/null
+++ b/sci-mathematics/cvc3/files/cvc3-2.4.1-gccv6-fix.patch
@@ -0,0 +1,76 @@
+commit 4eb28b907e89be05d92eb704115f821b9b848e60
+Author: Matthew Dawson
+Date: Sun Oct 16 22:06:03 2016 -0400
+
+Fix gcc v6 compile failures.
+
+ * Use std::hash over std::hash, as throwing away the
const is not allowed.
+ * Use Hash::hash by default in CDMap over std::hash, to get
Hash::hash
+
+diff --git a/src/expr/expr_value.cpp b/src/expr/expr_value.cpp
+index 0c85ff6..e4dd251 100644
+--- a/src/expr/expr_value.cpp
b/src/expr/expr_value.cpp
+@@ -29,7 +29,7 @@ namespace CVC3 {
+ // Class ExprValue static members
+
+
+-std::hash ExprValue::s_charHash;
++std::hash ExprValue::s_charHash;
+ std::hash ExprValue::s_intHash;
+
+
+diff --git a/src/include/cdmap.h b/src/include/cdmap.h
+index faf682a..c3b094c 100644
+--- a/src/include/cdmap.h
b/src/include/cdmap.h
+@@ -43,9 +43,9 @@ namespace CVC3 {
+ // Auxiliary class: almost the same as CDO (see cdo.h), but on
+ // setNull() call it erases itself from the map.
+
+-template > class CDMap;
++template > class
CDMap;
+
+-template >
++template >
+ class CDOmap :public ContextObj {
+ Key d_key;
+ Data d_data;
+diff --git a/src/include/expr_hash.h b/src/include/expr_hash.h
+index b2107d7..baa2eab 100644
+--- a/src/include/expr_hash.h
b/src/include/expr_hash.h
+@@ -20,7 +20,6 @@
+ * hash_set over Expr class.
+ */
+
/*/
+-
+ #ifndef _cvc3__expr_h_
+ #include "expr.h"
+ #endif
+diff --git a/src/include/expr_value.h b/src/include/expr_value.h
+index 95102b2..f53aa4d 100644
+--- a/src/include/expr_value.h
b/src/include/expr_value.h
+@@ -179,7 +179,7 @@ protected:
+ // Static hash functions. They don't depend on the context
+ // (ExprManager and such), so it is still thread-safe to have them
+ // static.
+- static std::hash s_charHash;
++ static std::hash s_charHash;
+ static std::hash s_intHash;
+
+ static size_t pointerHash(void* p) { return s_intHash((long int)p); }
+diff --git a/src/theory_core/theory_core.cpp b/src/theory_core/theory_core.cpp
+index df5289f..37ccab9 100644
+--- a/src/theory_core/theory_core.cpp
b/src/theory_core/theory_core.cpp
+@@ -710,7 +710,7 @@ TheoryCore::TheoryCore(ContextManager* cm,
+ //d_termTheorems(cm->getCurrentContext()),
+ d_predicates(cm->getCurrentContext()),
+ d_solver(NULL),
+-d_simplifyInPlace(false),
++d_simplifyInPlace(NULL),
+ d_currentRecursiveSimplifier(NULL),
+ d_resourceLimit(0),
+ d_timeBase(0),
