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-plasma/kwrited/, kde-plasma/milou/, kde-plasma/plasma-desktop/, ...
Date: Sat, 26 Jan 2019 20:30:01
Message-Id: 1548534523.bf527842844737a71d0ec1399d026c12fa347b4a.asturm@gentoo
1 commit: bf527842844737a71d0ec1399d026c12fa347b4a
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 20 22:40:02 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 26 20:28:43 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bf527842
7
8 kde-plasma: EAPI-7 bump
9
10 Package-Manager: Portage-2.3.56, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 kde-plasma/bluedevil/bluedevil-9999.ebuild | 12 +++---------
14 kde-plasma/breeze-grub/breeze-grub-9999.ebuild | 16 ++++------------
15 kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild | 4 ++--
16 .../breeze-plymouth/breeze-plymouth-9999.ebuild | 9 ++++-----
17 kde-plasma/breeze/breeze-9999.ebuild | 2 +-
18 kde-plasma/discover/discover-9999.ebuild | 2 +-
19 kde-plasma/drkonqi/drkonqi-9999.ebuild | 3 +--
20 .../kactivitymanagerd/kactivitymanagerd-9999.ebuild | 3 +--
21 kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild | 2 +-
22 kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild | 3 +--
23 kde-plasma/kdecoration/kdecoration-9999.ebuild | 2 +-
24 .../kdeplasma-addons/kdeplasma-addons-9999.ebuild | 3 +--
25 kde-plasma/kgamma/kgamma-9999.ebuild | 2 +-
26 kde-plasma/khotkeys/khotkeys-9999.ebuild | 12 +++++-------
27 kde-plasma/kinfocenter/kinfocenter-9999.ebuild | 11 ++++-------
28 kde-plasma/kmenuedit/kmenuedit-9999.ebuild | 9 +++------
29 kde-plasma/kscreen/kscreen-9999.ebuild | 3 +--
30 kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild | 20 +++++++++-----------
31 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild | 7 ++-----
32 kde-plasma/ksysguard/ksysguard-9999.ebuild | 8 +++-----
33 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild | 2 +-
34 .../kwayland-integration-9999.ebuild | 2 +-
35 kde-plasma/kwin/kwin-9999.ebuild | 6 ++----
36 kde-plasma/kwrited/kwrited-9999.ebuild | 6 ++----
37 kde-plasma/libkscreen/libkscreen-9999.ebuild | 6 ++----
38 kde-plasma/libksysguard/libksysguard-9999.ebuild | 9 +++------
39 kde-plasma/libkworkspace/libkworkspace-9999.ebuild | 3 +--
40 kde-plasma/milou/milou-9999.ebuild | 6 ++----
41 kde-plasma/oxygen/oxygen-9999.ebuild | 9 ++++-----
42 .../plasma-browser-integration-9999.ebuild | 2 +-
43 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 7 +------
44 .../plasma-integration-9999.ebuild | 2 +-
45 kde-plasma/plasma-nm/plasma-nm-9999.ebuild | 3 +--
46 kde-plasma/plasma-pa/plasma-pa-9999.ebuild | 3 +--
47 kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild | 3 +--
48 kde-plasma/plasma-vault/plasma-vault-9999.ebuild | 2 +-
49 .../plasma-workspace-wallpapers-9999.ebuild | 5 ++---
50 .../plasma-workspace/plasma-workspace-9999.ebuild | 11 +----------
51 kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild | 2 +-
52 .../polkit-kde-agent/polkit-kde-agent-9999.ebuild | 2 +-
53 kde-plasma/powerdevil/powerdevil-9999.ebuild | 4 +---
54 kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild | 3 +--
55 kde-plasma/systemsettings/systemsettings-9999.ebuild | 3 +--
56 kde-plasma/user-manager/user-manager-9999.ebuild | 2 +-
57 .../xdg-desktop-portal-kde-9999.ebuild | 2 +-
58 .../xembed-sni-proxy/xembed-sni-proxy-9999.ebuild | 2 +-
59 46 files changed, 85 insertions(+), 155 deletions(-)
60
61 diff --git a/kde-plasma/bluedevil/bluedevil-9999.ebuild b/kde-plasma/bluedevil/bluedevil-9999.ebuild
62 index 58d7797040..84aae6c17c 100644
63 --- a/kde-plasma/bluedevil/bluedevil-9999.ebuild
64 +++ b/kde-plasma/bluedevil/bluedevil-9999.ebuild
65 @@ -1,7 +1,7 @@
66 # Copyright 1999-2019 Gentoo Authors
67 # Distributed under the terms of the GNU General Public License v2
68
69 -EAPI=6
70 +EAPI=7
71
72 inherit kde5
73
74 @@ -10,7 +10,7 @@ HOMEPAGE="https://cgit.kde.org/bluedevil.git"
75 KEYWORDS=""
76 IUSE=""
77
78 -COMMON_DEPEND="
79 +DEPEND="
80 $(add_frameworks_dep bluez-qt)
81 $(add_frameworks_dep kconfig)
82 $(add_frameworks_dep kconfigwidgets)
83 @@ -29,12 +29,6 @@ COMMON_DEPEND="
84 $(add_qt_dep qtgui)
85 $(add_qt_dep qtwidgets)
86 "
87 -DEPEND="${COMMON_DEPEND}
88 - x11-misc/shared-mime-info
89 -"
90 -RDEPEND="${COMMON_DEPEND}
91 +RDEPEND="${DEPEND}
92 $(add_plasma_dep kde-cli-tools)
93 - !app-mobilephone/obexd
94 - !app-mobilephone/obex-data-server
95 - !kde-plasma/bluedevil:4
96 "
97
98 diff --git a/kde-plasma/breeze-grub/breeze-grub-9999.ebuild b/kde-plasma/breeze-grub/breeze-grub-9999.ebuild
99 index 6e9572f17d..b54e11cfc2 100644
100 --- a/kde-plasma/breeze-grub/breeze-grub-9999.ebuild
101 +++ b/kde-plasma/breeze-grub/breeze-grub-9999.ebuild
102 @@ -1,7 +1,7 @@
103 # Copyright 1999-2019 Gentoo Authors
104 # Distributed under the terms of the GNU General Public License v2
105
106 -EAPI=6
107 +EAPI=7
108
109 KDE_AUTODEPS="false"
110 KDE_DEBUG="false"
111 @@ -12,17 +12,9 @@ LICENSE="GPL-3+"
112 KEYWORDS=""
113 IUSE=""
114
115 -src_prepare() {
116 - default
117 -}
118 -
119 -src_configure() {
120 - :
121 -}
122 -
123 -src_compile() {
124 - :
125 -}
126 +src_prepare() { default; }
127 +src_configure() { :; }
128 +src_compile() { :; }
129
130 src_install() {
131 insinto /usr/share/grub/themes
132
133 diff --git a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
134 index cf7c01b1f0..fe5865c1c7 100644
135 --- a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
136 +++ b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
137 @@ -1,7 +1,7 @@
138 # Copyright 1999-2019 Gentoo Authors
139 # Distributed under the terms of the GNU General Public License v2
140
141 -EAPI=6
142 +EAPI=7
143
144 PYTHON_COMPAT=( python3_{5,6,7} )
145 inherit kde5 python-any-r1
146 @@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
147 KEYWORDS=""
148 IUSE=""
149
150 -DEPEND="${PYTHON_DEPS}
151 +BDEPEND="${PYTHON_DEPS}
152 $(add_plasma_dep breeze)
153 $(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
154 dev-ruby/sass
155
156 diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild
157 index 7761597521..5de7622b8c 100644
158 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild
159 +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild
160 @@ -1,7 +1,7 @@
161 # Copyright 1999-2019 Gentoo Authors
162 # Distributed under the terms of the GNU General Public License v2
163
164 -EAPI=6
165 +EAPI=7
166
167 KDE_AUTODEPS="false"
168 inherit kde5
169 @@ -11,10 +11,9 @@ LICENSE="GPL-2+ GPL-3+"
170 KEYWORDS=""
171 IUSE=""
172
173 -RDEPEND="sys-boot/plymouth"
174 -DEPEND="${RDEPEND}
175 - $(add_frameworks_dep extra-cmake-modules)
176 -"
177 +BDEPEND="$(add_frameworks_dep extra-cmake-modules)"
178 +DEPEND="sys-boot/plymouth"
179 +RDEPEND="${DEPEND}"
180
181 src_configure() {
182 local mycmakeargs=(
183
184 diff --git a/kde-plasma/breeze/breeze-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild
185 index 7387eb4a6b..ba59a80c19 100644
186 --- a/kde-plasma/breeze/breeze-9999.ebuild
187 +++ b/kde-plasma/breeze/breeze-9999.ebuild
188 @@ -1,7 +1,7 @@
189 # Copyright 1999-2019 Gentoo Authors
190 # Distributed under the terms of the GNU General Public License v2
191
192 -EAPI=6
193 +EAPI=7
194
195 inherit kde5
196
197
198 diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
199 index 80d7ad83ae..68dcdd2106 100644
200 --- a/kde-plasma/discover/discover-9999.ebuild
201 +++ b/kde-plasma/discover/discover-9999.ebuild
202 @@ -1,7 +1,7 @@
203 # Copyright 1999-2019 Gentoo Authors
204 # Distributed under the terms of the GNU General Public License v2
205
206 -EAPI=6
207 +EAPI=7
208
209 KDE_TEST="forceoptional"
210 inherit kde5
211
212 diff --git a/kde-plasma/drkonqi/drkonqi-9999.ebuild b/kde-plasma/drkonqi/drkonqi-9999.ebuild
213 index 7e4cd96805..2bcdfe0d18 100644
214 --- a/kde-plasma/drkonqi/drkonqi-9999.ebuild
215 +++ b/kde-plasma/drkonqi/drkonqi-9999.ebuild
216 @@ -1,7 +1,7 @@
217 # Copyright 1999-2019 Gentoo Authors
218 # Distributed under the terms of the GNU General Public License v2
219
220 -EAPI=6
221 +EAPI=7
222
223 inherit kde5
224
225 @@ -36,7 +36,6 @@ DEPEND="${COMMON_DEPEND}
226 $(add_qt_dep qtconcurrent)
227 "
228 RDEPEND="${COMMON_DEPEND}
229 - !kde-apps/drkonqi:4
230 !<kde-plasma/plasma-workspace-5.10.95:5
231 "
232
233
234 diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
235 index 7bbbeeff8e..9326eeb609 100644
236 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
237 +++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
238 @@ -1,7 +1,7 @@
239 # Copyright 1999-2019 Gentoo Authors
240 # Distributed under the terms of the GNU General Public License v2
241
242 -EAPI=6
243 +EAPI=7
244
245 inherit kde5
246
247 @@ -31,5 +31,4 @@ DEPEND="${COMMON_DEPEND}
248 "
249 RDEPEND="${COMMON_DEPEND}
250 !<kde-frameworks/kactivities-4.13.3-r2:4
251 - !kde-plasma/kactivitymanagerd:4
252 "
253
254 diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
255 index a7307fbafc..84ac6c4719 100644
256 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
257 +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
258 @@ -1,7 +1,7 @@
259 # Copyright 1999-2019 Gentoo Authors
260 # Distributed under the terms of the GNU General Public License v2
261
262 -EAPI=6
263 +EAPI=7
264
265 KDE_HANDBOOK="forceoptional"
266 KDE_TEST="optional"
267
268 diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
269 index 02ae68f6d4..b65707d989 100644
270 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
271 +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
272 @@ -1,7 +1,7 @@
273 # Copyright 1999-2019 Gentoo Authors
274 # Distributed under the terms of the GNU General Public License v2
275
276 -EAPI=6
277 +EAPI=7
278
279 KDE_TEST="forceoptional"
280 VIRTUALX_REQUIRED="test"
281 @@ -33,7 +33,6 @@ DEPEND="
282 "
283 RDEPEND="${DEPEND}
284 $(add_plasma_dep kde-cli-tools)
285 - !kde-plasma/kde-gtk-config:4
286 "
287
288 src_configure() {
289
290 diff --git a/kde-plasma/kdecoration/kdecoration-9999.ebuild b/kde-plasma/kdecoration/kdecoration-9999.ebuild
291 index a6463628a7..c005ecf253 100644
292 --- a/kde-plasma/kdecoration/kdecoration-9999.ebuild
293 +++ b/kde-plasma/kdecoration/kdecoration-9999.ebuild
294 @@ -1,7 +1,7 @@
295 # Copyright 1999-2019 Gentoo Authors
296 # Distributed under the terms of the GNU General Public License v2
297
298 -EAPI=6
299 +EAPI=7
300
301 KDE_TEST="forceoptional"
302 VIRTUALX_REQUIRED="test"
303
304 diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
305 index 02dcc0550f..a12b1a4fd0 100644
306 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
307 +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
308 @@ -1,7 +1,7 @@
309 # Copyright 1999-2019 Gentoo Authors
310 # Distributed under the terms of the GNU General Public License v2
311
312 -EAPI=6
313 +EAPI=7
314
315 inherit kde5
316
317 @@ -45,7 +45,6 @@ RDEPEND="${DEPEND}
318 $(add_plasma_dep plasma-workspace)
319 $(add_qt_dep qtquickcontrols)
320 $(add_qt_dep qtquickcontrols2)
321 - !kde-plasma/kdeplasma-addons:4
322 "
323
324 src_configure() {
325
326 diff --git a/kde-plasma/kgamma/kgamma-9999.ebuild b/kde-plasma/kgamma/kgamma-9999.ebuild
327 index 7873bdf82e..0d706a7822 100644
328 --- a/kde-plasma/kgamma/kgamma-9999.ebuild
329 +++ b/kde-plasma/kgamma/kgamma-9999.ebuild
330 @@ -1,7 +1,7 @@
331 # Copyright 1999-2019 Gentoo Authors
332 # Distributed under the terms of the GNU General Public License v2
333
334 -EAPI=6
335 +EAPI=7
336
337 KDE_HANDBOOK="forceoptional"
338 KMNAME="${PN}5"
339
340 diff --git a/kde-plasma/khotkeys/khotkeys-9999.ebuild b/kde-plasma/khotkeys/khotkeys-9999.ebuild
341 index 56a57f1760..c6518185ea 100644
342 --- a/kde-plasma/khotkeys/khotkeys-9999.ebuild
343 +++ b/kde-plasma/khotkeys/khotkeys-9999.ebuild
344 @@ -1,7 +1,7 @@
345 # Copyright 1999-2019 Gentoo Authors
346 # Distributed under the terms of the GNU General Public License v2
347
348 -EAPI=6
349 +EAPI=7
350
351 KDE_HANDBOOK="true"
352 inherit kde5
353 @@ -33,14 +33,12 @@ COMMON_DEPEND="
354 x11-libs/libX11
355 x11-libs/libXtst
356 "
357 -RDEPEND="${COMMON_DEPEND}
358 - $(add_frameworks_dep kded)
359 - $(add_plasma_dep kde-cli-tools)
360 - !kde-plasma/khotkeys:4
361 - !kde-plasma/systemsettings:4
362 -"
363 DEPEND="${COMMON_DEPEND}
364 x11-base/xorg-proto
365 x11-libs/libxcb
366 x11-libs/libXtst
367 "
368 +RDEPEND="${COMMON_DEPEND}
369 + $(add_frameworks_dep kded)
370 + $(add_plasma_dep kde-cli-tools)
371 +"
372
373 diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
374 index b3db930839..1d44f8fb01 100644
375 --- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
376 +++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
377 @@ -1,7 +1,7 @@
378 # Copyright 1999-2019 Gentoo Authors
379 # Distributed under the terms of the GNU General Public License v2
380
381 -EAPI=6
382 +EAPI=7
383
384 KDE_HANDBOOK="true"
385 inherit kde5
386 @@ -55,8 +55,6 @@ RDEPEND="${COMMON_DEPEND}
387 $(add_plasma_dep kde-cli-tools)
388 $(add_qt_dep qtquickcontrols2)
389 !kde-apps/kcontrol:4
390 - !kde-misc/about-distro
391 - !kde-plasma/kinfocenter:4
392 "
393
394 src_configure() {
395 @@ -90,11 +88,10 @@ pkg_postinst() {
396 kde5_pkg_postinst
397
398 if [[ -z "${REPLACING_VERSIONS}" ]]; then
399 - if ! has_version "net-fs/nfs-utils"; then
400 + has_version "net-fs/nfs-utils" || \
401 elog "Installing net-fs/nfs-utils will enable the NFS information module."
402 - fi
403 - if ! has_version "net-fs/samba"; then
404 +
405 + has_version "net-fs/samba" || \
406 elog "Installing net-fs/samba will enable the Samba status information module."
407 - fi
408 fi
409 }
410
411 diff --git a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
412 index f8f27d320f..5c91e681b8 100644
413 --- a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
414 +++ b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
415 @@ -1,7 +1,7 @@
416 # Copyright 1999-2019 Gentoo Authors
417 # Distributed under the terms of the GNU General Public License v2
418
419 -EAPI=6
420 +EAPI=7
421
422 KDE_HANDBOOK="forceoptional"
423 inherit kde5
424 @@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
425 KEYWORDS=""
426 IUSE="+hotkeys"
427
428 -COMMON_DEPEND="
429 +RDEPEND="
430 $(add_frameworks_dep kcompletion)
431 $(add_frameworks_dep kconfig)
432 $(add_frameworks_dep kconfigwidgets)
433 @@ -31,12 +31,9 @@ COMMON_DEPEND="
434 $(add_qt_dep qtxml)
435 hotkeys? ( $(add_plasma_dep khotkeys) )
436 "
437 -DEPEND="${COMMON_DEPEND}
438 +DEPEND="${RDEPEND}
439 $(add_frameworks_dep kinit)
440 "
441 -RDEPEND="${COMMON_DEPEND}
442 - !kde-plasma/kmenuedit:4
443 -"
444
445 src_configure() {
446 local mycmakeargs=(
447
448 diff --git a/kde-plasma/kscreen/kscreen-9999.ebuild b/kde-plasma/kscreen/kscreen-9999.ebuild
449 index f4510025df..d13de9ea44 100644
450 --- a/kde-plasma/kscreen/kscreen-9999.ebuild
451 +++ b/kde-plasma/kscreen/kscreen-9999.ebuild
452 @@ -1,7 +1,7 @@
453 # Copyright 1999-2019 Gentoo Authors
454 # Distributed under the terms of the GNU General Public License v2
455
456 -EAPI=6
457 +EAPI=7
458
459 KDE_TEST="forceoptional"
460 inherit kde5
461 @@ -33,7 +33,6 @@ DEPEND="
462 RDEPEND="${DEPEND}
463 $(add_plasma_dep kde-cli-tools)
464 $(add_qt_dep qtgraphicaleffects)
465 - !kde-plasma/kscreen:4
466 "
467
468 # bug #580440, last checked 5.6.3
469
470 diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
471 index b210948bb0..43d0ebf072 100644
472 --- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
473 +++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
474 @@ -1,7 +1,7 @@
475 # Copyright 1999-2019 Gentoo Authors
476 # Distributed under the terms of the GNU General Public License v2
477
478 -EAPI=6
479 +EAPI=7
480
481 KDE_TEST="forceoptional"
482 VIRTUALX_REQUIRED="test"
483 @@ -13,7 +13,7 @@ IUSE="consolekit +pam seccomp"
484
485 REQUIRED_USE="seccomp? ( pam )"
486
487 -COMMON_DEPEND="
488 +RDEPEND="
489 $(add_frameworks_dep kcmutils)
490 $(add_frameworks_dep kconfig)
491 $(add_frameworks_dep kconfigwidgets)
492 @@ -45,13 +45,9 @@ COMMON_DEPEND="
493 pam? ( virtual/pam )
494 seccomp? ( sys-libs/libseccomp )
495 "
496 -DEPEND="${COMMON_DEPEND}
497 +DEPEND="${RDEPEND}
498 x11-base/xorg-proto
499 "
500 -RDEPEND="${COMMON_DEPEND}
501 - !<kde-plasma/kcheckpass-4.11.22-r1:4
502 - !kde-plasma/kdebase-pam:0
503 -"
504 PDEPEND="
505 $(add_plasma_dep kde-cli-tools)
506 "
507 @@ -61,8 +57,10 @@ RESTRICT+=" test"
508 src_prepare() {
509 kde5_src_prepare
510
511 - use test || sed -i \
512 - -e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
513 + if ! use test; then
514 + sed -e "/add_subdirectory(autotests)/ s/^/#/" \
515 + -i greeter/CMakeLists.txt || die
516 + fi
517 }
518
519 src_test() {
520 @@ -90,7 +88,7 @@ src_install() {
521 use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
522
523 if ! use pam; then
524 - chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
525 - chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
526 + chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
527 + chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
528 fi
529 }
530
531 diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
532 index bfae243f74..5a545a4040 100644
533 --- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
534 +++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
535 @@ -1,7 +1,7 @@
536 # Copyright 1999-2019 Gentoo Authors
537 # Distributed under the terms of the GNU General Public License v2
538
539 -EAPI=6
540 +EAPI=7
541
542 inherit kde5
543
544 @@ -17,10 +17,7 @@ DEPEND="
545 $(add_frameworks_dep kwidgetsaddons)
546 $(add_qt_dep qtwidgets)
547 "
548 -RDEPEND="
549 - ${DEPEND}
550 - !kde-plasma/ksshaskpass:4
551 -"
552 +RDEPEND="${DEPEND}"
553
554 src_install() {
555 kde5_src_install
556
557 diff --git a/kde-plasma/ksysguard/ksysguard-9999.ebuild b/kde-plasma/ksysguard/ksysguard-9999.ebuild
558 index 774b1d133a..568cd7b137 100644
559 --- a/kde-plasma/ksysguard/ksysguard-9999.ebuild
560 +++ b/kde-plasma/ksysguard/ksysguard-9999.ebuild
561 @@ -1,7 +1,7 @@
562 # Copyright 1999-2019 Gentoo Authors
563 # Distributed under the terms of the GNU General Public License v2
564
565 -EAPI=6
566 +EAPI=7
567
568 KDE_HANDBOOK="forceoptional"
569 inherit kde5
570 @@ -12,7 +12,6 @@ KEYWORDS=""
571 IUSE="lm_sensors"
572
573 DEPEND="
574 - $(add_plasma_dep libksysguard '-minimal(-)')
575 $(add_frameworks_dep kcompletion)
576 $(add_frameworks_dep kconfig)
577 $(add_frameworks_dep kconfigwidgets)
578 @@ -28,15 +27,14 @@ DEPEND="
579 $(add_frameworks_dep kwidgetsaddons)
580 $(add_frameworks_dep kwindowsystem)
581 $(add_frameworks_dep kxmlgui)
582 + $(add_plasma_dep libksysguard '-minimal(-)')
583 $(add_qt_dep qtdbus)
584 $(add_qt_dep qtgui)
585 $(add_qt_dep qtwidgets)
586 $(add_qt_dep qtxml)
587 lm_sensors? ( sys-apps/lm_sensors:= )
588 "
589 -RDEPEND="${DEPEND}
590 - !kde-plasma/ksysguard:4
591 -"
592 +RDEPEND="${DEPEND}"
593
594 src_configure() {
595 local mycmakeargs=(
596
597 diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
598 index 617bdbc91a..6c12dc0220 100644
599 --- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
600 +++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
601 @@ -1,7 +1,7 @@
602 # Copyright 1999-2019 Gentoo Authors
603 # Distributed under the terms of the GNU General Public License v2
604
605 -EAPI=6
606 +EAPI=7
607
608 inherit kde5
609
610
611 diff --git a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
612 index 98a7b43a35..0e67dd69a7 100644
613 --- a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
614 +++ b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
615 @@ -1,7 +1,7 @@
616 # Copyright 1999-2019 Gentoo Authors
617 # Distributed under the terms of the GNU General Public License v2
618
619 -EAPI=6
620 +EAPI=7
621
622 KDE_TEST="true"
623 inherit kde5
624
625 diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
626 index d211393dfe..3f60977051 100644
627 --- a/kde-plasma/kwin/kwin-9999.ebuild
628 +++ b/kde-plasma/kwin/kwin-9999.ebuild
629 @@ -1,14 +1,14 @@
630 # Copyright 1999-2019 Gentoo Authors
631 # Distributed under the terms of the GNU General Public License v2
632
633 -EAPI=6
634 +EAPI=7
635
636 KDE_HANDBOOK="optional"
637 KDE_TEST="optional"
638 VIRTUALX_REQUIRED="test"
639 inherit kde5
640
641 -DESCRIPTION="KDE window manager"
642 +DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
643 LICENSE="GPL-2+"
644 KEYWORDS=""
645 IUSE="caps gles2 multimedia"
646 @@ -74,8 +74,6 @@ RDEPEND="${COMMON_DEPEND}
647 $(add_qt_dep qtquickcontrols2)
648 $(add_qt_dep qtvirtualkeyboard)
649 multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
650 - !kde-plasma/kwin:4
651 - !kde-plasma/systemsettings:4
652 "
653 DEPEND="${COMMON_DEPEND}
654 $(add_qt_dep designer)
655
656 diff --git a/kde-plasma/kwrited/kwrited-9999.ebuild b/kde-plasma/kwrited/kwrited-9999.ebuild
657 index d7b62243e1..2d5d2f68b4 100644
658 --- a/kde-plasma/kwrited/kwrited-9999.ebuild
659 +++ b/kde-plasma/kwrited/kwrited-9999.ebuild
660 @@ -1,7 +1,7 @@
661 # Copyright 1999-2019 Gentoo Authors
662 # Distributed under the terms of the GNU General Public License v2
663
664 -EAPI=6
665 +EAPI=7
666
667 inherit kde5
668
669 @@ -18,6 +18,4 @@ DEPEND="
670 $(add_qt_dep qtgui)
671 $(add_qt_dep qtwidgets)
672 "
673 -RDEPEND="${DEPEND}
674 - !kde-plasma/kwrited:4
675 -"
676 +RDEPEND="${DEPEND}"
677
678 diff --git a/kde-plasma/libkscreen/libkscreen-9999.ebuild b/kde-plasma/libkscreen/libkscreen-9999.ebuild
679 index 0a409ed71d..b4fe0f4ea8 100644
680 --- a/kde-plasma/libkscreen/libkscreen-9999.ebuild
681 +++ b/kde-plasma/libkscreen/libkscreen-9999.ebuild
682 @@ -1,7 +1,7 @@
683 # Copyright 1999-2019 Gentoo Authors
684 # Distributed under the terms of the GNU General Public License v2
685
686 -EAPI=6
687 +EAPI=7
688
689 KDE_QTHELP="true"
690 KDE_TEST="forceoptional"
691 @@ -20,9 +20,7 @@ DEPEND="
692 $(add_qt_dep qtx11extras)
693 x11-libs/libxcb
694 "
695 -RDEPEND="${DEPEND}
696 - !x11-libs/libkscreen:5
697 -"
698 +RDEPEND="${DEPEND}"
699
700 # requires running session
701 RESTRICT+=" test"
702
703 diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild b/kde-plasma/libksysguard/libksysguard-9999.ebuild
704 index a893581dcf..93e98374df 100644
705 --- a/kde-plasma/libksysguard/libksysguard-9999.ebuild
706 +++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild
707 @@ -1,7 +1,7 @@
708 # Copyright 1999-2019 Gentoo Authors
709 # Distributed under the terms of the GNU General Public License v2
710
711 -EAPI=6
712 +EAPI=7
713
714 KDE_TEST="true"
715 VIRTUALX_REQUIRED="test"
716 @@ -12,7 +12,7 @@ LICENSE="LGPL-2+"
717 KEYWORDS=""
718 IUSE="minimal webengine X"
719
720 -COMMON_DEPEND="
721 +RDEPEND="
722 $(add_frameworks_dep kauth)
723 $(add_frameworks_dep kcompletion)
724 $(add_frameworks_dep kconfig)
725 @@ -33,10 +33,7 @@ COMMON_DEPEND="
726 x11-libs/libXres
727 )
728 "
729 -RDEPEND="${COMMON_DEPEND}
730 - !kde-plasma/ksysguard:4
731 -"
732 -DEPEND="${COMMON_DEPEND}
733 +DEPEND="${RDEPEND}
734 $(add_frameworks_dep kiconthemes)
735 !minimal? ( $(add_frameworks_dep plasma) )
736 X? ( x11-base/xorg-proto )
737
738 diff --git a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
739 index 7ae1f21cce..8c4d2cbf19 100644
740 --- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
741 +++ b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
742 @@ -1,7 +1,7 @@
743 # Copyright 1999-2019 Gentoo Authors
744 # Distributed under the terms of the GNU General Public License v2
745
746 -EAPI=6
747 +EAPI=7
748
749 KDE_TEST="true"
750 KMNAME="plasma-workspace"
751 @@ -28,7 +28,6 @@ DEPEND="${COMMON_DEPEND}
752 $(add_plasma_dep kwin)
753 "
754 RDEPEND="${COMMON_DEPEND}
755 - !kde-plasma/libkworkspace:4
756 !<kde-plasma/plasma-workspace-5.14.2:5
757 "
758
759
760 diff --git a/kde-plasma/milou/milou-9999.ebuild b/kde-plasma/milou/milou-9999.ebuild
761 index 0c712a0150..5e88de0042 100644
762 --- a/kde-plasma/milou/milou-9999.ebuild
763 +++ b/kde-plasma/milou/milou-9999.ebuild
764 @@ -1,7 +1,7 @@
765 # Copyright 1999-2019 Gentoo Authors
766 # Distributed under the terms of the GNU General Public License v2
767
768 -EAPI=6
769 +EAPI=7
770
771 KDE_TEST="forceoptional-recursive"
772 inherit kde5
773 @@ -25,6 +25,4 @@ DEPEND="
774 $(add_qt_dep qtgui)
775 $(add_qt_dep qtwidgets)
776 "
777 -RDEPEND="${DEPEND}
778 - !kde-plasma/milou:4
779 -"
780 +RDEPEND="${DEPEND}"
781
782 diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild b/kde-plasma/oxygen/oxygen-9999.ebuild
783 index 82a864f2e7..98958fe427 100644
784 --- a/kde-plasma/oxygen/oxygen-9999.ebuild
785 +++ b/kde-plasma/oxygen/oxygen-9999.ebuild
786 @@ -1,7 +1,7 @@
787 # Copyright 1999-2019 Gentoo Authors
788 # Distributed under the terms of the GNU General Public License v2
789
790 -EAPI=6
791 +EAPI=7
792
793 inherit kde5
794
795 @@ -10,7 +10,7 @@ HOMEPAGE="https://cgit.kde.org/oxygen.git"
796 KEYWORDS=""
797 IUSE="wayland"
798
799 -COMMON_DEPEND="
800 +RDEPEND="
801 $(add_frameworks_dep frameworkintegration)
802 $(add_frameworks_dep kcmutils)
803 $(add_frameworks_dep kcompletion)
804 @@ -30,12 +30,11 @@ COMMON_DEPEND="
805 x11-libs/libxcb
806 wayland? ( $(add_frameworks_dep kwayland) )
807 "
808 -DEPEND="${COMMON_DEPEND}
809 +DEPEND="${RDEPEND}
810 $(add_frameworks_dep kservice)
811 "
812 -RDEPEND="${COMMON_DEPEND}
813 +PDEPEND="
814 $(add_plasma_dep kde-cli-tools)
815 - !kde-plasma/kdebase-cursors:4
816 "
817
818 src_configure() {
819
820 diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild
821 index 595f2f997c..79127b7c34 100644
822 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild
823 +++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild
824 @@ -1,7 +1,7 @@
825 # Copyright 1999-2019 Gentoo Authors
826 # Distributed under the terms of the GNU General Public License v2
827
828 -EAPI=6
829 +EAPI=7
830
831 inherit kde5
832
833
834 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
835 index 3a15f8a3fe..e86c109d45 100644
836 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
837 +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
838 @@ -1,7 +1,7 @@
839 # Copyright 1999-2019 Gentoo Authors
840 # Distributed under the terms of the GNU General Public License v2
841
842 -EAPI=6
843 +EAPI=7
844
845 KDE_HANDBOOK="forceoptional"
846 KDE_TEST="true"
847 @@ -112,11 +112,6 @@ RDEPEND="${COMMON_DEPEND}
848 !kde-apps/kcontrol
849 !<kde-apps/kde4-l10n-17.08.1-r1
850 !kde-apps/knetattach[handbook]
851 - !kde-misc/kcm-touchpad
852 - !kde-plasma/plasma-desktop:4
853 - !kde-plasma/plasma-workspace:4
854 - !kde-plasma/solid-actions-kcm:4
855 - !kde-plasma/systemsettings:4
856 "
857
858 src_configure() {
859
860 diff --git a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
861 index 79e7f26976..86626c0b75 100644
862 --- a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
863 +++ b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
864 @@ -1,7 +1,7 @@
865 # Copyright 1999-2019 Gentoo Authors
866 # Distributed under the terms of the GNU General Public License v2
867
868 -EAPI=6
869 +EAPI=7
870
871 VIRTUALX_REQUIRED="test"
872 inherit kde5
873
874 diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
875 index 2c4bbb5131..59c959e9af 100644
876 --- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
877 +++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
878 @@ -1,7 +1,7 @@
879 # Copyright 1999-2019 Gentoo Authors
880 # Distributed under the terms of the GNU General Public License v2
881
882 -EAPI=6
883 +EAPI=7
884
885 KDE_TEST="true"
886 inherit kde5
887 @@ -51,7 +51,6 @@ DEPEND="
888 "
889 RDEPEND="${DEPEND}
890 $(add_plasma_dep kde-cli-tools)
891 - !kde-plasma/plasma-nm:4
892 "
893
894 src_configure() {
895
896 diff --git a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
897 index edb4727315..cac6dc2ed1 100644
898 --- a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
899 +++ b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
900 @@ -1,7 +1,7 @@
901 # Copyright 1999-2019 Gentoo Authors
902 # Distributed under the terms of the GNU General Public License v2
903
904 -EAPI=6
905 +EAPI=7
906
907 KDE_HANDBOOK="forceoptional"
908 inherit kde5
909 @@ -23,7 +23,6 @@ DEPEND="
910 media-libs/libcanberra
911 media-sound/pulseaudio
912 "
913 -
914 RDEPEND="${DEPEND}"
915
916 PATCHES=( "${FILESDIR}/${PN}-5.13.3-automagic_gconf.patch" )
917
918 diff --git a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
919 index 7626c67ccd..3c52aa7948 100644
920 --- a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
921 +++ b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
922 @@ -1,7 +1,7 @@
923 # Copyright 1999-2019 Gentoo Authors
924 # Distributed under the terms of the GNU General Public License v2
925
926 -EAPI=6
927 +EAPI=7
928
929 KDE_TEST="optional"
930 VIRTUALX_REQUIRED="test"
931 @@ -34,6 +34,5 @@ DEPEND="
932 $(add_qt_dep qtxml)
933 "
934 RDEPEND="${DEPEND}
935 - !dev-util/plasmate
936 $(add_frameworks_dep kirigami)
937 "
938
939 diff --git a/kde-plasma/plasma-vault/plasma-vault-9999.ebuild b/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
940 index b908291821..88e94dced5 100644
941 --- a/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
942 +++ b/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
943 @@ -1,7 +1,7 @@
944 # Copyright 1999-2019 Gentoo Authors
945 # Distributed under the terms of the GNU General Public License v2
946
947 -EAPI=6
948 +EAPI=7
949
950 inherit kde5
951
952
953 diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
954 index 19ab8ff9f2..243175d59e 100644
955 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
956 +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
957 @@ -1,7 +1,7 @@
958 # Copyright 1999-2019 Gentoo Authors
959 # Distributed under the terms of the GNU General Public License v2
960
961 -EAPI=6
962 +EAPI=7
963
964 KDE_AUTODEPS="false"
965 KDE_DEBUG="false"
966 @@ -11,8 +11,7 @@ DESCRIPTION="Additional wallpapers for the Plasma workspace"
967 KEYWORDS=""
968 IUSE=""
969
970 -DEPEND="
971 +BDEPEND="
972 $(add_frameworks_dep extra-cmake-modules)
973 $(add_qt_dep qtcore)
974 "
975 -RDEPEND=""
976
977 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
978 index 3745f19bc3..93343e9d50 100644
979 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
980 +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
981 @@ -1,7 +1,7 @@
982 # Copyright 1999-2019 Gentoo Authors
983 # Distributed under the terms of the GNU General Public License v2
984
985 -EAPI=6
986 +EAPI=7
987
988 KDE_HANDBOOK="forceoptional"
989 KDE_TEST="forceoptional"
990 @@ -108,16 +108,7 @@ RDEPEND="${COMMON_DEPEND}
991 x11-apps/xsetroot
992 systemd? ( sys-apps/dbus[user-session] )
993 !systemd? ( sys-apps/dbus )
994 - !kde-plasma/freespacenotifier:4
995 - !kde-plasma/libtaskmanager:4
996 - !kde-plasma/kcminit:4
997 - !kde-plasma/kdebase-startkde:4
998 - !kde-plasma/klipper:4
999 - !kde-plasma/krunner:4
1000 - !kde-plasma/ksmserver:4
1001 - !kde-plasma/ksplash:4
1002 !<kde-plasma/plasma-desktop-5.14.80:5
1003 - !kde-plasma/plasma-workspace:4
1004 "
1005 PDEPEND="
1006 $(add_plasma_dep kde-cli-tools)
1007
1008 diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild
1009 index ba22487c0d..ac7bc90249 100644
1010 --- a/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild
1011 +++ b/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild
1012 @@ -1,7 +1,7 @@
1013 # Copyright 1999-2019 Gentoo Authors
1014 # Distributed under the terms of the GNU General Public License v2
1015
1016 -EAPI=6
1017 +EAPI=7
1018
1019 BOGUS=1
1020 inherit kde5
1021
1022 diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
1023 index 365aad4f0b..a18edcd871 100644
1024 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
1025 +++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
1026 @@ -1,7 +1,7 @@
1027 # Copyright 1999-2019 Gentoo Authors
1028 # Distributed under the terms of the GNU General Public License v2
1029
1030 -EAPI=6
1031 +EAPI=7
1032
1033 KMNAME="${PN}-1"
1034 inherit kde5
1035
1036 diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild b/kde-plasma/powerdevil/powerdevil-9999.ebuild
1037 index 089f18b908..cc256248f4 100644
1038 --- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
1039 +++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
1040 @@ -1,7 +1,7 @@
1041 # Copyright 1999-2019 Gentoo Authors
1042 # Distributed under the terms of the GNU General Public License v2
1043
1044 -EAPI=6
1045 +EAPI=7
1046
1047 KDE_HANDBOOK="true"
1048 inherit kde5
1049 @@ -48,8 +48,6 @@ DEPEND="
1050 RDEPEND="${DEPEND}
1051 $(add_plasma_dep kde-cli-tools)
1052 >=sys-power/upower-0.9.23
1053 - !kde-plasma/powerdevil:4
1054 - !kde-plasma/systemsettings:4[handbook]
1055 "
1056
1057 src_configure() {
1058
1059 diff --git a/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
1060 index b2f5d4fa71..9ce4e0adbb 100644
1061 --- a/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
1062 +++ b/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
1063 @@ -1,7 +1,7 @@
1064 # Copyright 1999-2019 Gentoo Authors
1065 # Distributed under the terms of the GNU General Public License v2
1066
1067 -EAPI=6
1068 +EAPI=7
1069
1070 inherit kde5
1071
1072 @@ -35,7 +35,6 @@ DEPEND="${COMMON_DEPEND}
1073 RDEPEND="${COMMON_DEPEND}
1074 $(add_plasma_dep kde-cli-tools)
1075 x11-misc/sddm
1076 - !kde-misc/sddm-kcm
1077 "
1078
1079 DOCS=( CONTRIBUTORS )
1080
1081 diff --git a/kde-plasma/systemsettings/systemsettings-9999.ebuild b/kde-plasma/systemsettings/systemsettings-9999.ebuild
1082 index ddbf3529c1..159c06160c 100644
1083 --- a/kde-plasma/systemsettings/systemsettings-9999.ebuild
1084 +++ b/kde-plasma/systemsettings/systemsettings-9999.ebuild
1085 @@ -1,7 +1,7 @@
1086 # Copyright 1999-2019 Gentoo Authors
1087 # Distributed under the terms of the GNU General Public License v2
1088
1089 -EAPI=6
1090 +EAPI=7
1091
1092 KDE_HANDBOOK="forceoptional"
1093 inherit kde5
1094 @@ -39,7 +39,6 @@ DEPEND="
1095 classic? ( $(add_frameworks_dep khtml) )
1096 "
1097 RDEPEND="${DEPEND}
1098 - !kde-plasma/systemsettings:4
1099 $(add_frameworks_dep kirigami)
1100 gtk? ( $(add_plasma_dep kde-gtk-config) )
1101 "
1102
1103 diff --git a/kde-plasma/user-manager/user-manager-9999.ebuild b/kde-plasma/user-manager/user-manager-9999.ebuild
1104 index 077626704a..45e231692d 100644
1105 --- a/kde-plasma/user-manager/user-manager-9999.ebuild
1106 +++ b/kde-plasma/user-manager/user-manager-9999.ebuild
1107 @@ -1,7 +1,7 @@
1108 # Copyright 1999-2019 Gentoo Authors
1109 # Distributed under the terms of the GNU General Public License v2
1110
1111 -EAPI=6
1112 +EAPI=7
1113
1114 inherit kde5
1115
1116
1117 diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild
1118 index 34c45b3b37..b6a9108ab5 100644
1119 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild
1120 +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild
1121 @@ -1,7 +1,7 @@
1122 # Copyright 1999-2019 Gentoo Authors
1123 # Distributed under the terms of the GNU General Public License v2
1124
1125 -EAPI=6
1126 +EAPI=7
1127
1128 VIRTUALX_REQUIRED="test"
1129 inherit kde5
1130
1131 diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
1132 index cd0e53d4a5..ed07b2be85 100644
1133 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
1134 +++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
1135 @@ -1,7 +1,7 @@
1136 # Copyright 1999-2019 Gentoo Authors
1137 # Distributed under the terms of the GNU General Public License v2
1138
1139 -EAPI=6
1140 +EAPI=7
1141
1142 KDE_AUTODEPS="false"
1143 KMNAME="plasma-workspace"