Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/
Date: Sun, 26 Jan 2020 20:05:52
Message-Id: 1580069142.64bf6aff6b29039dbef965972c6610e1388f1c4d.zmedico@gentoo
1 commit: 64bf6aff6b29039dbef965972c6610e1388f1c4d
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 26 20:00:03 2020 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 26 20:05:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64bf6aff
7
8 app-text/calibre: fix ${EPREFIX} missing trailing slash
9
10 Reported-by: Michał Górny <mgorny <AT> gentoo.org>
11 Package-Manager: Portage-2.3.85, Repoman-2.3.20
12 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
13
14 app-text/calibre/calibre-3.48.0-r1.ebuild | 4 ++--
15 app-text/calibre/calibre-4.9.1-r1.ebuild | 2 +-
16 app-text/calibre/calibre-4.9.1.ebuild | 2 +-
17 3 files changed, 4 insertions(+), 4 deletions(-)
18
19 diff --git a/app-text/calibre/calibre-3.48.0-r1.ebuild b/app-text/calibre/calibre-3.48.0-r1.ebuild
20 index 438e9707f60..750bc132087 100644
21 --- a/app-text/calibre/calibre-3.48.0-r1.ebuild
22 +++ b/app-text/calibre/calibre-3.48.0-r1.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2019 Gentoo Authors
25 +# Copyright 1999-2020 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=7
29 @@ -203,7 +203,7 @@ src_install() {
30 cd "${ED}"/usr/share/calibre/fonts/liberation || die
31 local x
32 for x in * ; do
33 - [[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
34 + [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
35 ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
36 done
37
38
39 diff --git a/app-text/calibre/calibre-4.9.1-r1.ebuild b/app-text/calibre/calibre-4.9.1-r1.ebuild
40 index a158ed8ff2e..96f088d7781 100644
41 --- a/app-text/calibre/calibre-4.9.1-r1.ebuild
42 +++ b/app-text/calibre/calibre-4.9.1-r1.ebuild
43 @@ -211,7 +211,7 @@ src_install() {
44 cd "${ED}"/usr/share/calibre/fonts/liberation || die
45 local x
46 for x in * ; do
47 - [[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
48 + [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
49 ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
50 done
51
52
53 diff --git a/app-text/calibre/calibre-4.9.1.ebuild b/app-text/calibre/calibre-4.9.1.ebuild
54 index 3049f662198..1b5faed75d3 100644
55 --- a/app-text/calibre/calibre-4.9.1.ebuild
56 +++ b/app-text/calibre/calibre-4.9.1.ebuild
57 @@ -208,7 +208,7 @@ src_install() {
58 cd "${ED}"/usr/share/calibre/fonts/liberation || die
59 local x
60 for x in * ; do
61 - [[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
62 + [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
63 ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
64 done