[gentoo-commits] proj/kde:master commit in: kde-frameworks/oxygen-icons/, kde-frameworks/kdbusaddons/, ...

[Andreas Sturmlechner]

commit:     b34c05ee67c5ca7d00dda5ab239835d1a6e3a74e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 21:31:55 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 20:28:43 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b34c05ee

kde-frameworks: EAPI-7 bump

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

 kde-frameworks/attica/attica-9999.ebuild                |  2 +-
 kde-frameworks/baloo/baloo-9999.ebuild                  |  2 +-
 kde-frameworks/bluez-qt/bluez-qt-9999.ebuild            |  2 +-
 .../breeze-icons-rcc/breeze-icons-rcc-9999.ebuild       |  5 ++---
 kde-frameworks/breeze-icons/breeze-icons-9999.ebuild    |  5 ++---
 .../extra-cmake-modules/extra-cmake-modules-9999.ebuild |  4 ++--
 .../frameworkintegration-9999.ebuild                    |  6 +++---
 .../kactivities-stats/kactivities-stats-9999.ebuild     |  2 +-
 kde-frameworks/kactivities/kactivities-9999.ebuild      |  2 +-
 kde-frameworks/kapidox/kapidox-9999.ebuild              |  2 +-
 kde-frameworks/karchive/karchive-9999.ebuild            |  6 +++---
 kde-frameworks/kauth/kauth-9999.ebuild                  | 11 ++++++-----
 kde-frameworks/kbookmarks/kbookmarks-9999.ebuild        |  6 ++++--
 kde-frameworks/kcmutils/kcmutils-9999.ebuild            |  6 +++---
 kde-frameworks/kcodecs/kcodecs-9999.ebuild              |  4 ++--
 kde-frameworks/kcompletion/kcompletion-9999.ebuild      | 11 ++++++-----
 kde-frameworks/kconfig/kconfig-9999.ebuild              | 13 +++++++------
 .../kconfigwidgets/kconfigwidgets-9999.ebuild           | 11 ++++++-----
 kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild      | 12 ++++++------
 kde-frameworks/kcrash/kcrash-9999.ebuild                |  8 +++++---
 kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild      | 11 ++++++-----
 kde-frameworks/kdeclarative/kdeclarative-9999.ebuild    |  2 +-
 kde-frameworks/kded/kded-9999.ebuild                    | 11 ++++++-----
 .../kdelibs4support/kdelibs4support-9999.ebuild         | 14 ++++++++------
 .../kdesignerplugin/kdesignerplugin-9999.ebuild         | 11 ++++++-----
 kde-frameworks/kdesu/kdesu-9999.ebuild                  |  2 +-
 kde-frameworks/kdewebkit/kdewebkit-9999.ebuild          |  2 +-
 kde-frameworks/kdnssd/kdnssd-9999.ebuild                | 11 ++++++-----
 kde-frameworks/kdoctools/kdoctools-9999.ebuild          | 15 ++++++++-------
 kde-frameworks/kemoticons/kemoticons-9999.ebuild        |  6 +++---
 kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild  |  6 ++++--
 kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild    | 11 ++++++-----
 kde-frameworks/kguiaddons/kguiaddons-9999.ebuild        |  2 +-
 kde-frameworks/kholidays/kholidays-9999.ebuild          | 12 ++++++------
 kde-frameworks/khtml/khtml-9999.ebuild                  | 10 ++++++----
 kde-frameworks/ki18n/ki18n-9999.ebuild                  | 11 ++++++-----
 kde-frameworks/kiconthemes/kiconthemes-9999.ebuild      |  6 +++---
 kde-frameworks/kidletime/kidletime-9999.ebuild          |  6 +++---
 kde-frameworks/kimageformats/kimageformats-9999.ebuild  |  6 +++---
 kde-frameworks/kinit/kinit-9999.ebuild                  |  6 ++++--
 kde-frameworks/kio/kio-9999.ebuild                      |  6 ++++--
 kde-frameworks/kirigami/kirigami-9999.ebuild            | 11 ++++++-----
 kde-frameworks/kitemmodels/kitemmodels-9999.ebuild      |  4 ++--
 kde-frameworks/kitemviews/kitemviews-9999.ebuild        | 11 ++++++-----
 kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild      |  6 ++++--
 kde-frameworks/kjs/kjs-9999.ebuild                      | 11 ++++++-----
 kde-frameworks/kjsembed/kjsembed-9999.ebuild            |  2 +-
 kde-frameworks/kmediaplayer/kmediaplayer-9999.ebuild    |  6 +++---
 kde-frameworks/knewstuff/knewstuff-9999.ebuild          |  2 +-
 .../knotifications/knotifications-9999.ebuild           |  6 ++++--
 kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild  |  6 +++---
 kde-frameworks/kpackage/kpackage-9999.ebuild            | 11 ++++++-----
 kde-frameworks/kparts/kparts-9999.ebuild                |  2 +-
 kde-frameworks/kpeople/kpeople-9999.ebuild              |  6 ++----
 kde-frameworks/kplotting/kplotting-9999.ebuild          |  6 +++---
 kde-frameworks/kpty/kpty-9999.ebuild                    |  2 +-
 kde-frameworks/kross/kross-9999.ebuild                  |  2 +-
 kde-frameworks/krunner/krunner-9999.ebuild              |  2 +-
 kde-frameworks/kservice/kservice-9999.ebuild            | 17 +++++++++--------
 kde-frameworks/ktexteditor/ktexteditor-9999.ebuild      | 11 ++++++-----
 kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild    |  6 +++---
 .../kunitconversion/kunitconversion-9999.ebuild         |  6 +++---
 kde-frameworks/kwallet/kwallet-9999.ebuild              | 11 ++++++-----
 kde-frameworks/kwayland/kwayland-9999.ebuild            |  2 +-
 .../kwidgetsaddons/kwidgetsaddons-9999.ebuild           | 11 ++++++-----
 kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild  |  8 +++++---
 kde-frameworks/kxmlgui/kxmlgui-9999.ebuild              |  6 +++---
 kde-frameworks/kxmlrpcclient/kxmlrpcclient-9999.ebuild  |  2 +-
 .../modemmanager-qt/modemmanager-qt-9999.ebuild         | 11 ++++++-----
 .../networkmanager-qt/networkmanager-qt-9999.ebuild     | 12 ++++++------
 kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild    |  5 ++---
 kde-frameworks/plasma/plasma-9999.ebuild                |  6 ++++--
 kde-frameworks/prison/prison-9999.ebuild                |  2 +-
 kde-frameworks/purpose/purpose-9999.ebuild              |  2 +-
 .../qqc2-desktop-style/qqc2-desktop-style-9999.ebuild   |  2 +-
 kde-frameworks/solid/solid-9999.ebuild                  | 13 +++++++------
 kde-frameworks/sonnet/sonnet-9999.ebuild                | 11 ++++++-----
 kde-frameworks/syndication/syndication-9999.ebuild      | 14 +++++++-------
 .../syntax-highlighting/syntax-highlighting-9999.ebuild | 13 +++++++------
 kde-frameworks/threadweaver/threadweaver-9999.ebuild    |  2 +-
 80 files changed, 298 insertions(+), 258 deletions(-)

