Gentoo Archives: gentoo-commits

From: Tomas Chvatal <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Sun, 01 May 2011 13:46:39
Message-Id: 927a0dd0fd3ce9f9a53d646e0def681d7ea99b45.scarabeus@gentoo
1 commit: 927a0dd0fd3ce9f9a53d646e0def681d7ea99b45
2 Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 1 13:45:34 2011 +0000
4 Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
5 CommitDate: Sun May 1 13:45:34 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=927a0dd0
7
8 [functions.eclass] kdeprefix is nogo for kdepim in 4.4 slot
9
10 ---
11 eclass/kde4-functions.eclass | 4 +++-
12 1 files changed, 3 insertions(+), 1 deletions(-)
13
14 diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
15 index c0f26ee..df3e50a 100644
16 --- a/eclass/kde4-functions.eclass
17 +++ b/eclass/kde4-functions.eclass
18 @@ -428,7 +428,9 @@ add_kdebase_dep() {
19
20 if [[ ${KDEBASE} = kde-base ]]; then
21 echo " !kdeprefix? ( >=kde-base/${1}-${ver}[aqua=,-kdeprefix${use}] )"
22 - echo " kdeprefix? ( >=kde-base/${1}-${ver}:${SLOT}[aqua=,kdeprefix${use}] )"
23 + # kdeprefix is no-go for kdepim 4.4
24 + [[ ( ${KMNAME} == kdepim || ${PN} == kdepim-runtime ) && ${SLOT} == 4.4 ]] || \
25 + echo " kdeprefix? ( >=kde-base/${1}-${ver}:${SLOT}[aqua=,kdeprefix${use}] )"
26 elif [[ ${ver} == live ]]; then
27 echo " kde-base/${1}:live[aqua=${use}]"
28 else