diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-21 09:45:21 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-03-21 09:45:21 +0100 |
| commit | c4e4184cb8aba8d0874da0a4515c64cbf53e2d84 (patch) | |
| tree | def240bc87ab0b6dc034f7fbfc2ebf2c223e4417 /eclass/kde4-meta.eclass | |
| parent | 2e9574d19ba571d8a715516ae26fde34ad65fbe4 (diff) | |
| download | kde-c4e4184cb8aba8d0874da0a4515c64cbf53e2d84.tar.gz kde-c4e4184cb8aba8d0874da0a4515c64cbf53e2d84.tar.bz2 kde-c4e4184cb8aba8d0874da0a4515c64cbf53e2d84.zip | |
kde4-meta.eclass cleanup a logic for kdebase-apps a bit.
Diffstat (limited to 'eclass/kde4-meta.eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 59 |
1 files changed, 24 insertions, 35 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 90e0d8bfc95..a85b326650b 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -193,13 +193,14 @@ kde4-meta_src_extract() { debug-print-function ${FUNCNAME} "$@" if [[ ${BUILD_TYPE} = live ]]; then - local rsync_options subdir kmnamedir targetdir wc_path escm # Export working copy to ${S} einfo "Exporting parts of working copy to ${S}" kde4-meta_create_extractlists case "${KDE_SCM}" in svn) + local rsync_options subdir kmnamedir targetdir wc_path escm + rsync_options="--group --links --owner --perms --quiet --exclude=.svn/ --exclude=.git/" wc_path="${ESVN_WC_PATH}" escm="{ESVN}" @@ -235,15 +236,10 @@ kde4-meta_src_extract() { kdebase-apps) # kdebase/apps -> kdebase-apps tarball="kdebase-${PV}.tar.${postfix}" - case ${PV} in - 4.6.1) - ;; - *) - # Go one level deeper for kdebase-apps in tarballs - moduleprefix=apps/ - KMTARPARAMS+=" --transform=s|apps/||" - ;; - esac + if ! slot_is_at_least 4.6 ${SLOT} || [[ ${PV} == "4.6.0" ]]; then + moduleprefix=apps/ + KMTARPARAMS+=" --transform=s|apps/||" + fi ;; *) # Create tarball name from module name (this is the default) @@ -335,18 +331,15 @@ kde4-meta_create_extractlists() { # In those cases you should care to add the relevant files to KMEXTRACTONLY case ${KMNAME} in kdebase) - case ${PV} in - 4.6.1) - KMEXTRACTONLY+=" - config-apps.h.cmake - ConfigureChecks.cmake" - ;; - *) - KMEXTRACTONLY+=" - apps/config-apps.h.cmake - apps/ConfigureChecks.cmake" - ;; - esac + if ! slot_is_at_least 4.6 ${SLOT} || [[ ${PV} == "4.6.0" ]]; then + KMEXTRACTONLY+=" + apps/config-apps.h.cmake + apps/ConfigureChecks.cmake" + else + KMEXTRACTONLY+=" + config-apps.h.cmake + ConfigureChecks.cmake" + fi ;; kdebase-apps) KMEXTRACTONLY+=" @@ -414,19 +407,15 @@ kde4-meta_create_extractlists() { ;; esac # Don't install cmake modules for split ebuilds, to avoid collisions. - case ${KMNAME} in - kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics) - case ${PN} in - libkdegames|libkdeedu|libkworkspace) - KMEXTRA+=" - cmake/modules/" - ;; - *) - KMCOMPILEONLY+=" - cmake/modules/" - ;; - esac - ;; + case ${PN} in + libkdegames|libkdeedu|libkworkspace) + KMEXTRA+=" + cmake/modules/" + ;; + *) + KMCOMPILEONLY+=" + cmake/modules/" + ;; esac debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME}: KMEXTRACTONLY ${KMEXTRACTONLY}" |