kde-apps: EAPI-7 bump

Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
author: Andreas Sturmlechner <asturm@gentoo.org> 2019-01-21 07:08:29 +0100
committer: Andreas Sturmlechner <asturm@gentoo.org> 2019-01-26 21:28:43 +0100
commit: a045dfdd144e285fc02ef8ca9f39a263dd786d7a (patch)
tree: 9ba3fa055201217c1cdcabc1e22c51839d917d87
parent: kde-plasma: EAPI-7 bump (diff)
download: kde-a045dfdd.tar.gz
kde-a045dfdd.tar.bz2
kde-a045dfdd.zip
222 files changed, 451 insertions, 460 deletions
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
index 191936c094..a2e187bd07 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-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-apps/akonadi-contacts/akonadi-contacts-9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
index a2d84b48a3..8dee6162b1 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-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-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
index e9e6564a12..5168e3991b 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-9999.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-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
diff --git a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
index ed48bb0998..a4de234ed9 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-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
@@ -29,7 +29,6 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	dev-libs/libxslt
-	x11-misc/shared-mime-info
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
diff --git a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
index e427fce293..e8162fc5ea 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-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-apps/akonadi-search/akonadi-search-9999.ebuild b/kde-apps/akonadi-search/akonadi-search-9999.ebuild
index 4a7eb32307..ee7fbd5129 100644
--- a/kde-apps/akonadi-search/akonadi-search-9999.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-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,6 +13,9 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
+BDEPEND="
+	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite,tools') )
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
@@ -35,7 +38,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
-	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite,tools') )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 447c51f57c..afeedcf928 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-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_DESIGNERPLUGIN="true"
 KDE_TEST="forceoptional"
@@ -18,6 +18,9 @@ IUSE="+mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
 
+BDEPEND="
+	test? ( sys-apps/dbus )
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -39,7 +42,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtsql 'mysql?,postgres?')
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	x11-misc/shared-mime-info
 	sqlite? (
 		$(add_qt_dep qtsql 'sqlite' '' '5=')
 		dev-db/sqlite:3
@@ -49,7 +51,6 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	dev-libs/libxslt
-	test? ( sys-apps/dbus )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kapptemplate-17.11.80
diff --git a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild b/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
index b7328b00de..702a832345 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-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" # FIXME: Check back for doc in release
 inherit kde5
diff --git a/kde-apps/akregator/akregator-9999.ebuild b/kde-apps/akregator/akregator-9999.ebuild
index 89b106bdb7..6a6524be92 100644
--- a/kde-apps/akregator/akregator-9999.ebuild
+++ b/kde-apps/akregator/akregator-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"
diff --git a/kde-apps/amor/amor-9999.ebuild b/kde-apps/amor/amor-9999.ebuild
index 08f38bc56f..28deca5188 100644
--- a/kde-apps/amor/amor-9999.ebuild
+++ b/kde-apps/amor/amor-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
diff --git a/kde-apps/analitza/analitza-9999.ebuild b/kde-apps/analitza/analitza-9999.ebuild
index f5962ec2ae..e623dc462c 100644
--- a/kde-apps/analitza/analitza-9999.ebuild
+++ b/kde-apps/analitza/analitza-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"
 VIRTUALX_REQUIRED="test"
@@ -11,7 +11,10 @@ DESCRIPTION="KDE library for mathematical features"
 KEYWORDS=""
 IUSE="eigen nls"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui '-gles2')
 	$(add_qt_dep qtprintsupport)
@@ -20,9 +23,7 @@ RDEPEND="
 	$(add_qt_dep qtxml)
 	eigen? ( dev-cpp/eigen:3 )
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	kde5_src_prepare
diff --git a/kde-apps/ark/ark-9999.ebuild b/kde-apps/ark/ark-9999.ebuild
index b8686fc009..7c86522965 100644
--- a/kde-apps/ark/ark-9999.ebuild
+++ b/kde-apps/ark/ark-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"
@@ -14,6 +14,9 @@ https://utils.kde.org/projects/ark/"
 KEYWORDS=""
 IUSE="bzip2 lzma zip"
 
+BDEPEND="
+	sys-devel/gettext
+"
 RDEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
@@ -41,7 +44,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
 "
 
 # bug #560548, last checked with 16.04.1
diff --git a/kde-apps/artikulate/artikulate-9999.ebuild b/kde-apps/artikulate/artikulate-9999.ebuild
index b790423707..d28227b2e3 100644
--- a/kde-apps/artikulate/artikulate-9999.ebuild
+++ b/kde-apps/artikulate/artikulate-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
diff --git a/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild b/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
index 11ec6e3bcd..d62579e45d 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-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
diff --git a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild b/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
index eaac4b2ca4..b5fcff11da 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-9999.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-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-apps/blinken/blinken-9999.ebuild b/kde-apps/blinken/blinken-9999.ebuild
index 9a8a8831e9..9a9d30c3eb 100644
--- a/kde-apps/blinken/blinken-9999.ebuild
+++ b/kde-apps/blinken/blinken-9999.ebuild
@@ -1,12 +1,12 @@
 # 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
 
-DESCRIPTION="KDE version of the Simon Says game"
+DESCRIPTION="Memory enhancement game based on KDE Frameworks"
 HOMEPAGE="https://www.kde.org/applications/education/blinken
 https://edu.kde.org/blinken/"
 KEYWORDS=""
@@ -29,6 +29,5 @@ RDEPEND="${DEPEND}"
 
 src_install() {
 	kde5_src_install
-
-	rm "${ED}"usr/share/${PN}/README.packagers || die
+	rm "${ED}"/usr/share/${PN}/README.packagers || die
 }
diff --git a/kde-apps/bomber/bomber-9999.ebuild b/kde-apps/bomber/bomber-9999.ebuild
index 46a9e03a8c..d23cfec217 100644
--- a/kde-apps/bomber/bomber-9999.ebuild
+++ b/kde-apps/bomber/bomber-9999.ebuild
@@ -1,12 +1,12 @@
 # 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
 
-DESCRIPTION="KDE arcade bombing game"
+DESCRIPTION="Single player arcade bombing game"
 HOMEPAGE="https://www.kde.org/applications/games/bomber/"
 KEYWORDS=""
 IUSE=""
diff --git a/kde-apps/bovo/bovo-9999.ebuild b/kde-apps/bovo/bovo-9999.ebuild
index c3a58b4061..1c337def6e 100644
--- a/kde-apps/bovo/bovo-9999.ebuild
+++ b/kde-apps/bovo/bovo-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
diff --git a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
index c193c3b55b..f4a453f8d4 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-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" # FIXME: Check back for doc in release
 KDE_TEST="false"
diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild b/kde-apps/calendarsupport/calendarsupport-9999.ebuild
index 8a4808412d..86a6d6c13f 100644
--- a/kde-apps/calendarsupport/calendarsupport-9999.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-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="false"
 inherit kde5
diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
index d360f78fcf..7a36bdd9db 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-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"
diff --git a/kde-apps/cervisia/cervisia-9999.ebuild b/kde-apps/cervisia/cervisia-9999.ebuild
index aab1cbc30b..cf9bdf997f 100644
--- a/kde-apps/cervisia/cervisia-9999.ebuild
+++ b/kde-apps/cervisia/cervisia-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
diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-9999.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-9999.ebuild
index 267649ef0e..12b213b98c 100644
--- a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-9999.ebuild
+++ b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-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="dolphin-plugins"
 KDE_HANDBOOK="false"
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
index 1bd465cd77..dc7db3648e 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-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="dolphin-plugins"
 KDE_HANDBOOK="false"
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
index 675f74ab28..9e8570dce9 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-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="dolphin-plugins"
 KDE_HANDBOOK="false"
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
index 377721eabd..a450ae2232 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-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="dolphin-plugins"
 KDE_HANDBOOK="false"
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
index f9939c52fd..61777c6632 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-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="dolphin-plugins"
 KDE_HANDBOOK="false"
diff --git a/kde-apps/dolphin/dolphin-9999.ebuild b/kde-apps/dolphin/dolphin-9999.ebuild
index 0ae289fa9b..51e9f79ae9 100644
--- a/kde-apps/dolphin/dolphin-9999.ebuild
+++ b/kde-apps/dolphin/dolphin-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"
@@ -72,11 +72,11 @@ src_configure() {
 pkg_postinst() {
 	kde5_pkg_postinst
 
-	if ! has_version "kde-apps/ark:${SLOT}" ; then
-		elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}"
-	fi
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		has_version "kde-apps/ark:${SLOT}" || \
+			elog "For compress/extract and other actions install kde-apps/ark:${SLOT}"
 
-	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
-		elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}"
+		has_version "kde-apps/kleopatra:${SLOT}" || \
+			elog "For crypto actions install kde-apps/kleopatra:${SLOT}"
 	fi
 }
diff --git a/kde-apps/dragon/dragon-9999.ebuild b/kde-apps/dragon/dragon-9999.ebuild
index 8113ee8b16..2aa0eaa8bb 100644
--- a/kde-apps/dragon/dragon-9999.ebuild
+++ b/kde-apps/dragon/dragon-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
@@ -13,7 +13,10 @@ LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -34,6 +37,4 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/phonon[qt5(+)]
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/eventviews-9999.ebuild b/kde-apps/eventviews/eventviews-9999.ebuild
index d8a9799321..4a16e68bee 100644
--- a/kde-apps/eventviews/eventviews-9999.ebuild
+++ b/kde-apps/eventviews/eventviews-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-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
index 021fc31e60..90aa888556 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-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,10 @@ LICENSE="GPL-2+"
 KEYWORDS=""
 IUSE="libav"
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
@@ -19,6 +22,4 @@ RDEPEND="
 	libav? ( media-video/libav:= )
 	!libav? ( media-video/ffmpeg:0= )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/filelight/filelight-9999.ebuild b/kde-apps/filelight/filelight-9999.ebuild
index ea53f9d748..b84a3de70b 100644
--- a/kde-apps/filelight/filelight-9999.ebuild
+++ b/kde-apps/filelight/filelight-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="optional"
 inherit kde5
