1 |
pesa 11/12/30 14:39:26 |
2 |
|
3 |
Modified: ChangeLog qt4-build.eclass |
4 |
Log: |
5 |
Make the output of qt4-build_src_unpack() more readable. |
6 |
|
7 |
Revision Changes Path |
8 |
1.64 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.64&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.64&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.63&r2=1.64 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.63 |
18 |
retrieving revision 1.64 |
19 |
diff -u -r1.63 -r1.64 |
20 |
--- ChangeLog 28 Dec 2011 13:38:05 -0000 1.63 |
21 |
+++ ChangeLog 30 Dec 2011 14:39:26 -0000 1.64 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.63 2011/12/28 13:38:05 psomas Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.64 2011/12/30 14:39:26 pesa Exp $ |
27 |
+ |
28 |
+ 30 Dec 2011; Davide Pesavento <pesa@g.o> qt4-build.eclass: |
29 |
+ Make the output of qt4-build_src_unpack() more readable. |
30 |
|
31 |
28 Dec 2011; Stratos Psomadakis <psomas@g.o> kernel-2.eclass: |
32 |
Fix URIs for longterm kernels |
33 |
|
34 |
|
35 |
|
36 |
1.112 eclass/qt4-build.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.112&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.112&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.111&r2=1.112 |
41 |
|
42 |
Index: qt4-build.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
45 |
retrieving revision 1.111 |
46 |
retrieving revision 1.112 |
47 |
diff -u -r1.111 -r1.112 |
48 |
--- qt4-build.eclass 27 Dec 2011 16:04:27 -0000 1.111 |
49 |
+++ qt4-build.eclass 30 Dec 2011 14:39:26 -0000 1.112 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2011 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.111 2011/12/27 16:04:27 pesa Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.112 2011/12/30 14:39:26 pesa Exp $ |
55 |
|
56 |
# @ECLASS: qt4-build.eclass |
57 |
# @MAINTAINER: |
58 |
@@ -138,15 +138,18 @@ |
59 |
# Unpacks the sources. |
60 |
qt4-build_src_unpack() { |
61 |
setqtenv |
62 |
- local target targets= |
63 |
+ |
64 |
+ local tarball="${MY_P}.tar.gz" target= targets= |
65 |
for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ |
66 |
- src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \ |
67 |
- ${QT4_EXTRACT_DIRECTORIES}; do |
68 |
- targets+=" ${MY_P}/${target}" |
69 |
+ src/{qbase,qt_targets,qt_install}.pri bin config.tests \ |
70 |
+ mkspecs qmake ${QT4_EXTRACT_DIRECTORIES} |
71 |
+ do |
72 |
+ targets+="${MY_P}/${target} " |
73 |
done |
74 |
|
75 |
- echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} |
76 |
- tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die |
77 |
+ ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/} |
78 |
+ tar -xzf "${DISTDIR}/${tarball}" ${targets} |
79 |
+ eend $? || die "failed to unpack" |
80 |
} |
81 |
|
82 |
# @ECLASS-VARIABLE: PATCHES |