commit:     e0ff1ec4b877f0cdd820971c5e950538bf5e5d68
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jan 25 00:26:43 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 16:21:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e0ff1ec4

kde-plasma: Convert to add_qt_dep

Package-Manager: portage-2.2.26

 kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild  |  8 +++---
 kde-plasma/bluedevil/bluedevil-9999.ebuild         |  8 +++---
 kde-plasma/breeze/breeze-5.5.49.9999.ebuild        |  8 +++---
 kde-plasma/breeze/breeze-9999.ebuild               |  8 +++---
 .../kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild | 10 ++++----
 kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild | 10 ++++----
 .../kde-gtk-config-5.5.49.9999.ebuild              |  4 +--
 .../kde-gtk-config/kde-gtk-config-9999.ebuild      |  4 +--
 .../kdeplasma-addons-5.5.49.9999.ebuild            | 12 ++++-----
 .../kdeplasma-addons/kdeplasma-addons-9999.ebuild  | 12 ++++-----
 kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild        |  6 ++---
 kde-plasma/kgamma/kgamma-9999.ebuild               |  5 ++--
 .../khelpcenter/khelpcenter-5.5.49.9999.ebuild     |  8 +++---
 kde-plasma/khelpcenter/khelpcenter-9999.ebuild     |  8 +++---
 kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild    |  8 +++---
 kde-plasma/khotkeys/khotkeys-9999.ebuild           |  8 +++---
 .../kinfocenter/kinfocenter-5.5.49.9999.ebuild     | 10 ++++----
 kde-plasma/kinfocenter/kinfocenter-9999.ebuild     | 10 ++++----
 kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild  |  8 +++---
 kde-plasma/kmenuedit/kmenuedit-9999.ebuild         |  8 +++---
 kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild      | 10 ++++----
 kde-plasma/kscreen/kscreen-9999.ebuild             | 10 ++++----
 .../kscreenlocker/kscreenlocker-5.5.49.9999.ebuild | 13 +++++-----
 kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild | 13 +++++-----
 .../ksshaskpass/ksshaskpass-5.5.49.9999.ebuild     |  2 +-
 kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild     |  2 +-
 kde-plasma/ksysguard/ksysguard-5.5.49.9999.ebuild  |  8 +++---
 kde-plasma/ksysguard/ksysguard-9999.ebuild         |  8 +++---
 .../kwayland-integration-5.5.49.9999.ebuild        |  4 +--
 .../kwayland-integration-9999.ebuild               |  4 +--
 kde-plasma/kwayland/kwayland-5.5.49.9999.ebuild    |  2 +-
 kde-plasma/kwayland/kwayland-9999.ebuild           |  2 +-
 kde-plasma/kwin/kwin-5.5.49.9999.ebuild            | 20 +++++++--------
 kde-plasma/kwin/kwin-9999.ebuild                   | 20 +++++++--------
 kde-plasma/kwrited/kwrited-5.5.49.9999.ebuild      |  4 +--
 kde-plasma/kwrited/kwrited-9999.ebuild             |  4 +--
 .../libkscreen/libkscreen-5.5.49.9999.ebuild       |  6 ++---
 kde-plasma/libkscreen/libkscreen-9999.ebuild       |  6 ++---
 .../libksysguard/libksysguard-5.5.49.9999.ebuild   | 12 ++++-----
 kde-plasma/libksysguard/libksysguard-9999.ebuild   | 12 ++++-----
 kde-plasma/milou/milou-5.5.49.9999.ebuild          |  6 ++---
 kde-plasma/milou/milou-9999.ebuild                 |  6 ++---
 kde-plasma/oxygen/oxygen-5.5.49.9999.ebuild        |  8 +++---
 kde-plasma/oxygen/oxygen-9999.ebuild               |  8 +++---
 .../plasma-desktop-5.5.49.9999.ebuild              | 24 +++++++++---------
 .../plasma-desktop/plasma-desktop-9999.ebuild      | 24 +++++++++---------
 .../plasma-integration-9999.ebuild                 |  6 ++---
 .../plasma-mediacenter-5.5.49.9999.ebuild          | 12 ++++-----
 .../plasma-mediacenter-9999.ebuild                 | 12 ++++-----
 kde-plasma/plasma-nm/plasma-nm-5.5.49.9999.ebuild  | 14 +++++------
 kde-plasma/plasma-nm/plasma-nm-9999.ebuild         | 14 +++++------
 kde-plasma/plasma-pa/plasma-pa-5.5.49.9999.ebuild  |  8 +++---
 kde-plasma/plasma-pa/plasma-pa-9999.ebuild         |  8 +++---
 .../plasma-sdk/plasma-sdk-5.5.49.9999.ebuild       | 10 ++++----
 kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild       | 10 ++++----
 .../plasma-workspace-5.5.49.9999.ebuild            | 29 +++++++++++-----------
 .../plasma-workspace/plasma-workspace-9999.ebuild  | 29 +++++++++++-----------
 .../polkit-kde-agent-5.5.49.9999.ebuild            |  6 ++---
 .../polkit-kde-agent/polkit-kde-agent-9999.ebuild  |  6 ++---
 .../powerdevil/powerdevil-5.5.49.9999.ebuild       |  8 +++---
 kde-plasma/powerdevil/powerdevil-9999.ebuild       |  8 +++---
 kde-plasma/sddm-kcm/sddm-kcm-5.5.49.9999.ebuild    |  8 +++---
 kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild           |  8 +++---
 .../systemsettings-5.5.49.9999.ebuild              |  6 ++---
 .../systemsettings/systemsettings-9999.ebuild      |  6 ++---
 .../user-manager/user-manager-5.5.49.9999.ebuild   |  6 ++---
 kde-plasma/user-manager/user-manager-9999.ebuild   |  6 ++---
 67 files changed, 309 insertions(+), 312 deletions(-)

