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-demo: metadata.xml ChangeLog qt-demo-4.7.0.ebuild
Date: Sat, 06 Nov 2010 19:17:03
Message-Id: 20101106191657.6B70220051@flycatcher.gentoo.org
1 wired 10/11/06 19:16:57
2
3 Modified: metadata.xml ChangeLog qt-demo-4.7.0.ebuild
4 Log:
5 added qt3support useflag, fixes bug #342349
6
7 (Portage version: 2.2.0_alpha3/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 x11-libs/qt-demo/metadata.xml
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/metadata.xml?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/metadata.xml?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/metadata.xml?r1=1.2&r2=1.3
15
16 Index: metadata.xml
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/metadata.xml,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- metadata.xml 18 Feb 2010 00:08:14 -0000 1.2
23 +++ metadata.xml 6 Nov 2010 19:16:57 -0000 1.3
24 @@ -5,5 +5,7 @@
25 <use>
26 <flag name='exceptions'>Add support for exceptions - like catching them
27 inside the event loop (recommended by Nokia)</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 </use>
31 </pkgmetadata>
32
33
34
35 1.60 x11-libs/qt-demo/ChangeLog
36
37 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/ChangeLog?rev=1.60&view=markup
38 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/ChangeLog?rev=1.60&content-type=text/plain
39 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/ChangeLog?r1=1.59&r2=1.60
40
41 Index: ChangeLog
42 ===================================================================
43 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v
44 retrieving revision 1.59
45 retrieving revision 1.60
46 diff -u -r1.59 -r1.60
47 --- ChangeLog 5 Nov 2010 18:07:22 -0000 1.59
48 +++ ChangeLog 6 Nov 2010 19:16:57 -0000 1.60
49 @@ -1,6 +1,10 @@
50 # ChangeLog for x11-libs/qt-demo
51 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
52 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.59 2010/11/05 18:07:22 jer Exp $
53 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.60 2010/11/06 19:16:57 wired Exp $
54 +
55 + 06 Nov 2010; Alex Alexander <wired@g.o> qt-demo-4.7.0.ebuild,
56 + metadata.xml:
57 + added qt3support useflag, fixes bug #342349
58
59 05 Nov 2010; Jeroen Roovers <jer@g.o> qt-demo-4.5.3.ebuild:
60 Needs qt-webkit, so dropping HPPA keywording (bug #239441).
61
62
63
64 1.5 x11-libs/qt-demo/qt-demo-4.7.0.ebuild
65
66 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.0.ebuild?rev=1.5&view=markup
67 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.0.ebuild?rev=1.5&content-type=text/plain
68 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.0.ebuild?r1=1.4&r2=1.5
69
70 Index: qt-demo-4.7.0.ebuild
71 ===================================================================
72 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.0.ebuild,v
73 retrieving revision 1.4
74 retrieving revision 1.5
75 diff -u -r1.4 -r1.5
76 --- qt-demo-4.7.0.ebuild 1 Nov 2010 12:30:57 -0000 1.4
77 +++ qt-demo-4.7.0.ebuild 6 Nov 2010 19:16:57 -0000 1.5
78 @@ -1,6 +1,6 @@
79 # Copyright 1999-2010 Gentoo Foundation
80 # Distributed under the terms of the GNU General Public License v2
81 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.0.ebuild,v 1.4 2010/11/01 12:30:57 ssuominen Exp $
82 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.0.ebuild,v 1.5 2010/11/06 19:16:57 wired Exp $
83
84 EAPI="3"
85 inherit qt4-build
86 @@ -8,19 +8,19 @@
87 DESCRIPTION="Demonstration module of the Qt toolkit"
88 SLOT="4"
89 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
90 -IUSE="kde"
91 +IUSE="kde qt3support"
92
93 DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=]
94 - ~x11-libs/qt-core-${PV}:${SLOT}[aqua=]
95 + ~x11-libs/qt-core-${PV}:${SLOT}[aqua=,qt3support=]
96 ~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=]
97 - ~x11-libs/qt-gui-${PV}:${SLOT}[aqua=]
98 + ~x11-libs/qt-gui-${PV}:${SLOT}[aqua=,qt3support=]
99 ~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=]
100 - ~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=]
101 + ~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,qt3support=]
102 !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=]
103 media-sound/phonon[aqua=] ) )
104 kde? ( media-sound/phonon[aqua=] )
105 ~x11-libs/qt-script-${PV}:${SLOT}[aqua=]
106 - ~x11-libs/qt-sql-${PV}:${SLOT}[aqua=]
107 + ~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,qt3support=]
108 ~x11-libs/qt-svg-${PV}:${SLOT}[aqua=]
109 ~x11-libs/qt-test-${PV}:${SLOT}[aqua=]
110 ~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=]
111 @@ -42,6 +42,11 @@
112 qt4-build_pkg_setup
113 }
114
115 +src_configure() {
116 + myconf="${myconf} $(qt_use qt3support)"
117 + qt4-build_src_configure
118 +}
119 +
120 src_install() {
121 insinto "${QTDOCDIR#${EPREFIX}}"/src
122 doins -r "${S}"/doc/src/images || die "Installing images failed."