Make the output of qt4-build_src_unpack() more readable.
authorDavide Pesavento <pesa@gentoo.org>
Fri, 30 Dec 2011 14:39:26 +0000 (14:39 +0000)
committerDavide Pesavento <pesa@gentoo.org>
Fri, 30 Dec 2011 14:39:26 +0000 (14:39 +0000)
eclass/ChangeLog
eclass/qt4-build.eclass

index b1d5f84a80a5c80926cd16b183ef661646c124bd..5d7f8b971c2f6b1c12ba0be08c26a0a3e988f569 100644 (file)
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.63 2011/12/28 13:38:05 psomas Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.64 2011/12/30 14:39:26 pesa Exp $
+
+  30 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Make the output of qt4-build_src_unpack() more readable.
 
   28 Dec 2011; Stratos Psomadakis <psomas@gentoo.org> kernel-2.eclass:
   Fix URIs for longterm kernels
index 7db4959475e493e0e0db5a204fea14f4bd3250f5..e229def8625dc92239ac1d3642618c35c6f1c462 100644 (file)
@@ -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/qt4-build.eclass,v 1.111 2011/12/27 16:04:27 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.112 2011/12/30 14:39:26 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -138,15 +138,18 @@ qt4-build_pkg_setup() {
 # Unpacks the sources.
 qt4-build_src_unpack() {
        setqtenv
-       local target targets=
+
+       local tarball="${MY_P}.tar.gz" target= targets=
        for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
-               src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
-               ${QT4_EXTRACT_DIRECTORIES}; do
-                       targets+=" ${MY_P}/${target}"
+               src/{qbase,qt_targets,qt_install}.pri bin config.tests \
+               mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
+       do
+               targets+="${MY_P}/${target} "
        done
 
-       echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
-       tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
+       ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
+       tar -xzf "${DISTDIR}/${tarball}" ${targets}
+       eend $? || die "failed to unpack"
 }
 
 # @ECLASS-VARIABLE: PATCHES