diff --git a/kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild 
b/kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild
index 310cdc2..52c7657 100644
--- a/kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.5.49.9999.ebuild
@@ -25,10 +25,10 @@ COMMON_DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep plasma)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 DEPEND="${COMMON_DEPEND}
        x11-misc/shared-mime-info

diff --git a/kde-plasma/bluedevil/bluedevil-9999.ebuild 
b/kde-plasma/bluedevil/bluedevil-9999.ebuild
index 310cdc2..52c7657 100644
--- a/kde-plasma/bluedevil/bluedevil-9999.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-9999.ebuild
@@ -25,10 +25,10 @@ COMMON_DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep plasma)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 DEPEND="${COMMON_DEPEND}
        x11-misc/shared-mime-info

diff --git a/kde-plasma/breeze/breeze-5.5.49.9999.ebuild 
b/kde-plasma/breeze/breeze-5.5.49.9999.ebuild
index 4f4d312..81ccf3b 100644
--- a/kde-plasma/breeze/breeze-5.5.49.9999.ebuild
+++ b/kde-plasma/breeze/breeze-5.5.49.9999.ebuild
@@ -23,10 +23,10 @@ DEPEND="
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep plasma)
        $(add_plasma_dep kdecoration)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        x11-libs/libxcb
        qt4? (
                kde-base/kdelibs:4

diff --git a/kde-plasma/breeze/breeze-9999.ebuild 
b/kde-plasma/breeze/breeze-9999.ebuild
index 4f4d312..81ccf3b 100644
--- a/kde-plasma/breeze/breeze-9999.ebuild
+++ b/kde-plasma/breeze/breeze-9999.ebuild
@@ -23,10 +23,10 @@ DEPEND="
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep plasma)
        $(add_plasma_dep kdecoration)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        x11-libs/libxcb
        qt4? (
                kde-base/kdelibs:4

diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild 
b/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild
index a75fc20..6794eb1 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.49.9999.ebuild
@@ -26,14 +26,14 @@ DEPEND="
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtsvg:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtsvg)
+       $(add_qt_dep qtwidgets)
        kdesu? ( $(add_frameworks_dep kdesu) )
        X? (
                $(add_frameworks_dep kdelibs4support)
-               dev-qt/qtx11extras:5
+               $(add_qt_dep qtx11extras)
                x11-libs/libX11
        )
 "

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 a75fc20..6794eb1 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-9999.ebuild
@@ -26,14 +26,14 @@ DEPEND="
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtsvg:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtsvg)
+       $(add_qt_dep qtwidgets)
        kdesu? ( $(add_frameworks_dep kdesu) )
        X? (
                $(add_frameworks_dep kdelibs4support)
-               dev-qt/qtx11extras:5
+               $(add_qt_dep qtx11extras)
                x11-libs/libX11
        )
 "

diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.49.9999.ebuild 
b/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.49.9999.ebuild
index 894e33b..bf1230e 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.49.9999.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.49.9999.ebuild
@@ -25,8 +25,8 @@ DEPEND="
        $(add_frameworks_dep knewstuff)
        $(add_frameworks_dep kwidgetsaddons)
        dev-libs/glib:2
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        x11-libs/gtk+:2
        gtk3? ( x11-libs/gtk+:3 )
 "

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 894e33b..bf1230e 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
@@ -25,8 +25,8 @@ DEPEND="
        $(add_frameworks_dep knewstuff)
        $(add_frameworks_dep kwidgetsaddons)
        dev-libs/glib:2
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        x11-libs/gtk+:2
        gtk3? ( x11-libs/gtk+:3 )
 "

diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.49.9999.ebuild 
b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.49.9999.ebuild
index 5538e6b..9587d28 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.49.9999.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.49.9999.ebuild
@@ -35,15 +35,15 @@ DEPEND="
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep plasma)
        $(add_frameworks_dep sonnet)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        ibus? (
                app-i18n/ibus
                dev-libs/glib:2
-               dev-qt/qtx11extras:5
+               $(add_qt_dep qtx11extras)
                x11-libs/libxcb
                x11-libs/xcb-util-keysyms
        )

diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild 
b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 5538e6b..9587d28 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -35,15 +35,15 @@ DEPEND="
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep plasma)
        $(add_frameworks_dep sonnet)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        ibus? (
                app-i18n/ibus
                dev-libs/glib:2
-               dev-qt/qtx11extras:5
+               $(add_qt_dep qtx11extras)
                x11-libs/libxcb
                x11-libs/xcb-util-keysyms
        )

diff --git a/kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild 
b/kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild
index 6aac9ee..6933b1c 100644
--- a/kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.5.49.9999.ebuild
@@ -18,9 +18,9 @@ RDEPEND="
        $(add_frameworks_dep kcoreaddons)
        $(add_frameworks_dep kdelibs4support)
        $(add_frameworks_dep ki18n)
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        x11-libs/libX11
        x11-libs/libXxf86vm
 "

