commit:     e06365c847da7e720e690dfe1385a56a5f64f7b2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 16:33:57 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 17:11:34 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e06365c8

kde-plasma: Port 9999 to ecm.eclass and kde.org.eclass

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

 kde-plasma/bluedevil/bluedevil-9999.ebuild         |  44 +++---
 kde-plasma/breeze-grub/breeze-grub-9999.ebuild     |   1 +
 kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild       |  13 +-
 .../breeze-plymouth/breeze-plymouth-9999.ebuild    |  12 +-
 kde-plasma/breeze/breeze-9999.ebuild               |  48 ++++---
 kde-plasma/discover/discover-9999.ebuild           |  64 +++++----
 kde-plasma/drkonqi/drkonqi-9999.ebuild             |  55 ++++----
 .../kactivitymanagerd-9999.ebuild                  |  35 +++--
 kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild |  56 ++++----
 .../kde-gtk-config/kde-gtk-config-9999.ebuild      |  39 +++---
 kde-plasma/kdecoration/kdecoration-9999.ebuild     |  13 +-
 .../kdeplasma-addons/kdeplasma-addons-9999.ebuild  |  73 +++++-----
 kde-plasma/kgamma/kgamma-9999.ebuild               |  24 ++--
 kde-plasma/khotkeys/khotkeys-9999.ebuild           |  52 ++++---
 kde-plasma/kinfocenter/kinfocenter-9999.ebuild     |  66 +++++----
 kde-plasma/kmenuedit/kmenuedit-9999.ebuild         |  50 ++++---
 kde-plasma/kscreen/kscreen-9999.ebuild             |  47 ++++---
 kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild |  64 +++++----
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild     |  22 +--
 kde-plasma/ksysguard/ksysguard-9999.ebuild         |  51 ++++---
 kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild     |  14 +-
 .../kwayland-integration-9999.ebuild               |  20 +--
 kde-plasma/kwin/kwin-9999.ebuild                   | 101 +++++++-------
 kde-plasma/kwrited/kwrited-9999.ebuild             |  22 +--
 kde-plasma/libkscreen/libkscreen-9999.ebuild       |  19 ++-
 kde-plasma/libksysguard/libksysguard-9999.ebuild   |  42 +++---
 kde-plasma/libkworkspace/libkworkspace-9999.ebuild |  31 +++--
 kde-plasma/milou/milou-9999.ebuild                 |  30 ++--
 kde-plasma/oxygen/oxygen-9999.ebuild               |  48 ++++---
 .../plasma-browser-integration-9999.ebuild         |  34 +++--
 .../plasma-desktop/plasma-desktop-9999.ebuild      | 136 +++++++++---------
 .../plasma-integration-9999.ebuild                 |  45 +++---
 kde-plasma/plasma-nm/plasma-nm-9999.ebuild         |  69 ++++-----
 kde-plasma/plasma-pa/plasma-pa-9999.ebuild         |  32 +++--
 kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild       |  52 ++++---
 .../plasma-thunderbolt-9999.ebuild                 |  26 ++--
 kde-plasma/plasma-vault/plasma-vault-9999.ebuild   |  40 +++---
 .../plasma-workspace-wallpapers-9999.ebuild        |   1 +
 .../plasma-workspace/plasma-workspace-9999.ebuild  | 155 +++++++++++----------
 kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild   |  34 +++--
 .../polkit-kde-agent/polkit-kde-agent-9999.ebuild  |  30 ++--
 kde-plasma/powerdevil/powerdevil-9999.ebuild       |  68 ++++-----
 kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild           |  32 +++--
 .../systemsettings/systemsettings-9999.ebuild      |  66 +++++----
 kde-plasma/user-manager/user-manager-9999.ebuild   |  32 +++--
 .../xdg-desktop-portal-kde-9999.ebuild             |  39 +++---
 .../xembed-sni-proxy/xembed-sni-proxy-9999.ebuild  |  23 +--
 47 files changed, 1150 insertions(+), 920 deletions(-)

diff --git a/kde-plasma/bluedevil/bluedevil-9999.ebuild 
b/kde-plasma/bluedevil/bluedevil-9999.ebuild
index 84aae6c17c..dba653f7e3 100644
--- a/kde-plasma/bluedevil/bluedevil-9999.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-9999.ebuild
@@ -3,32 +3,38 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Bluetooth stack for KDE Plasma"
 HOMEPAGE="https://cgit.kde.org/bluedevil.git";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep bluez-qt)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kded)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep plasma)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/bluez-qt-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kded-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
-       $(add_plasma_dep kde-cli-tools)
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
 "

diff --git a/kde-plasma/breeze-grub/breeze-grub-9999.ebuild 
b/kde-plasma/breeze-grub/breeze-grub-9999.ebuild
index 9e6291db2e..d0e5956c5e 100644
--- a/kde-plasma/breeze-grub/breeze-grub-9999.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+PVCUT=$(ver_cut 1-3)
 inherit kde.org
 
 DESCRIPTION="Breeze theme for GRUB"

diff --git a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild 
b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
index 9c320fbc60..db711a1671 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
@@ -4,16 +4,19 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
-inherit kde5 python-any-r1
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org python-any-r1
 
 DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
 HOMEPAGE="https://cgit.kde.org/breeze-gtk.git";
+
 LICENSE="LGPL-2.1+"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
-       $(add_plasma_dep breeze)
+       >=kde-plasma/breeze-${PVCUT}:5
        $(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
        dev-lang/sassc
 "
@@ -24,11 +27,11 @@ python_check_deps() {
 
 pkg_setup() {
        python-any-r1_pkg_setup
-       kde5_pkg_setup
+       ecm_pkg_setup
 }
 
 src_prepare() {
-       kde5_src_prepare
+       ecm_src_prepare
        if has_version "<dev-util/cmake-3.16_rc1"; then
                eapply "${FILESDIR}"/${PN}-5.16.5-cmake-pre-3.16.patch
        fi
@@ -41,5 +44,5 @@ src_configure() {
        if has_version "<dev-util/cmake-3.16_rc1"; then
                mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
        fi
-       kde5_src_configure
+       ecm_src_configure
 }

diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild 
b/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild
index d299cbbf7f..8bc2431d96 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild
@@ -3,16 +3,18 @@
 
 EAPI=7
 
-ECM_KDEINSTALLDIRS="false"
-KDE_AUTODEPS="false"
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+inherit cmake-utils kde.org
 
 DESCRIPTION="Breeze theme for Plymouth"
+
 LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-BDEPEND="$(add_frameworks_dep extra-cmake-modules)"
+BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
 DEPEND="sys-boot/plymouth"
 RDEPEND="${DEPEND}"
 
@@ -22,5 +24,5 @@ src_configure() {
                -DDISTRO_VERSION=
        )
 
-       kde5_src_configure
+       cmake-utils_src_configure
 }

diff --git a/kde-plasma/breeze/breeze-9999.ebuild 
b/kde-plasma/breeze/breeze-9999.ebuild
index 8e8bbc24b5..f9fc724e23 100644
--- a/kde-plasma/breeze/breeze-9999.ebuild
+++ b/kde-plasma/breeze/breeze-9999.ebuild
@@ -3,42 +3,48 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Breeze visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/breeze.git";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE="wayland X"
 
 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.13.0
 RDEPEND="
-       $(add_frameworks_dep frameworkintegration)
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kguiaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_plasma_dep kdecoration)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets '' '' '5=')
+       >=kde-frameworks/frameworkintegration-${KFMIN}:5
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kguiaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-plasma/kdecoration-${PVCUT}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5=
        sci-libs/fftw:3.0=
-       wayland? ( $(add_frameworks_dep kwayland) )
+       wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
        X? (
-               $(add_qt_dep qtx11extras)
+               >=dev-qt/qtx11extras-${QTMIN}:5
                x11-libs/libxcb
        )
 "
 DEPEND="${RDEPEND}