diff --git a/kde-frameworks/attica/attica-9999.ebuild b/kde-frameworks/attica/attica-9999.ebuild
index e69d7959d3..e4c52d3d9b 100644
--- a/kde-frameworks/attica/attica-9999.ebuild
+++ b/kde-frameworks/attica/attica-9999.ebuild
@@ -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-frameworks/baloo/baloo-9999.ebuild b/kde-frameworks/baloo/baloo-9999.ebuild
index 94e13532c3..17c1032a13 100644
--- a/kde-frameworks/baloo/baloo-9999.ebuild
+++ b/kde-frameworks/baloo/baloo-9999.ebuild
@@ -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-frameworks/bluez-qt/bluez-qt-9999.ebuild b/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild
index 11f3a1320f..bb563902ed 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5 udev

diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild
index 76f200bd7a..d459c62bd9 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild
@@ -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"
@@ -14,7 +14,7 @@ LICENSE="LGPL-3"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
+BDEPEND="
 	$(add_frameworks_dep extra-cmake-modules)
 	$(add_qt_dep qtcore)
 	test? (
@@ -22,7 +22,6 @@ DEPEND="
 		app-misc/fdupes
 	)
 "
-RDEPEND=""
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild b/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild
index 3913787e3f..1efd923e7f 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild
@@ -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"
@@ -13,7 +13,7 @@ LICENSE="LGPL-3"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
+BDEPEND="
 	$(add_frameworks_dep extra-cmake-modules)
 	$(add_qt_dep qtcore)
 	test? (
@@ -21,7 +21,6 @@ DEPEND="
 		app-misc/fdupes
 	)
 "
-RDEPEND=""
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
index 936c681e56..c9c1d975bb 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
@@ -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=( python{2_7,3_{4,5,6,7}} )
 ECM_KDEINSTALLDIRS="false"
@@ -18,7 +18,7 @@ LICENSE="BSD"
 KEYWORDS=""
 IUSE="doc test"
 
-DEPEND="
+BDEPEND="
 	doc? (
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')

diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
index e9a5b50758..8079df8779 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_QTHELP="false"
 VIRTUALX_REQUIRED="test"
@@ -12,7 +12,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="appstream X"
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep ki18n)
@@ -32,7 +32,7 @@ RDEPEND="
 		x11-libs/libxcb
 	)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 # requires running kde environment
 RESTRICT+=" test"

diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-9999.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-9999.ebuild
index e804eab415..ad2f137677 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-9999.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-9999.ebuild
@@ -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-frameworks/kactivities/kactivities-9999.ebuild b/kde-frameworks/kactivities/kactivities-9999.ebuild
index 7053ae2566..16b7b62f1d 100644
--- a/kde-frameworks/kactivities/kactivities-9999.ebuild
+++ b/kde-frameworks/kactivities/kactivities-9999.ebuild
@@ -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-frameworks/kapidox/kapidox-9999.ebuild b/kde-frameworks/kapidox/kapidox-9999.ebuild
index 7dfd256486..265bf30a4b 100644
--- a/kde-frameworks/kapidox/kapidox-9999.ebuild
+++ b/kde-frameworks/kapidox/kapidox-9999.ebuild
@@ -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"

