diff options
| -rw-r--r-- | eclass/kde4-base.eclass | 6 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 8 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 0d9a1f7ca93c..237e3fbe01e9 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.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-base.eclass,v 1.80 2010/12/29 16:45:19 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.81 2010/12/29 17:06:51 tampakrap Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -533,6 +533,10 @@ 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" diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 29ae9fa8874f..3ed61cf4700e 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.39 2010/12/29 16:45:19 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.40 2010/12/29 17:06:51 tampakrap Exp $ inherit versionator @@ -381,6 +381,12 @@ add_kdebase_dep() { else FIXME_PV=${PV} fi + # FIXME remove hack when kdepim-4.6beta is gone + if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then + FIXME_PV=4.5.90 + else + FIXME_PV=${PV} + fi # if building stable-live version depend just on slot # to allow merging packages against more stable basic stuff diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 676f13c8713b..444cecfdedc2 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: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.45 2010/12/29 16:38:50 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.46 2010/12/29 17:06:51 tampakrap Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -220,6 +220,11 @@ kde4-meta_src_extract() { moduleprefix=apps/ KMTARPARAMS+=" --transform=s|apps/||" ;; + kdepim) + if [[ ${PV} == 4.5.93 ]] ; then + tarball="kdepim-4.6beta3.tar.${postfix}" + fi + ;; *) # Create tarball name from module name (this is the default) tarball="${KMNAME}-${PV}.tar.${postfix}" |