-       $(add_frameworks_dep kpackage)
+       >=kde-frameworks/kpackage-${KFMIN}:5
 "
 PDEPEND="
-       $(add_frameworks_dep breeze-icons)
-       $(add_plasma_dep kde-cli-tools)
+       >=kde-frameworks/breeze-icons-${KFMIN}:5
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
 src_configure() {
@@ -46,5 +52,5 @@ src_configure() {
                $(cmake-utils_use_find_package wayland KF5Wayland)
                $(cmake-utils_use_find_package X XCB)
        )
-       kde5_src_configure
+       ecm_src_configure
 }

diff --git a/kde-plasma/discover/discover-9999.ebuild 
b/kde-plasma/discover/discover-9999.ebuild
index 6ab5dca1c7..1c59638cc1 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -3,50 +3,56 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma resources management GUI"
 HOMEPAGE="https://userbase.kde.org/Discover";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE="+firmware feedback"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
 DEPEND="
-       $(add_frameworks_dep attica)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kcrash)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kirigami)
-       $(add_frameworks_dep kitemmodels)
-       $(add_frameworks_dep knewstuff)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kxmlgui)
-       $(add_qt_dep qtconcurrent)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtnetwork)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtxml)
+       >=kde-frameworks/attica-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kirigami-${KFMIN}:5
+       >=kde-frameworks/kitemmodels-${KFMIN}:5
+       >=kde-frameworks/knewstuff-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=dev-qt/qtconcurrent-${QTMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtnetwork-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtxml-${QTMIN}:5
        feedback? ( dev-libs/kuserfeedback:5 )
        firmware? ( sys-apps/fwupd )
 "
 RDEPEND="${DEPEND}
-       $(add_frameworks_dep kirigami)
+       >=kde-frameworks/kirigami-${KFMIN}:5
 "
 
 src_prepare() {
-       kde5_src_prepare
+       ecm_src_prepare
        # we don't need it with PackageKitBackend off
-       punt_bogus_dep KF5 Archive
+       ecm_punt_bogus_dep KF5 Archive
 }
 
 src_configure() {
@@ -59,7 +65,7 @@ src_configure() {
                -DBUILD_FwupdBackend=$(usex firmware)
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }
 
 src_test() {
@@ -68,5 +74,5 @@ src_test() {
                -E "(knsbackendtest)"
        )
 
-       kde5_src_test
+       ecm_src_test
 }

diff --git a/kde-plasma/drkonqi/drkonqi-9999.ebuild 
b/kde-plasma/drkonqi/drkonqi-9999.ebuild
index b9b7d267cf..46f7a7b90c 100644
--- a/kde-plasma/drkonqi/drkonqi-9999.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-9999.ebuild
@@ -3,44 +3,49 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Plasma crash handler, gives the user feedback if a program 
crashed"
 
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE="X"
 
 RDEPEND="
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kcrash)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kidletime)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kjobwidgets)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep kwallet)
-       $(add_frameworks_dep kwayland)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kxmlrpcclient)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtxml)
-       X? ( $(add_qt_dep qtx11extras) )
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kidletime-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kjobwidgets-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/kwallet-${KFMIN}:5
+       >=kde-frameworks/kwayland-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kxmlrpcclient-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtxml-${QTMIN}:5
+       X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${RDEPEND}
-       $(add_qt_dep qtconcurrent)
+       >=dev-qt/qtconcurrent-${QTMIN}:5
 "
 
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package X Qt5X11Extras)
        )
-       kde5_src_configure
+       ecm_src_configure
 }
 
 src_test() {
@@ -49,11 +54,11 @@ src_test() {
                -E "(connectiontest)"
        )
 
-       kde5_src_test
+       ecm_src_test
 }
 
 pkg_postinst() {
-       kde5_pkg_postinst
+       ecm_pkg_postinst
        if ! has_version "sys-devel/gdb"; then
                elog "For more usability consider installing the following 
package:"
                elog "    sys-devel/gdb - Easier debugging support"

diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild 
b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
index 36e5f05a5e..b6d1c43b90 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
@@ -3,28 +3,33 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="System service to manage user's activities, track the usage 
patterns etc."
+
 LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kcrash)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kglobalaccel)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep kxmlgui)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtsql 'sqlite')
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtsql-${QTMIN}:5[sqlite]
+       >=dev-qt/qtwidgets-${QTMIN}:5
 "
 DEPEND="${RDEPEND}
        dev-libs/boost

diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild 
b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
index 757e81f84c..f1b06fb4a9 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
@@ -3,40 +3,46 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the 
system"
 HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
 
 DEPEND="
-       $(add_frameworks_dep kactivities)
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_plasma_dep libkworkspace)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtsvg)
-       $(add_qt_dep qtwidgets)
-       kdesu? ( $(add_frameworks_dep kdesu) )
+       >=kde-frameworks/kactivities-${KFMIN}:5
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-plasma/libkworkspace-${PVCUT}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtsvg-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
        X? (
-               $(add_qt_dep qtx11extras)
+               >=dev-qt/qtx11extras-${QTMIN}:5
                x11-libs/libX11
        )
 "
@@ -55,10 +61,10 @@ src_configure() {
                $(cmake-utils_use_find_package X Qt5X11Extras)
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }
 
 src_install() {
-       kde5_src_install
+       ecm_src_install
        use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
 }

diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild 
b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
index ce3972e6b1..7345d0a3c3 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
@@ -3,29 +3,34 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
 HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git";
+
 LICENSE="GPL-3"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep karchive)
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep knewstuff)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtsvg)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/karchive-${KFMIN}:5
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/knewstuff-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtsvg-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
        dev-libs/glib:2
        gnome-base/gsettings-desktop-schemas
        x11-libs/gtk+:2
@@ -33,7 +38,7 @@ DEPEND="
        x11-libs/libXcursor
 "
 RDEPEND="${DEPEND}