diff --git a/kde-frameworks/karchive/karchive-9999.ebuild b/kde-frameworks/karchive/karchive-9999.ebuild
index 574e5f1044..d82b471c01 100644
--- a/kde-frameworks/karchive/karchive-9999.ebuild
+++ b/kde-frameworks/karchive/karchive-9999.ebuild
@@ -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,12 +10,12 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS=""
 IUSE="+bzip2 +lzma"
 
-RDEPEND="
+DEPEND="
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
 	lzma? ( app-arch/xz-utils )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/kauth/kauth-9999.ebuild b/kde-frameworks/kauth/kauth-9999.ebuild
index 855e0b796d..da7c0979dd 100644
--- a/kde-frameworks/kauth/kauth-9999.ebuild
+++ b/kde-frameworks/kauth/kauth-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,16 +11,17 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE="nls +policykit"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	policykit? ( sys-auth/polkit-qt[qt5(+)] )
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"
 PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
 
 src_configure() {

diff --git a/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild b/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild
index 6403aca233..40a36966c9 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,6 +11,9 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="nls"
 
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
 RDEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
@@ -25,5 +28,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	$(add_frameworks_dep kconfigwidgets)
-	nls? ( $(add_qt_dep linguist-tools) )
 "

diff --git a/kde-frameworks/kcmutils/kcmutils-9999.ebuild b/kde-frameworks/kcmutils/kcmutils-9999.ebuild
index e467764d46..b4ab301567 100644
--- a/kde-frameworks/kcmutils/kcmutils-9999.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FRAMEWORK_TEST="false"
 inherit kde5
@@ -11,7 +11,7 @@ LICENSE="LGPL-2"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -28,4 +28,4 @@ RDEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-frameworks/kcodecs/kcodecs-9999.ebuild b/kde-frameworks/kcodecs/kcodecs-9999.ebuild
index 6fd9d7d229..2d2b211f71 100644
--- a/kde-frameworks/kcodecs/kcodecs-9999.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-9999.ebuild
@@ -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+ LGPL-2+"
 KEYWORDS=""
 IUSE="nls"
 
-DEPEND="
+BDEPEND="
 	dev-util/gperf
 	nls? ( $(add_qt_dep linguist-tools) )
 "

diff --git a/kde-frameworks/kcompletion/kcompletion-9999.ebuild b/kde-frameworks/kcompletion/kcompletion-9999.ebuild
index 7b2de6c67c..697bfe8d1f 100644
--- a/kde-frameworks/kcompletion/kcompletion-9999.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -10,12 +10,13 @@ DESCRIPTION="Framework for common completion tasks such as filename or URL compl
 KEYWORDS=""
 IUSE="nls"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"

diff --git a/kde-frameworks/kconfig/kconfig-9999.ebuild b/kde-frameworks/kconfig/kconfig-9999.ebuild
index 9805bef308..e35e32094b 100644
--- a/kde-frameworks/kconfig/kconfig-9999.ebuild
+++ b/kde-frameworks/kconfig/kconfig-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,15 +11,16 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="dbus nls"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtxml)
 	dbus? ( $(add_qt_dep qtdbus) )
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	test? ( $(add_qt_dep qtconcurrent) )
-"
+RDEPEND="${DEPEND}"
 
 # bug 560086
 RESTRICT+=" test"

diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild
index 1c00a79575..d77da6ffdc 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,7 +11,10 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="+man"
 
-RDEPEND="
+BDEPEND="
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+DEPEND="
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
@@ -23,9 +26,7 @@ RDEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild
index 20e135e1a3..ee67cb326a 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild
@@ -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,14 +10,14 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="fam nls"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_qt_dep qtcore 'icu')
 	fam? ( virtual/fam )
 "
-DEPEND="${RDEPEND}
-	x11-misc/shared-mime-info
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/kcrash/kcrash-9999.ebuild b/kde-frameworks/kcrash/kcrash-9999.ebuild
index c3ef99d496..4b67a59c6e 100644
--- a/kde-frameworks/kcrash/kcrash-9999.ebuild
+++ b/kde-frameworks/kcrash/kcrash-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -14,6 +14,10 @@ IUSE="nls"
 # requires running kde environment
 RESTRICT+=" test"
 
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtwidgets) )
+"
 RDEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kwindowsystem)
@@ -23,6 +27,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto
-	nls? ( $(add_qt_dep linguist-tools) )
-	test? ( $(add_qt_dep qtwidgets) )
 "

diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild
index 30d9bd422b..5b6b51eacc 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALDBUS_TEST="true"
 inherit kde5
@@ -11,13 +11,14 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="nls X"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_qt_dep qtdbus)
 	X? ( $(add_qt_dep qtx11extras) )
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild b/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild
index 117c9aef96..5bb550f2c5 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild
@@ -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-frameworks/kded/kded-9999.ebuild b/kde-frameworks/kded/kded-9999.ebuild
index c365349ddd..4826f9e65c 100644
--- a/kde-frameworks/kded/kded-9999.ebuild
+++ b/kde-frameworks/kded/kded-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_QTHELP="false"
 KDE_TEST="false"
@@ -12,7 +12,10 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="+man"
 
-RDEPEND="
+BDEPEND="
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
@@ -23,9 +26,7 @@ RDEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
index e402bd9c5c..6c9f8eb380 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_QTHELP="false"
 VIRTUALX_REQUIRED="test"
@@ -12,6 +12,12 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="libressl X"
 
