kde-plasma: EAPI-7 bump

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

46 files changed, 85 insertions, 155 deletions

diff --git a/kde-plasma/bluedevil/bluedevil-9999.ebuild b/kde-plasma/bluedevil/bluedevil-9999.ebuild
index 58d7797040..84aae6c17c 100644
--- a/kde-plasma/bluedevil/bluedevil-9999.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
@@ -10,7 +10,7 @@ HOMEPAGE="https://cgit.kde.org/bluedevil.git"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	$(add_frameworks_dep bluez-qt)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -29,12 +29,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	!app-mobilephone/obexd
-	!app-mobilephone/obex-data-server
-	!kde-plasma/bluedevil:4
 "
diff --git a/kde-plasma/breeze-grub/breeze-grub-9999.ebuild b/kde-plasma/breeze-grub/breeze-grub-9999.ebuild
index 6e9572f17d..b54e11cfc2 100644
--- a/kde-plasma/breeze-grub/breeze-grub-9999.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
@@ -12,17 +12,9 @@ LICENSE="GPL-3+"
 KEYWORDS=""
 IUSE=""
 
-src_prepare() {
-	default
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
+src_prepare() { default; }
+src_configure() { :; }
+src_compile() { :; }
 
 src_install() {
 	insinto /usr/share/grub/themes
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
index cf7c01b1f0..fe5865c1c7 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 inherit kde5 python-any-r1
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
 	$(add_plasma_dep breeze)
 	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
 	dev-ruby/sass
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild
index 7761597521..5de7622b8c 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_AUTODEPS="false"
 inherit kde5
@@ -11,10 +11,9 @@ LICENSE="GPL-2+ GPL-3+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="sys-boot/plymouth"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
+BDEPEND="$(add_frameworks_dep extra-cmake-modules)"
+DEPEND="sys-boot/plymouth"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-plasma/breeze/breeze-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild
index 7387eb4a6b..ba59a80c19 100644
--- a/kde-plasma/breeze/breeze-9999.ebuild
+++ b/kde-plasma/breeze/breeze-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
index 80d7ad83ae..68dcdd2106 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="forceoptional"
 inherit kde5
diff --git a/kde-plasma/drkonqi/drkonqi-9999.ebuild b/kde-plasma/drkonqi/drkonqi-9999.ebuild
index 7e4cd96805..2bcdfe0d18 100644
--- a/kde-plasma/drkonqi/drkonqi-9999.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
@@ -36,7 +36,6 @@ DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtconcurrent)
 "
 RDEPEND="${COMMON_DEPEND}
-	!kde-apps/drkonqi:4
 	!<kde-plasma/plasma-workspace-5.10.95:5
 "
 
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
index 7bbbeeff8e..9326eeb609 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
@@ -31,5 +31,4 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-frameworks/kactivities-4.13.3-r2:4
-	!kde-plasma/kactivitymanagerd:4
 "
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
index a7307fbafc..84ac6c4719 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="optional"
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
index 02ae68f6d4..b65707d989 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
@@ -33,7 +33,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/kde-gtk-config:4
 "
 
 src_configure() {
diff --git a/kde-plasma/kdecoration/kdecoration-9999.ebuild b/kde-plasma/kdecoration/kdecoration-9999.ebuild
index a6463628a7..c005ecf253 100644
--- a/kde-plasma/kdecoration/kdecoration-9999.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 02dcc0550f..a12b1a4fd0 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
@@ -45,7 +45,6 @@ RDEPEND="${DEPEND}
 	$(add_plasma_dep plasma-workspace)
 	$(add_qt_dep qtquickcontrols)
 	$(add_qt_dep qtquickcontrols2)
-	!kde-plasma/kdeplasma-addons:4
 "
 
 src_configure() {
diff --git a/kde-plasma/kgamma/kgamma-9999.ebuild b/kde-plasma/kgamma/kgamma-9999.ebuild
index 7873bdf82e..0d706a7822 100644
--- a/kde-plasma/kgamma/kgamma-9999.ebuild
+++ b/kde-plasma/kgamma/kgamma-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KMNAME="${PN}5"
diff --git a/kde-plasma/khotkeys/khotkeys-9999.ebuild b/kde-plasma/khotkeys/khotkeys-9999.ebuild
index 56a57f1760..c6518185ea 100644
--- a/kde-plasma/khotkeys/khotkeys-9999.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="true"
 inherit kde5
@@ -33,14 +33,12 @@ COMMON_DEPEND="
 	x11-libs/libX11
 	x11-libs/libXtst
 "
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/khotkeys:4
-	!kde-plasma/systemsettings:4
-"
 DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 	x11-libs/libxcb
 	x11-libs/libXtst
 "
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_plasma_dep kde-cli-tools)
+"
diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
index b3db930839..1d44f8fb01 100644
--- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="true"
 inherit kde5
@@ -55,8 +55,6 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	$(add_qt_dep qtquickcontrols2)
 	!kde-apps/kcontrol:4
-	!kde-misc/about-distro
-	!kde-plasma/kinfocenter:4
 "
 
 src_configure() {
@@ -90,11 +88,10 @@ pkg_postinst() {
 	kde5_pkg_postinst
 
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if ! has_version "net-fs/nfs-utils"; then
+		has_version "net-fs/nfs-utils" || \
 			elog "Installing net-fs/nfs-utils will enable the NFS information module."
-		fi
-		if ! has_version "net-fs/samba"; then
+
+		has_version "net-fs/samba" || \
 			elog "Installing net-fs/samba will enable the Samba status information module."
-		fi
 	fi
 }
diff --git a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
index f8f27d320f..5c91e681b8 100644
--- a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
 KEYWORDS=""
 IUSE="+hotkeys"
 
-COMMON_DEPEND="
+RDEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -31,12 +31,9 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	hotkeys? ( $(add_plasma_dep khotkeys) )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	$(add_frameworks_dep kinit)
 "
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/kmenuedit:4
-"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-plasma/kscreen/kscreen-9999.ebuild b/kde-plasma/kscreen/kscreen-9999.ebuild
index f4510025df..d13de9ea44 100644
--- a/kde-plasma/kscreen/kscreen-9999.ebuild
+++ b/kde-plasma/kscreen/kscreen-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="forceoptional"
 inherit kde5
@@ -33,7 +33,6 @@ DEPEND="
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	$(add_qt_dep qtgraphicaleffects)
-	!kde-plasma/kscreen:4
 "
 
 # bug #580440, last checked 5.6.3
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
index b210948bb0..43d0ebf072 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
@@ -13,7 +13,7 @@ IUSE="consolekit +pam seccomp"
 
 REQUIRED_USE="seccomp? ( pam )"
 
-COMMON_DEPEND="
+RDEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -45,13 +45,9 @@ COMMON_DEPEND="
 	pam? ( virtual/pam )
 	seccomp? ( sys-libs/libseccomp )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/kcheckpass-4.11.22-r1:4
-	!kde-plasma/kdebase-pam:0
-"
 PDEPEND="
 	$(add_plasma_dep kde-cli-tools)
 "
@@ -61,8 +57,10 @@ RESTRICT+=" test"
 src_prepare() {
 	kde5_src_prepare
 
-	use test || sed -i \
-		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
+	if ! use test; then
+		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
+			-i greeter/CMakeLists.txt || die
+	fi
 }
 
 src_test() {
@@ -90,7 +88,7 @@ src_install() {
 	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
 
 	if ! use pam; then
-		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
 	fi
 }
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
index bfae243f74..5a545a4040 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
@@ -17,10 +17,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="
-	${DEPEND}
-	!kde-plasma/ksshaskpass:4
-"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	kde5_src_install
diff --git a/kde-plasma/ksysguard/ksysguard-9999.ebuild b/kde-plasma/ksysguard/ksysguard-9999.ebuild
index 774b1d133a..568cd7b137 100644
--- a/kde-plasma/ksysguard/ksysguard-9999.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -12,7 +12,6 @@ KEYWORDS=""
 IUSE="lm_sensors"
 
 DEPEND="
-	$(add_plasma_dep libksysguard '-minimal(-)')
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -28,15 +27,14 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep libksysguard '-minimal(-)')
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	lm_sensors? ( sys-apps/lm_sensors:= )
 "
-RDEPEND="${DEPEND}
-	!kde-plasma/ksysguard:4
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 617bdbc91a..6c12dc0220 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
index 98a7b43a35..0e67dd69a7 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="true"
 inherit kde5
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index d211393dfe..3f60977051 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="optional"
 KDE_TEST="optional"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="KDE window manager"
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 LICENSE="GPL-2+"
 KEYWORDS=""
 IUSE="caps gles2 multimedia"
@@ -74,8 +74,6 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtquickcontrols2)
 	$(add_qt_dep qtvirtualkeyboard)
 	multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
-	!kde-plasma/kwin:4
-	!kde-plasma/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep designer)
diff --git a/kde-plasma/kwrited/kwrited-9999.ebuild b/kde-plasma/kwrited/kwrited-9999.ebuild
index d7b62243e1..2d5d2f68b4 100644
--- a/kde-plasma/kwrited/kwrited-9999.ebuild
+++ b/kde-plasma/kwrited/kwrited-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
@@ -18,6 +18,4 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}
-	!kde-plasma/kwrited:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/libkscreen/libkscreen-9999.ebuild b/kde-plasma/libkscreen/libkscreen-9999.ebuild
index 0a409ed71d..b4fe0f4ea8 100644
--- a/kde-plasma/libkscreen/libkscreen-9999.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_QTHELP="true"
 KDE_TEST="forceoptional"