-       $(add_plasma_dep kde-cli-tools)
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
 src_configure() {
@@ -41,11 +46,11 @@ src_configure() {
                -DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }
 
 pkg_postinst() {
-       kde5_pkg_postinst
+       ecm_pkg_postinst
        elog "If you notice missing icons in your GTK applications, you may 
have to install"
        elog "the corresponding themes for GTK. A good guess would be 
x11-themes/oxygen-gtk"
        elog "for example."

diff --git a/kde-plasma/kdecoration/kdecoration-9999.ebuild 
b/kde-plasma/kdecoration/kdecoration-9999.ebuild
index c005ecf253..5fae914d4b 100644
--- a/kde-plasma/kdecoration/kdecoration-9999.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-9999.ebuild
@@ -3,17 +3,22 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Plugin based library to create window decorations"
+
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep ki18n)
-       $(add_qt_dep qtgui)
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild 
b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index a12b1a4fd0..2e32784303 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -3,48 +3,53 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Extra Plasma applets and engines"
+
 LICENSE="GPL-2 LGPL-2"
+SLOT="5"
 KEYWORDS=""
 IUSE="share webengine"
 
 DEPEND="
-       $(add_frameworks_dep karchive)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep kholidays)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep knewstuff)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep kpackage)
-       $(add_frameworks_dep kross)
-       $(add_frameworks_dep krunner)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep kunitconversion)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep kxmlgui)
-       $(add_frameworks_dep plasma)
-       $(add_frameworks_dep sonnet)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
-       share? ( $(add_frameworks_dep purpose) )
-       webengine? ( $(add_qt_dep qtwebengine) )
+       >=kde-frameworks/karchive-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/kholidays-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/knewstuff-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/kpackage-${KFMIN}:5
+       >=kde-frameworks/kross-${KFMIN}:5
+       >=kde-frameworks/krunner-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/kunitconversion-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=kde-frameworks/sonnet-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+       webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
-       $(add_plasma_dep plasma-workspace)
-       $(add_qt_dep qtquickcontrols)
-       $(add_qt_dep qtquickcontrols2)
+       >=kde-plasma/plasma-workspace-${PVCUT}:5
+       >=dev-qt/qtquickcontrols-${QTMIN}:5
+       >=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
 src_configure() {
@@ -53,5 +58,5 @@ src_configure() {
                $(cmake-utils_use_find_package webengine Qt5WebEngine)
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }

diff --git a/kde-plasma/kgamma/kgamma-9999.ebuild 
b/kde-plasma/kgamma/kgamma-9999.ebuild
index 0d706a7822..447f06c33c 100644
--- a/kde-plasma/kgamma/kgamma-9999.ebuild
+++ b/kde-plasma/kgamma/kgamma-9999.ebuild
@@ -3,21 +3,27 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KMNAME="${PN}5"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KDE_ORG_NAME="${PN}5"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Screen gamma values kcontrol module"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
        x11-libs/libX11
        x11-libs/libXxf86vm
 "

diff --git a/kde-plasma/khotkeys/khotkeys-9999.ebuild 
b/kde-plasma/khotkeys/khotkeys-9999.ebuild
index 2ceab5d97d..dd5aa41b1d 100644
--- a/kde-plasma/khotkeys/khotkeys-9999.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-9999.ebuild
@@ -3,33 +3,39 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-inherit kde5
+ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma workspace hotkey module"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdelibs4support X)
-       $(add_frameworks_dep kglobalaccel)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep ktextwidgets)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep kxmlgui)
-       $(add_plasma_dep libkworkspace)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtx11extras)
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kdelibs4support-${KFMIN}:5[X]
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/ktextwidgets-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-plasma/libkworkspace-${PVCUT}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtx11extras-${QTMIN}:5
        x11-libs/libX11
        x11-libs/libXtst
 "
@@ -39,6 +45,6 @@ DEPEND="${COMMON_DEPEND}
        x11-libs/libXtst
 "
 RDEPEND="${COMMON_DEPEND}
-       $(add_frameworks_dep kded)
-       $(add_plasma_dep kde-cli-tools)
+       >=kde-frameworks/kded-${KFMIN}:5
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
 "

diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild 
b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
index 639463c3b5..b63b57dd8d 100644
--- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
@@ -4,57 +4,63 @@
 EAPI=7
 
 CMAKE_MIN_VERSION=3.14.3
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Utility providing information about the computer hardware"
 HOMEPAGE="https://kde.org/applications/system/kinfocenter/";
 SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> 
glogo-small.png"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE="gles2 ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
 
 COMMON_DEPEND="
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kcrash)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kpackage)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kxmlgui)
-       $(add_frameworks_dep solid)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kpackage-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/solid-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
        x11-libs/libX11
        ieee1394? ( sys-libs/libraw1394 )
        opengl? (
-               $(add_qt_dep qtgui 'gles2=')
+               >=dev-qt/qtgui-${QTMIN}:5[gles2=]
                media-libs/mesa[gles2?,X(+)]
                !gles2? ( media-libs/glu )
        )
        pci? ( sys-apps/pciutils )
        wayland? (
-               $(add_frameworks_dep kwayland)
+               >=kde-frameworks/kwayland-${KFMIN}:5
                media-libs/mesa[egl]
        )
 "
 DEPEND="${COMMON_DEPEND}
-       $(add_frameworks_dep plasma)
+       >=kde-frameworks/plasma-${KFMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
-       $(add_plasma_dep kde-cli-tools)
-       $(add_qt_dep qtquickcontrols2)
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
+       >=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
 src_configure() {
@@ -71,11 +77,11 @@ src_configure() {
                mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
        fi
 
-       kde5_src_configure
+       ecm_src_configure
 }
 
 src_install() {
-       kde5_src_install
+       ecm_src_install
 
        # TODO: Make this fully obsolete by /etc/os-release
        insinto /etc/xdg
@@ -86,7 +92,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       kde5_pkg_postinst
+       ecm_pkg_postinst
 
        if [[ -z "${REPLACING_VERSIONS}" ]]; then
                has_version "net-fs/nfs-utils" || \

diff --git a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild 
b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
index b66401cbf3..256469873a 100644
--- a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
@@ -3,36 +3,42 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma menu editor"
 HOMEPAGE="https://cgit.kde.org/kmenuedit.git";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE="+hotkeys"
 
 RDEPEND="
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kitemviews)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kxmlgui)
-       $(add_frameworks_dep sonnet)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtxml)
-       hotkeys? ( $(add_plasma_dep khotkeys) )
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kitemviews-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/sonnet-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtxml-${QTMIN}:5
+       hotkeys? ( >=kde-plasma/khotkeys-${PVCUT}:5 )
 "
 DEPEND="${RDEPEND}
-       $(add_frameworks_dep kinit)
+       >=kde-frameworks/kinit-${KFMIN}:5
 "
 
 src_configure() {
@@ -40,5 +46,5 @@ src_configure() {
                $(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }

diff --git a/kde-plasma/kscreen/kscreen-9999.ebuild 
b/kde-plasma/kscreen/kscreen-9999.ebuild
index 7620c1544b..bc28e58aed 100644
--- a/kde-plasma/kscreen/kscreen-9999.ebuild
+++ b/kde-plasma/kscreen/kscreen-9999.ebuild
@@ -3,37 +3,42 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_TEST="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma screen management"
 HOMEPAGE="https://cgit.kde.org/kscreen.git";
 
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kglobalaccel)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kxmlgui)
-       $(add_frameworks_dep plasma)
-       $(add_plasma_dep libkscreen)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative 'widgets')
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=kde-plasma/libkscreen-${PVCUT}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
-       $(add_plasma_dep kde-cli-tools)
-       $(add_qt_dep qtgraphicaleffects)
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
+       >=dev-qt/qtgraphicaleffects-${QTMIN}:5
 "
 
 # bug #580440, last checked 5.6.3

diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild 
b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
index 1d576fc688..c302620dc3 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
@@ -3,39 +3,45 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5 pam
+inherit ecm kde.org pam
 
 DESCRIPTION="Library and components for secure lock screen architecture"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE="consolekit +pam seccomp"
 
 REQUIRED_USE="seccomp? ( pam )"
 
 RDEPEND="
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kcrash)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep kglobalaccel)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kidletime)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep kpackage)
-       $(add_frameworks_dep ktextwidgets)
-       $(add_frameworks_dep kwayland)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep kxmlgui)
-       $(add_frameworks_dep solid)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative 'widgets')
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtnetwork)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtx11extras)
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kidletime-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/kpackage-${KFMIN}:5
+       >=kde-frameworks/ktextwidgets-${KFMIN}:5
+       >=kde-frameworks/kwayland-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/solid-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtnetwork-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtx11extras-${QTMIN}:5
        dev-libs/wayland
        x11-libs/libX11
        x11-libs/libXi
@@ -49,13 +55,13 @@ DEPEND="${RDEPEND}
        x11-base/xorg-proto
 "
 PDEPEND="
