Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kgamma/
Date: Wed, 26 Aug 2015 18:40:28
Message-Id: 1440614409.35f01dfde26ec0d361d4adbdc9af0e18ecbf4334.johu@gentoo
1 commit: 35f01dfde26ec0d361d4adbdc9af0e18ecbf4334
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 26 18:40:09 2015 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 26 18:40:09 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=35f01dfd
7
8 kde-plasma/kgamma: Block old kde-apps/kde4-l10n
9
10 Due to file collision.
11
12 Gentoo-Bug: 558806
13 Reported-by: Mario Kicherer <dev <AT> kicherer.org>
14
15 Package-Manager: portage-2.2.20.1
16
17 kde-plasma/kgamma/kgamma-5.4.49.9999.ebuild | 1 +
18 kde-plasma/kgamma/kgamma-9999.ebuild | 1 +
19 2 files changed, 2 insertions(+)
20
21 diff --git a/kde-plasma/kgamma/kgamma-5.4.49.9999.ebuild b/kde-plasma/kgamma/kgamma-5.4.49.9999.ebuild
22 index e16bc0f..2c3f37f 100644
23 --- a/kde-plasma/kgamma/kgamma-5.4.49.9999.ebuild
24 +++ b/kde-plasma/kgamma/kgamma-5.4.49.9999.ebuild
25 @@ -26,5 +26,6 @@ RDEPEND="
26 "
27 DEPEND="${RDEPEND}
28 x11-proto/xf86vidmodeproto
29 + !<kde-apps/kde4-l10n-15.08.0
30 !kde-apps/kgamma:5
31 "
32
33 diff --git a/kde-plasma/kgamma/kgamma-9999.ebuild b/kde-plasma/kgamma/kgamma-9999.ebuild
34 index e16bc0f..2c3f37f 100644
35 --- a/kde-plasma/kgamma/kgamma-9999.ebuild
36 +++ b/kde-plasma/kgamma/kgamma-9999.ebuild
37 @@ -26,5 +26,6 @@ RDEPEND="
38 "
39 DEPEND="${RDEPEND}
40 x11-proto/xf86vidmodeproto
41 + !<kde-apps/kde4-l10n-15.08.0
42 !kde-apps/kgamma:5
43 "