[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cvc3/, sci-mathematics/cvc3/files/, profiles/

[Michał Górny]

commit:     118ae495ef2e4f65f8c48245dc6367da28bb8035
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 15:43:59 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 15:43:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118ae495

sci-mathematics/cvc3: Remove last-rited pkg

Signed-off-by: Michał Górny <mgorny <AT> 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 <mgorny@g.o> (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..00000000000
--- 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..00000000000
--- 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 CVC3"
-			CVC3_COMPONENT="\$COMPONENT"
-			CVC3_HOME="${EPREFIX}/usr/bin"
-			CVC3_SOLVER="\$CVC3_HOME/cvc3"
-			CVC3_REMOTE_SOLVER="cvc3"
-			CVC3_INSTALLED="yes"
-		EOF
-		insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		doins settings
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use isabelle; then
-		if [[ -f "${EROOT%/}/etc/isabelle/components" ]]; then
-			if egrep "contrib/${PN}-[0-9.]*" "${EROOT%/}/etc/isabelle/components"; then
-				sed -e "/contrib\/${PN}-[0-9.]*/d" \
-					-i "${EROOT%/}/etc/isabelle/components" || die "Failed to remove old CVC3 registrations in Isabelle"
-			fi
-			cat >> "${EROOT%/}/etc/isabelle/components" <<- EOF || die "Failed to register CVC3 with Isabelle"
-				contrib/${PN}-${PV}
-			EOF
-		fi
-	fi
-	if use zchaff; then
-		einfo "This copy of CVC3 is also configured to use the SAT solver zchaff whose"
-		einfo "copyright is owned by Princeton University and is more restrictive."
-		einfo "Specifically, it may be used for internal, noncommercial, research purposes"
-		einfo "only. See the copyright notices from the zchaff source files which are"
-		einfo "included in the LICENSE file."
-		einfo "To build CVC3 without these files, please build cvc3 without the zchaff"
-		einfo "use flag (note: zchaff is disabled by default):"
-		einfo "USE=-zchaff emerge sci-mathemathematics/cvc3"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use isabelle; then
-		if [[ ! -f "${EROOT%/}/usr/bin/cvc3" && -f "${EROOT%/}/etc/isabelle/components" ]]; then
-			# Note: this sed should only match the version of this ebuild
-			# Which is what we want as we do not want to remove the line
-			# of a new CVC3 being installed during an upgrade.
-			sed -e "/contrib\/${PN}-${PV}/d" \
-				-i "${EROOT%/}/etc/isabelle/components" || die "Failed to unregister CVC3 from Isabelle"
-		fi
-	fi
-}

diff --git a/sci-mathematics/cvc3/files/50cvc3-gentoo.el b/sci-mathematics/cvc3/files/50cvc3-gentoo.el
deleted file mode 100644
index 8e046edf7ad..00000000000
--- a/sci-mathematics/cvc3/files/50cvc3-gentoo.el
+++ /dev/null
@@ -1,3 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(add-to-list 'auto-mode-alist '("\\.cvc\\'" . cvc-mode))
-(autoload 'cvc-mode "cvc-mode" "CVC specifications editing mode." t)

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
deleted file mode 100644
index 1fb3516b8c2..00000000000
--- a/sci-mathematics/cvc3/files/cvc3-2.4.1-gccv6-fix.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-commit 4eb28b907e89be05d92eb704115f821b9b848e60
-Author: Matthew Dawson <matthew@××××××××××.ca>
-Date:   Sun Oct 16 22:06:03 2016 -0400
-
-    Fix gcc v6 compile failures.
-    
-     * Use std::hash<const char*> over std::hash<char *>, as throwing away the const is not allowed.
-     * Use Hash::hash by default in CDMap over std::hash, to get Hash::hash<CVC3::expr>
-
-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<char*> ExprValue::s_charHash;
-+std::hash<const char*> ExprValue::s_charHash;
- std::hash<long int> 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 Key, class Data, class HashFcn = std::hash<Key> > class CDMap;
-+template <class Key, class Data, class HashFcn = Hash::hash<Key> > class CDMap;
- 
--template <class Key, class Data, class HashFcn = std::hash<Key> >
-+template <class Key, class Data, class HashFcn = Hash::hash<Key> >
- 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<char*> s_charHash;
-+  static std::hash<const char*> s_charHash;
-   static std::hash<long int> 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),

diff --git a/sci-mathematics/cvc3/metadata.xml b/sci-mathematics/cvc3/metadata.xml
deleted file mode 100644
index cb6781b3e6d..00000000000
--- a/sci-mathematics/cvc3/metadata.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>gienah@g.o</email>
-  <name>Mark Wright</name>
-</maintainer>
-<maintainer type="project">
-  <email>sci-mathematics@g.o</email>
-  <name>Gentoo Mathematics Project</name>
-</maintainer>
-<longdescription lang="en">
-CVC3 is an automatic theorem prover for Satisfiability Modulo Theories
-(SMT) problems. It can be used to prove the validity (or, dually, the
-satisfiability) of first-order formulas in a large number of built-in
-logical theories and their combination.
-
-CVC3 is the last offspring of a series of popular SMT provers, which
-originated at Stanford University with the SVC system. In particular,
-it builds on the code base of CVC Lite, its most recent
-predecessor. Its high level design follows that of the Sammy prover.
-
-CVC3 works with a version of first-order logic with polymorphic types
-and has a wide variety of features including:
-
-    several built-in base theories: rational and integer linear
-        arithmetic, arrays, tuples, records, inductive data types, bit
-        vectors, and equality over uninterpreted function symbols;
-    support for quantifiers;
-    an interactive text-based interface;
-    a rich C and C++ API for embedding in other systems;
-    proof and model generation abilities;
-    predicate subtyping;
-    essentially no limit on its use for research or commercial
-        purposes (see license).
-</longdescription>
-<use>
-  <flag name="isabelle">Add integration support for the Isabelle/HOL
-  theorem prover.</flag>
-  <flag name="zchaff">Use the SAT solver zchaff whose copyright is
-  owned by Princeton University and is more restrictive (see zchaff
-  license).
-  </flag>
-</use>
-</pkgmetadata>