diff --git a/kde-apps/granatier/granatier-9999.ebuild b/kde-apps/granatier/granatier-9999.ebuild
index 2d75aaf5d7..dde1da41e1 100644
--- a/kde-apps/granatier/granatier-9999.ebuild
+++ b/kde-apps/granatier/granatier-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
diff --git a/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild b/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
index 5bafa8b021..4a5ff58889 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-9999.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-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
diff --git a/kde-apps/grantleetheme/grantleetheme-9999.ebuild b/kde-apps/grantleetheme/grantleetheme-9999.ebuild
index 09ffc31e11..41f99eb7a6 100644
--- a/kde-apps/grantleetheme/grantleetheme-9999.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-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-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index 9848f14024..a31983da6d 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-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"
 KDE_TEST="true"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
index 6ea94a14e6..37c3b14e3a 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-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"
diff --git a/kde-apps/juk/juk-9999.ebuild b/kde-apps/juk/juk-9999.ebuild
index b58be8c1f0..e44bb0708d 100644
--- a/kde-apps/juk/juk-9999.ebuild
+++ b/kde-apps/juk/juk-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"
diff --git a/kde-apps/k3b/k3b-9999.ebuild b/kde-apps/k3b/k3b-9999.ebuild
index 9cc99e2c66..d7875db462 100644
--- a/kde-apps/k3b/k3b-9999.ebuild
+++ b/kde-apps/k3b/k3b-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"
@@ -14,6 +14,12 @@ LICENSE="GPL-2 FDL-1.2"
 KEYWORDS=""
 IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
 
+REQUIRED_USE="
+	flac? ( taglib )
+	mp3? ( encode taglib )
+	sox? ( encode taglib )
+"
+
 DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kbookmarks)
@@ -72,12 +78,6 @@ RDEPEND="${DEPEND}
 	vcd? ( media-video/vcdimager )
 "
 
-REQUIRED_USE="
-	flac? ( taglib )
-	mp3? ( encode taglib )
-	sox? ( encode taglib )
-"
-
 DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
 
 src_configure() {
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
index 2723c40c39..ce47804747 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-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="forceoptional"
 VIRTUALDBUS_TEST="true"
@@ -14,6 +14,9 @@ LICENSE="LGPL-2.1"
 KEYWORDS=""
 IUSE=""
 
+BDEPEND="
+	sys-devel/gettext
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -32,7 +35,6 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kcmutils)
 	$(add_plasma_dep kde-cli-tools)
-	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
 	dev-util/intltool
diff --git a/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild b/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
index 0dd931ab4f..5c5c23732f 100644
--- a/kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild
+++ b/kde-apps/kaccounts-mobile/kaccounts-mobile-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
 
@@ -12,7 +12,10 @@ LICENSE="LGPL-2.1"
 KEYWORDS=""
 IUSE="google"
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
@@ -29,9 +32,7 @@ RDEPEND="
 		$(add_qt_dep qtwebkit)
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild
index 31cfa58c53..423010b568 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-9999.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-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
 
@@ -12,7 +12,10 @@ LICENSE="LGPL-2.1"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+BDEPEND="
+	dev-util/intltool
+"
+DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdeclarative)
 	$(add_frameworks_dep ki18n)
@@ -23,10 +26,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	net-libs/signon-ui
 	net-libs/signon-oauth2
 "
diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild b/kde-apps/kaddressbook/kaddressbook-9999.ebuild
index 2b47f5f96b..eadf70337f 100644
--- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-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" # FIXME: Check back for doc in release
 KDE_TEST="forceoptional-recursive"
@@ -10,12 +10,15 @@ inherit kde5
 
 DESCRIPTION="Address book application based on KDE Frameworks"
 HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
+
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
-
 IUSE=""
 
-COMMON_DEPEND="
+BDEPEND="
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
@@ -51,10 +54,7 @@ COMMON_DEPEND="
 	>=app-crypt/gpgme-1.7.1[cxx,qt5]
 	dev-libs/grantlee:5
 "
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 	$(add_kdeapps_dep kdepim-runtime)
 "
diff --git a/kde-apps/kajongg/kajongg-9999.ebuild b/kde-apps/kajongg/kajongg-9999.ebuild
index f6afaa24d3..eed53fc7c8 100644
--- a/kde-apps/kajongg/kajongg-9999.ebuild
+++ b/kde-apps/kajongg/kajongg-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_HANDBOOK="forceoptional"
diff --git a/kde-apps/kalarm/kalarm-9999.ebuild b/kde-apps/kalarm/kalarm-9999.ebuild
index 61a03a814f..0e50a0b45e 100644
--- a/kde-apps/kalarm/kalarm-9999.ebuild
+++ b/kde-apps/kalarm/kalarm-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,10 @@ LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
 IUSE="X"
 
-COMMON_DEPEND="
+BDEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+"
+DEPEND="
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
@@ -63,13 +66,10 @@ COMMON_DEPEND="
 		x11-libs/libX11
 	)
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 	$(add_kdeapps_dep kdepim-runtime)
 "
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kalarmcal/kalarmcal-9999.ebuild b/kde-apps/kalarmcal/kalarmcal-9999.ebuild
index 59c0b28113..bf7b3162c4 100644
--- a/kde-apps/kalarmcal/kalarmcal-9999.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-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
@@ -11,7 +11,10 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+BDEPEND="
+	test? ( $(add_qt_dep qtdbus) )
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kholidays)
 	$(add_frameworks_dep ki18n)
@@ -21,10 +24,7 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_qt_dep qtgui)
 "
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_qt_dep qtdbus) )
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 	!<kde-apps/kdepim-runtime-18.03.80
 "
diff --git a/kde-apps/kalgebra/kalgebra-9999.ebuild b/kde-apps/kalgebra/kalgebra-9999.ebuild
index 25df7e92ac..43ff7eb9fe 100644
--- a/kde-apps/kalgebra/kalgebra-9999.ebuild
+++ b/kde-apps/kalgebra/kalgebra-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="optional"
 inherit kde5
 
-DESCRIPTION="MathML-based graph calculator by KDE"
+DESCRIPTION="MathML-based 2D and 3D graph calculator by KDE"
 HOMEPAGE="https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/"
 KEYWORDS=""
 IUSE="readline"
diff --git a/kde-apps/kalzium/kalzium-9999.ebuild b/kde-apps/kalzium/kalzium-9999.ebuild
index fed5a19256..9d56e6100a 100644
--- a/kde-apps/kalzium/kalzium-9999.ebuild
+++ b/kde-apps/kalzium/kalzium-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 flag-o-matic
diff --git a/kde-apps/kamera/kamera-9999.ebuild b/kde-apps/kamera/kamera-9999.ebuild
index 7dde9f6b9f..b686c71302 100644
--- a/kde-apps/kamera/kamera-9999.ebuild
+++ b/kde-apps/kamera/kamera-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,10 @@ LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -23,6 +26,4 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/libgphoto2:=
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kamoso/kamoso-9999.ebuild b/kde-apps/kamoso/kamoso-9999.ebuild
index ff658535d3..2998993a16 100644
--- a/kde-apps/kamoso/kamoso-9999.ebuild
+++ b/kde-apps/kamoso/kamoso-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"
 VIRTUALX_REQUIRED="test"
diff --git a/kde-apps/kanagram/kanagram-9999.ebuild b/kde-apps/kanagram/kanagram-9999.ebuild
index d91c64a3f3..09b8a8e374 100644
--- a/kde-apps/kanagram/kanagram-9999.ebuild
+++ b/kde-apps/kanagram/kanagram-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
diff --git a/kde-apps/kapman/kapman-9999.ebuild b/kde-apps/kapman/kapman-9999.ebuild
index e3eef74080..157bb16e0c 100644
--- a/kde-apps/kapman/kapman-9999.ebuild
+++ b/kde-apps/kapman/kapman-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
diff --git a/kde-apps/kapptemplate/kapptemplate-9999.ebuild b/kde-apps/kapptemplate/kapptemplate-9999.ebuild
index 20b3082a33..c75e9c73b5 100644
--- a/kde-apps/kapptemplate/kapptemplate-9999.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-9999.ebuild
@@ -1,13 +1,13 @@
 # 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"
 inherit kde5
 
-DESCRIPTION="A shell script to create the necessary framework to develop KDE applications"
+DESCRIPTION="Shell script to create the necessary framework to develop KDE applications"
 HOMEPAGE="https://www.kde.org/applications/development/kapptemplate"
 KEYWORDS=""
 IUSE=""
diff --git a/kde-apps/kate/kate-9999.ebuild b/kde-apps/kate/kate-9999.ebuild
index f399ee7560..3d21014813 100644
--- a/kde-apps/kate/kate-9999.ebuild
+++ b/kde-apps/kate/kate-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="optional"
 KDE_TEST="true"
diff --git a/kde-apps/katomic/katomic-9999.ebuild b/kde-apps/katomic/katomic-9999.ebuild
index fe2906ac3f..3aa6db6b12 100644
--- a/kde-apps/katomic/katomic-9999.ebuild
+++ b/kde-apps/katomic/katomic-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_SELINUX_MODULE="games"
diff --git a/kde-apps/kbackup/kbackup-9999.ebuild b/kde-apps/kbackup/kbackup-9999.ebuild
index d1ba5e66d5..46cfa74559 100644
--- a/kde-apps/kbackup/kbackup-9999.ebuild
+++ b/kde-apps/kbackup/kbackup-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 @@ LICENSE="GPL-2"
 KEYWORDS=""
 IUSE=""
 
-CDEPEND="
+DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -27,9 +27,4 @@ CDEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${CDEPEND}
-	x11-misc/shared-mime-info
-"
-RDEPEND="${CDEPEND}
-	!app-backup/kbackup:4
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblackbox/kblackbox-9999.ebuild b/kde-apps/kblackbox/kblackbox-9999.ebuild
index b841d2a9ae..f05c8f2261 100644
--- a/kde-apps/kblackbox/kblackbox-9999.ebuild
+++ b/kde-apps/kblackbox/kblackbox-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 inherit kde5
 
-DESCRIPTION="KDE Blackbox Game"
+DESCRIPTION="Game of hide and seek played on a grid of boxes"
 KEYWORDS=""
 IUSE=""
 
