Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/powerdevil/, kde-plasma/bluedevil/, kde-plasma/libkscreen/, ...
Date: Sun, 31 Jan 2016 16:22:07
Message-Id: 1454257307.e0ff1ec4b877f0cdd820971c5e950538bf5e5d68.kensington@gentoo
1 commit: e0ff1ec4b877f0cdd820971c5e950538bf5e5d68
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Mon Jan 25 00:26:43 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 31 16:21:47 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e0ff1ec4
7
8 kde-plasma: Convert to add_qt_dep
9
10 Package-Manager: portage-2.2.26
11
12 kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild | 8 +++---
13 kde-plasma/bluedevil/bluedevil-9999.ebuild | 8 +++---
14 kde-plasma/breeze/breeze-5.5.49.9999.ebuild | 8 +++---
15 kde-plasma/breeze/breeze-9999.ebuild | 8 +++---
16 .../kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild | 10 ++++----
17 kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild | 10 ++++----
18 .../kde-gtk-config-5.5.49.9999.ebuild | 4 +--
19 .../kde-gtk-config/kde-gtk-config-9999.ebuild | 4 +--
20 .../kdeplasma-addons-5.5.49.9999.ebuild | 12 ++++-----
21 .../kdeplasma-addons/kdeplasma-addons-9999.ebuild | 12 ++++-----
22 kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild | 6 ++---
23 kde-plasma/kgamma/kgamma-9999.ebuild | 5 ++--
24 .../khelpcenter/khelpcenter-5.5.49.9999.ebuild | 8 +++---
25 kde-plasma/khelpcenter/khelpcenter-9999.ebuild | 8 +++---
26 kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild | 8 +++---
27 kde-plasma/khotkeys/khotkeys-9999.ebuild | 8 +++---
28 .../kinfocenter/kinfocenter-5.5.49.9999.ebuild | 10 ++++----
29 kde-plasma/kinfocenter/kinfocenter-9999.ebuild | 10 ++++----
30 kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild | 8 +++---
31 kde-plasma/kmenuedit/kmenuedit-9999.ebuild | 8 +++---
32 kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild | 10 ++++----
33 kde-plasma/kscreen/kscreen-9999.ebuild | 10 ++++----
34 .../kscreenlocker/kscreenlocker-5.5.49.9999.ebuild | 13 +++++-----
35 kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild | 13 +++++-----
36 .../ksshaskpass/ksshaskpass-5.5.49.9999.ebuild | 2 +-
37 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild | 2 +-
38 kde-plasma/ksysguard/ksysguard-5.5.49.9999.ebuild | 8 +++---
39 kde-plasma/ksysguard/ksysguard-9999.ebuild | 8 +++---
40 .../kwayland-integration-5.5.49.9999.ebuild | 4 +--
41 .../kwayland-integration-9999.ebuild | 4 +--
42 kde-plasma/kwayland/kwayland-5.5.49.9999.ebuild | 2 +-
43 kde-plasma/kwayland/kwayland-9999.ebuild | 2 +-
44 kde-plasma/kwin/kwin-5.5.49.9999.ebuild | 20 +++++++--------
45 kde-plasma/kwin/kwin-9999.ebuild | 20 +++++++--------
46 kde-plasma/kwrited/kwrited-5.5.49.9999.ebuild | 4 +--
47 kde-plasma/kwrited/kwrited-9999.ebuild | 4 +--
48 .../libkscreen/libkscreen-5.5.49.9999.ebuild | 6 ++---
49 kde-plasma/libkscreen/libkscreen-9999.ebuild | 6 ++---
50 .../libksysguard/libksysguard-5.5.49.9999.ebuild | 12 ++++-----
51 kde-plasma/libksysguard/libksysguard-9999.ebuild | 12 ++++-----
52 kde-plasma/milou/milou-5.5.49.9999.ebuild | 6 ++---
53 kde-plasma/milou/milou-9999.ebuild | 6 ++---
54 kde-plasma/oxygen/oxygen-5.5.49.9999.ebuild | 8 +++---
55 kde-plasma/oxygen/oxygen-9999.ebuild | 8 +++---
56 .../plasma-desktop-5.5.49.9999.ebuild | 24 +++++++++---------
57 .../plasma-desktop/plasma-desktop-9999.ebuild | 24 +++++++++---------
58 .../plasma-integration-9999.ebuild | 6 ++---
59 .../plasma-mediacenter-5.5.49.9999.ebuild | 12 ++++-----
60 .../plasma-mediacenter-9999.ebuild | 12 ++++-----
61 kde-plasma/plasma-nm/plasma-nm-5.5.49.9999.ebuild | 14 +++++------
62 kde-plasma/plasma-nm/plasma-nm-9999.ebuild | 14 +++++------
63 kde-plasma/plasma-pa/plasma-pa-5.5.49.9999.ebuild | 8 +++---
64 kde-plasma/plasma-pa/plasma-pa-9999.ebuild | 8 +++---
65 .../plasma-sdk/plasma-sdk-5.5.49.9999.ebuild | 10 ++++----
66 kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild | 10 ++++----
67 .../plasma-workspace-5.5.49.9999.ebuild | 29 +++++++++++-----------
68 .../plasma-workspace/plasma-workspace-9999.ebuild | 29 +++++++++++-----------
69 .../polkit-kde-agent-5.5.49.9999.ebuild | 6 ++---
70 .../polkit-kde-agent/polkit-kde-agent-9999.ebuild | 6 ++---
71 .../powerdevil/powerdevil-5.5.49.9999.ebuild | 8 +++---
72 kde-plasma/powerdevil/powerdevil-9999.ebuild | 8 +++---
73 kde-plasma/sddm-kcm/sddm-kcm-5.5.49.9999.ebuild | 8 +++---
74 kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild | 8 +++---
75 .../systemsettings-5.5.49.9999.ebuild | 6 ++---
76 .../systemsettings/systemsettings-9999.ebuild | 6 ++---
77 .../user-manager/user-manager-5.5.49.9999.ebuild | 6 ++---
78 kde-plasma/user-manager/user-manager-9999.ebuild | 6 ++---
79 67 files changed, 309 insertions(+), 312 deletions(-)
80
81 diff --git a/kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild b/kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild
82 index 310cdc2..52c7657 100644
83 --- a/kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild
84 +++ b/kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild
85 @@ -25,10 +25,10 @@ COMMON_DEPEND="
86 $(add_frameworks_dep kwidgetsaddons)
87 $(add_frameworks_dep kwindowsystem)
88 $(add_frameworks_dep plasma)
89 - dev-qt/qtdbus:5
90 - dev-qt/qtdeclarative:5
91 - dev-qt/qtgui:5
92 - dev-qt/qtwidgets:5
93 + $(add_qt_dep qtdbus)
94 + $(add_qt_dep qtdeclarative)
95 + $(add_qt_dep qtgui)
96 + $(add_qt_dep qtwidgets)
97 "
98 DEPEND="${COMMON_DEPEND}
99 x11-misc/shared-mime-info
100
101 diff --git a/kde-plasma/bluedevil/bluedevil-9999.ebuild b/kde-plasma/bluedevil/bluedevil-9999.ebuild
102 index 310cdc2..52c7657 100644
103 --- a/kde-plasma/bluedevil/bluedevil-9999.ebuild
104 +++ b/kde-plasma/bluedevil/bluedevil-9999.ebuild
105 @@ -25,10 +25,10 @@ COMMON_DEPEND="
106 $(add_frameworks_dep kwidgetsaddons)
107 $(add_frameworks_dep kwindowsystem)
108 $(add_frameworks_dep plasma)
109 - dev-qt/qtdbus:5
110 - dev-qt/qtdeclarative:5
111 - dev-qt/qtgui:5
112 - dev-qt/qtwidgets:5
113 + $(add_qt_dep qtdbus)
114 + $(add_qt_dep qtdeclarative)
115 + $(add_qt_dep qtgui)
116 + $(add_qt_dep qtwidgets)
117 "
118 DEPEND="${COMMON_DEPEND}
119 x11-misc/shared-mime-info
120
121 diff --git a/kde-plasma/breeze/breeze-5.5.49.9999.ebuild b/kde-plasma/breeze/breeze-5.5.49.9999.ebuild
122 index 4f4d312..81ccf3b 100644
123 --- a/kde-plasma/breeze/breeze-5.5.49.9999.ebuild
124 +++ b/kde-plasma/breeze/breeze-5.5.49.9999.ebuild
125 @@ -23,10 +23,10 @@ DEPEND="
126 $(add_frameworks_dep kwindowsystem)
127 $(add_frameworks_dep plasma)
128 $(add_plasma_dep kdecoration)
129 - dev-qt/qtdbus:5
130 - dev-qt/qtgui:5
131 - dev-qt/qtwidgets:5
132 - dev-qt/qtx11extras:5
133 + $(add_qt_dep qtdbus)
134 + $(add_qt_dep qtgui)
135 + $(add_qt_dep qtwidgets)
136 + $(add_qt_dep qtx11extras)
137 x11-libs/libxcb
138 qt4? (
139 kde-base/kdelibs:4
140
141 diff --git a/kde-plasma/breeze/breeze-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild
142 index 4f4d312..81ccf3b 100644
143 --- a/kde-plasma/breeze/breeze-9999.ebuild
144 +++ b/kde-plasma/breeze/breeze-9999.ebuild
145 @@ -23,10 +23,10 @@ DEPEND="
146 $(add_frameworks_dep kwindowsystem)
147 $(add_frameworks_dep plasma)
148 $(add_plasma_dep kdecoration)
149 - dev-qt/qtdbus:5
150 - dev-qt/qtgui:5
151 - dev-qt/qtwidgets:5
152 - dev-qt/qtx11extras:5
153 + $(add_qt_dep qtdbus)
154 + $(add_qt_dep qtgui)
155 + $(add_qt_dep qtwidgets)
156 + $(add_qt_dep qtx11extras)
157 x11-libs/libxcb
158 qt4? (
159 kde-base/kdelibs:4
160
161 diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild
162 index a75fc20..6794eb1 100644
163 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild
164 +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild
165 @@ -26,14 +26,14 @@ DEPEND="
166 $(add_frameworks_dep kservice)
167 $(add_frameworks_dep kwidgetsaddons)
168 $(add_frameworks_dep kwindowsystem)
169 - dev-qt/qtdbus:5
170 - dev-qt/qtgui:5
171 - dev-qt/qtsvg:5
172 - dev-qt/qtwidgets:5
173 + $(add_qt_dep qtdbus)
174 + $(add_qt_dep qtgui)
175 + $(add_qt_dep qtsvg)
176 + $(add_qt_dep qtwidgets)
177 kdesu? ( $(add_frameworks_dep kdesu) )
178 X? (
179 $(add_frameworks_dep kdelibs4support)
180 - dev-qt/qtx11extras:5
181 + $(add_qt_dep qtx11extras)
182 x11-libs/libX11
183 )
184 "
185
186 diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
187 index a75fc20..6794eb1 100644
188 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
189 +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
190 @@ -26,14 +26,14 @@ DEPEND="
191 $(add_frameworks_dep kservice)
192 $(add_frameworks_dep kwidgetsaddons)
193 $(add_frameworks_dep kwindowsystem)
194 - dev-qt/qtdbus:5
195 - dev-qt/qtgui:5
196 - dev-qt/qtsvg:5
197 - dev-qt/qtwidgets:5
198 + $(add_qt_dep qtdbus)
199 + $(add_qt_dep qtgui)
200 + $(add_qt_dep qtsvg)
201 + $(add_qt_dep qtwidgets)
202 kdesu? ( $(add_frameworks_dep kdesu) )
203 X? (
204 $(add_frameworks_dep kdelibs4support)
205 - dev-qt/qtx11extras:5
206 + $(add_qt_dep qtx11extras)
207 x11-libs/libX11
208 )
209 "
210
211 diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.49.9999.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.49.9999.ebuild
212 index 894e33b..bf1230e 100644
213 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.49.9999.ebuild
214 +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.49.9999.ebuild
215 @@ -25,8 +25,8 @@ DEPEND="
216 $(add_frameworks_dep knewstuff)
217 $(add_frameworks_dep kwidgetsaddons)
218 dev-libs/glib:2
219 - dev-qt/qtgui:5
220 - dev-qt/qtwidgets:5
221 + $(add_qt_dep qtgui)
222 + $(add_qt_dep qtwidgets)
223 x11-libs/gtk+:2
224 gtk3? ( x11-libs/gtk+:3 )
225 "
226
227 diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
228 index 894e33b..bf1230e 100644
229 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
230 +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
231 @@ -25,8 +25,8 @@ DEPEND="
232 $(add_frameworks_dep knewstuff)
233 $(add_frameworks_dep kwidgetsaddons)
234 dev-libs/glib:2
235 - dev-qt/qtgui:5
236 - dev-qt/qtwidgets:5
237 + $(add_qt_dep qtgui)
238 + $(add_qt_dep qtwidgets)
239 x11-libs/gtk+:2
240 gtk3? ( x11-libs/gtk+:3 )
241 "
242
243 diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.49.9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.49.9999.ebuild
244 index 5538e6b..9587d28 100644
245 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.49.9999.ebuild
246 +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.49.9999.ebuild
247 @@ -35,15 +35,15 @@ DEPEND="
248 $(add_frameworks_dep kxmlgui)
249 $(add_frameworks_dep plasma)
250 $(add_frameworks_dep sonnet)
251 - dev-qt/qtdbus:5
252 - dev-qt/qtdeclarative:5
253 - dev-qt/qtgui:5
254 - dev-qt/qtwidgets:5
255 - dev-qt/qtx11extras:5
256 + $(add_qt_dep qtdbus)
257 + $(add_qt_dep qtdeclarative)
258 + $(add_qt_dep qtgui)
259 + $(add_qt_dep qtwidgets)
260 + $(add_qt_dep qtx11extras)
261 ibus? (
262 app-i18n/ibus
263 dev-libs/glib:2
264 - dev-qt/qtx11extras:5
265 + $(add_qt_dep qtx11extras)
266 x11-libs/libxcb
267 x11-libs/xcb-util-keysyms
268 )
269
270 diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
271 index 5538e6b..9587d28 100644
272 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
273 +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
274 @@ -35,15 +35,15 @@ DEPEND="
275 $(add_frameworks_dep kxmlgui)
276 $(add_frameworks_dep plasma)
277 $(add_frameworks_dep sonnet)
278 - dev-qt/qtdbus:5
279 - dev-qt/qtdeclarative:5
280 - dev-qt/qtgui:5
281 - dev-qt/qtwidgets:5
282 - dev-qt/qtx11extras:5
283 + $(add_qt_dep qtdbus)
284 + $(add_qt_dep qtdeclarative)
285 + $(add_qt_dep qtgui)
286 + $(add_qt_dep qtwidgets)
287 + $(add_qt_dep qtx11extras)
288 ibus? (
289 app-i18n/ibus
290 dev-libs/glib:2
291 - dev-qt/qtx11extras:5
292 + $(add_qt_dep qtx11extras)
293 x11-libs/libxcb
294 x11-libs/xcb-util-keysyms
295 )
296
297 diff --git a/kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild b/kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild
298 index 6aac9ee..6933b1c 100644
299 --- a/kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild
300 +++ b/kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild
301 @@ -18,9 +18,9 @@ RDEPEND="
302 $(add_frameworks_dep kcoreaddons)
303 $(add_frameworks_dep kdelibs4support)
304 $(add_frameworks_dep ki18n)
305 - dev-qt/qtgui:5
306 - dev-qt/qtwidgets:5
307 - dev-qt/qtx11extras:5
308 + $(add_qt_dep qtgui)
309 + $(add_qt_dep qtwidgets)
310 + $(add_qt_dep qtx11extras)
311 x11-libs/libX11
312 x11-libs/libXxf86vm
313 "
314
315 diff --git a/kde-plasma/kgamma/kgamma-9999.ebuild b/kde-plasma/kgamma/kgamma-9999.ebuild
316 index c2a1b98..6933b1c 100644
317 --- a/kde-plasma/kgamma/kgamma-9999.ebuild
318 +++ b/kde-plasma/kgamma/kgamma-9999.ebuild
319 @@ -18,8 +18,9 @@ RDEPEND="
320 $(add_frameworks_dep kcoreaddons)
321 $(add_frameworks_dep kdelibs4support)
322 $(add_frameworks_dep ki18n)
323 - dev-qt/qtgui:5
324 - dev-qt/qtwidgets:5
325 + $(add_qt_dep qtgui)
326 + $(add_qt_dep qtwidgets)
327 + $(add_qt_dep qtx11extras)
328 x11-libs/libX11
329 x11-libs/libXxf86vm
330 "
331
332 diff --git a/kde-plasma/khelpcenter/khelpcenter-5.5.49.9999.ebuild b/kde-plasma/khelpcenter/khelpcenter-5.5.49.9999.ebuild
333 index 8f3add6..bcef29d 100644
334 --- a/kde-plasma/khelpcenter/khelpcenter-5.5.49.9999.ebuild
335 +++ b/kde-plasma/khelpcenter/khelpcenter-5.5.49.9999.ebuild
336 @@ -31,10 +31,10 @@ DEPEND="
337 $(add_frameworks_dep kwidgetsaddons)
338 $(add_frameworks_dep kwindowsystem)
339 $(add_frameworks_dep kxmlgui)
340 - dev-qt/qtdbus:5
341 - dev-qt/qtgui:5
342 - dev-qt/qtwidgets:5
343 - dev-qt/qtxml:5
344 + $(add_qt_dep qtdbus)
345 + $(add_qt_dep qtgui)
346 + $(add_qt_dep qtwidgets)
347 + $(add_qt_dep qtxml)
348 "
349 RDEPEND="${DEPEND}
350 $(add_plasma_dep kde-cli-tools)
351
352 diff --git a/kde-plasma/khelpcenter/khelpcenter-9999.ebuild b/kde-plasma/khelpcenter/khelpcenter-9999.ebuild
353 index 8f3add6..bcef29d 100644
354 --- a/kde-plasma/khelpcenter/khelpcenter-9999.ebuild
355 +++ b/kde-plasma/khelpcenter/khelpcenter-9999.ebuild
356 @@ -31,10 +31,10 @@ DEPEND="
357 $(add_frameworks_dep kwidgetsaddons)
358 $(add_frameworks_dep kwindowsystem)
359 $(add_frameworks_dep kxmlgui)
360 - dev-qt/qtdbus:5
361 - dev-qt/qtgui:5
362 - dev-qt/qtwidgets:5
363 - dev-qt/qtxml:5
364 + $(add_qt_dep qtdbus)
365 + $(add_qt_dep qtgui)
366 + $(add_qt_dep qtwidgets)
367 + $(add_qt_dep qtxml)
368 "
369 RDEPEND="${DEPEND}
370 $(add_plasma_dep kde-cli-tools)
371
372 diff --git a/kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild b/kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild
373 index 9ef8a67..231d101 100644
374 --- a/kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild
375 +++ b/kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild
376 @@ -27,10 +27,10 @@ COMMON_DEPEND="
377 $(add_frameworks_dep kwindowsystem)
378 $(add_frameworks_dep kxmlgui)
379 $(add_plasma_dep plasma-workspace)
380 - dev-qt/qtdbus:5
381 - dev-qt/qtgui:5
382 - dev-qt/qtwidgets:5
383 - dev-qt/qtx11extras:5
384 + $(add_qt_dep qtdbus)
385 + $(add_qt_dep qtgui)
386 + $(add_qt_dep qtwidgets)
387 + $(add_qt_dep qtx11extras)
388 x11-libs/libX11
389 "
390 RDEPEND="${COMMON_DEPEND}
391
392 diff --git a/kde-plasma/khotkeys/khotkeys-9999.ebuild b/kde-plasma/khotkeys/khotkeys-9999.ebuild
393 index 9ef8a67..231d101 100644
394 --- a/kde-plasma/khotkeys/khotkeys-9999.ebuild
395 +++ b/kde-plasma/khotkeys/khotkeys-9999.ebuild
396 @@ -27,10 +27,10 @@ COMMON_DEPEND="
397 $(add_frameworks_dep kwindowsystem)
398 $(add_frameworks_dep kxmlgui)
399 $(add_plasma_dep plasma-workspace)
400 - dev-qt/qtdbus:5
401 - dev-qt/qtgui:5
402 - dev-qt/qtwidgets:5
403 - dev-qt/qtx11extras:5
404 + $(add_qt_dep qtdbus)
405 + $(add_qt_dep qtgui)
406 + $(add_qt_dep qtwidgets)
407 + $(add_qt_dep qtx11extras)
408 x11-libs/libX11
409 "
410 RDEPEND="${COMMON_DEPEND}
411
412 diff --git a/kde-plasma/kinfocenter/kinfocenter-5.5.49.9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.5.49.9999.ebuild
413 index 00f0cca..12a10e1 100644
414 --- a/kde-plasma/kinfocenter/kinfocenter-5.5.49.9999.ebuild
415 +++ b/kde-plasma/kinfocenter/kinfocenter-5.5.49.9999.ebuild
416 @@ -32,12 +32,12 @@ COMMON_DEPEND="
417 $(add_frameworks_dep kwidgetsaddons)
418 $(add_frameworks_dep kxmlgui)
419 $(add_frameworks_dep solid)
420 - dev-qt/qtdbus:5
421 - dev-qt/qtdeclarative:5
422 - dev-qt/qtgui:5[opengl(+)]
423 - dev-qt/qtwidgets:5
424 + $(add_qt_dep qtdbus)
425 + $(add_qt_dep qtdeclarative)
426 + $(add_qt_dep qtgui 'opengl(+)')
427 + $(add_qt_dep qtwidgets)
428 gles? (
429 - dev-qt/qtgui:5[gles2]
430 + $(add_qt_dep qtgui 'gles2')
431 || (
432 media-libs/mesa[egl,gles1]
433 media-libs/mesa[egl,gles2]
434
435 diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
436 index 00f0cca..12a10e1 100644
437 --- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
438 +++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
439 @@ -32,12 +32,12 @@ COMMON_DEPEND="
440 $(add_frameworks_dep kwidgetsaddons)
441 $(add_frameworks_dep kxmlgui)
442 $(add_frameworks_dep solid)
443 - dev-qt/qtdbus:5
444 - dev-qt/qtdeclarative:5
445 - dev-qt/qtgui:5[opengl(+)]
446 - dev-qt/qtwidgets:5
447 + $(add_qt_dep qtdbus)
448 + $(add_qt_dep qtdeclarative)
449 + $(add_qt_dep qtgui 'opengl(+)')
450 + $(add_qt_dep qtwidgets)
451 gles? (
452 - dev-qt/qtgui:5[gles2]
453 + $(add_qt_dep qtgui 'gles2')
454 || (
455 media-libs/mesa[egl,gles1]
456 media-libs/mesa[egl,gles2]
457
458 diff --git a/kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild
459 index fc75c3d..d1873d4 100644
460 --- a/kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild
461 +++ b/kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild
462 @@ -26,10 +26,10 @@ DEPEND="
463 $(add_frameworks_dep kwidgetsaddons)
464 $(add_frameworks_dep kxmlgui)
465 $(add_frameworks_dep sonnet)
466 - dev-qt/qtdbus:5
467 - dev-qt/qtgui:5
468 - dev-qt/qtwidgets:5
469 - dev-qt/qtxml:5
470 + $(add_qt_dep qtdbus)
471 + $(add_qt_dep qtgui)
472 + $(add_qt_dep qtwidgets)
473 + $(add_qt_dep qtxml)
474 hotkeys? ( $(add_plasma_dep khotkeys) )
475 "
476 RDEPEND="${DEPEND}
477
478 diff --git a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
479 index fc75c3d..d1873d4 100644
480 --- a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
481 +++ b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
482 @@ -26,10 +26,10 @@ DEPEND="
483 $(add_frameworks_dep kwidgetsaddons)
484 $(add_frameworks_dep kxmlgui)
485 $(add_frameworks_dep sonnet)
486 - dev-qt/qtdbus:5
487 - dev-qt/qtgui:5
488 - dev-qt/qtwidgets:5
489 - dev-qt/qtxml:5
490 + $(add_qt_dep qtdbus)
491 + $(add_qt_dep qtgui)
492 + $(add_qt_dep qtwidgets)
493 + $(add_qt_dep qtxml)
494 hotkeys? ( $(add_plasma_dep khotkeys) )
495 "
496 RDEPEND="${DEPEND}
497
498 diff --git a/kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild b/kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild
499 index 15cb0ea..441068d 100644
500 --- a/kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild
501 +++ b/kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild
502 @@ -22,13 +22,13 @@ DEPEND="
503 $(add_frameworks_dep ki18n)
504 $(add_frameworks_dep kwidgetsaddons)
505 $(add_frameworks_dep kxmlgui)
506 - dev-qt/qtdbus:5
507 - dev-qt/qtdeclarative:5[widgets]
508 - dev-qt/qtgui:5
509 - dev-qt/qtwidgets:5
510 + $(add_qt_dep qtdbus)
511 + $(add_qt_dep qtdeclarative 'widgets')
512 + $(add_qt_dep qtgui)
513 + $(add_qt_dep qtwidgets)
514 "
515 RDEPEND="${DEPEND}
516 $(add_plasma_dep kde-cli-tools)
517 - dev-qt/qtgraphicaleffects:5
518 + $(add_qt_dep qtgraphicaleffects)
519 !kde-misc/kscreen
520 "
521
522 diff --git a/kde-plasma/kscreen/kscreen-9999.ebuild b/kde-plasma/kscreen/kscreen-9999.ebuild
523 index 15cb0ea..441068d 100644
524 --- a/kde-plasma/kscreen/kscreen-9999.ebuild
525 +++ b/kde-plasma/kscreen/kscreen-9999.ebuild
526 @@ -22,13 +22,13 @@ DEPEND="
527 $(add_frameworks_dep ki18n)
528 $(add_frameworks_dep kwidgetsaddons)
529 $(add_frameworks_dep kxmlgui)
530 - dev-qt/qtdbus:5
531 - dev-qt/qtdeclarative:5[widgets]
532 - dev-qt/qtgui:5
533 - dev-qt/qtwidgets:5
534 + $(add_qt_dep qtdbus)
535 + $(add_qt_dep qtdeclarative 'widgets')
536 + $(add_qt_dep qtgui)
537 + $(add_qt_dep qtwidgets)
538 "
539 RDEPEND="${DEPEND}
540 $(add_plasma_dep kde-cli-tools)
541 - dev-qt/qtgraphicaleffects:5
542 + $(add_qt_dep qtgraphicaleffects)
543 !kde-misc/kscreen
544 "
545
546 diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.5.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.5.49.9999.ebuild
547 index 5700942..2e0db86 100644
548 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.5.49.9999.ebuild
549 +++ b/kde-plasma/kscreenlocker/kscreenlocker-5.5.49.9999.ebuild
550 @@ -5,7 +5,6 @@
551 EAPI=6
552
553 KDE_TEST="forceoptional"
554 -QT_MINIMAL="5.5.0"
555 VIRTUALX_REQUIRED="test"
556 inherit kde5 pam
557
558 @@ -30,13 +29,13 @@ COMMON_DEPEND="
559 $(add_frameworks_dep kxmlgui)
560 $(add_frameworks_dep plasma)
561 $(add_plasma_dep kwayland)
562 + $(add_qt_dep qtdbus)
563 + $(add_qt_dep qtdeclarative 'widgets')
564 + $(add_qt_dep qtgui)
565 + $(add_qt_dep qtnetwork)
566 + $(add_qt_dep qtwidgets)
567 + $(add_qt_dep qtx11extras)
568 dev-libs/wayland
569 - dev-qt/qtdbus:5
570 - dev-qt/qtdeclarative:5[widgets]
571 - dev-qt/qtgui:5
572 - dev-qt/qtnetwork:5
573 - dev-qt/qtwidgets:5
574 - dev-qt/qtx11extras:5
575 x11-libs/libX11
576 x11-libs/libXi
577 x11-libs/libxcb
578
579 diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
580 index 9cb532c..dc0c758 100644
581 --- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
582 +++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
583 @@ -5,7 +5,6 @@
584 EAPI=6
585
586 KDE_TEST="forceoptional"
587 -QT_MINIMAL="5.5.0"
588 VIRTUALX_REQUIRED="test"
589 inherit kde5 pam
590
591 @@ -29,13 +28,13 @@ COMMON_DEPEND="
592 $(add_frameworks_dep kxmlgui)
593 $(add_frameworks_dep solid)
594 $(add_plasma_dep kwayland)
595 + $(add_qt_dep qtdbus)
596 + $(add_qt_dep qtdeclarative 'widgets')
597 + $(add_qt_dep qtgui)
598 + $(add_qt_dep qtnetwork)
599 + $(add_qt_dep qtwidgets)
600 + $(add_qt_dep qtx11extras)
601 dev-libs/wayland
602 - dev-qt/qtdbus:5
603 - dev-qt/qtdeclarative:5[widgets]
604 - dev-qt/qtgui:5
605 - dev-qt/qtnetwork:5
606 - dev-qt/qtwidgets:5
607 - dev-qt/qtx11extras:5
608 x11-libs/libX11
609 x11-libs/libXi
610 x11-libs/libxcb
611
612 diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.5.49.9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.5.49.9999.ebuild
613 index 55555c2..b917786 100644
614 --- a/kde-plasma/ksshaskpass/ksshaskpass-5.5.49.9999.ebuild
615 +++ b/kde-plasma/ksshaskpass/ksshaskpass-5.5.49.9999.ebuild
616 @@ -16,7 +16,7 @@ DEPEND="
617 $(add_frameworks_dep ki18n)
618 $(add_frameworks_dep kwallet)
619 $(add_frameworks_dep kwidgetsaddons)
620 - dev-qt/qtwidgets:5
621 + $(add_qt_dep qtwidgets)
622 "
623 RDEPEND="
624 ${DEPEND}
625
626 diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
627 index 55555c2..b917786 100644
628 --- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
629 +++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
630 @@ -16,7 +16,7 @@ DEPEND="
631 $(add_frameworks_dep ki18n)
632 $(add_frameworks_dep kwallet)
633 $(add_frameworks_dep kwidgetsaddons)
634 - dev-qt/qtwidgets:5
635 + $(add_qt_dep qtwidgets)
636 "
637 RDEPEND="
638 ${DEPEND}
639
640 diff --git a/kde-plasma/ksysguard/ksysguard-5.5.49.9999.ebuild b/kde-plasma/ksysguard/ksysguard-5.5.49.9999.ebuild
641 index 39ddc4f..e6b3842 100644
642 --- a/kde-plasma/ksysguard/ksysguard-5.5.49.9999.ebuild
643 +++ b/kde-plasma/ksysguard/ksysguard-5.5.49.9999.ebuild
644 @@ -29,10 +29,10 @@ DEPEND="
645 $(add_frameworks_dep kwidgetsaddons)
646 $(add_frameworks_dep kwindowsystem)
647 $(add_frameworks_dep kxmlgui)
648 - dev-qt/qtdbus:5
649 - dev-qt/qtgui:5
650 - dev-qt/qtwidgets:5
651 - dev-qt/qtxml:5
652 + $(add_qt_dep qtdbus)
653 + $(add_qt_dep qtgui)
654 + $(add_qt_dep qtwidgets)
655 + $(add_qt_dep qtxml)
656 lm_sensors? ( sys-apps/lm_sensors )
657 "
658 RDEPEND="${DEPEND}
659
660 diff --git a/kde-plasma/ksysguard/ksysguard-9999.ebuild b/kde-plasma/ksysguard/ksysguard-9999.ebuild
661 index 39ddc4f..e6b3842 100644
662 --- a/kde-plasma/ksysguard/ksysguard-9999.ebuild
663 +++ b/kde-plasma/ksysguard/ksysguard-9999.ebuild
664 @@ -29,10 +29,10 @@ DEPEND="
665 $(add_frameworks_dep kwidgetsaddons)
666 $(add_frameworks_dep kwindowsystem)
667 $(add_frameworks_dep kxmlgui)
668 - dev-qt/qtdbus:5
669 - dev-qt/qtgui:5
670 - dev-qt/qtwidgets:5
671 - dev-qt/qtxml:5
672 + $(add_qt_dep qtdbus)
673 + $(add_qt_dep qtgui)
674 + $(add_qt_dep qtwidgets)
675 + $(add_qt_dep qtxml)
676 lm_sensors? ( sys-apps/lm_sensors )
677 "
678 RDEPEND="${DEPEND}
679
680 diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.5.49.9999.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.5.49.9999.ebuild
681 index 628feb4..de8ed75 100644
682 --- a/kde-plasma/kwayland-integration/kwayland-integration-5.5.49.9999.ebuild
683 +++ b/kde-plasma/kwayland-integration/kwayland-integration-5.5.49.9999.ebuild
684 @@ -17,7 +17,7 @@ DEPEND="
685 $(add_frameworks_dep kidletime)
686 $(add_frameworks_dep kwindowsystem)
687 $(add_plasma_dep kwayland)
688 - dev-qt/qtgui:5
689 - dev-qt/qtwidgets:5
690 + $(add_qt_dep qtgui)
691 + $(add_qt_dep qtwidgets)
692 "
693 RDEPEND="${DEPEND}"
694
695 diff --git a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
696 index 628feb4..de8ed75 100644
697 --- a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
698 +++ b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
699 @@ -17,7 +17,7 @@ DEPEND="
700 $(add_frameworks_dep kidletime)
701 $(add_frameworks_dep kwindowsystem)
702 $(add_plasma_dep kwayland)
703 - dev-qt/qtgui:5
704 - dev-qt/qtwidgets:5
705 + $(add_qt_dep qtgui)
706 + $(add_qt_dep qtwidgets)
707 "
708 RDEPEND="${DEPEND}"
709
710 diff --git a/kde-plasma/kwayland/kwayland-5.5.49.9999.ebuild b/kde-plasma/kwayland/kwayland-5.5.49.9999.ebuild
711 index 4070d95..e4de6b3 100644
712 --- a/kde-plasma/kwayland/kwayland-5.5.49.9999.ebuild
713 +++ b/kde-plasma/kwayland/kwayland-5.5.49.9999.ebuild
714 @@ -16,7 +16,7 @@ IUSE=""
715
716 DEPEND="
717 >=dev-libs/wayland-1.7.0
718 - dev-qt/qtgui:5
719 + $(add_qt_dep qtgui)
720 media-libs/mesa[egl]
721 "
722 RDEPEND="${DEPEND}"
723
724 diff --git a/kde-plasma/kwayland/kwayland-9999.ebuild b/kde-plasma/kwayland/kwayland-9999.ebuild
725 index 4070d95..e4de6b3 100644
726 --- a/kde-plasma/kwayland/kwayland-9999.ebuild
727 +++ b/kde-plasma/kwayland/kwayland-9999.ebuild
728 @@ -16,7 +16,7 @@ IUSE=""
729
730 DEPEND="
731 >=dev-libs/wayland-1.7.0
732 - dev-qt/qtgui:5
733 + $(add_qt_dep qtgui)
734 media-libs/mesa[egl]
735 "
736 RDEPEND="${DEPEND}"
737
738 diff --git a/kde-plasma/kwin/kwin-5.5.49.9999.ebuild b/kde-plasma/kwin/kwin-5.5.49.9999.ebuild
739 index 91cc765..ec1e939 100644
740 --- a/kde-plasma/kwin/kwin-5.5.49.9999.ebuild
741 +++ b/kde-plasma/kwin/kwin-5.5.49.9999.ebuild
742 @@ -43,12 +43,12 @@ COMMON_DEPEND="
743 $(add_plasma_dep kwayland)
744 >=dev-libs/libinput-0.10
745 >=dev-libs/wayland-1.2
746 - dev-qt/qtdbus:5
747 - dev-qt/qtdeclarative:5
748 - dev-qt/qtgui:5[gles2=,opengl(+)]
749 - dev-qt/qtscript:5
750 - dev-qt/qtwidgets:5
751 - dev-qt/qtx11extras:5
752 + $(add_qt_dep qtdbus)
753 + $(add_qt_dep qtdeclarative)
754 + $(add_qt_dep qtgui 'gles2=,opengl(+)')
755 + $(add_qt_dep qtscript)
756 + $(add_qt_dep qtwidgets)
757 + $(add_qt_dep qtx11extras)
758 media-libs/fontconfig
759 media-libs/freetype
760 media-libs/libepoxy
761 @@ -68,16 +68,16 @@ RDEPEND="${COMMON_DEPEND}
762 $(add_plasma_dep kde-cli-tools)
763 multimedia? (
764 || (
765 - dev-qt/qtmultimedia:5[gstreamer,qml]
766 - dev-qt/qtmultimedia:5[gstreamer010,qml]
767 + $(add_qt_dep qtmultimedia 'gstreamer,qml')
768 + $(add_qt_dep qtmultimedia 'gstreamer010,qml')
769 )
770 )
771 !kde-base/kwin:4
772 !kde-base/systemsettings:4
773 "
774 DEPEND="${COMMON_DEPEND}
775 - dev-qt/designer:5
776 - dev-qt/qtconcurrent:5
777 + $(add_qt_dep designer)
778 + $(add_qt_dep qtconcurrent)
779 x11-proto/xproto
780 test? ( x11-libs/xcb-util-wm )
781 "
782
783 diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
784 index 91cc765..ec1e939 100644
785 --- a/kde-plasma/kwin/kwin-9999.ebuild
786 +++ b/kde-plasma/kwin/kwin-9999.ebuild
787 @@ -43,12 +43,12 @@ COMMON_DEPEND="
788 $(add_plasma_dep kwayland)
789 >=dev-libs/libinput-0.10
790 >=dev-libs/wayland-1.2
791 - dev-qt/qtdbus:5
792 - dev-qt/qtdeclarative:5
793 - dev-qt/qtgui:5[gles2=,opengl(+)]
794 - dev-qt/qtscript:5
795 - dev-qt/qtwidgets:5
796 - dev-qt/qtx11extras:5
797 + $(add_qt_dep qtdbus)
798 + $(add_qt_dep qtdeclarative)
799 + $(add_qt_dep qtgui 'gles2=,opengl(+)')
800 + $(add_qt_dep qtscript)
801 + $(add_qt_dep qtwidgets)
802 + $(add_qt_dep qtx11extras)
803 media-libs/fontconfig
804 media-libs/freetype
805 media-libs/libepoxy
806 @@ -68,16 +68,16 @@ RDEPEND="${COMMON_DEPEND}
807 $(add_plasma_dep kde-cli-tools)
808 multimedia? (
809 || (
810 - dev-qt/qtmultimedia:5[gstreamer,qml]
811 - dev-qt/qtmultimedia:5[gstreamer010,qml]
812 + $(add_qt_dep qtmultimedia 'gstreamer,qml')
813 + $(add_qt_dep qtmultimedia 'gstreamer010,qml')
814 )
815 )
816 !kde-base/kwin:4
817 !kde-base/systemsettings:4
818 "
819 DEPEND="${COMMON_DEPEND}
820 - dev-qt/designer:5
821 - dev-qt/qtconcurrent:5
822 + $(add_qt_dep designer)
823 + $(add_qt_dep qtconcurrent)
824 x11-proto/xproto
825 test? ( x11-libs/xcb-util-wm )
826 "
827
828 diff --git a/kde-plasma/kwrited/kwrited-5.5.49.9999.ebuild b/kde-plasma/kwrited/kwrited-5.5.49.9999.ebuild
829 index 0c184ad..36d5a93 100644
830 --- a/kde-plasma/kwrited/kwrited-5.5.49.9999.ebuild
831 +++ b/kde-plasma/kwrited/kwrited-5.5.49.9999.ebuild
832 @@ -16,8 +16,8 @@ DEPEND="
833 $(add_frameworks_dep ki18n)
834 $(add_frameworks_dep knotifications)
835 $(add_frameworks_dep kpty)
836 - dev-qt/qtgui:5
837 - dev-qt/qtwidgets:5
838 + $(add_qt_dep qtgui)
839 + $(add_qt_dep qtwidgets)
840 "
841 RDEPEND="${DEPEND}
842 !kde-base/kwrited:4
843
844 diff --git a/kde-plasma/kwrited/kwrited-9999.ebuild b/kde-plasma/kwrited/kwrited-9999.ebuild
845 index 0c184ad..36d5a93 100644
846 --- a/kde-plasma/kwrited/kwrited-9999.ebuild
847 +++ b/kde-plasma/kwrited/kwrited-9999.ebuild
848 @@ -16,8 +16,8 @@ DEPEND="
849 $(add_frameworks_dep ki18n)
850 $(add_frameworks_dep knotifications)
851 $(add_frameworks_dep kpty)
852 - dev-qt/qtgui:5
853 - dev-qt/qtwidgets:5
854 + $(add_qt_dep qtgui)
855 + $(add_qt_dep qtwidgets)
856 "
857 RDEPEND="${DEPEND}
858 !kde-base/kwrited:4
859
860 diff --git a/kde-plasma/libkscreen/libkscreen-5.5.49.9999.ebuild b/kde-plasma/libkscreen/libkscreen-5.5.49.9999.ebuild
861 index cedf8da..435423c 100644
862 --- a/kde-plasma/libkscreen/libkscreen-5.5.49.9999.ebuild
863 +++ b/kde-plasma/libkscreen/libkscreen-5.5.49.9999.ebuild
864 @@ -13,9 +13,9 @@ KEYWORDS=""
865 IUSE=""
866
867 DEPEND="
868 - dev-qt/qtdbus:5
869 - dev-qt/qtgui:5
870 - dev-qt/qtx11extras:5
871 + $(add_qt_dep qtdbus)
872 + $(add_qt_dep qtgui)
873 + $(add_qt_dep qtx11extras)
874 x11-libs/libxcb
875 "
876 RDEPEND="${DEPEND}
877
878 diff --git a/kde-plasma/libkscreen/libkscreen-9999.ebuild b/kde-plasma/libkscreen/libkscreen-9999.ebuild
879 index ae622c9..bbcccb6 100644
880 --- a/kde-plasma/libkscreen/libkscreen-9999.ebuild
881 +++ b/kde-plasma/libkscreen/libkscreen-9999.ebuild
882 @@ -14,9 +14,9 @@ IUSE="X"
883
884 DEPEND="
885 $(add_plasma_dep kwayland)
886 - dev-qt/qtdbus:5
887 - dev-qt/qtgui:5
888 - dev-qt/qtx11extras:5
889 + $(add_qt_dep qtdbus)
890 + $(add_qt_dep qtgui)
891 + $(add_qt_dep qtx11extras)
892 X? ( x11-libs/libxcb )
893 "
894 RDEPEND="${DEPEND}
895
896 diff --git a/kde-plasma/libksysguard/libksysguard-5.5.49.9999.ebuild b/kde-plasma/libksysguard/libksysguard-5.5.49.9999.ebuild
897 index e49af3e..398a0c8 100644
898 --- a/kde-plasma/libksysguard/libksysguard-5.5.49.9999.ebuild
899 +++ b/kde-plasma/libksysguard/libksysguard-5.5.49.9999.ebuild
900 @@ -22,14 +22,14 @@ COMMON_DEPEND="
901 $(add_frameworks_dep ki18n)
902 $(add_frameworks_dep kwidgetsaddons)
903 $(add_frameworks_dep kwindowsystem)
904 - dev-qt/qtdbus:5
905 - dev-qt/qtgui:5
906 - dev-qt/qtnetwork:5
907 - dev-qt/qtwidgets:5
908 + $(add_qt_dep qtdbus)
909 + $(add_qt_dep qtgui)
910 + $(add_qt_dep qtnetwork)
911 + $(add_qt_dep qtwidgets)
912 sys-libs/zlib
913 - detailedmemory? ( dev-qt/qtwebkit:5 )
914 + detailedmemory? ( $(add_qt_dep qtwebkit) )
915 X? (
916 - dev-qt/qtx11extras:5
917 + $(add_qt_dep qtx11extras)
918 x11-libs/libX11
919 x11-libs/libXres
920 )
921
922 diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild b/kde-plasma/libksysguard/libksysguard-9999.ebuild
923 index e49af3e..398a0c8 100644
924 --- a/kde-plasma/libksysguard/libksysguard-9999.ebuild
925 +++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild
926 @@ -22,14 +22,14 @@ COMMON_DEPEND="
927 $(add_frameworks_dep ki18n)
928 $(add_frameworks_dep kwidgetsaddons)
929 $(add_frameworks_dep kwindowsystem)
930 - dev-qt/qtdbus:5
931 - dev-qt/qtgui:5
932 - dev-qt/qtnetwork:5
933 - dev-qt/qtwidgets:5
934 + $(add_qt_dep qtdbus)
935 + $(add_qt_dep qtgui)
936 + $(add_qt_dep qtnetwork)
937 + $(add_qt_dep qtwidgets)
938 sys-libs/zlib
939 - detailedmemory? ( dev-qt/qtwebkit:5 )
940 + detailedmemory? ( $(add_qt_dep qtwebkit) )
941 X? (
942 - dev-qt/qtx11extras:5
943 + $(add_qt_dep qtx11extras)
944 x11-libs/libX11
945 x11-libs/libXres
946 )
947
948 diff --git a/kde-plasma/milou/milou-5.5.49.9999.ebuild b/kde-plasma/milou/milou-5.5.49.9999.ebuild
949 index fac285b..4efdac9 100644
950 --- a/kde-plasma/milou/milou-5.5.49.9999.ebuild
951 +++ b/kde-plasma/milou/milou-5.5.49.9999.ebuild
952 @@ -21,9 +21,9 @@ DEPEND="
953 $(add_frameworks_dep krunner)
954 $(add_frameworks_dep kservice)
955 $(add_frameworks_dep plasma)
956 - dev-qt/qtdeclarative:5
957 - dev-qt/qtgui:5
958 - dev-qt/qtwidgets:5
959 + $(add_qt_dep qtdeclarative)
960 + $(add_qt_dep qtgui)
961 + $(add_qt_dep qtwidgets)
962 "
963 RDEPEND="${DEPEND}
964 !kde-misc/milou:4
965
966 diff --git a/kde-plasma/milou/milou-9999.ebuild b/kde-plasma/milou/milou-9999.ebuild
967 index fac285b..4efdac9 100644
968 --- a/kde-plasma/milou/milou-9999.ebuild
969 +++ b/kde-plasma/milou/milou-9999.ebuild
970 @@ -21,9 +21,9 @@ DEPEND="
971 $(add_frameworks_dep krunner)
972 $(add_frameworks_dep kservice)
973 $(add_frameworks_dep plasma)
974 - dev-qt/qtdeclarative:5
975 - dev-qt/qtgui:5
976 - dev-qt/qtwidgets:5
977 + $(add_qt_dep qtdeclarative)
978 + $(add_qt_dep qtgui)
979 + $(add_qt_dep qtwidgets)
980 "
981 RDEPEND="${DEPEND}
982 !kde-misc/milou:4
983
984 diff --git a/kde-plasma/oxygen/oxygen-5.5.49.9999.ebuild b/kde-plasma/oxygen/oxygen-5.5.49.9999.ebuild
985 index 1e9ab7a..2c2a9b1 100644
986 --- a/kde-plasma/oxygen/oxygen-5.5.49.9999.ebuild
987 +++ b/kde-plasma/oxygen/oxygen-5.5.49.9999.ebuild
988 @@ -23,10 +23,10 @@ RDEPEND="
989 $(add_frameworks_dep kwidgetsaddons)
990 $(add_frameworks_dep kwindowsystem)
991 $(add_plasma_dep kdecoration)
992 - dev-qt/qtdbus:5
993 - dev-qt/qtgui:5
994 - dev-qt/qtwidgets:5
995 - dev-qt/qtx11extras:5
996 + $(add_qt_dep qtdbus)
997 + $(add_qt_dep qtgui)
998 + $(add_qt_dep qtwidgets)
999 + $(add_qt_dep qtx11extras)
1000 x11-libs/libxcb
1001 !kde-base/kdebase-cursors:4
1002 !kde-base/oxygen:4
1003
1004 diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild b/kde-plasma/oxygen/oxygen-9999.ebuild
1005 index 1e9ab7a..2c2a9b1 100644
1006 --- a/kde-plasma/oxygen/oxygen-9999.ebuild
1007 +++ b/kde-plasma/oxygen/oxygen-9999.ebuild
1008 @@ -23,10 +23,10 @@ RDEPEND="
1009 $(add_frameworks_dep kwidgetsaddons)
1010 $(add_frameworks_dep kwindowsystem)
1011 $(add_plasma_dep kdecoration)
1012 - dev-qt/qtdbus:5
1013 - dev-qt/qtgui:5
1014 - dev-qt/qtwidgets:5
1015 - dev-qt/qtx11extras:5
1016 + $(add_qt_dep qtdbus)
1017 + $(add_qt_dep qtgui)
1018 + $(add_qt_dep qtwidgets)
1019 + $(add_qt_dep qtx11extras)
1020 x11-libs/libxcb
1021 !kde-base/kdebase-cursors:4
1022 !kde-base/oxygen:4
1023
1024 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.5.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.5.49.9999.ebuild
1025 index 66ae4fd..6f81777 100644
1026 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.5.49.9999.ebuild
1027 +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.5.49.9999.ebuild
1028 @@ -54,17 +54,17 @@ COMMON_DEPEND="
1029 $(add_frameworks_dep plasma)
1030 $(add_frameworks_dep solid)
1031 $(add_frameworks_dep sonnet)
1032 - dev-qt/qtconcurrent:5
1033 - dev-qt/qtdbus:5
1034 - dev-qt/qtdeclarative:5
1035 - dev-qt/qtgui:5
1036 - dev-qt/qtnetwork:5
1037 - dev-qt/qtprintsupport:5
1038 - dev-qt/qtsql:5
1039 - dev-qt/qtsvg:5
1040 - dev-qt/qtwidgets:5
1041 - dev-qt/qtx11extras:5
1042 - dev-qt/qtxml:5
1043 + $(add_qt_dep qtconcurrent)
1044 + $(add_qt_dep qtdbus)
1045 + $(add_qt_dep qtdeclarative)
1046 + $(add_qt_dep qtgui)
1047 + $(add_qt_dep qtnetwork)
1048 + $(add_qt_dep qtprintsupport)
1049 + $(add_qt_dep qtsql)
1050 + $(add_qt_dep qtsvg)
1051 + $(add_qt_dep qtwidgets)
1052 + $(add_qt_dep qtx11extras)
1053 + $(add_qt_dep qtxml)
1054 media-libs/phonon[qt5]
1055 x11-libs/libX11
1056 x11-libs/libXcursor
1057 @@ -89,7 +89,7 @@ RDEPEND="${COMMON_DEPEND}
1058 $(add_plasma_dep breeze)
1059 $(add_plasma_dep kde-cli-tools)
1060 $(add_plasma_dep oxygen)
1061 - dev-qt/qtgraphicaleffects:5
1062 + $(add_qt_dep qtgraphicaleffects)
1063 sys-apps/accountsservice
1064 x11-apps/setxkbmap
1065 legacy-systray? (
1066
1067 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
1068 index 7d2aed4..af28a55 100644
1069 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
1070 +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
1071 @@ -54,17 +54,17 @@ COMMON_DEPEND="
1072 $(add_frameworks_dep sonnet)
1073 $(add_plasma_dep kwin)
1074 $(add_plasma_dep plasma-workspace)
1075 - dev-qt/qtconcurrent:5
1076 - dev-qt/qtdbus:5
1077 - dev-qt/qtdeclarative:5
1078 - dev-qt/qtgui:5
1079 - dev-qt/qtnetwork:5
1080 - dev-qt/qtprintsupport:5
1081 - dev-qt/qtsql:5
1082 - dev-qt/qtsvg:5
1083 - dev-qt/qtwidgets:5
1084 - dev-qt/qtx11extras:5
1085 - dev-qt/qtxml:5
1086 + $(add_qt_dep qtconcurrent)
1087 + $(add_qt_dep qtdbus)
1088 + $(add_qt_dep qtdeclarative)
1089 + $(add_qt_dep qtgui)
1090 + $(add_qt_dep qtnetwork)
1091 + $(add_qt_dep qtprintsupport)
1092 + $(add_qt_dep qtsql)
1093 + $(add_qt_dep qtsvg)
1094 + $(add_qt_dep qtwidgets)
1095 + $(add_qt_dep qtx11extras)
1096 + $(add_qt_dep qtxml)
1097 media-libs/phonon[qt5]
1098 x11-libs/libX11
1099 x11-libs/libXcursor
1100 @@ -89,7 +89,7 @@ RDEPEND="${COMMON_DEPEND}
1101 $(add_plasma_dep breeze)
1102 $(add_plasma_dep kde-cli-tools)
1103 $(add_plasma_dep oxygen)
1104 - dev-qt/qtgraphicaleffects:5
1105 + $(add_qt_dep qtgraphicaleffects)
1106 sys-apps/accountsservice
1107 x11-apps/setxkbmap
1108 legacy-systray? (
1109
1110 diff --git a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
1111 index 8110ed5..db003d1 100644
1112 --- a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
1113 +++ b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
1114 @@ -27,10 +27,10 @@ DEPEND="
1115 $(add_frameworks_dep kwidgetsaddons)
1116 $(add_frameworks_dep kxmlgui)
1117 $(add_plasma_dep kwayland)
1118 - dev-qt/qtdbus:5
1119 + $(add_qt_dep qtdbus)
1120 dev-qt/qtgui:5=
1121 - dev-qt/qtwidgets:5
1122 - dev-qt/qtx11extras:5
1123 + $(add_qt_dep qtwidgets)
1124 + $(add_qt_dep qtx11extras)
1125 x11-libs/libXcursor
1126 "
1127 RDEPEND="${DEPEND}
1128
1129 diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.5.49.9999.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.5.49.9999.ebuild
1130 index 59a1526..6949296 100644
1131 --- a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.5.49.9999.ebuild
1132 +++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.5.49.9999.ebuild
1133 @@ -21,11 +21,11 @@ DEPEND="
1134 $(add_frameworks_dep kio)
1135 $(add_frameworks_dep kservice)
1136 $(add_frameworks_dep plasma)
1137 - dev-qt/qtdbus:5
1138 - dev-qt/qtdeclarative:5
1139 - dev-qt/qtgui:5
1140 - dev-qt/qtnetwork:5
1141 - dev-qt/qtxml:5
1142 + $(add_qt_dep qtdbus)
1143 + $(add_qt_dep qtdeclarative)
1144 + $(add_qt_dep qtgui)
1145 + $(add_qt_dep qtnetwork)
1146 + $(add_qt_dep qtxml)
1147 media-libs/taglib
1148 semantic-desktop? (
1149 $(add_frameworks_dep baloo)
1150 @@ -34,7 +34,7 @@ DEPEND="
1151 "
1152 RDEPEND="${DEPEND}
1153 $(add_plasma_dep plasma-workspace)
1154 - dev-qt/qtmultimedia:5[qml]
1155 + $(add_qt_dep qtmultimedia 'qml')
1156 !media-video/plasma-mediacenter
1157 "
1158
1159
1160 diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-9999.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-9999.ebuild
1161 index 59a1526..6949296 100644
1162 --- a/kde-plasma/plasma-mediacenter/plasma-mediacenter-9999.ebuild
1163 +++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-9999.ebuild
1164 @@ -21,11 +21,11 @@ DEPEND="
1165 $(add_frameworks_dep kio)
1166 $(add_frameworks_dep kservice)
1167 $(add_frameworks_dep plasma)
1168 - dev-qt/qtdbus:5
1169 - dev-qt/qtdeclarative:5
1170 - dev-qt/qtgui:5
1171 - dev-qt/qtnetwork:5
1172 - dev-qt/qtxml:5
1173 + $(add_qt_dep qtdbus)
1174 + $(add_qt_dep qtdeclarative)
1175 + $(add_qt_dep qtgui)
1176 + $(add_qt_dep qtnetwork)
1177 + $(add_qt_dep qtxml)
1178 media-libs/taglib
1179 semantic-desktop? (
1180 $(add_frameworks_dep baloo)
1181 @@ -34,7 +34,7 @@ DEPEND="
1182 "
1183 RDEPEND="${DEPEND}
1184 $(add_plasma_dep plasma-workspace)
1185 - dev-qt/qtmultimedia:5[qml]
1186 + $(add_qt_dep qtmultimedia 'qml')
1187 !media-video/plasma-mediacenter
1188 "
1189
1190
1191 diff --git a/kde-plasma/plasma-nm/plasma-nm-5.5.49.9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.5.49.9999.ebuild
1192 index f914ea7..2fe6b94 100644
1193 --- a/kde-plasma/plasma-nm/plasma-nm-5.5.49.9999.ebuild
1194 +++ b/kde-plasma/plasma-nm/plasma-nm-5.5.49.9999.ebuild
1195 @@ -33,19 +33,19 @@ DEPEND="
1196 $(add_frameworks_dep plasma)
1197 $(add_frameworks_dep solid)
1198 >=app-crypt/qca-2.1.0.3-r1:2[qt5]
1199 - dev-qt/qtdbus:5
1200 - dev-qt/qtdeclarative:5
1201 - dev-qt/qtgui:5
1202 - dev-qt/qtnetwork:5
1203 - dev-qt/qtwidgets:5
1204 + $(add_qt_dep qtdbus)
1205 + $(add_qt_dep qtdeclarative)
1206 + $(add_qt_dep qtgui)
1207 + $(add_qt_dep qtnetwork)
1208 + $(add_qt_dep qtwidgets)
1209 >=net-misc/networkmanager-0.9.10.0[teamd=]
1210 modemmanager? (
1211 $(add_frameworks_dep modemmanager-qt)
1212 - dev-qt/qtxml:5
1213 + $(add_qt_dep qtxml)
1214 net-misc/mobile-broadband-provider-info
1215 )
1216 openconnect? (
1217 - dev-qt/qtxml:5
1218 + $(add_qt_dep qtxml)
1219 net-misc/networkmanager-openconnect
1220 net-misc/openconnect:=
1221 )
1222
1223 diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
1224 index f914ea7..2fe6b94 100644
1225 --- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
1226 +++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
1227 @@ -33,19 +33,19 @@ DEPEND="
1228 $(add_frameworks_dep plasma)
1229 $(add_frameworks_dep solid)
1230 >=app-crypt/qca-2.1.0.3-r1:2[qt5]
1231 - dev-qt/qtdbus:5
1232 - dev-qt/qtdeclarative:5
1233 - dev-qt/qtgui:5
1234 - dev-qt/qtnetwork:5
1235 - dev-qt/qtwidgets:5
1236 + $(add_qt_dep qtdbus)
1237 + $(add_qt_dep qtdeclarative)
1238 + $(add_qt_dep qtgui)
1239 + $(add_qt_dep qtnetwork)
1240 + $(add_qt_dep qtwidgets)
1241 >=net-misc/networkmanager-0.9.10.0[teamd=]
1242 modemmanager? (
1243 $(add_frameworks_dep modemmanager-qt)
1244 - dev-qt/qtxml:5
1245 + $(add_qt_dep qtxml)
1246 net-misc/mobile-broadband-provider-info
1247 )
1248 openconnect? (
1249 - dev-qt/qtxml:5
1250 + $(add_qt_dep qtxml)
1251 net-misc/networkmanager-openconnect
1252 net-misc/openconnect:=
1253 )
1254
1255 diff --git a/kde-plasma/plasma-pa/plasma-pa-5.5.49.9999.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.5.49.9999.ebuild
1256 index 09dbf39..f2ae54d 100644
1257 --- a/kde-plasma/plasma-pa/plasma-pa-5.5.49.9999.ebuild
1258 +++ b/kde-plasma/plasma-pa/plasma-pa-5.5.49.9999.ebuild
1259 @@ -17,10 +17,10 @@ DEPEND="
1260 $(add_frameworks_dep kglobalaccel)
1261 $(add_frameworks_dep ki18n)
1262 $(add_frameworks_dep plasma)
1263 - dev-qt/qtdbus:5
1264 - dev-qt/qtdeclarative:5
1265 - dev-qt/qtgui:5
1266 - dev-qt/qtwidgets:5
1267 + $(add_qt_dep qtdbus)
1268 + $(add_qt_dep qtdeclarative)
1269 + $(add_qt_dep qtgui)
1270 + $(add_qt_dep qtwidgets)
1271 media-sound/pulseaudio
1272 "
1273
1274
1275 diff --git a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
1276 index 09dbf39..f2ae54d 100644
1277 --- a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
1278 +++ b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
1279 @@ -17,10 +17,10 @@ DEPEND="
1280 $(add_frameworks_dep kglobalaccel)
1281 $(add_frameworks_dep ki18n)
1282 $(add_frameworks_dep plasma)
1283 - dev-qt/qtdbus:5
1284 - dev-qt/qtdeclarative:5
1285 - dev-qt/qtgui:5
1286 - dev-qt/qtwidgets:5
1287 + $(add_qt_dep qtdbus)
1288 + $(add_qt_dep qtdeclarative)
1289 + $(add_qt_dep qtgui)
1290 + $(add_qt_dep qtwidgets)
1291 media-sound/pulseaudio
1292 "
1293
1294
1295 diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.5.49.9999.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.5.49.9999.ebuild
1296 index 554ce79..b4d53e3 100644
1297 --- a/kde-plasma/plasma-sdk/plasma-sdk-5.5.49.9999.ebuild
1298 +++ b/kde-plasma/plasma-sdk/plasma-sdk-5.5.49.9999.ebuild
1299 @@ -27,11 +27,11 @@ DEPEND="
1300 $(add_frameworks_dep ktexteditor)
1301 $(add_frameworks_dep kwidgetsaddons)
1302 $(add_frameworks_dep plasma)
1303 - dev-qt/qtdbus:5
1304 - dev-qt/qtdeclarative:5
1305 - dev-qt/qtgui:5
1306 - dev-qt/qtwidgets:5
1307 - dev-qt/qtxml:5
1308 + $(add_qt_dep qtdbus)
1309 + $(add_qt_dep qtdeclarative)
1310 + $(add_qt_dep qtgui)
1311 + $(add_qt_dep qtwidgets)
1312 + $(add_qt_dep qtxml)
1313 "
1314 RDEPEND="${DEPEND}
1315 !dev-util/plasmate
1316
1317 diff --git a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
1318 index 554ce79..b4d53e3 100644
1319 --- a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
1320 +++ b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
1321 @@ -27,11 +27,11 @@ DEPEND="
1322 $(add_frameworks_dep ktexteditor)
1323 $(add_frameworks_dep kwidgetsaddons)
1324 $(add_frameworks_dep plasma)
1325 - dev-qt/qtdbus:5
1326 - dev-qt/qtdeclarative:5
1327 - dev-qt/qtgui:5
1328 - dev-qt/qtwidgets:5
1329 - dev-qt/qtxml:5
1330 + $(add_qt_dep qtdbus)
1331 + $(add_qt_dep qtdeclarative)
1332 + $(add_qt_dep qtgui)
1333 + $(add_qt_dep qtwidgets)
1334 + $(add_qt_dep qtxml)
1335 "
1336 RDEPEND="${DEPEND}
1337 !dev-util/plasmate
1338
1339 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
1340 index 7671c37..452241a 100644
1341 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
1342 +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
1343 @@ -7,7 +7,6 @@ EAPI=6
1344 KDE_HANDBOOK="true"
1345 KDE_PUNT_BOGUS_DEPS="true"
1346 KDE_TEST="true"
1347 -QT_MINIMAL="5.5.0"
1348 VIRTUALX_REQUIRED="test"
1349 inherit kde5 multilib qmake-utils
1350
1351 @@ -60,16 +59,16 @@ COMMON_DEPEND="
1352 $(add_plasma_dep kwin)
1353 $(add_plasma_dep libkscreen)
1354 $(add_plasma_dep libksysguard)
1355 - dev-qt/qtconcurrent:5
1356 - dev-qt/qtdbus:5
1357 - dev-qt/qtdeclarative:5[widgets]
1358 - dev-qt/qtgui:5[jpeg]
1359 - dev-qt/qtnetwork:5
1360 - dev-qt/qtscript:5
1361 - dev-qt/qtsql:5
1362 - dev-qt/qtwidgets:5
1363 - dev-qt/qtx11extras:5
1364 - dev-qt/qtxml:5
1365 + $(add_qt_dep qtconcurrent)
1366 + $(add_qt_dep qtdbus)
1367 + $(add_qt_dep qtdeclarative 'widgets')
1368 + $(add_qt_dep qtgui 'jpeg')
1369 + $(add_qt_dep qtnetwork)
1370 + $(add_qt_dep qtscript)
1371 + $(add_qt_dep qtsql)
1372 + $(add_qt_dep qtwidgets)
1373 + $(add_qt_dep qtx11extras)
1374 + $(add_qt_dep qtxml)
1375 media-libs/phonon[qt5]
1376 sys-libs/zlib
1377 x11-libs/libICE
1378 @@ -93,10 +92,10 @@ RDEPEND="${COMMON_DEPEND}
1379 $(add_plasma_dep kde-cli-tools)
1380 $(add_plasma_dep ksysguard)
1381 $(add_plasma_dep milou)
1382 - dev-qt/qdbus:5
1383 - dev-qt/qtgraphicaleffects:5
1384 - dev-qt/qtpaths:5
1385 - dev-qt/qtquickcontrols:5[widgets]
1386 + $(add_qt_dep qdbus)
1387 + $(add_qt_dep qtgraphicaleffects)
1388 + $(add_qt_dep qtpaths)
1389 + $(add_qt_dep qtquickcontrols 'widgets')
1390 x11-apps/mkfontdir
1391 x11-apps/xmessage
1392 x11-apps/xprop
1393
1394 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
1395 index 3bdfd3a..85a065b 100644
1396 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
1397 +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
1398 @@ -7,7 +7,6 @@ EAPI=6
1399 KDE_HANDBOOK="true"
1400 KDE_PUNT_BOGUS_DEPS="true"
1401 KDE_TEST="true"
1402 -QT_MINIMAL="5.5.0"
1403 VIRTUALX_REQUIRED="test"
1404 inherit kde5 multilib qmake-utils
1405
1406 @@ -60,16 +59,16 @@ COMMON_DEPEND="
1407 $(add_plasma_dep kwin)
1408 $(add_plasma_dep libkscreen)
1409 $(add_plasma_dep libksysguard)
1410 - dev-qt/qtconcurrent:5
1411 - dev-qt/qtdbus:5
1412 - dev-qt/qtdeclarative:5[widgets]
1413 - dev-qt/qtgui:5[jpeg]
1414 - dev-qt/qtnetwork:5
1415 - dev-qt/qtscript:5
1416 - dev-qt/qtsql:5
1417 - dev-qt/qtwidgets:5
1418 - dev-qt/qtx11extras:5
1419 - dev-qt/qtxml:5
1420 + $(add_qt_dep qtconcurrent)
1421 + $(add_qt_dep qtdbus)
1422 + $(add_qt_dep qtdeclarative 'widgets')
1423 + $(add_qt_dep qtgui 'jpeg')
1424 + $(add_qt_dep qtnetwork)
1425 + $(add_qt_dep qtscript)
1426 + $(add_qt_dep qtsql)
1427 + $(add_qt_dep qtwidgets)
1428 + $(add_qt_dep qtx11extras)
1429 + $(add_qt_dep qtxml)
1430 media-libs/phonon[qt5]
1431 sys-libs/zlib
1432 x11-libs/libICE
1433 @@ -93,10 +92,10 @@ RDEPEND="${COMMON_DEPEND}
1434 $(add_plasma_dep kde-cli-tools)
1435 $(add_plasma_dep ksysguard)
1436 $(add_plasma_dep milou)
1437 - dev-qt/qdbus:5
1438 - dev-qt/qtgraphicaleffects:5
1439 - dev-qt/qtpaths:5
1440 - dev-qt/qtquickcontrols:5[widgets]
1441 + $(add_qt_dep qdbus)
1442 + $(add_qt_dep qtgraphicaleffects)
1443 + $(add_qt_dep qtpaths)
1444 + $(add_qt_dep qtquickcontrols 'widgets')
1445 x11-apps/mkfontdir
1446 x11-apps/xmessage
1447 x11-apps/xprop
1448
1449 diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.5.49.9999.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.5.49.9999.ebuild
1450 index 9dc6310..e8457e3 100644
1451 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.5.49.9999.ebuild
1452 +++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.5.49.9999.ebuild
1453 @@ -21,9 +21,9 @@ DEPEND="
1454 $(add_frameworks_dep knotifications)
1455 $(add_frameworks_dep kwidgetsaddons)
1456 $(add_frameworks_dep kwindowsystem)
1457 - dev-qt/qtdbus:5
1458 - dev-qt/qtgui:5
1459 - dev-qt/qtwidgets:5
1460 + $(add_qt_dep qtdbus)
1461 + $(add_qt_dep qtgui)
1462 + $(add_qt_dep qtwidgets)
1463 || ( $(add_frameworks_dep polkit-qt) >=sys-auth/polkit-qt-0.112.0[qt5] )
1464 "
1465 RDEPEND="${DEPEND}
1466
1467 diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
1468 index 37a913b..48e3812 100644
1469 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
1470 +++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
1471 @@ -20,9 +20,9 @@ DEPEND="
1472 $(add_frameworks_dep kiconthemes)
1473 $(add_frameworks_dep kwidgetsaddons)
1474 $(add_frameworks_dep kwindowsystem)
1475 - dev-qt/qtdbus:5
1476 - dev-qt/qtgui:5
1477 - dev-qt/qtwidgets:5
1478 + $(add_qt_dep qtdbus)
1479 + $(add_qt_dep qtgui)
1480 + $(add_qt_dep qtwidgets)
1481 || ( $(add_frameworks_dep polkit-qt) >=sys-auth/polkit-qt-0.112.0[qt5] )
1482 "
1483 RDEPEND="${DEPEND}
1484
1485 diff --git a/kde-plasma/powerdevil/powerdevil-5.5.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-5.5.49.9999.ebuild
1486 index d432dd9..42335a5 100644
1487 --- a/kde-plasma/powerdevil/powerdevil-5.5.49.9999.ebuild
1488 +++ b/kde-plasma/powerdevil/powerdevil-5.5.49.9999.ebuild
1489 @@ -34,10 +34,10 @@ DEPEND="
1490 $(add_plasma_dep kwayland)
1491 $(add_plasma_dep libkscreen)
1492 $(add_plasma_dep plasma-workspace)
1493 - dev-qt/qtdbus:5
1494 - dev-qt/qtgui:5
1495 - dev-qt/qtwidgets:5
1496 - dev-qt/qtx11extras:5
1497 + $(add_qt_dep qtdbus)
1498 + $(add_qt_dep qtgui)
1499 + $(add_qt_dep qtwidgets)
1500 + $(add_qt_dep qtx11extras)
1501 virtual/libudev:=
1502 x11-libs/libxcb
1503 "
1504
1505 diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild b/kde-plasma/powerdevil/powerdevil-9999.ebuild
1506 index d432dd9..42335a5 100644
1507 --- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
1508 +++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
1509 @@ -34,10 +34,10 @@ DEPEND="
1510 $(add_plasma_dep kwayland)
1511 $(add_plasma_dep libkscreen)
1512 $(add_plasma_dep plasma-workspace)
1513 - dev-qt/qtdbus:5
1514 - dev-qt/qtgui:5
1515 - dev-qt/qtwidgets:5
1516 - dev-qt/qtx11extras:5
1517 + $(add_qt_dep qtdbus)
1518 + $(add_qt_dep qtgui)
1519 + $(add_qt_dep qtwidgets)
1520 + $(add_qt_dep qtx11extras)
1521 virtual/libudev:=
1522 x11-libs/libxcb
1523 "
1524
1525 diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.5.49.9999.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.5.49.9999.ebuild
1526 index ebd0be7..619e6ba 100644
1527 --- a/kde-plasma/sddm-kcm/sddm-kcm-5.5.49.9999.ebuild
1528 +++ b/kde-plasma/sddm-kcm/sddm-kcm-5.5.49.9999.ebuild
1529 @@ -20,10 +20,10 @@ COMMON_DEPEND="
1530 $(add_frameworks_dep kcoreaddons)
1531 $(add_frameworks_dep ki18n)
1532 $(add_frameworks_dep kio)
1533 - dev-qt/qtdeclarative:5[widgets]
1534 - dev-qt/qtgui:5
1535 - dev-qt/qtwidgets:5
1536 - dev-qt/qtx11extras:5
1537 + $(add_qt_dep qtdeclarative 'widgets')
1538 + $(add_qt_dep qtgui)
1539 + $(add_qt_dep qtwidgets)
1540 + $(add_qt_dep qtx11extras)
1541 x11-libs/libX11
1542 x11-libs/libXcursor
1543 "
1544
1545 diff --git a/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
1546 index ebd0be7..619e6ba 100644
1547 --- a/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
1548 +++ b/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
1549 @@ -20,10 +20,10 @@ COMMON_DEPEND="
1550 $(add_frameworks_dep kcoreaddons)
1551 $(add_frameworks_dep ki18n)
1552 $(add_frameworks_dep kio)
1553 - dev-qt/qtdeclarative:5[widgets]
1554 - dev-qt/qtgui:5
1555 - dev-qt/qtwidgets:5
1556 - dev-qt/qtx11extras:5
1557 + $(add_qt_dep qtdeclarative 'widgets')
1558 + $(add_qt_dep qtgui)
1559 + $(add_qt_dep qtwidgets)
1560 + $(add_qt_dep qtx11extras)
1561 x11-libs/libX11
1562 x11-libs/libXcursor
1563 "
1564
1565 diff --git a/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild b/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild
1566 index 4b40f78..7fc6dce 100644
1567 --- a/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild
1568 +++ b/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild
1569 @@ -27,9 +27,9 @@ DEPEND="
1570 $(add_frameworks_dep kwidgetsaddons)
1571 $(add_frameworks_dep kwindowsystem)
1572 $(add_frameworks_dep kxmlgui)
1573 - dev-qt/qtdbus:5
1574 - dev-qt/qtgui:5
1575 - dev-qt/qtwidgets:5
1576 + $(add_qt_dep qtdbus)
1577 + $(add_qt_dep qtgui)
1578 + $(add_qt_dep qtwidgets)
1579 classic? ( $(add_frameworks_dep khtml) )
1580 "
1581 RDEPEND="${DEPEND}
1582
1583 diff --git a/kde-plasma/systemsettings/systemsettings-9999.ebuild b/kde-plasma/systemsettings/systemsettings-9999.ebuild
1584 index 4b40f78..7fc6dce 100644
1585 --- a/kde-plasma/systemsettings/systemsettings-9999.ebuild
1586 +++ b/kde-plasma/systemsettings/systemsettings-9999.ebuild
1587 @@ -27,9 +27,9 @@ DEPEND="
1588 $(add_frameworks_dep kwidgetsaddons)
1589 $(add_frameworks_dep kwindowsystem)
1590 $(add_frameworks_dep kxmlgui)
1591 - dev-qt/qtdbus:5
1592 - dev-qt/qtgui:5
1593 - dev-qt/qtwidgets:5
1594 + $(add_qt_dep qtdbus)
1595 + $(add_qt_dep qtgui)
1596 + $(add_qt_dep qtwidgets)
1597 classic? ( $(add_frameworks_dep khtml) )
1598 "
1599 RDEPEND="${DEPEND}
1600
1601 diff --git a/kde-plasma/user-manager/user-manager-5.5.49.9999.ebuild b/kde-plasma/user-manager/user-manager-5.5.49.9999.ebuild
1602 index 31a83ac..8088068 100644
1603 --- a/kde-plasma/user-manager/user-manager-5.5.49.9999.ebuild
1604 +++ b/kde-plasma/user-manager/user-manager-5.5.49.9999.ebuild
1605 @@ -19,8 +19,8 @@ DEPEND="
1606 $(add_frameworks_dep kio)
1607 $(add_frameworks_dep kwidgetsaddons)
1608 dev-libs/libpwquality
1609 - dev-qt/qtdbus:5
1610 - dev-qt/qtgui:5
1611 - dev-qt/qtwidgets:5
1612 + $(add_qt_dep qtdbus)
1613 + $(add_qt_dep qtgui)
1614 + $(add_qt_dep qtwidgets)
1615 "
1616 RDEPEND="${DEPEND}"
1617
1618 diff --git a/kde-plasma/user-manager/user-manager-9999.ebuild b/kde-plasma/user-manager/user-manager-9999.ebuild
1619 index 31a83ac..8088068 100644
1620 --- a/kde-plasma/user-manager/user-manager-9999.ebuild
1621 +++ b/kde-plasma/user-manager/user-manager-9999.ebuild
1622 @@ -19,8 +19,8 @@ DEPEND="
1623 $(add_frameworks_dep kio)
1624 $(add_frameworks_dep kwidgetsaddons)
1625 dev-libs/libpwquality
1626 - dev-qt/qtdbus:5
1627 - dev-qt/qtgui:5
1628 - dev-qt/qtwidgets:5
1629 + $(add_qt_dep qtdbus)
1630 + $(add_qt_dep qtgui)
1631 + $(add_qt_dep qtwidgets)
1632 "
1633 RDEPEND="${DEPEND}"