-       $(add_plasma_dep kde-cli-tools)
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
 RESTRICT+=" test"
 
 src_prepare() {
-       kde5_src_prepare
+       ecm_src_prepare
 
        if ! use test; then
                sed -e "/add_subdirectory(autotests)/ s/^/#/" \
@@ -68,7 +74,7 @@ src_test() {
        local myctestargs=(
                -E x11LockerTest
        )
-       kde5_src_test
+       ecm_src_test
 }
 
 src_configure() {
@@ -78,11 +84,11 @@ src_configure() {
                $(cmake-utils_use_find_package pam PAM)
                $(cmake-utils_use_find_package seccomp Seccomp)
        )
-       kde5_src_configure
+       ecm_src_configure
 }
 
 src_install() {
-       kde5_src_install
+       ecm_src_install
 
        use pam && newpamd "${FILESDIR}/kde.pam" kde
        use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild 
b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
index 4303aedc45..1ba4678041 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -3,31 +3,37 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
 HOMEPAGE="https://cgit.kde.org/ksshaskpass.git";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kwallet)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kwallet-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
 
 src_install() {
-       kde5_src_install
+       ecm_src_install
 
        insinto /etc/xdg/plasma-workspace/env/
        doins "${FILESDIR}/05-ksshaskpass.sh"
 }
 
 pkg_postinst() {
-       kde5_pkg_postinst
+       ecm_pkg_postinst
 
        elog "${PN} has been installed as your default askpass application"
        elog "for Plasma 5 sessions."

diff --git a/kde-plasma/ksysguard/ksysguard-9999.ebuild 
b/kde-plasma/ksysguard/ksysguard-9999.ebuild
index c2feefdcf7..4fa4edcd91 100644
--- a/kde-plasma/ksysguard/ksysguard-9999.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-9999.ebuild
@@ -3,35 +3,40 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Network-enabled task manager and system monitor"
+
 LICENSE="GPL-2+"
+SLOT="5"
 KEYWORDS=""
 IUSE="caps lm-sensors"
 
 DEPEND="
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kinit)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kitemviews)
-       $(add_frameworks_dep knewstuff)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep kxmlgui)
-       $(add_plasma_dep libksysguard '-minimal(-)')
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtxml)
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kinit-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kitemviews-${KFMIN}:5
+       >=kde-frameworks/knewstuff-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-plasma/libksysguard-${PVCUT}:5[-minimal(-)]
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtxml-${QTMIN}:5
        caps? (
                net-libs/libpcap
                sys-libs/libcap
@@ -46,5 +51,5 @@ src_configure() {
                $(cmake-utils_use_find_package lm-sensors Sensors)
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }

diff --git a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild 
b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
index 5f59742ef3..1f70bc3bb3 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-9999.ebuild
@@ -3,15 +3,19 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org
+
+DESCRIPTION="PAM module to not enter KWallet password again after login"
 
-DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kwallet)
+       >=kde-frameworks/kwallet-${KFMIN}:5
        dev-libs/libgcrypt:0=
        sys-libs/pam
 "
@@ -23,11 +27,11 @@ src_configure() {
        local mycmakeargs=(
                -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
        )
-       kde5_src_configure
+       ecm_src_configure
 }
 
 pkg_postinst() {
-       kde5_pkg_postinst
+       ecm_pkg_postinst
        elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
        elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking";
 }

diff --git a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild 
b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
index fb7276075e..5d36d715be 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
@@ -3,23 +3,27 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Provides integration plugins for various KDE frameworks for 
Wayland"
 HOMEPAGE="https://cgit.kde.org/kwayland-integration.git";
 
 LICENSE="LGPL-2.1"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kguiaddons)
-       $(add_frameworks_dep kidletime)
-       $(add_frameworks_dep kwayland)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kguiaddons-${KFMIN}:5
+       >=kde-frameworks/kidletime-${KFMIN}:5
+       >=kde-frameworks/kwayland-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 7616348f29..4118db229c 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -3,52 +3,57 @@
 
 EAPI=7
 
-KDE_HANDBOOK="optional"
-KDE_TEST="optional"
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Flexible, composited Window Manager for windowing systems on 
Linux"
+
 LICENSE="GPL-2+"
+SLOT="5"
 KEYWORDS=""
 IUSE="caps gles2 multimedia"
 
 COMMON_DEPEND="
-       $(add_frameworks_dep kactivities)
-       $(add_frameworks_dep kauth)
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kcrash)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep kglobalaccel '' '' '5=')
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kidletime '' '' '5=')
-       $(add_frameworks_dep kinit)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep knewstuff)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep kpackage)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep ktextwidgets)
-       $(add_frameworks_dep kwayland)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem X)
-       $(add_frameworks_dep kxmlgui)
-       $(add_frameworks_dep plasma)
-       $(add_plasma_dep breeze)
-       $(add_plasma_dep kdecoration)
-       $(add_plasma_dep kscreenlocker)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui 'gles2=' '' '5=')
-       $(add_qt_dep qtscript)
-       $(add_qt_dep qtsensors)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtx11extras)
+       >=kde-frameworks/kactivities-${KFMIN}:5
+       >=kde-frameworks/kauth-${KFMIN}:5
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5=
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kidletime-${KFMIN}:5=
+       >=kde-frameworks/kinit-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/knewstuff-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/kpackage-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/ktextwidgets-${KFMIN}:5
+       >=kde-frameworks/kwayland-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=kde-plasma/breeze-${PVCUT}:5
+       >=kde-plasma/kdecoration-${PVCUT}:5
+       >=kde-plasma/kscreenlocker-${PVCUT}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5=[gles2=]
+       >=dev-qt/qtscript-${QTMIN}:5
+       >=dev-qt/qtsensors-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtx11extras-${QTMIN}:5
        >=dev-libs/libinput-1.9
        >=dev-libs/wayland-1.2
        media-libs/fontconfig
@@ -70,25 +75,25 @@ COMMON_DEPEND="
        caps? ( sys-libs/libcap )
 "
 RDEPEND="${COMMON_DEPEND}
-       $(add_frameworks_dep kirigami)
-       $(add_qt_dep qtquickcontrols)
-       $(add_qt_dep qtquickcontrols2)
-       $(add_qt_dep qtvirtualkeyboard)
-       multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
+       >=kde-frameworks/kirigami-${KFMIN}:5
+       >=dev-qt/qtquickcontrols-${QTMIN}:5
+       >=dev-qt/qtquickcontrols2-${QTMIN}:5
+       >=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+       multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
 "
 DEPEND="${COMMON_DEPEND}
-       $(add_qt_dep designer)
-       $(add_qt_dep qtconcurrent)
+       >=dev-qt/designer-${QTMIN}:5
+       >=dev-qt/qtconcurrent-${QTMIN}:5
        x11-base/xorg-proto
 "
 PDEPEND="
-       $(add_plasma_dep kde-cli-tools)
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
 RESTRICT+=" test"
 
 src_prepare() {
-       kde5_src_prepare
+       ecm_src_prepare
        use multimedia || eapply 
"${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
 
        # Access violations, bug #640432
@@ -101,5 +106,5 @@ src_configure() {
                $(cmake-utils_use_find_package caps Libcap)
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }

diff --git a/kde-plasma/kwrited/kwrited-9999.ebuild 
b/kde-plasma/kwrited/kwrited-9999.ebuild
index 2d5d2f68b4..f73c9d3b92 100644
--- a/kde-plasma/kwrited/kwrited-9999.ebuild
+++ b/kde-plasma/kwrited/kwrited-9999.ebuild
@@ -3,19 +3,25 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep kpty)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/kpty-${KFMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-plasma/libkscreen/libkscreen-9999.ebuild 
b/kde-plasma/libkscreen/libkscreen-9999.ebuild
index b4fe0f4ea8..0ccae5fde7 100644
--- a/kde-plasma/libkscreen/libkscreen-9999.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-9999.ebuild
@@ -3,21 +3,26 @@
 
 EAPI=7
 
-KDE_QTHELP="true"
-KDE_TEST="forceoptional"
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Plasma screen management library"
+
+LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/7"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kwayland)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtx11extras)
+       >=kde-frameworks/kwayland-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtx11extras-${QTMIN}:5
        x11-libs/libxcb
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild 
b/kde-plasma/libksysguard/libksysguard-9999.ebuild
index f7ef3e4408..c882abe968 100644
--- a/kde-plasma/libksysguard/libksysguard-9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild
@@ -3,39 +3,43 @@
 
 EAPI=7
 
-KDE_TEST="true"
+ECM_TEST="true"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
+SLOT="5"
 KEYWORDS=""
 IUSE="minimal webengine X"
 
 RDEPEND="
-       $(add_frameworks_dep kauth)
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtnetwork)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kauth-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtnetwork-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
        sys-libs/zlib
