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

Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@×××××××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-vcs/qgit/, media-gfx/google-image-downloader/, dev-util/qt-creator/, ...
Date: Wed, 04 Apr 2012 18:24:57
Message-Id: 1333563623.652823502d41eadc30655ee2a6fbb54ba0d2e751.kensington@gentoo
1 commit: 652823502d41eadc30655ee2a6fbb54ba0d2e751
2 Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
3 AuthorDate: Wed Apr 4 18:14:38 2012 +0000
4 Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
5 CommitDate: Wed Apr 4 18:20:23 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=65282350
7
8 Migrate usage of qt4-edge to qt4-r2.
9
10 (Portage version: 2.1.10.55/git/Linux x86_64, unsigned Manifest commit)
11
12 ---
13 app-admin/keepassx/keepassx-9999.ebuild | 2 +-
14 app-editors/qxmledit/qxmledit-9999.ebuild | 6 +++---
15 app-emulation/q4wine/q4wine-9999.ebuild | 2 +-
16 app-emulation/qtemu/qtemu-2.0_alpha1.ebuild | 2 +-
17 app-emulation/qtemu/qtemu-9999.ebuild | 2 +-
18 dev-db/unixODBC-GUI-Qt/unixODBC-GUI-Qt-9999.ebuild | 2 +-
19 dev-libs/qoauth/qoauth-9999.ebuild | 4 ++--
20 dev-util/qt-creator/qt-creator-9999.ebuild | 7 ++-----
21 dev-vcs/qgit/qgit-9999.ebuild | 2 +-
22 .../imapquickcheck/imapquickcheck-1.2.ebuild | 2 +-
23 .../imapquickcheck/imapquickcheck-1.3.ebuild | 2 +-
24 .../google-image-downloader-1.1.ebuild | 2 +-
25 media-gfx/gsalbumer/gsalbumer-1.26.ebuild | 2 +-
26 media-gfx/screenie/screenie-9999.ebuild | 4 ++--
27 media-sound/mp3diags/mp3diags-9999.ebuild | 2 +-
28 media-sound/qtmpc/qtmpc-0.5.0.ebuild | 2 +-
29 media-sound/qtmpc/qtmpc-9999.ebuild | 2 +-
30 .../xvideoservicethief-9999.ebuild | 4 ++--
31 net-dialup/checkppp/checkppp-1.5.0.ebuild | 2 +-
32 net-im/qtwitter/qtwitter-9999.ebuild | 4 ++--
33 net-im/qwit/qwit-9999.ebuild | 2 +-
34 net-misc/kontrolpack/kontrolpack-3.0.0.ebuild | 2 +-
35 net-misc/qconnman/qconnman-9999.ebuild | 2 +-
36 sci-electronics/fritzing/fritzing-0.7.1b.ebuild | 4 ++--
37 x11-themes/quantumstyle/quantumstyle-0_rc3.ebuild | 2 +-
38 x11-themes/xcurtheme/xcurtheme-9999.ebuild | 6 +++---
39 26 files changed, 36 insertions(+), 39 deletions(-)
40
41 diff --git a/app-admin/keepassx/keepassx-9999.ebuild b/app-admin/keepassx/keepassx-9999.ebuild
42 index 4540198..8292dca 100644
43 --- a/app-admin/keepassx/keepassx-9999.ebuild
44 +++ b/app-admin/keepassx/keepassx-9999.ebuild
45 @@ -4,7 +4,7 @@
46
47 EAPI=4
48
49 -inherit qt4-edge cmake-utils git-2
50 +inherit qt4-r2 cmake-utils git-2
51
52 DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions."
53 HOMEPAGE="http://keepassx.sourceforge.net/"
54
55 diff --git a/app-editors/qxmledit/qxmledit-9999.ebuild b/app-editors/qxmledit/qxmledit-9999.ebuild
56 index e3e0128..2fed787 100644
57 --- a/app-editors/qxmledit/qxmledit-9999.ebuild
58 +++ b/app-editors/qxmledit/qxmledit-9999.ebuild
59 @@ -4,7 +4,7 @@
60
61 EAPI=4
62
63 -inherit qt4-edge subversion
64 +inherit qt4-r2 subversion
65
66 DESCRIPTION="Qt4 XML Editor"
67 HOMEPAGE="http://code.google.com/p/qxmledit/"
68 @@ -29,11 +29,11 @@ src_prepare(){
69 # fix translations
70 sed -i "/^translations.path/ s/\/opt/\/usr\/share/" src/QXmlEdit.pro || \
71 die "failed to fix translations"
72 - qt4-edge_src_prepare
73 + qt4-r2_src_prepare
74 }
75
76 src_install(){
77 - qt4-edge_src_install
78 + qt4-r2_src_install
79 newicon "${S}"/src/images/icon.png ${PN}.png
80 make_desktop_entry QXmlEdit QXmlEdit ${PN} "Qt;Utility;TextEditor;"
81 }
82
83 diff --git a/app-emulation/q4wine/q4wine-9999.ebuild b/app-emulation/q4wine/q4wine-9999.ebuild
84 index 5b81638..b600293 100644
85 --- a/app-emulation/q4wine/q4wine-9999.ebuild
86 +++ b/app-emulation/q4wine/q4wine-9999.ebuild
87 @@ -4,7 +4,7 @@
88
89 EAPI=4
90
91 -inherit qt4-edge cmake-utils git-2
92 +inherit qt4-r2 cmake-utils git-2
93
94 DESCRIPTION="Qt4 utility for Wine applications and prefixes management."
95 HOMEPAGE="http://q4wine.brezblock.org.ua/"
96
97 diff --git a/app-emulation/qtemu/qtemu-2.0_alpha1.ebuild b/app-emulation/qtemu/qtemu-2.0_alpha1.ebuild
98 index f315c7e..8ee24a9 100644
99 --- a/app-emulation/qtemu/qtemu-2.0_alpha1.ebuild
100 +++ b/app-emulation/qtemu/qtemu-2.0_alpha1.ebuild
101 @@ -4,7 +4,7 @@
102
103 EAPI=4
104
105 -inherit eutils qt4-edge cmake-utils
106 +inherit eutils qt4-r2 cmake-utils
107
108 MY_P="${P/_/}"
109
110
111 diff --git a/app-emulation/qtemu/qtemu-9999.ebuild b/app-emulation/qtemu/qtemu-9999.ebuild
112 index 2773811..17a80f2 100644
113 --- a/app-emulation/qtemu/qtemu-9999.ebuild
114 +++ b/app-emulation/qtemu/qtemu-9999.ebuild
115 @@ -4,7 +4,7 @@
116
117 EAPI=4
118
119 -inherit eutils qt4-edge cmake-utils subversion
120 +inherit eutils qt4-r2 cmake-utils subversion
121
122 DESCRIPTION="A graphical user interface for QEMU written in Qt4"
123 HOMEPAGE="http://qtemu.sourceforge.net/"
124
125 diff --git a/dev-db/unixODBC-GUI-Qt/unixODBC-GUI-Qt-9999.ebuild b/dev-db/unixODBC-GUI-Qt/unixODBC-GUI-Qt-9999.ebuild
126 index 2911fbb..4416774 100644
127 --- a/dev-db/unixODBC-GUI-Qt/unixODBC-GUI-Qt-9999.ebuild
128 +++ b/dev-db/unixODBC-GUI-Qt/unixODBC-GUI-Qt-9999.ebuild
129 @@ -4,7 +4,7 @@
130
131 EAPI=4
132
133 -inherit qt4-edge subversion
134 +inherit qt4-r2 subversion
135
136 DESCRIPTION="Qt4 based GUI for unixODBC"
137 HOMEPAGE="http://sourceforge.net/projects/unixodbc-gui-qt/"
138
139 diff --git a/dev-libs/qoauth/qoauth-9999.ebuild b/dev-libs/qoauth/qoauth-9999.ebuild
140 index 369946f..74d5c0e 100644
141 --- a/dev-libs/qoauth/qoauth-9999.ebuild
142 +++ b/dev-libs/qoauth/qoauth-9999.ebuild
143 @@ -4,7 +4,7 @@
144
145 EAPI=4
146
147 -inherit qt4-edge git-2
148 +inherit qt4-r2 git-2
149
150 DESCRIPTION="A Qt-based library for OAuth support"
151 HOMEPAGE="http://wiki.github.com/ayoy/qoauth"
152 @@ -22,7 +22,7 @@ RDEPEND="${COMMON_DEPEND}
153 app-crypt/qca-ossl:2[debug?]"
154
155 src_prepare() {
156 - qt4-edge_src_prepare
157 + qt4-r2_src_prepare
158 sed -i -e '/^ *docs \\$/d' \
159 -e '/^ *build_all \\$/d' \
160 -e 's/^\#\(!macx\)/\1/' \
161
162 diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
163 index a62dc0a..6ac7a8b 100644
164 --- a/dev-util/qt-creator/qt-creator-9999.ebuild
165 +++ b/dev-util/qt-creator/qt-creator-9999.ebuild
166 @@ -6,17 +6,14 @@ EAPI=4
167
168 LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
169
170 -inherit multilib eutils flag-o-matic
171 +inherit multilib eutils flag-o-matic qt4-r2
172
173 MY_P=${PN}-${PV/_/-}-src
174 if [[ ${PV} == *9999* ]]; then
175 - QTCREATOR_SUFFIX="-edge"
176 - inherit qt4${QTCREATOR_SUFFIX} git-2
177 + inherit git-2
178 EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
179 https://git.gitorious.org/${PN}/${PN}.git"
180 else
181 - QTCREATOR_SUFFIX="-r2"
182 - inherit qt4${QTCREATOR_SUFFIX}
183 SRC_URI="http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz"
184 S=${WORKDIR}/${MY_P}
185 fi
186
187 diff --git a/dev-vcs/qgit/qgit-9999.ebuild b/dev-vcs/qgit/qgit-9999.ebuild
188 index 190a7b4..e1dc71b 100644
189 --- a/dev-vcs/qgit/qgit-9999.ebuild
190 +++ b/dev-vcs/qgit/qgit-9999.ebuild
191 @@ -3,7 +3,7 @@
192 # $Header: $
193
194 EAPI=4
195 -inherit qt4-edge git-2
196 +inherit qt4-r2 git-2
197
198 DESCRIPTION="GUI interface for git/cogito SCM"
199 HOMEPAGE="http://digilander.libero.it/mcostalba/"
200
201 diff --git a/mail-client/imapquickcheck/imapquickcheck-1.2.ebuild b/mail-client/imapquickcheck/imapquickcheck-1.2.ebuild
202 index 607cb0b..848721a 100644
203 --- a/mail-client/imapquickcheck/imapquickcheck-1.2.ebuild
204 +++ b/mail-client/imapquickcheck/imapquickcheck-1.2.ebuild
205 @@ -6,7 +6,7 @@ EAPI="2"
206
207 LANGS="fr"
208
209 -inherit qt4-edge
210 +inherit qt4-r2
211
212 MY_PN=ImapQuickCheck
213 MY_P=${MY_PN}-${PV}
214
215 diff --git a/mail-client/imapquickcheck/imapquickcheck-1.3.ebuild b/mail-client/imapquickcheck/imapquickcheck-1.3.ebuild
216 index 08f53b8..d9ad36f 100644
217 --- a/mail-client/imapquickcheck/imapquickcheck-1.3.ebuild
218 +++ b/mail-client/imapquickcheck/imapquickcheck-1.3.ebuild
219 @@ -6,7 +6,7 @@ EAPI=4
220
221 LANGS="fr"
222
223 -inherit eutils qt4-edge
224 +inherit eutils qt4-r2
225
226 MY_PN=ImapQuickCheck
227
228
229 diff --git a/media-gfx/google-image-downloader/google-image-downloader-1.1.ebuild b/media-gfx/google-image-downloader/google-image-downloader-1.1.ebuild
230 index 8eb75a9..684dd7b 100644
231 --- a/media-gfx/google-image-downloader/google-image-downloader-1.1.ebuild
232 +++ b/media-gfx/google-image-downloader/google-image-downloader-1.1.ebuild
233 @@ -4,7 +4,7 @@
234
235 EAPI="2"
236
237 -inherit qt4-edge
238 +inherit qt4-r2
239
240 MY_PKG_PN="GoogleImageDownloader"
241 MY_SRC_PN="${MY_PKG_PN/Image/Img}"
242
243 diff --git a/media-gfx/gsalbumer/gsalbumer-1.26.ebuild b/media-gfx/gsalbumer/gsalbumer-1.26.ebuild
244 index d12df81..6427154 100644
245 --- a/media-gfx/gsalbumer/gsalbumer-1.26.ebuild
246 +++ b/media-gfx/gsalbumer/gsalbumer-1.26.ebuild
247 @@ -4,7 +4,7 @@
248
249 EAPI="2"
250
251 -inherit qt4-edge
252 +inherit qt4-r2
253
254 MY_PN="GSalbumer"
255
256
257 diff --git a/media-gfx/screenie/screenie-9999.ebuild b/media-gfx/screenie/screenie-9999.ebuild
258 index 8ddcce1..156c920 100644
259 --- a/media-gfx/screenie/screenie-9999.ebuild
260 +++ b/media-gfx/screenie/screenie-9999.ebuild
261 @@ -4,7 +4,7 @@
262
263 EAPI=4
264
265 -inherit qt4-edge git-2 multilib
266 +inherit qt4-r2 git-2 multilib
267
268 EGIT_REPO_URI="git://github.com/ariya/screenie.git"
269
270 @@ -20,7 +20,7 @@ DEPEND="x11-libs/qt-gui:4"
271 RDEPEND="${DEPEND}"
272
273 src_prepare () {
274 - qt4-edge_src_prepare
275 + qt4-r2_src_prepare
276 sed -i -e "/^Exec/s:Screenie:${PN}:" -e "/^TryExec/s:Screenie:${PN}:" \
277 "${S}"/src/Screenie/res/${PN}.desktop || die
278 }
279
280 diff --git a/media-sound/mp3diags/mp3diags-9999.ebuild b/media-sound/mp3diags/mp3diags-9999.ebuild
281 index 8d89e12..151018a 100644
282 --- a/media-sound/mp3diags/mp3diags-9999.ebuild
283 +++ b/media-sound/mp3diags/mp3diags-9999.ebuild
284 @@ -4,7 +4,7 @@
285
286 EAPI="2"
287
288 -inherit qt4-edge subversion
289 +inherit qt4-r2 subversion
290
291 MY_PN=${PN/mp3d/MP3D}
292 S=${WORKDIR}/${PN}
293
294 diff --git a/media-sound/qtmpc/qtmpc-0.5.0.ebuild b/media-sound/qtmpc/qtmpc-0.5.0.ebuild
295 index 4010dca..fae2e1b 100644
296 --- a/media-sound/qtmpc/qtmpc-0.5.0.ebuild
297 +++ b/media-sound/qtmpc/qtmpc-0.5.0.ebuild
298 @@ -5,7 +5,7 @@
299 EAPI=3
300
301 KDE_REQUIRED="optional"
302 -inherit qt4-edge kde4-base
303 +inherit qt4-r2 kde4-base
304
305 DESCRIPTION="Qt MPD client with a tree view music library interface"
306 HOMEPAGE="http://lowblog.nl/category/qtmpc/"
307
308 diff --git a/media-sound/qtmpc/qtmpc-9999.ebuild b/media-sound/qtmpc/qtmpc-9999.ebuild
309 index 9467359..707eda0 100644
310 --- a/media-sound/qtmpc/qtmpc-9999.ebuild
311 +++ b/media-sound/qtmpc/qtmpc-9999.ebuild
312 @@ -5,7 +5,7 @@
313 EAPI=3
314
315 KDE_REQUIRED="optional"
316 -inherit qt4-edge kde4-base subversion
317 +inherit qt4-r2 kde4-base subversion
318
319 DESCRIPTION="Qt MPD client with a tree view music library interface"
320 HOMEPAGE="http://lowblog.nl/category/qtmpc/"
321
322 diff --git a/media-video/xvideoservicethief/xvideoservicethief-9999.ebuild b/media-video/xvideoservicethief/xvideoservicethief-9999.ebuild
323 index 1a63eeb..d82578f 100644
324 --- a/media-video/xvideoservicethief/xvideoservicethief-9999.ebuild
325 +++ b/media-video/xvideoservicethief/xvideoservicethief-9999.ebuild
326 @@ -6,7 +6,7 @@ EAPI="2"
327
328 LANGS="br ca cs da de es fr gl hu it ja ko nl pl ro ru sv"
329
330 -inherit qt4-edge versionator subversion
331 +inherit qt4-r2 versionator subversion
332
333 MY_PN="xVST"
334 MY_PV=$(replace_all_version_separators '_')
335 @@ -45,7 +45,7 @@ src_prepare() {
336 # fix plugins, language path
337 sed -i -e "s/getApplicationPath()\ +\ \"/\"\/usr\/share\/${PN}/g" \
338 "${S}"/src/options.cpp || die "failed to fix paths"
339 - qt4-edge_src_prepare
340 + qt4-r2_src_prepare
341 }
342
343 src_compile() {
344
345 diff --git a/net-dialup/checkppp/checkppp-1.5.0.ebuild b/net-dialup/checkppp/checkppp-1.5.0.ebuild
346 index 87b8826..3d5839f 100644
347 --- a/net-dialup/checkppp/checkppp-1.5.0.ebuild
348 +++ b/net-dialup/checkppp/checkppp-1.5.0.ebuild
349 @@ -4,7 +4,7 @@
350
351 EAPI="2"
352
353 -inherit qt4-edge
354 +inherit qt4-r2
355
356 MY_PN="CheckPPP"
357
358
359 diff --git a/net-im/qtwitter/qtwitter-9999.ebuild b/net-im/qtwitter/qtwitter-9999.ebuild
360 index fac22f2..5e75a85 100644
361 --- a/net-im/qtwitter/qtwitter-9999.ebuild
362 +++ b/net-im/qtwitter/qtwitter-9999.ebuild
363 @@ -7,7 +7,7 @@ EAPI=4
364 LANGS="nb_NO pt_BR"
365 LANGSLONG="ca_ES cs_CZ de_DE es_ES fr_FR it_IT ja_JP pl_PL"
366
367 -inherit qt4-edge git-2
368 +inherit qt4-r2 git-2
369
370 DESCRIPTION="A Qt-based microblogging client"
371 HOMEPAGE="http://www.qt-apps.org/content/show.php/qTwitter?content=99087"
372 @@ -30,7 +30,7 @@ S="${WORKDIR}/${PN}"
373 DOCS="README CHANGELOG"
374
375 src_prepare() {
376 - qt4-edge_src_prepare
377 + qt4-r2_src_prepare
378 echo "CONFIG += nostrip" >> "${S}"/${PN}.pro
379
380 local langs=
381
382 diff --git a/net-im/qwit/qwit-9999.ebuild b/net-im/qwit/qwit-9999.ebuild
383 index f1aa5d2..c0c5f7e 100644
384 --- a/net-im/qwit/qwit-9999.ebuild
385 +++ b/net-im/qwit/qwit-9999.ebuild
386 @@ -4,7 +4,7 @@
387
388 EAPI="2"
389
390 -inherit qt4-edge subversion
391 +inherit qt4-r2 subversion
392
393 MY_P=${P/_/-}-src
394
395
396 diff --git a/net-misc/kontrolpack/kontrolpack-3.0.0.ebuild b/net-misc/kontrolpack/kontrolpack-3.0.0.ebuild
397 index 1eeaee4..27e21c0 100644
398 --- a/net-misc/kontrolpack/kontrolpack-3.0.0.ebuild
399 +++ b/net-misc/kontrolpack/kontrolpack-3.0.0.ebuild
400 @@ -4,7 +4,7 @@
401
402 EAPI="4"
403
404 -inherit eutils qt4-edge
405 +inherit eutils qt4-r2
406
407 MY_PN="KontrolPack"
408 MY_P="${MY_PN}-${PV}"
409
410 diff --git a/net-misc/qconnman/qconnman-9999.ebuild b/net-misc/qconnman/qconnman-9999.ebuild
411 index b63358d..fcc8c59 100644
412 --- a/net-misc/qconnman/qconnman-9999.ebuild
413 +++ b/net-misc/qconnman/qconnman-9999.ebuild
414 @@ -4,7 +4,7 @@
415
416 EAPI=4
417
418 -inherit qt4-edge git-2
419 +inherit qt4-r2 git-2
420
421 DESCRIPTION="Qt4 Connman Applet"
422 HOMEPAGE="https://github.com/OSSystems/qconnman"
423
424 diff --git a/sci-electronics/fritzing/fritzing-0.7.1b.ebuild b/sci-electronics/fritzing/fritzing-0.7.1b.ebuild
425 index 0688fc5..555bde1 100644
426 --- a/sci-electronics/fritzing/fritzing-0.7.1b.ebuild
427 +++ b/sci-electronics/fritzing/fritzing-0.7.1b.ebuild
428 @@ -9,7 +9,7 @@ MY_PN="Fritzing"
429 LANGS="ar bg cs de el en es et fr gl hi hu it ja ko nl pl ro ru sv th tr"
430 LANGSLONG="pt_BR pt_PT zh_CN zh_TW"
431
432 -inherit eutils qt4-edge
433 +inherit eutils qt4-r2
434
435 DESCRIPTION="breadboard and arduino prototyping"
436 HOMEPAGE="http://fritzing.org/"
437 @@ -54,5 +54,5 @@ src_configure() {
438
439 src_install() {
440 doman ${MY_PN}.1
441 - qt4-edge_src_install
442 + qt4-r2_src_install
443 }
444
445 diff --git a/x11-themes/quantumstyle/quantumstyle-0_rc3.ebuild b/x11-themes/quantumstyle/quantumstyle-0_rc3.ebuild
446 index 7101847..efecd8f 100644
447 --- a/x11-themes/quantumstyle/quantumstyle-0_rc3.ebuild
448 +++ b/x11-themes/quantumstyle/quantumstyle-0_rc3.ebuild
449 @@ -4,7 +4,7 @@
450
451 EAPI=4
452
453 -inherit multilib qt4-edge
454 +inherit multilib qt4-r2
455
456 MY_PN="QuantumStyle"
457 MY_P="${MY_PN}-${PV/*_/}"
458
459 diff --git a/x11-themes/xcurtheme/xcurtheme-9999.ebuild b/x11-themes/xcurtheme/xcurtheme-9999.ebuild
460 index eb1c641..2055db0 100644
461 --- a/x11-themes/xcurtheme/xcurtheme-9999.ebuild
462 +++ b/x11-themes/xcurtheme/xcurtheme-9999.ebuild
463 @@ -4,7 +4,7 @@
464
465 EAPI=4
466
467 -inherit qt4-edge git-2
468 +inherit qt4-r2 git-2
469
470 DESCRIPTION="Qt utility to change Xcrusor themes without restarting X Server."
471 HOMEPAGE="http://gitorious.org/qt-xcurtheme"
472 @@ -30,7 +30,7 @@ src_prepare() {
473 }
474
475 src_configure() {
476 - qt4-edge_src_configure
477 + qt4-r2_src_configure
478 if use tools; then
479 pushd tools/cursorFXconvert/
480 eqmake4
481 @@ -39,7 +39,7 @@ src_configure() {
482 }
483
484 src_compile() {
485 - qt4-edge_src_compile
486 + qt4-r2_src_compile
487 if use tools; then
488 pushd tools/cursorFXconvert/
489 emake
Report Message
Find on MARC Find on Google Groups