[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/spass/
commit: 9b604b4a1b2ca85a35a733e899a582514e7c00f4
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Aug 22 12:38:41 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Aug 22 12:38:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b604b4a
sci-mathematics/spass: add missing slash
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann gentoo.org>
sci-mathematics/spass/spass-3.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-mathematics/spass/spass-3.9.ebuild
b/sci-mathematics/spass/spass-3.9.ebuild
index 81289762c3d..c702deaec24 100644
--- a/sci-mathematics/spass/spass-3.9.ebuild
+++ b/sci-mathematics/spass/spass-3.9.ebuild
@@ -123,7 +123,7 @@ pkg_postinst() {
sed -e "/contrib\/${PN}-[0-9.]*/d" \
-i "${EROOT}/etc/isabelle/components"
fi
- cat <<- EOF >> "${ROOT}etc/isabelle/components"
+ cat <<- EOF >> "${EROOT}/etc/isabelle/components"
contrib/${PN}-${PV}
EOF
fi
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/spass/
commit: b4b7bf578d6915570fc39d5ec71d692604af4d1c
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Aug 22 11:01:26 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Aug 22 11:01:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4b7bf57
sci-mathematics/spass: fix missing slashes
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann gentoo.org>
sci-mathematics/spass/spass-3.9.ebuild | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sci-mathematics/spass/spass-3.9.ebuild
b/sci-mathematics/spass/spass-3.9.ebuild
index a32001e22b9..81289762c3d 100644
--- a/sci-mathematics/spass/spass-3.9.ebuild
+++ b/sci-mathematics/spass/spass-3.9.ebuild
@@ -108,7 +108,7 @@ src_install() {
[[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
cat <<- EOF >> "${S}/settings"
- SPASS_HOME="${ROOT}usr/bin"
+ SPASS_HOME="${EROOT}/usr/bin"
SPASS_VERSION="${PV}"
EOF
insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
@@ -118,10 +118,10 @@ src_install() {
pkg_postinst() {
if use isabelle; then
- if [ -f "${ROOT}etc/isabelle/components" ]; then
- if egrep "contrib/${PN}-[0-9.]*"
"${ROOT}etc/isabelle/components"; 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 "${ROOT}etc/isabelle/components"
+ -i "${EROOT}/etc/isabelle/components"
fi
cat <<- EOF >> "${ROOT}etc/isabelle/components"
contrib/${PN}-${PV}
@@ -132,13 +132,13 @@ pkg_postinst() {
pkg_postrm() {
if use isabelle; then
- if [ ! -f "${ROOT}usr/bin/SPASS" ]; then
- if [ -f "${ROOT}etc/isabelle/components" ]; then
+ if [ ! -f "${EROOT}/usr/bin/SPASS" ]; then
+ if [ -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 spass being installed during an
upgrade.
sed -e "/contrib\/${PN}-${PV}/d" \
- -i "${ROOT}etc/isabelle/components"
+ -i "${EROOT}/etc/isabelle/components"
fi
fi
fi
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/spass/
commit: 1ecd094c36d2bd4c23d71325843a9f3d27259663
Author: Mark Wright gentoo org>
AuthorDate: Thu Aug 22 00:43:13 2019 +
Commit: Mark Wright gentoo org>
CommitDate: Thu Aug 22 00:43:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ecd094c
sci-mathematics/spass: Fix #645394, remove old
Closes: https://bugs.gentoo.org/645394
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Mark Wright gentoo.org>
sci-mathematics/spass/Manifest | 1 -
sci-mathematics/spass/spass-3.7.ebuild | 81 --
sci-mathematics/spass/spass-3.9.ebuild | 8 ++--
3 files changed, 4 insertions(+), 86 deletions(-)
diff --git a/sci-mathematics/spass/Manifest b/sci-mathematics/spass/Manifest
index 9b2ec303ee4..00c5827991c 100644
--- a/sci-mathematics/spass/Manifest
+++ b/sci-mathematics/spass/Manifest
@@ -1,2 +1 @@
-DIST spass37.tgz 1340925 BLAKE2B
5b71778702f61a62e1ec6bd6136fb53ab50f746cab9437510a22141702384b425502c321651910f881c908d0d5640a223ae632e2e0c0f9dbd347cd7ee5c435f6
SHA512
5b4efd7b767dfee3f24e7917a6ec58ac240ab33bf601722eabd50af57637d8fdd62de9e34e7cd1cd98b8b7e371c9e2d47c8fa3e07c6e7ce2fa616a76646a4e12
DIST spass39.tgz 554633 BLAKE2B
ca2215f205215805eace6abae82ad281bdadd75f2a52cfe3fed43cb15a4955a4e4d2375fc73a546592315540a7596494bc0df4c53996fd9299e901f68a81ddc8
SHA512
d7ea0697426c476f2e03b2f9078b7e060671067a67fad7144bb5887a2dd3f39e19e1888f121fce546b5d6ea9a4dc458d1cbec56b59c93507e7dc2d0afa25a89b
diff --git a/sci-mathematics/spass/spass-3.7.ebuild
b/sci-mathematics/spass/spass-3.7.ebuild
deleted file mode 100644
index 6f16128d8a8..000
--- a/sci-mathematics/spass/spass-3.7.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-MY_PV=$(delete_all_version_separators "${PV}")
-MY_P="${PN}${MY_PV}"
-
-DESCRIPTION="An Automated Theorem Prover for First-Order Logic with Equality"
-HOMEPAGE="http://www.spass-prover.org/";
-SRC_URI="http://www.spass-prover.org/download/sources/${MY_P}.tgz";
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples isabelle"
-
-RDEPEND="isabelle? (
- >=sci-mathematics/isabelle-2011.1-r1:=
- )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/SPASS-${PV}"
-
-src_prepare() {
- sed \
- -e "s:-O3:${CFLAGS}:g" \
- -i configure || die
-}
-
-src_install() {
- default
-
- if use examples; then
- insinto /usr/share/${PN}/
- doins -r examples
- fi
-
- if use isabelle; then
- ewarn "All open source versions of spass are broken with
Isabelle 2016.1"
- ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f
2)"
- [[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
- dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
- cat <<- EOF >> "${S}/settings"
- SPASS_HOME="${ROOT}usr/bin"
- SPASS_VERSION="${PV}"
- EOF
- insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
- doins "${S}/settings"
- fi
-}
-
-pkg_postinst() {
- if use isabelle; then
- if [ -f "${ROOT}etc/isabelle/components" ]; then
- if egrep "contrib/${PN}-[0-9.]*"
"${ROOT}etc/isabelle/components"; then
- sed -e "/contrib\/${PN}-[0-9.]*/d" \
- -i "${ROOT}etc/isabelle/components"
- fi
- cat <<- EOF >> "${ROOT}etc/isabelle/components"
- contrib/${PN}-${PV}
- EOF
- fi
- fi
-}
-
-pkg_postrm() {
- if use isabelle; then
- if [ ! -f "${ROOT}usr/bin/SPASS" ]; then
- if [ -f "${ROOT}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 spass being installed during an
upgrade.
- sed -e "/contrib\/${PN}-${PV}/d" \
- -i "${ROOT}etc/isabelle/components"
- fi
- fi
- fi
-}
diff --git a/sci-mathematics/spass/spass-3.9.ebuild
b/sci-mathematics/spass/spass-3.9.ebuild
index 8fdbb7ebb63..a32001e22b9 100644
--- a/sci-mathematics/spass/spass-3.9.ebuild
+++ b/sci-mathematics/spass/spass-3.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit versionator
+inherit toolchain-funcs
-MY_PV=$(delete_all_version_separators "${PV
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/spass/
commit: 659980ac524e6e41edbeb01871d057355b9304cb Author: David Seifert gentoo org> AuthorDate: Sat Nov 25 16:52:42 2017 + Commit: David Seifert gentoo org> CommitDate: Sat Nov 25 17:40:17 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659980ac sci-mathematics/spass: [QA] Consistent whitespace in metadata.xml sci-mathematics/spass/metadata.xml | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sci-mathematics/spass/metadata.xml b/sci-mathematics/spass/metadata.xml index 742f96e9a9c..93ca493501b 100644 --- a/sci-mathematics/spass/metadata.xml +++ b/sci-mathematics/spass/metadata.xml @@ -9,10 +9,9 @@ Gentoo Mathematics Project -SPASS: An Automated Theorem Prover for First-Order Logic with Equality. - + SPASS: An Automated Theorem Prover for First-Order Logic with Equality. + - Add integration support for the Isabelle/HOL - theorem prover. + Add integration support for the Isabelle/HOL theorem prover.
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/spass/
commit: 71d6af007ea0f4ed26ab0233600401fdb3bfcc6b
Author: Mark Wright gentoo org>
AuthorDate: Mon Jan 2 23:07:12 2017 +
Commit: Mark Wright gentoo org>
CommitDate: Mon Jan 2 23:07:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d6af00
sci-mathematics/spass: Bump to 3.9
Package-Manager: portage-2.3.3
sci-mathematics/spass/Manifest | 1 +
sci-mathematics/spass/spass-3.7.ebuild | 3 +-
sci-mathematics/spass/spass-3.9.ebuild | 146 +
3 files changed, 149 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/spass/Manifest b/sci-mathematics/spass/Manifest
index 5fb1372..f1d7eaa 100644
--- a/sci-mathematics/spass/Manifest
+++ b/sci-mathematics/spass/Manifest
@@ -1 +1,2 @@
DIST spass37.tgz 1340925 SHA256
13c67e5e09b814ba50f38a391fe653661ba714e7541ffd4951efef91274aaacc SHA512
5b4efd7b767dfee3f24e7917a6ec58ac240ab33bf601722eabd50af57637d8fdd62de9e34e7cd1cd98b8b7e371c9e2d47c8fa3e07c6e7ce2fa616a76646a4e12
WHIRLPOOL
2fa8881b08a0fcdb9f1a6e7d27849f5c900a32f2cb27d878fbdae4986d0854608fd137e4608349c4eb612f4e1981142e63af8462ab904f7d08c3e2758f319835
+DIST spass39.tgz 554633 SHA256
1797c3fbd1954189c812fbab7927880bad964ded400bae733a9938c7e6b09e85 SHA512
d7ea0697426c476f2e03b2f9078b7e060671067a67fad7144bb5887a2dd3f39e19e1888f121fce546b5d6ea9a4dc458d1cbec56b59c93507e7dc2d0afa25a89b
WHIRLPOOL
ad69c2e3714c5c640898a71a47ad6ab8370d3dd568372d492e82e6ba17312e84d3885016db3f923a4d7b3967cb0ac65c8e9dd8f0c8ce93f9de0534be01a371aa
diff --git a/sci-mathematics/spass/spass-3.7.ebuild
b/sci-mathematics/spass/spass-3.7.ebuild
index 30967c7..7556028 100644
--- a/sci-mathematics/spass/spass-3.7.ebuild
+++ b/sci-mathematics/spass/spass-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -40,6 +40,7 @@ src_install() {
fi
if use isabelle; then
+ ewarn "All open source versions of spass are broken with
Isabelle 2016.1"
ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f
2)"
[[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
diff --git a/sci-mathematics/spass/spass-3.9.ebuild
b/sci-mathematics/spass/spass-3.9.ebuild
new file mode 100644
index ..1804581
--- /dev/null
+++ b/sci-mathematics/spass/spass-3.9.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit versionator
+
+MY_PV=$(delete_all_version_separators "${PV}")
+MY_P="${PN}${MY_PV}"
+
+DESCRIPTION="An Automated Theorem Prover for First-Order Logic with Equality"
+HOMEPAGE="http://www.spass-prover.org/";
+SRC_URI="http://www.spass-prover.org/download/sources/${MY_P}.tgz";
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="isabelle"
+
+RDEPEND="isabelle? (
+ sci-mathematics/isabelle:=
+ )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+ mkdir -p "${P}" || die
+ cd "${S}" || die
+ unpack "${MY_P}.tgz"
+}
+
+src_compile() {
+ einfo "generating parsers"
+ bison -d -p pro_ -o proparser.c proparser.y || die
+ bison -d -p tptp_ -o tptpparser.c tptpparser.y || die
+ bison -d -p ia_ -o iaparser.c iaparser.y || die
+
+ einfo "generating lexers"
+ flex -Ppro_ -o proscanner.c proscanner.l || die
+ flex -Ptptp_ -o tptpscanner.c tptpscanner.l || die
+ flex -Pia_ -o iascanner.c iascanner.l || die
+
+ einfo "compiling sources"
+ local x
+ for x in *.c
+ do
+ $(tc-getCC) \
+ ${CPPFLAGS} ${CFLAGS} \
+ -c -o ${x/.c/.o} ${x} || die "compile ${x} failed"
+ done
+
+ einfo "linking tptp2dfg"
+ $(tc-getCC) \
+ ${LDFLAGS} -o tptp2dfg \
+ array.o clause.o cmdline.o context.o description.o
dfg_diagnostic.o \
+ dfg_string_table.o dfg_token.o dfgparser.o dfglexer.o \
+ tptpparser.o tptpscanner.o eml.o flags.o foldfg.o hashmap.o
kbo.o \
+ list.o memory.o misc.o order.o rpos.o sharing.o st.o stack.o \
+ strings.o subst.o symbol.o term.o unify.o tptp2dfg.o -lm \
+ || die "link tptp2dfg failed"
+
+ einfo "linking dfg2ascii"
+ $(tc-getCC) \
+ ${LDFLAGS} -o dfg2ascii \
+ array.o clause.o cmdline.o context.o description.o
dfg_diagnostic.o \
+ dfg_string_table.o dfg_token.o dfgparser.o dfglexer.o \
+ tptpparser.o tptpscanner.o eml.o flags.o foldfg.o hashmap.o
kbo.o \
+ list.o memory.o misc.o order.o rpos.o sharing.o st.o stack.o \
+ strings.o subst.o symbol.o term.o unify.o dfg2ascii.o -lm \
+ || die "link