@@ -20,9 +20,7 @@ DEPEND="
 	$(add_qt_dep qtx11extras)
 	x11-libs/libxcb
 "
-RDEPEND="${DEPEND}
-	!x11-libs/libkscreen:5
-"
+RDEPEND="${DEPEND}"
 
 # requires running session
 RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild b/kde-plasma/libksysguard/libksysguard-9999.ebuild
index a893581dcf..93e98374df 100644
--- a/kde-plasma/libksysguard/libksysguard-9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
@@ -12,7 +12,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="minimal webengine X"
 
-COMMON_DEPEND="
+RDEPEND="
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -33,10 +33,7 @@ COMMON_DEPEND="
 		x11-libs/libXres
 	)
 "
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/ksysguard:4
-"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	$(add_frameworks_dep kiconthemes)
 	!minimal? ( $(add_frameworks_dep plasma) )
 	X? ( x11-base/xorg-proto )
diff --git a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
index 7ae1f21cce..8c4d2cbf19 100644
--- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="true"
 KMNAME="plasma-workspace"
@@ -28,7 +28,6 @@ DEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kwin)
 "
 RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/libkworkspace:4
 	!<kde-plasma/plasma-workspace-5.14.2:5
 "
 
diff --git a/kde-plasma/milou/milou-9999.ebuild b/kde-plasma/milou/milou-9999.ebuild
index 0c712a0150..5e88de0042 100644
--- a/kde-plasma/milou/milou-9999.ebuild
+++ b/kde-plasma/milou/milou-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="forceoptional-recursive"
 inherit kde5
