diff options
| author | abcd <abcd@gentoo.org> | 2010-01-07 20:35:29 -0500 |
|---|---|---|
| committer | abcd <abcd@gentoo.org> | 2010-01-07 20:35:29 -0500 |
| commit | 1b9c0c1bdb0c9ba7e9fa6e20afcf7c3d5e2ec86a (patch) | |
| tree | bdd49f995cadf67a947d3049f7330a7fff6d9ce8 | |
| parent | ca50f37b182f3dd6d960cea4d664a309666cf0d5 (diff) | |
| download | kde-1b9c0c1bdb0c9ba7e9fa6e20afcf7c3d5e2ec86a.tar.gz kde-1b9c0c1bdb0c9ba7e9fa6e20afcf7c3d5e2ec86a.tar.bz2 kde-1b9c0c1bdb0c9ba7e9fa6e20afcf7c3d5e2ec86a.zip | |
[eclass] Add support for KDE 4.5, drop last bits of 4.2
| -rw-r--r-- | eclass/kde4-base.eclass | 6 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 2 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 31 |
3 files changed, 10 insertions, 29 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 52ed502437b..c5a2e9e11e7 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -121,9 +121,9 @@ case ${KDEBASE} in # Determine SLOT from PVs case ${PV} in *.9999*) SLOT="${PV/.9999*/}" ;; # stable live + 4.5* | 4.4.[6-9]*) SLOT="4.5" ;; 4.4* | 4.3.[6-9]*) SLOT="4.4" ;; 4.3*) SLOT="4.3" ;; - 4.2*) SLOT="4.2" ;; 9999*) SLOT="live" ;; # regular live *) die "Unsupported ${PV}" ;; esac @@ -386,10 +386,10 @@ case ${BUILD_TYPE} in case ${KDEBASE} in kde-base) case ${PV} in - 4.3.8[05] | 4.3.9[0568]) + 4.[34].8[05] | 4.[34].9[0568]) # block for normally packed unstable releases SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; - 4.3.[6-9]*) + 4.[34].[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}/${_kmname_pv}.tar.xz" DEPEND+=" app-arch/xz-utils" diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 300c5c0d903..ca48c2f0b3c 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -41,7 +41,7 @@ fi # @DESCRIPTION: # The slots used by all KDE versions later than 4.0. The live KDE releases use # KDE_LIVE_SLOTS instead. Values should be ordered. -KDE_SLOTS=( "4.1" "4.2" "4.3" "4.4" ) +KDE_SLOTS=( "4.1" "4.2" "4.3" "4.4" "4.5" ) # @ECLASS-VARIABLE: KDE_LIVE_SLOTS # @DESCRIPTION: diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 108a7c88bf3..14268737f14 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -204,12 +204,12 @@ kde4-meta_src_extract() { else local abort tarball tarfile f extractlist moduleprefix postfix case ${PV} in - 4.3.8[05] | 4.3.9[0568]) + 4.[34].8[05] | 4.[34].9[0568]) # block for normally packed upstream unstable snapshots KMTARPARAMS+=" --bzip2" # bz2 postfix="bz2" ;; - 4.3.[6-9]*) + 4.[34].[6-9]*) # Not passing --xz, as it doesn't work with stable tar KMTARPARAMS+=" --use-compress-program=xz" # xz postfix="xz" @@ -334,14 +334,9 @@ kde4-meta_create_extractlists() { KMEXTRACTONLY+=" libkdepim/" fi - case ${SLOT} in - 4.3|4.4|live) - KMEXTRACTONLY+=" - kdepim-version.h - config-enterprise.h.cmake" - ;; - esac KMEXTRACTONLY+=" + kdepim-version.h + config-enterprise.h.cmake kleopatra/ConfigureChecks.cmake" if has kontact ${IUSE//+} && use kontact; then KMEXTRA+=" @@ -353,12 +348,8 @@ kde4-meta_create_extractlists() { fi ;; kdeutils) - case ${SLOT} in - 4.3|4.4|live) - KMEXTRACTONLY+=" - kdeutils-version.h" - ;; - esac + KMEXTRACTONLY+=" + kdeutils-version.h" ;; koffice) KMEXTRACTONLY+=" @@ -378,16 +369,6 @@ kde4-meta_create_extractlists() { esac # Don't install cmake modules for split ebuilds, to avoid collisions. case ${KMNAME} in - kdepim) - # No need for unpack since 4.2.86 - # Remove when 4.2 is wiped out from the tree - case ${PV} in - 4.2.[0-4]) - KMCOMPILEONLY+=" - cmake/modules/" - ;; - esac - ;; kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics) case ${PN} in libkdegames|libkdeedu|libkworkspace) |