diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2011-12-30 14:39:26 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2011-12-30 14:39:26 +0000 |
| commit | 975bc957af882fd5b911f52549beed6de1d004d5 (patch) | |
| tree | 6e763c56acdf9697d8eaecdb767637fad89b0bdc /eclass | |
| parent | Avoid yard documentation task which causes segmentation fault. Add ruby19. Av... (diff) | |
| download | gentoo-2-975bc957af882fd5b911f52549beed6de1d004d5.tar.gz gentoo-2-975bc957af882fd5b911f52549beed6de1d004d5.tar.bz2 gentoo-2-975bc957af882fd5b911f52549beed6de1d004d5.zip | |
Make the output of qt4-build_src_unpack() more readable.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 17 |
2 files changed, 14 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index b1d5f84a80a5..5d7f8b971c2f 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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 diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 7db4959475e4..e229def8625d 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.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/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 |