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/akonadi-calendar/, kde-apps/kblog/, kde-apps/kleopatra/, ...
Date: Sat, 11 Jan 2020 23:25:17
Message-Id: 1578785081.ed50bcdb4dc236da63aa3d50997bd8c8fad76d9e.asturm@gentoo
1 commit: ed50bcdb4dc236da63aa3d50997bd8c8fad76d9e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 11 23:18:31 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 11 23:24:41 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed50bcdb
7
8 kde-apps: Drop obsolete blockers
9
10 Do some sorting along the way.
11
12 Package-Manager: Portage-2.3.84, Repoman-2.3.20
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 .../akonadi-calendar-19.12.49.9999.ebuild | 1 -
16 .../akonadi-calendar/akonadi-calendar-9999.ebuild | 1 -
17 .../akonadi-contacts-19.12.49.9999.ebuild | 1 -
18 .../akonadi-contacts/akonadi-contacts-9999.ebuild | 1 -
19 .../akonadi-import-wizard-19.12.49.9999.ebuild | 27 +++++-----
20 .../akonadi-import-wizard-9999.ebuild | 27 +++++-----
21 .../akonadi-mime/akonadi-mime-19.12.49.9999.ebuild | 2 -
22 kde-apps/akonadi-mime/akonadi-mime-9999.ebuild | 14 +++---
23 .../akonadi-notes-19.12.49.9999.ebuild | 8 ++-
24 kde-apps/akonadi-notes/akonadi-notes-9999.ebuild | 8 ++-
25 .../akonadi-search-19.12.49.9999.ebuild | 21 ++++----
26 kde-apps/akonadi-search/akonadi-search-9999.ebuild | 21 ++++----
27 kde-apps/akonadi/akonadi-19.12.49.9999.ebuild | 2 -
28 kde-apps/akonadi/akonadi-9999.ebuild | 4 +-
29 kde-apps/akregator/akregator-19.12.49.9999.ebuild | 7 +--
30 kde-apps/akregator/akregator-9999.ebuild | 31 ++++++------
31 .../calendarjanitor-19.12.49.9999.ebuild | 12 ++---
32 .../calendarjanitor/calendarjanitor-9999.ebuild | 12 ++---
33 .../calendarsupport-19.12.49.9999.ebuild | 4 +-
34 .../calendarsupport/calendarsupport-9999.ebuild | 32 ++++++------
35 .../eventviews/eventviews-19.12.49.9999.ebuild | 4 +-
36 kde-apps/eventviews/eventviews-9999.ebuild | 26 +++++-----
37 .../grantlee-editor-19.12.49.9999.ebuild | 7 +--
38 .../grantlee-editor/grantlee-editor-9999.ebuild | 23 ++++-----
39 .../grantleetheme-19.12.49.9999.ebuild | 13 ++---
40 kde-apps/grantleetheme/grantleetheme-9999.ebuild | 13 ++---
41 .../incidenceeditor-19.12.49.9999.ebuild | 5 +-
42 .../incidenceeditor/incidenceeditor-9999.ebuild | 39 +++++++--------
43 .../kaddressbook/kaddressbook-19.12.49.9999.ebuild | 1 -
44 kde-apps/kaddressbook/kaddressbook-9999.ebuild | 33 ++++++------
45 kde-apps/kalarm/kalarm-19.12.49.9999.ebuild | 1 -
46 kde-apps/kalarm/kalarm-9999.ebuild | 37 +++++++-------
47 kde-apps/kalarmcal/kalarmcal-19.12.49.9999.ebuild | 1 -
48 kde-apps/kalarmcal/kalarmcal-9999.ebuild | 9 ++--
49 kde-apps/kblog/kblog-19.12.49.9999.ebuild | 4 +-
50 kde-apps/kblog/kblog-9999.ebuild | 4 +-
51 kde-apps/kcalutils/kcalutils-19.12.49.9999.ebuild | 4 +-
52 kde-apps/kcalutils/kcalutils-9999.ebuild | 12 ++---
53 kde-apps/kdav/kdav-19.12.49.9999.ebuild | 4 +-
54 kde-apps/kdav/kdav-9999.ebuild | 8 ++-
55 .../kdepim-addons-19.12.49.9999.ebuild | 9 +---
56 kde-apps/kdepim-addons/kdepim-addons-9999.ebuild | 9 +---
57 .../kdepim-apps-libs-19.12.49.9999.ebuild | 4 +-
58 .../kdepim-apps-libs/kdepim-apps-libs-9999.ebuild | 22 ++++----
59 .../kdepim-meta/kdepim-meta-19.12.49.9999.ebuild | 1 -
60 kde-apps/kdepim-meta/kdepim-meta-9999.ebuild | 1 -
61 .../kdepim-runtime-19.12.49.9999.ebuild | 1 -
62 kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 58 ++++++++++------------
63 .../kidentitymanagement-19.12.49.9999.ebuild | 14 +++---
64 .../kidentitymanagement-9999.ebuild | 4 +-
65 kde-apps/kimap/kimap-19.12.49.9999.ebuild | 13 ++---
66 kde-apps/kimap/kimap-9999.ebuild | 13 ++---
67 kde-apps/kldap/kldap-19.12.49.9999.ebuild | 10 ++--
68 kde-apps/kldap/kldap-9999.ebuild | 4 +-
69 kde-apps/kleopatra/kleopatra-19.12.49.9999.ebuild | 1 -
70 kde-apps/kleopatra/kleopatra-9999.ebuild | 23 ++++-----
71 .../kmail-account-wizard-19.12.49.9999.ebuild | 28 +++++------
72 .../kmail-account-wizard-9999.ebuild | 28 +++++------
73 kde-apps/kmail/kmail-19.12.49.9999.ebuild | 2 -
74 kde-apps/kmail/kmail-9999.ebuild | 52 ++++++++++---------
75 .../kmailtransport-19.12.49.9999.ebuild | 8 +--
76 kde-apps/kmailtransport/kmailtransport-9999.ebuild | 26 ++++------
77 kde-apps/kmime/kmime-19.12.49.9999.ebuild | 4 +-
78 kde-apps/kmime/kmime-9999.ebuild | 4 +-
79 kde-apps/knotes/knotes-19.12.49.9999.ebuild | 1 -
80 kde-apps/knotes/knotes-9999.ebuild | 35 +++++++------
81 .../konsolekalendar-19.12.49.9999.ebuild | 4 +-
82 .../konsolekalendar/konsolekalendar-9999.ebuild | 12 ++---
83 kde-apps/kontact/kontact-19.12.49.9999.ebuild | 4 +-
84 kde-apps/kontact/kontact-9999.ebuild | 26 +++++-----
85 .../kontactinterface-19.12.49.9999.ebuild | 4 +-
86 .../kontactinterface/kontactinterface-9999.ebuild | 12 ++---
87 .../korganizer/korganizer-19.12.49.9999.ebuild | 2 -
88 kde-apps/korganizer/korganizer-9999.ebuild | 48 +++++++++---------
89 .../kpimtextedit/kpimtextedit-19.12.49.9999.ebuild | 7 +--
90 kde-apps/kpimtextedit/kpimtextedit-9999.ebuild | 15 +++---
91 .../libgravatar/libgravatar-19.12.49.9999.ebuild | 4 +-
92 kde-apps/libgravatar/libgravatar-9999.ebuild | 12 ++---
93 kde-apps/libkdepim/libkdepim-19.12.49.9999.ebuild | 21 ++++----
94 kde-apps/libkdepim/libkdepim-9999.ebuild | 21 ++++----
95 kde-apps/libkgapi/libkgapi-19.12.49.9999.ebuild | 1 -
96 kde-apps/libkgapi/libkgapi-9999.ebuild | 11 ++--
97 kde-apps/libkleo/libkleo-19.12.49.9999.ebuild | 7 +--
98 kde-apps/libkleo/libkleo-9999.ebuild | 13 ++---
99 kde-apps/libksieve/libksieve-19.12.49.9999.ebuild | 31 ++++++------
100 kde-apps/libksieve/libksieve-9999.ebuild | 31 ++++++------
101 kde-apps/libktnef/libktnef-19.12.49.9999.ebuild | 4 +-
102 kde-apps/libktnef/libktnef-9999.ebuild | 8 ++-
103 .../mailcommon/mailcommon-19.12.49.9999.ebuild | 4 +-
104 kde-apps/mailcommon/mailcommon-9999.ebuild | 34 ++++++-------
105 .../mailimporter/mailimporter-19.12.49.9999.ebuild | 4 +-
106 kde-apps/mailimporter/mailimporter-9999.ebuild | 18 +++----
107 .../mbox-importer-19.12.49.9999.ebuild | 5 +-
108 kde-apps/mbox-importer/mbox-importer-9999.ebuild | 17 +++----
109 .../messagelib/messagelib-19.12.49.9999.ebuild | 5 +-
110 kde-apps/messagelib/messagelib-9999.ebuild | 51 +++++++++----------
111 .../pim-data-exporter-19.12.49.9999.ebuild | 5 +-
112 .../pim-data-exporter-9999.ebuild | 25 ++++------
113 .../pim-sieve-editor-19.12.49.9999.ebuild | 5 +-
114 .../pim-sieve-editor/pim-sieve-editor-9999.ebuild | 25 ++++------
115 kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild | 8 +--
116 kde-apps/pimcommon/pimcommon-9999.ebuild | 30 +++++------
117 102 files changed, 577 insertions(+), 816 deletions(-)
118
119 diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.12.49.9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.12.49.9999.ebuild
120 index 4c75bc61f1..8e5d5b7a72 100644
121 --- a/kde-apps/akonadi-calendar/akonadi-calendar-19.12.49.9999.ebuild
122 +++ b/kde-apps/akonadi-calendar/akonadi-calendar-19.12.49.9999.ebuild
123 @@ -42,7 +42,6 @@ DEPEND="
124 >=dev-qt/qtwidgets-${QTMIN}:5
125 "
126 RDEPEND="${DEPEND}
127 - !kde-apps/kdepim-l10n
128 !<kde-apps/kdepim-runtime-18.03.80
129 "
130
131
132 diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
133 index fc4a1d73cc..560993e4b1 100644
134 --- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
135 +++ b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
136 @@ -42,7 +42,6 @@ DEPEND="
137 >=dev-qt/qtwidgets-${QTMIN}:5
138 "
139 RDEPEND="${DEPEND}
140 - !kde-apps/kdepim-l10n
141 !<kde-apps/kdepim-runtime-18.03.80
142 "
143
144
145 diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.12.49.9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-19.12.49.9999.ebuild
146 index 7b0f716a71..5c45ea6e37 100644
147 --- a/kde-apps/akonadi-contacts/akonadi-contacts-19.12.49.9999.ebuild
148 +++ b/kde-apps/akonadi-contacts/akonadi-contacts-19.12.49.9999.ebuild
149 @@ -42,6 +42,5 @@ DEPEND="
150 >=dev-qt/qtwidgets-${QTMIN}:5
151 "
152 RDEPEND="${DEPEND}
153 - !kde-apps/kdepim-l10n
154 !<kde-apps/kdepim-runtime-18.03.80
155 "
156
157 diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
158 index 3ba6e152f0..a22efd7647 100644
159 --- a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
160 +++ b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
161 @@ -42,6 +42,5 @@ DEPEND="
162 >=dev-qt/qtwidgets-${QTMIN}:5
163 "
164 RDEPEND="${DEPEND}
165 - !kde-apps/kdepim-l10n
166 !<kde-apps/kdepim-runtime-18.03.80
167 "
168
169 diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.49.9999.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.49.9999.ebuild
170 index 5d0c09505d..a6a79d3712 100644
171 --- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.49.9999.ebuild
172 +++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.49.9999.ebuild
173 @@ -18,6 +18,17 @@ KEYWORDS=""
174 IUSE=""
175
176 DEPEND="
177 + >=dev-qt/qtgui-${QTMIN}:5
178 + >=dev-qt/qtwidgets-${QTMIN}:5
179 + >=dev-qt/qtxml-${QTMIN}:5
180 + >=kde-apps/akonadi-${PVCUT}:5
181 + >=kde-apps/kidentitymanagement-${PVCUT}:5
182 + >=kde-apps/kmailtransport-${PVCUT}:5
183 + >=kde-apps/libkdepim-${PVCUT}:5
184 + >=kde-apps/mailcommon-${PVCUT}:5
185 + >=kde-apps/mailimporter-${PVCUT}:5
186 + >=kde-apps/messagelib-${PVCUT}:5
187 + >=kde-apps/pimcommon-${PVCUT}:5
188 >=kde-frameworks/kcompletion-${KFMIN}:5
189 >=kde-frameworks/kconfig-${KFMIN}:5
190 >=kde-frameworks/kcontacts-${KFMIN}:5
191 @@ -28,19 +39,5 @@ DEPEND="
192 >=kde-frameworks/kwallet-${KFMIN}:5
193 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
194 >=kde-frameworks/kxmlgui-${KFMIN}:5
195 - >=kde-apps/akonadi-${PVCUT}:5
196 - >=kde-apps/kidentitymanagement-${PVCUT}:5
197 - >=kde-apps/kmailtransport-${PVCUT}:5
198 - >=kde-apps/libkdepim-${PVCUT}:5
199 - >=kde-apps/mailcommon-${PVCUT}:5
200 - >=kde-apps/mailimporter-${PVCUT}:5
201 - >=kde-apps/messagelib-${PVCUT}:5
202 - >=kde-apps/pimcommon-${PVCUT}:5
203 - >=dev-qt/qtgui-${QTMIN}:5
204 - >=dev-qt/qtwidgets-${QTMIN}:5
205 - >=dev-qt/qtxml-${QTMIN}:5
206 -"
207 -RDEPEND="${DEPEND}
208 - !kde-apps/kdepim-l10n
209 - !kde-apps/kmail:4
210 "
211 +RDEPEND="${DEPEND}"
212
213 diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
214 index 622693cba5..f160f6bfeb 100644
215 --- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
216 +++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
217 @@ -18,6 +18,17 @@ KEYWORDS=""
218 IUSE=""
219
220 DEPEND="
221 + >=dev-qt/qtgui-${QTMIN}:5
222 + >=dev-qt/qtwidgets-${QTMIN}:5
223 + >=dev-qt/qtxml-${QTMIN}:5
224 + >=kde-apps/akonadi-${PVCUT}:5
225 + >=kde-apps/kidentitymanagement-${PVCUT}:5
226 + >=kde-apps/kmailtransport-${PVCUT}:5
227 + >=kde-apps/libkdepim-${PVCUT}:5
228 + >=kde-apps/mailcommon-${PVCUT}:5
229 + >=kde-apps/mailimporter-${PVCUT}:5
230 + >=kde-apps/messagelib-${PVCUT}:5
231 + >=kde-apps/pimcommon-${PVCUT}:5
232 >=kde-frameworks/kcompletion-${KFMIN}:5
233 >=kde-frameworks/kconfig-${KFMIN}:5
234 >=kde-frameworks/kcontacts-${KFMIN}:5
235 @@ -28,19 +39,5 @@ DEPEND="
236 >=kde-frameworks/kwallet-${KFMIN}:5
237 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
238 >=kde-frameworks/kxmlgui-${KFMIN}:5
239 - >=kde-apps/akonadi-${PVCUT}:5
240 - >=kde-apps/kidentitymanagement-${PVCUT}:5
241 - >=kde-apps/kmailtransport-${PVCUT}:5
242 - >=kde-apps/libkdepim-${PVCUT}:5
243 - >=kde-apps/mailcommon-${PVCUT}:5
244 - >=kde-apps/mailimporter-${PVCUT}:5
245 - >=kde-apps/messagelib-${PVCUT}:5
246 - >=kde-apps/pimcommon-${PVCUT}:5
247 - >=dev-qt/qtgui-${QTMIN}:5
248 - >=dev-qt/qtwidgets-${QTMIN}:5
249 - >=dev-qt/qtxml-${QTMIN}:5
250 -"
251 -RDEPEND="${DEPEND}
252 - !kde-apps/kdepim-l10n
253 - !kde-apps/kmail:4
254 "
255 +RDEPEND="${DEPEND}"
256
257 diff --git a/kde-apps/akonadi-mime/akonadi-mime-19.12.49.9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-19.12.49.9999.ebuild
258 index 1f983dd0f9..e8398e64c2 100644
259 --- a/kde-apps/akonadi-mime/akonadi-mime-19.12.49.9999.ebuild
260 +++ b/kde-apps/akonadi-mime/akonadi-mime-19.12.49.9999.ebuild
261 @@ -36,7 +36,5 @@ DEPEND="
262 dev-libs/libxslt
263 "
264 RDEPEND="${DEPEND}
265 - !kde-apps/kdepim-l10n
266 !<kde-apps/kdepim-runtime-18.03.80
267 - !kde-apps/kdepimlibs:4
268 "
269
270 diff --git a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
271 index d1fb4ed38c..23a243df5a 100644
272 --- a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
273 +++ b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
274 @@ -20,6 +20,12 @@ IUSE=""
275 RESTRICT+=" test"
276
277 DEPEND="
278 + dev-libs/libxslt
279 + >=dev-qt/qtdbus-${QTMIN}:5
280 + >=dev-qt/qtgui-${QTMIN}:5
281 + >=dev-qt/qtwidgets-${QTMIN}:5
282 + >=kde-apps/akonadi-${PVCUT}:5
283 + >=kde-apps/kmime-${PVCUT}:5
284 >=kde-frameworks/kconfig-${KFMIN}:5
285 >=kde-frameworks/kcoreaddons-${KFMIN}:5
286 >=kde-frameworks/kdbusaddons-${KFMIN}:5
287 @@ -28,15 +34,7 @@ DEPEND="
288 >=kde-frameworks/kitemmodels-${KFMIN}:5
289 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
290 >=kde-frameworks/kxmlgui-${KFMIN}:5
291 - >=kde-apps/akonadi-${PVCUT}:5
292 - >=kde-apps/kmime-${PVCUT}:5
293 - >=dev-qt/qtdbus-${QTMIN}:5
294 - >=dev-qt/qtgui-${QTMIN}:5
295 - >=dev-qt/qtwidgets-${QTMIN}:5
296 - dev-libs/libxslt
297 "
298 RDEPEND="${DEPEND}
299 - !kde-apps/kdepim-l10n
300 !<kde-apps/kdepim-runtime-18.03.80
301 - !kde-apps/kdepimlibs:4
302 "
303
304 diff --git a/kde-apps/akonadi-notes/akonadi-notes-19.12.49.9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-19.12.49.9999.ebuild
305 index 32d1e81d34..ce400f8919 100644
306 --- a/kde-apps/akonadi-notes/akonadi-notes-19.12.49.9999.ebuild
307 +++ b/kde-apps/akonadi-notes/akonadi-notes-19.12.49.9999.ebuild
308 @@ -17,11 +17,9 @@ KEYWORDS=""
309 IUSE=""
310
311 DEPEND="
312 - >=kde-frameworks/ki18n-${KFMIN}:5
313 - >=kde-apps/kmime-${PVCUT}:5
314 >=dev-qt/qtgui-${QTMIN}:5
315 >=dev-qt/qtxml-${QTMIN}:5
316 + >=kde-apps/kmime-${PVCUT}:5
317 + >=kde-frameworks/ki18n-${KFMIN}:5
318 "
319 -RDEPEND="${DEPEND}
320 - !kde-apps/kdepim-l10n
321 -"
322 +RDEPEND="${DEPEND}"
323
324 diff --git a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
325 index ff38a53c86..f8ca14e4ec 100644
326 --- a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
327 +++ b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
328 @@ -17,11 +17,9 @@ KEYWORDS=""
329 IUSE=""
330
331 DEPEND="
332 - >=kde-frameworks/ki18n-${KFMIN}:5
333 - >=kde-apps/kmime-${PVCUT}:5
334 >=dev-qt/qtgui-${QTMIN}:5
335 >=dev-qt/qtxml-${QTMIN}:5
336 + >=kde-apps/kmime-${PVCUT}:5
337 + >=kde-frameworks/ki18n-${KFMIN}:5
338 "
339 -RDEPEND="${DEPEND}
340 - !kde-apps/kdepim-l10n
341 -"
342 +RDEPEND="${DEPEND}"
343
344 diff --git a/kde-apps/akonadi-search/akonadi-search-19.12.49.9999.ebuild b/kde-apps/akonadi-search/akonadi-search-19.12.49.9999.ebuild
345 index c716da3175..6c36e95f99 100644
346 --- a/kde-apps/akonadi-search/akonadi-search-19.12.49.9999.ebuild
347 +++ b/kde-apps/akonadi-search/akonadi-search-19.12.49.9999.ebuild
348 @@ -21,7 +21,14 @@ IUSE=""
349 BDEPEND="
350 test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
351 "
352 -COMMON_DEPEND="
353 +RDEPEND="
354 + >=dev-libs/xapian-1.3:=[chert(+)]
355 + >=dev-qt/qtdbus-${QTMIN}:5
356 + >=dev-qt/qtgui-${QTMIN}:5
357 + >=dev-qt/qtwidgets-${QTMIN}:5
358 + >=kde-apps/akonadi-${PVCUT}:5
359 + >=kde-apps/akonadi-mime-${PVCUT}:5
360 + >=kde-apps/kmime-${PVCUT}:5
361 >=kde-frameworks/kcalendarcore-${KFMIN}:5
362 >=kde-frameworks/kcmutils-${KFMIN}:5
363 >=kde-frameworks/kcodecs-${KFMIN}:5
364 @@ -33,18 +40,8 @@ COMMON_DEPEND="
365 >=kde-frameworks/kio-${KFMIN}:5
366 >=kde-frameworks/ki18n-${KFMIN}:5
367 >=kde-frameworks/krunner-${KFMIN}:5
368 - >=kde-apps/akonadi-${PVCUT}:5
369 - >=kde-apps/akonadi-mime-${PVCUT}:5
370 - >=kde-apps/kmime-${PVCUT}:5
371 - >=dev-qt/qtdbus-${QTMIN}:5
372 - >=dev-qt/qtgui-${QTMIN}:5
373 - >=dev-qt/qtwidgets-${QTMIN}:5
374 - >=dev-libs/xapian-1.3:=[chert(+)]
375 "
376 -DEPEND="${COMMON_DEPEND}
377 +DEPEND="${RDEPEND}
378 dev-libs/boost
379 test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
380 "
381 -RDEPEND="${COMMON_DEPEND}
382 - !kde-apps/kdepim-l10n
383 -"
384
385 diff --git a/kde-apps/akonadi-search/akonadi-search-9999.ebuild b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
386 index 07a8429dae..b711688281 100644
387 --- a/kde-apps/akonadi-search/akonadi-search-9999.ebuild
388 +++ b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
389 @@ -21,7 +21,14 @@ IUSE=""
390 BDEPEND="
391 test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
392 "
393 -COMMON_DEPEND="
394 +RDEPEND="
395 + >=dev-libs/xapian-1.3:=[chert(+)]
396 + >=dev-qt/qtdbus-${QTMIN}:5
397 + >=dev-qt/qtgui-${QTMIN}:5
398 + >=dev-qt/qtwidgets-${QTMIN}:5
399 + >=kde-apps/akonadi-${PVCUT}:5
400 + >=kde-apps/akonadi-mime-${PVCUT}:5
401 + >=kde-apps/kmime-${PVCUT}:5
402 >=kde-frameworks/kcalendarcore-${KFMIN}:5
403 >=kde-frameworks/kcmutils-${KFMIN}:5
404 >=kde-frameworks/kcodecs-${KFMIN}:5
405 @@ -33,18 +40,8 @@ COMMON_DEPEND="
406 >=kde-frameworks/kio-${KFMIN}:5
407 >=kde-frameworks/ki18n-${KFMIN}:5
408 >=kde-frameworks/krunner-${KFMIN}:5
409 - >=kde-apps/akonadi-${PVCUT}:5
410 - >=kde-apps/akonadi-mime-${PVCUT}:5
411 - >=kde-apps/kmime-${PVCUT}:5
412 - >=dev-qt/qtdbus-${QTMIN}:5
413 - >=dev-qt/qtgui-${QTMIN}:5
414 - >=dev-qt/qtwidgets-${QTMIN}:5
415 - >=dev-libs/xapian-1.3:=[chert(+)]
416 "
417 -DEPEND="${COMMON_DEPEND}
418 +DEPEND="${RDEPEND}
419 dev-libs/boost
420 test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
421 "
422 -RDEPEND="${COMMON_DEPEND}
423 - !kde-apps/kdepim-l10n
424 -"
425
426 diff --git a/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild
427 index 670615cd65..4c7e21add6 100644
428 --- a/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild
429 +++ b/kde-apps/akonadi/akonadi-19.12.49.9999.ebuild
430 @@ -60,8 +60,6 @@ DEPEND="${COMMON_DEPEND}
431 "
432 RDEPEND="${COMMON_DEPEND}
433 !<kde-apps/kapptemplate-17.11.80
434 - !kde-apps/kdepim-l10n
435 - !kde-apps/kdepimlibs
436 mysql? ( virtual/mysql )
437 postgres? ( dev-db/postgresql )
438 "
439
440 diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
441 index b97d105597..6f8339e324 100644
442 --- a/kde-apps/akonadi/akonadi-9999.ebuild
443 +++ b/kde-apps/akonadi/akonadi-9999.ebuild
444 @@ -47,8 +47,8 @@ COMMON_DEPEND="
445 net-libs/accounts-qt
446 )
447 sqlite? (
448 - >=dev-qt/qtsql-${QTMIN}:5=[sqlite]
449 dev-db/sqlite:3
450 + >=dev-qt/qtsql-${QTMIN}:5=[sqlite]
451 )
452 xml? ( dev-libs/libxml2 )
453 "
454 @@ -59,8 +59,6 @@ DEPEND="${COMMON_DEPEND}
455 "
456 RDEPEND="${COMMON_DEPEND}
457 !<kde-apps/kapptemplate-17.11.80
458 - !kde-apps/kdepim-l10n
459 - !kde-apps/kdepimlibs
460 mysql? ( virtual/mysql )
461 postgres? ( dev-db/postgresql )
462 "
463
464 diff --git a/kde-apps/akregator/akregator-19.12.49.9999.ebuild b/kde-apps/akregator/akregator-19.12.49.9999.ebuild
465 index 3992177061..4f4dcaf552 100644
466 --- a/kde-apps/akregator/akregator-19.12.49.9999.ebuild
467 +++ b/kde-apps/akregator/akregator-19.12.49.9999.ebuild
468 @@ -18,7 +18,7 @@ SLOT="5"
469 KEYWORDS=""
470 IUSE=""
471
472 -COMMON_DEPEND="
473 +RDEPEND="
474 >=kde-frameworks/kcmutils-${KFMIN}:5
475 >=kde-frameworks/kcodecs-${KFMIN}:5
476 >=kde-frameworks/kcompletion-${KFMIN}:5
477 @@ -51,9 +51,6 @@ COMMON_DEPEND="
478 >=dev-qt/qtwidgets-${QTMIN}:5
479 >=dev-qt/qtxml-${QTMIN}:5
480 "
481 -DEPEND="${COMMON_DEPEND}
482 +DEPEND="${RDEPEND}
483 dev-libs/grantlee:5
484 "
485 -RDEPEND="${COMMON_DEPEND}
486 - !kde-apps/kdepim-l10n
487 -"
488
489 diff --git a/kde-apps/akregator/akregator-9999.ebuild b/kde-apps/akregator/akregator-9999.ebuild
490 index a0ca3d64fd..ea3fe3c329 100644
491 --- a/kde-apps/akregator/akregator-9999.ebuild
492 +++ b/kde-apps/akregator/akregator-9999.ebuild
493 @@ -18,7 +18,19 @@ SLOT="5"
494 KEYWORDS=""
495 IUSE=""
496
497 -COMMON_DEPEND="
498 +RDEPEND="
499 + >=dev-qt/qtdbus-${QTMIN}:5
500 + >=dev-qt/qtgui-${QTMIN}:5
501 + >=dev-qt/qtnetwork-${QTMIN}:5
502 + >=dev-qt/qtwebengine-${QTMIN}:5
503 + >=dev-qt/qtwidgets-${QTMIN}:5
504 + >=dev-qt/qtxml-${QTMIN}:5
505 + >=kde-apps/grantleetheme-${PVCUT}:5
506 + >=kde-apps/kontactinterface-${PVCUT}:5
507 + >=kde-apps/kpimtextedit-${PVCUT}:5
508 + >=kde-apps/libkdepim-${PVCUT}:5
509 + >=kde-apps/messagelib-${PVCUT}:5
510 + >=kde-apps/pimcommon-${PVCUT}:5
511 >=kde-frameworks/kcmutils-${KFMIN}:5
512 >=kde-frameworks/kcodecs-${KFMIN}:5
513 >=kde-frameworks/kcompletion-${KFMIN}:5
514 @@ -37,22 +49,7 @@ COMMON_DEPEND="
515 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
516 >=kde-frameworks/kxmlgui-${KFMIN}:5
517 >=kde-frameworks/syndication-${KFMIN}:5
518 - >=kde-apps/grantleetheme-${PVCUT}:5
519 - >=kde-apps/kontactinterface-${PVCUT}:5
520 - >=kde-apps/kpimtextedit-${PVCUT}:5
521 - >=kde-apps/libkdepim-${PVCUT}:5
522 - >=kde-apps/messagelib-${PVCUT}:5
523 - >=kde-apps/pimcommon-${PVCUT}:5
524 - >=dev-qt/qtdbus-${QTMIN}:5
525 - >=dev-qt/qtgui-${QTMIN}:5
526 - >=dev-qt/qtnetwork-${QTMIN}:5
527 - >=dev-qt/qtwebengine-${QTMIN}:5
528 - >=dev-qt/qtwidgets-${QTMIN}:5
529 - >=dev-qt/qtxml-${QTMIN}:5
530 "
531 -DEPEND="${COMMON_DEPEND}
532 +DEPEND="${RDEPEND}
533 dev-libs/grantlee:5
534 "
535 -RDEPEND="${COMMON_DEPEND}
536 - !kde-apps/kdepim-l10n
537 -"
538
539 diff --git a/kde-apps/calendarjanitor/calendarjanitor-19.12.49.9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-19.12.49.9999.ebuild
540 index 82ffdf8348..533670c011 100644
541 --- a/kde-apps/calendarjanitor/calendarjanitor-19.12.49.9999.ebuild
542 +++ b/kde-apps/calendarjanitor/calendarjanitor-19.12.49.9999.ebuild
543 @@ -19,17 +19,15 @@ KEYWORDS=""
544 IUSE=""
545
546 DEPEND="
547 - >=kde-frameworks/kcalendarcore-${KFMIN}:5
548 - >=kde-frameworks/kcoreaddons-${KFMIN}:5
549 - >=kde-frameworks/ki18n-${KFMIN}:5
550 + >=dev-qt/qtwidgets-${QTMIN}:5
551 >=kde-apps/akonadi-${PVCUT}:5
552 >=kde-apps/akonadi-calendar-${PVCUT}:5
553 >=kde-apps/calendarsupport-${PVCUT}:5
554 - >=dev-qt/qtwidgets-${QTMIN}:5
555 -"
556 -RDEPEND="${DEPEND}
557 - !kde-apps/kdepim-l10n
558 + >=kde-frameworks/kcalendarcore-${KFMIN}:5
559 + >=kde-frameworks/kcoreaddons-${KFMIN}:5
560 + >=kde-frameworks/ki18n-${KFMIN}:5
561 "
562 +RDEPEND="${DEPEND}"
563
564 src_prepare() {
565 ecm_src_prepare
566
567 diff --git a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
568 index 3387588a55..8faada72b3 100644
569 --- a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
570 +++ b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
571 @@ -19,17 +19,15 @@ KEYWORDS=""
572 IUSE=""
573
574 DEPEND="
575 - >=kde-frameworks/kcalendarcore-${KFMIN}:5
576 - >=kde-frameworks/kcoreaddons-${KFMIN}:5
577 - >=kde-frameworks/ki18n-${KFMIN}:5
578 + >=dev-qt/qtwidgets-${QTMIN}:5
579 >=kde-apps/akonadi-${PVCUT}:5
580 >=kde-apps/akonadi-calendar-${PVCUT}:5
581 >=kde-apps/calendarsupport-${PVCUT}:5
582 - >=dev-qt/qtwidgets-${QTMIN}:5
583 -"
584 -RDEPEND="${DEPEND}
585 - !kde-apps/kdepim-l10n
586 + >=kde-frameworks/kcalendarcore-${KFMIN}:5
587 + >=kde-frameworks/kcoreaddons-${KFMIN}:5
588 + >=kde-frameworks/ki18n-${KFMIN}:5
589 "
590 +RDEPEND="${DEPEND}"
591
592 src_prepare() {
593 ecm_src_prepare
594
595 diff --git a/kde-apps/calendarsupport/calendarsupport-19.12.49.9999.ebuild b/kde-apps/calendarsupport/calendarsupport-19.12.49.9999.ebuild
596 index 7b744c6dd9..8bea7ebeeb 100644
597 --- a/kde-apps/calendarsupport/calendarsupport-19.12.49.9999.ebuild
598 +++ b/kde-apps/calendarsupport/calendarsupport-19.12.49.9999.ebuild
599 @@ -43,6 +43,4 @@ DEPEND="
600 >=dev-qt/qtwidgets-${QTMIN}:5
601 dev-libs/libical
602 "
603 -RDEPEND="${DEPEND}
604 - !kde-apps/kdepim-l10n
605 -"
606 +RDEPEND="${DEPEND}"
607
608 diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
609 index d136247a43..321ec53069 100644
610 --- a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
611 +++ b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
612 @@ -17,6 +17,20 @@ KEYWORDS=""
613 IUSE=""
614
615 DEPEND="
616 + dev-libs/libical
617 + >=dev-qt/designer-${QTMIN}:5
618 + >=dev-qt/qtgui-${QTMIN}:5
619 + >=dev-qt/qtprintsupport-${QTMIN}:5
620 + >=dev-qt/qtwidgets-${QTMIN}:5
621 + >=kde-apps/akonadi-${PVCUT}:5
622 + >=kde-apps/akonadi-calendar-${PVCUT}:5
623 + >=kde-apps/akonadi-mime-${PVCUT}:5
624 + >=kde-apps/kcalutils-${PVCUT}:5
625 + >=kde-apps/kdepim-apps-libs-${PVCUT}:5
626 + >=kde-apps/kidentitymanagement-${PVCUT}:5
627 + >=kde-apps/kmime-${PVCUT}:5
628 + >=kde-apps/libkdepim-${PVCUT}:5
629 + >=kde-apps/pimcommon-${PVCUT}:5
630 >=kde-frameworks/kcalendarcore-${KFMIN}:5
631 >=kde-frameworks/kcodecs-${KFMIN}:5
632 >=kde-frameworks/kcompletion-${KFMIN}:5
633 @@ -28,21 +42,5 @@ DEPEND="
634 >=kde-frameworks/kio-${KFMIN}:5
635 >=kde-frameworks/kjobwidgets-${KFMIN}:5
636 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
637 - >=kde-apps/akonadi-${PVCUT}:5
638 - >=kde-apps/akonadi-calendar-${PVCUT}:5
639 - >=kde-apps/akonadi-mime-${PVCUT}:5
640 - >=kde-apps/kcalutils-${PVCUT}:5
641 - >=kde-apps/kdepim-apps-libs-${PVCUT}:5
642 - >=kde-apps/kidentitymanagement-${PVCUT}:5
643 - >=kde-apps/kmime-${PVCUT}:5
644 - >=kde-apps/libkdepim-${PVCUT}:5
645 - >=kde-apps/pimcommon-${PVCUT}:5
646 - >=dev-qt/designer-${QTMIN}:5
647 - >=dev-qt/qtgui-${QTMIN}:5
648 - >=dev-qt/qtprintsupport-${QTMIN}:5
649 - >=dev-qt/qtwidgets-${QTMIN}:5
650 - dev-libs/libical
651 -"
652 -RDEPEND="${DEPEND}
653 - !kde-apps/kdepim-l10n
654 "
655 +RDEPEND="${DEPEND}"
656
657 diff --git a/kde-apps/eventviews/eventviews-19.12.49.9999.ebuild b/kde-apps/eventviews/eventviews-19.12.49.9999.ebuild
658 index abdc343614..6405623014 100644
659 --- a/kde-apps/eventviews/eventviews-19.12.49.9999.ebuild
660 +++ b/kde-apps/eventviews/eventviews-19.12.49.9999.ebuild
661 @@ -43,6 +43,4 @@ DEPEND="
662 dev-libs/kdiagram:5
663 dev-libs/libical
664 "
665 -RDEPEND="${DEPEND}
666 - !kde-apps/kdepim-l10n
667 -"
668 +RDEPEND="${DEPEND}"
669
670 diff --git a/kde-apps/eventviews/eventviews-9999.ebuild b/kde-apps/eventviews/eventviews-9999.ebuild
671 index 59fb65438b..b131169e96 100644
672 --- a/kde-apps/eventviews/eventviews-9999.ebuild
673 +++ b/kde-apps/eventviews/eventviews-9999.ebuild
674 @@ -18,6 +18,17 @@ IUSE=""
675
676 # drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
677 DEPEND="
678 + dev-libs/kdiagram:5
679 + dev-libs/libical
680 + >=dev-qt/designer-${QTMIN}:5
681 + >=dev-qt/qtgui-${QTMIN}:5=
682 + >=dev-qt/qtwidgets-${QTMIN}:5
683 + >=kde-apps/akonadi-${PVCUT}:5
684 + >=kde-apps/akonadi-calendar-${PVCUT}:5
685 + >=kde-apps/calendarsupport-${PVCUT}:5
686 + >=kde-apps/kcalutils-${PVCUT}:5
687 + >=kde-apps/kmime-${PVCUT}:5
688 + >=kde-apps/libkdepim-${PVCUT}:5
689 >=kde-frameworks/kcalendarcore-${KFMIN}:5
690 >=kde-frameworks/kcodecs-${KFMIN}:5
691 >=kde-frameworks/kcompletion-${KFMIN}:5
692 @@ -31,18 +42,5 @@ DEPEND="
693 >=kde-frameworks/kitemmodels-${KFMIN}:5
694 >=kde-frameworks/kservice-${KFMIN}:5
695 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
696 - >=kde-apps/akonadi-${PVCUT}:5
697 - >=kde-apps/akonadi-calendar-${PVCUT}:5
698 - >=kde-apps/calendarsupport-${PVCUT}:5
699 - >=kde-apps/kcalutils-${PVCUT}:5
700 - >=kde-apps/kmime-${PVCUT}:5
701 - >=kde-apps/libkdepim-${PVCUT}:5
702 - >=dev-qt/designer-${QTMIN}:5
703 - >=dev-qt/qtgui-${QTMIN}:5=
704 - >=dev-qt/qtwidgets-${QTMIN}:5
705 - dev-libs/kdiagram:5
706 - dev-libs/libical
707 -"
708 -RDEPEND="${DEPEND}
709 - !kde-apps/kdepim-l10n
710 "
711 +RDEPEND="${DEPEND}"
712
713 diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.12.49.9999.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.12.49.9999.ebuild
714 index fceabdf735..567dab0015 100644
715 --- a/kde-apps/grantlee-editor/grantlee-editor-19.12.49.9999.ebuild
716 +++ b/kde-apps/grantlee-editor/grantlee-editor-19.12.49.9999.ebuild
717 @@ -41,9 +41,4 @@ DEPEND="
718 >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
719 >=dev-qt/qtwidgets-${QTMIN}:5
720 "
721 -RDEPEND="${DEPEND}
722 - !kde-apps/kaddressbook:4
723 - !kde-apps/kdepim-common-libs:4
724 - !kde-apps/kdepim-l10n
725 - !kde-apps/kmail:4
726 -"
727 +RDEPEND="${DEPEND}"
728
729 diff --git a/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild b/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
730 index e9ed4276eb..35925d7426 100644
731 --- a/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
732 +++ b/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
733 @@ -17,6 +17,14 @@ KEYWORDS=""
734 IUSE=""
735
736 DEPEND="
737 + >=dev-qt/qtgui-${QTMIN}:5
738 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
739 + >=dev-qt/qtwidgets-${QTMIN}:5
740 + >=kde-apps/akonadi-contacts-${PVCUT}:5
741 + >=kde-apps/kmime-${PVCUT}:5
742 + >=kde-apps/kpimtextedit-${PVCUT}:5
743 + >=kde-apps/messagelib-${PVCUT}:5
744 + >=kde-apps/pimcommon-${PVCUT}:5
745 >=kde-frameworks/karchive-${KFMIN}:5
746 >=kde-frameworks/kcompletion-${KFMIN}:5
747 >=kde-frameworks/kconfig-${KFMIN}:5
748 @@ -32,18 +40,5 @@ DEPEND="
749 >=kde-frameworks/kwallet-${KFMIN}:5
750 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
751 >=kde-frameworks/kxmlgui-${KFMIN}:5
752 - >=kde-apps/akonadi-contacts-${PVCUT}:5
753 - >=kde-apps/kmime-${PVCUT}:5
754 - >=kde-apps/kpimtextedit-${PVCUT}:5
755 - >=kde-apps/messagelib-${PVCUT}:5
756 - >=kde-apps/pimcommon-${PVCUT}:5
757 - >=dev-qt/qtgui-${QTMIN}:5
758 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
759 - >=dev-qt/qtwidgets-${QTMIN}:5
760 -"
761 -RDEPEND="${DEPEND}
762 - !kde-apps/kaddressbook:4
763 - !kde-apps/kdepim-common-libs:4
764 - !kde-apps/kdepim-l10n
765 - !kde-apps/kmail:4
766 "
767 +RDEPEND="${DEPEND}"
768
769 diff --git a/kde-apps/grantleetheme/grantleetheme-19.12.49.9999.ebuild b/kde-apps/grantleetheme/grantleetheme-19.12.49.9999.ebuild
770 index 40e00b7259..fdfad2e205 100644
771 --- a/kde-apps/grantleetheme/grantleetheme-19.12.49.9999.ebuild
772 +++ b/kde-apps/grantleetheme/grantleetheme-19.12.49.9999.ebuild
773 @@ -15,7 +15,10 @@ SLOT="5"
774 KEYWORDS=""
775 IUSE=""
776
777 -COMMON_DEPEND="
778 +RDEPEND="
779 + dev-libs/grantlee:5
780 + >=dev-qt/qtgui-${QTMIN}:5
781 + >=dev-qt/qtwidgets-${QTMIN}:5
782 >=kde-frameworks/kconfig-${KFMIN}:5
783 >=kde-frameworks/kcoreaddons-${KFMIN}:5
784 >=kde-frameworks/kguiaddons-${KFMIN}:5
785 @@ -24,16 +27,10 @@ COMMON_DEPEND="
786 >=kde-frameworks/knewstuff-${KFMIN}:5
787 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
788 >=kde-frameworks/kxmlgui-${KFMIN}:5
789 - >=dev-qt/qtgui-${QTMIN}:5
790 - >=dev-qt/qtwidgets-${QTMIN}:5
791 - dev-libs/grantlee:5
792 "
793 -DEPEND="${COMMON_DEPEND}
794 +DEPEND="${RDEPEND}
795 >=dev-qt/qtnetwork-${QTMIN}:5
796 "
797 -RDEPEND="${COMMON_DEPEND}
798 - !kde-apps/kdepim-l10n
799 -"
800
801 # fails if package not already installed
802 RESTRICT+=" test"
803
804 diff --git a/kde-apps/grantleetheme/grantleetheme-9999.ebuild b/kde-apps/grantleetheme/grantleetheme-9999.ebuild
805 index 138f73269a..a4b94f5449 100644
806 --- a/kde-apps/grantleetheme/grantleetheme-9999.ebuild
807 +++ b/kde-apps/grantleetheme/grantleetheme-9999.ebuild
808 @@ -15,7 +15,10 @@ SLOT="5"
809 KEYWORDS=""
810 IUSE=""
811
812 -COMMON_DEPEND="
813 +RDEPEND="
814 + dev-libs/grantlee:5
815 + >=dev-qt/qtgui-${QTMIN}:5
816 + >=dev-qt/qtwidgets-${QTMIN}:5
817 >=kde-frameworks/kconfig-${KFMIN}:5
818 >=kde-frameworks/kcoreaddons-${KFMIN}:5
819 >=kde-frameworks/kguiaddons-${KFMIN}:5
820 @@ -24,16 +27,10 @@ COMMON_DEPEND="
821 >=kde-frameworks/knewstuff-${KFMIN}:5
822 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
823 >=kde-frameworks/kxmlgui-${KFMIN}:5
824 - >=dev-qt/qtgui-${QTMIN}:5
825 - >=dev-qt/qtwidgets-${QTMIN}:5
826 - dev-libs/grantlee:5
827 "
828 -DEPEND="${COMMON_DEPEND}
829 +DEPEND="${RDEPEND}
830 >=dev-qt/qtnetwork-${QTMIN}:5
831 "
832 -RDEPEND="${COMMON_DEPEND}
833 - !kde-apps/kdepim-l10n
834 -"
835
836 # fails if package not already installed
837 RESTRICT+=" test"
838
839 diff --git a/kde-apps/incidenceeditor/incidenceeditor-19.12.49.9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-19.12.49.9999.ebuild
840 index db042ad552..45a5b8182c 100644
841 --- a/kde-apps/incidenceeditor/incidenceeditor-19.12.49.9999.ebuild
842 +++ b/kde-apps/incidenceeditor/incidenceeditor-19.12.49.9999.ebuild
843 @@ -52,7 +52,4 @@ DEPEND="
844 >=dev-qt/qtwidgets-${QTMIN}:5
845 dev-libs/kdiagram:5
846 "
847 -RDEPEND="${DEPEND}
848 - !kde-apps/kdepim-common-libs:4
849 - !kde-apps/kdepim-l10n
850 -"
851 +RDEPEND="${DEPEND}"
852
853 diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
854 index bee1f891d0..56d6f56d48 100644
855 --- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
856 +++ b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
857 @@ -18,6 +18,23 @@ KEYWORDS=""
858 IUSE=""
859
860 DEPEND="
861 + dev-libs/kdiagram:5
862 + >=dev-qt/qtdbus-${QTMIN}:5
863 + >=dev-qt/qtgui-${QTMIN}:5
864 + >=dev-qt/qtwidgets-${QTMIN}:5
865 + >=kde-apps/akonadi-${PVCUT}:5
866 + >=kde-apps/akonadi-calendar-${PVCUT}:5
867 + >=kde-apps/akonadi-contacts-${PVCUT}:5
868 + >=kde-apps/akonadi-mime-${PVCUT}:5
869 + >=kde-apps/calendarsupport-${PVCUT}:5
870 + >=kde-apps/eventviews-${PVCUT}:5
871 + >=kde-apps/kcalutils-${PVCUT}:5
872 + >=kde-apps/kdepim-apps-libs-${PVCUT}:5
873 + >=kde-apps/kidentitymanagement-${PVCUT}:5
874 + >=kde-apps/kldap-${PVCUT}:5
875 + >=kde-apps/kmailtransport-${PVCUT}:5
876 + >=kde-apps/kmime-${PVCUT}:5
877 + >=kde-apps/libkdepim-${PVCUT}:5
878 >=kde-frameworks/kcalendarcore-${KFMIN}:5
879 >=kde-frameworks/kcodecs-${KFMIN}:5
880 >=kde-frameworks/kcompletion-${KFMIN}:5
881 @@ -34,25 +51,5 @@ DEPEND="
882 >=kde-frameworks/ktextwidgets-${KFMIN}:5
883 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
884 >=kde-frameworks/kxmlgui-${KFMIN}:5
885 - >=kde-apps/akonadi-${PVCUT}:5
886 - >=kde-apps/akonadi-calendar-${PVCUT}:5
887 - >=kde-apps/akonadi-contacts-${PVCUT}:5
888 - >=kde-apps/akonadi-mime-${PVCUT}:5
889 - >=kde-apps/calendarsupport-${PVCUT}:5
890 - >=kde-apps/eventviews-${PVCUT}:5
891 - >=kde-apps/kcalutils-${PVCUT}:5
892 - >=kde-apps/kdepim-apps-libs-${PVCUT}:5
893 - >=kde-apps/kidentitymanagement-${PVCUT}:5
894 - >=kde-apps/kldap-${PVCUT}:5
895 - >=kde-apps/kmailtransport-${PVCUT}:5
896 - >=kde-apps/kmime-${PVCUT}:5
897 - >=kde-apps/libkdepim-${PVCUT}:5
898 - >=dev-qt/qtdbus-${QTMIN}:5
899 - >=dev-qt/qtgui-${QTMIN}:5
900 - >=dev-qt/qtwidgets-${QTMIN}:5
901 - dev-libs/kdiagram:5
902 -"
903 -RDEPEND="${DEPEND}
904 - !kde-apps/kdepim-common-libs:4
905 - !kde-apps/kdepim-l10n
906 "
907 +RDEPEND="${DEPEND}"
908
909 diff --git a/kde-apps/kaddressbook/kaddressbook-19.12.49.9999.ebuild b/kde-apps/kaddressbook/kaddressbook-19.12.49.9999.ebuild
910 index 0912d339cb..0abd13bef6 100644
911 --- a/kde-apps/kaddressbook/kaddressbook-19.12.49.9999.ebuild
912 +++ b/kde-apps/kaddressbook/kaddressbook-19.12.49.9999.ebuild
913 @@ -55,7 +55,6 @@ DEPEND="
914 dev-libs/grantlee:5
915 "
916 RDEPEND="${DEPEND}
917 - !kde-apps/kdepim-l10n
918 >=kde-apps/kdepim-runtime-${PVCUT}:5
919 "
920
921
922 diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
923 index 6ea1ee358c..b96485b1a1 100644
924 --- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
925 +++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
926 @@ -20,6 +20,22 @@ KEYWORDS=""
927 IUSE=""
928
929 DEPEND="
930 + >=app-crypt/gpgme-1.11.1[cxx,qt5]
931 + dev-libs/grantlee:5
932 + >=dev-qt/qtdbus-${QTMIN}:5
933 + >=dev-qt/qtgui-${QTMIN}:5
934 + >=dev-qt/qtprintsupport-${QTMIN}:5
935 + >=dev-qt/qtwidgets-${QTMIN}:5
936 + >=kde-apps/akonadi-${PVCUT}:5
937 + >=kde-apps/akonadi-contacts-${PVCUT}:5
938 + >=kde-apps/akonadi-search-${PVCUT}:5
939 + >=kde-apps/grantleetheme-${PVCUT}:5
940 + >=kde-apps/kdepim-apps-libs-${PVCUT}:5
941 + >=kde-apps/kontactinterface-${PVCUT}:5
942 + >=kde-apps/libgravatar-${PVCUT}:5
943 + >=kde-apps/libkdepim-${PVCUT}:5
944 + >=kde-apps/libkleo-${PVCUT}:5
945 + >=kde-apps/pimcommon-${PVCUT}:5
946 >=kde-frameworks/kcmutils-${KFMIN}:5
947 >=kde-frameworks/kcodecs-${KFMIN}:5
948 >=kde-frameworks/kcompletion-${KFMIN}:5
949 @@ -37,25 +53,8 @@ DEPEND="
950 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
951 >=kde-frameworks/kxmlgui-${KFMIN}:5
952 >=kde-frameworks/prison-${KFMIN}:5
953 - >=kde-apps/akonadi-${PVCUT}:5
954 - >=kde-apps/akonadi-contacts-${PVCUT}:5
955 - >=kde-apps/akonadi-search-${PVCUT}:5
956 - >=kde-apps/grantleetheme-${PVCUT}:5
957 - >=kde-apps/kdepim-apps-libs-${PVCUT}:5
958 - >=kde-apps/kontactinterface-${PVCUT}:5
959 - >=kde-apps/libgravatar-${PVCUT}:5
960 - >=kde-apps/libkdepim-${PVCUT}:5
961 - >=kde-apps/libkleo-${PVCUT}:5
962 - >=kde-apps/pimcommon-${PVCUT}:5
963 - >=dev-qt/qtdbus-${QTMIN}:5
964 - >=dev-qt/qtgui-${QTMIN}:5
965 - >=dev-qt/qtprintsupport-${QTMIN}:5
966 - >=dev-qt/qtwidgets-${QTMIN}:5
967 - >=app-crypt/gpgme-1.11.1[cxx,qt5]
968 - dev-libs/grantlee:5
969 "
970 RDEPEND="${DEPEND}
971 - !kde-apps/kdepim-l10n
972 >=kde-apps/kdepim-runtime-${PVCUT}:5
973 "
974
975
976 diff --git a/kde-apps/kalarm/kalarm-19.12.49.9999.ebuild b/kde-apps/kalarm/kalarm-19.12.49.9999.ebuild
977 index 0af7f6fc45..30feac8462 100644
978 --- a/kde-apps/kalarm/kalarm-19.12.49.9999.ebuild
979 +++ b/kde-apps/kalarm/kalarm-19.12.49.9999.ebuild
980 @@ -72,7 +72,6 @@ DEPEND="
981 )
982 "
983 RDEPEND="${DEPEND}
984 - !kde-apps/kdepim-l10n
985 >=kde-apps/kdepim-runtime-${PVCUT}:5
986 "
987
988
989 diff --git a/kde-apps/kalarm/kalarm-9999.ebuild b/kde-apps/kalarm/kalarm-9999.ebuild
990 index 08dac83ec6..d90c30d27e 100644
991 --- a/kde-apps/kalarm/kalarm-9999.ebuild
992 +++ b/kde-apps/kalarm/kalarm-9999.ebuild
993 @@ -22,6 +22,24 @@ BDEPEND="
994 dev-libs/libxslt
995 "
996 DEPEND="
997 + >=dev-qt/qtdbus-${QTMIN}:5
998 + >=dev-qt/qtgui-${QTMIN}:5
999 + >=dev-qt/qtnetwork-${QTMIN}:5
1000 + >=dev-qt/qtwidgets-${QTMIN}:5
1001 + >=kde-apps/akonadi-${PVCUT}:5
1002 + >=kde-apps/akonadi-contacts-${PVCUT}:5
1003 + >=kde-apps/akonadi-mime-${PVCUT}:5
1004 + >=kde-apps/kalarmcal-${PVCUT}:5
1005 + >=kde-apps/kcalutils-${PVCUT}:5
1006 + >=kde-apps/kdepim-apps-libs-${PVCUT}:5
1007 + >=kde-apps/kidentitymanagement-${PVCUT}:5
1008 + >=kde-apps/kmailtransport-${PVCUT}:5
1009 + >=kde-apps/kmime-${PVCUT}:5
1010 + >=kde-apps/kontactinterface-${PVCUT}:5
1011 + >=kde-apps/kpimtextedit-${PVCUT}:5
1012 + >=kde-apps/libkdepim-${PVCUT}:5
1013 + >=kde-apps/mailcommon-${PVCUT}:5
1014 + >=kde-apps/pimcommon-${PVCUT}:5
1015 >=kde-frameworks/kauth-${KFMIN}:5
1016 >=kde-frameworks/kcalendarcore-${KFMIN}:5
1017 >=kde-frameworks/kcmutils-${KFMIN}:5
1018 @@ -47,24 +65,6 @@ DEPEND="
1019 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
1020 >=kde-frameworks/kwindowsystem-${KFMIN}:5
1021 >=kde-frameworks/kxmlgui-${KFMIN}:5
1022 - >=kde-apps/akonadi-${PVCUT}:5
1023 - >=kde-apps/akonadi-contacts-${PVCUT}:5
1024 - >=kde-apps/akonadi-mime-${PVCUT}:5
1025 - >=kde-apps/kalarmcal-${PVCUT}:5
1026 - >=kde-apps/kcalutils-${PVCUT}:5
1027 - >=kde-apps/kdepim-apps-libs-${PVCUT}:5
1028 - >=kde-apps/kidentitymanagement-${PVCUT}:5
1029 - >=kde-apps/kmailtransport-${PVCUT}:5
1030 - >=kde-apps/kmime-${PVCUT}:5
1031 - >=kde-apps/kontactinterface-${PVCUT}:5
1032 - >=kde-apps/kpimtextedit-${PVCUT}:5
1033 - >=kde-apps/libkdepim-${PVCUT}:5
1034 - >=kde-apps/mailcommon-${PVCUT}:5
1035 - >=kde-apps/pimcommon-${PVCUT}:5
1036 - >=dev-qt/qtdbus-${QTMIN}:5
1037 - >=dev-qt/qtgui-${QTMIN}:5
1038 - >=dev-qt/qtnetwork-${QTMIN}:5
1039 - >=dev-qt/qtwidgets-${QTMIN}:5
1040 media-libs/phonon[qt5(+)]
1041 X? (
1042 >=dev-qt/qtx11extras-${QTMIN}:5
1043 @@ -72,7 +72,6 @@ DEPEND="
1044 )
1045 "
1046 RDEPEND="${DEPEND}
1047 - !kde-apps/kdepim-l10n
1048 >=kde-apps/kdepim-runtime-${PVCUT}:5
1049 "
1050
1051
1052 diff --git a/kde-apps/kalarmcal/kalarmcal-19.12.49.9999.ebuild b/kde-apps/kalarmcal/kalarmcal-19.12.49.9999.ebuild
1053 index 5671a38f52..a391a8aa70 100644
1054 --- a/kde-apps/kalarmcal/kalarmcal-19.12.49.9999.ebuild
1055 +++ b/kde-apps/kalarmcal/kalarmcal-19.12.49.9999.ebuild
1056 @@ -30,7 +30,6 @@ DEPEND="${COMMON_DEPEND}
1057 test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
1058 "
1059 RDEPEND="${COMMON_DEPEND}
1060 - !kde-apps/kdepim-l10n
1061 !<kde-apps/kdepim-runtime-18.03.80
1062 "
1063
1064
1065 diff --git a/kde-apps/kalarmcal/kalarmcal-9999.ebuild b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
1066 index fb44a9a4e5..ebfcf82f8d 100644
1067 --- a/kde-apps/kalarmcal/kalarmcal-9999.ebuild
1068 +++ b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
1069 @@ -17,20 +17,19 @@ KEYWORDS=""
1070 IUSE=""
1071
1072 COMMON_DEPEND="
1073 + >=dev-qt/qtgui-${QTMIN}:5
1074 + >=kde-apps/akonadi-${PVCUT}:5
1075 + >=kde-apps/kcalutils-${PVCUT}:5
1076 + >=kde-apps/kidentitymanagement-${PVCUT}:5
1077 >=kde-frameworks/kcalendarcore-${KFMIN}:5
1078 >=kde-frameworks/kconfig-${KFMIN}:5
1079 >=kde-frameworks/kholidays-${KFMIN}:5
1080 >=kde-frameworks/ki18n-${KFMIN}:5
1081 - >=kde-apps/akonadi-${PVCUT}:5
1082 - >=kde-apps/kcalutils-${PVCUT}:5
1083 - >=kde-apps/kidentitymanagement-${PVCUT}:5
1084 - >=dev-qt/qtgui-${QTMIN}:5
1085 "
1086 DEPEND="${COMMON_DEPEND}
1087 test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
1088 "
1089 RDEPEND="${COMMON_DEPEND}
1090 - !kde-apps/kdepim-l10n
1091 !<kde-apps/kdepim-runtime-18.03.80
1092 "
1093
1094
1095 diff --git a/kde-apps/kblog/kblog-19.12.49.9999.ebuild b/kde-apps/kblog/kblog-19.12.49.9999.ebuild
1096 index 786ef92a71..a0f35b86b0 100644
1097 --- a/kde-apps/kblog/kblog-19.12.49.9999.ebuild
1098 +++ b/kde-apps/kblog/kblog-19.12.49.9999.ebuild
1099 @@ -23,6 +23,4 @@ DEPEND="
1100 >=kde-frameworks/kxmlrpcclient-${KFMIN}:5
1101 >=kde-frameworks/syndication-${KFMIN}:5
1102 "
1103 -RDEPEND="${DEPEND}
1104 - !kde-apps/kdepim-l10n
1105 -"
1106 +RDEPEND="${DEPEND}"
1107
1108 diff --git a/kde-apps/kblog/kblog-9999.ebuild b/kde-apps/kblog/kblog-9999.ebuild
1109 index 7e4d58f1ce..cb91e7109a 100644
1110 --- a/kde-apps/kblog/kblog-9999.ebuild
1111 +++ b/kde-apps/kblog/kblog-9999.ebuild
1112 @@ -23,6 +23,4 @@ DEPEND="
1113 >=kde-frameworks/kxmlrpcclient-${KFMIN}:5
1114 >=kde-frameworks/syndication-${KFMIN}:5
1115 "
1116 -RDEPEND="${DEPEND}
1117 - !kde-apps/kdepim-l10n
1118 -"
1119 +RDEPEND="${DEPEND}"
1120
1121 diff --git a/kde-apps/kcalutils/kcalutils-19.12.49.9999.ebuild b/kde-apps/kcalutils/kcalutils-19.12.49.9999.ebuild
1122 index 17cc18da60..636e2f5b5b 100644
1123 --- a/kde-apps/kcalutils/kcalutils-19.12.49.9999.ebuild
1124 +++ b/kde-apps/kcalutils/kcalutils-19.12.49.9999.ebuild
1125 @@ -32,9 +32,7 @@ DEPEND="
1126 >=dev-qt/qtwidgets-${QTMIN}:5
1127 dev-libs/grantlee:5
1128 "
1129 -RDEPEND="${DEPEND}
1130 - !kde-apps/kdepim-l10n
1131 -"
1132 +RDEPEND="${DEPEND}"
1133
1134 src_test() {
1135 # bug 653616
1136
1137 diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/kcalutils/kcalutils-9999.ebuild
1138 index 3089562c02..3d3d86286b 100644
1139 --- a/kde-apps/kcalutils/kcalutils-9999.ebuild
1140 +++ b/kde-apps/kcalutils/kcalutils-9999.ebuild
1141 @@ -19,6 +19,10 @@ KEYWORDS=""
1142 IUSE=""
1143
1144 DEPEND="
1145 + dev-libs/grantlee:5
1146 + >=dev-qt/qtgui-${QTMIN}:5
1147 + >=dev-qt/qtwidgets-${QTMIN}:5
1148 + >=kde-apps/kidentitymanagement-${PVCUT}:5
1149 >=kde-frameworks/kcalendarcore-${KFMIN}:5
1150 >=kde-frameworks/kcodecs-${KFMIN}:5
1151 >=kde-frameworks/kconfig-${KFMIN}:5
1152 @@ -27,14 +31,8 @@ DEPEND="
1153 >=kde-frameworks/ki18n-${KFMIN}:5
1154 >=kde-frameworks/kiconthemes-${KFMIN}:5
1155 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
1156 - >=kde-apps/kidentitymanagement-${PVCUT}:5
1157 - >=dev-qt/qtgui-${QTMIN}:5
1158 - >=dev-qt/qtwidgets-${QTMIN}:5
1159 - dev-libs/grantlee:5
1160 -"
1161 -RDEPEND="${DEPEND}
1162 - !kde-apps/kdepim-l10n
1163 "
1164 +RDEPEND="${DEPEND}"
1165
1166 src_test() {
1167 # bug 653616
1168
1169 diff --git a/kde-apps/kdav/kdav-19.12.49.9999.ebuild b/kde-apps/kdav/kdav-19.12.49.9999.ebuild
1170 index 8e4e799702..f518ab2dfb 100644
1171 --- a/kde-apps/kdav/kdav-19.12.49.9999.ebuild
1172 +++ b/kde-apps/kdav/kdav-19.12.49.9999.ebuild
1173 @@ -24,9 +24,7 @@ DEPEND="
1174 >=dev-qt/qtxml-${QTMIN}:5
1175 >=dev-qt/qtxmlpatterns-${QTMIN}:5
1176 "
1177 -RDEPEND="${DEPEND}
1178 - !kde-apps/kdepim-l10n
1179 -"
1180 +RDEPEND="${DEPEND}"
1181
1182 src_test() {
1183 # bug 616808 - DavItemFetchJobTest requires D-Bus
1184
1185 diff --git a/kde-apps/kdav/kdav-9999.ebuild b/kde-apps/kdav/kdav-9999.ebuild
1186 index c56fcce6b6..91e351529e 100644
1187 --- a/kde-apps/kdav/kdav-9999.ebuild
1188 +++ b/kde-apps/kdav/kdav-9999.ebuild
1189 @@ -18,15 +18,13 @@ KEYWORDS=""
1190 IUSE=""
1191
1192 DEPEND="
1193 - >=kde-frameworks/kcoreaddons-${KFMIN}:5
1194 - >=kde-frameworks/kio-${KFMIN}:5
1195 >=dev-qt/qtgui-${QTMIN}:5
1196 >=dev-qt/qtxml-${QTMIN}:5
1197 >=dev-qt/qtxmlpatterns-${QTMIN}:5
1198 + >=kde-frameworks/kcoreaddons-${KFMIN}:5
1199 + >=kde-frameworks/kio-${KFMIN}:5
1200 "
1201 -RDEPEND="${DEPEND}
1202 - !kde-apps/kdepim-l10n
1203 -"
1204 +RDEPEND="${DEPEND}"
1205
1206 src_test() {
1207 # bug 616808 - DavItemFetchJobTest requires D-Bus
1208
1209 diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.12.49.9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.12.49.9999.ebuild
1210 index 2f3fc6572e..932d07dae9 100644
1211 --- a/kde-apps/kdepim-addons/kdepim-addons-19.12.49.9999.ebuild
1212 +++ b/kde-apps/kdepim-addons/kdepim-addons-19.12.49.9999.ebuild
1213 @@ -20,7 +20,7 @@ KEYWORDS=""
1214 IUSE="importwizard markdown"
1215
1216 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
1217 -COMMON_DEPEND="
1218 +RDEPEND="
1219 >=dev-qt/qtgui-${QTMIN}:5
1220 >=dev-qt/qtnetwork-${QTMIN}:5
1221 >=dev-qt/qtwidgets-${QTMIN}:5=
1222 @@ -64,14 +64,9 @@ COMMON_DEPEND="
1223 importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
1224 markdown? ( app-text/discount )
1225 "
1226 -DEPEND="${COMMON_DEPEND}
1227 +DEPEND="${RDEPEND}
1228 >=app-crypt/gpgme-1.11.1[cxx,qt5]
1229 "
1230 -RDEPEND="${COMMON_DEPEND}
1231 - !kde-apps/kaddressbook:4
1232 - !kde-apps/kdepim-l10n
1233 - !kde-apps/kmail:4
1234 -"
1235
1236 RESTRICT+=" test"
1237
1238
1239 diff --git a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
1240 index a295d1cd2d..a1875de86a 100644
1241 --- a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
1242 +++ b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
1243 @@ -19,7 +19,7 @@ KEYWORDS=""
1244 IUSE="importwizard markdown"
1245
1246 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
1247 -COMMON_DEPEND="
1248 +RDEPEND="
1249 >=dev-qt/qtgui-${QTMIN}:5
1250 >=dev-qt/qtnetwork-${QTMIN}:5
1251 >=dev-qt/qtwidgets-${QTMIN}:5=
1252 @@ -63,14 +63,9 @@ COMMON_DEPEND="
1253 importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
1254 markdown? ( app-text/discount )
1255 "
1256 -DEPEND="${COMMON_DEPEND}
1257 +DEPEND="${RDEPEND}
1258 >=app-crypt/gpgme-1.11.1[cxx,qt5]
1259 "
1260 -RDEPEND="${COMMON_DEPEND}
1261 - !kde-apps/kaddressbook:4
1262 - !kde-apps/kdepim-l10n
1263 - !kde-apps/kmail:4
1264 -"
1265
1266 RESTRICT+=" test"
1267
1268
1269 diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.49.9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.49.9999.ebuild
1270 index 771a312343..1ba2e4a4ef 100644
1271 --- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.49.9999.ebuild
1272 +++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.49.9999.ebuild
1273 @@ -38,6 +38,4 @@ DEPEND="
1274 >=dev-qt/qtwidgets-${QTMIN}:5
1275 >=dev-libs/grantlee-5.1.0:5
1276 "
1277 -RDEPEND="${DEPEND}
1278 - !kde-apps/kdepim-l10n
1279 -"
1280 +RDEPEND="${DEPEND}"
1281
1282 diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
1283 index 68978c95ba..5589ffcb25 100644
1284 --- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
1285 +++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
1286 @@ -19,6 +19,15 @@ KEYWORDS=""
1287 IUSE=""
1288
1289 DEPEND="
1290 + >=dev-libs/grantlee-5.1.0:5
1291 + >=dev-qt/qtdbus-${QTMIN}:5
1292 + >=dev-qt/qtgui-${QTMIN}:5
1293 + >=dev-qt/qtwidgets-${QTMIN}:5
1294 + >=kde-apps/akonadi-${PVCUT}:5
1295 + >=kde-apps/akonadi-contacts-${PVCUT}:5
1296 + >=kde-apps/grantleetheme-${PVCUT}:5
1297 + >=kde-apps/libkleo-${PVCUT}:5
1298 + >=kde-apps/pimcommon-${PVCUT}:5
1299 >=kde-frameworks/kconfig-${KFMIN}:5
1300 >=kde-frameworks/kconfigwidgets-${KFMIN}:5
1301 >=kde-frameworks/kcontacts-${KFMIN}:5
1302 @@ -28,16 +37,5 @@ DEPEND="
1303 >=kde-frameworks/kservice-${KFMIN}:5
1304 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
1305 >=kde-frameworks/prison-${KFMIN}:5
1306 - >=kde-apps/akonadi-${PVCUT}:5
1307 - >=kde-apps/akonadi-contacts-${PVCUT}:5
1308 - >=kde-apps/grantleetheme-${PVCUT}:5
1309 - >=kde-apps/libkleo-${PVCUT}:5
1310 - >=kde-apps/pimcommon-${PVCUT}:5
1311 - >=dev-qt/qtdbus-${QTMIN}:5
1312 - >=dev-qt/qtgui-${QTMIN}:5
1313 - >=dev-qt/qtwidgets-${QTMIN}:5
1314 - >=dev-libs/grantlee-5.1.0:5
1315 -"
1316 -RDEPEND="${DEPEND}
1317 - !kde-apps/kdepim-l10n
1318 "
1319 +RDEPEND="${DEPEND}"
1320
1321 diff --git a/kde-apps/kdepim-meta/kdepim-meta-19.12.49.9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-19.12.49.9999.ebuild
1322 index bc70703454..34e4ac2739 100644
1323 --- a/kde-apps/kdepim-meta/kdepim-meta-19.12.49.9999.ebuild
1324 +++ b/kde-apps/kdepim-meta/kdepim-meta-19.12.49.9999.ebuild
1325 @@ -65,7 +65,6 @@ RDEPEND="
1326 >=kde-apps/pim-data-exporter-${PV}:${SLOT}
1327 >=kde-apps/pim-sieve-editor-${PV}:${SLOT}
1328 >=kde-apps/pimcommon-${PV}:${SLOT}
1329 - !kde-apps/kdepim-meta:4
1330 "
1331 # Optional runtime dependencies: kde-apps/kmail
1332 RDEPEND="${RDEPEND}
1333
1334 diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
1335 index bc70703454..34e4ac2739 100644
1336 --- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
1337 +++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
1338 @@ -65,7 +65,6 @@ RDEPEND="
1339 >=kde-apps/pim-data-exporter-${PV}:${SLOT}
1340 >=kde-apps/pim-sieve-editor-${PV}:${SLOT}
1341 >=kde-apps/pimcommon-${PV}:${SLOT}
1342 - !kde-apps/kdepim-meta:4
1343 "
1344 # Optional runtime dependencies: kde-apps/kmail
1345 RDEPEND="${RDEPEND}
1346
1347 diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.12.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.12.49.9999.ebuild
1348 index c74cfbcc72..c62b95a17e 100644
1349 --- a/kde-apps/kdepim-runtime/kdepim-runtime-19.12.49.9999.ebuild
1350 +++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.12.49.9999.ebuild
1351 @@ -76,7 +76,6 @@ DEPEND="${COMMON_DEPEND}
1352 test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
1353 "
1354 RDEPEND="${COMMON_DEPEND}
1355 - !kde-apps/kdepim-l10n
1356 !kde-misc/akonadi-ews
1357 "
1358
1359
1360 diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
1361 index 96ffabd8c8..767142619e 100644
1362 --- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
1363 +++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
1364 @@ -23,7 +23,32 @@ IUSE=""
1365 BDEPEND="
1366 dev-libs/libxslt
1367 "
1368 -COMMON_DEPEND="
1369 +RDEPEND="
1370 + dev-libs/cyrus-sasl:2
1371 + dev-libs/libical:=
1372 + >=dev-qt/qtdbus-${QTMIN}:5
1373 + >=dev-qt/qtgui-${QTMIN}:5
1374 + >=dev-qt/qtnetwork-${QTMIN}:5
1375 + >=dev-qt/qtnetworkauth-${QTMIN}:5
1376 + >=dev-qt/qtspeech-${QTMIN}:5
1377 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
1378 + >=dev-qt/qtwidgets-${QTMIN}:5
1379 + >=dev-qt/qtxml-${QTMIN}:5
1380 + >=kde-apps/akonadi-${PVCUT}:5
1381 + >=kde-apps/akonadi-calendar-${PVCUT}:5
1382 + >=kde-apps/akonadi-contacts-${PVCUT}:5
1383 + >=kde-apps/akonadi-mime-${PVCUT}:5
1384 + >=kde-apps/akonadi-notes-${PVCUT}:5
1385 + >=kde-apps/kalarmcal-${PVCUT}:5
1386 + >=kde-apps/kcalutils-${PVCUT}:5
1387 + >=kde-apps/kdav-${PVCUT}:5
1388 + >=kde-apps/kidentitymanagement-${PVCUT}:5
1389 + >=kde-apps/kimap-${PVCUT}:5
1390 + >=kde-apps/kmailtransport-${PVCUT}:5
1391 + >=kde-apps/kmbox-${PVCUT}:5
1392 + >=kde-apps/kmime-${PVCUT}:5
1393 + >=kde-apps/libkgapi-${PVCUT}:5
1394 + >=kde-apps/pimcommon-${PVCUT}:5
1395 >=kde-frameworks/kcalendarcore-${KFMIN}:5
1396 >=kde-frameworks/kcodecs-${KFMIN}:5
1397 >=kde-frameworks/kcompletion-${KFMIN}:5
1398 @@ -45,40 +70,11 @@ COMMON_DEPEND="
1399 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
1400 >=kde-frameworks/kwindowsystem-${KFMIN}:5
1401 >=kde-frameworks/kxmlgui-${KFMIN}:5
1402 - >=kde-apps/akonadi-${PVCUT}:5
1403 - >=kde-apps/akonadi-calendar-${PVCUT}:5
1404 - >=kde-apps/akonadi-contacts-${PVCUT}:5
1405 - >=kde-apps/akonadi-mime-${PVCUT}:5
1406 - >=kde-apps/akonadi-notes-${PVCUT}:5
1407 - >=kde-apps/kalarmcal-${PVCUT}:5
1408 - >=kde-apps/kcalutils-${PVCUT}:5
1409 - >=kde-apps/kdav-${PVCUT}:5
1410 - >=kde-apps/kidentitymanagement-${PVCUT}:5
1411 - >=kde-apps/kimap-${PVCUT}:5
1412 - >=kde-apps/kmailtransport-${PVCUT}:5
1413 - >=kde-apps/kmbox-${PVCUT}:5
1414 - >=kde-apps/kmime-${PVCUT}:5
1415 - >=kde-apps/libkgapi-${PVCUT}:5
1416 - >=kde-apps/pimcommon-${PVCUT}:5
1417 - >=dev-qt/qtdbus-${QTMIN}:5
1418 - >=dev-qt/qtgui-${QTMIN}:5
1419 - >=dev-qt/qtnetwork-${QTMIN}:5
1420 - >=dev-qt/qtnetworkauth-${QTMIN}:5
1421 - >=dev-qt/qtspeech-${QTMIN}:5
1422 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
1423 - >=dev-qt/qtwidgets-${QTMIN}:5
1424 - >=dev-qt/qtxml-${QTMIN}:5
1425 - dev-libs/cyrus-sasl:2
1426 - dev-libs/libical:=
1427 "
1428 -DEPEND="${COMMON_DEPEND}
1429 +DEPEND="${RDEPEND}
1430 >=dev-qt/qtxmlpatterns-${QTMIN}:5
1431 test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
1432 "
1433 -RDEPEND="${COMMON_DEPEND}
1434 - !kde-apps/kdepim-l10n
1435 - !kde-misc/akonadi-ews
1436 -"
1437
1438 RESTRICT+=" test"
1439
1440
1441 diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-19.12.49.9999.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-19.12.49.9999.ebuild
1442 index c19bec2cfd..b656a168c3 100644
1443 --- a/kde-apps/kidentitymanagement/kidentitymanagement-19.12.49.9999.ebuild
1444 +++ b/kde-apps/kidentitymanagement/kidentitymanagement-19.12.49.9999.ebuild
1445 @@ -18,6 +18,11 @@ KEYWORDS=""
1446 IUSE=""
1447
1448 DEPEND="
1449 + >=dev-qt/qtdbus-${QTMIN}:5
1450 + >=dev-qt/qtgui-${QTMIN}:5
1451 + >=dev-qt/qtnetwork-${QTMIN}:5
1452 + >=dev-qt/qtwidgets-${QTMIN}:5
1453 + >=kde-apps/kpimtextedit-${PVCUT}:5
1454 >=kde-frameworks/kcodecs-${KFMIN}:5
1455 >=kde-frameworks/kcompletion-${KFMIN}:5
1456 >=kde-frameworks/kconfig-${KFMIN}:5
1457 @@ -27,14 +32,7 @@ DEPEND="
1458 >=kde-frameworks/ktextwidgets-${KFMIN}:5
1459 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
1460 >=kde-frameworks/kxmlgui-${KFMIN}:5
1461 - >=kde-apps/kpimtextedit-${PVCUT}:5
1462 - >=dev-qt/qtdbus-${QTMIN}:5
1463 - >=dev-qt/qtgui-${QTMIN}:5
1464 - >=dev-qt/qtnetwork-${QTMIN}:5
1465 - >=dev-qt/qtwidgets-${QTMIN}:5
1466 -"
1467 -RDEPEND="${DEPEND}
1468 - !kde-apps/kdepim-l10n
1469 "
1470 +RDEPEND="${DEPEND}"
1471
1472 RESTRICT+=" test"
1473
1474 diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
1475 index d350cf6e53..e0965a87b3 100644
1476 --- a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
1477 +++ b/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
1478 @@ -32,8 +32,6 @@ DEPEND="
1479 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
1480 >=kde-frameworks/kxmlgui-${KFMIN}:5
1481 "
1482 -RDEPEND="${DEPEND}
1483 - !kde-apps/kdepim-l10n
1484 -"
1485 +RDEPEND="${DEPEND}"
1486
1487 RESTRICT+=" test"
1488
1489 diff --git a/kde-apps/kimap/kimap-19.12.49.9999.ebuild b/kde-apps/kimap/kimap-19.12.49.9999.ebuild
1490 index 9a49570792..27f4eb37be 100644
1491 --- a/kde-apps/kimap/kimap-19.12.49.9999.ebuild
1492 +++ b/kde-apps/kimap/kimap-19.12.49.9999.ebuild
1493 @@ -17,22 +17,19 @@ SLOT="5"
1494 KEYWORDS=""
1495 IUSE=""
1496
1497 -COMMON_DEPEND="
1498 +RDEPEND="
1499 + dev-libs/cyrus-sasl
1500 + >=dev-qt/qtgui-${QTMIN}:5
1501 + >=kde-apps/kmime-${PVCUT}:5
1502 >=kde-frameworks/kcodecs-${KFMIN}:5
1503 >=kde-frameworks/kcoreaddons-${KFMIN}:5
1504 >=kde-frameworks/ki18n-${KFMIN}:5
1505 >=kde-frameworks/kio-${KFMIN}:5
1506 - >=kde-apps/kmime-${PVCUT}:5
1507 - >=dev-qt/qtgui-${QTMIN}:5
1508 - dev-libs/cyrus-sasl
1509 "
1510 # TODO: Convince upstream not to install stuff with tests
1511 -DEPEND="${COMMON_DEPEND}
1512 +DEPEND="${RDEPEND}
1513 test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
1514 "
1515 -RDEPEND="${COMMON_DEPEND}
1516 - !kde-apps/kdepim-l10n
1517 -"
1518
1519 src_test() {
1520 # tests cannot be run in parallel #605586
1521
1522 diff --git a/kde-apps/kimap/kimap-9999.ebuild b/kde-apps/kimap/kimap-9999.ebuild
1523 index 9ebdc1c92c..d8e1467b2e 100644
1524 --- a/kde-apps/kimap/kimap-9999.ebuild
1525 +++ b/kde-apps/kimap/kimap-9999.ebuild
1526 @@ -17,22 +17,19 @@ SLOT="5"
1527 KEYWORDS=""
1528 IUSE=""
1529
1530 -COMMON_DEPEND="
1531 +RDEPEND="
1532 + dev-libs/cyrus-sasl
1533 + >=dev-qt/qtgui-${QTMIN}:5
1534 + >=kde-apps/kmime-${PVCUT}:5
1535 >=kde-frameworks/kcodecs-${KFMIN}:5
1536 >=kde-frameworks/kcoreaddons-${KFMIN}:5
1537 >=kde-frameworks/ki18n-${KFMIN}:5
1538 >=kde-frameworks/kio-${KFMIN}:5
1539 - >=kde-apps/kmime-${PVCUT}:5
1540 - >=dev-qt/qtgui-${QTMIN}:5
1541 - dev-libs/cyrus-sasl
1542 "
1543 # TODO: Convince upstream not to install stuff with tests
1544 -DEPEND="${COMMON_DEPEND}
1545 +DEPEND="${RDEPEND}
1546 test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
1547 "
1548 -RDEPEND="${COMMON_DEPEND}
1549 - !kde-apps/kdepim-l10n
1550 -"
1551
1552 src_test() {
1553 # tests cannot be run in parallel #605586
1554
1555 diff --git a/kde-apps/kldap/kldap-19.12.49.9999.ebuild b/kde-apps/kldap/kldap-19.12.49.9999.ebuild
1556 index 8a331caab0..8583ab4364 100644
1557 --- a/kde-apps/kldap/kldap-19.12.49.9999.ebuild
1558 +++ b/kde-apps/kldap/kldap-19.12.49.9999.ebuild
1559 @@ -18,18 +18,16 @@ KEYWORDS=""
1560 IUSE=""
1561
1562 DEPEND="
1563 + dev-libs/cyrus-sasl
1564 + >=dev-qt/qtgui-${QTMIN}:5
1565 + >=dev-qt/qtwidgets-${QTMIN}:5
1566 >=kde-frameworks/kcompletion-${KFMIN}:5
1567 >=kde-frameworks/ki18n-${KFMIN}:5
1568 >=kde-frameworks/kio-${KFMIN}:5
1569 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
1570 - >=dev-qt/qtgui-${QTMIN}:5
1571 - >=dev-qt/qtwidgets-${QTMIN}:5
1572 - dev-libs/cyrus-sasl
1573 net-nds/openldap
1574 "
1575 -RDEPEND="${DEPEND}
1576 - !kde-apps/kdepim-l10n
1577 -"
1578 +RDEPEND="${DEPEND}"
1579
1580 src_prepare() {
1581 ecm_src_prepare
1582
1583 diff --git a/kde-apps/kldap/kldap-9999.ebuild b/kde-apps/kldap/kldap-9999.ebuild
1584 index 9bf122c442..af12ecfb0d 100644
1585 --- a/kde-apps/kldap/kldap-9999.ebuild
1586 +++ b/kde-apps/kldap/kldap-9999.ebuild
1587 @@ -26,9 +26,7 @@ DEPEND="
1588 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
1589 net-nds/openldap
1590 "
1591 -RDEPEND="${DEPEND}
1592 - !kde-apps/kdepim-l10n
1593 -"
1594 +RDEPEND="${DEPEND}"
1595
1596 src_prepare() {
1597 ecm_src_prepare
1598
1599 diff --git a/kde-apps/kleopatra/kleopatra-19.12.49.9999.ebuild b/kde-apps/kleopatra/kleopatra-19.12.49.9999.ebuild
1600 index 752f07acba..76ec940ef5 100644
1601 --- a/kde-apps/kleopatra/kleopatra-19.12.49.9999.ebuild
1602 +++ b/kde-apps/kleopatra/kleopatra-19.12.49.9999.ebuild
1603 @@ -47,7 +47,6 @@ DEPEND="
1604 dev-libs/libgpg-error
1605 "
1606 RDEPEND="${DEPEND}
1607 - !kde-apps/kdepim-l10n
1608 >=app-crypt/gnupg-2.1
1609 app-crypt/paperkey
1610 "
1611
1612 diff --git a/kde-apps/kleopatra/kleopatra-9999.ebuild b/kde-apps/kleopatra/kleopatra-9999.ebuild
1613 index 8f4b5e7da0..daebca5e5b 100644
1614 --- a/kde-apps/kleopatra/kleopatra-9999.ebuild
1615 +++ b/kde-apps/kleopatra/kleopatra-9999.ebuild
1616 @@ -20,6 +20,17 @@ KEYWORDS=""
1617 IUSE=""
1618
1619 DEPEND="
1620 + >=app-crypt/gpgme-1.11.1[cxx,qt5]
1621 + dev-libs/boost:=
1622 + dev-libs/libassuan
1623 + dev-libs/libgpg-error
1624 + >=dev-qt/qtdbus-${QTMIN}:5
1625 + >=dev-qt/qtgui-${QTMIN}:5
1626 + >=dev-qt/qtnetwork-${QTMIN}:5
1627 + >=dev-qt/qtprintsupport-${QTMIN}:5
1628 + >=dev-qt/qtwidgets-${QTMIN}:5
1629 + >=kde-apps/kmime-${PVCUT}:5
1630 + >=kde-apps/libkleo-${PVCUT}:5
1631 >=kde-frameworks/kcmutils-${KFMIN}:5
1632 >=kde-frameworks/kcodecs-${KFMIN}:5
1633 >=kde-frameworks/kconfig-${KFMIN}:5
1634 @@ -34,20 +45,8 @@ DEPEND="
1635 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
1636 >=kde-frameworks/kwindowsystem-${KFMIN}:5
1637 >=kde-frameworks/kxmlgui-${KFMIN}:5
1638 - >=kde-apps/kmime-${PVCUT}:5
1639 - >=kde-apps/libkleo-${PVCUT}:5
1640 - >=dev-qt/qtdbus-${QTMIN}:5
1641 - >=dev-qt/qtgui-${QTMIN}:5
1642 - >=dev-qt/qtnetwork-${QTMIN}:5
1643 - >=dev-qt/qtprintsupport-${QTMIN}:5
1644 - >=dev-qt/qtwidgets-${QTMIN}:5
1645 - >=app-crypt/gpgme-1.11.1[cxx,qt5]
1646 - dev-libs/boost:=
1647 - dev-libs/libassuan
1648 - dev-libs/libgpg-error
1649 "
1650 RDEPEND="${DEPEND}
1651 - !kde-apps/kdepim-l10n
1652 >=app-crypt/gnupg-2.1
1653 app-crypt/paperkey
1654 "
1655
1656 diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.49.9999.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.49.9999.ebuild
1657 index 3b9a804548..35d8537d42 100644
1658 --- a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.49.9999.ebuild
1659 +++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.49.9999.ebuild
1660 @@ -20,6 +20,17 @@ KEYWORDS=""
1661 IUSE=""
1662
1663 DEPEND="
1664 + >=dev-qt/qtdbus-${QTMIN}:5
1665 + >=dev-qt/qtgui-${QTMIN}:5
1666 + >=dev-qt/qtwidgets-${QTMIN}:5
1667 + >=dev-qt/qtxml-${QTMIN}:5
1668 + >=kde-apps/akonadi-${PVCUT}:5
1669 + >=kde-apps/kidentitymanagement-${PVCUT}:5
1670 + >=kde-apps/kldap-${PVCUT}:5
1671 + >=kde-apps/kmailtransport-${PVCUT}:5
1672 + >=kde-apps/libkdepim-${PVCUT}:5
1673 + >=kde-apps/libkleo-${PVCUT}:5
1674 + >=kde-apps/pimcommon-${PVCUT}:5
1675 >=kde-frameworks/kcmutils-${KFMIN}:5
1676 >=kde-frameworks/kcodecs-${KFMIN}:5
1677 >=kde-frameworks/kconfig-${KFMIN}:5
1678 @@ -38,20 +49,5 @@ DEPEND="
1679 >=kde-frameworks/kwallet-${KFMIN}:5
1680 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
1681 >=kde-frameworks/kxmlgui-${KFMIN}:5
1682 - >=kde-apps/akonadi-${PVCUT}:5
1683 - >=kde-apps/kidentitymanagement-${PVCUT}:5
1684 - >=kde-apps/kldap-${PVCUT}:5
1685 - >=kde-apps/kmailtransport-${PVCUT}:5
1686 - >=kde-apps/libkdepim-${PVCUT}:5
1687 - >=kde-apps/libkleo-${PVCUT}:5
1688 - >=kde-apps/pimcommon-${PVCUT}:5
1689 - >=dev-qt/qtdbus-${QTMIN}:5
1690 - >=dev-qt/qtgui-${QTMIN}:5
1691 - >=dev-qt/qtwidgets-${QTMIN}:5
1692 - >=dev-qt/qtxml-${QTMIN}:5
1693 -"
1694 -RDEPEND="${DEPEND}
1695 - !kde-apps/kdepim-common-libs:4
1696 - !kde-apps/kdepim-l10n
1697 - !kde-apps/kdepim-runtime:4
1698 "
1699 +RDEPEND="${DEPEND}"
1700
1701 diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild
1702 index b5535cef11..2d86732827 100644
1703 --- a/kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild
1704 +++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild
1705 @@ -20,6 +20,17 @@ KEYWORDS=""
1706 IUSE=""
1707
1708 DEPEND="
1709 + >=dev-qt/qtdbus-${QTMIN}:5
1710 + >=dev-qt/qtgui-${QTMIN}:5
1711 + >=dev-qt/qtwidgets-${QTMIN}:5
1712 + >=dev-qt/qtxml-${QTMIN}:5
1713 + >=kde-apps/akonadi-${PVCUT}:5
1714 + >=kde-apps/kidentitymanagement-${PVCUT}:5
1715 + >=kde-apps/kldap-${PVCUT}:5
1716 + >=kde-apps/kmailtransport-${PVCUT}:5
1717 + >=kde-apps/libkdepim-${PVCUT}:5
1718 + >=kde-apps/libkleo-${PVCUT}:5
1719 + >=kde-apps/pimcommon-${PVCUT}:5
1720 >=kde-frameworks/kcmutils-${KFMIN}:5
1721 >=kde-frameworks/kcodecs-${KFMIN}:5
1722 >=kde-frameworks/kconfig-${KFMIN}:5
1723 @@ -38,20 +49,5 @@ DEPEND="
1724 >=kde-frameworks/kwallet-${KFMIN}:5
1725 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
1726 >=kde-frameworks/kxmlgui-${KFMIN}:5
1727 - >=kde-apps/akonadi-${PVCUT}:5
1728 - >=kde-apps/kidentitymanagement-${PVCUT}:5
1729 - >=kde-apps/kldap-${PVCUT}:5
1730 - >=kde-apps/kmailtransport-${PVCUT}:5
1731 - >=kde-apps/libkdepim-${PVCUT}:5
1732 - >=kde-apps/libkleo-${PVCUT}:5
1733 - >=kde-apps/pimcommon-${PVCUT}:5
1734 - >=dev-qt/qtdbus-${QTMIN}:5
1735 - >=dev-qt/qtgui-${QTMIN}:5
1736 - >=dev-qt/qtwidgets-${QTMIN}:5
1737 - >=dev-qt/qtxml-${QTMIN}:5
1738 -"
1739 -RDEPEND="${DEPEND}
1740 - !kde-apps/kdepim-common-libs:4
1741 - !kde-apps/kdepim-l10n
1742 - !kde-apps/kdepim-runtime:4
1743 "
1744 +RDEPEND="${DEPEND}"
1745
1746 diff --git a/kde-apps/kmail/kmail-19.12.49.9999.ebuild b/kde-apps/kmail/kmail-19.12.49.9999.ebuild
1747 index cee9d7fd2f..3e44c17936 100644
1748 --- a/kde-apps/kmail/kmail-19.12.49.9999.ebuild
1749 +++ b/kde-apps/kmail/kmail-19.12.49.9999.ebuild
1750 @@ -84,8 +84,6 @@ DEPEND="${COMMON_DEPEND}
1751 test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
1752 "
1753 RDEPEND="${COMMON_DEPEND}
1754 - !kde-apps/kdepim-common-libs:4
1755 - !kde-apps/kdepim-l10n
1756 >=kde-apps/kdepim-runtime-${PVCUT}:5
1757 >=kde-apps/kmail-account-wizard-${PVCUT}:5
1758 "
1759
1760 diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild
1761 index 09cdec7c5f..c6047c25f1 100644
1762 --- a/kde-apps/kmail/kmail-9999.ebuild
1763 +++ b/kde-apps/kmail/kmail-9999.ebuild
1764 @@ -26,6 +26,31 @@ BDEPEND="
1765 test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
1766 "
1767 COMMON_DEPEND="
1768 + >=app-crypt/gpgme-1.11.1[cxx,qt5]
1769 + >=dev-qt/qtcore-${QTMIN}:5=
1770 + >=dev-qt/qtdbus-${QTMIN}:5
1771 + >=dev-qt/qtgui-${QTMIN}:5
1772 + >=dev-qt/qtnetwork-${QTMIN}:5
1773 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
1774 + >=dev-qt/qtwidgets-${QTMIN}:5
1775 + >=kde-apps/akonadi-${PVCUT}:5
1776 + >=kde-apps/akonadi-contacts-${PVCUT}:5
1777 + >=kde-apps/akonadi-mime-${PVCUT}:5
1778 + >=kde-apps/akonadi-search-${PVCUT}:5
1779 + >=kde-apps/kdepim-apps-libs-${PVCUT}:5
1780 + >=kde-apps/kidentitymanagement-${PVCUT}:5
1781 + >=kde-apps/kmailtransport-${PVCUT}:5
1782 + >=kde-apps/kmime-${PVCUT}:5
1783 + >=kde-apps/kontactinterface-${PVCUT}:5
1784 + >=kde-apps/kpimtextedit-${PVCUT}:5
1785 + >=kde-apps/libgravatar-${PVCUT}:5
1786 + >=kde-apps/libkdepim-${PVCUT}:5
1787 + >=kde-apps/libkleo-${PVCUT}:5
1788 + >=kde-apps/libksieve-${PVCUT}:5
1789 + >=kde-apps/libktnef-${PVCUT}:5
1790 + >=kde-apps/mailcommon-${PVCUT}:5
1791 + >=kde-apps/messagelib-${PVCUT}:5
1792 + >=kde-apps/pimcommon-${PVCUT}:5
1793 >=kde-frameworks/kbookmarks-${KFMIN}:5
1794 >=kde-frameworks/kcalendarcore-${KFMIN}:5
1795 >=kde-frameworks/kcmutils-${KFMIN}:5
1796 @@ -52,31 +77,6 @@ COMMON_DEPEND="
1797 >=kde-frameworks/kwindowsystem-${KFMIN}:5
1798 >=kde-frameworks/kxmlgui-${KFMIN}:5
1799 >=kde-frameworks/sonnet-${KFMIN}:5
1800 - >=kde-apps/akonadi-${PVCUT}:5
1801 - >=kde-apps/akonadi-contacts-${PVCUT}:5
1802 - >=kde-apps/akonadi-mime-${PVCUT}:5
1803 - >=kde-apps/akonadi-search-${PVCUT}:5
1804 - >=kde-apps/kdepim-apps-libs-${PVCUT}:5
1805 - >=kde-apps/kidentitymanagement-${PVCUT}:5
1806 - >=kde-apps/kmailtransport-${PVCUT}:5
1807 - >=kde-apps/kmime-${PVCUT}:5
1808 - >=kde-apps/kontactinterface-${PVCUT}:5
1809 - >=kde-apps/kpimtextedit-${PVCUT}:5
1810 - >=kde-apps/libgravatar-${PVCUT}:5
1811 - >=kde-apps/libkdepim-${PVCUT}:5
1812 - >=kde-apps/libkleo-${PVCUT}:5
1813 - >=kde-apps/libksieve-${PVCUT}:5
1814 - >=kde-apps/libktnef-${PVCUT}:5
1815 - >=kde-apps/mailcommon-${PVCUT}:5
1816 - >=kde-apps/messagelib-${PVCUT}:5
1817 - >=kde-apps/pimcommon-${PVCUT}:5
1818 - >=dev-qt/qtcore-${QTMIN}:5=
1819 - >=dev-qt/qtdbus-${QTMIN}:5
1820 - >=dev-qt/qtgui-${QTMIN}:5
1821 - >=dev-qt/qtnetwork-${QTMIN}:5
1822 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
1823 - >=dev-qt/qtwidgets-${QTMIN}:5
1824 - >=app-crypt/gpgme-1.11.1[cxx,qt5]
1825 "
1826 DEPEND="${COMMON_DEPEND}
1827 >=kde-apps/kcalutils-${PVCUT}:5
1828 @@ -84,8 +84,6 @@ DEPEND="${COMMON_DEPEND}
1829 test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
1830 "
1831 RDEPEND="${COMMON_DEPEND}
1832 - !kde-apps/kdepim-common-libs:4
1833 - !kde-apps/kdepim-l10n
1834 >=kde-apps/kdepim-runtime-${PVCUT}:5
1835 >=kde-apps/kmail-account-wizard-${PVCUT}:5
1836 "
1837
1838 diff --git a/kde-apps/kmailtransport/kmailtransport-19.12.49.9999.ebuild b/kde-apps/kmailtransport/kmailtransport-19.12.49.9999.ebuild
1839 index 645dc04221..a566162361 100644
1840 --- a/kde-apps/kmailtransport/kmailtransport-19.12.49.9999.ebuild
1841 +++ b/kde-apps/kmailtransport/kmailtransport-19.12.49.9999.ebuild
1842 @@ -16,7 +16,7 @@ SLOT="5"
1843 KEYWORDS=""
1844 IUSE=""
1845
1846 -COMMON_DEPEND="
1847 +RDEPEND="
1848 >=kde-frameworks/kcmutils-${KFMIN}:5
1849 >=kde-frameworks/kcompletion-${KFMIN}:5
1850 >=kde-frameworks/kconfig-${KFMIN}:5
1851 @@ -36,12 +36,8 @@ COMMON_DEPEND="
1852 >=dev-qt/qtnetwork-${QTMIN}:5
1853 >=dev-qt/qtwidgets-${QTMIN}:5
1854 "
1855 -DEPEND="${COMMON_DEPEND}
1856 +DEPEND="${RDEPEND}
1857 test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
1858 "
1859 -RDEPEND="${COMMON_DEPEND}
1860 - !kde-apps/kdepim-l10n
1861 - !kde-apps/kdepimlibs:4
1862 -"
1863
1864 RESTRICT+=" test"
1865
1866 diff --git a/kde-apps/kmailtransport/kmailtransport-9999.ebuild b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
1867 index 016335b657..cd06982eaf 100644
1868 --- a/kde-apps/kmailtransport/kmailtransport-9999.ebuild
1869 +++ b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
1870 @@ -16,7 +16,16 @@ SLOT="5"
1871 KEYWORDS=""
1872 IUSE=""
1873
1874 -COMMON_DEPEND="
1875 +RDEPEND="
1876 + >=dev-qt/qtdbus-${QTMIN}:5
1877 + >=dev-qt/qtgui-${QTMIN}:5
1878 + >=dev-qt/qtnetwork-${QTMIN}:5
1879 + >=dev-qt/qtwidgets-${QTMIN}:5
1880 + >=kde-apps/akonadi-${PVCUT}:5
1881 + >=kde-apps/akonadi-mime-${PVCUT}:5
1882 + >=kde-apps/kmime-${PVCUT}:5
1883 + >=kde-apps/ksmtp-${PVCUT}:5
1884 + >=kde-apps/libkgapi-${PVCUT}:5
1885 >=kde-frameworks/kcmutils-${KFMIN}:5
1886 >=kde-frameworks/kcompletion-${KFMIN}:5
1887 >=kde-frameworks/kconfig-${KFMIN}:5
1888 @@ -26,22 +35,9 @@ COMMON_DEPEND="
1889 >=kde-frameworks/kio-${KFMIN}:5
1890 >=kde-frameworks/kwallet-${KFMIN}:5
1891 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
1892 - >=kde-apps/akonadi-${PVCUT}:5
1893 - >=kde-apps/akonadi-mime-${PVCUT}:5
1894 - >=kde-apps/kmime-${PVCUT}:5
1895 - >=kde-apps/ksmtp-${PVCUT}:5
1896 - >=kde-apps/libkgapi-${PVCUT}:5
1897 - >=dev-qt/qtdbus-${QTMIN}:5
1898 - >=dev-qt/qtgui-${QTMIN}:5
1899 - >=dev-qt/qtnetwork-${QTMIN}:5
1900 - >=dev-qt/qtwidgets-${QTMIN}:5
1901 "
1902 -DEPEND="${COMMON_DEPEND}
1903 +DEPEND="${RDEPEND}
1904 test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
1905 "
1906 -RDEPEND="${COMMON_DEPEND}
1907 - !kde-apps/kdepim-l10n
1908 - !kde-apps/kdepimlibs:4
1909 -"
1910
1911 RESTRICT+=" test"
1912
1913 diff --git a/kde-apps/kmime/kmime-19.12.49.9999.ebuild b/kde-apps/kmime/kmime-19.12.49.9999.ebuild
1914 index 52b0dbad10..51adc6bc32 100644
1915 --- a/kde-apps/kmime/kmime-19.12.49.9999.ebuild
1916 +++ b/kde-apps/kmime/kmime-19.12.49.9999.ebuild
1917 @@ -18,6 +18,4 @@ DEPEND="
1918 >=kde-frameworks/kcodecs-${KFMIN}:5
1919 >=kde-frameworks/ki18n-${KFMIN}:5
1920 "
1921 -RDEPEND="${DEPEND}
1922 - !kde-apps/kdepim-l10n
1923 -"
1924 +RDEPEND="${DEPEND}"
1925
1926 diff --git a/kde-apps/kmime/kmime-9999.ebuild b/kde-apps/kmime/kmime-9999.ebuild
1927 index a8fd0f0408..b10e83502f 100644
1928 --- a/kde-apps/kmime/kmime-9999.ebuild
1929 +++ b/kde-apps/kmime/kmime-9999.ebuild
1930 @@ -18,6 +18,4 @@ DEPEND="
1931 >=kde-frameworks/kcodecs-${KFMIN}:5
1932 >=kde-frameworks/ki18n-${KFMIN}:5
1933 "
1934 -RDEPEND="${DEPEND}
1935 - !kde-apps/kdepim-l10n
1936 -"
1937 +RDEPEND="${DEPEND}"
1938
1939 diff --git a/kde-apps/knotes/knotes-19.12.49.9999.ebuild b/kde-apps/knotes/knotes-19.12.49.9999.ebuild
1940 index c610890356..f5838fc84a 100644
1941 --- a/kde-apps/knotes/knotes-19.12.49.9999.ebuild
1942 +++ b/kde-apps/knotes/knotes-19.12.49.9999.ebuild
1943 @@ -62,7 +62,6 @@ DEPEND="
1944 x11-libs/libX11
1945 "
1946 RDEPEND="${DEPEND}
1947 - !kde-apps/kdepim-l10n
1948 >=kde-apps/kdepim-runtime-${PVCUT}:5
1949 "
1950
1951
1952 diff --git a/kde-apps/knotes/knotes-9999.ebuild b/kde-apps/knotes/knotes-9999.ebuild
1953 index fd9f47e4c6..980e6fc8ff 100644
1954 --- a/kde-apps/knotes/knotes-9999.ebuild
1955 +++ b/kde-apps/knotes/knotes-9999.ebuild
1956 @@ -21,6 +21,23 @@ KEYWORDS=""
1957 IUSE=""
1958
1959 DEPEND="
1960 + dev-libs/grantlee:5
1961 + dev-libs/libxslt
1962 + >=dev-qt/qtdbus-${QTMIN}:5
1963 + >=dev-qt/qtgui-${QTMIN}:5
1964 + >=dev-qt/qtprintsupport-${QTMIN}:5
1965 + >=dev-qt/qtwidgets-${QTMIN}:5
1966 + >=dev-qt/qtx11extras-${QTMIN}:5
1967 + >=dev-qt/qtxml-${QTMIN}:5
1968 + >=kde-apps/akonadi-${PVCUT}:5
1969 + >=kde-apps/akonadi-notes-${PVCUT}:5
1970 + >=kde-apps/akonadi-search-${PVCUT}:5
1971 + >=kde-apps/grantleetheme-${PVCUT}:5
1972 + >=kde-apps/kcalutils-${PVCUT}:5
1973 + >=kde-apps/kmime-${PVCUT}:5
1974 + >=kde-apps/kontactinterface-${PVCUT}:5
1975 + >=kde-apps/libkdepim-${PVCUT}:5
1976 + >=kde-apps/pimcommon-${PVCUT}:5
1977 >=kde-frameworks/kcalendarcore-${KFMIN}:5
1978 >=kde-frameworks/kcmutils-${KFMIN}:5
1979 >=kde-frameworks/kcompletion-${KFMIN}:5
1980 @@ -42,27 +59,9 @@ DEPEND="
1981 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
1982 >=kde-frameworks/kwindowsystem-${KFMIN}:5
1983 >=kde-frameworks/kxmlgui-${KFMIN}:5
1984 - >=kde-apps/akonadi-${PVCUT}:5
1985 - >=kde-apps/akonadi-notes-${PVCUT}:5
1986 - >=kde-apps/akonadi-search-${PVCUT}:5
1987 - >=kde-apps/grantleetheme-${PVCUT}:5
1988 - >=kde-apps/kcalutils-${PVCUT}:5
1989 - >=kde-apps/kmime-${PVCUT}:5
1990 - >=kde-apps/kontactinterface-${PVCUT}:5
1991 - >=kde-apps/libkdepim-${PVCUT}:5
1992 - >=kde-apps/pimcommon-${PVCUT}:5
1993 - >=dev-qt/qtdbus-${QTMIN}:5
1994 - >=dev-qt/qtgui-${QTMIN}:5
1995 - >=dev-qt/qtprintsupport-${QTMIN}:5
1996 - >=dev-qt/qtwidgets-${QTMIN}:5
1997 - >=dev-qt/qtx11extras-${QTMIN}:5
1998 - >=dev-qt/qtxml-${QTMIN}:5
1999 - dev-libs/grantlee:5
2000 - dev-libs/libxslt
2001 x11-libs/libX11
2002 "
2003 RDEPEND="${DEPEND}
2004 - !kde-apps/kdepim-l10n
2005 >=kde-apps/kdepim-runtime-${PVCUT}:5
2006 "
2007
2008
2009 diff --git a/kde-apps/konsolekalendar/konsolekalendar-19.12.49.9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-19.12.49.9999.ebuild
2010 index 018247f262..c6ddbd4db1 100644
2011 --- a/kde-apps/konsolekalendar/konsolekalendar-19.12.49.9999.ebuild
2012 +++ b/kde-apps/konsolekalendar/konsolekalendar-19.12.49.9999.ebuild
2013 @@ -27,9 +27,7 @@ DEPEND="
2014 >=kde-apps/calendarsupport-${PVCUT}:5
2015 >=kde-apps/kcalutils-${PVCUT}:5
2016 "
2017 -RDEPEND="${DEPEND}
2018 - !kde-apps/kdepim-l10n
2019 -"
2020 +RDEPEND="${DEPEND}"
2021
2022 src_prepare() {
2023 ecm_src_prepare
2024
2025 diff --git a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
2026 index ba8fcd2c72..bc5d80c110 100644
2027 --- a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
2028 +++ b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
2029 @@ -18,18 +18,16 @@ KEYWORDS=""
2030 IUSE=""
2031
2032 DEPEND="
2033 - >=kde-frameworks/kcalendarcore-${KFMIN}:5
2034 - >=kde-frameworks/kconfig-${KFMIN}:5
2035 - >=kde-frameworks/kcoreaddons-${KFMIN}:5
2036 - >=kde-frameworks/ki18n-${KFMIN}:5
2037 >=kde-apps/akonadi-${PVCUT}:5
2038 >=kde-apps/akonadi-calendar-${PVCUT}:5
2039 >=kde-apps/calendarsupport-${PVCUT}:5
2040 >=kde-apps/kcalutils-${PVCUT}:5
2041 + >=kde-frameworks/kcalendarcore-${KFMIN}:5
2042 + >=kde-frameworks/kconfig-${KFMIN}:5
2043 + >=kde-frameworks/kcoreaddons-${KFMIN}:5
2044 + >=kde-frameworks/ki18n-${KFMIN}:5
2045 "
2046 -RDEPEND="${DEPEND}
2047 - !kde-apps/kdepim-l10n
2048 -"
2049 +RDEPEND="${DEPEND}"
2050
2051 src_prepare() {
2052 ecm_src_prepare
2053
2054 diff --git a/kde-apps/kontact/kontact-19.12.49.9999.ebuild b/kde-apps/kontact/kontact-19.12.49.9999.ebuild
2055 index 3385204f14..d3bfd726c2 100644
2056 --- a/kde-apps/kontact/kontact-19.12.49.9999.ebuild
2057 +++ b/kde-apps/kontact/kontact-19.12.49.9999.ebuild
2058 @@ -45,6 +45,4 @@ DEPEND="
2059 >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
2060 >=dev-qt/qtwidgets-${QTMIN}:5
2061 "
2062 -RDEPEND="${DEPEND}
2063 - !kde-apps/kdepim-l10n
2064 -"
2065 +RDEPEND="${DEPEND}"
2066
2067 diff --git a/kde-apps/kontact/kontact-9999.ebuild b/kde-apps/kontact/kontact-9999.ebuild
2068 index 692d30149a..51fcda7608 100644
2069 --- a/kde-apps/kontact/kontact-9999.ebuild
2070 +++ b/kde-apps/kontact/kontact-9999.ebuild
2071 @@ -18,6 +18,17 @@ KEYWORDS=""
2072 IUSE=""
2073
2074 DEPEND="
2075 + >=dev-qt/qtdbus-${QTMIN}:5
2076 + >=dev-qt/qtgui-${QTMIN}:5
2077 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
2078 + >=dev-qt/qtwidgets-${QTMIN}:5
2079 + >=kde-apps/akonadi-${PVCUT}:5
2080 + >=kde-apps/grantleetheme-${PVCUT}:5
2081 + >=kde-apps/kdepim-apps-libs-${PVCUT}:5
2082 + >=kde-apps/kontactinterface-${PVCUT}:5
2083 + >=kde-apps/kpimtextedit-${PVCUT}:5
2084 + >=kde-apps/libkdepim-${PVCUT}:5
2085 + >=kde-apps/mailcommon-${PVCUT}:5
2086 >=kde-frameworks/kcmutils-${KFMIN}:5
2087 >=kde-frameworks/kcompletion-${KFMIN}:5
2088 >=kde-frameworks/kconfig-${KFMIN}:5
2089 @@ -33,18 +44,5 @@ DEPEND="
2090 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
2091 >=kde-frameworks/kwindowsystem-${KFMIN}:5
2092 >=kde-frameworks/kxmlgui-${KFMIN}:5
2093 - >=kde-apps/akonadi-${PVCUT}:5
2094 - >=kde-apps/grantleetheme-${PVCUT}:5
2095 - >=kde-apps/kdepim-apps-libs-${PVCUT}:5
2096 - >=kde-apps/kontactinterface-${PVCUT}:5
2097 - >=kde-apps/kpimtextedit-${PVCUT}:5
2098 - >=kde-apps/libkdepim-${PVCUT}:5
2099 - >=kde-apps/mailcommon-${PVCUT}:5
2100 - >=dev-qt/qtdbus-${QTMIN}:5
2101 - >=dev-qt/qtgui-${QTMIN}:5
2102 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
2103 - >=dev-qt/qtwidgets-${QTMIN}:5
2104 -"
2105 -RDEPEND="${DEPEND}
2106 - !kde-apps/kdepim-l10n
2107 "
2108 +RDEPEND="${DEPEND}"
2109
2110 diff --git a/kde-apps/kontactinterface/kontactinterface-19.12.49.9999.ebuild b/kde-apps/kontactinterface/kontactinterface-19.12.49.9999.ebuild
2111 index 58fa1f3e7d..4fbf55402d 100644
2112 --- a/kde-apps/kontactinterface/kontactinterface-19.12.49.9999.ebuild
2113 +++ b/kde-apps/kontactinterface/kontactinterface-19.12.49.9999.ebuild
2114 @@ -26,6 +26,4 @@ DEPEND="
2115 >=dev-qt/qtwidgets-${QTMIN}:5
2116 >=dev-qt/qtxml-${QTMIN}:5
2117 "
2118 -RDEPEND="${DEPEND}
2119 - !kde-apps/kdepim-l10n
2120 -"
2121 +RDEPEND="${DEPEND}"
2122
2123 diff --git a/kde-apps/kontactinterface/kontactinterface-9999.ebuild b/kde-apps/kontactinterface/kontactinterface-9999.ebuild
2124 index 087557ba08..27247eccf1 100644
2125 --- a/kde-apps/kontactinterface/kontactinterface-9999.ebuild
2126 +++ b/kde-apps/kontactinterface/kontactinterface-9999.ebuild
2127 @@ -16,16 +16,14 @@ KEYWORDS=""
2128 IUSE=""
2129
2130 DEPEND="
2131 + >=dev-qt/qtdbus-${QTMIN}:5
2132 + >=dev-qt/qtgui-${QTMIN}:5
2133 + >=dev-qt/qtwidgets-${QTMIN}:5
2134 + >=dev-qt/qtxml-${QTMIN}:5
2135 >=kde-frameworks/kcoreaddons-${KFMIN}:5
2136 >=kde-frameworks/kio-${KFMIN}:5
2137 >=kde-frameworks/kparts-${KFMIN}:5
2138 >=kde-frameworks/kwindowsystem-${KFMIN}:5
2139 >=kde-frameworks/kxmlgui-${KFMIN}:5
2140 - >=dev-qt/qtdbus-${QTMIN}:5
2141 - >=dev-qt/qtgui-${QTMIN}:5
2142 - >=dev-qt/qtwidgets-${QTMIN}:5
2143 - >=dev-qt/qtxml-${QTMIN}:5
2144 -"
2145 -RDEPEND="${DEPEND}
2146 - !kde-apps/kdepim-l10n
2147 "
2148 +RDEPEND="${DEPEND}"
2149
2150 diff --git a/kde-apps/korganizer/korganizer-19.12.49.9999.ebuild b/kde-apps/korganizer/korganizer-19.12.49.9999.ebuild
2151 index 11ab95e231..767022bcb0 100644
2152 --- a/kde-apps/korganizer/korganizer-19.12.49.9999.ebuild
2153 +++ b/kde-apps/korganizer/korganizer-19.12.49.9999.ebuild
2154 @@ -80,8 +80,6 @@ DEPEND="${COMMON_DEPEND}
2155 test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
2156 "
2157 RDEPEND="${COMMON_DEPEND}
2158 - !kde-apps/kdepim-common-libs:4
2159 - !kde-apps/kdepim-l10n
2160 >=kde-apps/kdepim-runtime-${PVCUT}:5
2161 "
2162
2163
2164 diff --git a/kde-apps/korganizer/korganizer-9999.ebuild b/kde-apps/korganizer/korganizer-9999.ebuild
2165 index 41215c26bc..83553ab6b4 100644
2166 --- a/kde-apps/korganizer/korganizer-9999.ebuild
2167 +++ b/kde-apps/korganizer/korganizer-9999.ebuild
2168 @@ -23,6 +23,28 @@ BDEPEND="
2169 test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
2170 "
2171 COMMON_DEPEND="
2172 + >=dev-qt/qtdbus-${QTMIN}:5
2173 + >=dev-qt/qtgui-${QTMIN}:5
2174 + >=dev-qt/qtmultimedia-${QTMIN}:5
2175 + >=dev-qt/qtwidgets-${QTMIN}:5
2176 + >=kde-apps/akonadi-${PVCUT}:5
2177 + >=kde-apps/akonadi-calendar-${PVCUT}:5
2178 + >=kde-apps/akonadi-contacts-${PVCUT}:5
2179 + >=kde-apps/akonadi-mime-${PVCUT}:5
2180 + >=kde-apps/akonadi-notes-${PVCUT}:5
2181 + >=kde-apps/akonadi-search-${PVCUT}:5
2182 + >=kde-apps/calendarsupport-${PVCUT}:5
2183 + >=kde-apps/eventviews-${PVCUT}:5
2184 + >=kde-apps/incidenceeditor-${PVCUT}:5
2185 + >=kde-apps/kcalutils-${PVCUT}:5
2186 + >=kde-apps/kdepim-apps-libs-${PVCUT}:5
2187 + >=kde-apps/kidentitymanagement-${PVCUT}:5
2188 + >=kde-apps/kmailtransport-${PVCUT}:5
2189 + >=kde-apps/kmime-${PVCUT}:5
2190 + >=kde-apps/kontactinterface-${PVCUT}:5
2191 + >=kde-apps/kpimtextedit-${PVCUT}:5
2192 + >=kde-apps/libkdepim-${PVCUT}:5
2193 + >=kde-apps/pimcommon-${PVCUT}:5
2194 >=kde-frameworks/kcalendarcore-${KFMIN}:5
2195 >=kde-frameworks/kcmutils-${KFMIN}:5
2196 >=kde-frameworks/kcodecs-${KFMIN}:5
2197 @@ -47,41 +69,17 @@ COMMON_DEPEND="
2198 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
2199 >=kde-frameworks/kwindowsystem-${KFMIN}:5
2200 >=kde-frameworks/kxmlgui-${KFMIN}:5
2201 - >=kde-apps/akonadi-${PVCUT}:5
2202 - >=kde-apps/akonadi-calendar-${PVCUT}:5
2203 - >=kde-apps/akonadi-contacts-${PVCUT}:5
2204 - >=kde-apps/akonadi-mime-${PVCUT}:5
2205 - >=kde-apps/akonadi-notes-${PVCUT}:5
2206 - >=kde-apps/akonadi-search-${PVCUT}:5
2207 - >=kde-apps/calendarsupport-${PVCUT}:5
2208 - >=kde-apps/eventviews-${PVCUT}:5
2209 - >=kde-apps/incidenceeditor-${PVCUT}:5
2210 - >=kde-apps/kcalutils-${PVCUT}:5
2211 - >=kde-apps/kdepim-apps-libs-${PVCUT}:5
2212 - >=kde-apps/kidentitymanagement-${PVCUT}:5
2213 - >=kde-apps/kmailtransport-${PVCUT}:5
2214 - >=kde-apps/kmime-${PVCUT}:5
2215 - >=kde-apps/kontactinterface-${PVCUT}:5
2216 - >=kde-apps/kpimtextedit-${PVCUT}:5
2217 - >=kde-apps/libkdepim-${PVCUT}:5
2218 - >=kde-apps/pimcommon-${PVCUT}:5
2219 - >=dev-qt/qtdbus-${QTMIN}:5
2220 - >=dev-qt/qtgui-${QTMIN}:5
2221 - >=dev-qt/qtmultimedia-${QTMIN}:5
2222 - >=dev-qt/qtwidgets-${QTMIN}:5
2223 X? (
2224 >=dev-qt/qtx11extras-${QTMIN}:5
2225 x11-libs/libX11
2226 )
2227 "
2228 DEPEND="${COMMON_DEPEND}
2229 - >=kde-apps/kldap-${PVCUT}:5
2230 >=dev-qt/designer-${QTMIN}:5
2231 + >=kde-apps/kldap-${PVCUT}:5
2232 test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
2233 "
2234 RDEPEND="${COMMON_DEPEND}
2235 - !kde-apps/kdepim-common-libs:4
2236 - !kde-apps/kdepim-l10n
2237 >=kde-apps/kdepim-runtime-${PVCUT}:5
2238 "
2239
2240
2241 diff --git a/kde-apps/kpimtextedit/kpimtextedit-19.12.49.9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-19.12.49.9999.ebuild
2242 index 79f3245dbb..5126b52cc6 100644
2243 --- a/kde-apps/kpimtextedit/kpimtextedit-19.12.49.9999.ebuild
2244 +++ b/kde-apps/kpimtextedit/kpimtextedit-19.12.49.9999.ebuild
2245 @@ -17,7 +17,7 @@ SLOT="5"
2246 KEYWORDS=""
2247 IUSE=""
2248
2249 -COMMON_DEPEND="
2250 +RDEPEND="
2251 >=kde-frameworks/kcodecs-${KFMIN}:5
2252 >=kde-frameworks/kcompletion-${KFMIN}:5
2253 >=kde-frameworks/kconfig-${KFMIN}:5
2254 @@ -35,11 +35,8 @@ COMMON_DEPEND="
2255 >=dev-qt/qtwidgets-${QTMIN}:5
2256 dev-libs/grantlee:5
2257 "
2258 -DEPEND="${COMMON_DEPEND}
2259 +DEPEND="${RDEPEND}
2260 test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
2261 "
2262 -RDEPEND="${COMMON_DEPEND}
2263 - !kde-apps/kdepim-l10n
2264 -"
2265
2266 RESTRICT+=" test"
2267
2268 diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
2269 index 731c487478..c269f6688d 100644
2270 --- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
2271 +++ b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
2272 @@ -17,7 +17,11 @@ SLOT="5"
2273 KEYWORDS=""
2274 IUSE=""
2275
2276 -COMMON_DEPEND="
2277 +RDEPEND="
2278 + dev-libs/grantlee:5
2279 + >=dev-qt/qtgui-${QTMIN}:5
2280 + >=dev-qt/qtspeech-${QTMIN}:5
2281 + >=dev-qt/qtwidgets-${QTMIN}:5
2282 >=kde-frameworks/kcodecs-${KFMIN}:5
2283 >=kde-frameworks/kcompletion-${KFMIN}:5
2284 >=kde-frameworks/kconfig-${KFMIN}:5
2285 @@ -30,16 +34,9 @@ COMMON_DEPEND="
2286 >=kde-frameworks/kxmlgui-${KFMIN}:5
2287 >=kde-frameworks/sonnet-${KFMIN}:5
2288 >=kde-frameworks/syntax-highlighting-${KFMIN}:5
2289 - >=dev-qt/qtgui-${QTMIN}:5
2290 - >=dev-qt/qtspeech-${QTMIN}:5
2291 - >=dev-qt/qtwidgets-${QTMIN}:5
2292 - dev-libs/grantlee:5
2293 "
2294 -DEPEND="${COMMON_DEPEND}
2295 +DEPEND="${RDEPEND}
2296 test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
2297 "
2298 -RDEPEND="${COMMON_DEPEND}
2299 - !kde-apps/kdepim-l10n
2300 -"
2301
2302 RESTRICT+=" test"
2303
2304 diff --git a/kde-apps/libgravatar/libgravatar-19.12.49.9999.ebuild b/kde-apps/libgravatar/libgravatar-19.12.49.9999.ebuild
2305 index d4a505bc3a..7eb06a745c 100644
2306 --- a/kde-apps/libgravatar/libgravatar-19.12.49.9999.ebuild
2307 +++ b/kde-apps/libgravatar/libgravatar-19.12.49.9999.ebuild
2308 @@ -28,9 +28,7 @@ DEPEND="
2309 >=dev-qt/qtnetwork-${QTMIN}:5
2310 >=dev-qt/qtwidgets-${QTMIN}:5
2311 "
2312 -RDEPEND="${DEPEND}
2313 - !kde-apps/kdepim-l10n
2314 -"
2315 +RDEPEND="${DEPEND}"
2316
2317 src_test() {
2318 # bug 624584 - needs internet connection
2319
2320 diff --git a/kde-apps/libgravatar/libgravatar-9999.ebuild b/kde-apps/libgravatar/libgravatar-9999.ebuild
2321 index 01b060f51c..e96355dc0f 100644
2322 --- a/kde-apps/libgravatar/libgravatar-9999.ebuild
2323 +++ b/kde-apps/libgravatar/libgravatar-9999.ebuild
2324 @@ -18,19 +18,17 @@ KEYWORDS=""
2325 IUSE=""
2326
2327 DEPEND="
2328 + >=dev-qt/qtgui-${QTMIN}:5
2329 + >=dev-qt/qtnetwork-${QTMIN}:5
2330 + >=dev-qt/qtwidgets-${QTMIN}:5
2331 + >=kde-apps/pimcommon-${PVCUT}:5
2332 >=kde-frameworks/kconfig-${KFMIN}:5
2333 >=kde-frameworks/ki18n-${KFMIN}:5
2334 >=kde-frameworks/kio-${KFMIN}:5
2335 >=kde-frameworks/ktextwidgets-${KFMIN}:5
2336 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
2337 - >=kde-apps/pimcommon-${PVCUT}:5
2338 - >=dev-qt/qtgui-${QTMIN}:5
2339 - >=dev-qt/qtnetwork-${QTMIN}:5
2340 - >=dev-qt/qtwidgets-${QTMIN}:5
2341 -"
2342 -RDEPEND="${DEPEND}
2343 - !kde-apps/kdepim-l10n
2344 "
2345 +RDEPEND="${DEPEND}"
2346
2347 src_test() {
2348 # bug 624584 - needs internet connection
2349
2350 diff --git a/kde-apps/libkdepim/libkdepim-19.12.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-19.12.49.9999.ebuild
2351 index 12b07ba1a7..331e5a83dc 100644
2352 --- a/kde-apps/libkdepim/libkdepim-19.12.49.9999.ebuild
2353 +++ b/kde-apps/libkdepim/libkdepim-19.12.49.9999.ebuild
2354 @@ -19,6 +19,14 @@ KEYWORDS=""
2355 IUSE=""
2356
2357 DEPEND="
2358 + >=dev-qt/qtdbus-${QTMIN}:5
2359 + >=dev-qt/qtgui-${QTMIN}:5
2360 + >=dev-qt/qtnetwork-${QTMIN}:5
2361 + >=dev-qt/qtwidgets-${QTMIN}:5
2362 + >=kde-apps/akonadi-${PVCUT}:5
2363 + >=kde-apps/akonadi-contacts-${PVCUT}:5
2364 + >=kde-apps/akonadi-search-${PVCUT}:5
2365 + >=kde-apps/kldap-${PVCUT}:5
2366 >=kde-frameworks/kcmutils-${KFMIN}:5
2367 >=kde-frameworks/kcodecs-${KFMIN}:5
2368 >=kde-frameworks/kcompletion-${KFMIN}:5
2369 @@ -32,16 +40,5 @@ DEPEND="
2370 >=kde-frameworks/kjobwidgets-${KFMIN}:5
2371 >=kde-frameworks/kwallet-${KFMIN}:5
2372 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
2373 - >=kde-apps/akonadi-${PVCUT}:5
2374 - >=kde-apps/akonadi-contacts-${PVCUT}:5
2375 - >=kde-apps/akonadi-search-${PVCUT}:5
2376 - >=kde-apps/kldap-${PVCUT}:5
2377 - >=dev-qt/qtdbus-${QTMIN}:5
2378 - >=dev-qt/qtgui-${QTMIN}:5
2379 - >=dev-qt/qtnetwork-${QTMIN}:5
2380 - >=dev-qt/qtwidgets-${QTMIN}:5
2381 -"
2382 -RDEPEND="${DEPEND}
2383 - !kde-apps/kdepim-common-libs:4
2384 - !kde-apps/kdepim-l10n
2385 "
2386 +RDEPEND="${DEPEND}"
2387
2388 diff --git a/kde-apps/libkdepim/libkdepim-9999.ebuild b/kde-apps/libkdepim/libkdepim-9999.ebuild
2389 index 6bd8a843b8..4b3ec7b83b 100644
2390 --- a/kde-apps/libkdepim/libkdepim-9999.ebuild
2391 +++ b/kde-apps/libkdepim/libkdepim-9999.ebuild
2392 @@ -19,6 +19,14 @@ KEYWORDS=""
2393 IUSE=""
2394
2395 DEPEND="
2396 + >=dev-qt/qtdbus-${QTMIN}:5
2397 + >=dev-qt/qtgui-${QTMIN}:5
2398 + >=dev-qt/qtnetwork-${QTMIN}:5
2399 + >=dev-qt/qtwidgets-${QTMIN}:5
2400 + >=kde-apps/akonadi-${PVCUT}:5
2401 + >=kde-apps/akonadi-contacts-${PVCUT}:5
2402 + >=kde-apps/akonadi-search-${PVCUT}:5
2403 + >=kde-apps/kldap-${PVCUT}:5
2404 >=kde-frameworks/kcmutils-${KFMIN}:5
2405 >=kde-frameworks/kcodecs-${KFMIN}:5
2406 >=kde-frameworks/kcompletion-${KFMIN}:5
2407 @@ -32,16 +40,5 @@ DEPEND="
2408 >=kde-frameworks/kjobwidgets-${KFMIN}:5
2409 >=kde-frameworks/kwallet-${KFMIN}:5
2410 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
2411 - >=kde-apps/akonadi-${PVCUT}:5
2412 - >=kde-apps/akonadi-contacts-${PVCUT}:5
2413 - >=kde-apps/akonadi-search-${PVCUT}:5
2414 - >=kde-apps/kldap-${PVCUT}:5
2415 - >=dev-qt/qtdbus-${QTMIN}:5
2416 - >=dev-qt/qtgui-${QTMIN}:5
2417 - >=dev-qt/qtnetwork-${QTMIN}:5
2418 - >=dev-qt/qtwidgets-${QTMIN}:5
2419 -"
2420 -RDEPEND="${DEPEND}
2421 - !kde-apps/kdepim-common-libs:4
2422 - !kde-apps/kdepim-l10n
2423 "
2424 +RDEPEND="${DEPEND}"
2425
2426 diff --git a/kde-apps/libkgapi/libkgapi-19.12.49.9999.ebuild b/kde-apps/libkgapi/libkgapi-19.12.49.9999.ebuild
2427 index e1a44d34bb..6bc43aaa27 100644
2428 --- a/kde-apps/libkgapi/libkgapi-19.12.49.9999.ebuild
2429 +++ b/kde-apps/libkgapi/libkgapi-19.12.49.9999.ebuild
2430 @@ -33,6 +33,5 @@ DEPEND="
2431 dev-libs/cyrus-sasl:2
2432 "
2433 RDEPEND="${DEPEND}
2434 - !kde-apps/kdepim-l10n
2435 !<kde-apps/kdepim-runtime-18.07.80:5
2436 "
2437
2438 diff --git a/kde-apps/libkgapi/libkgapi-9999.ebuild b/kde-apps/libkgapi/libkgapi-9999.ebuild
2439 index 80f5204e12..6d5eabc1b9 100644
2440 --- a/kde-apps/libkgapi/libkgapi-9999.ebuild
2441 +++ b/kde-apps/libkgapi/libkgapi-9999.ebuild
2442 @@ -21,18 +21,17 @@ BDEPEND="
2443 nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
2444 "
2445 DEPEND="
2446 - >=kde-frameworks/kcalendarcore-${KFMIN}:5
2447 - >=kde-frameworks/kcontacts-${KFMIN}:5
2448 - >=kde-frameworks/kio-${KFMIN}:5
2449 - >=kde-frameworks/kwindowsystem-${KFMIN}:5
2450 + dev-libs/cyrus-sasl:2
2451 >=dev-qt/qtgui-${QTMIN}:5
2452 >=dev-qt/qtnetwork-${QTMIN}:5
2453 >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
2454 >=dev-qt/qtwidgets-${QTMIN}:5
2455 >=dev-qt/qtxml-${QTMIN}:5
2456 - dev-libs/cyrus-sasl:2
2457 + >=kde-frameworks/kcalendarcore-${KFMIN}:5
2458 + >=kde-frameworks/kcontacts-${KFMIN}:5
2459 + >=kde-frameworks/kio-${KFMIN}:5
2460 + >=kde-frameworks/kwindowsystem-${KFMIN}:5
2461 "
2462 RDEPEND="${DEPEND}
2463 - !kde-apps/kdepim-l10n
2464 !<kde-apps/kdepim-runtime-18.07.80:5
2465 "
2466
2467 diff --git a/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild b/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild
2468 index b1fbe18095..7f66a9d53d 100644
2469 --- a/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild
2470 +++ b/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild
2471 @@ -16,7 +16,7 @@ SLOT="5"
2472 KEYWORDS=""
2473 IUSE="+fancyviewer"
2474
2475 -COMMON_DEPEND="
2476 +RDEPEND="
2477 >=kde-frameworks/kcodecs-${KFMIN}:5
2478 >=kde-frameworks/kcompletion-${KFMIN}:5
2479 >=kde-frameworks/kconfig-${KFMIN}:5
2480 @@ -30,12 +30,9 @@ COMMON_DEPEND="
2481 >=app-crypt/gpgme-1.11.1[cxx,qt5]
2482 fancyviewer? ( >=kde-apps/kpimtextedit-${PVCUT}:5 )
2483 "
2484 -DEPEND="${COMMON_DEPEND}
2485 +DEPEND="${RDEPEND}
2486 dev-libs/boost
2487 "
2488 -RDEPEND="${COMMON_DEPEND}
2489 - !kde-apps/kdepim-l10n
2490 -"
2491
2492 src_configure() {
2493 local mycmakeargs=(
2494
2495 diff --git a/kde-apps/libkleo/libkleo-9999.ebuild b/kde-apps/libkleo/libkleo-9999.ebuild
2496 index fe16bbbf4a..cba3badae9 100644
2497 --- a/kde-apps/libkleo/libkleo-9999.ebuild
2498 +++ b/kde-apps/libkleo/libkleo-9999.ebuild
2499 @@ -16,7 +16,10 @@ SLOT="5"
2500 KEYWORDS=""
2501 IUSE="+fancyviewer"
2502
2503 -COMMON_DEPEND="
2504 +RDEPEND="
2505 + >=app-crypt/gpgme-1.11.1[cxx,qt5]
2506 + >=dev-qt/qtgui-${QTMIN}:5
2507 + >=dev-qt/qtwidgets-${QTMIN}:5
2508 >=kde-frameworks/kcodecs-${KFMIN}:5
2509 >=kde-frameworks/kcompletion-${KFMIN}:5
2510 >=kde-frameworks/kconfig-${KFMIN}:5
2511 @@ -25,17 +28,11 @@ COMMON_DEPEND="
2512 >=kde-frameworks/kitemmodels-${KFMIN}:5
2513 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
2514 >=kde-frameworks/kwindowsystem-${KFMIN}:5
2515 - >=dev-qt/qtgui-${QTMIN}:5
2516 - >=dev-qt/qtwidgets-${QTMIN}:5
2517 - >=app-crypt/gpgme-1.11.1[cxx,qt5]
2518 fancyviewer? ( >=kde-apps/kpimtextedit-${PVCUT}:5 )
2519 "
2520 -DEPEND="${COMMON_DEPEND}
2521 +DEPEND="${RDEPEND}
2522 dev-libs/boost
2523 "
2524 -RDEPEND="${COMMON_DEPEND}
2525 - !kde-apps/kdepim-l10n
2526 -"
2527
2528 src_configure() {
2529 local mycmakeargs=(
2530
2531 diff --git a/kde-apps/libksieve/libksieve-19.12.49.9999.ebuild b/kde-apps/libksieve/libksieve-19.12.49.9999.ebuild
2532 index 0223241c1a..27bb469b5b 100644
2533 --- a/kde-apps/libksieve/libksieve-19.12.49.9999.ebuild
2534 +++ b/kde-apps/libksieve/libksieve-19.12.49.9999.ebuild
2535 @@ -19,7 +19,19 @@ KEYWORDS=""
2536 IUSE=""
2537
2538 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
2539 -COMMON_DEPEND="
2540 +RDEPEND="
2541 + dev-libs/cyrus-sasl
2542 + >=dev-qt/qtdbus-${QTMIN}:5
2543 + >=dev-qt/qtgui-${QTMIN}:5
2544 + >=dev-qt/qtnetwork-${QTMIN}:5
2545 + >=dev-qt/qtprintsupport-${QTMIN}:5
2546 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
2547 + >=dev-qt/qtwidgets-${QTMIN}:5=
2548 + >=kde-apps/kidentitymanagement-${PVCUT}:5
2549 + >=kde-apps/kmime-${PVCUT}:5
2550 + >=kde-apps/kpimtextedit-${PVCUT}:5
2551 + >=kde-apps/libkdepim-${PVCUT}:5
2552 + >=kde-apps/pimcommon-${PVCUT}:5
2553 >=kde-frameworks/karchive-${KFMIN}:5
2554 >=kde-frameworks/kcompletion-${KFMIN}:5
2555 >=kde-frameworks/kconfig-${KFMIN}:5
2556 @@ -31,26 +43,11 @@ COMMON_DEPEND="
2557 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
2558 >=kde-frameworks/sonnet-${KFMIN}:5
2559 >=kde-frameworks/syntax-highlighting-${KFMIN}:5
2560 - >=kde-apps/kidentitymanagement-${PVCUT}:5
2561 - >=kde-apps/kmime-${PVCUT}:5
2562 - >=kde-apps/kpimtextedit-${PVCUT}:5
2563 - >=kde-apps/libkdepim-${PVCUT}:5
2564 - >=kde-apps/pimcommon-${PVCUT}:5
2565 - >=dev-qt/qtdbus-${QTMIN}:5
2566 - >=dev-qt/qtgui-${QTMIN}:5
2567 - >=dev-qt/qtnetwork-${QTMIN}:5
2568 - >=dev-qt/qtprintsupport-${QTMIN}:5
2569 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
2570 - >=dev-qt/qtwidgets-${QTMIN}:5=
2571 - dev-libs/cyrus-sasl
2572 "
2573 -DEPEND="${COMMON_DEPEND}
2574 +DEPEND="${RDEPEND}
2575 >=kde-apps/kimap-${PVCUT}:5
2576 >=kde-apps/kmailtransport-${PVCUT}:5
2577 "
2578 -RDEPEND="${COMMON_DEPEND}
2579 - !kde-apps/kdepim-l10n
2580 -"
2581
2582 RESTRICT+=" test"
2583
2584
2585 diff --git a/kde-apps/libksieve/libksieve-9999.ebuild b/kde-apps/libksieve/libksieve-9999.ebuild
2586 index 0fe3e1cc82..cdd6291abf 100644
2587 --- a/kde-apps/libksieve/libksieve-9999.ebuild
2588 +++ b/kde-apps/libksieve/libksieve-9999.ebuild
2589 @@ -19,7 +19,19 @@ KEYWORDS=""
2590 IUSE=""
2591
2592 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
2593 -COMMON_DEPEND="
2594 +RDEPEND="
2595 + dev-libs/cyrus-sasl
2596 + >=dev-qt/qtdbus-${QTMIN}:5
2597 + >=dev-qt/qtgui-${QTMIN}:5
2598 + >=dev-qt/qtnetwork-${QTMIN}:5
2599 + >=dev-qt/qtprintsupport-${QTMIN}:5
2600 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
2601 + >=dev-qt/qtwidgets-${QTMIN}:5=
2602 + >=kde-apps/kidentitymanagement-${PVCUT}:5
2603 + >=kde-apps/kmime-${PVCUT}:5
2604 + >=kde-apps/kpimtextedit-${PVCUT}:5
2605 + >=kde-apps/libkdepim-${PVCUT}:5
2606 + >=kde-apps/pimcommon-${PVCUT}:5
2607 >=kde-frameworks/karchive-${KFMIN}:5
2608 >=kde-frameworks/kcompletion-${KFMIN}:5
2609 >=kde-frameworks/kconfig-${KFMIN}:5
2610 @@ -31,26 +43,11 @@ COMMON_DEPEND="
2611 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
2612 >=kde-frameworks/sonnet-${KFMIN}:5
2613 >=kde-frameworks/syntax-highlighting-${KFMIN}:5
2614 - >=kde-apps/kidentitymanagement-${PVCUT}:5
2615 - >=kde-apps/kmime-${PVCUT}:5
2616 - >=kde-apps/kpimtextedit-${PVCUT}:5
2617 - >=kde-apps/libkdepim-${PVCUT}:5
2618 - >=kde-apps/pimcommon-${PVCUT}:5
2619 - >=dev-qt/qtdbus-${QTMIN}:5
2620 - >=dev-qt/qtgui-${QTMIN}:5
2621 - >=dev-qt/qtnetwork-${QTMIN}:5
2622 - >=dev-qt/qtprintsupport-${QTMIN}:5
2623 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
2624 - >=dev-qt/qtwidgets-${QTMIN}:5=
2625 - dev-libs/cyrus-sasl
2626 "
2627 -DEPEND="${COMMON_DEPEND}
2628 +DEPEND="${RDEPEND}
2629 >=kde-apps/kimap-${PVCUT}:5
2630 >=kde-apps/kmailtransport-${PVCUT}:5
2631 "
2632 -RDEPEND="${COMMON_DEPEND}
2633 - !kde-apps/kdepim-l10n
2634 -"
2635
2636 RESTRICT+=" test"
2637
2638
2639 diff --git a/kde-apps/libktnef/libktnef-19.12.49.9999.ebuild b/kde-apps/libktnef/libktnef-19.12.49.9999.ebuild
2640 index 2f9be069e6..dcbbf8510d 100644
2641 --- a/kde-apps/libktnef/libktnef-19.12.49.9999.ebuild
2642 +++ b/kde-apps/libktnef/libktnef-19.12.49.9999.ebuild
2643 @@ -24,6 +24,4 @@ DEPEND="
2644 >=kde-apps/kcalutils-${PVCUT}:5
2645 >=dev-qt/qtwidgets-${QTMIN}:5
2646 "
2647 -RDEPEND="${DEPEND}
2648 - !kde-apps/kdepim-l10n
2649 -"
2650 +RDEPEND="${DEPEND}"
2651
2652 diff --git a/kde-apps/libktnef/libktnef-9999.ebuild b/kde-apps/libktnef/libktnef-9999.ebuild
2653 index 705f9da605..f7eb9b03a3 100644
2654 --- a/kde-apps/libktnef/libktnef-9999.ebuild
2655 +++ b/kde-apps/libktnef/libktnef-9999.ebuild
2656 @@ -18,12 +18,10 @@ KEYWORDS=""
2657 IUSE=""
2658
2659 DEPEND="
2660 + >=dev-qt/qtwidgets-${QTMIN}:5
2661 + >=kde-apps/kcalutils-${PVCUT}:5
2662 >=kde-frameworks/kcalendarcore-${KFMIN}:5
2663 >=kde-frameworks/kcontacts-${KFMIN}:5
2664 >=kde-frameworks/ki18n-${KFMIN}:5
2665 - >=kde-apps/kcalutils-${PVCUT}:5
2666 - >=dev-qt/qtwidgets-${QTMIN}:5
2667 -"
2668 -RDEPEND="${DEPEND}
2669 - !kde-apps/kdepim-l10n
2670 "
2671 +RDEPEND="${DEPEND}"
2672
2673 diff --git a/kde-apps/mailcommon/mailcommon-19.12.49.9999.ebuild b/kde-apps/mailcommon/mailcommon-19.12.49.9999.ebuild
2674 index 0c5b2c549d..d9b0bdc9bf 100644
2675 --- a/kde-apps/mailcommon/mailcommon-19.12.49.9999.ebuild
2676 +++ b/kde-apps/mailcommon/mailcommon-19.12.49.9999.ebuild
2677 @@ -57,8 +57,6 @@ DEPEND="
2678 >=dev-qt/qtxml-${QTMIN}:5
2679 >=media-libs/phonon-4.10.90
2680 "
2681 -RDEPEND="${DEPEND}
2682 - !kde-apps/kdepim-l10n
2683 -"
2684 +RDEPEND="${DEPEND}"
2685
2686 RESTRICT+=" test"
2687
2688 diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild b/kde-apps/mailcommon/mailcommon-9999.ebuild
2689 index f88e9bd990..a787a12e60 100644
2690 --- a/kde-apps/mailcommon/mailcommon-9999.ebuild
2691 +++ b/kde-apps/mailcommon/mailcommon-9999.ebuild
2692 @@ -23,6 +23,21 @@ BDEPEND="
2693 dev-libs/libxslt
2694 "
2695 DEPEND="
2696 + >=dev-qt/qtdbus-${QTMIN}:5
2697 + >=dev-qt/qtgui-${QTMIN}:5
2698 + >=dev-qt/qtmultimedia-${QTMIN}:5
2699 + >=dev-qt/qtwidgets-${QTMIN}:5=
2700 + >=dev-qt/qtxml-${QTMIN}:5
2701 + >=kde-apps/akonadi-${PVCUT}:5
2702 + >=kde-apps/akonadi-contacts-${PVCUT}:5
2703 + >=kde-apps/akonadi-mime-${PVCUT}:5
2704 + >=kde-apps/kmailtransport-${PVCUT}:5
2705 + >=kde-apps/kmime-${PVCUT}:5
2706 + >=kde-apps/kpimtextedit-${PVCUT}:5
2707 + >=kde-apps/libkdepim-${PVCUT}:5
2708 + >=kde-apps/mailimporter-${PVCUT}:5
2709 + >=kde-apps/messagelib-${PVCUT}:5
2710 + >=kde-apps/pimcommon-${PVCUT}:5
2711 >=kde-frameworks/karchive-${KFMIN}:5
2712 >=kde-frameworks/kcodecs-${KFMIN}:5
2713 >=kde-frameworks/kcompletion-${KFMIN}:5
2714 @@ -40,25 +55,8 @@ DEPEND="
2715 >=kde-frameworks/kwindowsystem-${KFMIN}:5
2716 >=kde-frameworks/kxmlgui-${KFMIN}:5
2717 >=kde-frameworks/syntax-highlighting-${KFMIN}:5
2718 - >=kde-apps/akonadi-${PVCUT}:5
2719 - >=kde-apps/akonadi-contacts-${PVCUT}:5
2720 - >=kde-apps/akonadi-mime-${PVCUT}:5
2721 - >=kde-apps/kmailtransport-${PVCUT}:5
2722 - >=kde-apps/kmime-${PVCUT}:5
2723 - >=kde-apps/kpimtextedit-${PVCUT}:5
2724 - >=kde-apps/libkdepim-${PVCUT}:5
2725 - >=kde-apps/mailimporter-${PVCUT}:5
2726 - >=kde-apps/messagelib-${PVCUT}:5
2727 - >=kde-apps/pimcommon-${PVCUT}:5
2728 - >=dev-qt/qtdbus-${QTMIN}:5
2729 - >=dev-qt/qtgui-${QTMIN}:5
2730 - >=dev-qt/qtmultimedia-${QTMIN}:5
2731 - >=dev-qt/qtwidgets-${QTMIN}:5=
2732 - >=dev-qt/qtxml-${QTMIN}:5
2733 >=media-libs/phonon-4.10.90
2734 "
2735 -RDEPEND="${DEPEND}
2736 - !kde-apps/kdepim-l10n
2737 -"
2738 +RDEPEND="${DEPEND}"
2739
2740 RESTRICT+=" test"
2741
2742 diff --git a/kde-apps/mailimporter/mailimporter-19.12.49.9999.ebuild b/kde-apps/mailimporter/mailimporter-19.12.49.9999.ebuild
2743 index 63b79a31b4..0c29d5f1b3 100644
2744 --- a/kde-apps/mailimporter/mailimporter-19.12.49.9999.ebuild
2745 +++ b/kde-apps/mailimporter/mailimporter-19.12.49.9999.ebuild
2746 @@ -30,6 +30,4 @@ DEPEND="
2747 >=dev-qt/qtwidgets-${QTMIN}:5
2748 >=dev-qt/qtxml-${QTMIN}:5
2749 "
2750 -RDEPEND="${DEPEND}
2751 - !kde-apps/kdepim-l10n
2752 -"
2753 +RDEPEND="${DEPEND}"
2754
2755 diff --git a/kde-apps/mailimporter/mailimporter-9999.ebuild b/kde-apps/mailimporter/mailimporter-9999.ebuild
2756 index 78fdcff01a..547d204963 100644
2757 --- a/kde-apps/mailimporter/mailimporter-9999.ebuild
2758 +++ b/kde-apps/mailimporter/mailimporter-9999.ebuild
2759 @@ -18,18 +18,16 @@ KEYWORDS=""
2760 IUSE=""
2761
2762 DEPEND="
2763 - >=kde-frameworks/karchive-${KFMIN}:5
2764 - >=kde-frameworks/kconfig-${KFMIN}:5
2765 - >=kde-frameworks/kcoreaddons-${KFMIN}:5
2766 - >=kde-frameworks/ki18n-${KFMIN}:5
2767 + >=dev-qt/qtgui-${QTMIN}:5
2768 + >=dev-qt/qtwidgets-${QTMIN}:5
2769 + >=dev-qt/qtxml-${QTMIN}:5
2770 >=kde-apps/akonadi-${PVCUT}:5
2771 >=kde-apps/akonadi-mime-${PVCUT}:5
2772 >=kde-apps/kmime-${PVCUT}:5
2773 >=kde-apps/libkdepim-${PVCUT}:5
2774 - >=dev-qt/qtgui-${QTMIN}:5
2775 - >=dev-qt/qtwidgets-${QTMIN}:5
2776 - >=dev-qt/qtxml-${QTMIN}:5
2777 -"
2778 -RDEPEND="${DEPEND}
2779 - !kde-apps/kdepim-l10n
2780 + >=kde-frameworks/karchive-${KFMIN}:5
2781 + >=kde-frameworks/kconfig-${KFMIN}:5
2782 + >=kde-frameworks/kcoreaddons-${KFMIN}:5
2783 + >=kde-frameworks/ki18n-${KFMIN}:5
2784 "
2785 +RDEPEND="${DEPEND}"
2786
2787 diff --git a/kde-apps/mbox-importer/mbox-importer-19.12.49.9999.ebuild b/kde-apps/mbox-importer/mbox-importer-19.12.49.9999.ebuild
2788 index 54b9fa07b9..e42e0b192d 100644
2789 --- a/kde-apps/mbox-importer/mbox-importer-19.12.49.9999.ebuild
2790 +++ b/kde-apps/mbox-importer/mbox-importer-19.12.49.9999.ebuild
2791 @@ -31,7 +31,4 @@ DEPEND="
2792 >=dev-qt/qtgui-${QTMIN}:5
2793 >=dev-qt/qtwidgets-${QTMIN}:5
2794 "
2795 -RDEPEND="${DEPEND}
2796 - !kde-apps/kdepim-l10n
2797 - !kde-apps/kmail:4
2798 -"
2799 +RDEPEND="${DEPEND}"
2800
2801 diff --git a/kde-apps/mbox-importer/mbox-importer-9999.ebuild b/kde-apps/mbox-importer/mbox-importer-9999.ebuild
2802 index 4ab2c82320..17a6d9d5ad 100644
2803 --- a/kde-apps/mbox-importer/mbox-importer-9999.ebuild
2804 +++ b/kde-apps/mbox-importer/mbox-importer-9999.ebuild
2805 @@ -17,6 +17,12 @@ KEYWORDS=""
2806 IUSE=""
2807
2808 DEPEND="
2809 + >=dev-qt/qtgui-${QTMIN}:5
2810 + >=dev-qt/qtwidgets-${QTMIN}:5
2811 + >=kde-apps/akonadi-${PVCUT}:5
2812 + >=kde-apps/kidentitymanagement-${PVCUT}:5
2813 + >=kde-apps/mailcommon-${PVCUT}:5
2814 + >=kde-apps/mailimporter-${PVCUT}:5
2815 >=kde-frameworks/kconfig-${KFMIN}:5
2816 >=kde-frameworks/kcoreaddons-${KFMIN}:5
2817 >=kde-frameworks/kcrash-${KFMIN}:5
2818 @@ -24,14 +30,5 @@ DEPEND="
2819 >=kde-frameworks/ki18n-${KFMIN}:5
2820 >=kde-frameworks/kservice-${KFMIN}:5
2821 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
2822 - >=kde-apps/akonadi-${PVCUT}:5
2823 - >=kde-apps/kidentitymanagement-${PVCUT}:5
2824 - >=kde-apps/mailcommon-${PVCUT}:5
2825 - >=kde-apps/mailimporter-${PVCUT}:5
2826 - >=dev-qt/qtgui-${QTMIN}:5
2827 - >=dev-qt/qtwidgets-${QTMIN}:5
2828 -"
2829 -RDEPEND="${DEPEND}
2830 - !kde-apps/kdepim-l10n
2831 - !kde-apps/kmail:4
2832 "
2833 +RDEPEND="${DEPEND}"
2834
2835 diff --git a/kde-apps/messagelib/messagelib-19.12.49.9999.ebuild b/kde-apps/messagelib/messagelib-19.12.49.9999.ebuild
2836 index 145786227b..87ae05a156 100644
2837 --- a/kde-apps/messagelib/messagelib-19.12.49.9999.ebuild
2838 +++ b/kde-apps/messagelib/messagelib-19.12.49.9999.ebuild
2839 @@ -65,10 +65,7 @@ DEPEND="
2840 app-crypt/qca:2
2841 >=dev-libs/grantlee-5.1.0:5
2842 "
2843 -RDEPEND="${DEPEND}
2844 - !kde-apps/kdepim-common-libs:4
2845 - !kde-apps/kdepim-l10n
2846 -"
2847 +RDEPEND="${DEPEND}"
2848
2849 # bug 579630
2850 RESTRICT+=" test"
2851
2852 diff --git a/kde-apps/messagelib/messagelib-9999.ebuild b/kde-apps/messagelib/messagelib-9999.ebuild
2853 index 141ef9924d..24425d5dc8 100644
2854 --- a/kde-apps/messagelib/messagelib-9999.ebuild
2855 +++ b/kde-apps/messagelib/messagelib-9999.ebuild
2856 @@ -18,6 +18,29 @@ KEYWORDS=""
2857 IUSE=""
2858
2859 DEPEND="
2860 + >=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
2861 + app-crypt/qca:2
2862 + >=dev-libs/grantlee-5.1.0:5
2863 + >=dev-qt/qtgui-${QTMIN}:5
2864 + >=dev-qt/qtnetwork-${QTMIN}:5
2865 + >=dev-qt/qtprintsupport-${QTMIN}:5
2866 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
2867 + >=dev-qt/qtwidgets-${QTMIN}:5
2868 + >=kde-apps/akonadi-${PVCUT}:5
2869 + >=kde-apps/akonadi-contacts-${PVCUT}:5
2870 + >=kde-apps/akonadi-mime-${PVCUT}:5
2871 + >=kde-apps/grantleetheme-${PVCUT}:5
2872 + >=kde-apps/incidenceeditor-${PVCUT}:5
2873 + >=kde-apps/kdepim-apps-libs-${PVCUT}:5
2874 + >=kde-apps/kidentitymanagement-${PVCUT}:5
2875 + >=kde-apps/kldap-${PVCUT}:5
2876 + >=kde-apps/kmailtransport-${PVCUT}:5
2877 + >=kde-apps/kmbox-${PVCUT}:5
2878 + >=kde-apps/kmime-${PVCUT}:5
2879 + >=kde-apps/kpimtextedit-${PVCUT}:5
2880 + >=kde-apps/libgravatar-${PVCUT}:5
2881 + >=kde-apps/libkdepim-${PVCUT}:5
2882 + >=kde-apps/libkleo-${PVCUT}:5
2883 >=kde-frameworks/karchive-${KFMIN}:5
2884 >=kde-frameworks/kcalendarcore-${KFMIN}:5
2885 >=kde-frameworks/kcodecs-${KFMIN}:5
2886 @@ -41,34 +64,8 @@ DEPEND="
2887 >=kde-frameworks/kxmlgui-${KFMIN}:5
2888 >=kde-frameworks/sonnet-${KFMIN}:5
2889 >=kde-frameworks/syntax-highlighting-${KFMIN}:5
2890 - >=kde-apps/akonadi-${PVCUT}:5
2891 - >=kde-apps/akonadi-contacts-${PVCUT}:5
2892 - >=kde-apps/akonadi-mime-${PVCUT}:5
2893 - >=kde-apps/grantleetheme-${PVCUT}:5
2894 - >=kde-apps/incidenceeditor-${PVCUT}:5
2895 - >=kde-apps/kdepim-apps-libs-${PVCUT}:5
2896 - >=kde-apps/kidentitymanagement-${PVCUT}:5
2897 - >=kde-apps/kldap-${PVCUT}:5
2898 - >=kde-apps/kmailtransport-${PVCUT}:5
2899 - >=kde-apps/kmbox-${PVCUT}:5
2900 - >=kde-apps/kmime-${PVCUT}:5
2901 - >=kde-apps/kpimtextedit-${PVCUT}:5
2902 - >=kde-apps/libgravatar-${PVCUT}:5
2903 - >=kde-apps/libkdepim-${PVCUT}:5
2904 - >=kde-apps/libkleo-${PVCUT}:5
2905 - >=dev-qt/qtgui-${QTMIN}:5
2906 - >=dev-qt/qtnetwork-${QTMIN}:5
2907 - >=dev-qt/qtprintsupport-${QTMIN}:5
2908 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
2909 - >=dev-qt/qtwidgets-${QTMIN}:5
2910 - >=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
2911 - app-crypt/qca:2
2912 - >=dev-libs/grantlee-5.1.0:5
2913 -"
2914 -RDEPEND="${DEPEND}
2915 - !kde-apps/kdepim-common-libs:4
2916 - !kde-apps/kdepim-l10n
2917 "
2918 +RDEPEND="${DEPEND}"
2919
2920 # bug 579630
2921 RESTRICT+=" test"
2922
2923 diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.12.49.9999.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-19.12.49.9999.ebuild
2924 index e53e8250aa..758f285494 100644
2925 --- a/kde-apps/pim-data-exporter/pim-data-exporter-19.12.49.9999.ebuild
2926 +++ b/kde-apps/pim-data-exporter/pim-data-exporter-19.12.49.9999.ebuild
2927 @@ -44,7 +44,4 @@ DEPEND="
2928 >=dev-qt/qtgui-${QTMIN}:5
2929 >=dev-qt/qtwidgets-${QTMIN}:5
2930 "
2931 -RDEPEND="${DEPEND}
2932 - !kde-apps/kdepim-l10n
2933 - !kde-apps/kmail:4
2934 -"
2935 +RDEPEND="${DEPEND}"
2936
2937 diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
2938 index 8588729761..38b288fd08 100644
2939 --- a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
2940 +++ b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
2941 @@ -20,6 +20,16 @@ KEYWORDS=""
2942 IUSE=""
2943
2944 DEPEND="
2945 + >=dev-qt/qtgui-${QTMIN}:5
2946 + >=dev-qt/qtwidgets-${QTMIN}:5
2947 + >=kde-apps/akonadi-${PVCUT}:5
2948 + >=kde-apps/kidentitymanagement-${PVCUT}:5
2949 + >=kde-apps/kmailtransport-${PVCUT}:5
2950 + >=kde-apps/kmime-${PVCUT}:5
2951 + >=kde-apps/kpimtextedit-${PVCUT}:5
2952 + >=kde-apps/libkdepim-${PVCUT}:5
2953 + >=kde-apps/mailcommon-${PVCUT}:5
2954 + >=kde-apps/pimcommon-${PVCUT}:5
2955 >=kde-frameworks/karchive-${KFMIN}:5
2956 >=kde-frameworks/kconfig-${KFMIN}:5
2957 >=kde-frameworks/kconfigwidgets-${KFMIN}:5
2958 @@ -33,18 +43,5 @@ DEPEND="
2959 >=kde-frameworks/knotifications-${KFMIN}:5
2960 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
2961 >=kde-frameworks/kxmlgui-${KFMIN}:5
2962 - >=kde-apps/akonadi-${PVCUT}:5
2963 - >=kde-apps/kidentitymanagement-${PVCUT}:5
2964 - >=kde-apps/kmailtransport-${PVCUT}:5
2965 - >=kde-apps/kmime-${PVCUT}:5
2966 - >=kde-apps/kpimtextedit-${PVCUT}:5
2967 - >=kde-apps/libkdepim-${PVCUT}:5
2968 - >=kde-apps/mailcommon-${PVCUT}:5
2969 - >=kde-apps/pimcommon-${PVCUT}:5
2970 - >=dev-qt/qtgui-${QTMIN}:5
2971 - >=dev-qt/qtwidgets-${QTMIN}:5
2972 -"
2973 -RDEPEND="${DEPEND}
2974 - !kde-apps/kdepim-l10n
2975 - !kde-apps/kmail:4
2976 "
2977 +RDEPEND="${DEPEND}"
2978
2979 diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.49.9999.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.49.9999.ebuild
2980 index 487d912b90..fa78aa407b 100644
2981 --- a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.49.9999.ebuild
2982 +++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.49.9999.ebuild
2983 @@ -43,7 +43,4 @@ DEPEND="
2984 >=dev-qt/qtnetwork-${QTMIN}:5
2985 >=dev-qt/qtwidgets-${QTMIN}:5
2986 "
2987 -RDEPEND="${DEPEND}
2988 - !kde-apps/kdepim-common-libs:4
2989 - !kde-apps/kdepim-l10n
2990 -"
2991 +RDEPEND="${DEPEND}"
2992
2993 diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
2994 index 71083b934d..61477d9daa 100644
2995 --- a/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
2996 +++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
2997 @@ -19,6 +19,16 @@ KEYWORDS=""
2998 IUSE=""
2999
3000 DEPEND="
3001 + >=dev-qt/qtgui-${QTMIN}:5
3002 + >=dev-qt/qtnetwork-${QTMIN}:5
3003 + >=dev-qt/qtwidgets-${QTMIN}:5
3004 + >=kde-apps/akonadi-${PVCUT}:5
3005 + >=kde-apps/akonadi-contacts-${PVCUT}:5
3006 + >=kde-apps/akonadi-mime-${PVCUT}:5
3007 + >=kde-apps/calendarsupport-${PVCUT}:5
3008 + >=kde-apps/kmailtransport-${PVCUT}:5
3009 + >=kde-apps/libksieve-${PVCUT}:5
3010 + >=kde-apps/pimcommon-${PVCUT}:5
3011 >=kde-frameworks/kbookmarks-${KFMIN}:5
3012 >=kde-frameworks/kcalendarcore-${KFMIN}:5
3013 >=kde-frameworks/kconfig-${KFMIN}:5
3014 @@ -32,18 +42,5 @@ DEPEND="
3015 >=kde-frameworks/kwallet-${KFMIN}:5
3016 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
3017 >=kde-frameworks/kxmlgui-${KFMIN}:5
3018 - >=kde-apps/akonadi-${PVCUT}:5
3019 - >=kde-apps/akonadi-contacts-${PVCUT}:5
3020 - >=kde-apps/akonadi-mime-${PVCUT}:5
3021 - >=kde-apps/calendarsupport-${PVCUT}:5
3022 - >=kde-apps/kmailtransport-${PVCUT}:5
3023 - >=kde-apps/libksieve-${PVCUT}:5
3024 - >=kde-apps/pimcommon-${PVCUT}:5
3025 - >=dev-qt/qtgui-${QTMIN}:5
3026 - >=dev-qt/qtnetwork-${QTMIN}:5
3027 - >=dev-qt/qtwidgets-${QTMIN}:5
3028 -"
3029 -RDEPEND="${DEPEND}
3030 - !kde-apps/kdepim-common-libs:4
3031 - !kde-apps/kdepim-l10n
3032 "
3033 +RDEPEND="${DEPEND}"
3034
3035 diff --git a/kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild b/kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild
3036 index 0a6d5e2375..4ea604eecc 100644
3037 --- a/kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild
3038 +++ b/kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild
3039 @@ -21,7 +21,7 @@ IUSE=""
3040 BDEPEND="
3041 dev-libs/libxslt
3042 "
3043 -COMMON_DEPEND="
3044 +RDEPEND="
3045 >=kde-frameworks/karchive-${KFMIN}:5
3046 >=kde-frameworks/kcodecs-${KFMIN}:5
3047 >=kde-frameworks/kcompletion-${KFMIN}:5
3048 @@ -51,13 +51,9 @@ COMMON_DEPEND="
3049 >=dev-qt/qtwidgets-${QTMIN}:5
3050 >=dev-qt/qtxml-${QTMIN}:5
3051 "
3052 -DEPEND="${COMMON_DEPEND}
3053 +DEPEND="${RDEPEND}
3054 test? ( >=kde-apps/kmime-${PVCUT}:5 )
3055 "
3056 -RDEPEND="${COMMON_DEPEND}
3057 - !kde-apps/kdepim-common-libs:4
3058 - !kde-apps/kdepim-l10n
3059 -"
3060
3061 src_test() {
3062 # bugs 641730, 661330
3063
3064 diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild
3065 index 8cc3847bad..4778255c6a 100644
3066 --- a/kde-apps/pimcommon/pimcommon-9999.ebuild
3067 +++ b/kde-apps/pimcommon/pimcommon-9999.ebuild
3068 @@ -21,7 +21,18 @@ IUSE=""
3069 BDEPEND="
3070 dev-libs/libxslt
3071 "
3072 -COMMON_DEPEND="
3073 +RDEPEND="
3074 + >=dev-qt/qtdbus-${QTMIN}:5
3075 + >=dev-qt/qtgui-${QTMIN}:5
3076 + >=dev-qt/qtnetwork-${QTMIN}:5
3077 + >=dev-qt/qtprintsupport-${QTMIN}:5
3078 + >=dev-qt/qtwidgets-${QTMIN}:5
3079 + >=dev-qt/qtxml-${QTMIN}:5
3080 + >=kde-apps/akonadi-${PVCUT}:5
3081 + >=kde-apps/akonadi-contacts-${PVCUT}:5
3082 + >=kde-apps/kimap-${PVCUT}:5
3083 + >=kde-apps/kpimtextedit-${PVCUT}:5
3084 + >=kde-apps/libkdepim-${PVCUT}:5
3085 >=kde-frameworks/karchive-${KFMIN}:5
3086 >=kde-frameworks/kcodecs-${KFMIN}:5
3087 >=kde-frameworks/kcompletion-${KFMIN}:5
3088 @@ -39,25 +50,10 @@ COMMON_DEPEND="
3089 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
3090 >=kde-frameworks/kxmlgui-${KFMIN}:5
3091 >=kde-frameworks/purpose-${KFMIN}:5
3092 - >=kde-apps/akonadi-${PVCUT}:5
3093 - >=kde-apps/akonadi-contacts-${PVCUT}:5
3094 - >=kde-apps/kimap-${PVCUT}:5
3095 - >=kde-apps/kpimtextedit-${PVCUT}:5
3096 - >=kde-apps/libkdepim-${PVCUT}:5
3097 - >=dev-qt/qtdbus-${QTMIN}:5
3098 - >=dev-qt/qtgui-${QTMIN}:5
3099 - >=dev-qt/qtnetwork-${QTMIN}:5
3100 - >=dev-qt/qtprintsupport-${QTMIN}:5
3101 - >=dev-qt/qtwidgets-${QTMIN}:5
3102 - >=dev-qt/qtxml-${QTMIN}:5
3103 "
3104 -DEPEND="${COMMON_DEPEND}
3105 +DEPEND="${RDEPEND}
3106 test? ( >=kde-apps/kmime-${PVCUT}:5 )
3107 "
3108 -RDEPEND="${COMMON_DEPEND}
3109 - !kde-apps/kdepim-common-libs:4
3110 - !kde-apps/kdepim-l10n
3111 -"
3112
3113 src_test() {
3114 # bugs 641730, 661330