diff options
| author | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2011-01-07 00:53:50 -0100 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2011-01-07 00:53:50 -0100 |
| commit | ebab4cc41a39392a7a650d9126ee99706b7b8dd7 (patch) | |
| tree | a8023e1fe049faa603a8a26b3fcb6565b38d2fb0 /eclass/kde4-functions.eclass | |
| parent | 00a71c283962bc3094561df4a3e9db38631b1df0 (diff) | |
| parent | 11ad60dbb8676cfce8e1145b4be31053eb940f8a (diff) | |
| download | kde-ebab4cc41a39392a7a650d9126ee99706b7b8dd7.tar.gz kde-ebab4cc41a39392a7a650d9126ee99706b7b8dd7.tar.bz2 kde-ebab4cc41a39392a7a650d9126ee99706b7b8dd7.zip | |
Merge branch 'kde-git' of git+ssh://git.overlays.gentoo.org/proj/kde into kde-git
Diffstat (limited to 'eclass/kde4-functions.eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 511e1518b9e..5b15575fc5f 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.41 2010/12/29 17:56:34 tampakrap Exp $ inherit versionator @@ -361,10 +361,13 @@ add_kdebase_dep() { local use=${2:+,${2}} if [[ ${KDEBASE} = kde-base ]]; then - # FIXME remove hack when kdepim-4.4.{6,7} is gone + # FIXME remove hack when >kdepim-4.4.5 is gone local FIXME_PV - if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7* || ${PV} = 4.4.8* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then + if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7* || ${PV} = 4.4.8* || ${PV} = 4.4.9* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs || ${1} = oxygen-icons ]]; then FIXME_PV=4.4.5 + # FIXME remove hack when kdepim-4.6beta is gone + elif [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs || ${1} = oxygen-icons ]]; then + FIXME_PV=4.5.90 else FIXME_PV=${PV} fi |