summaryrefslogtreecommitdiff
path: root/eclass/kde4-meta.eclass
diff options
context:
space:
mode:
Diffstat (limited to 'eclass/kde4-meta.eclass')
-rw-r--r--eclass/kde4-meta.eclass17
1 files changed, 10 insertions, 7 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index c3d1abfcfd0..6f63aaf3599 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -178,7 +178,7 @@ kde4-meta_src_unpack() {
if [[ ${BUILD_TYPE} = live ]]; then
migrate_store_dir
- S="${WORKDIR}/${PN}-${PV}"
+ S="${WORKDIR}/${P}"
mkdir -p "${S}"
ESVN_RESTRICT="export" subversion_src_unpack
subversion_wc_info
@@ -233,18 +233,21 @@ kde4-meta_src_extract() {
fi
else
local abort tarball tarfile f extractlist moduleprefix
+
+ case $KMNAME in
+ kdebase-apps)
+ tarball="${KMNAME#-apps}-${PV}.tar.bz2"
+ ;;
+ *)
+ tarball="${KMNAME}-${PV}.tar.bz2"
+ ;;
+ esac
tarfile="${DISTDIR}/${tarball}"
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 && ${BUILD_TYPE} == release ]]; then
- moduleprefix=apps/
- KMTARPARAMS="${KMTARPARAMS} --transform=s|apps/||"
- fi
-
for f in cmake/ CMakeLists.txt ConfigureChecks.cmake config.h.cmake \
AUTHORS COPYING INSTALL README NEWS ChangeLog
do