+BDEPEND="
+	$(add_frameworks_dep kdoctools)
+	dev-lang/perl
+	dev-perl/URI
+	test? ( $(add_qt_dep qtconcurrent) )
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kcodecs)
@@ -23,6 +29,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kded)
 	$(add_frameworks_dep kdesignerplugin)
+	$(add_frameworks_dep kdoctools)
 	$(add_frameworks_dep kemoticons)
 	$(add_frameworks_dep kglobalaccel)
 	$(add_frameworks_dep kguiaddons)
@@ -59,15 +66,10 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdoctools)
 	$(add_qt_dep designer)
-	dev-lang/perl
-	dev-perl/URI
-	test? ( $(add_qt_dep qtconcurrent) )
 	X? ( x11-base/xorg-proto )
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdoctools)
 	$(add_frameworks_dep kinit)
 	$(add_frameworks_dep kitemmodels)
 	$(add_qt_dep qtxml)

diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-9999.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-9999.ebuild
index 38a20846cc..008d15cb0a 100644
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-9999.ebuild
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-9999.ebuild
@@ -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_QTHELP="false"
@@ -13,7 +13,10 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE="designer nls webkit"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	designer? (
@@ -35,9 +38,7 @@ RDEPEND="
 		$(add_frameworks_dep kdewebkit)
 	)
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/kdesu/kdesu-9999.ebuild b/kde-frameworks/kdesu/kdesu-9999.ebuild
index 41378dacd6..50df61248c 100644
--- a/kde-frameworks/kdesu/kdesu-9999.ebuild
+++ b/kde-frameworks/kdesu/kdesu-9999.ebuild
@@ -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-frameworks/kdewebkit/kdewebkit-9999.ebuild b/kde-frameworks/kdewebkit/kdewebkit-9999.ebuild
index 3259158b2e..4ca70d3911 100644
--- a/kde-frameworks/kdewebkit/kdewebkit-9999.ebuild
+++ b/kde-frameworks/kdewebkit/kdewebkit-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_QTHELP="false"
 KDE_TEST="false"

diff --git a/kde-frameworks/kdnssd/kdnssd-9999.ebuild b/kde-frameworks/kdnssd/kdnssd-9999.ebuild
index 2e9052d452..13a447ef88 100644
--- a/kde-frameworks/kdnssd/kdnssd-9999.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-9999.ebuild
@@ -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,16 +10,17 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="nls zeroconf"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_qt_dep qtnetwork)
 	zeroconf? (
 		$(add_qt_dep qtdbus)
 		net-dns/avahi[mdnsresponder-compat]
 	)
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/kdoctools/kdoctools-9999.ebuild b/kde-frameworks/kdoctools/kdoctools-9999.ebuild
index cf4e2d5463..619b8603f2 100644
--- a/kde-frameworks/kdoctools/kdoctools-9999.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_QTHELP="false"
 inherit kde5
@@ -11,7 +11,12 @@ LICENSE="MIT"
 KEYWORDS=""
 IUSE="nls"
 
-RDEPEND="
+BDEPEND="
+	dev-lang/perl
+	dev-perl/URI
+	nls? ( $(add_frameworks_dep ki18n) )
+"
+DEPEND="
 	$(add_frameworks_dep karchive)
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
@@ -19,11 +24,7 @@ RDEPEND="
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 "
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/URI
-	nls? ( $(add_frameworks_dep ki18n) )
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/kemoticons/kemoticons-9999.ebuild b/kde-frameworks/kemoticons/kemoticons-9999.ebuild
index cfefbcd19b..c4818fb314 100644
--- a/kde-frameworks/kemoticons/kemoticons-9999.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,7 +11,7 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
@@ -20,7 +20,7 @@ RDEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 # requires running kde environment
 RESTRICT+=" test"

diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
index 1f31f4b090..de47594427 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
@@ -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=( python{2_7,3_{4,5,6,7}} )
 inherit kde5 python-any-r1
@@ -10,6 +10,9 @@ DESCRIPTION="Library for extracting file metadata"
 KEYWORDS=""
 IUSE="epub exif ffmpeg kernel_linux libav office pdf taglib"
 
+BDEPEND="
+	test? ( ${PYTHON_DEPS} )
+"
 RDEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_qt_dep qtxml)
@@ -25,7 +28,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	kernel_linux? ( sys-apps/attr )
-	test? ( ${PYTHON_DEPS} )
 "
 
 pkg_setup() {

diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild
index f1afa7c755..e9f5777314 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,7 +11,10 @@ KEYWORDS=""
 LICENSE="LGPL-2+"
 IUSE="nls"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
@@ -24,6 +27,4 @@ RDEPEND="
 	x11-libs/libxcb
 	x11-libs/xcb-util-keysyms
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"

diff --git a/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild b/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild
index c5dae277f6..453b4d319f 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5

diff --git a/kde-frameworks/kholidays/kholidays-9999.ebuild b/kde-frameworks/kholidays/kholidays-9999.ebuild
index a360ab7202..cbc5a95fa2 100644
--- a/kde-frameworks/kholidays/kholidays-9999.ebuild
+++ b/kde-frameworks/kholidays/kholidays-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_QTHELP="false"
 KDE_TEST="true"
@@ -12,13 +12,13 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE="nls"
 
-COMMON_DEPEND="
-	$(add_qt_dep qtdeclarative)
-"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	nls? ( $(add_qt_dep linguist-tools) )
 "
-RDEPEND="${COMMON_DEPEND}
+DEPEND="
+	$(add_qt_dep qtdeclarative)
+"
+RDEPEND="${DEPEND}
 	!kde-apps/kholidays:5
 "
 

diff --git a/kde-frameworks/khtml/khtml-9999.ebuild b/kde-frameworks/khtml/khtml-9999.ebuild
index 56fe6915a9..05e20f61c3 100644
--- a/kde-frameworks/khtml/khtml-9999.ebuild
+++ b/kde-frameworks/khtml/khtml-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_QTHELP="false"
 VIRTUALX_REQUIRED="test"
@@ -12,6 +12,11 @@ LICENSE="LGPL-2"
 KEYWORDS=""
 IUSE="libressl X"
 
+BDEPEND="
+	dev-lang/perl
+	dev-util/gperf
+	test? ( $(add_qt_dep qtx11extras) )
+"
 RDEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcodecs)
