diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-09-11 04:25:23 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-09-11 04:25:23 +0000 |
| commit | 4de058592d4b141f2e805f2157162d511fe7afcd (patch) | |
| tree | ed24f18eb607b740c7cfe4e17efb5090d2743686 /eclass/kde4-functions.eclass | |
| parent | Do not include src_test(); test files are not included in the alpha release (diff) | |
| download | gentoo-2-4de058592d4b141f2e805f2157162d511fe7afcd.tar.gz gentoo-2-4de058592d4b141f2e805f2157162d511fe7afcd.tar.bz2 gentoo-2-4de058592d4b141f2e805f2157162d511fe7afcd.zip | |
Remove repacked unstable snapshots handling codepaths, add kdepim-4.4.6 dependency rule
Diffstat (limited to 'eclass/kde4-functions.eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 436c973627df..ef5eed69ee94 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: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.34 2010/09/09 17:02:30 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.35 2010/09/11 04:25:23 reavertm Exp $ inherit versionator @@ -518,8 +518,15 @@ add_kdebase_dep() { local use=${2:+,${2}} if [[ ${KDEBASE} = kde-base ]]; then - echo " !kdeprefix? ( >=kde-base/${1}-${PV}[aqua=,-kdeprefix${use}] )" - echo " kdeprefix? ( >=kde-base/${1}-${PV}:${SLOT}[aqua=,kdeprefix${use}] )" + # FIXME remove hack when kdepim-4.4.6 is gone + local FIXME_PV + if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then + FIXME_PV=4.4.5 + else + FIXME_PV=${PV} + fi + echo " !kdeprefix? ( >=kde-base/${1}-${FIXME_PV}[aqua=,-kdeprefix${use}] )" + echo " kdeprefix? ( >=kde-base/${1}-${FIXME_PV}:${SLOT}[aqua=,kdeprefix${use}] )" else if [[ ${KDE_MINIMAL} = live ]]; then echo " kde-base/${1}:${KDE_MINIMAL}[aqua=${use}]" |