diff options
| author | Maciej Mrozowski <reavertm@gentoo.org> | 2010-09-11 06:38:31 +0200 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-09-11 06:38:31 +0200 |
| commit | ce0c882f9cc274c75dbfe8e59696be481665d1de (patch) | |
| tree | 8247d33736e8b110422e814ae9daf5428baa672b | |
| parent | 766e7785be5af74a06617d5cffe3bdc505d380c7 (diff) | |
| download | kde-ce0c882f9cc274c75dbfe8e59696be481665d1de.tar.gz kde-ce0c882f9cc274c75dbfe8e59696be481665d1de.tar.bz2 kde-ce0c882f9cc274c75dbfe8e59696be481665d1de.zip | |
[eclass/kde4-*] Add kdepim-4.4.6 rules, remove repacked unstable snaphots handling code
| -rw-r--r-- | eclass/kde4-base.eclass | 23 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 11 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 7 |
3 files changed, 19 insertions, 22 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index e5e44e3e2ed..b253b6d1dd0 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -480,22 +480,17 @@ case ${BUILD_TYPE} in kde-base) case ${PV} in 4.[456].8[05] | 4.[456].9[023568]) - case ${_kmname} in - kdepim | kdepim-runtime) - # Betta kdepim versions - SRC_URI="mirror://kde/unstable/kdepim/${PV}/src/src/${_kmname_pv}.tar.bz2" - ;; - *) - # Normally packed unstable releases - SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; - esac + # Unstable KDE SC releases + SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; - 4.[56].[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.4.6) + # Only kdepim here + SRC_URI="mirror://kde/stable/kdepim-${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 8458a8d955b..60260ee96d8 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -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 8e06a8bc159..9cd7fb36f10 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -204,15 +204,10 @@ kde4-meta_src_extract() { local abort tarball tarfile f extractlist moduleprefix postfix case ${PV} in 4.[45].8[05] | 4.[45].9[023568]) - # block for normally packed upstream unstable snapshots + # 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" |