diff options
| author |   Theo Chatzimichos <tampakrap@gentoo.org> | 2010-12-29 17:56:34 +0000 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2010-12-29 17:56:34 +0000 |
| commit | d6b2316566d3e1192c16c66d4a1eb54422184bcc (patch) | |
| tree | f1c6c31924f931c09aaedc24550d05401d90b91f /eclass | |
| parent | Stable on amd64 wrt bug #349697 (diff) | |
| download | gentoo-2-d6b2316566d3e1192c16c66d4a1eb54422184bcc.tar.gz gentoo-2-d6b2316566d3e1192c16c66d4a1eb54422184bcc.tar.bz2 gentoo-2-d6b2316566d3e1192c16c66d4a1eb54422184bcc.zip | |
Previous commit broke kdepim installations for =! 4.6beta3, fixing
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 7 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 3ed61cf4700e..2b553af4f92a 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.40 2010/12/29 17:06:51 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.41 2010/12/29 17:56:34 tampakrap Exp $ inherit versionator @@ -378,11 +378,8 @@ add_kdebase_dep() { local FIXME_PV 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 ]]; then FIXME_PV=4.4.5 - 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 + elif [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then FIXME_PV=4.5.90 else FIXME_PV=${PV} diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 444cecfdedc2..97593ec693ec 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.46 2010/12/29 17:06:51 tampakrap Exp $ +# $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: @@ -223,6 +223,8 @@ kde4-meta_src_extract() { kdepim) if [[ ${PV} == 4.5.93 ]] ; then tarball="kdepim-4.6beta3.tar.${postfix}" + else + tarball="${KMNAME}-${PV}.tar.${postfix}" fi ;; *) |