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.8.0-r1.ebuild
Date: Sun, 29 Jan 2012 17:01:36
Message-Id: 20120129170127.6248C20034@flycatcher.gentoo.org
1 wired 12/01/29 17:01:27
2
3 Modified: metadata.xml ChangeLog
4 Added: qt-declarative-4.8.0-r1.ebuild
5 Log:
6 version bump
7
8 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.6 x11-libs/qt-declarative/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/metadata.xml?rev=1.6&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/metadata.xml?rev=1.6&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/metadata.xml?r1=1.5&r2=1.6
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/metadata.xml,v
20 retrieving revision 1.5
21 retrieving revision 1.6
22 diff -u -r1.5 -r1.6
23 --- metadata.xml 14 Apr 2011 22:29:03 -0000 1.5
24 +++ metadata.xml 29 Jan 2012 17:01:27 -0000 1.6
25 @@ -1,16 +1,18 @@
26 <?xml version="1.0" encoding="UTF-8"?>
27 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
28 <pkgmetadata>
29 -<herd>qt</herd>
30 -<use>
31 - <flag name="private-headers">Install Qt declarative private headers required
32 - by Qt-creator QmlDesigner and QmlInspector plugins"</flag>
33 - <flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that
34 - this does not mean you can compile pure Qt3 programs with Qt4.</flag>
35 - <flag name='exceptions'>Add support for exceptions - like catching them
36 - inside the event loop (recommended by Nokia)</flag>
37 - <flag name='webkit'>Build the WebView QML element</flag>
38 -</use>
39 + <herd>qt</herd>
40 + <use>
41 + <flag name="private-headers">Install Qt declarative private headers required
42 + by Qt-creator QmlDesigner and QmlInspector plugins"</flag>
43 + <flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that
44 + this does not mean you can compile pure Qt3 programs with Qt4.</flag>
45 + <flag name='exceptions'>Add support for exceptions - like catching them
46 + inside the event loop (recommended by Nokia)</flag>
47 + <flag name='webkit'>Build the WebView QML element</flag>
48 + <flag name='c++0x'>Build Qt using the C++11 standard</flag>
49 + <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
50 + </use>
51 <longdescription lang="en">
52 </longdescription>
53 </pkgmetadata>
54
55
56
57 1.34 x11-libs/qt-declarative/ChangeLog
58
59 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/ChangeLog?rev=1.34&view=markup
60 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/ChangeLog?rev=1.34&content-type=text/plain
61 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/ChangeLog?r1=1.33&r2=1.34
62
63 Index: ChangeLog
64 ===================================================================
65 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v
66 retrieving revision 1.33
67 retrieving revision 1.34
68 diff -u -r1.33 -r1.34
69 --- ChangeLog 27 Dec 2011 21:38:01 -0000 1.33
70 +++ ChangeLog 29 Jan 2012 17:01:27 -0000 1.34
71 @@ -1,6 +1,12 @@
72 # ChangeLog for x11-libs/qt-declarative
73 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
74 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.33 2011/12/27 21:38:01 maekke Exp $
75 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
76 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.34 2012/01/29 17:01:27 wired Exp $
77 +
78 +*qt-declarative-4.8.0-r1 (29 Jan 2012)
79 +
80 + 29 Jan 2012; Alex Alexander <wired@g.o>
81 + +qt-declarative-4.8.0-r1.ebuild, metadata.xml:
82 + version bump
83
84 27 Dec 2011; Markus Meier <maekke@g.o> qt-declarative-4.7.4.ebuild:
85 x86 stable, bug #390963
86
87
88
89 1.1 x11-libs/qt-declarative/qt-declarative-4.8.0-r1.ebuild
90
91 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.8.0-r1.ebuild?rev=1.1&view=markup
92 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.8.0-r1.ebuild?rev=1.1&content-type=text/plain
93
94 Index: qt-declarative-4.8.0-r1.ebuild
95 ===================================================================
96 # Copyright 1999-2012 Gentoo Foundation
97 # Distributed under the terms of the GNU General Public License v2
98 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.8.0-r1.ebuild,v 1.1 2012/01/29 17:01:27 wired Exp $
99
100 EAPI="3"
101 inherit qt4-build
102
103 DESCRIPTION="The Declarative module for the Qt toolkit"
104 SLOT="4"
105 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
106 IUSE="+accessibility qt3support webkit"
107
108 DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
109 ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=,qt3support=]
110 ~x11-libs/qt-opengl-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
111 ~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=]
112 ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
113 ~x11-libs/qt-svg-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=]
114 ~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
115 qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=] )
116 webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )
117 "
118 RDEPEND="${DEPEND}"
119
120 pkg_setup() {
121 QCONFIG_ADD="declarative"
122
123 QT4_TARGET_DIRECTORIES="
124 src/declarative
125 src/imports
126 tools/designer/src/plugins/qdeclarativeview
127 tools/qml
128 tools/qmlplugindump"
129
130 if use webkit; then
131 QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
132 src/3rdparty/webkit/Source/WebKit/qt/declarative"
133 fi
134
135 QT4_EXTRACT_DIRECTORIES="
136 include/
137 src/
138 tools/
139 translations/"
140
141 qt4-build_pkg_setup
142 }
143
144 src_configure() {
145 myconf="${myconf} -declarative -no-gtkstyle
146 $(qt_use accessibility) $(qt_use qt3support) $(qt_use webkit)"
147 qt4-build_src_configure
148 }
149
150 src_install() {
151 qt4-build_src_install
152 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
153 insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
154 # ran for the 2nd time, need it for the updated headers
155 fix_includes
156 else
157 insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
158 fi
159 find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} \;
160 }