@@ -53,9 +58,6 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/gperf
-	test? ( $(add_qt_dep qtx11extras) )
 	X? ( x11-base/xorg-proto )
 "
 

diff --git a/kde-frameworks/ki18n/ki18n-9999.ebuild b/kde-frameworks/ki18n/ki18n-9999.ebuild
index 7d369c176b..53f27ced5a 100644
--- a/kde-frameworks/ki18n/ki18n-9999.ebuild
+++ b/kde-frameworks/ki18n/ki18n-9999.ebuild
@@ -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=( python{2_7,3_{4,5,6,7}} )
 inherit kde5 python-single-r1
@@ -13,14 +13,15 @@ IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+BDEPEND="
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+DEPEND="${PYTHON_DEPS}
 	$(add_qt_dep qtdeclarative)
 	sys-devel/gettext
 	virtual/libintl
 "
-DEPEND="${RDEPEND}
-	test? ( $(add_qt_dep qtconcurrent) )
-"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	kde5_pkg_setup

diff --git a/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild b/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild
index 9b42dddd50..903cf5b8dc 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,7 +11,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -24,6 +24,6 @@ RDEPEND="
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 RESTRICT+=" test" # bug 574770

diff --git a/kde-frameworks/kidletime/kidletime-9999.ebuild b/kde-frameworks/kidletime/kidletime-9999.ebuild
index a1669c3fb9..fb8366f8e8 100644
--- a/kde-frameworks/kidletime/kidletime-9999.ebuild
+++ b/kde-frameworks/kidletime/kidletime-9999.ebuild
@@ -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
@@ -13,7 +13,7 @@ IUSE="X xscreensaver"
 
 REQUIRED_USE="xscreensaver? ( X )"
 
-RDEPEND="
+DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	X? (
@@ -27,7 +27,7 @@ RDEPEND="
 		x11-libs/libXScrnSaver
 	)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	kde5_src_prepare

diff --git a/kde-frameworks/kimageformats/kimageformats-9999.ebuild b/kde-frameworks/kimageformats/kimageformats-9999.ebuild
index e742b02365..835c06f83d 100644
--- a/kde-frameworks/kimageformats/kimageformats-9999.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_QTHELP="false"
 VIRTUALX_REQUIRED="test"
@@ -12,7 +12,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="eps openexr"
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_qt_dep qtgui)
 	eps? ( $(add_qt_dep qtprintsupport) )
@@ -21,7 +21,7 @@ RDEPEND="
 		media-libs/openexr:=
 	)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 DOCS=( src/imageformats/AUTHORS )
 

diff --git a/kde-frameworks/kinit/kinit-9999.ebuild b/kde-frameworks/kinit/kinit-9999.ebuild
index 377a8fc798..29b77247ef 100644
--- a/kde-frameworks/kinit/kinit-9999.ebuild
+++ b/kde-frameworks/kinit/kinit-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_QTHELP="false"
 KDE_TEST="false"
@@ -12,6 +12,9 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="+caps +man X"
 
+BDEPEND="
+	man? ( $(add_frameworks_dep kdoctools) )
+"
 RDEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
@@ -29,7 +32,6 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
 	X? ( x11-base/xorg-proto )
 "
 

diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild
index 53d248bdb9..050102e386 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/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_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
@@ -13,6 +13,9 @@ KEYWORDS=""
 IUSE="acl +handbook kerberos +kwallet X"
 
 # drop qtnetwork subslot operator when QT_MINIMAL >= 5.12.0
+BDEPEND="
+	test? ( sys-libs/zlib )
+"
 RDEPEND="
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep karchive)
@@ -54,7 +57,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	$(add_qt_dep qtconcurrent)
-	test? ( sys-libs/zlib )
 	X? (
 		x11-base/xorg-proto
 		x11-libs/libX11

diff --git a/kde-frameworks/kirigami/kirigami-9999.ebuild b/kde-frameworks/kirigami/kirigami-9999.ebuild
index d3bbd01a07..ba90b86d6d 100644
--- a/kde-frameworks/kirigami/kirigami-9999.ebuild
+++ b/kde-frameworks/kirigami/kirigami-9999.ebuild
@@ -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_QTHELP="false"
@@ -17,7 +17,10 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+BDEPEND="
+	$(add_qt_dep linguist-tools)
+"
+DEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgraphicaleffects)
@@ -26,9 +29,7 @@ RDEPEND="
 	$(add_qt_dep qtquickcontrols2)
 	$(add_qt_dep qtsvg)
 "
