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/qttest/, dev-qt/pixeltool/, dev-qt/qtmultimedia/, dev-qt/qdbusviewer/, ...
Date: Mon, 02 Jun 2014 18:44:31
Message-Id: 1401734638.c257170e0c37c3a6fa3874dda7b650b1d2af8297.pesa@gentoo
1 commit: c257170e0c37c3a6fa3874dda7b650b1d2af8297
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 2 18:43:58 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 2 18:43:58 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c257170e
7
8 [Qt4] Add MULTILIB_USEDEP where appropriate.
9
10 ---
11 dev-qt/assistant/assistant-4.8.6.ebuild | 10 ++--
12 dev-qt/assistant/assistant-4.8.9999.ebuild | 10 ++--
13 dev-qt/designer/designer-4.8.6.ebuild | 14 ++---
14 dev-qt/designer/designer-4.8.9999.ebuild | 14 ++---
15 dev-qt/linguist/linguist-4.8.6.ebuild | 6 +-
16 dev-qt/linguist/linguist-4.8.9999.ebuild | 6 +-
17 dev-qt/pixeltool/pixeltool-4.8.6.ebuild | 4 +-
18 dev-qt/pixeltool/pixeltool-4.8.9999.ebuild | 4 +-
19 dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild | 6 +-
20 dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild | 6 +-
21 dev-qt/qt3support/qt3support-4.8.6.ebuild | 6 +-
22 dev-qt/qt3support/qt3support-4.8.9999.ebuild | 6 +-
23 dev-qt/qtbearer/qtbearer-4.8.6.ebuild | 6 +-
24 dev-qt/qtbearer/qtbearer-4.8.9999.ebuild | 6 +-
25 dev-qt/qtcore/qtcore-4.8.6.ebuild | 10 ++--
26 dev-qt/qtcore/qtcore-4.8.9999.ebuild | 10 ++--
27 dev-qt/qtdbus/qtdbus-4.8.6.ebuild | 4 +-
28 dev-qt/qtdbus/qtdbus-4.8.9999.ebuild | 4 +-
29 dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild | 18 +++---
30 dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild | 18 +++---
31 dev-qt/qtdemo/qtdemo-4.8.6.ebuild | 32 +++++------
32 dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 32 +++++------
33 dev-qt/qtgui/qtgui-4.8.6.ebuild | 64 +++++++++++-----------
34 dev-qt/qtgui/qtgui-4.8.9999.ebuild | 64 +++++++++++-----------
35 dev-qt/qthelp/qthelp-4.8.6.ebuild | 10 ++--
36 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 10 ++--
37 dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild | 6 +-
38 dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild | 6 +-
39 dev-qt/qtopengl/qtopengl-4.8.6.ebuild | 10 ++--
40 dev-qt/qtopengl/qtopengl-4.8.9999.ebuild | 10 ++--
41 dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild | 6 +-
42 dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild | 6 +-
43 dev-qt/qtphonon/qtphonon-4.8.6.ebuild | 16 +++---
44 dev-qt/qtphonon/qtphonon-4.8.9999.ebuild | 16 +++---
45 dev-qt/qtscript/qtscript-4.8.6.ebuild | 2 +-
46 dev-qt/qtscript/qtscript-4.8.9999.ebuild | 2 +-
47 dev-qt/qtsql/qtsql-4.8.6.ebuild | 8 +--
48 dev-qt/qtsql/qtsql-4.8.9999.ebuild | 8 +--
49 dev-qt/qtsvg/qtsvg-4.8.6.ebuild | 6 +-
50 dev-qt/qtsvg/qtsvg-4.8.9999.ebuild | 6 +-
51 dev-qt/qttest/qttest-4.8.6.ebuild | 2 +-
52 dev-qt/qttest/qttest-4.8.9999.ebuild | 2 +-
53 dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild | 18 +++---
54 dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild | 18 +++---
55 dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild | 2 +-
56 dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild | 2 +-
57 46 files changed, 268 insertions(+), 264 deletions(-)
58
59 diff --git a/dev-qt/assistant/assistant-4.8.6.ebuild b/dev-qt/assistant/assistant-4.8.6.ebuild
60 index 0a54ca0..60846fa 100644
61 --- a/dev-qt/assistant/assistant-4.8.6.ebuild
62 +++ b/dev-qt/assistant/assistant-4.8.6.ebuild
63 @@ -17,11 +17,11 @@ fi
64 IUSE="webkit"
65
66 DEPEND="
67 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
68 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
69 - ~dev-qt/qthelp-${PV}[aqua=,debug=]
70 - ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
71 - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
72 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
73 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
74 + ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
75 + ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
76 + webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
77 "
78 RDEPEND="${DEPEND}"
79
80
81 diff --git a/dev-qt/assistant/assistant-4.8.9999.ebuild b/dev-qt/assistant/assistant-4.8.9999.ebuild
82 index 0a54ca0..60846fa 100644
83 --- a/dev-qt/assistant/assistant-4.8.9999.ebuild
84 +++ b/dev-qt/assistant/assistant-4.8.9999.ebuild
85 @@ -17,11 +17,11 @@ fi
86 IUSE="webkit"
87
88 DEPEND="
89 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
90 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
91 - ~dev-qt/qthelp-${PV}[aqua=,debug=]
92 - ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
93 - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
94 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
95 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
96 + ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
97 + ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
98 + webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
99 "
100 RDEPEND="${DEPEND}"
101
102
103 diff --git a/dev-qt/designer/designer-4.8.6.ebuild b/dev-qt/designer/designer-4.8.6.ebuild
104 index 5ae0273..0b0d858 100644
105 --- a/dev-qt/designer/designer-4.8.6.ebuild
106 +++ b/dev-qt/designer/designer-4.8.6.ebuild
107 @@ -18,13 +18,13 @@ DESIGNER_PLUGINS="declarative phonon qt3support webkit"
108 IUSE="${DESIGNER_PLUGINS}"
109
110 DEPEND="
111 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
112 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
113 - ~dev-qt/qtscript-${PV}[aqua=,debug=]
114 - declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=] )
115 - phonon? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] )
116 - qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
117 - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
118 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
119 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
120 + ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
121 + declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
122 + phonon? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
123 + qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
124 + webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
125 "
126 RDEPEND="${DEPEND}"
127
128
129 diff --git a/dev-qt/designer/designer-4.8.9999.ebuild b/dev-qt/designer/designer-4.8.9999.ebuild
130 index 5ae0273..0b0d858 100644
131 --- a/dev-qt/designer/designer-4.8.9999.ebuild
132 +++ b/dev-qt/designer/designer-4.8.9999.ebuild
133 @@ -18,13 +18,13 @@ DESIGNER_PLUGINS="declarative phonon qt3support webkit"
134 IUSE="${DESIGNER_PLUGINS}"
135
136 DEPEND="
137 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
138 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
139 - ~dev-qt/qtscript-${PV}[aqua=,debug=]
140 - declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=] )
141 - phonon? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] )
142 - qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
143 - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
144 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
145 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
146 + ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
147 + declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
148 + phonon? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
149 + qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
150 + webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
151 "
152 RDEPEND="${DEPEND}"
153
154
155 diff --git a/dev-qt/linguist/linguist-4.8.6.ebuild b/dev-qt/linguist/linguist-4.8.6.ebuild
156 index 606e0af..62bfacf 100644
157 --- a/dev-qt/linguist/linguist-4.8.6.ebuild
158 +++ b/dev-qt/linguist/linguist-4.8.6.ebuild
159 @@ -17,9 +17,9 @@ fi
160 IUSE=""
161
162 DEPEND="
163 - ~dev-qt/designer-${PV}[aqua=,debug=]
164 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
165 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
166 + ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
167 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
168 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
169 "
170 RDEPEND="${DEPEND}"
171
172
173 diff --git a/dev-qt/linguist/linguist-4.8.9999.ebuild b/dev-qt/linguist/linguist-4.8.9999.ebuild
174 index 606e0af..62bfacf 100644
175 --- a/dev-qt/linguist/linguist-4.8.9999.ebuild
176 +++ b/dev-qt/linguist/linguist-4.8.9999.ebuild
177 @@ -17,9 +17,9 @@ fi
178 IUSE=""
179
180 DEPEND="
181 - ~dev-qt/designer-${PV}[aqua=,debug=]
182 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
183 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
184 + ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
185 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
186 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
187 "
188 RDEPEND="${DEPEND}"
189
190
191 diff --git a/dev-qt/pixeltool/pixeltool-4.8.6.ebuild b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
192 index b61f5ed..07cf48b 100644
193 --- a/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
194 +++ b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
195 @@ -17,8 +17,8 @@ fi
196 IUSE=""
197
198 DEPEND="
199 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
200 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
201 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
202 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
203 !<dev-qt/qthelp-4.8.5:4
204 "
205 RDEPEND="${DEPEND}"
206
207 diff --git a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
208 index b61f5ed..07cf48b 100644
209 --- a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
210 +++ b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
211 @@ -17,8 +17,8 @@ fi
212 IUSE=""
213
214 DEPEND="
215 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
216 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
217 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
218 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
219 !<dev-qt/qthelp-4.8.5:4
220 "
221 RDEPEND="${DEPEND}"
222
223 diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
224 index 303fc8d..fe83d4c 100644
225 --- a/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
226 +++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
227 @@ -17,9 +17,9 @@ fi
228 IUSE=""
229
230 DEPEND="
231 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
232 - ~dev-qt/qtdbus-${PV}[aqua=,debug=]
233 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
234 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
235 + ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
236 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
237 "
238 RDEPEND="${DEPEND}"
239
240
241 diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
242 index 303fc8d..fe83d4c 100644
243 --- a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
244 +++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
245 @@ -17,9 +17,9 @@ fi
246 IUSE=""
247
248 DEPEND="
249 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
250 - ~dev-qt/qtdbus-${PV}[aqua=,debug=]
251 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
252 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
253 + ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
254 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
255 "
256 RDEPEND="${DEPEND}"
257
258
259 diff --git a/dev-qt/qt3support/qt3support-4.8.6.ebuild b/dev-qt/qt3support/qt3support-4.8.6.ebuild
260 index 191103e..ab38a26 100644
261 --- a/dev-qt/qt3support/qt3support-4.8.6.ebuild
262 +++ b/dev-qt/qt3support/qt3support-4.8.6.ebuild
263 @@ -17,9 +17,9 @@ fi
264 IUSE="+accessibility"
265
266 DEPEND="
267 - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support]
268 - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support]
269 - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support]
270 + ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
271 + ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
272 + ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
273 "
274 RDEPEND="${DEPEND}"
275
276
277 diff --git a/dev-qt/qt3support/qt3support-4.8.9999.ebuild b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
278 index 191103e..ab38a26 100644
279 --- a/dev-qt/qt3support/qt3support-4.8.9999.ebuild
280 +++ b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
281 @@ -17,9 +17,9 @@ fi
282 IUSE="+accessibility"
283
284 DEPEND="
285 - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support]
286 - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support]
287 - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support]
288 + ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
289 + ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
290 + ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
291 "
292 RDEPEND="${DEPEND}"
293
294
295 diff --git a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
296 index d5c7eb1..bb01c0a 100644
297 --- a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
298 +++ b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
299 @@ -17,9 +17,9 @@ fi
300 IUSE="connman networkmanager"
301
302 DEPEND="
303 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
304 - connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
305 - networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
306 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
307 + connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
308 + networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
309 "
310 RDEPEND="${DEPEND}
311 connman? ( net-misc/connman )
312
313 diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
314 index d5c7eb1..bb01c0a 100644
315 --- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
316 +++ b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
317 @@ -17,9 +17,9 @@ fi
318 IUSE="connman networkmanager"
319
320 DEPEND="
321 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
322 - connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
323 - networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
324 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
325 + connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
326 + networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
327 "
328 RDEPEND="${DEPEND}
329 connman? ( net-misc/connman )
330
331 diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
332 index 60bff0a..783bbdb 100644
333 --- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
334 +++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
335 @@ -17,15 +17,15 @@ fi
336 IUSE="+glib iconv icu qt3support ssl"
337
338 DEPEND="
339 - sys-libs/zlib
340 - glib? ( dev-libs/glib:2 )
341 - icu? ( dev-libs/icu:= )
342 - ssl? ( dev-libs/openssl:0 )
343 + sys-libs/zlib[${MULTILIB_USEDEP}]
344 + glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
345 + icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
346 + ssl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
347 "
348 RDEPEND="${DEPEND}"
349 PDEPEND="
350 ~dev-qt/qttranslations-${PV}
351 - qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
352 + qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
353 "
354
355 PATCHES=(
356
357 diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
358 index 60bff0a..783bbdb 100644
359 --- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
360 +++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
361 @@ -17,15 +17,15 @@ fi
362 IUSE="+glib iconv icu qt3support ssl"
363
364 DEPEND="
365 - sys-libs/zlib
366 - glib? ( dev-libs/glib:2 )
367 - icu? ( dev-libs/icu:= )
368 - ssl? ( dev-libs/openssl:0 )
369 + sys-libs/zlib[${MULTILIB_USEDEP}]
370 + glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
371 + icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
372 + ssl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
373 "
374 RDEPEND="${DEPEND}"
375 PDEPEND="
376 ~dev-qt/qttranslations-${PV}
377 - qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
378 + qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
379 "
380
381 PATCHES=(
382
383 diff --git a/dev-qt/qtdbus/qtdbus-4.8.6.ebuild b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
384 index d4fcbde..df916b8 100644
385 --- a/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
386 +++ b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
387 @@ -17,8 +17,8 @@ fi
388 IUSE=""
389
390 DEPEND="
391 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
392 - sys-apps/dbus
393 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
394 + sys-apps/dbus[${MULTILIB_USEDEP}]
395 "
396 RDEPEND="${DEPEND}"
397
398
399 diff --git a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
400 index d4fcbde..df916b8 100644
401 --- a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
402 +++ b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
403 @@ -17,8 +17,8 @@ fi
404 IUSE=""
405
406 DEPEND="
407 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
408 - sys-apps/dbus
409 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
410 + sys-apps/dbus[${MULTILIB_USEDEP}]
411 "
412 RDEPEND="${DEPEND}"
413
414
415 diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
416 index 3247b62..5a5c974 100644
417 --- a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
418 +++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
419 @@ -17,15 +17,15 @@ fi
420 IUSE="+accessibility qt3support webkit"
421
422 DEPEND="
423 - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
424 - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=]
425 - ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=]
426 - ~dev-qt/qtscript-${PV}[aqua=,debug=]
427 - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=]
428 - ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=]
429 - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
430 - qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=] )
431 - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
432 + ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
433 + ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
434 + ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
435 + ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
436 + ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
437 + ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
438 + ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
439 + qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] )
440 + webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
441 "
442 RDEPEND="${DEPEND}"
443
444
445 diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
446 index 3247b62..5a5c974 100644
447 --- a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
448 +++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
449 @@ -17,15 +17,15 @@ fi
450 IUSE="+accessibility qt3support webkit"
451
452 DEPEND="
453 - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
454 - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=]
455 - ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=]
456 - ~dev-qt/qtscript-${PV}[aqua=,debug=]
457 - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=]
458 - ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=]
459 - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
460 - qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=] )
461 - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
462 + ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
463 + ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
464 + ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
465 + ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
466 + ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
467 + ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
468 + ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
469 + qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] )
470 + webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
471 "
472 RDEPEND="${DEPEND}"
473
474
475 diff --git a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
476 index 50072f8..e74659d 100644
477 --- a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
478 +++ b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
479 @@ -17,25 +17,25 @@ fi
480 IUSE="dbus declarative kde multimedia opengl openvg phonon webkit xmlpatterns"
481
482 DEPEND="
483 - ~dev-qt/designer-${PV}[aqua=,debug=]
484 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
485 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
486 - ~dev-qt/qthelp-${PV}[aqua=,debug=]
487 - ~dev-qt/qtscript-${PV}[aqua=,debug=]
488 - ~dev-qt/qtsql-${PV}[aqua=,debug=]
489 - ~dev-qt/qtsvg-${PV}[aqua=,debug=]
490 - ~dev-qt/qttest-${PV}[aqua=,debug=]
491 - dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
492 - declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?] )
493 - multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=] )
494 - opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=] )
495 - openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=] )
496 + ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
497 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
498 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
499 + ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
500 + ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
501 + ~dev-qt/qtsql-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
502 + ~dev-qt/qtsvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
503 + ~dev-qt/qttest-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
504 + dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
505 + declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
506 + multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
507 + opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
508 + openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
509 phonon? (
510 kde? ( media-libs/phonon[aqua=] )
511 - !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=] ) )
512 + !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=] ) )
513 )
514 - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
515 - xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] )
516 + webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
517 + xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
518 "
519 RDEPEND="${DEPEND}"
520
521
522 diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
523 index 50072f8..e74659d 100644
524 --- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
525 +++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
526 @@ -17,25 +17,25 @@ fi
527 IUSE="dbus declarative kde multimedia opengl openvg phonon webkit xmlpatterns"
528
529 DEPEND="
530 - ~dev-qt/designer-${PV}[aqua=,debug=]
531 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
532 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
533 - ~dev-qt/qthelp-${PV}[aqua=,debug=]
534 - ~dev-qt/qtscript-${PV}[aqua=,debug=]
535 - ~dev-qt/qtsql-${PV}[aqua=,debug=]
536 - ~dev-qt/qtsvg-${PV}[aqua=,debug=]
537 - ~dev-qt/qttest-${PV}[aqua=,debug=]
538 - dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
539 - declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?] )
540 - multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=] )
541 - opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=] )
542 - openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=] )
543 + ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
544 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
545 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
546 + ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
547 + ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
548 + ~dev-qt/qtsql-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
549 + ~dev-qt/qtsvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
550 + ~dev-qt/qttest-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
551 + dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
552 + declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
553 + multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
554 + opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
555 + openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
556 phonon? (
557 kde? ( media-libs/phonon[aqua=] )
558 - !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=] ) )
559 + !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=] ) )
560 )
561 - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
562 - xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] )
563 + webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
564 + xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
565 "
566 RDEPEND="${DEPEND}"
567
568
569 diff --git a/dev-qt/qtgui/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild
570 index 8191652..9adb751 100644
571 --- a/dev-qt/qtgui/qtgui-4.8.6.ebuild
572 +++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild
573 @@ -23,47 +23,49 @@ REQUIRED_USE="
574 # cairo[-qt4] is needed because of bug 454066
575 RDEPEND="
576 app-admin/eselect-qtgraphicssystem
577 - ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=]
578 - ~dev-qt/qtscript-${PV}[aqua=,debug=]
579 - media-libs/fontconfig
580 - media-libs/freetype:2
581 - media-libs/libpng:0=
582 - sys-libs/zlib
583 - virtual/jpeg:0
584 + ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}]
585 + ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
586 + media-libs/fontconfig[${MULTILIB_USEDEP}]
587 + media-libs/freetype:2[${MULTILIB_USEDEP}]
588 + media-libs/libpng:0=[${MULTILIB_USEDEP}]
589 + sys-libs/zlib[${MULTILIB_USEDEP}]
590 + virtual/jpeg:0[${MULTILIB_USEDEP}]
591 !aqua? (
592 - x11-libs/libICE
593 - x11-libs/libSM
594 - x11-libs/libX11
595 - x11-libs/libXcursor
596 - x11-libs/libXext
597 - x11-libs/libXfixes
598 - x11-libs/libXi
599 - x11-libs/libXrandr
600 - x11-libs/libXrender
601 - xinerama? ( x11-libs/libXinerama )
602 - xv? ( x11-libs/libXv )
603 + x11-libs/libICE[${MULTILIB_USEDEP}]
604 + x11-libs/libSM[${MULTILIB_USEDEP}]
605 + x11-libs/libX11[${MULTILIB_USEDEP}]
606 + x11-libs/libXcursor[${MULTILIB_USEDEP}]
607 + x11-libs/libXext[${MULTILIB_USEDEP}]
608 + x11-libs/libXfixes[${MULTILIB_USEDEP}]
609 + x11-libs/libXi[${MULTILIB_USEDEP}]
610 + x11-libs/libXrandr[${MULTILIB_USEDEP}]
611 + x11-libs/libXrender[${MULTILIB_USEDEP}]
612 + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
613 + xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
614 )
615 - cups? ( net-print/cups )
616 - egl? ( media-libs/mesa[egl] )
617 - glib? ( dev-libs/glib:2 )
618 + cups? ( net-print/cups[${MULTILIB_USEDEP}] )
619 + egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
620 + glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
621 gtkstyle? (
622 - x11-libs/cairo[-qt4]
623 - x11-libs/gtk+:2[aqua=]
624 + x11-libs/cairo[-qt4,${MULTILIB_USEDEP}]
625 + x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
626 )
627 - mng? ( >=media-libs/libmng-1.0.9:= )
628 - nas? ( >=media-libs/nas-1.5 )
629 - tiff? ( media-libs/tiff:0 )
630 + mng? ( >=media-libs/libmng-1.0.9:=[${MULTILIB_USEDEP}] )
631 + nas? ( >=media-libs/nas-1.5[${MULTILIB_USEDEP}] )
632 + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
633 !<dev-qt/qthelp-4.8.5:4
634 "
635 DEPEND="${RDEPEND}
636 !aqua? (
637 - x11-proto/inputproto
638 - x11-proto/xextproto
639 - xinerama? ( x11-proto/xineramaproto )
640 - xv? ( x11-proto/videoproto )
641 + x11-proto/inputproto[${MULTILIB_USEDEP}]
642 + x11-proto/xextproto[${MULTILIB_USEDEP}]
643 + xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
644 + xv? ( x11-proto/videoproto[${MULTILIB_USEDEP}] )
645 )
646 "
647 -PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )"
648 +PDEPEND="
649 + qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
650 +"
651
652 PATCHES=(
653 "${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
654
655 diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
656 index 288ec37..a97b855 100644
657 --- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
658 +++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
659 @@ -23,47 +23,49 @@ REQUIRED_USE="
660 # cairo[-qt4] is needed because of bug 454066
661 RDEPEND="
662 app-admin/eselect-qtgraphicssystem
663 - ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=]
664 - ~dev-qt/qtscript-${PV}[aqua=,debug=]
665 - media-libs/fontconfig
666 - media-libs/freetype:2
667 - media-libs/libpng:0=
668 - sys-libs/zlib
669 - virtual/jpeg:0
670 + ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}]
671 + ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
672 + media-libs/fontconfig[${MULTILIB_USEDEP}]
673 + media-libs/freetype:2[${MULTILIB_USEDEP}]
674 + media-libs/libpng:0=[${MULTILIB_USEDEP}]
675 + sys-libs/zlib[${MULTILIB_USEDEP}]
676 + virtual/jpeg:0[${MULTILIB_USEDEP}]
677 !aqua? (
678 - x11-libs/libICE
679 - x11-libs/libSM
680 - x11-libs/libX11
681 - x11-libs/libXcursor
682 - x11-libs/libXext
683 - x11-libs/libXfixes
684 - x11-libs/libXi
685 - x11-libs/libXrandr
686 - x11-libs/libXrender
687 - xinerama? ( x11-libs/libXinerama )
688 - xv? ( x11-libs/libXv )
689 + x11-libs/libICE[${MULTILIB_USEDEP}]
690 + x11-libs/libSM[${MULTILIB_USEDEP}]
691 + x11-libs/libX11[${MULTILIB_USEDEP}]
692 + x11-libs/libXcursor[${MULTILIB_USEDEP}]
693 + x11-libs/libXext[${MULTILIB_USEDEP}]
694 + x11-libs/libXfixes[${MULTILIB_USEDEP}]
695 + x11-libs/libXi[${MULTILIB_USEDEP}]
696 + x11-libs/libXrandr[${MULTILIB_USEDEP}]
697 + x11-libs/libXrender[${MULTILIB_USEDEP}]
698 + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
699 + xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
700 )
701 - cups? ( net-print/cups )
702 - egl? ( media-libs/mesa[egl] )
703 - glib? ( dev-libs/glib:2 )
704 + cups? ( net-print/cups[${MULTILIB_USEDEP}] )
705 + egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
706 + glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
707 gtkstyle? (
708 - x11-libs/cairo[-qt4]
709 - x11-libs/gtk+:2[aqua=]
710 + x11-libs/cairo[-qt4,${MULTILIB_USEDEP}]
711 + x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
712 )
713 - mng? ( >=media-libs/libmng-1.0.9:= )
714 - nas? ( >=media-libs/nas-1.5 )
715 - tiff? ( media-libs/tiff:0 )
716 + mng? ( >=media-libs/libmng-1.0.9:=[${MULTILIB_USEDEP}] )
717 + nas? ( >=media-libs/nas-1.5[${MULTILIB_USEDEP}] )
718 + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
719 !<dev-qt/qthelp-4.8.5:4
720 "
721 DEPEND="${RDEPEND}
722 !aqua? (
723 - x11-proto/inputproto
724 - x11-proto/xextproto
725 - xinerama? ( x11-proto/xineramaproto )
726 - xv? ( x11-proto/videoproto )
727 + x11-proto/inputproto[${MULTILIB_USEDEP}]
728 + x11-proto/xextproto[${MULTILIB_USEDEP}]
729 + xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
730 + xv? ( x11-proto/videoproto[${MULTILIB_USEDEP}] )
731 )
732 "
733 -PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )"
734 +PDEPEND="
735 + qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
736 +"
737
738 PATCHES=(
739 "${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
740
741 diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild b/dev-qt/qthelp/qthelp-4.8.6.ebuild
742 index f385329..70ac632 100644
743 --- a/dev-qt/qthelp/qthelp-4.8.6.ebuild
744 +++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild
745 @@ -22,12 +22,12 @@ fi
746 IUSE="compat doc"
747
748 DEPEND="
749 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
750 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
751 - ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
752 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
753 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
754 + ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
755 compat? (
756 - ~dev-qt/qtdbus-${PV}[aqua=,debug=]
757 - sys-libs/zlib
758 + ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
759 + sys-libs/zlib[${MULTILIB_USEDEP}]
760 )
761 "
762 RDEPEND="${DEPEND}"
763
764 diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
765 index f385329..70ac632 100644
766 --- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
767 +++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
768 @@ -22,12 +22,12 @@ fi
769 IUSE="compat doc"
770
771 DEPEND="
772 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
773 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
774 - ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
775 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
776 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
777 + ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
778 compat? (
779 - ~dev-qt/qtdbus-${PV}[aqua=,debug=]
780 - sys-libs/zlib
781 + ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
782 + sys-libs/zlib[${MULTILIB_USEDEP}]
783 )
784 "
785 RDEPEND="${DEPEND}"
786
787 diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
788 index 897fa0d..32318e3 100644
789 --- a/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
790 +++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
791 @@ -17,9 +17,9 @@ fi
792 IUSE="alsa"
793
794 DEPEND="
795 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
796 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
797 - alsa? ( media-libs/alsa-lib )
798 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
799 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
800 + alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
801 "
802 RDEPEND="${DEPEND}"
803
804
805 diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
806 index 897fa0d..32318e3 100644
807 --- a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
808 +++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
809 @@ -17,9 +17,9 @@ fi
810 IUSE="alsa"
811
812 DEPEND="
813 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
814 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
815 - alsa? ( media-libs/alsa-lib )
816 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
817 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
818 + alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
819 "
820 RDEPEND="${DEPEND}"
821
822
823 diff --git a/dev-qt/qtopengl/qtopengl-4.8.6.ebuild b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
824 index 404909b..8c08988 100644
825 --- a/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
826 +++ b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
827 @@ -17,11 +17,11 @@ fi
828 IUSE="egl qt3support"
829
830 DEPEND="
831 - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
832 - ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=]
833 - x11-libs/libX11
834 - x11-libs/libXrender
835 - virtual/opengl
836 + ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
837 + ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=,${MULTILIB_USEDEP}]
838 + x11-libs/libX11[${MULTILIB_USEDEP}]
839 + x11-libs/libXrender[${MULTILIB_USEDEP}]
840 + virtual/opengl[${MULTILIB_USEDEP}]
841 "
842 RDEPEND="${DEPEND}"
843
844
845 diff --git a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
846 index 404909b..8c08988 100644
847 --- a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
848 +++ b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
849 @@ -17,11 +17,11 @@ fi
850 IUSE="egl qt3support"
851
852 DEPEND="
853 - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
854 - ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=]
855 - x11-libs/libX11
856 - x11-libs/libXrender
857 - virtual/opengl
858 + ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
859 + ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=,${MULTILIB_USEDEP}]
860 + x11-libs/libX11[${MULTILIB_USEDEP}]
861 + x11-libs/libXrender[${MULTILIB_USEDEP}]
862 + virtual/opengl[${MULTILIB_USEDEP}]
863 "
864 RDEPEND="${DEPEND}"
865
866
867 diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
868 index 73e2d06..84799f5 100644
869 --- a/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
870 +++ b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
871 @@ -17,9 +17,9 @@ fi
872 IUSE="qt3support"
873
874 DEPEND="
875 - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
876 - ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=]
877 - media-libs/mesa[egl,openvg]
878 + ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
879 + ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=,${MULTILIB_USEDEP}]
880 + media-libs/mesa[egl,openvg,${MULTILIB_USEDEP}]
881 "
882 RDEPEND="${DEPEND}"
883
884
885 diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
886 index 73e2d06..84799f5 100644
887 --- a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
888 +++ b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
889 @@ -17,9 +17,9 @@ fi
890 IUSE="qt3support"
891
892 DEPEND="
893 - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
894 - ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=]
895 - media-libs/mesa[egl,openvg]
896 + ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
897 + ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=,${MULTILIB_USEDEP}]
898 + media-libs/mesa[egl,openvg,${MULTILIB_USEDEP}]
899 "
900 RDEPEND="${DEPEND}"
901
902
903 diff --git a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
904 index 759970f..fb5979b 100644
905 --- a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
906 +++ b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
907 @@ -17,18 +17,18 @@ fi
908 IUSE="dbus qt3support"
909
910 DEPEND="
911 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
912 - ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=]
913 - !kde-base/phonon-kde
914 - !kde-base/phonon-xine
915 - !media-libs/phonon
916 - !media-sound/phonon
917 - aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=] )
918 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
919 + ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
920 + aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=,${MULTILIB_USEDEP}] )
921 !aqua? (
922 media-libs/gstreamer:0.10
923 media-plugins/gst-plugins-meta:0.10
924 )
925 - dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
926 + dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
927 + !kde-base/phonon-kde
928 + !kde-base/phonon-xine
929 + !media-libs/phonon
930 + !media-sound/phonon
931 "
932 RDEPEND="${DEPEND}"
933
934
935 diff --git a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
936 index 759970f..fb5979b 100644
937 --- a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
938 +++ b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
939 @@ -17,18 +17,18 @@ fi
940 IUSE="dbus qt3support"
941
942 DEPEND="
943 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
944 - ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=]
945 - !kde-base/phonon-kde
946 - !kde-base/phonon-xine
947 - !media-libs/phonon
948 - !media-sound/phonon
949 - aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=] )
950 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
951 + ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
952 + aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=,${MULTILIB_USEDEP}] )
953 !aqua? (
954 media-libs/gstreamer:0.10
955 media-plugins/gst-plugins-meta:0.10
956 )
957 - dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
958 + dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
959 + !kde-base/phonon-kde
960 + !kde-base/phonon-xine
961 + !media-libs/phonon
962 + !media-sound/phonon
963 "
964 RDEPEND="${DEPEND}"
965
966
967 diff --git a/dev-qt/qtscript/qtscript-4.8.6.ebuild b/dev-qt/qtscript/qtscript-4.8.6.ebuild
968 index 3f6b70c..e00c21e 100644
969 --- a/dev-qt/qtscript/qtscript-4.8.6.ebuild
970 +++ b/dev-qt/qtscript/qtscript-4.8.6.ebuild
971 @@ -17,7 +17,7 @@ fi
972 IUSE="iconv +jit"
973
974 DEPEND="
975 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
976 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
977 "
978 RDEPEND="${DEPEND}"
979
980
981 diff --git a/dev-qt/qtscript/qtscript-4.8.9999.ebuild b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
982 index 3f6b70c..e00c21e 100644
983 --- a/dev-qt/qtscript/qtscript-4.8.9999.ebuild
984 +++ b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
985 @@ -17,7 +17,7 @@ fi
986 IUSE="iconv +jit"
987
988 DEPEND="
989 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
990 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
991 "
992 RDEPEND="${DEPEND}"
993
994
995 diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
996 index c899348..c66e471 100644
997 --- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
998 +++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
999 @@ -21,14 +21,14 @@ REQUIRED_USE="
1000 "
1001
1002 DEPEND="
1003 - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
1004 + ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
1005 firebird? ( dev-db/firebird )
1006 freetds? ( dev-db/freetds )
1007 mysql? ( virtual/mysql )
1008 - oci8? ( dev-db/oracle-instantclient-basic )
1009 - odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
1010 + oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
1011 + odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc ) )
1012 postgres? ( dev-db/postgresql-base )
1013 - sqlite? ( dev-db/sqlite:3 )
1014 + sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
1015 "
1016 RDEPEND="${DEPEND}"
1017
1018
1019 diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
1020 index c899348..c66e471 100644
1021 --- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
1022 +++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
1023 @@ -21,14 +21,14 @@ REQUIRED_USE="
1024 "
1025
1026 DEPEND="
1027 - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
1028 + ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
1029 firebird? ( dev-db/firebird )
1030 freetds? ( dev-db/freetds )
1031 mysql? ( virtual/mysql )
1032 - oci8? ( dev-db/oracle-instantclient-basic )
1033 - odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
1034 + oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
1035 + odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc ) )
1036 postgres? ( dev-db/postgresql-base )
1037 - sqlite? ( dev-db/sqlite:3 )
1038 + sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
1039 "
1040 RDEPEND="${DEPEND}"
1041
1042
1043 diff --git a/dev-qt/qtsvg/qtsvg-4.8.6.ebuild b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
1044 index 7228081..8813c14 100644
1045 --- a/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
1046 +++ b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
1047 @@ -17,9 +17,9 @@ fi
1048 IUSE="+accessibility"
1049
1050 DEPEND="
1051 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
1052 - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=]
1053 - sys-libs/zlib
1054 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
1055 + ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
1056 + sys-libs/zlib[${MULTILIB_USEDEP}]
1057 "
1058 RDEPEND="${DEPEND}"
1059
1060
1061 diff --git a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
1062 index 7228081..8813c14 100644
1063 --- a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
1064 +++ b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
1065 @@ -17,9 +17,9 @@ fi
1066 IUSE="+accessibility"
1067
1068 DEPEND="
1069 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
1070 - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=]
1071 - sys-libs/zlib
1072 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
1073 + ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
1074 + sys-libs/zlib[${MULTILIB_USEDEP}]
1075 "
1076 RDEPEND="${DEPEND}"
1077
1078
1079 diff --git a/dev-qt/qttest/qttest-4.8.6.ebuild b/dev-qt/qttest/qttest-4.8.6.ebuild
1080 index 71ef73a..d151b5f 100644
1081 --- a/dev-qt/qttest/qttest-4.8.6.ebuild
1082 +++ b/dev-qt/qttest/qttest-4.8.6.ebuild
1083 @@ -17,7 +17,7 @@ fi
1084 IUSE=""
1085
1086 DEPEND="
1087 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
1088 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
1089 "
1090 RDEPEND="${DEPEND}"
1091
1092
1093 diff --git a/dev-qt/qttest/qttest-4.8.9999.ebuild b/dev-qt/qttest/qttest-4.8.9999.ebuild
1094 index 71ef73a..d151b5f 100644
1095 --- a/dev-qt/qttest/qttest-4.8.9999.ebuild
1096 +++ b/dev-qt/qttest/qttest-4.8.9999.ebuild
1097 @@ -17,7 +17,7 @@ fi
1098 IUSE=""
1099
1100 DEPEND="
1101 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
1102 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
1103 "
1104 RDEPEND="${DEPEND}"
1105
1106
1107 diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
1108 index c435448..1434a14 100644
1109 --- a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
1110 +++ b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
1111 @@ -18,19 +18,19 @@ IUSE="+gstreamer icu +jit"
1112
1113 # libxml2[!icu?] is needed for bugs 407315 and 411091
1114 DEPEND="
1115 - dev-db/sqlite:3
1116 - ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl]
1117 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
1118 - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
1119 - x11-libs/libX11
1120 - x11-libs/libXrender
1121 + dev-db/sqlite:3[${MULTILIB_USEDEP}]
1122 + ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}]
1123 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
1124 + ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
1125 + x11-libs/libX11[${MULTILIB_USEDEP}]
1126 + x11-libs/libXrender[${MULTILIB_USEDEP}]
1127 gstreamer? (
1128 - dev-libs/glib:2
1129 - dev-libs/libxml2:2[!icu?]
1130 + dev-libs/glib:2[${MULTILIB_USEDEP}]
1131 + dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}]
1132 >=media-libs/gstreamer-0.10.36:0.10
1133 >=media-libs/gst-plugins-base-0.10.36:0.10
1134 )
1135 - icu? ( dev-libs/icu:= )
1136 + icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
1137 "
1138 RDEPEND="${DEPEND}"
1139
1140
1141 diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
1142 index c435448..1434a14 100644
1143 --- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
1144 +++ b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
1145 @@ -18,19 +18,19 @@ IUSE="+gstreamer icu +jit"
1146
1147 # libxml2[!icu?] is needed for bugs 407315 and 411091
1148 DEPEND="
1149 - dev-db/sqlite:3
1150 - ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl]
1151 - ~dev-qt/qtgui-${PV}[aqua=,debug=]
1152 - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
1153 - x11-libs/libX11
1154 - x11-libs/libXrender
1155 + dev-db/sqlite:3[${MULTILIB_USEDEP}]
1156 + ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}]
1157 + ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
1158 + ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
1159 + x11-libs/libX11[${MULTILIB_USEDEP}]
1160 + x11-libs/libXrender[${MULTILIB_USEDEP}]
1161 gstreamer? (
1162 - dev-libs/glib:2
1163 - dev-libs/libxml2:2[!icu?]
1164 + dev-libs/glib:2[${MULTILIB_USEDEP}]
1165 + dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}]
1166 >=media-libs/gstreamer-0.10.36:0.10
1167 >=media-libs/gst-plugins-base-0.10.36:0.10
1168 )
1169 - icu? ( dev-libs/icu:= )
1170 + icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
1171 "
1172 RDEPEND="${DEPEND}"
1173
1174
1175 diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
1176 index 9c99fa9..e2941e9 100644
1177 --- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
1178 +++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
1179 @@ -17,7 +17,7 @@ fi
1180 IUSE=""
1181
1182 DEPEND="
1183 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
1184 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
1185 "
1186 RDEPEND="${DEPEND}"
1187
1188
1189 diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
1190 index 9c99fa9..e2941e9 100644
1191 --- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
1192 +++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
1193 @@ -17,7 +17,7 @@ fi
1194 IUSE=""
1195
1196 DEPEND="
1197 - ~dev-qt/qtcore-${PV}[aqua=,debug=]
1198 + ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
1199 "
1200 RDEPEND="${DEPEND}"
Report Message
Find on MARC Find on Google Groups