Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtpositioning/, dev-qt/qtlocation/
Date: Sat, 27 Sep 2014 21:35:43
Message-Id: 1411853447.2ce54e2a2bdde33bac5e8e2267d15c33283ebb3b.pesa@gentoo
1 commit: 2ce54e2a2bdde33bac5e8e2267d15c33283ebb3b
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 27 21:30:47 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 27 21:30:47 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2ce54e2a
7
8 [dev-qt/qtlocation] Split the QtPositioning module into its own package.
9
10 ---
11 dev-qt/qtlocation/metadata.xml | 4 ---
12 dev-qt/qtlocation/qtlocation-5.9999.ebuild | 38 +++++++++-------------
13 dev-qt/{qtlocation => qtpositioning}/Manifest | 0
14 dev-qt/{qtlocation => qtpositioning}/metadata.xml | 0
15 .../qtpositioning-5.3.2.ebuild} | 22 ++++++-------
16 .../qtpositioning-5.3.9999.ebuild} | 22 ++++++-------
17 .../qtpositioning-5.4.0_alpha.ebuild} | 23 +++++++------
18 .../qtpositioning-5.4.9999.ebuild} | 23 +++++++------
19 .../qtpositioning-5.9999.ebuild} | 22 ++++++-------
20 9 files changed, 70 insertions(+), 84 deletions(-)
21
22 diff --git a/dev-qt/qtlocation/metadata.xml b/dev-qt/qtlocation/metadata.xml
23 index 6f68672..9d5bff1 100644
24 --- a/dev-qt/qtlocation/metadata.xml
25 +++ b/dev-qt/qtlocation/metadata.xml
26 @@ -2,10 +2,6 @@
27 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
28 <pkgmetadata>
29 <herd>qt</herd>
30 - <use>
31 - <flag name="geoclue">Use enhanced location information from <pkg>app-misc/geoclue</pkg></flag>
32 - <flag name="qml">Build QML bindings</flag>
33 - </use>
34 <upstream>
35 <bugs-to>https://bugreports.qt-project.org/</bugs-to>
36 <doc>http://qt-project.org/doc/</doc>
37
38 diff --git a/dev-qt/qtlocation/qtlocation-5.9999.ebuild b/dev-qt/qtlocation/qtlocation-5.9999.ebuild
39 index 5b8989f..a28bc3c 100644
40 --- a/dev-qt/qtlocation/qtlocation-5.9999.ebuild
41 +++ b/dev-qt/qtlocation/qtlocation-5.9999.ebuild
42 @@ -6,7 +6,7 @@ EAPI=5
43
44 inherit qt5-build
45
46 -DESCRIPTION="Physical position determination library for the Qt5 framework"
47 +DESCRIPTION="The Location module for the Qt5 framework"
48
49 if [[ ${QT5_BUILD_TYPE} == live ]]; then
50 KEYWORDS=""
51 @@ -14,28 +14,20 @@ else
52 KEYWORDS="~amd64 ~x86"
53 fi
54
55 -# FIXME: src/3rdparty/poly2tri doesn't respect CXX and CXXFLAGS
56 -# TODO: plugins (geoclue-satellite, gypsy)
57 -IUSE="geoclue qml"
58 +IUSE=""
59
60 -RDEPEND="
61 +DEPEND="
62 >=dev-qt/qtcore-${PV}:5[debug=]
63 - geoclue? (
64 - app-misc/geoclue:0
65 - dev-libs/glib:2
66 - )
67 - qml? (
68 - >=dev-qt/qtdeclarative-${PV}:5[debug=]
69 - >=dev-qt/qtgui-${PV}:5[debug=]
70 - >=dev-qt/qtnetwork-${PV}:5[debug=]
71 - )
72 + >=dev-qt/qtdeclarative-${PV}:5[debug=]
73 + >=dev-qt/qtgui-${PV}:5[debug=]
74 + >=dev-qt/qtnetwork-${PV}:5[debug=]
75 + >=dev-qt/qtpositioning-${PV}:5[debug=]
76 "
77 -DEPEND="${RDEPEND}"
78 -
79 -src_prepare() {
80 - qt_use_compile_test geoclue
81 - qt_use_disable_mod qml quick \
82 - src/src.pro
83 -
84 - qt5-build_src_prepare
85 -}
86 +RDEPEND="${DEPEND}"
87 +
88 +QT5_TARGET_SUBDIRS=(
89 + src/3rdparty
90 + src/location
91 + src/imports/location
92 + src/plugins/geoservices
93 +)
94
95 diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtpositioning/Manifest
96 similarity index 100%
97 rename from dev-qt/qtlocation/Manifest
98 rename to dev-qt/qtpositioning/Manifest
99
100 diff --git a/dev-qt/qtlocation/metadata.xml b/dev-qt/qtpositioning/metadata.xml
101 similarity index 100%
102 copy from dev-qt/qtlocation/metadata.xml
103 copy to dev-qt/qtpositioning/metadata.xml
104
105 diff --git a/dev-qt/qtlocation/qtlocation-5.3.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.3.2.ebuild
106 similarity index 58%
107 copy from dev-qt/qtlocation/qtlocation-5.3.2.ebuild
108 copy to dev-qt/qtpositioning/qtpositioning-5.3.2.ebuild
109 index c0b4916..79bc51f 100644
110 --- a/dev-qt/qtlocation/qtlocation-5.3.2.ebuild
111 +++ b/dev-qt/qtpositioning/qtpositioning-5.3.2.ebuild
112 @@ -4,6 +4,8 @@
113
114 EAPI=5
115
116 +QT5_MODULE="qtlocation"
117 +
118 inherit qt5-build
119
120 DESCRIPTION="Physical position determination library for the Qt5 framework"
121 @@ -14,8 +16,7 @@ else
122 KEYWORDS="~amd64 ~x86"
123 fi
124
125 -# FIXME: src/3rdparty/poly2tri doesn't respect CXX and CXXFLAGS
126 -# TODO: plugins (geoclue-satellite, gypsy)
127 +# TODO: src/plugins/position/gypsy
128 IUSE="geoclue qml"
129
130 RDEPEND="
131 @@ -24,17 +25,16 @@ RDEPEND="
132 app-misc/geoclue:0
133 dev-libs/glib:2
134 )
135 - qml? (
136 - >=dev-qt/qtdeclarative-${PV}:5[debug=]
137 - >=dev-qt/qtnetwork-${PV}:5[debug=]
138 - )
139 + qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
140 "
141 DEPEND="${RDEPEND}"
142
143 -src_prepare() {
144 - qt_use_compile_test geoclue
145 - qt_use_disable_mod qml quick \
146 - src/src.pro
147 +QT5_TARGET_SUBDIRS=(
148 + src/positioning
149 + src/plugins/position/positionpoll
150 +)
151
152 - qt5-build_src_prepare
153 +pkg_setup() {
154 + use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
155 + use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
156 }
157
158 diff --git a/dev-qt/qtlocation/qtlocation-5.3.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-5.3.9999.ebuild
159 similarity index 58%
160 rename from dev-qt/qtlocation/qtlocation-5.3.9999.ebuild
161 rename to dev-qt/qtpositioning/qtpositioning-5.3.9999.ebuild
162 index c0b4916..79bc51f 100644
163 --- a/dev-qt/qtlocation/qtlocation-5.3.9999.ebuild
164 +++ b/dev-qt/qtpositioning/qtpositioning-5.3.9999.ebuild
165 @@ -4,6 +4,8 @@
166
167 EAPI=5
168
169 +QT5_MODULE="qtlocation"
170 +
171 inherit qt5-build
172
173 DESCRIPTION="Physical position determination library for the Qt5 framework"
174 @@ -14,8 +16,7 @@ else
175 KEYWORDS="~amd64 ~x86"
176 fi
177
178 -# FIXME: src/3rdparty/poly2tri doesn't respect CXX and CXXFLAGS
179 -# TODO: plugins (geoclue-satellite, gypsy)
180 +# TODO: src/plugins/position/gypsy
181 IUSE="geoclue qml"
182
183 RDEPEND="
184 @@ -24,17 +25,16 @@ RDEPEND="
185 app-misc/geoclue:0
186 dev-libs/glib:2
187 )
188 - qml? (
189 - >=dev-qt/qtdeclarative-${PV}:5[debug=]
190 - >=dev-qt/qtnetwork-${PV}:5[debug=]
191 - )
192 + qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
193 "
194 DEPEND="${RDEPEND}"
195
196 -src_prepare() {
197 - qt_use_compile_test geoclue
198 - qt_use_disable_mod qml quick \
199 - src/src.pro
200 +QT5_TARGET_SUBDIRS=(
201 + src/positioning
202 + src/plugins/position/positionpoll
203 +)
204
205 - qt5-build_src_prepare
206 +pkg_setup() {
207 + use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
208 + use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
209 }
210
211 diff --git a/dev-qt/qtlocation/qtlocation-5.4.0_alpha.ebuild b/dev-qt/qtpositioning/qtpositioning-5.4.0_alpha.ebuild
212 similarity index 57%
213 rename from dev-qt/qtlocation/qtlocation-5.4.0_alpha.ebuild
214 rename to dev-qt/qtpositioning/qtpositioning-5.4.0_alpha.ebuild
215 index 5b8989f..79bc51f 100644
216 --- a/dev-qt/qtlocation/qtlocation-5.4.0_alpha.ebuild
217 +++ b/dev-qt/qtpositioning/qtpositioning-5.4.0_alpha.ebuild
218 @@ -4,6 +4,8 @@
219
220 EAPI=5
221
222 +QT5_MODULE="qtlocation"
223 +
224 inherit qt5-build
225
226 DESCRIPTION="Physical position determination library for the Qt5 framework"
227 @@ -14,8 +16,7 @@ else
228 KEYWORDS="~amd64 ~x86"
229 fi
230
231 -# FIXME: src/3rdparty/poly2tri doesn't respect CXX and CXXFLAGS
232 -# TODO: plugins (geoclue-satellite, gypsy)
233 +# TODO: src/plugins/position/gypsy
234 IUSE="geoclue qml"
235
236 RDEPEND="
237 @@ -24,18 +25,16 @@ RDEPEND="
238 app-misc/geoclue:0
239 dev-libs/glib:2
240 )
241 - qml? (
242 - >=dev-qt/qtdeclarative-${PV}:5[debug=]
243 - >=dev-qt/qtgui-${PV}:5[debug=]
244 - >=dev-qt/qtnetwork-${PV}:5[debug=]
245 - )
246 + qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
247 "
248 DEPEND="${RDEPEND}"
249
250 -src_prepare() {
251 - qt_use_compile_test geoclue
252 - qt_use_disable_mod qml quick \
253 - src/src.pro
254 +QT5_TARGET_SUBDIRS=(
255 + src/positioning
256 + src/plugins/position/positionpoll
257 +)
258
259 - qt5-build_src_prepare
260 +pkg_setup() {
261 + use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
262 + use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
263 }
264
265 diff --git a/dev-qt/qtlocation/qtlocation-5.4.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-5.4.9999.ebuild
266 similarity index 57%
267 rename from dev-qt/qtlocation/qtlocation-5.4.9999.ebuild
268 rename to dev-qt/qtpositioning/qtpositioning-5.4.9999.ebuild
269 index 5b8989f..79bc51f 100644
270 --- a/dev-qt/qtlocation/qtlocation-5.4.9999.ebuild
271 +++ b/dev-qt/qtpositioning/qtpositioning-5.4.9999.ebuild
272 @@ -4,6 +4,8 @@
273
274 EAPI=5
275
276 +QT5_MODULE="qtlocation"
277 +
278 inherit qt5-build
279
280 DESCRIPTION="Physical position determination library for the Qt5 framework"
281 @@ -14,8 +16,7 @@ else
282 KEYWORDS="~amd64 ~x86"
283 fi
284
285 -# FIXME: src/3rdparty/poly2tri doesn't respect CXX and CXXFLAGS
286 -# TODO: plugins (geoclue-satellite, gypsy)
287 +# TODO: src/plugins/position/gypsy
288 IUSE="geoclue qml"
289
290 RDEPEND="
291 @@ -24,18 +25,16 @@ RDEPEND="
292 app-misc/geoclue:0
293 dev-libs/glib:2
294 )
295 - qml? (
296 - >=dev-qt/qtdeclarative-${PV}:5[debug=]
297 - >=dev-qt/qtgui-${PV}:5[debug=]
298 - >=dev-qt/qtnetwork-${PV}:5[debug=]
299 - )
300 + qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
301 "
302 DEPEND="${RDEPEND}"
303
304 -src_prepare() {
305 - qt_use_compile_test geoclue
306 - qt_use_disable_mod qml quick \
307 - src/src.pro
308 +QT5_TARGET_SUBDIRS=(
309 + src/positioning
310 + src/plugins/position/positionpoll
311 +)
312
313 - qt5-build_src_prepare
314 +pkg_setup() {
315 + use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
316 + use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
317 }
318
319 diff --git a/dev-qt/qtlocation/qtlocation-5.3.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.9999.ebuild
320 similarity index 58%
321 rename from dev-qt/qtlocation/qtlocation-5.3.2.ebuild
322 rename to dev-qt/qtpositioning/qtpositioning-5.9999.ebuild
323 index c0b4916..79bc51f 100644
324 --- a/dev-qt/qtlocation/qtlocation-5.3.2.ebuild
325 +++ b/dev-qt/qtpositioning/qtpositioning-5.9999.ebuild
326 @@ -4,6 +4,8 @@
327
328 EAPI=5
329
330 +QT5_MODULE="qtlocation"
331 +
332 inherit qt5-build
333
334 DESCRIPTION="Physical position determination library for the Qt5 framework"
335 @@ -14,8 +16,7 @@ else
336 KEYWORDS="~amd64 ~x86"
337 fi
338
339 -# FIXME: src/3rdparty/poly2tri doesn't respect CXX and CXXFLAGS
340 -# TODO: plugins (geoclue-satellite, gypsy)
341 +# TODO: src/plugins/position/gypsy
342 IUSE="geoclue qml"
343
344 RDEPEND="
345 @@ -24,17 +25,16 @@ RDEPEND="
346 app-misc/geoclue:0
347 dev-libs/glib:2
348 )
349 - qml? (
350 - >=dev-qt/qtdeclarative-${PV}:5[debug=]
351 - >=dev-qt/qtnetwork-${PV}:5[debug=]
352 - )
353 + qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
354 "
355 DEPEND="${RDEPEND}"
356
357 -src_prepare() {
358 - qt_use_compile_test geoclue
359 - qt_use_disable_mod qml quick \
360 - src/src.pro
361 +QT5_TARGET_SUBDIRS=(
362 + src/positioning
363 + src/plugins/position/positionpoll
364 +)
365
366 - qt5-build_src_prepare
367 +pkg_setup() {
368 + use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
369 + use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
370 }
Report Message
Find on MARC Find on Google Groups