-       webengine? ( $(add_qt_dep qtwebengine) )
+       webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
        X? (
-               $(add_qt_dep qtx11extras)
+               >=dev-qt/qtx11extras-${QTMIN}:5
                x11-libs/libX11
                x11-libs/libXres
        )
 "
 DEPEND="${RDEPEND}
-       $(add_frameworks_dep kiconthemes)
-       !minimal? ( $(add_frameworks_dep plasma) )
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       !minimal? ( >=kde-frameworks/plasma-${KFMIN}:5 )
        X? ( x11-base/xorg-proto )
 "
 
@@ -48,5 +52,5 @@ src_configure() {
                $(cmake-utils_use_find_package X X11)
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }

diff --git a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild 
b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
index 1282f6d256..1e061c8471 100644
--- a/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-9999.ebuild
@@ -3,30 +3,35 @@
 
 EAPI=7
 
-KDE_TEST="true"
-KMNAME="plasma-workspace"
-inherit kde5
+ECM_TEST="true"
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep plasma)
-       $(add_plasma_dep kscreenlocker)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtx11extras)
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=kde-plasma/kscreenlocker-${PVCUT}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtx11extras-${QTMIN}:5
        x11-libs/libICE
        x11-libs/libSM
        x11-libs/libX11
        x11-libs/libXau
 "
 DEPEND="${COMMON_DEPEND}
-       $(add_plasma_dep kwin)
+       >=kde-plasma/kwin-${PVCUT}:5
 "
 RDEPEND="${COMMON_DEPEND}
        !<kde-plasma/plasma-workspace-5.14.2:5
