1 |
commit: ed622606b5bb7ceeed420a7f487c351b128168f6 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jan 25 00:31:39 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=ed622606 |
7 |
|
8 |
kde-frameworks: Convert to add_qt_dep |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
kde-frameworks/attica/attica-9999.ebuild | 2 +- |
13 |
kde-frameworks/baloo/baloo-9999.ebuild | 8 ++++---- |
14 |
kde-frameworks/bluez-qt/bluez-qt-9999.ebuild | 6 +++--- |
15 |
.../extra-cmake-modules-9999.ebuild | 2 +- |
16 |
.../frameworkintegration-9999.ebuild | 6 +++--- |
17 |
kde-frameworks/kactivities/kactivities-9999.ebuild | 10 +++++----- |
18 |
kde-frameworks/kauth/kauth-9999.ebuild | 8 ++++---- |
19 |
kde-frameworks/kbookmarks/kbookmarks-9999.ebuild | 10 +++++----- |
20 |
kde-frameworks/kcmutils/kcmutils-9999.ebuild | 8 ++++---- |
21 |
kde-frameworks/kcodecs/kcodecs-9999.ebuild | 2 +- |
22 |
kde-frameworks/kcompletion/kcompletion-9999.ebuild | 6 +++--- |
23 |
kde-frameworks/kconfig/kconfig-9999.ebuild | 8 ++++---- |
24 |
.../kconfigwidgets/kconfigwidgets-9999.ebuild | 6 +++--- |
25 |
kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild | 4 ++-- |
26 |
kde-frameworks/kcrash/kcrash-9999.ebuild | 8 ++++---- |
27 |
kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild | 6 +++--- |
28 |
.../kdeclarative/kdeclarative-9999.ebuild | 8 ++++---- |
29 |
kde-frameworks/kded/kded-9999.ebuild | 6 +++--- |
30 |
.../kdelibs4support/kdelibs4support-9999.ebuild | 22 +++++++++++----------- |
31 |
.../kdesignerplugin/kdesignerplugin-9999.ebuild | 8 ++++---- |
32 |
kde-frameworks/kdewebkit/kdewebkit-9999.ebuild | 10 +++++----- |
33 |
kde-frameworks/kdnssd/kdnssd-9999.ebuild | 6 +++--- |
34 |
kde-frameworks/kemoticons/kemoticons-9999.ebuild | 4 ++-- |
35 |
.../kfilemetadata/kfilemetadata-9999.ebuild | 2 +- |
36 |
.../kglobalaccel/kglobalaccel-9999.ebuild | 10 +++++----- |
37 |
kde-frameworks/kguiaddons/kguiaddons-9999.ebuild | 4 ++-- |
38 |
kde-frameworks/khtml/khtml-9999.ebuild | 16 ++++++++-------- |
39 |
kde-frameworks/ki18n/ki18n-9999.ebuild | 4 ++-- |
40 |
kde-frameworks/kiconthemes/kiconthemes-9999.ebuild | 8 ++++---- |
41 |
kde-frameworks/kidletime/kidletime-9999.ebuild | 8 ++++---- |
42 |
.../kimageformats/kimageformats-9999.ebuild | 4 ++-- |
43 |
kde-frameworks/kinit/kinit-9999.ebuild | 4 ++-- |
44 |
kde-frameworks/kio/kio-9999.ebuild | 16 ++++++++-------- |
45 |
kde-frameworks/kitemmodels/kitemmodels-9999.ebuild | 2 +- |
46 |
kde-frameworks/kitemviews/kitemviews-9999.ebuild | 6 +++--- |
47 |
kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild | 10 +++++----- |
48 |
kde-frameworks/kjsembed/kjsembed-9999.ebuild | 10 +++++----- |
49 |
.../kmediaplayer/kmediaplayer-9999.ebuild | 4 ++-- |
50 |
kde-frameworks/knewstuff/knewstuff-9999.ebuild | 6 +++--- |
51 |
.../knotifications/knotifications-9999.ebuild | 12 ++++++------ |
52 |
.../knotifyconfig/knotifyconfig-9999.ebuild | 6 +++--- |
53 |
kde-frameworks/kparts/kparts-9999.ebuild | 6 +++--- |
54 |
kde-frameworks/kpeople/kpeople-9999.ebuild | 10 +++++----- |
55 |
kde-frameworks/kplotting/kplotting-9999.ebuild | 4 ++-- |
56 |
kde-frameworks/kross/kross-9999.ebuild | 10 +++++----- |
57 |
kde-frameworks/krunner/krunner-9999.ebuild | 6 +++--- |
58 |
kde-frameworks/kservice/kservice-9999.ebuild | 6 +++--- |
59 |
kde-frameworks/ktexteditor/ktexteditor-9999.ebuild | 12 ++++++------ |
60 |
.../ktextwidgets/ktextwidgets-9999.ebuild | 6 +++--- |
61 |
.../kunitconversion/kunitconversion-9999.ebuild | 4 ++-- |
62 |
kde-frameworks/kwallet/kwallet-9999.ebuild | 6 +++--- |
63 |
.../kwidgetsaddons/kwidgetsaddons-9999.ebuild | 8 ++++---- |
64 |
.../kwindowsystem/kwindowsystem-9999.ebuild | 8 ++++---- |
65 |
kde-frameworks/kxmlgui/kxmlgui-9999.ebuild | 12 ++++++------ |
66 |
.../kxmlrpcclient/kxmlrpcclient-9999.ebuild | 2 +- |
67 |
.../modemmanager-qt/modemmanager-qt-9999.ebuild | 4 ++-- |
68 |
.../networkmanager-qt-9999.ebuild | 4 ++-- |
69 |
.../oxygen-icons/oxygen-icons-9999.ebuild | 2 +- |
70 |
kde-frameworks/plasma/plasma-9999.ebuild | 22 +++++++++++----------- |
71 |
kde-frameworks/polkit-qt/polkit-qt-9999.ebuild | 10 +++++----- |
72 |
kde-frameworks/solid/solid-9999.ebuild | 12 ++++++------ |
73 |
kde-frameworks/sonnet/sonnet-9999.ebuild | 6 +++--- |
74 |
62 files changed, 228 insertions(+), 228 deletions(-) |
75 |
|
76 |
diff --git a/kde-frameworks/attica/attica-9999.ebuild b/kde-frameworks/attica/attica-9999.ebuild |
77 |
index 70a8b0f..7c3b852 100644 |
78 |
--- a/kde-frameworks/attica/attica-9999.ebuild |
79 |
+++ b/kde-frameworks/attica/attica-9999.ebuild |
80 |
@@ -12,6 +12,6 @@ KEYWORDS="" |
81 |
IUSE="" |
82 |
|
83 |
RDEPEND=" |
84 |
- dev-qt/qtnetwork:5 |
85 |
+ $(add_qt_dep qtnetwork) |
86 |
" |
87 |
DEPEND="${RDEPEND}" |
88 |
|
89 |
diff --git a/kde-frameworks/baloo/baloo-9999.ebuild b/kde-frameworks/baloo/baloo-9999.ebuild |
90 |
index 7fce09a..fa22cfc 100644 |
91 |
--- a/kde-frameworks/baloo/baloo-9999.ebuild |
92 |
+++ b/kde-frameworks/baloo/baloo-9999.ebuild |
93 |
@@ -22,10 +22,10 @@ DEPEND=" |
94 |
$(add_frameworks_dep kio) |
95 |
$(add_frameworks_dep solid) |
96 |
>=dev-db/lmdb-0.9.17 |
97 |
- dev-qt/qtdbus:5 |
98 |
- dev-qt/qtdeclarative:5 |
99 |
- dev-qt/qtgui:5 |
100 |
- dev-qt/qtwidgets:5 |
101 |
+ $(add_qt_dep qtdbus) |
102 |
+ $(add_qt_dep qtdeclarative) |
103 |
+ $(add_qt_dep qtgui) |
104 |
+ $(add_qt_dep qtwidgets) |
105 |
" |
106 |
RDEPEND="${DEPEND} |
107 |
!kde-base/baloo:4[-minimal(-)] |
108 |
|
109 |
diff --git a/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild b/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild |
110 |
index 2ff5a49..384391f 100644 |
111 |
--- a/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild |
112 |
+++ b/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild |
113 |
@@ -12,9 +12,9 @@ KEYWORDS="" |
114 |
IUSE="" |
115 |
|
116 |
DEPEND=" |
117 |
- dev-qt/qtdbus:5 |
118 |
- dev-qt/qtdeclarative:5 |
119 |
- dev-qt/qtnetwork:5 |
120 |
+ $(add_qt_dep qtdbus) |
121 |
+ $(add_qt_dep qtdeclarative) |
122 |
+ $(add_qt_dep qtnetwork) |
123 |
" |
124 |
RDEPEND="${DEPEND} |
125 |
!kde-plasma/bluez-qt |
126 |
|
127 |
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild |
128 |
index 3e83ad1..5af8bfb 100644 |
129 |
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild |
130 |
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild |
131 |
@@ -24,7 +24,7 @@ DEPEND=" |
132 |
) |
133 |
" |
134 |
RDEPEND=" |
135 |
- dev-qt/qtcore:5 |
136 |
+ $(add_qt_dep qtcore) |
137 |
" |
138 |
|
139 |
python_check_deps() { |
140 |
|
141 |
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild |
142 |
index 2b96998..ebcc851 100644 |
143 |
--- a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild |
144 |
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild |
145 |
@@ -25,12 +25,12 @@ RDEPEND=" |
146 |
$(add_frameworks_dep knotifications) |
147 |
$(add_frameworks_dep kwidgetsaddons) |
148 |
$(add_frameworks_dep kxmlgui) |
149 |
- dev-qt/qtdbus:5 |
150 |
+ $(add_qt_dep qtdbus) |
151 |
dev-qt/qtgui:5= |
152 |
- dev-qt/qtwidgets:5 |
153 |
+ $(add_qt_dep qtwidgets) |
154 |
media-fonts/noto |
155 |
X? ( |
156 |
- dev-qt/qtx11extras:5 |
157 |
+ $(add_qt_dep qtx11extras) |
158 |
x11-libs/libxcb |
159 |
x11-libs/libXcursor |
160 |
) |
161 |
|
162 |
diff --git a/kde-frameworks/kactivities/kactivities-9999.ebuild b/kde-frameworks/kactivities/kactivities-9999.ebuild |
163 |
index aa20c26..70606e1 100644 |
164 |
--- a/kde-frameworks/kactivities/kactivities-9999.ebuild |
165 |
+++ b/kde-frameworks/kactivities/kactivities-9999.ebuild |
166 |
@@ -25,11 +25,11 @@ RDEPEND=" |
167 |
$(add_frameworks_dep kwidgetsaddons) |
168 |
$(add_frameworks_dep kwindowsystem) |
169 |
$(add_frameworks_dep kxmlgui) |
170 |
- dev-qt/qtdbus:5 |
171 |
- dev-qt/qtdeclarative:5 |
172 |
- dev-qt/qtgui:5 |
173 |
- dev-qt/qtsql:5 |
174 |
- dev-qt/qtwidgets:5 |
175 |
+ $(add_qt_dep qtdbus) |
176 |
+ $(add_qt_dep qtdeclarative) |
177 |
+ $(add_qt_dep qtgui) |
178 |
+ $(add_qt_dep qtsql) |
179 |
+ $(add_qt_dep qtwidgets) |
180 |
!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] |
181 |
" |
182 |
DEPEND="${RDEPEND} |
183 |
|
184 |
diff --git a/kde-frameworks/kauth/kauth-9999.ebuild b/kde-frameworks/kauth/kauth-9999.ebuild |
185 |
index 187985c..6584f87 100644 |
186 |
--- a/kde-frameworks/kauth/kauth-9999.ebuild |
187 |
+++ b/kde-frameworks/kauth/kauth-9999.ebuild |
188 |
@@ -14,13 +14,13 @@ IUSE="nls +policykit" |
189 |
|
190 |
RDEPEND=" |
191 |
$(add_frameworks_dep kcoreaddons) |
192 |
- dev-qt/qtdbus:5 |
193 |
- dev-qt/qtgui:5 |
194 |
- dev-qt/qtwidgets:5 |
195 |
+ $(add_qt_dep qtdbus) |
196 |
+ $(add_qt_dep qtgui) |
197 |
+ $(add_qt_dep qtwidgets) |
198 |
policykit? ( || ( $(add_frameworks_dep polkit-qt) sys-auth/polkit-qt[qt5] ) ) |
199 |
" |
200 |
DEPEND="${RDEPEND} |
201 |
- nls? ( dev-qt/linguist-tools:5 ) |
202 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
203 |
" |
204 |
PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )" |
205 |
|
206 |
|
207 |
diff --git a/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild b/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild |
208 |
index b273cf6..41c6b07 100644 |
209 |
--- a/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild |
210 |
+++ b/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild |
211 |
@@ -19,12 +19,12 @@ RDEPEND=" |
212 |
$(add_frameworks_dep kiconthemes) |
213 |
$(add_frameworks_dep kwidgetsaddons) |
214 |
$(add_frameworks_dep kxmlgui) |
215 |
- dev-qt/qtdbus:5 |
216 |
- dev-qt/qtgui:5 |
217 |
- dev-qt/qtwidgets:5 |
218 |
- dev-qt/qtxml:5 |
219 |
+ $(add_qt_dep qtdbus) |
220 |
+ $(add_qt_dep qtgui) |
221 |
+ $(add_qt_dep qtwidgets) |
222 |
+ $(add_qt_dep qtxml) |
223 |
" |
224 |
DEPEND="${RDEPEND} |
225 |
$(add_frameworks_dep kconfigwidgets) |
226 |
- nls? ( dev-qt/linguist-tools:5 ) |
227 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
228 |
" |
229 |
|
230 |
diff --git a/kde-frameworks/kcmutils/kcmutils-9999.ebuild b/kde-frameworks/kcmutils/kcmutils-9999.ebuild |
231 |
index 23d72b0..1d080fe 100644 |
232 |
--- a/kde-frameworks/kcmutils/kcmutils-9999.ebuild |
233 |
+++ b/kde-frameworks/kcmutils/kcmutils-9999.ebuild |
234 |
@@ -24,9 +24,9 @@ RDEPEND=" |
235 |
$(add_frameworks_dep kservice) |
236 |
$(add_frameworks_dep kwidgetsaddons) |
237 |
$(add_frameworks_dep kxmlgui) |
238 |
- dev-qt/qtdbus:5 |
239 |
- dev-qt/qtdeclarative:5 |
240 |
- dev-qt/qtgui:5 |
241 |
- dev-qt/qtwidgets:5 |
242 |
+ $(add_qt_dep qtdbus) |
243 |
+ $(add_qt_dep qtdeclarative) |
244 |
+ $(add_qt_dep qtgui) |
245 |
+ $(add_qt_dep qtwidgets) |
246 |
" |
247 |
DEPEND="${RDEPEND}" |
248 |
|
249 |
diff --git a/kde-frameworks/kcodecs/kcodecs-9999.ebuild b/kde-frameworks/kcodecs/kcodecs-9999.ebuild |
250 |
index a10a133..7d250d7 100644 |
251 |
--- a/kde-frameworks/kcodecs/kcodecs-9999.ebuild |
252 |
+++ b/kde-frameworks/kcodecs/kcodecs-9999.ebuild |
253 |
@@ -11,4 +11,4 @@ LICENSE="GPL-2+ LGPL-2+" |
254 |
KEYWORDS="" |
255 |
IUSE="nls" |
256 |
|
257 |
-DEPEND="nls? ( dev-qt/linguist-tools:5 )" |
258 |
+DEPEND="nls? ( $(add_qt_dep linguist-tools) )" |
259 |
|
260 |
diff --git a/kde-frameworks/kcompletion/kcompletion-9999.ebuild b/kde-frameworks/kcompletion/kcompletion-9999.ebuild |
261 |
index 216594b..9d10348 100644 |
262 |
--- a/kde-frameworks/kcompletion/kcompletion-9999.ebuild |
263 |
+++ b/kde-frameworks/kcompletion/kcompletion-9999.ebuild |
264 |
@@ -14,9 +14,9 @@ IUSE="nls" |
265 |
RDEPEND=" |
266 |
$(add_frameworks_dep kconfig) |
267 |
$(add_frameworks_dep kwidgetsaddons) |
268 |
- dev-qt/qtgui:5 |
269 |
- dev-qt/qtwidgets:5 |
270 |
+ $(add_qt_dep qtgui) |
271 |
+ $(add_qt_dep qtwidgets) |
272 |
" |
273 |
DEPEND="${RDEPEND} |
274 |
- nls? ( dev-qt/linguist-tools:5 ) |
275 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
276 |
" |
277 |
|
278 |
diff --git a/kde-frameworks/kconfig/kconfig-9999.ebuild b/kde-frameworks/kconfig/kconfig-9999.ebuild |
279 |
index c3e8c3e..7b89eac 100644 |
280 |
--- a/kde-frameworks/kconfig/kconfig-9999.ebuild |
281 |
+++ b/kde-frameworks/kconfig/kconfig-9999.ebuild |
282 |
@@ -13,12 +13,12 @@ KEYWORDS="" |
283 |
IUSE="nls" |
284 |
|
285 |
RDEPEND=" |
286 |
- dev-qt/qtgui:5 |
287 |
- dev-qt/qtxml:5 |
288 |
+ $(add_qt_dep qtgui) |
289 |
+ $(add_qt_dep qtxml) |
290 |
" |
291 |
DEPEND="${RDEPEND} |
292 |
- nls? ( dev-qt/linguist-tools:5 ) |
293 |
- test? ( dev-qt/qtconcurrent:5 ) |
294 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
295 |
+ test? ( $(add_qt_dep qtconcurrent) ) |
296 |
" |
297 |
|
298 |
# bug 560086 |
299 |
|
300 |
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild |
301 |
index d1559bd..741aaa1 100644 |
302 |
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild |
303 |
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild |
304 |
@@ -20,9 +20,9 @@ RDEPEND=" |
305 |
$(add_frameworks_dep kguiaddons) |
306 |
$(add_frameworks_dep ki18n) |
307 |
$(add_frameworks_dep kwidgetsaddons) |
308 |
- dev-qt/qtdbus:5 |
309 |
- dev-qt/qtgui:5 |
310 |
- dev-qt/qtwidgets:5 |
311 |
+ $(add_qt_dep qtdbus) |
312 |
+ $(add_qt_dep qtgui) |
313 |
+ $(add_qt_dep qtwidgets) |
314 |
!<kde-frameworks/kdelibs4support-5.3.0:5 |
315 |
" |
316 |
DEPEND="${RDEPEND} |
317 |
|
318 |
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild |
319 |
index dfbaeb7..35adc80 100644 |
320 |
--- a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild |
321 |
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild |
322 |
@@ -12,13 +12,13 @@ KEYWORDS="" |
323 |
IUSE="fam nls" |
324 |
|
325 |
RDEPEND=" |
326 |
- dev-qt/qtcore:5[icu] |
327 |
+ $(add_qt_dep qtcore 'icu') |
328 |
fam? ( virtual/fam ) |
329 |
!<kde-frameworks/kservice-5.2.0:5 |
330 |
" |
331 |
DEPEND="${RDEPEND} |
332 |
x11-misc/shared-mime-info |
333 |
- nls? ( dev-qt/linguist-tools:5 ) |
334 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
335 |
" |
336 |
|
337 |
src_configure() { |
338 |
|
339 |
diff --git a/kde-frameworks/kcrash/kcrash-9999.ebuild b/kde-frameworks/kcrash/kcrash-9999.ebuild |
340 |
index 7bb987a..45cf407 100644 |
341 |
--- a/kde-frameworks/kcrash/kcrash-9999.ebuild |
342 |
+++ b/kde-frameworks/kcrash/kcrash-9999.ebuild |
343 |
@@ -18,15 +18,15 @@ RESTRICT="test" |
344 |
RDEPEND=" |
345 |
$(add_frameworks_dep kcoreaddons) |
346 |
$(add_frameworks_dep kwindowsystem) |
347 |
- dev-qt/qtgui:5 |
348 |
+ $(add_qt_dep qtgui) |
349 |
X? ( |
350 |
- dev-qt/qtx11extras:5 |
351 |
+ $(add_qt_dep qtx11extras) |
352 |
x11-libs/libX11 |
353 |
) |
354 |
" |
355 |
DEPEND="${RDEPEND} |
356 |
- nls? ( dev-qt/linguist-tools:5 ) |
357 |
- test? ( dev-qt/qtwidgets:5 ) |
358 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
359 |
+ test? ( $(add_qt_dep qtwidgets) ) |
360 |
X? ( x11-proto/xproto ) |
361 |
" |
362 |
|
363 |
|
364 |
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild |
365 |
index bde518b..0348a2b 100644 |
366 |
--- a/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild |
367 |
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild |
368 |
@@ -13,11 +13,11 @@ KEYWORDS="" |
369 |
IUSE="nls X" |
370 |
|
371 |
RDEPEND=" |
372 |
- dev-qt/qtdbus:5 |
373 |
- X? ( dev-qt/qtx11extras:5 ) |
374 |
+ $(add_qt_dep qtdbus) |
375 |
+ X? ( $(add_qt_dep qtx11extras) ) |
376 |
" |
377 |
DEPEND="${RDEPEND} |
378 |
- nls? ( dev-qt/linguist-tools:5 ) |
379 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
380 |
" |
381 |
|
382 |
src_configure() { |
383 |
|
384 |
diff --git a/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild b/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild |
385 |
index 43c9df3..40ec06a 100644 |
386 |
--- a/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild |
387 |
+++ b/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild |
388 |
@@ -23,10 +23,10 @@ DEPEND=" |
389 |
$(add_frameworks_dep kservice) |
390 |
$(add_frameworks_dep kwidgetsaddons) |
391 |
$(add_frameworks_dep kwindowsystem) |
392 |
- dev-qt/qtdeclarative:5 |
393 |
- dev-qt/qtgui:5 |
394 |
- dev-qt/qtnetwork:5 |
395 |
- dev-qt/qtwidgets:5 |
396 |
+ $(add_qt_dep qtdeclarative) |
397 |
+ $(add_qt_dep qtgui) |
398 |
+ $(add_qt_dep qtnetwork) |
399 |
+ $(add_qt_dep qtwidgets) |
400 |
media-libs/libepoxy |
401 |
" |
402 |
RDEPEND="${DEPEND}" |
403 |
|
404 |
diff --git a/kde-frameworks/kded/kded-9999.ebuild b/kde-frameworks/kded/kded-9999.ebuild |
405 |
index c272a50..04a9ae1 100644 |
406 |
--- a/kde-frameworks/kded/kded-9999.ebuild |
407 |
+++ b/kde-frameworks/kded/kded-9999.ebuild |
408 |
@@ -19,9 +19,9 @@ RDEPEND=" |
409 |
$(add_frameworks_dep kdbusaddons) |
410 |
$(add_frameworks_dep kinit) |
411 |
$(add_frameworks_dep kservice) |
412 |
- dev-qt/qtdbus:5 |
413 |
- dev-qt/qtgui:5 |
414 |
- dev-qt/qtwidgets:5 |
415 |
+ $(add_qt_dep qtdbus) |
416 |
+ $(add_qt_dep qtgui) |
417 |
+ $(add_qt_dep qtwidgets) |
418 |
" |
419 |
DEPEND="${RDEPEND} |
420 |
man? ( $(add_frameworks_dep kdoctools) ) |
421 |
|
422 |
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild |
423 |
index ff997b0..85cfea6 100644 |
424 |
--- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild |
425 |
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild |
426 |
@@ -41,16 +41,16 @@ COMMON_DEPEND=" |
427 |
$(add_frameworks_dep solid) |
428 |
app-text/docbook-xml-dtd:4.2 |
429 |
dev-libs/openssl:0 |
430 |
- dev-qt/qtdbus:5 |
431 |
- dev-qt/qtgui:5 |
432 |
- dev-qt/qtnetwork:5[ssl] |
433 |
- dev-qt/qtprintsupport:5 |
434 |
- dev-qt/qtsvg:5 |
435 |
- dev-qt/qttest:5 |
436 |
- dev-qt/qtwidgets:5 |
437 |
+ $(add_qt_dep qtdbus) |
438 |
+ $(add_qt_dep qtgui) |
439 |
+ $(add_qt_dep qtnetwork 'ssl') |
440 |
+ $(add_qt_dep qtprintsupport) |
441 |
+ $(add_qt_dep qtsvg) |
442 |
+ $(add_qt_dep qttest) |
443 |
+ $(add_qt_dep qtwidgets) |
444 |
virtual/libintl |
445 |
X? ( |
446 |
- dev-qt/qtx11extras:5 |
447 |
+ $(add_qt_dep qtx11extras) |
448 |
x11-libs/libICE |
449 |
x11-libs/libSM |
450 |
x11-libs/libX11 |
451 |
@@ -61,15 +61,15 @@ RDEPEND="${COMMON_DEPEND} |
452 |
$(add_frameworks_dep kemoticons) |
453 |
$(add_frameworks_dep kinit) |
454 |
$(add_frameworks_dep kitemmodels) |
455 |
- dev-qt/qtxml:5 |
456 |
+ $(add_qt_dep qtxml) |
457 |
!<kde-apps/kcontrol-15.08.0[handbook] |
458 |
" |
459 |
DEPEND="${COMMON_DEPEND} |
460 |
$(add_frameworks_dep kdoctools) |
461 |
dev-lang/perl |
462 |
dev-perl/URI |
463 |
- dev-qt/designer:5 |
464 |
- test? ( dev-qt/qtconcurrent:5 ) |
465 |
+ $(add_qt_dep designer) |
466 |
+ test? ( $(add_qt_dep qtconcurrent) ) |
467 |
X? ( x11-proto/xproto ) |
468 |
" |
469 |
|
470 |
|
471 |
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-9999.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-9999.ebuild |
472 |
index d5bb840..fcde7db 100644 |
473 |
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-9999.ebuild |
474 |
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-9999.ebuild |
475 |
@@ -16,7 +16,7 @@ RDEPEND=" |
476 |
$(add_frameworks_dep kconfig) |
477 |
$(add_frameworks_dep kcoreaddons) |
478 |
designer? ( |
479 |
- dev-qt/designer:5 |
480 |
+ $(add_qt_dep designer) |
481 |
$(add_frameworks_dep kcompletion) |
482 |
$(add_frameworks_dep kconfigwidgets) |
483 |
$(add_frameworks_dep kiconthemes) |
484 |
@@ -29,14 +29,14 @@ RDEPEND=" |
485 |
$(add_frameworks_dep sonnet) |
486 |
) |
487 |
webkit? ( |
488 |
- dev-qt/designer:5 |
489 |
- dev-qt/qtgui:5 |
490 |
+ $(add_qt_dep designer) |
491 |
+ $(add_qt_dep qtgui) |
492 |
$(add_frameworks_dep kdewebkit) |
493 |
) |
494 |
" |
495 |
DEPEND="${RDEPEND} |
496 |
$(add_frameworks_dep kdoctools) |
497 |
- nls? ( dev-qt/linguist-tools:5 ) |
498 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
499 |
" |
500 |
|
501 |
src_configure() { |
502 |
|
503 |
diff --git a/kde-frameworks/kdewebkit/kdewebkit-9999.ebuild b/kde-frameworks/kdewebkit/kdewebkit-9999.ebuild |
504 |
index a14c484..39d637e 100644 |
505 |
--- a/kde-frameworks/kdewebkit/kdewebkit-9999.ebuild |
506 |
+++ b/kde-frameworks/kdewebkit/kdewebkit-9999.ebuild |
507 |
@@ -20,11 +20,11 @@ RDEPEND=" |
508 |
$(add_frameworks_dep kparts) |
509 |
$(add_frameworks_dep kservice) |
510 |
$(add_frameworks_dep kwallet) |
511 |
- dev-qt/qtgui:5 |
512 |
- dev-qt/qtnetwork:5 |
513 |
- dev-qt/qtwebkit:5 |
514 |
- dev-qt/qtwidgets:5 |
515 |
+ $(add_qt_dep qtgui) |
516 |
+ $(add_qt_dep qtnetwork) |
517 |
+ $(add_qt_dep qtwebkit) |
518 |
+ $(add_qt_dep qtwidgets) |
519 |
" |
520 |
DEPEND="${RDEPEND} |
521 |
- dev-qt/qtnetwork:5 |
522 |
+ $(add_qt_dep qtnetwork) |
523 |
" |
524 |
|
525 |
diff --git a/kde-frameworks/kdnssd/kdnssd-9999.ebuild b/kde-frameworks/kdnssd/kdnssd-9999.ebuild |
526 |
index 1c702d9..990c193 100644 |
527 |
--- a/kde-frameworks/kdnssd/kdnssd-9999.ebuild |
528 |
+++ b/kde-frameworks/kdnssd/kdnssd-9999.ebuild |
529 |
@@ -12,14 +12,14 @@ KEYWORDS="" |
530 |
IUSE="nls zeroconf" |
531 |
|
532 |
RDEPEND=" |
533 |
- dev-qt/qtnetwork:5 |
534 |
+ $(add_qt_dep qtnetwork) |
535 |
zeroconf? ( |
536 |
- dev-qt/qtdbus:5 |
537 |
+ $(add_qt_dep qtdbus) |
538 |
net-dns/avahi[mdnsresponder-compat] |
539 |
) |
540 |
" |
541 |
DEPEND="${RDEPEND} |
542 |
- nls? ( dev-qt/linguist-tools:5 ) |
543 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
544 |
" |
545 |
|
546 |
src_configure() { |
547 |
|
548 |
diff --git a/kde-frameworks/kemoticons/kemoticons-9999.ebuild b/kde-frameworks/kemoticons/kemoticons-9999.ebuild |
549 |
index 6b099ed..c6e320b 100644 |
550 |
--- a/kde-frameworks/kemoticons/kemoticons-9999.ebuild |
551 |
+++ b/kde-frameworks/kemoticons/kemoticons-9999.ebuild |
552 |
@@ -17,8 +17,8 @@ RDEPEND=" |
553 |
$(add_frameworks_dep kconfig) |
554 |
$(add_frameworks_dep kcoreaddons) |
555 |
$(add_frameworks_dep kservice) |
556 |
- dev-qt/qtgui:5 |
557 |
- dev-qt/qtxml:5 |
558 |
+ $(add_qt_dep qtgui) |
559 |
+ $(add_qt_dep qtxml) |
560 |
" |
561 |
DEPEND="${RDEPEND}" |
562 |
|
563 |
|
564 |
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild |
565 |
index b1c19d0..77857e1 100644 |
566 |
--- a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild |
567 |
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild |
568 |
@@ -14,7 +14,7 @@ IUSE="epub exif ffmpeg libav pdf taglib" |
569 |
DEPEND=" |
570 |
$(add_frameworks_dep karchive) |
571 |
$(add_frameworks_dep ki18n) |
572 |
- dev-qt/qtxml:5 |
573 |
+ $(add_qt_dep qtxml) |
574 |
epub? ( app-text/ebook-tools ) |
575 |
exif? ( media-gfx/exiv2:= ) |
576 |
ffmpeg? ( |
577 |
|
578 |
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild |
579 |
index 2769bba..bf0a473 100644 |
580 |
--- a/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild |
581 |
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild |
582 |
@@ -18,14 +18,14 @@ RDEPEND=" |
583 |
$(add_frameworks_dep kcrash) |
584 |
$(add_frameworks_dep kdbusaddons) |
585 |
$(add_frameworks_dep kwindowsystem X) |
586 |
- dev-qt/qtdbus:5 |
587 |
- dev-qt/qtgui:5 |
588 |
- dev-qt/qtwidgets:5 |
589 |
- dev-qt/qtx11extras:5 |
590 |
+ $(add_qt_dep qtdbus) |
591 |
+ $(add_qt_dep qtgui) |
592 |
+ $(add_qt_dep qtwidgets) |
593 |
+ $(add_qt_dep qtx11extras) |
594 |
x11-libs/libxcb |
595 |
x11-libs/xcb-util-keysyms |
596 |
!<kde-plasma/plasma-workspace-5.2.0-r2 |
597 |
" |
598 |
DEPEND="${RDEPEND} |
599 |
- nls? ( dev-qt/linguist-tools:5 ) |
600 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
601 |
" |
602 |
|
603 |
diff --git a/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild b/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild |
604 |
index fc771f8..9561550 100644 |
605 |
--- a/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild |
606 |
+++ b/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild |
607 |
@@ -13,8 +13,8 @@ KEYWORDS="" |
608 |
IUSE="" |
609 |
|
610 |
RDEPEND=" |
611 |
- dev-qt/qtgui:5 |
612 |
- dev-qt/qtx11extras:5 |
613 |
+ $(add_qt_dep qtgui) |
614 |
+ $(add_qt_dep qtx11extras) |
615 |
x11-libs/libX11 |
616 |
" |
617 |
DEPEND="${RDEPEND} |
618 |
|
619 |
diff --git a/kde-frameworks/khtml/khtml-9999.ebuild b/kde-frameworks/khtml/khtml-9999.ebuild |
620 |
index 8206b42..6d5abfa 100644 |
621 |
--- a/kde-frameworks/khtml/khtml-9999.ebuild |
622 |
+++ b/kde-frameworks/khtml/khtml-9999.ebuild |
623 |
@@ -34,26 +34,26 @@ RDEPEND=" |
624 |
$(add_frameworks_dep kwindowsystem) |
625 |
$(add_frameworks_dep kxmlgui) |
626 |
$(add_frameworks_dep sonnet) |
627 |
- dev-qt/qtdbus:5 |
628 |
- dev-qt/qtgui:5 |
629 |
- dev-qt/qtnetwork:5[ssl] |
630 |
- dev-qt/qtprintsupport:5 |
631 |
- dev-qt/qtwidgets:5 |
632 |
- dev-qt/qtxml:5 |
633 |
+ $(add_qt_dep qtdbus) |
634 |
+ $(add_qt_dep qtgui) |
635 |
+ $(add_qt_dep qtnetwork 'ssl') |
636 |
+ $(add_qt_dep qtprintsupport) |
637 |
+ $(add_qt_dep qtwidgets) |
638 |
+ $(add_qt_dep qtxml) |
639 |
media-libs/giflib:= |
640 |
media-libs/libpng:0= |
641 |
media-libs/phonon[qt5] |
642 |
sys-libs/zlib |
643 |
virtual/jpeg:0 |
644 |
X? ( |
645 |
- dev-qt/qtx11extras:5 |
646 |
+ $(add_qt_dep qtx11extras) |
647 |
x11-libs/libX11 |
648 |
) |
649 |
" |
650 |
DEPEND="${RDEPEND} |
651 |
dev-lang/perl |
652 |
dev-libs/openssl:0 |
653 |
- test? ( dev-qt/qtx11extras:5 ) |
654 |
+ test? ( $(add_qt_dep qtx11extras) ) |
655 |
X? ( x11-proto/xproto ) |
656 |
" |
657 |
|
658 |
|
659 |
diff --git a/kde-frameworks/ki18n/ki18n-9999.ebuild b/kde-frameworks/ki18n/ki18n-9999.ebuild |
660 |
index 5b73a2f..14be6fe 100644 |
661 |
--- a/kde-frameworks/ki18n/ki18n-9999.ebuild |
662 |
+++ b/kde-frameworks/ki18n/ki18n-9999.ebuild |
663 |
@@ -12,10 +12,10 @@ KEYWORDS="" |
664 |
IUSE="" |
665 |
|
666 |
RDEPEND=" |
667 |
- dev-qt/qtscript:5 |
668 |
+ $(add_qt_dep qtscript) |
669 |
sys-devel/gettext |
670 |
virtual/libintl |
671 |
" |
672 |
DEPEND="${RDEPEND} |
673 |
- test? ( dev-qt/qtconcurrent:5 ) |
674 |
+ test? ( $(add_qt_dep qtconcurrent) ) |
675 |
" |
676 |
|
677 |
diff --git a/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild b/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild |
678 |
index 90053ab..65f2a68 100644 |
679 |
--- a/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild |
680 |
+++ b/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild |
681 |
@@ -19,9 +19,9 @@ RDEPEND=" |
682 |
$(add_frameworks_dep ki18n) |
683 |
$(add_frameworks_dep kitemviews) |
684 |
$(add_frameworks_dep kwidgetsaddons) |
685 |
- dev-qt/qtdbus:5 |
686 |
- dev-qt/qtgui:5 |
687 |
- dev-qt/qtsvg:5 |
688 |
- dev-qt/qtwidgets:5 |
689 |
+ $(add_qt_dep qtdbus) |
690 |
+ $(add_qt_dep qtgui) |
691 |
+ $(add_qt_dep qtsvg) |
692 |
+ $(add_qt_dep qtwidgets) |
693 |
" |
694 |
DEPEND="${RDEPEND}" |
695 |
|
696 |
diff --git a/kde-frameworks/kidletime/kidletime-9999.ebuild b/kde-frameworks/kidletime/kidletime-9999.ebuild |
697 |
index 35277d2..c1d8e85 100644 |
698 |
--- a/kde-frameworks/kidletime/kidletime-9999.ebuild |
699 |
+++ b/kde-frameworks/kidletime/kidletime-9999.ebuild |
700 |
@@ -13,10 +13,10 @@ KEYWORDS="" |
701 |
IUSE="" |
702 |
|
703 |
RDEPEND=" |
704 |
- dev-qt/qtdbus:5 |
705 |
- dev-qt/qtgui:5 |
706 |
- dev-qt/qtwidgets:5 |
707 |
- dev-qt/qtx11extras:5 |
708 |
+ $(add_qt_dep qtdbus) |
709 |
+ $(add_qt_dep qtgui) |
710 |
+ $(add_qt_dep qtwidgets) |
711 |
+ $(add_qt_dep qtx11extras) |
712 |
x11-libs/libX11 |
713 |
x11-libs/libXScrnSaver |
714 |
x11-libs/libXext |
715 |
|
716 |
diff --git a/kde-frameworks/kimageformats/kimageformats-9999.ebuild b/kde-frameworks/kimageformats/kimageformats-9999.ebuild |
717 |
index 4a6c901..f7c821f 100644 |
718 |
--- a/kde-frameworks/kimageformats/kimageformats-9999.ebuild |
719 |
+++ b/kde-frameworks/kimageformats/kimageformats-9999.ebuild |
720 |
@@ -13,8 +13,8 @@ KEYWORDS="" |
721 |
IUSE="eps openexr" |
722 |
|
723 |
RDEPEND=" |
724 |
- dev-qt/qtgui:5 |
725 |
- eps? ( dev-qt/qtprintsupport:5 ) |
726 |
+ $(add_qt_dep qtgui) |
727 |
+ eps? ( $(add_qt_dep qtprintsupport) ) |
728 |
openexr? ( |
729 |
media-libs/ilmbase:= |
730 |
media-libs/openexr:= |
731 |
|
732 |
diff --git a/kde-frameworks/kinit/kinit-9999.ebuild b/kde-frameworks/kinit/kinit-9999.ebuild |
733 |
index c70857c..9a59ede 100644 |
734 |
--- a/kde-frameworks/kinit/kinit-9999.ebuild |
735 |
+++ b/kde-frameworks/kinit/kinit-9999.ebuild |
736 |
@@ -20,8 +20,8 @@ RDEPEND=" |
737 |
$(add_frameworks_dep kio) |
738 |
$(add_frameworks_dep kservice) |
739 |
$(add_frameworks_dep kwindowsystem) |
740 |
- dev-qt/qtdbus:5 |
741 |
- dev-qt/qtgui:5 |
742 |
+ $(add_qt_dep qtdbus) |
743 |
+ $(add_qt_dep qtgui) |
744 |
x11-libs/libX11 |
745 |
x11-libs/libxcb |
746 |
caps? ( sys-libs/libcap ) |
747 |
|
748 |
diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild |
749 |
index 126f7c2..83e0aa9 100644 |
750 |
--- a/kde-frameworks/kio/kio-9999.ebuild |
751 |
+++ b/kde-frameworks/kio/kio-9999.ebuild |
752 |
@@ -33,12 +33,12 @@ COMMON_DEPEND=" |
753 |
$(add_frameworks_dep kwindowsystem) |
754 |
$(add_frameworks_dep kxmlgui) |
755 |
$(add_frameworks_dep solid) |
756 |
- dev-qt/qtdbus:5 |
757 |
- dev-qt/qtgui:5 |
758 |
- dev-qt/qtnetwork:5[ssl] |
759 |
- dev-qt/qtscript:5 |
760 |
- dev-qt/qtwidgets:5 |
761 |
- dev-qt/qtxml:5 |
762 |
+ $(add_qt_dep qtdbus) |
763 |
+ $(add_qt_dep qtgui) |
764 |
+ $(add_qt_dep qtnetwork 'ssl') |
765 |
+ $(add_qt_dep qtscript) |
766 |
+ $(add_qt_dep qtwidgets) |
767 |
+ $(add_qt_dep qtxml) |
768 |
dev-libs/libxml2 |
769 |
dev-libs/libxslt |
770 |
acl? ( |
771 |
@@ -47,10 +47,10 @@ COMMON_DEPEND=" |
772 |
) |
773 |
kerberos? ( virtual/krb5 ) |
774 |
kwallet? ( $(add_frameworks_dep kwallet) ) |
775 |
- X? ( dev-qt/qtx11extras:5 ) |
776 |
+ X? ( $(add_qt_dep qtx11extras) ) |
777 |
" |
778 |
DEPEND="${COMMON_DEPEND} |
779 |
- dev-qt/qtconcurrent:5 |
780 |
+ $(add_qt_dep qtconcurrent) |
781 |
handbook? ( $(add_frameworks_dep kdoctools) ) |
782 |
test? ( sys-libs/zlib ) |
783 |
X? ( |
784 |
|
785 |
diff --git a/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild b/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild |
786 |
index 319e57f..cce8820 100644 |
787 |
--- a/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild |
788 |
+++ b/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild |
789 |
@@ -12,4 +12,4 @@ LICENSE="LGPL-2+" |
790 |
KEYWORDS="" |
791 |
IUSE="" |
792 |
|
793 |
-DEPEND="test? ( dev-qt/qtwidgets:5 )" |
794 |
+DEPEND="test? ( $(add_qt_dep qtwidgets) )" |
795 |
|
796 |
diff --git a/kde-frameworks/kitemviews/kitemviews-9999.ebuild b/kde-frameworks/kitemviews/kitemviews-9999.ebuild |
797 |
index 7e9697a..28a545b 100644 |
798 |
--- a/kde-frameworks/kitemviews/kitemviews-9999.ebuild |
799 |
+++ b/kde-frameworks/kitemviews/kitemviews-9999.ebuild |
800 |
@@ -13,9 +13,9 @@ KEYWORDS="" |
801 |
IUSE="nls" |
802 |
|
803 |
RDEPEND=" |
804 |
- dev-qt/qtgui:5 |
805 |
- dev-qt/qtwidgets:5 |
806 |
+ $(add_qt_dep qtgui) |
807 |
+ $(add_qt_dep qtwidgets) |
808 |
" |
809 |
DEPEND="${RDEPEND} |
810 |
- nls? ( dev-qt/linguist-tools:5 ) |
811 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
812 |
" |
813 |
|
814 |
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild |
815 |
index 2cc6a28..68a83a5 100644 |
816 |
--- a/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild |
817 |
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild |
818 |
@@ -14,13 +14,13 @@ IUSE="nls X" |
819 |
RDEPEND=" |
820 |
$(add_frameworks_dep kcoreaddons) |
821 |
$(add_frameworks_dep kwidgetsaddons) |
822 |
- dev-qt/qtdbus:5 |
823 |
- dev-qt/qtgui:5 |
824 |
- dev-qt/qtwidgets:5 |
825 |
- X? ( dev-qt/qtx11extras:5 ) |
826 |
+ $(add_qt_dep qtdbus) |
827 |
+ $(add_qt_dep qtgui) |
828 |
+ $(add_qt_dep qtwidgets) |
829 |
+ X? ( $(add_qt_dep qtx11extras) ) |
830 |
" |
831 |
DEPEND="${RDEPEND} |
832 |
- nls? ( dev-qt/linguist-tools:5 ) |
833 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
834 |
X? ( |
835 |
x11-libs/libX11 |
836 |
x11-proto/xproto |
837 |
|
838 |
diff --git a/kde-frameworks/kjsembed/kjsembed-9999.ebuild b/kde-frameworks/kjsembed/kjsembed-9999.ebuild |
839 |
index 9f4c8c8..4d73d4d 100644 |
840 |
--- a/kde-frameworks/kjsembed/kjsembed-9999.ebuild |
841 |
+++ b/kde-frameworks/kjsembed/kjsembed-9999.ebuild |
842 |
@@ -15,12 +15,12 @@ IUSE="" |
843 |
RDEPEND=" |
844 |
$(add_frameworks_dep ki18n) |
845 |
$(add_frameworks_dep kjs) |
846 |
- dev-qt/qtgui:5 |
847 |
- dev-qt/qtsvg:5 |
848 |
- dev-qt/qtwidgets:5 |
849 |
- dev-qt/qtxml:5 |
850 |
+ $(add_qt_dep qtgui) |
851 |
+ $(add_qt_dep qtsvg) |
852 |
+ $(add_qt_dep qtwidgets) |
853 |
+ $(add_qt_dep qtxml) |
854 |
" |
855 |
DEPEND="${RDEPEND} |
856 |
$(add_frameworks_dep kdoctools) |
857 |
- dev-qt/designer:5 |
858 |
+ $(add_qt_dep designer) |
859 |
" |
860 |
|
861 |
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-9999.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-9999.ebuild |
862 |
index 69a12cf..5874eca 100644 |
863 |
--- a/kde-frameworks/kmediaplayer/kmediaplayer-9999.ebuild |
864 |
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-9999.ebuild |
865 |
@@ -15,7 +15,7 @@ IUSE="" |
866 |
RDEPEND=" |
867 |
$(add_frameworks_dep kparts) |
868 |
$(add_frameworks_dep kxmlgui) |
869 |
- dev-qt/qtdbus:5 |
870 |
- dev-qt/qtwidgets:5 |
871 |
+ $(add_qt_dep qtdbus) |
872 |
+ $(add_qt_dep qtwidgets) |
873 |
" |
874 |
DEPEND="${RDEPEND}" |
875 |
|
876 |
diff --git a/kde-frameworks/knewstuff/knewstuff-9999.ebuild b/kde-frameworks/knewstuff/knewstuff-9999.ebuild |
877 |
index 71bc28e..8ba2d42 100644 |
878 |
--- a/kde-frameworks/knewstuff/knewstuff-9999.ebuild |
879 |
+++ b/kde-frameworks/knewstuff/knewstuff-9999.ebuild |
880 |
@@ -26,8 +26,8 @@ RDEPEND=" |
881 |
$(add_frameworks_dep ktextwidgets) |
882 |
$(add_frameworks_dep kwidgetsaddons) |
883 |
$(add_frameworks_dep kxmlgui) |
884 |
- dev-qt/qtgui:5 |
885 |
- dev-qt/qtwidgets:5 |
886 |
- dev-qt/qtxml:5 |
887 |
+ $(add_qt_dep qtgui) |
888 |
+ $(add_qt_dep qtwidgets) |
889 |
+ $(add_qt_dep qtxml) |
890 |
" |
891 |
DEPEND="${RDEPEND}" |
892 |
|
893 |
diff --git a/kde-frameworks/knotifications/knotifications-9999.ebuild b/kde-frameworks/knotifications/knotifications-9999.ebuild |
894 |
index 59f2fee..a845c1f 100644 |
895 |
--- a/kde-frameworks/knotifications/knotifications-9999.ebuild |
896 |
+++ b/kde-frameworks/knotifications/knotifications-9999.ebuild |
897 |
@@ -17,20 +17,20 @@ RDEPEND=" |
898 |
$(add_frameworks_dep kconfig) |
899 |
$(add_frameworks_dep kcoreaddons) |
900 |
$(add_frameworks_dep kwindowsystem) |
901 |
- dev-qt/qtdbus:5 |
902 |
- dev-qt/qtgui:5 |
903 |
- dev-qt/qtwidgets:5 |
904 |
+ $(add_qt_dep qtdbus) |
905 |
+ $(add_qt_dep qtgui) |
906 |
+ $(add_qt_dep qtwidgets) |
907 |
media-libs/phonon[qt5] |
908 |
dbus? ( dev-libs/libdbusmenu-qt[qt5] ) |
909 |
- speech? ( dev-qt/qtspeech:5 ) |
910 |
+ speech? ( $(add_qt_dep qtspeech) ) |
911 |
X? ( |
912 |
- dev-qt/qtx11extras:5 |
913 |
+ $(add_qt_dep qtx11extras) |
914 |
x11-libs/libX11 |
915 |
x11-libs/libXtst |
916 |
) |
917 |
" |
918 |
DEPEND="${RDEPEND} |
919 |
- nls? ( dev-qt/linguist-tools:5 ) |
920 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
921 |
X? ( x11-proto/xproto ) |
922 |
" |
923 |
|
924 |
|
925 |
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild |
926 |
index eec120b..cc7ff98 100644 |
927 |
--- a/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild |
928 |
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild |
929 |
@@ -17,9 +17,9 @@ RDEPEND=" |
930 |
$(add_frameworks_dep kconfig) |
931 |
$(add_frameworks_dep ki18n) |
932 |
$(add_frameworks_dep kio) |
933 |
- dev-qt/qtdbus:5 |
934 |
- dev-qt/qtgui:5 |
935 |
- dev-qt/qtwidgets:5 |
936 |
+ $(add_qt_dep qtdbus) |
937 |
+ $(add_qt_dep qtgui) |
938 |
+ $(add_qt_dep qtwidgets) |
939 |
phonon? ( media-libs/phonon[qt5] ) |
940 |
" |
941 |
DEPEND="${RDEPEND}" |
942 |
|
943 |
diff --git a/kde-frameworks/kparts/kparts-9999.ebuild b/kde-frameworks/kparts/kparts-9999.ebuild |
944 |
index c3be144..86bcca5 100644 |
945 |
--- a/kde-frameworks/kparts/kparts-9999.ebuild |
946 |
+++ b/kde-frameworks/kparts/kparts-9999.ebuild |
947 |
@@ -22,9 +22,9 @@ RDEPEND=" |
948 |
$(add_frameworks_dep kservice) |
949 |
$(add_frameworks_dep kwidgetsaddons) |
950 |
$(add_frameworks_dep kxmlgui) |
951 |
- dev-qt/qtgui:5 |
952 |
- dev-qt/qtwidgets:5 |
953 |
- dev-qt/qtxml:5 |
954 |
+ $(add_qt_dep qtgui) |
955 |
+ $(add_qt_dep qtwidgets) |
956 |
+ $(add_qt_dep qtxml) |
957 |
" |
958 |
DEPEND="${RDEPEND} |
959 |
$(add_frameworks_dep ktextwidgets) |
960 |
|
961 |
diff --git a/kde-frameworks/kpeople/kpeople-9999.ebuild b/kde-frameworks/kpeople/kpeople-9999.ebuild |
962 |
index d4d1783..ea9eb76 100644 |
963 |
--- a/kde-frameworks/kpeople/kpeople-9999.ebuild |
964 |
+++ b/kde-frameworks/kpeople/kpeople-9999.ebuild |
965 |
@@ -21,11 +21,11 @@ DEPEND=" |
966 |
$(add_frameworks_dep kitemviews) |
967 |
$(add_frameworks_dep kservice) |
968 |
$(add_frameworks_dep kwidgetsaddons) |
969 |
- dev-qt/qtdbus:5 |
970 |
- dev-qt/qtdeclarative:5 |
971 |
- dev-qt/qtgui:5 |
972 |
- dev-qt/qtsql:5 |
973 |
- dev-qt/qtwidgets:5 |
974 |
+ $(add_qt_dep qtdbus) |
975 |
+ $(add_qt_dep qtdeclarative) |
976 |
+ $(add_qt_dep qtgui) |
977 |
+ $(add_qt_dep qtsql) |
978 |
+ $(add_qt_dep qtwidgets) |
979 |
" |
980 |
RDEPEND="${DEPEND} |
981 |
!net-libs/kpeople:5 |
982 |
|
983 |
diff --git a/kde-frameworks/kplotting/kplotting-9999.ebuild b/kde-frameworks/kplotting/kplotting-9999.ebuild |
984 |
index 46aafd6..5270a96 100644 |
985 |
--- a/kde-frameworks/kplotting/kplotting-9999.ebuild |
986 |
+++ b/kde-frameworks/kplotting/kplotting-9999.ebuild |
987 |
@@ -13,7 +13,7 @@ KEYWORDS="" |
988 |
IUSE="" |
989 |
|
990 |
RDEPEND=" |
991 |
- dev-qt/qtgui:5 |
992 |
- dev-qt/qtwidgets:5 |
993 |
+ $(add_qt_dep qtgui) |
994 |
+ $(add_qt_dep qtwidgets) |
995 |
" |
996 |
DEPEND="${RDEPEND}" |
997 |
|
998 |
diff --git a/kde-frameworks/kross/kross-9999.ebuild b/kde-frameworks/kross/kross-9999.ebuild |
999 |
index 581c993..a610199 100644 |
1000 |
--- a/kde-frameworks/kross/kross-9999.ebuild |
1001 |
+++ b/kde-frameworks/kross/kross-9999.ebuild |
1002 |
@@ -21,12 +21,12 @@ RDEPEND=" |
1003 |
$(add_frameworks_dep kparts) |
1004 |
$(add_frameworks_dep kwidgetsaddons) |
1005 |
$(add_frameworks_dep kxmlgui) |
1006 |
- dev-qt/qtgui:5 |
1007 |
- dev-qt/qtscript:5 |
1008 |
- dev-qt/qtwidgets:5 |
1009 |
- dev-qt/qtxml:5 |
1010 |
+ $(add_qt_dep qtgui) |
1011 |
+ $(add_qt_dep qtscript) |
1012 |
+ $(add_qt_dep qtwidgets) |
1013 |
+ $(add_qt_dep qtxml) |
1014 |
" |
1015 |
DEPEND="${RDEPEND} |
1016 |
$(add_frameworks_dep kdoctools) |
1017 |
- dev-qt/designer:5 |
1018 |
+ $(add_qt_dep designer) |
1019 |
" |
1020 |
|
1021 |
diff --git a/kde-frameworks/krunner/krunner-9999.ebuild b/kde-frameworks/krunner/krunner-9999.ebuild |
1022 |
index 8998521..8a3b19f 100644 |
1023 |
--- a/kde-frameworks/krunner/krunner-9999.ebuild |
1024 |
+++ b/kde-frameworks/krunner/krunner-9999.ebuild |
1025 |
@@ -21,8 +21,8 @@ RDEPEND=" |
1026 |
$(add_frameworks_dep plasma) |
1027 |
$(add_frameworks_dep solid) |
1028 |
$(add_frameworks_dep threadweaver) |
1029 |
- dev-qt/qtdeclarative:5 |
1030 |
- dev-qt/qtgui:5 |
1031 |
- dev-qt/qtwidgets:5 |
1032 |
+ $(add_qt_dep qtdeclarative) |
1033 |
+ $(add_qt_dep qtgui) |
1034 |
+ $(add_qt_dep qtwidgets) |
1035 |
" |
1036 |
DEPEND="${RDEPEND}" |
1037 |
|
1038 |
diff --git a/kde-frameworks/kservice/kservice-9999.ebuild b/kde-frameworks/kservice/kservice-9999.ebuild |
1039 |
index f65a7dd..56117cd 100644 |
1040 |
--- a/kde-frameworks/kservice/kservice-9999.ebuild |
1041 |
+++ b/kde-frameworks/kservice/kservice-9999.ebuild |
1042 |
@@ -17,12 +17,12 @@ RDEPEND=" |
1043 |
$(add_frameworks_dep kcrash) |
1044 |
$(add_frameworks_dep kdbusaddons) |
1045 |
$(add_frameworks_dep ki18n) |
1046 |
- dev-qt/qtdbus:5 |
1047 |
- dev-qt/qtxml:5 |
1048 |
+ $(add_qt_dep qtdbus) |
1049 |
+ $(add_qt_dep qtxml) |
1050 |
" |
1051 |
DEPEND="${RDEPEND} |
1052 |
man? ( $(add_frameworks_dep kdoctools) ) |
1053 |
- test? ( dev-qt/qtconcurrent:5 ) |
1054 |
+ test? ( $(add_qt_dep qtconcurrent) ) |
1055 |
" |
1056 |
|
1057 |
# requires running kde environment |
1058 |
|
1059 |
diff --git a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild |
1060 |
index 12a105f..7d71360 100644 |
1061 |
--- a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild |
1062 |
+++ b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild |
1063 |
@@ -30,15 +30,15 @@ RDEPEND=" |
1064 |
$(add_frameworks_dep kwidgetsaddons) |
1065 |
$(add_frameworks_dep kxmlgui) |
1066 |
$(add_frameworks_dep sonnet) |
1067 |
- dev-qt/qtgui:5 |
1068 |
- dev-qt/qtprintsupport:5 |
1069 |
- dev-qt/qtscript:5 |
1070 |
- dev-qt/qtwidgets:5 |
1071 |
- dev-qt/qtxml:5 |
1072 |
+ $(add_qt_dep qtgui) |
1073 |
+ $(add_qt_dep qtprintsupport) |
1074 |
+ $(add_qt_dep qtscript) |
1075 |
+ $(add_qt_dep qtwidgets) |
1076 |
+ $(add_qt_dep qtxml) |
1077 |
git? ( dev-libs/libgit2:= ) |
1078 |
" |
1079 |
DEPEND="${RDEPEND} |
1080 |
- dev-qt/qtxmlpatterns:5 |
1081 |
+ $(add_qt_dep qtxmlpatterns) |
1082 |
test? ( $(add_frameworks_dep kservice) ) |
1083 |
" |
1084 |
|
1085 |
|
1086 |
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild |
1087 |
index 9b20b51..1d24d6d 100644 |
1088 |
--- a/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild |
1089 |
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild |
1090 |
@@ -23,9 +23,9 @@ RDEPEND=" |
1091 |
$(add_frameworks_dep kwidgetsaddons) |
1092 |
$(add_frameworks_dep kwindowsystem) |
1093 |
$(add_frameworks_dep sonnet) |
1094 |
- dev-qt/qtgui:5 |
1095 |
- dev-qt/qtwidgets:5 |
1096 |
- speech? ( dev-qt/qtspeech:5 ) |
1097 |
+ $(add_qt_dep qtgui) |
1098 |
+ $(add_qt_dep qtwidgets) |
1099 |
+ speech? ( $(add_qt_dep qtspeech) ) |
1100 |
" |
1101 |
DEPEND="${RDEPEND}" |
1102 |
|
1103 |
|
1104 |
diff --git a/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild b/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild |
1105 |
index edcf1f0..cfc4958 100644 |
1106 |
--- a/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild |
1107 |
+++ b/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild |
1108 |
@@ -13,7 +13,7 @@ IUSE="" |
1109 |
|
1110 |
RDEPEND=" |
1111 |
$(add_frameworks_dep ki18n) |
1112 |
- dev-qt/qtnetwork:5 |
1113 |
- dev-qt/qtxml:5 |
1114 |
+ $(add_qt_dep qtnetwork) |
1115 |
+ $(add_qt_dep qtxml) |
1116 |
" |
1117 |
DEPEND="${RDEPEND}" |
1118 |
|
1119 |
diff --git a/kde-frameworks/kwallet/kwallet-9999.ebuild b/kde-frameworks/kwallet/kwallet-9999.ebuild |
1120 |
index 7648dfd..54bd6f6 100644 |
1121 |
--- a/kde-frameworks/kwallet/kwallet-9999.ebuild |
1122 |
+++ b/kde-frameworks/kwallet/kwallet-9999.ebuild |
1123 |
@@ -22,9 +22,9 @@ RDEPEND=" |
1124 |
$(add_frameworks_dep kwidgetsaddons) |
1125 |
$(add_frameworks_dep kwindowsystem) |
1126 |
dev-libs/libgcrypt:0= |
1127 |
- dev-qt/qtdbus:5 |
1128 |
- dev-qt/qtgui:5 |
1129 |
- dev-qt/qtwidgets:5 |
1130 |
+ $(add_qt_dep qtdbus) |
1131 |
+ $(add_qt_dep qtgui) |
1132 |
+ $(add_qt_dep qtwidgets) |
1133 |
gpg? ( |
1134 |
$(add_kdeapps_dep gpgmepp) |
1135 |
app-crypt/gpgme |
1136 |
|
1137 |
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-9999.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-9999.ebuild |
1138 |
index b6c277f..2bffff7 100644 |
1139 |
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-9999.ebuild |
1140 |
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-9999.ebuild |
1141 |
@@ -13,10 +13,10 @@ KEYWORDS="" |
1142 |
IUSE="nls" |
1143 |
|
1144 |
RDEPEND=" |
1145 |
- dev-qt/qtgui:5 |
1146 |
- dev-qt/qtwidgets:5 |
1147 |
+ $(add_qt_dep qtgui) |
1148 |
+ $(add_qt_dep qtwidgets) |
1149 |
" |
1150 |
DEPEND="${RDEPEND} |
1151 |
- nls? ( dev-qt/linguist-tools:5 ) |
1152 |
- test? ( dev-qt/designer:5 ) |
1153 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
1154 |
+ test? ( $(add_qt_dep designer) ) |
1155 |
" |
1156 |
|
1157 |
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild |
1158 |
index b3e2338..0bbfc1f 100644 |
1159 |
--- a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild |
1160 |
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild |
1161 |
@@ -13,10 +13,10 @@ KEYWORDS="" |
1162 |
IUSE="nls X" |
1163 |
|
1164 |
RDEPEND=" |
1165 |
- dev-qt/qtgui:5 |
1166 |
- dev-qt/qtwidgets:5 |
1167 |
+ $(add_qt_dep qtgui) |
1168 |
+ $(add_qt_dep qtwidgets) |
1169 |
X? ( |
1170 |
- dev-qt/qtx11extras:5 |
1171 |
+ $(add_qt_dep qtx11extras) |
1172 |
x11-libs/libX11 |
1173 |
x11-libs/libXfixes |
1174 |
x11-libs/libxcb |
1175 |
@@ -24,7 +24,7 @@ RDEPEND=" |
1176 |
) |
1177 |
" |
1178 |
DEPEND="${RDEPEND} |
1179 |
- nls? ( dev-qt/linguist-tools:5 ) |
1180 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
1181 |
X? ( x11-proto/xproto ) |
1182 |
" |
1183 |
|
1184 |
|
1185 |
diff --git a/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild b/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild |
1186 |
index 8ea6580..0a6c782 100644 |
1187 |
--- a/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild |
1188 |
+++ b/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild |
1189 |
@@ -23,12 +23,12 @@ RDEPEND=" |
1190 |
$(add_frameworks_dep ktextwidgets) |
1191 |
$(add_frameworks_dep kwidgetsaddons) |
1192 |
$(add_frameworks_dep kwindowsystem) |
1193 |
- dev-qt/qtdbus:5 |
1194 |
- dev-qt/qtgui:5 |
1195 |
- dev-qt/qtnetwork:5[ssl] |
1196 |
- dev-qt/qtprintsupport:5 |
1197 |
- dev-qt/qtwidgets:5 |
1198 |
- dev-qt/qtxml:5 |
1199 |
+ $(add_qt_dep qtdbus) |
1200 |
+ $(add_qt_dep qtgui) |
1201 |
+ $(add_qt_dep qtnetwork 'ssl') |
1202 |
+ $(add_qt_dep qtprintsupport) |
1203 |
+ $(add_qt_dep qtwidgets) |
1204 |
+ $(add_qt_dep qtxml) |
1205 |
attica? ( $(add_frameworks_dep attica) ) |
1206 |
" |
1207 |
DEPEND="${RDEPEND}" |
1208 |
|
1209 |
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-9999.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-9999.ebuild |
1210 |
index 340922d..89d4722 100644 |
1211 |
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-9999.ebuild |
1212 |
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-9999.ebuild |
1213 |
@@ -17,7 +17,7 @@ RDEPEND=" |
1214 |
$(add_frameworks_dep kcoreaddons) |
1215 |
$(add_frameworks_dep ki18n) |
1216 |
$(add_frameworks_dep kio) |
1217 |
- dev-qt/qtxml:5 |
1218 |
+ $(add_qt_dep qtxml) |
1219 |
!<kde-plasma/plasma-workspace-5.2.95 |
1220 |
" |
1221 |
DEPEND="${RDEPEND}" |
1222 |
|
1223 |
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild |
1224 |
index 171288a..10392ed 100644 |
1225 |
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild |
1226 |
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild |
1227 |
@@ -12,8 +12,8 @@ KEYWORDS="" |
1228 |
IUSE="" |
1229 |
|
1230 |
RDEPEND=" |
1231 |
- dev-qt/qtdbus:5 |
1232 |
- dev-qt/qtxml:5 |
1233 |
+ $(add_qt_dep qtdbus) |
1234 |
+ $(add_qt_dep qtxml) |
1235 |
net-misc/modemmanager |
1236 |
!kde-plasma/libmm-qt |
1237 |
" |
1238 |
|
1239 |
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-9999.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-9999.ebuild |
1240 |
index 723fea8..7f0a9d6 100644 |
1241 |
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-9999.ebuild |
1242 |
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-9999.ebuild |
1243 |
@@ -12,8 +12,8 @@ KEYWORDS="" |
1244 |
IUSE="teamd" |
1245 |
|
1246 |
RDEPEND=" |
1247 |
- dev-qt/qtdbus:5 |
1248 |
- dev-qt/qtnetwork:5 |
1249 |
+ $(add_qt_dep qtdbus) |
1250 |
+ $(add_qt_dep qtnetwork) |
1251 |
|| ( |
1252 |
>=net-misc/networkmanager-0.9.10.0[consolekit,teamd=] |
1253 |
>=net-misc/networkmanager-0.9.10.0[systemd,teamd=] |
1254 |
|
1255 |
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild |
1256 |
index cdf33f9..f23447b 100644 |
1257 |
--- a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild |
1258 |
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild |
1259 |
@@ -18,6 +18,6 @@ IUSE="" |
1260 |
|
1261 |
DEPEND=" |
1262 |
$(add_frameworks_dep extra-cmake-modules) |
1263 |
- test? ( dev-qt/qttest:5 ) |
1264 |
+ test? ( $(add_qt_dep qttest) ) |
1265 |
" |
1266 |
RDEPEND="!kde-frameworks/oxygen-icons:4" |
1267 |
|
1268 |
diff --git a/kde-frameworks/plasma/plasma-9999.ebuild b/kde-frameworks/plasma/plasma-9999.ebuild |
1269 |
index ba9799c..16793b5 100644 |
1270 |
--- a/kde-frameworks/plasma/plasma-9999.ebuild |
1271 |
+++ b/kde-frameworks/plasma/plasma-9999.ebuild |
1272 |
@@ -30,26 +30,26 @@ COMMON_DEPEND=" |
1273 |
$(add_frameworks_dep kservice) |
1274 |
$(add_frameworks_dep kwindowsystem) |
1275 |
$(add_frameworks_dep kxmlgui) |
1276 |
- dev-qt/qtdbus:5 |
1277 |
- dev-qt/qtdeclarative:5 |
1278 |
- dev-qt/qtgui:5[gles2=] |
1279 |
- dev-qt/qtquickcontrols:5 |
1280 |
- dev-qt/qtscript:5 |
1281 |
- dev-qt/qtsql:5 |
1282 |
- dev-qt/qtsvg:5 |
1283 |
- dev-qt/qtwidgets:5 |
1284 |
- dev-qt/qtxml:5 |
1285 |
+ $(add_qt_dep qtdbus) |
1286 |
+ $(add_qt_dep qtdeclarative) |
1287 |
+ $(add_qt_dep qtgui 'gles2=') |
1288 |
+ $(add_qt_dep qtquickcontrols) |
1289 |
+ $(add_qt_dep qtscript) |
1290 |
+ $(add_qt_dep qtsql) |
1291 |
+ $(add_qt_dep qtsvg) |
1292 |
+ $(add_qt_dep qtwidgets) |
1293 |
+ $(add_qt_dep qtxml) |
1294 |
egl? ( media-libs/mesa[egl] ) |
1295 |
!gles2? ( virtual/opengl ) |
1296 |
X? ( |
1297 |
- dev-qt/qtx11extras:5 |
1298 |
+ $(add_qt_dep qtx11extras) |
1299 |
x11-libs/libX11 |
1300 |
x11-libs/libxcb |
1301 |
) |
1302 |
" |
1303 |
DEPEND="${COMMON_DEPEND} |
1304 |
$(add_frameworks_dep kdoctools) |
1305 |
- dev-qt/qtquick1:5 |
1306 |
+ $(add_qt_dep qtquick1) |
1307 |
X? ( x11-proto/xproto ) |
1308 |
" |
1309 |
RDEPEND="${COMMON_DEPEND} |
1310 |
|
1311 |
diff --git a/kde-frameworks/polkit-qt/polkit-qt-9999.ebuild b/kde-frameworks/polkit-qt/polkit-qt-9999.ebuild |
1312 |
index 2fd202b..cd58a27 100644 |
1313 |
--- a/kde-frameworks/polkit-qt/polkit-qt-9999.ebuild |
1314 |
+++ b/kde-frameworks/polkit-qt/polkit-qt-9999.ebuild |
1315 |
@@ -16,12 +16,12 @@ IUSE="examples" |
1316 |
|
1317 |
DEPEND=" |
1318 |
dev-libs/glib:2 |
1319 |
- dev-qt/qtcore:5 |
1320 |
- dev-qt/qtdbus:5 |
1321 |
- dev-qt/qtgui:5 |
1322 |
- dev-qt/qtwidgets:5 |
1323 |
+ $(add_qt_dep qtcore) |
1324 |
+ $(add_qt_dep qtdbus) |
1325 |
+ $(add_qt_dep qtgui) |
1326 |
+ $(add_qt_dep qtwidgets) |
1327 |
>=sys-auth/polkit-0.103 |
1328 |
- examples? ( dev-qt/qtxml:5 ) |
1329 |
+ examples? ( $(add_qt_dep qtxml) ) |
1330 |
" |
1331 |
RDEPEND="${DEPEND} |
1332 |
!sys-auth/polkit-qt[qt5] |
1333 |
|
1334 |
diff --git a/kde-frameworks/solid/solid-9999.ebuild b/kde-frameworks/solid/solid-9999.ebuild |
1335 |
index 2dc2df9..6a595d7 100644 |
1336 |
--- a/kde-frameworks/solid/solid-9999.ebuild |
1337 |
+++ b/kde-frameworks/solid/solid-9999.ebuild |
1338 |
@@ -13,16 +13,16 @@ KEYWORDS="" |
1339 |
IUSE="nls" |
1340 |
|
1341 |
RDEPEND=" |
1342 |
- dev-qt/qtdbus:5 |
1343 |
- dev-qt/qtdeclarative:5 |
1344 |
- dev-qt/qtwidgets:5 |
1345 |
- dev-qt/qtxml:5 |
1346 |
+ $(add_qt_dep qtdbus) |
1347 |
+ $(add_qt_dep qtdeclarative) |
1348 |
+ $(add_qt_dep qtwidgets) |
1349 |
+ $(add_qt_dep qtxml) |
1350 |
sys-fs/udisks:2 |
1351 |
virtual/udev |
1352 |
" |
1353 |
DEPEND="${RDEPEND} |
1354 |
- nls? ( dev-qt/linguist-tools:5 ) |
1355 |
- test? ( dev-qt/qtconcurrent:5 ) |
1356 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
1357 |
+ test? ( $(add_qt_dep qtconcurrent) ) |
1358 |
" |
1359 |
pkg_postinst() { |
1360 |
kde5_pkg_postinst |
1361 |
|
1362 |
diff --git a/kde-frameworks/sonnet/sonnet-9999.ebuild b/kde-frameworks/sonnet/sonnet-9999.ebuild |
1363 |
index dce4120..d05285c 100644 |
1364 |
--- a/kde-frameworks/sonnet/sonnet-9999.ebuild |
1365 |
+++ b/kde-frameworks/sonnet/sonnet-9999.ebuild |
1366 |
@@ -12,13 +12,13 @@ KEYWORDS="" |
1367 |
IUSE="aspell +hunspell nls" |
1368 |
|
1369 |
RDEPEND=" |
1370 |
- dev-qt/qtgui:5 |
1371 |
- dev-qt/qtwidgets:5 |
1372 |
+ $(add_qt_dep qtgui) |
1373 |
+ $(add_qt_dep qtwidgets) |
1374 |
aspell? ( app-text/aspell ) |
1375 |
hunspell? ( app-text/hunspell ) |
1376 |
" |
1377 |
DEPEND="${RDEPEND} |
1378 |
- nls? ( dev-qt/linguist-tools:5 ) |
1379 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
1380 |
" |
1381 |
|
1382 |
src_configure() { |