diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 10 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 9 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 9 |
3 files changed, 23 insertions, 5 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 1f2c78135ff..e5fa9a71eaa 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -387,6 +387,10 @@ kdedepend=" kderdepend="" +if [[ ${PN} != oxygen-icons ]]; then + kderdepend+=" $(add_kdebase_dep oxygen-icons)" +fi + kdehandbookdepend=" app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets @@ -543,11 +547,15 @@ case ${BUILD_TYPE} in case ${KDEBASE} in kde-base) case ${PV} in + 4.5.93) + # Only kdepim and kdepim-runtime 4.6beta here + SRC_URI="mirror://kde/unstable/kdepim/${PV}/${_kmname}-4.6beta3.tar.bz2" + ;; 4.[456].8[05] | 4.[456].9[023568]) # Unstable KDE SC releases SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; - 4.4.6 | 4.4.7 | 4.4.8) + 4.4.6 | 4.4.7 | 4.4.8 | 4.4.9) # Only kdepim here SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2" ;; 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 diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index de920f8fc3d..425ad8519fc 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.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-meta.eclass,v 1.47 2010/12/29 17:56:34 tampakrap Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -227,6 +227,13 @@ kde4-meta_src_extract() { moduleprefix=apps/ KMTARPARAMS+=" --transform=s|apps/||" ;; + kdepim) + if [[ ${PV} == 4.5.93 ]] ; then + tarball="kdepim-4.6beta3.tar.${postfix}" + else + tarball="${KMNAME}-${PV}.tar.${postfix}" + fi + ;; *) # Create tarball name from module name (this is the default) tarball="${KMNAME}-${PV}.tar.${postfix}" |