gentoo resync : 06.08.2019

3 files changed, 13 insertions, 96 deletions

diff --git a/sci-mathematics/spass/Manifest b/sci-mathematics/spass/Manifest
index fe06a9388497..3f6eac8e73fd 100644
--- a/sci-mathematics/spass/Manifest
+++ b/sci-mathematics/spass/Manifest
@@ -1,5 +1,3 @@
-DIST spass37.tgz 1340925 BLAKE2B 5b71778702f61a62e1ec6bd6136fb53ab50f746cab9437510a22141702384b425502c321651910f881c908d0d5640a223ae632e2e0c0f9dbd347cd7ee5c435f6 SHA512 5b4efd7b767dfee3f24e7917a6ec58ac240ab33bf601722eabd50af57637d8fdd62de9e34e7cd1cd98b8b7e371c9e2d47c8fa3e07c6e7ce2fa616a76646a4e12
 DIST spass39.tgz 554633 BLAKE2B ca2215f205215805eace6abae82ad281bdadd75f2a52cfe3fed43cb15a4955a4e4d2375fc73a546592315540a7596494bc0df4c53996fd9299e901f68a81ddc8 SHA512 d7ea0697426c476f2e03b2f9078b7e060671067a67fad7144bb5887a2dd3f39e19e1888f121fce546b5d6ea9a4dc458d1cbec56b59c93507e7dc2d0afa25a89b
-EBUILD spass-3.7.ebuild 1991 BLAKE2B db0b3f9a499dadfa94d30838fcf59fa35f2cb463501502448e5301cb0532efdac20a9131960e85d0cd12cb8abd2dbd5a2a8721a107b4906b9d051aaa3271a562 SHA512 a155b205249cd9e80b274d8316d42e3a69d60aeecaabe4162b8b6225433a138b5b33605cde7dea391b65c9acb97f65807e0bbf7f2eb9fbe7970e38c81cccb33b
-EBUILD spass-3.9.ebuild 4528 BLAKE2B 4004195f26de851c50a4d0d9631bf08fa808a45db3efb2421823097bceda8da062c048020bb84b187d4bdbcfdea74e641226935150dfc105cf698a7949f9f977 SHA512 5cd41de9201063f2ebf696b5cdd1cf2572e6e0e99282c41a0fd3a92ea8589337da63e4392e0e45257b79dd667d986f7206655310696372ce433e43f5473a6f2c
+EBUILD spass-3.9.ebuild 4528 BLAKE2B cde0847e8e2779971f33c1901f4601083c7490082d987a3286c89b1b7c72b8f5c5824aa3762f3eab99b4748c17f0cc6e38bd6f5ced7cf66ff87e4a013b6349a0 SHA512 e00e0c0a2fe8ffc3b5e5ff193a90ed002ffb0a7173cd31837351d32e86201b4bb0296ee49e203ebba9b67f948448f93e3f8acd317f1f800691d6b8a9ed3b0a2f
 MISC metadata.xml 577 BLAKE2B 7d0a60f31459c0a514ae829d1a56efdb55ac0abb5c5202e1e8400755ae4593ef183e9770e2308545af2b17ad7e385d15c48a9ee630a3cd20d1feb5f0edc189d1 SHA512 7cd50f06b202828fd682e2f44d361b393cc89f0468001970c2ad807e26d7fa5399cba09e6805a937cfba9c56019b67ab3dec422a989e16cbb5216fa76c253285
diff --git a/sci-mathematics/spass/spass-3.7.ebuild b/sci-mathematics/spass/spass-3.7.ebuild
deleted file mode 100644
index 6f16128d8a8c..000000000000
--- 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 8fdbb7ebb633..c702deaec240 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}")
+MY_PV=$(ver_rs 1- '' "${PV}")
 MY_P="${PN}${MY_PV}"
 
 DESCRIPTION="An Automated Theorem Prover for First-Order Logic with Equality"
@@ -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,12 +118,12 @@ 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"
+			cat <<- EOF >> "${EROOT}/etc/isabelle/components"
 				contrib/${PN}-${PV}
 			EOF
 		fi
@@ -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