From 78ce695673a97a18442e7d89295018c93c45ac2e Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Wed, 6 Apr 2011 16:24:20 +0200 Subject: [eclasses] sync back from main tree. --- eclass/kde4-functions.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'eclass/kde4-functions.eclass') diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 1765a2a1cd2..f2297750f14 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# 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.41 2010/12/29 17:56:34 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.45 2011/04/06 14:22:14 scarabeus Exp $ inherit versionator @@ -401,7 +401,7 @@ add_kdebase_dep() { elif [[ ${KDEBASE} != kde-base ]]; then ver=${KDE_MINIMAL} # FIXME remove hack when kdepim-4.4.* is gone - elif [[ ( ${KMNAME} == kdepim || ${PN} == kdepim-runtime ) && ${PV} == 4.4.[6-8] && ${1} =~ ^kde(pim)?libs$ ]]; then + elif [[ ( ${KMNAME} == kdepim || ${PN} == kdepim-runtime ) && ${SLOT} == 4.4 && ${1} =~ ^(kde(pim)?libs|oxygen-icons)$ ]]; then ver=4.4.5 # FIXME remove hack when kdepim-4.6beta is gone elif [[ ( ${KMNAME} == kdepim || ${PN} == kdepim-runtime ) && ${PV} == 4.5.98 && ${1} =~ ^(kde(pim)?libs|oxygen-icons)$ ]]; then -- cgit v1.2.3