@@ -37,13 +42,13 @@ S="${S}/${PN}"
 PATCHES=( "${FILESDIR}/${PN}-5.16.80-standalone.patch" )
 
 src_prepare() {
-       # delete colliding libkworkspace translations, let kde5_src_prepare do 
its magic
+       # delete colliding libkworkspace translations, let ecm_src_prepare do 
its magic
        if [[ ${KDE_BUILD_TYPE} = release ]]; then
                find ../po -type f -name "*po" -and -not -name "libkworkspace*" 
-delete || die
                rm -rf po/*/docs || die
                cp -a ../po ./ || die
        fi
-       kde5_src_prepare
+       ecm_src_prepare
        if [[ ${KDE_BUILD_TYPE} = release ]]; then
                cat >> CMakeLists.txt <<- _EOF_ || die
                        ki18n_install(po)

diff --git a/kde-plasma/milou/milou-9999.ebuild 
b/kde-plasma/milou/milou-9999.ebuild
index b447547694..be40858098 100644
--- a/kde-plasma/milou/milou-9999.ebuild
+++ b/kde-plasma/milou/milou-9999.ebuild
@@ -3,27 +3,31 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional-recursive"
-inherit kde5
+ECM_TEST="forceoptional-recursive"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Dedicated search application built on top of Baloo"
 HOMEPAGE="https://cgit.kde.org/milou.git";
 
 LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kitemmodels)
-       $(add_frameworks_dep krunner)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep plasma)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kitemmodels-${KFMIN}:5
+       >=kde-frameworks/krunner-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild 
b/kde-plasma/oxygen/oxygen-9999.ebuild
index 0bf15fcf59..8e6a9afaa5 100644
--- a/kde-plasma/oxygen/oxygen-9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-9999.ebuild
@@ -3,46 +3,52 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Oxygen visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/oxygen.git";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE="wayland"
 
 COMMON_DEPEND="
-       $(add_frameworks_dep frameworkintegration)
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kguiaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_plasma_dep kdecoration)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtx11extras)
+       >=kde-frameworks/frameworkintegration-${KFMIN}:5
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kguiaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-plasma/kdecoration-${PVCUT}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtx11extras-${QTMIN}:5
        x11-libs/libxcb
-       wayland? ( $(add_frameworks_dep kwayland) )
+       wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
-       $(add_frameworks_dep kservice)
+       >=kde-frameworks/kservice-${KFMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
        !<kde-plasma/plasma-desktop-5.16.80
 "
 PDEPEND="
-       $(add_plasma_dep kde-cli-tools)
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package wayland KF5Wayland)
        )
-       kde5_src_configure
+       ecm_src_configure
 }

diff --git 
a/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild 
b/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild
index 3d2fb8c710..cd8384cd18 100644
--- 
a/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild
+++ 
b/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild
@@ -3,28 +3,32 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser 
extensions"
 
 LICENSE="GPL-3+"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kactivities)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kfilemetadata)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep krunner)
-       $(add_frameworks_dep purpose)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kactivities-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kfilemetadata-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/krunner-${KFMIN}:5
+       >=kde-frameworks/purpose-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
 
@@ -33,5 +37,5 @@ src_configure() {
                -DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index a7b7b5d8ad..5479a63534 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -3,67 +3,73 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma desktop"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="
-       $(add_frameworks_dep attica)
-       $(add_frameworks_dep kactivities)
-       $(add_frameworks_dep kactivities-stats)
-       $(add_frameworks_dep karchive)
-       $(add_frameworks_dep kauth)
-       $(add_frameworks_dep kbookmarks)
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kcodecs)
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep kded)
-       $(add_frameworks_dep kdelibs4support)
-       $(add_frameworks_dep kemoticons)
-       $(add_frameworks_dep kglobalaccel)
-       $(add_frameworks_dep kguiaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kitemmodels)
-       $(add_frameworks_dep kitemviews)
-       $(add_frameworks_dep kjobwidgets)
-       $(add_frameworks_dep knewstuff)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep knotifyconfig)
-       $(add_frameworks_dep kparts)
-       $(add_frameworks_dep krunner)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep kwallet)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep kxmlgui)
-       $(add_frameworks_dep plasma)
-       $(add_frameworks_dep solid)
-       $(add_frameworks_dep sonnet)
-       $(add_plasma_dep kwin)
-       $(add_plasma_dep plasma-workspace)
-       $(add_qt_dep qtconcurrent)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtnetwork)
-       $(add_qt_dep qtprintsupport)
-       $(add_qt_dep qtsql)
-       $(add_qt_dep qtsvg)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtx11extras)
-       $(add_qt_dep qtxml)
+       >=kde-frameworks/attica-${KFMIN}:5
+       >=kde-frameworks/kactivities-${KFMIN}:5
+       >=kde-frameworks/kactivities-stats-${KFMIN}:5
+       >=kde-frameworks/karchive-${KFMIN}:5
+       >=kde-frameworks/kauth-${KFMIN}:5
+       >=kde-frameworks/kbookmarks-${KFMIN}:5
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kcodecs-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/kded-${KFMIN}:5
+       >=kde-frameworks/kdelibs4support-${KFMIN}:5
+       >=kde-frameworks/kemoticons-${KFMIN}:5
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5
+       >=kde-frameworks/kguiaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kitemmodels-${KFMIN}:5
+       >=kde-frameworks/kitemviews-${KFMIN}:5
+       >=kde-frameworks/kjobwidgets-${KFMIN}:5
+       >=kde-frameworks/knewstuff-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/knotifyconfig-${KFMIN}:5
+       >=kde-frameworks/kparts-${KFMIN}:5
+       >=kde-frameworks/krunner-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/kwallet-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=kde-frameworks/solid-${KFMIN}:5
+       >=kde-frameworks/sonnet-${KFMIN}:5
+       >=kde-plasma/kwin-${PVCUT}:5
+       >=kde-plasma/plasma-workspace-${PVCUT}:5
+       >=dev-qt/qtconcurrent-${QTMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtnetwork-${QTMIN}:5
+       >=dev-qt/qtprintsupport-${QTMIN}:5
+       >=dev-qt/qtsql-${QTMIN}:5
+       >=dev-qt/qtsvg-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtx11extras-${QTMIN}:5
+       >=dev-qt/qtxml-${QTMIN}:5
        media-libs/phonon[qt5(+)]
        x11-libs/libX11
        x11-libs/libXcursor
@@ -78,14 +84,14 @@ COMMON_DEPEND="
                x11-libs/xcb-util-image
        )
        ibus? (
-               $(add_qt_dep qtx11extras)
+               >=dev-qt/qtx11extras-${QTMIN}:5
                app-i18n/ibus
                dev-libs/glib:2
                x11-libs/libxcb
                x11-libs/xcb-util-keysyms
        )
        scim? ( app-i18n/scim )
-       semantic-desktop? ( $(add_frameworks_dep baloo) )
+       semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
        touchpad? ( x11-drivers/xf86-input-synaptics )
 "
 DEPEND="${COMMON_DEPEND}
@@ -98,13 +104,13 @@ DEPEND="${COMMON_DEPEND}
        )
 "
 RDEPEND="${COMMON_DEPEND}
-       $(add_frameworks_dep kirigami)
-       $(add_frameworks_dep qqc2-desktop-style)
-       $(add_plasma_dep breeze)
-       $(add_plasma_dep kde-cli-tools)
-       $(add_plasma_dep oxygen)
-       $(add_qt_dep qtgraphicaleffects)
-       $(add_qt_dep qtquickcontrols2)
+       >=kde-frameworks/kirigami-${KFMIN}:5
+       >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+       >=kde-plasma/breeze-${PVCUT}:5
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
+       >=kde-plasma/oxygen-${PVCUT}:5
+       >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+       >=dev-qt/qtquickcontrols2-${QTMIN}:5
        sys-apps/util-linux
        x11-apps/setxkbmap
        !<kde-plasma/kdeplasma-addons-5.15.80
@@ -121,7 +127,7 @@ src_configure() {
                $(cmake-utils_use_find_package touchpad Synaptics)
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }
 
 src_test() {
@@ -132,5 +138,5 @@ src_test() {
                -E "(foldermodeltest|positionertest|test_kio_fonts)"
        )
 
-       kde5_src_test
+       ecm_src_test
 }

diff --git a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild 
b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
index 86626c0b75..d9fd16f11b 100644
--- a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
@@ -3,34 +3,39 @@
 
 EAPI=7
 
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+
 LICENSE="LGPL-2+"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kjobwidgets)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep kwayland)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep kxmlgui)
-       $(add_plasma_dep breeze)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui 'dbus' '' '5=')
-       $(add_qt_dep qtquickcontrols2)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtx11extras)
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kjobwidgets-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/kwayland-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-plasma/breeze-${PVCUT}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5=[dbus]
+       >=dev-qt/qtquickcontrols2-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtx11extras-${QTMIN}:5
        x11-libs/libXcursor
        x11-libs/libxcb
 "

diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild 
b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
index 397e8f61dc..1d7967ae6d 100644
--- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
@@ -3,54 +3,59 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma applet for NetworkManager"
+
 LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
 KEYWORDS=""
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kitemviews)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep kwallet)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep kxmlgui)
-       $(add_frameworks_dep networkmanager-qt 'teamd=')
-       $(add_frameworks_dep plasma)
-       $(add_frameworks_dep solid)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative 'widgets')
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtnetwork)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kitemviews-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/kwallet-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=kde-frameworks/solid-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtnetwork-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
        >=app-crypt/qca-2.1.1:2[qt5(+)]
        net-misc/networkmanager[teamd=]
        modemmanager? (
-               $(add_frameworks_dep modemmanager-qt)
-               $(add_qt_dep qtxml)
+               >=kde-frameworks/modemmanager-qt-${KFMIN}:5
+               >=dev-qt/qtxml-${QTMIN}:5
                net-misc/mobile-broadband-provider-info
        )
        openconnect? (
-               $(add_qt_dep qtxml)
+               >=dev-qt/qtxml-${QTMIN}:5
                net-vpn/networkmanager-openconnect
                net-vpn/openconnect:=
        )
 "
 RDEPEND="${DEPEND}
-       $(add_plasma_dep kde-cli-tools)
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
 src_configure() {
@@ -60,11 +65,11 @@ src_configure() {
                $(cmake-utils_use_find_package openconnect OpenConnect)
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }
 
 pkg_postinst() {
-       kde5_pkg_postinst
+       ecm_pkg_postinst
 
        if ! has_version "kde-plasma/plasma-workspace:5"; then
                elog "${PN} is not terribly useful without 
kde-plasma/plasma-workspace:5."

diff --git a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild 
b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
index b1d720e6af..7d1462f21f 100644
--- a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
@@ -3,30 +3,36 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep kglobalaccel)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep plasma)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
        dev-libs/glib:2
        media-libs/libcanberra
        media-sound/pulseaudio
 "
 RDEPEND="${DEPEND}
-       $(add_frameworks_dep kirigami)
-       $(add_qt_dep qtquickcontrols2)
+       >=kde-frameworks/kirigami-${KFMIN}:5
+       >=dev-qt/qtquickcontrols2-${QTMIN}:5
        media-libs/libcanberra
        x11-themes/sound-theme-freedesktop
 "

diff --git a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild 
b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
index 3c52aa7948..666233de59 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
@@ -3,36 +3,42 @@
 
 EAPI=7
 
-KDE_TEST="optional"
+ECM_TEST="optional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Useful applications for Plasma development"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep karchive)
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kpackage)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep ktexteditor)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep plasma)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtxml)
+       >=kde-frameworks/karchive-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kpackage-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/ktexteditor-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtxml-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
-       $(add_frameworks_dep kirigami)
+       >=kde-frameworks/kirigami-${KFMIN}:5
 "

diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-9999.ebuild 
b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-9999.ebuild
index 6deb83a0a1..de04252ecf 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-9999.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-9999.ebuild
@@ -3,26 +3,30 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
 HOMEPAGE="https://cgit.kde.org/plasma-thunderbolt.git";
 
 LICENSE="|| ( GPL-2 GPL-3+ )"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep knotifications)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
        sys-apps/bolt

diff --git a/kde-plasma/plasma-vault/plasma-vault-9999.ebuild 
b/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
index 88e94dced5..fca5ad4d96 100644
--- a/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
@@ -3,32 +3,36 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Plasma applet and services for creating encrypted vaults"
 HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/";
 
 LICENSE="LGPL-3"
+SLOT="5"
 KEYWORDS=""
 IUSE="networkmanager"
 
 DEPEND="
-       $(add_frameworks_dep kactivities)
-       $(add_frameworks_dep kcodecs)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep plasma)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_plasma_dep libksysguard)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
-       networkmanager? ( $(add_frameworks_dep networkmanager-qt) )
+       >=kde-frameworks/kactivities-${KFMIN}:5
+       >=kde-frameworks/kcodecs-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-plasma/libksysguard-${PVCUT}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
 "
 RDEPEND="${DEPEND}
        || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
@@ -39,5 +43,5 @@ src_configure() {
                $(cmake-utils_use_find_package networkmanager 
KF5NetworkManagerQt)
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }

diff --git 
a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
 
b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
index eccdd355c1..bb53d0712a 100644
--- 
a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
+++ 
b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+PVCUT=$(ver_cut 1-3)
 inherit kde.org
 
 DESCRIPTION="Wallpapers for the Plasma workspace"

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 6e287a1520..3e29cb5e6a 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -3,12 +3,17 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma workspace"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE="appstream +calendar feedback geolocation gps qalculate qrcode 
+semantic-desktop systemd"
 
@@ -16,57 +21,57 @@ REQUIRED_USE="gps? ( geolocation )"
 
 # drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
 COMMON_DEPEND="
-       $(add_frameworks_dep kactivities)
-       $(add_frameworks_dep kactivities-stats)
-       $(add_frameworks_dep kauth)
-       $(add_frameworks_dep kbookmarks)
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kcrash)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep kded)
-       $(add_frameworks_dep kdelibs4support)
-       $(add_frameworks_dep kglobalaccel)
-       $(add_frameworks_dep kguiaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kidletime)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kitemmodels)
-       $(add_frameworks_dep kitemviews)
-       $(add_frameworks_dep kjobwidgets)
-       $(add_frameworks_dep knewstuff)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep knotifyconfig)
-       $(add_frameworks_dep kpackage)
-       $(add_frameworks_dep kpeople)
-       $(add_frameworks_dep krunner)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep ktexteditor)
-       $(add_frameworks_dep ktextwidgets)
-       $(add_frameworks_dep kwallet)
-       $(add_frameworks_dep kwayland)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep kxmlgui)
-       $(add_frameworks_dep plasma)
-       $(add_frameworks_dep solid)
-       $(add_plasma_dep kscreenlocker)
-       $(add_plasma_dep kwin)
-       $(add_plasma_dep libkscreen)
-       $(add_plasma_dep libksysguard)
-       $(add_plasma_dep libkworkspace)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative 'widgets')
-       $(add_qt_dep qtgui 'jpeg' '' '5=')
-       $(add_qt_dep qtnetwork)
-       $(add_qt_dep qtsql)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtx11extras)
-       $(add_qt_dep qtxml)
+       >=kde-frameworks/kactivities-${KFMIN}:5
+       >=kde-frameworks/kactivities-stats-${KFMIN}:5
+       >=kde-frameworks/kauth-${KFMIN}:5
+       >=kde-frameworks/kbookmarks-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/kded-${KFMIN}:5
+       >=kde-frameworks/kdelibs4support-${KFMIN}:5
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5
+       >=kde-frameworks/kguiaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kidletime-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kitemmodels-${KFMIN}:5
+       >=kde-frameworks/kitemviews-${KFMIN}:5
+       >=kde-frameworks/kjobwidgets-${KFMIN}:5
+       >=kde-frameworks/knewstuff-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/knotifyconfig-${KFMIN}:5
+       >=kde-frameworks/kpackage-${KFMIN}:5
+       >=kde-frameworks/kpeople-${KFMIN}:5
+       >=kde-frameworks/krunner-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/ktexteditor-${KFMIN}:5
+       >=kde-frameworks/ktextwidgets-${KFMIN}:5
+       >=kde-frameworks/kwallet-${KFMIN}:5
+       >=kde-frameworks/kwayland-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=kde-frameworks/solid-${KFMIN}:5
+       >=kde-plasma/kscreenlocker-${PVCUT}:5
+       >=kde-plasma/kwin-${PVCUT}:5
+       >=kde-plasma/libkscreen-${PVCUT}:5
+       >=kde-plasma/libksysguard-${PVCUT}:5
+       >=kde-plasma/libkworkspace-${PVCUT}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+       >=dev-qt/qtgui-${QTMIN}:5=[jpeg]
+       >=dev-qt/qtnetwork-${QTMIN}:5
+       >=dev-qt/qtsql-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtx11extras-${QTMIN}:5
+       >=dev-qt/qtxml-${QTMIN}:5
        media-libs/phonon[qt5(+)]
        sys-libs/zlib
        x11-libs/libICE
@@ -80,30 +85,30 @@ COMMON_DEPEND="
        x11-libs/xcb-util
        x11-libs/xcb-util-image
        appstream? ( dev-libs/appstream[qt5] )
-       calendar? ( $(add_frameworks_dep kholidays) )
+       calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
        feedback? ( dev-libs/kuserfeedback:5 )
-       geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+       geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
        gps? ( sci-geosciences/gpsd )
        qalculate? ( sci-libs/libqalculate:= )
-       qrcode? ( $(add_frameworks_dep prison) )
-       semantic-desktop? ( $(add_frameworks_dep baloo) )
+       qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
+       semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
-       $(add_qt_dep qtconcurrent)
+       >=dev-qt/qtconcurrent-${QTMIN}:5
        x11-base/xorg-proto
 "
 RDEPEND="${COMMON_DEPEND}
-       $(add_frameworks_dep kdesu)
-       $(add_frameworks_dep kirigami)
-       $(add_kdeapps_dep kio-extras)
-       $(add_plasma_dep ksysguard)
-       $(add_plasma_dep milou)
-       $(add_plasma_dep plasma-integration)
-       $(add_qt_dep qdbus)
-       $(add_qt_dep qtgraphicaleffects)
-       $(add_qt_dep qtpaths)
-       $(add_qt_dep qtquickcontrols 'widgets')
-       $(add_qt_dep qtquickcontrols2)
+       >=kde-frameworks/kdesu-${KFMIN}:5
+       >=kde-frameworks/kirigami-${KFMIN}:5
+       >=kde-apps/kio-extras-19.04.3:5
+       >=kde-plasma/ksysguard-${PVCUT}:5
+       >=kde-plasma/milou-${PVCUT}:5
+       >=kde-plasma/plasma-integration-${PVCUT}:5
+       >=dev-qt/qdbus-${QTMIN}:5
+       >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+       >=dev-qt/qtpaths-${QTMIN}:5
+       >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
+       >=dev-qt/qtquickcontrols2-${QTMIN}:5
        app-text/iso-codes
        x11-apps/xmessage
        x11-apps/xprop
@@ -114,7 +119,7 @@ RDEPEND="${COMMON_DEPEND}
        !<kde-plasma/plasma-desktop-5.16.80:5
 "
 PDEPEND="
-       $(add_plasma_dep kde-cli-tools)
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
 PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
@@ -122,7 +127,7 @@ PATCHES=( 
"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
 RESTRICT+=" test"
 
 src_prepare() {
-       kde5_src_prepare
+       ecm_src_prepare
 
        cmake_comment_add_subdirectory libkworkspace
        # delete colliding libkworkspace translations
@@ -145,11 +150,11 @@ src_configure() {
 
        use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
 
-       kde5_src_configure
+       ecm_src_configure
 }
 
 src_install() {
-       kde5_src_install
+       ecm_src_install
 
        # startup and shutdown scripts
        insinto /etc/plasma/startup
@@ -160,7 +165,7 @@ src_install() {
 }
 
 pkg_postinst () {
-       kde5_pkg_postinst
+       ecm_pkg_postinst
 
        elog "To enable gpg-agent and/or ssh-agent in Plasma sessions, do the 
following:"
        elog " * Copy the necessary files to your home directory:"

diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild 
b/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild
index ac7bc90249..f9f632236d 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild
@@ -4,33 +4,37 @@
 EAPI=7
 
 BOGUS=1
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma control module for Plymouth"
 HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git";
 
 LICENSE="GPL-2+"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep karchive)
-       $(add_frameworks_dep kauth)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep knewstuff)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtquickcontrols)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/karchive-${KFMIN}:5
+       >=kde-frameworks/kauth-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/knewstuff-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtquickcontrols-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
        sys-boot/plymouth
 "
 RDEPEND="${DEPEND}
-       $(add_plasma_dep kde-cli-tools)
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
 DOCS=( CONTRIBUTORS )

diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild 
b/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
index fa6a565c62..d8687d76bf 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
@@ -3,25 +3,31 @@
 
 EAPI=7
 
-KMNAME="${PN}-1"
-inherit kde5
+KDE_ORG_NAME="${PN}-1"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="PolKit agent module for KDE Plasma"
 HOMEPAGE="https://kde.org/";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kcrash)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
        >=sys-auth/polkit-qt-0.112.0[qt5(+)]
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild 
b/kde-plasma/powerdevil/powerdevil-9999.ebuild
index d816007fd7..cf1658b18a 100644
--- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
@@ -3,50 +3,56 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Power management for KDE Plasma Shell"
 HOMEPAGE="https://cgit.kde.org/powerdevil.git";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE="brightness-control +wireless"
 
 DEPEND="
-       $(add_frameworks_dep kactivities)
-       $(add_frameworks_dep kauth policykit)
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kcrash)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kglobalaccel)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kidletime)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep knotifyconfig)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep kwayland)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kxmlgui)
-       $(add_frameworks_dep solid)
-       $(add_plasma_dep libkscreen)
-       $(add_plasma_dep libkworkspace)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
-       $(add_qt_dep qtx11extras)
+       >=kde-frameworks/kactivities-${KFMIN}:5
+       >=kde-frameworks/kauth-${KFMIN}:5[policykit]
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kidletime-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/knotifyconfig-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/kwayland-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/solid-${KFMIN}:5
+       >=kde-plasma/libkscreen-${PVCUT}:5
+       >=kde-plasma/libkworkspace-${PVCUT}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtx11extras-${QTMIN}:5
        virtual/libudev:=
        x11-libs/libxcb
        brightness-control? ( app-misc/ddcutil )
        wireless? (
-               $(add_frameworks_dep bluez-qt)
-               $(add_frameworks_dep networkmanager-qt)
+               >=kde-frameworks/bluez-qt-${KFMIN}:5
+               >=kde-frameworks/networkmanager-qt-${KFMIN}:5
        )
 "
 RDEPEND="${DEPEND}
-       $(add_plasma_dep kde-cli-tools)
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
        >=sys-power/upower-0.9.23
 "
 
@@ -57,5 +63,5 @@ src_configure() {
                $(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
        )
 
-       kde5_src_configure
+       ecm_src_configure
 }

diff --git a/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild 
b/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
index 5bcb132053..e90237e61d 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
@@ -3,31 +3,35 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma control module for SDDM"
 HOMEPAGE="https://cgit.kde.org/sddm-kcm.git";
 
 LICENSE="GPL-2+"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep karchive)
-       $(add_frameworks_dep kauth)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep knewstuff)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_qt_dep qtdeclarative 'widgets')
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/karchive-${KFMIN}:5
+       >=kde-frameworks/kauth-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/knewstuff-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
-       $(add_plasma_dep kde-cli-tools)
+       >=kde-plasma/kde-cli-tools-${PVCUT}:5
        x11-misc/sddm
 "
 

diff --git a/kde-plasma/systemsettings/systemsettings-9999.ebuild 
b/kde-plasma/systemsettings/systemsettings-9999.ebuild
index 2d0bb16a83..c68e6bb37e 100644
--- a/kde-plasma/systemsettings/systemsettings-9999.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-9999.ebuild
@@ -3,47 +3,53 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Control Center to configure KDE Plasma desktop"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kactivities)
-       $(add_frameworks_dep kactivities-stats)
-       $(add_frameworks_dep kauth)
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kcrash)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kitemviews)
-       $(add_frameworks_dep kpackage)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_frameworks_dep kxmlgui)
-       $(add_plasma_dep libkworkspace)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative 'widgets')
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kactivities-${KFMIN}:5
+       >=kde-frameworks/kactivities-stats-${KFMIN}:5
+       >=kde-frameworks/kauth-${KFMIN}:5
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kcrash-${KFMIN}:5
+       >=kde-frameworks/kdbusaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kitemviews-${KFMIN}:5
+       >=kde-frameworks/kpackage-${KFMIN}:5
+       >=kde-frameworks/kservice-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-plasma/libkworkspace-${PVCUT}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
        !kde-misc/systemd-kcm
-       $(add_frameworks_dep kirigami)
+       >=kde-frameworks/kirigami-${KFMIN}:5
 "
 
 src_prepare() {
-       kde5_src_prepare
+       ecm_src_prepare
 
        # FIXME: hangs in chroot; similar to bug #640432
        sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \
@@ -51,7 +57,7 @@ src_prepare() {
 }
 
 pkg_postinst() {
-       kde5_pkg_postinst
+       ecm_pkg_postinst
 
        if [[ -z "${REPLACING_VERSIONS}" ]]; then
                has_version kde-plasma/kde-gtk-config || \

diff --git a/kde-plasma/user-manager/user-manager-9999.ebuild 
b/kde-plasma/user-manager/user-manager-9999.ebuild
index 45e231692d..90322d976e 100644
--- a/kde-plasma/user-manager/user-manager-9999.ebuild
+++ b/kde-plasma/user-manager/user-manager-9999.ebuild
@@ -3,25 +3,31 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Simple system settings module to manage the users of your system"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       $(add_frameworks_dep kauth)
-       $(add_frameworks_dep kcmutils)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kiconthemes)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kauth-${KFMIN}:5
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
        >=dev-libs/libpwquality-1.3.0
 "
 RDEPEND="${DEPEND}

diff --git 
a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild 
b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild
index 30fccbbcba..dc7f2cdf82 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild
@@ -3,28 +3,33 @@
 
 EAPI=7
 
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Backend implementation for xdg-desktop-portal that is using 
Qt/KDE Frameworks"
+
 LICENSE="LGPL-2+"
+SLOT="5"
 KEYWORDS=""
 IUSE="screencast"
 
 COMMON_DEPEND="
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdeclarative)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kirigami)
-       $(add_frameworks_dep knotifications)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep plasma)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtdeclarative)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtprintsupport 'cups')
-       $(add_qt_dep qtwidgets)
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdeclarative-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kirigami-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/plasma-${KFMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtprintsupport-${QTMIN}:5[cups]
+       >=dev-qt/qtwidgets-${QTMIN}:5
        screencast? (
                media-libs/libepoxy
                media-libs/mesa[gbm]
@@ -32,8 +37,8 @@ COMMON_DEPEND="
        )
 "
 DEPEND="${COMMON_DEPEND}
-       $(add_frameworks_dep kwayland)
-       $(add_qt_dep qtconcurrent)
+       >=kde-frameworks/kwayland-${KFMIN}:5
+       >=dev-qt/qtconcurrent-${QTMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
        sys-apps/xdg-desktop-portal[screencast?]
@@ -45,5 +50,5 @@ src_configure() {
                $(cmake-utils_use_find_package screencast GBM)
                $(cmake-utils_use_find_package screencast Epoxy)
        )
-       kde5_src_configure
+       ecm_src_configure
 }

diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild 
b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
index ed07b2be85..856b16d1c1 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
@@ -3,23 +3,26 @@
 
 EAPI=7
 
-KDE_AUTODEPS="false"
-KMNAME="plasma-workspace"
-inherit kde5
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit cmake-utils kde.org
 
 DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
 
HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md";
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS=""
 
 DEPEND="
-       $(add_frameworks_dep extra-cmake-modules)
-       $(add_frameworks_dep kwindowsystem)
-       $(add_qt_dep qtcore)
-       $(add_qt_dep qtdbus)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtx11extras)
+       >=dev-qt/qtcore-${QTMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtx11extras-${QTMIN}:5
+       >=kde-frameworks/extra-cmake-modules-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
        x11-libs/libxcb
        x11-libs/libXtst
        x11-libs/xcb-util-image
@@ -34,7 +37,7 @@ S="${S}/${PN}"
 PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
 
 src_prepare() {
-       kde5_src_prepare
+       cmake-utils_src_prepare
 
        sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
                -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"

Reply via email to