Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdelibs/
Date: Sat, 06 May 2017 22:20:43
Message-Id: 1494109189.9647d3e3d81f872a3126f7d18a6db4a2055823d2.soap@gentoo
1 commit: 9647d3e3d81f872a3126f7d18a6db4a2055823d2
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 6 15:02:35 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat May 6 22:19:49 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9647d3e3
7
8 kde-frameworks/kdelibs: Remove PREFIX setting for CMake
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11 Closes: https://github.com/gentoo/gentoo/pull/4555
12
13 kde-frameworks/kdelibs/kdelibs-4.14.29-r1.ebuild | 2 +-
14 kde-frameworks/kdelibs/kdelibs-4.14.31.ebuild | 2 +-
15 2 files changed, 2 insertions(+), 2 deletions(-)
16
17 diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.29-r1.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.29-r1.ebuild
18 index e25e078eea2..a1228fb327b 100644
19 --- a/kde-frameworks/kdelibs/kdelibs-4.14.29-r1.ebuild
20 +++ b/kde-frameworks/kdelibs/kdelibs-4.14.29-r1.ebuild
21 @@ -289,7 +289,7 @@ pkg_postinst() {
22
23 pkg_prerm() {
24 # Remove ksycoca4 global database
25 - rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
26 + rm -f "${EROOT%/}"/usr/share/kde4/services/ksycoca4 || die
27 }
28
29 pkg_postrm() {
30
31 diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.31.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.31.ebuild
32 index 6913396c7ca..e45fbaec53a 100644
33 --- a/kde-frameworks/kdelibs/kdelibs-4.14.31.ebuild
34 +++ b/kde-frameworks/kdelibs/kdelibs-4.14.31.ebuild
35 @@ -282,7 +282,7 @@ pkg_postinst() {
36
37 pkg_prerm() {
38 # Remove ksycoca4 global database
39 - rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
40 + rm -f "${EROOT%/}"/usr/share/kde4/services/ksycoca4 || die
41 }
42
43 pkg_postrm() {