-DEPEND="${RDEPEND}
-	$(add_qt_dep linguist-tools)
-"
+RDEPEND="${DEPEND}"
 
 # requires package to already be installed
 RESTRICT+=" test"

diff --git a/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild b/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild
index 3e3c44239b..77fb4c606d 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,4 +11,4 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="test? ( $(add_qt_dep qtwidgets) )"
+BDEPEND="test? ( $(add_qt_dep qtwidgets) )"

diff --git a/kde-frameworks/kitemviews/kitemviews-9999.ebuild b/kde-frameworks/kitemviews/kitemviews-9999.ebuild
index 090dcd1100..bdf1c55732 100644
--- a/kde-frameworks/kitemviews/kitemviews-9999.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,10 +11,11 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="nls"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"

diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild
index 59e72feb5d..dd10d4b05e 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild
@@ -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,6 +10,9 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="nls X"
 
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
 RDEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kwidgetsaddons)
@@ -19,7 +22,6 @@ RDEPEND="
 	X? ( $(add_qt_dep qtx11extras) )
 "
 DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
 	X? (
 		x11-base/xorg-proto
 		x11-libs/libX11

diff --git a/kde-frameworks/kjs/kjs-9999.ebuild b/kde-frameworks/kjs/kjs-9999.ebuild
index 1b1168bb6d..e87be3afea 100644
--- a/kde-frameworks/kjs/kjs-9999.ebuild
+++ b/kde-frameworks/kjs/kjs-9999.ebuild
@@ -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_QTHELP="false"
@@ -12,11 +12,12 @@ LICENSE="BSD-2 LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
+BDEPEND="
 	dev-lang/perl
 "
+DEPEND="
+	dev-libs/libpcre
+"
+RDEPEND="${DEPEND}"
 
 DOCS=( src/README )

diff --git a/kde-frameworks/kjsembed/kjsembed-9999.ebuild b/kde-frameworks/kjsembed/kjsembed-9999.ebuild
index 1f75d22e17..362ee2cee1 100644
--- a/kde-frameworks/kjsembed/kjsembed-9999.ebuild
+++ b/kde-frameworks/kjsembed/kjsembed-9999.ebuild
@@ -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_QTHELP="false"

diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-9999.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-9999.ebuild
index 832851e7a6..fa08ad0977 100644
--- a/kde-frameworks/kmediaplayer/kmediaplayer-9999.ebuild
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_QTHELP="false"
 VIRTUALX_REQUIRED="test"
@@ -12,10 +12,10 @@ LICENSE="MIT"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-frameworks/knewstuff/knewstuff-9999.ebuild b/kde-frameworks/knewstuff/knewstuff-9999.ebuild
index 4c60337522..b73bec687a 100644
--- a/kde-frameworks/knewstuff/knewstuff-9999.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-9999.ebuild
@@ -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-frameworks/knotifications/knotifications-9999.ebuild b/kde-frameworks/knotifications/knotifications-9999.ebuild
index 59bc1dc3df..827a57e82a 100644
--- a/kde-frameworks/knotifications/knotifications-9999.ebuild
+++ b/kde-frameworks/knotifications/knotifications-9999.ebuild
@@ -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
@@ -11,6 +11,9 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE="dbus nls phonon speech X"
 
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
 RDEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kconfig)
@@ -30,7 +33,6 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
 	X? ( x11-base/xorg-proto )
 "
 

diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild
index 92123d1b57..5e401555bd 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild
@@ -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
@@ -11,7 +11,7 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="phonon"
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep ki18n)
@@ -21,4 +21,4 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	phonon? ( media-libs/phonon[qt5(+)] )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-frameworks/kpackage/kpackage-9999.ebuild b/kde-frameworks/kpackage/kpackage-9999.ebuild
index 792cfc086c..5bed619d46 100644
--- a/kde-frameworks/kpackage/kpackage-9999.ebuild
+++ b/kde-frameworks/kpackage/kpackage-9999.ebuild
@@ -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,14 +10,15 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="man"
 
-RDEPEND="
+BDEPEND="
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 "
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/kparts/kparts-9999.ebuild b/kde-frameworks/kparts/kparts-9999.ebuild
index d836cf9a43..6aadb39984 100644
--- a/kde-frameworks/kparts/kparts-9999.ebuild
+++ b/kde-frameworks/kparts/kparts-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5

diff --git a/kde-frameworks/kpeople/kpeople-9999.ebuild b/kde-frameworks/kpeople/kpeople-9999.ebuild
index 4793f58191..815b6719c7 100644
--- a/kde-frameworks/kpeople/kpeople-9999.ebuild
+++ b/kde-frameworks/kpeople/kpeople-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -26,9 +26,7 @@ DEPEND="
 	$(add_qt_dep qtsql)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}
