Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
Date: Fri, 27 Jun 2014 17:43:14
Message-Id: 1403890917.71886358e60f88587443660751a154531db208c3.kensington@gentoo
1 commit: 71886358e60f88587443660751a154531db208c3
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 27 17:41:57 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 27 17:41:57 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=71886358
7
8 [dev-qt/qtquick1] Add designer USE flag.
9
10 Package-Manager: portage-2.2.10
11
12 ---
13 dev-qt/qtquick1/metadata.xml | 5 +++--
14 dev-qt/qtquick1/qtquick1-5.3.1.ebuild | 11 ++++++++---
15 dev-qt/qtquick1/qtquick1-5.3.9999.ebuild | 11 ++++++++---
16 dev-qt/qtquick1/qtquick1-5.9999.ebuild | 11 ++++++++---
17 4 files changed, 27 insertions(+), 11 deletions(-)
18
19 diff --git a/dev-qt/qtquick1/metadata.xml b/dev-qt/qtquick1/metadata.xml
20 index 81b3a08..5bd6127 100644
21 --- a/dev-qt/qtquick1/metadata.xml
22 +++ b/dev-qt/qtquick1/metadata.xml
23 @@ -3,8 +3,9 @@
24 <pkgmetadata>
25 <herd>qt</herd>
26 <use>
27 - <flag name="webkit">Build the WebView import for QtQuick1 (requires QtWebKit)</flag>
28 - <flag name="xml">Build the XmlListModel import for QtQuick1 (requires QtXmlPatterns)</flag>
29 + <flag name="designer">Build plugin for <pkg>dev-qt/designer</pkg></flag>
30 + <flag name="webkit">Build the WebView import for QtQuick1 (requires QtWebKit)</flag>
31 + <flag name="xml">Build the XmlListModel import for QtQuick1 (requires QtXmlPatterns)</flag>
32 </use>
33 <upstream>
34 <bugs-to>https://bugreports.qt-project.org/</bugs-to>
35
36 diff --git a/dev-qt/qtquick1/qtquick1-5.3.1.ebuild b/dev-qt/qtquick1/qtquick1-5.3.1.ebuild
37 index c0bd8e1..83115ee 100644
38 --- a/dev-qt/qtquick1/qtquick1-5.3.1.ebuild
39 +++ b/dev-qt/qtquick1/qtquick1-5.3.1.ebuild
40 @@ -14,9 +14,7 @@ else
41 KEYWORDS="~amd64 ~x86"
42 fi
43
44 -# FIXME: qdeclarativeview designer plugin is automagic
45 -
46 -IUSE="+opengl webkit +xml"
47 +IUSE="designer +opengl webkit +xml"
48
49 DEPEND="
50 >=dev-qt/qtcore-${PV}:5[debug=]
51 @@ -25,6 +23,10 @@ DEPEND="
52 >=dev-qt/qtscript-${PV}:5[debug=]
53 >=dev-qt/qtsql-${PV}:5[debug=]
54 >=dev-qt/qtwidgets-${PV}:5[debug=]
55 + designer? (
56 + >=dev-qt/designer-${PV}:5[debug=]
57 + >=dev-qt/qtdeclarative-${PV}:5[debug=]
58 + )
59 opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
60 webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
61 xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
62 @@ -32,6 +34,9 @@ DEPEND="
63 RDEPEND="${DEPEND}"
64
65 src_prepare() {
66 + qt_use_disable_mod designer designer \
67 + src/plugins/plugins.pro
68 +
69 qt_use_disable_mod opengl opengl \
70 src/imports/imports.pro \
71 tools/qml/qml.pri
72
73 diff --git a/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild b/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild
74 index c0bd8e1..83115ee 100644
75 --- a/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild
76 +++ b/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild
77 @@ -14,9 +14,7 @@ else
78 KEYWORDS="~amd64 ~x86"
79 fi
80
81 -# FIXME: qdeclarativeview designer plugin is automagic
82 -
83 -IUSE="+opengl webkit +xml"
84 +IUSE="designer +opengl webkit +xml"
85
86 DEPEND="
87 >=dev-qt/qtcore-${PV}:5[debug=]
88 @@ -25,6 +23,10 @@ DEPEND="
89 >=dev-qt/qtscript-${PV}:5[debug=]
90 >=dev-qt/qtsql-${PV}:5[debug=]
91 >=dev-qt/qtwidgets-${PV}:5[debug=]
92 + designer? (
93 + >=dev-qt/designer-${PV}:5[debug=]
94 + >=dev-qt/qtdeclarative-${PV}:5[debug=]
95 + )
96 opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
97 webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
98 xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
99 @@ -32,6 +34,9 @@ DEPEND="
100 RDEPEND="${DEPEND}"
101
102 src_prepare() {
103 + qt_use_disable_mod designer designer \
104 + src/plugins/plugins.pro
105 +
106 qt_use_disable_mod opengl opengl \
107 src/imports/imports.pro \
108 tools/qml/qml.pri
109
110 diff --git a/dev-qt/qtquick1/qtquick1-5.9999.ebuild b/dev-qt/qtquick1/qtquick1-5.9999.ebuild
111 index c0bd8e1..83115ee 100644
112 --- a/dev-qt/qtquick1/qtquick1-5.9999.ebuild
113 +++ b/dev-qt/qtquick1/qtquick1-5.9999.ebuild
114 @@ -14,9 +14,7 @@ else
115 KEYWORDS="~amd64 ~x86"
116 fi
117
118 -# FIXME: qdeclarativeview designer plugin is automagic
119 -
120 -IUSE="+opengl webkit +xml"
121 +IUSE="designer +opengl webkit +xml"
122
123 DEPEND="
124 >=dev-qt/qtcore-${PV}:5[debug=]
125 @@ -25,6 +23,10 @@ DEPEND="
126 >=dev-qt/qtscript-${PV}:5[debug=]
127 >=dev-qt/qtsql-${PV}:5[debug=]
128 >=dev-qt/qtwidgets-${PV}:5[debug=]
129 + designer? (
130 + >=dev-qt/designer-${PV}:5[debug=]
131 + >=dev-qt/qtdeclarative-${PV}:5[debug=]
132 + )
133 opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
134 webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
135 xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
136 @@ -32,6 +34,9 @@ DEPEND="
137 RDEPEND="${DEPEND}"
138
139 src_prepare() {
140 + qt_use_disable_mod designer designer \
141 + src/plugins/plugins.pro
142 +
143 qt_use_disable_mod opengl opengl \
144 src/imports/imports.pro \
145 tools/qml/qml.pri