Gentoo Archives: gentoo-commits

From: "Alex Alexander (wired)" <wired@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-declarative: metadata.xml ChangeLog qt-declarative-4.7.0.ebuild
Date: Sat, 06 Nov 2010 10:49:53
Message-Id: 20101106104950.05E5620051@flycatcher.gentoo.org
1 wired 10/11/06 10:49:49
2
3 Modified: metadata.xml ChangeLog qt-declarative-4.7.0.ebuild
4 Log:
5 added qt3support useflag, fixes bug #341861
6
7 (Portage version: 2.2.0_alpha3/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.4 x11-libs/qt-declarative/metadata.xml
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/metadata.xml?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/metadata.xml?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/metadata.xml?r1=1.3&r2=1.4
15
16 Index: metadata.xml
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/metadata.xml,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- metadata.xml 21 Sep 2010 14:44:04 -0000 1.3
23 +++ metadata.xml 6 Nov 2010 10:49:49 -0000 1.4
24 @@ -5,6 +5,8 @@
25 <use>
26 <flag name="private-headers">Install Qt declarative private headers required
27 by Qt-creator QmlDesigner and QmlInspector plugins"</flag>
28 + <flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that
29 + this does not mean you can compile pure Qt3 programs with Qt4.</flag>
30 <flag name='exceptions'>Add support for exceptions - like catching them
31 inside the event loop (recommended by Nokia)</flag>
32 </use>
33
34
35
36 1.10 x11-libs/qt-declarative/ChangeLog
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/ChangeLog?rev=1.10&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/ChangeLog?rev=1.10&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/ChangeLog?r1=1.9&r2=1.10
41
42 Index: ChangeLog
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v
45 retrieving revision 1.9
46 retrieving revision 1.10
47 diff -u -r1.9 -r1.10
48 --- ChangeLog 1 Nov 2010 12:28:42 -0000 1.9
49 +++ ChangeLog 6 Nov 2010 10:49:49 -0000 1.10
50 @@ -1,6 +1,10 @@
51 # ChangeLog for x11-libs/qt-declarative
52 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
53 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.9 2010/11/01 12:28:42 ssuominen Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.10 2010/11/06 10:49:49 wired Exp $
55 +
56 + 06 Nov 2010; Alex Alexander <wired@g.o>
57 + qt-declarative-4.7.0.ebuild, metadata.xml:
58 + added qt3support useflag, fixes bug #341861
59
60 01 Nov 2010; Samuli Suominen <ssuominen@g.o>
61 qt-declarative-4.7.0.ebuild:
62
63
64
65 1.7 x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild
66
67 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild?rev=1.7&view=markup
68 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild?rev=1.7&content-type=text/plain
69 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild?r1=1.6&r2=1.7
70
71 Index: qt-declarative-4.7.0.ebuild
72 ===================================================================
73 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild,v
74 retrieving revision 1.6
75 retrieving revision 1.7
76 diff -u -r1.6 -r1.7
77 --- qt-declarative-4.7.0.ebuild 1 Nov 2010 12:28:42 -0000 1.6
78 +++ qt-declarative-4.7.0.ebuild 6 Nov 2010 10:49:49 -0000 1.7
79 @@ -1,6 +1,6 @@
80 # Copyright 1999-2010 Gentoo Foundation
81 # Distributed under the terms of the GNU General Public License v2
82 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild,v 1.6 2010/11/01 12:28:42 ssuominen Exp $
83 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.0.ebuild,v 1.7 2010/11/06 10:49:49 wired Exp $
84
85 EAPI="3"
86 inherit qt4-build
87 @@ -8,17 +8,19 @@
88 DESCRIPTION="The Declarative module for the Qt toolkit"
89 SLOT="4"
90 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
91 -IUSE="private-headers"
92 +IUSE="private-headers qt3support"
93
94 -DEPEND="~x11-libs/qt-core-${PV}[aqua=]
95 - ~x11-libs/qt-gui-${PV}[aqua=]
96 +DEPEND="~x11-libs/qt-core-${PV}[aqua=,qt3support=]
97 + ~x11-libs/qt-gui-${PV}[aqua=,qt3support=]
98 ~x11-libs/qt-multimedia-${PV}[aqua=]
99 - ~x11-libs/qt-opengl-${PV}[aqua=]
100 + ~x11-libs/qt-opengl-${PV}[aqua=,qt3support=]
101 ~x11-libs/qt-script-${PV}[aqua=]
102 - ~x11-libs/qt-sql-${PV}[aqua=]
103 + ~x11-libs/qt-sql-${PV}[aqua=,qt3support=]
104 ~x11-libs/qt-svg-${PV}[aqua=]
105 ~x11-libs/qt-webkit-${PV}[aqua=]
106 - ~x11-libs/qt-xmlpatterns-${PV}[aqua=]"
107 + ~x11-libs/qt-xmlpatterns-${PV}[aqua=]
108 + qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=] )
109 + "
110 RDEPEND="${DEPEND}"
111
112 pkg_setup() {
113 @@ -36,7 +38,7 @@
114 }
115
116 src_configure() {
117 - myconf="${myconf} -declarative"
118 + myconf="${myconf} -declarative $(qt_use qt3support)"
119 qt4-build_src_configure
120 }