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-apps/kio-extras/
Date: Tue, 01 Sep 2015 16:22:55
Message-Id: 1441124539.f4b3b8101de8d9921fcba92ddb1b744a16613517.kensington@gentoo
1 commit: f4b3b8101de8d9921fcba92ddb1b744a16613517
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 1 16:22:19 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 1 16:22:19 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4b3b810
7
8 kde-apps/kio-extras: tighten blocker.
9
10 The colliding files are unconditionally removed in later versions.
11
12 Package-Manager: portage-2.2.20.1
13
14 kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild | 2 +-
15 kde-apps/kio-extras/kio-extras-9999.ebuild | 2 +-
16 2 files changed, 2 insertions(+), 2 deletions(-)
17
18 diff --git a/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild b/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild
19 index a4b6878..db67d5d 100644
20 --- a/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild
21 +++ b/kde-apps/kio-extras/kio-extras-15.08.49.9999.ebuild
22 @@ -50,7 +50,7 @@ COMMON_DEPEND="
23 "
24 RDEPEND="${COMMON_DEPEND}
25 $(add_frameworks_dep kded)
26 - !kde-apps/kcontrol:4
27 + !<kde-apps/kcontrol-15.08.0-r1:4
28 !kde-base/kio-extras
29 !kde-plasma/kio-extras
30 "
31
32 diff --git a/kde-apps/kio-extras/kio-extras-9999.ebuild b/kde-apps/kio-extras/kio-extras-9999.ebuild
33 index a4b6878..db67d5d 100644
34 --- a/kde-apps/kio-extras/kio-extras-9999.ebuild
35 +++ b/kde-apps/kio-extras/kio-extras-9999.ebuild
36 @@ -50,7 +50,7 @@ COMMON_DEPEND="
37 "
38 RDEPEND="${COMMON_DEPEND}
39 $(add_frameworks_dep kded)
40 - !kde-apps/kcontrol:4
41 + !<kde-apps/kcontrol-15.08.0-r1:4
42 !kde-base/kio-extras
43 !kde-plasma/kio-extras
44 "