Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/eric/
Date: Mon, 25 Apr 2016 18:13:36
Message-Id: 1461607988.4409d011eccd3e40265bf9baed10fc41100d6b34.pesa@gentoo
1 commit: 4409d011eccd3e40265bf9baed10fc41100d6b34
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 25 18:13:08 2016 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 25 18:13:08 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4409d011
7
8 dev-util/eric: fix file collision
9
10 Gentoo-Bug: 542488
11
12 Package-Manager: portage-2.2.28
13
14 dev-util/eric/eric-5.5.2.ebuild | 6 ++++--
15 1 file changed, 4 insertions(+), 2 deletions(-)
16
17 diff --git a/dev-util/eric/eric-5.5.2.ebuild b/dev-util/eric/eric-5.5.2.ebuild
18 index 3769513..0a8c818 100644
19 --- a/dev-util/eric/eric-5.5.2.ebuild
20 +++ b/dev-util/eric/eric-5.5.2.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2015 Gentoo Foundation
23 +# Copyright 1999-2016 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 # $Id$
26
27 @@ -44,10 +44,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
28 S=${WORKDIR}/${MY_P}
29
30 src_prepare() {
31 - # Avoid file collisions between different slots of Eric
32 + # Avoid file collisions between different slots of eric
33 sed -i -e 's/^Icon=eric$/&5/' eric/eric5.desktop || die
34 sed -i -e 's/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/' \
35 $(grep -lr 'eric\.png' .) || die
36 + sed -i -e 's/eric"/eric5"/' \
37 + $(grep -lr 'eric".*\.png' .) || die
38 mv eric/icons/default/eric{,5}.png || die
39 mv eric/pixmaps/eric{,5}.png || die
40 rm -f eric/APIs/Python/zope-*.api