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-apps/akonadi-mime/, kde-apps/kfourinline/, kde-apps/messagelib/, ...
Date: Sun, 31 Jan 2016 16:22:10
Message-Id: 1454257307.c7b658db8ae44cbeeee0687f45f8068aba462668.kensington@gentoo
1 commit: c7b658db8ae44cbeeee0687f45f8068aba462668
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Mon Jan 25 00:47:13 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=c7b658db
7
8 kde-apps: Convert to add_qt_dep
9
10 Package-Manager: portage-2.2.26
11
12 .../akonadi-calendar-15.12.1.ebuild | 6 ++---
13 .../akonadi-calendar-15.12.49.9999.ebuild | 6 ++---
14 .../akonadi-calendar/akonadi-calendar-9999.ebuild | 6 ++---
15 .../akonadi-contact/akonadi-contact-15.12.1.ebuild | 6 ++---
16 .../akonadi-contact-15.12.49.9999.ebuild | 6 ++---
17 .../akonadi-contact/akonadi-contact-9999.ebuild | 6 ++---
18 kde-apps/akonadi-mime/akonadi-mime-15.12.1.ebuild | 6 ++---
19 .../akonadi-mime/akonadi-mime-15.12.49.9999.ebuild | 6 ++---
20 kde-apps/akonadi-mime/akonadi-mime-9999.ebuild | 6 ++---
21 .../akonadi-notes/akonadi-notes-15.12.1.ebuild | 4 ++--
22 .../akonadi-notes-15.12.49.9999.ebuild | 4 ++--
23 kde-apps/akonadi-notes/akonadi-notes-9999.ebuild | 4 ++--
24 .../akonadi-search/akonadi-search-15.12.1.ebuild | 6 ++---
25 .../akonadi-search-15.12.49.9999.ebuild | 6 ++---
26 kde-apps/akonadi-search/akonadi-search-9999.ebuild | 6 ++---
27 .../akonadi-socialutils-15.12.1.ebuild | 2 +-
28 .../akonadi-socialutils-15.12.49.9999.ebuild | 2 +-
29 .../akonadi-socialutils-9999.ebuild | 2 +-
30 kde-apps/akonadi/akonadi-15.12.1.ebuild | 14 ++++++------
31 kde-apps/akonadi/akonadi-15.12.49.9999.ebuild | 14 ++++++------
32 kde-apps/akonadi/akonadi-9999.ebuild | 16 ++++++-------
33 kde-apps/analitza/analitza-15.08.3.ebuild | 12 +++++-----
34 kde-apps/analitza/analitza-15.12.1.ebuild | 12 +++++-----
35 kde-apps/analitza/analitza-15.12.49.9999.ebuild | 12 +++++-----
36 kde-apps/analitza/analitza-9999.ebuild | 12 +++++-----
37 kde-apps/ark/ark-15.12.1.ebuild | 6 ++---
38 kde-apps/ark/ark-15.12.49.9999.ebuild | 6 ++---
39 kde-apps/ark/ark-9999.ebuild | 6 ++---
40 kde-apps/artikulate/artikulate-15.12.1.ebuild | 13 +++++------
41 .../artikulate/artikulate-15.12.49.9999.ebuild | 13 +++++------
42 kde-apps/artikulate/artikulate-9999.ebuild | 13 +++++------
43 .../baloo-widgets/baloo-widgets-15.12.1.ebuild | 4 ++--
44 .../baloo-widgets-15.12.49.9999.ebuild | 4 ++--
45 kde-apps/baloo-widgets/baloo-widgets-9999.ebuild | 4 ++--
46 kde-apps/blinken/blinken-15.08.3.ebuild | 6 ++---
47 kde-apps/blinken/blinken-15.12.1.ebuild | 6 ++---
48 kde-apps/blinken/blinken-15.12.49.9999.ebuild | 6 ++---
49 kde-apps/blinken/blinken-9999.ebuild | 6 ++---
50 kde-apps/bomber/bomber-15.12.1.ebuild | 4 ++--
51 kde-apps/bomber/bomber-15.12.49.9999.ebuild | 4 ++--
52 kde-apps/bomber/bomber-9999.ebuild | 4 ++--
53 kde-apps/bovo/bovo-15.12.1.ebuild | 8 +++----
54 kde-apps/bovo/bovo-15.12.49.9999.ebuild | 8 +++----
55 kde-apps/bovo/bovo-9999.ebuild | 8 +++----
56 .../calendarsupport/calendarsupport-15.12.1.ebuild | 8 +++----
57 .../calendarsupport-15.12.49.9999.ebuild | 8 +++----
58 .../calendarsupport/calendarsupport-9999.ebuild | 8 +++----
59 kde-apps/cantor/cantor-15.08.3.ebuild | 10 ++++-----
60 kde-apps/cantor/cantor-15.12.1.ebuild | 10 ++++-----
61 kde-apps/cantor/cantor-15.12.49.9999.ebuild | 10 ++++-----
62 kde-apps/cantor/cantor-9999.ebuild | 10 ++++-----
63 .../composereditor/composereditor-15.12.1.ebuild | 10 ++++-----
64 .../composereditor-15.12.49.9999.ebuild | 10 ++++-----
65 .../dolphin-plugins/dolphin-plugins-15.12.1.ebuild | 6 ++---
66 .../dolphin-plugins-15.12.49.9999.ebuild | 6 ++---
67 .../dolphin-plugins/dolphin-plugins-9999.ebuild | 6 ++---
68 kde-apps/dolphin/dolphin-15.12.1.ebuild | 10 ++++-----
69 kde-apps/dolphin/dolphin-15.12.49.9999.ebuild | 10 ++++-----
70 kde-apps/dolphin/dolphin-9999.ebuild | 10 ++++-----
71 kde-apps/dragon/dragon-15.12.1.ebuild | 6 ++---
72 kde-apps/dragon/dragon-15.12.49.9999.ebuild | 6 ++---
73 kde-apps/dragon/dragon-9999.ebuild | 6 ++---
74 kde-apps/eventviews/eventviews-15.12.1.ebuild | 6 ++---
75 .../eventviews/eventviews-15.12.49.9999.ebuild | 6 ++---
76 kde-apps/eventviews/eventviews-9999.ebuild | 6 ++---
77 kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.1.ebuild | 2 +-
78 .../ffmpegthumbs/ffmpegthumbs-15.12.49.9999.ebuild | 2 +-
79 kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild | 2 +-
80 kde-apps/filelight/filelight-15.12.1.ebuild | 4 ++--
81 kde-apps/filelight/filelight-15.12.49.9999.ebuild | 4 ++--
82 kde-apps/filelight/filelight-9999.ebuild | 4 ++--
83 kde-apps/granatier/granatier-15.12.1.ebuild | 8 +++----
84 kde-apps/granatier/granatier-15.12.49.9999.ebuild | 8 +++----
85 kde-apps/granatier/granatier-9999.ebuild | 8 +++----
86 .../grantleetheme/grantleetheme-15.12.1.ebuild | 6 ++---
87 .../grantleetheme-15.12.49.9999.ebuild | 6 ++---
88 kde-apps/grantleetheme/grantleetheme-9999.ebuild | 6 ++---
89 kde-apps/gwenview/gwenview-15.12.1.ebuild | 16 ++++++-------
90 kde-apps/gwenview/gwenview-15.12.49.9999.ebuild | 16 ++++++-------
91 kde-apps/gwenview/gwenview-9999.ebuild | 16 ++++++-------
92 .../incidenceeditor/incidenceeditor-15.12.1.ebuild | 10 ++++-----
93 .../incidenceeditor-15.12.49.9999.ebuild | 10 ++++-----
94 .../incidenceeditor/incidenceeditor-9999.ebuild | 10 ++++-----
95 .../kaccounts-integration-15.12.1.ebuild | 8 +++----
96 .../kaccounts-integration-15.12.49.9999.ebuild | 8 +++----
97 .../kaccounts-integration-9999.ebuild | 8 +++----
98 .../kaccounts-mobile/kaccounts-mobile-9999.ebuild | 10 ++++-----
99 .../kaccounts-providers-15.12.1.ebuild | 6 ++---
100 .../kaccounts-providers-15.12.49.9999.ebuild | 6 ++---
101 .../kaccounts-providers-9999.ebuild | 6 ++---
102 .../kaddressbookgrantlee-15.12.1.ebuild | 6 ++---
103 .../kaddressbookgrantlee-15.12.49.9999.ebuild | 6 ++---
104 kde-apps/kalarmcal/kalarmcal-15.12.1.ebuild | 2 +-
105 kde-apps/kalarmcal/kalarmcal-15.12.49.9999.ebuild | 2 +-
106 kde-apps/kalarmcal/kalarmcal-9999.ebuild | 2 +-
107 kde-apps/kalgebra/kalgebra-15.08.3.ebuild | 12 +++++-----
108 kde-apps/kalgebra/kalgebra-15.12.1.ebuild | 12 +++++-----
109 kde-apps/kalgebra/kalgebra-15.12.49.9999.ebuild | 12 +++++-----
110 kde-apps/kalgebra/kalgebra-9999.ebuild | 12 +++++-----
111 kde-apps/kamera/kamera-15.12.1.ebuild | 4 ++--
112 kde-apps/kamera/kamera-15.12.49.9999.ebuild | 4 ++--
113 kde-apps/kamera/kamera-9999.ebuild | 4 ++--
114 kde-apps/kanagram/kanagram-15.08.3.ebuild | 10 ++++-----
115 kde-apps/kanagram/kanagram-15.12.1.ebuild | 10 ++++-----
116 kde-apps/kanagram/kanagram-15.12.49.9999.ebuild | 10 ++++-----
117 kde-apps/kanagram/kanagram-9999.ebuild | 10 ++++-----
118 kde-apps/kapman/kapman-15.12.1.ebuild | 8 +++----
119 kde-apps/kapman/kapman-15.12.49.9999.ebuild | 8 +++----
120 kde-apps/kapman/kapman-9999.ebuild | 8 +++----
121 kde-apps/kapptemplate/kapptemplate-15.12.1.ebuild | 4 ++--
122 .../kapptemplate/kapptemplate-15.12.49.9999.ebuild | 4 ++--
123 kde-apps/kapptemplate/kapptemplate-9999.ebuild | 4 ++--
124 kde-apps/kate/kate-15.12.1.ebuild | 12 +++++-----
125 kde-apps/kate/kate-15.12.49.9999.ebuild | 12 +++++-----
126 kde-apps/kate/kate-9999.ebuild | 12 +++++-----
127 kde-apps/katomic/katomic-15.12.1.ebuild | 4 ++--
128 kde-apps/katomic/katomic-15.12.49.9999.ebuild | 4 ++--
129 kde-apps/katomic/katomic-9999.ebuild | 4 ++--
130 kde-apps/kblackbox/kblackbox-15.12.1.ebuild | 8 +++----
131 kde-apps/kblackbox/kblackbox-15.12.49.9999.ebuild | 8 +++----
132 kde-apps/kblackbox/kblackbox-9999.ebuild | 8 +++----
133 kde-apps/kblocks/kblocks-15.12.1.ebuild | 8 +++----
134 kde-apps/kblocks/kblocks-15.12.49.9999.ebuild | 8 +++----
135 kde-apps/kblocks/kblocks-9999.ebuild | 8 +++----
136 kde-apps/kblog/kblog-15.12.1.ebuild | 2 +-
137 kde-apps/kblog/kblog-15.12.49.9999.ebuild | 2 +-
138 kde-apps/kblog/kblog-9999.ebuild | 2 +-
139 kde-apps/kbounce/kbounce-15.12.1.ebuild | 6 ++---
140 kde-apps/kbounce/kbounce-15.12.49.9999.ebuild | 6 ++---
141 kde-apps/kbounce/kbounce-9999.ebuild | 6 ++---
142 kde-apps/kbreakout/kbreakout-15.12.1.ebuild | 8 +++----
143 kde-apps/kbreakout/kbreakout-15.12.49.9999.ebuild | 8 +++----
144 kde-apps/kbreakout/kbreakout-9999.ebuild | 8 +++----
145 kde-apps/kbruch/kbruch-15.08.3.ebuild | 4 ++--
146 kde-apps/kbruch/kbruch-15.12.1.ebuild | 4 ++--
147 kde-apps/kbruch/kbruch-15.12.49.9999.ebuild | 4 ++--
148 kde-apps/kbruch/kbruch-9999.ebuild | 4 ++--
149 kde-apps/kcachegrind/kcachegrind-5.9999.ebuild | 6 ++---
150 kde-apps/kcalc/kcalc-15.12.1.ebuild | 6 ++---
151 kde-apps/kcalc/kcalc-15.12.49.9999.ebuild | 6 ++---
152 kde-apps/kcalc/kcalc-9999.ebuild | 6 ++---
153 kde-apps/kcalcore/kcalcore-15.12.1.ebuild | 2 +-
154 kde-apps/kcalcore/kcalcore-15.12.49.9999.ebuild | 2 +-
155 kde-apps/kcalcore/kcalcore-9999.ebuild | 2 +-
156 kde-apps/kcalutils/kcalutils-15.12.1.ebuild | 4 ++--
157 kde-apps/kcalutils/kcalutils-15.12.49.9999.ebuild | 4 ++--
158 kde-apps/kcalutils/kcalutils-9999.ebuild | 4 ++--
159 kde-apps/kcharselect/kcharselect-15.12.1.ebuild | 4 ++--
160 .../kcharselect/kcharselect-15.12.49.9999.ebuild | 4 ++--
161 kde-apps/kcharselect/kcharselect-9999.ebuild | 4 ++--
162 kde-apps/kcontacts/kcontacts-15.12.1.ebuild | 4 ++--
163 kde-apps/kcontacts/kcontacts-15.12.49.9999.ebuild | 4 ++--
164 kde-apps/kcontacts/kcontacts-9999.ebuild | 4 ++--
165 kde-apps/kcron/kcron-15.12.1.ebuild | 6 ++---
166 kde-apps/kcron/kcron-15.12.49.9999.ebuild | 6 ++---
167 kde-apps/kcron/kcron-9999.ebuild | 6 ++---
168 kde-apps/kdb/kdb-9999.ebuild | 6 ++---
169 kde-apps/kde-l10n/kde-l10n-15.12.1.ebuild | 2 +-
170 .../kdebugsettings/kdebugsettings-15.12.1.ebuild | 4 ++--
171 .../kdebugsettings-15.12.49.9999.ebuild | 4 ++--
172 kde-apps/kdebugsettings/kdebugsettings-9999.ebuild | 4 ++--
173 .../kdenetwork-filesharing-15.12.1.ebuild | 4 ++--
174 .../kdenetwork-filesharing-15.12.49.9999.ebuild | 4 ++--
175 .../kdenetwork-filesharing-9999.ebuild | 4 ++--
176 kde-apps/kdenlive/kdenlive-15.12.1.ebuild | 16 ++++++-------
177 kde-apps/kdenlive/kdenlive-15.12.49.9999.ebuild | 16 ++++++-------
178 kde-apps/kdenlive/kdenlive-9999.ebuild | 16 ++++++-------
179 kde-apps/kdepim-addons/kdepim-addons-9999.ebuild | 8 +++----
180 .../kdepim-apps-libs/kdepim-apps-libs-9999.ebuild | 12 +++++-----
181 .../kdepim-kioslaves-15.12.1.ebuild | 6 ++---
182 .../kdepim-kioslaves-15.12.49.9999.ebuild | 6 ++---
183 .../kdepim-kioslaves/kdepim-kioslaves-9999.ebuild | 6 ++---
184 kde-apps/kdepim-l10n/kdepim-l10n-15.12.1.ebuild | 2 +-
185 .../kdepim-runtime/kdepim-runtime-15.12.1.ebuild | 12 +++++-----
186 .../kdepim-runtime-15.12.49.9999.ebuild | 12 +++++-----
187 kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 12 +++++-----
188 kde-apps/kdepim/kdepim-15.12.1.ebuild | 26 +++++++++++-----------
189 kde-apps/kdepim/kdepim-15.12.49.9999.ebuild | 26 +++++++++++-----------
190 kde-apps/kdepim/kdepim-9999.ebuild | 26 +++++++++++-----------
191 .../kdesdk-thumbnailers-15.12.1.ebuild | 4 ++--
192 .../kdesdk-thumbnailers-15.12.49.9999.ebuild | 4 ++--
193 .../kdesdk-thumbnailers-9999.ebuild | 4 ++--
194 kde-apps/kdgantt2/kdgantt2-15.12.1.ebuild | 6 ++---
195 kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild | 6 ++---
196 kde-apps/kdgantt2/kdgantt2-9999.ebuild | 6 ++---
197 kde-apps/kdiagram/kdiagram-9999.ebuild | 8 +++----
198 kde-apps/kdialog/kdialog-5.9999.ebuild | 2 +-
199 kde-apps/kdiamond/kdiamond-15.12.1.ebuild | 4 ++--
200 kde-apps/kdiamond/kdiamond-15.12.49.9999.ebuild | 4 ++--
201 kde-apps/kdiamond/kdiamond-9999.ebuild | 4 ++--
202 kde-apps/kfind/kfind-5.9999.ebuild | 4 ++--
203 kde-apps/kfourinline/kfourinline-15.12.1.ebuild | 6 ++---
204 .../kfourinline/kfourinline-15.12.49.9999.ebuild | 6 ++---
205 kde-apps/kfourinline/kfourinline-9999.ebuild | 6 ++---
206 kde-apps/kgeography/kgeography-15.08.3-r1.ebuild | 6 ++---
207 kde-apps/kgeography/kgeography-15.12.1.ebuild | 6 ++---
208 .../kgeography/kgeography-15.12.49.9999.ebuild | 6 ++---
209 kde-apps/kgeography/kgeography-9999.ebuild | 6 ++---
210 kde-apps/kget/kget-5.9999.ebuild | 12 +++++-----
211 kde-apps/kgoldrunner/kgoldrunner-5.9999.ebuild | 4 ++--
212 kde-apps/khangman/khangman-15.08.3.ebuild | 8 +++----
213 kde-apps/khangman/khangman-15.12.1.ebuild | 8 +++----
214 kde-apps/khangman/khangman-15.12.49.9999.ebuild | 8 +++----
215 kde-apps/khangman/khangman-9999.ebuild | 8 +++----
216 .../kidentitymanagement-15.12.1.ebuild | 8 +++----
217 .../kidentitymanagement-15.12.49.9999.ebuild | 8 +++----
218 .../kidentitymanagement-9999.ebuild | 8 +++----
219 kde-apps/kig/kig-15.08.3.ebuild | 10 ++++-----
220 kde-apps/kig/kig-15.12.1.ebuild | 10 ++++-----
221 kde-apps/kig/kig-15.12.49.9999.ebuild | 10 ++++-----
222 kde-apps/kig/kig-9999.ebuild | 10 ++++-----
223 kde-apps/kigo/kigo-5.9999.ebuild | 6 ++---
224 kde-apps/killbots/killbots-15.12.1.ebuild | 4 ++--
225 kde-apps/killbots/killbots-15.12.49.9999.ebuild | 4 ++--
226 kde-apps/killbots/killbots-9999.ebuild | 4 ++--
227 kde-apps/kimap/kimap-15.12.1.ebuild | 2 +-
228 kde-apps/kimap/kimap-15.12.49.9999.ebuild | 2 +-
229 kde-apps/kimap/kimap-9999.ebuild | 2 +-
230 kde-apps/kio-extras/kio-extras-15.12.1.ebuild | 12 +++++-----
231 .../kio-extras/kio-extras-15.12.49.9999.ebuild | 12 +++++-----
232 kde-apps/kio-extras/kio-extras-9999.ebuild | 12 +++++-----
233 kde-apps/kiriki/kiriki-15.12.1.ebuild | 6 ++---
234 kde-apps/kiriki/kiriki-15.12.49.9999.ebuild | 6 ++---
235 kde-apps/kiriki/kiriki-9999.ebuild | 6 ++---
236 kde-apps/kiten/kiten-15.08.3.ebuild | 6 ++---
237 kde-apps/kiten/kiten-15.12.1.ebuild | 6 ++---
238 kde-apps/kiten/kiten-15.12.49.9999.ebuild | 6 ++---
239 kde-apps/kiten/kiten-9999.ebuild | 6 ++---
240 kde-apps/kjots/kjots-9999.ebuild | 8 +++----
241 kde-apps/kjumpingcube/kjumpingcube-15.12.1.ebuild | 6 ++---
242 .../kjumpingcube/kjumpingcube-15.12.49.9999.ebuild | 6 ++---
243 kde-apps/kjumpingcube/kjumpingcube-9999.ebuild | 6 ++---
244 kde-apps/kldap/kldap-15.12.1.ebuild | 4 ++--
245 kde-apps/kldap/kldap-15.12.49.9999.ebuild | 4 ++--
246 kde-apps/kldap/kldap-9999.ebuild | 4 ++--
247 kde-apps/klettres/klettres-15.08.3.ebuild | 8 +++----
248 kde-apps/klettres/klettres-15.12.1.ebuild | 8 +++----
249 kde-apps/klettres/klettres-15.12.49.9999.ebuild | 8 +++----
250 kde-apps/klettres/klettres-9999.ebuild | 8 +++----
251 kde-apps/klickety/klickety-15.12.1.ebuild | 4 ++--
252 kde-apps/klickety/klickety-15.12.49.9999.ebuild | 4 ++--
253 kde-apps/klickety/klickety-9999.ebuild | 4 ++--
254 kde-apps/klines/klines-15.12.1.ebuild | 4 ++--
255 kde-apps/klines/klines-15.12.49.9999.ebuild | 4 ++--
256 kde-apps/klines/klines-9999.ebuild | 4 ++--
257 kde-apps/kmag/kmag-5.9999.ebuild | 6 ++---
258 kde-apps/kmahjongg/kmahjongg-9999.ebuild | 6 ++---
259 .../kmailtransport/kmailtransport-15.12.1.ebuild | 8 +++----
260 .../kmailtransport-15.12.49.9999.ebuild | 8 +++----
261 kde-apps/kmailtransport/kmailtransport-9999.ebuild | 8 +++----
262 kde-apps/kmines/kmines-15.12.1.ebuild | 8 +++----
263 kde-apps/kmines/kmines-15.12.49.9999.ebuild | 8 +++----
264 kde-apps/kmines/kmines-9999.ebuild | 8 +++----
265 kde-apps/kmix/kmix-15.12.1.ebuild | 8 +++----
266 kde-apps/kmix/kmix-15.12.49.9999.ebuild | 8 +++----
267 kde-apps/kmix/kmix-9999.ebuild | 8 +++----
268 kde-apps/kmousetool/kmousetool-5.9999.ebuild | 4 ++--
269 kde-apps/kmouth/kmouth-5.9999.ebuild | 10 ++++-----
270 kde-apps/kmplot/kmplot-15.08.3.ebuild | 12 +++++-----
271 kde-apps/kmplot/kmplot-15.12.1.ebuild | 12 +++++-----
272 kde-apps/kmplot/kmplot-15.12.49.9999.ebuild | 12 +++++-----
273 kde-apps/kmplot/kmplot-9999.ebuild | 12 +++++-----
274 kde-apps/knavalbattle/knavalbattle-15.12.1.ebuild | 8 +++----
275 .../knavalbattle/knavalbattle-15.12.49.9999.ebuild | 8 +++----
276 kde-apps/knavalbattle/knavalbattle-9999.ebuild | 8 +++----
277 kde-apps/knetwalk/knetwalk-15.12.1.ebuild | 8 +++----
278 kde-apps/knetwalk/knetwalk-15.12.49.9999.ebuild | 8 +++----
279 kde-apps/knetwalk/knetwalk-9999.ebuild | 8 +++----
280 kde-apps/kolf/kolf-5.9999.ebuild | 4 ++--
281 kde-apps/kollision/kollision-15.12.1.ebuild | 4 ++--
282 kde-apps/kollision/kollision-15.12.49.9999.ebuild | 4 ++--
283 kde-apps/kollision/kollision-9999.ebuild | 4 ++--
284 kde-apps/kompare/kompare-15.12.1.ebuild | 6 ++---
285 kde-apps/kompare/kompare-15.12.49.9999.ebuild | 6 ++---
286 kde-apps/kompare/kompare-9999.ebuild | 6 ++---
287 kde-apps/konquest/konquest-5.9999.ebuild | 10 ++++-----
288 kde-apps/konsole/konsole-15.12.1.ebuild | 14 ++++++------
289 kde-apps/konsole/konsole-15.12.49.9999.ebuild | 14 ++++++------
290 kde-apps/konsole/konsole-9999.ebuild | 14 ++++++------
291 .../kontactinterface-15.12.1.ebuild | 8 +++----
292 .../kontactinterface-15.12.49.9999.ebuild | 8 +++----
293 .../kontactinterface/kontactinterface-9999.ebuild | 8 +++----
294 kde-apps/kpat/kpat-15.12.1.ebuild | 10 ++++-----
295 kde-apps/kpat/kpat-15.12.49.9999.ebuild | 10 ++++-----
296 kde-apps/kpat/kpat-9999.ebuild | 10 ++++-----
297 kde-apps/kpeoplevcard/kpeoplevcard-9999.ebuild | 4 ++--
298 kde-apps/kpimtextedit/kpimtextedit-15.12.1.ebuild | 6 ++---
299 .../kpimtextedit/kpimtextedit-15.12.49.9999.ebuild | 6 ++---
300 kde-apps/kpimtextedit/kpimtextedit-9999.ebuild | 6 ++---
301 kde-apps/kproperty/kproperty-9999.ebuild | 4 ++--
302 .../kqtquickcharts/kqtquickcharts-5.9999.ebuild | 4 ++--
303 kde-apps/krdc/krdc-5.9999.ebuild | 6 ++---
304 kde-apps/kreport/kreport-9999.ebuild | 8 +++----
305 kde-apps/kreversi/kreversi-5.9999.ebuild | 10 ++++-----
306 kde-apps/krfb/krfb-15.12.1.ebuild | 10 ++++-----
307 kde-apps/krfb/krfb-15.12.49.9999.ebuild | 10 ++++-----
308 kde-apps/krfb/krfb-9999.ebuild | 10 ++++-----
309 .../kross-interpreters-15.08.3.ebuild | 4 ++--
310 .../kross-interpreters-15.12.1.ebuild | 4 ++--
311 .../kross-interpreters-15.12.49.9999.ebuild | 4 ++--
312 .../kross-interpreters-9999.ebuild | 4 ++--
313 kde-apps/kruler/kruler-15.12.1.ebuild | 6 ++---
314 kde-apps/kruler/kruler-15.12.49.9999.ebuild | 6 ++---
315 kde-apps/kruler/kruler-9999.ebuild | 6 ++---
316 kde-apps/kshisen/kshisen-15.12.1.ebuild | 4 ++--
317 kde-apps/kshisen/kshisen-15.12.49.9999.ebuild | 4 ++--
318 kde-apps/kshisen/kshisen-9999.ebuild | 4 ++--
319 kde-apps/ksnakeduel/ksnakeduel-5.9999.ebuild | 10 ++++-----
320 kde-apps/kspaceduel/kspaceduel-5.9999.ebuild | 10 ++++-----
321 kde-apps/ksquares/ksquares-15.12.1.ebuild | 4 ++--
322 kde-apps/ksquares/ksquares-15.12.49.9999.ebuild | 4 ++--
323 kde-apps/ksquares/ksquares-9999.ebuild | 4 ++--
324 kde-apps/kstars/kstars-15.08.3-r1.ebuild | 18 +++++++--------
325 kde-apps/kstars/kstars-15.12.1.ebuild | 12 +++++-----
326 kde-apps/kstars/kstars-15.12.49.9999.ebuild | 12 +++++-----
327 kde-apps/kstars/kstars-9999.ebuild | 14 ++++++------
328 kde-apps/ksudoku/ksudoku-5.9999.ebuild | 12 +++++-----
329 kde-apps/ksystemlog/ksystemlog-15.12.1.ebuild | 6 ++---
330 .../ksystemlog/ksystemlog-15.12.49.9999.ebuild | 6 ++---
331 kde-apps/ksystemlog/ksystemlog-9999.ebuild | 6 ++---
332 kde-apps/kteatime/kteatime-15.12.1.ebuild | 4 ++--
333 kde-apps/kteatime/kteatime-15.12.49.9999.ebuild | 4 ++--
334 kde-apps/kteatime/kteatime-9999.ebuild | 4 ++--
335 kde-apps/ktimer/ktimer-15.12.1.ebuild | 4 ++--
336 kde-apps/ktimer/ktimer-15.12.49.9999.ebuild | 4 ++--
337 kde-apps/ktimer/ktimer-9999.ebuild | 4 ++--
338 .../ktp-accounts-kcm-15.12.1.ebuild | 8 +++----
339 .../ktp-accounts-kcm-15.12.49.9999.ebuild | 8 +++----
340 .../ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild | 8 +++----
341 kde-apps/ktp-approver/ktp-approver-15.12.1.ebuild | 6 ++---
342 .../ktp-approver/ktp-approver-15.12.49.9999.ebuild | 6 ++---
343 kde-apps/ktp-approver/ktp-approver-9999.ebuild | 6 ++---
344 .../ktp-auth-handler-15.12.1.ebuild | 8 +++----
345 .../ktp-auth-handler-15.12.49.9999.ebuild | 8 +++----
346 .../ktp-auth-handler/ktp-auth-handler-9999.ebuild | 8 +++----
347 kde-apps/ktp-call-ui/ktp-call-ui-9999.ebuild | 6 ++---
348 .../ktp-common-internals-15.12.1.ebuild | 14 ++++++------
349 .../ktp-common-internals-15.12.49.9999.ebuild | 14 ++++++------
350 .../ktp-common-internals-9999.ebuild | 14 ++++++------
351 .../ktp-contact-list-15.12.1.ebuild | 8 +++----
352 .../ktp-contact-list-15.12.49.9999.ebuild | 8 +++----
353 .../ktp-contact-list/ktp-contact-list-9999.ebuild | 8 +++----
354 .../ktp-contact-runner-15.12.1.ebuild | 6 ++---
355 .../ktp-contact-runner-15.12.49.9999.ebuild | 6 ++---
356 .../ktp-contact-runner-9999.ebuild | 6 ++---
357 .../ktp-desktop-applets-15.12.1.ebuild | 2 +-
358 .../ktp-desktop-applets-15.12.49.9999.ebuild | 2 +-
359 .../ktp-desktop-applets-9999.ebuild | 2 +-
360 .../ktp-filetransfer-handler-15.12.1.ebuild | 6 ++---
361 .../ktp-filetransfer-handler-15.12.49.9999.ebuild | 6 ++---
362 .../ktp-filetransfer-handler-9999.ebuild | 6 ++---
363 .../ktp-kded-module/ktp-kded-module-15.12.1.ebuild | 12 +++++-----
364 .../ktp-kded-module-15.12.49.9999.ebuild | 12 +++++-----
365 .../ktp-kded-module/ktp-kded-module-9999.ebuild | 12 +++++-----
366 kde-apps/ktp-l10n/ktp-l10n-15.12.1.ebuild | 2 +-
367 .../ktp-send-file/ktp-send-file-15.12.1.ebuild | 6 ++---
368 .../ktp-send-file-15.12.49.9999.ebuild | 6 ++---
369 kde-apps/ktp-send-file/ktp-send-file-9999.ebuild | 6 ++---
370 kde-apps/ktp-text-ui/ktp-text-ui-15.12.1.ebuild | 10 ++++-----
371 .../ktp-text-ui/ktp-text-ui-15.12.49.9999.ebuild | 10 ++++-----
372 kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild | 10 ++++-----
373 kde-apps/ktuberling/ktuberling-15.12.1.ebuild | 10 ++++-----
374 .../ktuberling/ktuberling-15.12.49.9999.ebuild | 10 ++++-----
375 kde-apps/ktuberling/ktuberling-9999.ebuild | 10 ++++-----
376 kde-apps/kturtle/kturtle-15.08.3.ebuild | 10 ++++-----
377 kde-apps/kturtle/kturtle-15.12.1.ebuild | 10 ++++-----
378 kde-apps/kturtle/kturtle-15.12.49.9999.ebuild | 10 ++++-----
379 kde-apps/kturtle/kturtle-9999.ebuild | 10 ++++-----
380 kde-apps/kubrick/kubrick-5.9999.ebuild | 8 +++----
381 .../kwalletmanager/kwalletmanager-15.12.1.ebuild | 8 +++----
382 .../kwalletmanager-15.12.49.9999.ebuild | 8 +++----
383 kde-apps/kwalletmanager/kwalletmanager-9999.ebuild | 8 +++----
384 kde-apps/kwordquiz/kwordquiz-15.08.3.ebuild | 4 ++--
385 kde-apps/kwordquiz/kwordquiz-15.12.1.ebuild | 4 ++--
386 kde-apps/kwordquiz/kwordquiz-15.12.49.9999.ebuild | 4 ++--
387 kde-apps/kwordquiz/kwordquiz-9999.ebuild | 4 ++--
388 kde-apps/kwrite/kwrite-15.12.1.ebuild | 4 ++--
389 kde-apps/kwrite/kwrite-15.12.49.9999.ebuild | 4 ++--
390 kde-apps/kwrite/kwrite-9999.ebuild | 4 ++--
391 kde-apps/libakonadi/libakonadi-15.12.1.ebuild | 14 ++++++------
392 .../libakonadi/libakonadi-15.12.49.9999.ebuild | 14 ++++++------
393 .../libfollowupreminder-15.12.1.ebuild | 4 ++--
394 .../libfollowupreminder-15.12.49.9999.ebuild | 4 ++--
395 kde-apps/libgravatar/libgravatar-15.12.1.ebuild | 6 ++---
396 .../libgravatar/libgravatar-15.12.49.9999.ebuild | 6 ++---
397 kde-apps/libgravatar/libgravatar-9999.ebuild | 6 ++---
398 kde-apps/libkcddb/libkcddb-5.9999.ebuild | 6 ++---
399 .../libkcompactdisc/libkcompactdisc-5.9999.ebuild | 2 +-
400 kde-apps/libkdcraw/libkdcraw-15.12.1.ebuild | 2 +-
401 kde-apps/libkdcraw/libkdcraw-15.12.49.9999.ebuild | 2 +-
402 kde-apps/libkdcraw/libkdcraw-9999.ebuild | 2 +-
403 kde-apps/libkdegames/libkdegames-15.12.1.ebuild | 12 +++++-----
404 .../libkdegames/libkdegames-15.12.49.9999.ebuild | 12 +++++-----
405 kde-apps/libkdegames/libkdegames-9999.ebuild | 12 +++++-----
406 kde-apps/libkdepim/libkdepim-15.12.1.ebuild | 10 ++++-----
407 kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild | 10 ++++-----
408 kde-apps/libkdepim/libkdepim-9999.ebuild | 10 ++++-----
409 .../libkdepimdbusinterfaces-15.12.1.ebuild | 6 ++---
410 .../libkdepimdbusinterfaces-15.12.49.9999.ebuild | 6 ++---
411 .../libkeduvocdocument-15.08.3.ebuild | 2 +-
412 .../libkeduvocdocument-15.12.1.ebuild | 2 +-
413 .../libkeduvocdocument-15.12.49.9999.ebuild | 2 +-
414 .../libkeduvocdocument-9999.ebuild | 2 +-
415 kde-apps/libkexiv2/libkexiv2-15.12.1.ebuild | 2 +-
416 kde-apps/libkexiv2/libkexiv2-15.12.49.9999.ebuild | 2 +-
417 kde-apps/libkexiv2/libkexiv2-9999.ebuild | 2 +-
418 kde-apps/libkface/libkface-15.12.1.ebuild | 8 +++----
419 kde-apps/libkface/libkface-15.12.49.9999.ebuild | 8 +++----
420 kde-apps/libkface/libkface-9999.ebuild | 8 +++----
421 kde-apps/libkgeomap/libkgeomap-15.12.1.ebuild | 10 ++++-----
422 .../libkgeomap/libkgeomap-15.12.49.9999.ebuild | 10 ++++-----
423 kde-apps/libkgeomap/libkgeomap-9999.ebuild | 10 ++++-----
424 kde-apps/libkipi/libkipi-15.12.1.ebuild | 6 ++---
425 kde-apps/libkipi/libkipi-15.12.49.9999.ebuild | 6 ++---
426 kde-apps/libkipi/libkipi-9999.ebuild | 6 ++---
427 kde-apps/libkleo/libkleo-15.12.1.ebuild | 8 +++----
428 kde-apps/libkleo/libkleo-15.12.49.9999.ebuild | 8 +++----
429 kde-apps/libkleo/libkleo-9999.ebuild | 8 +++----
430 kde-apps/libkmahjongg/libkmahjongg-15.12.1.ebuild | 6 ++---
431 .../libkmahjongg/libkmahjongg-15.12.49.9999.ebuild | 6 ++---
432 kde-apps/libkmahjongg/libkmahjongg-9999.ebuild | 6 ++---
433 .../libkomparediff2/libkomparediff2-15.12.1.ebuild | 4 ++--
434 .../libkomparediff2-15.12.49.9999.ebuild | 4 ++--
435 .../libkomparediff2/libkomparediff2-9999.ebuild | 4 ++--
436 kde-apps/libkonq/libkonq-5.9999.ebuild | 8 +++----
437 kde-apps/libksane/libksane-15.12.1.ebuild | 4 ++--
438 kde-apps/libksane/libksane-15.12.49.9999.ebuild | 4 ++--
439 kde-apps/libksane/libksane-9999.ebuild | 4 ++--
440 kde-apps/libksieve/libksieve-15.12.1.ebuild | 10 ++++-----
441 kde-apps/libksieve/libksieve-15.12.49.9999.ebuild | 10 ++++-----
442 kde-apps/libksieve/libksieve-9999.ebuild | 10 ++++-----
443 kde-apps/libsendlater/libsendlater-15.12.1.ebuild | 8 +++----
444 .../libsendlater/libsendlater-15.12.49.9999.ebuild | 8 +++----
445 kde-apps/lokalize/lokalize-15.12.1.ebuild | 13 +++++------
446 kde-apps/lokalize/lokalize-15.12.49.9999.ebuild | 13 +++++------
447 kde-apps/lokalize/lokalize-9999.ebuild | 13 +++++------
448 kde-apps/lskat/lskat-5.9999.ebuild | 6 ++---
449 kde-apps/mailcommon/mailcommon-15.12.1.ebuild | 6 ++---
450 .../mailcommon/mailcommon-15.12.49.9999.ebuild | 6 ++---
451 kde-apps/mailcommon/mailcommon-9999.ebuild | 6 ++---
452 kde-apps/mailimporter/mailimporter-15.12.1.ebuild | 8 +++----
453 .../mailimporter/mailimporter-15.12.49.9999.ebuild | 8 +++----
454 kde-apps/mailimporter/mailimporter-9999.ebuild | 8 +++----
455 kde-apps/marble/marble-15.08.3.ebuild | 26 +++++++++++-----------
456 kde-apps/marble/marble-15.12.1.ebuild | 26 +++++++++++-----------
457 kde-apps/marble/marble-15.12.49.9999.ebuild | 26 +++++++++++-----------
458 kde-apps/marble/marble-9999.ebuild | 26 +++++++++++-----------
459 .../messagecomposer/messagecomposer-15.12.1.ebuild | 8 +++----
460 .../messagecomposer-15.12.49.9999.ebuild | 8 +++----
461 kde-apps/messagecore/messagecore-15.12.1.ebuild | 8 +++----
462 .../messagecore/messagecore-15.12.49.9999.ebuild | 8 +++----
463 kde-apps/messagelib/messagelib-9999.ebuild | 12 +++++-----
464 kde-apps/messagelist/messagelist-15.12.1.ebuild | 6 ++---
465 .../messagelist/messagelist-15.12.49.9999.ebuild | 6 ++---
466 .../messageviewer/messageviewer-15.12.1.ebuild | 12 +++++-----
467 .../messageviewer-15.12.49.9999.ebuild | 12 +++++-----
468 kde-apps/noteshared/noteshared-15.12.1.ebuild | 10 ++++-----
469 .../noteshared/noteshared-15.12.49.9999.ebuild | 10 ++++-----
470 kde-apps/okteta/okteta-15.12.1.ebuild | 12 +++++-----
471 kde-apps/okteta/okteta-15.12.49.9999.ebuild | 12 +++++-----
472 kde-apps/okteta/okteta-9999.ebuild | 12 +++++-----
473 kde-apps/okular/okular-5.9999.ebuild | 10 ++++-----
474 kde-apps/palapeli/palapeli-5.9999.ebuild | 6 ++---
475 kde-apps/parley/parley-15.08.3.ebuild | 12 +++++-----
476 kde-apps/parley/parley-15.12.1.ebuild | 12 +++++-----
477 kde-apps/parley/parley-15.12.49.9999.ebuild | 12 +++++-----
478 kde-apps/parley/parley-9999.ebuild | 12 +++++-----
479 kde-apps/picmi/picmi-15.12.1.ebuild | 10 ++++-----
480 kde-apps/picmi/picmi-15.12.49.9999.ebuild | 10 ++++-----
481 kde-apps/picmi/picmi-9999.ebuild | 10 ++++-----
482 kde-apps/pimcommon/pimcommon-15.12.1.ebuild | 14 ++++++------
483 kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild | 14 ++++++------
484 kde-apps/pimcommon/pimcommon-9999.ebuild | 14 ++++++------
485 kde-apps/poxml/poxml-15.12.1.ebuild | 2 +-
486 kde-apps/poxml/poxml-15.12.49.9999.ebuild | 2 +-
487 kde-apps/poxml/poxml-9999.ebuild | 2 +-
488 .../print-manager/print-manager-15.12.1.ebuild | 10 ++++-----
489 .../print-manager-15.12.49.9999.ebuild | 10 ++++-----
490 kde-apps/print-manager/print-manager-9999.ebuild | 10 ++++-----
491 kde-apps/pykde5/pykde5-9999.ebuild | 6 ++---
492 kde-apps/rocs/rocs-15.08.3.ebuild | 18 +++++++--------
493 kde-apps/rocs/rocs-15.12.1.ebuild | 18 +++++++--------
494 kde-apps/rocs/rocs-15.12.49.9999.ebuild | 18 +++++++--------
495 kde-apps/rocs/rocs-9999.ebuild | 18 +++++++--------
496 kde-apps/spectacle/spectacle-15.12.1.ebuild | 10 ++++-----
497 kde-apps/spectacle/spectacle-15.12.49.9999.ebuild | 10 ++++-----
498 kde-apps/spectacle/spectacle-9999.ebuild | 10 ++++-----
499 kde-apps/step/step-15.08.3.ebuild | 14 ++++++------
500 kde-apps/step/step-15.12.1.ebuild | 14 ++++++------
501 kde-apps/step/step-15.12.49.9999.ebuild | 14 ++++++------
502 kde-apps/step/step-9999.ebuild | 14 ++++++------
503 kde-apps/svgpart/svgpart-5.9999.ebuild | 6 ++---
504 kde-apps/syndication/syndication-15.12.1.ebuild | 2 +-
505 .../syndication/syndication-15.12.49.9999.ebuild | 2 +-
506 kde-apps/syndication/syndication-9999.ebuild | 2 +-
507 .../templateparser/templateparser-15.12.1.ebuild | 8 +++----
508 .../templateparser-15.12.49.9999.ebuild | 8 +++----
509 kde-apps/thumbnailers/thumbnailers-15.12.1.ebuild | 2 +-
510 .../thumbnailers/thumbnailers-15.12.49.9999.ebuild | 2 +-
511 kde-apps/thumbnailers/thumbnailers-9999.ebuild | 2 +-
512 kde-apps/umbrello/umbrello-15.12.1.ebuild | 10 ++++-----
513 kde-apps/umbrello/umbrello-15.12.49.9999.ebuild | 10 ++++-----
514 kde-apps/umbrello/umbrello-9999.ebuild | 10 ++++-----
515 .../zeroconf-ioslave-5.9999.ebuild | 2 +-
516 504 files changed, 1892 insertions(+), 1898 deletions(-)
517
518 diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-15.12.1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-15.12.1.ebuild
519 index ad4562f..5c527f3 100644
520 --- a/kde-apps/akonadi-calendar/akonadi-calendar-15.12.1.ebuild
521 +++ b/kde-apps/akonadi-calendar/akonadi-calendar-15.12.1.ebuild
522 @@ -36,9 +36,9 @@ RDEPEND="
523 $(add_kdeapps_dep kmailtransport)
524 $(add_kdeapps_dep kmime)
525 $(add_kdeapps_dep libakonadi)
526 - dev-qt/qtdbus:5
527 - dev-qt/qtgui:5
528 - dev-qt/qtwidgets:5
529 + $(add_qt_dep qtdbus)
530 + $(add_qt_dep qtgui)
531 + $(add_qt_dep qtwidgets)
532 "
533 DEPEND="${RDEPEND}"
534
535
536 diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-15.12.49.9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-15.12.49.9999.ebuild
537 index b5357a5..e61d172 100644
538 --- a/kde-apps/akonadi-calendar/akonadi-calendar-15.12.49.9999.ebuild
539 +++ b/kde-apps/akonadi-calendar/akonadi-calendar-15.12.49.9999.ebuild
540 @@ -36,9 +36,9 @@ RDEPEND="
541 $(add_kdeapps_dep kmailtransport)
542 $(add_kdeapps_dep kmime)
543 $(add_kdeapps_dep libakonadi)
544 - dev-qt/qtdbus:5
545 - dev-qt/qtgui:5
546 - dev-qt/qtwidgets:5
547 + $(add_qt_dep qtdbus)
548 + $(add_qt_dep qtgui)
549 + $(add_qt_dep qtwidgets)
550 "
551 DEPEND="${RDEPEND}"
552
553
554 diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
555 index 7a98171..f92193f 100644
556 --- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
557 +++ b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
558 @@ -36,9 +36,9 @@ RDEPEND="
559 $(add_kdeapps_dep kidentitymanagement)
560 $(add_kdeapps_dep kmailtransport)
561 $(add_kdeapps_dep kmime)
562 - dev-qt/qtdbus:5
563 - dev-qt/qtgui:5
564 - dev-qt/qtwidgets:5
565 + $(add_qt_dep qtdbus)
566 + $(add_qt_dep qtgui)
567 + $(add_qt_dep qtwidgets)
568 "
569 DEPEND="${RDEPEND}"
570
571
572 diff --git a/kde-apps/akonadi-contact/akonadi-contact-15.12.1.ebuild b/kde-apps/akonadi-contact/akonadi-contact-15.12.1.ebuild
573 index e07e9e4..7d93263 100644
574 --- a/kde-apps/akonadi-contact/akonadi-contact-15.12.1.ebuild
575 +++ b/kde-apps/akonadi-contact/akonadi-contact-15.12.1.ebuild
576 @@ -36,9 +36,9 @@ COMMON_DEPEND="
577 $(add_kdeapps_dep kcalcore)
578 $(add_kdeapps_dep kcontacts)
579 $(add_kdeapps_dep kmime)
580 - dev-qt/qtdbus:5
581 - dev-qt/qtgui:5
582 - dev-qt/qtwidgets:5
583 + $(add_qt_dep qtdbus)
584 + $(add_qt_dep qtgui)
585 + $(add_qt_dep qtwidgets)
586 media-libs/phonon[qt5]
587 prison? ( media-libs/prison:5 )
588 "
589
590 diff --git a/kde-apps/akonadi-contact/akonadi-contact-15.12.49.9999.ebuild b/kde-apps/akonadi-contact/akonadi-contact-15.12.49.9999.ebuild
591 index cd795ef..328a43c 100644
592 --- a/kde-apps/akonadi-contact/akonadi-contact-15.12.49.9999.ebuild
593 +++ b/kde-apps/akonadi-contact/akonadi-contact-15.12.49.9999.ebuild
594 @@ -36,9 +36,9 @@ COMMON_DEPEND="
595 $(add_kdeapps_dep kcalcore)
596 $(add_kdeapps_dep kcontacts)
597 $(add_kdeapps_dep kmime)
598 - dev-qt/qtdbus:5
599 - dev-qt/qtgui:5
600 - dev-qt/qtwidgets:5
601 + $(add_qt_dep qtdbus)
602 + $(add_qt_dep qtgui)
603 + $(add_qt_dep qtwidgets)
604 media-libs/phonon[qt5]
605 prison? ( media-libs/prison:5 )
606 "
607
608 diff --git a/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild b/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild
609 index 1215ae7..4667315 100644
610 --- a/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild
611 +++ b/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild
612 @@ -36,9 +36,9 @@ COMMON_DEPEND="
613 $(add_kdeapps_dep kcalcore)
614 $(add_kdeapps_dep kcontacts)
615 $(add_kdeapps_dep kmime)
616 - dev-qt/qtdbus:5
617 - dev-qt/qtgui:5
618 - dev-qt/qtwidgets:5
619 + $(add_qt_dep qtdbus)
620 + $(add_qt_dep qtgui)
621 + $(add_qt_dep qtwidgets)
622 media-libs/phonon[qt5]
623 prison? ( media-libs/prison:5 )
624 "
625
626 diff --git a/kde-apps/akonadi-mime/akonadi-mime-15.12.1.ebuild b/kde-apps/akonadi-mime/akonadi-mime-15.12.1.ebuild
627 index 6f7d076..68ee9a4 100644
628 --- a/kde-apps/akonadi-mime/akonadi-mime-15.12.1.ebuild
629 +++ b/kde-apps/akonadi-mime/akonadi-mime-15.12.1.ebuild
630 @@ -28,9 +28,9 @@ COMMON_DEPEND="
631 $(add_kdeapps_dep libakonadi)
632 $(add_kdeapps_dep kmime)
633 dev-libs/libxslt
634 - dev-qt/qtdbus:5
635 - dev-qt/qtgui:5
636 - dev-qt/qtwidgets:5
637 + $(add_qt_dep qtdbus)
638 + $(add_qt_dep qtgui)
639 + $(add_qt_dep qtwidgets)
640 x11-misc/shared-mime-info
641 "
642 DEPEND="${COMMON_DEPEND}
643
644 diff --git a/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild
645 index 447ae63..89f15bb 100644
646 --- a/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild
647 +++ b/kde-apps/akonadi-mime/akonadi-mime-15.12.49.9999.ebuild
648 @@ -28,9 +28,9 @@ COMMON_DEPEND="
649 $(add_kdeapps_dep libakonadi)
650 $(add_kdeapps_dep kmime)
651 dev-libs/libxslt
652 - dev-qt/qtdbus:5
653 - dev-qt/qtgui:5
654 - dev-qt/qtwidgets:5
655 + $(add_qt_dep qtdbus)
656 + $(add_qt_dep qtgui)
657 + $(add_qt_dep qtwidgets)
658 x11-misc/shared-mime-info
659 "
660 DEPEND="${COMMON_DEPEND}
661
662 diff --git a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
663 index 58e614d..c99e8e8 100644
664 --- a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
665 +++ b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
666 @@ -28,9 +28,9 @@ COMMON_DEPEND="
667 $(add_kdeapps_dep akonadi)
668 $(add_kdeapps_dep kmime)
669 dev-libs/libxslt
670 - dev-qt/qtdbus:5
671 - dev-qt/qtgui:5
672 - dev-qt/qtwidgets:5
673 + $(add_qt_dep qtdbus)
674 + $(add_qt_dep qtgui)
675 + $(add_qt_dep qtwidgets)
676 x11-misc/shared-mime-info
677 "
678 DEPEND="${COMMON_DEPEND}
679
680 diff --git a/kde-apps/akonadi-notes/akonadi-notes-15.12.1.ebuild b/kde-apps/akonadi-notes/akonadi-notes-15.12.1.ebuild
681 index 57a6122..a9a128e 100644
682 --- a/kde-apps/akonadi-notes/akonadi-notes-15.12.1.ebuild
683 +++ b/kde-apps/akonadi-notes/akonadi-notes-15.12.1.ebuild
684 @@ -19,8 +19,8 @@ RESTRICT="test"
685 COMMON_DEPEND="
686 $(add_frameworks_dep ki18n)
687 $(add_kdeapps_dep kmime)
688 - dev-qt/qtgui:5
689 - dev-qt/qtxml:5
690 + $(add_qt_dep qtgui)
691 + $(add_qt_dep qtxml)
692 "
693 DEPEND="${COMMON_DEPEND}
694 $(add_kdeapps_dep libakonadi)
695
696 diff --git a/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild
697 index e6d601b..871f7fa 100644
698 --- a/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild
699 +++ b/kde-apps/akonadi-notes/akonadi-notes-15.12.49.9999.ebuild
700 @@ -19,8 +19,8 @@ RESTRICT="test"
701 COMMON_DEPEND="
702 $(add_frameworks_dep ki18n)
703 $(add_kdeapps_dep kmime)
704 - dev-qt/qtgui:5
705 - dev-qt/qtxml:5
706 + $(add_qt_dep qtgui)
707 + $(add_qt_dep qtxml)
708 "
709 DEPEND="${COMMON_DEPEND}
710 $(add_kdeapps_dep libakonadi)
711
712 diff --git a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
713 index 393e0f3..7312e6c 100644
714 --- a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
715 +++ b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
716 @@ -19,8 +19,8 @@ RESTRICT="test"
717 COMMON_DEPEND="
718 $(add_frameworks_dep ki18n)
719 $(add_kdeapps_dep kmime)
720 - dev-qt/qtgui:5
721 - dev-qt/qtxml:5
722 + $(add_qt_dep qtgui)
723 + $(add_qt_dep qtxml)
724 "
725 DEPEND="${COMMON_DEPEND}
726 $(add_kdeapps_dep akonadi)
727
728 diff --git a/kde-apps/akonadi-search/akonadi-search-15.12.1.ebuild b/kde-apps/akonadi-search/akonadi-search-15.12.1.ebuild
729 index d61be74..a29a3c5 100644
730 --- a/kde-apps/akonadi-search/akonadi-search-15.12.1.ebuild
731 +++ b/kde-apps/akonadi-search/akonadi-search-15.12.1.ebuild
732 @@ -26,9 +26,9 @@ RDEPEND="
733 $(add_kdeapps_dep kmime)
734 $(add_kdeapps_dep libakonadi)
735 >=dev-libs/xapian-1.3:=[chert]
736 - dev-qt/qtdbus:5
737 - dev-qt/qtgui:5
738 - dev-qt/qtwidgets:5
739 + $(add_qt_dep qtdbus)
740 + $(add_qt_dep qtgui)
741 + $(add_qt_dep qtwidgets)
742 "
743 DEPEND="${RDEPEND}
744 dev-libs/boost
745
746 diff --git a/kde-apps/akonadi-search/akonadi-search-15.12.49.9999.ebuild b/kde-apps/akonadi-search/akonadi-search-15.12.49.9999.ebuild
747 index 70eb673..d6ca1ed 100644
748 --- a/kde-apps/akonadi-search/akonadi-search-15.12.49.9999.ebuild
749 +++ b/kde-apps/akonadi-search/akonadi-search-15.12.49.9999.ebuild
750 @@ -26,9 +26,9 @@ RDEPEND="
751 $(add_kdeapps_dep kmime)
752 $(add_kdeapps_dep libakonadi)
753 >=dev-libs/xapian-1.3:=[chert]
754 - dev-qt/qtdbus:5
755 - dev-qt/qtgui:5
756 - dev-qt/qtwidgets:5
757 + $(add_qt_dep qtdbus)
758 + $(add_qt_dep qtgui)
759 + $(add_qt_dep qtwidgets)
760 "
761 DEPEND="${RDEPEND}
762 dev-libs/boost
763
764 diff --git a/kde-apps/akonadi-search/akonadi-search-9999.ebuild b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
765 index a70c727..9df8ba3 100644
766 --- a/kde-apps/akonadi-search/akonadi-search-9999.ebuild
767 +++ b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
768 @@ -26,9 +26,9 @@ RDEPEND="
769 $(add_kdeapps_dep kcontacts)
770 $(add_kdeapps_dep kmime)
771 >=dev-libs/xapian-1.3:=[chert]
772 - dev-qt/qtdbus:5
773 - dev-qt/qtgui:5
774 - dev-qt/qtwidgets:5
775 + $(add_qt_dep qtdbus)
776 + $(add_qt_dep qtgui)
777 + $(add_qt_dep qtwidgets)
778 "
779 DEPEND="${RDEPEND}
780 dev-libs/boost
781
782 diff --git a/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.1.ebuild b/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.1.ebuild
783 index bff99a4..ecafb13 100644
784 --- a/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.1.ebuild
785 +++ b/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.1.ebuild
786 @@ -22,7 +22,7 @@ COMMON_DEPEND="
787 $(add_frameworks_dep kio)
788 $(add_frameworks_dep kitemmodels)
789 $(add_kdeapps_dep libakonadi)
790 - dev-qt/qtgui:5
791 + $(add_qt_dep qtgui)
792 x11-misc/shared-mime-info
793 "
794 DEPEND="${COMMON_DEPEND}
795
796 diff --git a/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild b/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild
797 index 68b687e..3580919 100644
798 --- a/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild
799 +++ b/kde-apps/akonadi-socialutils/akonadi-socialutils-15.12.49.9999.ebuild
800 @@ -22,7 +22,7 @@ COMMON_DEPEND="
801 $(add_frameworks_dep kio)
802 $(add_frameworks_dep kitemmodels)
803 $(add_kdeapps_dep libakonadi)
804 - dev-qt/qtgui:5
805 + $(add_qt_dep qtgui)
806 x11-misc/shared-mime-info
807 "
808 DEPEND="${COMMON_DEPEND}
809
810 diff --git a/kde-apps/akonadi-socialutils/akonadi-socialutils-9999.ebuild b/kde-apps/akonadi-socialutils/akonadi-socialutils-9999.ebuild
811 index 6fdc85f..2d52433 100644
812 --- a/kde-apps/akonadi-socialutils/akonadi-socialutils-9999.ebuild
813 +++ b/kde-apps/akonadi-socialutils/akonadi-socialutils-9999.ebuild
814 @@ -22,7 +22,7 @@ COMMON_DEPEND="
815 $(add_frameworks_dep kio)
816 $(add_frameworks_dep kitemmodels)
817 $(add_kdeapps_dep akonadi)
818 - dev-qt/qtgui:5
819 + $(add_qt_dep qtgui)
820 x11-misc/shared-mime-info
821 "
822 DEPEND="${COMMON_DEPEND}
823
824 diff --git a/kde-apps/akonadi/akonadi-15.12.1.ebuild b/kde-apps/akonadi/akonadi-15.12.1.ebuild
825 index f7157a2..b5adb12 100644
826 --- a/kde-apps/akonadi/akonadi-15.12.1.ebuild
827 +++ b/kde-apps/akonadi/akonadi-15.12.1.ebuild
828 @@ -17,13 +17,13 @@ IUSE="+mysql postgres sqlite test"
829 REQUIRED_USE="|| ( sqlite mysql postgres )"
830
831 CDEPEND="
832 - dev-qt/qtdbus:5
833 - dev-qt/qtgui:5
834 - dev-qt/qtnetwork:5
835 - dev-qt/qtsql:5[mysql?,postgres?]
836 - dev-qt/qttest:5
837 - dev-qt/qtwidgets:5
838 - dev-qt/qtxml:5
839 + $(add_qt_dep qtdbus)
840 + $(add_qt_dep qtgui)
841 + $(add_qt_dep qtnetwork)
842 + $(add_qt_dep qtsql 'mysql?,postgres?')
843 + $(add_qt_dep qttest)
844 + $(add_qt_dep qtwidgets)
845 + $(add_qt_dep qtxml)
846 x11-misc/shared-mime-info
847 sqlite? ( dev-db/sqlite:3 )
848 "
849
850 diff --git a/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild
851 index 4b8e68c..ff55ab7 100644
852 --- a/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild
853 +++ b/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild
854 @@ -17,13 +17,13 @@ IUSE="+mysql postgres sqlite test"
855 REQUIRED_USE="|| ( sqlite mysql postgres )"
856
857 CDEPEND="
858 - dev-qt/qtdbus:5
859 - dev-qt/qtgui:5
860 - dev-qt/qtnetwork:5
861 - dev-qt/qtsql:5[mysql?,postgres?]
862 - dev-qt/qttest:5
863 - dev-qt/qtwidgets:5
864 - dev-qt/qtxml:5
865 + $(add_qt_dep qtdbus)
866 + $(add_qt_dep qtgui)
867 + $(add_qt_dep qtnetwork)
868 + $(add_qt_dep qtsql 'mysql?,postgres?')
869 + $(add_qt_dep qttest)
870 + $(add_qt_dep qtwidgets)
871 + $(add_qt_dep qtxml)
872 x11-misc/shared-mime-info
873 sqlite? ( dev-db/sqlite:3 )
874 "
875
876 diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
877 index 382cbdd..622210b 100644
878 --- a/kde-apps/akonadi/akonadi-9999.ebuild
879 +++ b/kde-apps/akonadi/akonadi-9999.ebuild
880 @@ -34,15 +34,15 @@ COMMON_DEPEND="
881 $(add_frameworks_dep kwidgetsaddons)
882 $(add_frameworks_dep kwindowsystem)
883 $(add_frameworks_dep kxmlgui)
884 - dev-qt/qtdbus:5
885 - dev-qt/qtgui:5
886 - dev-qt/qtnetwork:5
887 - dev-qt/qtsql:5[mysql?,postgres?]
888 - dev-qt/qttest:5
889 - dev-qt/qtwidgets:5
890 - dev-qt/qtxml:5
891 + $(add_qt_dep qtdbus)
892 + $(add_qt_dep qtgui)
893 + $(add_qt_dep qtnetwork)
894 + $(add_qt_dep qtsql 'mysql?,postgres?')
895 + $(add_qt_dep qttest)
896 + $(add_qt_dep qtwidgets)
897 + $(add_qt_dep qtxml)
898 x11-misc/shared-mime-info
899 - designer? ( dev-qt/designer:5 )
900 + designer? ( $(add_qt_dep designer) )
901 sqlite? ( dev-db/sqlite:3 )
902 tools? ( xml? ( dev-libs/libxml2 ) )
903 "
904
905 diff --git a/kde-apps/analitza/analitza-15.08.3.ebuild b/kde-apps/analitza/analitza-15.08.3.ebuild
906 index d54bffe..aaed74f 100644
907 --- a/kde-apps/analitza/analitza-15.08.3.ebuild
908 +++ b/kde-apps/analitza/analitza-15.08.3.ebuild
909 @@ -13,14 +13,14 @@ KEYWORDS=" ~amd64 ~x86"
910 IUSE="eigen opengl"
911
912 DEPEND="
913 - dev-qt/qtdeclarative:5
914 - dev-qt/qtgui:5
915 - dev-qt/qtsvg:5
916 - dev-qt/qtwidgets:5
917 - dev-qt/qtxml:5
918 + $(add_qt_dep qtdeclarative)
919 + $(add_qt_dep qtgui)
920 + $(add_qt_dep qtsvg)
921 + $(add_qt_dep qtwidgets)
922 + $(add_qt_dep qtxml)
923 eigen? ( dev-cpp/eigen:3 )
924 opengl? (
925 - dev-qt/qtopengl:5
926 + $(add_qt_dep qtopengl)
927 virtual/opengl
928 )
929 "
930
931 diff --git a/kde-apps/analitza/analitza-15.12.1.ebuild b/kde-apps/analitza/analitza-15.12.1.ebuild
932 index d54bffe..aaed74f 100644
933 --- a/kde-apps/analitza/analitza-15.12.1.ebuild
934 +++ b/kde-apps/analitza/analitza-15.12.1.ebuild
935 @@ -13,14 +13,14 @@ KEYWORDS=" ~amd64 ~x86"
936 IUSE="eigen opengl"
937
938 DEPEND="
939 - dev-qt/qtdeclarative:5
940 - dev-qt/qtgui:5
941 - dev-qt/qtsvg:5
942 - dev-qt/qtwidgets:5
943 - dev-qt/qtxml:5
944 + $(add_qt_dep qtdeclarative)
945 + $(add_qt_dep qtgui)
946 + $(add_qt_dep qtsvg)
947 + $(add_qt_dep qtwidgets)
948 + $(add_qt_dep qtxml)
949 eigen? ( dev-cpp/eigen:3 )
950 opengl? (
951 - dev-qt/qtopengl:5
952 + $(add_qt_dep qtopengl)
953 virtual/opengl
954 )
955 "
956
957 diff --git a/kde-apps/analitza/analitza-15.12.49.9999.ebuild b/kde-apps/analitza/analitza-15.12.49.9999.ebuild
958 index 25245c8..406b803 100644
959 --- a/kde-apps/analitza/analitza-15.12.49.9999.ebuild
960 +++ b/kde-apps/analitza/analitza-15.12.49.9999.ebuild
961 @@ -13,14 +13,14 @@ KEYWORDS=""
962 IUSE="eigen opengl"
963
964 DEPEND="
965 - dev-qt/qtdeclarative:5
966 - dev-qt/qtgui:5
967 - dev-qt/qtsvg:5
968 - dev-qt/qtwidgets:5
969 - dev-qt/qtxml:5
970 + $(add_qt_dep qtdeclarative)
971 + $(add_qt_dep qtgui)
972 + $(add_qt_dep qtsvg)
973 + $(add_qt_dep qtwidgets)
974 + $(add_qt_dep qtxml)
975 eigen? ( dev-cpp/eigen:3 )
976 opengl? (
977 - dev-qt/qtopengl:5
978 + $(add_qt_dep qtopengl)
979 virtual/opengl
980 )
981 "
982
983 diff --git a/kde-apps/analitza/analitza-9999.ebuild b/kde-apps/analitza/analitza-9999.ebuild
984 index 25245c8..406b803 100644
985 --- a/kde-apps/analitza/analitza-9999.ebuild
986 +++ b/kde-apps/analitza/analitza-9999.ebuild
987 @@ -13,14 +13,14 @@ KEYWORDS=""
988 IUSE="eigen opengl"
989
990 DEPEND="
991 - dev-qt/qtdeclarative:5
992 - dev-qt/qtgui:5
993 - dev-qt/qtsvg:5
994 - dev-qt/qtwidgets:5
995 - dev-qt/qtxml:5
996 + $(add_qt_dep qtdeclarative)
997 + $(add_qt_dep qtgui)
998 + $(add_qt_dep qtsvg)
999 + $(add_qt_dep qtwidgets)
1000 + $(add_qt_dep qtxml)
1001 eigen? ( dev-cpp/eigen:3 )
1002 opengl? (
1003 - dev-qt/qtopengl:5
1004 + $(add_qt_dep qtopengl)
1005 virtual/opengl
1006 )
1007 "
1008
1009 diff --git a/kde-apps/ark/ark-15.12.1.ebuild b/kde-apps/ark/ark-15.12.1.ebuild
1010 index b25d888..0ddf8d0 100644
1011 --- a/kde-apps/ark/ark-15.12.1.ebuild
1012 +++ b/kde-apps/ark/ark-15.12.1.ebuild
1013 @@ -32,9 +32,9 @@ RDEPEND="
1014 $(add_frameworks_dep kwidgetsaddons)
1015 $(add_frameworks_dep kxmlgui)
1016 >=app-arch/libarchive-3.0.0[bzip2?,lzma?,zlib?]
1017 - dev-qt/qtdbus:5
1018 - dev-qt/qtgui:5
1019 - dev-qt/qtwidgets:5
1020 + $(add_qt_dep qtdbus)
1021 + $(add_qt_dep qtgui)
1022 + $(add_qt_dep qtwidgets)
1023 "
1024 DEPEND="${RDEPEND}
1025 sys-devel/gettext
1026
1027 diff --git a/kde-apps/ark/ark-15.12.49.9999.ebuild b/kde-apps/ark/ark-15.12.49.9999.ebuild
1028 index 680bea0..41d5686 100644
1029 --- a/kde-apps/ark/ark-15.12.49.9999.ebuild
1030 +++ b/kde-apps/ark/ark-15.12.49.9999.ebuild
1031 @@ -32,9 +32,9 @@ RDEPEND="
1032 $(add_frameworks_dep kwidgetsaddons)
1033 $(add_frameworks_dep kxmlgui)
1034 >=app-arch/libarchive-3.0.0[bzip2?,lzma?,zlib?]
1035 - dev-qt/qtdbus:5
1036 - dev-qt/qtgui:5
1037 - dev-qt/qtwidgets:5
1038 + $(add_qt_dep qtdbus)
1039 + $(add_qt_dep qtgui)
1040 + $(add_qt_dep qtwidgets)
1041 "
1042 DEPEND="${RDEPEND}
1043 sys-devel/gettext
1044
1045 diff --git a/kde-apps/ark/ark-9999.ebuild b/kde-apps/ark/ark-9999.ebuild
1046 index 680bea0..41d5686 100644
1047 --- a/kde-apps/ark/ark-9999.ebuild
1048 +++ b/kde-apps/ark/ark-9999.ebuild
1049 @@ -32,9 +32,9 @@ RDEPEND="
1050 $(add_frameworks_dep kwidgetsaddons)
1051 $(add_frameworks_dep kxmlgui)
1052 >=app-arch/libarchive-3.0.0[bzip2?,lzma?,zlib?]
1053 - dev-qt/qtdbus:5
1054 - dev-qt/qtgui:5
1055 - dev-qt/qtwidgets:5
1056 + $(add_qt_dep qtdbus)
1057 + $(add_qt_dep qtgui)
1058 + $(add_qt_dep qtwidgets)
1059 "
1060 DEPEND="${RDEPEND}
1061 sys-devel/gettext
1062
1063 diff --git a/kde-apps/artikulate/artikulate-15.12.1.ebuild b/kde-apps/artikulate/artikulate-15.12.1.ebuild
1064 index ebf30fb..07c5ea3 100644
1065 --- a/kde-apps/artikulate/artikulate-15.12.1.ebuild
1066 +++ b/kde-apps/artikulate/artikulate-15.12.1.ebuild
1067 @@ -5,7 +5,6 @@
1068 EAPI=5
1069
1070 KDE_HANDBOOK="true"
1071 -QT_MINIMAL="5.5.0"
1072 inherit kde5
1073
1074 DESCRIPTION="Language learning application that helps improving pronunciation skills"
1075 @@ -22,12 +21,12 @@ DEPEND="
1076 $(add_frameworks_dep knewstuff)
1077 $(add_frameworks_dep kwidgetsaddons)
1078 $(add_frameworks_dep kxmlgui)
1079 - dev-qt/qtdeclarative:5
1080 - dev-qt/qtgui:5
1081 - dev-qt/qtsql:5
1082 - dev-qt/qtwidgets:5
1083 - dev-qt/qtxml:5
1084 - dev-qt/qtxmlpatterns:5
1085 + $(add_qt_dep qtdeclarative)
1086 + $(add_qt_dep qtgui)
1087 + $(add_qt_dep qtsql)
1088 + $(add_qt_dep qtwidgets)
1089 + $(add_qt_dep qtxml)
1090 + $(add_qt_dep qtxmlpatterns)
1091 >=media-libs/qt-gstreamer-1.2.0[qt5]
1092 "
1093 RDEPEND="${DEPEND}"
1094
1095 diff --git a/kde-apps/artikulate/artikulate-15.12.49.9999.ebuild b/kde-apps/artikulate/artikulate-15.12.49.9999.ebuild
1096 index 2c7d628..8eb6e28 100644
1097 --- a/kde-apps/artikulate/artikulate-15.12.49.9999.ebuild
1098 +++ b/kde-apps/artikulate/artikulate-15.12.49.9999.ebuild
1099 @@ -5,7 +5,6 @@
1100 EAPI=5
1101
1102 KDE_HANDBOOK="true"
1103 -QT_MINIMAL="5.5.0"
1104 inherit kde5
1105
1106 DESCRIPTION="Language learning application that helps improving pronunciation skills"
1107 @@ -22,12 +21,12 @@ DEPEND="
1108 $(add_frameworks_dep knewstuff)
1109 $(add_frameworks_dep kwidgetsaddons)
1110 $(add_frameworks_dep kxmlgui)
1111 - dev-qt/qtdeclarative:5
1112 - dev-qt/qtgui:5
1113 - dev-qt/qtsql:5
1114 - dev-qt/qtwidgets:5
1115 - dev-qt/qtxml:5
1116 - dev-qt/qtxmlpatterns:5
1117 + $(add_qt_dep qtdeclarative)
1118 + $(add_qt_dep qtgui)
1119 + $(add_qt_dep qtsql)
1120 + $(add_qt_dep qtwidgets)
1121 + $(add_qt_dep qtxml)
1122 + $(add_qt_dep qtxmlpatterns)
1123 >=media-libs/qt-gstreamer-1.2.0[qt5]
1124 "
1125 RDEPEND="${DEPEND}"
1126
1127 diff --git a/kde-apps/artikulate/artikulate-9999.ebuild b/kde-apps/artikulate/artikulate-9999.ebuild
1128 index 2c7d628..8eb6e28 100644
1129 --- a/kde-apps/artikulate/artikulate-9999.ebuild
1130 +++ b/kde-apps/artikulate/artikulate-9999.ebuild
1131 @@ -5,7 +5,6 @@
1132 EAPI=5
1133
1134 KDE_HANDBOOK="true"
1135 -QT_MINIMAL="5.5.0"
1136 inherit kde5
1137
1138 DESCRIPTION="Language learning application that helps improving pronunciation skills"
1139 @@ -22,12 +21,12 @@ DEPEND="
1140 $(add_frameworks_dep knewstuff)
1141 $(add_frameworks_dep kwidgetsaddons)
1142 $(add_frameworks_dep kxmlgui)
1143 - dev-qt/qtdeclarative:5
1144 - dev-qt/qtgui:5
1145 - dev-qt/qtsql:5
1146 - dev-qt/qtwidgets:5
1147 - dev-qt/qtxml:5
1148 - dev-qt/qtxmlpatterns:5
1149 + $(add_qt_dep qtdeclarative)
1150 + $(add_qt_dep qtgui)
1151 + $(add_qt_dep qtsql)
1152 + $(add_qt_dep qtwidgets)
1153 + $(add_qt_dep qtxml)
1154 + $(add_qt_dep qtxmlpatterns)
1155 >=media-libs/qt-gstreamer-1.2.0[qt5]
1156 "
1157 RDEPEND="${DEPEND}"
1158
1159 diff --git a/kde-apps/baloo-widgets/baloo-widgets-15.12.1.ebuild b/kde-apps/baloo-widgets/baloo-widgets-15.12.1.ebuild
1160 index 71d4be6..40722c9 100644
1161 --- a/kde-apps/baloo-widgets/baloo-widgets-15.12.1.ebuild
1162 +++ b/kde-apps/baloo-widgets/baloo-widgets-15.12.1.ebuild
1163 @@ -19,8 +19,8 @@ DEPEND="
1164 $(add_frameworks_dep ki18n)
1165 $(add_frameworks_dep kio)
1166 $(add_frameworks_dep kwidgetsaddons)
1167 - dev-qt/qtgui:5
1168 - dev-qt/qtwidgets:5
1169 + $(add_qt_dep qtgui)
1170 + $(add_qt_dep qtwidgets)
1171 "
1172 RDEPEND="${DEPEND}
1173 !kde-base/baloo-widgets
1174
1175 diff --git a/kde-apps/baloo-widgets/baloo-widgets-15.12.49.9999.ebuild b/kde-apps/baloo-widgets/baloo-widgets-15.12.49.9999.ebuild
1176 index 9530e65..07e5608 100644
1177 --- a/kde-apps/baloo-widgets/baloo-widgets-15.12.49.9999.ebuild
1178 +++ b/kde-apps/baloo-widgets/baloo-widgets-15.12.49.9999.ebuild
1179 @@ -19,8 +19,8 @@ DEPEND="
1180 $(add_frameworks_dep ki18n)
1181 $(add_frameworks_dep kio)
1182 $(add_frameworks_dep kwidgetsaddons)
1183 - dev-qt/qtgui:5
1184 - dev-qt/qtwidgets:5
1185 + $(add_qt_dep qtgui)
1186 + $(add_qt_dep qtwidgets)
1187 "
1188 RDEPEND="${DEPEND}
1189 !kde-base/baloo-widgets
1190
1191 diff --git a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild b/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
1192 index 9530e65..07e5608 100644
1193 --- a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
1194 +++ b/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
1195 @@ -19,8 +19,8 @@ DEPEND="
1196 $(add_frameworks_dep ki18n)
1197 $(add_frameworks_dep kio)
1198 $(add_frameworks_dep kwidgetsaddons)
1199 - dev-qt/qtgui:5
1200 - dev-qt/qtwidgets:5
1201 + $(add_qt_dep qtgui)
1202 + $(add_qt_dep qtwidgets)
1203 "
1204 RDEPEND="${DEPEND}
1205 !kde-base/baloo-widgets
1206
1207 diff --git a/kde-apps/blinken/blinken-15.08.3.ebuild b/kde-apps/blinken/blinken-15.08.3.ebuild
1208 index d914a16..c0bdefb 100644
1209 --- a/kde-apps/blinken/blinken-15.08.3.ebuild
1210 +++ b/kde-apps/blinken/blinken-15.08.3.ebuild
1211 @@ -20,9 +20,9 @@ DEPEND="
1212 $(add_frameworks_dep kguiaddons)
1213 $(add_frameworks_dep ki18n)
1214 $(add_frameworks_dep kxmlgui)
1215 - dev-qt/qtgui:5
1216 - dev-qt/qtsvg:5
1217 - dev-qt/qtwidgets:5
1218 + $(add_qt_dep qtgui)
1219 + $(add_qt_dep qtsvg)
1220 + $(add_qt_dep qtwidgets)
1221 media-libs/phonon[qt5]
1222 "
1223 RDEPEND="${DEPEND}"
1224
1225 diff --git a/kde-apps/blinken/blinken-15.12.1.ebuild b/kde-apps/blinken/blinken-15.12.1.ebuild
1226 index d914a16..c0bdefb 100644
1227 --- a/kde-apps/blinken/blinken-15.12.1.ebuild
1228 +++ b/kde-apps/blinken/blinken-15.12.1.ebuild
1229 @@ -20,9 +20,9 @@ DEPEND="
1230 $(add_frameworks_dep kguiaddons)
1231 $(add_frameworks_dep ki18n)
1232 $(add_frameworks_dep kxmlgui)
1233 - dev-qt/qtgui:5
1234 - dev-qt/qtsvg:5
1235 - dev-qt/qtwidgets:5
1236 + $(add_qt_dep qtgui)
1237 + $(add_qt_dep qtsvg)
1238 + $(add_qt_dep qtwidgets)
1239 media-libs/phonon[qt5]
1240 "
1241 RDEPEND="${DEPEND}"
1242
1243 diff --git a/kde-apps/blinken/blinken-15.12.49.9999.ebuild b/kde-apps/blinken/blinken-15.12.49.9999.ebuild
1244 index 8386a37..f7507db 100644
1245 --- a/kde-apps/blinken/blinken-15.12.49.9999.ebuild
1246 +++ b/kde-apps/blinken/blinken-15.12.49.9999.ebuild
1247 @@ -20,9 +20,9 @@ DEPEND="
1248 $(add_frameworks_dep kguiaddons)
1249 $(add_frameworks_dep ki18n)
1250 $(add_frameworks_dep kxmlgui)
1251 - dev-qt/qtgui:5
1252 - dev-qt/qtsvg:5
1253 - dev-qt/qtwidgets:5
1254 + $(add_qt_dep qtgui)
1255 + $(add_qt_dep qtsvg)
1256 + $(add_qt_dep qtwidgets)
1257 media-libs/phonon[qt5]
1258 "
1259 RDEPEND="${DEPEND}"
1260
1261 diff --git a/kde-apps/blinken/blinken-9999.ebuild b/kde-apps/blinken/blinken-9999.ebuild
1262 index 8386a37..f7507db 100644
1263 --- a/kde-apps/blinken/blinken-9999.ebuild
1264 +++ b/kde-apps/blinken/blinken-9999.ebuild
1265 @@ -20,9 +20,9 @@ DEPEND="
1266 $(add_frameworks_dep kguiaddons)
1267 $(add_frameworks_dep ki18n)
1268 $(add_frameworks_dep kxmlgui)
1269 - dev-qt/qtgui:5
1270 - dev-qt/qtsvg:5
1271 - dev-qt/qtwidgets:5
1272 + $(add_qt_dep qtgui)
1273 + $(add_qt_dep qtsvg)
1274 + $(add_qt_dep qtwidgets)
1275 media-libs/phonon[qt5]
1276 "
1277 RDEPEND="${DEPEND}"
1278
1279 diff --git a/kde-apps/bomber/bomber-15.12.1.ebuild b/kde-apps/bomber/bomber-15.12.1.ebuild
1280 index 14f1262..7452b2e 100644
1281 --- a/kde-apps/bomber/bomber-15.12.1.ebuild
1282 +++ b/kde-apps/bomber/bomber-15.12.1.ebuild
1283 @@ -21,8 +21,8 @@ DEPEND="
1284 $(add_frameworks_dep kwidgetsaddons)
1285 $(add_frameworks_dep kxmlgui)
1286 $(add_kdeapps_dep libkdegames)
1287 - dev-qt/qtgui:5
1288 - dev-qt/qtwidgets:5
1289 + $(add_qt_dep qtgui)
1290 + $(add_qt_dep qtwidgets)
1291 media-libs/phonon[qt5]
1292 "
1293
1294
1295 diff --git a/kde-apps/bomber/bomber-15.12.49.9999.ebuild b/kde-apps/bomber/bomber-15.12.49.9999.ebuild
1296 index 7bbe29d..af95e90 100644
1297 --- a/kde-apps/bomber/bomber-15.12.49.9999.ebuild
1298 +++ b/kde-apps/bomber/bomber-15.12.49.9999.ebuild
1299 @@ -21,8 +21,8 @@ DEPEND="
1300 $(add_frameworks_dep kwidgetsaddons)
1301 $(add_frameworks_dep kxmlgui)
1302 $(add_kdeapps_dep libkdegames)
1303 - dev-qt/qtgui:5
1304 - dev-qt/qtwidgets:5
1305 + $(add_qt_dep qtgui)
1306 + $(add_qt_dep qtwidgets)
1307 media-libs/phonon[qt5]
1308 "
1309
1310
1311 diff --git a/kde-apps/bomber/bomber-9999.ebuild b/kde-apps/bomber/bomber-9999.ebuild
1312 index 9641a18..3b47b37 100644
1313 --- a/kde-apps/bomber/bomber-9999.ebuild
1314 +++ b/kde-apps/bomber/bomber-9999.ebuild
1315 @@ -22,8 +22,8 @@ DEPEND="
1316 $(add_frameworks_dep kwidgetsaddons)
1317 $(add_frameworks_dep kxmlgui)
1318 $(add_kdeapps_dep libkdegames)
1319 - dev-qt/qtgui:5
1320 - dev-qt/qtwidgets:5
1321 + $(add_qt_dep qtgui)
1322 + $(add_qt_dep qtwidgets)
1323 media-libs/phonon[qt5]
1324 "
1325
1326
1327 diff --git a/kde-apps/bovo/bovo-15.12.1.ebuild b/kde-apps/bovo/bovo-15.12.1.ebuild
1328 index 4578c78..1193ffa 100644
1329 --- a/kde-apps/bovo/bovo-15.12.1.ebuild
1330 +++ b/kde-apps/bovo/bovo-15.12.1.ebuild
1331 @@ -20,10 +20,10 @@ DEPEND="
1332 $(add_frameworks_dep kwidgetsaddons)
1333 $(add_frameworks_dep kxmlgui)
1334 $(add_kdeapps_dep libkdegames)
1335 - dev-qt/qtconcurrent:5
1336 - dev-qt/qtgui:5
1337 - dev-qt/qtsvg:5
1338 - dev-qt/qtwidgets:5
1339 + $(add_qt_dep qtconcurrent)
1340 + $(add_qt_dep qtgui)
1341 + $(add_qt_dep qtsvg)
1342 + $(add_qt_dep qtwidgets)
1343 "
1344
1345 RDEPEND="${DEPEND}"
1346
1347 diff --git a/kde-apps/bovo/bovo-15.12.49.9999.ebuild b/kde-apps/bovo/bovo-15.12.49.9999.ebuild
1348 index 08bca70..ee2d690 100644
1349 --- a/kde-apps/bovo/bovo-15.12.49.9999.ebuild
1350 +++ b/kde-apps/bovo/bovo-15.12.49.9999.ebuild
1351 @@ -20,10 +20,10 @@ DEPEND="
1352 $(add_frameworks_dep kwidgetsaddons)
1353 $(add_frameworks_dep kxmlgui)
1354 $(add_kdeapps_dep libkdegames)
1355 - dev-qt/qtconcurrent:5
1356 - dev-qt/qtgui:5
1357 - dev-qt/qtsvg:5
1358 - dev-qt/qtwidgets:5
1359 + $(add_qt_dep qtconcurrent)
1360 + $(add_qt_dep qtgui)
1361 + $(add_qt_dep qtsvg)
1362 + $(add_qt_dep qtwidgets)
1363 "
1364
1365 RDEPEND="${DEPEND}"
1366
1367 diff --git a/kde-apps/bovo/bovo-9999.ebuild b/kde-apps/bovo/bovo-9999.ebuild
1368 index 235b5e9..ab8cfaf 100644
1369 --- a/kde-apps/bovo/bovo-9999.ebuild
1370 +++ b/kde-apps/bovo/bovo-9999.ebuild
1371 @@ -21,10 +21,10 @@ DEPEND="
1372 $(add_frameworks_dep kwidgetsaddons)
1373 $(add_frameworks_dep kxmlgui)
1374 $(add_kdeapps_dep libkdegames)
1375 - dev-qt/qtconcurrent:5
1376 - dev-qt/qtgui:5
1377 - dev-qt/qtsvg:5
1378 - dev-qt/qtwidgets:5
1379 + $(add_qt_dep qtconcurrent)
1380 + $(add_qt_dep qtgui)
1381 + $(add_qt_dep qtsvg)
1382 + $(add_qt_dep qtwidgets)
1383 "
1384
1385 RDEPEND="${DEPEND}"
1386
1387 diff --git a/kde-apps/calendarsupport/calendarsupport-15.12.1.ebuild b/kde-apps/calendarsupport/calendarsupport-15.12.1.ebuild
1388 index bd532fb..f3edbce 100644
1389 --- a/kde-apps/calendarsupport/calendarsupport-15.12.1.ebuild
1390 +++ b/kde-apps/calendarsupport/calendarsupport-15.12.1.ebuild
1391 @@ -39,10 +39,10 @@ COMMON_DEPEND="
1392 $(add_kdeapps_dep libkdepimdbusinterfaces)
1393 $(add_kdeapps_dep pimcommon)
1394 dev-libs/libical
1395 - dev-qt/designer:5
1396 - dev-qt/qtgui:5
1397 - dev-qt/qtprintsupport:5
1398 - dev-qt/qtwidgets:5
1399 + $(add_qt_dep designer)
1400 + $(add_qt_dep qtgui)
1401 + $(add_qt_dep qtprintsupport)
1402 + $(add_qt_dep qtwidgets)
1403 "
1404 DEPEND="${COMMON_DEPEND}
1405 sys-devel/gettext
1406
1407 diff --git a/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild b/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild
1408 index a172f7c..72694d3 100644
1409 --- a/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild
1410 +++ b/kde-apps/calendarsupport/calendarsupport-15.12.49.9999.ebuild
1411 @@ -39,10 +39,10 @@ COMMON_DEPEND="
1412 $(add_kdeapps_dep libkdepimdbusinterfaces)
1413 $(add_kdeapps_dep pimcommon)
1414 dev-libs/libical
1415 - dev-qt/designer:5
1416 - dev-qt/qtgui:5
1417 - dev-qt/qtprintsupport:5
1418 - dev-qt/qtwidgets:5
1419 + $(add_qt_dep designer)
1420 + $(add_qt_dep qtgui)
1421 + $(add_qt_dep qtprintsupport)
1422 + $(add_qt_dep qtwidgets)
1423 "
1424 DEPEND="${COMMON_DEPEND}
1425 sys-devel/gettext
1426
1427 diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
1428 index 7081570..3699c00 100644
1429 --- a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
1430 +++ b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
1431 @@ -37,10 +37,10 @@ COMMON_DEPEND="
1432 $(add_kdeapps_dep libkdepim)
1433 $(add_kdeapps_dep pimcommon)
1434 dev-libs/libical
1435 - dev-qt/designer:5
1436 - dev-qt/qtgui:5
1437 - dev-qt/qtprintsupport:5
1438 - dev-qt/qtwidgets:5
1439 + $(add_qt_dep designer)
1440 + $(add_qt_dep qtgui)
1441 + $(add_qt_dep qtprintsupport)
1442 + $(add_qt_dep qtwidgets)
1443 "
1444 DEPEND="${COMMON_DEPEND}
1445 sys-devel/gettext
1446
1447 diff --git a/kde-apps/cantor/cantor-15.08.3.ebuild b/kde-apps/cantor/cantor-15.08.3.ebuild
1448 index 8e4bd17..6f6db5c 100644
1449 --- a/kde-apps/cantor/cantor-15.08.3.ebuild
1450 +++ b/kde-apps/cantor/cantor-15.08.3.ebuild
1451 @@ -33,11 +33,11 @@ RDEPEND="
1452 $(add_frameworks_dep ktexteditor)
1453 $(add_frameworks_dep kwidgetsaddons)
1454 $(add_frameworks_dep kxmlgui)
1455 - dev-qt/qtgui:5
1456 - dev-qt/qtsvg:5
1457 - dev-qt/qtwidgets:5
1458 - dev-qt/qtxml:5
1459 - dev-qt/qtxmlpatterns:5
1460 + $(add_qt_dep qtgui)
1461 + $(add_qt_dep qtsvg)
1462 + $(add_qt_dep qtwidgets)
1463 + $(add_qt_dep qtxml)
1464 + $(add_qt_dep qtxmlpatterns)
1465 analitza? ( $(add_kdeapps_dep analitza) )
1466 lua? ( dev-lang/luajit:2 )
1467 qalculate? (
1468
1469 diff --git a/kde-apps/cantor/cantor-15.12.1.ebuild b/kde-apps/cantor/cantor-15.12.1.ebuild
1470 index 88eaab6..0724191 100644
1471 --- a/kde-apps/cantor/cantor-15.12.1.ebuild
1472 +++ b/kde-apps/cantor/cantor-15.12.1.ebuild
1473 @@ -34,11 +34,11 @@ RDEPEND="
1474 $(add_frameworks_dep ktexteditor)
1475 $(add_frameworks_dep kwidgetsaddons)
1476 $(add_frameworks_dep kxmlgui)
1477 - dev-qt/qtgui:5
1478 - dev-qt/qtsvg:5
1479 - dev-qt/qtwidgets:5
1480 - dev-qt/qtxml:5
1481 - dev-qt/qtxmlpatterns:5
1482 + $(add_qt_dep qtgui)
1483 + $(add_qt_dep qtsvg)
1484 + $(add_qt_dep qtwidgets)
1485 + $(add_qt_dep qtxml)
1486 + $(add_qt_dep qtxmlpatterns)
1487 analitza? ( $(add_kdeapps_dep analitza) )
1488 lua? ( dev-lang/luajit:2 )
1489 qalculate? (
1490
1491 diff --git a/kde-apps/cantor/cantor-15.12.49.9999.ebuild b/kde-apps/cantor/cantor-15.12.49.9999.ebuild
1492 index d8879e6..ee20328 100644
1493 --- a/kde-apps/cantor/cantor-15.12.49.9999.ebuild
1494 +++ b/kde-apps/cantor/cantor-15.12.49.9999.ebuild
1495 @@ -34,11 +34,11 @@ RDEPEND="
1496 $(add_frameworks_dep ktexteditor)
1497 $(add_frameworks_dep kwidgetsaddons)
1498 $(add_frameworks_dep kxmlgui)
1499 - dev-qt/qtgui:5
1500 - dev-qt/qtsvg:5
1501 - dev-qt/qtwidgets:5
1502 - dev-qt/qtxml:5
1503 - dev-qt/qtxmlpatterns:5
1504 + $(add_qt_dep qtgui)
1505 + $(add_qt_dep qtsvg)
1506 + $(add_qt_dep qtwidgets)
1507 + $(add_qt_dep qtxml)
1508 + $(add_qt_dep qtxmlpatterns)
1509 analitza? ( $(add_kdeapps_dep analitza) )
1510 lua? ( dev-lang/luajit:2 )
1511 qalculate? (
1512
1513 diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
1514 index d8879e6..ee20328 100644
1515 --- a/kde-apps/cantor/cantor-9999.ebuild
1516 +++ b/kde-apps/cantor/cantor-9999.ebuild
1517 @@ -34,11 +34,11 @@ RDEPEND="
1518 $(add_frameworks_dep ktexteditor)
1519 $(add_frameworks_dep kwidgetsaddons)
1520 $(add_frameworks_dep kxmlgui)
1521 - dev-qt/qtgui:5
1522 - dev-qt/qtsvg:5
1523 - dev-qt/qtwidgets:5
1524 - dev-qt/qtxml:5
1525 - dev-qt/qtxmlpatterns:5
1526 + $(add_qt_dep qtgui)
1527 + $(add_qt_dep qtsvg)
1528 + $(add_qt_dep qtwidgets)
1529 + $(add_qt_dep qtxml)
1530 + $(add_qt_dep qtxmlpatterns)
1531 analitza? ( $(add_kdeapps_dep analitza) )
1532 lua? ( dev-lang/luajit:2 )
1533 qalculate? (
1534
1535 diff --git a/kde-apps/composereditor/composereditor-15.12.1.ebuild b/kde-apps/composereditor/composereditor-15.12.1.ebuild
1536 index 3a9b028..0e22e0c 100644
1537 --- a/kde-apps/composereditor/composereditor-15.12.1.ebuild
1538 +++ b/kde-apps/composereditor/composereditor-15.12.1.ebuild
1539 @@ -29,11 +29,11 @@ COMMON_DEPEND="
1540 $(add_kdeapps_dep kpimtextedit)
1541 $(add_kdeapps_dep libakonadi)
1542 $(add_kdeapps_dep pimcommon)
1543 - dev-qt/designer:5
1544 - dev-qt/qtgui:5
1545 - dev-qt/qtprintsupport:5
1546 - dev-qt/qtwebkit:5
1547 - dev-qt/qtwidgets:5
1548 + $(add_qt_dep designer)
1549 + $(add_qt_dep qtgui)
1550 + $(add_qt_dep qtprintsupport)
1551 + $(add_qt_dep qtwebkit)
1552 + $(add_qt_dep qtwidgets)
1553 "
1554 DEPEND="${COMMON_DEPEND}
1555 sys-devel/gettext
1556
1557 diff --git a/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild b/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild
1558 index abc1c2c..1a3fa8b 100644
1559 --- a/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild
1560 +++ b/kde-apps/composereditor/composereditor-15.12.49.9999.ebuild
1561 @@ -29,11 +29,11 @@ COMMON_DEPEND="
1562 $(add_kdeapps_dep kpimtextedit)
1563 $(add_kdeapps_dep libakonadi)
1564 $(add_kdeapps_dep pimcommon)
1565 - dev-qt/designer:5
1566 - dev-qt/qtgui:5
1567 - dev-qt/qtprintsupport:5
1568 - dev-qt/qtwebkit:5
1569 - dev-qt/qtwidgets:5
1570 + $(add_qt_dep designer)
1571 + $(add_qt_dep qtgui)
1572 + $(add_qt_dep qtprintsupport)
1573 + $(add_qt_dep qtwebkit)
1574 + $(add_qt_dep qtwidgets)
1575 "
1576 DEPEND="${COMMON_DEPEND}
1577 sys-devel/gettext
1578
1579 diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-15.12.1.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-15.12.1.ebuild
1580 index 46dccee..dd542a2 100644
1581 --- a/kde-apps/dolphin-plugins/dolphin-plugins-15.12.1.ebuild
1582 +++ b/kde-apps/dolphin-plugins/dolphin-plugins-15.12.1.ebuild
1583 @@ -21,9 +21,9 @@ COMMON_DEPEND="
1584 $(add_frameworks_dep kio)
1585 $(add_frameworks_dep kxmlgui)
1586 $(add_kdeapps_dep dolphin)
1587 - dev-qt/qtgui:5
1588 - dev-qt/qtnetwork:5
1589 - dev-qt/qtwidgets:5
1590 + $(add_qt_dep qtgui)
1591 + $(add_qt_dep qtnetwork)
1592 + $(add_qt_dep qtwidgets)
1593 git? (
1594 $(add_frameworks_dep kcompletion)
1595 $(add_frameworks_dep kconfig)
1596
1597 diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-15.12.49.9999.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-15.12.49.9999.ebuild
1598 index 85d68b0..4dcc4cb 100644
1599 --- a/kde-apps/dolphin-plugins/dolphin-plugins-15.12.49.9999.ebuild
1600 +++ b/kde-apps/dolphin-plugins/dolphin-plugins-15.12.49.9999.ebuild
1601 @@ -21,9 +21,9 @@ COMMON_DEPEND="
1602 $(add_frameworks_dep kio)
1603 $(add_frameworks_dep kxmlgui)
1604 $(add_kdeapps_dep dolphin)
1605 - dev-qt/qtgui:5
1606 - dev-qt/qtnetwork:5
1607 - dev-qt/qtwidgets:5
1608 + $(add_qt_dep qtgui)
1609 + $(add_qt_dep qtnetwork)
1610 + $(add_qt_dep qtwidgets)
1611 git? (
1612 $(add_frameworks_dep kcompletion)
1613 $(add_frameworks_dep kconfig)
1614
1615 diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-9999.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-9999.ebuild
1616 index 85d68b0..4dcc4cb 100644
1617 --- a/kde-apps/dolphin-plugins/dolphin-plugins-9999.ebuild
1618 +++ b/kde-apps/dolphin-plugins/dolphin-plugins-9999.ebuild
1619 @@ -21,9 +21,9 @@ COMMON_DEPEND="
1620 $(add_frameworks_dep kio)
1621 $(add_frameworks_dep kxmlgui)
1622 $(add_kdeapps_dep dolphin)
1623 - dev-qt/qtgui:5
1624 - dev-qt/qtnetwork:5
1625 - dev-qt/qtwidgets:5
1626 + $(add_qt_dep qtgui)
1627 + $(add_qt_dep qtnetwork)
1628 + $(add_qt_dep qtwidgets)
1629 git? (
1630 $(add_frameworks_dep kcompletion)
1631 $(add_frameworks_dep kconfig)
1632
1633 diff --git a/kde-apps/dolphin/dolphin-15.12.1.ebuild b/kde-apps/dolphin/dolphin-15.12.1.ebuild
1634 index dcfdb79..f763f50 100644
1635 --- a/kde-apps/dolphin/dolphin-15.12.1.ebuild
1636 +++ b/kde-apps/dolphin/dolphin-15.12.1.ebuild
1637 @@ -40,11 +40,11 @@ DEPEND="
1638 $(add_frameworks_dep kwindowsystem)
1639 $(add_frameworks_dep kxmlgui)
1640 $(add_frameworks_dep solid)
1641 - dev-qt/qtconcurrent:5
1642 - dev-qt/qtdbus:5
1643 - dev-qt/qtgui:5
1644 - dev-qt/qtwidgets:5
1645 - dev-qt/qtxml:5
1646 + $(add_qt_dep qtconcurrent)
1647 + $(add_qt_dep qtdbus)
1648 + $(add_qt_dep qtgui)
1649 + $(add_qt_dep qtwidgets)
1650 + $(add_qt_dep qtxml)
1651 media-libs/phonon[qt5]
1652 semantic-desktop? (
1653 $(add_frameworks_dep baloo)
1654
1655 diff --git a/kde-apps/dolphin/dolphin-15.12.49.9999.ebuild b/kde-apps/dolphin/dolphin-15.12.49.9999.ebuild
1656 index 654eaa5..74b7859 100644
1657 --- a/kde-apps/dolphin/dolphin-15.12.49.9999.ebuild
1658 +++ b/kde-apps/dolphin/dolphin-15.12.49.9999.ebuild
1659 @@ -40,11 +40,11 @@ DEPEND="
1660 $(add_frameworks_dep kwindowsystem)
1661 $(add_frameworks_dep kxmlgui)
1662 $(add_frameworks_dep solid)
1663 - dev-qt/qtconcurrent:5
1664 - dev-qt/qtdbus:5
1665 - dev-qt/qtgui:5
1666 - dev-qt/qtwidgets:5
1667 - dev-qt/qtxml:5
1668 + $(add_qt_dep qtconcurrent)
1669 + $(add_qt_dep qtdbus)
1670 + $(add_qt_dep qtgui)
1671 + $(add_qt_dep qtwidgets)
1672 + $(add_qt_dep qtxml)
1673 media-libs/phonon[qt5]
1674 semantic-desktop? (
1675 $(add_frameworks_dep baloo)
1676
1677 diff --git a/kde-apps/dolphin/dolphin-9999.ebuild b/kde-apps/dolphin/dolphin-9999.ebuild
1678 index 654eaa5..74b7859 100644
1679 --- a/kde-apps/dolphin/dolphin-9999.ebuild
1680 +++ b/kde-apps/dolphin/dolphin-9999.ebuild
1681 @@ -40,11 +40,11 @@ DEPEND="
1682 $(add_frameworks_dep kwindowsystem)
1683 $(add_frameworks_dep kxmlgui)
1684 $(add_frameworks_dep solid)
1685 - dev-qt/qtconcurrent:5
1686 - dev-qt/qtdbus:5
1687 - dev-qt/qtgui:5
1688 - dev-qt/qtwidgets:5
1689 - dev-qt/qtxml:5
1690 + $(add_qt_dep qtconcurrent)
1691 + $(add_qt_dep qtdbus)
1692 + $(add_qt_dep qtgui)
1693 + $(add_qt_dep qtwidgets)
1694 + $(add_qt_dep qtxml)
1695 media-libs/phonon[qt5]
1696 semantic-desktop? (
1697 $(add_frameworks_dep baloo)
1698
1699 diff --git a/kde-apps/dragon/dragon-15.12.1.ebuild b/kde-apps/dragon/dragon-15.12.1.ebuild
1700 index 193ff4c..0b1a113 100644
1701 --- a/kde-apps/dragon/dragon-15.12.1.ebuild
1702 +++ b/kde-apps/dragon/dragon-15.12.1.ebuild
1703 @@ -26,9 +26,9 @@ RDEPEND="
1704 $(add_frameworks_dep kwindowsystem)
1705 $(add_frameworks_dep kxmlgui)
1706 $(add_frameworks_dep solid)
1707 - dev-qt/qtdbus:5
1708 - dev-qt/qtgui:5
1709 - dev-qt/qtwidgets:5
1710 + $(add_qt_dep qtdbus)
1711 + $(add_qt_dep qtgui)
1712 + $(add_qt_dep qtwidgets)
1713 media-libs/phonon[qt5]
1714 "
1715 DEPEND="${RDEPEND}
1716
1717 diff --git a/kde-apps/dragon/dragon-15.12.49.9999.ebuild b/kde-apps/dragon/dragon-15.12.49.9999.ebuild
1718 index 8b43656..3fbe0f4 100644
1719 --- a/kde-apps/dragon/dragon-15.12.49.9999.ebuild
1720 +++ b/kde-apps/dragon/dragon-15.12.49.9999.ebuild
1721 @@ -26,9 +26,9 @@ RDEPEND="
1722 $(add_frameworks_dep kwindowsystem)
1723 $(add_frameworks_dep kxmlgui)
1724 $(add_frameworks_dep solid)
1725 - dev-qt/qtdbus:5
1726 - dev-qt/qtgui:5
1727 - dev-qt/qtwidgets:5
1728 + $(add_qt_dep qtdbus)
1729 + $(add_qt_dep qtgui)
1730 + $(add_qt_dep qtwidgets)
1731 media-libs/phonon[qt5]
1732 "
1733 DEPEND="${RDEPEND}
1734
1735 diff --git a/kde-apps/dragon/dragon-9999.ebuild b/kde-apps/dragon/dragon-9999.ebuild
1736 index a3ba8f2..0f49e6c 100644
1737 --- a/kde-apps/dragon/dragon-9999.ebuild
1738 +++ b/kde-apps/dragon/dragon-9999.ebuild
1739 @@ -27,9 +27,9 @@ RDEPEND="
1740 $(add_frameworks_dep kwindowsystem)
1741 $(add_frameworks_dep kxmlgui)
1742 $(add_frameworks_dep solid)
1743 - dev-qt/qtdbus:5
1744 - dev-qt/qtgui:5
1745 - dev-qt/qtwidgets:5
1746 + $(add_qt_dep qtdbus)
1747 + $(add_qt_dep qtgui)
1748 + $(add_qt_dep qtwidgets)
1749 media-libs/phonon[qt5]
1750 "
1751 DEPEND="${RDEPEND}
1752
1753 diff --git a/kde-apps/eventviews/eventviews-15.12.1.ebuild b/kde-apps/eventviews/eventviews-15.12.1.ebuild
1754 index ceeb0bd..1b2bc54 100644
1755 --- a/kde-apps/eventviews/eventviews-15.12.1.ebuild
1756 +++ b/kde-apps/eventviews/eventviews-15.12.1.ebuild
1757 @@ -37,9 +37,9 @@ COMMON_DEPEND="
1758 $(add_kdeapps_dep libakonadi)
1759 $(add_kdeapps_dep libkdepim)
1760 dev-libs/libical
1761 - dev-qt/designer:5
1762 - dev-qt/qtgui:5
1763 - dev-qt/qtwidgets:5
1764 + $(add_qt_dep designer)
1765 + $(add_qt_dep qtgui)
1766 + $(add_qt_dep qtwidgets)
1767 "
1768 DEPEND="${COMMON_DEPEND}
1769 sys-devel/gettext
1770
1771 diff --git a/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild b/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild
1772 index 8aee4a9..6a3b238 100644
1773 --- a/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild
1774 +++ b/kde-apps/eventviews/eventviews-15.12.49.9999.ebuild
1775 @@ -37,9 +37,9 @@ COMMON_DEPEND="
1776 $(add_kdeapps_dep libakonadi)
1777 $(add_kdeapps_dep libkdepim)
1778 dev-libs/libical
1779 - dev-qt/designer:5
1780 - dev-qt/qtgui:5
1781 - dev-qt/qtwidgets:5
1782 + $(add_qt_dep designer)
1783 + $(add_qt_dep qtgui)
1784 + $(add_qt_dep qtwidgets)
1785 "
1786 DEPEND="${COMMON_DEPEND}
1787 sys-devel/gettext
1788
1789 diff --git a/kde-apps/eventviews/eventviews-9999.ebuild b/kde-apps/eventviews/eventviews-9999.ebuild
1790 index 8d3d537..2729ec4 100644
1791 --- a/kde-apps/eventviews/eventviews-9999.ebuild
1792 +++ b/kde-apps/eventviews/eventviews-9999.ebuild
1793 @@ -36,9 +36,9 @@ COMMON_DEPEND="
1794 $(add_kdeapps_dep kmime)
1795 $(add_kdeapps_dep libkdepim)
1796 dev-libs/libical
1797 - dev-qt/designer:5
1798 - dev-qt/qtgui:5
1799 - dev-qt/qtwidgets:5
1800 + $(add_qt_dep designer)
1801 + $(add_qt_dep qtgui)
1802 + $(add_qt_dep qtwidgets)
1803 "
1804 DEPEND="${COMMON_DEPEND}
1805 sys-devel/gettext
1806
1807 diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.1.ebuild
1808 index e5e2011..860298e 100644
1809 --- a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.1.ebuild
1810 +++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.1.ebuild
1811 @@ -12,7 +12,7 @@ IUSE="libav"
1812
1813 RDEPEND="
1814 $(add_frameworks_dep kio)
1815 - dev-qt/qtgui:5
1816 + $(add_qt_dep qtgui)
1817 libav? ( media-video/libav:= )
1818 !libav? ( media-video/ffmpeg:= )
1819 "
1820
1821 diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.49.9999.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.49.9999.ebuild
1822 index 7922773..430efb7 100644
1823 --- a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.49.9999.ebuild
1824 +++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.49.9999.ebuild
1825 @@ -12,7 +12,7 @@ IUSE="libav"
1826
1827 RDEPEND="
1828 $(add_frameworks_dep kio)
1829 - dev-qt/qtgui:5
1830 + $(add_qt_dep qtgui)
1831 libav? ( media-video/libav:= )
1832 !libav? ( media-video/ffmpeg:= )
1833 "
1834
1835 diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
1836 index 7922773..430efb7 100644
1837 --- a/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
1838 +++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
1839 @@ -12,7 +12,7 @@ IUSE="libav"
1840
1841 RDEPEND="
1842 $(add_frameworks_dep kio)
1843 - dev-qt/qtgui:5
1844 + $(add_qt_dep qtgui)
1845 libav? ( media-video/libav:= )
1846 !libav? ( media-video/ffmpeg:= )
1847 "
1848
1849 diff --git a/kde-apps/filelight/filelight-15.12.1.ebuild b/kde-apps/filelight/filelight-15.12.1.ebuild
1850 index d250021..670178e 100644
1851 --- a/kde-apps/filelight/filelight-15.12.1.ebuild
1852 +++ b/kde-apps/filelight/filelight-15.12.1.ebuild
1853 @@ -24,7 +24,7 @@ DEPEND="
1854 $(add_frameworks_dep kwidgetsaddons)
1855 $(add_frameworks_dep kxmlgui)
1856 $(add_frameworks_dep solid)
1857 - dev-qt/qtgui:5
1858 - dev-qt/qtwidgets:5
1859 + $(add_qt_dep qtgui)
1860 + $(add_qt_dep qtwidgets)
1861 "
1862 RDEPEND="${DEPEND}"
1863
1864 diff --git a/kde-apps/filelight/filelight-15.12.49.9999.ebuild b/kde-apps/filelight/filelight-15.12.49.9999.ebuild
1865 index a8295b3..5b5a7f1 100644
1866 --- a/kde-apps/filelight/filelight-15.12.49.9999.ebuild
1867 +++ b/kde-apps/filelight/filelight-15.12.49.9999.ebuild
1868 @@ -24,7 +24,7 @@ DEPEND="
1869 $(add_frameworks_dep kwidgetsaddons)
1870 $(add_frameworks_dep kxmlgui)
1871 $(add_frameworks_dep solid)
1872 - dev-qt/qtgui:5
1873 - dev-qt/qtwidgets:5
1874 + $(add_qt_dep qtgui)
1875 + $(add_qt_dep qtwidgets)
1876 "
1877 RDEPEND="${DEPEND}"
1878
1879 diff --git a/kde-apps/filelight/filelight-9999.ebuild b/kde-apps/filelight/filelight-9999.ebuild
1880 index a8295b3..5b5a7f1 100644
1881 --- a/kde-apps/filelight/filelight-9999.ebuild
1882 +++ b/kde-apps/filelight/filelight-9999.ebuild
1883 @@ -24,7 +24,7 @@ DEPEND="
1884 $(add_frameworks_dep kwidgetsaddons)
1885 $(add_frameworks_dep kxmlgui)
1886 $(add_frameworks_dep solid)
1887 - dev-qt/qtgui:5
1888 - dev-qt/qtwidgets:5
1889 + $(add_qt_dep qtgui)
1890 + $(add_qt_dep qtwidgets)
1891 "
1892 RDEPEND="${DEPEND}"
1893
1894 diff --git a/kde-apps/granatier/granatier-15.12.1.ebuild b/kde-apps/granatier/granatier-15.12.1.ebuild
1895 index 0d3cd48..80a3e55 100644
1896 --- a/kde-apps/granatier/granatier-15.12.1.ebuild
1897 +++ b/kde-apps/granatier/granatier-15.12.1.ebuild
1898 @@ -22,10 +22,10 @@ DEPEND="
1899 $(add_frameworks_dep kwidgetsaddons)
1900 $(add_frameworks_dep kxmlgui)
1901 $(add_kdeapps_dep libkdegames)
1902 - dev-qt/qtgui:5
1903 - dev-qt/qtsvg:5
1904 - dev-qt/qtwidgets:5
1905 - dev-qt/qtxml:5
1906 + $(add_qt_dep qtgui)
1907 + $(add_qt_dep qtsvg)
1908 + $(add_qt_dep qtwidgets)
1909 + $(add_qt_dep qtxml)
1910 "
1911
1912 RDEPEND="${DEPEND}"
1913
1914 diff --git a/kde-apps/granatier/granatier-15.12.49.9999.ebuild b/kde-apps/granatier/granatier-15.12.49.9999.ebuild
1915 index ebf9ba1..1a5e88c 100644
1916 --- a/kde-apps/granatier/granatier-15.12.49.9999.ebuild
1917 +++ b/kde-apps/granatier/granatier-15.12.49.9999.ebuild
1918 @@ -22,10 +22,10 @@ DEPEND="
1919 $(add_frameworks_dep kwidgetsaddons)
1920 $(add_frameworks_dep kxmlgui)
1921 $(add_kdeapps_dep libkdegames)
1922 - dev-qt/qtgui:5
1923 - dev-qt/qtsvg:5
1924 - dev-qt/qtwidgets:5
1925 - dev-qt/qtxml:5
1926 + $(add_qt_dep qtgui)
1927 + $(add_qt_dep qtsvg)
1928 + $(add_qt_dep qtwidgets)
1929 + $(add_qt_dep qtxml)
1930 "
1931
1932 RDEPEND="${DEPEND}"
1933
1934 diff --git a/kde-apps/granatier/granatier-9999.ebuild b/kde-apps/granatier/granatier-9999.ebuild
1935 index 5f3c507..0cf18e9 100644
1936 --- a/kde-apps/granatier/granatier-9999.ebuild
1937 +++ b/kde-apps/granatier/granatier-9999.ebuild
1938 @@ -23,10 +23,10 @@ DEPEND="
1939 $(add_frameworks_dep kwidgetsaddons)
1940 $(add_frameworks_dep kxmlgui)
1941 $(add_kdeapps_dep libkdegames)
1942 - dev-qt/qtgui:5
1943 - dev-qt/qtsvg:5
1944 - dev-qt/qtwidgets:5
1945 - dev-qt/qtxml:5
1946 + $(add_qt_dep qtgui)
1947 + $(add_qt_dep qtsvg)
1948 + $(add_qt_dep qtwidgets)
1949 + $(add_qt_dep qtxml)
1950 "
1951
1952 RDEPEND="${DEPEND}"
1953
1954 diff --git a/kde-apps/grantleetheme/grantleetheme-15.12.1.ebuild b/kde-apps/grantleetheme/grantleetheme-15.12.1.ebuild
1955 index a20105e..789a213 100644
1956 --- a/kde-apps/grantleetheme/grantleetheme-15.12.1.ebuild
1957 +++ b/kde-apps/grantleetheme/grantleetheme-15.12.1.ebuild
1958 @@ -21,11 +21,11 @@ COMMON_DEPEND="
1959 $(add_frameworks_dep kwidgetsaddons)
1960 $(add_frameworks_dep kxmlgui)
1961 dev-libs/grantlee:5
1962 - dev-qt/qtgui:5
1963 - dev-qt/qtwidgets:5
1964 + $(add_qt_dep qtgui)
1965 + $(add_qt_dep qtwidgets)
1966 "
1967 DEPEND="${COMMON_DEPEND}
1968 - dev-qt/qtnetwork:5
1969 + $(add_qt_dep qtnetwork)
1970 sys-devel/gettext
1971 "
1972 RDEPEND="${COMMON_DEPEND}
1973
1974 diff --git a/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild b/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild
1975 index b96d1f1..9d6b0e4 100644
1976 --- a/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild
1977 +++ b/kde-apps/grantleetheme/grantleetheme-15.12.49.9999.ebuild
1978 @@ -21,11 +21,11 @@ COMMON_DEPEND="
1979 $(add_frameworks_dep kwidgetsaddons)
1980 $(add_frameworks_dep kxmlgui)
1981 dev-libs/grantlee:5
1982 - dev-qt/qtgui:5
1983 - dev-qt/qtwidgets:5
1984 + $(add_qt_dep qtgui)
1985 + $(add_qt_dep qtwidgets)
1986 "
1987 DEPEND="${COMMON_DEPEND}
1988 - dev-qt/qtnetwork:5
1989 + $(add_qt_dep qtnetwork)
1990 sys-devel/gettext
1991 "
1992 RDEPEND="${COMMON_DEPEND}
1993
1994 diff --git a/kde-apps/grantleetheme/grantleetheme-9999.ebuild b/kde-apps/grantleetheme/grantleetheme-9999.ebuild
1995 index 2aff5ae..9b42567 100644
1996 --- a/kde-apps/grantleetheme/grantleetheme-9999.ebuild
1997 +++ b/kde-apps/grantleetheme/grantleetheme-9999.ebuild
1998 @@ -20,11 +20,11 @@ COMMON_DEPEND="
1999 $(add_frameworks_dep kwidgetsaddons)
2000 $(add_frameworks_dep kxmlgui)
2001 dev-libs/grantlee:5
2002 - dev-qt/qtgui:5
2003 - dev-qt/qtwidgets:5
2004 + $(add_qt_dep qtgui)
2005 + $(add_qt_dep qtwidgets)
2006 "
2007 DEPEND="${COMMON_DEPEND}
2008 - dev-qt/qtnetwork:5
2009 + $(add_qt_dep qtnetwork)
2010 sys-devel/gettext
2011 "
2012 RDEPEND="${COMMON_DEPEND}
2013
2014 diff --git a/kde-apps/gwenview/gwenview-15.12.1.ebuild b/kde-apps/gwenview/gwenview-15.12.1.ebuild
2015 index 3e9b61e..6d0a085 100644
2016 --- a/kde-apps/gwenview/gwenview-15.12.1.ebuild
2017 +++ b/kde-apps/gwenview/gwenview-15.12.1.ebuild
2018 @@ -38,11 +38,11 @@ COMMON_DEPEND="
2019 $(add_frameworks_dep ktextwidgets)
2020 $(add_frameworks_dep kwidgetsaddons)
2021 $(add_frameworks_dep kxmlgui)
2022 - dev-qt/qtgui:5
2023 - dev-qt/qtopengl:5
2024 - dev-qt/qtprintsupport:5
2025 - dev-qt/qtsvg:5
2026 - dev-qt/qtwidgets:5
2027 + $(add_qt_dep qtgui)
2028 + $(add_qt_dep qtopengl)
2029 + $(add_qt_dep qtprintsupport)
2030 + $(add_qt_dep qtsvg)
2031 + $(add_qt_dep qtwidgets)
2032 media-gfx/exiv2:=
2033 media-libs/lcms:2
2034 media-libs/libpng:0=
2035 @@ -55,16 +55,16 @@ COMMON_DEPEND="
2036 $(add_frameworks_dep kfilemetadata)
2037 )
2038 X? (
2039 - dev-qt/qtx11extras:5
2040 + $(add_qt_dep qtx11extras)
2041 x11-libs/libX11
2042 )
2043 "
2044 DEPEND="${COMMON_DEPEND}
2045 - dev-qt/qtconcurrent:5
2046 + $(add_qt_dep qtconcurrent)
2047 "
2048 RDEPEND="${COMMON_DEPEND}
2049 $(add_frameworks_dep kimageformats)
2050 - dev-qt/qtimageformats:5
2051 + $(add_qt_dep qtimageformats)
2052 "
2053
2054 src_configure() {
2055
2056 diff --git a/kde-apps/gwenview/gwenview-15.12.49.9999.ebuild b/kde-apps/gwenview/gwenview-15.12.49.9999.ebuild
2057 index 23d2a33..07e072e 100644
2058 --- a/kde-apps/gwenview/gwenview-15.12.49.9999.ebuild
2059 +++ b/kde-apps/gwenview/gwenview-15.12.49.9999.ebuild
2060 @@ -38,11 +38,11 @@ COMMON_DEPEND="
2061 $(add_frameworks_dep ktextwidgets)
2062 $(add_frameworks_dep kwidgetsaddons)
2063 $(add_frameworks_dep kxmlgui)
2064 - dev-qt/qtgui:5
2065 - dev-qt/qtopengl:5
2066 - dev-qt/qtprintsupport:5
2067 - dev-qt/qtsvg:5
2068 - dev-qt/qtwidgets:5
2069 + $(add_qt_dep qtgui)
2070 + $(add_qt_dep qtopengl)
2071 + $(add_qt_dep qtprintsupport)
2072 + $(add_qt_dep qtsvg)
2073 + $(add_qt_dep qtwidgets)
2074 media-gfx/exiv2:=
2075 media-libs/lcms:2
2076 media-libs/libpng:0=
2077 @@ -55,16 +55,16 @@ COMMON_DEPEND="
2078 $(add_frameworks_dep kfilemetadata)
2079 )
2080 X? (
2081 - dev-qt/qtx11extras:5
2082 + $(add_qt_dep qtx11extras)
2083 x11-libs/libX11
2084 )
2085 "
2086 DEPEND="${COMMON_DEPEND}
2087 - dev-qt/qtconcurrent:5
2088 + $(add_qt_dep qtconcurrent)
2089 "
2090 RDEPEND="${COMMON_DEPEND}
2091 $(add_frameworks_dep kimageformats)
2092 - dev-qt/qtimageformats:5
2093 + $(add_qt_dep qtimageformats)
2094 "
2095
2096 src_configure() {
2097
2098 diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
2099 index 23d2a33..07e072e 100644
2100 --- a/kde-apps/gwenview/gwenview-9999.ebuild
2101 +++ b/kde-apps/gwenview/gwenview-9999.ebuild
2102 @@ -38,11 +38,11 @@ COMMON_DEPEND="
2103 $(add_frameworks_dep ktextwidgets)
2104 $(add_frameworks_dep kwidgetsaddons)
2105 $(add_frameworks_dep kxmlgui)
2106 - dev-qt/qtgui:5
2107 - dev-qt/qtopengl:5
2108 - dev-qt/qtprintsupport:5
2109 - dev-qt/qtsvg:5
2110 - dev-qt/qtwidgets:5
2111 + $(add_qt_dep qtgui)
2112 + $(add_qt_dep qtopengl)
2113 + $(add_qt_dep qtprintsupport)
2114 + $(add_qt_dep qtsvg)
2115 + $(add_qt_dep qtwidgets)
2116 media-gfx/exiv2:=
2117 media-libs/lcms:2
2118 media-libs/libpng:0=
2119 @@ -55,16 +55,16 @@ COMMON_DEPEND="
2120 $(add_frameworks_dep kfilemetadata)
2121 )
2122 X? (
2123 - dev-qt/qtx11extras:5
2124 + $(add_qt_dep qtx11extras)
2125 x11-libs/libX11
2126 )
2127 "
2128 DEPEND="${COMMON_DEPEND}
2129 - dev-qt/qtconcurrent:5
2130 + $(add_qt_dep qtconcurrent)
2131 "
2132 RDEPEND="${COMMON_DEPEND}
2133 $(add_frameworks_dep kimageformats)
2134 - dev-qt/qtimageformats:5
2135 + $(add_qt_dep qtimageformats)
2136 "
2137
2138 src_configure() {
2139
2140 diff --git a/kde-apps/incidenceeditor/incidenceeditor-15.12.1.ebuild b/kde-apps/incidenceeditor/incidenceeditor-15.12.1.ebuild
2141 index d52dd51..e71a56d 100644
2142 --- a/kde-apps/incidenceeditor/incidenceeditor-15.12.1.ebuild
2143 +++ b/kde-apps/incidenceeditor/incidenceeditor-15.12.1.ebuild
2144 @@ -46,11 +46,11 @@ COMMON_DEPEND="
2145 $(add_kdeapps_dep libakonadi)
2146 $(add_kdeapps_dep libkdepim)
2147 $(add_kdeapps_dep libkdepimdbusinterfaces)
2148 - dev-qt/designer:5
2149 - dev-qt/qtdbus:5
2150 - dev-qt/qtgui:5
2151 - dev-qt/qtwebkit:5
2152 - dev-qt/qtwidgets:5
2153 + $(add_qt_dep designer)
2154 + $(add_qt_dep qtdbus)
2155 + $(add_qt_dep qtgui)
2156 + $(add_qt_dep qtwebkit)
2157 + $(add_qt_dep qtwidgets)
2158 "
2159 DEPEND="${COMMON_DEPEND}
2160 sys-devel/gettext
2161
2162 diff --git a/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild
2163 index d33197f..03b6f46 100644
2164 --- a/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild
2165 +++ b/kde-apps/incidenceeditor/incidenceeditor-15.12.49.9999.ebuild
2166 @@ -46,11 +46,11 @@ COMMON_DEPEND="
2167 $(add_kdeapps_dep libakonadi)
2168 $(add_kdeapps_dep libkdepim)
2169 $(add_kdeapps_dep libkdepimdbusinterfaces)
2170 - dev-qt/designer:5
2171 - dev-qt/qtdbus:5
2172 - dev-qt/qtgui:5
2173 - dev-qt/qtwebkit:5
2174 - dev-qt/qtwidgets:5
2175 + $(add_qt_dep designer)
2176 + $(add_qt_dep qtdbus)
2177 + $(add_qt_dep qtgui)
2178 + $(add_qt_dep qtwebkit)
2179 + $(add_qt_dep qtwidgets)
2180 "
2181 DEPEND="${COMMON_DEPEND}
2182 sys-devel/gettext
2183
2184 diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
2185 index 8a0dd58..eb0e927 100644
2186 --- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
2187 +++ b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
2188 @@ -44,11 +44,11 @@ COMMON_DEPEND="
2189 $(add_kdeapps_dep kmailtransport)
2190 $(add_kdeapps_dep kmime)
2191 $(add_kdeapps_dep libkdepim)
2192 - dev-qt/designer:5
2193 - dev-qt/qtdbus:5
2194 - dev-qt/qtgui:5
2195 - dev-qt/qtwebkit:5
2196 - dev-qt/qtwidgets:5
2197 + $(add_qt_dep designer)
2198 + $(add_qt_dep qtdbus)
2199 + $(add_qt_dep qtgui)
2200 + $(add_qt_dep qtwebkit)
2201 + $(add_qt_dep qtwidgets)
2202 "
2203 DEPEND="${COMMON_DEPEND}
2204 sys-devel/gettext
2205
2206 diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-15.12.1.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-15.12.1.ebuild
2207 index 95fb009..5deb371 100644
2208 --- a/kde-apps/kaccounts-integration/kaccounts-integration-15.12.1.ebuild
2209 +++ b/kde-apps/kaccounts-integration/kaccounts-integration-15.12.1.ebuild
2210 @@ -21,10 +21,10 @@ COMMON_DEPEND="
2211 $(add_frameworks_dep kdbusaddons)
2212 $(add_frameworks_dep kdeclarative)
2213 $(add_frameworks_dep ki18n)
2214 - dev-qt/qtdbus:5
2215 - dev-qt/qtdeclarative:5
2216 - dev-qt/qtgui:5
2217 - dev-qt/qtwidgets:5
2218 + $(add_qt_dep qtdbus)
2219 + $(add_qt_dep qtdeclarative)
2220 + $(add_qt_dep qtgui)
2221 + $(add_qt_dep qtwidgets)
2222 net-libs/accounts-qt
2223 net-libs/signond
2224 "
2225
2226 diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-15.12.49.9999.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-15.12.49.9999.ebuild
2227 index b38d03b..c76a3c4 100644
2228 --- a/kde-apps/kaccounts-integration/kaccounts-integration-15.12.49.9999.ebuild
2229 +++ b/kde-apps/kaccounts-integration/kaccounts-integration-15.12.49.9999.ebuild
2230 @@ -21,10 +21,10 @@ COMMON_DEPEND="
2231 $(add_frameworks_dep kdbusaddons)
2232 $(add_frameworks_dep kdeclarative)
2233 $(add_frameworks_dep ki18n)
2234 - dev-qt/qtdbus:5
2235 - dev-qt/qtdeclarative:5
2236 - dev-qt/qtgui:5
2237 - dev-qt/qtwidgets:5
2238 + $(add_qt_dep qtdbus)
2239 + $(add_qt_dep qtdeclarative)
2240 + $(add_qt_dep qtgui)
2241 + $(add_qt_dep qtwidgets)
2242 net-libs/accounts-qt
2243 net-libs/signond
2244 "
2245
2246 diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
2247 index b38d03b..c76a3c4 100644
2248 --- a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
2249 +++ b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
2250 @@ -21,10 +21,10 @@ COMMON_DEPEND="
2251 $(add_frameworks_dep kdbusaddons)
2252 $(add_frameworks_dep kdeclarative)
2253 $(add_frameworks_dep ki18n)
2254 - dev-qt/qtdbus:5
2255 - dev-qt/qtdeclarative:5
2256 - dev-qt/qtgui:5
2257 - dev-qt/qtwidgets:5
2258 + $(add_qt_dep qtdbus)
2259 + $(add_qt_dep qtdeclarative)
2260 + $(add_qt_dep qtgui)
2261 + $(add_qt_dep qtwidgets)
2262 net-libs/accounts-qt
2263 net-libs/signond
2264 "
2265
2266 diff --git a/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild b/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
2267 index 979a494..cf19a25 100644
2268 --- a/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
2269 +++ b/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
2270 @@ -19,14 +19,14 @@ COMMON_DEPEND="
2271 $(add_frameworks_dep ki18n)
2272 $(add_frameworks_dep kio)
2273 $(add_kdeapps_dep kcontacts)
2274 - dev-qt/qtdeclarative:5
2275 - dev-qt/qtgui:5
2276 - dev-qt/qtnetwork:5
2277 - dev-qt/qtxml:5
2278 + $(add_qt_dep qtdeclarative)
2279 + $(add_qt_dep qtgui)
2280 + $(add_qt_dep qtnetwork)
2281 + $(add_qt_dep qtxml)
2282 net-libs/accounts-qt
2283 net-libs/signond
2284 google? (
2285 - dev-qt/qtwebkit:5
2286 + $(add_qt_dep qtwebkit)
2287 net-libs/libkgapi:5
2288 )
2289 "
2290
2291 diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-15.12.1.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-15.12.1.ebuild
2292 index 5f8c2a2..f02238d 100644
2293 --- a/kde-apps/kaccounts-providers/kaccounts-providers-15.12.1.ebuild
2294 +++ b/kde-apps/kaccounts-providers/kaccounts-providers-15.12.1.ebuild
2295 @@ -20,9 +20,9 @@ COMMON_DEPEND="
2296 $(add_frameworks_dep kio)
2297 $(add_frameworks_dep kpackage)
2298 $(add_kdeapps_dep kaccounts-integration)
2299 - dev-qt/qtdeclarative:5
2300 - dev-qt/qtgui:5
2301 - dev-qt/qtxml:5
2302 + $(add_qt_dep qtdeclarative)
2303 + $(add_qt_dep qtgui)
2304 + $(add_qt_dep qtxml)
2305 "
2306 DEPEND="${COMMON_DEPEND}
2307 dev-util/intltool
2308
2309 diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-15.12.49.9999.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-15.12.49.9999.ebuild
2310 index 871a023..68b3afb 100644
2311 --- a/kde-apps/kaccounts-providers/kaccounts-providers-15.12.49.9999.ebuild
2312 +++ b/kde-apps/kaccounts-providers/kaccounts-providers-15.12.49.9999.ebuild
2313 @@ -20,9 +20,9 @@ COMMON_DEPEND="
2314 $(add_frameworks_dep kio)
2315 $(add_frameworks_dep kpackage)
2316 $(add_kdeapps_dep kaccounts-integration)
2317 - dev-qt/qtdeclarative:5
2318 - dev-qt/qtgui:5
2319 - dev-qt/qtxml:5
2320 + $(add_qt_dep qtdeclarative)
2321 + $(add_qt_dep qtgui)
2322 + $(add_qt_dep qtxml)
2323 "
2324 DEPEND="${COMMON_DEPEND}
2325 dev-util/intltool
2326
2327 diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild
2328 index 871a023..68b3afb 100644
2329 --- a/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild
2330 +++ b/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild
2331 @@ -20,9 +20,9 @@ COMMON_DEPEND="
2332 $(add_frameworks_dep kio)
2333 $(add_frameworks_dep kpackage)
2334 $(add_kdeapps_dep kaccounts-integration)
2335 - dev-qt/qtdeclarative:5
2336 - dev-qt/qtgui:5
2337 - dev-qt/qtxml:5
2338 + $(add_qt_dep qtdeclarative)
2339 + $(add_qt_dep qtgui)
2340 + $(add_qt_dep qtxml)
2341 "
2342 DEPEND="${COMMON_DEPEND}
2343 dev-util/intltool
2344
2345 diff --git a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.1.ebuild b/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.1.ebuild
2346 index 0ff9806..4136ff0 100644
2347 --- a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.1.ebuild
2348 +++ b/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.1.ebuild
2349 @@ -27,9 +27,9 @@ COMMON_DEPEND="
2350 $(add_kdeapps_dep libakonadi)
2351 $(add_kdeapps_dep libkleo)
2352 dev-libs/grantlee:5
2353 - dev-qt/designer:5
2354 - dev-qt/qtgui:5
2355 - dev-qt/qtwidgets:5
2356 + $(add_qt_dep designer)
2357 + $(add_qt_dep qtgui)
2358 + $(add_qt_dep qtwidgets)
2359 prison? ( media-libs/prison:5 )
2360 "
2361 DEPEND="${COMMON_DEPEND}
2362
2363 diff --git a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild b/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild
2364 index f6b9110..1a438b0 100644
2365 --- a/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild
2366 +++ b/kde-apps/kaddressbookgrantlee/kaddressbookgrantlee-15.12.49.9999.ebuild
2367 @@ -27,9 +27,9 @@ COMMON_DEPEND="
2368 $(add_kdeapps_dep libakonadi)
2369 $(add_kdeapps_dep libkleo)
2370 dev-libs/grantlee:5
2371 - dev-qt/designer:5
2372 - dev-qt/qtgui:5
2373 - dev-qt/qtwidgets:5
2374 + $(add_qt_dep designer)
2375 + $(add_qt_dep qtgui)
2376 + $(add_qt_dep qtwidgets)
2377 prison? ( media-libs/prison:5 )
2378 "
2379 DEPEND="${COMMON_DEPEND}
2380
2381 diff --git a/kde-apps/kalarmcal/kalarmcal-15.12.1.ebuild b/kde-apps/kalarmcal/kalarmcal-15.12.1.ebuild
2382 index b7136ca..bf1ace3 100644
2383 --- a/kde-apps/kalarmcal/kalarmcal-15.12.1.ebuild
2384 +++ b/kde-apps/kalarmcal/kalarmcal-15.12.1.ebuild
2385 @@ -17,7 +17,7 @@ RDEPEND="
2386 $(add_kdeapps_dep kholidays)
2387 $(add_kdeapps_dep kidentitymanagement)
2388 $(add_kdeapps_dep libakonadi)
2389 - dev-qt/qtgui:5
2390 + $(add_qt_dep qtgui)
2391 "
2392 DEPEND="${RDEPEND}
2393 sys-devel/gettext
2394
2395 diff --git a/kde-apps/kalarmcal/kalarmcal-15.12.49.9999.ebuild b/kde-apps/kalarmcal/kalarmcal-15.12.49.9999.ebuild
2396 index 0bdba9a..6b0d3fc 100644
2397 --- a/kde-apps/kalarmcal/kalarmcal-15.12.49.9999.ebuild
2398 +++ b/kde-apps/kalarmcal/kalarmcal-15.12.49.9999.ebuild
2399 @@ -17,7 +17,7 @@ RDEPEND="
2400 $(add_kdeapps_dep kholidays)
2401 $(add_kdeapps_dep kidentitymanagement)
2402 $(add_kdeapps_dep libakonadi)
2403 - dev-qt/qtgui:5
2404 + $(add_qt_dep qtgui)
2405 "
2406 DEPEND="${RDEPEND}
2407 sys-devel/gettext
2408
2409 diff --git a/kde-apps/kalarmcal/kalarmcal-9999.ebuild b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
2410 index fb95a94..41d9f54 100644
2411 --- a/kde-apps/kalarmcal/kalarmcal-9999.ebuild
2412 +++ b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
2413 @@ -17,7 +17,7 @@ RDEPEND="
2414 $(add_kdeapps_dep kcalcore)
2415 $(add_kdeapps_dep kholidays)
2416 $(add_kdeapps_dep kidentitymanagement)
2417 - dev-qt/qtgui:5
2418 + $(add_qt_dep qtgui)
2419 "
2420 DEPEND="${RDEPEND}
2421 sys-devel/gettext
2422
2423 diff --git a/kde-apps/kalgebra/kalgebra-15.08.3.ebuild b/kde-apps/kalgebra/kalgebra-15.08.3.ebuild
2424 index 4ca7c70..415be3f 100644
2425 --- a/kde-apps/kalgebra/kalgebra-15.08.3.ebuild
2426 +++ b/kde-apps/kalgebra/kalgebra-15.08.3.ebuild
2427 @@ -22,13 +22,13 @@ DEPEND="
2428 $(add_frameworks_dep kwidgetsaddons)
2429 $(add_frameworks_dep kxmlgui)
2430 $(add_kdeapps_dep analitza opengl?)
2431 - dev-qt/qtdeclarative:5
2432 - dev-qt/qtgui:5
2433 - dev-qt/qtwebkit:5
2434 - dev-qt/qtwidgets:5
2435 + $(add_qt_dep qtdeclarative)
2436 + $(add_qt_dep qtgui)
2437 + $(add_qt_dep qtwebkit)
2438 + $(add_qt_dep qtwidgets)
2439 opengl? (
2440 - dev-qt/qtopengl:5
2441 - dev-qt/qtprintsupport:5
2442 + $(add_qt_dep qtopengl)
2443 + $(add_qt_dep qtprintsupport)
2444 virtual/glu
2445 )
2446 readline? ( sys-libs/readline:0= )
2447
2448 diff --git a/kde-apps/kalgebra/kalgebra-15.12.1.ebuild b/kde-apps/kalgebra/kalgebra-15.12.1.ebuild
2449 index 4ca7c70..415be3f 100644
2450 --- a/kde-apps/kalgebra/kalgebra-15.12.1.ebuild
2451 +++ b/kde-apps/kalgebra/kalgebra-15.12.1.ebuild
2452 @@ -22,13 +22,13 @@ DEPEND="
2453 $(add_frameworks_dep kwidgetsaddons)
2454 $(add_frameworks_dep kxmlgui)
2455 $(add_kdeapps_dep analitza opengl?)
2456 - dev-qt/qtdeclarative:5
2457 - dev-qt/qtgui:5
2458 - dev-qt/qtwebkit:5
2459 - dev-qt/qtwidgets:5
2460 + $(add_qt_dep qtdeclarative)
2461 + $(add_qt_dep qtgui)
2462 + $(add_qt_dep qtwebkit)
2463 + $(add_qt_dep qtwidgets)
2464 opengl? (
2465 - dev-qt/qtopengl:5
2466 - dev-qt/qtprintsupport:5
2467 + $(add_qt_dep qtopengl)
2468 + $(add_qt_dep qtprintsupport)
2469 virtual/glu
2470 )
2471 readline? ( sys-libs/readline:0= )
2472
2473 diff --git a/kde-apps/kalgebra/kalgebra-15.12.49.9999.ebuild b/kde-apps/kalgebra/kalgebra-15.12.49.9999.ebuild
2474 index e9aac4e..33edf81 100644
2475 --- a/kde-apps/kalgebra/kalgebra-15.12.49.9999.ebuild
2476 +++ b/kde-apps/kalgebra/kalgebra-15.12.49.9999.ebuild
2477 @@ -22,13 +22,13 @@ DEPEND="
2478 $(add_frameworks_dep kwidgetsaddons)
2479 $(add_frameworks_dep kxmlgui)
2480 $(add_kdeapps_dep analitza opengl?)
2481 - dev-qt/qtdeclarative:5
2482 - dev-qt/qtgui:5
2483 - dev-qt/qtwebkit:5
2484 - dev-qt/qtwidgets:5
2485 + $(add_qt_dep qtdeclarative)
2486 + $(add_qt_dep qtgui)
2487 + $(add_qt_dep qtwebkit)
2488 + $(add_qt_dep qtwidgets)
2489 opengl? (
2490 - dev-qt/qtopengl:5
2491 - dev-qt/qtprintsupport:5
2492 + $(add_qt_dep qtopengl)
2493 + $(add_qt_dep qtprintsupport)
2494 virtual/glu
2495 )
2496 readline? ( sys-libs/readline:0= )
2497
2498 diff --git a/kde-apps/kalgebra/kalgebra-9999.ebuild b/kde-apps/kalgebra/kalgebra-9999.ebuild
2499 index e9aac4e..33edf81 100644
2500 --- a/kde-apps/kalgebra/kalgebra-9999.ebuild
2501 +++ b/kde-apps/kalgebra/kalgebra-9999.ebuild
2502 @@ -22,13 +22,13 @@ DEPEND="
2503 $(add_frameworks_dep kwidgetsaddons)
2504 $(add_frameworks_dep kxmlgui)
2505 $(add_kdeapps_dep analitza opengl?)
2506 - dev-qt/qtdeclarative:5
2507 - dev-qt/qtgui:5
2508 - dev-qt/qtwebkit:5
2509 - dev-qt/qtwidgets:5
2510 + $(add_qt_dep qtdeclarative)
2511 + $(add_qt_dep qtgui)
2512 + $(add_qt_dep qtwebkit)
2513 + $(add_qt_dep qtwidgets)
2514 opengl? (
2515 - dev-qt/qtopengl:5
2516 - dev-qt/qtprintsupport:5
2517 + $(add_qt_dep qtopengl)
2518 + $(add_qt_dep qtprintsupport)
2519 virtual/glu
2520 )
2521 readline? ( sys-libs/readline:0= )
2522
2523 diff --git a/kde-apps/kamera/kamera-15.12.1.ebuild b/kde-apps/kamera/kamera-15.12.1.ebuild
2524 index 0f7304e..86ea363 100644
2525 --- a/kde-apps/kamera/kamera-15.12.1.ebuild
2526 +++ b/kde-apps/kamera/kamera-15.12.1.ebuild
2527 @@ -19,8 +19,8 @@ COMMON_DEPEND="
2528 $(add_frameworks_dep ki18n)
2529 $(add_frameworks_dep kio)
2530 $(add_frameworks_dep kwidgetsaddons)
2531 - dev-qt/qtgui:5
2532 - dev-qt/qtwidgets:5
2533 + $(add_qt_dep qtgui)
2534 + $(add_qt_dep qtwidgets)
2535 media-libs/libgphoto2:=
2536 "
2537 DEPEND="${COMMON_DEPEND}
2538
2539 diff --git a/kde-apps/kamera/kamera-15.12.49.9999.ebuild b/kde-apps/kamera/kamera-15.12.49.9999.ebuild
2540 index 96056f0..aa1b4ca 100644
2541 --- a/kde-apps/kamera/kamera-15.12.49.9999.ebuild
2542 +++ b/kde-apps/kamera/kamera-15.12.49.9999.ebuild
2543 @@ -19,8 +19,8 @@ COMMON_DEPEND="
2544 $(add_frameworks_dep ki18n)
2545 $(add_frameworks_dep kio)
2546 $(add_frameworks_dep kwidgetsaddons)
2547 - dev-qt/qtgui:5
2548 - dev-qt/qtwidgets:5
2549 + $(add_qt_dep qtgui)
2550 + $(add_qt_dep qtwidgets)
2551 media-libs/libgphoto2:=
2552 "
2553 DEPEND="${COMMON_DEPEND}
2554
2555 diff --git a/kde-apps/kamera/kamera-9999.ebuild b/kde-apps/kamera/kamera-9999.ebuild
2556 index 96056f0..aa1b4ca 100644
2557 --- a/kde-apps/kamera/kamera-9999.ebuild
2558 +++ b/kde-apps/kamera/kamera-9999.ebuild
2559 @@ -19,8 +19,8 @@ COMMON_DEPEND="
2560 $(add_frameworks_dep ki18n)
2561 $(add_frameworks_dep kio)
2562 $(add_frameworks_dep kwidgetsaddons)
2563 - dev-qt/qtgui:5
2564 - dev-qt/qtwidgets:5
2565 + $(add_qt_dep qtgui)
2566 + $(add_qt_dep qtwidgets)
2567 media-libs/libgphoto2:=
2568 "
2569 DEPEND="${COMMON_DEPEND}
2570
2571 diff --git a/kde-apps/kanagram/kanagram-15.08.3.ebuild b/kde-apps/kanagram/kanagram-15.08.3.ebuild
2572 index 93e0003..cc7f325 100644
2573 --- a/kde-apps/kanagram/kanagram-15.08.3.ebuild
2574 +++ b/kde-apps/kanagram/kanagram-15.08.3.ebuild
2575 @@ -25,13 +25,13 @@ DEPEND="
2576 $(add_frameworks_dep kxmlgui)
2577 $(add_frameworks_dep sonnet)
2578 $(add_kdeapps_dep libkeduvocdocument)
2579 - dev-qt/qtdeclarative:5
2580 - dev-qt/qtgui:5
2581 - dev-qt/qtwidgets:5
2582 + $(add_qt_dep qtdeclarative)
2583 + $(add_qt_dep qtgui)
2584 + $(add_qt_dep qtwidgets)
2585 media-libs/phonon[qt5]
2586 "
2587 RDEPEND="${DEPEND}
2588 $(add_kdeapps_dep kdeedu-data)
2589 - dev-qt/qtquickcontrols:5
2590 - dev-qt/qtwebkit:5[qml]
2591 + $(add_qt_dep qtquickcontrols)
2592 + $(add_qt_dep qtwebkit 'qml')
2593 "
2594
2595 diff --git a/kde-apps/kanagram/kanagram-15.12.1.ebuild b/kde-apps/kanagram/kanagram-15.12.1.ebuild
2596 index 93e0003..cc7f325 100644
2597 --- a/kde-apps/kanagram/kanagram-15.12.1.ebuild
2598 +++ b/kde-apps/kanagram/kanagram-15.12.1.ebuild
2599 @@ -25,13 +25,13 @@ DEPEND="
2600 $(add_frameworks_dep kxmlgui)
2601 $(add_frameworks_dep sonnet)
2602 $(add_kdeapps_dep libkeduvocdocument)
2603 - dev-qt/qtdeclarative:5
2604 - dev-qt/qtgui:5
2605 - dev-qt/qtwidgets:5
2606 + $(add_qt_dep qtdeclarative)
2607 + $(add_qt_dep qtgui)
2608 + $(add_qt_dep qtwidgets)
2609 media-libs/phonon[qt5]
2610 "
2611 RDEPEND="${DEPEND}
2612 $(add_kdeapps_dep kdeedu-data)
2613 - dev-qt/qtquickcontrols:5
2614 - dev-qt/qtwebkit:5[qml]
2615 + $(add_qt_dep qtquickcontrols)
2616 + $(add_qt_dep qtwebkit 'qml')
2617 "
2618
2619 diff --git a/kde-apps/kanagram/kanagram-15.12.49.9999.ebuild b/kde-apps/kanagram/kanagram-15.12.49.9999.ebuild
2620 index 628f4d1..1a1424e 100644
2621 --- a/kde-apps/kanagram/kanagram-15.12.49.9999.ebuild
2622 +++ b/kde-apps/kanagram/kanagram-15.12.49.9999.ebuild
2623 @@ -25,13 +25,13 @@ DEPEND="
2624 $(add_frameworks_dep kxmlgui)
2625 $(add_frameworks_dep sonnet)
2626 $(add_kdeapps_dep libkeduvocdocument)
2627 - dev-qt/qtdeclarative:5
2628 - dev-qt/qtgui:5
2629 - dev-qt/qtwidgets:5
2630 + $(add_qt_dep qtdeclarative)
2631 + $(add_qt_dep qtgui)
2632 + $(add_qt_dep qtwidgets)
2633 media-libs/phonon[qt5]
2634 "
2635 RDEPEND="${DEPEND}
2636 $(add_kdeapps_dep kdeedu-data)
2637 - dev-qt/qtquickcontrols:5
2638 - dev-qt/qtwebkit:5[qml]
2639 + $(add_qt_dep qtquickcontrols)
2640 + $(add_qt_dep qtwebkit 'qml')
2641 "
2642
2643 diff --git a/kde-apps/kanagram/kanagram-9999.ebuild b/kde-apps/kanagram/kanagram-9999.ebuild
2644 index 628f4d1..1a1424e 100644
2645 --- a/kde-apps/kanagram/kanagram-9999.ebuild
2646 +++ b/kde-apps/kanagram/kanagram-9999.ebuild
2647 @@ -25,13 +25,13 @@ DEPEND="
2648 $(add_frameworks_dep kxmlgui)
2649 $(add_frameworks_dep sonnet)
2650 $(add_kdeapps_dep libkeduvocdocument)
2651 - dev-qt/qtdeclarative:5
2652 - dev-qt/qtgui:5
2653 - dev-qt/qtwidgets:5
2654 + $(add_qt_dep qtdeclarative)
2655 + $(add_qt_dep qtgui)
2656 + $(add_qt_dep qtwidgets)
2657 media-libs/phonon[qt5]
2658 "
2659 RDEPEND="${DEPEND}
2660 $(add_kdeapps_dep kdeedu-data)
2661 - dev-qt/qtquickcontrols:5
2662 - dev-qt/qtwebkit:5[qml]
2663 + $(add_qt_dep qtquickcontrols)
2664 + $(add_qt_dep qtwebkit 'qml')
2665 "
2666
2667 diff --git a/kde-apps/kapman/kapman-15.12.1.ebuild b/kde-apps/kapman/kapman-15.12.1.ebuild
2668 index dd343af..344afb7 100644
2669 --- a/kde-apps/kapman/kapman-15.12.1.ebuild
2670 +++ b/kde-apps/kapman/kapman-15.12.1.ebuild
2671 @@ -21,9 +21,9 @@ DEPEND="
2672 $(add_frameworks_dep kwidgetsaddons)
2673 $(add_frameworks_dep kxmlgui)
2674 $(add_kdeapps_dep libkdegames)
2675 - dev-qt/qtgui:5
2676 - dev-qt/qtsvg:5
2677 - dev-qt/qtwidgets:5
2678 - dev-qt/qtxml:5
2679 + $(add_qt_dep qtgui)
2680 + $(add_qt_dep qtsvg)
2681 + $(add_qt_dep qtwidgets)
2682 + $(add_qt_dep qtxml)
2683 "
2684 RDEPEND="${DEPEND}"
2685
2686 diff --git a/kde-apps/kapman/kapman-15.12.49.9999.ebuild b/kde-apps/kapman/kapman-15.12.49.9999.ebuild
2687 index c354f95..fd8a5c2 100644
2688 --- a/kde-apps/kapman/kapman-15.12.49.9999.ebuild
2689 +++ b/kde-apps/kapman/kapman-15.12.49.9999.ebuild
2690 @@ -21,9 +21,9 @@ DEPEND="
2691 $(add_frameworks_dep kwidgetsaddons)
2692 $(add_frameworks_dep kxmlgui)
2693 $(add_kdeapps_dep libkdegames)
2694 - dev-qt/qtgui:5
2695 - dev-qt/qtsvg:5
2696 - dev-qt/qtwidgets:5
2697 - dev-qt/qtxml:5
2698 + $(add_qt_dep qtgui)
2699 + $(add_qt_dep qtsvg)
2700 + $(add_qt_dep qtwidgets)
2701 + $(add_qt_dep qtxml)
2702 "
2703 RDEPEND="${DEPEND}"
2704
2705 diff --git a/kde-apps/kapman/kapman-9999.ebuild b/kde-apps/kapman/kapman-9999.ebuild
2706 index fb1cb33..7f380ed 100644
2707 --- a/kde-apps/kapman/kapman-9999.ebuild
2708 +++ b/kde-apps/kapman/kapman-9999.ebuild
2709 @@ -22,9 +22,9 @@ DEPEND="
2710 $(add_frameworks_dep kwidgetsaddons)
2711 $(add_frameworks_dep kxmlgui)
2712 $(add_kdeapps_dep libkdegames)
2713 - dev-qt/qtgui:5
2714 - dev-qt/qtsvg:5
2715 - dev-qt/qtwidgets:5
2716 - dev-qt/qtxml:5
2717 + $(add_qt_dep qtgui)
2718 + $(add_qt_dep qtsvg)
2719 + $(add_qt_dep qtwidgets)
2720 + $(add_qt_dep qtxml)
2721 "
2722 RDEPEND="${DEPEND}"
2723
2724 diff --git a/kde-apps/kapptemplate/kapptemplate-15.12.1.ebuild b/kde-apps/kapptemplate/kapptemplate-15.12.1.ebuild
2725 index 2430840..7bc5c1c 100644
2726 --- a/kde-apps/kapptemplate/kapptemplate-15.12.1.ebuild
2727 +++ b/kde-apps/kapptemplate/kapptemplate-15.12.1.ebuild
2728 @@ -23,8 +23,8 @@ DEPEND="
2729 $(add_frameworks_dep ki18n)
2730 $(add_frameworks_dep kio)
2731 $(add_frameworks_dep kwidgetsaddons)
2732 - dev-qt/qtgui:5
2733 - dev-qt/qtwidgets:5
2734 + $(add_qt_dep qtgui)
2735 + $(add_qt_dep qtwidgets)
2736 "
2737
2738 RDEPEND="${DEPEND}"
2739
2740 diff --git a/kde-apps/kapptemplate/kapptemplate-15.12.49.9999.ebuild b/kde-apps/kapptemplate/kapptemplate-15.12.49.9999.ebuild
2741 index fa70651..b26adc9 100644
2742 --- a/kde-apps/kapptemplate/kapptemplate-15.12.49.9999.ebuild
2743 +++ b/kde-apps/kapptemplate/kapptemplate-15.12.49.9999.ebuild
2744 @@ -23,8 +23,8 @@ DEPEND="
2745 $(add_frameworks_dep ki18n)
2746 $(add_frameworks_dep kio)
2747 $(add_frameworks_dep kwidgetsaddons)
2748 - dev-qt/qtgui:5
2749 - dev-qt/qtwidgets:5
2750 + $(add_qt_dep qtgui)
2751 + $(add_qt_dep qtwidgets)
2752 "
2753
2754 RDEPEND="${DEPEND}"
2755
2756 diff --git a/kde-apps/kapptemplate/kapptemplate-9999.ebuild b/kde-apps/kapptemplate/kapptemplate-9999.ebuild
2757 index 4bb5f56..23697f3 100644
2758 --- a/kde-apps/kapptemplate/kapptemplate-9999.ebuild
2759 +++ b/kde-apps/kapptemplate/kapptemplate-9999.ebuild
2760 @@ -22,8 +22,8 @@ DEPEND="
2761 $(add_frameworks_dep ki18n)
2762 $(add_frameworks_dep kio)
2763 $(add_frameworks_dep kwidgetsaddons)
2764 - dev-qt/qtgui:5
2765 - dev-qt/qtwidgets:5
2766 + $(add_qt_dep qtgui)
2767 + $(add_qt_dep qtwidgets)
2768 "
2769
2770 RDEPEND="${DEPEND}"
2771
2772 diff --git a/kde-apps/kate/kate-15.12.1.ebuild b/kde-apps/kate/kate-15.12.1.ebuild
2773 index 98c9237..1fba1da 100644
2774 --- a/kde-apps/kate/kate-15.12.1.ebuild
2775 +++ b/kde-apps/kate/kate-15.12.1.ebuild
2776 @@ -36,18 +36,18 @@ DEPEND="
2777 $(add_frameworks_dep kwidgetsaddons)
2778 $(add_frameworks_dep kwindowsystem)
2779 $(add_frameworks_dep kxmlgui)
2780 - dev-qt/qtdbus:5
2781 - dev-qt/qtgui:5
2782 - dev-qt/qtscript:5
2783 - dev-qt/qtwidgets:5
2784 - dev-qt/qtxml:5
2785 + $(add_qt_dep qtdbus)
2786 + $(add_qt_dep qtgui)
2787 + $(add_qt_dep qtscript)
2788 + $(add_qt_dep qtwidgets)
2789 + $(add_qt_dep qtxml)
2790 addons? (
2791 $(add_frameworks_dep kbookmarks)
2792 $(add_frameworks_dep knewstuff)
2793 $(add_frameworks_dep kwallet)
2794 $(add_frameworks_dep plasma)
2795 $(add_frameworks_dep threadweaver)
2796 - dev-qt/qtsql:5
2797 + $(add_qt_dep qtsql)
2798 >=dev-libs/libgit2-0.22.0:=
2799 )
2800 "
2801
2802 diff --git a/kde-apps/kate/kate-15.12.49.9999.ebuild b/kde-apps/kate/kate-15.12.49.9999.ebuild
2803 index 143c847..1a49db8 100644
2804 --- a/kde-apps/kate/kate-15.12.49.9999.ebuild
2805 +++ b/kde-apps/kate/kate-15.12.49.9999.ebuild
2806 @@ -36,18 +36,18 @@ DEPEND="
2807 $(add_frameworks_dep kwidgetsaddons)
2808 $(add_frameworks_dep kwindowsystem)
2809 $(add_frameworks_dep kxmlgui)
2810 - dev-qt/qtdbus:5
2811 - dev-qt/qtgui:5
2812 - dev-qt/qtscript:5
2813 - dev-qt/qtwidgets:5
2814 - dev-qt/qtxml:5
2815 + $(add_qt_dep qtdbus)
2816 + $(add_qt_dep qtgui)
2817 + $(add_qt_dep qtscript)
2818 + $(add_qt_dep qtwidgets)
2819 + $(add_qt_dep qtxml)
2820 addons? (
2821 $(add_frameworks_dep kbookmarks)
2822 $(add_frameworks_dep knewstuff)
2823 $(add_frameworks_dep kwallet)
2824 $(add_frameworks_dep plasma)
2825 $(add_frameworks_dep threadweaver)
2826 - dev-qt/qtsql:5
2827 + $(add_qt_dep qtsql)
2828 >=dev-libs/libgit2-0.22.0:=
2829 )
2830 "
2831
2832 diff --git a/kde-apps/kate/kate-9999.ebuild b/kde-apps/kate/kate-9999.ebuild
2833 index 143c847..1a49db8 100644
2834 --- a/kde-apps/kate/kate-9999.ebuild
2835 +++ b/kde-apps/kate/kate-9999.ebuild
2836 @@ -36,18 +36,18 @@ DEPEND="
2837 $(add_frameworks_dep kwidgetsaddons)
2838 $(add_frameworks_dep kwindowsystem)
2839 $(add_frameworks_dep kxmlgui)
2840 - dev-qt/qtdbus:5
2841 - dev-qt/qtgui:5
2842 - dev-qt/qtscript:5
2843 - dev-qt/qtwidgets:5
2844 - dev-qt/qtxml:5
2845 + $(add_qt_dep qtdbus)
2846 + $(add_qt_dep qtgui)
2847 + $(add_qt_dep qtscript)
2848 + $(add_qt_dep qtwidgets)
2849 + $(add_qt_dep qtxml)
2850 addons? (
2851 $(add_frameworks_dep kbookmarks)
2852 $(add_frameworks_dep knewstuff)
2853 $(add_frameworks_dep kwallet)
2854 $(add_frameworks_dep plasma)
2855 $(add_frameworks_dep threadweaver)
2856 - dev-qt/qtsql:5
2857 + $(add_qt_dep qtsql)
2858 >=dev-libs/libgit2-0.22.0:=
2859 )
2860 "
2861
2862 diff --git a/kde-apps/katomic/katomic-15.12.1.ebuild b/kde-apps/katomic/katomic-15.12.1.ebuild
2863 index 1636915..68e8a04 100644
2864 --- a/kde-apps/katomic/katomic-15.12.1.ebuild
2865 +++ b/kde-apps/katomic/katomic-15.12.1.ebuild
2866 @@ -25,7 +25,7 @@ DEPEND="
2867 $(add_frameworks_dep kwidgetsaddons)
2868 $(add_frameworks_dep kxmlgui)
2869 $(add_kdeapps_dep libkdegames)
2870 - dev-qt/qtgui:5
2871 - dev-qt/qtwidgets:5
2872 + $(add_qt_dep qtgui)
2873 + $(add_qt_dep qtwidgets)
2874 "
2875 RDEPEND="${DEPEND}"
2876
2877 diff --git a/kde-apps/katomic/katomic-15.12.49.9999.ebuild b/kde-apps/katomic/katomic-15.12.49.9999.ebuild
2878 index 6596891..8e11d09 100644
2879 --- a/kde-apps/katomic/katomic-15.12.49.9999.ebuild
2880 +++ b/kde-apps/katomic/katomic-15.12.49.9999.ebuild
2881 @@ -25,7 +25,7 @@ DEPEND="
2882 $(add_frameworks_dep kwidgetsaddons)
2883 $(add_frameworks_dep kxmlgui)
2884 $(add_kdeapps_dep libkdegames)
2885 - dev-qt/qtgui:5
2886 - dev-qt/qtwidgets:5
2887 + $(add_qt_dep qtgui)
2888 + $(add_qt_dep qtwidgets)
2889 "
2890 RDEPEND="${DEPEND}"
2891
2892 diff --git a/kde-apps/katomic/katomic-9999.ebuild b/kde-apps/katomic/katomic-9999.ebuild
2893 index e49ad16..236f646 100644
2894 --- a/kde-apps/katomic/katomic-9999.ebuild
2895 +++ b/kde-apps/katomic/katomic-9999.ebuild
2896 @@ -26,7 +26,7 @@ DEPEND="
2897 $(add_frameworks_dep kwidgetsaddons)
2898 $(add_frameworks_dep kxmlgui)
2899 $(add_kdeapps_dep libkdegames)
2900 - dev-qt/qtgui:5
2901 - dev-qt/qtwidgets:5
2902 + $(add_qt_dep qtgui)
2903 + $(add_qt_dep qtwidgets)
2904 "
2905 RDEPEND="${DEPEND}"
2906
2907 diff --git a/kde-apps/kblackbox/kblackbox-15.12.1.ebuild b/kde-apps/kblackbox/kblackbox-15.12.1.ebuild
2908 index 6c407e5..cec33f9 100644
2909 --- a/kde-apps/kblackbox/kblackbox-15.12.1.ebuild
2910 +++ b/kde-apps/kblackbox/kblackbox-15.12.1.ebuild
2911 @@ -23,9 +23,9 @@ DEPEND="
2912 $(add_frameworks_dep kwidgetsaddons)
2913 $(add_frameworks_dep kxmlgui)
2914 $(add_kdeapps_dep libkdegames)
2915 - dev-qt/qtgui:5
2916 - dev-qt/qtsvg:5
2917 - dev-qt/qtwidgets:5
2918 - dev-qt/qtxml:5
2919 + $(add_qt_dep qtgui)
2920 + $(add_qt_dep qtsvg)
2921 + $(add_qt_dep qtwidgets)
2922 + $(add_qt_dep qtxml)
2923 "
2924 RDEPEND="${DEPEND}"
2925
2926 diff --git a/kde-apps/kblackbox/kblackbox-15.12.49.9999.ebuild b/kde-apps/kblackbox/kblackbox-15.12.49.9999.ebuild
2927 index bf1a876..467bda8 100644
2928 --- a/kde-apps/kblackbox/kblackbox-15.12.49.9999.ebuild
2929 +++ b/kde-apps/kblackbox/kblackbox-15.12.49.9999.ebuild
2930 @@ -23,9 +23,9 @@ DEPEND="
2931 $(add_frameworks_dep kwidgetsaddons)
2932 $(add_frameworks_dep kxmlgui)
2933 $(add_kdeapps_dep libkdegames)
2934 - dev-qt/qtgui:5
2935 - dev-qt/qtsvg:5
2936 - dev-qt/qtwidgets:5
2937 - dev-qt/qtxml:5
2938 + $(add_qt_dep qtgui)
2939 + $(add_qt_dep qtsvg)
2940 + $(add_qt_dep qtwidgets)
2941 + $(add_qt_dep qtxml)
2942 "
2943 RDEPEND="${DEPEND}"
2944
2945 diff --git a/kde-apps/kblackbox/kblackbox-9999.ebuild b/kde-apps/kblackbox/kblackbox-9999.ebuild
2946 index 5b56ad4..7bf051c 100644
2947 --- a/kde-apps/kblackbox/kblackbox-9999.ebuild
2948 +++ b/kde-apps/kblackbox/kblackbox-9999.ebuild
2949 @@ -24,9 +24,9 @@ DEPEND="
2950 $(add_frameworks_dep kwidgetsaddons)
2951 $(add_frameworks_dep kxmlgui)
2952 $(add_kdeapps_dep libkdegames)
2953 - dev-qt/qtgui:5
2954 - dev-qt/qtsvg:5
2955 - dev-qt/qtwidgets:5
2956 - dev-qt/qtxml:5
2957 + $(add_qt_dep qtgui)
2958 + $(add_qt_dep qtsvg)
2959 + $(add_qt_dep qtwidgets)
2960 + $(add_qt_dep qtxml)
2961 "
2962 RDEPEND="${DEPEND}"
2963
2964 diff --git a/kde-apps/kblocks/kblocks-15.12.1.ebuild b/kde-apps/kblocks/kblocks-15.12.1.ebuild
2965 index 79e5d2d..58cdb21 100644
2966 --- a/kde-apps/kblocks/kblocks-15.12.1.ebuild
2967 +++ b/kde-apps/kblocks/kblocks-15.12.1.ebuild
2968 @@ -20,10 +20,10 @@ DEPEND="
2969 $(add_frameworks_dep kwidgetsaddons)
2970 $(add_frameworks_dep kxmlgui)
2971 $(add_kdeapps_dep libkdegames)
2972 - dev-qt/qtgui:5
2973 - dev-qt/qtnetwork:5
2974 - dev-qt/qtsvg:5
2975 - dev-qt/qtwidgets:5
2976 + $(add_qt_dep qtgui)
2977 + $(add_qt_dep qtnetwork)
2978 + $(add_qt_dep qtsvg)
2979 + $(add_qt_dep qtwidgets)
2980 media-libs/phonon[qt5]
2981 "
2982
2983
2984 diff --git a/kde-apps/kblocks/kblocks-15.12.49.9999.ebuild b/kde-apps/kblocks/kblocks-15.12.49.9999.ebuild
2985 index 3388261..1b04bfb 100644
2986 --- a/kde-apps/kblocks/kblocks-15.12.49.9999.ebuild
2987 +++ b/kde-apps/kblocks/kblocks-15.12.49.9999.ebuild
2988 @@ -20,10 +20,10 @@ DEPEND="
2989 $(add_frameworks_dep kwidgetsaddons)
2990 $(add_frameworks_dep kxmlgui)
2991 $(add_kdeapps_dep libkdegames)
2992 - dev-qt/qtgui:5
2993 - dev-qt/qtnetwork:5
2994 - dev-qt/qtsvg:5
2995 - dev-qt/qtwidgets:5
2996 + $(add_qt_dep qtgui)
2997 + $(add_qt_dep qtnetwork)
2998 + $(add_qt_dep qtsvg)
2999 + $(add_qt_dep qtwidgets)
3000 media-libs/phonon[qt5]
3001 "
3002
3003
3004 diff --git a/kde-apps/kblocks/kblocks-9999.ebuild b/kde-apps/kblocks/kblocks-9999.ebuild
3005 index f80215e..23c78e7 100644
3006 --- a/kde-apps/kblocks/kblocks-9999.ebuild
3007 +++ b/kde-apps/kblocks/kblocks-9999.ebuild
3008 @@ -21,10 +21,10 @@ DEPEND="
3009 $(add_frameworks_dep kwidgetsaddons)
3010 $(add_frameworks_dep kxmlgui)
3011 $(add_kdeapps_dep libkdegames)
3012 - dev-qt/qtgui:5
3013 - dev-qt/qtnetwork:5
3014 - dev-qt/qtsvg:5
3015 - dev-qt/qtwidgets:5
3016 + $(add_qt_dep qtgui)
3017 + $(add_qt_dep qtnetwork)
3018 + $(add_qt_dep qtsvg)
3019 + $(add_qt_dep qtwidgets)
3020 media-libs/phonon[qt5]
3021 "
3022
3023
3024 diff --git a/kde-apps/kblog/kblog-15.12.1.ebuild b/kde-apps/kblog/kblog-15.12.1.ebuild
3025 index 87d7c25..f72759e 100644
3026 --- a/kde-apps/kblog/kblog-15.12.1.ebuild
3027 +++ b/kde-apps/kblog/kblog-15.12.1.ebuild
3028 @@ -21,6 +21,6 @@ RDEPEND="
3029 $(add_frameworks_dep ki18n)
3030 $(add_frameworks_dep kio)
3031 $(add_frameworks_dep kxmlrpcclient)
3032 - dev-qt/qtxml:5
3033 + $(add_qt_dep qtxml)
3034 "
3035 DEPEND="${RDEPEND}"
3036
3037 diff --git a/kde-apps/kblog/kblog-15.12.49.9999.ebuild b/kde-apps/kblog/kblog-15.12.49.9999.ebuild
3038 index f669af7..b782e93 100644
3039 --- a/kde-apps/kblog/kblog-15.12.49.9999.ebuild
3040 +++ b/kde-apps/kblog/kblog-15.12.49.9999.ebuild
3041 @@ -21,6 +21,6 @@ RDEPEND="
3042 $(add_frameworks_dep ki18n)
3043 $(add_frameworks_dep kio)
3044 $(add_frameworks_dep kxmlrpcclient)
3045 - dev-qt/qtxml:5
3046 + $(add_qt_dep qtxml)
3047 "
3048 DEPEND="${RDEPEND}"
3049
3050 diff --git a/kde-apps/kblog/kblog-9999.ebuild b/kde-apps/kblog/kblog-9999.ebuild
3051 index f669af7..b782e93 100644
3052 --- a/kde-apps/kblog/kblog-9999.ebuild
3053 +++ b/kde-apps/kblog/kblog-9999.ebuild
3054 @@ -21,6 +21,6 @@ RDEPEND="
3055 $(add_frameworks_dep ki18n)
3056 $(add_frameworks_dep kio)
3057 $(add_frameworks_dep kxmlrpcclient)
3058 - dev-qt/qtxml:5
3059 + $(add_qt_dep qtxml)
3060 "
3061 DEPEND="${RDEPEND}"
3062
3063 diff --git a/kde-apps/kbounce/kbounce-15.12.1.ebuild b/kde-apps/kbounce/kbounce-15.12.1.ebuild
3064 index 35f568e..c1a3fae 100644
3065 --- a/kde-apps/kbounce/kbounce-15.12.1.ebuild
3066 +++ b/kde-apps/kbounce/kbounce-15.12.1.ebuild
3067 @@ -27,8 +27,8 @@ DEPEND="
3068 $(add_frameworks_dep kwidgetsaddons)
3069 $(add_frameworks_dep kxmlgui)
3070 $(add_kdeapps_dep libkdegames)
3071 - dev-qt/qtgui:5
3072 - dev-qt/qtsvg:5
3073 - dev-qt/qtwidgets:5
3074 + $(add_qt_dep qtgui)
3075 + $(add_qt_dep qtsvg)
3076 + $(add_qt_dep qtwidgets)
3077 "
3078 RDEPEND="${DEPEND}"
3079
3080 diff --git a/kde-apps/kbounce/kbounce-15.12.49.9999.ebuild b/kde-apps/kbounce/kbounce-15.12.49.9999.ebuild
3081 index 48ff789..e8f8fb8 100644
3082 --- a/kde-apps/kbounce/kbounce-15.12.49.9999.ebuild
3083 +++ b/kde-apps/kbounce/kbounce-15.12.49.9999.ebuild
3084 @@ -27,8 +27,8 @@ DEPEND="
3085 $(add_frameworks_dep kwidgetsaddons)
3086 $(add_frameworks_dep kxmlgui)
3087 $(add_kdeapps_dep libkdegames)
3088 - dev-qt/qtgui:5
3089 - dev-qt/qtsvg:5
3090 - dev-qt/qtwidgets:5
3091 + $(add_qt_dep qtgui)
3092 + $(add_qt_dep qtsvg)
3093 + $(add_qt_dep qtwidgets)
3094 "
3095 RDEPEND="${DEPEND}"
3096
3097 diff --git a/kde-apps/kbounce/kbounce-9999.ebuild b/kde-apps/kbounce/kbounce-9999.ebuild
3098 index 8bcdd69..f7c4602 100644
3099 --- a/kde-apps/kbounce/kbounce-9999.ebuild
3100 +++ b/kde-apps/kbounce/kbounce-9999.ebuild
3101 @@ -28,8 +28,8 @@ DEPEND="
3102 $(add_frameworks_dep kwidgetsaddons)
3103 $(add_frameworks_dep kxmlgui)
3104 $(add_kdeapps_dep libkdegames)
3105 - dev-qt/qtgui:5
3106 - dev-qt/qtsvg:5
3107 - dev-qt/qtwidgets:5
3108 + $(add_qt_dep qtgui)
3109 + $(add_qt_dep qtsvg)
3110 + $(add_qt_dep qtwidgets)
3111 "
3112 RDEPEND="${DEPEND}"
3113
3114 diff --git a/kde-apps/kbreakout/kbreakout-15.12.1.ebuild b/kde-apps/kbreakout/kbreakout-15.12.1.ebuild
3115 index 01fd9a9..8cc32d9 100644
3116 --- a/kde-apps/kbreakout/kbreakout-15.12.1.ebuild
3117 +++ b/kde-apps/kbreakout/kbreakout-15.12.1.ebuild
3118 @@ -24,9 +24,9 @@ DEPEND="
3119 $(add_frameworks_dep kwidgetsaddons)
3120 $(add_frameworks_dep kxmlgui)
3121 $(add_kdeapps_dep libkdegames)
3122 - dev-qt/qtdeclarative:5
3123 - dev-qt/qtgui:5
3124 - dev-qt/qtwidgets:5
3125 - dev-qt/qtxml:5
3126 + $(add_qt_dep qtdeclarative)
3127 + $(add_qt_dep qtgui)
3128 + $(add_qt_dep qtwidgets)
3129 + $(add_qt_dep qtxml)
3130 "
3131 RDEPEND="${DEPEND}"
3132
3133 diff --git a/kde-apps/kbreakout/kbreakout-15.12.49.9999.ebuild b/kde-apps/kbreakout/kbreakout-15.12.49.9999.ebuild
3134 index 5d1763f..2605f55 100644
3135 --- a/kde-apps/kbreakout/kbreakout-15.12.49.9999.ebuild
3136 +++ b/kde-apps/kbreakout/kbreakout-15.12.49.9999.ebuild
3137 @@ -24,9 +24,9 @@ DEPEND="
3138 $(add_frameworks_dep kwidgetsaddons)
3139 $(add_frameworks_dep kxmlgui)
3140 $(add_kdeapps_dep libkdegames)
3141 - dev-qt/qtdeclarative:5
3142 - dev-qt/qtgui:5
3143 - dev-qt/qtwidgets:5
3144 - dev-qt/qtxml:5
3145 + $(add_qt_dep qtdeclarative)
3146 + $(add_qt_dep qtgui)
3147 + $(add_qt_dep qtwidgets)
3148 + $(add_qt_dep qtxml)
3149 "
3150 RDEPEND="${DEPEND}"
3151
3152 diff --git a/kde-apps/kbreakout/kbreakout-9999.ebuild b/kde-apps/kbreakout/kbreakout-9999.ebuild
3153 index cb4e5e9..02c25c5 100644
3154 --- a/kde-apps/kbreakout/kbreakout-9999.ebuild
3155 +++ b/kde-apps/kbreakout/kbreakout-9999.ebuild
3156 @@ -25,9 +25,9 @@ DEPEND="
3157 $(add_frameworks_dep kwidgetsaddons)
3158 $(add_frameworks_dep kxmlgui)
3159 $(add_kdeapps_dep libkdegames)
3160 - dev-qt/qtdeclarative:5
3161 - dev-qt/qtgui:5
3162 - dev-qt/qtwidgets:5
3163 - dev-qt/qtxml:5
3164 + $(add_qt_dep qtdeclarative)
3165 + $(add_qt_dep qtgui)
3166 + $(add_qt_dep qtwidgets)
3167 + $(add_qt_dep qtxml)
3168 "
3169 RDEPEND="${DEPEND}"
3170
3171 diff --git a/kde-apps/kbruch/kbruch-15.08.3.ebuild b/kde-apps/kbruch/kbruch-15.08.3.ebuild
3172 index e5cf1a8..4e6738c 100644
3173 --- a/kde-apps/kbruch/kbruch-15.08.3.ebuild
3174 +++ b/kde-apps/kbruch/kbruch-15.08.3.ebuild
3175 @@ -19,7 +19,7 @@ DEPEND="
3176 $(add_frameworks_dep ki18n)
3177 $(add_frameworks_dep kwidgetsaddons)
3178 $(add_frameworks_dep kxmlgui)
3179 - dev-qt/qtgui:5
3180 - dev-qt/qtwidgets:5
3181 + $(add_qt_dep qtgui)
3182 + $(add_qt_dep qtwidgets)
3183 "
3184 RDEPEND="${DEPEND}"
3185
3186 diff --git a/kde-apps/kbruch/kbruch-15.12.1.ebuild b/kde-apps/kbruch/kbruch-15.12.1.ebuild
3187 index e5cf1a8..4e6738c 100644
3188 --- a/kde-apps/kbruch/kbruch-15.12.1.ebuild
3189 +++ b/kde-apps/kbruch/kbruch-15.12.1.ebuild
3190 @@ -19,7 +19,7 @@ DEPEND="
3191 $(add_frameworks_dep ki18n)
3192 $(add_frameworks_dep kwidgetsaddons)
3193 $(add_frameworks_dep kxmlgui)
3194 - dev-qt/qtgui:5
3195 - dev-qt/qtwidgets:5
3196 + $(add_qt_dep qtgui)
3197 + $(add_qt_dep qtwidgets)
3198 "
3199 RDEPEND="${DEPEND}"
3200
3201 diff --git a/kde-apps/kbruch/kbruch-15.12.49.9999.ebuild b/kde-apps/kbruch/kbruch-15.12.49.9999.ebuild
3202 index 346c228..6b9793a 100644
3203 --- a/kde-apps/kbruch/kbruch-15.12.49.9999.ebuild
3204 +++ b/kde-apps/kbruch/kbruch-15.12.49.9999.ebuild
3205 @@ -19,7 +19,7 @@ DEPEND="
3206 $(add_frameworks_dep ki18n)
3207 $(add_frameworks_dep kwidgetsaddons)
3208 $(add_frameworks_dep kxmlgui)
3209 - dev-qt/qtgui:5
3210 - dev-qt/qtwidgets:5
3211 + $(add_qt_dep qtgui)
3212 + $(add_qt_dep qtwidgets)
3213 "
3214 RDEPEND="${DEPEND}"
3215
3216 diff --git a/kde-apps/kbruch/kbruch-9999.ebuild b/kde-apps/kbruch/kbruch-9999.ebuild
3217 index 346c228..6b9793a 100644
3218 --- a/kde-apps/kbruch/kbruch-9999.ebuild
3219 +++ b/kde-apps/kbruch/kbruch-9999.ebuild
3220 @@ -19,7 +19,7 @@ DEPEND="
3221 $(add_frameworks_dep ki18n)
3222 $(add_frameworks_dep kwidgetsaddons)
3223 $(add_frameworks_dep kxmlgui)
3224 - dev-qt/qtgui:5
3225 - dev-qt/qtwidgets:5
3226 + $(add_qt_dep qtgui)
3227 + $(add_qt_dep qtwidgets)
3228 "
3229 RDEPEND="${DEPEND}"
3230
3231 diff --git a/kde-apps/kcachegrind/kcachegrind-5.9999.ebuild b/kde-apps/kcachegrind/kcachegrind-5.9999.ebuild
3232 index ef1be07..c1fb7ea 100644
3233 --- a/kde-apps/kcachegrind/kcachegrind-5.9999.ebuild
3234 +++ b/kde-apps/kcachegrind/kcachegrind-5.9999.ebuild
3235 @@ -21,9 +21,9 @@ DEPEND="
3236 $(add_frameworks_dep kdelibs4support)
3237 $(add_frameworks_dep kwidgetsaddons)
3238 $(add_frameworks_dep kxmlgui)
3239 - dev-qt/qtdbus:5
3240 - dev-qt/qtgui:5
3241 - dev-qt/qtwidgets:5
3242 + $(add_qt_dep qtdbus)
3243 + $(add_qt_dep qtgui)
3244 + $(add_qt_dep qtwidgets)
3245 "
3246 RDEPEND="${DEPEND}
3247 media-gfx/graphviz
3248
3249 diff --git a/kde-apps/kcalc/kcalc-15.12.1.ebuild b/kde-apps/kcalc/kcalc-15.12.1.ebuild
3250 index bc2de33..78763e6 100644
3251 --- a/kde-apps/kcalc/kcalc-15.12.1.ebuild
3252 +++ b/kde-apps/kcalc/kcalc-15.12.1.ebuild
3253 @@ -25,9 +25,9 @@ COMMON_DEPEND="
3254 $(add_frameworks_dep kwidgetsaddons)
3255 $(add_frameworks_dep kxmlgui)
3256 dev-libs/gmp:0
3257 - dev-qt/qtgui:5
3258 - dev-qt/qtwidgets:5
3259 - dev-qt/qtxml:5
3260 + $(add_qt_dep qtgui)
3261 + $(add_qt_dep qtwidgets)
3262 + $(add_qt_dep qtxml)
3263 "
3264 DEPEND="${COMMON_DEPEND}
3265 $(add_frameworks_dep kinit)
3266
3267 diff --git a/kde-apps/kcalc/kcalc-15.12.49.9999.ebuild b/kde-apps/kcalc/kcalc-15.12.49.9999.ebuild
3268 index a4e76c3..0fa0840 100644
3269 --- a/kde-apps/kcalc/kcalc-15.12.49.9999.ebuild
3270 +++ b/kde-apps/kcalc/kcalc-15.12.49.9999.ebuild
3271 @@ -25,9 +25,9 @@ COMMON_DEPEND="
3272 $(add_frameworks_dep kwidgetsaddons)
3273 $(add_frameworks_dep kxmlgui)
3274 dev-libs/gmp:0
3275 - dev-qt/qtgui:5
3276 - dev-qt/qtwidgets:5
3277 - dev-qt/qtxml:5
3278 + $(add_qt_dep qtgui)
3279 + $(add_qt_dep qtwidgets)
3280 + $(add_qt_dep qtxml)
3281 "
3282 DEPEND="${COMMON_DEPEND}
3283 $(add_frameworks_dep kinit)
3284
3285 diff --git a/kde-apps/kcalc/kcalc-9999.ebuild b/kde-apps/kcalc/kcalc-9999.ebuild
3286 index a4e76c3..0fa0840 100644
3287 --- a/kde-apps/kcalc/kcalc-9999.ebuild
3288 +++ b/kde-apps/kcalc/kcalc-9999.ebuild
3289 @@ -25,9 +25,9 @@ COMMON_DEPEND="
3290 $(add_frameworks_dep kwidgetsaddons)
3291 $(add_frameworks_dep kxmlgui)
3292 dev-libs/gmp:0
3293 - dev-qt/qtgui:5
3294 - dev-qt/qtwidgets:5
3295 - dev-qt/qtxml:5
3296 + $(add_qt_dep qtgui)
3297 + $(add_qt_dep qtwidgets)
3298 + $(add_qt_dep qtxml)
3299 "
3300 DEPEND="${COMMON_DEPEND}
3301 $(add_frameworks_dep kinit)
3302
3303 diff --git a/kde-apps/kcalcore/kcalcore-15.12.1.ebuild b/kde-apps/kcalcore/kcalcore-15.12.1.ebuild
3304 index 0c254f5..8eb9ffa 100644
3305 --- a/kde-apps/kcalcore/kcalcore-15.12.1.ebuild
3306 +++ b/kde-apps/kcalcore/kcalcore-15.12.1.ebuild
3307 @@ -20,7 +20,7 @@ DEPEND="
3308 $(add_frameworks_dep kcoreaddons)
3309 $(add_frameworks_dep kdelibs4support)
3310 dev-libs/libical:=
3311 - dev-qt/qtgui:5
3312 + $(add_qt_dep qtgui)
3313 sys-apps/util-linux
3314 "
3315 RDEPEND="${DEPEND}"
3316
3317 diff --git a/kde-apps/kcalcore/kcalcore-15.12.49.9999.ebuild b/kde-apps/kcalcore/kcalcore-15.12.49.9999.ebuild
3318 index cb8c1e1..d4843de 100644
3319 --- a/kde-apps/kcalcore/kcalcore-15.12.49.9999.ebuild
3320 +++ b/kde-apps/kcalcore/kcalcore-15.12.49.9999.ebuild
3321 @@ -20,7 +20,7 @@ DEPEND="
3322 $(add_frameworks_dep kcoreaddons)
3323 $(add_frameworks_dep kdelibs4support)
3324 dev-libs/libical:=
3325 - dev-qt/qtgui:5
3326 + $(add_qt_dep qtgui)
3327 sys-apps/util-linux
3328 "
3329 RDEPEND="${DEPEND}"
3330
3331 diff --git a/kde-apps/kcalcore/kcalcore-9999.ebuild b/kde-apps/kcalcore/kcalcore-9999.ebuild
3332 index cb8c1e1..d4843de 100644
3333 --- a/kde-apps/kcalcore/kcalcore-9999.ebuild
3334 +++ b/kde-apps/kcalcore/kcalcore-9999.ebuild
3335 @@ -20,7 +20,7 @@ DEPEND="
3336 $(add_frameworks_dep kcoreaddons)
3337 $(add_frameworks_dep kdelibs4support)
3338 dev-libs/libical:=
3339 - dev-qt/qtgui:5
3340 + $(add_qt_dep qtgui)
3341 sys-apps/util-linux
3342 "
3343 RDEPEND="${DEPEND}"
3344
3345 diff --git a/kde-apps/kcalutils/kcalutils-15.12.1.ebuild b/kde-apps/kcalutils/kcalutils-15.12.1.ebuild
3346 index c8f986e..0a99fb0 100644
3347 --- a/kde-apps/kcalutils/kcalutils-15.12.1.ebuild
3348 +++ b/kde-apps/kcalutils/kcalutils-15.12.1.ebuild
3349 @@ -25,8 +25,8 @@ COMMON_DEPEND="
3350 $(add_kdeapps_dep kcalcore)
3351 $(add_kdeapps_dep kidentitymanagement)
3352 dev-libs/grantlee:5
3353 - dev-qt/qtgui:5
3354 - dev-qt/qtwidgets:5
3355 + $(add_qt_dep qtgui)
3356 + $(add_qt_dep qtwidgets)
3357 "
3358 DEPEND="${COMMON_DEPEND}
3359 sys-devel/gettext
3360
3361 diff --git a/kde-apps/kcalutils/kcalutils-15.12.49.9999.ebuild b/kde-apps/kcalutils/kcalutils-15.12.49.9999.ebuild
3362 index 5e3acd5..2958ee4 100644
3363 --- a/kde-apps/kcalutils/kcalutils-15.12.49.9999.ebuild
3364 +++ b/kde-apps/kcalutils/kcalutils-15.12.49.9999.ebuild
3365 @@ -25,8 +25,8 @@ COMMON_DEPEND="
3366 $(add_kdeapps_dep kcalcore)
3367 $(add_kdeapps_dep kidentitymanagement)
3368 dev-libs/grantlee:5
3369 - dev-qt/qtgui:5
3370 - dev-qt/qtwidgets:5
3371 + $(add_qt_dep qtgui)
3372 + $(add_qt_dep qtwidgets)
3373 "
3374 DEPEND="${COMMON_DEPEND}
3375 sys-devel/gettext
3376
3377 diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/kcalutils/kcalutils-9999.ebuild
3378 index 5e3acd5..2958ee4 100644
3379 --- a/kde-apps/kcalutils/kcalutils-9999.ebuild
3380 +++ b/kde-apps/kcalutils/kcalutils-9999.ebuild
3381 @@ -25,8 +25,8 @@ COMMON_DEPEND="
3382 $(add_kdeapps_dep kcalcore)
3383 $(add_kdeapps_dep kidentitymanagement)
3384 dev-libs/grantlee:5
3385 - dev-qt/qtgui:5
3386 - dev-qt/qtwidgets:5
3387 + $(add_qt_dep qtgui)
3388 + $(add_qt_dep qtwidgets)
3389 "
3390 DEPEND="${COMMON_DEPEND}
3391 sys-devel/gettext
3392
3393 diff --git a/kde-apps/kcharselect/kcharselect-15.12.1.ebuild b/kde-apps/kcharselect/kcharselect-15.12.1.ebuild
3394 index 50d7633..f6a47d3 100644
3395 --- a/kde-apps/kcharselect/kcharselect-15.12.1.ebuild
3396 +++ b/kde-apps/kcharselect/kcharselect-15.12.1.ebuild
3397 @@ -21,7 +21,7 @@ DEPEND="
3398 $(add_frameworks_dep ki18n)
3399 $(add_frameworks_dep kwidgetsaddons)
3400 $(add_frameworks_dep kxmlgui)
3401 - dev-qt/qtgui:5
3402 - dev-qt/qtwidgets:5
3403 + $(add_qt_dep qtgui)
3404 + $(add_qt_dep qtwidgets)
3405 "
3406 RDEPEND="${DEPEND}"
3407
3408 diff --git a/kde-apps/kcharselect/kcharselect-15.12.49.9999.ebuild b/kde-apps/kcharselect/kcharselect-15.12.49.9999.ebuild
3409 index bec6b09..ebe718c 100644
3410 --- a/kde-apps/kcharselect/kcharselect-15.12.49.9999.ebuild
3411 +++ b/kde-apps/kcharselect/kcharselect-15.12.49.9999.ebuild
3412 @@ -21,7 +21,7 @@ DEPEND="
3413 $(add_frameworks_dep ki18n)
3414 $(add_frameworks_dep kwidgetsaddons)
3415 $(add_frameworks_dep kxmlgui)
3416 - dev-qt/qtgui:5
3417 - dev-qt/qtwidgets:5
3418 + $(add_qt_dep qtgui)
3419 + $(add_qt_dep qtwidgets)
3420 "
3421 RDEPEND="${DEPEND}"
3422
3423 diff --git a/kde-apps/kcharselect/kcharselect-9999.ebuild b/kde-apps/kcharselect/kcharselect-9999.ebuild
3424 index bec6b09..ebe718c 100644
3425 --- a/kde-apps/kcharselect/kcharselect-9999.ebuild
3426 +++ b/kde-apps/kcharselect/kcharselect-9999.ebuild
3427 @@ -21,7 +21,7 @@ DEPEND="
3428 $(add_frameworks_dep ki18n)
3429 $(add_frameworks_dep kwidgetsaddons)
3430 $(add_frameworks_dep kxmlgui)
3431 - dev-qt/qtgui:5
3432 - dev-qt/qtwidgets:5
3433 + $(add_qt_dep qtgui)
3434 + $(add_qt_dep qtwidgets)
3435 "
3436 RDEPEND="${DEPEND}"
3437
3438 diff --git a/kde-apps/kcontacts/kcontacts-15.12.1.ebuild b/kde-apps/kcontacts/kcontacts-15.12.1.ebuild
3439 index 2fed17a..1871dd0 100644
3440 --- a/kde-apps/kcontacts/kcontacts-15.12.1.ebuild
3441 +++ b/kde-apps/kcontacts/kcontacts-15.12.1.ebuild
3442 @@ -19,8 +19,8 @@ RDEPEND="
3443 $(add_frameworks_dep kconfig)
3444 $(add_frameworks_dep kcoreaddons)
3445 $(add_frameworks_dep ki18n)
3446 - dev-qt/qtdbus:5
3447 - dev-qt/qtgui:5
3448 + $(add_qt_dep qtdbus)
3449 + $(add_qt_dep qtgui)
3450 "
3451 DEPEND="${RDEPEND}"
3452
3453
3454 diff --git a/kde-apps/kcontacts/kcontacts-15.12.49.9999.ebuild b/kde-apps/kcontacts/kcontacts-15.12.49.9999.ebuild
3455 index ff3e784..34fea42 100644
3456 --- a/kde-apps/kcontacts/kcontacts-15.12.49.9999.ebuild
3457 +++ b/kde-apps/kcontacts/kcontacts-15.12.49.9999.ebuild
3458 @@ -19,8 +19,8 @@ RDEPEND="
3459 $(add_frameworks_dep kconfig)
3460 $(add_frameworks_dep kcoreaddons)
3461 $(add_frameworks_dep ki18n)
3462 - dev-qt/qtdbus:5
3463 - dev-qt/qtgui:5
3464 + $(add_qt_dep qtdbus)
3465 + $(add_qt_dep qtgui)
3466 "
3467 DEPEND="${RDEPEND}"
3468
3469
3470 diff --git a/kde-apps/kcontacts/kcontacts-9999.ebuild b/kde-apps/kcontacts/kcontacts-9999.ebuild
3471 index ff3e784..34fea42 100644
3472 --- a/kde-apps/kcontacts/kcontacts-9999.ebuild
3473 +++ b/kde-apps/kcontacts/kcontacts-9999.ebuild
3474 @@ -19,8 +19,8 @@ RDEPEND="
3475 $(add_frameworks_dep kconfig)
3476 $(add_frameworks_dep kcoreaddons)
3477 $(add_frameworks_dep ki18n)
3478 - dev-qt/qtdbus:5
3479 - dev-qt/qtgui:5
3480 + $(add_qt_dep qtdbus)
3481 + $(add_qt_dep qtgui)
3482 "
3483 DEPEND="${RDEPEND}"
3484
3485
3486 diff --git a/kde-apps/kcron/kcron-15.12.1.ebuild b/kde-apps/kcron/kcron-15.12.1.ebuild
3487 index 43e2283..64b8c88 100644
3488 --- a/kde-apps/kcron/kcron-15.12.1.ebuild
3489 +++ b/kde-apps/kcron/kcron-15.12.1.ebuild
3490 @@ -18,9 +18,9 @@ DEPEND="
3491 $(add_frameworks_dep kiconthemes)
3492 $(add_frameworks_dep kio)
3493 $(add_frameworks_dep kwidgetsaddons)
3494 - dev-qt/qtgui:5
3495 - dev-qt/qtprintsupport:5
3496 - dev-qt/qtwidgets:5
3497 + $(add_qt_dep qtgui)
3498 + $(add_qt_dep qtprintsupport)
3499 + $(add_qt_dep qtwidgets)
3500 "
3501 RDEPEND="${DEPEND}
3502 !prefix? ( virtual/cron )
3503
3504 diff --git a/kde-apps/kcron/kcron-15.12.49.9999.ebuild b/kde-apps/kcron/kcron-15.12.49.9999.ebuild
3505 index 487126e..df1a69c 100644
3506 --- a/kde-apps/kcron/kcron-15.12.49.9999.ebuild
3507 +++ b/kde-apps/kcron/kcron-15.12.49.9999.ebuild
3508 @@ -18,9 +18,9 @@ DEPEND="
3509 $(add_frameworks_dep kiconthemes)
3510 $(add_frameworks_dep kio)
3511 $(add_frameworks_dep kwidgetsaddons)
3512 - dev-qt/qtgui:5
3513 - dev-qt/qtprintsupport:5
3514 - dev-qt/qtwidgets:5
3515 + $(add_qt_dep qtgui)
3516 + $(add_qt_dep qtprintsupport)
3517 + $(add_qt_dep qtwidgets)
3518 "
3519 RDEPEND="${DEPEND}
3520 !prefix? ( virtual/cron )
3521
3522 diff --git a/kde-apps/kcron/kcron-9999.ebuild b/kde-apps/kcron/kcron-9999.ebuild
3523 index 487126e..df1a69c 100644
3524 --- a/kde-apps/kcron/kcron-9999.ebuild
3525 +++ b/kde-apps/kcron/kcron-9999.ebuild
3526 @@ -18,9 +18,9 @@ DEPEND="
3527 $(add_frameworks_dep kiconthemes)
3528 $(add_frameworks_dep kio)
3529 $(add_frameworks_dep kwidgetsaddons)
3530 - dev-qt/qtgui:5
3531 - dev-qt/qtprintsupport:5
3532 - dev-qt/qtwidgets:5
3533 + $(add_qt_dep qtgui)
3534 + $(add_qt_dep qtprintsupport)
3535 + $(add_qt_dep qtwidgets)
3536 "
3537 RDEPEND="${DEPEND}
3538 !prefix? ( virtual/cron )
3539
3540 diff --git a/kde-apps/kdb/kdb-9999.ebuild b/kde-apps/kdb/kdb-9999.ebuild
3541 index 127c6ac..632aba4 100644
3542 --- a/kde-apps/kdb/kdb-9999.ebuild
3543 +++ b/kde-apps/kdb/kdb-9999.ebuild
3544 @@ -16,9 +16,9 @@ IUSE="mysql postgres sqlite"
3545 RDEPEND="
3546 $(add_frameworks_dep kcoreaddons)
3547 dev-libs/icu:=
3548 - dev-qt/qtgui:5
3549 - dev-qt/qtwidgets:5
3550 - dev-qt/qtxml:5
3551 + $(add_qt_dep qtgui)
3552 + $(add_qt_dep qtwidgets)
3553 + $(add_qt_dep qtxml)
3554 mysql? ( virtual/mysql )
3555 postgres? ( dev-db/postgresql:* )
3556 sqlite? ( dev-db/sqlite:3 )
3557
3558 diff --git a/kde-apps/kde-l10n/kde-l10n-15.12.1.ebuild b/kde-apps/kde-l10n/kde-l10n-15.12.1.ebuild
3559 index b46c391..641e2b2 100644
3560 --- a/kde-apps/kde-l10n/kde-l10n-15.12.1.ebuild
3561 +++ b/kde-apps/kde-l10n/kde-l10n-15.12.1.ebuild
3562 @@ -12,7 +12,7 @@ HOMEPAGE="http://l10n.kde.org"
3563
3564 DEPEND="
3565 $(add_frameworks_dep ki18n)
3566 - dev-qt/linguist-tools:5
3567 + $(add_qt_dep linguist-tools)
3568 sys-devel/gettext
3569 "
3570 RDEPEND="
3571
3572 diff --git a/kde-apps/kdebugsettings/kdebugsettings-15.12.1.ebuild b/kde-apps/kdebugsettings/kdebugsettings-15.12.1.ebuild
3573 index 98e65b4..9b6af94 100644
3574 --- a/kde-apps/kdebugsettings/kdebugsettings-15.12.1.ebuild
3575 +++ b/kde-apps/kdebugsettings/kdebugsettings-15.12.1.ebuild
3576 @@ -20,8 +20,8 @@ DEPEND="
3577 $(add_frameworks_dep ki18n)
3578 $(add_frameworks_dep kitemviews)
3579 $(add_frameworks_dep kwidgetsaddons)
3580 - dev-qt/qtgui:5
3581 - dev-qt/qtwidgets:5
3582 + $(add_qt_dep qtgui)
3583 + $(add_qt_dep qtwidgets)
3584 "
3585 RDEPEND="${DEPEND}"
3586
3587
3588 diff --git a/kde-apps/kdebugsettings/kdebugsettings-15.12.49.9999.ebuild b/kde-apps/kdebugsettings/kdebugsettings-15.12.49.9999.ebuild
3589 index e0e1943..91ba2b8 100644
3590 --- a/kde-apps/kdebugsettings/kdebugsettings-15.12.49.9999.ebuild
3591 +++ b/kde-apps/kdebugsettings/kdebugsettings-15.12.49.9999.ebuild
3592 @@ -20,8 +20,8 @@ DEPEND="
3593 $(add_frameworks_dep ki18n)
3594 $(add_frameworks_dep kitemviews)
3595 $(add_frameworks_dep kwidgetsaddons)
3596 - dev-qt/qtgui:5
3597 - dev-qt/qtwidgets:5
3598 + $(add_qt_dep qtgui)
3599 + $(add_qt_dep qtwidgets)
3600 "
3601 RDEPEND="${DEPEND}"
3602
3603
3604 diff --git a/kde-apps/kdebugsettings/kdebugsettings-9999.ebuild b/kde-apps/kdebugsettings/kdebugsettings-9999.ebuild
3605 index e0e1943..91ba2b8 100644
3606 --- a/kde-apps/kdebugsettings/kdebugsettings-9999.ebuild
3607 +++ b/kde-apps/kdebugsettings/kdebugsettings-9999.ebuild
3608 @@ -20,8 +20,8 @@ DEPEND="
3609 $(add_frameworks_dep ki18n)
3610 $(add_frameworks_dep kitemviews)
3611 $(add_frameworks_dep kwidgetsaddons)
3612 - dev-qt/qtgui:5
3613 - dev-qt/qtwidgets:5
3614 + $(add_qt_dep qtgui)
3615 + $(add_qt_dep qtwidgets)
3616 "
3617 RDEPEND="${DEPEND}"
3618
3619
3620 diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.12.1.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.12.1.ebuild
3621 index 4d36d7f..2e423f7 100644
3622 --- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.12.1.ebuild
3623 +++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.12.1.ebuild
3624 @@ -16,8 +16,8 @@ DEPEND="
3625 $(add_frameworks_dep ki18n)
3626 $(add_frameworks_dep kio)
3627 $(add_frameworks_dep kwidgetsaddons)
3628 - dev-qt/qtgui:5
3629 - dev-qt/qtwidgets:5
3630 + $(add_qt_dep qtgui)
3631 + $(add_qt_dep qtwidgets)
3632 "
3633 RDEPEND="${DEPEND}"
3634
3635
3636 diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.12.49.9999.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.12.49.9999.ebuild
3637 index a48331a..2ce5bd0 100644
3638 --- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.12.49.9999.ebuild
3639 +++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.12.49.9999.ebuild
3640 @@ -16,8 +16,8 @@ DEPEND="
3641 $(add_frameworks_dep ki18n)
3642 $(add_frameworks_dep kio)
3643 $(add_frameworks_dep kwidgetsaddons)
3644 - dev-qt/qtgui:5
3645 - dev-qt/qtwidgets:5
3646 + $(add_qt_dep qtgui)
3647 + $(add_qt_dep qtwidgets)
3648 "
3649 RDEPEND="${DEPEND}"
3650
3651
3652 diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild
3653 index a48331a..2ce5bd0 100644
3654 --- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild
3655 +++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild
3656 @@ -16,8 +16,8 @@ DEPEND="
3657 $(add_frameworks_dep ki18n)
3658 $(add_frameworks_dep kio)
3659 $(add_frameworks_dep kwidgetsaddons)
3660 - dev-qt/qtgui:5
3661 - dev-qt/qtwidgets:5
3662 + $(add_qt_dep qtgui)
3663 + $(add_qt_dep qtwidgets)
3664 "
3665 RDEPEND="${DEPEND}"
3666
3667
3668 diff --git a/kde-apps/kdenlive/kdenlive-15.12.1.ebuild b/kde-apps/kdenlive/kdenlive-15.12.1.ebuild
3669 index f5cdc8a..daaa179 100644
3670 --- a/kde-apps/kdenlive/kdenlive-15.12.1.ebuild
3671 +++ b/kde-apps/kdenlive/kdenlive-15.12.1.ebuild
3672 @@ -38,14 +38,14 @@ RDEPEND="
3673 $(add_frameworks_dep kwidgetsaddons)
3674 $(add_frameworks_dep kxmlgui)
3675 $(add_frameworks_dep solid)
3676 - dev-qt/qtdbus:5
3677 - dev-qt/qtdeclarative:5
3678 - dev-qt/qtgui:5[gles2=]
3679 - dev-qt/qtnetwork:5
3680 - dev-qt/qtscript:5
3681 - dev-qt/qtsvg:5
3682 - dev-qt/qtwidgets:5
3683 - dev-qt/qtxml:5
3684 + $(add_qt_dep qtdbus)
3685 + $(add_qt_dep qtdeclarative)
3686 + $(add_qt_dep qtgui 'gles2=')
3687 + $(add_qt_dep qtnetwork)
3688 + $(add_qt_dep qtscript)
3689 + $(add_qt_dep qtsvg)
3690 + $(add_qt_dep qtwidgets)
3691 + $(add_qt_dep qtxml)
3692 >=media-libs/mlt-0.9.8-r1[ffmpeg,kdenlive,melt,qt5,sdl,xml]
3693 virtual/ffmpeg[encode,sdl,X]
3694 virtual/opengl
3695
3696 diff --git a/kde-apps/kdenlive/kdenlive-15.12.49.9999.ebuild b/kde-apps/kdenlive/kdenlive-15.12.49.9999.ebuild
3697 index d7fdcce..c35becd 100644
3698 --- a/kde-apps/kdenlive/kdenlive-15.12.49.9999.ebuild
3699 +++ b/kde-apps/kdenlive/kdenlive-15.12.49.9999.ebuild
3700 @@ -38,14 +38,14 @@ RDEPEND="
3701 $(add_frameworks_dep kwidgetsaddons)
3702 $(add_frameworks_dep kxmlgui)
3703 $(add_frameworks_dep solid)
3704 - dev-qt/qtdbus:5
3705 - dev-qt/qtdeclarative:5
3706 - dev-qt/qtgui:5[gles2=]
3707 - dev-qt/qtnetwork:5
3708 - dev-qt/qtscript:5
3709 - dev-qt/qtsvg:5
3710 - dev-qt/qtwidgets:5
3711 - dev-qt/qtxml:5
3712 + $(add_qt_dep qtdbus)
3713 + $(add_qt_dep qtdeclarative)
3714 + $(add_qt_dep qtgui 'gles2=')
3715 + $(add_qt_dep qtnetwork)
3716 + $(add_qt_dep qtscript)
3717 + $(add_qt_dep qtsvg)
3718 + $(add_qt_dep qtwidgets)
3719 + $(add_qt_dep qtxml)
3720 >=media-libs/mlt-0.9.8-r1[ffmpeg,kdenlive,melt,qt5,sdl,xml]
3721 virtual/ffmpeg[encode,sdl,X]
3722 virtual/opengl
3723
3724 diff --git a/kde-apps/kdenlive/kdenlive-9999.ebuild b/kde-apps/kdenlive/kdenlive-9999.ebuild
3725 index d6a8739..22be4a9 100644
3726 --- a/kde-apps/kdenlive/kdenlive-9999.ebuild
3727 +++ b/kde-apps/kdenlive/kdenlive-9999.ebuild
3728 @@ -38,14 +38,14 @@ RDEPEND="
3729 $(add_frameworks_dep kwidgetsaddons)
3730 $(add_frameworks_dep kxmlgui)
3731 $(add_frameworks_dep solid)
3732 - dev-qt/qtdbus:5
3733 - dev-qt/qtdeclarative:5
3734 - dev-qt/qtgui:5[gles2=]
3735 - dev-qt/qtnetwork:5
3736 - dev-qt/qtscript:5
3737 - dev-qt/qtsvg:5
3738 - dev-qt/qtwidgets:5
3739 - dev-qt/qtxml:5
3740 + $(add_qt_dep qtdbus)
3741 + $(add_qt_dep qtdeclarative)
3742 + $(add_qt_dep qtgui 'gles2=')
3743 + $(add_qt_dep qtnetwork)
3744 + $(add_qt_dep qtscript)
3745 + $(add_qt_dep qtsvg)
3746 + $(add_qt_dep qtwidgets)
3747 + $(add_qt_dep qtxml)
3748 >=media-libs/mlt-0.9.8-r1[ffmpeg,kdenlive,melt,qt5,sdl,xml]
3749 virtual/ffmpeg[encode,sdl,X]
3750 virtual/opengl
3751
3752 diff --git a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
3753 index c2c2492..fee10a5 100644
3754 --- a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
3755 +++ b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
3756 @@ -42,10 +42,10 @@ COMMON_DEPEND="
3757 $(add_kdeapps_dep mailcommon)
3758 $(add_kdeapps_dep messagelib)
3759 $(add_kdeapps_dep pimcommon)
3760 - dev-qt/qtgui:5
3761 - dev-qt/qtnetwork:5
3762 - dev-qt/qtwidgets:5
3763 - dev-qt/qtxml:5
3764 + $(add_qt_dep qtgui)
3765 + $(add_qt_dep qtnetwork)
3766 + $(add_qt_dep qtwidgets)
3767 + $(add_qt_dep qtxml)
3768 "
3769 DEPEND="${COMMON_DEPEND}
3770 sys-devel/gettext
3771
3772 diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
3773 index 074f13e..d6f21bd 100644
3774 --- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
3775 +++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
3776 @@ -37,12 +37,12 @@ COMMON_DEPEND="
3777 $(add_kdeapps_dep libkleo)
3778 $(add_kdeapps_dep pimcommon)
3779 dev-libs/grantlee:5
3780 - dev-qt/designer:5
3781 - dev-qt/qtdbus:5
3782 - dev-qt/qtgui:5
3783 - dev-qt/qtprintsupport:5
3784 - dev-qt/qtwebkit:5
3785 - dev-qt/qtwidgets:5
3786 + $(add_qt_dep designer)
3787 + $(add_qt_dep qtdbus)
3788 + $(add_qt_dep qtgui)
3789 + $(add_qt_dep qtprintsupport)
3790 + $(add_qt_dep qtwebkit)
3791 + $(add_qt_dep qtwidgets)
3792 prison? ( media-libs/prison:5 )
3793 "
3794 DEPEND="${COMMON_DEPEND}
3795
3796 diff --git a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.1.ebuild b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.1.ebuild
3797 index 610bcf4..e298349 100644
3798 --- a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.1.ebuild
3799 +++ b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.1.ebuild
3800 @@ -22,9 +22,9 @@ COMMON_DEPEND="
3801 $(add_frameworks_dep kio)
3802 $(add_kdeapps_dep kldap)
3803 $(add_kdeapps_dep kmbox)
3804 - dev-qt/qtgui:5
3805 - dev-qt/qtnetwork:5
3806 - dev-qt/qtwidgets:5
3807 + $(add_qt_dep qtgui)
3808 + $(add_qt_dep qtnetwork)
3809 + $(add_qt_dep qtwidgets)
3810 ssl? ( dev-libs/cyrus-sasl )
3811 "
3812 DEPEND="${COMMON_DEPEND}
3813
3814 diff --git a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.49.9999.ebuild b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.49.9999.ebuild
3815 index fb55d70..f145674 100644
3816 --- a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.49.9999.ebuild
3817 +++ b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-15.12.49.9999.ebuild
3818 @@ -22,9 +22,9 @@ COMMON_DEPEND="
3819 $(add_frameworks_dep kio)
3820 $(add_kdeapps_dep kldap)
3821 $(add_kdeapps_dep kmbox)
3822 - dev-qt/qtgui:5
3823 - dev-qt/qtnetwork:5
3824 - dev-qt/qtwidgets:5
3825 + $(add_qt_dep qtgui)
3826 + $(add_qt_dep qtnetwork)
3827 + $(add_qt_dep qtwidgets)
3828 ssl? ( dev-libs/cyrus-sasl )
3829 "
3830 DEPEND="${COMMON_DEPEND}
3831
3832 diff --git a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild
3833 index fb55d70..f145674 100644
3834 --- a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild
3835 +++ b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild
3836 @@ -22,9 +22,9 @@ COMMON_DEPEND="
3837 $(add_frameworks_dep kio)
3838 $(add_kdeapps_dep kldap)
3839 $(add_kdeapps_dep kmbox)
3840 - dev-qt/qtgui:5
3841 - dev-qt/qtnetwork:5
3842 - dev-qt/qtwidgets:5
3843 + $(add_qt_dep qtgui)
3844 + $(add_qt_dep qtnetwork)
3845 + $(add_qt_dep qtwidgets)
3846 ssl? ( dev-libs/cyrus-sasl )
3847 "
3848 DEPEND="${COMMON_DEPEND}
3849
3850 diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-15.12.1.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-15.12.1.ebuild
3851 index e7facf2..3aca9a9 100644
3852 --- a/kde-apps/kdepim-l10n/kdepim-l10n-15.12.1.ebuild
3853 +++ b/kde-apps/kdepim-l10n/kdepim-l10n-15.12.1.ebuild
3854 @@ -12,7 +12,7 @@ HOMEPAGE="http://l10n.kde.org"
3855
3856 DEPEND="
3857 $(add_frameworks_dep ki18n)
3858 - dev-qt/linguist-tools:5
3859 + $(add_qt_dep linguist-tools)
3860 sys-devel/gettext
3861 "
3862 RDEPEND="
3863
3864 diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-15.12.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-15.12.1.ebuild
3865 index f380eee..e04e941 100644
3866 --- a/kde-apps/kdepim-runtime/kdepim-runtime-15.12.1.ebuild
3867 +++ b/kde-apps/kdepim-runtime/kdepim-runtime-15.12.1.ebuild
3868 @@ -51,12 +51,12 @@ CDEPEND="
3869 $(add_kdeapps_dep kmime)
3870 $(add_kdeapps_dep libakonadi)
3871 dev-libs/libical:=
3872 - dev-qt/qtdbus:5
3873 - dev-qt/qtgui:5
3874 - dev-qt/qtnetwork:5
3875 - dev-qt/qtwidgets:5
3876 - dev-qt/qtxml:5
3877 - dev-qt/qtxmlpatterns:5
3878 + $(add_qt_dep qtdbus)
3879 + $(add_qt_dep qtgui)
3880 + $(add_qt_dep qtnetwork)
3881 + $(add_qt_dep qtwidgets)
3882 + $(add_qt_dep qtxml)
3883 + $(add_qt_dep qtxmlpatterns)
3884 "
3885 DEPEND="${CDEPEND}
3886 $(add_frameworks_dep kross)
3887
3888 diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-15.12.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-15.12.49.9999.ebuild
3889 index 6e0b627..a50ac7a 100644
3890 --- a/kde-apps/kdepim-runtime/kdepim-runtime-15.12.49.9999.ebuild
3891 +++ b/kde-apps/kdepim-runtime/kdepim-runtime-15.12.49.9999.ebuild
3892 @@ -51,12 +51,12 @@ CDEPEND="
3893 $(add_kdeapps_dep kmime)
3894 $(add_kdeapps_dep libakonadi)
3895 dev-libs/libical:=
3896 - dev-qt/qtdbus:5
3897 - dev-qt/qtgui:5
3898 - dev-qt/qtnetwork:5
3899 - dev-qt/qtwidgets:5
3900 - dev-qt/qtxml:5
3901 - dev-qt/qtxmlpatterns:5
3902 + $(add_qt_dep qtdbus)
3903 + $(add_qt_dep qtgui)
3904 + $(add_qt_dep qtnetwork)
3905 + $(add_qt_dep qtwidgets)
3906 + $(add_qt_dep qtxml)
3907 + $(add_qt_dep qtxmlpatterns)
3908 "
3909 DEPEND="${CDEPEND}
3910 $(add_frameworks_dep kross)
3911
3912 diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
3913 index c96a890..980cfd5 100644
3914 --- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
3915 +++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
3916 @@ -50,12 +50,12 @@ CDEPEND="
3917 $(add_kdeapps_dep kmbox)
3918 $(add_kdeapps_dep kmime)
3919 dev-libs/libical:=
3920 - dev-qt/qtdbus:5
3921 - dev-qt/qtgui:5
3922 - dev-qt/qtnetwork:5
3923 - dev-qt/qtwidgets:5
3924 - dev-qt/qtxml:5
3925 - dev-qt/qtxmlpatterns:5
3926 + $(add_qt_dep qtdbus)
3927 + $(add_qt_dep qtgui)
3928 + $(add_qt_dep qtnetwork)
3929 + $(add_qt_dep qtwidgets)
3930 + $(add_qt_dep qtxml)
3931 + $(add_qt_dep qtxmlpatterns)
3932 "
3933 DEPEND="${CDEPEND}
3934 $(add_frameworks_dep kross)
3935
3936 diff --git a/kde-apps/kdepim/kdepim-15.12.1.ebuild b/kde-apps/kdepim/kdepim-15.12.1.ebuild
3937 index 965b63d..967eaec 100644
3938 --- a/kde-apps/kdepim/kdepim-15.12.1.ebuild
3939 +++ b/kde-apps/kdepim/kdepim-15.12.1.ebuild
3940 @@ -100,19 +100,19 @@ COMMON_DEPEND="
3941 dev-libs/boost:=
3942 dev-libs/grantlee:5
3943 dev-libs/libxslt
3944 - dev-qt/qtconcurrent:5
3945 - dev-qt/qtdbus:5
3946 - dev-qt/qtgui:5
3947 - dev-qt/qtnetwork:5
3948 - dev-qt/qtopengl:5
3949 - dev-qt/qtscript:5
3950 - dev-qt/qtsql:5
3951 - dev-qt/qtwebkit:5
3952 - dev-qt/qtwidgets:5
3953 - dev-qt/qtx11extras:5
3954 - dev-qt/qtxml:5
3955 + $(add_qt_dep qtconcurrent)
3956 + $(add_qt_dep qtdbus)
3957 + $(add_qt_dep qtgui)
3958 + $(add_qt_dep qtnetwork)
3959 + $(add_qt_dep qtopengl)
3960 + $(add_qt_dep qtscript)
3961 + $(add_qt_dep qtsql)
3962 + $(add_qt_dep qtwebkit)
3963 + $(add_qt_dep qtwidgets)
3964 + $(add_qt_dep qtx11extras)
3965 + $(add_qt_dep qtxml)
3966 media-libs/phonon[qt5]
3967 - designer? ( dev-qt/designer:5 )
3968 + designer? ( $(add_qt_dep designer) )
3969 google? ( net-libs/libkgapi:5 )
3970 prison? ( media-libs/prison:5 )
3971 kdepim_features_kleopatra? (
3972 @@ -128,7 +128,7 @@ DEPEND="${COMMON_DEPEND}
3973 test? (
3974 $(add_kdeapps_dep akonadi sqlite)
3975 $(add_kdeapps_dep libakonadi tools)
3976 - dev-qt/qtsql:5[sqlite]
3977 + $(add_qt_dep qtsql 'sqlite')
3978 )
3979 "
3980 RDEPEND="${COMMON_DEPEND}
3981
3982 diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
3983 index a075dc5..e44db90 100644
3984 --- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
3985 +++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
3986 @@ -100,19 +100,19 @@ COMMON_DEPEND="
3987 dev-libs/boost:=
3988 dev-libs/grantlee:5
3989 dev-libs/libxslt
3990 - dev-qt/qtconcurrent:5
3991 - dev-qt/qtdbus:5
3992 - dev-qt/qtgui:5
3993 - dev-qt/qtnetwork:5
3994 - dev-qt/qtopengl:5
3995 - dev-qt/qtscript:5
3996 - dev-qt/qtsql:5
3997 - dev-qt/qtwebkit:5
3998 - dev-qt/qtwidgets:5
3999 - dev-qt/qtx11extras:5
4000 - dev-qt/qtxml:5
4001 + $(add_qt_dep qtconcurrent)
4002 + $(add_qt_dep qtdbus)
4003 + $(add_qt_dep qtgui)
4004 + $(add_qt_dep qtnetwork)
4005 + $(add_qt_dep qtopengl)
4006 + $(add_qt_dep qtscript)
4007 + $(add_qt_dep qtsql)
4008 + $(add_qt_dep qtwebkit)
4009 + $(add_qt_dep qtwidgets)
4010 + $(add_qt_dep qtx11extras)
4011 + $(add_qt_dep qtxml)
4012 media-libs/phonon[qt5]
4013 - designer? ( dev-qt/designer:5 )
4014 + designer? ( $(add_qt_dep designer) )
4015 google? ( net-libs/libkgapi:5 )
4016 prison? ( media-libs/prison:5 )
4017 kdepim_features_kleopatra? (
4018 @@ -128,7 +128,7 @@ DEPEND="${COMMON_DEPEND}
4019 test? (
4020 $(add_kdeapps_dep akonadi sqlite)
4021 $(add_kdeapps_dep libakonadi tools)
4022 - dev-qt/qtsql:5[sqlite]
4023 + $(add_qt_dep qtsql 'sqlite')
4024 )
4025 "
4026 RDEPEND="${COMMON_DEPEND}
4027
4028 diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
4029 index 3171926..3b64089 100644
4030 --- a/kde-apps/kdepim/kdepim-9999.ebuild
4031 +++ b/kde-apps/kdepim/kdepim-9999.ebuild
4032 @@ -91,19 +91,19 @@ COMMON_DEPEND="
4033 dev-libs/boost:=
4034 dev-libs/grantlee:5
4035 dev-libs/libxslt
4036 - dev-qt/qtconcurrent:5
4037 - dev-qt/qtdbus:5
4038 - dev-qt/qtgui:5
4039 - dev-qt/qtnetwork:5
4040 - dev-qt/qtopengl:5
4041 - dev-qt/qtscript:5
4042 - dev-qt/qtsql:5
4043 - dev-qt/qtwebkit:5
4044 - dev-qt/qtwidgets:5
4045 - dev-qt/qtx11extras:5
4046 - dev-qt/qtxml:5
4047 + $(add_qt_dep qtconcurrent)
4048 + $(add_qt_dep qtdbus)
4049 + $(add_qt_dep qtgui)
4050 + $(add_qt_dep qtnetwork)
4051 + $(add_qt_dep qtopengl)
4052 + $(add_qt_dep qtscript)
4053 + $(add_qt_dep qtsql)
4054 + $(add_qt_dep qtwebkit)
4055 + $(add_qt_dep qtwidgets)
4056 + $(add_qt_dep qtx11extras)
4057 + $(add_qt_dep qtxml)
4058 media-libs/phonon[qt5]
4059 - designer? ( dev-qt/designer:5 )
4060 + designer? ( $(add_qt_dep designer) )
4061 google? ( net-libs/libkgapi:5 )
4062 prison? ( media-libs/prison:5 )
4063 kdepim_features_kleopatra? (
4064 @@ -115,7 +115,7 @@ DEPEND="${COMMON_DEPEND}
4065 sys-devel/gettext
4066 test? (
4067 $(add_kdeapps_dep akonadi 'sqlite,tools')
4068 - dev-qt/qtsql:5[sqlite]
4069 + $(add_qt_dep qtsql 'sqlite')
4070 )
4071 "
4072 RDEPEND="${COMMON_DEPEND}
4073
4074 diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-15.12.1.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-15.12.1.ebuild
4075 index 57c068d..efe0e49 100644
4076 --- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-15.12.1.ebuild
4077 +++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-15.12.1.ebuild
4078 @@ -15,8 +15,8 @@ DEPEND="
4079 $(add_frameworks_dep ki18n)
4080 $(add_frameworks_dep kio)
4081 $(add_frameworks_dep kwidgetsaddons)
4082 - dev-qt/qtgui:5
4083 - dev-qt/qtwidgets:5
4084 + $(add_qt_dep qtgui)
4085 + $(add_qt_dep qtwidgets)
4086 sys-devel/gettext
4087 "
4088 RDEPEND="${DEPEND}"
4089
4090 diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-15.12.49.9999.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-15.12.49.9999.ebuild
4091 index 1fcb42a..1930d12 100644
4092 --- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-15.12.49.9999.ebuild
4093 +++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-15.12.49.9999.ebuild
4094 @@ -15,8 +15,8 @@ DEPEND="
4095 $(add_frameworks_dep ki18n)
4096 $(add_frameworks_dep kio)
4097 $(add_frameworks_dep kwidgetsaddons)
4098 - dev-qt/qtgui:5
4099 - dev-qt/qtwidgets:5
4100 + $(add_qt_dep qtgui)
4101 + $(add_qt_dep qtwidgets)
4102 sys-devel/gettext
4103 "
4104 RDEPEND="${DEPEND}"
4105
4106 diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-9999.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-9999.ebuild
4107 index 1fcb42a..1930d12 100644
4108 --- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-9999.ebuild
4109 +++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-9999.ebuild
4110 @@ -15,8 +15,8 @@ DEPEND="
4111 $(add_frameworks_dep ki18n)
4112 $(add_frameworks_dep kio)
4113 $(add_frameworks_dep kwidgetsaddons)
4114 - dev-qt/qtgui:5
4115 - dev-qt/qtwidgets:5
4116 + $(add_qt_dep qtgui)
4117 + $(add_qt_dep qtwidgets)
4118 sys-devel/gettext
4119 "
4120 RDEPEND="${DEPEND}"
4121
4122 diff --git a/kde-apps/kdgantt2/kdgantt2-15.12.1.ebuild b/kde-apps/kdgantt2/kdgantt2-15.12.1.ebuild
4123 index 08a84dc..d77e72d 100644
4124 --- a/kde-apps/kdgantt2/kdgantt2-15.12.1.ebuild
4125 +++ b/kde-apps/kdgantt2/kdgantt2-15.12.1.ebuild
4126 @@ -15,9 +15,9 @@ KEYWORDS=" ~amd64 ~x86"
4127 IUSE=""
4128
4129 COMMON_DEPEND="
4130 - dev-qt/qtgui:5
4131 - dev-qt/qtprintsupport:5
4132 - dev-qt/qtwidgets:5
4133 + $(add_qt_dep qtgui)
4134 + $(add_qt_dep qtprintsupport)
4135 + $(add_qt_dep qtwidgets)
4136 "
4137 DEPEND="${COMMON_DEPEND}
4138 sys-devel/gettext
4139
4140 diff --git a/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild b/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild
4141 index c6387b4..649f766 100644
4142 --- a/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild
4143 +++ b/kde-apps/kdgantt2/kdgantt2-15.12.49.9999.ebuild
4144 @@ -15,9 +15,9 @@ KEYWORDS=""
4145 IUSE=""
4146
4147 COMMON_DEPEND="
4148 - dev-qt/qtgui:5
4149 - dev-qt/qtprintsupport:5
4150 - dev-qt/qtwidgets:5
4151 + $(add_qt_dep qtgui)
4152 + $(add_qt_dep qtprintsupport)
4153 + $(add_qt_dep qtwidgets)
4154 "
4155 DEPEND="${COMMON_DEPEND}
4156 sys-devel/gettext
4157
4158 diff --git a/kde-apps/kdgantt2/kdgantt2-9999.ebuild b/kde-apps/kdgantt2/kdgantt2-9999.ebuild
4159 index fe683ce..68ad5a4 100644
4160 --- a/kde-apps/kdgantt2/kdgantt2-9999.ebuild
4161 +++ b/kde-apps/kdgantt2/kdgantt2-9999.ebuild
4162 @@ -14,9 +14,9 @@ KEYWORDS=""
4163 IUSE=""
4164
4165 COMMON_DEPEND="
4166 - dev-qt/qtgui:5
4167 - dev-qt/qtprintsupport:5
4168 - dev-qt/qtwidgets:5
4169 + $(add_qt_dep qtgui)
4170 + $(add_qt_dep qtprintsupport)
4171 + $(add_qt_dep qtwidgets)
4172 "
4173 DEPEND="${COMMON_DEPEND}
4174 sys-devel/gettext
4175
4176 diff --git a/kde-apps/kdiagram/kdiagram-9999.ebuild b/kde-apps/kdiagram/kdiagram-9999.ebuild
4177 index 966dd66..cc0f0e7 100644
4178 --- a/kde-apps/kdiagram/kdiagram-9999.ebuild
4179 +++ b/kde-apps/kdiagram/kdiagram-9999.ebuild
4180 @@ -12,9 +12,9 @@ KEYWORDS=""
4181 IUSE=""
4182
4183 DEPEND="
4184 - dev-qt/qtgui:5
4185 - dev-qt/qtprintsupport:5
4186 - dev-qt/qtsvg:5
4187 - dev-qt/qtwidgets:5
4188 + $(add_qt_dep qtgui)
4189 + $(add_qt_dep qtprintsupport)
4190 + $(add_qt_dep qtsvg)
4191 + $(add_qt_dep qtwidgets)
4192 "
4193 RDEPEND="${DEPEND}"
4194
4195 diff --git a/kde-apps/kdialog/kdialog-5.9999.ebuild b/kde-apps/kdialog/kdialog-5.9999.ebuild
4196 index d78f999..c250c03 100644
4197 --- a/kde-apps/kdialog/kdialog-5.9999.ebuild
4198 +++ b/kde-apps/kdialog/kdialog-5.9999.ebuild
4199 @@ -17,5 +17,5 @@ S=${WORKDIR}/${P}/${PN}
4200 DEPEND="
4201 $(add_frameworks_dep kdelibs4support)
4202 $(add_frameworks_dep kwidgetsaddons)
4203 - dev-qt/qtdbus:5"
4204 + $(add_qt_dep qtdbus)"
4205 RDEPEND="${DEPEND}"
4206
4207 diff --git a/kde-apps/kdiamond/kdiamond-15.12.1.ebuild b/kde-apps/kdiamond/kdiamond-15.12.1.ebuild
4208 index 76cbaa1..119dbde 100644
4209 --- a/kde-apps/kdiamond/kdiamond-15.12.1.ebuild
4210 +++ b/kde-apps/kdiamond/kdiamond-15.12.1.ebuild
4211 @@ -26,8 +26,8 @@ DEPEND="
4212 $(add_frameworks_dep kwidgetsaddons)
4213 $(add_frameworks_dep kxmlgui)
4214 $(add_kdeapps_dep libkdegames)
4215 - dev-qt/qtgui:5
4216 - dev-qt/qtwidgets:5
4217 + $(add_qt_dep qtgui)
4218 + $(add_qt_dep qtwidgets)
4219 "
4220
4221 RDEPEND="${DEPEND}"
4222
4223 diff --git a/kde-apps/kdiamond/kdiamond-15.12.49.9999.ebuild b/kde-apps/kdiamond/kdiamond-15.12.49.9999.ebuild
4224 index 5798729..bd744bf 100644
4225 --- a/kde-apps/kdiamond/kdiamond-15.12.49.9999.ebuild
4226 +++ b/kde-apps/kdiamond/kdiamond-15.12.49.9999.ebuild
4227 @@ -26,8 +26,8 @@ DEPEND="
4228 $(add_frameworks_dep kwidgetsaddons)
4229 $(add_frameworks_dep kxmlgui)
4230 $(add_kdeapps_dep libkdegames)
4231 - dev-qt/qtgui:5
4232 - dev-qt/qtwidgets:5
4233 + $(add_qt_dep qtgui)
4234 + $(add_qt_dep qtwidgets)
4235 "
4236
4237 RDEPEND="${DEPEND}"
4238
4239 diff --git a/kde-apps/kdiamond/kdiamond-9999.ebuild b/kde-apps/kdiamond/kdiamond-9999.ebuild
4240 index 77ef369..66046ff 100644
4241 --- a/kde-apps/kdiamond/kdiamond-9999.ebuild
4242 +++ b/kde-apps/kdiamond/kdiamond-9999.ebuild
4243 @@ -27,8 +27,8 @@ DEPEND="
4244 $(add_frameworks_dep kwidgetsaddons)
4245 $(add_frameworks_dep kxmlgui)
4246 $(add_kdeapps_dep libkdegames)
4247 - dev-qt/qtgui:5
4248 - dev-qt/qtwidgets:5
4249 + $(add_qt_dep qtgui)
4250 + $(add_qt_dep qtwidgets)
4251 "
4252
4253 RDEPEND="${DEPEND}"
4254
4255 diff --git a/kde-apps/kfind/kfind-5.9999.ebuild b/kde-apps/kfind/kfind-5.9999.ebuild
4256 index d608594..8ad613d 100644
4257 --- a/kde-apps/kfind/kfind-5.9999.ebuild
4258 +++ b/kde-apps/kfind/kfind-5.9999.ebuild
4259 @@ -28,8 +28,8 @@ DEPEND="
4260 $(add_frameworks_dep kwidgetsaddons)
4261 $(add_frameworks_dep kxmlgui)
4262 $(add_kdeapps_dep libkonq)
4263 - dev-qt/qtgui:5
4264 - dev-qt/qtwidgets:5
4265 + $(add_qt_dep qtgui)
4266 + $(add_qt_dep qtwidgets)
4267 "
4268 RDEPEND="${DEPEND}"
4269
4270
4271 diff --git a/kde-apps/kfourinline/kfourinline-15.12.1.ebuild b/kde-apps/kfourinline/kfourinline-15.12.1.ebuild
4272 index 3087035..69910b5 100644
4273 --- a/kde-apps/kfourinline/kfourinline-15.12.1.ebuild
4274 +++ b/kde-apps/kfourinline/kfourinline-15.12.1.ebuild
4275 @@ -27,8 +27,8 @@ DEPEND="
4276 $(add_frameworks_dep kwidgetsaddons)
4277 $(add_frameworks_dep kxmlgui)
4278 $(add_kdeapps_dep libkdegames)
4279 - dev-qt/qtgui:5
4280 - dev-qt/qtsvg:5
4281 - dev-qt/qtwidgets:5
4282 + $(add_qt_dep qtgui)
4283 + $(add_qt_dep qtsvg)
4284 + $(add_qt_dep qtwidgets)
4285 "
4286 RDEPEND="${DEPEND}"
4287
4288 diff --git a/kde-apps/kfourinline/kfourinline-15.12.49.9999.ebuild b/kde-apps/kfourinline/kfourinline-15.12.49.9999.ebuild
4289 index 157b45c..f19a8b5 100644
4290 --- a/kde-apps/kfourinline/kfourinline-15.12.49.9999.ebuild
4291 +++ b/kde-apps/kfourinline/kfourinline-15.12.49.9999.ebuild
4292 @@ -27,8 +27,8 @@ DEPEND="
4293 $(add_frameworks_dep kwidgetsaddons)
4294 $(add_frameworks_dep kxmlgui)
4295 $(add_kdeapps_dep libkdegames)
4296 - dev-qt/qtgui:5
4297 - dev-qt/qtsvg:5
4298 - dev-qt/qtwidgets:5
4299 + $(add_qt_dep qtgui)
4300 + $(add_qt_dep qtsvg)
4301 + $(add_qt_dep qtwidgets)
4302 "
4303 RDEPEND="${DEPEND}"
4304
4305 diff --git a/kde-apps/kfourinline/kfourinline-9999.ebuild b/kde-apps/kfourinline/kfourinline-9999.ebuild
4306 index 462758c..d98c460 100644
4307 --- a/kde-apps/kfourinline/kfourinline-9999.ebuild
4308 +++ b/kde-apps/kfourinline/kfourinline-9999.ebuild
4309 @@ -28,8 +28,8 @@ DEPEND="
4310 $(add_frameworks_dep kwidgetsaddons)
4311 $(add_frameworks_dep kxmlgui)
4312 $(add_kdeapps_dep libkdegames)
4313 - dev-qt/qtgui:5
4314 - dev-qt/qtsvg:5
4315 - dev-qt/qtwidgets:5
4316 + $(add_qt_dep qtgui)
4317 + $(add_qt_dep qtsvg)
4318 + $(add_qt_dep qtwidgets)
4319 "
4320 RDEPEND="${DEPEND}"
4321
4322 diff --git a/kde-apps/kgeography/kgeography-15.08.3-r1.ebuild b/kde-apps/kgeography/kgeography-15.08.3-r1.ebuild
4323 index 77a3ac0..d022a8e 100644
4324 --- a/kde-apps/kgeography/kgeography-15.08.3-r1.ebuild
4325 +++ b/kde-apps/kgeography/kgeography-15.08.3-r1.ebuild
4326 @@ -23,9 +23,9 @@ DEPEND="
4327 $(add_frameworks_dep kitemviews)
4328 $(add_frameworks_dep kwidgetsaddons)
4329 $(add_frameworks_dep kxmlgui)
4330 - dev-qt/qtgui:5
4331 - dev-qt/qtwidgets:5
4332 - dev-qt/qtxml:5
4333 + $(add_qt_dep qtgui)
4334 + $(add_qt_dep qtwidgets)
4335 + $(add_qt_dep qtxml)
4336 "
4337 RDEPEND="${DEPEND}"
4338
4339
4340 diff --git a/kde-apps/kgeography/kgeography-15.12.1.ebuild b/kde-apps/kgeography/kgeography-15.12.1.ebuild
4341 index 77a3ac0..d022a8e 100644
4342 --- a/kde-apps/kgeography/kgeography-15.12.1.ebuild
4343 +++ b/kde-apps/kgeography/kgeography-15.12.1.ebuild
4344 @@ -23,9 +23,9 @@ DEPEND="
4345 $(add_frameworks_dep kitemviews)
4346 $(add_frameworks_dep kwidgetsaddons)
4347 $(add_frameworks_dep kxmlgui)
4348 - dev-qt/qtgui:5
4349 - dev-qt/qtwidgets:5
4350 - dev-qt/qtxml:5
4351 + $(add_qt_dep qtgui)
4352 + $(add_qt_dep qtwidgets)
4353 + $(add_qt_dep qtxml)
4354 "
4355 RDEPEND="${DEPEND}"
4356
4357
4358 diff --git a/kde-apps/kgeography/kgeography-15.12.49.9999.ebuild b/kde-apps/kgeography/kgeography-15.12.49.9999.ebuild
4359 index 6f223ff..7c5bc9a 100644
4360 --- a/kde-apps/kgeography/kgeography-15.12.49.9999.ebuild
4361 +++ b/kde-apps/kgeography/kgeography-15.12.49.9999.ebuild
4362 @@ -23,9 +23,9 @@ DEPEND="
4363 $(add_frameworks_dep kitemviews)
4364 $(add_frameworks_dep kwidgetsaddons)
4365 $(add_frameworks_dep kxmlgui)
4366 - dev-qt/qtgui:5
4367 - dev-qt/qtwidgets:5
4368 - dev-qt/qtxml:5
4369 + $(add_qt_dep qtgui)
4370 + $(add_qt_dep qtwidgets)
4371 + $(add_qt_dep qtxml)
4372 "
4373 RDEPEND="${DEPEND}"
4374
4375
4376 diff --git a/kde-apps/kgeography/kgeography-9999.ebuild b/kde-apps/kgeography/kgeography-9999.ebuild
4377 index ae3e00c..74204ec 100644
4378 --- a/kde-apps/kgeography/kgeography-9999.ebuild
4379 +++ b/kde-apps/kgeography/kgeography-9999.ebuild
4380 @@ -23,8 +23,8 @@ DEPEND="
4381 $(add_frameworks_dep kitemviews)
4382 $(add_frameworks_dep kwidgetsaddons)
4383 $(add_frameworks_dep kxmlgui)
4384 - dev-qt/qtgui:5
4385 - dev-qt/qtwidgets:5
4386 - dev-qt/qtxml:5
4387 + $(add_qt_dep qtgui)
4388 + $(add_qt_dep qtwidgets)
4389 + $(add_qt_dep qtxml)
4390 "
4391 RDEPEND="${DEPEND}"
4392
4393 diff --git a/kde-apps/kget/kget-5.9999.ebuild b/kde-apps/kget/kget-5.9999.ebuild
4394 index 13d0651..566d1c5 100644
4395 --- a/kde-apps/kget/kget-5.9999.ebuild
4396 +++ b/kde-apps/kget/kget-5.9999.ebuild
4397 @@ -33,12 +33,12 @@ RDEPEND="
4398 $(add_frameworks_dep kwallet)
4399 $(add_frameworks_dep kwidgetsaddons)
4400 $(add_frameworks_dep solid)
4401 - dev-qt/qtdbus:5
4402 - dev-qt/qtnetwork:5
4403 - dev-qt/qtsql:5
4404 - dev-qt/qttest:5
4405 - dev-qt/qtwidgets:5
4406 - dev-qt/qtxml:5
4407 + $(add_qt_dep qtdbus)
4408 + $(add_qt_dep qtnetwork)
4409 + $(add_qt_dep qtsql)
4410 + $(add_qt_dep qttest)
4411 + $(add_qt_dep qtwidgets)
4412 + $(add_qt_dep qtxml)
4413 gpg? ( $(add_kdeapps_dep gpgmepp) )
4414 mms? ( media-libs/libmms )
4415 sqlite? ( dev-db/sqlite:3 )
4416
4417 diff --git a/kde-apps/kgoldrunner/kgoldrunner-5.9999.ebuild b/kde-apps/kgoldrunner/kgoldrunner-5.9999.ebuild
4418 index 5610ea7..431132c 100644
4419 --- a/kde-apps/kgoldrunner/kgoldrunner-5.9999.ebuild
4420 +++ b/kde-apps/kgoldrunner/kgoldrunner-5.9999.ebuild
4421 @@ -28,8 +28,8 @@ DEPEND="
4422 $(add_frameworks_dep kwidgetsaddons)
4423 $(add_frameworks_dep kxmlgui)
4424 $(add_kdeapps_dep libkdegames)
4425 - dev-qt/qtgui:5
4426 - dev-qt/qtwidgets:5
4427 + $(add_qt_dep qtgui)
4428 + $(add_qt_dep qtwidgets)
4429 media-libs/libsndfile
4430 media-libs/openal
4431 "
4432
4433 diff --git a/kde-apps/khangman/khangman-15.08.3.ebuild b/kde-apps/khangman/khangman-15.08.3.ebuild
4434 index e9d4282..dfbca4e 100644
4435 --- a/kde-apps/khangman/khangman-15.08.3.ebuild
4436 +++ b/kde-apps/khangman/khangman-15.08.3.ebuild
4437 @@ -25,10 +25,10 @@ DEPEND="
4438 $(add_frameworks_dep kwidgetsaddons)
4439 $(add_frameworks_dep kxmlgui)
4440 $(add_kdeapps_dep libkeduvocdocument)
4441 - dev-qt/qtgui:5
4442 - dev-qt/qtsvg:5
4443 - dev-qt/qtwidgets:5
4444 - dev-qt/qtxml:5
4445 + $(add_qt_dep qtgui)
4446 + $(add_qt_dep qtsvg)
4447 + $(add_qt_dep qtwidgets)
4448 + $(add_qt_dep qtxml)
4449 media-libs/phonon[qt5]
4450 "
4451 RDEPEND="${DEPEND}
4452
4453 diff --git a/kde-apps/khangman/khangman-15.12.1.ebuild b/kde-apps/khangman/khangman-15.12.1.ebuild
4454 index e9d4282..dfbca4e 100644
4455 --- a/kde-apps/khangman/khangman-15.12.1.ebuild
4456 +++ b/kde-apps/khangman/khangman-15.12.1.ebuild
4457 @@ -25,10 +25,10 @@ DEPEND="
4458 $(add_frameworks_dep kwidgetsaddons)
4459 $(add_frameworks_dep kxmlgui)
4460 $(add_kdeapps_dep libkeduvocdocument)
4461 - dev-qt/qtgui:5
4462 - dev-qt/qtsvg:5
4463 - dev-qt/qtwidgets:5
4464 - dev-qt/qtxml:5
4465 + $(add_qt_dep qtgui)
4466 + $(add_qt_dep qtsvg)
4467 + $(add_qt_dep qtwidgets)
4468 + $(add_qt_dep qtxml)
4469 media-libs/phonon[qt5]
4470 "
4471 RDEPEND="${DEPEND}
4472
4473 diff --git a/kde-apps/khangman/khangman-15.12.49.9999.ebuild b/kde-apps/khangman/khangman-15.12.49.9999.ebuild
4474 index 802e210..05fcef4 100644
4475 --- a/kde-apps/khangman/khangman-15.12.49.9999.ebuild
4476 +++ b/kde-apps/khangman/khangman-15.12.49.9999.ebuild
4477 @@ -25,10 +25,10 @@ DEPEND="
4478 $(add_frameworks_dep kwidgetsaddons)
4479 $(add_frameworks_dep kxmlgui)
4480 $(add_kdeapps_dep libkeduvocdocument)
4481 - dev-qt/qtgui:5
4482 - dev-qt/qtsvg:5
4483 - dev-qt/qtwidgets:5
4484 - dev-qt/qtxml:5
4485 + $(add_qt_dep qtgui)
4486 + $(add_qt_dep qtsvg)
4487 + $(add_qt_dep qtwidgets)
4488 + $(add_qt_dep qtxml)
4489 media-libs/phonon[qt5]
4490 "
4491 RDEPEND="${DEPEND}
4492
4493 diff --git a/kde-apps/khangman/khangman-9999.ebuild b/kde-apps/khangman/khangman-9999.ebuild
4494 index 802e210..05fcef4 100644
4495 --- a/kde-apps/khangman/khangman-9999.ebuild
4496 +++ b/kde-apps/khangman/khangman-9999.ebuild
4497 @@ -25,10 +25,10 @@ DEPEND="
4498 $(add_frameworks_dep kwidgetsaddons)
4499 $(add_frameworks_dep kxmlgui)
4500 $(add_kdeapps_dep libkeduvocdocument)
4501 - dev-qt/qtgui:5
4502 - dev-qt/qtsvg:5
4503 - dev-qt/qtwidgets:5
4504 - dev-qt/qtxml:5
4505 + $(add_qt_dep qtgui)
4506 + $(add_qt_dep qtsvg)
4507 + $(add_qt_dep qtwidgets)
4508 + $(add_qt_dep qtxml)
4509 media-libs/phonon[qt5]
4510 "
4511 RDEPEND="${DEPEND}
4512
4513 diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-15.12.1.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-15.12.1.ebuild
4514 index bb43c9c..eb971d7 100644
4515 --- a/kde-apps/kidentitymanagement/kidentitymanagement-15.12.1.ebuild
4516 +++ b/kde-apps/kidentitymanagement/kidentitymanagement-15.12.1.ebuild
4517 @@ -24,9 +24,9 @@ RDEPEND="
4518 $(add_frameworks_dep ktextwidgets)
4519 $(add_frameworks_dep kwidgetsaddons)
4520 $(add_frameworks_dep kxmlgui)
4521 - dev-qt/qtdbus:5
4522 - dev-qt/qtgui:5
4523 - dev-qt/qtnetwork:5
4524 - dev-qt/qtwidgets:5
4525 + $(add_qt_dep qtdbus)
4526 + $(add_qt_dep qtgui)
4527 + $(add_qt_dep qtnetwork)
4528 + $(add_qt_dep qtwidgets)
4529 "
4530 DEPEND="${RDEPEND}"
4531
4532 diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-15.12.49.9999.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-15.12.49.9999.ebuild
4533 index 5779d60..a611d8a 100644
4534 --- a/kde-apps/kidentitymanagement/kidentitymanagement-15.12.49.9999.ebuild
4535 +++ b/kde-apps/kidentitymanagement/kidentitymanagement-15.12.49.9999.ebuild
4536 @@ -24,9 +24,9 @@ RDEPEND="
4537 $(add_frameworks_dep ktextwidgets)
4538 $(add_frameworks_dep kwidgetsaddons)
4539 $(add_frameworks_dep kxmlgui)
4540 - dev-qt/qtdbus:5
4541 - dev-qt/qtgui:5
4542 - dev-qt/qtnetwork:5
4543 - dev-qt/qtwidgets:5
4544 + $(add_qt_dep qtdbus)
4545 + $(add_qt_dep qtgui)
4546 + $(add_qt_dep qtnetwork)
4547 + $(add_qt_dep qtwidgets)
4548 "
4549 DEPEND="${RDEPEND}"
4550
4551 diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
4552 index 5779d60..a611d8a 100644
4553 --- a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
4554 +++ b/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
4555 @@ -24,9 +24,9 @@ RDEPEND="
4556 $(add_frameworks_dep ktextwidgets)
4557 $(add_frameworks_dep kwidgetsaddons)
4558 $(add_frameworks_dep kxmlgui)
4559 - dev-qt/qtdbus:5
4560 - dev-qt/qtgui:5
4561 - dev-qt/qtnetwork:5
4562 - dev-qt/qtwidgets:5
4563 + $(add_qt_dep qtdbus)
4564 + $(add_qt_dep qtgui)
4565 + $(add_qt_dep qtnetwork)
4566 + $(add_qt_dep qtwidgets)
4567 "
4568 DEPEND="${RDEPEND}"
4569
4570 diff --git a/kde-apps/kig/kig-15.08.3.ebuild b/kde-apps/kig/kig-15.08.3.ebuild
4571 index ed59106..12dab24 100644
4572 --- a/kde-apps/kig/kig-15.08.3.ebuild
4573 +++ b/kde-apps/kig/kig-15.08.3.ebuild
4574 @@ -28,11 +28,11 @@ DEPEND="
4575 $(add_frameworks_dep kservice)
4576 $(add_frameworks_dep kwidgetsaddons)
4577 $(add_frameworks_dep kxmlgui)
4578 - dev-qt/qtgui:5
4579 - dev-qt/qtprintsupport:5
4580 - dev-qt/qtsvg:5
4581 - dev-qt/qtwidgets:5
4582 - dev-qt/qtxml:5
4583 + $(add_qt_dep qtgui)
4584 + $(add_qt_dep qtprintsupport)
4585 + $(add_qt_dep qtsvg)
4586 + $(add_qt_dep qtwidgets)
4587 + $(add_qt_dep qtxml)
4588 scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
4589 "
4590 RDEPEND="${DEPEND}"
4591
4592 diff --git a/kde-apps/kig/kig-15.12.1.ebuild b/kde-apps/kig/kig-15.12.1.ebuild
4593 index ed59106..12dab24 100644
4594 --- a/kde-apps/kig/kig-15.12.1.ebuild
4595 +++ b/kde-apps/kig/kig-15.12.1.ebuild
4596 @@ -28,11 +28,11 @@ DEPEND="
4597 $(add_frameworks_dep kservice)
4598 $(add_frameworks_dep kwidgetsaddons)
4599 $(add_frameworks_dep kxmlgui)
4600 - dev-qt/qtgui:5
4601 - dev-qt/qtprintsupport:5
4602 - dev-qt/qtsvg:5
4603 - dev-qt/qtwidgets:5
4604 - dev-qt/qtxml:5
4605 + $(add_qt_dep qtgui)
4606 + $(add_qt_dep qtprintsupport)
4607 + $(add_qt_dep qtsvg)
4608 + $(add_qt_dep qtwidgets)
4609 + $(add_qt_dep qtxml)
4610 scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
4611 "
4612 RDEPEND="${DEPEND}"
4613
4614 diff --git a/kde-apps/kig/kig-15.12.49.9999.ebuild b/kde-apps/kig/kig-15.12.49.9999.ebuild
4615 index 6e09586..ffe3ad5 100644
4616 --- a/kde-apps/kig/kig-15.12.49.9999.ebuild
4617 +++ b/kde-apps/kig/kig-15.12.49.9999.ebuild
4618 @@ -28,11 +28,11 @@ DEPEND="
4619 $(add_frameworks_dep kservice)
4620 $(add_frameworks_dep kwidgetsaddons)
4621 $(add_frameworks_dep kxmlgui)
4622 - dev-qt/qtgui:5
4623 - dev-qt/qtprintsupport:5
4624 - dev-qt/qtsvg:5
4625 - dev-qt/qtwidgets:5
4626 - dev-qt/qtxml:5
4627 + $(add_qt_dep qtgui)
4628 + $(add_qt_dep qtprintsupport)
4629 + $(add_qt_dep qtsvg)
4630 + $(add_qt_dep qtwidgets)
4631 + $(add_qt_dep qtxml)
4632 scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
4633 "
4634 RDEPEND="${DEPEND}"
4635
4636 diff --git a/kde-apps/kig/kig-9999.ebuild b/kde-apps/kig/kig-9999.ebuild
4637 index 5618a9c..ed2570f 100644
4638 --- a/kde-apps/kig/kig-9999.ebuild
4639 +++ b/kde-apps/kig/kig-9999.ebuild
4640 @@ -29,11 +29,11 @@ DEPEND="
4641 $(add_frameworks_dep kservice)
4642 $(add_frameworks_dep kwidgetsaddons)
4643 $(add_frameworks_dep kxmlgui)
4644 - dev-qt/qtgui:5
4645 - dev-qt/qtprintsupport:5
4646 - dev-qt/qtsvg:5
4647 - dev-qt/qtwidgets:5
4648 - dev-qt/qtxml:5
4649 + $(add_qt_dep qtgui)
4650 + $(add_qt_dep qtprintsupport)
4651 + $(add_qt_dep qtsvg)
4652 + $(add_qt_dep qtwidgets)
4653 + $(add_qt_dep qtxml)
4654 scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
4655 "
4656 RDEPEND="${DEPEND}"
4657
4658 diff --git a/kde-apps/kigo/kigo-5.9999.ebuild b/kde-apps/kigo/kigo-5.9999.ebuild
4659 index f849d96..22c3a21 100644
4660 --- a/kde-apps/kigo/kigo-5.9999.ebuild
4661 +++ b/kde-apps/kigo/kigo-5.9999.ebuild
4662 @@ -27,9 +27,9 @@ DEPEND="
4663 $(add_frameworks_dep kwidgetsaddons)
4664 $(add_frameworks_dep kxmlgui)
4665 $(add_kdeapps_dep libkdegames)
4666 - dev-qt/qtgui:5
4667 - dev-qt/qtsvg:5
4668 - dev-qt/qtwidgets:5
4669 + $(add_qt_dep qtgui)
4670 + $(add_qt_dep qtsvg)
4671 + $(add_qt_dep qtwidgets)
4672 "
4673 RDEPEND="${DEPEND}
4674 games-board/gnugo
4675
4676 diff --git a/kde-apps/killbots/killbots-15.12.1.ebuild b/kde-apps/killbots/killbots-15.12.1.ebuild
4677 index c3a2a6e..f539063 100644
4678 --- a/kde-apps/killbots/killbots-15.12.1.ebuild
4679 +++ b/kde-apps/killbots/killbots-15.12.1.ebuild
4680 @@ -22,8 +22,8 @@ DEPEND="
4681 $(add_frameworks_dep kwidgetsaddons)
4682 $(add_frameworks_dep kxmlgui)
4683 $(add_kdeapps_dep libkdegames)
4684 - dev-qt/qtgui:5
4685 - dev-qt/qtwidgets:5
4686 + $(add_qt_dep qtgui)
4687 + $(add_qt_dep qtwidgets)
4688 "
4689 RDEPEND="${DEPEND}"
4690
4691
4692 diff --git a/kde-apps/killbots/killbots-15.12.49.9999.ebuild b/kde-apps/killbots/killbots-15.12.49.9999.ebuild
4693 index 8dbcc43..b6e4480 100644
4694 --- a/kde-apps/killbots/killbots-15.12.49.9999.ebuild
4695 +++ b/kde-apps/killbots/killbots-15.12.49.9999.ebuild
4696 @@ -22,8 +22,8 @@ DEPEND="
4697 $(add_frameworks_dep kwidgetsaddons)
4698 $(add_frameworks_dep kxmlgui)
4699 $(add_kdeapps_dep libkdegames)
4700 - dev-qt/qtgui:5
4701 - dev-qt/qtwidgets:5
4702 + $(add_qt_dep qtgui)
4703 + $(add_qt_dep qtwidgets)
4704 "
4705 RDEPEND="${DEPEND}"
4706
4707
4708 diff --git a/kde-apps/killbots/killbots-9999.ebuild b/kde-apps/killbots/killbots-9999.ebuild
4709 index ee3814b..d960d9c 100644
4710 --- a/kde-apps/killbots/killbots-9999.ebuild
4711 +++ b/kde-apps/killbots/killbots-9999.ebuild
4712 @@ -23,8 +23,8 @@ DEPEND="
4713 $(add_frameworks_dep kwidgetsaddons)
4714 $(add_frameworks_dep kxmlgui)
4715 $(add_kdeapps_dep libkdegames)
4716 - dev-qt/qtgui:5
4717 - dev-qt/qtwidgets:5
4718 + $(add_qt_dep qtgui)
4719 + $(add_qt_dep qtwidgets)
4720 "
4721 RDEPEND="${DEPEND}"
4722
4723
4724 diff --git a/kde-apps/kimap/kimap-15.12.1.ebuild b/kde-apps/kimap/kimap-15.12.1.ebuild
4725 index 3550335..c294947 100644
4726 --- a/kde-apps/kimap/kimap-15.12.1.ebuild
4727 +++ b/kde-apps/kimap/kimap-15.12.1.ebuild
4728 @@ -20,6 +20,6 @@ DEPEND="
4729 $(add_frameworks_dep kio)
4730 $(add_kdeapps_dep kmime)
4731 dev-libs/cyrus-sasl
4732 - dev-qt/qtgui:5
4733 + $(add_qt_dep qtgui)
4734 "
4735 RDEPEND="${DEPEND}"
4736
4737 diff --git a/kde-apps/kimap/kimap-15.12.49.9999.ebuild b/kde-apps/kimap/kimap-15.12.49.9999.ebuild
4738 index 9bd4c30..3f830e7 100644
4739 --- a/kde-apps/kimap/kimap-15.12.49.9999.ebuild
4740 +++ b/kde-apps/kimap/kimap-15.12.49.9999.ebuild
4741 @@ -20,6 +20,6 @@ DEPEND="
4742 $(add_frameworks_dep kio)
4743 $(add_kdeapps_dep kmime)
4744 dev-libs/cyrus-sasl
4745 - dev-qt/qtgui:5
4746 + $(add_qt_dep qtgui)
4747 "
4748 RDEPEND="${DEPEND}"
4749
4750 diff --git a/kde-apps/kimap/kimap-9999.ebuild b/kde-apps/kimap/kimap-9999.ebuild
4751 index 9bd4c30..3f830e7 100644
4752 --- a/kde-apps/kimap/kimap-9999.ebuild
4753 +++ b/kde-apps/kimap/kimap-9999.ebuild
4754 @@ -20,6 +20,6 @@ DEPEND="
4755 $(add_frameworks_dep kio)
4756 $(add_kdeapps_dep kmime)
4757 dev-libs/cyrus-sasl
4758 - dev-qt/qtgui:5
4759 + $(add_qt_dep qtgui)
4760 "
4761 RDEPEND="${DEPEND}"
4762
4763 diff --git a/kde-apps/kio-extras/kio-extras-15.12.1.ebuild b/kde-apps/kio-extras/kio-extras-15.12.1.ebuild
4764 index 44c9b74..3a6b93f 100644
4765 --- a/kde-apps/kio-extras/kio-extras-15.12.1.ebuild
4766 +++ b/kde-apps/kio-extras/kio-extras-15.12.1.ebuild
4767 @@ -34,12 +34,12 @@ COMMON_DEPEND="
4768 $(add_frameworks_dep kservice)
4769 $(add_frameworks_dep kxmlgui)
4770 $(add_frameworks_dep solid)
4771 - dev-qt/qtdbus:5
4772 - dev-qt/qtgui:5
4773 - dev-qt/qtnetwork:5
4774 - dev-qt/qtsvg:5
4775 - dev-qt/qtwidgets:5
4776 - dev-qt/qtxml:5
4777 + $(add_qt_dep qtdbus)
4778 + $(add_qt_dep qtgui)
4779 + $(add_qt_dep qtnetwork)
4780 + $(add_qt_dep qtsvg)
4781 + $(add_qt_dep qtwidgets)
4782 + $(add_qt_dep qtxml)
4783 virtual/jpeg:0
4784 exif? ( media-gfx/exiv2:= )
4785 mtp? ( media-libs/libmtp:= )
4786
4787 diff --git a/kde-apps/kio-extras/kio-extras-15.12.49.9999.ebuild b/kde-apps/kio-extras/kio-extras-15.12.49.9999.ebuild
4788 index 584a6a0..c3065df 100644
4789 --- a/kde-apps/kio-extras/kio-extras-15.12.49.9999.ebuild
4790 +++ b/kde-apps/kio-extras/kio-extras-15.12.49.9999.ebuild
4791 @@ -34,12 +34,12 @@ COMMON_DEPEND="
4792 $(add_frameworks_dep kservice)
4793 $(add_frameworks_dep kxmlgui)
4794 $(add_frameworks_dep solid)
4795 - dev-qt/qtdbus:5
4796 - dev-qt/qtgui:5
4797 - dev-qt/qtnetwork:5
4798 - dev-qt/qtsvg:5
4799 - dev-qt/qtwidgets:5
4800 - dev-qt/qtxml:5
4801 + $(add_qt_dep qtdbus)
4802 + $(add_qt_dep qtgui)
4803 + $(add_qt_dep qtnetwork)
4804 + $(add_qt_dep qtsvg)
4805 + $(add_qt_dep qtwidgets)
4806 + $(add_qt_dep qtxml)
4807 virtual/jpeg:0
4808 exif? ( media-gfx/exiv2:= )
4809 mtp? ( media-libs/libmtp:= )
4810
4811 diff --git a/kde-apps/kio-extras/kio-extras-9999.ebuild b/kde-apps/kio-extras/kio-extras-9999.ebuild
4812 index 584a6a0..c3065df 100644
4813 --- a/kde-apps/kio-extras/kio-extras-9999.ebuild
4814 +++ b/kde-apps/kio-extras/kio-extras-9999.ebuild
4815 @@ -34,12 +34,12 @@ COMMON_DEPEND="
4816 $(add_frameworks_dep kservice)
4817 $(add_frameworks_dep kxmlgui)
4818 $(add_frameworks_dep solid)
4819 - dev-qt/qtdbus:5
4820 - dev-qt/qtgui:5
4821 - dev-qt/qtnetwork:5
4822 - dev-qt/qtsvg:5
4823 - dev-qt/qtwidgets:5
4824 - dev-qt/qtxml:5
4825 + $(add_qt_dep qtdbus)
4826 + $(add_qt_dep qtgui)
4827 + $(add_qt_dep qtnetwork)
4828 + $(add_qt_dep qtsvg)
4829 + $(add_qt_dep qtwidgets)
4830 + $(add_qt_dep qtxml)
4831 virtual/jpeg:0
4832 exif? ( media-gfx/exiv2:= )
4833 mtp? ( media-libs/libmtp:= )
4834
4835 diff --git a/kde-apps/kiriki/kiriki-15.12.1.ebuild b/kde-apps/kiriki/kiriki-15.12.1.ebuild
4836 index 865b67a..74796cb 100644
4837 --- a/kde-apps/kiriki/kiriki-15.12.1.ebuild
4838 +++ b/kde-apps/kiriki/kiriki-15.12.1.ebuild
4839 @@ -26,8 +26,8 @@ DEPEND="
4840 $(add_frameworks_dep kwidgetsaddons)
4841 $(add_frameworks_dep kxmlgui)
4842 $(add_kdeapps_dep libkdegames)
4843 - dev-qt/qtgui:5
4844 - dev-qt/qtprintsupport:5
4845 - dev-qt/qtwidgets:5
4846 + $(add_qt_dep qtgui)
4847 + $(add_qt_dep qtprintsupport)
4848 + $(add_qt_dep qtwidgets)
4849 "
4850 RDEPEND="${DEPEND}"
4851
4852 diff --git a/kde-apps/kiriki/kiriki-15.12.49.9999.ebuild b/kde-apps/kiriki/kiriki-15.12.49.9999.ebuild
4853 index 04a14c1..2fc8fb1 100644
4854 --- a/kde-apps/kiriki/kiriki-15.12.49.9999.ebuild
4855 +++ b/kde-apps/kiriki/kiriki-15.12.49.9999.ebuild
4856 @@ -26,8 +26,8 @@ DEPEND="
4857 $(add_frameworks_dep kwidgetsaddons)
4858 $(add_frameworks_dep kxmlgui)
4859 $(add_kdeapps_dep libkdegames)
4860 - dev-qt/qtgui:5
4861 - dev-qt/qtprintsupport:5
4862 - dev-qt/qtwidgets:5
4863 + $(add_qt_dep qtgui)
4864 + $(add_qt_dep qtprintsupport)
4865 + $(add_qt_dep qtwidgets)
4866 "
4867 RDEPEND="${DEPEND}"
4868
4869 diff --git a/kde-apps/kiriki/kiriki-9999.ebuild b/kde-apps/kiriki/kiriki-9999.ebuild
4870 index 7a81ad4..ea4fc82 100644
4871 --- a/kde-apps/kiriki/kiriki-9999.ebuild
4872 +++ b/kde-apps/kiriki/kiriki-9999.ebuild
4873 @@ -27,8 +27,8 @@ DEPEND="
4874 $(add_frameworks_dep kwidgetsaddons)
4875 $(add_frameworks_dep kxmlgui)
4876 $(add_kdeapps_dep libkdegames)
4877 - dev-qt/qtgui:5
4878 - dev-qt/qtprintsupport:5
4879 - dev-qt/qtwidgets:5
4880 + $(add_qt_dep qtgui)
4881 + $(add_qt_dep qtprintsupport)
4882 + $(add_qt_dep qtwidgets)
4883 "
4884 RDEPEND="${DEPEND}"
4885
4886 diff --git a/kde-apps/kiten/kiten-15.08.3.ebuild b/kde-apps/kiten/kiten-15.08.3.ebuild
4887 index 2fe1129..0703e5c 100644
4888 --- a/kde-apps/kiten/kiten-15.08.3.ebuild
4889 +++ b/kde-apps/kiten/kiten-15.08.3.ebuild
4890 @@ -24,8 +24,8 @@ DEPEND="
4891 $(add_frameworks_dep kparts)
4892 $(add_frameworks_dep kwidgetsaddons)
4893 $(add_frameworks_dep kxmlgui)
4894 - dev-qt/qtdbus:5
4895 - dev-qt/qtgui:5
4896 - dev-qt/qtwidgets:5
4897 + $(add_qt_dep qtdbus)
4898 + $(add_qt_dep qtgui)
4899 + $(add_qt_dep qtwidgets)
4900 "
4901 RDEPEND="${DEPEND}"
4902
4903 diff --git a/kde-apps/kiten/kiten-15.12.1.ebuild b/kde-apps/kiten/kiten-15.12.1.ebuild
4904 index f8755a1..fa6f3f6 100644
4905 --- a/kde-apps/kiten/kiten-15.12.1.ebuild
4906 +++ b/kde-apps/kiten/kiten-15.12.1.ebuild
4907 @@ -25,8 +25,8 @@ DEPEND="
4908 $(add_frameworks_dep kparts)
4909 $(add_frameworks_dep kwidgetsaddons)
4910 $(add_frameworks_dep kxmlgui)
4911 - dev-qt/qtdbus:5
4912 - dev-qt/qtgui:5
4913 - dev-qt/qtwidgets:5
4914 + $(add_qt_dep qtdbus)
4915 + $(add_qt_dep qtgui)
4916 + $(add_qt_dep qtwidgets)
4917 "
4918 RDEPEND="${DEPEND}"
4919
4920 diff --git a/kde-apps/kiten/kiten-15.12.49.9999.ebuild b/kde-apps/kiten/kiten-15.12.49.9999.ebuild
4921 index 341ddfa..7b9fc5e 100644
4922 --- a/kde-apps/kiten/kiten-15.12.49.9999.ebuild
4923 +++ b/kde-apps/kiten/kiten-15.12.49.9999.ebuild
4924 @@ -25,8 +25,8 @@ DEPEND="
4925 $(add_frameworks_dep kparts)
4926 $(add_frameworks_dep kwidgetsaddons)
4927 $(add_frameworks_dep kxmlgui)
4928 - dev-qt/qtdbus:5
4929 - dev-qt/qtgui:5
4930 - dev-qt/qtwidgets:5
4931 + $(add_qt_dep qtdbus)
4932 + $(add_qt_dep qtgui)
4933 + $(add_qt_dep qtwidgets)
4934 "
4935 RDEPEND="${DEPEND}"
4936
4937 diff --git a/kde-apps/kiten/kiten-9999.ebuild b/kde-apps/kiten/kiten-9999.ebuild
4938 index 341ddfa..7b9fc5e 100644
4939 --- a/kde-apps/kiten/kiten-9999.ebuild
4940 +++ b/kde-apps/kiten/kiten-9999.ebuild
4941 @@ -25,8 +25,8 @@ DEPEND="
4942 $(add_frameworks_dep kparts)
4943 $(add_frameworks_dep kwidgetsaddons)
4944 $(add_frameworks_dep kxmlgui)
4945 - dev-qt/qtdbus:5
4946 - dev-qt/qtgui:5
4947 - dev-qt/qtwidgets:5
4948 + $(add_qt_dep qtdbus)
4949 + $(add_qt_dep qtgui)
4950 + $(add_qt_dep qtwidgets)
4951 "
4952 RDEPEND="${DEPEND}"
4953
4954 diff --git a/kde-apps/kjots/kjots-9999.ebuild b/kde-apps/kjots/kjots-9999.ebuild
4955 index 8e60be8..589c241 100644
4956 --- a/kde-apps/kjots/kjots-9999.ebuild
4957 +++ b/kde-apps/kjots/kjots-9999.ebuild
4958 @@ -32,10 +32,10 @@ RDEPEND="
4959 $(add_kdeapps_dep kpimtextedit)
4960 dev-libs/grantlee:5
4961 dev-libs/libxslt
4962 - dev-qt/qtdbus:5
4963 - dev-qt/qtgui:5
4964 - dev-qt/qtprintsupport:5
4965 - dev-qt/qtwidgets:5
4966 + $(add_qt_dep qtdbus)
4967 + $(add_qt_dep qtgui)
4968 + $(add_qt_dep qtprintsupport)
4969 + $(add_qt_dep qtwidgets)
4970 "
4971 DEPEND="${RDEPEND}
4972 sys-devel/gettext
4973
4974 diff --git a/kde-apps/kjumpingcube/kjumpingcube-15.12.1.ebuild b/kde-apps/kjumpingcube/kjumpingcube-15.12.1.ebuild
4975 index dcd8c94..b431361 100644
4976 --- a/kde-apps/kjumpingcube/kjumpingcube-15.12.1.ebuild
4977 +++ b/kde-apps/kjumpingcube/kjumpingcube-15.12.1.ebuild
4978 @@ -26,8 +26,8 @@ DEPEND="
4979 $(add_frameworks_dep kwidgetsaddons)
4980 $(add_frameworks_dep kxmlgui)
4981 $(add_kdeapps_dep libkdegames)
4982 - dev-qt/qtgui:5
4983 - dev-qt/qtsvg:5
4984 - dev-qt/qtwidgets:5
4985 + $(add_qt_dep qtgui)
4986 + $(add_qt_dep qtsvg)
4987 + $(add_qt_dep qtwidgets)
4988 "
4989 RDEPEND="${DEPEND}"
4990
4991 diff --git a/kde-apps/kjumpingcube/kjumpingcube-15.12.49.9999.ebuild b/kde-apps/kjumpingcube/kjumpingcube-15.12.49.9999.ebuild
4992 index 8a69d9b..ac58364 100644
4993 --- a/kde-apps/kjumpingcube/kjumpingcube-15.12.49.9999.ebuild
4994 +++ b/kde-apps/kjumpingcube/kjumpingcube-15.12.49.9999.ebuild
4995 @@ -26,8 +26,8 @@ DEPEND="
4996 $(add_frameworks_dep kwidgetsaddons)
4997 $(add_frameworks_dep kxmlgui)
4998 $(add_kdeapps_dep libkdegames)
4999 - dev-qt/qtgui:5
5000 - dev-qt/qtsvg:5
5001 - dev-qt/qtwidgets:5
5002 + $(add_qt_dep qtgui)
5003 + $(add_qt_dep qtsvg)
5004 + $(add_qt_dep qtwidgets)
5005 "
5006 RDEPEND="${DEPEND}"
5007
5008 diff --git a/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild b/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
5009 index a302395..3e1d38c 100644
5010 --- a/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
5011 +++ b/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
5012 @@ -27,8 +27,8 @@ DEPEND="
5013 $(add_frameworks_dep kwidgetsaddons)
5014 $(add_frameworks_dep kxmlgui)
5015 $(add_kdeapps_dep libkdegames)
5016 - dev-qt/qtgui:5
5017 - dev-qt/qtsvg:5
5018 - dev-qt/qtwidgets:5
5019 + $(add_qt_dep qtgui)
5020 + $(add_qt_dep qtsvg)
5021 + $(add_qt_dep qtwidgets)
5022 "
5023 RDEPEND="${DEPEND}"
5024
5025 diff --git a/kde-apps/kldap/kldap-15.12.1.ebuild b/kde-apps/kldap/kldap-15.12.1.ebuild
5026 index bf6ebd9..72b5aa1 100644
5027 --- a/kde-apps/kldap/kldap-15.12.1.ebuild
5028 +++ b/kde-apps/kldap/kldap-15.12.1.ebuild
5029 @@ -18,8 +18,8 @@ RDEPEND="
5030 $(add_frameworks_dep ki18n)
5031 $(add_frameworks_dep kwidgetsaddons)
5032 dev-libs/cyrus-sasl
5033 - dev-qt/qtgui:5
5034 - dev-qt/qtwidgets:5
5035 + $(add_qt_dep qtgui)
5036 + $(add_qt_dep qtwidgets)
5037 net-nds/openldap
5038 "
5039 DEPEND="${RDEPEND}"
5040
5041 diff --git a/kde-apps/kldap/kldap-15.12.49.9999.ebuild b/kde-apps/kldap/kldap-15.12.49.9999.ebuild
5042 index 12b09ab..146d8a1 100644
5043 --- a/kde-apps/kldap/kldap-15.12.49.9999.ebuild
5044 +++ b/kde-apps/kldap/kldap-15.12.49.9999.ebuild
5045 @@ -18,8 +18,8 @@ RDEPEND="
5046 $(add_frameworks_dep ki18n)
5047 $(add_frameworks_dep kwidgetsaddons)
5048 dev-libs/cyrus-sasl
5049 - dev-qt/qtgui:5
5050 - dev-qt/qtwidgets:5
5051 + $(add_qt_dep qtgui)
5052 + $(add_qt_dep qtwidgets)
5053 net-nds/openldap
5054 "
5055 DEPEND="${RDEPEND}"
5056
5057 diff --git a/kde-apps/kldap/kldap-9999.ebuild b/kde-apps/kldap/kldap-9999.ebuild
5058 index 12b09ab..146d8a1 100644
5059 --- a/kde-apps/kldap/kldap-9999.ebuild
5060 +++ b/kde-apps/kldap/kldap-9999.ebuild
5061 @@ -18,8 +18,8 @@ RDEPEND="
5062 $(add_frameworks_dep ki18n)
5063 $(add_frameworks_dep kwidgetsaddons)
5064 dev-libs/cyrus-sasl
5065 - dev-qt/qtgui:5
5066 - dev-qt/qtwidgets:5
5067 + $(add_qt_dep qtgui)
5068 + $(add_qt_dep qtwidgets)
5069 net-nds/openldap
5070 "
5071 DEPEND="${RDEPEND}"
5072
5073 diff --git a/kde-apps/klettres/klettres-15.08.3.ebuild b/kde-apps/klettres/klettres-15.08.3.ebuild
5074 index 3a878ad..e6750fc 100644
5075 --- a/kde-apps/klettres/klettres-15.08.3.ebuild
5076 +++ b/kde-apps/klettres/klettres-15.08.3.ebuild
5077 @@ -22,10 +22,10 @@ DEPEND="
5078 $(add_frameworks_dep knewstuff)
5079 $(add_frameworks_dep kwidgetsaddons)
5080 $(add_frameworks_dep kxmlgui)
5081 - dev-qt/qtgui:5
5082 - dev-qt/qtsvg:5
5083 - dev-qt/qtwidgets:5
5084 - dev-qt/qtxml:5
5085 + $(add_qt_dep qtgui)
5086 + $(add_qt_dep qtsvg)
5087 + $(add_qt_dep qtwidgets)
5088 + $(add_qt_dep qtxml)
5089 media-libs/phonon[qt5]
5090 "
5091 RDEPEND="${DEPEND}"
5092
5093 diff --git a/kde-apps/klettres/klettres-15.12.1.ebuild b/kde-apps/klettres/klettres-15.12.1.ebuild
5094 index 3a878ad..e6750fc 100644
5095 --- a/kde-apps/klettres/klettres-15.12.1.ebuild
5096 +++ b/kde-apps/klettres/klettres-15.12.1.ebuild
5097 @@ -22,10 +22,10 @@ DEPEND="
5098 $(add_frameworks_dep knewstuff)
5099 $(add_frameworks_dep kwidgetsaddons)
5100 $(add_frameworks_dep kxmlgui)
5101 - dev-qt/qtgui:5
5102 - dev-qt/qtsvg:5
5103 - dev-qt/qtwidgets:5
5104 - dev-qt/qtxml:5
5105 + $(add_qt_dep qtgui)
5106 + $(add_qt_dep qtsvg)
5107 + $(add_qt_dep qtwidgets)
5108 + $(add_qt_dep qtxml)
5109 media-libs/phonon[qt5]
5110 "
5111 RDEPEND="${DEPEND}"
5112
5113 diff --git a/kde-apps/klettres/klettres-15.12.49.9999.ebuild b/kde-apps/klettres/klettres-15.12.49.9999.ebuild
5114 index 0c521a2..2ba7596 100644
5115 --- a/kde-apps/klettres/klettres-15.12.49.9999.ebuild
5116 +++ b/kde-apps/klettres/klettres-15.12.49.9999.ebuild
5117 @@ -22,10 +22,10 @@ DEPEND="
5118 $(add_frameworks_dep knewstuff)
5119 $(add_frameworks_dep kwidgetsaddons)
5120 $(add_frameworks_dep kxmlgui)
5121 - dev-qt/qtgui:5
5122 - dev-qt/qtsvg:5
5123 - dev-qt/qtwidgets:5
5124 - dev-qt/qtxml:5
5125 + $(add_qt_dep qtgui)
5126 + $(add_qt_dep qtsvg)
5127 + $(add_qt_dep qtwidgets)
5128 + $(add_qt_dep qtxml)
5129 media-libs/phonon[qt5]
5130 "
5131 RDEPEND="${DEPEND}"
5132
5133 diff --git a/kde-apps/klettres/klettres-9999.ebuild b/kde-apps/klettres/klettres-9999.ebuild
5134 index 0c521a2..2ba7596 100644
5135 --- a/kde-apps/klettres/klettres-9999.ebuild
5136 +++ b/kde-apps/klettres/klettres-9999.ebuild
5137 @@ -22,10 +22,10 @@ DEPEND="
5138 $(add_frameworks_dep knewstuff)
5139 $(add_frameworks_dep kwidgetsaddons)
5140 $(add_frameworks_dep kxmlgui)
5141 - dev-qt/qtgui:5
5142 - dev-qt/qtsvg:5
5143 - dev-qt/qtwidgets:5
5144 - dev-qt/qtxml:5
5145 + $(add_qt_dep qtgui)
5146 + $(add_qt_dep qtsvg)
5147 + $(add_qt_dep qtwidgets)
5148 + $(add_qt_dep qtxml)
5149 media-libs/phonon[qt5]
5150 "
5151 RDEPEND="${DEPEND}"
5152
5153 diff --git a/kde-apps/klickety/klickety-15.12.1.ebuild b/kde-apps/klickety/klickety-15.12.1.ebuild
5154 index f879efc..95a8f72 100644
5155 --- a/kde-apps/klickety/klickety-15.12.1.ebuild
5156 +++ b/kde-apps/klickety/klickety-15.12.1.ebuild
5157 @@ -24,8 +24,8 @@ DEPEND="
5158 $(add_frameworks_dep kwidgetsaddons)
5159 $(add_frameworks_dep kxmlgui)
5160 $(add_kdeapps_dep libkdegames)
5161 - dev-qt/qtgui:5
5162 - dev-qt/qtwidgets:5
5163 + $(add_qt_dep qtgui)
5164 + $(add_qt_dep qtwidgets)
5165 "
5166
5167 RDEPEND="${DEPEND}"
5168
5169 diff --git a/kde-apps/klickety/klickety-15.12.49.9999.ebuild b/kde-apps/klickety/klickety-15.12.49.9999.ebuild
5170 index 5ccd7cb..abfeec9 100644
5171 --- a/kde-apps/klickety/klickety-15.12.49.9999.ebuild
5172 +++ b/kde-apps/klickety/klickety-15.12.49.9999.ebuild
5173 @@ -24,8 +24,8 @@ DEPEND="
5174 $(add_frameworks_dep kwidgetsaddons)
5175 $(add_frameworks_dep kxmlgui)
5176 $(add_kdeapps_dep libkdegames)
5177 - dev-qt/qtgui:5
5178 - dev-qt/qtwidgets:5
5179 + $(add_qt_dep qtgui)
5180 + $(add_qt_dep qtwidgets)
5181 "
5182
5183 RDEPEND="${DEPEND}"
5184
5185 diff --git a/kde-apps/klickety/klickety-9999.ebuild b/kde-apps/klickety/klickety-9999.ebuild
5186 index 696faff..48cf231 100644
5187 --- a/kde-apps/klickety/klickety-9999.ebuild
5188 +++ b/kde-apps/klickety/klickety-9999.ebuild
5189 @@ -25,8 +25,8 @@ DEPEND="
5190 $(add_frameworks_dep kwidgetsaddons)
5191 $(add_frameworks_dep kxmlgui)
5192 $(add_kdeapps_dep libkdegames)
5193 - dev-qt/qtgui:5
5194 - dev-qt/qtwidgets:5
5195 + $(add_qt_dep qtgui)
5196 + $(add_qt_dep qtwidgets)
5197 "
5198
5199 RDEPEND="${DEPEND}"
5200
5201 diff --git a/kde-apps/klines/klines-15.12.1.ebuild b/kde-apps/klines/klines-15.12.1.ebuild
5202 index d815b4c..74ed826 100644
5203 --- a/kde-apps/klines/klines-15.12.1.ebuild
5204 +++ b/kde-apps/klines/klines-15.12.1.ebuild
5205 @@ -25,8 +25,8 @@ DEPEND="
5206 $(add_frameworks_dep kwidgetsaddons)
5207 $(add_frameworks_dep kxmlgui)
5208 $(add_kdeapps_dep libkdegames)
5209 - dev-qt/qtgui:5
5210 - dev-qt/qtwidgets:5
5211 + $(add_qt_dep qtgui)
5212 + $(add_qt_dep qtwidgets)
5213 "
5214
5215 RDEPEND="${DEPEND}"
5216
5217 diff --git a/kde-apps/klines/klines-15.12.49.9999.ebuild b/kde-apps/klines/klines-15.12.49.9999.ebuild
5218 index e31a45b..60463fe 100644
5219 --- a/kde-apps/klines/klines-15.12.49.9999.ebuild
5220 +++ b/kde-apps/klines/klines-15.12.49.9999.ebuild
5221 @@ -25,8 +25,8 @@ DEPEND="
5222 $(add_frameworks_dep kwidgetsaddons)
5223 $(add_frameworks_dep kxmlgui)
5224 $(add_kdeapps_dep libkdegames)
5225 - dev-qt/qtgui:5
5226 - dev-qt/qtwidgets:5
5227 + $(add_qt_dep qtgui)
5228 + $(add_qt_dep qtwidgets)
5229 "
5230
5231 RDEPEND="${DEPEND}"
5232
5233 diff --git a/kde-apps/klines/klines-9999.ebuild b/kde-apps/klines/klines-9999.ebuild
5234 index 39c1b37..9afd59c 100644
5235 --- a/kde-apps/klines/klines-9999.ebuild
5236 +++ b/kde-apps/klines/klines-9999.ebuild
5237 @@ -26,8 +26,8 @@ DEPEND="
5238 $(add_frameworks_dep kwidgetsaddons)
5239 $(add_frameworks_dep kxmlgui)
5240 $(add_kdeapps_dep libkdegames)
5241 - dev-qt/qtgui:5
5242 - dev-qt/qtwidgets:5
5243 + $(add_qt_dep qtgui)
5244 + $(add_qt_dep qtwidgets)
5245 "
5246
5247 RDEPEND="${DEPEND}"
5248
5249 diff --git a/kde-apps/kmag/kmag-5.9999.ebuild b/kde-apps/kmag/kmag-5.9999.ebuild
5250 index e139e54..aef71d8 100644
5251 --- a/kde-apps/kmag/kmag-5.9999.ebuild
5252 +++ b/kde-apps/kmag/kmag-5.9999.ebuild
5253 @@ -21,9 +21,9 @@ DEPEND="
5254 $(add_frameworks_dep kio)
5255 $(add_frameworks_dep kwidgetsaddons)
5256 $(add_frameworks_dep kxmlgui)
5257 - dev-qt/qtgui:5
5258 - dev-qt/qtprintsupport:5
5259 - dev-qt/qtwidgets:5
5260 + $(add_qt_dep qtgui)
5261 + $(add_qt_dep qtprintsupport)
5262 + $(add_qt_dep qtwidgets)
5263 keyboardfocus? ( media-libs/libkdeaccessibilityclient )
5264 "
5265 RDEPEND="${DEPEND}"
5266
5267 diff --git a/kde-apps/kmahjongg/kmahjongg-9999.ebuild b/kde-apps/kmahjongg/kmahjongg-9999.ebuild
5268 index 2b2c28b..893d502 100644
5269 --- a/kde-apps/kmahjongg/kmahjongg-9999.ebuild
5270 +++ b/kde-apps/kmahjongg/kmahjongg-9999.ebuild
5271 @@ -30,9 +30,9 @@ DEPEND="
5272 $(add_frameworks_dep kxmlgui)
5273 $(add_kdeapps_dep libkdegames)
5274 $(add_kdeapps_dep libkmahjongg)
5275 - dev-qt/qtgui:5
5276 - dev-qt/qtsvg:5
5277 - dev-qt/qtwidgets:5
5278 + $(add_qt_dep qtgui)
5279 + $(add_qt_dep qtsvg)
5280 + $(add_qt_dep qtwidgets)
5281 "
5282
5283 RDEPEND="${DEPEND}"
5284
5285 diff --git a/kde-apps/kmailtransport/kmailtransport-15.12.1.ebuild b/kde-apps/kmailtransport/kmailtransport-15.12.1.ebuild
5286 index 2dad8b9..16508ee 100644
5287 --- a/kde-apps/kmailtransport/kmailtransport-15.12.1.ebuild
5288 +++ b/kde-apps/kmailtransport/kmailtransport-15.12.1.ebuild
5289 @@ -25,10 +25,10 @@ DEPEND="
5290 $(add_kdeapps_dep akonadi-mime)
5291 $(add_kdeapps_dep kmime)
5292 $(add_kdeapps_dep libakonadi)
5293 - dev-qt/qtdbus:5
5294 - dev-qt/qtgui:5
5295 - dev-qt/qtnetwork:5
5296 - dev-qt/qtwidgets:5
5297 + $(add_qt_dep qtdbus)
5298 + $(add_qt_dep qtgui)
5299 + $(add_qt_dep qtnetwork)
5300 + $(add_qt_dep qtwidgets)
5301 "
5302 RDEPEND="${DEPEND}"
5303
5304
5305 diff --git a/kde-apps/kmailtransport/kmailtransport-15.12.49.9999.ebuild b/kde-apps/kmailtransport/kmailtransport-15.12.49.9999.ebuild
5306 index 22674f1..f2a45b3 100644
5307 --- a/kde-apps/kmailtransport/kmailtransport-15.12.49.9999.ebuild
5308 +++ b/kde-apps/kmailtransport/kmailtransport-15.12.49.9999.ebuild
5309 @@ -25,10 +25,10 @@ DEPEND="
5310 $(add_kdeapps_dep akonadi-mime)
5311 $(add_kdeapps_dep kmime)
5312 $(add_kdeapps_dep libakonadi)
5313 - dev-qt/qtdbus:5
5314 - dev-qt/qtgui:5
5315 - dev-qt/qtnetwork:5
5316 - dev-qt/qtwidgets:5
5317 + $(add_qt_dep qtdbus)
5318 + $(add_qt_dep qtgui)
5319 + $(add_qt_dep qtnetwork)
5320 + $(add_qt_dep qtwidgets)
5321 "
5322 RDEPEND="${DEPEND}"
5323
5324
5325 diff --git a/kde-apps/kmailtransport/kmailtransport-9999.ebuild b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
5326 index c451aa6..0dc6ab7 100644
5327 --- a/kde-apps/kmailtransport/kmailtransport-9999.ebuild
5328 +++ b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
5329 @@ -25,10 +25,10 @@ DEPEND="
5330 $(add_kdeapps_dep akonadi)
5331 $(add_kdeapps_dep akonadi-mime)
5332 $(add_kdeapps_dep kmime)
5333 - dev-qt/qtdbus:5
5334 - dev-qt/qtgui:5
5335 - dev-qt/qtnetwork:5
5336 - dev-qt/qtwidgets:5
5337 + $(add_qt_dep qtdbus)
5338 + $(add_qt_dep qtgui)
5339 + $(add_qt_dep qtnetwork)
5340 + $(add_qt_dep qtwidgets)
5341 "
5342 RDEPEND="${DEPEND}"
5343
5344
5345 diff --git a/kde-apps/kmines/kmines-15.12.1.ebuild b/kde-apps/kmines/kmines-15.12.1.ebuild
5346 index 1291b04..5eeab2b 100644
5347 --- a/kde-apps/kmines/kmines-15.12.1.ebuild
5348 +++ b/kde-apps/kmines/kmines-15.12.1.ebuild
5349 @@ -29,10 +29,10 @@ DEPEND="
5350 $(add_frameworks_dep kwidgetsaddons)
5351 $(add_frameworks_dep kxmlgui)
5352 $(add_kdeapps_dep libkdegames)
5353 - dev-qt/qtdeclarative:5
5354 - dev-qt/qtnetwork:5
5355 - dev-qt/qtgui:5
5356 - dev-qt/qtwidgets:5
5357 + $(add_qt_dep qtdeclarative)
5358 + $(add_qt_dep qtnetwork)
5359 + $(add_qt_dep qtgui)
5360 + $(add_qt_dep qtwidgets)
5361 phonon? ( media-libs/phonon[qt5] )
5362 "
5363
5364
5365 diff --git a/kde-apps/kmines/kmines-15.12.49.9999.ebuild b/kde-apps/kmines/kmines-15.12.49.9999.ebuild
5366 index c1358d0..6986fb0 100644
5367 --- a/kde-apps/kmines/kmines-15.12.49.9999.ebuild
5368 +++ b/kde-apps/kmines/kmines-15.12.49.9999.ebuild
5369 @@ -29,10 +29,10 @@ DEPEND="
5370 $(add_frameworks_dep kwidgetsaddons)
5371 $(add_frameworks_dep kxmlgui)
5372 $(add_kdeapps_dep libkdegames)
5373 - dev-qt/qtdeclarative:5
5374 - dev-qt/qtnetwork:5
5375 - dev-qt/qtgui:5
5376 - dev-qt/qtwidgets:5
5377 + $(add_qt_dep qtdeclarative)
5378 + $(add_qt_dep qtnetwork)
5379 + $(add_qt_dep qtgui)
5380 + $(add_qt_dep qtwidgets)
5381 phonon? ( media-libs/phonon[qt5] )
5382 "
5383
5384
5385 diff --git a/kde-apps/kmines/kmines-9999.ebuild b/kde-apps/kmines/kmines-9999.ebuild
5386 index bb6f211..b87345e 100644
5387 --- a/kde-apps/kmines/kmines-9999.ebuild
5388 +++ b/kde-apps/kmines/kmines-9999.ebuild
5389 @@ -30,10 +30,10 @@ DEPEND="
5390 $(add_frameworks_dep kwidgetsaddons)
5391 $(add_frameworks_dep kxmlgui)
5392 $(add_kdeapps_dep libkdegames)
5393 - dev-qt/qtdeclarative:5
5394 - dev-qt/qtnetwork:5
5395 - dev-qt/qtgui:5
5396 - dev-qt/qtwidgets:5
5397 + $(add_qt_dep qtdeclarative)
5398 + $(add_qt_dep qtnetwork)
5399 + $(add_qt_dep qtgui)
5400 + $(add_qt_dep qtwidgets)
5401 phonon? ( media-libs/phonon[qt5] )
5402 "
5403
5404
5405 diff --git a/kde-apps/kmix/kmix-15.12.1.ebuild b/kde-apps/kmix/kmix-15.12.1.ebuild
5406 index afc3c35..f1c7ac9 100644
5407 --- a/kde-apps/kmix/kmix-15.12.1.ebuild
5408 +++ b/kde-apps/kmix/kmix-15.12.1.ebuild
5409 @@ -28,10 +28,10 @@ DEPEND="
5410 $(add_frameworks_dep kwindowsystem)
5411 $(add_frameworks_dep kxmlgui)
5412 $(add_frameworks_dep plasma)
5413 - dev-qt/qtdbus:5
5414 - dev-qt/qtgui:5
5415 - dev-qt/qtwidgets:5
5416 - dev-qt/qtxml:5
5417 + $(add_qt_dep qtdbus)
5418 + $(add_qt_dep qtgui)
5419 + $(add_qt_dep qtwidgets)
5420 + $(add_qt_dep qtxml)
5421 alsa? ( >=media-libs/alsa-lib-1.0.14a )
5422 pulseaudio? (
5423 media-libs/libcanberra
5424
5425 diff --git a/kde-apps/kmix/kmix-15.12.49.9999.ebuild b/kde-apps/kmix/kmix-15.12.49.9999.ebuild
5426 index 2ca13ff..706bb97 100644
5427 --- a/kde-apps/kmix/kmix-15.12.49.9999.ebuild
5428 +++ b/kde-apps/kmix/kmix-15.12.49.9999.ebuild
5429 @@ -28,10 +28,10 @@ DEPEND="
5430 $(add_frameworks_dep kwindowsystem)
5431 $(add_frameworks_dep kxmlgui)
5432 $(add_frameworks_dep plasma)
5433 - dev-qt/qtdbus:5
5434 - dev-qt/qtgui:5
5435 - dev-qt/qtwidgets:5
5436 - dev-qt/qtxml:5
5437 + $(add_qt_dep qtdbus)
5438 + $(add_qt_dep qtgui)
5439 + $(add_qt_dep qtwidgets)
5440 + $(add_qt_dep qtxml)
5441 alsa? ( >=media-libs/alsa-lib-1.0.14a )
5442 pulseaudio? (
5443 media-libs/libcanberra
5444
5445 diff --git a/kde-apps/kmix/kmix-9999.ebuild b/kde-apps/kmix/kmix-9999.ebuild
5446 index 2ca13ff..706bb97 100644
5447 --- a/kde-apps/kmix/kmix-9999.ebuild
5448 +++ b/kde-apps/kmix/kmix-9999.ebuild
5449 @@ -28,10 +28,10 @@ DEPEND="
5450 $(add_frameworks_dep kwindowsystem)
5451 $(add_frameworks_dep kxmlgui)
5452 $(add_frameworks_dep plasma)
5453 - dev-qt/qtdbus:5
5454 - dev-qt/qtgui:5
5455 - dev-qt/qtwidgets:5
5456 - dev-qt/qtxml:5
5457 + $(add_qt_dep qtdbus)
5458 + $(add_qt_dep qtgui)
5459 + $(add_qt_dep qtwidgets)
5460 + $(add_qt_dep qtxml)
5461 alsa? ( >=media-libs/alsa-lib-1.0.14a )
5462 pulseaudio? (
5463 media-libs/libcanberra
5464
5465 diff --git a/kde-apps/kmousetool/kmousetool-5.9999.ebuild b/kde-apps/kmousetool/kmousetool-5.9999.ebuild
5466 index 2df8084..067d00c 100644
5467 --- a/kde-apps/kmousetool/kmousetool-5.9999.ebuild
5468 +++ b/kde-apps/kmousetool/kmousetool-5.9999.ebuild
5469 @@ -22,8 +22,8 @@ RDEPEND="
5470 $(add_frameworks_dep knotifications)
5471 $(add_frameworks_dep kwidgetsaddons)
5472 $(add_frameworks_dep kxmlgui)
5473 - dev-qt/qtgui:5
5474 - dev-qt/qtwidgets:5
5475 + $(add_qt_dep qtgui)
5476 + $(add_qt_dep qtwidgets)
5477 media-libs/phonon[qt5]
5478 x11-libs/libX11
5479 x11-libs/libXtst
5480
5481 diff --git a/kde-apps/kmouth/kmouth-5.9999.ebuild b/kde-apps/kmouth/kmouth-5.9999.ebuild
5482 index abb6fd1..8975739 100644
5483 --- a/kde-apps/kmouth/kmouth-5.9999.ebuild
5484 +++ b/kde-apps/kmouth/kmouth-5.9999.ebuild
5485 @@ -23,10 +23,10 @@ DEPEND="
5486 $(add_frameworks_dep kio)
5487 $(add_frameworks_dep kwidgetsaddons)
5488 $(add_frameworks_dep kxmlgui)
5489 - dev-qt/qtgui:5
5490 - dev-qt/qtprintsupport:5
5491 - dev-qt/qtspeech:5
5492 - dev-qt/qtwidgets:5
5493 - dev-qt/qtxml:5
5494 + $(add_qt_dep qtgui)
5495 + $(add_qt_dep qtprintsupport)
5496 + $(add_qt_dep qtspeech)
5497 + $(add_qt_dep qtwidgets)
5498 + $(add_qt_dep qtxml)
5499 "
5500 RDEPEND="${DEPEND}"
5501
5502 diff --git a/kde-apps/kmplot/kmplot-15.08.3.ebuild b/kde-apps/kmplot/kmplot-15.08.3.ebuild
5503 index ebe4c71..abf8986 100644
5504 --- a/kde-apps/kmplot/kmplot-15.08.3.ebuild
5505 +++ b/kde-apps/kmplot/kmplot-15.08.3.ebuild
5506 @@ -25,11 +25,11 @@ RDEPEND="
5507 $(add_frameworks_dep ktextwidgets)
5508 $(add_frameworks_dep kwidgetsaddons)
5509 $(add_frameworks_dep kxmlgui)
5510 - dev-qt/qtdbus:5
5511 - dev-qt/qtgui:5
5512 - dev-qt/qtprintsupport:5
5513 - dev-qt/qtsvg:5
5514 - dev-qt/qtwidgets:5
5515 - dev-qt/qtxml:5
5516 + $(add_qt_dep qtdbus)
5517 + $(add_qt_dep qtgui)
5518 + $(add_qt_dep qtprintsupport)
5519 + $(add_qt_dep qtsvg)
5520 + $(add_qt_dep qtwidgets)
5521 + $(add_qt_dep qtxml)
5522 "
5523 DEPEND="${RDEPEND}"
5524
5525 diff --git a/kde-apps/kmplot/kmplot-15.12.1.ebuild b/kde-apps/kmplot/kmplot-15.12.1.ebuild
5526 index ebe4c71..abf8986 100644
5527 --- a/kde-apps/kmplot/kmplot-15.12.1.ebuild
5528 +++ b/kde-apps/kmplot/kmplot-15.12.1.ebuild
5529 @@ -25,11 +25,11 @@ RDEPEND="
5530 $(add_frameworks_dep ktextwidgets)
5531 $(add_frameworks_dep kwidgetsaddons)
5532 $(add_frameworks_dep kxmlgui)
5533 - dev-qt/qtdbus:5
5534 - dev-qt/qtgui:5
5535 - dev-qt/qtprintsupport:5
5536 - dev-qt/qtsvg:5
5537 - dev-qt/qtwidgets:5
5538 - dev-qt/qtxml:5
5539 + $(add_qt_dep qtdbus)
5540 + $(add_qt_dep qtgui)
5541 + $(add_qt_dep qtprintsupport)
5542 + $(add_qt_dep qtsvg)
5543 + $(add_qt_dep qtwidgets)
5544 + $(add_qt_dep qtxml)
5545 "
5546 DEPEND="${RDEPEND}"
5547
5548 diff --git a/kde-apps/kmplot/kmplot-15.12.49.9999.ebuild b/kde-apps/kmplot/kmplot-15.12.49.9999.ebuild
5549 index 4f0cd8e..78c2529 100644
5550 --- a/kde-apps/kmplot/kmplot-15.12.49.9999.ebuild
5551 +++ b/kde-apps/kmplot/kmplot-15.12.49.9999.ebuild
5552 @@ -25,11 +25,11 @@ RDEPEND="
5553 $(add_frameworks_dep ktextwidgets)
5554 $(add_frameworks_dep kwidgetsaddons)
5555 $(add_frameworks_dep kxmlgui)
5556 - dev-qt/qtdbus:5
5557 - dev-qt/qtgui:5
5558 - dev-qt/qtprintsupport:5
5559 - dev-qt/qtsvg:5
5560 - dev-qt/qtwidgets:5
5561 - dev-qt/qtxml:5
5562 + $(add_qt_dep qtdbus)
5563 + $(add_qt_dep qtgui)
5564 + $(add_qt_dep qtprintsupport)
5565 + $(add_qt_dep qtsvg)
5566 + $(add_qt_dep qtwidgets)
5567 + $(add_qt_dep qtxml)
5568 "
5569 DEPEND="${RDEPEND}"
5570
5571 diff --git a/kde-apps/kmplot/kmplot-9999.ebuild b/kde-apps/kmplot/kmplot-9999.ebuild
5572 index 4f0cd8e..78c2529 100644
5573 --- a/kde-apps/kmplot/kmplot-9999.ebuild
5574 +++ b/kde-apps/kmplot/kmplot-9999.ebuild
5575 @@ -25,11 +25,11 @@ RDEPEND="
5576 $(add_frameworks_dep ktextwidgets)
5577 $(add_frameworks_dep kwidgetsaddons)
5578 $(add_frameworks_dep kxmlgui)
5579 - dev-qt/qtdbus:5
5580 - dev-qt/qtgui:5
5581 - dev-qt/qtprintsupport:5
5582 - dev-qt/qtsvg:5
5583 - dev-qt/qtwidgets:5
5584 - dev-qt/qtxml:5
5585 + $(add_qt_dep qtdbus)
5586 + $(add_qt_dep qtgui)
5587 + $(add_qt_dep qtprintsupport)
5588 + $(add_qt_dep qtsvg)
5589 + $(add_qt_dep qtwidgets)
5590 + $(add_qt_dep qtxml)
5591 "
5592 DEPEND="${RDEPEND}"
5593
5594 diff --git a/kde-apps/knavalbattle/knavalbattle-15.12.1.ebuild b/kde-apps/knavalbattle/knavalbattle-15.12.1.ebuild
5595 index 6397ae4..af3c5f5 100644
5596 --- a/kde-apps/knavalbattle/knavalbattle-15.12.1.ebuild
5597 +++ b/kde-apps/knavalbattle/knavalbattle-15.12.1.ebuild
5598 @@ -27,10 +27,10 @@ DEPEND="
5599 $(add_frameworks_dep kwidgetsaddons)
5600 $(add_frameworks_dep kxmlgui)
5601 $(add_kdeapps_dep libkdegames)
5602 - dev-qt/qtgui:5
5603 - dev-qt/qtnetwork:5
5604 - dev-qt/qtwidgets:5
5605 - dev-qt/qtxml:5
5606 + $(add_qt_dep qtgui)
5607 + $(add_qt_dep qtnetwork)
5608 + $(add_qt_dep qtwidgets)
5609 + $(add_qt_dep qtxml)
5610 "
5611
5612 RDEPEND="${DEPEND}"
5613
5614 diff --git a/kde-apps/knavalbattle/knavalbattle-15.12.49.9999.ebuild b/kde-apps/knavalbattle/knavalbattle-15.12.49.9999.ebuild
5615 index ab2063e..e5c9e6b 100644
5616 --- a/kde-apps/knavalbattle/knavalbattle-15.12.49.9999.ebuild
5617 +++ b/kde-apps/knavalbattle/knavalbattle-15.12.49.9999.ebuild
5618 @@ -27,10 +27,10 @@ DEPEND="
5619 $(add_frameworks_dep kwidgetsaddons)
5620 $(add_frameworks_dep kxmlgui)
5621 $(add_kdeapps_dep libkdegames)
5622 - dev-qt/qtgui:5
5623 - dev-qt/qtnetwork:5
5624 - dev-qt/qtwidgets:5
5625 - dev-qt/qtxml:5
5626 + $(add_qt_dep qtgui)
5627 + $(add_qt_dep qtnetwork)
5628 + $(add_qt_dep qtwidgets)
5629 + $(add_qt_dep qtxml)
5630 "
5631
5632 RDEPEND="${DEPEND}"
5633
5634 diff --git a/kde-apps/knavalbattle/knavalbattle-9999.ebuild b/kde-apps/knavalbattle/knavalbattle-9999.ebuild
5635 index 087feff..a430243 100644
5636 --- a/kde-apps/knavalbattle/knavalbattle-9999.ebuild
5637 +++ b/kde-apps/knavalbattle/knavalbattle-9999.ebuild
5638 @@ -28,10 +28,10 @@ DEPEND="
5639 $(add_frameworks_dep kwidgetsaddons)
5640 $(add_frameworks_dep kxmlgui)
5641 $(add_kdeapps_dep libkdegames)
5642 - dev-qt/qtgui:5
5643 - dev-qt/qtnetwork:5
5644 - dev-qt/qtwidgets:5
5645 - dev-qt/qtxml:5
5646 + $(add_qt_dep qtgui)
5647 + $(add_qt_dep qtnetwork)
5648 + $(add_qt_dep qtwidgets)
5649 + $(add_qt_dep qtxml)
5650 "
5651
5652 RDEPEND="${DEPEND}"
5653
5654 diff --git a/kde-apps/knetwalk/knetwalk-15.12.1.ebuild b/kde-apps/knetwalk/knetwalk-15.12.1.ebuild
5655 index ffc2c9c..35fa87c 100644
5656 --- a/kde-apps/knetwalk/knetwalk-15.12.1.ebuild
5657 +++ b/kde-apps/knetwalk/knetwalk-15.12.1.ebuild
5658 @@ -32,9 +32,9 @@ DEPEND="
5659 $(add_frameworks_dep kwidgetsaddons)
5660 $(add_frameworks_dep kxmlgui)
5661 $(add_kdeapps_dep libkdegames)
5662 - dev-qt/qtdeclarative:5
5663 - dev-qt/qtgui:5
5664 - dev-qt/qtsvg:5
5665 - dev-qt/qtwidgets:5
5666 + $(add_qt_dep qtdeclarative)
5667 + $(add_qt_dep qtgui)
5668 + $(add_qt_dep qtsvg)
5669 + $(add_qt_dep qtwidgets)
5670 "
5671 RDEPEND="${DEPEND}"
5672
5673 diff --git a/kde-apps/knetwalk/knetwalk-15.12.49.9999.ebuild b/kde-apps/knetwalk/knetwalk-15.12.49.9999.ebuild
5674 index b29b2ca..6f124c4 100644
5675 --- a/kde-apps/knetwalk/knetwalk-15.12.49.9999.ebuild
5676 +++ b/kde-apps/knetwalk/knetwalk-15.12.49.9999.ebuild
5677 @@ -32,9 +32,9 @@ DEPEND="
5678 $(add_frameworks_dep kwidgetsaddons)
5679 $(add_frameworks_dep kxmlgui)
5680 $(add_kdeapps_dep libkdegames)
5681 - dev-qt/qtdeclarative:5
5682 - dev-qt/qtgui:5
5683 - dev-qt/qtsvg:5
5684 - dev-qt/qtwidgets:5
5685 + $(add_qt_dep qtdeclarative)
5686 + $(add_qt_dep qtgui)
5687 + $(add_qt_dep qtsvg)
5688 + $(add_qt_dep qtwidgets)
5689 "
5690 RDEPEND="${DEPEND}"
5691
5692 diff --git a/kde-apps/knetwalk/knetwalk-9999.ebuild b/kde-apps/knetwalk/knetwalk-9999.ebuild
5693 index 7996929..e50d92c 100644
5694 --- a/kde-apps/knetwalk/knetwalk-9999.ebuild
5695 +++ b/kde-apps/knetwalk/knetwalk-9999.ebuild
5696 @@ -33,9 +33,9 @@ DEPEND="
5697 $(add_frameworks_dep kwidgetsaddons)
5698 $(add_frameworks_dep kxmlgui)
5699 $(add_kdeapps_dep libkdegames)
5700 - dev-qt/qtdeclarative:5
5701 - dev-qt/qtgui:5
5702 - dev-qt/qtsvg:5
5703 - dev-qt/qtwidgets:5
5704 + $(add_qt_dep qtdeclarative)
5705 + $(add_qt_dep qtgui)
5706 + $(add_qt_dep qtsvg)
5707 + $(add_qt_dep qtwidgets)
5708 "
5709 RDEPEND="${DEPEND}"
5710
5711 diff --git a/kde-apps/kolf/kolf-5.9999.ebuild b/kde-apps/kolf/kolf-5.9999.ebuild
5712 index 3c13f77..8ef6248 100644
5713 --- a/kde-apps/kolf/kolf-5.9999.ebuild
5714 +++ b/kde-apps/kolf/kolf-5.9999.ebuild
5715 @@ -29,8 +29,8 @@ DEPEND="
5716 $(add_frameworks_dep kwidgetsaddons)
5717 $(add_frameworks_dep kxmlgui)
5718 $(add_kdeapps_dep libkdegames)
5719 - dev-qt/qtgui:5
5720 - dev-qt/qtwidgets:5
5721 + $(add_qt_dep qtgui)
5722 + $(add_qt_dep qtwidgets)
5723 "
5724
5725 RDEPEND="${DEPEND}"
5726
5727 diff --git a/kde-apps/kollision/kollision-15.12.1.ebuild b/kde-apps/kollision/kollision-15.12.1.ebuild
5728 index df3004c..443eec4 100644
5729 --- a/kde-apps/kollision/kollision-15.12.1.ebuild
5730 +++ b/kde-apps/kollision/kollision-15.12.1.ebuild
5731 @@ -23,7 +23,7 @@ DEPEND="
5732 $(add_frameworks_dep kwidgetsaddons)
5733 $(add_frameworks_dep kxmlgui)
5734 $(add_kdeapps_dep libkdegames)
5735 - dev-qt/qtgui:5
5736 - dev-qt/qtwidgets:5
5737 + $(add_qt_dep qtgui)
5738 + $(add_qt_dep qtwidgets)
5739 "
5740 RDEPEND="${DEPEND}"
5741
5742 diff --git a/kde-apps/kollision/kollision-15.12.49.9999.ebuild b/kde-apps/kollision/kollision-15.12.49.9999.ebuild
5743 index ebea780..ecbe72c 100644
5744 --- a/kde-apps/kollision/kollision-15.12.49.9999.ebuild
5745 +++ b/kde-apps/kollision/kollision-15.12.49.9999.ebuild
5746 @@ -23,7 +23,7 @@ DEPEND="
5747 $(add_frameworks_dep kwidgetsaddons)
5748 $(add_frameworks_dep kxmlgui)
5749 $(add_kdeapps_dep libkdegames)
5750 - dev-qt/qtgui:5
5751 - dev-qt/qtwidgets:5
5752 + $(add_qt_dep qtgui)
5753 + $(add_qt_dep qtwidgets)
5754 "
5755 RDEPEND="${DEPEND}"
5756
5757 diff --git a/kde-apps/kollision/kollision-9999.ebuild b/kde-apps/kollision/kollision-9999.ebuild
5758 index eefc329..c4d103b 100644
5759 --- a/kde-apps/kollision/kollision-9999.ebuild
5760 +++ b/kde-apps/kollision/kollision-9999.ebuild
5761 @@ -25,7 +25,7 @@ DEPEND="
5762 $(add_frameworks_dep kwidgetsaddons)
5763 $(add_frameworks_dep kxmlgui)
5764 $(add_kdeapps_dep libkdegames)
5765 - dev-qt/qtgui:5
5766 - dev-qt/qtwidgets:5
5767 + $(add_qt_dep qtgui)
5768 + $(add_qt_dep qtwidgets)
5769 "
5770 RDEPEND="${DEPEND}"
5771
5772 diff --git a/kde-apps/kompare/kompare-15.12.1.ebuild b/kde-apps/kompare/kompare-15.12.1.ebuild
5773 index 56e5479..8c58e70 100644
5774 --- a/kde-apps/kompare/kompare-15.12.1.ebuild
5775 +++ b/kde-apps/kompare/kompare-15.12.1.ebuild
5776 @@ -29,9 +29,9 @@ RDEPEND="
5777 $(add_frameworks_dep kwidgetsaddons)
5778 $(add_frameworks_dep kxmlgui)
5779 $(add_kdeapps_dep libkomparediff2)
5780 - dev-qt/qtgui:5
5781 - dev-qt/qtprintsupport:5
5782 - dev-qt/qtwidgets:5
5783 + $(add_qt_dep qtgui)
5784 + $(add_qt_dep qtprintsupport)
5785 + $(add_qt_dep qtwidgets)
5786 "
5787
5788 DEPEND="${RDEPEND}"
5789
5790 diff --git a/kde-apps/kompare/kompare-15.12.49.9999.ebuild b/kde-apps/kompare/kompare-15.12.49.9999.ebuild
5791 index 99f9cc4..3dc432b 100644
5792 --- a/kde-apps/kompare/kompare-15.12.49.9999.ebuild
5793 +++ b/kde-apps/kompare/kompare-15.12.49.9999.ebuild
5794 @@ -29,9 +29,9 @@ RDEPEND="
5795 $(add_frameworks_dep kwidgetsaddons)
5796 $(add_frameworks_dep kxmlgui)
5797 $(add_kdeapps_dep libkomparediff2)
5798 - dev-qt/qtgui:5
5799 - dev-qt/qtprintsupport:5
5800 - dev-qt/qtwidgets:5
5801 + $(add_qt_dep qtgui)
5802 + $(add_qt_dep qtprintsupport)
5803 + $(add_qt_dep qtwidgets)
5804 "
5805
5806 DEPEND="${RDEPEND}"
5807
5808 diff --git a/kde-apps/kompare/kompare-9999.ebuild b/kde-apps/kompare/kompare-9999.ebuild
5809 index 99f9cc4..3dc432b 100644
5810 --- a/kde-apps/kompare/kompare-9999.ebuild
5811 +++ b/kde-apps/kompare/kompare-9999.ebuild
5812 @@ -29,9 +29,9 @@ RDEPEND="
5813 $(add_frameworks_dep kwidgetsaddons)
5814 $(add_frameworks_dep kxmlgui)
5815 $(add_kdeapps_dep libkomparediff2)
5816 - dev-qt/qtgui:5
5817 - dev-qt/qtprintsupport:5
5818 - dev-qt/qtwidgets:5
5819 + $(add_qt_dep qtgui)
5820 + $(add_qt_dep qtprintsupport)
5821 + $(add_qt_dep qtwidgets)
5822 "
5823
5824 DEPEND="${RDEPEND}"
5825
5826 diff --git a/kde-apps/konquest/konquest-5.9999.ebuild b/kde-apps/konquest/konquest-5.9999.ebuild
5827 index 8fbf1d3..103a826 100644
5828 --- a/kde-apps/konquest/konquest-5.9999.ebuild
5829 +++ b/kde-apps/konquest/konquest-5.9999.ebuild
5830 @@ -34,11 +34,11 @@ DEPEND="
5831 $(add_frameworks_dep kwindowsystem)
5832 $(add_frameworks_dep kxmlgui)
5833 $(add_kdeapps_dep libkdegames)
5834 - dev-qt/qtdeclarative:5[widgets]
5835 - dev-qt/qtgui:5
5836 - dev-qt/qtnetwork:5
5837 - dev-qt/qtsvg:5
5838 - dev-qt/qtwidgets:5
5839 + $(add_qt_dep qtdeclarative 'widgets')
5840 + $(add_qt_dep qtgui)
5841 + $(add_qt_dep qtnetwork)
5842 + $(add_qt_dep qtsvg)
5843 + $(add_qt_dep qtwidgets)
5844 media-libs/phonon[qt5]
5845 "
5846
5847
5848 diff --git a/kde-apps/konsole/konsole-15.12.1.ebuild b/kde-apps/konsole/konsole-15.12.1.ebuild
5849 index b89b816..1690787 100644
5850 --- a/kde-apps/konsole/konsole-15.12.1.ebuild
5851 +++ b/kde-apps/konsole/konsole-15.12.1.ebuild
5852 @@ -37,13 +37,13 @@ DEPEND="
5853 $(add_frameworks_dep kwidgetsaddons)
5854 $(add_frameworks_dep kwindowsystem)
5855 $(add_frameworks_dep kxmlgui)
5856 - dev-qt/qtdbus:5
5857 - dev-qt/qtgui:5
5858 - dev-qt/qtnetwork:5
5859 - dev-qt/qtprintsupport:5
5860 - dev-qt/qtscript:5
5861 - dev-qt/qtwidgets:5
5862 - dev-qt/qtxml:5
5863 + $(add_qt_dep qtdbus)
5864 + $(add_qt_dep qtgui)
5865 + $(add_qt_dep qtnetwork)
5866 + $(add_qt_dep qtprintsupport)
5867 + $(add_qt_dep qtscript)
5868 + $(add_qt_dep qtwidgets)
5869 + $(add_qt_dep qtxml)
5870 X? ( x11-libs/libX11 )
5871 "
5872 RDEPEND="${DEPEND}"
5873
5874 diff --git a/kde-apps/konsole/konsole-15.12.49.9999.ebuild b/kde-apps/konsole/konsole-15.12.49.9999.ebuild
5875 index b387ad8..00c0da3 100644
5876 --- a/kde-apps/konsole/konsole-15.12.49.9999.ebuild
5877 +++ b/kde-apps/konsole/konsole-15.12.49.9999.ebuild
5878 @@ -37,13 +37,13 @@ DEPEND="
5879 $(add_frameworks_dep kwidgetsaddons)
5880 $(add_frameworks_dep kwindowsystem)
5881 $(add_frameworks_dep kxmlgui)
5882 - dev-qt/qtdbus:5
5883 - dev-qt/qtgui:5
5884 - dev-qt/qtnetwork:5
5885 - dev-qt/qtprintsupport:5
5886 - dev-qt/qtscript:5
5887 - dev-qt/qtwidgets:5
5888 - dev-qt/qtxml:5
5889 + $(add_qt_dep qtdbus)
5890 + $(add_qt_dep qtgui)
5891 + $(add_qt_dep qtnetwork)
5892 + $(add_qt_dep qtprintsupport)
5893 + $(add_qt_dep qtscript)
5894 + $(add_qt_dep qtwidgets)
5895 + $(add_qt_dep qtxml)
5896 X? ( x11-libs/libX11 )
5897 "
5898 RDEPEND="${DEPEND}"
5899
5900 diff --git a/kde-apps/konsole/konsole-9999.ebuild b/kde-apps/konsole/konsole-9999.ebuild
5901 index b387ad8..00c0da3 100644
5902 --- a/kde-apps/konsole/konsole-9999.ebuild
5903 +++ b/kde-apps/konsole/konsole-9999.ebuild
5904 @@ -37,13 +37,13 @@ DEPEND="
5905 $(add_frameworks_dep kwidgetsaddons)
5906 $(add_frameworks_dep kwindowsystem)
5907 $(add_frameworks_dep kxmlgui)
5908 - dev-qt/qtdbus:5
5909 - dev-qt/qtgui:5
5910 - dev-qt/qtnetwork:5
5911 - dev-qt/qtprintsupport:5
5912 - dev-qt/qtscript:5
5913 - dev-qt/qtwidgets:5
5914 - dev-qt/qtxml:5
5915 + $(add_qt_dep qtdbus)
5916 + $(add_qt_dep qtgui)
5917 + $(add_qt_dep qtnetwork)
5918 + $(add_qt_dep qtprintsupport)
5919 + $(add_qt_dep qtscript)
5920 + $(add_qt_dep qtwidgets)
5921 + $(add_qt_dep qtxml)
5922 X? ( x11-libs/libX11 )
5923 "
5924 RDEPEND="${DEPEND}"
5925
5926 diff --git a/kde-apps/kontactinterface/kontactinterface-15.12.1.ebuild b/kde-apps/kontactinterface/kontactinterface-15.12.1.ebuild
5927 index d4701cb..0cd8b02 100644
5928 --- a/kde-apps/kontactinterface/kontactinterface-15.12.1.ebuild
5929 +++ b/kde-apps/kontactinterface/kontactinterface-15.12.1.ebuild
5930 @@ -19,9 +19,9 @@ RDEPEND="
5931 $(add_frameworks_dep kparts)
5932 $(add_frameworks_dep kwindowsystem)
5933 $(add_frameworks_dep kxmlgui)
5934 - dev-qt/qtdbus:5
5935 - dev-qt/qtgui:5
5936 - dev-qt/qtwidgets:5
5937 - dev-qt/qtxml:5
5938 + $(add_qt_dep qtdbus)
5939 + $(add_qt_dep qtgui)
5940 + $(add_qt_dep qtwidgets)
5941 + $(add_qt_dep qtxml)
5942 "
5943 DEPEND="${RDEPEND}"
5944
5945 diff --git a/kde-apps/kontactinterface/kontactinterface-15.12.49.9999.ebuild b/kde-apps/kontactinterface/kontactinterface-15.12.49.9999.ebuild
5946 index 75011f0..6b29dc4 100644
5947 --- a/kde-apps/kontactinterface/kontactinterface-15.12.49.9999.ebuild
5948 +++ b/kde-apps/kontactinterface/kontactinterface-15.12.49.9999.ebuild
5949 @@ -19,9 +19,9 @@ RDEPEND="
5950 $(add_frameworks_dep kparts)
5951 $(add_frameworks_dep kwindowsystem)
5952 $(add_frameworks_dep kxmlgui)
5953 - dev-qt/qtdbus:5
5954 - dev-qt/qtgui:5
5955 - dev-qt/qtwidgets:5
5956 - dev-qt/qtxml:5
5957 + $(add_qt_dep qtdbus)
5958 + $(add_qt_dep qtgui)
5959 + $(add_qt_dep qtwidgets)
5960 + $(add_qt_dep qtxml)
5961 "
5962 DEPEND="${RDEPEND}"
5963
5964 diff --git a/kde-apps/kontactinterface/kontactinterface-9999.ebuild b/kde-apps/kontactinterface/kontactinterface-9999.ebuild
5965 index 75011f0..6b29dc4 100644
5966 --- a/kde-apps/kontactinterface/kontactinterface-9999.ebuild
5967 +++ b/kde-apps/kontactinterface/kontactinterface-9999.ebuild
5968 @@ -19,9 +19,9 @@ RDEPEND="
5969 $(add_frameworks_dep kparts)
5970 $(add_frameworks_dep kwindowsystem)
5971 $(add_frameworks_dep kxmlgui)
5972 - dev-qt/qtdbus:5
5973 - dev-qt/qtgui:5
5974 - dev-qt/qtwidgets:5
5975 - dev-qt/qtxml:5
5976 + $(add_qt_dep qtdbus)
5977 + $(add_qt_dep qtgui)
5978 + $(add_qt_dep qtwidgets)
5979 + $(add_qt_dep qtxml)
5980 "
5981 DEPEND="${RDEPEND}"
5982
5983 diff --git a/kde-apps/kpat/kpat-15.12.1.ebuild b/kde-apps/kpat/kpat-15.12.1.ebuild
5984 index 47907c1..f81e7e7 100644
5985 --- a/kde-apps/kpat/kpat-15.12.1.ebuild
5986 +++ b/kde-apps/kpat/kpat-15.12.1.ebuild
5987 @@ -34,11 +34,11 @@ DEPEND="
5988 $(add_frameworks_dep kwidgetsaddons)
5989 $(add_frameworks_dep kxmlgui)
5990 $(add_kdeapps_dep libkdegames)
5991 - dev-qt/qtdeclarative:5[widgets]
5992 - dev-qt/qtgui:5
5993 - dev-qt/qtnetwork:5
5994 - dev-qt/qtsvg:5
5995 - dev-qt/qtwidgets:5
5996 + $(add_qt_dep qtdeclarative 'widgets')
5997 + $(add_qt_dep qtgui)
5998 + $(add_qt_dep qtnetwork)
5999 + $(add_qt_dep qtsvg)
6000 + $(add_qt_dep qtwidgets)
6001 media-libs/phonon[qt5]
6002 x11-misc/shared-mime-info
6003 "
6004
6005 diff --git a/kde-apps/kpat/kpat-15.12.49.9999.ebuild b/kde-apps/kpat/kpat-15.12.49.9999.ebuild
6006 index d8b7eca..217309d 100644
6007 --- a/kde-apps/kpat/kpat-15.12.49.9999.ebuild
6008 +++ b/kde-apps/kpat/kpat-15.12.49.9999.ebuild
6009 @@ -34,11 +34,11 @@ DEPEND="
6010 $(add_frameworks_dep kwidgetsaddons)
6011 $(add_frameworks_dep kxmlgui)
6012 $(add_kdeapps_dep libkdegames)
6013 - dev-qt/qtdeclarative:5[widgets]
6014 - dev-qt/qtgui:5
6015 - dev-qt/qtnetwork:5
6016 - dev-qt/qtsvg:5
6017 - dev-qt/qtwidgets:5
6018 + $(add_qt_dep qtdeclarative 'widgets')
6019 + $(add_qt_dep qtgui)
6020 + $(add_qt_dep qtnetwork)
6021 + $(add_qt_dep qtsvg)
6022 + $(add_qt_dep qtwidgets)
6023 media-libs/phonon[qt5]
6024 x11-misc/shared-mime-info
6025 "
6026
6027 diff --git a/kde-apps/kpat/kpat-9999.ebuild b/kde-apps/kpat/kpat-9999.ebuild
6028 index 5fdc1e0..e6c10b7 100644
6029 --- a/kde-apps/kpat/kpat-9999.ebuild
6030 +++ b/kde-apps/kpat/kpat-9999.ebuild
6031 @@ -35,11 +35,11 @@ DEPEND="
6032 $(add_frameworks_dep kwidgetsaddons)
6033 $(add_frameworks_dep kxmlgui)
6034 $(add_kdeapps_dep libkdegames)
6035 - dev-qt/qtdeclarative:5[widgets]
6036 - dev-qt/qtgui:5
6037 - dev-qt/qtnetwork:5
6038 - dev-qt/qtsvg:5
6039 - dev-qt/qtwidgets:5
6040 + $(add_qt_dep qtdeclarative 'widgets')
6041 + $(add_qt_dep qtgui)
6042 + $(add_qt_dep qtnetwork)
6043 + $(add_qt_dep qtsvg)
6044 + $(add_qt_dep qtwidgets)
6045 media-libs/phonon[qt5]
6046 x11-misc/shared-mime-info
6047 "
6048
6049 diff --git a/kde-apps/kpeoplevcard/kpeoplevcard-9999.ebuild b/kde-apps/kpeoplevcard/kpeoplevcard-9999.ebuild
6050 index 9f6bfe0..97121d3 100644
6051 --- a/kde-apps/kpeoplevcard/kpeoplevcard-9999.ebuild
6052 +++ b/kde-apps/kpeoplevcard/kpeoplevcard-9999.ebuild
6053 @@ -16,7 +16,7 @@ DEPEND="
6054 $(add_frameworks_dep kcoreaddons)
6055 $(add_frameworks_dep kpeople)
6056 $(add_kdeapps_dep kcontacts)
6057 - dev-qt/qtgui:5
6058 - dev-qt/qtwidgets:5
6059 + $(add_qt_dep qtgui)
6060 + $(add_qt_dep qtwidgets)
6061 "
6062 RDEPEND="${DEPEND}"
6063
6064 diff --git a/kde-apps/kpimtextedit/kpimtextedit-15.12.1.ebuild b/kde-apps/kpimtextedit/kpimtextedit-15.12.1.ebuild
6065 index fa5bde3..0f3e3f3 100644
6066 --- a/kde-apps/kpimtextedit/kpimtextedit-15.12.1.ebuild
6067 +++ b/kde-apps/kpimtextedit/kpimtextedit-15.12.1.ebuild
6068 @@ -28,8 +28,8 @@ RDEPEND="
6069 $(add_frameworks_dep kxmlgui)
6070 $(add_frameworks_dep sonnet)
6071 dev-libs/grantlee:5
6072 - dev-qt/qtdbus:5
6073 - dev-qt/qtgui:5
6074 - dev-qt/qtwidgets:5
6075 + $(add_qt_dep qtdbus)
6076 + $(add_qt_dep qtgui)
6077 + $(add_qt_dep qtwidgets)
6078 "
6079 DEPEND="${RDEPEND}"
6080
6081 diff --git a/kde-apps/kpimtextedit/kpimtextedit-15.12.49.9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-15.12.49.9999.ebuild
6082 index 41429b8..6518b60 100644
6083 --- a/kde-apps/kpimtextedit/kpimtextedit-15.12.49.9999.ebuild
6084 +++ b/kde-apps/kpimtextedit/kpimtextedit-15.12.49.9999.ebuild
6085 @@ -28,8 +28,8 @@ RDEPEND="
6086 $(add_frameworks_dep kxmlgui)
6087 $(add_frameworks_dep sonnet)
6088 dev-libs/grantlee:5
6089 - dev-qt/qtdbus:5
6090 - dev-qt/qtgui:5
6091 - dev-qt/qtwidgets:5
6092 + $(add_qt_dep qtdbus)
6093 + $(add_qt_dep qtgui)
6094 + $(add_qt_dep qtwidgets)
6095 "
6096 DEPEND="${RDEPEND}"
6097
6098 diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
6099 index 41429b8..6518b60 100644
6100 --- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
6101 +++ b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
6102 @@ -28,8 +28,8 @@ RDEPEND="
6103 $(add_frameworks_dep kxmlgui)
6104 $(add_frameworks_dep sonnet)
6105 dev-libs/grantlee:5
6106 - dev-qt/qtdbus:5
6107 - dev-qt/qtgui:5
6108 - dev-qt/qtwidgets:5
6109 + $(add_qt_dep qtdbus)
6110 + $(add_qt_dep qtgui)
6111 + $(add_qt_dep qtwidgets)
6112 "
6113 DEPEND="${RDEPEND}"
6114
6115 diff --git a/kde-apps/kproperty/kproperty-9999.ebuild b/kde-apps/kproperty/kproperty-9999.ebuild
6116 index dacddad..23e14c6 100644
6117 --- a/kde-apps/kproperty/kproperty-9999.ebuild
6118 +++ b/kde-apps/kproperty/kproperty-9999.ebuild
6119 @@ -16,8 +16,8 @@ DEPEND="
6120 $(add_frameworks_dep kcoreaddons)
6121 $(add_frameworks_dep kguiaddons)
6122 $(add_frameworks_dep kwidgetsaddons)
6123 - dev-qt/qtgui:5
6124 - dev-qt/qtwidgets:5
6125 + $(add_qt_dep qtgui)
6126 + $(add_qt_dep qtwidgets)
6127 "
6128
6129 RDEPEND="${DEPEND}"
6130
6131 diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-5.9999.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-5.9999.ebuild
6132 index 86b5beb..447baa7 100644
6133 --- a/kde-apps/kqtquickcharts/kqtquickcharts-5.9999.ebuild
6134 +++ b/kde-apps/kqtquickcharts/kqtquickcharts-5.9999.ebuild
6135 @@ -12,7 +12,7 @@ KEYWORDS=""
6136 IUSE=""
6137
6138 DEPEND="
6139 - dev-qt/qtdeclarative:5
6140 - dev-qt/qtgui:5
6141 + $(add_qt_dep qtdeclarative)
6142 + $(add_qt_dep qtgui)
6143 "
6144 RDEPEND="${DEPEND}"
6145
6146 diff --git a/kde-apps/krdc/krdc-5.9999.ebuild b/kde-apps/krdc/krdc-5.9999.ebuild
6147 index da43932..b5460f1 100644
6148 --- a/kde-apps/krdc/krdc-5.9999.ebuild
6149 +++ b/kde-apps/krdc/krdc-5.9999.ebuild
6150 @@ -31,9 +31,9 @@ DEPEND="
6151 $(add_frameworks_dep kwallet)
6152 $(add_frameworks_dep kwidgetsaddons)
6153 $(add_frameworks_dep kxmlgui)
6154 - dev-qt/qtgui:5
6155 - dev-qt/qtwidgets:5
6156 - dev-qt/qtxml:5
6157 + $(add_qt_dep qtgui)
6158 + $(add_qt_dep qtwidgets)
6159 + $(add_qt_dep qtxml)
6160 net-dns/avahi
6161 vnc? ( >=net-libs/libvncserver-0.9 )
6162 "
6163
6164 diff --git a/kde-apps/kreport/kreport-9999.ebuild b/kde-apps/kreport/kreport-9999.ebuild
6165 index 57a276a..10f8e2c 100644
6166 --- a/kde-apps/kreport/kreport-9999.ebuild
6167 +++ b/kde-apps/kreport/kreport-9999.ebuild
6168 @@ -18,10 +18,10 @@ DEPEND="
6169 $(add_frameworks_dep kwidgetsaddons)
6170 $(add_frameworks_dep kross)
6171 $(add_kdeapps_dep kproperty)
6172 - dev-qt/qtgui:5
6173 - dev-qt/qtprintsupport:5
6174 - dev-qt/qtwidgets:5
6175 - dev-qt/qtxml:5
6176 + $(add_qt_dep qtgui)
6177 + $(add_qt_dep qtprintsupport)
6178 + $(add_qt_dep qtwidgets)
6179 + $(add_qt_dep qtxml)
6180 "
6181
6182 RDEPEND="${DEPEND}"
6183
6184 diff --git a/kde-apps/kreversi/kreversi-5.9999.ebuild b/kde-apps/kreversi/kreversi-5.9999.ebuild
6185 index 99706c7..88b97c8 100644
6186 --- a/kde-apps/kreversi/kreversi-5.9999.ebuild
6187 +++ b/kde-apps/kreversi/kreversi-5.9999.ebuild
6188 @@ -31,11 +31,11 @@ DEPEND="
6189 $(add_frameworks_dep kwidgetsaddons)
6190 $(add_frameworks_dep kxmlgui)
6191 $(add_kdeapps_dep libkdegames)
6192 - dev-qt/qtdeclarative:5
6193 - dev-qt/qtgui:5
6194 - dev-qt/qtsvg:5
6195 - dev-qt/qtwidgets:5
6196 - dev-qt/qtxml:5
6197 + $(add_qt_dep qtdeclarative)
6198 + $(add_qt_dep qtgui)
6199 + $(add_qt_dep qtsvg)
6200 + $(add_qt_dep qtwidgets)
6201 + $(add_qt_dep qtxml)
6202 "
6203
6204 RDEPEND="${DEPEND}"
6205
6206 diff --git a/kde-apps/krfb/krfb-15.12.1.ebuild b/kde-apps/krfb/krfb-15.12.1.ebuild
6207 index 340f646..d6860f4 100644
6208 --- a/kde-apps/krfb/krfb-15.12.1.ebuild
6209 +++ b/kde-apps/krfb/krfb-15.12.1.ebuild
6210 @@ -26,11 +26,11 @@ DEPEND="
6211 $(add_frameworks_dep kwallet)
6212 $(add_frameworks_dep kwidgetsaddons)
6213 $(add_frameworks_dep kxmlgui)
6214 - dev-qt/qtdbus:5
6215 - dev-qt/qtgui:5
6216 - dev-qt/qtnetwork:5
6217 - dev-qt/qtwidgets:5
6218 - dev-qt/qtx11extras:5
6219 + $(add_qt_dep qtdbus)
6220 + $(add_qt_dep qtgui)
6221 + $(add_qt_dep qtnetwork)
6222 + $(add_qt_dep qtwidgets)
6223 + $(add_qt_dep qtx11extras)
6224 >=net-libs/libvncserver-0.9.9
6225 sys-libs/zlib
6226 virtual/jpeg:0
6227
6228 diff --git a/kde-apps/krfb/krfb-15.12.49.9999.ebuild b/kde-apps/krfb/krfb-15.12.49.9999.ebuild
6229 index 50c9c95..0a9716e 100644
6230 --- a/kde-apps/krfb/krfb-15.12.49.9999.ebuild
6231 +++ b/kde-apps/krfb/krfb-15.12.49.9999.ebuild
6232 @@ -26,11 +26,11 @@ DEPEND="
6233 $(add_frameworks_dep kwallet)
6234 $(add_frameworks_dep kwidgetsaddons)
6235 $(add_frameworks_dep kxmlgui)
6236 - dev-qt/qtdbus:5
6237 - dev-qt/qtgui:5
6238 - dev-qt/qtnetwork:5
6239 - dev-qt/qtwidgets:5
6240 - dev-qt/qtx11extras:5
6241 + $(add_qt_dep qtdbus)
6242 + $(add_qt_dep qtgui)
6243 + $(add_qt_dep qtnetwork)
6244 + $(add_qt_dep qtwidgets)
6245 + $(add_qt_dep qtx11extras)
6246 >=net-libs/libvncserver-0.9.9
6247 sys-libs/zlib
6248 virtual/jpeg:0
6249
6250 diff --git a/kde-apps/krfb/krfb-9999.ebuild b/kde-apps/krfb/krfb-9999.ebuild
6251 index 50c9c95..0a9716e 100644
6252 --- a/kde-apps/krfb/krfb-9999.ebuild
6253 +++ b/kde-apps/krfb/krfb-9999.ebuild
6254 @@ -26,11 +26,11 @@ DEPEND="
6255 $(add_frameworks_dep kwallet)
6256 $(add_frameworks_dep kwidgetsaddons)
6257 $(add_frameworks_dep kxmlgui)
6258 - dev-qt/qtdbus:5
6259 - dev-qt/qtgui:5
6260 - dev-qt/qtnetwork:5
6261 - dev-qt/qtwidgets:5
6262 - dev-qt/qtx11extras:5
6263 + $(add_qt_dep qtdbus)
6264 + $(add_qt_dep qtgui)
6265 + $(add_qt_dep qtnetwork)
6266 + $(add_qt_dep qtwidgets)
6267 + $(add_qt_dep qtx11extras)
6268 >=net-libs/libvncserver-0.9.9
6269 sys-libs/zlib
6270 virtual/jpeg:0
6271
6272 diff --git a/kde-apps/kross-interpreters/kross-interpreters-15.08.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-15.08.3.ebuild
6273 index 1a29d22..67e2f00 100644
6274 --- a/kde-apps/kross-interpreters/kross-interpreters-15.08.3.ebuild
6275 +++ b/kde-apps/kross-interpreters/kross-interpreters-15.08.3.ebuild
6276 @@ -15,8 +15,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
6277
6278 DEPEND="${PYTHON_DEPS}
6279 $(add_frameworks_dep kross)
6280 - dev-qt/qtgui:5
6281 - dev-qt/qtwidgets:5
6282 + $(add_qt_dep qtgui)
6283 + $(add_qt_dep qtwidgets)
6284 "
6285 RDEPEND="${DEPEND}"
6286
6287
6288 diff --git a/kde-apps/kross-interpreters/kross-interpreters-15.12.1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-15.12.1.ebuild
6289 index 1a29d22..67e2f00 100644
6290 --- a/kde-apps/kross-interpreters/kross-interpreters-15.12.1.ebuild
6291 +++ b/kde-apps/kross-interpreters/kross-interpreters-15.12.1.ebuild
6292 @@ -15,8 +15,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
6293
6294 DEPEND="${PYTHON_DEPS}
6295 $(add_frameworks_dep kross)
6296 - dev-qt/qtgui:5
6297 - dev-qt/qtwidgets:5
6298 + $(add_qt_dep qtgui)
6299 + $(add_qt_dep qtwidgets)
6300 "
6301 RDEPEND="${DEPEND}"
6302
6303
6304 diff --git a/kde-apps/kross-interpreters/kross-interpreters-15.12.49.9999.ebuild b/kde-apps/kross-interpreters/kross-interpreters-15.12.49.9999.ebuild
6305 index b663895..007b5ca 100644
6306 --- a/kde-apps/kross-interpreters/kross-interpreters-15.12.49.9999.ebuild
6307 +++ b/kde-apps/kross-interpreters/kross-interpreters-15.12.49.9999.ebuild
6308 @@ -15,8 +15,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
6309
6310 DEPEND="${PYTHON_DEPS}
6311 $(add_frameworks_dep kross)
6312 - dev-qt/qtgui:5
6313 - dev-qt/qtwidgets:5
6314 + $(add_qt_dep qtgui)
6315 + $(add_qt_dep qtwidgets)
6316 "
6317 RDEPEND="${DEPEND}"
6318
6319
6320 diff --git a/kde-apps/kross-interpreters/kross-interpreters-9999.ebuild b/kde-apps/kross-interpreters/kross-interpreters-9999.ebuild
6321 index b663895..007b5ca 100644
6322 --- a/kde-apps/kross-interpreters/kross-interpreters-9999.ebuild
6323 +++ b/kde-apps/kross-interpreters/kross-interpreters-9999.ebuild
6324 @@ -15,8 +15,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
6325
6326 DEPEND="${PYTHON_DEPS}
6327 $(add_frameworks_dep kross)
6328 - dev-qt/qtgui:5
6329 - dev-qt/qtwidgets:5
6330 + $(add_qt_dep qtgui)
6331 + $(add_qt_dep qtwidgets)
6332 "
6333 RDEPEND="${DEPEND}"
6334
6335
6336 diff --git a/kde-apps/kruler/kruler-15.12.1.ebuild b/kde-apps/kruler/kruler-15.12.1.ebuild
6337 index 978cfee..c5f47ae 100644
6338 --- a/kde-apps/kruler/kruler-15.12.1.ebuild
6339 +++ b/kde-apps/kruler/kruler-15.12.1.ebuild
6340 @@ -21,10 +21,10 @@ DEPEND="
6341 $(add_frameworks_dep kwidgetsaddons)
6342 $(add_frameworks_dep kwindowsystem)
6343 $(add_frameworks_dep kxmlgui)
6344 - dev-qt/qtgui:5
6345 - dev-qt/qtwidgets:5
6346 + $(add_qt_dep qtgui)
6347 + $(add_qt_dep qtwidgets)
6348 X? (
6349 - dev-qt/qtx11extras:5
6350 + $(add_qt_dep qtx11extras)
6351 x11-libs/libxcb
6352 )
6353 "
6354
6355 diff --git a/kde-apps/kruler/kruler-15.12.49.9999.ebuild b/kde-apps/kruler/kruler-15.12.49.9999.ebuild
6356 index c2e1f88..65ff117 100644
6357 --- a/kde-apps/kruler/kruler-15.12.49.9999.ebuild
6358 +++ b/kde-apps/kruler/kruler-15.12.49.9999.ebuild
6359 @@ -21,10 +21,10 @@ DEPEND="
6360 $(add_frameworks_dep kwidgetsaddons)
6361 $(add_frameworks_dep kwindowsystem)
6362 $(add_frameworks_dep kxmlgui)
6363 - dev-qt/qtgui:5
6364 - dev-qt/qtwidgets:5
6365 + $(add_qt_dep qtgui)
6366 + $(add_qt_dep qtwidgets)
6367 X? (
6368 - dev-qt/qtx11extras:5
6369 + $(add_qt_dep qtx11extras)
6370 x11-libs/libxcb
6371 )
6372 "
6373
6374 diff --git a/kde-apps/kruler/kruler-9999.ebuild b/kde-apps/kruler/kruler-9999.ebuild
6375 index c2e1f88..65ff117 100644
6376 --- a/kde-apps/kruler/kruler-9999.ebuild
6377 +++ b/kde-apps/kruler/kruler-9999.ebuild
6378 @@ -21,10 +21,10 @@ DEPEND="
6379 $(add_frameworks_dep kwidgetsaddons)
6380 $(add_frameworks_dep kwindowsystem)
6381 $(add_frameworks_dep kxmlgui)
6382 - dev-qt/qtgui:5
6383 - dev-qt/qtwidgets:5
6384 + $(add_qt_dep qtgui)
6385 + $(add_qt_dep qtwidgets)
6386 X? (
6387 - dev-qt/qtx11extras:5
6388 + $(add_qt_dep qtx11extras)
6389 x11-libs/libxcb
6390 )
6391 "
6392
6393 diff --git a/kde-apps/kshisen/kshisen-15.12.1.ebuild b/kde-apps/kshisen/kshisen-15.12.1.ebuild
6394 index aac9b75..3eaf39a 100644
6395 --- a/kde-apps/kshisen/kshisen-15.12.1.ebuild
6396 +++ b/kde-apps/kshisen/kshisen-15.12.1.ebuild
6397 @@ -26,7 +26,7 @@ DEPEND="
6398 $(add_frameworks_dep kxmlgui)
6399 $(add_kdeapps_dep libkdegames)
6400 $(add_kdeapps_dep libkmahjongg)
6401 - dev-qt/qtgui:5
6402 - dev-qt/qtwidgets:5
6403 + $(add_qt_dep qtgui)
6404 + $(add_qt_dep qtwidgets)
6405 "
6406 RDEPEND="${DEPEND}"
6407
6408 diff --git a/kde-apps/kshisen/kshisen-15.12.49.9999.ebuild b/kde-apps/kshisen/kshisen-15.12.49.9999.ebuild
6409 index 985545a..649c6be 100644
6410 --- a/kde-apps/kshisen/kshisen-15.12.49.9999.ebuild
6411 +++ b/kde-apps/kshisen/kshisen-15.12.49.9999.ebuild
6412 @@ -26,7 +26,7 @@ DEPEND="
6413 $(add_frameworks_dep kxmlgui)
6414 $(add_kdeapps_dep libkdegames)
6415 $(add_kdeapps_dep libkmahjongg)
6416 - dev-qt/qtgui:5
6417 - dev-qt/qtwidgets:5
6418 + $(add_qt_dep qtgui)
6419 + $(add_qt_dep qtwidgets)
6420 "
6421 RDEPEND="${DEPEND}"
6422
6423 diff --git a/kde-apps/kshisen/kshisen-9999.ebuild b/kde-apps/kshisen/kshisen-9999.ebuild
6424 index 060feef..b7daea8 100644
6425 --- a/kde-apps/kshisen/kshisen-9999.ebuild
6426 +++ b/kde-apps/kshisen/kshisen-9999.ebuild
6427 @@ -27,7 +27,7 @@ DEPEND="
6428 $(add_frameworks_dep kxmlgui)
6429 $(add_kdeapps_dep libkdegames)
6430 $(add_kdeapps_dep libkmahjongg)
6431 - dev-qt/qtgui:5
6432 - dev-qt/qtwidgets:5
6433 + $(add_qt_dep qtgui)
6434 + $(add_qt_dep qtwidgets)
6435 "
6436 RDEPEND="${DEPEND}"
6437
6438 diff --git a/kde-apps/ksnakeduel/ksnakeduel-5.9999.ebuild b/kde-apps/ksnakeduel/ksnakeduel-5.9999.ebuild
6439 index 3ae2137..370bac7 100644
6440 --- a/kde-apps/ksnakeduel/ksnakeduel-5.9999.ebuild
6441 +++ b/kde-apps/ksnakeduel/ksnakeduel-5.9999.ebuild
6442 @@ -31,11 +31,11 @@ DEPEND="
6443 $(add_frameworks_dep kwindowsystem)
6444 $(add_frameworks_dep kxmlgui)
6445 $(add_kdeapps_dep libkdegames)
6446 - dev-qt/qtdeclarative:5[widgets]
6447 - dev-qt/qtgui:5
6448 - dev-qt/qtnetwork:5
6449 - dev-qt/qtsvg:5
6450 - dev-qt/qtwidgets:5
6451 + $(add_qt_dep qtdeclarative 'widgets')
6452 + $(add_qt_dep qtgui)
6453 + $(add_qt_dep qtnetwork)
6454 + $(add_qt_dep qtsvg)
6455 + $(add_qt_dep qtwidgets)
6456 media-libs/phonon[qt5]
6457 "
6458
6459
6460 diff --git a/kde-apps/kspaceduel/kspaceduel-5.9999.ebuild b/kde-apps/kspaceduel/kspaceduel-5.9999.ebuild
6461 index d108f0f..d39ec23 100644
6462 --- a/kde-apps/kspaceduel/kspaceduel-5.9999.ebuild
6463 +++ b/kde-apps/kspaceduel/kspaceduel-5.9999.ebuild
6464 @@ -34,11 +34,11 @@ DEPEND="
6465 $(add_frameworks_dep kwindowsystem)
6466 $(add_frameworks_dep kxmlgui)
6467 $(add_kdeapps_dep libkdegames)
6468 - dev-qt/qtdeclarative:5[widgets]
6469 - dev-qt/qtgui:5
6470 - dev-qt/qtnetwork:5
6471 - dev-qt/qtsvg:5
6472 - dev-qt/qtwidgets:5
6473 + $(add_qt_dep qtdeclarative 'widgets')
6474 + $(add_qt_dep qtgui)
6475 + $(add_qt_dep qtnetwork)
6476 + $(add_qt_dep qtsvg)
6477 + $(add_qt_dep qtwidgets)
6478 media-libs/phonon[qt5]
6479 "
6480
6481
6482 diff --git a/kde-apps/ksquares/ksquares-15.12.1.ebuild b/kde-apps/ksquares/ksquares-15.12.1.ebuild
6483 index 083118a..16b42d1 100644
6484 --- a/kde-apps/ksquares/ksquares-15.12.1.ebuild
6485 +++ b/kde-apps/ksquares/ksquares-15.12.1.ebuild
6486 @@ -26,7 +26,7 @@ DEPEND="
6487 $(add_frameworks_dep kwidgetsaddons)
6488 $(add_frameworks_dep kxmlgui)
6489 $(add_kdeapps_dep libkdegames)
6490 - dev-qt/qtgui:5
6491 - dev-qt/qtwidgets:5
6492 + $(add_qt_dep qtgui)
6493 + $(add_qt_dep qtwidgets)
6494 "
6495 RDEPEND="${DEPEND}"
6496
6497 diff --git a/kde-apps/ksquares/ksquares-15.12.49.9999.ebuild b/kde-apps/ksquares/ksquares-15.12.49.9999.ebuild
6498 index b820a26..cb7faf3 100644
6499 --- a/kde-apps/ksquares/ksquares-15.12.49.9999.ebuild
6500 +++ b/kde-apps/ksquares/ksquares-15.12.49.9999.ebuild
6501 @@ -26,7 +26,7 @@ DEPEND="
6502 $(add_frameworks_dep kwidgetsaddons)
6503 $(add_frameworks_dep kxmlgui)
6504 $(add_kdeapps_dep libkdegames)
6505 - dev-qt/qtgui:5
6506 - dev-qt/qtwidgets:5
6507 + $(add_qt_dep qtgui)
6508 + $(add_qt_dep qtwidgets)
6509 "
6510 RDEPEND="${DEPEND}"
6511
6512 diff --git a/kde-apps/ksquares/ksquares-9999.ebuild b/kde-apps/ksquares/ksquares-9999.ebuild
6513 index 768a864..f6f4e37 100644
6514 --- a/kde-apps/ksquares/ksquares-9999.ebuild
6515 +++ b/kde-apps/ksquares/ksquares-9999.ebuild
6516 @@ -27,7 +27,7 @@ DEPEND="
6517 $(add_frameworks_dep kwidgetsaddons)
6518 $(add_frameworks_dep kxmlgui)
6519 $(add_kdeapps_dep libkdegames)
6520 - dev-qt/qtgui:5
6521 - dev-qt/qtwidgets:5
6522 + $(add_qt_dep qtgui)
6523 + $(add_qt_dep qtwidgets)
6524 "
6525 RDEPEND="${DEPEND}"
6526
6527 diff --git a/kde-apps/kstars/kstars-15.08.3-r1.ebuild b/kde-apps/kstars/kstars-15.08.3-r1.ebuild
6528 index 6788000..cfa84b8 100644
6529 --- a/kde-apps/kstars/kstars-15.08.3-r1.ebuild
6530 +++ b/kde-apps/kstars/kstars-15.08.3-r1.ebuild
6531 @@ -32,15 +32,15 @@ COMMON_DEPEND="
6532 $(add_frameworks_dep ktexteditor)
6533 $(add_frameworks_dep kwidgetsaddons)
6534 $(add_frameworks_dep kxmlgui)
6535 - dev-qt/qtdbus:5
6536 - dev-qt/qtdeclarative:5
6537 - dev-qt/qtgui:5
6538 - dev-qt/qtmultimedia:5
6539 - dev-qt/qtprintsupport:5
6540 - dev-qt/qtsql:5
6541 - dev-qt/qtsvg:5
6542 - dev-qt/qtwidgets:5
6543 - dev-qt/qtxml:5
6544 + $(add_qt_dep qtdbus)
6545 + $(add_qt_dep qtdeclarative)
6546 + $(add_qt_dep qtgui)
6547 + $(add_qt_dep qtmultimedia)
6548 + $(add_qt_dep qtprintsupport)
6549 + $(add_qt_dep qtsql)
6550 + $(add_qt_dep qtsvg)
6551 + $(add_qt_dep qtwidgets)
6552 + $(add_qt_dep qtxml)
6553 >=sci-libs/cfitsio-0.390
6554 sys-libs/zlib
6555 indi? ( >=sci-libs/indilib-1.0.0 )
6556
6557 diff --git a/kde-apps/kstars/kstars-15.12.1.ebuild b/kde-apps/kstars/kstars-15.12.1.ebuild
6558 index 0762995..dad206a 100644
6559 --- a/kde-apps/kstars/kstars-15.12.1.ebuild
6560 +++ b/kde-apps/kstars/kstars-15.12.1.ebuild
6561 @@ -29,12 +29,12 @@ COMMON_DEPEND="
6562 $(add_frameworks_dep kplotting)
6563 $(add_frameworks_dep kwidgetsaddons)
6564 $(add_frameworks_dep kxmlgui)
6565 - dev-qt/qtdbus:5
6566 - dev-qt/qtgui:5
6567 - dev-qt/qtprintsupport:5
6568 - dev-qt/qtsvg:5
6569 - dev-qt/qtwidgets:5
6570 - dev-qt/qtxml:5
6571 + $(add_qt_dep qtdbus)
6572 + $(add_qt_dep qtgui)
6573 + $(add_qt_dep qtprintsupport)
6574 + $(add_qt_dep qtsvg)
6575 + $(add_qt_dep qtwidgets)
6576 + $(add_qt_dep qtxml)
6577 >=sci-libs/cfitsio-0.390
6578 sys-libs/zlib
6579 indi? (
6580
6581 diff --git a/kde-apps/kstars/kstars-15.12.49.9999.ebuild b/kde-apps/kstars/kstars-15.12.49.9999.ebuild
6582 index edbf535..3d25049 100644
6583 --- a/kde-apps/kstars/kstars-15.12.49.9999.ebuild
6584 +++ b/kde-apps/kstars/kstars-15.12.49.9999.ebuild
6585 @@ -29,12 +29,12 @@ COMMON_DEPEND="
6586 $(add_frameworks_dep kplotting)
6587 $(add_frameworks_dep kwidgetsaddons)
6588 $(add_frameworks_dep kxmlgui)
6589 - dev-qt/qtdbus:5
6590 - dev-qt/qtgui:5
6591 - dev-qt/qtprintsupport:5
6592 - dev-qt/qtsvg:5
6593 - dev-qt/qtwidgets:5
6594 - dev-qt/qtxml:5
6595 + $(add_qt_dep qtdbus)
6596 + $(add_qt_dep qtgui)
6597 + $(add_qt_dep qtprintsupport)
6598 + $(add_qt_dep qtsvg)
6599 + $(add_qt_dep qtwidgets)
6600 + $(add_qt_dep qtxml)
6601 >=sci-libs/cfitsio-0.390
6602 sys-libs/zlib
6603 indi? (
6604
6605 diff --git a/kde-apps/kstars/kstars-9999.ebuild b/kde-apps/kstars/kstars-9999.ebuild
6606 index 9eccdbc..16e9fd2 100644
6607 --- a/kde-apps/kstars/kstars-9999.ebuild
6608 +++ b/kde-apps/kstars/kstars-9999.ebuild
6609 @@ -29,12 +29,12 @@ COMMON_DEPEND="
6610 $(add_frameworks_dep kplotting)
6611 $(add_frameworks_dep kwidgetsaddons)
6612 $(add_frameworks_dep kxmlgui)
6613 - dev-qt/qtdbus:5
6614 - dev-qt/qtgui:5
6615 - dev-qt/qtprintsupport:5
6616 - dev-qt/qtsvg:5
6617 - dev-qt/qtwidgets:5
6618 - dev-qt/qtxml:5
6619 + $(add_qt_dep qtdbus)
6620 + $(add_qt_dep qtgui)
6621 + $(add_qt_dep qtprintsupport)
6622 + $(add_qt_dep qtsvg)
6623 + $(add_qt_dep qtwidgets)
6624 + $(add_qt_dep qtxml)
6625 >=sci-libs/cfitsio-0.390
6626 sys-libs/zlib
6627 indi? (
6628 @@ -46,7 +46,7 @@ COMMON_DEPEND="
6629 "
6630 # TODO: Add back when re-enabled by upstream
6631 # opengl? (
6632 -# dev-qt/qtopengl:5
6633 +# $(add_qt_dep qtopengl)
6634 # virtual/opengl
6635 # )
6636 DEPEND="${COMMON_DEPEND}
6637
6638 diff --git a/kde-apps/ksudoku/ksudoku-5.9999.ebuild b/kde-apps/ksudoku/ksudoku-5.9999.ebuild
6639 index e53c8e9..462eb43 100644
6640 --- a/kde-apps/ksudoku/ksudoku-5.9999.ebuild
6641 +++ b/kde-apps/ksudoku/ksudoku-5.9999.ebuild
6642 @@ -28,13 +28,13 @@ DEPEND="
6643 $(add_frameworks_dep kwidgetsaddons)
6644 $(add_frameworks_dep kxmlgui)
6645 $(add_kdeapps_dep libkdegames)
6646 - dev-qt/qtgui:5
6647 - dev-qt/qtprintsupport:5
6648 - dev-qt/qtsvg:5
6649 - dev-qt/qtwidgets:5
6650 - dev-qt/qtxml:5
6651 + $(add_qt_dep qtgui)
6652 + $(add_qt_dep qtprintsupport)
6653 + $(add_qt_dep qtsvg)
6654 + $(add_qt_dep qtwidgets)
6655 + $(add_qt_dep qtxml)
6656 opengl? (
6657 - dev-qt/qtopengl:5
6658 + $(add_qt_dep qtopengl)
6659 virtual/glu
6660 )
6661 "
6662
6663 diff --git a/kde-apps/ksystemlog/ksystemlog-15.12.1.ebuild b/kde-apps/ksystemlog/ksystemlog-15.12.1.ebuild
6664 index 73c52fc..916e784 100644
6665 --- a/kde-apps/ksystemlog/ksystemlog-15.12.1.ebuild
6666 +++ b/kde-apps/ksystemlog/ksystemlog-15.12.1.ebuild
6667 @@ -32,9 +32,9 @@ DEPEND="
6668 $(add_frameworks_dep ktextwidgets)
6669 $(add_frameworks_dep kwidgetsaddons)
6670 $(add_frameworks_dep kxmlgui)
6671 - dev-qt/qtgui:5
6672 - dev-qt/qtprintsupport:5
6673 - dev-qt/qtwidgets:5
6674 + $(add_qt_dep qtgui)
6675 + $(add_qt_dep qtprintsupport)
6676 + $(add_qt_dep qtwidgets)
6677 systemd? ( sys-apps/systemd )
6678 "
6679
6680
6681 diff --git a/kde-apps/ksystemlog/ksystemlog-15.12.49.9999.ebuild b/kde-apps/ksystemlog/ksystemlog-15.12.49.9999.ebuild
6682 index 7983665..b6ec9d9 100644
6683 --- a/kde-apps/ksystemlog/ksystemlog-15.12.49.9999.ebuild
6684 +++ b/kde-apps/ksystemlog/ksystemlog-15.12.49.9999.ebuild
6685 @@ -32,9 +32,9 @@ DEPEND="
6686 $(add_frameworks_dep ktextwidgets)
6687 $(add_frameworks_dep kwidgetsaddons)
6688 $(add_frameworks_dep kxmlgui)
6689 - dev-qt/qtgui:5
6690 - dev-qt/qtprintsupport:5
6691 - dev-qt/qtwidgets:5
6692 + $(add_qt_dep qtgui)
6693 + $(add_qt_dep qtprintsupport)
6694 + $(add_qt_dep qtwidgets)
6695 systemd? ( sys-apps/systemd )
6696 "
6697
6698
6699 diff --git a/kde-apps/ksystemlog/ksystemlog-9999.ebuild b/kde-apps/ksystemlog/ksystemlog-9999.ebuild
6700 index 7983665..b6ec9d9 100644
6701 --- a/kde-apps/ksystemlog/ksystemlog-9999.ebuild
6702 +++ b/kde-apps/ksystemlog/ksystemlog-9999.ebuild
6703 @@ -32,9 +32,9 @@ DEPEND="
6704 $(add_frameworks_dep ktextwidgets)
6705 $(add_frameworks_dep kwidgetsaddons)
6706 $(add_frameworks_dep kxmlgui)
6707 - dev-qt/qtgui:5
6708 - dev-qt/qtprintsupport:5
6709 - dev-qt/qtwidgets:5
6710 + $(add_qt_dep qtgui)
6711 + $(add_qt_dep qtprintsupport)
6712 + $(add_qt_dep qtwidgets)
6713 systemd? ( sys-apps/systemd )
6714 "
6715
6716
6717 diff --git a/kde-apps/kteatime/kteatime-15.12.1.ebuild b/kde-apps/kteatime/kteatime-15.12.1.ebuild
6718 index 347f05b..0404239 100644
6719 --- a/kde-apps/kteatime/kteatime-15.12.1.ebuild
6720 +++ b/kde-apps/kteatime/kteatime-15.12.1.ebuild
6721 @@ -23,8 +23,8 @@ DEPEND="
6722 $(add_frameworks_dep knotifyconfig)
6723 $(add_frameworks_dep ktextwidgets)
6724 $(add_frameworks_dep kxmlgui)
6725 - dev-qt/qtgui:5
6726 - dev-qt/qtwidgets:5
6727 + $(add_qt_dep qtgui)
6728 + $(add_qt_dep qtwidgets)
6729 "
6730 RDEPEND="${DEPEND}"
6731
6732
6733 diff --git a/kde-apps/kteatime/kteatime-15.12.49.9999.ebuild b/kde-apps/kteatime/kteatime-15.12.49.9999.ebuild
6734 index fef271b..bc148b6 100644
6735 --- a/kde-apps/kteatime/kteatime-15.12.49.9999.ebuild
6736 +++ b/kde-apps/kteatime/kteatime-15.12.49.9999.ebuild
6737 @@ -23,8 +23,8 @@ DEPEND="
6738 $(add_frameworks_dep knotifyconfig)
6739 $(add_frameworks_dep ktextwidgets)
6740 $(add_frameworks_dep kxmlgui)
6741 - dev-qt/qtgui:5
6742 - dev-qt/qtwidgets:5
6743 + $(add_qt_dep qtgui)
6744 + $(add_qt_dep qtwidgets)
6745 "
6746 RDEPEND="${DEPEND}"
6747
6748
6749 diff --git a/kde-apps/kteatime/kteatime-9999.ebuild b/kde-apps/kteatime/kteatime-9999.ebuild
6750 index 7ba30be..abf92b9 100644
6751 --- a/kde-apps/kteatime/kteatime-9999.ebuild
6752 +++ b/kde-apps/kteatime/kteatime-9999.ebuild
6753 @@ -23,7 +23,7 @@ DEPEND="
6754 $(add_frameworks_dep knotifyconfig)
6755 $(add_frameworks_dep ktextwidgets)
6756 $(add_frameworks_dep kxmlgui)
6757 - dev-qt/qtgui:5
6758 - dev-qt/qtwidgets:5
6759 + $(add_qt_dep qtgui)
6760 + $(add_qt_dep qtwidgets)
6761 "
6762 RDEPEND="${DEPEND}"
6763
6764 diff --git a/kde-apps/ktimer/ktimer-15.12.1.ebuild b/kde-apps/ktimer/ktimer-15.12.1.ebuild
6765 index f5cf734..44a401c 100644
6766 --- a/kde-apps/ktimer/ktimer-15.12.1.ebuild
6767 +++ b/kde-apps/ktimer/ktimer-15.12.1.ebuild
6768 @@ -23,7 +23,7 @@ DEPEND="
6769 $(add_frameworks_dep kio)
6770 $(add_frameworks_dep knotifications)
6771 $(add_frameworks_dep kwidgetsaddons)
6772 - dev-qt/qtgui:5
6773 - dev-qt/qtwidgets:5
6774 + $(add_qt_dep qtgui)
6775 + $(add_qt_dep qtwidgets)
6776 "
6777 RDEPEND="${DEPEND}"
6778
6779 diff --git a/kde-apps/ktimer/ktimer-15.12.49.9999.ebuild b/kde-apps/ktimer/ktimer-15.12.49.9999.ebuild
6780 index 9089dbc..82d9118 100644
6781 --- a/kde-apps/ktimer/ktimer-15.12.49.9999.ebuild
6782 +++ b/kde-apps/ktimer/ktimer-15.12.49.9999.ebuild
6783 @@ -23,7 +23,7 @@ DEPEND="
6784 $(add_frameworks_dep kio)
6785 $(add_frameworks_dep knotifications)
6786 $(add_frameworks_dep kwidgetsaddons)
6787 - dev-qt/qtgui:5
6788 - dev-qt/qtwidgets:5
6789 + $(add_qt_dep qtgui)
6790 + $(add_qt_dep qtwidgets)
6791 "
6792 RDEPEND="${DEPEND}"
6793
6794 diff --git a/kde-apps/ktimer/ktimer-9999.ebuild b/kde-apps/ktimer/ktimer-9999.ebuild
6795 index 9089dbc..82d9118 100644
6796 --- a/kde-apps/ktimer/ktimer-9999.ebuild
6797 +++ b/kde-apps/ktimer/ktimer-9999.ebuild
6798 @@ -23,7 +23,7 @@ DEPEND="
6799 $(add_frameworks_dep kio)
6800 $(add_frameworks_dep knotifications)
6801 $(add_frameworks_dep kwidgetsaddons)
6802 - dev-qt/qtgui:5
6803 - dev-qt/qtwidgets:5
6804 + $(add_qt_dep qtgui)
6805 + $(add_qt_dep qtwidgets)
6806 "
6807 RDEPEND="${DEPEND}"
6808
6809 diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-15.12.1.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-15.12.1.ebuild
6810 index d1b6bce..6b5c172 100644
6811 --- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-15.12.1.ebuild
6812 +++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-15.12.1.ebuild
6813 @@ -24,10 +24,10 @@ COMMON_DEPEND="
6814 $(add_frameworks_dep ktextwidgets)
6815 $(add_frameworks_dep kwidgetsaddons)
6816 $(add_kdeapps_dep kaccounts-integration)
6817 - dev-qt/qtdbus:5
6818 - dev-qt/qtgui:5
6819 - dev-qt/qtnetwork:5
6820 - dev-qt/qtwidgets:5
6821 + $(add_qt_dep qtdbus)
6822 + $(add_qt_dep qtgui)
6823 + $(add_qt_dep qtnetwork)
6824 + $(add_qt_dep qtwidgets)
6825 net-libs/accounts-qt
6826 net-libs/signond
6827 net-libs/telepathy-qt[qt5]
6828
6829 diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-15.12.49.9999.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-15.12.49.9999.ebuild
6830 index 9aaac03..a41735f 100644
6831 --- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-15.12.49.9999.ebuild
6832 +++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-15.12.49.9999.ebuild
6833 @@ -24,10 +24,10 @@ COMMON_DEPEND="
6834 $(add_frameworks_dep ktextwidgets)
6835 $(add_frameworks_dep kwidgetsaddons)
6836 $(add_kdeapps_dep kaccounts-integration)
6837 - dev-qt/qtdbus:5
6838 - dev-qt/qtgui:5
6839 - dev-qt/qtnetwork:5
6840 - dev-qt/qtwidgets:5
6841 + $(add_qt_dep qtdbus)
6842 + $(add_qt_dep qtgui)
6843 + $(add_qt_dep qtnetwork)
6844 + $(add_qt_dep qtwidgets)
6845 net-libs/accounts-qt
6846 net-libs/signond
6847 net-libs/telepathy-qt[qt5]
6848
6849 diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
6850 index 9aaac03..a41735f 100644
6851 --- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
6852 +++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
6853 @@ -24,10 +24,10 @@ COMMON_DEPEND="
6854 $(add_frameworks_dep ktextwidgets)
6855 $(add_frameworks_dep kwidgetsaddons)
6856 $(add_kdeapps_dep kaccounts-integration)
6857 - dev-qt/qtdbus:5
6858 - dev-qt/qtgui:5
6859 - dev-qt/qtnetwork:5
6860 - dev-qt/qtwidgets:5
6861 + $(add_qt_dep qtdbus)
6862 + $(add_qt_dep qtgui)
6863 + $(add_qt_dep qtnetwork)
6864 + $(add_qt_dep qtwidgets)
6865 net-libs/accounts-qt
6866 net-libs/signond
6867 net-libs/telepathy-qt[qt5]
6868
6869 diff --git a/kde-apps/ktp-approver/ktp-approver-15.12.1.ebuild b/kde-apps/ktp-approver/ktp-approver-15.12.1.ebuild
6870 index d6cd3f8..f881e68 100644
6871 --- a/kde-apps/ktp-approver/ktp-approver-15.12.1.ebuild
6872 +++ b/kde-apps/ktp-approver/ktp-approver-15.12.1.ebuild
6873 @@ -20,9 +20,9 @@ DEPEND="
6874 $(add_frameworks_dep ki18n)
6875 $(add_frameworks_dep knotifications)
6876 $(add_frameworks_dep kservice)
6877 - dev-qt/qtdbus:5
6878 - dev-qt/qtgui:5
6879 - dev-qt/qtwidgets:5
6880 + $(add_qt_dep qtdbus)
6881 + $(add_qt_dep qtgui)
6882 + $(add_qt_dep qtwidgets)
6883 net-libs/telepathy-qt[qt5]"
6884
6885 RDEPEND="${DEPEND}
6886
6887 diff --git a/kde-apps/ktp-approver/ktp-approver-15.12.49.9999.ebuild b/kde-apps/ktp-approver/ktp-approver-15.12.49.9999.ebuild
6888 index 4b802db..6b53a14 100644
6889 --- a/kde-apps/ktp-approver/ktp-approver-15.12.49.9999.ebuild
6890 +++ b/kde-apps/ktp-approver/ktp-approver-15.12.49.9999.ebuild
6891 @@ -20,9 +20,9 @@ DEPEND="
6892 $(add_frameworks_dep ki18n)
6893 $(add_frameworks_dep knotifications)
6894 $(add_frameworks_dep kservice)
6895 - dev-qt/qtdbus:5
6896 - dev-qt/qtgui:5
6897 - dev-qt/qtwidgets:5
6898 + $(add_qt_dep qtdbus)
6899 + $(add_qt_dep qtgui)
6900 + $(add_qt_dep qtwidgets)
6901 net-libs/telepathy-qt[qt5]"
6902
6903 RDEPEND="${DEPEND}
6904
6905 diff --git a/kde-apps/ktp-approver/ktp-approver-9999.ebuild b/kde-apps/ktp-approver/ktp-approver-9999.ebuild
6906 index 4b802db..6b53a14 100644
6907 --- a/kde-apps/ktp-approver/ktp-approver-9999.ebuild
6908 +++ b/kde-apps/ktp-approver/ktp-approver-9999.ebuild
6909 @@ -20,9 +20,9 @@ DEPEND="
6910 $(add_frameworks_dep ki18n)
6911 $(add_frameworks_dep knotifications)
6912 $(add_frameworks_dep kservice)
6913 - dev-qt/qtdbus:5
6914 - dev-qt/qtgui:5
6915 - dev-qt/qtwidgets:5
6916 + $(add_qt_dep qtdbus)
6917 + $(add_qt_dep qtgui)
6918 + $(add_qt_dep qtwidgets)
6919 net-libs/telepathy-qt[qt5]"
6920
6921 RDEPEND="${DEPEND}
6922
6923 diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-15.12.1.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-15.12.1.ebuild
6924 index e3e3ebe..8b84460 100644
6925 --- a/kde-apps/ktp-auth-handler/ktp-auth-handler-15.12.1.ebuild
6926 +++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-15.12.1.ebuild
6927 @@ -23,10 +23,10 @@ COMMON_DEPEND="
6928 $(add_kdeapps_dep kaccounts-integration)
6929 $(add_kdeapps_dep ktp-common-internals)
6930 app-crypt/qca:2[qt5]
6931 - dev-qt/qtdbus:5
6932 - dev-qt/qtgui:5
6933 - dev-qt/qtnetwork:5
6934 - dev-qt/qtwidgets:5
6935 + $(add_qt_dep qtdbus)
6936 + $(add_qt_dep qtgui)
6937 + $(add_qt_dep qtnetwork)
6938 + $(add_qt_dep qtwidgets)
6939 net-libs/accounts-qt
6940 net-libs/signond
6941 net-libs/telepathy-qt[qt5]
6942
6943 diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-15.12.49.9999.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-15.12.49.9999.ebuild
6944 index c917c35..3d67f45 100644
6945 --- a/kde-apps/ktp-auth-handler/ktp-auth-handler-15.12.49.9999.ebuild
6946 +++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-15.12.49.9999.ebuild
6947 @@ -23,10 +23,10 @@ COMMON_DEPEND="
6948 $(add_kdeapps_dep kaccounts-integration)
6949 $(add_kdeapps_dep ktp-common-internals)
6950 app-crypt/qca:2[qt5]
6951 - dev-qt/qtdbus:5
6952 - dev-qt/qtgui:5
6953 - dev-qt/qtnetwork:5
6954 - dev-qt/qtwidgets:5
6955 + $(add_qt_dep qtdbus)
6956 + $(add_qt_dep qtgui)
6957 + $(add_qt_dep qtnetwork)
6958 + $(add_qt_dep qtwidgets)
6959 net-libs/accounts-qt
6960 net-libs/signond
6961 net-libs/telepathy-qt[qt5]
6962
6963 diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-9999.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-9999.ebuild
6964 index c917c35..3d67f45 100644
6965 --- a/kde-apps/ktp-auth-handler/ktp-auth-handler-9999.ebuild
6966 +++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-9999.ebuild
6967 @@ -23,10 +23,10 @@ COMMON_DEPEND="
6968 $(add_kdeapps_dep kaccounts-integration)
6969 $(add_kdeapps_dep ktp-common-internals)
6970 app-crypt/qca:2[qt5]
6971 - dev-qt/qtdbus:5
6972 - dev-qt/qtgui:5
6973 - dev-qt/qtnetwork:5
6974 - dev-qt/qtwidgets:5
6975 + $(add_qt_dep qtdbus)
6976 + $(add_qt_dep qtgui)
6977 + $(add_qt_dep qtnetwork)
6978 + $(add_qt_dep qtwidgets)
6979 net-libs/accounts-qt
6980 net-libs/signond
6981 net-libs/telepathy-qt[qt5]
6982
6983 diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-9999.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-9999.ebuild
6984 index 6b0e930..906bf47 100644
6985 --- a/kde-apps/ktp-call-ui/ktp-call-ui-9999.ebuild
6986 +++ b/kde-apps/ktp-call-ui/ktp-call-ui-9999.ebuild
6987 @@ -27,9 +27,9 @@ DEPEND="
6988 $(add_kdeapps_dep ktp-common-internals)
6989 dev-libs/boost
6990 dev-libs/glib:2
6991 - dev-qt/qtdbus:5
6992 - dev-qt/qtgui:5
6993 - dev-qt/qtwidgets:5
6994 + $(add_qt_dep qtdbus)
6995 + $(add_qt_dep qtgui)
6996 + $(add_qt_dep qtwidgets)
6997 media-libs/phonon[qt5]
6998 media-libs/qt-gstreamer[qt5]
6999 net-libs/farstream:0.2
7000
7001 diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-15.12.1.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-15.12.1.ebuild
7002 index ffa8e17..1c7a231 100644
7003 --- a/kde-apps/ktp-common-internals/ktp-common-internals-15.12.1.ebuild
7004 +++ b/kde-apps/ktp-common-internals/ktp-common-internals-15.12.1.ebuild
7005 @@ -31,12 +31,12 @@ COMMON_DEPEND="
7006 $(add_frameworks_dep kwallet)
7007 $(add_frameworks_dep kwidgetsaddons)
7008 $(add_frameworks_dep kxmlgui)
7009 - dev-qt/qtdbus:5
7010 - dev-qt/qtdeclarative:5
7011 - dev-qt/qtgui:5
7012 - dev-qt/qtsql:5
7013 - dev-qt/qtwidgets:5
7014 - dev-qt/qtxml:5
7015 + $(add_qt_dep qtdbus)
7016 + $(add_qt_dep qtdeclarative)
7017 + $(add_qt_dep qtgui)
7018 + $(add_qt_dep qtsql)
7019 + $(add_qt_dep qtwidgets)
7020 + $(add_qt_dep qtxml)
7021 net-libs/telepathy-logger-qt:5
7022 >=net-libs/telepathy-qt-0.9.5[qt5]
7023 sso? (
7024 @@ -52,7 +52,7 @@ COMMON_DEPEND="
7025 DEPEND="
7026 ${COMMON_DEPEND}
7027 $(add_frameworks_dep kio)
7028 - dev-qt/qtnetwork:5
7029 + $(add_qt_dep qtnetwork)
7030 "
7031 RDEPEND="
7032 ${COMMON_DEPEND}
7033
7034 diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-15.12.49.9999.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-15.12.49.9999.ebuild
7035 index a92a15d..1063ef5 100644
7036 --- a/kde-apps/ktp-common-internals/ktp-common-internals-15.12.49.9999.ebuild
7037 +++ b/kde-apps/ktp-common-internals/ktp-common-internals-15.12.49.9999.ebuild
7038 @@ -31,12 +31,12 @@ COMMON_DEPEND="
7039 $(add_frameworks_dep kwallet)
7040 $(add_frameworks_dep kwidgetsaddons)
7041 $(add_frameworks_dep kxmlgui)
7042 - dev-qt/qtdbus:5
7043 - dev-qt/qtdeclarative:5
7044 - dev-qt/qtgui:5
7045 - dev-qt/qtsql:5
7046 - dev-qt/qtwidgets:5
7047 - dev-qt/qtxml:5
7048 + $(add_qt_dep qtdbus)
7049 + $(add_qt_dep qtdeclarative)
7050 + $(add_qt_dep qtgui)
7051 + $(add_qt_dep qtsql)
7052 + $(add_qt_dep qtwidgets)
7053 + $(add_qt_dep qtxml)
7054 net-libs/telepathy-logger-qt:5
7055 >=net-libs/telepathy-qt-0.9.5[qt5]
7056 sso? (
7057 @@ -52,7 +52,7 @@ COMMON_DEPEND="
7058 DEPEND="
7059 ${COMMON_DEPEND}
7060 $(add_frameworks_dep kio)
7061 - dev-qt/qtnetwork:5
7062 + $(add_qt_dep qtnetwork)
7063 "
7064 RDEPEND="
7065 ${COMMON_DEPEND}
7066
7067 diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild
7068 index a92a15d..1063ef5 100644
7069 --- a/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild
7070 +++ b/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild
7071 @@ -31,12 +31,12 @@ COMMON_DEPEND="
7072 $(add_frameworks_dep kwallet)
7073 $(add_frameworks_dep kwidgetsaddons)
7074 $(add_frameworks_dep kxmlgui)
7075 - dev-qt/qtdbus:5
7076 - dev-qt/qtdeclarative:5
7077 - dev-qt/qtgui:5
7078 - dev-qt/qtsql:5
7079 - dev-qt/qtwidgets:5
7080 - dev-qt/qtxml:5
7081 + $(add_qt_dep qtdbus)
7082 + $(add_qt_dep qtdeclarative)
7083 + $(add_qt_dep qtgui)
7084 + $(add_qt_dep qtsql)
7085 + $(add_qt_dep qtwidgets)
7086 + $(add_qt_dep qtxml)
7087 net-libs/telepathy-logger-qt:5
7088 >=net-libs/telepathy-qt-0.9.5[qt5]
7089 sso? (
7090 @@ -52,7 +52,7 @@ COMMON_DEPEND="
7091 DEPEND="
7092 ${COMMON_DEPEND}
7093 $(add_frameworks_dep kio)
7094 - dev-qt/qtnetwork:5
7095 + $(add_qt_dep qtnetwork)
7096 "
7097 RDEPEND="
7098 ${COMMON_DEPEND}
7099
7100 diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-15.12.1.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-15.12.1.ebuild
7101 index 924cedf..8e40a95 100644
7102 --- a/kde-apps/ktp-contact-list/ktp-contact-list-15.12.1.ebuild
7103 +++ b/kde-apps/ktp-contact-list/ktp-contact-list-15.12.1.ebuild
7104 @@ -28,9 +28,9 @@ COMMON_DEPEND="
7105 $(add_frameworks_dep kwindowsystem)
7106 $(add_frameworks_dep kxmlgui)
7107 $(add_kdeapps_dep ktp-common-internals)
7108 - dev-qt/qtdbus:5
7109 - dev-qt/qtgui:5
7110 - dev-qt/qtwidgets:5
7111 + $(add_qt_dep qtdbus)
7112 + $(add_qt_dep qtgui)
7113 + $(add_qt_dep qtwidgets)
7114 net-libs/telepathy-qt[qt5]
7115 "
7116 DEPEND="
7117 @@ -38,7 +38,7 @@ DEPEND="
7118 $(add_frameworks_dep kcmutils)
7119 $(add_frameworks_dep kio)
7120 $(add_frameworks_dep knotifyconfig)
7121 - dev-qt/qtxml:5
7122 + $(add_qt_dep qtxml)
7123 "
7124 RDEPEND="
7125 ${COMMON_DEPEND}
7126
7127 diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-15.12.49.9999.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-15.12.49.9999.ebuild
7128 index f257007..c97de1f 100644
7129 --- a/kde-apps/ktp-contact-list/ktp-contact-list-15.12.49.9999.ebuild
7130 +++ b/kde-apps/ktp-contact-list/ktp-contact-list-15.12.49.9999.ebuild
7131 @@ -28,9 +28,9 @@ COMMON_DEPEND="
7132 $(add_frameworks_dep kwindowsystem)
7133 $(add_frameworks_dep kxmlgui)
7134 $(add_kdeapps_dep ktp-common-internals)
7135 - dev-qt/qtdbus:5
7136 - dev-qt/qtgui:5
7137 - dev-qt/qtwidgets:5
7138 + $(add_qt_dep qtdbus)
7139 + $(add_qt_dep qtgui)
7140 + $(add_qt_dep qtwidgets)
7141 net-libs/telepathy-qt[qt5]
7142 "
7143 DEPEND="
7144 @@ -38,7 +38,7 @@ DEPEND="
7145 $(add_frameworks_dep kcmutils)
7146 $(add_frameworks_dep kio)
7147 $(add_frameworks_dep knotifyconfig)
7148 - dev-qt/qtxml:5
7149 + $(add_qt_dep qtxml)
7150 "
7151 RDEPEND="
7152 ${COMMON_DEPEND}
7153
7154 diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-9999.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-9999.ebuild
7155 index f257007..c97de1f 100644
7156 --- a/kde-apps/ktp-contact-list/ktp-contact-list-9999.ebuild
7157 +++ b/kde-apps/ktp-contact-list/ktp-contact-list-9999.ebuild
7158 @@ -28,9 +28,9 @@ COMMON_DEPEND="
7159 $(add_frameworks_dep kwindowsystem)
7160 $(add_frameworks_dep kxmlgui)
7161 $(add_kdeapps_dep ktp-common-internals)
7162 - dev-qt/qtdbus:5
7163 - dev-qt/qtgui:5
7164 - dev-qt/qtwidgets:5
7165 + $(add_qt_dep qtdbus)
7166 + $(add_qt_dep qtgui)
7167 + $(add_qt_dep qtwidgets)
7168 net-libs/telepathy-qt[qt5]
7169 "
7170 DEPEND="
7171 @@ -38,7 +38,7 @@ DEPEND="
7172 $(add_frameworks_dep kcmutils)
7173 $(add_frameworks_dep kio)
7174 $(add_frameworks_dep knotifyconfig)
7175 - dev-qt/qtxml:5
7176 + $(add_qt_dep qtxml)
7177 "
7178 RDEPEND="
7179 ${COMMON_DEPEND}
7180
7181 diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-15.12.1.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-15.12.1.ebuild
7182 index 4d83d39..8fb9945 100644
7183 --- a/kde-apps/ktp-contact-runner/ktp-contact-runner-15.12.1.ebuild
7184 +++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-15.12.1.ebuild
7185 @@ -18,9 +18,9 @@ COMMON_DEPEND="
7186 $(add_frameworks_dep ki18n)
7187 $(add_frameworks_dep krunner)
7188 $(add_kdeapps_dep ktp-common-internals)
7189 - dev-qt/qtdbus:5
7190 - dev-qt/qtgui:5
7191 - dev-qt/qtwidgets:5
7192 + $(add_qt_dep qtdbus)
7193 + $(add_qt_dep qtgui)
7194 + $(add_qt_dep qtwidgets)
7195 net-libs/telepathy-qt[qt5]
7196 "
7197 DEPEND="
7198
7199 diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-15.12.49.9999.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-15.12.49.9999.ebuild
7200 index e104dc4..93f8500 100644
7201 --- a/kde-apps/ktp-contact-runner/ktp-contact-runner-15.12.49.9999.ebuild
7202 +++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-15.12.49.9999.ebuild
7203 @@ -18,9 +18,9 @@ COMMON_DEPEND="
7204 $(add_frameworks_dep ki18n)
7205 $(add_frameworks_dep krunner)
7206 $(add_kdeapps_dep ktp-common-internals)
7207 - dev-qt/qtdbus:5
7208 - dev-qt/qtgui:5
7209 - dev-qt/qtwidgets:5
7210 + $(add_qt_dep qtdbus)
7211 + $(add_qt_dep qtgui)
7212 + $(add_qt_dep qtwidgets)
7213 net-libs/telepathy-qt[qt5]
7214 "
7215 DEPEND="
7216
7217 diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-9999.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-9999.ebuild
7218 index e104dc4..93f8500 100644
7219 --- a/kde-apps/ktp-contact-runner/ktp-contact-runner-9999.ebuild
7220 +++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-9999.ebuild
7221 @@ -18,9 +18,9 @@ COMMON_DEPEND="
7222 $(add_frameworks_dep ki18n)
7223 $(add_frameworks_dep krunner)
7224 $(add_kdeapps_dep ktp-common-internals)
7225 - dev-qt/qtdbus:5
7226 - dev-qt/qtgui:5
7227 - dev-qt/qtwidgets:5
7228 + $(add_qt_dep qtdbus)
7229 + $(add_qt_dep qtgui)
7230 + $(add_qt_dep qtwidgets)
7231 net-libs/telepathy-qt[qt5]
7232 "
7233 DEPEND="
7234
7235 diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-15.12.1.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-15.12.1.ebuild
7236 index 45733da..92c4960 100644
7237 --- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-15.12.1.ebuild
7238 +++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-15.12.1.ebuild
7239 @@ -15,7 +15,7 @@ IUSE=""
7240
7241 COMMON_DEPEND="
7242 $(add_frameworks_dep kwindowsystem)
7243 - dev-qt/qtdeclarative:5
7244 + $(add_qt_dep qtdeclarative)
7245 "
7246 DEPEND="
7247 ${COMMON_DEPEND}
7248
7249 diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-15.12.49.9999.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-15.12.49.9999.ebuild
7250 index 40fb606..bc32487 100644
7251 --- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-15.12.49.9999.ebuild
7252 +++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-15.12.49.9999.ebuild
7253 @@ -15,7 +15,7 @@ IUSE=""
7254
7255 COMMON_DEPEND="
7256 $(add_frameworks_dep kwindowsystem)
7257 - dev-qt/qtdeclarative:5
7258 + $(add_qt_dep qtdeclarative)
7259 "
7260 DEPEND="
7261 ${COMMON_DEPEND}
7262
7263 diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-9999.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-9999.ebuild
7264 index 40fb606..bc32487 100644
7265 --- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-9999.ebuild
7266 +++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-9999.ebuild
7267 @@ -15,7 +15,7 @@ IUSE=""
7268
7269 COMMON_DEPEND="
7270 $(add_frameworks_dep kwindowsystem)
7271 - dev-qt/qtdeclarative:5
7272 + $(add_qt_dep qtdeclarative)
7273 "
7274 DEPEND="
7275 ${COMMON_DEPEND}
7276
7277 diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-15.12.1.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-15.12.1.ebuild
7278 index 1b49803..d1c4ea6 100644
7279 --- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-15.12.1.ebuild
7280 +++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-15.12.1.ebuild
7281 @@ -19,9 +19,9 @@ DEPEND="
7282 $(add_frameworks_dep ki18n)
7283 $(add_frameworks_dep kio)
7284 $(add_kdeapps_dep ktp-common-internals)
7285 - dev-qt/qtdbus:5
7286 - dev-qt/qtgui:5
7287 - dev-qt/qtwidgets:5
7288 + $(add_qt_dep qtdbus)
7289 + $(add_qt_dep qtgui)
7290 + $(add_qt_dep qtwidgets)
7291 net-libs/telepathy-qt[qt5]
7292 "
7293 RDEPEND="${DEPEND}
7294
7295 diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-15.12.49.9999.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-15.12.49.9999.ebuild
7296 index b4e06df..4575f77 100644
7297 --- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-15.12.49.9999.ebuild
7298 +++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-15.12.49.9999.ebuild
7299 @@ -19,9 +19,9 @@ DEPEND="
7300 $(add_frameworks_dep ki18n)
7301 $(add_frameworks_dep kio)
7302 $(add_kdeapps_dep ktp-common-internals)
7303 - dev-qt/qtdbus:5
7304 - dev-qt/qtgui:5
7305 - dev-qt/qtwidgets:5
7306 + $(add_qt_dep qtdbus)
7307 + $(add_qt_dep qtgui)
7308 + $(add_qt_dep qtwidgets)
7309 net-libs/telepathy-qt[qt5]
7310 "
7311 RDEPEND="${DEPEND}
7312
7313 diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild
7314 index b4e06df..4575f77 100644
7315 --- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild
7316 +++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild
7317 @@ -19,9 +19,9 @@ DEPEND="
7318 $(add_frameworks_dep ki18n)
7319 $(add_frameworks_dep kio)
7320 $(add_kdeapps_dep ktp-common-internals)
7321 - dev-qt/qtdbus:5
7322 - dev-qt/qtgui:5
7323 - dev-qt/qtwidgets:5
7324 + $(add_qt_dep qtdbus)
7325 + $(add_qt_dep qtgui)
7326 + $(add_qt_dep qtwidgets)
7327 net-libs/telepathy-qt[qt5]
7328 "
7329 RDEPEND="${DEPEND}
7330
7331 diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-15.12.1.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-15.12.1.ebuild
7332 index c3861ca..8fe0e0c 100644
7333 --- a/kde-apps/ktp-kded-module/ktp-kded-module-15.12.1.ebuild
7334 +++ b/kde-apps/ktp-kded-module/ktp-kded-module-15.12.1.ebuild
7335 @@ -23,12 +23,12 @@ COMMON_DEPEND="
7336 $(add_frameworks_dep kio)
7337 $(add_frameworks_dep knotifications)
7338 $(add_kdeapps_dep ktp-common-internals)
7339 - dev-qt/qtconcurrent:5
7340 - dev-qt/qtdbus:5
7341 - dev-qt/qtgui:5
7342 - dev-qt/qtnetwork:5
7343 - dev-qt/qtsql:5
7344 - dev-qt/qtwidgets:5
7345 + $(add_qt_dep qtconcurrent)
7346 + $(add_qt_dep qtdbus)
7347 + $(add_qt_dep qtgui)
7348 + $(add_qt_dep qtnetwork)
7349 + $(add_qt_dep qtsql)
7350 + $(add_qt_dep qtwidgets)
7351 net-libs/telepathy-qt[qt5]
7352 "
7353 DEPEND="
7354
7355 diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-15.12.49.9999.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-15.12.49.9999.ebuild
7356 index ba8cf13..6fe089d 100644
7357 --- a/kde-apps/ktp-kded-module/ktp-kded-module-15.12.49.9999.ebuild
7358 +++ b/kde-apps/ktp-kded-module/ktp-kded-module-15.12.49.9999.ebuild
7359 @@ -23,12 +23,12 @@ COMMON_DEPEND="
7360 $(add_frameworks_dep kio)
7361 $(add_frameworks_dep knotifications)
7362 $(add_kdeapps_dep ktp-common-internals)
7363 - dev-qt/qtconcurrent:5
7364 - dev-qt/qtdbus:5
7365 - dev-qt/qtgui:5
7366 - dev-qt/qtnetwork:5
7367 - dev-qt/qtsql:5
7368 - dev-qt/qtwidgets:5
7369 + $(add_qt_dep qtconcurrent)
7370 + $(add_qt_dep qtdbus)
7371 + $(add_qt_dep qtgui)
7372 + $(add_qt_dep qtnetwork)
7373 + $(add_qt_dep qtsql)
7374 + $(add_qt_dep qtwidgets)
7375 net-libs/telepathy-qt[qt5]
7376 "
7377 DEPEND="
7378
7379 diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-9999.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-9999.ebuild
7380 index ba8cf13..6fe089d 100644
7381 --- a/kde-apps/ktp-kded-module/ktp-kded-module-9999.ebuild
7382 +++ b/kde-apps/ktp-kded-module/ktp-kded-module-9999.ebuild
7383 @@ -23,12 +23,12 @@ COMMON_DEPEND="
7384 $(add_frameworks_dep kio)
7385 $(add_frameworks_dep knotifications)
7386 $(add_kdeapps_dep ktp-common-internals)
7387 - dev-qt/qtconcurrent:5
7388 - dev-qt/qtdbus:5
7389 - dev-qt/qtgui:5
7390 - dev-qt/qtnetwork:5
7391 - dev-qt/qtsql:5
7392 - dev-qt/qtwidgets:5
7393 + $(add_qt_dep qtconcurrent)
7394 + $(add_qt_dep qtdbus)
7395 + $(add_qt_dep qtgui)
7396 + $(add_qt_dep qtnetwork)
7397 + $(add_qt_dep qtsql)
7398 + $(add_qt_dep qtwidgets)
7399 net-libs/telepathy-qt[qt5]
7400 "
7401 DEPEND="
7402
7403 diff --git a/kde-apps/ktp-l10n/ktp-l10n-15.12.1.ebuild b/kde-apps/ktp-l10n/ktp-l10n-15.12.1.ebuild
7404 index c5c4a5a..dbb94e0 100644
7405 --- a/kde-apps/ktp-l10n/ktp-l10n-15.12.1.ebuild
7406 +++ b/kde-apps/ktp-l10n/ktp-l10n-15.12.1.ebuild
7407 @@ -12,7 +12,7 @@ HOMEPAGE="http://l10n.kde.org"
7408
7409 DEPEND="
7410 $(add_frameworks_dep ki18n)
7411 - dev-qt/linguist-tools:5
7412 + $(add_qt_dep linguist-tools)
7413 sys-devel/gettext
7414 "
7415 RDEPEND="
7416
7417 diff --git a/kde-apps/ktp-send-file/ktp-send-file-15.12.1.ebuild b/kde-apps/ktp-send-file/ktp-send-file-15.12.1.ebuild
7418 index 0108f3b..297e8df 100644
7419 --- a/kde-apps/ktp-send-file/ktp-send-file-15.12.1.ebuild
7420 +++ b/kde-apps/ktp-send-file/ktp-send-file-15.12.1.ebuild
7421 @@ -20,9 +20,9 @@ COMMON_DEPEND="
7422 $(add_frameworks_dep kio)
7423 $(add_frameworks_dep kwidgetsaddons)
7424 $(add_kdeapps_dep ktp-common-internals)
7425 - dev-qt/qtdbus:5
7426 - dev-qt/qtgui:5
7427 - dev-qt/qtwidgets:5
7428 + $(add_qt_dep qtdbus)
7429 + $(add_qt_dep qtgui)
7430 + $(add_qt_dep qtwidgets)
7431 net-libs/telepathy-qt[qt5]
7432 "
7433 DEPEND="
7434
7435 diff --git a/kde-apps/ktp-send-file/ktp-send-file-15.12.49.9999.ebuild b/kde-apps/ktp-send-file/ktp-send-file-15.12.49.9999.ebuild
7436 index 0d461c1..c75e75f 100644
7437 --- a/kde-apps/ktp-send-file/ktp-send-file-15.12.49.9999.ebuild
7438 +++ b/kde-apps/ktp-send-file/ktp-send-file-15.12.49.9999.ebuild
7439 @@ -20,9 +20,9 @@ COMMON_DEPEND="
7440 $(add_frameworks_dep kio)
7441 $(add_frameworks_dep kwidgetsaddons)
7442 $(add_kdeapps_dep ktp-common-internals)
7443 - dev-qt/qtdbus:5
7444 - dev-qt/qtgui:5
7445 - dev-qt/qtwidgets:5
7446 + $(add_qt_dep qtdbus)
7447 + $(add_qt_dep qtgui)
7448 + $(add_qt_dep qtwidgets)
7449 net-libs/telepathy-qt[qt5]
7450 "
7451 DEPEND="
7452
7453 diff --git a/kde-apps/ktp-send-file/ktp-send-file-9999.ebuild b/kde-apps/ktp-send-file/ktp-send-file-9999.ebuild
7454 index 0d461c1..c75e75f 100644
7455 --- a/kde-apps/ktp-send-file/ktp-send-file-9999.ebuild
7456 +++ b/kde-apps/ktp-send-file/ktp-send-file-9999.ebuild
7457 @@ -20,9 +20,9 @@ COMMON_DEPEND="
7458 $(add_frameworks_dep kio)
7459 $(add_frameworks_dep kwidgetsaddons)
7460 $(add_kdeapps_dep ktp-common-internals)
7461 - dev-qt/qtdbus:5
7462 - dev-qt/qtgui:5
7463 - dev-qt/qtwidgets:5
7464 + $(add_qt_dep qtdbus)
7465 + $(add_qt_dep qtgui)
7466 + $(add_qt_dep qtwidgets)
7467 net-libs/telepathy-qt[qt5]
7468 "
7469 DEPEND="
7470
7471 diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-15.12.1.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-15.12.1.ebuild
7472 index 903bfe8..4e416e2 100644
7473 --- a/kde-apps/ktp-text-ui/ktp-text-ui-15.12.1.ebuild
7474 +++ b/kde-apps/ktp-text-ui/ktp-text-ui-15.12.1.ebuild
7475 @@ -35,11 +35,11 @@ DEPEND="
7476 $(add_frameworks_dep kxmlgui)
7477 $(add_frameworks_dep sonnet)
7478 $(add_kdeapps_dep ktp-common-internals otr)
7479 - dev-qt/qtdbus:5
7480 - dev-qt/qtgui:5
7481 - dev-qt/qtwebkit:5
7482 - dev-qt/qtwidgets:5
7483 - dev-qt/qtxml:5
7484 + $(add_qt_dep qtdbus)
7485 + $(add_qt_dep qtgui)
7486 + $(add_qt_dep qtwebkit)
7487 + $(add_qt_dep qtwidgets)
7488 + $(add_qt_dep qtxml)
7489 net-libs/telepathy-qt[qt5]
7490 "
7491 RDEPEND="${DEPEND}
7492
7493 diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-15.12.49.9999.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-15.12.49.9999.ebuild
7494 index 7db421b..36a8a38 100644
7495 --- a/kde-apps/ktp-text-ui/ktp-text-ui-15.12.49.9999.ebuild
7496 +++ b/kde-apps/ktp-text-ui/ktp-text-ui-15.12.49.9999.ebuild
7497 @@ -35,11 +35,11 @@ DEPEND="
7498 $(add_frameworks_dep kxmlgui)
7499 $(add_frameworks_dep sonnet)
7500 $(add_kdeapps_dep ktp-common-internals otr)
7501 - dev-qt/qtdbus:5
7502 - dev-qt/qtgui:5
7503 - dev-qt/qtwebkit:5
7504 - dev-qt/qtwidgets:5
7505 - dev-qt/qtxml:5
7506 + $(add_qt_dep qtdbus)
7507 + $(add_qt_dep qtgui)
7508 + $(add_qt_dep qtwebkit)
7509 + $(add_qt_dep qtwidgets)
7510 + $(add_qt_dep qtxml)
7511 net-libs/telepathy-qt[qt5]
7512 "
7513 RDEPEND="${DEPEND}
7514
7515 diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild
7516 index 7db421b..36a8a38 100644
7517 --- a/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild
7518 +++ b/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild
7519 @@ -35,11 +35,11 @@ DEPEND="
7520 $(add_frameworks_dep kxmlgui)
7521 $(add_frameworks_dep sonnet)
7522 $(add_kdeapps_dep ktp-common-internals otr)
7523 - dev-qt/qtdbus:5
7524 - dev-qt/qtgui:5
7525 - dev-qt/qtwebkit:5
7526 - dev-qt/qtwidgets:5
7527 - dev-qt/qtxml:5
7528 + $(add_qt_dep qtdbus)
7529 + $(add_qt_dep qtgui)
7530 + $(add_qt_dep qtwebkit)
7531 + $(add_qt_dep qtwidgets)
7532 + $(add_qt_dep qtxml)
7533 net-libs/telepathy-qt[qt5]
7534 "
7535 RDEPEND="${DEPEND}
7536
7537 diff --git a/kde-apps/ktuberling/ktuberling-15.12.1.ebuild b/kde-apps/ktuberling/ktuberling-15.12.1.ebuild
7538 index 6db1343..191f672 100644
7539 --- a/kde-apps/ktuberling/ktuberling-15.12.1.ebuild
7540 +++ b/kde-apps/ktuberling/ktuberling-15.12.1.ebuild
7541 @@ -28,11 +28,11 @@ DEPEND="
7542 $(add_frameworks_dep kwidgetsaddons)
7543 $(add_frameworks_dep kxmlgui)
7544 $(add_kdeapps_dep libkdegames)
7545 - dev-qt/qtgui:5
7546 - dev-qt/qtprintsupport:5
7547 - dev-qt/qtsvg:5
7548 - dev-qt/qtwidgets:5
7549 - dev-qt/qtxml:5
7550 + $(add_qt_dep qtgui)
7551 + $(add_qt_dep qtprintsupport)
7552 + $(add_qt_dep qtsvg)
7553 + $(add_qt_dep qtwidgets)
7554 + $(add_qt_dep qtxml)
7555 media-libs/phonon[qt5]
7556 "
7557
7558
7559 diff --git a/kde-apps/ktuberling/ktuberling-15.12.49.9999.ebuild b/kde-apps/ktuberling/ktuberling-15.12.49.9999.ebuild
7560 index d418724..2353e0b 100644
7561 --- a/kde-apps/ktuberling/ktuberling-15.12.49.9999.ebuild
7562 +++ b/kde-apps/ktuberling/ktuberling-15.12.49.9999.ebuild
7563 @@ -28,11 +28,11 @@ DEPEND="
7564 $(add_frameworks_dep kwidgetsaddons)
7565 $(add_frameworks_dep kxmlgui)
7566 $(add_kdeapps_dep libkdegames)
7567 - dev-qt/qtgui:5
7568 - dev-qt/qtprintsupport:5
7569 - dev-qt/qtsvg:5
7570 - dev-qt/qtwidgets:5
7571 - dev-qt/qtxml:5
7572 + $(add_qt_dep qtgui)
7573 + $(add_qt_dep qtprintsupport)
7574 + $(add_qt_dep qtsvg)
7575 + $(add_qt_dep qtwidgets)
7576 + $(add_qt_dep qtxml)
7577 media-libs/phonon[qt5]
7578 "
7579
7580
7581 diff --git a/kde-apps/ktuberling/ktuberling-9999.ebuild b/kde-apps/ktuberling/ktuberling-9999.ebuild
7582 index 131d6a2..ba85051 100644
7583 --- a/kde-apps/ktuberling/ktuberling-9999.ebuild
7584 +++ b/kde-apps/ktuberling/ktuberling-9999.ebuild
7585 @@ -29,11 +29,11 @@ DEPEND="
7586 $(add_frameworks_dep kwidgetsaddons)
7587 $(add_frameworks_dep kxmlgui)
7588 $(add_kdeapps_dep libkdegames)
7589 - dev-qt/qtgui:5
7590 - dev-qt/qtprintsupport:5
7591 - dev-qt/qtsvg:5
7592 - dev-qt/qtwidgets:5
7593 - dev-qt/qtxml:5
7594 + $(add_qt_dep qtgui)
7595 + $(add_qt_dep qtprintsupport)
7596 + $(add_qt_dep qtsvg)
7597 + $(add_qt_dep qtwidgets)
7598 + $(add_qt_dep qtxml)
7599 media-libs/phonon[qt5]
7600 "
7601
7602
7603 diff --git a/kde-apps/kturtle/kturtle-15.08.3.ebuild b/kde-apps/kturtle/kturtle-15.08.3.ebuild
7604 index 3332f29..442420c 100644
7605 --- a/kde-apps/kturtle/kturtle-15.08.3.ebuild
7606 +++ b/kde-apps/kturtle/kturtle-15.08.3.ebuild
7607 @@ -22,10 +22,10 @@ DEPEND="
7608 $(add_frameworks_dep ktextwidgets)
7609 $(add_frameworks_dep kwidgetsaddons)
7610 $(add_frameworks_dep kxmlgui)
7611 - dev-qt/qtdbus:5
7612 - dev-qt/qtgui:5
7613 - dev-qt/qtprintsupport:5
7614 - dev-qt/qtsvg:5
7615 - dev-qt/qtwidgets:5
7616 + $(add_qt_dep qtdbus)
7617 + $(add_qt_dep qtgui)
7618 + $(add_qt_dep qtprintsupport)
7619 + $(add_qt_dep qtsvg)
7620 + $(add_qt_dep qtwidgets)
7621 "
7622 RDEPEND="${DEPEND}"
7623
7624 diff --git a/kde-apps/kturtle/kturtle-15.12.1.ebuild b/kde-apps/kturtle/kturtle-15.12.1.ebuild
7625 index bad5773..c9bb8dc 100644
7626 --- a/kde-apps/kturtle/kturtle-15.12.1.ebuild
7627 +++ b/kde-apps/kturtle/kturtle-15.12.1.ebuild
7628 @@ -23,10 +23,10 @@ DEPEND="
7629 $(add_frameworks_dep ktextwidgets)
7630 $(add_frameworks_dep kwidgetsaddons)
7631 $(add_frameworks_dep kxmlgui)
7632 - dev-qt/qtdbus:5
7633 - dev-qt/qtgui:5
7634 - dev-qt/qtprintsupport:5
7635 - dev-qt/qtsvg:5
7636 - dev-qt/qtwidgets:5
7637 + $(add_qt_dep qtdbus)
7638 + $(add_qt_dep qtgui)
7639 + $(add_qt_dep qtprintsupport)
7640 + $(add_qt_dep qtsvg)
7641 + $(add_qt_dep qtwidgets)
7642 "
7643 RDEPEND="${DEPEND}"
7644
7645 diff --git a/kde-apps/kturtle/kturtle-15.12.49.9999.ebuild b/kde-apps/kturtle/kturtle-15.12.49.9999.ebuild
7646 index 7e33fe3..c9d9c3a 100644
7647 --- a/kde-apps/kturtle/kturtle-15.12.49.9999.ebuild
7648 +++ b/kde-apps/kturtle/kturtle-15.12.49.9999.ebuild
7649 @@ -23,10 +23,10 @@ DEPEND="
7650 $(add_frameworks_dep ktextwidgets)
7651 $(add_frameworks_dep kwidgetsaddons)
7652 $(add_frameworks_dep kxmlgui)
7653 - dev-qt/qtdbus:5
7654 - dev-qt/qtgui:5
7655 - dev-qt/qtprintsupport:5
7656 - dev-qt/qtsvg:5
7657 - dev-qt/qtwidgets:5
7658 + $(add_qt_dep qtdbus)
7659 + $(add_qt_dep qtgui)
7660 + $(add_qt_dep qtprintsupport)
7661 + $(add_qt_dep qtsvg)
7662 + $(add_qt_dep qtwidgets)
7663 "
7664 RDEPEND="${DEPEND}"
7665
7666 diff --git a/kde-apps/kturtle/kturtle-9999.ebuild b/kde-apps/kturtle/kturtle-9999.ebuild
7667 index 7e33fe3..c9d9c3a 100644
7668 --- a/kde-apps/kturtle/kturtle-9999.ebuild
7669 +++ b/kde-apps/kturtle/kturtle-9999.ebuild
7670 @@ -23,10 +23,10 @@ DEPEND="
7671 $(add_frameworks_dep ktextwidgets)
7672 $(add_frameworks_dep kwidgetsaddons)
7673 $(add_frameworks_dep kxmlgui)
7674 - dev-qt/qtdbus:5
7675 - dev-qt/qtgui:5
7676 - dev-qt/qtprintsupport:5
7677 - dev-qt/qtsvg:5
7678 - dev-qt/qtwidgets:5
7679 + $(add_qt_dep qtdbus)
7680 + $(add_qt_dep qtgui)
7681 + $(add_qt_dep qtprintsupport)
7682 + $(add_qt_dep qtsvg)
7683 + $(add_qt_dep qtwidgets)
7684 "
7685 RDEPEND="${DEPEND}"
7686
7687 diff --git a/kde-apps/kubrick/kubrick-5.9999.ebuild b/kde-apps/kubrick/kubrick-5.9999.ebuild
7688 index 3c1ceb1..2a397ee 100644
7689 --- a/kde-apps/kubrick/kubrick-5.9999.ebuild
7690 +++ b/kde-apps/kubrick/kubrick-5.9999.ebuild
7691 @@ -23,10 +23,10 @@ RDEPEND="
7692 $(add_frameworks_dep kwidgetsaddons)
7693 $(add_frameworks_dep kxmlgui)
7694 $(add_kdeapps_dep libkdegames)
7695 - dev-qt/qtgui:5
7696 - dev-qt/qtopengl:5
7697 - dev-qt/qtsvg:5
7698 - dev-qt/qtwidgets:5
7699 + $(add_qt_dep qtgui)
7700 + $(add_qt_dep qtopengl)
7701 + $(add_qt_dep qtsvg)
7702 + $(add_qt_dep qtwidgets)
7703 virtual/glu
7704 "
7705 DEPEND="${RDEPEND}
7706
7707 diff --git a/kde-apps/kwalletmanager/kwalletmanager-15.12.1.ebuild b/kde-apps/kwalletmanager/kwalletmanager-15.12.1.ebuild
7708 index 7cb1286..552a7ab 100644
7709 --- a/kde-apps/kwalletmanager/kwalletmanager-15.12.1.ebuild
7710 +++ b/kde-apps/kwalletmanager/kwalletmanager-15.12.1.ebuild
7711 @@ -32,10 +32,10 @@ DEPEND="
7712 $(add_frameworks_dep kwallet)
7713 $(add_frameworks_dep kwidgetsaddons)
7714 $(add_frameworks_dep kxmlgui)
7715 - dev-qt/qtdbus:5
7716 - dev-qt/qtgui:5
7717 - dev-qt/qtwidgets:5
7718 - dev-qt/qtxml:5
7719 + $(add_qt_dep qtdbus)
7720 + $(add_qt_dep qtgui)
7721 + $(add_qt_dep qtwidgets)
7722 + $(add_qt_dep qtxml)
7723 "
7724 RDEPEND="${DEPEND}
7725 !kde-apps/kwalletmanager:4[-minimal(-)]
7726
7727 diff --git a/kde-apps/kwalletmanager/kwalletmanager-15.12.49.9999.ebuild b/kde-apps/kwalletmanager/kwalletmanager-15.12.49.9999.ebuild
7728 index 39f7d95..97884a5 100644
7729 --- a/kde-apps/kwalletmanager/kwalletmanager-15.12.49.9999.ebuild
7730 +++ b/kde-apps/kwalletmanager/kwalletmanager-15.12.49.9999.ebuild
7731 @@ -32,10 +32,10 @@ DEPEND="
7732 $(add_frameworks_dep kwallet)
7733 $(add_frameworks_dep kwidgetsaddons)
7734 $(add_frameworks_dep kxmlgui)
7735 - dev-qt/qtdbus:5
7736 - dev-qt/qtgui:5
7737 - dev-qt/qtwidgets:5
7738 - dev-qt/qtxml:5
7739 + $(add_qt_dep qtdbus)
7740 + $(add_qt_dep qtgui)
7741 + $(add_qt_dep qtwidgets)
7742 + $(add_qt_dep qtxml)
7743 "
7744 RDEPEND="${DEPEND}
7745 !kde-apps/kwalletmanager:4[-minimal(-)]
7746
7747 diff --git a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild b/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
7748 index 39f7d95..97884a5 100644
7749 --- a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
7750 +++ b/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
7751 @@ -32,10 +32,10 @@ DEPEND="
7752 $(add_frameworks_dep kwallet)
7753 $(add_frameworks_dep kwidgetsaddons)
7754 $(add_frameworks_dep kxmlgui)
7755 - dev-qt/qtdbus:5
7756 - dev-qt/qtgui:5
7757 - dev-qt/qtwidgets:5
7758 - dev-qt/qtxml:5
7759 + $(add_qt_dep qtdbus)
7760 + $(add_qt_dep qtgui)
7761 + $(add_qt_dep qtwidgets)
7762 + $(add_qt_dep qtxml)
7763 "
7764 RDEPEND="${DEPEND}
7765 !kde-apps/kwalletmanager:4[-minimal(-)]
7766
7767 diff --git a/kde-apps/kwordquiz/kwordquiz-15.08.3.ebuild b/kde-apps/kwordquiz/kwordquiz-15.08.3.ebuild
7768 index 672c4cc..872d997 100644
7769 --- a/kde-apps/kwordquiz/kwordquiz-15.08.3.ebuild
7770 +++ b/kde-apps/kwordquiz/kwordquiz-15.08.3.ebuild
7771 @@ -29,8 +29,8 @@ DEPEND="
7772 $(add_frameworks_dep sonnet)
7773 $(add_frameworks_dep kxmlgui)
7774 $(add_kdeapps_dep libkeduvocdocument)
7775 - dev-qt/qtprintsupport:5
7776 - dev-qt/qtwidgets:5
7777 + $(add_qt_dep qtprintsupport)
7778 + $(add_qt_dep qtwidgets)
7779 media-libs/phonon[qt5]
7780 "
7781 RDEPEND=${DEPEND}
7782
7783 diff --git a/kde-apps/kwordquiz/kwordquiz-15.12.1.ebuild b/kde-apps/kwordquiz/kwordquiz-15.12.1.ebuild
7784 index 672c4cc..872d997 100644
7785 --- a/kde-apps/kwordquiz/kwordquiz-15.12.1.ebuild
7786 +++ b/kde-apps/kwordquiz/kwordquiz-15.12.1.ebuild
7787 @@ -29,8 +29,8 @@ DEPEND="
7788 $(add_frameworks_dep sonnet)
7789 $(add_frameworks_dep kxmlgui)
7790 $(add_kdeapps_dep libkeduvocdocument)
7791 - dev-qt/qtprintsupport:5
7792 - dev-qt/qtwidgets:5
7793 + $(add_qt_dep qtprintsupport)
7794 + $(add_qt_dep qtwidgets)
7795 media-libs/phonon[qt5]
7796 "
7797 RDEPEND=${DEPEND}
7798
7799 diff --git a/kde-apps/kwordquiz/kwordquiz-15.12.49.9999.ebuild b/kde-apps/kwordquiz/kwordquiz-15.12.49.9999.ebuild
7800 index 850257f..2e87c13 100644
7801 --- a/kde-apps/kwordquiz/kwordquiz-15.12.49.9999.ebuild
7802 +++ b/kde-apps/kwordquiz/kwordquiz-15.12.49.9999.ebuild
7803 @@ -29,8 +29,8 @@ DEPEND="
7804 $(add_frameworks_dep sonnet)
7805 $(add_frameworks_dep kxmlgui)
7806 $(add_kdeapps_dep libkeduvocdocument)
7807 - dev-qt/qtprintsupport:5
7808 - dev-qt/qtwidgets:5
7809 + $(add_qt_dep qtprintsupport)
7810 + $(add_qt_dep qtwidgets)
7811 media-libs/phonon[qt5]
7812 "
7813 RDEPEND=${DEPEND}
7814
7815 diff --git a/kde-apps/kwordquiz/kwordquiz-9999.ebuild b/kde-apps/kwordquiz/kwordquiz-9999.ebuild
7816 index 850257f..2e87c13 100644
7817 --- a/kde-apps/kwordquiz/kwordquiz-9999.ebuild
7818 +++ b/kde-apps/kwordquiz/kwordquiz-9999.ebuild
7819 @@ -29,8 +29,8 @@ DEPEND="
7820 $(add_frameworks_dep sonnet)
7821 $(add_frameworks_dep kxmlgui)
7822 $(add_kdeapps_dep libkeduvocdocument)
7823 - dev-qt/qtprintsupport:5
7824 - dev-qt/qtwidgets:5
7825 + $(add_qt_dep qtprintsupport)
7826 + $(add_qt_dep qtwidgets)
7827 media-libs/phonon[qt5]
7828 "
7829 RDEPEND=${DEPEND}
7830
7831 diff --git a/kde-apps/kwrite/kwrite-15.12.1.ebuild b/kde-apps/kwrite/kwrite-15.12.1.ebuild
7832 index b32285b..fa43ccb 100644
7833 --- a/kde-apps/kwrite/kwrite-15.12.1.ebuild
7834 +++ b/kde-apps/kwrite/kwrite-15.12.1.ebuild
7835 @@ -26,8 +26,8 @@ DEPEND="
7836 $(add_frameworks_dep ktexteditor)
7837 $(add_frameworks_dep kwidgetsaddons)
7838 $(add_frameworks_dep kxmlgui)
7839 - dev-qt/qtgui:5
7840 - dev-qt/qtwidgets:5
7841 + $(add_qt_dep qtgui)
7842 + $(add_qt_dep qtwidgets)
7843 "
7844 RDEPEND="${DEPEND}"
7845
7846
7847 diff --git a/kde-apps/kwrite/kwrite-15.12.49.9999.ebuild b/kde-apps/kwrite/kwrite-15.12.49.9999.ebuild
7848 index 35f2fb7..ad6809a 100644
7849 --- a/kde-apps/kwrite/kwrite-15.12.49.9999.ebuild
7850 +++ b/kde-apps/kwrite/kwrite-15.12.49.9999.ebuild
7851 @@ -26,8 +26,8 @@ DEPEND="
7852 $(add_frameworks_dep ktexteditor)
7853 $(add_frameworks_dep kwidgetsaddons)
7854 $(add_frameworks_dep kxmlgui)
7855 - dev-qt/qtgui:5
7856 - dev-qt/qtwidgets:5
7857 + $(add_qt_dep qtgui)
7858 + $(add_qt_dep qtwidgets)
7859 "
7860 RDEPEND="${DEPEND}"
7861
7862
7863 diff --git a/kde-apps/kwrite/kwrite-9999.ebuild b/kde-apps/kwrite/kwrite-9999.ebuild
7864 index 35f2fb7..ad6809a 100644
7865 --- a/kde-apps/kwrite/kwrite-9999.ebuild
7866 +++ b/kde-apps/kwrite/kwrite-9999.ebuild
7867 @@ -26,8 +26,8 @@ DEPEND="
7868 $(add_frameworks_dep ktexteditor)
7869 $(add_frameworks_dep kwidgetsaddons)
7870 $(add_frameworks_dep kxmlgui)
7871 - dev-qt/qtgui:5
7872 - dev-qt/qtwidgets:5
7873 + $(add_qt_dep qtgui)
7874 + $(add_qt_dep qtwidgets)
7875 "
7876 RDEPEND="${DEPEND}"
7877
7878
7879 diff --git a/kde-apps/libakonadi/libakonadi-15.12.1.ebuild b/kde-apps/libakonadi/libakonadi-15.12.1.ebuild
7880 index 544c72c..479aa0e 100644
7881 --- a/kde-apps/libakonadi/libakonadi-15.12.1.ebuild
7882 +++ b/kde-apps/libakonadi/libakonadi-15.12.1.ebuild
7883 @@ -35,13 +35,13 @@ COMMON_DEPEND="
7884 $(add_frameworks_dep kwindowsystem)
7885 $(add_frameworks_dep kxmlgui)
7886 $(add_kdeapps_dep akonadi)
7887 - dev-qt/qtdbus:5
7888 - dev-qt/qtgui:5
7889 - dev-qt/qtnetwork:5
7890 - dev-qt/qtsql:5
7891 - dev-qt/qtxml:5
7892 - dev-qt/qtwidgets:5
7893 - designer? ( dev-qt/designer:5 )
7894 + $(add_qt_dep qtdbus)
7895 + $(add_qt_dep qtgui)
7896 + $(add_qt_dep qtnetwork)
7897 + $(add_qt_dep qtsql)
7898 + $(add_qt_dep qtxml)
7899 + $(add_qt_dep qtwidgets)
7900 + designer? ( $(add_qt_dep designer) )
7901 tools? ( dev-libs/libxml2 )
7902 "
7903 DEPEND="${COMMON_DEPEND}
7904
7905 diff --git a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
7906 index 7890628..0523317 100644
7907 --- a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
7908 +++ b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
7909 @@ -35,13 +35,13 @@ COMMON_DEPEND="
7910 $(add_frameworks_dep kwindowsystem)
7911 $(add_frameworks_dep kxmlgui)
7912 $(add_kdeapps_dep akonadi)
7913 - dev-qt/qtdbus:5
7914 - dev-qt/qtgui:5
7915 - dev-qt/qtnetwork:5
7916 - dev-qt/qtsql:5
7917 - dev-qt/qtxml:5
7918 - dev-qt/qtwidgets:5
7919 - designer? ( dev-qt/designer:5 )
7920 + $(add_qt_dep qtdbus)
7921 + $(add_qt_dep qtgui)
7922 + $(add_qt_dep qtnetwork)
7923 + $(add_qt_dep qtsql)
7924 + $(add_qt_dep qtxml)
7925 + $(add_qt_dep qtwidgets)
7926 + designer? ( $(add_qt_dep designer) )
7927 tools? ( dev-libs/libxml2 )
7928 "
7929 DEPEND="${COMMON_DEPEND}
7930
7931 diff --git a/kde-apps/libfollowupreminder/libfollowupreminder-15.12.1.ebuild b/kde-apps/libfollowupreminder/libfollowupreminder-15.12.1.ebuild
7932 index d03d025..4457d78 100644
7933 --- a/kde-apps/libfollowupreminder/libfollowupreminder-15.12.1.ebuild
7934 +++ b/kde-apps/libfollowupreminder/libfollowupreminder-15.12.1.ebuild
7935 @@ -19,8 +19,8 @@ COMMON_DEPEND="
7936 $(add_frameworks_dep ki18n)
7937 $(add_frameworks_dep knewstuff)
7938 $(add_kdeapps_dep libakonadi)
7939 - dev-qt/qtdbus:5
7940 - dev-qt/qtgui:5
7941 + $(add_qt_dep qtdbus)
7942 + $(add_qt_dep qtgui)
7943 "
7944 DEPEND="${COMMON_DEPEND}
7945 sys-devel/gettext
7946
7947 diff --git a/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild b/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild
7948 index e30c947..753b422 100644
7949 --- a/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild
7950 +++ b/kde-apps/libfollowupreminder/libfollowupreminder-15.12.49.9999.ebuild
7951 @@ -19,8 +19,8 @@ COMMON_DEPEND="
7952 $(add_frameworks_dep ki18n)
7953 $(add_frameworks_dep knewstuff)
7954 $(add_kdeapps_dep libakonadi)
7955 - dev-qt/qtdbus:5
7956 - dev-qt/qtgui:5
7957 + $(add_qt_dep qtdbus)
7958 + $(add_qt_dep qtgui)
7959 "
7960 DEPEND="${COMMON_DEPEND}
7961 sys-devel/gettext
7962
7963 diff --git a/kde-apps/libgravatar/libgravatar-15.12.1.ebuild b/kde-apps/libgravatar/libgravatar-15.12.1.ebuild
7964 index f13f898..283f2b6 100644
7965 --- a/kde-apps/libgravatar/libgravatar-15.12.1.ebuild
7966 +++ b/kde-apps/libgravatar/libgravatar-15.12.1.ebuild
7967 @@ -20,9 +20,9 @@ COMMON_DEPEND="
7968 $(add_frameworks_dep ktextwidgets)
7969 $(add_frameworks_dep kwidgetsaddons)
7970 $(add_kdeapps_dep pimcommon)
7971 - dev-qt/qtgui:5
7972 - dev-qt/qtnetwork:5
7973 - dev-qt/qtwidgets:5
7974 + $(add_qt_dep qtgui)
7975 + $(add_qt_dep qtnetwork)
7976 + $(add_qt_dep qtwidgets)
7977 "
7978 DEPEND="${COMMON_DEPEND}
7979 sys-devel/gettext
7980
7981 diff --git a/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild b/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild
7982 index 114e51f..df3cad0 100644
7983 --- a/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild
7984 +++ b/kde-apps/libgravatar/libgravatar-15.12.49.9999.ebuild
7985 @@ -20,9 +20,9 @@ COMMON_DEPEND="
7986 $(add_frameworks_dep ktextwidgets)
7987 $(add_frameworks_dep kwidgetsaddons)
7988 $(add_kdeapps_dep pimcommon)
7989 - dev-qt/qtgui:5
7990 - dev-qt/qtnetwork:5
7991 - dev-qt/qtwidgets:5
7992 + $(add_qt_dep qtgui)
7993 + $(add_qt_dep qtnetwork)
7994 + $(add_qt_dep qtwidgets)
7995 "
7996 DEPEND="${COMMON_DEPEND}
7997 sys-devel/gettext
7998
7999 diff --git a/kde-apps/libgravatar/libgravatar-9999.ebuild b/kde-apps/libgravatar/libgravatar-9999.ebuild
8000 index 0bba5e9..de9d301 100644
8001 --- a/kde-apps/libgravatar/libgravatar-9999.ebuild
8002 +++ b/kde-apps/libgravatar/libgravatar-9999.ebuild
8003 @@ -19,9 +19,9 @@ COMMON_DEPEND="
8004 $(add_frameworks_dep ktextwidgets)
8005 $(add_frameworks_dep kwidgetsaddons)
8006 $(add_kdeapps_dep pimcommon)
8007 - dev-qt/qtgui:5
8008 - dev-qt/qtnetwork:5
8009 - dev-qt/qtwidgets:5
8010 + $(add_qt_dep qtgui)
8011 + $(add_qt_dep qtnetwork)
8012 + $(add_qt_dep qtwidgets)
8013 "
8014 DEPEND="${COMMON_DEPEND}
8015 sys-devel/gettext
8016
8017 diff --git a/kde-apps/libkcddb/libkcddb-5.9999.ebuild b/kde-apps/libkcddb/libkcddb-5.9999.ebuild
8018 index 1946727..1600636 100644
8019 --- a/kde-apps/libkcddb/libkcddb-5.9999.ebuild
8020 +++ b/kde-apps/libkcddb/libkcddb-5.9999.ebuild
8021 @@ -24,9 +24,9 @@ DEPEND="
8022 $(add_frameworks_dep ki18n)
8023 $(add_frameworks_dep kio)
8024 $(add_frameworks_dep kwidgetsaddons)
8025 - dev-qt/qtgui:5
8026 - dev-qt/qtnetwork:5
8027 - dev-qt/qtwidgets:5
8028 + $(add_qt_dep qtgui)
8029 + $(add_qt_dep qtnetwork)
8030 + $(add_qt_dep qtwidgets)
8031 musicbrainz? ( media-libs/musicbrainz:5 )
8032 "
8033 RDEPEND="${DEPEND}"
8034
8035 diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
8036 index e46b4bc..638ec05 100644
8037 --- a/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
8038 +++ b/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
8039 @@ -17,7 +17,7 @@ DEPEND="
8040 $(add_frameworks_dep ki18n)
8041 $(add_frameworks_dep solid)
8042 media-libs/phonon[qt5]
8043 - dev-qt/qtdbus:5
8044 + $(add_qt_dep qtdbus)
8045 "
8046 RDEPEND="${DEPEND}"
8047
8048
8049 diff --git a/kde-apps/libkdcraw/libkdcraw-15.12.1.ebuild b/kde-apps/libkdcraw/libkdcraw-15.12.1.ebuild
8050 index 1033f0c..f905e3f 100644
8051 --- a/kde-apps/libkdcraw/libkdcraw-15.12.1.ebuild
8052 +++ b/kde-apps/libkdcraw/libkdcraw-15.12.1.ebuild
8053 @@ -13,6 +13,6 @@ IUSE=""
8054
8055 DEPEND="
8056 >=media-libs/libraw-0.16:=
8057 - dev-qt/qtgui:5
8058 + $(add_qt_dep qtgui)
8059 "
8060 RDEPEND="${DEPEND}"
8061
8062 diff --git a/kde-apps/libkdcraw/libkdcraw-15.12.49.9999.ebuild b/kde-apps/libkdcraw/libkdcraw-15.12.49.9999.ebuild
8063 index 9a73af2..6c028c1 100644
8064 --- a/kde-apps/libkdcraw/libkdcraw-15.12.49.9999.ebuild
8065 +++ b/kde-apps/libkdcraw/libkdcraw-15.12.49.9999.ebuild
8066 @@ -13,6 +13,6 @@ IUSE=""
8067
8068 DEPEND="
8069 >=media-libs/libraw-0.16:=
8070 - dev-qt/qtgui:5
8071 + $(add_qt_dep qtgui)
8072 "
8073 RDEPEND="${DEPEND}"
8074
8075 diff --git a/kde-apps/libkdcraw/libkdcraw-9999.ebuild b/kde-apps/libkdcraw/libkdcraw-9999.ebuild
8076 index 9a73af2..6c028c1 100644
8077 --- a/kde-apps/libkdcraw/libkdcraw-9999.ebuild
8078 +++ b/kde-apps/libkdcraw/libkdcraw-9999.ebuild
8079 @@ -13,6 +13,6 @@ IUSE=""
8080
8081 DEPEND="
8082 >=media-libs/libraw-0.16:=
8083 - dev-qt/qtgui:5
8084 + $(add_qt_dep qtgui)
8085 "
8086 RDEPEND="${DEPEND}"
8087
8088 diff --git a/kde-apps/libkdegames/libkdegames-15.12.1.ebuild b/kde-apps/libkdegames/libkdegames-15.12.1.ebuild
8089 index 96e63ef..a2cc1da 100644
8090 --- a/kde-apps/libkdegames/libkdegames-15.12.1.ebuild
8091 +++ b/kde-apps/libkdegames/libkdegames-15.12.1.ebuild
8092 @@ -38,12 +38,12 @@ DEPEND="
8093 $(add_frameworks_dep ktextwidgets)
8094 $(add_frameworks_dep kwidgetsaddons)
8095 $(add_frameworks_dep kxmlgui)
8096 - dev-qt/qtdeclarative:5[widgets]
8097 - dev-qt/qtgui:5
8098 - dev-qt/qtnetwork:5
8099 - dev-qt/qtwidgets:5
8100 - dev-qt/qtsvg:5
8101 - dev-qt/qtxml:5
8102 + $(add_qt_dep qtdeclarative 'widgets')
8103 + $(add_qt_dep qtgui)
8104 + $(add_qt_dep qtnetwork)
8105 + $(add_qt_dep qtwidgets)
8106 + $(add_qt_dep qtsvg)
8107 + $(add_qt_dep qtxml)
8108 media-libs/libsndfile
8109 media-libs/openal
8110 "
8111
8112 diff --git a/kde-apps/libkdegames/libkdegames-15.12.49.9999.ebuild b/kde-apps/libkdegames/libkdegames-15.12.49.9999.ebuild
8113 index 69e6424..d468741 100644
8114 --- a/kde-apps/libkdegames/libkdegames-15.12.49.9999.ebuild
8115 +++ b/kde-apps/libkdegames/libkdegames-15.12.49.9999.ebuild
8116 @@ -38,12 +38,12 @@ DEPEND="
8117 $(add_frameworks_dep ktextwidgets)
8118 $(add_frameworks_dep kwidgetsaddons)
8119 $(add_frameworks_dep kxmlgui)
8120 - dev-qt/qtdeclarative:5[widgets]
8121 - dev-qt/qtgui:5
8122 - dev-qt/qtnetwork:5
8123 - dev-qt/qtwidgets:5
8124 - dev-qt/qtsvg:5
8125 - dev-qt/qtxml:5
8126 + $(add_qt_dep qtdeclarative 'widgets')
8127 + $(add_qt_dep qtgui)
8128 + $(add_qt_dep qtnetwork)
8129 + $(add_qt_dep qtwidgets)
8130 + $(add_qt_dep qtsvg)
8131 + $(add_qt_dep qtxml)
8132 media-libs/libsndfile
8133 media-libs/openal
8134 "
8135
8136 diff --git a/kde-apps/libkdegames/libkdegames-9999.ebuild b/kde-apps/libkdegames/libkdegames-9999.ebuild
8137 index 69e6424..d468741 100644
8138 --- a/kde-apps/libkdegames/libkdegames-9999.ebuild
8139 +++ b/kde-apps/libkdegames/libkdegames-9999.ebuild
8140 @@ -38,12 +38,12 @@ DEPEND="
8141 $(add_frameworks_dep ktextwidgets)
8142 $(add_frameworks_dep kwidgetsaddons)
8143 $(add_frameworks_dep kxmlgui)
8144 - dev-qt/qtdeclarative:5[widgets]
8145 - dev-qt/qtgui:5
8146 - dev-qt/qtnetwork:5
8147 - dev-qt/qtwidgets:5
8148 - dev-qt/qtsvg:5
8149 - dev-qt/qtxml:5
8150 + $(add_qt_dep qtdeclarative 'widgets')
8151 + $(add_qt_dep qtgui)
8152 + $(add_qt_dep qtnetwork)
8153 + $(add_qt_dep qtwidgets)
8154 + $(add_qt_dep qtsvg)
8155 + $(add_qt_dep qtxml)
8156 media-libs/libsndfile
8157 media-libs/openal
8158 "
8159
8160 diff --git a/kde-apps/libkdepim/libkdepim-15.12.1.ebuild b/kde-apps/libkdepim/libkdepim-15.12.1.ebuild
8161 index 1e3a42e..cf433e5 100644
8162 --- a/kde-apps/libkdepim/libkdepim-15.12.1.ebuild
8163 +++ b/kde-apps/libkdepim/libkdepim-15.12.1.ebuild
8164 @@ -27,14 +27,14 @@ COMMON_DEPEND="
8165 $(add_kdeapps_dep kldap)
8166 $(add_kdeapps_dep kmime)
8167 $(add_kdeapps_dep libakonadi)
8168 - dev-qt/qtdbus:5
8169 - dev-qt/qtgui:5
8170 - dev-qt/qtnetwork:5
8171 - dev-qt/qtwidgets:5
8172 + $(add_qt_dep qtdbus)
8173 + $(add_qt_dep qtgui)
8174 + $(add_qt_dep qtnetwork)
8175 + $(add_qt_dep qtwidgets)
8176 "
8177 DEPEND="${COMMON_DEPEND}
8178 sys-devel/gettext
8179 - designer? ( dev-qt/designer:5 )
8180 + designer? ( $(add_qt_dep designer) )
8181 "
8182 RDEPEND="${COMMON_DEPEND}
8183 !<kde-apps/kdepim-15.08.50:5
8184
8185 diff --git a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild
8186 index 1efca7c..7254a68 100644
8187 --- a/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild
8188 +++ b/kde-apps/libkdepim/libkdepim-15.12.49.9999.ebuild
8189 @@ -27,14 +27,14 @@ COMMON_DEPEND="
8190 $(add_kdeapps_dep kldap)
8191 $(add_kdeapps_dep kmime)
8192 $(add_kdeapps_dep libakonadi)
8193 - dev-qt/qtdbus:5
8194 - dev-qt/qtgui:5
8195 - dev-qt/qtnetwork:5
8196 - dev-qt/qtwidgets:5
8197 + $(add_qt_dep qtdbus)
8198 + $(add_qt_dep qtgui)
8199 + $(add_qt_dep qtnetwork)
8200 + $(add_qt_dep qtwidgets)
8201 "
8202 DEPEND="${COMMON_DEPEND}
8203 sys-devel/gettext
8204 - designer? ( dev-qt/designer:5 )
8205 + designer? ( $(add_qt_dep designer) )
8206 "
8207 RDEPEND="${COMMON_DEPEND}
8208 !<kde-apps/kdepim-15.08.50:5
8209
8210 diff --git a/kde-apps/libkdepim/libkdepim-9999.ebuild b/kde-apps/libkdepim/libkdepim-9999.ebuild
8211 index 0364075..4b03bee 100644
8212 --- a/kde-apps/libkdepim/libkdepim-9999.ebuild
8213 +++ b/kde-apps/libkdepim/libkdepim-9999.ebuild
8214 @@ -26,14 +26,14 @@ COMMON_DEPEND="
8215 $(add_kdeapps_dep kcontacts)
8216 $(add_kdeapps_dep kldap)
8217 $(add_kdeapps_dep kmime)
8218 - dev-qt/qtdbus:5
8219 - dev-qt/qtgui:5
8220 - dev-qt/qtnetwork:5
8221 - dev-qt/qtwidgets:5
8222 + $(add_qt_dep qtdbus)
8223 + $(add_qt_dep qtgui)
8224 + $(add_qt_dep qtnetwork)
8225 + $(add_qt_dep qtwidgets)
8226 "
8227 DEPEND="${COMMON_DEPEND}
8228 sys-devel/gettext
8229 - designer? ( dev-qt/designer:5 )
8230 + designer? ( $(add_qt_dep designer) )
8231 "
8232 RDEPEND="${COMMON_DEPEND}
8233 !<kde-apps/kdepim-15.08.50:5
8234
8235 diff --git a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.1.ebuild b/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.1.ebuild
8236 index 2f950d8..c1bbf3c 100644
8237 --- a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.1.ebuild
8238 +++ b/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.1.ebuild
8239 @@ -20,9 +20,9 @@ COMMON_DEPEND="
8240 $(add_frameworks_dep kservice)
8241 $(add_kdeapps_dep akonadi-contact)
8242 $(add_kdeapps_dep libakonadi)
8243 - dev-qt/qtdbus:5
8244 - dev-qt/qtgui:5
8245 - dev-qt/qtwidgets:5
8246 + $(add_qt_dep qtdbus)
8247 + $(add_qt_dep qtgui)
8248 + $(add_qt_dep qtwidgets)
8249 "
8250 DEPEND="${COMMON_DEPEND}
8251 sys-devel/gettext
8252
8253 diff --git a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild b/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild
8254 index 29c542f..50dba20 100644
8255 --- a/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild
8256 +++ b/kde-apps/libkdepimdbusinterfaces/libkdepimdbusinterfaces-15.12.49.9999.ebuild
8257 @@ -20,9 +20,9 @@ COMMON_DEPEND="
8258 $(add_frameworks_dep kservice)
8259 $(add_kdeapps_dep akonadi-contact)
8260 $(add_kdeapps_dep libakonadi)
8261 - dev-qt/qtdbus:5
8262 - dev-qt/qtgui:5
8263 - dev-qt/qtwidgets:5
8264 + $(add_qt_dep qtdbus)
8265 + $(add_qt_dep qtgui)
8266 + $(add_qt_dep qtwidgets)
8267 "
8268 DEPEND="${COMMON_DEPEND}
8269 sys-devel/gettext
8270
8271 diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-15.08.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-15.08.3.ebuild
8272 index 3659aa8..8c663d8 100644
8273 --- a/kde-apps/libkeduvocdocument/libkeduvocdocument-15.08.3.ebuild
8274 +++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-15.08.3.ebuild
8275 @@ -16,6 +16,6 @@ DEPEND="
8276 $(add_frameworks_dep kcoreaddons)
8277 $(add_frameworks_dep ki18n)
8278 $(add_frameworks_dep kio)
8279 - dev-qt/qtxml:5
8280 + $(add_qt_dep qtxml)
8281 "
8282 RDEPEND="${DEPEND}"
8283
8284 diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.1.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.1.ebuild
8285 index 3659aa8..8c663d8 100644
8286 --- a/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.1.ebuild
8287 +++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.1.ebuild
8288 @@ -16,6 +16,6 @@ DEPEND="
8289 $(add_frameworks_dep kcoreaddons)
8290 $(add_frameworks_dep ki18n)
8291 $(add_frameworks_dep kio)
8292 - dev-qt/qtxml:5
8293 + $(add_qt_dep qtxml)
8294 "
8295 RDEPEND="${DEPEND}"
8296
8297 diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.49.9999.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.49.9999.ebuild
8298 index 56ac2c4..7024bae 100644
8299 --- a/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.49.9999.ebuild
8300 +++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.49.9999.ebuild
8301 @@ -16,6 +16,6 @@ DEPEND="
8302 $(add_frameworks_dep kcoreaddons)
8303 $(add_frameworks_dep ki18n)
8304 $(add_frameworks_dep kio)
8305 - dev-qt/qtxml:5
8306 + $(add_qt_dep qtxml)
8307 "
8308 RDEPEND="${DEPEND}"
8309
8310 diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-9999.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-9999.ebuild
8311 index 56ac2c4..7024bae 100644
8312 --- a/kde-apps/libkeduvocdocument/libkeduvocdocument-9999.ebuild
8313 +++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-9999.ebuild
8314 @@ -16,6 +16,6 @@ DEPEND="
8315 $(add_frameworks_dep kcoreaddons)
8316 $(add_frameworks_dep ki18n)
8317 $(add_frameworks_dep kio)
8318 - dev-qt/qtxml:5
8319 + $(add_qt_dep qtxml)
8320 "
8321 RDEPEND="${DEPEND}"
8322
8323 diff --git a/kde-apps/libkexiv2/libkexiv2-15.12.1.ebuild b/kde-apps/libkexiv2/libkexiv2-15.12.1.ebuild
8324 index 934cb41..4772d4f 100644
8325 --- a/kde-apps/libkexiv2/libkexiv2-15.12.1.ebuild
8326 +++ b/kde-apps/libkexiv2/libkexiv2-15.12.1.ebuild
8327 @@ -12,7 +12,7 @@ KEYWORDS=" ~amd64 ~x86"
8328 IUSE="+xmp"
8329
8330 DEPEND="
8331 - dev-qt/qtgui:5
8332 + $(add_qt_dep qtgui)
8333 >=media-gfx/exiv2-0.25:=[xmp=]
8334 "
8335 RDEPEND="${DEPEND}"
8336
8337 diff --git a/kde-apps/libkexiv2/libkexiv2-15.12.49.9999.ebuild b/kde-apps/libkexiv2/libkexiv2-15.12.49.9999.ebuild
8338 index 0c0c512..c6c4355 100644
8339 --- a/kde-apps/libkexiv2/libkexiv2-15.12.49.9999.ebuild
8340 +++ b/kde-apps/libkexiv2/libkexiv2-15.12.49.9999.ebuild
8341 @@ -12,7 +12,7 @@ KEYWORDS=""
8342 IUSE="+xmp"
8343
8344 DEPEND="
8345 - dev-qt/qtgui:5
8346 + $(add_qt_dep qtgui)
8347 >=media-gfx/exiv2-0.25:=[xmp=]
8348 "
8349 RDEPEND="${DEPEND}"
8350
8351 diff --git a/kde-apps/libkexiv2/libkexiv2-9999.ebuild b/kde-apps/libkexiv2/libkexiv2-9999.ebuild
8352 index 0c0c512..c6c4355 100644
8353 --- a/kde-apps/libkexiv2/libkexiv2-9999.ebuild
8354 +++ b/kde-apps/libkexiv2/libkexiv2-9999.ebuild
8355 @@ -12,7 +12,7 @@ KEYWORDS=""
8356 IUSE="+xmp"
8357
8358 DEPEND="
8359 - dev-qt/qtgui:5
8360 + $(add_qt_dep qtgui)
8361 >=media-gfx/exiv2-0.25:=[xmp=]
8362 "
8363 RDEPEND="${DEPEND}"
8364
8365 diff --git a/kde-apps/libkface/libkface-15.12.1.ebuild b/kde-apps/libkface/libkface-15.12.1.ebuild
8366 index 3c0e98a..d53eb09 100644
8367 --- a/kde-apps/libkface/libkface-15.12.1.ebuild
8368 +++ b/kde-apps/libkface/libkface-15.12.1.ebuild
8369 @@ -15,10 +15,10 @@ KEYWORDS=" ~amd64 ~x86"
8370 IUSE=""
8371
8372 DEPEND="
8373 - dev-qt/qtgui:5
8374 - dev-qt/qtsql:5
8375 - dev-qt/qtwidgets:5
8376 - dev-qt/qtxml:5
8377 + $(add_qt_dep qtgui)
8378 + $(add_qt_dep qtsql)
8379 + $(add_qt_dep qtwidgets)
8380 + $(add_qt_dep qtxml)
8381 >=media-libs/opencv-3:=[contrib]
8382 "
8383 RDEPEND="${DEPEND}"
8384
8385 diff --git a/kde-apps/libkface/libkface-15.12.49.9999.ebuild b/kde-apps/libkface/libkface-15.12.49.9999.ebuild
8386 index 1106fcb..a9b9915 100644
8387 --- a/kde-apps/libkface/libkface-15.12.49.9999.ebuild
8388 +++ b/kde-apps/libkface/libkface-15.12.49.9999.ebuild
8389 @@ -15,10 +15,10 @@ KEYWORDS=""
8390 IUSE=""
8391
8392 DEPEND="
8393 - dev-qt/qtgui:5
8394 - dev-qt/qtsql:5
8395 - dev-qt/qtwidgets:5
8396 - dev-qt/qtxml:5
8397 + $(add_qt_dep qtgui)
8398 + $(add_qt_dep qtsql)
8399 + $(add_qt_dep qtwidgets)
8400 + $(add_qt_dep qtxml)
8401 >=media-libs/opencv-3:=[contrib]
8402 "
8403 RDEPEND="${DEPEND}"
8404
8405 diff --git a/kde-apps/libkface/libkface-9999.ebuild b/kde-apps/libkface/libkface-9999.ebuild
8406 index 1106fcb..a9b9915 100644
8407 --- a/kde-apps/libkface/libkface-9999.ebuild
8408 +++ b/kde-apps/libkface/libkface-9999.ebuild
8409 @@ -15,10 +15,10 @@ KEYWORDS=""
8410 IUSE=""
8411
8412 DEPEND="
8413 - dev-qt/qtgui:5
8414 - dev-qt/qtsql:5
8415 - dev-qt/qtwidgets:5
8416 - dev-qt/qtxml:5
8417 + $(add_qt_dep qtgui)
8418 + $(add_qt_dep qtsql)
8419 + $(add_qt_dep qtwidgets)
8420 + $(add_qt_dep qtxml)
8421 >=media-libs/opencv-3:=[contrib]
8422 "
8423 RDEPEND="${DEPEND}"
8424
8425 diff --git a/kde-apps/libkgeomap/libkgeomap-15.12.1.ebuild b/kde-apps/libkgeomap/libkgeomap-15.12.1.ebuild
8426 index 06677cf..5e3eda9 100644
8427 --- a/kde-apps/libkgeomap/libkgeomap-15.12.1.ebuild
8428 +++ b/kde-apps/libkgeomap/libkgeomap-15.12.1.ebuild
8429 @@ -21,11 +21,11 @@ DEPEND="
8430 $(add_frameworks_dep ki18n)
8431 $(add_frameworks_dep kio)
8432 $(add_frameworks_dep ktextwidgets)
8433 - dev-qt/qtconcurrent:5
8434 - dev-qt/qtgui:5
8435 - dev-qt/qtwebkit:5
8436 - dev-qt/qtwidgets:5
8437 - dev-qt/qtxml:5
8438 + $(add_qt_dep qtconcurrent)
8439 + $(add_qt_dep qtgui)
8440 + $(add_qt_dep qtwebkit)
8441 + $(add_qt_dep qtwidgets)
8442 + $(add_qt_dep qtxml)
8443 kde-apps/libkexiv2:5=
8444 kde-apps/marble:5=[kde]
8445 "
8446
8447 diff --git a/kde-apps/libkgeomap/libkgeomap-15.12.49.9999.ebuild b/kde-apps/libkgeomap/libkgeomap-15.12.49.9999.ebuild
8448 index 595a194..29c319b 100644
8449 --- a/kde-apps/libkgeomap/libkgeomap-15.12.49.9999.ebuild
8450 +++ b/kde-apps/libkgeomap/libkgeomap-15.12.49.9999.ebuild
8451 @@ -21,11 +21,11 @@ DEPEND="
8452 $(add_frameworks_dep ki18n)
8453 $(add_frameworks_dep kio)
8454 $(add_frameworks_dep ktextwidgets)
8455 - dev-qt/qtconcurrent:5
8456 - dev-qt/qtgui:5
8457 - dev-qt/qtwebkit:5
8458 - dev-qt/qtwidgets:5
8459 - dev-qt/qtxml:5
8460 + $(add_qt_dep qtconcurrent)
8461 + $(add_qt_dep qtgui)
8462 + $(add_qt_dep qtwebkit)
8463 + $(add_qt_dep qtwidgets)
8464 + $(add_qt_dep qtxml)
8465 kde-apps/libkexiv2:5=
8466 kde-apps/marble:5=[kde]
8467 "
8468
8469 diff --git a/kde-apps/libkgeomap/libkgeomap-9999.ebuild b/kde-apps/libkgeomap/libkgeomap-9999.ebuild
8470 index 595a194..29c319b 100644
8471 --- a/kde-apps/libkgeomap/libkgeomap-9999.ebuild
8472 +++ b/kde-apps/libkgeomap/libkgeomap-9999.ebuild
8473 @@ -21,11 +21,11 @@ DEPEND="
8474 $(add_frameworks_dep ki18n)
8475 $(add_frameworks_dep kio)
8476 $(add_frameworks_dep ktextwidgets)
8477 - dev-qt/qtconcurrent:5
8478 - dev-qt/qtgui:5
8479 - dev-qt/qtwebkit:5
8480 - dev-qt/qtwidgets:5
8481 - dev-qt/qtxml:5
8482 + $(add_qt_dep qtconcurrent)
8483 + $(add_qt_dep qtgui)
8484 + $(add_qt_dep qtwebkit)
8485 + $(add_qt_dep qtwidgets)
8486 + $(add_qt_dep qtxml)
8487 kde-apps/libkexiv2:5=
8488 kde-apps/marble:5=[kde]
8489 "
8490
8491 diff --git a/kde-apps/libkipi/libkipi-15.12.1.ebuild b/kde-apps/libkipi/libkipi-15.12.1.ebuild
8492 index 8ad91a8..5d3c502 100644
8493 --- a/kde-apps/libkipi/libkipi-15.12.1.ebuild
8494 +++ b/kde-apps/libkipi/libkipi-15.12.1.ebuild
8495 @@ -17,9 +17,9 @@ DEPEND="
8496 $(add_frameworks_dep ki18n)
8497 $(add_frameworks_dep kservice)
8498 $(add_frameworks_dep kxmlgui)
8499 - dev-qt/qtgui:5
8500 - dev-qt/qtwidgets:5
8501 - dev-qt/qtxml:5
8502 + $(add_qt_dep qtgui)
8503 + $(add_qt_dep qtwidgets)
8504 + $(add_qt_dep qtxml)
8505 "
8506
8507 RDEPEND="${DEPEND}
8508
8509 diff --git a/kde-apps/libkipi/libkipi-15.12.49.9999.ebuild b/kde-apps/libkipi/libkipi-15.12.49.9999.ebuild
8510 index 0f3a7d2..9d84d4a 100644
8511 --- a/kde-apps/libkipi/libkipi-15.12.49.9999.ebuild
8512 +++ b/kde-apps/libkipi/libkipi-15.12.49.9999.ebuild
8513 @@ -17,9 +17,9 @@ DEPEND="
8514 $(add_frameworks_dep ki18n)
8515 $(add_frameworks_dep kservice)
8516 $(add_frameworks_dep kxmlgui)
8517 - dev-qt/qtgui:5
8518 - dev-qt/qtwidgets:5
8519 - dev-qt/qtxml:5
8520 + $(add_qt_dep qtgui)
8521 + $(add_qt_dep qtwidgets)
8522 + $(add_qt_dep qtxml)
8523 "
8524
8525 RDEPEND="${DEPEND}
8526
8527 diff --git a/kde-apps/libkipi/libkipi-9999.ebuild b/kde-apps/libkipi/libkipi-9999.ebuild
8528 index 0f3a7d2..9d84d4a 100644
8529 --- a/kde-apps/libkipi/libkipi-9999.ebuild
8530 +++ b/kde-apps/libkipi/libkipi-9999.ebuild
8531 @@ -17,9 +17,9 @@ DEPEND="
8532 $(add_frameworks_dep ki18n)
8533 $(add_frameworks_dep kservice)
8534 $(add_frameworks_dep kxmlgui)
8535 - dev-qt/qtgui:5
8536 - dev-qt/qtwidgets:5
8537 - dev-qt/qtxml:5
8538 + $(add_qt_dep qtgui)
8539 + $(add_qt_dep qtwidgets)
8540 + $(add_qt_dep qtxml)
8541 "
8542
8543 RDEPEND="${DEPEND}
8544
8545 diff --git a/kde-apps/libkleo/libkleo-15.12.1.ebuild b/kde-apps/libkleo/libkleo-15.12.1.ebuild
8546 index 0d53d05..b82716d 100644
8547 --- a/kde-apps/libkleo/libkleo-15.12.1.ebuild
8548 +++ b/kde-apps/libkleo/libkleo-15.12.1.ebuild
8549 @@ -25,10 +25,10 @@ COMMON_DEPEND="
8550 $(add_kdeapps_dep gpgmepp)
8551 $(add_kdeapps_dep kmime)
8552 $(add_kdeapps_dep pimcommon)
8553 - dev-qt/designer:5
8554 - dev-qt/qtgui:5
8555 - dev-qt/qtwidgets:5
8556 - dev-qt/qtxml:5
8557 + $(add_qt_dep designer)
8558 + $(add_qt_dep qtgui)
8559 + $(add_qt_dep qtwidgets)
8560 + $(add_qt_dep qtxml)
8561 "
8562 DEPEND="${COMMON_DEPEND}
8563 sys-devel/gettext
8564
8565 diff --git a/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild b/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild
8566 index 475827a..89100de 100644
8567 --- a/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild
8568 +++ b/kde-apps/libkleo/libkleo-15.12.49.9999.ebuild
8569 @@ -25,10 +25,10 @@ COMMON_DEPEND="
8570 $(add_kdeapps_dep gpgmepp)
8571 $(add_kdeapps_dep kmime)
8572 $(add_kdeapps_dep pimcommon)
8573 - dev-qt/designer:5
8574 - dev-qt/qtgui:5
8575 - dev-qt/qtwidgets:5
8576 - dev-qt/qtxml:5
8577 + $(add_qt_dep designer)
8578 + $(add_qt_dep qtgui)
8579 + $(add_qt_dep qtwidgets)
8580 + $(add_qt_dep qtxml)
8581 "
8582 DEPEND="${COMMON_DEPEND}
8583 sys-devel/gettext
8584
8585 diff --git a/kde-apps/libkleo/libkleo-9999.ebuild b/kde-apps/libkleo/libkleo-9999.ebuild
8586 index bc42e0b..70acca0 100644
8587 --- a/kde-apps/libkleo/libkleo-9999.ebuild
8588 +++ b/kde-apps/libkleo/libkleo-9999.ebuild
8589 @@ -24,10 +24,10 @@ COMMON_DEPEND="
8590 $(add_kdeapps_dep gpgmepp)
8591 $(add_kdeapps_dep kmime)
8592 $(add_kdeapps_dep pimcommon)
8593 - dev-qt/designer:5
8594 - dev-qt/qtgui:5
8595 - dev-qt/qtwidgets:5
8596 - dev-qt/qtxml:5
8597 + $(add_qt_dep designer)
8598 + $(add_qt_dep qtgui)
8599 + $(add_qt_dep qtwidgets)
8600 + $(add_qt_dep qtxml)
8601 "
8602 DEPEND="${COMMON_DEPEND}
8603 sys-devel/gettext
8604
8605 diff --git a/kde-apps/libkmahjongg/libkmahjongg-15.12.1.ebuild b/kde-apps/libkmahjongg/libkmahjongg-15.12.1.ebuild
8606 index 71df534..8ab4d51 100644
8607 --- a/kde-apps/libkmahjongg/libkmahjongg-15.12.1.ebuild
8608 +++ b/kde-apps/libkmahjongg/libkmahjongg-15.12.1.ebuild
8609 @@ -19,9 +19,9 @@ DEPEND="
8610 $(add_frameworks_dep kcoreaddons)
8611 $(add_frameworks_dep ki18n)
8612 $(add_frameworks_dep kwidgetsaddons)
8613 - dev-qt/qtgui:5
8614 - dev-qt/qtsvg:5
8615 - dev-qt/qtwidgets:5
8616 + $(add_qt_dep qtgui)
8617 + $(add_qt_dep qtsvg)
8618 + $(add_qt_dep qtwidgets)
8619 "
8620
8621 RDEPEND="${DEPEND}"
8622
8623 diff --git a/kde-apps/libkmahjongg/libkmahjongg-15.12.49.9999.ebuild b/kde-apps/libkmahjongg/libkmahjongg-15.12.49.9999.ebuild
8624 index e9eb069..568099c 100644
8625 --- a/kde-apps/libkmahjongg/libkmahjongg-15.12.49.9999.ebuild
8626 +++ b/kde-apps/libkmahjongg/libkmahjongg-15.12.49.9999.ebuild
8627 @@ -19,9 +19,9 @@ DEPEND="
8628 $(add_frameworks_dep kcoreaddons)
8629 $(add_frameworks_dep ki18n)
8630 $(add_frameworks_dep kwidgetsaddons)
8631 - dev-qt/qtgui:5
8632 - dev-qt/qtsvg:5
8633 - dev-qt/qtwidgets:5
8634 + $(add_qt_dep qtgui)
8635 + $(add_qt_dep qtsvg)
8636 + $(add_qt_dep qtwidgets)
8637 "
8638
8639 RDEPEND="${DEPEND}"
8640
8641 diff --git a/kde-apps/libkmahjongg/libkmahjongg-9999.ebuild b/kde-apps/libkmahjongg/libkmahjongg-9999.ebuild
8642 index e9eb069..568099c 100644
8643 --- a/kde-apps/libkmahjongg/libkmahjongg-9999.ebuild
8644 +++ b/kde-apps/libkmahjongg/libkmahjongg-9999.ebuild
8645 @@ -19,9 +19,9 @@ DEPEND="
8646 $(add_frameworks_dep kcoreaddons)
8647 $(add_frameworks_dep ki18n)
8648 $(add_frameworks_dep kwidgetsaddons)
8649 - dev-qt/qtgui:5
8650 - dev-qt/qtsvg:5
8651 - dev-qt/qtwidgets:5
8652 + $(add_qt_dep qtgui)
8653 + $(add_qt_dep qtsvg)
8654 + $(add_qt_dep qtwidgets)
8655 "
8656
8657 RDEPEND="${DEPEND}"
8658
8659 diff --git a/kde-apps/libkomparediff2/libkomparediff2-15.12.1.ebuild b/kde-apps/libkomparediff2/libkomparediff2-15.12.1.ebuild
8660 index 6cbddc8..307ca4e 100644
8661 --- a/kde-apps/libkomparediff2/libkomparediff2-15.12.1.ebuild
8662 +++ b/kde-apps/libkomparediff2/libkomparediff2-15.12.1.ebuild
8663 @@ -19,7 +19,7 @@ DEPEND="
8664 $(add_frameworks_dep ki18n)
8665 $(add_frameworks_dep kio)
8666 $(add_frameworks_dep kxmlgui)
8667 - dev-qt/qtgui:5
8668 - dev-qt/qtwidgets:5
8669 + $(add_qt_dep qtgui)
8670 + $(add_qt_dep qtwidgets)
8671 "
8672 RDEPEND="${DEPEND}"
8673
8674 diff --git a/kde-apps/libkomparediff2/libkomparediff2-15.12.49.9999.ebuild b/kde-apps/libkomparediff2/libkomparediff2-15.12.49.9999.ebuild
8675 index 3024245..65ab71e 100644
8676 --- a/kde-apps/libkomparediff2/libkomparediff2-15.12.49.9999.ebuild
8677 +++ b/kde-apps/libkomparediff2/libkomparediff2-15.12.49.9999.ebuild
8678 @@ -19,7 +19,7 @@ DEPEND="
8679 $(add_frameworks_dep ki18n)
8680 $(add_frameworks_dep kio)
8681 $(add_frameworks_dep kxmlgui)
8682 - dev-qt/qtgui:5
8683 - dev-qt/qtwidgets:5
8684 + $(add_qt_dep qtgui)
8685 + $(add_qt_dep qtwidgets)
8686 "
8687 RDEPEND="${DEPEND}"
8688
8689 diff --git a/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild b/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
8690 index 3024245..65ab71e 100644
8691 --- a/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
8692 +++ b/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
8693 @@ -19,7 +19,7 @@ DEPEND="
8694 $(add_frameworks_dep ki18n)
8695 $(add_frameworks_dep kio)
8696 $(add_frameworks_dep kxmlgui)
8697 - dev-qt/qtgui:5
8698 - dev-qt/qtwidgets:5
8699 + $(add_qt_dep qtgui)
8700 + $(add_qt_dep qtwidgets)
8701 "
8702 RDEPEND="${DEPEND}"
8703
8704 diff --git a/kde-apps/libkonq/libkonq-5.9999.ebuild b/kde-apps/libkonq/libkonq-5.9999.ebuild
8705 index 0c01201..97f9aa5 100644
8706 --- a/kde-apps/libkonq/libkonq-5.9999.ebuild
8707 +++ b/kde-apps/libkonq/libkonq-5.9999.ebuild
8708 @@ -29,10 +29,10 @@ DEPEND="
8709 $(add_frameworks_dep kservice)
8710 $(add_frameworks_dep kwidgetsaddons)
8711 $(add_frameworks_dep kxmlgui)
8712 - dev-qt/qtdbus:5
8713 - dev-qt/qtgui:5
8714 - dev-qt/qtwidgets:5
8715 - dev-qt/qtxml:5
8716 + $(add_qt_dep qtdbus)
8717 + $(add_qt_dep qtgui)
8718 + $(add_qt_dep qtwidgets)
8719 + $(add_qt_dep qtxml)
8720 sys-libs/zlib
8721 "
8722 RDEPEND="${DEPEND}"
8723
8724 diff --git a/kde-apps/libksane/libksane-15.12.1.ebuild b/kde-apps/libksane/libksane-15.12.1.ebuild
8725 index ee8ae6f..35bf934 100644
8726 --- a/kde-apps/libksane/libksane-15.12.1.ebuild
8727 +++ b/kde-apps/libksane/libksane-15.12.1.ebuild
8728 @@ -18,8 +18,8 @@ DEPEND="
8729 $(add_frameworks_dep ktextwidgets)
8730 $(add_frameworks_dep kwallet)
8731 $(add_frameworks_dep kwidgetsaddons)
8732 - dev-qt/qtgui:5
8733 - dev-qt/qtwidgets:5
8734 + $(add_qt_dep qtgui)
8735 + $(add_qt_dep qtwidgets)
8736 media-gfx/sane-backends
8737 "
8738 RDEPEND="${DEPEND}"
8739
8740 diff --git a/kde-apps/libksane/libksane-15.12.49.9999.ebuild b/kde-apps/libksane/libksane-15.12.49.9999.ebuild
8741 index e6e2b3d..becd76d 100644
8742 --- a/kde-apps/libksane/libksane-15.12.49.9999.ebuild
8743 +++ b/kde-apps/libksane/libksane-15.12.49.9999.ebuild
8744 @@ -18,8 +18,8 @@ DEPEND="
8745 $(add_frameworks_dep ktextwidgets)
8746 $(add_frameworks_dep kwallet)
8747 $(add_frameworks_dep kwidgetsaddons)
8748 - dev-qt/qtgui:5
8749 - dev-qt/qtwidgets:5
8750 + $(add_qt_dep qtgui)
8751 + $(add_qt_dep qtwidgets)
8752 media-gfx/sane-backends
8753 "
8754 RDEPEND="${DEPEND}"
8755
8756 diff --git a/kde-apps/libksane/libksane-9999.ebuild b/kde-apps/libksane/libksane-9999.ebuild
8757 index dcb55b6..56d55d9 100644
8758 --- a/kde-apps/libksane/libksane-9999.ebuild
8759 +++ b/kde-apps/libksane/libksane-9999.ebuild
8760 @@ -17,8 +17,8 @@ DEPEND="
8761 $(add_frameworks_dep ktextwidgets)
8762 $(add_frameworks_dep kwallet)
8763 $(add_frameworks_dep kwidgetsaddons)
8764 - dev-qt/qtgui:5
8765 - dev-qt/qtwidgets:5
8766 + $(add_qt_dep qtgui)
8767 + $(add_qt_dep qtwidgets)
8768 media-gfx/sane-backends
8769 "
8770 RDEPEND="${DEPEND}"
8771
8772 diff --git a/kde-apps/libksieve/libksieve-15.12.1.ebuild b/kde-apps/libksieve/libksieve-15.12.1.ebuild
8773 index 6fb2592..a3c3c84 100644
8774 --- a/kde-apps/libksieve/libksieve-15.12.1.ebuild
8775 +++ b/kde-apps/libksieve/libksieve-15.12.1.ebuild
8776 @@ -25,11 +25,11 @@ COMMON_DEPEND="
8777 $(add_kdeapps_dep kpimtextedit)
8778 $(add_kdeapps_dep libkdepim)
8779 $(add_kdeapps_dep pimcommon)
8780 - dev-qt/designer:5
8781 - dev-qt/qtgui:5
8782 - dev-qt/qtwebkit:5
8783 - dev-qt/qtwidgets:5
8784 - dev-qt/qtxml:5
8785 + $(add_qt_dep designer)
8786 + $(add_qt_dep qtgui)
8787 + $(add_qt_dep qtwebkit)
8788 + $(add_qt_dep qtwidgets)
8789 + $(add_qt_dep qtxml)
8790 "
8791 DEPEND="${COMMON_DEPEND}
8792 sys-devel/gettext
8793
8794 diff --git a/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild b/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild
8795 index 1047563..cb3f4de 100644
8796 --- a/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild
8797 +++ b/kde-apps/libksieve/libksieve-15.12.49.9999.ebuild
8798 @@ -25,11 +25,11 @@ COMMON_DEPEND="
8799 $(add_kdeapps_dep kpimtextedit)
8800 $(add_kdeapps_dep libkdepim)
8801 $(add_kdeapps_dep pimcommon)
8802 - dev-qt/designer:5
8803 - dev-qt/qtgui:5
8804 - dev-qt/qtwebkit:5
8805 - dev-qt/qtwidgets:5
8806 - dev-qt/qtxml:5
8807 + $(add_qt_dep designer)
8808 + $(add_qt_dep qtgui)
8809 + $(add_qt_dep qtwebkit)
8810 + $(add_qt_dep qtwidgets)
8811 + $(add_qt_dep qtxml)
8812 "
8813 DEPEND="${COMMON_DEPEND}
8814 sys-devel/gettext
8815
8816 diff --git a/kde-apps/libksieve/libksieve-9999.ebuild b/kde-apps/libksieve/libksieve-9999.ebuild
8817 index 8e27ba4..1a49c4f 100644
8818 --- a/kde-apps/libksieve/libksieve-9999.ebuild
8819 +++ b/kde-apps/libksieve/libksieve-9999.ebuild
8820 @@ -24,11 +24,11 @@ COMMON_DEPEND="
8821 $(add_kdeapps_dep kpimtextedit)
8822 $(add_kdeapps_dep libkdepim)
8823 $(add_kdeapps_dep pimcommon)
8824 - dev-qt/designer:5
8825 - dev-qt/qtgui:5
8826 - dev-qt/qtwebkit:5
8827 - dev-qt/qtwidgets:5
8828 - dev-qt/qtxml:5
8829 + $(add_qt_dep designer)
8830 + $(add_qt_dep qtgui)
8831 + $(add_qt_dep qtwebkit)
8832 + $(add_qt_dep qtwidgets)
8833 + $(add_qt_dep qtxml)
8834 "
8835 DEPEND="${COMMON_DEPEND}
8836 sys-devel/gettext
8837
8838 diff --git a/kde-apps/libsendlater/libsendlater-15.12.1.ebuild b/kde-apps/libsendlater/libsendlater-15.12.1.ebuild
8839 index fc74d02..52b02ff 100644
8840 --- a/kde-apps/libsendlater/libsendlater-15.12.1.ebuild
8841 +++ b/kde-apps/libsendlater/libsendlater-15.12.1.ebuild
8842 @@ -18,10 +18,10 @@ COMMON_DEPEND="
8843 $(add_frameworks_dep ki18n)
8844 $(add_frameworks_dep kwidgetsaddons)
8845 $(add_kdeapps_dep libakonadi)
8846 - dev-qt/designer:5
8847 - dev-qt/qtdbus:5
8848 - dev-qt/qtgui:5
8849 - dev-qt/qtwidgets:5
8850 + $(add_qt_dep designer)
8851 + $(add_qt_dep qtdbus)
8852 + $(add_qt_dep qtgui)
8853 + $(add_qt_dep qtwidgets)
8854 "
8855 DEPEND="${COMMON_DEPEND}
8856 sys-devel/gettext
8857
8858 diff --git a/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild b/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild
8859 index c7149ce..2caa0c7 100644
8860 --- a/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild
8861 +++ b/kde-apps/libsendlater/libsendlater-15.12.49.9999.ebuild
8862 @@ -18,10 +18,10 @@ COMMON_DEPEND="
8863 $(add_frameworks_dep ki18n)
8864 $(add_frameworks_dep kwidgetsaddons)
8865 $(add_kdeapps_dep libakonadi)
8866 - dev-qt/designer:5
8867 - dev-qt/qtdbus:5
8868 - dev-qt/qtgui:5
8869 - dev-qt/qtwidgets:5
8870 + $(add_qt_dep designer)
8871 + $(add_qt_dep qtdbus)
8872 + $(add_qt_dep qtgui)
8873 + $(add_qt_dep qtwidgets)
8874 "
8875 DEPEND="${COMMON_DEPEND}
8876 sys-devel/gettext
8877
8878 diff --git a/kde-apps/lokalize/lokalize-15.12.1.ebuild b/kde-apps/lokalize/lokalize-15.12.1.ebuild
8879 index 8b174e8..94a1a74 100644
8880 --- a/kde-apps/lokalize/lokalize-15.12.1.ebuild
8881 +++ b/kde-apps/lokalize/lokalize-15.12.1.ebuild
8882 @@ -6,7 +6,6 @@ EAPI=5
8883
8884 KDE_HANDBOOK="forceoptional"
8885 PYTHON_COMPAT=( python2_7 )
8886 -QT_MINIMAL="5.5"
8887 inherit python-single-r1 kde5
8888
8889 DESCRIPTION="KDE Applications 5 translation tool"
8890 @@ -34,13 +33,13 @@ DEPEND="${PYTHON_DEPS}
8891 $(add_frameworks_dep kwidgetsaddons)
8892 $(add_frameworks_dep kxmlgui)
8893 $(add_frameworks_dep sonnet)
8894 + $(add_qt_dep qtdbus)
8895 + $(add_qt_dep qtgui)
8896 + $(add_qt_dep qtscript)
8897 + $(add_qt_dep qtsql 'sqlite')
8898 + $(add_qt_dep qtwidgets)
8899 + $(add_qt_dep qtxml)
8900 >=app-text/hunspell-1.2.8
8901 - dev-qt/qtdbus:5
8902 - dev-qt/qtgui:5
8903 - dev-qt/qtscript:5
8904 - dev-qt/qtsql:5[sqlite]
8905 - dev-qt/qtwidgets:5
8906 - dev-qt/qtxml:5
8907 "
8908 RDEPEND="${DEPEND}
8909 dev-python/translate-toolkit[${PYTHON_USEDEP}]
8910
8911 diff --git a/kde-apps/lokalize/lokalize-15.12.49.9999.ebuild b/kde-apps/lokalize/lokalize-15.12.49.9999.ebuild
8912 index 21a626b..7df1479 100644
8913 --- a/kde-apps/lokalize/lokalize-15.12.49.9999.ebuild
8914 +++ b/kde-apps/lokalize/lokalize-15.12.49.9999.ebuild
8915 @@ -6,7 +6,6 @@ EAPI=5
8916
8917 KDE_HANDBOOK="forceoptional"
8918 PYTHON_COMPAT=( python2_7 )
8919 -QT_MINIMAL="5.5"
8920 inherit python-single-r1 kde5
8921
8922 DESCRIPTION="KDE Applications 5 translation tool"
8923 @@ -34,13 +33,13 @@ DEPEND="${PYTHON_DEPS}
8924 $(add_frameworks_dep kwidgetsaddons)
8925 $(add_frameworks_dep kxmlgui)
8926 $(add_frameworks_dep sonnet)
8927 + $(add_qt_dep qtdbus)
8928 + $(add_qt_dep qtgui)
8929 + $(add_qt_dep qtscript)
8930 + $(add_qt_dep qtsql 'sqlite')
8931 + $(add_qt_dep qtwidgets)
8932 + $(add_qt_dep qtxml)
8933 >=app-text/hunspell-1.2.8
8934 - dev-qt/qtdbus:5
8935 - dev-qt/qtgui:5
8936 - dev-qt/qtscript:5
8937 - dev-qt/qtsql:5[sqlite]
8938 - dev-qt/qtwidgets:5
8939 - dev-qt/qtxml:5
8940 "
8941 RDEPEND="${DEPEND}
8942 dev-python/translate-toolkit[${PYTHON_USEDEP}]
8943
8944 diff --git a/kde-apps/lokalize/lokalize-9999.ebuild b/kde-apps/lokalize/lokalize-9999.ebuild
8945 index 21a626b..7df1479 100644
8946 --- a/kde-apps/lokalize/lokalize-9999.ebuild
8947 +++ b/kde-apps/lokalize/lokalize-9999.ebuild
8948 @@ -6,7 +6,6 @@ EAPI=5
8949
8950 KDE_HANDBOOK="forceoptional"
8951 PYTHON_COMPAT=( python2_7 )
8952 -QT_MINIMAL="5.5"
8953 inherit python-single-r1 kde5
8954
8955 DESCRIPTION="KDE Applications 5 translation tool"
8956 @@ -34,13 +33,13 @@ DEPEND="${PYTHON_DEPS}
8957 $(add_frameworks_dep kwidgetsaddons)
8958 $(add_frameworks_dep kxmlgui)
8959 $(add_frameworks_dep sonnet)
8960 + $(add_qt_dep qtdbus)
8961 + $(add_qt_dep qtgui)
8962 + $(add_qt_dep qtscript)
8963 + $(add_qt_dep qtsql 'sqlite')
8964 + $(add_qt_dep qtwidgets)
8965 + $(add_qt_dep qtxml)
8966 >=app-text/hunspell-1.2.8
8967 - dev-qt/qtdbus:5
8968 - dev-qt/qtgui:5
8969 - dev-qt/qtscript:5
8970 - dev-qt/qtsql:5[sqlite]
8971 - dev-qt/qtwidgets:5
8972 - dev-qt/qtxml:5
8973 "
8974 RDEPEND="${DEPEND}
8975 dev-python/translate-toolkit[${PYTHON_USEDEP}]
8976
8977 diff --git a/kde-apps/lskat/lskat-5.9999.ebuild b/kde-apps/lskat/lskat-5.9999.ebuild
8978 index 241e1c9..b163215 100644
8979 --- a/kde-apps/lskat/lskat-5.9999.ebuild
8980 +++ b/kde-apps/lskat/lskat-5.9999.ebuild
8981 @@ -26,9 +26,9 @@ DEPEND="
8982 $(add_frameworks_dep kwidgetsaddons)
8983 $(add_frameworks_dep kxmlgui)
8984 $(add_kdeapps_dep libkdegames)
8985 - dev-qt/qtgui:5
8986 - dev-qt/qtsvg:5
8987 - dev-qt/qtwidgets:5
8988 + $(add_qt_dep qtgui)
8989 + $(add_qt_dep qtsvg)
8990 + $(add_qt_dep qtwidgets)
8991 "
8992
8993 RDEPEND="${DEPEND}"
8994
8995 diff --git a/kde-apps/mailcommon/mailcommon-15.12.1.ebuild b/kde-apps/mailcommon/mailcommon-15.12.1.ebuild
8996 index e2832af..3c1e538 100644
8997 --- a/kde-apps/mailcommon/mailcommon-15.12.1.ebuild
8998 +++ b/kde-apps/mailcommon/mailcommon-15.12.1.ebuild
8999 @@ -37,13 +37,13 @@ COMMON_DEPEND="
9000 $(add_kdeapps_dep pimcommon)
9001 $(add_kdeapps_dep templateparser)
9002 dev-libs/libxslt
9003 - dev-qt/qtgui:5
9004 - dev-qt/qtwidgets:5
9005 + $(add_qt_dep qtgui)
9006 + $(add_qt_dep qtwidgets)
9007 media-libs/phonon[qt5]
9008 "
9009 DEPEND="${COMMON_DEPEND}
9010 sys-devel/gettext
9011 - designer? ( dev-qt/designer:5 )
9012 + designer? ( $(add_qt_dep designer) )
9013 "
9014 RDEPEND="${COMMON_DEPEND}
9015 !<kde-apps/kdepim-15.08.50:5
9016
9017 diff --git a/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild b/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild
9018 index 6307d8b..f4115e9 100644
9019 --- a/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild
9020 +++ b/kde-apps/mailcommon/mailcommon-15.12.49.9999.ebuild
9021 @@ -37,13 +37,13 @@ COMMON_DEPEND="
9022 $(add_kdeapps_dep pimcommon)
9023 $(add_kdeapps_dep templateparser)
9024 dev-libs/libxslt
9025 - dev-qt/qtgui:5
9026 - dev-qt/qtwidgets:5
9027 + $(add_qt_dep qtgui)
9028 + $(add_qt_dep qtwidgets)
9029 media-libs/phonon[qt5]
9030 "
9031 DEPEND="${COMMON_DEPEND}
9032 sys-devel/gettext
9033 - designer? ( dev-qt/designer:5 )
9034 + designer? ( $(add_qt_dep designer) )
9035 "
9036 RDEPEND="${COMMON_DEPEND}
9037 !<kde-apps/kdepim-15.08.50:5
9038
9039 diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild b/kde-apps/mailcommon/mailcommon-9999.ebuild
9040 index f5d1ecc..f110ff1 100644
9041 --- a/kde-apps/mailcommon/mailcommon-9999.ebuild
9042 +++ b/kde-apps/mailcommon/mailcommon-9999.ebuild
9043 @@ -33,13 +33,13 @@ COMMON_DEPEND="
9044 $(add_kdeapps_dep messagelib)
9045 $(add_kdeapps_dep pimcommon)
9046 dev-libs/libxslt
9047 - dev-qt/qtgui:5
9048 - dev-qt/qtwidgets:5
9049 + $(add_qt_dep qtgui)
9050 + $(add_qt_dep qtwidgets)
9051 media-libs/phonon[qt5]
9052 "
9053 DEPEND="${COMMON_DEPEND}
9054 sys-devel/gettext
9055 - designer? ( dev-qt/designer:5 )
9056 + designer? ( $(add_qt_dep designer) )
9057 "
9058 RDEPEND="${COMMON_DEPEND}
9059 !<kde-apps/kdepim-15.08.50:5
9060
9061 diff --git a/kde-apps/mailimporter/mailimporter-15.12.1.ebuild b/kde-apps/mailimporter/mailimporter-15.12.1.ebuild
9062 index b7a0a74..f865bf4 100644
9063 --- a/kde-apps/mailimporter/mailimporter-15.12.1.ebuild
9064 +++ b/kde-apps/mailimporter/mailimporter-15.12.1.ebuild
9065 @@ -23,10 +23,10 @@ COMMON_DEPEND="
9066 $(add_kdeapps_dep kmime)
9067 $(add_kdeapps_dep libakonadi)
9068 $(add_kdeapps_dep libkdepim)
9069 - dev-qt/designer:5
9070 - dev-qt/qtgui:5
9071 - dev-qt/qtwidgets:5
9072 - dev-qt/qtxml:5
9073 + $(add_qt_dep designer)
9074 + $(add_qt_dep qtgui)
9075 + $(add_qt_dep qtwidgets)
9076 + $(add_qt_dep qtxml)
9077 "
9078 DEPEND="${COMMON_DEPEND}
9079 sys-devel/gettext
9080
9081 diff --git a/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild b/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild
9082 index aaec4fd..7faabc1 100644
9083 --- a/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild
9084 +++ b/kde-apps/mailimporter/mailimporter-15.12.49.9999.ebuild
9085 @@ -23,10 +23,10 @@ COMMON_DEPEND="
9086 $(add_kdeapps_dep kmime)
9087 $(add_kdeapps_dep libakonadi)
9088 $(add_kdeapps_dep libkdepim)
9089 - dev-qt/designer:5
9090 - dev-qt/qtgui:5
9091 - dev-qt/qtwidgets:5
9092 - dev-qt/qtxml:5
9093 + $(add_qt_dep designer)
9094 + $(add_qt_dep qtgui)
9095 + $(add_qt_dep qtwidgets)
9096 + $(add_qt_dep qtxml)
9097 "
9098 DEPEND="${COMMON_DEPEND}
9099 sys-devel/gettext
9100
9101 diff --git a/kde-apps/mailimporter/mailimporter-9999.ebuild b/kde-apps/mailimporter/mailimporter-9999.ebuild
9102 index 4c5f74b..809f4d8 100644
9103 --- a/kde-apps/mailimporter/mailimporter-9999.ebuild
9104 +++ b/kde-apps/mailimporter/mailimporter-9999.ebuild
9105 @@ -22,10 +22,10 @@ COMMON_DEPEND="
9106 $(add_kdeapps_dep akonadi-mime)
9107 $(add_kdeapps_dep kmime)
9108 $(add_kdeapps_dep libkdepim)
9109 - dev-qt/designer:5
9110 - dev-qt/qtgui:5
9111 - dev-qt/qtwidgets:5
9112 - dev-qt/qtxml:5
9113 + $(add_qt_dep designer)
9114 + $(add_qt_dep qtgui)
9115 + $(add_qt_dep qtwidgets)
9116 + $(add_qt_dep qtxml)
9117 "
9118 DEPEND="${COMMON_DEPEND}
9119 sys-devel/gettext
9120
9121 diff --git a/kde-apps/marble/marble-15.08.3.ebuild b/kde-apps/marble/marble-15.08.3.ebuild
9122 index ee19245..a7e3c2c 100644
9123 --- a/kde-apps/marble/marble-15.08.3.ebuild
9124 +++ b/kde-apps/marble/marble-15.08.3.ebuild
9125 @@ -18,19 +18,19 @@ IUSE="aprs designer-plugin gps +kde phonon shapefile zip"
9126 # libwlocate, WLAN-based geolocation
9127 # qextserialport, interface to old fashioned serial ports
9128 RDEPEND="
9129 - dev-qt/qtconcurrent:5
9130 - dev-qt/qtdbus:5
9131 - dev-qt/qtdeclarative:5
9132 - dev-qt/qtgui:5
9133 - dev-qt/qtnetwork:5
9134 - dev-qt/qtopengl:5
9135 - dev-qt/qtprintsupport:5
9136 - dev-qt/qtscript:5
9137 - dev-qt/qtsql:5
9138 - dev-qt/qtsvg:5
9139 - dev-qt/qtwebkit:5
9140 - dev-qt/qtwidgets:5
9141 - dev-qt/qtxml:5
9142 + $(add_qt_dep qtconcurrent)
9143 + $(add_qt_dep qtdbus)
9144 + $(add_qt_dep qtdeclarative)
9145 + $(add_qt_dep qtgui)
9146 + $(add_qt_dep qtnetwork)
9147 + $(add_qt_dep qtopengl)
9148 + $(add_qt_dep qtprintsupport)
9149 + $(add_qt_dep qtscript)
9150 + $(add_qt_dep qtsql)
9151 + $(add_qt_dep qtsvg)
9152 + $(add_qt_dep qtwebkit)
9153 + $(add_qt_dep qtwidgets)
9154 + $(add_qt_dep qtxml)
9155 gps? ( >=sci-geosciences/gpsd-2.95 )
9156 kde? (
9157 $(add_frameworks_dep kconfig)
9158
9159 diff --git a/kde-apps/marble/marble-15.12.1.ebuild b/kde-apps/marble/marble-15.12.1.ebuild
9160 index c4a64cf..fad2929 100644
9161 --- a/kde-apps/marble/marble-15.12.1.ebuild
9162 +++ b/kde-apps/marble/marble-15.12.1.ebuild
9163 @@ -18,19 +18,19 @@ IUSE="aprs designer-plugin gps +kde phonon shapefile zip"
9164 # libwlocate, WLAN-based geolocation
9165 # qextserialport, interface to old fashioned serial ports
9166 RDEPEND="
9167 - dev-qt/qtconcurrent:5
9168 - dev-qt/qtdbus:5
9169 - dev-qt/qtdeclarative:5
9170 - dev-qt/qtgui:5
9171 - dev-qt/qtnetwork:5
9172 - dev-qt/qtopengl:5
9173 - dev-qt/qtprintsupport:5
9174 - dev-qt/qtscript:5
9175 - dev-qt/qtsql:5
9176 - dev-qt/qtsvg:5
9177 - dev-qt/qtwebkit:5
9178 - dev-qt/qtwidgets:5
9179 - dev-qt/qtxml:5
9180 + $(add_qt_dep qtconcurrent)
9181 + $(add_qt_dep qtdbus)
9182 + $(add_qt_dep qtdeclarative)
9183 + $(add_qt_dep qtgui)
9184 + $(add_qt_dep qtnetwork)
9185 + $(add_qt_dep qtopengl)
9186 + $(add_qt_dep qtprintsupport)
9187 + $(add_qt_dep qtscript)
9188 + $(add_qt_dep qtsql)
9189 + $(add_qt_dep qtsvg)
9190 + $(add_qt_dep qtwebkit)
9191 + $(add_qt_dep qtwidgets)
9192 + $(add_qt_dep qtxml)
9193 gps? ( >=sci-geosciences/gpsd-2.95 )
9194 kde? (
9195 $(add_frameworks_dep kconfig)
9196
9197 diff --git a/kde-apps/marble/marble-15.12.49.9999.ebuild b/kde-apps/marble/marble-15.12.49.9999.ebuild
9198 index 135e27b..9317e5f 100644
9199 --- a/kde-apps/marble/marble-15.12.49.9999.ebuild
9200 +++ b/kde-apps/marble/marble-15.12.49.9999.ebuild
9201 @@ -18,19 +18,19 @@ IUSE="aprs designer-plugin gps +kde phonon shapefile zip"
9202 # libwlocate, WLAN-based geolocation
9203 # qextserialport, interface to old fashioned serial ports
9204 RDEPEND="
9205 - dev-qt/qtconcurrent:5
9206 - dev-qt/qtdbus:5
9207 - dev-qt/qtdeclarative:5
9208 - dev-qt/qtgui:5
9209 - dev-qt/qtnetwork:5
9210 - dev-qt/qtopengl:5
9211 - dev-qt/qtprintsupport:5
9212 - dev-qt/qtscript:5
9213 - dev-qt/qtsql:5
9214 - dev-qt/qtsvg:5
9215 - dev-qt/qtwebkit:5
9216 - dev-qt/qtwidgets:5
9217 - dev-qt/qtxml:5
9218 + $(add_qt_dep qtconcurrent)
9219 + $(add_qt_dep qtdbus)
9220 + $(add_qt_dep qtdeclarative)
9221 + $(add_qt_dep qtgui)
9222 + $(add_qt_dep qtnetwork)
9223 + $(add_qt_dep qtopengl)
9224 + $(add_qt_dep qtprintsupport)
9225 + $(add_qt_dep qtscript)
9226 + $(add_qt_dep qtsql)
9227 + $(add_qt_dep qtsvg)
9228 + $(add_qt_dep qtwebkit)
9229 + $(add_qt_dep qtwidgets)
9230 + $(add_qt_dep qtxml)
9231 gps? ( >=sci-geosciences/gpsd-2.95 )
9232 kde? (
9233 $(add_frameworks_dep kconfig)
9234
9235 diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild
9236 index 135e27b..9317e5f 100644
9237 --- a/kde-apps/marble/marble-9999.ebuild
9238 +++ b/kde-apps/marble/marble-9999.ebuild
9239 @@ -18,19 +18,19 @@ IUSE="aprs designer-plugin gps +kde phonon shapefile zip"
9240 # libwlocate, WLAN-based geolocation
9241 # qextserialport, interface to old fashioned serial ports
9242 RDEPEND="
9243 - dev-qt/qtconcurrent:5
9244 - dev-qt/qtdbus:5
9245 - dev-qt/qtdeclarative:5
9246 - dev-qt/qtgui:5
9247 - dev-qt/qtnetwork:5
9248 - dev-qt/qtopengl:5
9249 - dev-qt/qtprintsupport:5
9250 - dev-qt/qtscript:5
9251 - dev-qt/qtsql:5
9252 - dev-qt/qtsvg:5
9253 - dev-qt/qtwebkit:5
9254 - dev-qt/qtwidgets:5
9255 - dev-qt/qtxml:5
9256 + $(add_qt_dep qtconcurrent)
9257 + $(add_qt_dep qtdbus)
9258 + $(add_qt_dep qtdeclarative)
9259 + $(add_qt_dep qtgui)
9260 + $(add_qt_dep qtnetwork)
9261 + $(add_qt_dep qtopengl)
9262 + $(add_qt_dep qtprintsupport)
9263 + $(add_qt_dep qtscript)
9264 + $(add_qt_dep qtsql)
9265 + $(add_qt_dep qtsvg)
9266 + $(add_qt_dep qtwebkit)
9267 + $(add_qt_dep qtwidgets)
9268 + $(add_qt_dep qtxml)
9269 gps? ( >=sci-geosciences/gpsd-2.95 )
9270 kde? (
9271 $(add_frameworks_dep kconfig)
9272
9273 diff --git a/kde-apps/messagecomposer/messagecomposer-15.12.1.ebuild b/kde-apps/messagecomposer/messagecomposer-15.12.1.ebuild
9274 index c5f0abc..18c19fb 100644
9275 --- a/kde-apps/messagecomposer/messagecomposer-15.12.1.ebuild
9276 +++ b/kde-apps/messagecomposer/messagecomposer-15.12.1.ebuild
9277 @@ -32,10 +32,10 @@ COMMON_DEPEND="
9278 $(add_kdeapps_dep pimcommon)
9279 $(add_kdeapps_dep templateparser)
9280 dev-libs/grantlee:5
9281 - dev-qt/designer:5
9282 - dev-qt/qtgui:5
9283 - dev-qt/qtwebkit:5
9284 - dev-qt/qtwidgets:5
9285 + $(add_qt_dep designer)
9286 + $(add_qt_dep qtgui)
9287 + $(add_qt_dep qtwebkit)
9288 + $(add_qt_dep qtwidgets)
9289 "
9290 DEPEND="${COMMON_DEPEND}
9291 sys-devel/gettext
9292
9293 diff --git a/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild b/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild
9294 index 1400096..b3ab95c 100644
9295 --- a/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild
9296 +++ b/kde-apps/messagecomposer/messagecomposer-15.12.49.9999.ebuild
9297 @@ -32,10 +32,10 @@ COMMON_DEPEND="
9298 $(add_kdeapps_dep pimcommon)
9299 $(add_kdeapps_dep templateparser)
9300 dev-libs/grantlee:5
9301 - dev-qt/designer:5
9302 - dev-qt/qtgui:5
9303 - dev-qt/qtwebkit:5
9304 - dev-qt/qtwidgets:5
9305 + $(add_qt_dep designer)
9306 + $(add_qt_dep qtgui)
9307 + $(add_qt_dep qtwebkit)
9308 + $(add_qt_dep qtwidgets)
9309 "
9310 DEPEND="${COMMON_DEPEND}
9311 sys-devel/gettext
9312
9313 diff --git a/kde-apps/messagecore/messagecore-15.12.1.ebuild b/kde-apps/messagecore/messagecore-15.12.1.ebuild
9314 index 10437d7..99d775a 100644
9315 --- a/kde-apps/messagecore/messagecore-15.12.1.ebuild
9316 +++ b/kde-apps/messagecore/messagecore-15.12.1.ebuild
9317 @@ -25,10 +25,10 @@ COMMON_DEPEND="
9318 $(add_kdeapps_dep kpimtextedit)
9319 $(add_kdeapps_dep libakonadi)
9320 $(add_kdeapps_dep libkleo)
9321 - dev-qt/designer:5
9322 - dev-qt/qtgui:5
9323 - dev-qt/qtnetwork:5
9324 - dev-qt/qtwidgets:5
9325 + $(add_qt_dep designer)
9326 + $(add_qt_dep qtgui)
9327 + $(add_qt_dep qtnetwork)
9328 + $(add_qt_dep qtwidgets)
9329 "
9330 DEPEND="${COMMON_DEPEND}
9331 sys-devel/gettext
9332
9333 diff --git a/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild b/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild
9334 index 44775d4..ba4f9a0 100644
9335 --- a/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild
9336 +++ b/kde-apps/messagecore/messagecore-15.12.49.9999.ebuild
9337 @@ -25,10 +25,10 @@ COMMON_DEPEND="
9338 $(add_kdeapps_dep kpimtextedit)
9339 $(add_kdeapps_dep libakonadi)
9340 $(add_kdeapps_dep libkleo)
9341 - dev-qt/designer:5
9342 - dev-qt/qtgui:5
9343 - dev-qt/qtnetwork:5
9344 - dev-qt/qtwidgets:5
9345 + $(add_qt_dep designer)
9346 + $(add_qt_dep qtgui)
9347 + $(add_qt_dep qtnetwork)
9348 + $(add_qt_dep qtwidgets)
9349 "
9350 DEPEND="${COMMON_DEPEND}
9351 sys-devel/gettext
9352
9353 diff --git a/kde-apps/messagelib/messagelib-9999.ebuild b/kde-apps/messagelib/messagelib-9999.ebuild
9354 index 379c4f6..e3510ac 100644
9355 --- a/kde-apps/messagelib/messagelib-9999.ebuild
9356 +++ b/kde-apps/messagelib/messagelib-9999.ebuild
9357 @@ -56,12 +56,12 @@ COMMON_DEPEND="
9358 $(add_kdeapps_dep libkleo)
9359 $(add_kdeapps_dep pimcommon)
9360 dev-libs/grantlee:5
9361 - dev-qt/designer:5
9362 - dev-qt/qtgui:5
9363 - dev-qt/qtnetwork:5
9364 - dev-qt/qtprintsupport:5
9365 - dev-qt/qtwebkit:5
9366 - dev-qt/qtwidgets:5
9367 + $(add_qt_dep designer)
9368 + $(add_qt_dep qtgui)
9369 + $(add_qt_dep qtnetwork)
9370 + $(add_qt_dep qtprintsupport)
9371 + $(add_qt_dep qtwebkit)
9372 + $(add_qt_dep qtwidgets)
9373 "
9374 DEPEND="${COMMON_DEPEND}
9375 sys-devel/gettext
9376
9377 diff --git a/kde-apps/messagelist/messagelist-15.12.1.ebuild b/kde-apps/messagelist/messagelist-15.12.1.ebuild
9378 index 0049867..98b8010 100644
9379 --- a/kde-apps/messagelist/messagelist-15.12.1.ebuild
9380 +++ b/kde-apps/messagelist/messagelist-15.12.1.ebuild
9381 @@ -30,9 +30,9 @@ COMMON_DEPEND="
9382 $(add_kdeapps_dep libakonadi)
9383 $(add_kdeapps_dep messagecore)
9384 $(add_kdeapps_dep pimcommon)
9385 - dev-qt/designer:5
9386 - dev-qt/qtgui:5
9387 - dev-qt/qtwidgets:5
9388 + $(add_qt_dep designer)
9389 + $(add_qt_dep qtgui)
9390 + $(add_qt_dep qtwidgets)
9391 "
9392 DEPEND="${COMMON_DEPEND}
9393 sys-devel/gettext
9394
9395 diff --git a/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild b/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild
9396 index 9508387..58210e7 100644
9397 --- a/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild
9398 +++ b/kde-apps/messagelist/messagelist-15.12.49.9999.ebuild
9399 @@ -30,9 +30,9 @@ COMMON_DEPEND="
9400 $(add_kdeapps_dep libakonadi)
9401 $(add_kdeapps_dep messagecore)
9402 $(add_kdeapps_dep pimcommon)
9403 - dev-qt/designer:5
9404 - dev-qt/qtgui:5
9405 - dev-qt/qtwidgets:5
9406 + $(add_qt_dep designer)
9407 + $(add_qt_dep qtgui)
9408 + $(add_qt_dep qtwidgets)
9409 "
9410 DEPEND="${COMMON_DEPEND}
9411 sys-devel/gettext
9412
9413 diff --git a/kde-apps/messageviewer/messageviewer-15.12.1.ebuild b/kde-apps/messageviewer/messageviewer-15.12.1.ebuild
9414 index fc1540e..828e62e 100644
9415 --- a/kde-apps/messageviewer/messageviewer-15.12.1.ebuild
9416 +++ b/kde-apps/messageviewer/messageviewer-15.12.1.ebuild
9417 @@ -52,12 +52,12 @@ COMMON_DEPEND="
9418 $(add_kdeapps_dep messagecore)
9419 $(add_kdeapps_dep pimcommon)
9420 dev-libs/grantlee:5
9421 - dev-qt/designer:5
9422 - dev-qt/qtgui:5
9423 - dev-qt/qtnetwork:5
9424 - dev-qt/qtprintsupport:5
9425 - dev-qt/qtwebkit:5
9426 - dev-qt/qtwidgets:5
9427 + $(add_qt_dep designer)
9428 + $(add_qt_dep qtgui)
9429 + $(add_qt_dep qtnetwork)
9430 + $(add_qt_dep qtprintsupport)
9431 + $(add_qt_dep qtwebkit)
9432 + $(add_qt_dep qtwidgets)
9433 "
9434 DEPEND="${COMMON_DEPEND}
9435 sys-devel/gettext
9436
9437 diff --git a/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild b/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild
9438 index f80795c..d1d1172 100644
9439 --- a/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild
9440 +++ b/kde-apps/messageviewer/messageviewer-15.12.49.9999.ebuild
9441 @@ -52,12 +52,12 @@ COMMON_DEPEND="
9442 $(add_kdeapps_dep messagecore)
9443 $(add_kdeapps_dep pimcommon)
9444 dev-libs/grantlee:5
9445 - dev-qt/designer:5
9446 - dev-qt/qtgui:5
9447 - dev-qt/qtnetwork:5
9448 - dev-qt/qtprintsupport:5
9449 - dev-qt/qtwebkit:5
9450 - dev-qt/qtwidgets:5
9451 + $(add_qt_dep designer)
9452 + $(add_qt_dep qtgui)
9453 + $(add_qt_dep qtnetwork)
9454 + $(add_qt_dep qtprintsupport)
9455 + $(add_qt_dep qtwebkit)
9456 + $(add_qt_dep qtwidgets)
9457 "
9458 DEPEND="${COMMON_DEPEND}
9459 sys-devel/gettext
9460
9461 diff --git a/kde-apps/noteshared/noteshared-15.12.1.ebuild b/kde-apps/noteshared/noteshared-15.12.1.ebuild
9462 index 41917bf..cc99707 100644
9463 --- a/kde-apps/noteshared/noteshared-15.12.1.ebuild
9464 +++ b/kde-apps/noteshared/noteshared-15.12.1.ebuild
9465 @@ -32,11 +32,11 @@ COMMON_DEPEND="
9466 $(add_kdeapps_dep libakonadi)
9467 $(add_kdeapps_dep pimcommon)
9468 dev-libs/libxslt
9469 - dev-qt/designer:5
9470 - dev-qt/qtdbus:5
9471 - dev-qt/qtgui:5
9472 - dev-qt/qtnetwork:5
9473 - dev-qt/qtwidgets:5
9474 + $(add_qt_dep designer)
9475 + $(add_qt_dep qtdbus)
9476 + $(add_qt_dep qtgui)
9477 + $(add_qt_dep qtnetwork)
9478 + $(add_qt_dep qtwidgets)
9479 "
9480 DEPEND="${COMMON_DEPEND}
9481 sys-devel/gettext
9482
9483 diff --git a/kde-apps/noteshared/noteshared-15.12.49.9999.ebuild b/kde-apps/noteshared/noteshared-15.12.49.9999.ebuild
9484 index 0429e15..3095e1b 100644
9485 --- a/kde-apps/noteshared/noteshared-15.12.49.9999.ebuild
9486 +++ b/kde-apps/noteshared/noteshared-15.12.49.9999.ebuild
9487 @@ -32,11 +32,11 @@ COMMON_DEPEND="
9488 $(add_kdeapps_dep libakonadi)
9489 $(add_kdeapps_dep pimcommon)
9490 dev-libs/libxslt
9491 - dev-qt/designer:5
9492 - dev-qt/qtdbus:5
9493 - dev-qt/qtgui:5
9494 - dev-qt/qtnetwork:5
9495 - dev-qt/qtwidgets:5
9496 + $(add_qt_dep designer)
9497 + $(add_qt_dep qtdbus)
9498 + $(add_qt_dep qtgui)
9499 + $(add_qt_dep qtnetwork)
9500 + $(add_qt_dep qtwidgets)
9501 "
9502 DEPEND="${COMMON_DEPEND}
9503 sys-devel/gettext
9504
9505 diff --git a/kde-apps/okteta/okteta-15.12.1.ebuild b/kde-apps/okteta/okteta-15.12.1.ebuild
9506 index 236ccf8..0643af8 100644
9507 --- a/kde-apps/okteta/okteta-15.12.1.ebuild
9508 +++ b/kde-apps/okteta/okteta-15.12.1.ebuild
9509 @@ -29,12 +29,12 @@ DEPEND="
9510 $(add_frameworks_dep kservice)
9511 $(add_frameworks_dep kwidgetsaddons)
9512 $(add_frameworks_dep kxmlgui)
9513 - dev-qt/qtnetwork:5
9514 - dev-qt/designer:5
9515 - dev-qt/qtprintsupport:5
9516 - dev-qt/qtwidgets:5
9517 - dev-qt/qtxml:5
9518 - dev-qt/qtscript:5[scripttools]
9519 + $(add_qt_dep qtnetwork)
9520 + $(add_qt_dep designer)
9521 + $(add_qt_dep qtprintsupport)
9522 + $(add_qt_dep qtwidgets)
9523 + $(add_qt_dep qtxml)
9524 + $(add_qt_dep qtscript 'scripttools')
9525 crypt? ( app-crypt/qca:2[qt5] )
9526 "
9527 RDEPEND="${DEPEND}"
9528
9529 diff --git a/kde-apps/okteta/okteta-15.12.49.9999.ebuild b/kde-apps/okteta/okteta-15.12.49.9999.ebuild
9530 index 97495d4..cff44a8 100644
9531 --- a/kde-apps/okteta/okteta-15.12.49.9999.ebuild
9532 +++ b/kde-apps/okteta/okteta-15.12.49.9999.ebuild
9533 @@ -29,12 +29,12 @@ DEPEND="
9534 $(add_frameworks_dep kservice)
9535 $(add_frameworks_dep kwidgetsaddons)
9536 $(add_frameworks_dep kxmlgui)
9537 - dev-qt/qtnetwork:5
9538 - dev-qt/designer:5
9539 - dev-qt/qtprintsupport:5
9540 - dev-qt/qtwidgets:5
9541 - dev-qt/qtxml:5
9542 - dev-qt/qtscript:5[scripttools]
9543 + $(add_qt_dep qtnetwork)
9544 + $(add_qt_dep designer)
9545 + $(add_qt_dep qtprintsupport)
9546 + $(add_qt_dep qtwidgets)
9547 + $(add_qt_dep qtxml)
9548 + $(add_qt_dep qtscript 'scripttools')
9549 crypt? ( app-crypt/qca:2[qt5] )
9550 "
9551 RDEPEND="${DEPEND}"
9552
9553 diff --git a/kde-apps/okteta/okteta-9999.ebuild b/kde-apps/okteta/okteta-9999.ebuild
9554 index 97495d4..cff44a8 100644
9555 --- a/kde-apps/okteta/okteta-9999.ebuild
9556 +++ b/kde-apps/okteta/okteta-9999.ebuild
9557 @@ -29,12 +29,12 @@ DEPEND="
9558 $(add_frameworks_dep kservice)
9559 $(add_frameworks_dep kwidgetsaddons)
9560 $(add_frameworks_dep kxmlgui)
9561 - dev-qt/qtnetwork:5
9562 - dev-qt/designer:5
9563 - dev-qt/qtprintsupport:5
9564 - dev-qt/qtwidgets:5
9565 - dev-qt/qtxml:5
9566 - dev-qt/qtscript:5[scripttools]
9567 + $(add_qt_dep qtnetwork)
9568 + $(add_qt_dep designer)
9569 + $(add_qt_dep qtprintsupport)
9570 + $(add_qt_dep qtwidgets)
9571 + $(add_qt_dep qtxml)
9572 + $(add_qt_dep qtscript 'scripttools')
9573 crypt? ( app-crypt/qca:2[qt5] )
9574 "
9575 RDEPEND="${DEPEND}"
9576
9577 diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild
9578 index e08e661..b22f607 100644
9579 --- a/kde-apps/okular/okular-5.9999.ebuild
9580 +++ b/kde-apps/okular/okular-5.9999.ebuild
9581 @@ -35,11 +35,11 @@ COMMON_DEPEND="
9582 $(add_frameworks_dep kparts)
9583 $(add_frameworks_dep kwallet)
9584 $(add_frameworks_dep threadweaver)
9585 - dev-qt/qtdbus:5
9586 - dev-qt/qtgui:5
9587 - dev-qt/qtprintsupport:5
9588 - dev-qt/qtsvg:5
9589 - dev-qt/qtwidgets:5
9590 + $(add_qt_dep qtdbus)
9591 + $(add_qt_dep qtgui)
9592 + $(add_qt_dep qtprintsupport)
9593 + $(add_qt_dep qtsvg)
9594 + $(add_qt_dep qtwidgets)
9595 media-libs/freetype
9596 media-libs/phonon[qt5]
9597 sys-libs/zlib
9598
9599 diff --git a/kde-apps/palapeli/palapeli-5.9999.ebuild b/kde-apps/palapeli/palapeli-5.9999.ebuild
9600 index 142040e..6f9bee3 100644
9601 --- a/kde-apps/palapeli/palapeli-5.9999.ebuild
9602 +++ b/kde-apps/palapeli/palapeli-5.9999.ebuild
9603 @@ -29,9 +29,9 @@ DEPEND="
9604 $(add_frameworks_dep kwidgetsaddons)
9605 $(add_frameworks_dep kxmlgui)
9606 $(add_kdeapps_dep libkdegames)
9607 - dev-qt/qtgui:5
9608 - dev-qt/qtsvg:5
9609 - dev-qt/qtwidgets:5
9610 + $(add_qt_dep qtgui)
9611 + $(add_qt_dep qtsvg)
9612 + $(add_qt_dep qtwidgets)
9613 "
9614
9615 RDEPEND="${DEPEND}"
9616
9617 diff --git a/kde-apps/parley/parley-15.08.3.ebuild b/kde-apps/parley/parley-15.08.3.ebuild
9618 index 9c9b903..46a4063 100644
9619 --- a/kde-apps/parley/parley-15.08.3.ebuild
9620 +++ b/kde-apps/parley/parley-15.08.3.ebuild
9621 @@ -35,12 +35,12 @@ DEPEND="
9622 $(add_frameworks_dep sonnet)
9623 dev-libs/libxml2:2
9624 dev-libs/libxslt
9625 - dev-qt/qtdbus:5
9626 - dev-qt/qtconcurrent:5
9627 - dev-qt/qtgui:5
9628 - dev-qt/qtmultimedia:5
9629 - dev-qt/qtsvg:5
9630 - dev-qt/qtwidgets:5
9631 + $(add_qt_dep qtdbus)
9632 + $(add_qt_dep qtconcurrent)
9633 + $(add_qt_dep qtgui)
9634 + $(add_qt_dep qtmultimedia)
9635 + $(add_qt_dep qtsvg)
9636 + $(add_qt_dep qtwidgets)
9637 "
9638 RDEPEND="${DEPEND}
9639 $(add_kdeapps_dep kdeedu-data)
9640
9641 diff --git a/kde-apps/parley/parley-15.12.1.ebuild b/kde-apps/parley/parley-15.12.1.ebuild
9642 index 9c9b903..46a4063 100644
9643 --- a/kde-apps/parley/parley-15.12.1.ebuild
9644 +++ b/kde-apps/parley/parley-15.12.1.ebuild
9645 @@ -35,12 +35,12 @@ DEPEND="
9646 $(add_frameworks_dep sonnet)
9647 dev-libs/libxml2:2
9648 dev-libs/libxslt
9649 - dev-qt/qtdbus:5
9650 - dev-qt/qtconcurrent:5
9651 - dev-qt/qtgui:5
9652 - dev-qt/qtmultimedia:5
9653 - dev-qt/qtsvg:5
9654 - dev-qt/qtwidgets:5
9655 + $(add_qt_dep qtdbus)
9656 + $(add_qt_dep qtconcurrent)
9657 + $(add_qt_dep qtgui)
9658 + $(add_qt_dep qtmultimedia)
9659 + $(add_qt_dep qtsvg)
9660 + $(add_qt_dep qtwidgets)
9661 "
9662 RDEPEND="${DEPEND}
9663 $(add_kdeapps_dep kdeedu-data)
9664
9665 diff --git a/kde-apps/parley/parley-15.12.49.9999.ebuild b/kde-apps/parley/parley-15.12.49.9999.ebuild
9666 index 929d5b5..133dfb9 100644
9667 --- a/kde-apps/parley/parley-15.12.49.9999.ebuild
9668 +++ b/kde-apps/parley/parley-15.12.49.9999.ebuild
9669 @@ -35,12 +35,12 @@ DEPEND="
9670 $(add_frameworks_dep sonnet)
9671 dev-libs/libxml2:2
9672 dev-libs/libxslt
9673 - dev-qt/qtdbus:5
9674 - dev-qt/qtconcurrent:5
9675 - dev-qt/qtgui:5
9676 - dev-qt/qtmultimedia:5
9677 - dev-qt/qtsvg:5
9678 - dev-qt/qtwidgets:5
9679 + $(add_qt_dep qtdbus)
9680 + $(add_qt_dep qtconcurrent)
9681 + $(add_qt_dep qtgui)
9682 + $(add_qt_dep qtmultimedia)
9683 + $(add_qt_dep qtsvg)
9684 + $(add_qt_dep qtwidgets)
9685 "
9686 RDEPEND="${DEPEND}
9687 $(add_kdeapps_dep kdeedu-data)
9688
9689 diff --git a/kde-apps/parley/parley-9999.ebuild b/kde-apps/parley/parley-9999.ebuild
9690 index 929d5b5..133dfb9 100644
9691 --- a/kde-apps/parley/parley-9999.ebuild
9692 +++ b/kde-apps/parley/parley-9999.ebuild
9693 @@ -35,12 +35,12 @@ DEPEND="
9694 $(add_frameworks_dep sonnet)
9695 dev-libs/libxml2:2
9696 dev-libs/libxslt
9697 - dev-qt/qtdbus:5
9698 - dev-qt/qtconcurrent:5
9699 - dev-qt/qtgui:5
9700 - dev-qt/qtmultimedia:5
9701 - dev-qt/qtsvg:5
9702 - dev-qt/qtwidgets:5
9703 + $(add_qt_dep qtdbus)
9704 + $(add_qt_dep qtconcurrent)
9705 + $(add_qt_dep qtgui)
9706 + $(add_qt_dep qtmultimedia)
9707 + $(add_qt_dep qtsvg)
9708 + $(add_qt_dep qtwidgets)
9709 "
9710 RDEPEND="${DEPEND}
9711 $(add_kdeapps_dep kdeedu-data)
9712
9713 diff --git a/kde-apps/picmi/picmi-15.12.1.ebuild b/kde-apps/picmi/picmi-15.12.1.ebuild
9714 index 5cd341f..529d091 100644
9715 --- a/kde-apps/picmi/picmi-15.12.1.ebuild
9716 +++ b/kde-apps/picmi/picmi-15.12.1.ebuild
9717 @@ -25,10 +25,10 @@ DEPEND="
9718 $(add_frameworks_dep kwidgetsaddons)
9719 $(add_frameworks_dep kxmlgui)
9720 $(add_kdeapps_dep libkdegames)
9721 - dev-qt/qtdeclarative:5
9722 - dev-qt/qtgui:5
9723 - dev-qt/qtsvg:5
9724 - dev-qt/qtwidgets:5
9725 - dev-qt/qtxml:5
9726 + $(add_qt_dep qtdeclarative)
9727 + $(add_qt_dep qtgui)
9728 + $(add_qt_dep qtsvg)
9729 + $(add_qt_dep qtwidgets)
9730 + $(add_qt_dep qtxml)
9731 "
9732 RDEPEND="${DEPEND}"
9733
9734 diff --git a/kde-apps/picmi/picmi-15.12.49.9999.ebuild b/kde-apps/picmi/picmi-15.12.49.9999.ebuild
9735 index c85b5d3..1d3419a 100644
9736 --- a/kde-apps/picmi/picmi-15.12.49.9999.ebuild
9737 +++ b/kde-apps/picmi/picmi-15.12.49.9999.ebuild
9738 @@ -25,10 +25,10 @@ DEPEND="
9739 $(add_frameworks_dep kwidgetsaddons)
9740 $(add_frameworks_dep kxmlgui)
9741 $(add_kdeapps_dep libkdegames)
9742 - dev-qt/qtdeclarative:5
9743 - dev-qt/qtgui:5
9744 - dev-qt/qtsvg:5
9745 - dev-qt/qtwidgets:5
9746 - dev-qt/qtxml:5
9747 + $(add_qt_dep qtdeclarative)
9748 + $(add_qt_dep qtgui)
9749 + $(add_qt_dep qtsvg)
9750 + $(add_qt_dep qtwidgets)
9751 + $(add_qt_dep qtxml)
9752 "
9753 RDEPEND="${DEPEND}"
9754
9755 diff --git a/kde-apps/picmi/picmi-9999.ebuild b/kde-apps/picmi/picmi-9999.ebuild
9756 index e6f2976..70dc9d9 100644
9757 --- a/kde-apps/picmi/picmi-9999.ebuild
9758 +++ b/kde-apps/picmi/picmi-9999.ebuild
9759 @@ -26,10 +26,10 @@ DEPEND="
9760 $(add_frameworks_dep kwidgetsaddons)
9761 $(add_frameworks_dep kxmlgui)
9762 $(add_kdeapps_dep libkdegames)
9763 - dev-qt/qtdeclarative:5
9764 - dev-qt/qtgui:5
9765 - dev-qt/qtsvg:5
9766 - dev-qt/qtwidgets:5
9767 - dev-qt/qtxml:5
9768 + $(add_qt_dep qtdeclarative)
9769 + $(add_qt_dep qtgui)
9770 + $(add_qt_dep qtsvg)
9771 + $(add_qt_dep qtwidgets)
9772 + $(add_qt_dep qtxml)
9773 "
9774 RDEPEND="${DEPEND}"
9775
9776 diff --git a/kde-apps/pimcommon/pimcommon-15.12.1.ebuild b/kde-apps/pimcommon/pimcommon-15.12.1.ebuild
9777 index 55ffc6e..7eda9b9 100644
9778 --- a/kde-apps/pimcommon/pimcommon-15.12.1.ebuild
9779 +++ b/kde-apps/pimcommon/pimcommon-15.12.1.ebuild
9780 @@ -45,16 +45,16 @@ COMMON_DEPEND="
9781 $(add_kdeapps_dep libakonadi)
9782 $(add_kdeapps_dep libkdepim)
9783 dev-libs/libxslt
9784 - dev-qt/qtdbus:5
9785 - dev-qt/qtgui:5
9786 - dev-qt/qtnetwork:5
9787 - dev-qt/qtwebkit:5
9788 - dev-qt/qtwidgets:5
9789 - dev-qt/qtxml:5
9790 + $(add_qt_dep qtdbus)
9791 + $(add_qt_dep qtgui)
9792 + $(add_qt_dep qtnetwork)
9793 + $(add_qt_dep qtwebkit)
9794 + $(add_qt_dep qtwidgets)
9795 + $(add_qt_dep qtxml)
9796 "
9797 DEPEND="${COMMON_DEPEND}
9798 sys-devel/gettext
9799 - designer? ( dev-qt/designer:5 )
9800 + designer? ( $(add_qt_dep designer) )
9801 "
9802 RDEPEND="${COMMON_DEPEND}
9803 !<kde-apps/kdepim-15.08.50:5
9804
9805 diff --git a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild b/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
9806 index fe670b9..df69e69 100644
9807 --- a/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
9808 +++ b/kde-apps/pimcommon/pimcommon-15.12.49.9999.ebuild
9809 @@ -45,16 +45,16 @@ COMMON_DEPEND="
9810 $(add_kdeapps_dep libakonadi)
9811 $(add_kdeapps_dep libkdepim)
9812 dev-libs/libxslt
9813 - dev-qt/qtdbus:5
9814 - dev-qt/qtgui:5
9815 - dev-qt/qtnetwork:5
9816 - dev-qt/qtwebkit:5
9817 - dev-qt/qtwidgets:5
9818 - dev-qt/qtxml:5
9819 + $(add_qt_dep qtdbus)
9820 + $(add_qt_dep qtgui)
9821 + $(add_qt_dep qtnetwork)
9822 + $(add_qt_dep qtwebkit)
9823 + $(add_qt_dep qtwidgets)
9824 + $(add_qt_dep qtxml)
9825 "
9826 DEPEND="${COMMON_DEPEND}
9827 sys-devel/gettext
9828 - designer? ( dev-qt/designer:5 )
9829 + designer? ( $(add_qt_dep designer) )
9830 "
9831 RDEPEND="${COMMON_DEPEND}
9832 !<kde-apps/kdepim-15.08.50:5
9833
9834 diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild
9835 index f63c477..41c9e89 100644
9836 --- a/kde-apps/pimcommon/pimcommon-9999.ebuild
9837 +++ b/kde-apps/pimcommon/pimcommon-9999.ebuild
9838 @@ -44,16 +44,16 @@ COMMON_DEPEND="
9839 $(add_kdeapps_dep kpimtextedit)
9840 $(add_kdeapps_dep libkdepim)
9841 dev-libs/libxslt
9842 - dev-qt/qtdbus:5
9843 - dev-qt/qtgui:5
9844 - dev-qt/qtnetwork:5
9845 - dev-qt/qtwebkit:5
9846 - dev-qt/qtwidgets:5
9847 - dev-qt/qtxml:5
9848 + $(add_qt_dep qtdbus)
9849 + $(add_qt_dep qtgui)
9850 + $(add_qt_dep qtnetwork)
9851 + $(add_qt_dep qtwebkit)
9852 + $(add_qt_dep qtwidgets)
9853 + $(add_qt_dep qtxml)
9854 "
9855 DEPEND="${COMMON_DEPEND}
9856 sys-devel/gettext
9857 - designer? ( dev-qt/designer:5 )
9858 + designer? ( $(add_qt_dep designer) )
9859 "
9860 RDEPEND="${COMMON_DEPEND}
9861 !<kde-apps/kdepim-15.08.50:5
9862
9863 diff --git a/kde-apps/poxml/poxml-15.12.1.ebuild b/kde-apps/poxml/poxml-15.12.1.ebuild
9864 index a95aa1f..45f680e 100644
9865 --- a/kde-apps/poxml/poxml-15.12.1.ebuild
9866 +++ b/kde-apps/poxml/poxml-15.12.1.ebuild
9867 @@ -12,7 +12,7 @@ KEYWORDS=" ~amd64 ~x86"
9868 IUSE=""
9869
9870 DEPEND="
9871 - dev-qt/qtxml:5
9872 + $(add_qt_dep qtxml)
9873 sys-devel/gettext
9874 "
9875 RDEPEND="${DEPEND}"
9876
9877 diff --git a/kde-apps/poxml/poxml-15.12.49.9999.ebuild b/kde-apps/poxml/poxml-15.12.49.9999.ebuild
9878 index 44394a2..7054ac3 100644
9879 --- a/kde-apps/poxml/poxml-15.12.49.9999.ebuild
9880 +++ b/kde-apps/poxml/poxml-15.12.49.9999.ebuild
9881 @@ -12,7 +12,7 @@ KEYWORDS=""
9882 IUSE=""
9883
9884 DEPEND="
9885 - dev-qt/qtxml:5
9886 + $(add_qt_dep qtxml)
9887 sys-devel/gettext
9888 "
9889 RDEPEND="${DEPEND}"
9890
9891 diff --git a/kde-apps/poxml/poxml-9999.ebuild b/kde-apps/poxml/poxml-9999.ebuild
9892 index 44394a2..7054ac3 100644
9893 --- a/kde-apps/poxml/poxml-9999.ebuild
9894 +++ b/kde-apps/poxml/poxml-9999.ebuild
9895 @@ -12,7 +12,7 @@ KEYWORDS=""
9896 IUSE=""
9897
9898 DEPEND="
9899 - dev-qt/qtxml:5
9900 + $(add_qt_dep qtxml)
9901 sys-devel/gettext
9902 "
9903 RDEPEND="${DEPEND}"
9904
9905 diff --git a/kde-apps/print-manager/print-manager-15.12.1.ebuild b/kde-apps/print-manager/print-manager-15.12.1.ebuild
9906 index 511d068..5543861 100644
9907 --- a/kde-apps/print-manager/print-manager-15.12.1.ebuild
9908 +++ b/kde-apps/print-manager/print-manager-15.12.1.ebuild
9909 @@ -24,11 +24,11 @@ DEPEND="
9910 $(add_frameworks_dep kwidgetsaddons)
9911 $(add_frameworks_dep kwindowsystem)
9912 $(add_frameworks_dep plasma)
9913 - dev-qt/qtdbus:5
9914 - dev-qt/qtdeclarative:5
9915 - dev-qt/qtgui:5
9916 - dev-qt/qtnetwork:5
9917 - dev-qt/qtwidgets:5
9918 + $(add_qt_dep qtdbus)
9919 + $(add_qt_dep qtdeclarative)
9920 + $(add_qt_dep qtgui)
9921 + $(add_qt_dep qtnetwork)
9922 + $(add_qt_dep qtwidgets)
9923 net-print/cups
9924 "
9925 RDEPEND="${DEPEND}
9926
9927 diff --git a/kde-apps/print-manager/print-manager-15.12.49.9999.ebuild b/kde-apps/print-manager/print-manager-15.12.49.9999.ebuild
9928 index 18f74ca..3074803 100644
9929 --- a/kde-apps/print-manager/print-manager-15.12.49.9999.ebuild
9930 +++ b/kde-apps/print-manager/print-manager-15.12.49.9999.ebuild
9931 @@ -24,11 +24,11 @@ DEPEND="
9932 $(add_frameworks_dep kwidgetsaddons)
9933 $(add_frameworks_dep kwindowsystem)
9934 $(add_frameworks_dep plasma)
9935 - dev-qt/qtdbus:5
9936 - dev-qt/qtdeclarative:5
9937 - dev-qt/qtgui:5
9938 - dev-qt/qtnetwork:5
9939 - dev-qt/qtwidgets:5
9940 + $(add_qt_dep qtdbus)
9941 + $(add_qt_dep qtdeclarative)
9942 + $(add_qt_dep qtgui)
9943 + $(add_qt_dep qtnetwork)
9944 + $(add_qt_dep qtwidgets)
9945 net-print/cups
9946 "
9947 RDEPEND="${DEPEND}
9948
9949 diff --git a/kde-apps/print-manager/print-manager-9999.ebuild b/kde-apps/print-manager/print-manager-9999.ebuild
9950 index 18f74ca..3074803 100644
9951 --- a/kde-apps/print-manager/print-manager-9999.ebuild
9952 +++ b/kde-apps/print-manager/print-manager-9999.ebuild
9953 @@ -24,11 +24,11 @@ DEPEND="
9954 $(add_frameworks_dep kwidgetsaddons)
9955 $(add_frameworks_dep kwindowsystem)
9956 $(add_frameworks_dep plasma)
9957 - dev-qt/qtdbus:5
9958 - dev-qt/qtdeclarative:5
9959 - dev-qt/qtgui:5
9960 - dev-qt/qtnetwork:5
9961 - dev-qt/qtwidgets:5
9962 + $(add_qt_dep qtdbus)
9963 + $(add_qt_dep qtdeclarative)
9964 + $(add_qt_dep qtgui)
9965 + $(add_qt_dep qtnetwork)
9966 + $(add_qt_dep qtwidgets)
9967 net-print/cups
9968 "
9969 RDEPEND="${DEPEND}
9970
9971 diff --git a/kde-apps/pykde5/pykde5-9999.ebuild b/kde-apps/pykde5/pykde5-9999.ebuild
9972 index 0e840fe..739c306 100644
9973 --- a/kde-apps/pykde5/pykde5-9999.ebuild
9974 +++ b/kde-apps/pykde5/pykde5-9999.ebuild
9975 @@ -28,9 +28,9 @@ RDEPEND="${PYTHON_DEPS}
9976 $(add_frameworks_dep sonnet)
9977 dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
9978 >=dev-python/sip-4.16.2:=[${PYTHON_USEDEP}]
9979 - dev-qt/qtdbus:5
9980 - dev-qt/qtgui:5
9981 - dev-qt/qtwidgets:5
9982 + $(add_qt_dep qtdbus)
9983 + $(add_qt_dep qtgui)
9984 + $(add_qt_dep qtwidgets)
9985 "
9986
9987 DEPEND="${RDEPEND}
9988
9989 diff --git a/kde-apps/rocs/rocs-15.08.3.ebuild b/kde-apps/rocs/rocs-15.08.3.ebuild
9990 index de68c8f..94c219f 100644
9991 --- a/kde-apps/rocs/rocs-15.08.3.ebuild
9992 +++ b/kde-apps/rocs/rocs-15.08.3.ebuild
9993 @@ -28,15 +28,15 @@ RDEPEND="
9994 $(add_frameworks_dep ktextwidgets)
9995 $(add_frameworks_dep kxmlgui)
9996 dev-libs/grantlee:5
9997 - dev-qt/qtconcurrent:5
9998 - dev-qt/qtdeclarative:5[widgets]
9999 - dev-qt/qtgui:5
10000 - dev-qt/qtscript:5[scripttools]
10001 - dev-qt/qtsvg:5
10002 - dev-qt/qtwebkit:5
10003 - dev-qt/qtwidgets:5
10004 - dev-qt/qtxml:5
10005 - dev-qt/qtxmlpatterns:5
10006 + $(add_qt_dep qtconcurrent)
10007 + $(add_qt_dep qtdeclarative 'widgets')
10008 + $(add_qt_dep qtgui)
10009 + $(add_qt_dep qtscript 'scripttools')
10010 + $(add_qt_dep qtsvg)
10011 + $(add_qt_dep qtwebkit)
10012 + $(add_qt_dep qtwidgets)
10013 + $(add_qt_dep qtxml)
10014 + $(add_qt_dep qtxmlpatterns)
10015 "
10016 DEPEND="${RDEPEND}
10017 >=dev-libs/boost-1.49
10018
10019 diff --git a/kde-apps/rocs/rocs-15.12.1.ebuild b/kde-apps/rocs/rocs-15.12.1.ebuild
10020 index c4f90a1..34a177e 100644
10021 --- a/kde-apps/rocs/rocs-15.12.1.ebuild
10022 +++ b/kde-apps/rocs/rocs-15.12.1.ebuild
10023 @@ -29,15 +29,15 @@ RDEPEND="
10024 $(add_frameworks_dep ktextwidgets)
10025 $(add_frameworks_dep kxmlgui)
10026 dev-libs/grantlee:5
10027 - dev-qt/qtconcurrent:5
10028 - dev-qt/qtdeclarative:5[widgets]
10029 - dev-qt/qtgui:5
10030 - dev-qt/qtscript:5[scripttools]
10031 - dev-qt/qtsvg:5
10032 - dev-qt/qtwebkit:5
10033 - dev-qt/qtwidgets:5
10034 - dev-qt/qtxml:5
10035 - dev-qt/qtxmlpatterns:5
10036 + $(add_qt_dep qtconcurrent)
10037 + $(add_qt_dep qtdeclarative 'widgets')
10038 + $(add_qt_dep qtgui)
10039 + $(add_qt_dep qtscript 'scripttools')
10040 + $(add_qt_dep qtsvg)
10041 + $(add_qt_dep qtwebkit)
10042 + $(add_qt_dep qtwidgets)
10043 + $(add_qt_dep qtxml)
10044 + $(add_qt_dep qtxmlpatterns)
10045 "
10046 DEPEND="${RDEPEND}
10047 >=dev-libs/boost-1.49
10048
10049 diff --git a/kde-apps/rocs/rocs-15.12.49.9999.ebuild b/kde-apps/rocs/rocs-15.12.49.9999.ebuild
10050 index ae9749a..b0137d1 100644
10051 --- a/kde-apps/rocs/rocs-15.12.49.9999.ebuild
10052 +++ b/kde-apps/rocs/rocs-15.12.49.9999.ebuild
10053 @@ -29,15 +29,15 @@ RDEPEND="
10054 $(add_frameworks_dep ktextwidgets)
10055 $(add_frameworks_dep kxmlgui)
10056 dev-libs/grantlee:5
10057 - dev-qt/qtconcurrent:5
10058 - dev-qt/qtdeclarative:5[widgets]
10059 - dev-qt/qtgui:5
10060 - dev-qt/qtscript:5[scripttools]
10061 - dev-qt/qtsvg:5
10062 - dev-qt/qtwebkit:5
10063 - dev-qt/qtwidgets:5
10064 - dev-qt/qtxml:5
10065 - dev-qt/qtxmlpatterns:5
10066 + $(add_qt_dep qtconcurrent)
10067 + $(add_qt_dep qtdeclarative 'widgets')
10068 + $(add_qt_dep qtgui)
10069 + $(add_qt_dep qtscript 'scripttools')
10070 + $(add_qt_dep qtsvg)
10071 + $(add_qt_dep qtwebkit)
10072 + $(add_qt_dep qtwidgets)
10073 + $(add_qt_dep qtxml)
10074 + $(add_qt_dep qtxmlpatterns)
10075 "
10076 DEPEND="${RDEPEND}
10077 >=dev-libs/boost-1.49
10078
10079 diff --git a/kde-apps/rocs/rocs-9999.ebuild b/kde-apps/rocs/rocs-9999.ebuild
10080 index ae9749a..b0137d1 100644
10081 --- a/kde-apps/rocs/rocs-9999.ebuild
10082 +++ b/kde-apps/rocs/rocs-9999.ebuild
10083 @@ -29,15 +29,15 @@ RDEPEND="
10084 $(add_frameworks_dep ktextwidgets)
10085 $(add_frameworks_dep kxmlgui)
10086 dev-libs/grantlee:5
10087 - dev-qt/qtconcurrent:5
10088 - dev-qt/qtdeclarative:5[widgets]
10089 - dev-qt/qtgui:5
10090 - dev-qt/qtscript:5[scripttools]
10091 - dev-qt/qtsvg:5
10092 - dev-qt/qtwebkit:5
10093 - dev-qt/qtwidgets:5
10094 - dev-qt/qtxml:5
10095 - dev-qt/qtxmlpatterns:5
10096 + $(add_qt_dep qtconcurrent)
10097 + $(add_qt_dep qtdeclarative 'widgets')
10098 + $(add_qt_dep qtgui)
10099 + $(add_qt_dep qtscript 'scripttools')
10100 + $(add_qt_dep qtsvg)
10101 + $(add_qt_dep qtwebkit)
10102 + $(add_qt_dep qtwidgets)
10103 + $(add_qt_dep qtxml)
10104 + $(add_qt_dep qtxmlpatterns)
10105 "
10106 DEPEND="${RDEPEND}
10107 >=dev-libs/boost-1.49
10108
10109 diff --git a/kde-apps/spectacle/spectacle-15.12.1.ebuild b/kde-apps/spectacle/spectacle-15.12.1.ebuild
10110 index 1f30ddb..992d88e 100644
10111 --- a/kde-apps/spectacle/spectacle-15.12.1.ebuild
10112 +++ b/kde-apps/spectacle/spectacle-15.12.1.ebuild
10113 @@ -24,11 +24,11 @@ DEPEND="
10114 $(add_frameworks_dep kwindowsystem)
10115 $(add_frameworks_dep kxmlgui)
10116 $(add_plasma_dep libkscreen)
10117 - dev-qt/qtdbus:5
10118 - dev-qt/qtgui:5
10119 - dev-qt/qtprintsupport:5
10120 - dev-qt/qtwidgets:5
10121 - dev-qt/qtx11extras:5
10122 + $(add_qt_dep qtdbus)
10123 + $(add_qt_dep qtgui)
10124 + $(add_qt_dep qtprintsupport)
10125 + $(add_qt_dep qtwidgets)
10126 + $(add_qt_dep qtx11extras)
10127 x11-libs/libxcb
10128 x11-libs/xcb-util
10129 x11-libs/xcb-util-cursor
10130
10131 diff --git a/kde-apps/spectacle/spectacle-15.12.49.9999.ebuild b/kde-apps/spectacle/spectacle-15.12.49.9999.ebuild
10132 index 28b7ca9..3d22747 100644
10133 --- a/kde-apps/spectacle/spectacle-15.12.49.9999.ebuild
10134 +++ b/kde-apps/spectacle/spectacle-15.12.49.9999.ebuild
10135 @@ -24,11 +24,11 @@ DEPEND="
10136 $(add_frameworks_dep kwindowsystem)
10137 $(add_frameworks_dep kxmlgui)
10138 $(add_plasma_dep libkscreen)
10139 - dev-qt/qtdbus:5
10140 - dev-qt/qtgui:5
10141 - dev-qt/qtprintsupport:5
10142 - dev-qt/qtwidgets:5
10143 - dev-qt/qtx11extras:5
10144 + $(add_qt_dep qtdbus)
10145 + $(add_qt_dep qtgui)
10146 + $(add_qt_dep qtprintsupport)
10147 + $(add_qt_dep qtwidgets)
10148 + $(add_qt_dep qtx11extras)
10149 x11-libs/libxcb
10150 x11-libs/xcb-util
10151 x11-libs/xcb-util-cursor
10152
10153 diff --git a/kde-apps/spectacle/spectacle-9999.ebuild b/kde-apps/spectacle/spectacle-9999.ebuild
10154 index 38b7cc7..8bc1c65 100644
10155 --- a/kde-apps/spectacle/spectacle-9999.ebuild
10156 +++ b/kde-apps/spectacle/spectacle-9999.ebuild
10157 @@ -24,11 +24,11 @@ DEPEND="
10158 $(add_frameworks_dep kwindowsystem)
10159 $(add_frameworks_dep kxmlgui)
10160 $(add_plasma_dep libkscreen)
10161 - dev-qt/qtdbus:5
10162 - dev-qt/qtgui:5
10163 - dev-qt/qtprintsupport:5
10164 - dev-qt/qtwidgets:5
10165 - dev-qt/qtx11extras:5
10166 + $(add_qt_dep qtdbus)
10167 + $(add_qt_dep qtgui)
10168 + $(add_qt_dep qtprintsupport)
10169 + $(add_qt_dep qtwidgets)
10170 + $(add_qt_dep qtx11extras)
10171 x11-libs/libxcb
10172 x11-libs/xcb-util
10173 x11-libs/xcb-util-cursor
10174
10175 diff --git a/kde-apps/step/step-15.08.3.ebuild b/kde-apps/step/step-15.08.3.ebuild
10176 index e20bbbf..248d2e3 100644
10177 --- a/kde-apps/step/step-15.08.3.ebuild
10178 +++ b/kde-apps/step/step-15.08.3.ebuild
10179 @@ -31,13 +31,13 @@ DEPEND="
10180 $(add_frameworks_dep kwidgetsaddons)
10181 $(add_frameworks_dep kxmlgui)
10182 =dev-cpp/eigen-3.2*:3
10183 - dev-qt/qtdeclarative:5
10184 - dev-qt/qtgui:5
10185 - dev-qt/qtopengl:5
10186 - dev-qt/qtprintsupport:5
10187 - dev-qt/qtsvg:5
10188 - dev-qt/qtwidgets:5
10189 - dev-qt/qtxml:5
10190 + $(add_qt_dep qtdeclarative)
10191 + $(add_qt_dep qtgui)
10192 + $(add_qt_dep qtopengl)
10193 + $(add_qt_dep qtprintsupport)
10194 + $(add_qt_dep qtsvg)
10195 + $(add_qt_dep qtwidgets)
10196 + $(add_qt_dep qtxml)
10197 sci-libs/cln
10198 gsl? ( >=sci-libs/gsl-1.9-r1 )
10199 qalculate? ( >=sci-libs/libqalculate-0.9.5 )
10200
10201 diff --git a/kde-apps/step/step-15.12.1.ebuild b/kde-apps/step/step-15.12.1.ebuild
10202 index e20bbbf..248d2e3 100644
10203 --- a/kde-apps/step/step-15.12.1.ebuild
10204 +++ b/kde-apps/step/step-15.12.1.ebuild
10205 @@ -31,13 +31,13 @@ DEPEND="
10206 $(add_frameworks_dep kwidgetsaddons)
10207 $(add_frameworks_dep kxmlgui)
10208 =dev-cpp/eigen-3.2*:3
10209 - dev-qt/qtdeclarative:5
10210 - dev-qt/qtgui:5
10211 - dev-qt/qtopengl:5
10212 - dev-qt/qtprintsupport:5
10213 - dev-qt/qtsvg:5
10214 - dev-qt/qtwidgets:5
10215 - dev-qt/qtxml:5
10216 + $(add_qt_dep qtdeclarative)
10217 + $(add_qt_dep qtgui)
10218 + $(add_qt_dep qtopengl)
10219 + $(add_qt_dep qtprintsupport)
10220 + $(add_qt_dep qtsvg)
10221 + $(add_qt_dep qtwidgets)
10222 + $(add_qt_dep qtxml)
10223 sci-libs/cln
10224 gsl? ( >=sci-libs/gsl-1.9-r1 )
10225 qalculate? ( >=sci-libs/libqalculate-0.9.5 )
10226
10227 diff --git a/kde-apps/step/step-15.12.49.9999.ebuild b/kde-apps/step/step-15.12.49.9999.ebuild
10228 index f9389d6..f25c046 100644
10229 --- a/kde-apps/step/step-15.12.49.9999.ebuild
10230 +++ b/kde-apps/step/step-15.12.49.9999.ebuild
10231 @@ -31,13 +31,13 @@ DEPEND="
10232 $(add_frameworks_dep kwidgetsaddons)
10233 $(add_frameworks_dep kxmlgui)
10234 =dev-cpp/eigen-3.2*:3
10235 - dev-qt/qtdeclarative:5
10236 - dev-qt/qtgui:5
10237 - dev-qt/qtopengl:5
10238 - dev-qt/qtprintsupport:5
10239 - dev-qt/qtsvg:5
10240 - dev-qt/qtwidgets:5
10241 - dev-qt/qtxml:5
10242 + $(add_qt_dep qtdeclarative)
10243 + $(add_qt_dep qtgui)
10244 + $(add_qt_dep qtopengl)
10245 + $(add_qt_dep qtprintsupport)
10246 + $(add_qt_dep qtsvg)
10247 + $(add_qt_dep qtwidgets)
10248 + $(add_qt_dep qtxml)
10249 sci-libs/cln
10250 gsl? ( >=sci-libs/gsl-1.9-r1 )
10251 qalculate? ( >=sci-libs/libqalculate-0.9.5 )
10252
10253 diff --git a/kde-apps/step/step-9999.ebuild b/kde-apps/step/step-9999.ebuild
10254 index f9389d6..f25c046 100644
10255 --- a/kde-apps/step/step-9999.ebuild
10256 +++ b/kde-apps/step/step-9999.ebuild
10257 @@ -31,13 +31,13 @@ DEPEND="
10258 $(add_frameworks_dep kwidgetsaddons)
10259 $(add_frameworks_dep kxmlgui)
10260 =dev-cpp/eigen-3.2*:3
10261 - dev-qt/qtdeclarative:5
10262 - dev-qt/qtgui:5
10263 - dev-qt/qtopengl:5
10264 - dev-qt/qtprintsupport:5
10265 - dev-qt/qtsvg:5
10266 - dev-qt/qtwidgets:5
10267 - dev-qt/qtxml:5
10268 + $(add_qt_dep qtdeclarative)
10269 + $(add_qt_dep qtgui)
10270 + $(add_qt_dep qtopengl)
10271 + $(add_qt_dep qtprintsupport)
10272 + $(add_qt_dep qtsvg)
10273 + $(add_qt_dep qtwidgets)
10274 + $(add_qt_dep qtxml)
10275 sci-libs/cln
10276 gsl? ( >=sci-libs/gsl-1.9-r1 )
10277 qalculate? ( >=sci-libs/libqalculate-0.9.5 )
10278
10279 diff --git a/kde-apps/svgpart/svgpart-5.9999.ebuild b/kde-apps/svgpart/svgpart-5.9999.ebuild
10280 index 504f1de..3f726e1 100644
10281 --- a/kde-apps/svgpart/svgpart-5.9999.ebuild
10282 +++ b/kde-apps/svgpart/svgpart-5.9999.ebuild
10283 @@ -15,9 +15,9 @@ DEPEND="
10284 $(add_frameworks_dep kcoreaddons)
10285 $(add_frameworks_dep kparts)
10286 $(add_frameworks_dep kxmlgui)
10287 - dev-qt/qtgui:5
10288 - dev-qt/qtsvg:5
10289 - dev-qt/qtwidgets:5
10290 + $(add_qt_dep qtgui)
10291 + $(add_qt_dep qtsvg)
10292 + $(add_qt_dep qtwidgets)
10293 "
10294
10295 RDEPEND="${DEPEND}"
10296
10297 diff --git a/kde-apps/syndication/syndication-15.12.1.ebuild b/kde-apps/syndication/syndication-15.12.1.ebuild
10298 index 9e4e460..8934abe 100644
10299 --- a/kde-apps/syndication/syndication-15.12.1.ebuild
10300 +++ b/kde-apps/syndication/syndication-15.12.1.ebuild
10301 @@ -17,6 +17,6 @@ RDEPEND="
10302 $(add_frameworks_dep kcodecs)
10303 $(add_frameworks_dep kcoreaddons)
10304 $(add_frameworks_dep kio)
10305 - dev-qt/qtxml:5
10306 + $(add_qt_dep qtxml)
10307 "
10308 DEPEND="${RDEPEND}"
10309
10310 diff --git a/kde-apps/syndication/syndication-15.12.49.9999.ebuild b/kde-apps/syndication/syndication-15.12.49.9999.ebuild
10311 index 43ca1c4..65027ba 100644
10312 --- a/kde-apps/syndication/syndication-15.12.49.9999.ebuild
10313 +++ b/kde-apps/syndication/syndication-15.12.49.9999.ebuild
10314 @@ -17,6 +17,6 @@ RDEPEND="
10315 $(add_frameworks_dep kcodecs)
10316 $(add_frameworks_dep kcoreaddons)
10317 $(add_frameworks_dep kio)
10318 - dev-qt/qtxml:5
10319 + $(add_qt_dep qtxml)
10320 "
10321 DEPEND="${RDEPEND}"
10322
10323 diff --git a/kde-apps/syndication/syndication-9999.ebuild b/kde-apps/syndication/syndication-9999.ebuild
10324 index 43ca1c4..65027ba 100644
10325 --- a/kde-apps/syndication/syndication-9999.ebuild
10326 +++ b/kde-apps/syndication/syndication-9999.ebuild
10327 @@ -17,6 +17,6 @@ RDEPEND="
10328 $(add_frameworks_dep kcodecs)
10329 $(add_frameworks_dep kcoreaddons)
10330 $(add_frameworks_dep kio)
10331 - dev-qt/qtxml:5
10332 + $(add_qt_dep qtxml)
10333 "
10334 DEPEND="${RDEPEND}"
10335
10336 diff --git a/kde-apps/templateparser/templateparser-15.12.1.ebuild b/kde-apps/templateparser/templateparser-15.12.1.ebuild
10337 index bfddf7a..ffe940a 100644
10338 --- a/kde-apps/templateparser/templateparser-15.12.1.ebuild
10339 +++ b/kde-apps/templateparser/templateparser-15.12.1.ebuild
10340 @@ -33,10 +33,10 @@ COMMON_DEPEND="
10341 $(add_kdeapps_dep messagecore)
10342 $(add_kdeapps_dep messageviewer)
10343 $(add_kdeapps_dep pimcommon)
10344 - dev-qt/designer:5
10345 - dev-qt/qtgui:5
10346 - dev-qt/qtwebkit:5
10347 - dev-qt/qtwidgets:5
10348 + $(add_qt_dep designer)
10349 + $(add_qt_dep qtgui)
10350 + $(add_qt_dep qtwebkit)
10351 + $(add_qt_dep qtwidgets)
10352 "
10353 DEPEND="${COMMON_DEPEND}
10354 sys-devel/gettext
10355
10356 diff --git a/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild b/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild
10357 index 4aa8db7..4893853 100644
10358 --- a/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild
10359 +++ b/kde-apps/templateparser/templateparser-15.12.49.9999.ebuild
10360 @@ -33,10 +33,10 @@ COMMON_DEPEND="
10361 $(add_kdeapps_dep messagecore)
10362 $(add_kdeapps_dep messageviewer)
10363 $(add_kdeapps_dep pimcommon)
10364 - dev-qt/designer:5
10365 - dev-qt/qtgui:5
10366 - dev-qt/qtwebkit:5
10367 - dev-qt/qtwidgets:5
10368 + $(add_qt_dep designer)
10369 + $(add_qt_dep qtgui)
10370 + $(add_qt_dep qtwebkit)
10371 + $(add_qt_dep qtwidgets)
10372 "
10373 DEPEND="${COMMON_DEPEND}
10374 sys-devel/gettext
10375
10376 diff --git a/kde-apps/thumbnailers/thumbnailers-15.12.1.ebuild b/kde-apps/thumbnailers/thumbnailers-15.12.1.ebuild
10377 index 170c96f..2225408 100644
10378 --- a/kde-apps/thumbnailers/thumbnailers-15.12.1.ebuild
10379 +++ b/kde-apps/thumbnailers/thumbnailers-15.12.1.ebuild
10380 @@ -15,6 +15,6 @@ DEPEND="
10381 $(add_kdeapps_dep libkdcraw)
10382 $(add_kdeapps_dep libkexiv2)
10383 $(add_frameworks_dep kio)
10384 - dev-qt/qtgui:5
10385 + $(add_qt_dep qtgui)
10386 "
10387 RDEPEND="${DEPEND}"
10388
10389 diff --git a/kde-apps/thumbnailers/thumbnailers-15.12.49.9999.ebuild b/kde-apps/thumbnailers/thumbnailers-15.12.49.9999.ebuild
10390 index 91070cd..f92791c 100644
10391 --- a/kde-apps/thumbnailers/thumbnailers-15.12.49.9999.ebuild
10392 +++ b/kde-apps/thumbnailers/thumbnailers-15.12.49.9999.ebuild
10393 @@ -15,6 +15,6 @@ DEPEND="
10394 $(add_kdeapps_dep libkdcraw)
10395 $(add_kdeapps_dep libkexiv2)
10396 $(add_frameworks_dep kio)
10397 - dev-qt/qtgui:5
10398 + $(add_qt_dep qtgui)
10399 "
10400 RDEPEND="${DEPEND}"
10401
10402 diff --git a/kde-apps/thumbnailers/thumbnailers-9999.ebuild b/kde-apps/thumbnailers/thumbnailers-9999.ebuild
10403 index 91070cd..f92791c 100644
10404 --- a/kde-apps/thumbnailers/thumbnailers-9999.ebuild
10405 +++ b/kde-apps/thumbnailers/thumbnailers-9999.ebuild
10406 @@ -15,6 +15,6 @@ DEPEND="
10407 $(add_kdeapps_dep libkdcraw)
10408 $(add_kdeapps_dep libkexiv2)
10409 $(add_frameworks_dep kio)
10410 - dev-qt/qtgui:5
10411 + $(add_qt_dep qtgui)
10412 "
10413 RDEPEND="${DEPEND}"
10414
10415 diff --git a/kde-apps/umbrello/umbrello-15.12.1.ebuild b/kde-apps/umbrello/umbrello-15.12.1.ebuild
10416 index d76c303..9beefe7 100644
10417 --- a/kde-apps/umbrello/umbrello-15.12.1.ebuild
10418 +++ b/kde-apps/umbrello/umbrello-15.12.1.ebuild
10419 @@ -33,11 +33,11 @@ RDEPEND="
10420 $(add_frameworks_dep kxmlgui)
10421 dev-libs/libxml2
10422 dev-libs/libxslt
10423 - dev-qt/qtgui:5
10424 - dev-qt/qtprintsupport:5
10425 - dev-qt/qtsvg:5
10426 - dev-qt/qtwidgets:5
10427 - dev-qt/qtxml:5
10428 + $(add_qt_dep qtgui)
10429 + $(add_qt_dep qtprintsupport)
10430 + $(add_qt_dep qtsvg)
10431 + $(add_qt_dep qtwidgets)
10432 + $(add_qt_dep qtxml)
10433 "
10434 DEPEND="${RDEPEND}"
10435
10436
10437 diff --git a/kde-apps/umbrello/umbrello-15.12.49.9999.ebuild b/kde-apps/umbrello/umbrello-15.12.49.9999.ebuild
10438 index 2130fde..7c38bb8 100644
10439 --- a/kde-apps/umbrello/umbrello-15.12.49.9999.ebuild
10440 +++ b/kde-apps/umbrello/umbrello-15.12.49.9999.ebuild
10441 @@ -33,11 +33,11 @@ RDEPEND="
10442 $(add_frameworks_dep kxmlgui)
10443 dev-libs/libxml2
10444 dev-libs/libxslt
10445 - dev-qt/qtgui:5
10446 - dev-qt/qtprintsupport:5
10447 - dev-qt/qtsvg:5
10448 - dev-qt/qtwidgets:5
10449 - dev-qt/qtxml:5
10450 + $(add_qt_dep qtgui)
10451 + $(add_qt_dep qtprintsupport)
10452 + $(add_qt_dep qtsvg)
10453 + $(add_qt_dep qtwidgets)
10454 + $(add_qt_dep qtxml)
10455 "
10456 DEPEND="${RDEPEND}"
10457
10458
10459 diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-9999.ebuild
10460 index 2130fde..7c38bb8 100644
10461 --- a/kde-apps/umbrello/umbrello-9999.ebuild
10462 +++ b/kde-apps/umbrello/umbrello-9999.ebuild
10463 @@ -33,11 +33,11 @@ RDEPEND="
10464 $(add_frameworks_dep kxmlgui)
10465 dev-libs/libxml2
10466 dev-libs/libxslt
10467 - dev-qt/qtgui:5
10468 - dev-qt/qtprintsupport:5
10469 - dev-qt/qtsvg:5
10470 - dev-qt/qtwidgets:5
10471 - dev-qt/qtxml:5
10472 + $(add_qt_dep qtgui)
10473 + $(add_qt_dep qtprintsupport)
10474 + $(add_qt_dep qtsvg)
10475 + $(add_qt_dep qtwidgets)
10476 + $(add_qt_dep qtxml)
10477 "
10478 DEPEND="${RDEPEND}"
10479
10480
10481 diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-5.9999.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-5.9999.ebuild
10482 index 81e22fc..a9c205c 100644
10483 --- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-5.9999.ebuild
10484 +++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-5.9999.ebuild
10485 @@ -17,7 +17,7 @@ DEPEND="
10486 $(add_frameworks_dep kdnssd)
10487 $(add_frameworks_dep ki18n)
10488 $(add_frameworks_dep kio)
10489 - dev-qt/qtdbus:5
10490 + $(add_qt_dep qtdbus)
10491 "
10492
10493 RDEPEND="${DEPEND}"