-	!net-libs/kpeople:5
-"
+RDEPEND="${DEPEND}"
 
 src_test() {
 	# personsmodeltest segfaults, bug 668192

diff --git a/kde-frameworks/kplotting/kplotting-9999.ebuild b/kde-frameworks/kplotting/kplotting-9999.ebuild
index 87f71f2601..91135ecb22 100644
--- a/kde-frameworks/kplotting/kplotting-9999.ebuild
+++ b/kde-frameworks/kplotting/kplotting-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,8 +11,8 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/kde-frameworks/kpty/kpty-9999.ebuild b/kde-frameworks/kpty/kpty-9999.ebuild
index 9b40fec8a8..cfe761d928 100644
--- a/kde-frameworks/kpty/kpty-9999.ebuild
+++ b/kde-frameworks/kpty/kpty-9999.ebuild
@@ -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-frameworks/kross/kross-9999.ebuild b/kde-frameworks/kross/kross-9999.ebuild
index 0383869312..370a0d81fa 100644
--- a/kde-frameworks/kross/kross-9999.ebuild
+++ b/kde-frameworks/kross/kross-9999.ebuild
@@ -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_QTHELP="false"

diff --git a/kde-frameworks/krunner/krunner-9999.ebuild b/kde-frameworks/krunner/krunner-9999.ebuild
index aba4c7895c..06f8f81192 100644
--- a/kde-frameworks/krunner/krunner-9999.ebuild
+++ b/kde-frameworks/krunner/krunner-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5

diff --git a/kde-frameworks/kservice/kservice-9999.ebuild b/kde-frameworks/kservice/kservice-9999.ebuild
index b2d6a6e78d..2862551b87 100644
--- a/kde-frameworks/kservice/kservice-9999.ebuild
+++ b/kde-frameworks/kservice/kservice-9999.ebuild
@@ -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,13 @@ LICENSE="LGPL-2 LGPL-2.1+"
 KEYWORDS=""
 IUSE="+man"
 
-RDEPEND="
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	man? ( $(add_frameworks_dep kdoctools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
@@ -19,12 +25,7 @@ RDEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtxml)
 "
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	man? ( $(add_frameworks_dep kdoctools) )
-	test? ( $(add_qt_dep qtconcurrent) )
-"
+RDEPEND="${DEPEND}"
 
 # requires running kde environment
 RESTRICT+=" test"

diff --git a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild
index 2e3dda4108..c79fc8067b 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,7 +11,10 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="editorconfig git"
 
-RDEPEND="
+BDEPEND="
+	test? ( $(add_frameworks_dep kservice) )
+"
+DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep kcodecs)
@@ -39,9 +42,7 @@ RDEPEND="
 	editorconfig? ( app-text/editorconfig-core-c )
 	git? ( dev-libs/libgit2:= )
 "
-DEPEND="${RDEPEND}
-	test? ( $(add_frameworks_dep kservice) )
-"
+RDEPEND="${DEPEND}"
 
 RESTRICT+=" test"
 

diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild
index 7376f79679..26e60a6383 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,7 +11,7 @@ LICENSE="LGPL-2+ LGPL-2.1+"
 KEYWORDS=""
 IUSE="speech"
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -26,7 +26,7 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	speech? ( $(add_qt_dep qtspeech) )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild b/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild
index 4758295fe5..d248355daa 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild
@@ -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,11 +10,11 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_qt_dep qtnetwork)
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_test() {
 	# bug 623938 - needs internet connection

diff --git a/kde-frameworks/kwallet/kwallet-9999.ebuild b/kde-frameworks/kwallet/kwallet-9999.ebuild
index 1066b686fc..3b9f7e24c5 100644
--- a/kde-frameworks/kwallet/kwallet-9999.ebuild
+++ b/kde-frameworks/kwallet/kwallet-9999.ebuild
@@ -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="LGPL-2+"
 KEYWORDS=""
 IUSE="gpg +man"
 
-RDEPEND="
+BDEPEND="
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -27,9 +30,7 @@ RDEPEND="
 	dev-libs/libgcrypt:0=
 	gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
 "
-DEPEND="${RDEPEND}
-	man? ( $(add_frameworks_dep kdoctools) )
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/kwayland/kwayland-9999.ebuild b/kde-frameworks/kwayland/kwayland-9999.ebuild
index faa9c1b1e2..08ad7c6cd6 100644
--- a/kde-frameworks/kwayland/kwayland-9999.ebuild
+++ b/kde-frameworks/kwayland/kwayland-9999.ebuild
@@ -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-frameworks/kwidgetsaddons/kwidgetsaddons-9999.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-9999.ebuild
index 411dda1580..76263a720b 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-9999.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,13 +11,14 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE="nls"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"
 
 src_test() {
 	# bug 650216, 653186

diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild
index 7bb14dbe4f..97318a3a48 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,6 +11,9 @@ LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
 KEYWORDS=""
 IUSE="nls X"
 
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
 RDEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
@@ -23,13 +26,12 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
 	X? ( x11-base/xorg-proto )
 "
 
 RESTRICT+=" test"
 
-DOCS=( "docs/README.kstartupinfo" )
+DOCS=( docs/README.kstartupinfo )
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild b/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild
index 5e7c566e99..0229674279 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -12,7 +12,7 @@ LICENSE="LGPL-2+"
 IUSE="attica"
 
 # slot op: includes QtCore/private/qlocale_p.h
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -32,7 +32,7 @@ RDEPEND="
 	$(add_qt_dep qtxml)
 	attica? ( $(add_frameworks_dep attica) )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-9999.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-9999.ebuild
index 61b8069c4e..80f6cea7e1 100644
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-9999.ebuild
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-9999.ebuild
@@ -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-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild
index f3219dd990..6680ecab89 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild
@@ -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,14 +10,15 @@ LICENSE="LGPL-2"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtxml)
 	net-misc/modemmanager
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
 # requires running environment
 RESTRICT+=" test"

diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-9999.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-9999.ebuild
index 20ff42f4db..99d33b5167 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-9999.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-9999.ebuild
@@ -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,15 +10,15 @@ LICENSE="LGPL-2"
 KEYWORDS=""
 IUSE="teamd"
 
-COMMON_DEPEND="
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtnetwork)
 	>=net-misc/networkmanager-1.4.0-r1[teamd=]
 "
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!net-libs/libnm-qt:5
 	|| (
 		>=net-misc/networkmanager-1.4.0-r1[consolekit]

diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
index de0ca380f7..911030c5df 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
@@ -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"
@@ -15,7 +15,7 @@ LICENSE="LGPL-3"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
+BDEPEND="
 	$(add_frameworks_dep extra-cmake-modules)
 	$(add_qt_dep qtcore)
 	test? (
@@ -24,6 +24,5 @@ DEPEND="
 	)
 "
 RDEPEND="
-	!kde-apps/kdepim-icons:4
 	!kde-frameworks/oxygen-icons:4
 "

diff --git a/kde-frameworks/plasma/plasma-9999.ebuild b/kde-frameworks/plasma/plasma-9999.ebuild
index d24a45d547..02034285da 100644
--- a/kde-frameworks/plasma/plasma-9999.ebuild
+++ b/kde-frameworks/plasma/plasma-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KMNAME="${PN}-framework"
 VIRTUALX_REQUIRED="test"
@@ -12,6 +12,9 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE="gles2 wayland X"
 
+BDEPEND="
+	$(add_frameworks_dep kdoctools)
+"
 RDEPEND="
 	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep karchive)