@@ -25,6 +25,4 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}
-	!kde-plasma/milou:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild b/kde-plasma/oxygen/oxygen-9999.ebuild
index 82a864f2e7..98958fe427 100644
--- a/kde-plasma/oxygen/oxygen-9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
@@ -10,7 +10,7 @@ HOMEPAGE="https://cgit.kde.org/oxygen.git"
 KEYWORDS=""
 IUSE="wayland"
 
-COMMON_DEPEND="
+RDEPEND="
 	$(add_frameworks_dep frameworkintegration)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcompletion)
@@ -30,12 +30,11 @@ COMMON_DEPEND="
 	x11-libs/libxcb
 	wayland? ( $(add_frameworks_dep kwayland) )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	$(add_frameworks_dep kservice)
 "
-RDEPEND="${COMMON_DEPEND}
+PDEPEND="
 	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/kdebase-cursors:4
 "
 
 src_configure() {
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild
index 595f2f997c..79127b7c34 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 3a15f8a3fe..e86c109d45 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
@@ -112,11 +112,6 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kcontrol
 	!<kde-apps/kde4-l10n-17.08.1-r1
 	!kde-apps/knetattach[handbook]
-	!kde-misc/kcm-touchpad
-	!kde-plasma/plasma-desktop:4
-	!kde-plasma/plasma-workspace:4
-	!kde-plasma/solid-actions-kcm:4
-	!kde-plasma/systemsettings:4
 "
 
 src_configure() {
diff --git a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
index 79e7f26976..86626c0b75 100644
--- a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
index 2c4bbb5131..59c959e9af 100644
--- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="true"
 inherit kde5
@@ -51,7 +51,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/plasma-nm:4
 "
 
 src_configure() {
diff --git a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
index edb4727315..cac6dc2ed1 100644
--- a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -23,7 +23,6 @@ DEPEND="
 	media-libs/libcanberra
 	media-sound/pulseaudio
 "
-
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-5.13.3-automagic_gconf.patch" )
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
index 7626c67ccd..3c52aa7948 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="optional"
 VIRTUALX_REQUIRED="test"
@@ -34,6 +34,5 @@ DEPEND="
 	$(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}
-	!dev-util/plasmate
 	$(add_frameworks_dep kirigami)
 "
diff --git a/kde-plasma/plasma-vault/plasma-vault-9999.ebuild b/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
index b908291821..88e94dced5 100644
--- a/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
index 19ab8ff9f2..243175d59e 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
@@ -11,8 +11,7 @@ DESCRIPTION="Additional wallpapers for the Plasma workspace"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
+BDEPEND="
 	$(add_frameworks_dep extra-cmake-modules)
 	$(add_qt_dep qtcore)
 "
-RDEPEND=""
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 3745f19bc3..93343e9d50 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
@@ -108,16 +108,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xsetroot
 	systemd? ( sys-apps/dbus[user-session] )
 	!systemd? ( sys-apps/dbus )
-	!kde-plasma/freespacenotifier:4
-	!kde-plasma/libtaskmanager:4
-	!kde-plasma/kcminit:4
-	!kde-plasma/kdebase-startkde:4
-	!kde-plasma/klipper:4
-	!kde-plasma/krunner:4
-	!kde-plasma/ksmserver:4
-	!kde-plasma/ksplash:4
 	!<kde-plasma/plasma-desktop-5.14.80:5
-	!kde-plasma/plasma-workspace:4
 "
 PDEPEND="
 	$(add_plasma_dep kde-cli-tools)
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild
index ba22487c0d..ac7bc90249 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 BOGUS=1
 inherit kde5
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
index 365aad4f0b..a18edcd871 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KMNAME="${PN}-1"
 inherit kde5
diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild b/kde-plasma/powerdevil/powerdevil-9999.ebuild
index 089f18b908..cc256248f4 100644
--- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="true"
 inherit kde5
@@ -48,8 +48,6 @@ DEPEND="
 RDEPEND="${DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	>=sys-power/upower-0.9.23
-	!kde-plasma/powerdevil:4
-	!kde-plasma/systemsettings:4[handbook]
 "
 
 src_configure() {
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
index b2f5d4fa71..9ce4e0adbb 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
@@ -35,7 +35,6 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	x11-misc/sddm
-	!kde-misc/sddm-kcm
 "
 
 DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/systemsettings-9999.ebuild b/kde-plasma/systemsettings/systemsettings-9999.ebuild
index ddbf3529c1..159c06160c 100644
--- a/kde-plasma/systemsettings/systemsettings-9999.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -39,7 +39,6 @@ DEPEND="
 	classic? ( $(add_frameworks_dep khtml) )
 "
 RDEPEND="${DEPEND}
-	!kde-plasma/systemsettings:4
 	$(add_frameworks_dep kirigami)
 	gtk? ( $(add_plasma_dep kde-gtk-config) )
 "
diff --git a/kde-plasma/user-manager/user-manager-9999.ebuild b/kde-plasma/user-manager/user-manager-9999.ebuild
index 077626704a..45e231692d 100644
--- a/kde-plasma/user-manager/user-manager-9999.ebuild
+++ b/kde-plasma/user-manager/user-manager-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
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
index 34c45b3b37..b6a9108ab5 100644
--- 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
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
index cd0e53d4a5..ed07b2be85 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_AUTODEPS="false"
 KMNAME="plasma-workspace"