diff options
| author | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-03-09 09:03:17 +0100 |
|---|---|---|
| committer | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-03-09 09:03:17 +0100 |
| commit | 7cf71aa012280bd21e2068e30930f71253bd0e2a (patch) | |
| tree | d054ea643cb84e3edcba445cac09101121a625bf | |
| parent | 464c56c66d83782bd234825b86166940a229610d (diff) | |
| download | kde-7cf71aa012280bd21e2068e30930f71253bd0e2a.tar.gz kde-7cf71aa012280bd21e2068e30930f71253bd0e2a.tar.bz2 kde-7cf71aa012280bd21e2068e30930f71253bd0e2a.zip | |
Removed unnecessary apps* check (it's covered already), cleaned up code a bit
| -rw-r--r-- | eclass/kde4-meta.eclass | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 26f6d49274d..18f47d8e5e0 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -268,36 +268,38 @@ kde4-meta_src_extract() { case ${PV} in 4.2.9* | 4.2.8* | 4.2.7* | 4.2.6*) KMTARPARAMS="${KMTARPARAMS} --lzma" # lzma - postfix="lzma" ;; + postfix="lzma" + ;; *) KMTARPARAMS="${KMTARPARAMS} --bzip2" # bz2 - postfix="bz2" ;; + postfix="bz2" + ;; esac case ${KMNAME} in kdebase-apps) - tarball="kdebase-${PV}.tar.${postfix}" ;; + # kdebase/apps -> kdebasa-apps + tarball="kdebase-${PV}.tar.${postfix}" + # Go one level deeper for kdebase-apps in tarballs + moduleprefix=apps/ + KMTARPARAMS="${KMTARPARAMS} --transform=s|apps/||" + ;; *) - tarball="${KMNAME}-${PV}.tar.${postfix}" ;; + # Create tarball name from module name (this is the default) + tarball="${KMNAME}-${PV}.tar.${postfix}" + ;; esac + + # Full patch to source tarball tarfile="${DISTDIR}/${tarball}" - # Detect real toplevel dir - it will be used in __list_needed_subdirectories + # Detect real toplevel dir from tarball name - it will be used upon extraction + # and in __list_needed_subdirectories topdir="${tarball%.tar.*}/" ebegin "Unpacking parts of ${tarball} to ${WORKDIR}" kde4-meta_create_extractlists - # Go one level deeper for kdebase-apps in tarballs (releases) - if [[ ${KMNAME} = kdebase-apps ]]; then - moduleprefix=apps/ - KMTARPARAMS="${KMTARPARAMS} --transform=s|apps/||" - fi - - if [[ ${KMMODULE} = apps* ]]; then # preserve old behavior - topdir="${KMNAME}-${PV}/" - fi - for f in cmake/ CMakeLists.txt ConfigureChecks.cmake config.h.cmake \ AUTHORS COPYING INSTALL README NEWS ChangeLog do |