@@ -50,7 +53,6 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
 	X? ( x11-base/xorg-proto )
 "
 

diff --git a/kde-frameworks/prison/prison-9999.ebuild b/kde-frameworks/prison/prison-9999.ebuild
index a1c8ea1de7..1d3c384466 100644
--- a/kde-frameworks/prison/prison-9999.ebuild
+++ b/kde-frameworks/prison/prison-9999.ebuild
@@ -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-frameworks/purpose/purpose-9999.ebuild b/kde-frameworks/purpose/purpose-9999.ebuild
index 7278741859..0d692517e6 100644
--- a/kde-frameworks/purpose/purpose-9999.ebuild
+++ b/kde-frameworks/purpose/purpose-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_QTHELP="false"
 KDE_TEST="forceoptional"

diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-9999.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-9999.ebuild
index f5901717f7..21322083d0 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-9999.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_QTHELP="false"
 inherit kde5

diff --git a/kde-frameworks/solid/solid-9999.ebuild b/kde-frameworks/solid/solid-9999.ebuild
index 2f268203ab..d42d3b1c34 100644
--- a/kde-frameworks/solid/solid-9999.ebuild
+++ b/kde-frameworks/solid/solid-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,7 +11,11 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE="nls"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+DEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtwidgets)
@@ -19,10 +23,7 @@ RDEPEND="
 	sys-fs/udisks:2
 	virtual/udev
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-	test? ( $(add_qt_dep qtconcurrent) )
-"
+RDEPEND="${DEPEND}"
 
 pkg_postinst() {
 	kde5_pkg_postinst

diff --git a/kde-frameworks/sonnet/sonnet-9999.ebuild b/kde-frameworks/sonnet/sonnet-9999.ebuild
index 924a971bcf..d5c6c057b0 100644
--- a/kde-frameworks/sonnet/sonnet-9999.ebuild
+++ b/kde-frameworks/sonnet/sonnet-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -11,15 +11,16 @@ LICENSE="LGPL-2+ LGPL-2.1+"
 KEYWORDS=""
 IUSE="aspell +hunspell nls"
 
-RDEPEND="
+BDEPEND="
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	aspell? ( app-text/aspell )
 	hunspell? ( app-text/hunspell:= )
 "
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-frameworks/syndication/syndication-9999.ebuild b/kde-frameworks/syndication/syndication-9999.ebuild
index 0f8ec5097f..ec10e5d1c1 100644
--- a/kde-frameworks/syndication/syndication-9999.ebuild
+++ b/kde-frameworks/syndication/syndication-9999.ebuild
@@ -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,16 +11,16 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	test? (
 		$(add_qt_dep qtnetwork)
 		$(add_qt_dep qtwidgets)
 	)
 "
-RDEPEND="${COMMON_DEPEND}
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
 	!kde-apps/syndication
 "

diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-9999.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-9999.ebuild
index bb18786021..cc8218f4ba 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-9999.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-9999.ebuild
@@ -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
@@ -11,15 +11,16 @@ LICENSE="LGPL-2+ LGPL-2.1+"
 KEYWORDS=""
 IUSE="nls"
 
-RDEPEND="
+BDEPEND="
+	dev-lang/perl
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtxmlpatterns)
 "
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	nls? ( $(add_qt_dep linguist-tools) )
-"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	kde5_src_install

diff --git a/kde-frameworks/threadweaver/threadweaver-9999.ebuild b/kde-frameworks/threadweaver/threadweaver-9999.ebuild
index a1510b5b7b..33784f81a2 100644
--- a/kde-frameworks/threadweaver/threadweaver-9999.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-9999.ebuild
@@ -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