Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kaddressbook/, kde-apps/kaccounts-mobile/, kde-apps/messagelib/, ...
Date: Thu, 19 Sep 2019 15:47:57
Message-Id: 1568878629.04e59592c689388aa37ee66821c607744f6a613e.asturm@gentoo
1 commit: 04e59592c689388aa37ee66821c607744f6a613e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 19 07:18:44 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 19 07:37:09 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=04e59592
7
8 */*: Switch to kde-frameworks/kcalendarcore, kde-frameworks/kcontacts
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.17
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 app-office/kmymoney/kmymoney-5.0.9999.ebuild | 2 +-
14 app-office/kmymoney/kmymoney-9999.ebuild | 2 +-
15 app-office/kraft/kraft-9999.ebuild | 2 +-
16 dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild | 2 +-
17 kde-apps/akonadi-calendar/akonadi-calendar-19.08.49.9999.ebuild | 2 +-
18 kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild | 2 +-
19 kde-apps/akonadi-contacts/akonadi-contacts-19.08.49.9999.ebuild | 2 +-
20 kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild | 2 +-
21 .../akonadi-import-wizard/akonadi-import-wizard-19.08.49.9999.ebuild | 2 +-
22 kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild | 2 +-
23 kde-apps/akonadi-search/akonadi-search-19.08.49.9999.ebuild | 4 ++--
24 kde-apps/akonadi-search/akonadi-search-9999.ebuild | 4 ++--
25 kde-apps/akonadiconsole/akonadiconsole-19.08.49.9999.ebuild | 4 ++--
26 kde-apps/akonadiconsole/akonadiconsole-9999.ebuild | 4 ++--
27 kde-apps/calendarjanitor/calendarjanitor-19.08.49.9999.ebuild | 2 +-
28 kde-apps/calendarjanitor/calendarjanitor-9999.ebuild | 2 +-
29 kde-apps/calendarsupport/calendarsupport-19.08.49.9999.ebuild | 2 +-
30 kde-apps/calendarsupport/calendarsupport-9999.ebuild | 2 +-
31 kde-apps/eventviews/eventviews-19.08.49.9999.ebuild | 4 ++--
32 kde-apps/eventviews/eventviews-9999.ebuild | 4 ++--
33 kde-apps/grantlee-editor/grantlee-editor-19.08.49.9999.ebuild | 2 +-
34 kde-apps/grantlee-editor/grantlee-editor-9999.ebuild | 2 +-
35 kde-apps/incidenceeditor/incidenceeditor-19.08.49.9999.ebuild | 4 ++--
36 kde-apps/incidenceeditor/incidenceeditor-9999.ebuild | 4 ++--
37 kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild | 2 +-
38 kde-apps/kaddressbook/kaddressbook-19.08.49.9999.ebuild | 2 +-
39 kde-apps/kaddressbook/kaddressbook-9999.ebuild | 2 +-
40 kde-apps/kalarm/kalarm-19.08.49.9999.ebuild | 4 ++--
41 kde-apps/kalarm/kalarm-9999.ebuild | 4 ++--
42 kde-apps/kalarmcal/kalarmcal-19.08.49.9999.ebuild | 2 +-
43 kde-apps/kalarmcal/kalarmcal-9999.ebuild | 2 +-
44 kde-apps/kblog/kblog-19.08.49.9999.ebuild | 2 +-
45 kde-apps/kblog/kblog-9999.ebuild | 2 +-
46 kde-apps/kcalutils/kcalutils-19.08.49.9999.ebuild | 2 +-
47 kde-apps/kcalutils/kcalutils-9999.ebuild | 2 +-
48 kde-apps/kdepim-addons/kdepim-addons-19.08.49.9999.ebuild | 2 +-
49 kde-apps/kdepim-addons/kdepim-addons-9999.ebuild | 2 +-
50 kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.49.9999.ebuild | 2 +-
51 kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild | 2 +-
52 kde-apps/kdepim-meta/kdepim-meta-19.08.49.9999.ebuild | 2 --
53 kde-apps/kdepim-meta/kdepim-meta-9999.ebuild | 2 --
54 kde-apps/kdepim-runtime/kdepim-runtime-19.08.49.9999.ebuild | 4 ++--
55 kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 4 ++--
56 kde-apps/kgpg/kgpg-19.08.49.9999.ebuild | 2 +-
57 kde-apps/kgpg/kgpg-9999.ebuild | 2 +-
58 kde-apps/kitinerary/kitinerary-19.08.49.9999.ebuild | 4 ++--
59 kde-apps/kitinerary/kitinerary-9999.ebuild | 4 ++--
60 kde-apps/kmail/kmail-19.08.49.9999.ebuild | 4 ++--
61 kde-apps/kmail/kmail-9999.ebuild | 4 ++--
62 kde-apps/knotes/knotes-19.08.49.9999.ebuild | 4 ++--
63 kde-apps/knotes/knotes-9999.ebuild | 4 ++--
64 kde-apps/konsolekalendar/konsolekalendar-19.08.49.9999.ebuild | 2 +-
65 kde-apps/konsolekalendar/konsolekalendar-9999.ebuild | 2 +-
66 kde-apps/kopete/kopete-19.08.49.9999.ebuild | 2 +-
67 kde-apps/kopete/kopete-9999.ebuild | 2 +-
68 kde-apps/korganizer/korganizer-19.08.49.9999.ebuild | 4 ++--
69 kde-apps/korganizer/korganizer-9999.ebuild | 4 ++--
70 kde-apps/libkdepim/libkdepim-19.08.49.9999.ebuild | 2 +-
71 kde-apps/libkdepim/libkdepim-9999.ebuild | 2 +-
72 kde-apps/libkgapi/libkgapi-19.08.49.9999.ebuild | 4 ++--
73 kde-apps/libkgapi/libkgapi-9999.ebuild | 4 ++--
74 kde-apps/libktnef/libktnef-19.08.49.9999.ebuild | 4 ++--
75 kde-apps/libktnef/libktnef-9999.ebuild | 4 ++--
76 kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild | 2 +-
77 kde-apps/mailcommon/mailcommon-9999.ebuild | 2 +-
78 kde-apps/messagelib/messagelib-19.08.49.9999.ebuild | 4 ++--
79 kde-apps/messagelib/messagelib-9999.ebuild | 4 ++--
80 kde-apps/pim-data-exporter/pim-data-exporter-19.08.49.9999.ebuild | 2 +-
81 kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild | 2 +-
82 kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.49.9999.ebuild | 4 ++--
83 kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild | 4 ++--
84 kde-apps/pimcommon/pimcommon-19.08.49.9999.ebuild | 2 +-
85 kde-apps/pimcommon/pimcommon-9999.ebuild | 2 +-
86 .../akonadi-phabricator-resource-9999.ebuild | 2 +-
87 kde-misc/akonadiclient/akonadiclient-9999.ebuild | 2 +-
88 kde-misc/itinerary/itinerary-9999.ebuild | 2 +-
89 kde-misc/ktimetracker/ktimetracker-9999.ebuild | 2 +-
90 kde-misc/zanshin/zanshin-9999.ebuild | 4 ++--
91 media-gfx/digikam/digikam-9999.ebuild | 4 ++--
92 79 files changed, 107 insertions(+), 111 deletions(-)
93
94 diff --git a/app-office/kmymoney/kmymoney-5.0.9999.ebuild b/app-office/kmymoney/kmymoney-5.0.9999.ebuild
95 index e7469b8356..ba468eca16 100644
96 --- a/app-office/kmymoney/kmymoney-5.0.9999.ebuild
97 +++ b/app-office/kmymoney/kmymoney-5.0.9999.ebuild
98 @@ -61,8 +61,8 @@ COMMON_DEPEND="
99 dev-libs/libgpg-error
100 activities? ( $(add_frameworks_dep kactivities) )
101 addressbook? (
102 + $(add_frameworks_dep kcontacts)
103 $(add_kdeapps_dep akonadi)
104 - $(add_kdeapps_dep kcontacts)
105 $(add_kdeapps_dep kidentitymanagement)
106 )
107 calendar? ( dev-libs/libical:= )
108
109 diff --git a/app-office/kmymoney/kmymoney-9999.ebuild b/app-office/kmymoney/kmymoney-9999.ebuild
110 index caab8c9038..a9f1c77f0a 100644
111 --- a/app-office/kmymoney/kmymoney-9999.ebuild
112 +++ b/app-office/kmymoney/kmymoney-9999.ebuild
113 @@ -60,8 +60,8 @@ COMMON_DEPEND="
114 dev-libs/libgpg-error
115 activities? ( $(add_frameworks_dep kactivities) )
116 addressbook? (
117 + $(add_frameworks_dep kcontacts)
118 $(add_kdeapps_dep akonadi)
119 - $(add_kdeapps_dep kcontacts)
120 $(add_kdeapps_dep kidentitymanagement)
121 )
122 calendar? ( dev-libs/libical:= )
123
124 diff --git a/app-office/kraft/kraft-9999.ebuild b/app-office/kraft/kraft-9999.ebuild
125 index 5ff85b862e..64b25b530f 100644
126 --- a/app-office/kraft/kraft-9999.ebuild
127 +++ b/app-office/kraft/kraft-9999.ebuild
128 @@ -16,11 +16,11 @@ IUSE="pim"
129 DEPEND="
130 $(add_frameworks_dep kconfig)
131 $(add_frameworks_dep kconfigwidgets)
132 + $(add_frameworks_dep kcontacts)
133 $(add_frameworks_dep kcoreaddons)
134 $(add_frameworks_dep ki18n)
135 $(add_frameworks_dep kwidgetsaddons)
136 $(add_frameworks_dep kxmlgui)
137 - $(add_kdeapps_dep kcontacts)
138 $(add_qt_dep qtgui)
139 $(add_qt_dep qtsql)
140 $(add_qt_dep qtwidgets)
141
142 diff --git a/dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild b/dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild
143 index 555d5e2a58..ea1a6fc566 100644
144 --- a/dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild
145 +++ b/dev-libs/kpeoplevcard/kpeoplevcard-9999.ebuild
146 @@ -13,9 +13,9 @@ KEYWORDS=""
147 IUSE=""
148
149 DEPEND="
150 + $(add_frameworks_dep kcontacts)
151 $(add_frameworks_dep kcoreaddons)
152 $(add_frameworks_dep kpeople)
153 - $(add_kdeapps_dep kcontacts)
154 $(add_qt_dep qtgui)
155 $(add_qt_dep qtwidgets)
156 "
157
158 diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.49.9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.49.9999.ebuild
159 index 454805cea2..32f18515b1 100644
160 --- a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.49.9999.ebuild
161 +++ b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.49.9999.ebuild
162 @@ -12,6 +12,7 @@ KEYWORDS=""
163 IUSE=""
164
165 DEPEND="
166 + $(add_frameworks_dep kcalendarcore)
167 $(add_frameworks_dep kcodecs)
168 $(add_frameworks_dep kconfig)
169 $(add_frameworks_dep kconfigwidgets)
170 @@ -27,7 +28,6 @@ DEPEND="
171 $(add_kdeapps_dep akonadi)
172 $(add_kdeapps_dep akonadi-contacts)
173 $(add_kdeapps_dep akonadi-mime)
174 - $(add_kdeapps_dep kcalcore)
175 $(add_kdeapps_dep kcalutils)
176 $(add_kdeapps_dep kidentitymanagement)
177 $(add_kdeapps_dep kmailtransport)
178
179 diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
180 index 454805cea2..32f18515b1 100644
181 --- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
182 +++ b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
183 @@ -12,6 +12,7 @@ KEYWORDS=""
184 IUSE=""
185
186 DEPEND="
187 + $(add_frameworks_dep kcalendarcore)
188 $(add_frameworks_dep kcodecs)
189 $(add_frameworks_dep kconfig)
190 $(add_frameworks_dep kconfigwidgets)
191 @@ -27,7 +28,6 @@ DEPEND="
192 $(add_kdeapps_dep akonadi)
193 $(add_kdeapps_dep akonadi-contacts)
194 $(add_kdeapps_dep akonadi-mime)
195 - $(add_kdeapps_dep kcalcore)
196 $(add_kdeapps_dep kcalutils)
197 $(add_kdeapps_dep kidentitymanagement)
198 $(add_kdeapps_dep kmailtransport)
199
200 diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.08.49.9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-19.08.49.9999.ebuild
201 index 8dee6162b1..674cd45fa3 100644
202 --- a/kde-apps/akonadi-contacts/akonadi-contacts-19.08.49.9999.ebuild
203 +++ b/kde-apps/akonadi-contacts/akonadi-contacts-19.08.49.9999.ebuild
204 @@ -19,6 +19,7 @@ DEPEND="
205 $(add_frameworks_dep kcompletion)
206 $(add_frameworks_dep kconfig)
207 $(add_frameworks_dep kconfigwidgets)
208 + $(add_frameworks_dep kcontacts)
209 $(add_frameworks_dep kcoreaddons)
210 $(add_frameworks_dep kdbusaddons)
211 $(add_frameworks_dep kiconthemes)
212 @@ -30,7 +31,6 @@ DEPEND="
213 $(add_frameworks_dep kxmlgui)
214 $(add_frameworks_dep prison)
215 $(add_kdeapps_dep akonadi)
216 - $(add_kdeapps_dep kcontacts)
217 $(add_kdeapps_dep kmime)
218 $(add_qt_dep qtdbus)
219 $(add_qt_dep qtgui)
220
221 diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
222 index 8dee6162b1..674cd45fa3 100644
223 --- a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
224 +++ b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
225 @@ -19,6 +19,7 @@ DEPEND="
226 $(add_frameworks_dep kcompletion)
227 $(add_frameworks_dep kconfig)
228 $(add_frameworks_dep kconfigwidgets)
229 + $(add_frameworks_dep kcontacts)
230 $(add_frameworks_dep kcoreaddons)
231 $(add_frameworks_dep kdbusaddons)
232 $(add_frameworks_dep kiconthemes)
233 @@ -30,7 +31,6 @@ DEPEND="
234 $(add_frameworks_dep kxmlgui)
235 $(add_frameworks_dep prison)
236 $(add_kdeapps_dep akonadi)
237 - $(add_kdeapps_dep kcontacts)
238 $(add_kdeapps_dep kmime)
239 $(add_qt_dep qtdbus)
240 $(add_qt_dep qtgui)
241
242 diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.49.9999.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.49.9999.ebuild
243 index 5168e3991b..3b95348ba6 100644
244 --- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.49.9999.ebuild
245 +++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.49.9999.ebuild
246 @@ -15,6 +15,7 @@ IUSE=""
247 DEPEND="
248 $(add_frameworks_dep kcompletion)
249 $(add_frameworks_dep kconfig)
250 + $(add_frameworks_dep kcontacts)
251 $(add_frameworks_dep kcoreaddons)
252 $(add_frameworks_dep kcrash)
253 $(add_frameworks_dep kdbusaddons)
254 @@ -23,7 +24,6 @@ DEPEND="
255 $(add_frameworks_dep kwidgetsaddons)
256 $(add_frameworks_dep kxmlgui)
257 $(add_kdeapps_dep akonadi)
258 - $(add_kdeapps_dep kcontacts)
259 $(add_kdeapps_dep kidentitymanagement)
260 $(add_kdeapps_dep kmailtransport)
261 $(add_kdeapps_dep libkdepim)
262
263 diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
264 index 5168e3991b..3b95348ba6 100644
265 --- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
266 +++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
267 @@ -15,6 +15,7 @@ IUSE=""
268 DEPEND="
269 $(add_frameworks_dep kcompletion)
270 $(add_frameworks_dep kconfig)
271 + $(add_frameworks_dep kcontacts)
272 $(add_frameworks_dep kcoreaddons)
273 $(add_frameworks_dep kcrash)
274 $(add_frameworks_dep kdbusaddons)
275 @@ -23,7 +24,6 @@ DEPEND="
276 $(add_frameworks_dep kwidgetsaddons)
277 $(add_frameworks_dep kxmlgui)
278 $(add_kdeapps_dep akonadi)
279 - $(add_kdeapps_dep kcontacts)
280 $(add_kdeapps_dep kidentitymanagement)
281 $(add_kdeapps_dep kmailtransport)
282 $(add_kdeapps_dep libkdepim)
283
284 diff --git a/kde-apps/akonadi-search/akonadi-search-19.08.49.9999.ebuild b/kde-apps/akonadi-search/akonadi-search-19.08.49.9999.ebuild
285 index 793a4c3645..bc95fadf79 100644
286 --- a/kde-apps/akonadi-search/akonadi-search-19.08.49.9999.ebuild
287 +++ b/kde-apps/akonadi-search/akonadi-search-19.08.49.9999.ebuild
288 @@ -17,10 +17,12 @@ BDEPEND="
289 test? ( $(add_kdeapps_dep akonadi 'tools') )
290 "
291 COMMON_DEPEND="
292 + $(add_frameworks_dep kcalendarcore)
293 $(add_frameworks_dep kcmutils)
294 $(add_frameworks_dep kcodecs)
295 $(add_frameworks_dep kconfig)
296 $(add_frameworks_dep kconfigwidgets)
297 + $(add_frameworks_dep kcontacts)
298 $(add_frameworks_dep kcoreaddons)
299 $(add_frameworks_dep kdbusaddons)
300 $(add_frameworks_dep kio)
301 @@ -28,8 +30,6 @@ COMMON_DEPEND="
302 $(add_frameworks_dep krunner)
303 $(add_kdeapps_dep akonadi)
304 $(add_kdeapps_dep akonadi-mime)
305 - $(add_kdeapps_dep kcalcore)
306 - $(add_kdeapps_dep kcontacts)
307 $(add_kdeapps_dep kmime)
308 $(add_qt_dep qtdbus)
309 $(add_qt_dep qtgui)
310
311 diff --git a/kde-apps/akonadi-search/akonadi-search-9999.ebuild b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
312 index 793a4c3645..bc95fadf79 100644
313 --- a/kde-apps/akonadi-search/akonadi-search-9999.ebuild
314 +++ b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
315 @@ -17,10 +17,12 @@ BDEPEND="
316 test? ( $(add_kdeapps_dep akonadi 'tools') )
317 "
318 COMMON_DEPEND="
319 + $(add_frameworks_dep kcalendarcore)
320 $(add_frameworks_dep kcmutils)
321 $(add_frameworks_dep kcodecs)
322 $(add_frameworks_dep kconfig)
323 $(add_frameworks_dep kconfigwidgets)
324 + $(add_frameworks_dep kcontacts)
325 $(add_frameworks_dep kcoreaddons)
326 $(add_frameworks_dep kdbusaddons)
327 $(add_frameworks_dep kio)
328 @@ -28,8 +30,6 @@ COMMON_DEPEND="
329 $(add_frameworks_dep krunner)
330 $(add_kdeapps_dep akonadi)
331 $(add_kdeapps_dep akonadi-mime)
332 - $(add_kdeapps_dep kcalcore)
333 - $(add_kdeapps_dep kcontacts)
334 $(add_kdeapps_dep kmime)
335 $(add_qt_dep qtdbus)
336 $(add_qt_dep qtgui)
337
338 diff --git a/kde-apps/akonadiconsole/akonadiconsole-19.08.49.9999.ebuild b/kde-apps/akonadiconsole/akonadiconsole-19.08.49.9999.ebuild
339 index ba334978cf..f2b080e922 100644
340 --- a/kde-apps/akonadiconsole/akonadiconsole-19.08.49.9999.ebuild
341 +++ b/kde-apps/akonadiconsole/akonadiconsole-19.08.49.9999.ebuild
342 @@ -14,9 +14,11 @@ KEYWORDS=""
343 IUSE=""
344
345 DEPEND="
346 + $(add_frameworks_dep kcalendarcore)
347 $(add_frameworks_dep kcompletion)
348 $(add_frameworks_dep kconfig)
349 $(add_frameworks_dep kconfigwidgets)
350 + $(add_frameworks_dep kcontacts)
351 $(add_frameworks_dep kcoreaddons)
352 $(add_frameworks_dep kcrash)
353 $(add_frameworks_dep kdbusaddons)
354 @@ -31,8 +33,6 @@ DEPEND="
355 $(add_kdeapps_dep akonadi-contacts)
356 $(add_kdeapps_dep akonadi-search)
357 $(add_kdeapps_dep calendarsupport)
358 - $(add_kdeapps_dep kcalcore)
359 - $(add_kdeapps_dep kcontacts)
360 $(add_kdeapps_dep kmime)
361 $(add_kdeapps_dep libkdepim)
362 $(add_kdeapps_dep messagelib)
363
364 diff --git a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild b/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
365 index ba334978cf..4c4ac0788d 100644
366 --- a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
367 +++ b/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
368 @@ -31,8 +31,8 @@ DEPEND="
369 $(add_kdeapps_dep akonadi-contacts)
370 $(add_kdeapps_dep akonadi-search)
371 $(add_kdeapps_dep calendarsupport)
372 - $(add_kdeapps_dep kcalcore)
373 - $(add_kdeapps_dep kcontacts)
374 + $(add_frameworks_dep kcalendarcore)
375 + $(add_frameworks_dep kcontacts)
376 $(add_kdeapps_dep kmime)
377 $(add_kdeapps_dep libkdepim)
378 $(add_kdeapps_dep messagelib)
379
380 diff --git a/kde-apps/calendarjanitor/calendarjanitor-19.08.49.9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-19.08.49.9999.ebuild
381 index f4a453f8d4..5908a010e9 100644
382 --- a/kde-apps/calendarjanitor/calendarjanitor-19.08.49.9999.ebuild
383 +++ b/kde-apps/calendarjanitor/calendarjanitor-19.08.49.9999.ebuild
384 @@ -15,12 +15,12 @@ KEYWORDS=""
385 IUSE=""
386
387 DEPEND="
388 + $(add_frameworks_dep kcalendarcore)
389 $(add_frameworks_dep kcoreaddons)
390 $(add_frameworks_dep ki18n)
391 $(add_kdeapps_dep akonadi)
392 $(add_kdeapps_dep akonadi-calendar)
393 $(add_kdeapps_dep calendarsupport)
394 - $(add_kdeapps_dep kcalcore)
395 $(add_qt_dep qtwidgets)
396 "
397 RDEPEND="${DEPEND}
398
399 diff --git a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
400 index f4a453f8d4..5908a010e9 100644
401 --- a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
402 +++ b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
403 @@ -15,12 +15,12 @@ KEYWORDS=""
404 IUSE=""
405
406 DEPEND="
407 + $(add_frameworks_dep kcalendarcore)
408 $(add_frameworks_dep kcoreaddons)
409 $(add_frameworks_dep ki18n)
410 $(add_kdeapps_dep akonadi)
411 $(add_kdeapps_dep akonadi-calendar)
412 $(add_kdeapps_dep calendarsupport)
413 - $(add_kdeapps_dep kcalcore)
414 $(add_qt_dep qtwidgets)
415 "
416 RDEPEND="${DEPEND}
417
418 diff --git a/kde-apps/calendarsupport/calendarsupport-19.08.49.9999.ebuild b/kde-apps/calendarsupport/calendarsupport-19.08.49.9999.ebuild
419 index 86a6d6c13f..93def382b9 100644
420 --- a/kde-apps/calendarsupport/calendarsupport-19.08.49.9999.ebuild
421 +++ b/kde-apps/calendarsupport/calendarsupport-19.08.49.9999.ebuild
422 @@ -12,6 +12,7 @@ KEYWORDS=""
423 IUSE=""
424
425 DEPEND="
426 + $(add_frameworks_dep kcalendarcore)
427 $(add_frameworks_dep kcodecs)
428 $(add_frameworks_dep kcompletion)
429 $(add_frameworks_dep kconfig)
430 @@ -26,7 +27,6 @@ DEPEND="
431 $(add_kdeapps_dep akonadi)
432 $(add_kdeapps_dep akonadi-calendar)
433 $(add_kdeapps_dep akonadi-mime)
434 - $(add_kdeapps_dep kcalcore)
435 $(add_kdeapps_dep kcalutils)
436 $(add_kdeapps_dep kdepim-apps-libs)
437 $(add_kdeapps_dep kidentitymanagement)
438
439 diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
440 index 86a6d6c13f..93def382b9 100644
441 --- a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
442 +++ b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
443 @@ -12,6 +12,7 @@ KEYWORDS=""
444 IUSE=""
445
446 DEPEND="
447 + $(add_frameworks_dep kcalendarcore)
448 $(add_frameworks_dep kcodecs)
449 $(add_frameworks_dep kcompletion)
450 $(add_frameworks_dep kconfig)
451 @@ -26,7 +27,6 @@ DEPEND="
452 $(add_kdeapps_dep akonadi)
453 $(add_kdeapps_dep akonadi-calendar)
454 $(add_kdeapps_dep akonadi-mime)
455 - $(add_kdeapps_dep kcalcore)
456 $(add_kdeapps_dep kcalutils)
457 $(add_kdeapps_dep kdepim-apps-libs)
458 $(add_kdeapps_dep kidentitymanagement)
459
460 diff --git a/kde-apps/eventviews/eventviews-19.08.49.9999.ebuild b/kde-apps/eventviews/eventviews-19.08.49.9999.ebuild
461 index a86cf051a9..f9f7bd18d8 100644
462 --- a/kde-apps/eventviews/eventviews-19.08.49.9999.ebuild
463 +++ b/kde-apps/eventviews/eventviews-19.08.49.9999.ebuild
464 @@ -13,10 +13,12 @@ IUSE=""
465
466 # drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
467 DEPEND="
468 + $(add_frameworks_dep kcalendarcore)
469 $(add_frameworks_dep kcodecs)
470 $(add_frameworks_dep kcompletion)
471 $(add_frameworks_dep kconfig)
472 $(add_frameworks_dep kconfigwidgets)
473 + $(add_frameworks_dep kcontacts)
474 $(add_frameworks_dep kcoreaddons)
475 $(add_frameworks_dep kguiaddons)
476 $(add_frameworks_dep ki18n)
477 @@ -27,9 +29,7 @@ DEPEND="
478 $(add_kdeapps_dep akonadi)
479 $(add_kdeapps_dep akonadi-calendar)
480 $(add_kdeapps_dep calendarsupport)
481 - $(add_kdeapps_dep kcalcore)
482 $(add_kdeapps_dep kcalutils)
483 - $(add_kdeapps_dep kcontacts)
484 $(add_kdeapps_dep kmime)
485 $(add_kdeapps_dep libkdepim)
486 $(add_qt_dep designer)
487
488 diff --git a/kde-apps/eventviews/eventviews-9999.ebuild b/kde-apps/eventviews/eventviews-9999.ebuild
489 index a86cf051a9..f9f7bd18d8 100644
490 --- a/kde-apps/eventviews/eventviews-9999.ebuild
491 +++ b/kde-apps/eventviews/eventviews-9999.ebuild
492 @@ -13,10 +13,12 @@ IUSE=""
493
494 # drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
495 DEPEND="
496 + $(add_frameworks_dep kcalendarcore)
497 $(add_frameworks_dep kcodecs)
498 $(add_frameworks_dep kcompletion)
499 $(add_frameworks_dep kconfig)
500 $(add_frameworks_dep kconfigwidgets)
501 + $(add_frameworks_dep kcontacts)
502 $(add_frameworks_dep kcoreaddons)
503 $(add_frameworks_dep kguiaddons)
504 $(add_frameworks_dep ki18n)
505 @@ -27,9 +29,7 @@ DEPEND="
506 $(add_kdeapps_dep akonadi)
507 $(add_kdeapps_dep akonadi-calendar)
508 $(add_kdeapps_dep calendarsupport)
509 - $(add_kdeapps_dep kcalcore)
510 $(add_kdeapps_dep kcalutils)
511 - $(add_kdeapps_dep kcontacts)
512 $(add_kdeapps_dep kmime)
513 $(add_kdeapps_dep libkdepim)
514 $(add_qt_dep designer)
515
516 diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.08.49.9999.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.08.49.9999.ebuild
517 index 4a5ff58889..bbd16dad18 100644
518 --- a/kde-apps/grantlee-editor/grantlee-editor-19.08.49.9999.ebuild
519 +++ b/kde-apps/grantlee-editor/grantlee-editor-19.08.49.9999.ebuild
520 @@ -16,6 +16,7 @@ DEPEND="
521 $(add_frameworks_dep kcompletion)
522 $(add_frameworks_dep kconfig)
523 $(add_frameworks_dep kconfigwidgets)
524 + $(add_frameworks_dep kcontacts)
525 $(add_frameworks_dep kcoreaddons)
526 $(add_frameworks_dep kcrash)
527 $(add_frameworks_dep kdbusaddons)
528 @@ -27,7 +28,6 @@ DEPEND="
529 $(add_frameworks_dep kwidgetsaddons)
530 $(add_frameworks_dep kxmlgui)
531 $(add_kdeapps_dep akonadi-contacts)
532 - $(add_kdeapps_dep kcontacts)
533 $(add_kdeapps_dep kmime)
534 $(add_kdeapps_dep kpimtextedit)
535 $(add_kdeapps_dep messagelib)
536
537 diff --git a/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild b/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
538 index 4a5ff58889..bbd16dad18 100644
539 --- a/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
540 +++ b/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
541 @@ -16,6 +16,7 @@ DEPEND="
542 $(add_frameworks_dep kcompletion)
543 $(add_frameworks_dep kconfig)
544 $(add_frameworks_dep kconfigwidgets)
545 + $(add_frameworks_dep kcontacts)
546 $(add_frameworks_dep kcoreaddons)
547 $(add_frameworks_dep kcrash)
548 $(add_frameworks_dep kdbusaddons)
549 @@ -27,7 +28,6 @@ DEPEND="
550 $(add_frameworks_dep kwidgetsaddons)
551 $(add_frameworks_dep kxmlgui)
552 $(add_kdeapps_dep akonadi-contacts)
553 - $(add_kdeapps_dep kcontacts)
554 $(add_kdeapps_dep kmime)
555 $(add_kdeapps_dep kpimtextedit)
556 $(add_kdeapps_dep messagelib)
557
558 diff --git a/kde-apps/incidenceeditor/incidenceeditor-19.08.49.9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-19.08.49.9999.ebuild
559 index 37c3b14e3a..bac95b1dc4 100644
560 --- a/kde-apps/incidenceeditor/incidenceeditor-19.08.49.9999.ebuild
561 +++ b/kde-apps/incidenceeditor/incidenceeditor-19.08.49.9999.ebuild
562 @@ -13,10 +13,12 @@ KEYWORDS=""
563 IUSE=""
564
565 DEPEND="
566 + $(add_frameworks_dep kcalendarcore)
567 $(add_frameworks_dep kcodecs)
568 $(add_frameworks_dep kcompletion)
569 $(add_frameworks_dep kconfig)
570 $(add_frameworks_dep kconfigwidgets)
571 + $(add_frameworks_dep kcontacts)
572 $(add_frameworks_dep kcoreaddons)
573 $(add_frameworks_dep ki18n)
574 $(add_frameworks_dep kiconthemes)
575 @@ -33,9 +35,7 @@ DEPEND="
576 $(add_kdeapps_dep akonadi-mime)
577 $(add_kdeapps_dep calendarsupport)
578 $(add_kdeapps_dep eventviews)
579 - $(add_kdeapps_dep kcalcore)
580 $(add_kdeapps_dep kcalutils)
581 - $(add_kdeapps_dep kcontacts)
582 $(add_kdeapps_dep kdepim-apps-libs)
583 $(add_kdeapps_dep kidentitymanagement)
584 $(add_kdeapps_dep kldap)
585
586 diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
587 index 37c3b14e3a..bac95b1dc4 100644
588 --- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
589 +++ b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
590 @@ -13,10 +13,12 @@ KEYWORDS=""
591 IUSE=""
592
593 DEPEND="
594 + $(add_frameworks_dep kcalendarcore)
595 $(add_frameworks_dep kcodecs)
596 $(add_frameworks_dep kcompletion)
597 $(add_frameworks_dep kconfig)
598 $(add_frameworks_dep kconfigwidgets)
599 + $(add_frameworks_dep kcontacts)
600 $(add_frameworks_dep kcoreaddons)
601 $(add_frameworks_dep ki18n)
602 $(add_frameworks_dep kiconthemes)
603 @@ -33,9 +35,7 @@ DEPEND="
604 $(add_kdeapps_dep akonadi-mime)
605 $(add_kdeapps_dep calendarsupport)
606 $(add_kdeapps_dep eventviews)
607 - $(add_kdeapps_dep kcalcore)
608 $(add_kdeapps_dep kcalutils)
609 - $(add_kdeapps_dep kcontacts)
610 $(add_kdeapps_dep kdepim-apps-libs)
611 $(add_kdeapps_dep kidentitymanagement)
612 $(add_kdeapps_dep kldap)
613
614 diff --git a/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild b/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
615 index 0061ca76ea..8ba6e81e95 100644
616 --- a/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
617 +++ b/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
618 @@ -17,10 +17,10 @@ BDEPEND="
619 "
620 DEPEND="
621 $(add_frameworks_dep kconfig)
622 + $(add_frameworks_dep kcontacts)
623 $(add_frameworks_dep kcoreaddons)
624 $(add_frameworks_dep ki18n)
625 $(add_frameworks_dep kio)
626 - $(add_kdeapps_dep kcontacts)
627 $(add_qt_dep qtdeclarative)
628 $(add_qt_dep qtgui)
629 $(add_qt_dep qtnetwork)
630
631 diff --git a/kde-apps/kaddressbook/kaddressbook-19.08.49.9999.ebuild b/kde-apps/kaddressbook/kaddressbook-19.08.49.9999.ebuild
632 index 6c9f1f2109..2f8bbabf96 100644
633 --- a/kde-apps/kaddressbook/kaddressbook-19.08.49.9999.ebuild
634 +++ b/kde-apps/kaddressbook/kaddressbook-19.08.49.9999.ebuild
635 @@ -21,6 +21,7 @@ DEPEND="
636 $(add_frameworks_dep kcompletion)
637 $(add_frameworks_dep kconfig)
638 $(add_frameworks_dep kconfigwidgets)
639 + $(add_frameworks_dep kcontacts)
640 $(add_frameworks_dep kcoreaddons)
641 $(add_frameworks_dep kcrash)
642 $(add_frameworks_dep ki18n)
643 @@ -37,7 +38,6 @@ DEPEND="
644 $(add_kdeapps_dep akonadi-contacts)
645 $(add_kdeapps_dep akonadi-search)
646 $(add_kdeapps_dep grantleetheme)
647 - $(add_kdeapps_dep kcontacts)
648 $(add_kdeapps_dep kdepim-apps-libs)
649 $(add_kdeapps_dep kontactinterface)
650 $(add_kdeapps_dep libgravatar)
651
652 diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
653 index 6c9f1f2109..2f8bbabf96 100644
654 --- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
655 +++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
656 @@ -21,6 +21,7 @@ DEPEND="
657 $(add_frameworks_dep kcompletion)
658 $(add_frameworks_dep kconfig)
659 $(add_frameworks_dep kconfigwidgets)
660 + $(add_frameworks_dep kcontacts)
661 $(add_frameworks_dep kcoreaddons)
662 $(add_frameworks_dep kcrash)
663 $(add_frameworks_dep ki18n)
664 @@ -37,7 +38,6 @@ DEPEND="
665 $(add_kdeapps_dep akonadi-contacts)
666 $(add_kdeapps_dep akonadi-search)
667 $(add_kdeapps_dep grantleetheme)
668 - $(add_kdeapps_dep kcontacts)
669 $(add_kdeapps_dep kdepim-apps-libs)
670 $(add_kdeapps_dep kontactinterface)
671 $(add_kdeapps_dep libgravatar)
672
673 diff --git a/kde-apps/kalarm/kalarm-19.08.49.9999.ebuild b/kde-apps/kalarm/kalarm-19.08.49.9999.ebuild
674 index 8d57935981..32c7578a1c 100644
675 --- a/kde-apps/kalarm/kalarm-19.08.49.9999.ebuild
676 +++ b/kde-apps/kalarm/kalarm-19.08.49.9999.ebuild
677 @@ -17,11 +17,13 @@ BDEPEND="
678 "
679 DEPEND="
680 $(add_frameworks_dep kauth)
681 + $(add_frameworks_dep kcalendarcore)
682 $(add_frameworks_dep kcmutils)
683 $(add_frameworks_dep kcodecs)
684 $(add_frameworks_dep kcompletion)
685 $(add_frameworks_dep kconfig)
686 $(add_frameworks_dep kconfigwidgets)
687 + $(add_frameworks_dep kcontacts)
688 $(add_frameworks_dep kcoreaddons)
689 $(add_frameworks_dep kcrash)
690 $(add_frameworks_dep kdbusaddons)
691 @@ -44,9 +46,7 @@ DEPEND="
692 $(add_kdeapps_dep akonadi-contacts)
693 $(add_kdeapps_dep akonadi-mime)
694 $(add_kdeapps_dep kalarmcal)
695 - $(add_kdeapps_dep kcalcore)
696 $(add_kdeapps_dep kcalutils)
697 - $(add_kdeapps_dep kcontacts)
698 $(add_kdeapps_dep kdepim-apps-libs)
699 $(add_kdeapps_dep kidentitymanagement)
700 $(add_kdeapps_dep kmailtransport)
701
702 diff --git a/kde-apps/kalarm/kalarm-9999.ebuild b/kde-apps/kalarm/kalarm-9999.ebuild
703 index 1fcd56cd00..682ec1cabc 100644
704 --- a/kde-apps/kalarm/kalarm-9999.ebuild
705 +++ b/kde-apps/kalarm/kalarm-9999.ebuild
706 @@ -17,11 +17,13 @@ BDEPEND="
707 "
708 DEPEND="
709 $(add_frameworks_dep kauth)
710 + $(add_frameworks_dep kcalendarcore)
711 $(add_frameworks_dep kcmutils)
712 $(add_frameworks_dep kcodecs)
713 $(add_frameworks_dep kcompletion)
714 $(add_frameworks_dep kconfig)
715 $(add_frameworks_dep kconfigwidgets)
716 + $(add_frameworks_dep kcontacts)
717 $(add_frameworks_dep kcoreaddons)
718 $(add_frameworks_dep kcrash)
719 $(add_frameworks_dep kdbusaddons)
720 @@ -43,9 +45,7 @@ DEPEND="
721 $(add_kdeapps_dep akonadi-contacts)
722 $(add_kdeapps_dep akonadi-mime)
723 $(add_kdeapps_dep kalarmcal)
724 - $(add_kdeapps_dep kcalcore)
725 $(add_kdeapps_dep kcalutils)
726 - $(add_kdeapps_dep kcontacts)
727 $(add_kdeapps_dep kdepim-apps-libs)
728 $(add_kdeapps_dep kidentitymanagement)
729 $(add_kdeapps_dep kmailtransport)
730
731 diff --git a/kde-apps/kalarmcal/kalarmcal-19.08.49.9999.ebuild b/kde-apps/kalarmcal/kalarmcal-19.08.49.9999.ebuild
732 index 29679e5d17..b151247463 100644
733 --- a/kde-apps/kalarmcal/kalarmcal-19.08.49.9999.ebuild
734 +++ b/kde-apps/kalarmcal/kalarmcal-19.08.49.9999.ebuild
735 @@ -12,11 +12,11 @@ KEYWORDS=""
736 IUSE=""
737
738 COMMON_DEPEND="
739 + $(add_frameworks_dep kcalendarcore)
740 $(add_frameworks_dep kconfig)
741 $(add_frameworks_dep kholidays)
742 $(add_frameworks_dep ki18n)
743 $(add_kdeapps_dep akonadi)
744 - $(add_kdeapps_dep kcalcore)
745 $(add_kdeapps_dep kcalutils)
746 $(add_kdeapps_dep kidentitymanagement)
747 $(add_qt_dep qtgui)
748
749 diff --git a/kde-apps/kalarmcal/kalarmcal-9999.ebuild b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
750 index 29679e5d17..b151247463 100644
751 --- a/kde-apps/kalarmcal/kalarmcal-9999.ebuild
752 +++ b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
753 @@ -12,11 +12,11 @@ KEYWORDS=""
754 IUSE=""
755
756 COMMON_DEPEND="
757 + $(add_frameworks_dep kcalendarcore)
758 $(add_frameworks_dep kconfig)
759 $(add_frameworks_dep kholidays)
760 $(add_frameworks_dep ki18n)
761 $(add_kdeapps_dep akonadi)
762 - $(add_kdeapps_dep kcalcore)
763 $(add_kdeapps_dep kcalutils)
764 $(add_kdeapps_dep kidentitymanagement)
765 $(add_qt_dep qtgui)
766
767 diff --git a/kde-apps/kblog/kblog-19.08.49.9999.ebuild b/kde-apps/kblog/kblog-19.08.49.9999.ebuild
768 index 136a040996..6975c2c131 100644
769 --- a/kde-apps/kblog/kblog-19.08.49.9999.ebuild
770 +++ b/kde-apps/kblog/kblog-19.08.49.9999.ebuild
771 @@ -12,12 +12,12 @@ KEYWORDS=""
772 IUSE=""
773
774 DEPEND="
775 + $(add_frameworks_dep kcalendarcore)
776 $(add_frameworks_dep kcoreaddons)
777 $(add_frameworks_dep ki18n)
778 $(add_frameworks_dep kio)
779 $(add_frameworks_dep kxmlrpcclient)
780 $(add_frameworks_dep syndication)
781 - $(add_kdeapps_dep kcalcore)
782 "
783 RDEPEND="${DEPEND}
784 !kde-apps/kdepim-l10n
785
786 diff --git a/kde-apps/kblog/kblog-9999.ebuild b/kde-apps/kblog/kblog-9999.ebuild
787 index 136a040996..6975c2c131 100644
788 --- a/kde-apps/kblog/kblog-9999.ebuild
789 +++ b/kde-apps/kblog/kblog-9999.ebuild
790 @@ -12,12 +12,12 @@ KEYWORDS=""
791 IUSE=""
792
793 DEPEND="
794 + $(add_frameworks_dep kcalendarcore)
795 $(add_frameworks_dep kcoreaddons)
796 $(add_frameworks_dep ki18n)
797 $(add_frameworks_dep kio)
798 $(add_frameworks_dep kxmlrpcclient)
799 $(add_frameworks_dep syndication)
800 - $(add_kdeapps_dep kcalcore)
801 "
802 RDEPEND="${DEPEND}
803 !kde-apps/kdepim-l10n
804
805 diff --git a/kde-apps/kcalutils/kcalutils-19.08.49.9999.ebuild b/kde-apps/kcalutils/kcalutils-19.08.49.9999.ebuild
806 index 34483cbe23..671d0e84d0 100644
807 --- a/kde-apps/kcalutils/kcalutils-19.08.49.9999.ebuild
808 +++ b/kde-apps/kcalutils/kcalutils-19.08.49.9999.ebuild
809 @@ -13,6 +13,7 @@ KEYWORDS=""
810 IUSE=""
811
812 DEPEND="
813 + $(add_frameworks_dep kcalendarcore)
814 $(add_frameworks_dep kcodecs)
815 $(add_frameworks_dep kconfig)
816 $(add_frameworks_dep kconfigwidgets)
817 @@ -20,7 +21,6 @@ DEPEND="
818 $(add_frameworks_dep ki18n)
819 $(add_frameworks_dep kiconthemes)
820 $(add_frameworks_dep kwidgetsaddons)
821 - $(add_kdeapps_dep kcalcore)
822 $(add_kdeapps_dep kidentitymanagement)
823 $(add_qt_dep qtgui)
824 $(add_qt_dep qtwidgets)
825
826 diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/kcalutils/kcalutils-9999.ebuild
827 index 34483cbe23..671d0e84d0 100644
828 --- a/kde-apps/kcalutils/kcalutils-9999.ebuild
829 +++ b/kde-apps/kcalutils/kcalutils-9999.ebuild
830 @@ -13,6 +13,7 @@ KEYWORDS=""
831 IUSE=""
832
833 DEPEND="
834 + $(add_frameworks_dep kcalendarcore)
835 $(add_frameworks_dep kcodecs)
836 $(add_frameworks_dep kconfig)
837 $(add_frameworks_dep kconfigwidgets)
838 @@ -20,7 +21,6 @@ DEPEND="
839 $(add_frameworks_dep ki18n)
840 $(add_frameworks_dep kiconthemes)
841 $(add_frameworks_dep kwidgetsaddons)
842 - $(add_kdeapps_dep kcalcore)
843 $(add_kdeapps_dep kidentitymanagement)
844 $(add_qt_dep qtgui)
845 $(add_qt_dep qtwidgets)
846
847 diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.08.49.9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.08.49.9999.ebuild
848 index 62401c3543..6799bff5c3 100644
849 --- a/kde-apps/kdepim-addons/kdepim-addons-19.08.49.9999.ebuild
850 +++ b/kde-apps/kdepim-addons/kdepim-addons-19.08.49.9999.ebuild
851 @@ -19,6 +19,7 @@ COMMON_DEPEND="
852 $(add_frameworks_dep kcompletion)
853 $(add_frameworks_dep kconfig)
854 $(add_frameworks_dep kconfigwidgets)
855 + $(add_frameworks_dep kcontacts)
856 $(add_frameworks_dep kcoreaddons)
857 $(add_frameworks_dep kdbusaddons)
858 $(add_frameworks_dep ki18n)
859 @@ -36,7 +37,6 @@ COMMON_DEPEND="
860 $(add_kdeapps_dep eventviews)
861 $(add_kdeapps_dep grantleetheme)
862 $(add_kdeapps_dep incidenceeditor)
863 - $(add_kdeapps_dep kcontacts)
864 $(add_kdeapps_dep kdepim-apps-libs)
865 $(add_kdeapps_dep kidentitymanagement)
866 $(add_kdeapps_dep kimap)
867
868 diff --git a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
869 index f98a8a84a5..62f46524fe 100644
870 --- a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
871 +++ b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
872 @@ -20,6 +20,7 @@ COMMON_DEPEND="
873 $(add_frameworks_dep kcompletion)
874 $(add_frameworks_dep kconfig)
875 $(add_frameworks_dep kconfigwidgets)
876 + $(add_frameworks_dep kcontacts)
877 $(add_frameworks_dep kcoreaddons)
878 $(add_frameworks_dep kdbusaddons)
879 $(add_frameworks_dep ki18n)
880 @@ -37,7 +38,6 @@ COMMON_DEPEND="
881 $(add_kdeapps_dep eventviews)
882 $(add_kdeapps_dep grantleetheme)
883 $(add_kdeapps_dep incidenceeditor)
884 - $(add_kdeapps_dep kcontacts)
885 $(add_kdeapps_dep kdepim-apps-libs)
886 $(add_kdeapps_dep kidentitymanagement)
887 $(add_kdeapps_dep kimap)
888
889 diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.49.9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.49.9999.ebuild
890 index 2640615efc..6410a79ed1 100644
891 --- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.49.9999.ebuild
892 +++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.49.9999.ebuild
893 @@ -15,6 +15,7 @@ IUSE=""
894 DEPEND="
895 $(add_frameworks_dep kconfig)
896 $(add_frameworks_dep kconfigwidgets)
897 + $(add_frameworks_dep kcontacts)
898 $(add_frameworks_dep kcoreaddons)
899 $(add_frameworks_dep ki18n)
900 $(add_frameworks_dep kiconthemes)
901 @@ -25,7 +26,6 @@ DEPEND="
902 $(add_kdeapps_dep akonadi)
903 $(add_kdeapps_dep akonadi-contacts)
904 $(add_kdeapps_dep grantleetheme)
905 - $(add_kdeapps_dep kcontacts)
906 $(add_kdeapps_dep libkleo)
907 $(add_kdeapps_dep pimcommon)
908 $(add_qt_dep qtdbus)
909
910 diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
911 index 2640615efc..6410a79ed1 100644
912 --- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
913 +++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
914 @@ -15,6 +15,7 @@ IUSE=""
915 DEPEND="
916 $(add_frameworks_dep kconfig)
917 $(add_frameworks_dep kconfigwidgets)
918 + $(add_frameworks_dep kcontacts)
919 $(add_frameworks_dep kcoreaddons)
920 $(add_frameworks_dep ki18n)
921 $(add_frameworks_dep kiconthemes)
922 @@ -25,7 +26,6 @@ DEPEND="
923 $(add_kdeapps_dep akonadi)
924 $(add_kdeapps_dep akonadi-contacts)
925 $(add_kdeapps_dep grantleetheme)
926 - $(add_kdeapps_dep kcontacts)
927 $(add_kdeapps_dep libkleo)
928 $(add_kdeapps_dep pimcommon)
929 $(add_qt_dep qtdbus)
930
931 diff --git a/kde-apps/kdepim-meta/kdepim-meta-19.08.49.9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-19.08.49.9999.ebuild
932 index e647fe170f..3f60686af9 100644
933 --- a/kde-apps/kdepim-meta/kdepim-meta-19.08.49.9999.ebuild
934 +++ b/kde-apps/kdepim-meta/kdepim-meta-19.08.49.9999.ebuild
935 @@ -30,9 +30,7 @@ RDEPEND="
936 >=kde-apps/kaddressbook-${PV}:${SLOT}
937 >=kde-apps/kalarm-${PV}:${SLOT}
938 >=kde-apps/kalarmcal-${PV}:${SLOT}
939 - >=kde-apps/kcalcore-${PV}:${SLOT}
940 >=kde-apps/kcalutils-${PV}:${SLOT}
941 - >=kde-apps/kcontacts-${PV}:${SLOT}
942 >=kde-apps/kdepim-addons-${PV}:${SLOT}
943 >=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
944 >=kde-apps/kdepim-runtime-${PV}:${SLOT}
945
946 diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
947 index e647fe170f..3f60686af9 100644
948 --- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
949 +++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
950 @@ -30,9 +30,7 @@ RDEPEND="
951 >=kde-apps/kaddressbook-${PV}:${SLOT}
952 >=kde-apps/kalarm-${PV}:${SLOT}
953 >=kde-apps/kalarmcal-${PV}:${SLOT}
954 - >=kde-apps/kcalcore-${PV}:${SLOT}
955 >=kde-apps/kcalutils-${PV}:${SLOT}
956 - >=kde-apps/kcontacts-${PV}:${SLOT}
957 >=kde-apps/kdepim-addons-${PV}:${SLOT}
958 >=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
959 >=kde-apps/kdepim-runtime-${PV}:${SLOT}
960
961 diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.49.9999.ebuild
962 index d80ed74619..4a0b30fee1 100644
963 --- a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.49.9999.ebuild
964 +++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.49.9999.ebuild
965 @@ -18,10 +18,12 @@ BDEPEND="
966 dev-libs/libxslt
967 "
968 COMMON_DEPEND="
969 + $(add_frameworks_dep kcalendarcore)
970 $(add_frameworks_dep kcodecs)
971 $(add_frameworks_dep kcompletion)
972 $(add_frameworks_dep kconfig)
973 $(add_frameworks_dep kconfigwidgets)
974 + $(add_frameworks_dep kcontacts)
975 $(add_frameworks_dep kcoreaddons)
976 $(add_frameworks_dep kdbusaddons)
977 $(add_frameworks_dep kholidays)
978 @@ -43,9 +45,7 @@ COMMON_DEPEND="
979 $(add_kdeapps_dep akonadi-mime)
980 $(add_kdeapps_dep akonadi-notes)
981 $(add_kdeapps_dep kalarmcal)
982 - $(add_kdeapps_dep kcalcore)
983 $(add_kdeapps_dep kcalutils)
984 - $(add_kdeapps_dep kcontacts)
985 $(add_kdeapps_dep kdav)
986 $(add_kdeapps_dep kidentitymanagement)
987 $(add_kdeapps_dep kimap)
988
989 diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
990 index 372b1943b9..6a882de56e 100644
991 --- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
992 +++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
993 @@ -18,10 +18,12 @@ BDEPEND="
994 dev-libs/libxslt
995 "
996 COMMON_DEPEND="
997 + $(add_frameworks_dep kcalendarcore)
998 $(add_frameworks_dep kcodecs)
999 $(add_frameworks_dep kcompletion)
1000 $(add_frameworks_dep kconfig)
1001 $(add_frameworks_dep kconfigwidgets)
1002 + $(add_frameworks_dep kcontacts)
1003 $(add_frameworks_dep kcoreaddons)
1004 $(add_frameworks_dep kdbusaddons)
1005 $(add_frameworks_dep kholidays)
1006 @@ -43,9 +45,7 @@ COMMON_DEPEND="
1007 $(add_kdeapps_dep akonadi-mime)
1008 $(add_kdeapps_dep akonadi-notes)
1009 $(add_kdeapps_dep kalarmcal)
1010 - $(add_kdeapps_dep kcalcore)
1011 $(add_kdeapps_dep kcalutils)
1012 - $(add_kdeapps_dep kcontacts)
1013 $(add_kdeapps_dep kdav)
1014 $(add_kdeapps_dep kidentitymanagement)
1015 $(add_kdeapps_dep kimap)
1016
1017 diff --git a/kde-apps/kgpg/kgpg-19.08.49.9999.ebuild b/kde-apps/kgpg/kgpg-19.08.49.9999.ebuild
1018 index 6546c84b40..407f318461 100644
1019 --- a/kde-apps/kgpg/kgpg-19.08.49.9999.ebuild
1020 +++ b/kde-apps/kgpg/kgpg-19.08.49.9999.ebuild
1021 @@ -18,6 +18,7 @@ COMMON_DEPEND="
1022 $(add_frameworks_dep kcodecs)
1023 $(add_frameworks_dep kconfig)
1024 $(add_frameworks_dep kconfigwidgets)
1025 + $(add_frameworks_dep kcontacts)
1026 $(add_frameworks_dep kcoreaddons)
1027 $(add_frameworks_dep kcrash)
1028 $(add_frameworks_dep kdbusaddons)
1029 @@ -33,7 +34,6 @@ COMMON_DEPEND="
1030 $(add_frameworks_dep kxmlgui)
1031 $(add_kdeapps_dep akonadi)
1032 $(add_kdeapps_dep akonadi-contacts)
1033 - $(add_kdeapps_dep kcontacts)
1034 $(add_qt_dep qtdbus)
1035 $(add_qt_dep qtgui)
1036 $(add_qt_dep qtnetwork)
1037
1038 diff --git a/kde-apps/kgpg/kgpg-9999.ebuild b/kde-apps/kgpg/kgpg-9999.ebuild
1039 index 6546c84b40..407f318461 100644
1040 --- a/kde-apps/kgpg/kgpg-9999.ebuild
1041 +++ b/kde-apps/kgpg/kgpg-9999.ebuild
1042 @@ -18,6 +18,7 @@ COMMON_DEPEND="
1043 $(add_frameworks_dep kcodecs)
1044 $(add_frameworks_dep kconfig)
1045 $(add_frameworks_dep kconfigwidgets)
1046 + $(add_frameworks_dep kcontacts)
1047 $(add_frameworks_dep kcoreaddons)
1048 $(add_frameworks_dep kcrash)
1049 $(add_frameworks_dep kdbusaddons)
1050 @@ -33,7 +34,6 @@ COMMON_DEPEND="
1051 $(add_frameworks_dep kxmlgui)
1052 $(add_kdeapps_dep akonadi)
1053 $(add_kdeapps_dep akonadi-contacts)
1054 - $(add_kdeapps_dep kcontacts)
1055 $(add_qt_dep qtdbus)
1056 $(add_qt_dep qtgui)
1057 $(add_qt_dep qtnetwork)
1058
1059 diff --git a/kde-apps/kitinerary/kitinerary-19.08.49.9999.ebuild b/kde-apps/kitinerary/kitinerary-19.08.49.9999.ebuild
1060 index f6b4bf5232..90274d01e5 100644
1061 --- a/kde-apps/kitinerary/kitinerary-19.08.49.9999.ebuild
1062 +++ b/kde-apps/kitinerary/kitinerary-19.08.49.9999.ebuild
1063 @@ -16,9 +16,9 @@ IUSE="+barcode pdf"
1064
1065 DEPEND="
1066 $(add_frameworks_dep karchive)
1067 + $(add_frameworks_dep kcalendarcore)
1068 + $(add_frameworks_dep kcontacts)
1069 $(add_frameworks_dep ki18n)
1070 - $(add_kdeapps_dep kcalcore)
1071 - $(add_kdeapps_dep kcontacts)
1072 $(add_kdeapps_dep kmime)
1073 $(add_kdeapps_dep kpkpass)
1074 $(add_qt_dep qtdeclarative)
1075
1076 diff --git a/kde-apps/kitinerary/kitinerary-9999.ebuild b/kde-apps/kitinerary/kitinerary-9999.ebuild
1077 index f6b4bf5232..90274d01e5 100644
1078 --- a/kde-apps/kitinerary/kitinerary-9999.ebuild
1079 +++ b/kde-apps/kitinerary/kitinerary-9999.ebuild
1080 @@ -16,9 +16,9 @@ IUSE="+barcode pdf"
1081
1082 DEPEND="
1083 $(add_frameworks_dep karchive)
1084 + $(add_frameworks_dep kcalendarcore)
1085 + $(add_frameworks_dep kcontacts)
1086 $(add_frameworks_dep ki18n)
1087 - $(add_kdeapps_dep kcalcore)
1088 - $(add_kdeapps_dep kcontacts)
1089 $(add_kdeapps_dep kmime)
1090 $(add_kdeapps_dep kpkpass)
1091 $(add_qt_dep qtdeclarative)
1092
1093 diff --git a/kde-apps/kmail/kmail-19.08.49.9999.ebuild b/kde-apps/kmail/kmail-19.08.49.9999.ebuild
1094 index cd07a79ea9..7e038a1c4a 100644
1095 --- a/kde-apps/kmail/kmail-19.08.49.9999.ebuild
1096 +++ b/kde-apps/kmail/kmail-19.08.49.9999.ebuild
1097 @@ -20,11 +20,13 @@ BDEPEND="
1098 "
1099 COMMON_DEPEND="
1100 $(add_frameworks_dep kbookmarks)
1101 + $(add_frameworks_dep kcalendarcore)
1102 $(add_frameworks_dep kcmutils)
1103 $(add_frameworks_dep kcodecs)
1104 $(add_frameworks_dep kcompletion)
1105 $(add_frameworks_dep kconfig)
1106 $(add_frameworks_dep kconfigwidgets)
1107 + $(add_frameworks_dep kcontacts)
1108 $(add_frameworks_dep kcoreaddons)
1109 $(add_frameworks_dep kcrash)
1110 $(add_frameworks_dep kdbusaddons)
1111 @@ -47,8 +49,6 @@ COMMON_DEPEND="
1112 $(add_kdeapps_dep akonadi-contacts)
1113 $(add_kdeapps_dep akonadi-mime)
1114 $(add_kdeapps_dep akonadi-search)
1115 - $(add_kdeapps_dep kcalcore)
1116 - $(add_kdeapps_dep kcontacts)
1117 $(add_kdeapps_dep kdepim-apps-libs)
1118 $(add_kdeapps_dep kidentitymanagement)
1119 $(add_kdeapps_dep kmailtransport)
1120
1121 diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild
1122 index 63424e210f..08d45567f6 100644
1123 --- a/kde-apps/kmail/kmail-9999.ebuild
1124 +++ b/kde-apps/kmail/kmail-9999.ebuild
1125 @@ -21,11 +21,13 @@ BDEPEND="
1126 "
1127 COMMON_DEPEND="
1128 $(add_frameworks_dep kbookmarks)
1129 + $(add_frameworks_dep kcalendarcore)
1130 $(add_frameworks_dep kcmutils)
1131 $(add_frameworks_dep kcodecs)
1132 $(add_frameworks_dep kcompletion)
1133 $(add_frameworks_dep kconfig)
1134 $(add_frameworks_dep kconfigwidgets)
1135 + $(add_frameworks_dep kcontacts)
1136 $(add_frameworks_dep kcoreaddons)
1137 $(add_frameworks_dep kcrash)
1138 $(add_frameworks_dep kdbusaddons)
1139 @@ -48,8 +50,6 @@ COMMON_DEPEND="
1140 $(add_kdeapps_dep akonadi-contacts)
1141 $(add_kdeapps_dep akonadi-mime)
1142 $(add_kdeapps_dep akonadi-search)
1143 - $(add_kdeapps_dep kcalcore)
1144 - $(add_kdeapps_dep kcontacts)
1145 $(add_kdeapps_dep kdepim-apps-libs)
1146 $(add_kdeapps_dep kidentitymanagement)
1147 $(add_kdeapps_dep kmailtransport)
1148
1149 diff --git a/kde-apps/knotes/knotes-19.08.49.9999.ebuild b/kde-apps/knotes/knotes-19.08.49.9999.ebuild
1150 index b7bbf229f7..0d258d1198 100644
1151 --- a/kde-apps/knotes/knotes-19.08.49.9999.ebuild
1152 +++ b/kde-apps/knotes/knotes-19.08.49.9999.ebuild
1153 @@ -16,10 +16,12 @@ KEYWORDS=""
1154 IUSE=""
1155
1156 DEPEND="
1157 + $(add_frameworks_dep kcalendarcore)
1158 $(add_frameworks_dep kcmutils)
1159 $(add_frameworks_dep kcompletion)
1160 $(add_frameworks_dep kconfig)
1161 $(add_frameworks_dep kconfigwidgets)
1162 + $(add_frameworks_dep kcontacts)
1163 $(add_frameworks_dep kcoreaddons)
1164 $(add_frameworks_dep kcrash)
1165 $(add_frameworks_dep kdnssd)
1166 @@ -39,9 +41,7 @@ DEPEND="
1167 $(add_kdeapps_dep akonadi-notes)
1168 $(add_kdeapps_dep akonadi-search)
1169 $(add_kdeapps_dep grantleetheme)
1170 - $(add_kdeapps_dep kcalcore)
1171 $(add_kdeapps_dep kcalutils)
1172 - $(add_kdeapps_dep kcontacts)
1173 $(add_kdeapps_dep kmime)
1174 $(add_kdeapps_dep kontactinterface)
1175 $(add_kdeapps_dep libkdepim)
1176
1177 diff --git a/kde-apps/knotes/knotes-9999.ebuild b/kde-apps/knotes/knotes-9999.ebuild
1178 index b7bbf229f7..0d258d1198 100644
1179 --- a/kde-apps/knotes/knotes-9999.ebuild
1180 +++ b/kde-apps/knotes/knotes-9999.ebuild
1181 @@ -16,10 +16,12 @@ KEYWORDS=""
1182 IUSE=""
1183
1184 DEPEND="
1185 + $(add_frameworks_dep kcalendarcore)
1186 $(add_frameworks_dep kcmutils)
1187 $(add_frameworks_dep kcompletion)
1188 $(add_frameworks_dep kconfig)
1189 $(add_frameworks_dep kconfigwidgets)
1190 + $(add_frameworks_dep kcontacts)
1191 $(add_frameworks_dep kcoreaddons)
1192 $(add_frameworks_dep kcrash)
1193 $(add_frameworks_dep kdnssd)
1194 @@ -39,9 +41,7 @@ DEPEND="
1195 $(add_kdeapps_dep akonadi-notes)
1196 $(add_kdeapps_dep akonadi-search)
1197 $(add_kdeapps_dep grantleetheme)
1198 - $(add_kdeapps_dep kcalcore)
1199 $(add_kdeapps_dep kcalutils)
1200 - $(add_kdeapps_dep kcontacts)
1201 $(add_kdeapps_dep kmime)
1202 $(add_kdeapps_dep kontactinterface)
1203 $(add_kdeapps_dep libkdepim)
1204
1205 diff --git a/kde-apps/konsolekalendar/konsolekalendar-19.08.49.9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-19.08.49.9999.ebuild
1206 index 766d9a2234..594f120c40 100644
1207 --- a/kde-apps/konsolekalendar/konsolekalendar-19.08.49.9999.ebuild
1208 +++ b/kde-apps/konsolekalendar/konsolekalendar-19.08.49.9999.ebuild
1209 @@ -15,13 +15,13 @@ KEYWORDS=""
1210 IUSE=""
1211
1212 DEPEND="
1213 + $(add_frameworks_dep kcalendarcore)
1214 $(add_frameworks_dep kconfig)
1215 $(add_frameworks_dep kcoreaddons)
1216 $(add_frameworks_dep ki18n)
1217 $(add_kdeapps_dep akonadi)
1218 $(add_kdeapps_dep akonadi-calendar)
1219 $(add_kdeapps_dep calendarsupport)
1220 - $(add_kdeapps_dep kcalcore)
1221 $(add_kdeapps_dep kcalutils)
1222 "
1223 RDEPEND="${DEPEND}
1224
1225 diff --git a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
1226 index 766d9a2234..594f120c40 100644
1227 --- a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
1228 +++ b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
1229 @@ -15,13 +15,13 @@ KEYWORDS=""
1230 IUSE=""
1231
1232 DEPEND="
1233 + $(add_frameworks_dep kcalendarcore)
1234 $(add_frameworks_dep kconfig)
1235 $(add_frameworks_dep kcoreaddons)
1236 $(add_frameworks_dep ki18n)
1237 $(add_kdeapps_dep akonadi)
1238 $(add_kdeapps_dep akonadi-calendar)
1239 $(add_kdeapps_dep calendarsupport)
1240 - $(add_kdeapps_dep kcalcore)
1241 $(add_kdeapps_dep kcalutils)
1242 "
1243 RDEPEND="${DEPEND}
1244
1245 diff --git a/kde-apps/kopete/kopete-19.08.49.9999.ebuild b/kde-apps/kopete/kopete-19.08.49.9999.ebuild
1246 index 2e178d1d34..af324e5972 100644
1247 --- a/kde-apps/kopete/kopete-19.08.49.9999.ebuild
1248 +++ b/kde-apps/kopete/kopete-19.08.49.9999.ebuild
1249 @@ -60,6 +60,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
1250 COMMON_DEPEND="
1251 $(add_frameworks_dep kcmutils)
1252 $(add_frameworks_dep kconfig)
1253 + $(add_frameworks_dep kcontacts)
1254 $(add_frameworks_dep kcrash)
1255 $(add_frameworks_dep kdbusaddons)
1256 $(add_frameworks_dep khtml)
1257 @@ -72,7 +73,6 @@ COMMON_DEPEND="
1258 $(add_frameworks_dep knotifyconfig)
1259 $(add_frameworks_dep kparts)
1260 $(add_frameworks_dep ktexteditor)
1261 - $(add_kdeapps_dep kcontacts)
1262 $(add_kdeapps_dep kidentitymanagement)
1263 $(add_kdeapps_dep libkleo)
1264 $(add_qt_dep qtgui)
1265
1266 diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
1267 index 2e178d1d34..af324e5972 100644
1268 --- a/kde-apps/kopete/kopete-9999.ebuild
1269 +++ b/kde-apps/kopete/kopete-9999.ebuild
1270 @@ -60,6 +60,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
1271 COMMON_DEPEND="
1272 $(add_frameworks_dep kcmutils)
1273 $(add_frameworks_dep kconfig)
1274 + $(add_frameworks_dep kcontacts)
1275 $(add_frameworks_dep kcrash)
1276 $(add_frameworks_dep kdbusaddons)
1277 $(add_frameworks_dep khtml)
1278 @@ -72,7 +73,6 @@ COMMON_DEPEND="
1279 $(add_frameworks_dep knotifyconfig)
1280 $(add_frameworks_dep kparts)
1281 $(add_frameworks_dep ktexteditor)
1282 - $(add_kdeapps_dep kcontacts)
1283 $(add_kdeapps_dep kidentitymanagement)
1284 $(add_kdeapps_dep libkleo)
1285 $(add_qt_dep qtgui)
1286
1287 diff --git a/kde-apps/korganizer/korganizer-19.08.49.9999.ebuild b/kde-apps/korganizer/korganizer-19.08.49.9999.ebuild
1288 index 48afade493..8765dc85ed 100644
1289 --- a/kde-apps/korganizer/korganizer-19.08.49.9999.ebuild
1290 +++ b/kde-apps/korganizer/korganizer-19.08.49.9999.ebuild
1291 @@ -18,11 +18,13 @@ BDEPEND="
1292 test? ( $(add_kdeapps_dep akonadi 'tools') )
1293 "
1294 COMMON_DEPEND="
1295 + $(add_frameworks_dep kcalendarcore)
1296 $(add_frameworks_dep kcmutils)
1297 $(add_frameworks_dep kcodecs)
1298 $(add_frameworks_dep kcompletion)
1299 $(add_frameworks_dep kconfig)
1300 $(add_frameworks_dep kconfigwidgets)
1301 + $(add_frameworks_dep kcontacts)
1302 $(add_frameworks_dep kcoreaddons)
1303 $(add_frameworks_dep kcrash)
1304 $(add_frameworks_dep kdbusaddons)
1305 @@ -49,9 +51,7 @@ COMMON_DEPEND="
1306 $(add_kdeapps_dep calendarsupport)
1307 $(add_kdeapps_dep eventviews)
1308 $(add_kdeapps_dep incidenceeditor)
1309 - $(add_kdeapps_dep kcalcore)
1310 $(add_kdeapps_dep kcalutils)
1311 - $(add_kdeapps_dep kcontacts)
1312 $(add_kdeapps_dep kdepim-apps-libs)
1313 $(add_kdeapps_dep kidentitymanagement)
1314 $(add_kdeapps_dep kmailtransport)
1315
1316 diff --git a/kde-apps/korganizer/korganizer-9999.ebuild b/kde-apps/korganizer/korganizer-9999.ebuild
1317 index 48afade493..8765dc85ed 100644
1318 --- a/kde-apps/korganizer/korganizer-9999.ebuild
1319 +++ b/kde-apps/korganizer/korganizer-9999.ebuild
1320 @@ -18,11 +18,13 @@ BDEPEND="
1321 test? ( $(add_kdeapps_dep akonadi 'tools') )
1322 "
1323 COMMON_DEPEND="
1324 + $(add_frameworks_dep kcalendarcore)
1325 $(add_frameworks_dep kcmutils)
1326 $(add_frameworks_dep kcodecs)
1327 $(add_frameworks_dep kcompletion)
1328 $(add_frameworks_dep kconfig)
1329 $(add_frameworks_dep kconfigwidgets)
1330 + $(add_frameworks_dep kcontacts)
1331 $(add_frameworks_dep kcoreaddons)
1332 $(add_frameworks_dep kcrash)
1333 $(add_frameworks_dep kdbusaddons)
1334 @@ -49,9 +51,7 @@ COMMON_DEPEND="
1335 $(add_kdeapps_dep calendarsupport)
1336 $(add_kdeapps_dep eventviews)
1337 $(add_kdeapps_dep incidenceeditor)
1338 - $(add_kdeapps_dep kcalcore)
1339 $(add_kdeapps_dep kcalutils)
1340 - $(add_kdeapps_dep kcontacts)
1341 $(add_kdeapps_dep kdepim-apps-libs)
1342 $(add_kdeapps_dep kidentitymanagement)
1343 $(add_kdeapps_dep kmailtransport)
1344
1345 diff --git a/kde-apps/libkdepim/libkdepim-19.08.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-19.08.49.9999.ebuild
1346 index eb83188cb8..4715b711a6 100644
1347 --- a/kde-apps/libkdepim/libkdepim-19.08.49.9999.ebuild
1348 +++ b/kde-apps/libkdepim/libkdepim-19.08.49.9999.ebuild
1349 @@ -19,6 +19,7 @@ DEPEND="
1350 $(add_frameworks_dep kcompletion)
1351 $(add_frameworks_dep kconfig)
1352 $(add_frameworks_dep kconfigwidgets)
1353 + $(add_frameworks_dep kcontacts)
1354 $(add_frameworks_dep kcoreaddons)
1355 $(add_frameworks_dep ki18n)
1356 $(add_frameworks_dep kiconthemes)
1357 @@ -30,7 +31,6 @@ DEPEND="
1358 $(add_kdeapps_dep akonadi)
1359 $(add_kdeapps_dep akonadi-contacts)
1360 $(add_kdeapps_dep akonadi-search)
1361 - $(add_kdeapps_dep kcontacts)
1362 $(add_kdeapps_dep kldap)
1363 $(add_qt_dep qtdbus)
1364 $(add_qt_dep qtgui)
1365
1366 diff --git a/kde-apps/libkdepim/libkdepim-9999.ebuild b/kde-apps/libkdepim/libkdepim-9999.ebuild
1367 index eb83188cb8..4715b711a6 100644
1368 --- a/kde-apps/libkdepim/libkdepim-9999.ebuild
1369 +++ b/kde-apps/libkdepim/libkdepim-9999.ebuild
1370 @@ -19,6 +19,7 @@ DEPEND="
1371 $(add_frameworks_dep kcompletion)
1372 $(add_frameworks_dep kconfig)
1373 $(add_frameworks_dep kconfigwidgets)
1374 + $(add_frameworks_dep kcontacts)
1375 $(add_frameworks_dep kcoreaddons)
1376 $(add_frameworks_dep ki18n)
1377 $(add_frameworks_dep kiconthemes)
1378 @@ -30,7 +31,6 @@ DEPEND="
1379 $(add_kdeapps_dep akonadi)
1380 $(add_kdeapps_dep akonadi-contacts)
1381 $(add_kdeapps_dep akonadi-search)
1382 - $(add_kdeapps_dep kcontacts)
1383 $(add_kdeapps_dep kldap)
1384 $(add_qt_dep qtdbus)
1385 $(add_qt_dep qtgui)
1386
1387 diff --git a/kde-apps/libkgapi/libkgapi-19.08.49.9999.ebuild b/kde-apps/libkgapi/libkgapi-19.08.49.9999.ebuild
1388 index 2cbdb74515..6e4f148f5b 100644
1389 --- a/kde-apps/libkgapi/libkgapi-19.08.49.9999.ebuild
1390 +++ b/kde-apps/libkgapi/libkgapi-19.08.49.9999.ebuild
1391 @@ -18,10 +18,10 @@ BDEPEND="
1392 nls? ( $(add_qt_dep linguist-tools) )
1393 "
1394 DEPEND="
1395 + $(add_frameworks_dep kcalendarcore)
1396 + $(add_frameworks_dep kcontacts)
1397 $(add_frameworks_dep kio)
1398 $(add_frameworks_dep kwindowsystem)
1399 - $(add_kdeapps_dep kcalcore)
1400 - $(add_kdeapps_dep kcontacts)
1401 $(add_qt_dep qtgui)
1402 $(add_qt_dep qtnetwork)
1403 $(add_qt_dep qtwebengine 'widgets')
1404
1405 diff --git a/kde-apps/libkgapi/libkgapi-9999.ebuild b/kde-apps/libkgapi/libkgapi-9999.ebuild
1406 index 2cbdb74515..6e4f148f5b 100644
1407 --- a/kde-apps/libkgapi/libkgapi-9999.ebuild
1408 +++ b/kde-apps/libkgapi/libkgapi-9999.ebuild
1409 @@ -18,10 +18,10 @@ BDEPEND="
1410 nls? ( $(add_qt_dep linguist-tools) )
1411 "
1412 DEPEND="
1413 + $(add_frameworks_dep kcalendarcore)
1414 + $(add_frameworks_dep kcontacts)
1415 $(add_frameworks_dep kio)
1416 $(add_frameworks_dep kwindowsystem)
1417 - $(add_kdeapps_dep kcalcore)
1418 - $(add_kdeapps_dep kcontacts)
1419 $(add_qt_dep qtgui)
1420 $(add_qt_dep qtnetwork)
1421 $(add_qt_dep qtwebengine 'widgets')
1422
1423 diff --git a/kde-apps/libktnef/libktnef-19.08.49.9999.ebuild b/kde-apps/libktnef/libktnef-19.08.49.9999.ebuild
1424 index d4df3147ed..ac8e54fa30 100644
1425 --- a/kde-apps/libktnef/libktnef-19.08.49.9999.ebuild
1426 +++ b/kde-apps/libktnef/libktnef-19.08.49.9999.ebuild
1427 @@ -13,10 +13,10 @@ KEYWORDS=""
1428 IUSE=""
1429
1430 DEPEND="
1431 + $(add_frameworks_dep kcalendarcore)
1432 + $(add_frameworks_dep kcontacts)
1433 $(add_frameworks_dep ki18n)
1434 - $(add_kdeapps_dep kcalcore)
1435 $(add_kdeapps_dep kcalutils)
1436 - $(add_kdeapps_dep kcontacts)
1437 $(add_qt_dep qtwidgets)
1438 "
1439 RDEPEND="${DEPEND}
1440
1441 diff --git a/kde-apps/libktnef/libktnef-9999.ebuild b/kde-apps/libktnef/libktnef-9999.ebuild
1442 index d4df3147ed..ac8e54fa30 100644
1443 --- a/kde-apps/libktnef/libktnef-9999.ebuild
1444 +++ b/kde-apps/libktnef/libktnef-9999.ebuild
1445 @@ -13,10 +13,10 @@ KEYWORDS=""
1446 IUSE=""
1447
1448 DEPEND="
1449 + $(add_frameworks_dep kcalendarcore)
1450 + $(add_frameworks_dep kcontacts)
1451 $(add_frameworks_dep ki18n)
1452 - $(add_kdeapps_dep kcalcore)
1453 $(add_kdeapps_dep kcalutils)
1454 - $(add_kdeapps_dep kcontacts)
1455 $(add_qt_dep qtwidgets)
1456 "
1457 RDEPEND="${DEPEND}
1458
1459 diff --git a/kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild b/kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild
1460 index a5f7e73072..07fa4cd331 100644
1461 --- a/kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild
1462 +++ b/kde-apps/mailcommon/mailcommon-19.08.49.9999.ebuild
1463 @@ -23,6 +23,7 @@ DEPEND="
1464 $(add_frameworks_dep kcompletion)
1465 $(add_frameworks_dep kconfig)
1466 $(add_frameworks_dep kconfigwidgets)
1467 + $(add_frameworks_dep kcontacts)
1468 $(add_frameworks_dep kdbusaddons)
1469 $(add_frameworks_dep ki18n)
1470 $(add_frameworks_dep kiconthemes)
1471 @@ -37,7 +38,6 @@ DEPEND="
1472 $(add_kdeapps_dep akonadi)
1473 $(add_kdeapps_dep akonadi-contacts)
1474 $(add_kdeapps_dep akonadi-mime)
1475 - $(add_kdeapps_dep kcontacts)
1476 $(add_kdeapps_dep kmailtransport)
1477 $(add_kdeapps_dep kmime)
1478 $(add_kdeapps_dep kpimtextedit)
1479
1480 diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild b/kde-apps/mailcommon/mailcommon-9999.ebuild
1481 index 27891f3004..0ced9ecb0c 100644
1482 --- a/kde-apps/mailcommon/mailcommon-9999.ebuild
1483 +++ b/kde-apps/mailcommon/mailcommon-9999.ebuild
1484 @@ -23,6 +23,7 @@ DEPEND="
1485 $(add_frameworks_dep kcompletion)
1486 $(add_frameworks_dep kconfig)
1487 $(add_frameworks_dep kconfigwidgets)
1488 + $(add_frameworks_dep kcontacts)
1489 $(add_frameworks_dep kdbusaddons)
1490 $(add_frameworks_dep ki18n)
1491 $(add_frameworks_dep kiconthemes)
1492 @@ -37,7 +38,6 @@ DEPEND="
1493 $(add_kdeapps_dep akonadi)
1494 $(add_kdeapps_dep akonadi-contacts)
1495 $(add_kdeapps_dep akonadi-mime)
1496 - $(add_kdeapps_dep kcontacts)
1497 $(add_kdeapps_dep kmailtransport)
1498 $(add_kdeapps_dep kmime)
1499 $(add_kdeapps_dep kpimtextedit)
1500
1501 diff --git a/kde-apps/messagelib/messagelib-19.08.49.9999.ebuild b/kde-apps/messagelib/messagelib-19.08.49.9999.ebuild
1502 index 30e3dfbf92..7cc825da3b 100644
1503 --- a/kde-apps/messagelib/messagelib-19.08.49.9999.ebuild
1504 +++ b/kde-apps/messagelib/messagelib-19.08.49.9999.ebuild
1505 @@ -14,10 +14,12 @@ IUSE=""
1506
1507 DEPEND="
1508 $(add_frameworks_dep karchive)
1509 + $(add_frameworks_dep kcalendarcore)
1510 $(add_frameworks_dep kcodecs)
1511 $(add_frameworks_dep kcompletion)
1512 $(add_frameworks_dep kconfig)
1513 $(add_frameworks_dep kconfigwidgets)
1514 + $(add_frameworks_dep kcontacts)
1515 $(add_frameworks_dep kcoreaddons)
1516 $(add_frameworks_dep kdbusaddons)
1517 $(add_frameworks_dep ki18n)
1518 @@ -39,8 +41,6 @@ DEPEND="
1519 $(add_kdeapps_dep akonadi-mime)
1520 $(add_kdeapps_dep grantleetheme)
1521 $(add_kdeapps_dep incidenceeditor)
1522 - $(add_kdeapps_dep kcalcore)
1523 - $(add_kdeapps_dep kcontacts)
1524 $(add_kdeapps_dep kdepim-apps-libs)
1525 $(add_kdeapps_dep kidentitymanagement)
1526 $(add_kdeapps_dep kldap)
1527
1528 diff --git a/kde-apps/messagelib/messagelib-9999.ebuild b/kde-apps/messagelib/messagelib-9999.ebuild
1529 index 30e3dfbf92..7cc825da3b 100644
1530 --- a/kde-apps/messagelib/messagelib-9999.ebuild
1531 +++ b/kde-apps/messagelib/messagelib-9999.ebuild
1532 @@ -14,10 +14,12 @@ IUSE=""
1533
1534 DEPEND="
1535 $(add_frameworks_dep karchive)
1536 + $(add_frameworks_dep kcalendarcore)
1537 $(add_frameworks_dep kcodecs)
1538 $(add_frameworks_dep kcompletion)
1539 $(add_frameworks_dep kconfig)
1540 $(add_frameworks_dep kconfigwidgets)
1541 + $(add_frameworks_dep kcontacts)
1542 $(add_frameworks_dep kcoreaddons)
1543 $(add_frameworks_dep kdbusaddons)
1544 $(add_frameworks_dep ki18n)
1545 @@ -39,8 +41,6 @@ DEPEND="
1546 $(add_kdeapps_dep akonadi-mime)
1547 $(add_kdeapps_dep grantleetheme)
1548 $(add_kdeapps_dep incidenceeditor)
1549 - $(add_kdeapps_dep kcalcore)
1550 - $(add_kdeapps_dep kcontacts)
1551 $(add_kdeapps_dep kdepim-apps-libs)
1552 $(add_kdeapps_dep kidentitymanagement)
1553 $(add_kdeapps_dep kldap)
1554
1555 diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.08.49.9999.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-19.08.49.9999.ebuild
1556 index e43de004b0..70cb7fac3e 100644
1557 --- a/kde-apps/pim-data-exporter/pim-data-exporter-19.08.49.9999.ebuild
1558 +++ b/kde-apps/pim-data-exporter/pim-data-exporter-19.08.49.9999.ebuild
1559 @@ -18,6 +18,7 @@ DEPEND="
1560 $(add_frameworks_dep karchive)
1561 $(add_frameworks_dep kconfig)
1562 $(add_frameworks_dep kconfigwidgets)
1563 + $(add_frameworks_dep kcontacts)
1564 $(add_frameworks_dep kcoreaddons)
1565 $(add_frameworks_dep kcrash)
1566 $(add_frameworks_dep kdbusaddons)
1567 @@ -28,7 +29,6 @@ DEPEND="
1568 $(add_frameworks_dep kwidgetsaddons)
1569 $(add_frameworks_dep kxmlgui)
1570 $(add_kdeapps_dep akonadi)
1571 - $(add_kdeapps_dep kcontacts)
1572 $(add_kdeapps_dep kidentitymanagement)
1573 $(add_kdeapps_dep kmailtransport)
1574 $(add_kdeapps_dep kmime)
1575
1576 diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
1577 index e43de004b0..70cb7fac3e 100644
1578 --- a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
1579 +++ b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
1580 @@ -18,6 +18,7 @@ DEPEND="
1581 $(add_frameworks_dep karchive)
1582 $(add_frameworks_dep kconfig)
1583 $(add_frameworks_dep kconfigwidgets)
1584 + $(add_frameworks_dep kcontacts)
1585 $(add_frameworks_dep kcoreaddons)
1586 $(add_frameworks_dep kcrash)
1587 $(add_frameworks_dep kdbusaddons)
1588 @@ -28,7 +29,6 @@ DEPEND="
1589 $(add_frameworks_dep kwidgetsaddons)
1590 $(add_frameworks_dep kxmlgui)
1591 $(add_kdeapps_dep akonadi)
1592 - $(add_kdeapps_dep kcontacts)
1593 $(add_kdeapps_dep kidentitymanagement)
1594 $(add_kdeapps_dep kmailtransport)
1595 $(add_kdeapps_dep kmime)
1596
1597 diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.49.9999.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.49.9999.ebuild
1598 index bf6d456b2d..f28612b52a 100644
1599 --- a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.49.9999.ebuild
1600 +++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.49.9999.ebuild
1601 @@ -15,8 +15,10 @@ IUSE=""
1602
1603 DEPEND="
1604 $(add_frameworks_dep kbookmarks)
1605 + $(add_frameworks_dep kcalendarcore)
1606 $(add_frameworks_dep kconfig)
1607 $(add_frameworks_dep kconfigwidgets)
1608 + $(add_frameworks_dep kcontacts)
1609 $(add_frameworks_dep kcoreaddons)
1610 $(add_frameworks_dep kcrash)
1611 $(add_frameworks_dep kdbusaddons)
1612 @@ -29,8 +31,6 @@ DEPEND="
1613 $(add_kdeapps_dep akonadi-contacts)
1614 $(add_kdeapps_dep akonadi-mime)
1615 $(add_kdeapps_dep calendarsupport)
1616 - $(add_kdeapps_dep kcalcore)
1617 - $(add_kdeapps_dep kcontacts)
1618 $(add_kdeapps_dep kmailtransport)
1619 $(add_kdeapps_dep libksieve)
1620 $(add_kdeapps_dep pimcommon)
1621
1622 diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
1623 index bf6d456b2d..f28612b52a 100644
1624 --- a/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
1625 +++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
1626 @@ -15,8 +15,10 @@ IUSE=""
1627
1628 DEPEND="
1629 $(add_frameworks_dep kbookmarks)
1630 + $(add_frameworks_dep kcalendarcore)
1631 $(add_frameworks_dep kconfig)
1632 $(add_frameworks_dep kconfigwidgets)
1633 + $(add_frameworks_dep kcontacts)
1634 $(add_frameworks_dep kcoreaddons)
1635 $(add_frameworks_dep kcrash)
1636 $(add_frameworks_dep kdbusaddons)
1637 @@ -29,8 +31,6 @@ DEPEND="
1638 $(add_kdeapps_dep akonadi-contacts)
1639 $(add_kdeapps_dep akonadi-mime)
1640 $(add_kdeapps_dep calendarsupport)
1641 - $(add_kdeapps_dep kcalcore)
1642 - $(add_kdeapps_dep kcontacts)
1643 $(add_kdeapps_dep kmailtransport)
1644 $(add_kdeapps_dep libksieve)
1645 $(add_kdeapps_dep pimcommon)
1646
1647 diff --git a/kde-apps/pimcommon/pimcommon-19.08.49.9999.ebuild b/kde-apps/pimcommon/pimcommon-19.08.49.9999.ebuild
1648 index 1f701bba77..7023f6b328 100644
1649 --- a/kde-apps/pimcommon/pimcommon-19.08.49.9999.ebuild
1650 +++ b/kde-apps/pimcommon/pimcommon-19.08.49.9999.ebuild
1651 @@ -22,6 +22,7 @@ COMMON_DEPEND="
1652 $(add_frameworks_dep kcompletion)
1653 $(add_frameworks_dep kconfig)
1654 $(add_frameworks_dep kconfigwidgets)
1655 + $(add_frameworks_dep kcontacts)
1656 $(add_frameworks_dep kcoreaddons)
1657 $(add_frameworks_dep kdbusaddons)
1658 $(add_frameworks_dep ki18n)
1659 @@ -35,7 +36,6 @@ COMMON_DEPEND="
1660 $(add_frameworks_dep purpose)
1661 $(add_kdeapps_dep akonadi)
1662 $(add_kdeapps_dep akonadi-contacts)
1663 - $(add_kdeapps_dep kcontacts)
1664 $(add_kdeapps_dep kimap)
1665 $(add_kdeapps_dep kpimtextedit)
1666 $(add_kdeapps_dep libkdepim)
1667
1668 diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild
1669 index 1f701bba77..7023f6b328 100644
1670 --- a/kde-apps/pimcommon/pimcommon-9999.ebuild
1671 +++ b/kde-apps/pimcommon/pimcommon-9999.ebuild
1672 @@ -22,6 +22,7 @@ COMMON_DEPEND="
1673 $(add_frameworks_dep kcompletion)
1674 $(add_frameworks_dep kconfig)
1675 $(add_frameworks_dep kconfigwidgets)
1676 + $(add_frameworks_dep kcontacts)
1677 $(add_frameworks_dep kcoreaddons)
1678 $(add_frameworks_dep kdbusaddons)
1679 $(add_frameworks_dep ki18n)
1680 @@ -35,7 +36,6 @@ COMMON_DEPEND="
1681 $(add_frameworks_dep purpose)
1682 $(add_kdeapps_dep akonadi)
1683 $(add_kdeapps_dep akonadi-contacts)
1684 - $(add_kdeapps_dep kcontacts)
1685 $(add_kdeapps_dep kimap)
1686 $(add_kdeapps_dep kpimtextedit)
1687 $(add_kdeapps_dep libkdepim)
1688
1689 diff --git a/kde-misc/akonadi-phabricator-resource/akonadi-phabricator-resource-9999.ebuild b/kde-misc/akonadi-phabricator-resource/akonadi-phabricator-resource-9999.ebuild
1690 index 9cbda0c85b..31fe6a7436 100644
1691 --- a/kde-misc/akonadi-phabricator-resource/akonadi-phabricator-resource-9999.ebuild
1692 +++ b/kde-misc/akonadi-phabricator-resource/akonadi-phabricator-resource-9999.ebuild
1693 @@ -14,12 +14,12 @@ KEYWORDS=""
1694 IUSE=""
1695
1696 DEPEND="
1697 + $(add_frameworks_dep kcalendarcore)
1698 $(add_frameworks_dep kconfig)
1699 $(add_frameworks_dep ki18n)
1700 $(add_frameworks_dep kio)
1701 $(add_frameworks_dep kwidgetsaddons)
1702 $(add_kdeapps_dep akonadi)
1703 - $(add_kdeapps_dep kcalcore)
1704 $(add_qt_dep qtdbus)
1705 $(add_qt_dep qtgui)
1706 $(add_qt_dep qtnetwork)
1707
1708 diff --git a/kde-misc/akonadiclient/akonadiclient-9999.ebuild b/kde-misc/akonadiclient/akonadiclient-9999.ebuild
1709 index f54ffd8137..5129c4059a 100644
1710 --- a/kde-misc/akonadiclient/akonadiclient-9999.ebuild
1711 +++ b/kde-misc/akonadiclient/akonadiclient-9999.ebuild
1712 @@ -16,10 +16,10 @@ IUSE=""
1713
1714 DEPEND="
1715 $(add_frameworks_dep kcodecs)
1716 + $(add_frameworks_dep kcontacts)
1717 $(add_frameworks_dep kcoreaddons)
1718 $(add_frameworks_dep ki18n)
1719 $(add_kdeapps_dep akonadi 'xml')
1720 - $(add_kdeapps_dep kcontacts)
1721 $(add_qt_dep qtwidgets)
1722 "
1723 RDEPEND="${DEPEND}"
1724
1725 diff --git a/kde-misc/itinerary/itinerary-9999.ebuild b/kde-misc/itinerary/itinerary-9999.ebuild
1726 index 685e5f8a88..401da518d5 100644
1727 --- a/kde-misc/itinerary/itinerary-9999.ebuild
1728 +++ b/kde-misc/itinerary/itinerary-9999.ebuild
1729 @@ -14,10 +14,10 @@ KEYWORDS=""
1730 IUSE=""
1731
1732 DEPEND="
1733 + $(add_frameworks_dep kcontacts)
1734 $(add_frameworks_dep kdbusaddons)
1735 $(add_frameworks_dep kholidays)
1736 $(add_frameworks_dep ki18n)
1737 - $(add_kdeapps_dep kcontacts)
1738 $(add_kdeapps_dep kitinerary)
1739 $(add_kdeapps_dep kpkpass)
1740 $(add_qt_dep qtdeclarative)
1741
1742 diff --git a/kde-misc/ktimetracker/ktimetracker-9999.ebuild b/kde-misc/ktimetracker/ktimetracker-9999.ebuild
1743 index 04c607d08a..b9baab6289 100644
1744 --- a/kde-misc/ktimetracker/ktimetracker-9999.ebuild
1745 +++ b/kde-misc/ktimetracker/ktimetracker-9999.ebuild
1746 @@ -14,6 +14,7 @@ KEYWORDS=""
1747 IUSE=""
1748
1749 DEPEND="
1750 + $(add_frameworks_dep kcalendarcore)
1751 $(add_frameworks_dep kconfig)
1752 $(add_frameworks_dep kconfigwidgets)
1753 $(add_frameworks_dep kcoreaddons)
1754 @@ -26,7 +27,6 @@ DEPEND="
1755 $(add_frameworks_dep kwidgetsaddons)
1756 $(add_frameworks_dep kwindowsystem)
1757 $(add_frameworks_dep kxmlgui)
1758 - $(add_kdeapps_dep kcalcore)
1759 $(add_qt_dep qtdbus)
1760 $(add_qt_dep qtgui)
1761 $(add_qt_dep qtwidgets)
1762
1763 diff --git a/kde-misc/zanshin/zanshin-9999.ebuild b/kde-misc/zanshin/zanshin-9999.ebuild
1764 index a9a49c3363..f24ff35dd8 100644
1765 --- a/kde-misc/zanshin/zanshin-9999.ebuild
1766 +++ b/kde-misc/zanshin/zanshin-9999.ebuild
1767 @@ -19,10 +19,12 @@ BDEPEND="
1768 test? ( $(add_kdeapps_dep akonadi 'tools') )
1769 "
1770 COMMON_DEPEND="
1771 + $(add_frameworks_dep kcalendarcore)
1772 $(add_frameworks_dep kcodecs)
1773 $(add_frameworks_dep kcompletion)
1774 $(add_frameworks_dep kconfig)
1775 $(add_frameworks_dep kconfigwidgets)
1776 + $(add_frameworks_dep kcontacts)
1777 $(add_frameworks_dep kcoreaddons)
1778 $(add_frameworks_dep ki18n)
1779 $(add_frameworks_dep kio)
1780 @@ -37,8 +39,6 @@ COMMON_DEPEND="
1781 $(add_kdeapps_dep akonadi)
1782 $(add_kdeapps_dep akonadi-calendar)
1783 $(add_kdeapps_dep akonadi-contacts)
1784 - $(add_kdeapps_dep kcalcore)
1785 - $(add_kdeapps_dep kcontacts)
1786 $(add_kdeapps_dep kmime)
1787 $(add_kdeapps_dep kontactinterface)
1788 $(add_qt_dep qtdbus)
1789
1790 diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
1791 index 3ffd1cfb3f..bd9a6f5057 100644
1792 --- a/media-gfx/digikam/digikam-9999.ebuild
1793 +++ b/media-gfx/digikam/digikam-9999.ebuild
1794 @@ -61,10 +61,10 @@ COMMON_DEPEND="
1795 media-libs/tiff:0
1796 virtual/jpeg:0
1797 addressbook? (
1798 + $(add_frameworks_dep kcontacts)
1799 $(add_kdeapps_dep akonadi-contacts)
1800 - $(add_kdeapps_dep kcontacts)
1801 )
1802 - calendar? ( $(add_kdeapps_dep kcalcore) )
1803 + calendar? ( $(add_frameworks_dep kcalendarcore) )
1804 dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
1805 gphoto2? ( media-libs/libgphoto2:= )
1806 imagemagick? ( media-gfx/imagemagick:= )