diff --git a/kde-apps/kblocks/kblocks-9999.ebuild b/kde-apps/kblocks/kblocks-9999.ebuild
index 028b9d4979..3767785ce7 100644
--- a/kde-apps/kblocks/kblocks-9999.ebuild
+++ b/kde-apps/kblocks/kblocks-9999.ebuild
@@ -1,12 +1,12 @@
 # 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
 
-DESCRIPTION="A single-player Tetris-like KDE game"
+DESCRIPTION="Single-player Tetris-like KDE game"
 HOMEPAGE="https://www.kde.org/applications/games/kblocks/"
 KEYWORDS=""
 IUSE=""
diff --git a/kde-apps/kblog/kblog-9999.ebuild b/kde-apps/kblog/kblog-9999.ebuild
index 927e460596..136a040996 100644
--- a/kde-apps/kblog/kblog-9999.ebuild
+++ b/kde-apps/kblog/kblog-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-apps/kbounce/kbounce-9999.ebuild b/kde-apps/kbounce/kbounce-9999.ebuild
index 067bedca17..6b6344931d 100644
--- a/kde-apps/kbounce/kbounce-9999.ebuild
+++ b/kde-apps/kbounce/kbounce-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_SELINUX_MODULE="games"
diff --git a/kde-apps/kbreakout/kbreakout-9999.ebuild b/kde-apps/kbreakout/kbreakout-9999.ebuild
index c1ee39773c..73d5b8ebdc 100644
--- a/kde-apps/kbreakout/kbreakout-9999.ebuild
+++ b/kde-apps/kbreakout/kbreakout-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
diff --git a/kde-apps/kbruch/kbruch-9999.ebuild b/kde-apps/kbruch/kbruch-9999.ebuild
index 3274b72d80..69a34b790c 100644
--- a/kde-apps/kbruch/kbruch-9999.ebuild
+++ b/kde-apps/kbruch/kbruch-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
diff --git a/kde-apps/kcachegrind/kcachegrind-9999.ebuild b/kde-apps/kcachegrind/kcachegrind-9999.ebuild
index 6b7a26a4bb..2f02a92606 100644
--- a/kde-apps/kcachegrind/kcachegrind-9999.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-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,10 @@ https://kcachegrind.github.io/html/Home.html"
 KEYWORDS=""
 IUSE="nls"
 
-COMMON_DEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -26,9 +29,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${COMMON_DEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	media-gfx/graphviz
 "
diff --git a/kde-apps/kcalc/kcalc-9999.ebuild b/kde-apps/kcalc/kcalc-9999.ebuild
index 7730d15835..2a4049ef52 100644
--- a/kde-apps/kcalc/kcalc-9999.ebuild
+++ b/kde-apps/kcalc/kcalc-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"
@@ -13,7 +13,10 @@ https://utils.kde.org/projects/kcalc/"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -29,6 +32,4 @@ RDEPEND="
 	$(add_qt_dep qtxml)
 	dev-libs/gmp:0=
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcalcore/kcalcore-9999.ebuild b/kde-apps/kcalcore/kcalcore-9999.ebuild
index 30a1f831b9..086d2a5dd6 100644
--- a/kde-apps/kcalcore/kcalcore-9999.ebuild
+++ b/kde-apps/kcalcore/kcalcore-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,12 +12,13 @@ LICENSE="GPL-2+ test? ( LGPL-3+ )"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+BDEPEND="
+	sys-devel/bison
+"
+DEPEND="
 	$(add_qt_dep qtgui)
 	dev-libs/libical:=
 "
-DEPEND="${RDEPEND}
-	sys-devel/bison
-"
+RDEPEND="${DEPEND}"
 
 RESTRICT+=" test" # multiple tests fail or hang indefinitely
diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/kcalutils/kcalutils-9999.ebuild
index fbb33cce83..34483cbe23 100644
--- a/kde-apps/kcalutils/kcalutils-9999.ebuild
+++ b/kde-apps/kcalutils/kcalutils-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"
@@ -35,6 +35,5 @@ src_test() {
 	local myctestargs=(
 		-E "(kcalutils-testincidenceformatter)"
 	)
-
 	kde5_src_test
 }
diff --git a/kde-apps/kcharselect/kcharselect-9999.ebuild b/kde-apps/kcharselect/kcharselect-9999.ebuild
index cf9e2d8238..1ac05c5b9f 100644
--- a/kde-apps/kcharselect/kcharselect-9999.ebuild
+++ b/kde-apps/kcharselect/kcharselect-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
diff --git a/kde-apps/kcolorchooser/kcolorchooser-9999.ebuild b/kde-apps/kcolorchooser/kcolorchooser-9999.ebuild
index fce1c8cb32..2978c14866 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-9999.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-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-apps/kcontacts/kcontacts-9999.ebuild b/kde-apps/kcontacts/kcontacts-9999.ebuild
index 7c1dc9d7f0..1f6d5f8693 100644
--- a/kde-apps/kcontacts/kcontacts-9999.ebuild
+++ b/kde-apps/kcontacts/kcontacts-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"
diff --git a/kde-apps/kcron/kcron-9999.ebuild b/kde-apps/kcron/kcron-9999.ebuild
index 8d96779407..c5e1b37e17 100644
--- a/kde-apps/kcron/kcron-9999.ebuild
+++ b/kde-apps/kcron/kcron-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
diff --git a/kde-apps/kdav/kdav-9999.ebuild b/kde-apps/kdav/kdav-9999.ebuild
index 86a7da8e07..a3ea9a026b 100644
--- a/kde-apps/kdav/kdav-9999.ebuild
+++ b/kde-apps/kdav/kdav-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"
@@ -29,6 +29,5 @@ src_test() {
 	local myctestargs=(
 		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
 	)
-
 	kde5_src_test
 }
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-9999.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-9999.ebuild
index 768ac6be4f..c5cbe29192 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-9999.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-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
@@ -24,8 +24,8 @@ RDEPEND="
 "
 
 src_prepare() {
-	# bug 275069
-	sed -ie 's:colorsvn::' CMakeLists.txt || die
-
 	kde5_src_prepare
+
+	# bug 275069
+	sed -e 's:colorsvn::' -i CMakeLists.txt || die
 }
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-9999.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-9999.ebuild
index 96642617e3..df9bd1b337 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-9999.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-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 @@ LICENSE="GPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -24,4 +24,4 @@ RDEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdebugsettings/kdebugsettings-9999.ebuild b/kde-apps/kdebugsettings/kdebugsettings-9999.ebuild
index 28dc99f6b7..c7c2a49a2b 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-9999.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-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-apps/kdeedu-data/kdeedu-data-9999.ebuild b/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild
index a7d960405f..5613d44c2e 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-9999.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-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,11 +11,10 @@ DESCRIPTION="Shared icons, artwork and data files for educational applications"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
+BDEPEND="
 	$(add_frameworks_dep extra-cmake-modules)
 	$(add_qt_dep qtcore)
 "
 RDEPEND="
-	!kde-apps/libkdeedu:4
 	!kde-apps/kde-l10n
 "
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild
index 009449c876..a46eb3c13e 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-9999.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-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-apps/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild
index 7dcc2fb403..2d11f40090 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
-DESCRIPTION="kcontrol filesharing config module for SMB"
+DESCRIPTION="SMB filesharing config module for systemsettings"
 KEYWORDS=""
 IUSE=""
 
diff --git a/kde-apps/kdenlive/kdenlive-9999.ebuild b/kde-apps/kdenlive/kdenlive-9999.ebuild
index 4544f71909..d190a09149 100644
--- a/kde-apps/kdenlive/kdenlive-9999.ebuild
+++ b/kde-apps/kdenlive/kdenlive-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="optional"
 inherit kde5
@@ -13,6 +13,9 @@ LICENSE="GPL-2"
 KEYWORDS=""
 IUSE="freesound gles2 jogshuttle semantic-desktop share v4l"
 
+BDEPEND="
+	sys-devel/gettext
+"
 RDEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kbookmarks)
@@ -53,7 +56,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
 "
 
 src_configure() {
diff --git a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
index a52dbe3041..cefbe07b4e 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-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
 
 KDE_EXAMPLES="true"
 KDE_TEST="forceoptional-recursive"
@@ -10,9 +10,9 @@ inherit kde5
 
 DESCRIPTION="Plugins for KDE Personal Information Management Suite"
 HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+
 LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS=""
-
 IUSE="importwizard markdown"
 
 COMMON_DEPEND="
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
index 77bb277fc3..2640615efc 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-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-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
index 640863d973..312f3f0f04 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-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"
@@ -14,6 +14,10 @@ KEYWORDS=""
 IUSE=""
 
 # TODO kolab
+BDEPEND="
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep kimap 'test') )
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
@@ -65,8 +69,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtxmlpatterns)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep kimap 'test') )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
index 8310b2a0f9..3173f6269d 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-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
 
@@ -9,10 +9,10 @@ DESCRIPTION="kioslaves from kdesdk package"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	dev-lang/perl
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-9999.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-9999.ebuild
index fc762fa6ae..7340ae5527 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-9999.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-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-apps/kdf/kdf-9999.ebuild b/kde-apps/kdf/kdf-9999.ebuild
index 87778c00a4..131bcda828 100644
--- a/kde-apps/kdf/kdf-9999.ebuild
+++ b/kde-apps/kdf/kdf-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
diff --git a/kde-apps/kdialog/kdialog-9999.ebuild b/kde-apps/kdialog/kdialog-9999.ebuild
index 9e6a3c04cc..7980441849 100644
--- a/kde-apps/kdialog/kdialog-9999.ebuild
+++ b/kde-apps/kdialog/kdialog-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-apps/kdiamond/kdiamond-9999.ebuild b/kde-apps/kdiamond/kdiamond-9999.ebuild
index 84f598ff9a..1d9db4f41a 100644
--- a/kde-apps/kdiamond/kdiamond-9999.ebuild
+++ b/kde-apps/kdiamond/kdiamond-9999.ebuild
@@ -1,16 +1,14 @@
 # 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
 
