[gentoo-commits] gentoo-x86 commit in eclass: kde4-functions.eclass

[Tomas Chvatal (scarabeus)]

scarabeus    11/04/26 16:19:44

  Modified:             kde4-functions.eclass
  Log:
  Ban kdeprefix on kdepim stuff as it is broken totaly even in depgraph calculations.

Revision  Changes    Path
1.47                 eclass/kde4-functions.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.46&r2=1.47

Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kde4-functions.eclass	21 Apr 2011 22:32:33 -0000	1.46
+++ kde4-functions.eclass	26 Apr 2011 16:19:44 -0000	1.47
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.46 2011/04/21 22:32:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.47 2011/04/26 16:19:44 scarabeus Exp $
 
 inherit versionator
 
@@ -428,7 +428,9 @@
 
 	if [[ ${KDEBASE} = kde-base ]]; then
 		echo " !kdeprefix? ( >=kde-base/${1}-${ver}[aqua=,-kdeprefix${use}] )"
-		echo " kdeprefix? ( >=kde-base/${1}-${ver}:${SLOT}[aqua=,kdeprefix${use}] )"
+		# kdeprefix is no-go for kdepim 4.4
+		[[ ( ${KMNAME} == kdepim || ${PN} == kdepim-runtime ) && ${SLOT} == 4.4 ]] || \
+			echo " kdeprefix? ( >=kde-base/${1}-${ver}:${SLOT}[aqua=,kdeprefix${use}] )"
 	elif [[ ${ver} == live ]]; then
 		echo " kde-base/${1}:live[aqua=${use}]"
 	else