Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/spass/
Date: Thu, 22 Aug 2019 11:01:57
Message-Id: 1566471707.b4b7bf578d6915570fc39d5ec71d692604af4d1c.whissi@gentoo
1 commit: b4b7bf578d6915570fc39d5ec71d692604af4d1c
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 22 11:01:26 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 22 11:01:47 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4b7bf57
7
8 sci-mathematics/spass: fix missing slashes
9
10 Package-Manager: Portage-2.3.72, Repoman-2.3.17
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 sci-mathematics/spass/spass-3.9.ebuild | 14 +++++++-------
14 1 file changed, 7 insertions(+), 7 deletions(-)
15
16 diff --git a/sci-mathematics/spass/spass-3.9.ebuild b/sci-mathematics/spass/spass-3.9.ebuild
17 index a32001e22b9..81289762c3d 100644
18 --- a/sci-mathematics/spass/spass-3.9.ebuild
19 +++ b/sci-mathematics/spass/spass-3.9.ebuild
20 @@ -108,7 +108,7 @@ src_install() {
21 [[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
22 dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
23 cat <<- EOF >> "${S}/settings"
24 - SPASS_HOME="${ROOT}usr/bin"
25 + SPASS_HOME="${EROOT}/usr/bin"
26 SPASS_VERSION="${PV}"
27 EOF
28 insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
29 @@ -118,10 +118,10 @@ src_install() {
30
31 pkg_postinst() {
32 if use isabelle; then
33 - if [ -f "${ROOT}etc/isabelle/components" ]; then
34 - if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then
35 + if [ -f "${EROOT}/etc/isabelle/components" ]; then
36 + if egrep "contrib/${PN}-[0-9.]*" "${EROOT}/etc/isabelle/components"; then
37 sed -e "/contrib\/${PN}-[0-9.]*/d" \
38 - -i "${ROOT}etc/isabelle/components"
39 + -i "${EROOT}/etc/isabelle/components"
40 fi
41 cat <<- EOF >> "${ROOT}etc/isabelle/components"
42 contrib/${PN}-${PV}
43 @@ -132,13 +132,13 @@ pkg_postinst() {
44
45 pkg_postrm() {
46 if use isabelle; then
47 - if [ ! -f "${ROOT}usr/bin/SPASS" ]; then
48 - if [ -f "${ROOT}etc/isabelle/components" ]; then
49 + if [ ! -f "${EROOT}/usr/bin/SPASS" ]; then
50 + if [ -f "${EROOT}/etc/isabelle/components" ]; then
51 # Note: this sed should only match the version of this ebuild
52 # Which is what we want as we do not want to remove the line
53 # of a new spass being installed during an upgrade.
54 sed -e "/contrib\/${PN}-${PV}/d" \
55 - -i "${ROOT}etc/isabelle/components"
56 + -i "${EROOT}/etc/isabelle/components"
57 fi
58 fi
59 fi