-DESCRIPTION="A KDE three-in-a-row game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kdiamond/
-	https://games.kde.org/game.php?game=kdiamond
-"
+DESCRIPTION="Single player three-in-a-row game"
+HOMEPAGE="https://www.kde.org/applications/games/kdiamond/
+https://games.kde.org/game.php?game=kdiamond"
 KEYWORDS=""
 IUSE=""
 
diff --git a/kde-apps/keditbookmarks/keditbookmarks-9999.ebuild b/kde-apps/keditbookmarks/keditbookmarks-9999.ebuild
index 3a8f735e4d..1761aa3937 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-9999.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-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"
@@ -12,7 +12,7 @@ DESCRIPTION="Bookmarks editor based on KDE Frameworks"
 KEYWORDS=""
 IUSE="+man"
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -31,7 +31,7 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_prepare(){
 	kde5_src_prepare
diff --git a/kde-apps/kfind/kfind-9999.ebuild b/kde-apps/kfind/kfind-9999.ebuild
index 90e10b1318..4e25f8ac30 100644
--- a/kde-apps/kfind/kfind-9999.ebuild
+++ b/kde-apps/kfind/kfind-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
diff --git a/kde-apps/kfloppy/kfloppy-9999.ebuild b/kde-apps/kfloppy/kfloppy-9999.ebuild
index 187bf2774b..049f8d9a74 100644
--- a/kde-apps/kfloppy/kfloppy-9999.ebuild
+++ b/kde-apps/kfloppy/kfloppy-9999.ebuild
@@ -1,12 +1,12 @@
 # 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
 
-DESCRIPTION="A straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
+DESCRIPTION="Straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
 HOMEPAGE="
 	https://www.kde.org/applications/utilities/kfloppy/
 	https://utils.kde.org/projects/kfloppy/
diff --git a/kde-apps/kfourinline/kfourinline-9999.ebuild b/kde-apps/kfourinline/kfourinline-9999.ebuild
index 4a715b5705..726eeed13f 100644
--- a/kde-apps/kfourinline/kfourinline-9999.ebuild
+++ b/kde-apps/kfourinline/kfourinline-9999.ebuild
@@ -1,16 +1,14 @@
 # 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
 
 DESCRIPTION="KDE four-in-a-row game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kfourinline/
-	https://games.kde.org/game.php?game=kfourinline
-"
+HOMEPAGE="https://www.kde.org/applications/games/kfourinline/
+https://games.kde.org/game.php?game=kfourinline"
 KEYWORDS=""
 IUSE=""
 
diff --git a/kde-apps/kgeography/kgeography-9999.ebuild b/kde-apps/kgeography/kgeography-9999.ebuild
index b3c1f404d1..5395c95ffb 100644
--- a/kde-apps/kgeography/kgeography-9999.ebuild
+++ b/kde-apps/kgeography/kgeography-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
diff --git a/kde-apps/kget/kget-9999.ebuild b/kde-apps/kget/kget-9999.ebuild
index c03ef7dabf..9fd5a38e26 100644
--- a/kde-apps/kget/kget-9999.ebuild
+++ b/kde-apps/kget/kget-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"
diff --git a/kde-apps/kgoldrunner/kgoldrunner-9999.ebuild b/kde-apps/kgoldrunner/kgoldrunner-9999.ebuild
index 96edc7ea09..f661d0f123 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-9999.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-9999.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 inherit kde5
 
 DESCRIPTION="Game of action and puzzle solving by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kgoldrunner/
-	https://games.kde.org/game.php?game=kgoldrunner
-"
+HOMEPAGE="https://www.kde.org/applications/games/kgoldrunner/
+https://games.kde.org/game.php?game=kgoldrunner"
 KEYWORDS=""
 IUSE=""
 
diff --git a/kde-apps/kgpg/kgpg-9999.ebuild b/kde-apps/kgpg/kgpg-9999.ebuild
index 8b98a07ded..7b1eb9bb13 100644
--- a/kde-apps/kgpg/kgpg-9999.ebuild
+++ b/kde-apps/kgpg/kgpg-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_SELINUX_MODULE="gpg"
diff --git a/kde-apps/khangman/khangman-9999.ebuild b/kde-apps/khangman/khangman-9999.ebuild
index 1b7cf5774a..623caefcdf 100644
--- a/kde-apps/khangman/khangman-9999.ebuild
+++ b/kde-apps/khangman/khangman-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
diff --git a/kde-apps/khelpcenter/khelpcenter-9999.ebuild b/kde-apps/khelpcenter/khelpcenter-9999.ebuild
index b34949262c..c77444529e 100644
--- a/kde-apps/khelpcenter/khelpcenter-9999.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-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
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
index 2021de33bf..715a542429 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-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"
diff --git a/kde-apps/kig/kig-9999.ebuild b/kde-apps/kig/kig-9999.ebuild
index 103d4aa202..0e9343ef02 100644
--- a/kde-apps/kig/kig-9999.ebuild
+++ b/kde-apps/kig/kig-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-apps/kigo/kigo-9999.ebuild b/kde-apps/kigo/kigo-9999.ebuild
index f54960a7c1..b60d6323eb 100644
--- a/kde-apps/kigo/kigo-9999.ebuild
+++ b/kde-apps/kigo/kigo-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
diff --git a/kde-apps/killbots/killbots-9999.ebuild b/kde-apps/killbots/killbots-9999.ebuild
index 4ffd5eadbe..7b7c77770d 100644
--- a/kde-apps/killbots/killbots-9999.ebuild
+++ b/kde-apps/killbots/killbots-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
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-9999.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-9999.ebuild
index 6bcbb20369..edb1a809d4 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-9999.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-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
diff --git a/kde-apps/kimap/kimap-9999.ebuild b/kde-apps/kimap/kimap-9999.ebuild
index 265d1caf54..a4c432bd43 100644
--- a/kde-apps/kimap/kimap-9999.ebuild
+++ b/kde-apps/kimap/kimap-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
@@ -12,7 +12,10 @@ KEYWORDS=""
 IUSE=""
 
 # TODO: Convince upstream not to install stuff with tests
-CDEPEND="
+BDEPEND="
+	test? ( $(add_qt_dep qttest) )
+"
+DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
@@ -21,10 +24,7 @@ CDEPEND="
 	$(add_qt_dep qtgui)
 	dev-libs/cyrus-sasl
 "
-DEPEND="${CDEPEND}
-	test? ( $(add_qt_dep qttest) )
-"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
@@ -33,6 +33,5 @@ src_test() {
 	local myctestargs=(
 		-j1
 	)
-
 	kde5_src_test
 }
diff --git a/kde-apps/kio-extras/kio-extras-9999.ebuild b/kde-apps/kio-extras/kio-extras-9999.ebuild
index b93022288c..91a054736d 100644
--- a/kde-apps/kio-extras/kio-extras-9999.ebuild
+++ b/kde-apps/kio-extras/kio-extras-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"
@@ -13,8 +13,10 @@ HOMEPAGE="https://cgit.kde.org/kio-extras.git"
 KEYWORDS=""
 IUSE="activities +man mtp openexr phonon samba +sftp taglib"
 
-# drop kdnssd slot operator when FRAMEWORKS_MINIMAL >= 5.54.0
-COMMON_DEPEND="
+BDEPEND="
+	man? ( dev-util/gperf )
+"
+DEPEND="
 	$(add_frameworks_dep karchive 'bzip2,lzma')
 	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcodecs)
@@ -22,7 +24,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd '' '' '5=')
+	$(add_frameworks_dep kdnssd)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
@@ -50,13 +52,9 @@ COMMON_DEPEND="
 	sftp? ( net-libs/libssh:=[sftp] )
 	taglib? ( >=media-libs/taglib-1.11.1 )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	$(add_frameworks_dep kded)
 "
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-	man? ( dev-util/gperf )
-"
 
 # requires running kde environment
 RESTRICT+=" test"
diff --git a/kde-apps/kiriki/kiriki-9999.ebuild b/kde-apps/kiriki/kiriki-9999.ebuild
index bc4fd51406..ff24210921 100644
--- a/kde-apps/kiriki/kiriki-9999.ebuild
+++ b/kde-apps/kiriki/kiriki-9999.ebuild
@@ -1,16 +1,14 @@
 # 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
 
 DESCRIPTION="An addictive and fun dice game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kiriki/
-	https://games.kde.org/game.php?game=kiriki
-"
+HOMEPAGE="https://www.kde.org/applications/games/kiriki/
+https://games.kde.org/game.php?game=kiriki"
 KEYWORDS=""
 IUSE=""
 
diff --git a/kde-apps/kiten/kiten-9999.ebuild b/kde-apps/kiten/kiten-9999.ebuild
index d85429eec3..a27afcd126 100644
--- a/kde-apps/kiten/kiten-9999.ebuild
+++ b/kde-apps/kiten/kiten-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
diff --git a/kde-apps/kitinerary/kitinerary-9999.ebuild b/kde-apps/kitinerary/kitinerary-9999.ebuild
index 49b68761fa..70f7f64032 100644
--- a/kde-apps/kitinerary/kitinerary-9999.ebuild
+++ b/kde-apps/kitinerary/kitinerary-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-apps/kjots/kjots-9999.ebuild b/kde-apps/kjots/kjots-9999.ebuild
index 7b7e5eff14..e04500ce1b 100644
--- a/kde-apps/kjots/kjots-9999.ebuild
+++ b/kde-apps/kjots/kjots-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-apps/kjumpingcube/kjumpingcube-9999.ebuild b/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
index f4d4d3107d..333ce95b08 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-9999.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="true"
 KDE_SELINUX_MODULE="games"
 inherit kde5
 
 DESCRIPTION="Tactical one or two player game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kjumpingcube/
-	https://games.kde.org/game.php?game=kjumpingcube
-"
+HOMEPAGE="https://www.kde.org/applications/games/kjumpingcube/
+https://games.kde.org/game.php?game=kjumpingcube"
 KEYWORDS=""
 IUSE=""
 