diff --git a/kde-plasma/kgamma/kgamma-9999.ebuild 
b/kde-plasma/kgamma/kgamma-9999.ebuild
index c2a1b98..6933b1c 100644
--- a/kde-plasma/kgamma/kgamma-9999.ebuild
+++ b/kde-plasma/kgamma/kgamma-9999.ebuild
@@ -18,8 +18,9 @@ RDEPEND="
        $(add_frameworks_dep kcoreaddons)
        $(add_frameworks_dep kdelibs4support)
        $(add_frameworks_dep ki18n)
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        x11-libs/libX11
        x11-libs/libXxf86vm
 "

diff --git a/kde-plasma/khelpcenter/khelpcenter-5.5.49.9999.ebuild 
b/kde-plasma/khelpcenter/khelpcenter-5.5.49.9999.ebuild
index 8f3add6..bcef29d 100644
--- a/kde-plasma/khelpcenter/khelpcenter-5.5.49.9999.ebuild
+++ b/kde-plasma/khelpcenter/khelpcenter-5.5.49.9999.ebuild
@@ -31,10 +31,10 @@ DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}
        $(add_plasma_dep kde-cli-tools)

diff --git a/kde-plasma/khelpcenter/khelpcenter-9999.ebuild 
b/kde-plasma/khelpcenter/khelpcenter-9999.ebuild
index 8f3add6..bcef29d 100644
--- a/kde-plasma/khelpcenter/khelpcenter-9999.ebuild
+++ b/kde-plasma/khelpcenter/khelpcenter-9999.ebuild
@@ -31,10 +31,10 @@ DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}
        $(add_plasma_dep kde-cli-tools)

diff --git a/kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild 
b/kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild
index 9ef8a67..231d101 100644
--- a/kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.5.49.9999.ebuild
@@ -27,10 +27,10 @@ COMMON_DEPEND="
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
        $(add_plasma_dep plasma-workspace)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        x11-libs/libX11
 "
 RDEPEND="${COMMON_DEPEND}

diff --git a/kde-plasma/khotkeys/khotkeys-9999.ebuild 
b/kde-plasma/khotkeys/khotkeys-9999.ebuild
index 9ef8a67..231d101 100644
--- a/kde-plasma/khotkeys/khotkeys-9999.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-9999.ebuild
@@ -27,10 +27,10 @@ COMMON_DEPEND="
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
        $(add_plasma_dep plasma-workspace)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        x11-libs/libX11
 "
 RDEPEND="${COMMON_DEPEND}

diff --git a/kde-plasma/kinfocenter/kinfocenter-5.5.49.9999.ebuild 
b/kde-plasma/kinfocenter/kinfocenter-5.5.49.9999.ebuild
index 00f0cca..12a10e1 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.5.49.9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.5.49.9999.ebuild
@@ -32,12 +32,12 @@ COMMON_DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep solid)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5[opengl(+)]
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui 'opengl(+)')
+       $(add_qt_dep qtwidgets)
        gles? (
-               dev-qt/qtgui:5[gles2]
+               $(add_qt_dep qtgui 'gles2')
                || (
                        media-libs/mesa[egl,gles1]
                        media-libs/mesa[egl,gles2]

diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild 
b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
index 00f0cca..12a10e1 100644
--- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
@@ -32,12 +32,12 @@ COMMON_DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep solid)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5[opengl(+)]
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui 'opengl(+)')
+       $(add_qt_dep qtwidgets)
        gles? (
-               dev-qt/qtgui:5[gles2]
+               $(add_qt_dep qtgui 'gles2')
                || (
                        media-libs/mesa[egl,gles1]
                        media-libs/mesa[egl,gles2]

diff --git a/kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild 
b/kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild
index fc75c3d..d1873d4 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.5.49.9999.ebuild
@@ -26,10 +26,10 @@ DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep sonnet)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
        hotkeys? ( $(add_plasma_dep khotkeys) )
 "
 RDEPEND="${DEPEND}

diff --git a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild 
b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
index fc75c3d..d1873d4 100644
--- a/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-9999.ebuild
@@ -26,10 +26,10 @@ DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep sonnet)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
        hotkeys? ( $(add_plasma_dep khotkeys) )
 "
 RDEPEND="${DEPEND}

diff --git a/kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild 
b/kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild
index 15cb0ea..441068d 100644
--- a/kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.5.49.9999.ebuild
@@ -22,13 +22,13 @@ DEPEND="
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5[widgets]
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative 'widgets')
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}
        $(add_plasma_dep kde-cli-tools)
-       dev-qt/qtgraphicaleffects:5
+       $(add_qt_dep qtgraphicaleffects)
        !kde-misc/kscreen
 "

diff --git a/kde-plasma/kscreen/kscreen-9999.ebuild 
b/kde-plasma/kscreen/kscreen-9999.ebuild
index 15cb0ea..441068d 100644
--- a/kde-plasma/kscreen/kscreen-9999.ebuild
+++ b/kde-plasma/kscreen/kscreen-9999.ebuild
@@ -22,13 +22,13 @@ DEPEND="
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5[widgets]
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative 'widgets')
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}
        $(add_plasma_dep kde-cli-tools)
-       dev-qt/qtgraphicaleffects:5
+       $(add_qt_dep qtgraphicaleffects)
        !kde-misc/kscreen
 "

diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.5.49.9999.ebuild 
b/kde-plasma/kscreenlocker/kscreenlocker-5.5.49.9999.ebuild
index 5700942..2e0db86 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.5.49.9999.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.5.49.9999.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 KDE_TEST="forceoptional"
-QT_MINIMAL="5.5.0"
 VIRTUALX_REQUIRED="test"
 inherit kde5 pam
 
@@ -30,13 +29,13 @@ COMMON_DEPEND="
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep plasma)
        $(add_plasma_dep kwayland)
+       $(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)
        dev-libs/wayland
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5[widgets]
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
        x11-libs/libX11
        x11-libs/libXi
        x11-libs/libxcb

diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild 
b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
index 9cb532c..dc0c758 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 KDE_TEST="forceoptional"
-QT_MINIMAL="5.5.0"
 VIRTUALX_REQUIRED="test"
 inherit kde5 pam
 
@@ -29,13 +28,13 @@ COMMON_DEPEND="
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep solid)
        $(add_plasma_dep kwayland)
+       $(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)
        dev-libs/wayland
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5[widgets]
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
        x11-libs/libX11
        x11-libs/libXi
        x11-libs/libxcb

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.5.49.9999.ebuild 
b/kde-plasma/ksshaskpass/ksshaskpass-5.5.49.9999.ebuild
index 55555c2..b917786 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.5.49.9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.5.49.9999.ebuild
@@ -16,7 +16,7 @@ DEPEND="
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kwallet)
        $(add_frameworks_dep kwidgetsaddons)
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="
        ${DEPEND}

diff --git a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild 
b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
index 55555c2..b917786 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-9999.ebuild
@@ -16,7 +16,7 @@ DEPEND="
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kwallet)
        $(add_frameworks_dep kwidgetsaddons)
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="
        ${DEPEND}

diff --git a/kde-plasma/ksysguard/ksysguard-5.5.49.9999.ebuild 
b/kde-plasma/ksysguard/ksysguard-5.5.49.9999.ebuild
index 39ddc4f..e6b3842 100644
--- a/kde-plasma/ksysguard/ksysguard-5.5.49.9999.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.5.49.9999.ebuild
@@ -29,10 +29,10 @@ DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
        lm_sensors? ( sys-apps/lm_sensors )
 "
 RDEPEND="${DEPEND}

diff --git a/kde-plasma/ksysguard/ksysguard-9999.ebuild 
b/kde-plasma/ksysguard/ksysguard-9999.ebuild
index 39ddc4f..e6b3842 100644
--- a/kde-plasma/ksysguard/ksysguard-9999.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-9999.ebuild
@@ -29,10 +29,10 @@ DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
        lm_sensors? ( sys-apps/lm_sensors )
 "
 RDEPEND="${DEPEND}

diff --git 
a/kde-plasma/kwayland-integration/kwayland-integration-5.5.49.9999.ebuild 
b/kde-plasma/kwayland-integration/kwayland-integration-5.5.49.9999.ebuild
index 628feb4..de8ed75 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.5.49.9999.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.5.49.9999.ebuild
@@ -17,7 +17,7 @@ DEPEND="
        $(add_frameworks_dep kidletime)
        $(add_frameworks_dep kwindowsystem)
        $(add_plasma_dep kwayland)
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild 
b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
index 628feb4..de8ed75 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild
@@ -17,7 +17,7 @@ DEPEND="
        $(add_frameworks_dep kidletime)
        $(add_frameworks_dep kwindowsystem)
        $(add_plasma_dep kwayland)
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-plasma/kwayland/kwayland-5.5.49.9999.ebuild 
b/kde-plasma/kwayland/kwayland-5.5.49.9999.ebuild
index 4070d95..e4de6b3 100644
--- a/kde-plasma/kwayland/kwayland-5.5.49.9999.ebuild
+++ b/kde-plasma/kwayland/kwayland-5.5.49.9999.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND="
        >=dev-libs/wayland-1.7.0
-       dev-qt/qtgui:5
+       $(add_qt_dep qtgui)
        media-libs/mesa[egl]
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-plasma/kwayland/kwayland-9999.ebuild 
b/kde-plasma/kwayland/kwayland-9999.ebuild
index 4070d95..e4de6b3 100644
--- a/kde-plasma/kwayland/kwayland-9999.ebuild
+++ b/kde-plasma/kwayland/kwayland-9999.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND="
        >=dev-libs/wayland-1.7.0
-       dev-qt/qtgui:5
+       $(add_qt_dep qtgui)
        media-libs/mesa[egl]
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-plasma/kwin/kwin-5.5.49.9999.ebuild 
b/kde-plasma/kwin/kwin-5.5.49.9999.ebuild
index 91cc765..ec1e939 100644
--- a/kde-plasma/kwin/kwin-5.5.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.5.49.9999.ebuild
@@ -43,12 +43,12 @@ COMMON_DEPEND="
        $(add_plasma_dep kwayland)
        >=dev-libs/libinput-0.10
        >=dev-libs/wayland-1.2
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5[gles2=,opengl(+)]
-       dev-qt/qtscript:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui 'gles2=,opengl(+)')
+       $(add_qt_dep qtscript)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        media-libs/fontconfig
        media-libs/freetype
        media-libs/libepoxy
@@ -68,16 +68,16 @@ RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep kde-cli-tools)
        multimedia? (
                || (
-                       dev-qt/qtmultimedia:5[gstreamer,qml]
-                       dev-qt/qtmultimedia:5[gstreamer010,qml]
+                       $(add_qt_dep qtmultimedia 'gstreamer,qml')
+                       $(add_qt_dep qtmultimedia 'gstreamer010,qml')
                )
        )
        !kde-base/kwin:4
        !kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
-       dev-qt/designer:5
-       dev-qt/qtconcurrent:5
+       $(add_qt_dep designer)
+       $(add_qt_dep qtconcurrent)
        x11-proto/xproto
        test? ( x11-libs/xcb-util-wm )
 "

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 91cc765..ec1e939 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -43,12 +43,12 @@ COMMON_DEPEND="
        $(add_plasma_dep kwayland)
        >=dev-libs/libinput-0.10
        >=dev-libs/wayland-1.2
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5[gles2=,opengl(+)]
-       dev-qt/qtscript:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui 'gles2=,opengl(+)')
+       $(add_qt_dep qtscript)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        media-libs/fontconfig
        media-libs/freetype
        media-libs/libepoxy
@@ -68,16 +68,16 @@ RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep kde-cli-tools)
        multimedia? (
                || (
-                       dev-qt/qtmultimedia:5[gstreamer,qml]
-                       dev-qt/qtmultimedia:5[gstreamer010,qml]
+                       $(add_qt_dep qtmultimedia 'gstreamer,qml')
+                       $(add_qt_dep qtmultimedia 'gstreamer010,qml')
                )
        )
        !kde-base/kwin:4
        !kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
-       dev-qt/designer:5
-       dev-qt/qtconcurrent:5
+       $(add_qt_dep designer)
+       $(add_qt_dep qtconcurrent)
        x11-proto/xproto
        test? ( x11-libs/xcb-util-wm )
 "

diff --git a/kde-plasma/kwrited/kwrited-5.5.49.9999.ebuild 
b/kde-plasma/kwrited/kwrited-5.5.49.9999.ebuild
index 0c184ad..36d5a93 100644
--- a/kde-plasma/kwrited/kwrited-5.5.49.9999.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.5.49.9999.ebuild
@@ -16,8 +16,8 @@ DEPEND="
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep knotifications)
        $(add_frameworks_dep kpty)
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}
        !kde-base/kwrited:4

diff --git a/kde-plasma/kwrited/kwrited-9999.ebuild 
b/kde-plasma/kwrited/kwrited-9999.ebuild
index 0c184ad..36d5a93 100644
--- a/kde-plasma/kwrited/kwrited-9999.ebuild
+++ b/kde-plasma/kwrited/kwrited-9999.ebuild
@@ -16,8 +16,8 @@ DEPEND="
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep knotifications)
        $(add_frameworks_dep kpty)
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}
        !kde-base/kwrited:4

diff --git a/kde-plasma/libkscreen/libkscreen-5.5.49.9999.ebuild 
b/kde-plasma/libkscreen/libkscreen-5.5.49.9999.ebuild
index cedf8da..435423c 100644
--- a/kde-plasma/libkscreen/libkscreen-5.5.49.9999.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.5.49.9999.ebuild
@@ -13,9 +13,9 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtx11extras)
        x11-libs/libxcb
 "
 RDEPEND="${DEPEND}

diff --git a/kde-plasma/libkscreen/libkscreen-9999.ebuild 
b/kde-plasma/libkscreen/libkscreen-9999.ebuild
index ae622c9..bbcccb6 100644
--- a/kde-plasma/libkscreen/libkscreen-9999.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-9999.ebuild
@@ -14,9 +14,9 @@ IUSE="X"
 
 DEPEND="
        $(add_plasma_dep kwayland)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtx11extras)
        X? ( x11-libs/libxcb )
 "
 RDEPEND="${DEPEND}

diff --git a/kde-plasma/libksysguard/libksysguard-5.5.49.9999.ebuild 
b/kde-plasma/libksysguard/libksysguard-5.5.49.9999.ebuild
index e49af3e..398a0c8 100644
--- a/kde-plasma/libksysguard/libksysguard-5.5.49.9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.5.49.9999.ebuild
@@ -22,14 +22,14 @@ COMMON_DEPEND="
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtwidgets)
        sys-libs/zlib
-       detailedmemory? ( dev-qt/qtwebkit:5 )
+       detailedmemory? ( $(add_qt_dep qtwebkit) )
        X? (
-               dev-qt/qtx11extras:5
+               $(add_qt_dep qtx11extras)
                x11-libs/libX11
                x11-libs/libXres
        )

diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild 
b/kde-plasma/libksysguard/libksysguard-9999.ebuild
index e49af3e..398a0c8 100644
--- a/kde-plasma/libksysguard/libksysguard-9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild
@@ -22,14 +22,14 @@ COMMON_DEPEND="
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtwidgets)
        sys-libs/zlib
-       detailedmemory? ( dev-qt/qtwebkit:5 )
+       detailedmemory? ( $(add_qt_dep qtwebkit) )
        X? (
-               dev-qt/qtx11extras:5
+               $(add_qt_dep qtx11extras)
                x11-libs/libX11
                x11-libs/libXres
        )

diff --git a/kde-plasma/milou/milou-5.5.49.9999.ebuild 
b/kde-plasma/milou/milou-5.5.49.9999.ebuild
index fac285b..4efdac9 100644
--- a/kde-plasma/milou/milou-5.5.49.9999.ebuild
+++ b/kde-plasma/milou/milou-5.5.49.9999.ebuild
@@ -21,9 +21,9 @@ DEPEND="
        $(add_frameworks_dep krunner)
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep plasma)
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}
        !kde-misc/milou:4

diff --git a/kde-plasma/milou/milou-9999.ebuild 
b/kde-plasma/milou/milou-9999.ebuild
index fac285b..4efdac9 100644
--- a/kde-plasma/milou/milou-9999.ebuild
+++ b/kde-plasma/milou/milou-9999.ebuild
@@ -21,9 +21,9 @@ DEPEND="
        $(add_frameworks_dep krunner)
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep plasma)
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}
        !kde-misc/milou:4

diff --git a/kde-plasma/oxygen/oxygen-5.5.49.9999.ebuild 
b/kde-plasma/oxygen/oxygen-5.5.49.9999.ebuild
index 1e9ab7a..2c2a9b1 100644
--- a/kde-plasma/oxygen/oxygen-5.5.49.9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.5.49.9999.ebuild
@@ -23,10 +23,10 @@ RDEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
        $(add_plasma_dep kdecoration)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        x11-libs/libxcb
        !kde-base/kdebase-cursors:4
        !kde-base/oxygen:4

diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild 
b/kde-plasma/oxygen/oxygen-9999.ebuild
index 1e9ab7a..2c2a9b1 100644
--- a/kde-plasma/oxygen/oxygen-9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-9999.ebuild
@@ -23,10 +23,10 @@ RDEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
        $(add_plasma_dep kdecoration)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        x11-libs/libxcb
        !kde-base/kdebase-cursors:4
        !kde-base/oxygen:4

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.5.49.9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-5.5.49.9999.ebuild
index 66ae4fd..6f81777 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.5.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.5.49.9999.ebuild
@@ -54,17 +54,17 @@ COMMON_DEPEND="
        $(add_frameworks_dep plasma)
        $(add_frameworks_dep solid)
        $(add_frameworks_dep sonnet)
-       dev-qt/qtconcurrent:5
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtprintsupport:5
-       dev-qt/qtsql:5
-       dev-qt/qtsvg:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
-       dev-qt/qtxml:5
+       $(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)
        media-libs/phonon[qt5]
        x11-libs/libX11
        x11-libs/libXcursor
@@ -89,7 +89,7 @@ RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep breeze)
        $(add_plasma_dep kde-cli-tools)
        $(add_plasma_dep oxygen)
-       dev-qt/qtgraphicaleffects:5
+       $(add_qt_dep qtgraphicaleffects)
        sys-apps/accountsservice
        x11-apps/setxkbmap
        legacy-systray? (

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 7d2aed4..af28a55 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -54,17 +54,17 @@ COMMON_DEPEND="
        $(add_frameworks_dep sonnet)
        $(add_plasma_dep kwin)
        $(add_plasma_dep plasma-workspace)
-       dev-qt/qtconcurrent:5
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtprintsupport:5
-       dev-qt/qtsql:5
-       dev-qt/qtsvg:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
-       dev-qt/qtxml:5
+       $(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)
        media-libs/phonon[qt5]
        x11-libs/libX11
        x11-libs/libXcursor
@@ -89,7 +89,7 @@ RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep breeze)
        $(add_plasma_dep kde-cli-tools)
        $(add_plasma_dep oxygen)
-       dev-qt/qtgraphicaleffects:5
+       $(add_qt_dep qtgraphicaleffects)
        sys-apps/accountsservice
        x11-apps/setxkbmap
        legacy-systray? (

diff --git a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild 
b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
index 8110ed5..db003d1 100644
--- a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
@@ -27,10 +27,10 @@ DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
        $(add_plasma_dep kwayland)
-       dev-qt/qtdbus:5
+       $(add_qt_dep qtdbus)
        dev-qt/qtgui:5=
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        x11-libs/libXcursor
 "
 RDEPEND="${DEPEND}

diff --git 
a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.5.49.9999.ebuild 
b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.5.49.9999.ebuild
index 59a1526..6949296 100644
--- a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.5.49.9999.ebuild
+++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.5.49.9999.ebuild
@@ -21,11 +21,11 @@ DEPEND="
        $(add_frameworks_dep kio)
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep plasma)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtxml)
        media-libs/taglib
        semantic-desktop? (
                $(add_frameworks_dep baloo)
@@ -34,7 +34,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        $(add_plasma_dep plasma-workspace)
-       dev-qt/qtmultimedia:5[qml]
+       $(add_qt_dep qtmultimedia 'qml')
        !media-video/plasma-mediacenter
 "
 

diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-9999.ebuild 
b/kde-plasma/plasma-mediacenter/plasma-mediacenter-9999.ebuild
index 59a1526..6949296 100644
--- a/kde-plasma/plasma-mediacenter/plasma-mediacenter-9999.ebuild
+++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-9999.ebuild
@@ -21,11 +21,11 @@ DEPEND="
        $(add_frameworks_dep kio)
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep plasma)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtxml)
        media-libs/taglib
        semantic-desktop? (
                $(add_frameworks_dep baloo)
@@ -34,7 +34,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        $(add_plasma_dep plasma-workspace)
-       dev-qt/qtmultimedia:5[qml]
+       $(add_qt_dep qtmultimedia 'qml')
        !media-video/plasma-mediacenter
 "
 

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.5.49.9999.ebuild 
b/kde-plasma/plasma-nm/plasma-nm-5.5.49.9999.ebuild
index f914ea7..2fe6b94 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.5.49.9999.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.5.49.9999.ebuild
@@ -33,19 +33,19 @@ DEPEND="
        $(add_frameworks_dep plasma)
        $(add_frameworks_dep solid)
        >=app-crypt/qca-2.1.0.3-r1:2[qt5]
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtwidgets)
        >=net-misc/networkmanager-0.9.10.0[teamd=]
        modemmanager? (
                $(add_frameworks_dep modemmanager-qt)
-               dev-qt/qtxml:5
+               $(add_qt_dep qtxml)
                net-misc/mobile-broadband-provider-info
        )
        openconnect? (
-               dev-qt/qtxml:5
+               $(add_qt_dep qtxml)
                net-misc/networkmanager-openconnect
                net-misc/openconnect:=
        )

diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild 
b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
index f914ea7..2fe6b94 100644
--- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild
@@ -33,19 +33,19 @@ DEPEND="
        $(add_frameworks_dep plasma)
        $(add_frameworks_dep solid)
        >=app-crypt/qca-2.1.0.3-r1:2[qt5]
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtwidgets)
        >=net-misc/networkmanager-0.9.10.0[teamd=]
        modemmanager? (
                $(add_frameworks_dep modemmanager-qt)
-               dev-qt/qtxml:5
+               $(add_qt_dep qtxml)
                net-misc/mobile-broadband-provider-info
        )
        openconnect? (
-               dev-qt/qtxml:5
+               $(add_qt_dep qtxml)
                net-misc/networkmanager-openconnect
                net-misc/openconnect:=
        )

diff --git a/kde-plasma/plasma-pa/plasma-pa-5.5.49.9999.ebuild 
b/kde-plasma/plasma-pa/plasma-pa-5.5.49.9999.ebuild
index 09dbf39..f2ae54d 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.5.49.9999.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.5.49.9999.ebuild
@@ -17,10 +17,10 @@ DEPEND="
        $(add_frameworks_dep kglobalaccel)
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep plasma)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        media-sound/pulseaudio
 "
 

diff --git a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild 
b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
index 09dbf39..f2ae54d 100644
--- a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
@@ -17,10 +17,10 @@ DEPEND="
        $(add_frameworks_dep kglobalaccel)
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep plasma)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        media-sound/pulseaudio
 "
 

diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.5.49.9999.ebuild 
b/kde-plasma/plasma-sdk/plasma-sdk-5.5.49.9999.ebuild
index 554ce79..b4d53e3 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.5.49.9999.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.5.49.9999.ebuild
@@ -27,11 +27,11 @@ DEPEND="
        $(add_frameworks_dep ktexteditor)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep plasma)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}
        !dev-util/plasmate

diff --git a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild 
b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
index 554ce79..b4d53e3 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild
@@ -27,11 +27,11 @@ DEPEND="
        $(add_frameworks_dep ktexteditor)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep plasma)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}
        !dev-util/plasmate

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
index 7671c37..452241a 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.5.49.9999.ebuild
@@ -7,7 +7,6 @@ EAPI=6
 KDE_HANDBOOK="true"
 KDE_PUNT_BOGUS_DEPS="true"
 KDE_TEST="true"
-QT_MINIMAL="5.5.0"
 VIRTUALX_REQUIRED="test"
 inherit kde5 multilib qmake-utils
 
@@ -60,16 +59,16 @@ COMMON_DEPEND="
        $(add_plasma_dep kwin)
        $(add_plasma_dep libkscreen)
        $(add_plasma_dep libksysguard)
-       dev-qt/qtconcurrent:5
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5[widgets]
-       dev-qt/qtgui:5[jpeg]
-       dev-qt/qtnetwork:5
-       dev-qt/qtscript:5
-       dev-qt/qtsql:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtconcurrent)
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative 'widgets')
+       $(add_qt_dep qtgui 'jpeg')
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtscript)
+       $(add_qt_dep qtsql)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
+       $(add_qt_dep qtxml)
        media-libs/phonon[qt5]
        sys-libs/zlib
        x11-libs/libICE
@@ -93,10 +92,10 @@ RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep kde-cli-tools)
        $(add_plasma_dep ksysguard)
        $(add_plasma_dep milou)
-       dev-qt/qdbus:5
-       dev-qt/qtgraphicaleffects:5
-       dev-qt/qtpaths:5
-       dev-qt/qtquickcontrols:5[widgets]
+       $(add_qt_dep qdbus)
+       $(add_qt_dep qtgraphicaleffects)
+       $(add_qt_dep qtpaths)
+       $(add_qt_dep qtquickcontrols 'widgets')
        x11-apps/mkfontdir
        x11-apps/xmessage
        x11-apps/xprop

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 3bdfd3a..85a065b 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -7,7 +7,6 @@ EAPI=6
 KDE_HANDBOOK="true"
 KDE_PUNT_BOGUS_DEPS="true"
 KDE_TEST="true"
-QT_MINIMAL="5.5.0"
 VIRTUALX_REQUIRED="test"
 inherit kde5 multilib qmake-utils
 
@@ -60,16 +59,16 @@ COMMON_DEPEND="
        $(add_plasma_dep kwin)
        $(add_plasma_dep libkscreen)
        $(add_plasma_dep libksysguard)
-       dev-qt/qtconcurrent:5
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5[widgets]
-       dev-qt/qtgui:5[jpeg]
-       dev-qt/qtnetwork:5
-       dev-qt/qtscript:5
-       dev-qt/qtsql:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtconcurrent)
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative 'widgets')
+       $(add_qt_dep qtgui 'jpeg')
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtscript)
+       $(add_qt_dep qtsql)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
+       $(add_qt_dep qtxml)
        media-libs/phonon[qt5]
        sys-libs/zlib
        x11-libs/libICE
@@ -93,10 +92,10 @@ RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep kde-cli-tools)
        $(add_plasma_dep ksysguard)
        $(add_plasma_dep milou)
-       dev-qt/qdbus:5
-       dev-qt/qtgraphicaleffects:5
-       dev-qt/qtpaths:5
-       dev-qt/qtquickcontrols:5[widgets]
+       $(add_qt_dep qdbus)
+       $(add_qt_dep qtgraphicaleffects)
+       $(add_qt_dep qtpaths)
+       $(add_qt_dep qtquickcontrols 'widgets')
        x11-apps/mkfontdir
        x11-apps/xmessage
        x11-apps/xprop

diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.5.49.9999.ebuild 
b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.5.49.9999.ebuild
index 9dc6310..e8457e3 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.5.49.9999.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.5.49.9999.ebuild
@@ -21,9 +21,9 @@ DEPEND="
        $(add_frameworks_dep knotifications)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        || ( $(add_frameworks_dep polkit-qt) >=sys-auth/polkit-qt-0.112.0[qt5] )
 "
 RDEPEND="${DEPEND}

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 37a913b..48e3812 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
@@ -20,9 +20,9 @@ DEPEND="
        $(add_frameworks_dep kiconthemes)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        || ( $(add_frameworks_dep polkit-qt) >=sys-auth/polkit-qt-0.112.0[qt5] )
 "
 RDEPEND="${DEPEND}

diff --git a/kde-plasma/powerdevil/powerdevil-5.5.49.9999.ebuild 
b/kde-plasma/powerdevil/powerdevil-5.5.49.9999.ebuild
index d432dd9..42335a5 100644
--- a/kde-plasma/powerdevil/powerdevil-5.5.49.9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.5.49.9999.ebuild
@@ -34,10 +34,10 @@ DEPEND="
        $(add_plasma_dep kwayland)
        $(add_plasma_dep libkscreen)
        $(add_plasma_dep plasma-workspace)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        virtual/libudev:=
        x11-libs/libxcb
 "

diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild 
b/kde-plasma/powerdevil/powerdevil-9999.ebuild
index d432dd9..42335a5 100644
--- a/kde-plasma/powerdevil/powerdevil-9999.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild
@@ -34,10 +34,10 @@ DEPEND="
        $(add_plasma_dep kwayland)
        $(add_plasma_dep libkscreen)
        $(add_plasma_dep plasma-workspace)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        virtual/libudev:=
        x11-libs/libxcb
 "

diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.5.49.9999.ebuild 
b/kde-plasma/sddm-kcm/sddm-kcm-5.5.49.9999.ebuild
index ebd0be7..619e6ba 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.5.49.9999.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.5.49.9999.ebuild
@@ -20,10 +20,10 @@ COMMON_DEPEND="
        $(add_frameworks_dep kcoreaddons)
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kio)
-       dev-qt/qtdeclarative:5[widgets]
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdeclarative 'widgets')
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        x11-libs/libX11
        x11-libs/libXcursor
 "

diff --git a/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild 
b/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
index ebd0be7..619e6ba 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild
@@ -20,10 +20,10 @@ COMMON_DEPEND="
        $(add_frameworks_dep kcoreaddons)
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kio)
-       dev-qt/qtdeclarative:5[widgets]
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtdeclarative 'widgets')
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
        x11-libs/libX11
        x11-libs/libXcursor
 "

diff --git a/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild 
b/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild
index 4b40f78..7fc6dce 100644
--- a/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.5.49.9999.ebuild
@@ -27,9 +27,9 @@ DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        classic? ( $(add_frameworks_dep khtml) )
 "
 RDEPEND="${DEPEND}

diff --git a/kde-plasma/systemsettings/systemsettings-9999.ebuild 
b/kde-plasma/systemsettings/systemsettings-9999.ebuild
index 4b40f78..7fc6dce 100644
--- a/kde-plasma/systemsettings/systemsettings-9999.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-9999.ebuild
@@ -27,9 +27,9 @@ DEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        classic? ( $(add_frameworks_dep khtml) )
 "
 RDEPEND="${DEPEND}

diff --git a/kde-plasma/user-manager/user-manager-5.5.49.9999.ebuild 
b/kde-plasma/user-manager/user-manager-5.5.49.9999.ebuild
index 31a83ac..8088068 100644
--- a/kde-plasma/user-manager/user-manager-5.5.49.9999.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.5.49.9999.ebuild
@@ -19,8 +19,8 @@ DEPEND="
        $(add_frameworks_dep kio)
        $(add_frameworks_dep kwidgetsaddons)
        dev-libs/libpwquality
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-plasma/user-manager/user-manager-9999.ebuild 
b/kde-plasma/user-manager/user-manager-9999.ebuild
index 31a83ac..8088068 100644
--- a/kde-plasma/user-manager/user-manager-9999.ebuild
+++ b/kde-plasma/user-manager/user-manager-9999.ebuild
@@ -19,8 +19,8 @@ DEPEND="
        $(add_frameworks_dep kio)
        $(add_frameworks_dep kwidgetsaddons)
        dev-libs/libpwquality
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}"

Reply via email to