diff options
| -rw-r--r-- | eclass/kde4-base.eclass | 17 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 13 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 11 |
3 files changed, 21 insertions, 20 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index ff185eef22e4..17a5d5c7bf30 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.69 2010/09/09 17:02:30 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.70 2010/09/11 04:25:23 reavertm Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -479,15 +479,14 @@ case ${BUILD_TYPE} in case ${KDEBASE} in kde-base) case ${PV} in - 4.[45].8[05] | 4.[45].9[02568]) - # Normally packed unstable releases - SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; - 4.[45].[6-9]*) - # Repacked tarballs: need to depend on xz-utils to ensure that they can be unpacked - SRC_URI="http://dev.gentooexperimental.org/~alexxy/kde/${PV}/src/${_kmname_pv}.tar.xz" - DEPEND+=" app-arch/xz-utils" + 4.[456].8[05] | 4.[456].9[023568]) + # Unstable KDE SC releases + SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" + ;; + *) + # Stable KDE SC releases + SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;; - *) SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;; esac ;; koffice) 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}]" diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 140dbb201531..05465251c1ef 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.39 2010/08/09 15:59:04 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.40 2010/09/11 04:25:23 reavertm Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -203,16 +203,11 @@ kde4-meta_src_extract() { else local abort tarball tarfile f extractlist moduleprefix postfix case ${PV} in - 4.[45].8[05] | 4.[45].9[02568]) - # block for normally packed upstream unstable snapshots + 4.[45].8[05] | 4.[45].9[023568]) + # Block for normally packed upstream unstable snapshots KMTARPARAMS+=" --bzip2" # bz2 postfix="bz2" ;; - 4.[45].[6-9]*) - # Not passing --xz, as it doesn't work with stable tar - KMTARPARAMS+=" --use-compress-program=xz" # xz - postfix="xz" - ;; *) KMTARPARAMS+=" --bzip2" # bz2 postfix="bz2" |