summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2016-04-25 20:13:08 +0200
committerDavide Pesavento <pesa@gentoo.org>2016-04-25 20:13:08 +0200
commit4409d011eccd3e40265bf9baed10fc41100d6b34 (patch)
tree98edfbf5f1f74402f2033f17628a8e9dfaf8e3f4 /dev-util
parentmedia-video/smplayer: revision bump with several changes (diff)
downloadgentoo-4409d011eccd3e40265bf9baed10fc41100d6b34.tar.gz
gentoo-4409d011eccd3e40265bf9baed10fc41100d6b34.tar.bz2
gentoo-4409d011eccd3e40265bf9baed10fc41100d6b34.zip
dev-util/eric: fix file collision
Gentoo-Bug: 542488 Package-Manager: portage-2.2.28
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/eric/eric-5.5.2.ebuild6
1 files changed, 4 insertions, 2 deletions
diff --git a/dev-util/eric/eric-5.5.2.ebuild b/dev-util/eric/eric-5.5.2.ebuild
index 3769513ecbed..0a8c818d40b5 100644
--- a/dev-util/eric/eric-5.5.2.ebuild
+++ b/dev-util/eric/eric-5.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -44,10 +44,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
S=${WORKDIR}/${MY_P}
src_prepare() {
- # Avoid file collisions between different slots of Eric
+ # Avoid file collisions between different slots of eric
sed -i -e 's/^Icon=eric$/&5/' eric/eric5.desktop || die
sed -i -e 's/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/' \
$(grep -lr 'eric\.png' .) || die
+ sed -i -e 's/eric"/eric5"/' \
+ $(grep -lr 'eric".*\.png' .) || die
mv eric/icons/default/eric{,5}.png || die
mv eric/pixmaps/eric{,5}.png || die
rm -f eric/APIs/Python/zope-*.api