diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2011-06-15 00:11:05 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2011-06-15 00:11:05 +0000 |
| commit | 7047410312df06ffb23a4c876241d8f80d83ad8e (patch) | |
| tree | b0585bfff228ac6926b4bb4f9d5f91bc71d85a02 /eclass/kde4-meta.eclass | |
| parent | Simplify blockers a bit for new version of add_blocker function and SLOT changes (diff) | |
| download | gentoo-2-7047410312df06ffb23a4c876241d8f80d83ad8e.tar.gz gentoo-2-7047410312df06ffb23a4c876241d8f80d83ad8e.tar.bz2 gentoo-2-7047410312df06ffb23a4c876241d8f80d83ad8e.zip | |
Sync eclasses from overlay
Diffstat (limited to 'eclass/kde4-meta.eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 81503a0dc966..15498473f7ec 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.54 2011/06/07 20:11:04 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.55 2011/06/15 00:11:05 abcd Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -180,29 +180,29 @@ kde4-meta_src_extract() { case ${KDE_SCM} in svn) - local rsync_options subdir kmnamedir targetdir wc_path escm + local rsync_options subdir targetdir wc_path escm rsync_options="--group --links --owner --perms --quiet --exclude=.svn/ --exclude=.git/" wc_path="${ESVN_WC_PATH}" escm="{ESVN}" # Copy ${KMNAME} non-recursively (toplevel files) - rsync ${rsync_options} "${wc_path}"/${kmnamedir}* "${S}" \ + rsync ${rsync_options} "${wc_path}"/* "${S}" \ || die "${escm}: can't export toplevel files to '${S}'." # Copy cmake directory - if [[ -d "${wc_path}/${kmnamedir}cmake" ]]; then - rsync --recursive ${rsync_options} "${wc_path}/${kmnamedir}cmake" "${S}" \ + if [[ -d "${wc_path}/cmake" ]]; then + rsync --recursive ${rsync_options} "${wc_path}/cmake" "${S}" \ || die "${escm}: can't export cmake files to '${S}'." fi # Copy all subdirectories for subdir in $(__list_needed_subdirectories); do targetdir="" - if [[ $subdir = doc/* && ! -e "$wc_path/$kmnamedir$subdir" ]]; then + if [[ $subdir = doc/* && ! -e "$wc_path/$subdir" ]]; then continue fi [[ ${subdir%/} = */* ]] && targetdir=${subdir%/} && targetdir=${targetdir%/*} && mkdir -p "${S}/${targetdir}" - rsync --recursive ${rsync_options} "${wc_path}/${kmnamedir}${subdir%/}" "${S}/${targetdir}" \ + rsync --recursive ${rsync_options} "${wc_path}/${subdir%/}" "${S}/${targetdir}" \ || die "${escm}: can't export subdirectory '${subdir}' to '${S}/${targetdir}'." done ;; @@ -305,7 +305,7 @@ kde4-meta_create_extractlists() { # Note that this actually doesn't include KMEXTRA handling. # In those cases you should care to add the relevant files to KMEXTRACTONLY case ${KMNAME} in - kdebase | kdebase-apps | kde-base-apps) + kdebase | kdebase-apps | kde-baseapps) KMEXTRACTONLY+=" config-apps.h.cmake ConfigureChecks.cmake" |