diff --git a/kde-apps/kldap/kldap-9999.ebuild b/kde-apps/kldap/kldap-9999.ebuild
index 041b1fb3cd..d539bba704 100644
--- a/kde-apps/kldap/kldap-9999.ebuild
+++ b/kde-apps/kldap/kldap-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"
diff --git a/kde-apps/kleopatra/kleopatra-9999.ebuild b/kde-apps/kleopatra/kleopatra-9999.ebuild
index a0bbc2a40a..939bff9b64 100644
--- a/kde-apps/kleopatra/kleopatra-9999.ebuild
+++ b/kde-apps/kleopatra/kleopatra-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="optional"
 KDE_TEST="forceoptional"
@@ -10,9 +10,9 @@ inherit kde5
 
 DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
 HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra"
+
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
-
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klettres/klettres-9999.ebuild b/kde-apps/klettres/klettres-9999.ebuild
index 288693c0b5..1f71c08b3c 100644
--- a/kde-apps/klettres/klettres-9999.ebuild
+++ b/kde-apps/klettres/klettres-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
diff --git a/kde-apps/klickety/klickety-9999.ebuild b/kde-apps/klickety/klickety-9999.ebuild
index 31c008317a..3bbaf2917b 100644
--- a/kde-apps/klickety/klickety-9999.ebuild
+++ b/kde-apps/klickety/klickety-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 inherit kde5
 
-DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
+DESCRIPTION="An adaptation of the Clickomania game"
 KEYWORDS=""
 IUSE=""
 
diff --git a/kde-apps/klines/klines-9999.ebuild b/kde-apps/klines/klines-9999.ebuild
index 577413ab4a..d7e9e15893 100644
--- a/kde-apps/klines/klines-9999.ebuild
+++ b/kde-apps/klines/klines-9999.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 inherit kde5
 
 DESCRIPTION="A little KDE game about balls and how to get rid of them"
-HOMEPAGE="
-	https://www.kde.org/applications/games/klines/
-	https://games.kde.org/game.php?game=klines
-"
+HOMEPAGE="https://www.kde.org/applications/games/klines/
+https://games.kde.org/game.php?game=klines"
 KEYWORDS=""
 IUSE=""
 
diff --git a/kde-apps/kmag/kmag-9999.ebuild b/kde-apps/kmag/kmag-9999.ebuild
index b1a3e0f936..3d050ef0c4 100644
--- a/kde-apps/kmag/kmag-9999.ebuild
+++ b/kde-apps/kmag/kmag-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
diff --git a/kde-apps/kmahjongg/kmahjongg-9999.ebuild b/kde-apps/kmahjongg/kmahjongg-9999.ebuild
index 7ac6058dc6..c2e9a40fb1 100644
--- a/kde-apps/kmahjongg/kmahjongg-9999.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-9999.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 inherit kde5
 
 DESCRIPTION="A tile matching game for one or two players"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kmahjongg/
-	https://games.kde.org/game.php?game=kmahjongg
-"
+HOMEPAGE="https://www.kde.org/applications/games/kmahjongg/
+https://games.kde.org/game.php?game=kmahjongg"
 KEYWORDS=""
 IUSE=""
 
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild
index df538e0c1f..788b1b6273 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-9999.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-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" # FIXME: Check back for doc in release
 KDE_TEST="forceoptional"
diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild
index 45fb30d520..44b76099ee 100644
--- a/kde-apps/kmail/kmail-9999.ebuild
+++ b/kde-apps/kmail/kmail-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"
@@ -14,6 +14,10 @@ LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
 IUSE=""
 
+BDEPEND="
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcmutils)
@@ -69,8 +73,6 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kcalutils)
 	$(add_kdeapps_dep kldap)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
diff --git a/kde-apps/kmailtransport/kmailtransport-9999.ebuild b/kde-apps/kmailtransport/kmailtransport-9999.ebuild
index 18600f3b2b..5e452b9107 100644
--- a/kde-apps/kmailtransport/kmailtransport-9999.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-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
@@ -11,7 +11,10 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+BDEPEND="
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -31,10 +34,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 	!kde-apps/kdepimlibs:4
 "
diff --git a/kde-apps/kmbox/kmbox-9999.ebuild b/kde-apps/kmbox/kmbox-9999.ebuild
index e41253a92f..19ef5ea4e3 100644
--- a/kde-apps/kmbox/kmbox-9999.ebuild
+++ b/kde-apps/kmbox/kmbox-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-apps/kmime/kmime-9999.ebuild b/kde-apps/kmime/kmime-9999.ebuild
index 243753d139..6749a48ca1 100644
--- a/kde-apps/kmime/kmime-9999.ebuild
+++ b/kde-apps/kmime/kmime-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-apps/kmines/kmines-9999.ebuild b/kde-apps/kmines/kmines-9999.ebuild
index ce95c559ce..aa1d0beeef 100644
--- a/kde-apps/kmines/kmines-9999.ebuild
+++ b/kde-apps/kmines/kmines-9999.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 inherit kde5
 
 DESCRIPTION="Classic mine sweeper game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kmines/
-	https://games.kde.org/game.php?game=kmines
-"
+HOMEPAGE="https://www.kde.org/applications/games/kmines/
+https://games.kde.org/game.php?game=kmines"
 KEYWORDS=""
 IUSE=""
 
diff --git a/kde-apps/kmousetool/kmousetool-9999.ebuild b/kde-apps/kmousetool/kmousetool-9999.ebuild
index 35755f9bd2..8c78c1cafb 100644
--- a/kde-apps/kmousetool/kmousetool-9999.ebuild
+++ b/kde-apps/kmousetool/kmousetool-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
diff --git a/kde-apps/kmouth/kmouth-9999.ebuild b/kde-apps/kmouth/kmouth-9999.ebuild
index ccbfb74d52..142874e45f 100644
--- a/kde-apps/kmouth/kmouth-9999.ebuild
+++ b/kde-apps/kmouth/kmouth-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
diff --git a/kde-apps/kmplot/kmplot-9999.ebuild b/kde-apps/kmplot/kmplot-9999.ebuild
index 89dc489b87..25a1bcf5cd 100644
--- a/kde-apps/kmplot/kmplot-9999.ebuild
+++ b/kde-apps/kmplot/kmplot-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
diff --git a/kde-apps/knavalbattle/knavalbattle-9999.ebuild b/kde-apps/knavalbattle/knavalbattle-9999.ebuild
index 545777a06f..1bbcbda295 100644
--- a/kde-apps/knavalbattle/knavalbattle-9999.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-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_SELINUX_MODULE="games"
diff --git a/kde-apps/knetwalk/knetwalk-9999.ebuild b/kde-apps/knetwalk/knetwalk-9999.ebuild
index 097f5ce7a6..1f9be22ef4 100644
--- a/kde-apps/knetwalk/knetwalk-9999.ebuild
+++ b/kde-apps/knetwalk/knetwalk-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-apps/knotes/knotes-9999.ebuild b/kde-apps/knotes/knotes-9999.ebuild
index 8ae6b59c3d..c55266ca07 100644
--- a/kde-apps/knotes/knotes-9999.ebuild
+++ b/kde-apps/knotes/knotes-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"
diff --git a/kde-apps/kolf/kolf-9999.ebuild b/kde-apps/kolf/kolf-9999.ebuild
index 4634aa382e..6d72752df6 100644
--- a/kde-apps/kolf/kolf-9999.ebuild
+++ b/kde-apps/kolf/kolf-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_SELINUX_MODULE="games"
diff --git a/kde-apps/kollision/kollision-9999.ebuild b/kde-apps/kollision/kollision-9999.ebuild
index 0b75d40dd0..b8fc60594f 100644
--- a/kde-apps/kollision/kollision-9999.ebuild
+++ b/kde-apps/kollision/kollision-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
diff --git a/kde-apps/kolourpaint/kolourpaint-9999.ebuild b/kde-apps/kolourpaint/kolourpaint-9999.ebuild
index 1887878129..86856fe19a 100644
--- a/kde-apps/kolourpaint/kolourpaint-9999.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-9999.ebuild
@@ -1,18 +1,18 @@
 # 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
 
 DESCRIPTION="Paint Program by KDE"
 HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
-KEYWORDS=""
 LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
+KEYWORDS=""
 IUSE="scanner"
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -30,7 +30,7 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	scanner? ( $(add_kdeapps_dep libksane) )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kompare/kompare-9999.ebuild b/kde-apps/kompare/kompare-9999.ebuild
index 78ef19b218..c81682df0c 100644
--- a/kde-apps/kompare/kompare-9999.ebuild
+++ b/kde-apps/kompare/kompare-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
diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild
index 8f1a2d9ca3..b032e21dc2 100644
--- a/kde-apps/konqueror/konqueror-9999.ebuild
+++ b/kde-apps/konqueror/konqueror-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" # not optional until !kdelibs4support
 KDE_TEST="true"
diff --git a/kde-apps/konquest/konquest-9999.ebuild b/kde-apps/konquest/konquest-9999.ebuild
index cffdf69a11..abca2b21d8 100644
--- a/kde-apps/konquest/konquest-9999.ebuild
+++ b/kde-apps/konquest/konquest-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_SELINUX_MODULE="games"
diff --git a/kde-apps/konsole/konsole-9999.ebuild b/kde-apps/konsole/konsole-9999.ebuild
index 834c53f4be..ffa6edda3a 100644
--- a/kde-apps/konsole/konsole-9999.ebuild
+++ b/kde-apps/konsole/konsole-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="optional"
 KDE_TEST="true"
diff --git a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
index e47eb09f45..766d9a2234 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-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="akonadi-calendar-tools"
@@ -9,9 +9,9 @@ inherit kde5
 
 DESCRIPTION="Command line interface to KDE calendars"
 HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
+
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
-
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontact/kontact-9999.ebuild b/kde-apps/kontact/kontact-9999.ebuild
index 2f238309d7..1854ea7cfd 100644
--- a/kde-apps/kontact/kontact-9999.ebuild
+++ b/kde-apps/kontact/kontact-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
diff --git a/kde-apps/kontactinterface/kontactinterface-9999.ebuild b/kde-apps/kontactinterface/kontactinterface-9999.ebuild
index 5b37f2abc1..b45452ef38 100644
--- a/kde-apps/kontactinterface/kontactinterface-9999.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-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-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 767193885c..d3e8aedf47 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-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"
@@ -12,9 +12,6 @@ HOMEPAGE="https://userbase.kde.org/Kopete https://www.kde.org/applications/inter
 KEYWORDS=""
 IUSE="ssl v4l"
 
