Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/
Date: Sat, 30 Jul 2011 12:49:29
Message-Id: c519b04f5892c8ffd8803ae689efd22d76bf679b.dilfridge@gentoo
1 commit: c519b04f5892c8ffd8803ae689efd22d76bf679b
2 Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 30 12:49:20 2011 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 30 12:49:20 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c519b04f
7
8 [kde-base/systemsettings] Add blocker to prevent file collisions, bug 376829
9
10 (Portage version: 2.1.10.9/git/Linux x86_64, signed Manifest commit with key 7887F787)
11
12 ---
13 .../systemsettings-4.7.49.9999.ebuild | 1 +
14 kde-base/systemsettings/systemsettings-9999.ebuild | 1 +
15 2 files changed, 2 insertions(+), 0 deletions(-)
16
17 diff --git a/kde-base/systemsettings/systemsettings-4.7.49.9999.ebuild b/kde-base/systemsettings/systemsettings-4.7.49.9999.ebuild
18 index 327e6f8..60abe9b 100644
19 --- a/kde-base/systemsettings/systemsettings-4.7.49.9999.ebuild
20 +++ b/kde-base/systemsettings/systemsettings-4.7.49.9999.ebuild
21 @@ -54,6 +54,7 @@ KMEXTRACTONLY="
22
23 add_blocker kcontrol '<4.3.98'
24 add_blocker konqueror '<4.4.70'
25 +add_blocker kdeaccessibility-colorschemes '<4.6.50'
26
27 PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
28
29
30 diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-9999.ebuild
31 index 327e6f8..60abe9b 100644
32 --- a/kde-base/systemsettings/systemsettings-9999.ebuild
33 +++ b/kde-base/systemsettings/systemsettings-9999.ebuild
34 @@ -54,6 +54,7 @@ KMEXTRACTONLY="
35
36 add_blocker kcontrol '<4.3.98'
37 add_blocker konqueror '<4.4.70'
38 +add_blocker kdeaccessibility-colorschemes '<4.6.50'
39
40 PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )