Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kimageformats/
Date: Mon, 24 Feb 2014 13:15:55
Message-Id: 1393247728.77beb1d98459c1bd230fc751771b26f90ea465c8.kensington@gentoo
1 commit: 77beb1d98459c1bd230fc751771b26f90ea465c8
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 24 13:13:16 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 24 13:15:28 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=77beb1d9
7
8 [kde-frameworks/kimageformats] Only apply rename workaround when the relevant USE flag is enabled.
9
10 Package-Manager: portage-2.2.7
11
12 ---
13 kde-frameworks/kimageformats/kimageformats-9999.ebuild | 4 +++-
14 1 file changed, 3 insertions(+), 1 deletion(-)
15
16 diff --git a/kde-frameworks/kimageformats/kimageformats-9999.ebuild b/kde-frameworks/kimageformats/kimageformats-9999.ebuild
17 index e60dd7d..5195f63 100644
18 --- a/kde-frameworks/kimageformats/kimageformats-9999.ebuild
19 +++ b/kde-frameworks/kimageformats/kimageformats-9999.ebuild
20 @@ -41,5 +41,7 @@ src_install() {
21
22 # collides with kde-base/kimgio
23 # part of shared-mime-info upstream at 7612a110f9a42db4730a8c6d1fff6d78c899d53d
24 - mv "${D}"/usr/share/mime/packages/{,kimageformats}webp.xml || die "rename failed"
25 + if use webp ; then
26 + "${D}"/usr/share/mime/packages/{,kimageformats}webp.xml || die "rename failed"
27 + fi
28 }