-# tests hang, last checked for 4.2.96
-RESTRICT+=" test"
-
 # Available plugins
 #
 #	addbookmarks: NO DEPS
@@ -60,7 +57,7 @@ PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
-COMMONDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcrash)
@@ -115,7 +112,7 @@ COMMONDEPEND="
 		$(add_kdeapps_dep kidentitymanagement)
 	)
 "
-RDEPEND="${COMMONDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kde4-l10n
 	latex? (
 		|| (
@@ -128,11 +125,14 @@ RDEPEND="${COMMONDEPEND}
 "
 #	sms? ( app-mobilephone/smssend )
 #	winpopup? ( net-fs/samba )
-DEPEND="${COMMONDEPEND}
+DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 	jingle? ( dev-libs/jsoncpp )
 "
 
+# tests hang, last checked for 4.2.96
+RESTRICT+=" test"
+
 src_configure() {
 	local x x2
 	# Handle common stuff
diff --git a/kde-apps/korganizer/korganizer-9999.ebuild b/kde-apps/korganizer/korganizer-9999.ebuild
index a388d91f68..da18e202ec 100644
--- a/kde-apps/korganizer/korganizer-9999.ebuild
+++ b/kde-apps/korganizer/korganizer-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"
@@ -14,6 +14,9 @@ LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 KEYWORDS=""
 IUSE="X"
 
+BDEPEND="
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kcodecs)
@@ -69,7 +72,6 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kldap)
 	$(add_qt_dep designer)
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
diff --git a/kde-apps/kpat/kpat-9999.ebuild b/kde-apps/kpat/kpat-9999.ebuild
index 797f1e2aea..69682c1712 100644
--- a/kde-apps/kpat/kpat-9999.ebuild
+++ b/kde-apps/kpat/kpat-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_SELINUX_MODULE="games"
@@ -29,6 +29,5 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
-	x11-misc/shared-mime-info
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
index b7b94b5c65..08c14d5b6c 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-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_DESIGNERPLUGIN="true"
 KDE_TEST="true"
@@ -13,7 +13,10 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+BDEPEND="
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -32,10 +35,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	dev-libs/grantlee:5
 "
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
diff --git a/kde-apps/kpkpass/kpkpass-9999.ebuild b/kde-apps/kpkpass/kpkpass-9999.ebuild
index 3cf34818b1..e18e8f8257 100644
--- a/kde-apps/kpkpass/kpkpass-9999.ebuild
+++ b/kde-apps/kpkpass/kpkpass-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-apps/kqtquickcharts/kqtquickcharts-9999.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-9999.ebuild
index bf17d012ee..f01809112d 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-9999.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-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-apps/krdc/krdc-9999.ebuild b/kde-apps/krdc/krdc-9999.ebuild
index d28978b082..eaaca43079 100644
--- a/kde-apps/krdc/krdc-9999.ebuild
+++ b/kde-apps/krdc/krdc-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="optional"
 inherit kde5
@@ -12,7 +12,6 @@ KEYWORDS=""
 IUSE="+rdp vnc"
 
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
-
 DEPEND="
 	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcmutils)
diff --git a/kde-apps/kreversi/kreversi-9999.ebuild b/kde-apps/kreversi/kreversi-9999.ebuild
index 430f749128..52b1b762be 100644
--- a/kde-apps/kreversi/kreversi-9999.ebuild
+++ b/kde-apps/kreversi/kreversi-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="optional"
 KDE_SELINUX_MODULE="games"
diff --git a/kde-apps/krfb/krfb-9999.ebuild b/kde-apps/krfb/krfb-9999.ebuild
index 52b5f09c67..f562f5d657 100644
--- a/kde-apps/krfb/krfb-9999.ebuild
+++ b/kde-apps/krfb/krfb-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
diff --git a/kde-apps/kross-interpreters/kross-interpreters-9999.ebuild b/kde-apps/kross-interpreters/kross-interpreters-9999.ebuild
index 3179228b58..d7338b9191 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-9999.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-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=( python2_7 )
 USE_RUBY="ruby25"
diff --git a/kde-apps/kruler/kruler-9999.ebuild b/kde-apps/kruler/kruler-9999.ebuild
index d81090408b..e3e1aea6a6 100644
--- a/kde-apps/kruler/kruler-9999.ebuild
+++ b/kde-apps/kruler/kruler-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
diff --git a/kde-apps/kscd/kscd-9999.ebuild b/kde-apps/kscd/kscd-9999.ebuild
index ed8fe3bd82..3313730b9c 100644
--- a/kde-apps/kscd/kscd-9999.ebuild
+++ b/kde-apps/kscd/kscd-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
 
 EGIT_BRANCH="kf5"
 KDE_TEST="true"
diff --git a/kde-apps/kshisen/kshisen-9999.ebuild b/kde-apps/kshisen/kshisen-9999.ebuild
index e2585a6cde..64476924a6 100644
--- a/kde-apps/kshisen/kshisen-9999.ebuild
+++ b/kde-apps/kshisen/kshisen-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_SELINUX_MODULE="games"
diff --git a/kde-apps/ksirk/ksirk-9999.ebuild b/kde-apps/ksirk/ksirk-9999.ebuild
index 3812e15f7f..b1032934d6 100644
--- a/kde-apps/ksirk/ksirk-9999.ebuild
+++ b/kde-apps/ksirk/ksirk-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
diff --git a/kde-apps/ksmtp/ksmtp-9999.ebuild b/kde-apps/ksmtp/ksmtp-9999.ebuild
index 5984562f0d..773a90cc59 100644
--- a/kde-apps/ksmtp/ksmtp-9999.ebuild
+++ b/kde-apps/ksmtp/ksmtp-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-apps/ksnakeduel/ksnakeduel-9999.ebuild b/kde-apps/ksnakeduel/ksnakeduel-9999.ebuild
index e96838b7ff..8c626e8642 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-9999.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-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="optional"
 KDE_SELINUX_MODULE="games"
diff --git a/kde-apps/kspaceduel/kspaceduel-9999.ebuild b/kde-apps/kspaceduel/kspaceduel-9999.ebuild
index 03f3a6fa7b..8bb81bd74c 100644
--- a/kde-apps/kspaceduel/kspaceduel-9999.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-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_SELINUX_MODULE="games"
diff --git a/kde-apps/ksquares/ksquares-9999.ebuild b/kde-apps/ksquares/ksquares-9999.ebuild
index b717ae0381..7e9f6f7320 100644
--- a/kde-apps/ksquares/ksquares-9999.ebuild
+++ b/kde-apps/ksquares/ksquares-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
diff --git a/kde-apps/ksudoku/ksudoku-9999.ebuild b/kde-apps/ksudoku/ksudoku-9999.ebuild
index 6715ecdb3b..4f5da80a81 100644
--- a/kde-apps/ksudoku/ksudoku-9999.ebuild
+++ b/kde-apps/ksudoku/ksudoku-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
diff --git a/kde-apps/ksystemlog/ksystemlog-9999.ebuild b/kde-apps/ksystemlog/ksystemlog-9999.ebuild
index 9bdb79dcc3..2a1f229707 100644
--- a/kde-apps/ksystemlog/ksystemlog-9999.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-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"
@@ -45,10 +45,11 @@ src_prepare() {
 		# comparison succeeds only in 2007 !!!
 		local theyear=$(date +%Y)
 		einfo Setting the current year as ${theyear} in the test files
-		sed -e "s:2007:${theyear}:g" -i tests/systemAnalyzerTest.cpp
+		sed -e "s:2007:${theyear}:g" -i tests/systemAnalyzerTest.cpp || die
 
 		# one test consistently fails, so comment it out for the moment
-		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" -i ksystemlog/tests/CMakeLists.txt
+		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" \
+			-i ksystemlog/tests/CMakeLists.txt || die
 	fi
 }
 
diff --git a/kde-apps/kteatime/kteatime-9999.ebuild b/kde-apps/kteatime/kteatime-9999.ebuild
index 1687714314..6203fa156b 100644
--- a/kde-apps/kteatime/kteatime-9999.ebuild
+++ b/kde-apps/kteatime/kteatime-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
diff --git a/kde-apps/ktimer/ktimer-9999.ebuild b/kde-apps/ktimer/ktimer-9999.ebuild
index a6e7ca50cb..425bacba38 100644
--- a/kde-apps/ktimer/ktimer-9999.ebuild
+++ b/kde-apps/ktimer/ktimer-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
diff --git a/kde-apps/ktouch/ktouch-9999.ebuild b/kde-apps/ktouch/ktouch-9999.ebuild
index b4221d1975..931c3872dc 100644
--- a/kde-apps/ktouch/ktouch-9999.ebuild
+++ b/kde-apps/ktouch/ktouch-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
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
index 70df6a997b..cad0ffebc4 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-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
 
@@ -12,6 +12,9 @@ LICENSE="LGPL-2.1"
 KEYWORDS=""
 IUSE="experimental"
 
+BDEPEND="
+	dev-util/intltool
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
@@ -35,7 +38,6 @@ DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kio)
-	dev-util/intltool
 	net-libs/libaccounts-glib
 "
 RDEPEND="${COMMON_DEPEND}
@@ -45,7 +47,8 @@ RDEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	if use experimental; then
-		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || die "couldn't enable experimental services"
+		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || \
+			die "couldn't enable experimental services"
 	fi
 	kde5_src_prepare
 }
@@ -56,4 +59,5 @@ pkg_postinst() {
 		ewarn "Most of them aren't integrated nicely and may require additional steps for account creation."
 		ewarn "Use at your own risk!"
 	fi
+	kde5_pkg_postinst
 }
