From a045dfdd144e285fc02ef8ca9f39a263dd786d7a Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Mon, 21 Jan 2019 07:08:29 +0100
Subject: kde-apps: EAPI-7 bump

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild  |  2 +-
 kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild  |  2 +-
 .../akonadi-import-wizard-9999.ebuild                   |  2 +-
 kde-apps/akonadi-mime/akonadi-mime-9999.ebuild          |  3 +--
 kde-apps/akonadi-notes/akonadi-notes-9999.ebuild        |  2 +-
 kde-apps/akonadi-search/akonadi-search-9999.ebuild      |  6 ++++--
 kde-apps/akonadi/akonadi-9999.ebuild                    |  7 ++++---
 kde-apps/akonadiconsole/akonadiconsole-9999.ebuild      |  2 +-
 kde-apps/akregator/akregator-9999.ebuild                |  2 +-
 kde-apps/amor/amor-9999.ebuild                          |  2 +-
 kde-apps/analitza/analitza-9999.ebuild                  | 11 ++++++-----
 kde-apps/ark/ark-9999.ebuild                            |  6 ++++--
 kde-apps/artikulate/artikulate-9999.ebuild              |  2 +-
 kde-apps/audiocd-kio/audiocd-kio-9999.ebuild            |  2 +-
 kde-apps/baloo-widgets/baloo-widgets-9999.ebuild        |  2 +-
 kde-apps/blinken/blinken-9999.ebuild                    |  7 +++----
 kde-apps/bomber/bomber-9999.ebuild                      |  4 ++--
 kde-apps/bovo/bovo-9999.ebuild                          |  2 +-
 kde-apps/calendarjanitor/calendarjanitor-9999.ebuild    |  2 +-
 kde-apps/calendarsupport/calendarsupport-9999.ebuild    |  2 +-
 kde-apps/cantor/cantor-9999.ebuild                      |  2 +-
 kde-apps/cervisia/cervisia-9999.ebuild                  |  2 +-
 .../dolphin-plugins-bazaar-9999.ebuild                  |  2 +-
 .../dolphin-plugins-dropbox-9999.ebuild                 |  2 +-
 .../dolphin-plugins-git/dolphin-plugins-git-9999.ebuild |  2 +-
 .../dolphin-plugins-mercurial-9999.ebuild               |  2 +-
 .../dolphin-plugins-subversion-9999.ebuild              |  2 +-
 kde-apps/dolphin/dolphin-9999.ebuild                    | 12 ++++++------
 kde-apps/dragon/dragon-9999.ebuild                      | 11 ++++++-----
 kde-apps/eventviews/eventviews-9999.ebuild              |  2 +-
 kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild          | 11 ++++++-----
 kde-apps/filelight/filelight-9999.ebuild                |  2 +-
 kde-apps/granatier/granatier-9999.ebuild                |  2 +-
 kde-apps/grantlee-editor/grantlee-editor-9999.ebuild    |  2 +-
 kde-apps/grantleetheme/grantleetheme-9999.ebuild        |  2 +-
 kde-apps/gwenview/gwenview-9999.ebuild                  |  2 +-
 kde-apps/incidenceeditor/incidenceeditor-9999.ebuild    |  2 +-
 kde-apps/juk/juk-9999.ebuild                            |  2 +-
 kde-apps/k3b/k3b-9999.ebuild                            | 14 +++++++-------
 .../kaccounts-integration-9999.ebuild                   |  6 ++++--
 kde-apps/kaccounts-mobile/kaccounts-mobile-9999.ebuild  | 11 ++++++-----
 .../kaccounts-providers/kaccounts-providers-9999.ebuild | 12 ++++++------
 kde-apps/kaddressbook/kaddressbook-9999.ebuild          | 14 +++++++-------
 kde-apps/kajongg/kajongg-9999.ebuild                    |  2 +-
 kde-apps/kalarm/kalarm-9999.ebuild                      | 12 ++++++------
 kde-apps/kalarmcal/kalarmcal-9999.ebuild                | 12 ++++++------
 kde-apps/kalgebra/kalgebra-9999.ebuild                  |  4 ++--
 kde-apps/kalzium/kalzium-9999.ebuild                    |  2 +-
 kde-apps/kamera/kamera-9999.ebuild                      | 11 ++++++-----
 kde-apps/kamoso/kamoso-9999.ebuild                      |  2 +-
 kde-apps/kanagram/kanagram-9999.ebuild                  |  2 +-
 kde-apps/kapman/kapman-9999.ebuild                      |  2 +-
 kde-apps/kapptemplate/kapptemplate-9999.ebuild          |  4 ++--
 kde-apps/kate/kate-9999.ebuild                          |  2 +-
 kde-apps/katomic/katomic-9999.ebuild                    |  2 +-
 kde-apps/kbackup/kbackup-9999.ebuild                    | 11 +++--------
 kde-apps/kblackbox/kblackbox-9999.ebuild                |  4 ++--
 kde-apps/kblocks/kblocks-9999.ebuild                    |  4 ++--
 kde-apps/kblog/kblog-9999.ebuild                        |  2 +-
 kde-apps/kbounce/kbounce-9999.ebuild                    |  2 +-
 kde-apps/kbreakout/kbreakout-9999.ebuild                |  2 +-
 kde-apps/kbruch/kbruch-9999.ebuild                      |  2 +-
 kde-apps/kcachegrind/kcachegrind-9999.ebuild            | 12 ++++++------
 kde-apps/kcalc/kcalc-9999.ebuild                        | 11 ++++++-----
 kde-apps/kcalcore/kcalcore-9999.ebuild                  | 11 ++++++-----
 kde-apps/kcalutils/kcalutils-9999.ebuild                |  3 +--
 kde-apps/kcharselect/kcharselect-9999.ebuild            |  2 +-
 kde-apps/kcolorchooser/kcolorchooser-9999.ebuild        |  2 +-
 kde-apps/kcontacts/kcontacts-9999.ebuild                |  2 +-
 kde-apps/kcron/kcron-9999.ebuild                        |  2 +-
 kde-apps/kdav/kdav-9999.ebuild                          |  3 +--
 kde-apps/kde-dev-scripts/kde-dev-scripts-9999.ebuild    |  8 ++++----
 kde-apps/kde-dev-utils/kde-dev-utils-9999.ebuild        |  6 +++---
 kde-apps/kdebugsettings/kdebugsettings-9999.ebuild      |  2 +-
 kde-apps/kdeedu-data/kdeedu-data-9999.ebuild            |  5 ++---
 .../kdegraphics-mobipocket-9999.ebuild                  |  2 +-
 .../kdenetwork-filesharing-9999.ebuild                  |  4 ++--
 kde-apps/kdenlive/kdenlive-9999.ebuild                  |  6 ++++--
 kde-apps/kdepim-addons/kdepim-addons-9999.ebuild        |  4 ++--
 kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild  |  2 +-
 kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild      |  8 +++++---
 kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild  |  6 +++---
 .../kdesdk-thumbnailers/kdesdk-thumbnailers-9999.ebuild |  2 +-
 kde-apps/kdf/kdf-9999.ebuild                            |  2 +-
 kde-apps/kdialog/kdialog-9999.ebuild                    |  2 +-
 kde-apps/kdiamond/kdiamond-9999.ebuild                  | 10 ++++------
 kde-apps/keditbookmarks/keditbookmarks-9999.ebuild      |  6 +++---
 kde-apps/kfind/kfind-9999.ebuild                        |  2 +-
 kde-apps/kfloppy/kfloppy-9999.ebuild                    |  4 ++--
 kde-apps/kfourinline/kfourinline-9999.ebuild            |  8 +++-----
 kde-apps/kgeography/kgeography-9999.ebuild              |  2 +-
 kde-apps/kget/kget-9999.ebuild                          |  2 +-
 kde-apps/kgoldrunner/kgoldrunner-9999.ebuild            |  8 +++-----
 kde-apps/kgpg/kgpg-9999.ebuild                          |  2 +-
 kde-apps/khangman/khangman-9999.ebuild                  |  2 +-
 kde-apps/khelpcenter/khelpcenter-9999.ebuild            |  2 +-
 .../kidentitymanagement/kidentitymanagement-9999.ebuild |  2 +-
 kde-apps/kig/kig-9999.ebuild                            |  2 +-
 kde-apps/kigo/kigo-9999.ebuild                          |  2 +-
 kde-apps/killbots/killbots-9999.ebuild                  |  2 +-
 kde-apps/kimagemapeditor/kimagemapeditor-9999.ebuild    |  2 +-
 kde-apps/kimap/kimap-9999.ebuild                        | 13 ++++++-------
 kde-apps/kio-extras/kio-extras-9999.ebuild              | 16 +++++++---------
 kde-apps/kiriki/kiriki-9999.ebuild                      |  8 +++-----
 kde-apps/kiten/kiten-9999.ebuild                        |  2 +-
 kde-apps/kitinerary/kitinerary-9999.ebuild              |  2 +-
 kde-apps/kjots/kjots-9999.ebuild                        |  2 +-
 kde-apps/kjumpingcube/kjumpingcube-9999.ebuild          |  8 +++-----
 kde-apps/kldap/kldap-9999.ebuild                        |  2 +-
 kde-apps/kleopatra/kleopatra-9999.ebuild                |  4 ++--
 kde-apps/klettres/klettres-9999.ebuild                  |  2 +-
 kde-apps/klickety/klickety-9999.ebuild                  |  4 ++--
 kde-apps/klines/klines-9999.ebuild                      |  8 +++-----
 kde-apps/kmag/kmag-9999.ebuild                          |  2 +-
 kde-apps/kmahjongg/kmahjongg-9999.ebuild                |  8 +++-----
 .../kmail-account-wizard-9999.ebuild                    |  2 +-
 kde-apps/kmail/kmail-9999.ebuild                        |  8 +++++---
 kde-apps/kmailtransport/kmailtransport-9999.ebuild      | 12 ++++++------
 kde-apps/kmbox/kmbox-9999.ebuild                        |  2 +-
 kde-apps/kmime/kmime-9999.ebuild                        |  2 +-
 kde-apps/kmines/kmines-9999.ebuild                      |  8 +++-----
 kde-apps/kmousetool/kmousetool-9999.ebuild              |  2 +-
 kde-apps/kmouth/kmouth-9999.ebuild                      |  2 +-
 kde-apps/kmplot/kmplot-9999.ebuild                      |  2 +-
 kde-apps/knavalbattle/knavalbattle-9999.ebuild          |  2 +-
 kde-apps/knetwalk/knetwalk-9999.ebuild                  |  2 +-
 kde-apps/knotes/knotes-9999.ebuild                      |  2 +-
 kde-apps/kolf/kolf-9999.ebuild                          |  2 +-
 kde-apps/kollision/kollision-9999.ebuild                |  2 +-
 kde-apps/kolourpaint/kolourpaint-9999.ebuild            |  8 ++++----
 kde-apps/kompare/kompare-9999.ebuild                    |  2 +-
 kde-apps/konqueror/konqueror-9999.ebuild                |  2 +-
 kde-apps/konquest/konquest-9999.ebuild                  |  2 +-
 kde-apps/konsole/konsole-9999.ebuild                    |  2 +-
 kde-apps/konsolekalendar/konsolekalendar-9999.ebuild    |  4 ++--
 kde-apps/kontact/kontact-9999.ebuild                    |  2 +-
 kde-apps/kontactinterface/kontactinterface-9999.ebuild  |  2 +-
 kde-apps/kopete/kopete-9999.ebuild                      | 14 +++++++-------
 kde-apps/korganizer/korganizer-9999.ebuild              |  6 ++++--
 kde-apps/kpat/kpat-9999.ebuild                          |  3 +--
 kde-apps/kpimtextedit/kpimtextedit-9999.ebuild          | 12 ++++++------
 kde-apps/kpkpass/kpkpass-9999.ebuild                    |  2 +-
 kde-apps/kqtquickcharts/kqtquickcharts-9999.ebuild      |  2 +-
 kde-apps/krdc/krdc-9999.ebuild                          |  3 +--
 kde-apps/kreversi/kreversi-9999.ebuild                  |  2 +-
 kde-apps/krfb/krfb-9999.ebuild                          |  2 +-
 .../kross-interpreters/kross-interpreters-9999.ebuild   |  2 +-
 kde-apps/kruler/kruler-9999.ebuild                      |  2 +-
 kde-apps/kscd/kscd-9999.ebuild                          |  2 +-
 kde-apps/kshisen/kshisen-9999.ebuild                    |  2 +-
 kde-apps/ksirk/ksirk-9999.ebuild                        |  2 +-
 kde-apps/ksmtp/ksmtp-9999.ebuild                        |  2 +-
 kde-apps/ksnakeduel/ksnakeduel-9999.ebuild              |  2 +-
 kde-apps/kspaceduel/kspaceduel-9999.ebuild              |  2 +-
 kde-apps/ksquares/ksquares-9999.ebuild                  |  2 +-
 kde-apps/ksudoku/ksudoku-9999.ebuild                    |  2 +-
 kde-apps/ksystemlog/ksystemlog-9999.ebuild              |  7 ++++---
 kde-apps/kteatime/kteatime-9999.ebuild                  |  2 +-
 kde-apps/ktimer/ktimer-9999.ebuild                      |  2 +-
 kde-apps/ktouch/ktouch-9999.ebuild                      |  2 +-
 kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-9999.ebuild  | 10 +++++++---
 kde-apps/ktp-approver/ktp-approver-9999.ebuild          |  2 +-
 kde-apps/ktp-auth-handler/ktp-auth-handler-9999.ebuild  |  2 +-
 kde-apps/ktp-call-ui/ktp-call-ui-9999.ebuild            |  2 +-
 .../ktp-common-internals-9999.ebuild                    |  2 +-
 kde-apps/ktp-contact-list/ktp-contact-list-9999.ebuild  |  2 +-
 .../ktp-contact-runner/ktp-contact-runner-9999.ebuild   |  2 +-
 .../ktp-desktop-applets/ktp-desktop-applets-9999.ebuild |  2 +-
 .../ktp-filetransfer-handler-9999.ebuild                |  2 +-
 kde-apps/ktp-kded-module/ktp-kded-module-9999.ebuild    |  2 +-
 kde-apps/ktp-send-file/ktp-send-file-9999.ebuild        |  2 +-
 kde-apps/ktp-text-ui/ktp-text-ui-9999.ebuild            |  2 +-
 kde-apps/ktuberling/ktuberling-9999.ebuild              |  2 +-
 kde-apps/kturtle/kturtle-9999.ebuild                    |  2 +-
 kde-apps/kubrick/kubrick-9999.ebuild                    |  2 +-
 kde-apps/kwalletmanager/kwalletmanager-9999.ebuild      |  3 +--
 kde-apps/kwave/kwave-9999.ebuild                        | 17 +++++++++--------
 kde-apps/kwordquiz/kwordquiz-9999.ebuild                |  2 +-
 kde-apps/kwrite/kwrite-9999.ebuild                      |  2 +-
 kde-apps/libgravatar/libgravatar-9999.ebuild            |  3 +--
 kde-apps/libkcddb/libkcddb-9999.ebuild                  | 10 +++++-----
 kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild    |  2 +-
 kde-apps/libkdcraw/libkdcraw-9999.ebuild                |  2 +-
 kde-apps/libkdegames/libkdegames-9999.ebuild            |  2 +-
 kde-apps/libkdepim/libkdepim-9999.ebuild                |  2 +-
 .../libkeduvocdocument/libkeduvocdocument-9999.ebuild   |  4 ++--
 kde-apps/libkexiv2/libkexiv2-9999.ebuild                |  2 +-
 kde-apps/libkgapi/libkgapi-9999.ebuild                  | 12 ++++++------
 kde-apps/libkgeomap/libkgeomap-9999.ebuild              |  2 +-
 kde-apps/libkipi/libkipi-9999.ebuild                    |  7 ++-----
 kde-apps/libkleo/libkleo-9999.ebuild                    |  2 +-
 kde-apps/libkmahjongg/libkmahjongg-9999.ebuild          |  2 +-
 kde-apps/libkomparediff2/libkomparediff2-9999.ebuild    |  2 +-
 kde-apps/libksane/libksane-9999.ebuild                  |  7 ++-----
 kde-apps/libksieve/libksieve-9999.ebuild                |  2 +-
 kde-apps/libktnef/libktnef-9999.ebuild                  |  2 +-
 kde-apps/lokalize/lokalize-9999.ebuild                  |  5 ++---
 kde-apps/lskat/lskat-9999.ebuild                        |  2 +-
 kde-apps/mailcommon/mailcommon-9999.ebuild              | 12 ++++++------
 kde-apps/mailimporter/mailimporter-9999.ebuild          |  2 +-
 kde-apps/marble/marble-9999.ebuild                      | 15 ++++++++-------
 kde-apps/mbox-importer/mbox-importer-9999.ebuild        |  2 +-
 kde-apps/messagelib/messagelib-9999.ebuild              |  2 +-
 kde-apps/minuet/minuet-9999.ebuild                      | 13 +++++++------
 kde-apps/okular/okular-9999.ebuild                      |  2 +-
 kde-apps/palapeli/palapeli-9999.ebuild                  |  2 +-
 kde-apps/parley/parley-9999.ebuild                      |  2 +-
 kde-apps/picmi/picmi-9999.ebuild                        |  2 +-
 .../pim-data-exporter/pim-data-exporter-9999.ebuild     |  2 +-
 kde-apps/pim-sieve-editor/pim-sieve-editor-9999.ebuild  |  2 +-
 kde-apps/pimcommon/pimcommon-9999.ebuild                |  8 +++++---
 kde-apps/poxml/poxml-9999.ebuild                        |  8 +++-----
 kde-apps/print-manager/print-manager-9999.ebuild        |  2 +-
 kde-apps/rocs/rocs-9999.ebuild                          |  2 +-
 .../signon-kwallet-extension-9999.ebuild                |  2 +-
 kde-apps/spectacle/spectacle-9999.ebuild                |  2 +-
 kde-apps/step/step-9999.ebuild                          | 11 ++++++-----
 kde-apps/svgpart/svgpart-9999.ebuild                    |  2 +-
 kde-apps/sweeper/sweeper-9999.ebuild                    |  2 +-
 kde-apps/thumbnailers/thumbnailers-9999.ebuild          |  2 +-
 kde-apps/umbrello/umbrello-9999.ebuild                  |  2 +-
 kde-apps/zeroconf-ioslave/zeroconf-ioslave-9999.ebuild  |  2 +-
 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 191936c0942..a2e187bd071 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 a2d84b48a34..8dee6162b1f 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 e9e6564a12c..5168e3991b8 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 ed48bb09987..a4de234ed94 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 e427fce293b..e8162fc5ea6 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 4a7eb323077..ee7fbd51290 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 447c51f57cd..afeedcf9283 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 b7328b00dea..702a8323453 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 89b106bdb7e..6a6524be927 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 08f38bc56fe..28deca51882 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 f5962ec2aee..e623dc462cc 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 b8686fc0091..7c86522965f 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 b7904237074..d28227b2e31 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 11ec6e3bcdc..d62579e45d7 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 eaac4b2ca4c..b5fcff11da3 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 9a8a8831e9b..9a9d30c3eb8 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 46a9e03a8c6..d23cfec2175 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 c3a58b40615..1c337def6e8 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 c193c3b55b8..f4a453f8d4f 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 8a4808412dc..86a6d6c13ff 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 d360f78fcf2..7a36bdd9db2 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 aab1cbc30b3..cf9bdf997f2 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 267649ef0e0..12b213b98c6 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 1bd465cd778..dc7db3648ed 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 675f74ab28d..9e8570dce9d 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 377721eabdb..a450ae22326 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 f9939c52fd6..61777c66320 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 0ae289fa9b7..51e9f79ae94 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 8113ee8b169..2aa0eaa8bb1 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 d8a9799321c..4a16e68bee4 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 021fc31e601..90aa888556b 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 ea53f9d7483..b84a3de70bc 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 2d75aaf5d7e..dde1da41e1b 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 5bafa8b021c..4a5ff58889f 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 09ffc31e11a..41f99eb7a66 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 9848f140242..a31983da6dc 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 6ea94a14e6a..37c3b14e3ae 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 b58be8c1f0c..e44bb0708dd 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 9cc99e2c664..d7875db4629 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 2723c40c39a..ce47804747f 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 0dd931ab4f5..5c5c23732f9 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 31cfa58c53b..423010b5683 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 2b47f5f96b1..eadf70337f0 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 f6afaa24d39..eed53fc7c8a 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 61a03a814f2..0e50a0b45e0 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 59c0b281137..bf7b3162c49 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 25df7e92ac9..43ff7eb9fed 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 fed5a19256f..9d56e6100a0 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 7dde9f6b9fb..b686c713028 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 ff658535d34..2998993a167 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 d91c64a3f32..09b8a8e374f 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 e3eef740808..157bb16e0cf 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 20b3082a331..c75e9c73b56 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 f399ee7560e..3d210148137 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 fe2906ac3f5..3aa6db6b129 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 d1ba5e66d5f..46cfa745591 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 b841d2a9aec..f05c8f22617 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 028b9d49792..3767785ce79 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 927e460596f..136a0409963 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 067bedca17c..6b6344931d3 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 c1ee39773c1..73d5b8ebdca 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 3274b72d807..69a34b790c0 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 6b7a26a4bb3..2f02a926061 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 7730d15835b..2a4049ef528 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 30a1f831b98..086d2a5dd68 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 fbb33cce83b..34483cbe234 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 cf9e2d82383..1ac05c5b9fd 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 fce1c8cb321..2978c148660 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 7c1dc9d7f0c..1f6d5f8693d 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 8d967794072..c5e1b37e176 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 86a7da8e079..a3ea9a026b5 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 768ac6be4f8..c5cbe291921 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 96642617e30..df9bd1b337e 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 28dc99f6b7b..c7c2a49a2bd 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 a7d960405f8..5613d44c2e2 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 009449c8768..a46eb3c13e6 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 7dcc2fb403a..2d11f400901 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 4544f719093..d190a091499 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 a52dbe3041b..cefbe07b4e7 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 77bb277fc36..2640615efc4 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 640863d973b..312f3f0f043 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 8310b2a0f94..3173f6269d6 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 fc762fa6ae1..7340ae5527e 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 87778c00a42..131bcda8285 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 9e6a3c04cc1..7980441849e 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 84f598ff9a1..1d9db4f41a1 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
-"
+