diff --git a/kde-apps/ktp-approver/ktp-approver-9999.ebuild b/kde-apps/ktp-approver/ktp-approver-9999.ebuild
index 66acc88259..7a367317e7 100644
--- a/kde-apps/ktp-approver/ktp-approver-9999.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-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-apps/ktp-auth-handler/ktp-auth-handler-9999.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-9999.ebuild
index 2fb5a9a186..cd63435803 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-9999.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-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-apps/ktp-call-ui/ktp-call-ui-9999.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-9999.ebuild
index e6bfe26923..d140fca04e 100644
--- a/kde-apps/ktp-call-ui/ktp-call-ui-9999.ebuild
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-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-apps/ktp-common-internals/ktp-common-internals-9999.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild
index a3cf6ce663..6112016fb4 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-9999.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-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-apps/ktp-contact-list/ktp-contact-list-9999.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-9999.ebuild
index 79de3fc3bd..bdb277a322 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-9999.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-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-apps/ktp-contact-runner/ktp-contact-runner-9999.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-9999.ebuild
index 6e85b8c289..82444ad18d 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-9999.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-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-apps/ktp-desktop-applets/ktp-desktop-applets-9999.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-9999.ebuild
index 6e5152f425..d38df8e94a 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-9999.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-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-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild
index c7666efbac..3aa53e540d 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-9999.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-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-apps/ktp-kded-module/ktp-kded-module-9999.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-9999.ebuild
index c76c47d3e8..d87bd7ad95 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-9999.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-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-apps/ktp-send-file/ktp-send-file-9999.ebuild b/kde-apps/ktp-send-file/ktp-send-file-9999.ebuild
index f341ccf86c..ffb26e0a47 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-9999.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-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-apps/ktp-text-ui/ktp-text-ui-9999.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild
index b67d293264..7bb7f48236 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-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-apps/ktuberling/ktuberling-9999.ebuild b/kde-apps/ktuberling/ktuberling-9999.ebuild
index 011eb5717f..98f523a455 100644
--- a/kde-apps/ktuberling/ktuberling-9999.ebuild
+++ b/kde-apps/ktuberling/ktuberling-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_SELINUX_MODULE="games"
diff --git a/kde-apps/kturtle/kturtle-9999.ebuild b/kde-apps/kturtle/kturtle-9999.ebuild
index 57ffe24bc3..661844eae4 100644
--- a/kde-apps/kturtle/kturtle-9999.ebuild
+++ b/kde-apps/kturtle/kturtle-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
diff --git a/kde-apps/kubrick/kubrick-9999.ebuild b/kde-apps/kubrick/kubrick-9999.ebuild
index 01c27152b7..8f31412e02 100644
--- a/kde-apps/kubrick/kubrick-9999.ebuild
+++ b/kde-apps/kubrick/kubrick-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
diff --git a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild b/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
index 9ca35b6c52..8ef3778e50 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-9999.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-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
@@ -41,5 +41,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!<kde-apps/kwalletmanager-15.04.3-r1:4
-	!kde-base/legacy-icons
 "
diff --git a/kde-apps/kwave/kwave-9999.ebuild b/kde-apps/kwave/kwave-9999.ebuild
index ce0b8beb58..8cb98fec18 100644
--- a/kde-apps/kwave/kwave-9999.ebuild
+++ b/kde-apps/kwave/kwave-9999.ebuild
@@ -1,21 +1,27 @@
 # 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
 
 DESCRIPTION="Sound editor built on KDE Frameworks 5 that can edit many types of audio files"
 HOMEPAGE="http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/"
-LICENSE="
-	CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+
+LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+
 	handbook? ( FDL-1.2 )
 	opus? ( BSD-2 )
 "
 KEYWORDS=""
 IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
+BDEPEND="
+	sys-devel/gettext
+	handbook? ( || (
+		gnome-base/librsvg
+		virtual/imagemagick-tools[png,svg]
+	) )
+"
 RDEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -55,11 +61,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	$(add_kdeapps_dep poxml)
 	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
-	handbook? ( || (
-		gnome-base/librsvg
-		virtual/imagemagick-tools[png,svg]
-	) )
 "
 
 DOCS=( AUTHORS CHANGES LICENSES README TODO )
diff --git a/kde-apps/kwordquiz/kwordquiz-9999.ebuild b/kde-apps/kwordquiz/kwordquiz-9999.ebuild
index 71c5fa70a4..9ffc6e4d41 100644
--- a/kde-apps/kwordquiz/kwordquiz-9999.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-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
diff --git a/kde-apps/kwrite/kwrite-9999.ebuild b/kde-apps/kwrite/kwrite-9999.ebuild
index 8636b68cb3..38588362fe 100644
--- a/kde-apps/kwrite/kwrite-9999.ebuild
+++ b/kde-apps/kwrite/kwrite-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="kate"
 KDE_HANDBOOK="optional"
diff --git a/kde-apps/libgravatar/libgravatar-9999.ebuild b/kde-apps/libgravatar/libgravatar-9999.ebuild
index 830b9fec6b..58f6ba07a2 100644
--- a/kde-apps/libgravatar/libgravatar-9999.ebuild
+++ b/kde-apps/libgravatar/libgravatar-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"
@@ -32,6 +32,5 @@ src_test() {
 	local myctestargs=(
 		-E "(gravatar-gravatarresolvurljobtest)"
 	)
-
 	kde5_src_test
 }
diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index c826946daa..18e01a9e3e 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-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"
@@ -12,10 +12,6 @@ LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 KEYWORDS=""
 IUSE="musicbrainz"
 
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT+=" test"
-
 DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
@@ -31,6 +27,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+# tests require network access and compare static data with online data
+# bug 280996
+RESTRICT+=" test"
+
 src_prepare() {
 	kde5_src_prepare
 
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
index 3425716112..28b0c60495 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-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-apps/libkdcraw/libkdcraw-9999.ebuild b/kde-apps/libkdcraw/libkdcraw-9999.ebuild
index edabf362b3..5606adcd6b 100644
--- a/kde-apps/libkdcraw/libkdcraw-9999.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-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-apps/libkdegames/libkdegames-9999.ebuild b/kde-apps/libkdegames/libkdegames-9999.ebuild
index 4080518a85..dd5edf9775 100644
--- a/kde-apps/libkdegames/libkdegames-9999.ebuild
+++ b/kde-apps/libkdegames/libkdegames-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-apps/libkdepim/libkdepim-9999.ebuild b/kde-apps/libkdepim/libkdepim-9999.ebuild
index 176aaae437..eb83188cb8 100644
--- a/kde-apps/libkdepim/libkdepim-9999.ebuild
+++ b/kde-apps/libkdepim/libkdepim-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_DESIGNERPLUGIN="true"
 KDE_TEST="forceoptional"
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-9999.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-9999.ebuild
index c53b7e82ea..15fd3a6278 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-9999.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-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
@@ -25,6 +25,6 @@ src_prepare(){
 	if ! use test; then
 		sed -e "/add_subdirectory(autotests)/ s/^/#DONT/" \
 			-e "/add_subdirectory(tests)/ s/^/#DONT/" \
-			-i keduvocdocument/CMakeLists.txt
+			-i keduvocdocument/CMakeLists.txt || die
 	fi
 }
diff --git a/kde-apps/libkexiv2/libkexiv2-9999.ebuild b/kde-apps/libkexiv2/libkexiv2-9999.ebuild
index b836f4201d..8fc3f0d9d3 100644
--- a/kde-apps/libkexiv2/libkexiv2-9999.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-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-apps/libkgapi/libkgapi-9999.ebuild b/kde-apps/libkgapi/libkgapi-9999.ebuild
index 58bada3c93..2cbdb74515 100644
--- a/kde-apps/libkgapi/libkgapi-9999.ebuild
+++ b/kde-apps/libkgapi/libkgapi-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"
@@ -14,7 +14,10 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE="nls"
 
-COMMON_DEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_kdeapps_dep kcalcore)
@@ -26,10 +29,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	dev-libs/cyrus-sasl:2
 "
-DEPEND="${COMMON_DEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 	!<kde-apps/kdepim-runtime-18.07.80:5
 "
diff --git a/kde-apps/libkgeomap/libkgeomap-9999.ebuild b/kde-apps/libkgeomap/libkgeomap-9999.ebuild
index 78b2db1ac5..c3b5792324 100644
--- a/kde-apps/libkgeomap/libkgeomap-9999.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-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"
diff --git a/kde-apps/libkipi/libkipi-9999.ebuild b/kde-apps/libkipi/libkipi-9999.ebuild
index d0d98e1f88..bd8785a1df 100644
--- a/kde-apps/libkipi/libkipi-9999.ebuild
+++ b/kde-apps/libkipi/libkipi-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
 
@@ -20,7 +20,4 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 "
-RDEPEND="${DEPEND}
-	!<kde-apps/libkipi-15.08.3-r1:4
-	!kde-base/legacy-icons
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkleo/libkleo-9999.ebuild b/kde-apps/libkleo/libkleo-9999.ebuild
index 28b62e73d4..6017b13215 100644
--- a/kde-apps/libkleo/libkleo-9999.ebuild
+++ b/kde-apps/libkleo/libkleo-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="false"
 inherit kde5
diff --git a/kde-apps/libkmahjongg/libkmahjongg-9999.ebuild b/kde-apps/libkmahjongg/libkmahjongg-9999.ebuild
index f37c1fc514..285ddad150 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-9999.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-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-apps/libkomparediff2/libkomparediff2-9999.ebuild b/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
index c6da28be79..3e2ee1c200 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-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"
 inherit kde5
diff --git a/kde-apps/libksane/libksane-9999.ebuild b/kde-apps/libksane/libksane-9999.ebuild
index 9c7b407419..d8e6ad3f54 100644
--- a/kde-apps/libksane/libksane-9999.ebuild
+++ b/kde-apps/libksane/libksane-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
 
@@ -19,10 +19,7 @@ DEPEND="
 	media-gfx/sane-backends
 	kwallet? ( $(add_frameworks_dep kwallet) )
 "
-RDEPEND="${DEPEND}
-	!<kde-apps/libksane-15.08.3-r1:4
-	!kde-base/legacy-icons
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/libksieve/libksieve-9999.ebuild b/kde-apps/libksieve/libksieve-9999.ebuild
index df16f34a89..0910d4ae38 100644
--- a/kde-apps/libksieve/libksieve-9999.ebuild
+++ b/kde-apps/libksieve/libksieve-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"
diff --git a/kde-apps/libktnef/libktnef-9999.ebuild b/kde-apps/libktnef/libktnef-9999.ebuild
index bcfaa2bd19..d4df3147ed 100644
--- a/kde-apps/libktnef/libktnef-9999.ebuild
+++ b/kde-apps/libktnef/libktnef-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="ktnef"
diff --git a/kde-apps/lokalize/lokalize-9999.ebuild b/kde-apps/lokalize/lokalize-9999.ebuild
index b616dcdf0b..c77eebb841 100644
--- a/kde-apps/lokalize/lokalize-9999.ebuild
+++ b/kde-apps/lokalize/lokalize-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"
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
@@ -57,7 +57,6 @@ src_install() {
 pkg_postinst() {
 	kde5_pkg_postinst
 
-	if ! has_version dev-vcs/subversion ; then
+	has_version dev-vcs/subversion || \
 		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
-	fi
 }
diff --git a/kde-apps/lskat/lskat-9999.ebuild b/kde-apps/lskat/lskat-9999.ebuild
index 76832d49bb..ca6c258e28 100644
--- a/kde-apps/lskat/lskat-9999.ebuild
+++ b/kde-apps/lskat/lskat-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"
 KDE_SELINUX_MODULE="games"
diff --git a/kde-apps/mailcommon/mailcommon-9999.ebuild b/kde-apps/mailcommon/mailcommon-9999.ebuild
index d60e3090b5..720268ca20 100644
--- a/kde-apps/mailcommon/mailcommon-9999.ebuild
+++ b/kde-apps/mailcommon/mailcommon-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_DESIGNERPLUGIN="true"
 KDE_TEST="forceoptional"
@@ -13,7 +13,10 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
+BDEPEND="
+	dev-libs/libxslt
+"
+DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
@@ -47,10 +50,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	media-libs/phonon[qt5(+)]
 "
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
diff --git a/kde-apps/mailimporter/mailimporter-9999.ebuild b/kde-apps/mailimporter/mailimporter-9999.ebuild
index 05d6395d7c..b589dcc716 100644
--- a/kde-apps/mailimporter/mailimporter-9999.ebuild
+++ b/kde-apps/mailimporter/mailimporter-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"
diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild
index 6393827003..142eebdd12 100644
--- a/kde-apps/marble/marble-9999.ebuild
+++ b/kde-apps/marble/marble-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_SUBSLOT="true"
@@ -11,12 +11,16 @@ inherit kde5
 
 DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
 HOMEPAGE="https://marble.kde.org/"
-KEYWORDS=""
 
+KEYWORDS=""
 IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine"
 
 # FIXME (new package): libwlocate, WLAN-based geolocation
-RDEPEND="
+BDEPEND="
+	aprs? ( dev-lang/perl )
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
@@ -48,10 +52,7 @@ RDEPEND="
 	shapefile? ( sci-libs/shapelib:= )
 	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
 "
-DEPEND="${RDEPEND}
-	aprs? ( dev-lang/perl )
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"
 
 # bug 588320
 RESTRICT+=" test"
diff --git a/kde-apps/mbox-importer/mbox-importer-9999.ebuild b/kde-apps/mbox-importer/mbox-importer-9999.ebuild
index b6e96b9b1e..229399ba86 100644
--- a/kde-apps/mbox-importer/mbox-importer-9999.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-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" # FIXME: Check back for doc in release
 inherit kde5
diff --git a/kde-apps/messagelib/messagelib-9999.ebuild b/kde-apps/messagelib/messagelib-9999.ebuild
index 03487c869d..30e3dfbf92 100644
--- a/kde-apps/messagelib/messagelib-9999.ebuild
+++ b/kde-apps/messagelib/messagelib-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"
 VIRTUALX_REQUIRED="test"
diff --git a/kde-apps/minuet/minuet-9999.ebuild b/kde-apps/minuet/minuet-9999.ebuild
index b1f25f1391..9207259430 100644
--- a/kde-apps/minuet/minuet-9999.ebuild
+++ b/kde-apps/minuet/minuet-9999.ebuild
@@ -1,17 +1,20 @@
 # 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
 
-DESCRIPTION="A KDE Software for Music Education"
+DESCRIPTION="Music Education software by KDE"
 HOMEPAGE="https://minuet.kde.org/"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep ki18n)
@@ -21,6 +24,4 @@ RDEPEND="
 	$(add_qt_dep qtquickcontrols2)
 	media-sound/fluidsynth
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 4974965c1b..9e09218374 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-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"
diff --git a/kde-apps/palapeli/palapeli-9999.ebuild b/kde-apps/palapeli/palapeli-9999.ebuild
index ea2c344f4c..3d2d06b6c0 100644
--- a/kde-apps/palapeli/palapeli-9999.ebuild
+++ b/kde-apps/palapeli/palapeli-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="optional"
 inherit kde5
diff --git a/kde-apps/parley/parley-9999.ebuild b/kde-apps/parley/parley-9999.ebuild
index 737dc6950a..697117d784 100644
--- a/kde-apps/parley/parley-9999.ebuild
+++ b/kde-apps/parley/parley-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_DOC_DIR="docs"
diff --git a/kde-apps/picmi/picmi-9999.ebuild b/kde-apps/picmi/picmi-9999.ebuild
index 4f7e54e7bd..3c97c596a0 100644
--- a/kde-apps/picmi/picmi-9999.ebuild
+++ b/kde-apps/picmi/picmi-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"
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
index c1809efdfd..c229f8e35b 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-9999.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-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"
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
index d7756accff..bf6d456b2d 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-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"
diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild
index f3290fe61c..fc0594ff9b 100644
--- a/kde-apps/pimcommon/pimcommon-9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-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_DESIGNERPLUGIN="true"
 KDE_TEST="forceoptional"
@@ -13,6 +13,10 @@ LICENSE="GPL-2+ LGPL-2.1+"
 KEYWORDS=""
 IUSE="share"
 
+BDEPEND="
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep kmime) )
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcodecs)
@@ -46,8 +50,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kiconthemes)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep kmime) )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-common-libs:4
diff --git a/kde-apps/poxml/poxml-9999.ebuild b/kde-apps/poxml/poxml-9999.ebuild
index 747168a89d..b90babc065 100644
--- a/kde-apps/poxml/poxml-9999.ebuild
+++ b/kde-apps/poxml/poxml-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
@@ -10,8 +10,6 @@ DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
-	$(add_qt_dep qtxml)
-	sys-devel/gettext
-"
+BDEPEND="sys-devel/gettext"
+DEPEND="$(add_qt_dep qtxml)"
 RDEPEND="${DEPEND}"
diff --git a/kde-apps/print-manager/print-manager-9999.ebuild b/kde-apps/print-manager/print-manager-9999.ebuild
index bdcdbfeb2a..14ee1edb1a 100644
--- a/kde-apps/print-manager/print-manager-9999.ebuild
+++ b/kde-apps/print-manager/print-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-apps/rocs/rocs-9999.ebuild b/kde-apps/rocs/rocs-9999.ebuild
index f3eb040066..ea6082dff3 100644
--- a/kde-apps/rocs/rocs-9999.ebuild
+++ b/kde-apps/rocs/rocs-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="optional"
 KDE_TEST="true"
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
index cf1fa5a236..722c7e6418 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-9999.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-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-apps/spectacle/spectacle-9999.ebuild b/kde-apps/spectacle/spectacle-9999.ebuild
index 827a7deb2f..6591366842 100644
--- a/kde-apps/spectacle/spectacle-9999.ebuild
+++ b/kde-apps/spectacle/spectacle-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
diff --git a/kde-apps/step/step-9999.ebuild b/kde-apps/step/step-9999.ebuild
index 2225a13f0e..ac11b64e3f 100644
--- a/kde-apps/step/step-9999.ebuild
+++ b/kde-apps/step/step-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="optional"
 KDE_TEST="forceoptional"
@@ -12,7 +12,10 @@ HOMEPAGE="https://edu.kde.org/step/"
 KEYWORDS=""
 IUSE="+gsl nls +qalculate"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -38,9 +41,7 @@ RDEPEND="
 	gsl? ( sci-libs/gsl:= )
 	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	kde5_src_prepare
diff --git a/kde-apps/svgpart/svgpart-9999.ebuild b/kde-apps/svgpart/svgpart-9999.ebuild
index b79cefb556..9c5368429e 100644
--- a/kde-apps/svgpart/svgpart-9999.ebuild
+++ b/kde-apps/svgpart/svgpart-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-apps/sweeper/sweeper-9999.ebuild b/kde-apps/sweeper/sweeper-9999.ebuild
index c054203062..116decad93 100644
--- a/kde-apps/sweeper/sweeper-9999.ebuild
+++ b/kde-apps/sweeper/sweeper-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
diff --git a/kde-apps/thumbnailers/thumbnailers-9999.ebuild b/kde-apps/thumbnailers/thumbnailers-9999.ebuild
index 0e28e3ea4f..dd045760b7 100644
--- a/kde-apps/thumbnailers/thumbnailers-9999.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-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="kdegraphics-thumbnailers"
 inherit kde5
diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-9999.ebuild
index 357488b365..fd883aea1f 100644
--- a/kde-apps/umbrello/umbrello-9999.ebuild
+++ b/kde-apps/umbrello/umbrello-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"
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-9999.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-9999.ebuild
index d22766bf42..d12b5565f8 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-9999.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-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
author	Andreas Sturmlechner <asturm@gentoo.org>	2019-01-21 07:08:29 +0100
committer	Andreas Sturmlechner <asturm@gentoo.org>	2019-01-26 21:28:43 +0100
commit	a045dfdd144e285fc02ef8ca9f39a263dd786d7a (patch)
tree	9ba3fa055201217c1cdcabc1e22c51839d917d87
parent	kde-plasma: EAPI-7 bump (diff)
download	kde-a045dfdd.tar.gz kde-a045dfdd.tar.bz2 kde-a045dfdd.zip