commit:     ed622606b5bb7ceeed420a7f487c351b128168f6
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jan 25 00:31:39 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=ed622606

kde-frameworks: Convert to add_qt_dep

Package-Manager: portage-2.2.26

 kde-frameworks/attica/attica-9999.ebuild           |  2 +-
 kde-frameworks/baloo/baloo-9999.ebuild             |  8 ++++----
 kde-frameworks/bluez-qt/bluez-qt-9999.ebuild       |  6 +++---
 .../extra-cmake-modules-9999.ebuild                |  2 +-
 .../frameworkintegration-9999.ebuild               |  6 +++---
 kde-frameworks/kactivities/kactivities-9999.ebuild | 10 +++++-----
 kde-frameworks/kauth/kauth-9999.ebuild             |  8 ++++----
 kde-frameworks/kbookmarks/kbookmarks-9999.ebuild   | 10 +++++-----
 kde-frameworks/kcmutils/kcmutils-9999.ebuild       |  8 ++++----
 kde-frameworks/kcodecs/kcodecs-9999.ebuild         |  2 +-
 kde-frameworks/kcompletion/kcompletion-9999.ebuild |  6 +++---
 kde-frameworks/kconfig/kconfig-9999.ebuild         |  8 ++++----
 .../kconfigwidgets/kconfigwidgets-9999.ebuild      |  6 +++---
 kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild |  4 ++--
 kde-frameworks/kcrash/kcrash-9999.ebuild           |  8 ++++----
 kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild |  6 +++---
 .../kdeclarative/kdeclarative-9999.ebuild          |  8 ++++----
 kde-frameworks/kded/kded-9999.ebuild               |  6 +++---
 .../kdelibs4support/kdelibs4support-9999.ebuild    | 22 +++++++++++-----------
 .../kdesignerplugin/kdesignerplugin-9999.ebuild    |  8 ++++----
 kde-frameworks/kdewebkit/kdewebkit-9999.ebuild     | 10 +++++-----
 kde-frameworks/kdnssd/kdnssd-9999.ebuild           |  6 +++---
 kde-frameworks/kemoticons/kemoticons-9999.ebuild   |  4 ++--
 .../kfilemetadata/kfilemetadata-9999.ebuild        |  2 +-
 .../kglobalaccel/kglobalaccel-9999.ebuild          | 10 +++++-----
 kde-frameworks/kguiaddons/kguiaddons-9999.ebuild   |  4 ++--
 kde-frameworks/khtml/khtml-9999.ebuild             | 16 ++++++++--------
 kde-frameworks/ki18n/ki18n-9999.ebuild             |  4 ++--
 kde-frameworks/kiconthemes/kiconthemes-9999.ebuild |  8 ++++----
 kde-frameworks/kidletime/kidletime-9999.ebuild     |  8 ++++----
 .../kimageformats/kimageformats-9999.ebuild        |  4 ++--
 kde-frameworks/kinit/kinit-9999.ebuild             |  4 ++--
 kde-frameworks/kio/kio-9999.ebuild                 | 16 ++++++++--------
 kde-frameworks/kitemmodels/kitemmodels-9999.ebuild |  2 +-
 kde-frameworks/kitemviews/kitemviews-9999.ebuild   |  6 +++---
 kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild | 10 +++++-----
 kde-frameworks/kjsembed/kjsembed-9999.ebuild       | 10 +++++-----
 .../kmediaplayer/kmediaplayer-9999.ebuild          |  4 ++--
 kde-frameworks/knewstuff/knewstuff-9999.ebuild     |  6 +++---
 .../knotifications/knotifications-9999.ebuild      | 12 ++++++------
 .../knotifyconfig/knotifyconfig-9999.ebuild        |  6 +++---
 kde-frameworks/kparts/kparts-9999.ebuild           |  6 +++---
 kde-frameworks/kpeople/kpeople-9999.ebuild         | 10 +++++-----
 kde-frameworks/kplotting/kplotting-9999.ebuild     |  4 ++--
 kde-frameworks/kross/kross-9999.ebuild             | 10 +++++-----
 kde-frameworks/krunner/krunner-9999.ebuild         |  6 +++---
 kde-frameworks/kservice/kservice-9999.ebuild       |  6 +++---
 kde-frameworks/ktexteditor/ktexteditor-9999.ebuild | 12 ++++++------
 .../ktextwidgets/ktextwidgets-9999.ebuild          |  6 +++---
 .../kunitconversion/kunitconversion-9999.ebuild    |  4 ++--
 kde-frameworks/kwallet/kwallet-9999.ebuild         |  6 +++---
 .../kwidgetsaddons/kwidgetsaddons-9999.ebuild      |  8 ++++----
 .../kwindowsystem/kwindowsystem-9999.ebuild        |  8 ++++----
 kde-frameworks/kxmlgui/kxmlgui-9999.ebuild         | 12 ++++++------
 .../kxmlrpcclient/kxmlrpcclient-9999.ebuild        |  2 +-
 .../modemmanager-qt/modemmanager-qt-9999.ebuild    |  4 ++--
 .../networkmanager-qt-9999.ebuild                  |  4 ++--
 .../oxygen-icons/oxygen-icons-9999.ebuild          |  2 +-
 kde-frameworks/plasma/plasma-9999.ebuild           | 22 +++++++++++-----------
 kde-frameworks/polkit-qt/polkit-qt-9999.ebuild     | 10 +++++-----
 kde-frameworks/solid/solid-9999.ebuild             | 12 ++++++------
 kde-frameworks/sonnet/sonnet-9999.ebuild           |  6 +++---
 62 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/kde-frameworks/attica/attica-9999.ebuild 
b/kde-frameworks/attica/attica-9999.ebuild
index 70a8b0f..7c3b852 100644
--- a/kde-frameworks/attica/attica-9999.ebuild
+++ b/kde-frameworks/attica/attica-9999.ebuild
@@ -12,6 +12,6 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-       dev-qt/qtnetwork:5
+       $(add_qt_dep qtnetwork)
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-frameworks/baloo/baloo-9999.ebuild 
b/kde-frameworks/baloo/baloo-9999.ebuild
index 7fce09a..fa22cfc 100644
--- a/kde-frameworks/baloo/baloo-9999.ebuild
+++ b/kde-frameworks/baloo/baloo-9999.ebuild
@@ -22,10 +22,10 @@ DEPEND="
        $(add_frameworks_dep kio)
        $(add_frameworks_dep solid)
        >=dev-db/lmdb-0.9.17
-       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)
 "
 RDEPEND="${DEPEND}
        !kde-base/baloo:4[-minimal(-)]

diff --git a/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild 
b/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild
index 2ff5a49..384391f 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-9999.ebuild
@@ -12,9 +12,9 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtnetwork:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtnetwork)
 "
 RDEPEND="${DEPEND}
        !kde-plasma/bluez-qt

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild 
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
index 3e83ad1..5af8bfb 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
@@ -24,7 +24,7 @@ DEPEND="
        )
 "
 RDEPEND="
-       dev-qt/qtcore:5
+       $(add_qt_dep qtcore)
 "
 
 python_check_deps() {

diff --git 
a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild 
b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
index 2b96998..ebcc851 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild
@@ -25,12 +25,12 @@ RDEPEND="
        $(add_frameworks_dep knotifications)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtdbus:5
+       $(add_qt_dep qtdbus)
        dev-qt/qtgui:5=
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtwidgets)
        media-fonts/noto
        X? (
-               dev-qt/qtx11extras:5
+               $(add_qt_dep qtx11extras)
                x11-libs/libxcb
                x11-libs/libXcursor
        )

diff --git a/kde-frameworks/kactivities/kactivities-9999.ebuild 
b/kde-frameworks/kactivities/kactivities-9999.ebuild
index aa20c26..70606e1 100644
--- a/kde-frameworks/kactivities/kactivities-9999.ebuild
+++ b/kde-frameworks/kactivities/kactivities-9999.ebuild
@@ -25,11 +25,11 @@ RDEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtsql:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtsql)
+       $(add_qt_dep qtwidgets)
        !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
 "
 DEPEND="${RDEPEND}

diff --git a/kde-frameworks/kauth/kauth-9999.ebuild 
b/kde-frameworks/kauth/kauth-9999.ebuild
index 187985c..6584f87 100644
--- a/kde-frameworks/kauth/kauth-9999.ebuild
+++ b/kde-frameworks/kauth/kauth-9999.ebuild
@@ -14,13 +14,13 @@ IUSE="nls +policykit"
 
 RDEPEND="
        $(add_frameworks_dep kcoreaddons)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        policykit? ( || ( $(add_frameworks_dep polkit-qt) 
sys-auth/polkit-qt[qt5] ) )
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
 "
 PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
 

diff --git a/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild 
b/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild
index b273cf6..41c6b07 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild
@@ -19,12 +19,12 @@ RDEPEND="
        $(add_frameworks_dep kiconthemes)
        $(add_frameworks_dep kwidgetsaddons)
        $(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)
 "
 DEPEND="${RDEPEND}
        $(add_frameworks_dep kconfigwidgets)
-       nls? ( dev-qt/linguist-tools:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
 "

diff --git a/kde-frameworks/kcmutils/kcmutils-9999.ebuild 
b/kde-frameworks/kcmutils/kcmutils-9999.ebuild
index 23d72b0..1d080fe 100644
--- a/kde-frameworks/kcmutils/kcmutils-9999.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-9999.ebuild
@@ -24,9 +24,9 @@ RDEPEND="
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
-       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="${RDEPEND}"

diff --git a/kde-frameworks/kcodecs/kcodecs-9999.ebuild 
b/kde-frameworks/kcodecs/kcodecs-9999.ebuild
index a10a133..7d250d7 100644
--- a/kde-frameworks/kcodecs/kcodecs-9999.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-9999.ebuild
@@ -11,4 +11,4 @@ LICENSE="GPL-2+ LGPL-2+"
 KEYWORDS=""
 IUSE="nls"
 
-DEPEND="nls? ( dev-qt/linguist-tools:5 )"
+DEPEND="nls? ( $(add_qt_dep linguist-tools) )"

diff --git a/kde-frameworks/kcompletion/kcompletion-9999.ebuild 
b/kde-frameworks/kcompletion/kcompletion-9999.ebuild
index 216594b..9d10348 100644
--- a/kde-frameworks/kcompletion/kcompletion-9999.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-9999.ebuild
@@ -14,9 +14,9 @@ IUSE="nls"
 RDEPEND="
        $(add_frameworks_dep kconfig)
        $(add_frameworks_dep kwidgetsaddons)
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
 "

diff --git a/kde-frameworks/kconfig/kconfig-9999.ebuild 
b/kde-frameworks/kconfig/kconfig-9999.ebuild
index c3e8c3e..7b89eac 100644
--- a/kde-frameworks/kconfig/kconfig-9999.ebuild
+++ b/kde-frameworks/kconfig/kconfig-9999.ebuild
@@ -13,12 +13,12 @@ KEYWORDS=""
 IUSE="nls"
 
 RDEPEND="
-       dev-qt/qtgui:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtxml)
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
-       test? ( dev-qt/qtconcurrent:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
+       test? ( $(add_qt_dep qtconcurrent) )
 "
 
 # bug 560086

diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild 
b/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild
index d1559bd..741aaa1 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild
@@ -20,9 +20,9 @@ RDEPEND="
        $(add_frameworks_dep kguiaddons)
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kwidgetsaddons)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        !<kde-frameworks/kdelibs4support-5.3.0:5
 "
 DEPEND="${RDEPEND}

diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild 
b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild
index dfbaeb7..35adc80 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild
@@ -12,13 +12,13 @@ KEYWORDS=""
 IUSE="fam nls"
 
 RDEPEND="
-       dev-qt/qtcore:5[icu]
+       $(add_qt_dep qtcore 'icu')
        fam? ( virtual/fam )
        !<kde-frameworks/kservice-5.2.0:5
 "
 DEPEND="${RDEPEND}
        x11-misc/shared-mime-info
-       nls? ( dev-qt/linguist-tools:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
 "
 
 src_configure() {

diff --git a/kde-frameworks/kcrash/kcrash-9999.ebuild 
b/kde-frameworks/kcrash/kcrash-9999.ebuild
index 7bb987a..45cf407 100644
--- a/kde-frameworks/kcrash/kcrash-9999.ebuild
+++ b/kde-frameworks/kcrash/kcrash-9999.ebuild
@@ -18,15 +18,15 @@ RESTRICT="test"
 RDEPEND="
        $(add_frameworks_dep kcoreaddons)
        $(add_frameworks_dep kwindowsystem)
-       dev-qt/qtgui:5
+       $(add_qt_dep qtgui)
        X? (
-               dev-qt/qtx11extras:5
+               $(add_qt_dep qtx11extras)
                x11-libs/libX11
        )
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
-       test? ( dev-qt/qtwidgets:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
+       test? ( $(add_qt_dep qtwidgets) )
        X? ( x11-proto/xproto )
 "
 

diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild 
b/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild
index bde518b..0348a2b 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-9999.ebuild
@@ -13,11 +13,11 @@ KEYWORDS=""
 IUSE="nls X"
 
 RDEPEND="
-       dev-qt/qtdbus:5
-       X? ( dev-qt/qtx11extras:5 )
+       $(add_qt_dep qtdbus)
+       X? ( $(add_qt_dep qtx11extras) )
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
 "
 
 src_configure() {

diff --git a/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild 
b/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild
index 43c9df3..40ec06a 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild
@@ -23,10 +23,10 @@ DEPEND="
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtwidgets)
        media-libs/libepoxy
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-frameworks/kded/kded-9999.ebuild 
b/kde-frameworks/kded/kded-9999.ebuild
index c272a50..04a9ae1 100644
--- a/kde-frameworks/kded/kded-9999.ebuild
+++ b/kde-frameworks/kded/kded-9999.ebuild
@@ -19,9 +19,9 @@ RDEPEND="
        $(add_frameworks_dep kdbusaddons)
        $(add_frameworks_dep kinit)
        $(add_frameworks_dep kservice)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}
        man? ( $(add_frameworks_dep kdoctools) )

diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild 
b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
index ff997b0..85cfea6 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
@@ -41,16 +41,16 @@ COMMON_DEPEND="
        $(add_frameworks_dep solid)
        app-text/docbook-xml-dtd:4.2
        dev-libs/openssl:0
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5[ssl]
-       dev-qt/qtprintsupport:5
-       dev-qt/qtsvg:5
-       dev-qt/qttest:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork 'ssl')
+       $(add_qt_dep qtprintsupport)
+       $(add_qt_dep qtsvg)
+       $(add_qt_dep qttest)
+       $(add_qt_dep qtwidgets)
        virtual/libintl
        X? (
-               dev-qt/qtx11extras:5
+               $(add_qt_dep qtx11extras)
                x11-libs/libICE
                x11-libs/libSM
                x11-libs/libX11
@@ -61,15 +61,15 @@ RDEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kemoticons)
        $(add_frameworks_dep kinit)
        $(add_frameworks_dep kitemmodels)
-       dev-qt/qtxml:5
+       $(add_qt_dep qtxml)
        !<kde-apps/kcontrol-15.08.0[handbook]
 "
 DEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kdoctools)
        dev-lang/perl
        dev-perl/URI
-       dev-qt/designer:5
-       test? ( dev-qt/qtconcurrent:5 )
+       $(add_qt_dep designer)
+       test? ( $(add_qt_dep qtconcurrent) )
        X? ( x11-proto/xproto )
 "
 

diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-9999.ebuild 
b/kde-frameworks/kdesignerplugin/kdesignerplugin-9999.ebuild
index d5bb840..fcde7db 100644
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-9999.ebuild
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-9999.ebuild
@@ -16,7 +16,7 @@ RDEPEND="
        $(add_frameworks_dep kconfig)
        $(add_frameworks_dep kcoreaddons)
        designer? (
-               dev-qt/designer:5
+               $(add_qt_dep designer)
                $(add_frameworks_dep kcompletion)
                $(add_frameworks_dep kconfigwidgets)
                $(add_frameworks_dep kiconthemes)
@@ -29,14 +29,14 @@ RDEPEND="
                $(add_frameworks_dep sonnet)
        )
        webkit? (
-               dev-qt/designer:5
-               dev-qt/qtgui:5
+               $(add_qt_dep designer)
+               $(add_qt_dep qtgui)
                $(add_frameworks_dep kdewebkit)
        )
 "
 DEPEND="${RDEPEND}
        $(add_frameworks_dep kdoctools)
-       nls? ( dev-qt/linguist-tools:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
 "
 
 src_configure() {

diff --git a/kde-frameworks/kdewebkit/kdewebkit-9999.ebuild 
b/kde-frameworks/kdewebkit/kdewebkit-9999.ebuild
index a14c484..39d637e 100644
--- a/kde-frameworks/kdewebkit/kdewebkit-9999.ebuild
+++ b/kde-frameworks/kdewebkit/kdewebkit-9999.ebuild
@@ -20,11 +20,11 @@ RDEPEND="
        $(add_frameworks_dep kparts)
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep kwallet)
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtwebkit:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtwebkit)
+       $(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}
-       dev-qt/qtnetwork:5
+       $(add_qt_dep qtnetwork)
 "

diff --git a/kde-frameworks/kdnssd/kdnssd-9999.ebuild 
b/kde-frameworks/kdnssd/kdnssd-9999.ebuild
index 1c702d9..990c193 100644
--- a/kde-frameworks/kdnssd/kdnssd-9999.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-9999.ebuild
@@ -12,14 +12,14 @@ KEYWORDS=""
 IUSE="nls zeroconf"
 
 RDEPEND="
-       dev-qt/qtnetwork:5
+       $(add_qt_dep qtnetwork)
        zeroconf? (
-               dev-qt/qtdbus:5
+               $(add_qt_dep qtdbus)
                net-dns/avahi[mdnsresponder-compat]
        )
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
 "
 
 src_configure() {

diff --git a/kde-frameworks/kemoticons/kemoticons-9999.ebuild 
b/kde-frameworks/kemoticons/kemoticons-9999.ebuild
index 6b099ed..c6e320b 100644
--- a/kde-frameworks/kemoticons/kemoticons-9999.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-9999.ebuild
@@ -17,8 +17,8 @@ RDEPEND="
        $(add_frameworks_dep kconfig)
        $(add_frameworks_dep kcoreaddons)
        $(add_frameworks_dep kservice)
-       dev-qt/qtgui:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtxml)
 "
 DEPEND="${RDEPEND}"
 

diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild 
b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
index b1c19d0..77857e1 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
@@ -14,7 +14,7 @@ IUSE="epub exif ffmpeg libav pdf taglib"
 DEPEND="
        $(add_frameworks_dep karchive)
        $(add_frameworks_dep ki18n)
-       dev-qt/qtxml:5
+       $(add_qt_dep qtxml)
        epub? ( app-text/ebook-tools )
        exif? ( media-gfx/exiv2:= )
        ffmpeg? (

diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild 
b/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild
index 2769bba..bf0a473 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild
@@ -18,14 +18,14 @@ RDEPEND="
        $(add_frameworks_dep kcrash)
        $(add_frameworks_dep kdbusaddons)
        $(add_frameworks_dep kwindowsystem X)
-       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
        x11-libs/xcb-util-keysyms
        !<kde-plasma/plasma-workspace-5.2.0-r2
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
 "

diff --git a/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild 
b/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild
index fc771f8..9561550 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild
@@ -13,8 +13,8 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-       dev-qt/qtgui:5
-       dev-qt/qtx11extras:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtx11extras)
        x11-libs/libX11
 "
 DEPEND="${RDEPEND}

diff --git a/kde-frameworks/khtml/khtml-9999.ebuild 
b/kde-frameworks/khtml/khtml-9999.ebuild
index 8206b42..6d5abfa 100644
--- a/kde-frameworks/khtml/khtml-9999.ebuild
+++ b/kde-frameworks/khtml/khtml-9999.ebuild
@@ -34,26 +34,26 @@ RDEPEND="
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep sonnet)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5[ssl]
-       dev-qt/qtprintsupport:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork 'ssl')
+       $(add_qt_dep qtprintsupport)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
        media-libs/giflib:=
        media-libs/libpng:0=
        media-libs/phonon[qt5]
        sys-libs/zlib
        virtual/jpeg:0
        X? (
-               dev-qt/qtx11extras:5
+               $(add_qt_dep qtx11extras)
                x11-libs/libX11
        )
 "
 DEPEND="${RDEPEND}
        dev-lang/perl
        dev-libs/openssl:0
-       test? ( dev-qt/qtx11extras:5 )
+       test? ( $(add_qt_dep qtx11extras) )
        X? ( x11-proto/xproto )
 "
 

diff --git a/kde-frameworks/ki18n/ki18n-9999.ebuild 
b/kde-frameworks/ki18n/ki18n-9999.ebuild
index 5b73a2f..14be6fe 100644
--- a/kde-frameworks/ki18n/ki18n-9999.ebuild
+++ b/kde-frameworks/ki18n/ki18n-9999.ebuild
@@ -12,10 +12,10 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-       dev-qt/qtscript:5
+       $(add_qt_dep qtscript)
        sys-devel/gettext
        virtual/libintl
 "
 DEPEND="${RDEPEND}
-       test? ( dev-qt/qtconcurrent:5 )
+       test? ( $(add_qt_dep qtconcurrent) )
 "

diff --git a/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild 
b/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild
index 90053ab..65f2a68 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild
@@ -19,9 +19,9 @@ RDEPEND="
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kitemviews)
        $(add_frameworks_dep kwidgetsaddons)
-       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)
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-frameworks/kidletime/kidletime-9999.ebuild 
b/kde-frameworks/kidletime/kidletime-9999.ebuild
index 35277d2..c1d8e85 100644
--- a/kde-frameworks/kidletime/kidletime-9999.ebuild
+++ b/kde-frameworks/kidletime/kidletime-9999.ebuild
@@ -13,10 +13,10 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-       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
        x11-libs/libXScrnSaver
        x11-libs/libXext

diff --git a/kde-frameworks/kimageformats/kimageformats-9999.ebuild 
b/kde-frameworks/kimageformats/kimageformats-9999.ebuild
index 4a6c901..f7c821f 100644
--- a/kde-frameworks/kimageformats/kimageformats-9999.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-9999.ebuild
@@ -13,8 +13,8 @@ KEYWORDS=""
 IUSE="eps openexr"
 
 RDEPEND="
-       dev-qt/qtgui:5
-       eps? ( dev-qt/qtprintsupport:5 )
+       $(add_qt_dep qtgui)
+       eps? ( $(add_qt_dep qtprintsupport) )
        openexr? (
                media-libs/ilmbase:=
                media-libs/openexr:=

diff --git a/kde-frameworks/kinit/kinit-9999.ebuild 
b/kde-frameworks/kinit/kinit-9999.ebuild
index c70857c..9a59ede 100644
--- a/kde-frameworks/kinit/kinit-9999.ebuild
+++ b/kde-frameworks/kinit/kinit-9999.ebuild
@@ -20,8 +20,8 @@ RDEPEND="
        $(add_frameworks_dep kio)
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep kwindowsystem)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
        x11-libs/libX11
        x11-libs/libxcb
        caps? ( sys-libs/libcap )

diff --git a/kde-frameworks/kio/kio-9999.ebuild 
b/kde-frameworks/kio/kio-9999.ebuild
index 126f7c2..83e0aa9 100644
--- a/kde-frameworks/kio/kio-9999.ebuild
+++ b/kde-frameworks/kio/kio-9999.ebuild
@@ -33,12 +33,12 @@ COMMON_DEPEND="
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep solid)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5[ssl]
-       dev-qt/qtscript:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork 'ssl')
+       $(add_qt_dep qtscript)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
        dev-libs/libxml2
        dev-libs/libxslt
        acl? (
@@ -47,10 +47,10 @@ COMMON_DEPEND="
        )
        kerberos? ( virtual/krb5 )
        kwallet? ( $(add_frameworks_dep kwallet) )
-       X? ( dev-qt/qtx11extras:5 )
+       X? ( $(add_qt_dep qtx11extras) )
 "
 DEPEND="${COMMON_DEPEND}
-       dev-qt/qtconcurrent:5
+       $(add_qt_dep qtconcurrent)
        handbook? ( $(add_frameworks_dep kdoctools) )
        test? ( sys-libs/zlib )
        X? (

diff --git a/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild 
b/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild
index 319e57f..cce8820 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-9999.ebuild
@@ -12,4 +12,4 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="test? ( dev-qt/qtwidgets:5 )"
+DEPEND="test? ( $(add_qt_dep qtwidgets) )"

diff --git a/kde-frameworks/kitemviews/kitemviews-9999.ebuild 
b/kde-frameworks/kitemviews/kitemviews-9999.ebuild
index 7e9697a..28a545b 100644
--- a/kde-frameworks/kitemviews/kitemviews-9999.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-9999.ebuild
@@ -13,9 +13,9 @@ KEYWORDS=""
 IUSE="nls"
 
 RDEPEND="
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
 "

diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild 
b/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild
index 2cc6a28..68a83a5 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild
@@ -14,13 +14,13 @@ IUSE="nls X"
 RDEPEND="
        $(add_frameworks_dep kcoreaddons)
        $(add_frameworks_dep kwidgetsaddons)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       X? ( dev-qt/qtx11extras:5 )
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       X? ( $(add_qt_dep qtx11extras) )
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
        X? (
                x11-libs/libX11
                x11-proto/xproto

diff --git a/kde-frameworks/kjsembed/kjsembed-9999.ebuild 
b/kde-frameworks/kjsembed/kjsembed-9999.ebuild
index 9f4c8c8..4d73d4d 100644
--- a/kde-frameworks/kjsembed/kjsembed-9999.ebuild
+++ b/kde-frameworks/kjsembed/kjsembed-9999.ebuild
@@ -15,12 +15,12 @@ IUSE=""
 RDEPEND="
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kjs)
-       dev-qt/qtgui:5
-       dev-qt/qtsvg:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtsvg)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
 "
 DEPEND="${RDEPEND}
        $(add_frameworks_dep kdoctools)
-       dev-qt/designer:5
+       $(add_qt_dep designer)
 "

diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-9999.ebuild 
b/kde-frameworks/kmediaplayer/kmediaplayer-9999.ebuild
index 69a12cf..5874eca 100644
--- a/kde-frameworks/kmediaplayer/kmediaplayer-9999.ebuild
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-9999.ebuild
@@ -15,7 +15,7 @@ IUSE=""
 RDEPEND="
        $(add_frameworks_dep kparts)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtdbus:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-frameworks/knewstuff/knewstuff-9999.ebuild 
b/kde-frameworks/knewstuff/knewstuff-9999.ebuild
index 71bc28e..8ba2d42 100644
--- a/kde-frameworks/knewstuff/knewstuff-9999.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-9999.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
        $(add_frameworks_dep ktextwidgets)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-frameworks/knotifications/knotifications-9999.ebuild 
b/kde-frameworks/knotifications/knotifications-9999.ebuild
index 59f2fee..a845c1f 100644
--- a/kde-frameworks/knotifications/knotifications-9999.ebuild
+++ b/kde-frameworks/knotifications/knotifications-9999.ebuild
@@ -17,20 +17,20 @@ RDEPEND="
        $(add_frameworks_dep kconfig)
        $(add_frameworks_dep kcoreaddons)
        $(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)
        media-libs/phonon[qt5]
        dbus? ( dev-libs/libdbusmenu-qt[qt5] )
-       speech? ( dev-qt/qtspeech:5 )
+       speech? ( $(add_qt_dep qtspeech) )
        X? (
-               dev-qt/qtx11extras:5
+               $(add_qt_dep qtx11extras)
                x11-libs/libX11
                x11-libs/libXtst
        )
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
        X? ( x11-proto/xproto )
 "
 

diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild 
b/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild
index eec120b..cc7ff98 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild
@@ -17,9 +17,9 @@ RDEPEND="
        $(add_frameworks_dep kconfig)
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kio)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        phonon? ( media-libs/phonon[qt5] )
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-frameworks/kparts/kparts-9999.ebuild 
b/kde-frameworks/kparts/kparts-9999.ebuild
index c3be144..86bcca5 100644
--- a/kde-frameworks/kparts/kparts-9999.ebuild
+++ b/kde-frameworks/kparts/kparts-9999.ebuild
@@ -22,9 +22,9 @@ RDEPEND="
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
 "
 DEPEND="${RDEPEND}
        $(add_frameworks_dep ktextwidgets)

diff --git a/kde-frameworks/kpeople/kpeople-9999.ebuild 
b/kde-frameworks/kpeople/kpeople-9999.ebuild
index d4d1783..ea9eb76 100644
--- a/kde-frameworks/kpeople/kpeople-9999.ebuild
+++ b/kde-frameworks/kpeople/kpeople-9999.ebuild
@@ -21,11 +21,11 @@ DEPEND="
        $(add_frameworks_dep kitemviews)
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep kwidgetsaddons)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtsql:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtsql)
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}
        !net-libs/kpeople:5

diff --git a/kde-frameworks/kplotting/kplotting-9999.ebuild 
b/kde-frameworks/kplotting/kplotting-9999.ebuild
index 46aafd6..5270a96 100644
--- a/kde-frameworks/kplotting/kplotting-9999.ebuild
+++ b/kde-frameworks/kplotting/kplotting-9999.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-frameworks/kross/kross-9999.ebuild 
b/kde-frameworks/kross/kross-9999.ebuild
index 581c993..a610199 100644
--- a/kde-frameworks/kross/kross-9999.ebuild
+++ b/kde-frameworks/kross/kross-9999.ebuild
@@ -21,12 +21,12 @@ RDEPEND="
        $(add_frameworks_dep kparts)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtgui:5
-       dev-qt/qtscript:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtscript)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
 "
 DEPEND="${RDEPEND}
        $(add_frameworks_dep kdoctools)
-       dev-qt/designer:5
+       $(add_qt_dep designer)
 "

diff --git a/kde-frameworks/krunner/krunner-9999.ebuild 
b/kde-frameworks/krunner/krunner-9999.ebuild
index 8998521..8a3b19f 100644
--- a/kde-frameworks/krunner/krunner-9999.ebuild
+++ b/kde-frameworks/krunner/krunner-9999.ebuild
@@ -21,8 +21,8 @@ RDEPEND="
        $(add_frameworks_dep plasma)
        $(add_frameworks_dep solid)
        $(add_frameworks_dep threadweaver)
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-frameworks/kservice/kservice-9999.ebuild 
b/kde-frameworks/kservice/kservice-9999.ebuild
index f65a7dd..56117cd 100644
--- a/kde-frameworks/kservice/kservice-9999.ebuild
+++ b/kde-frameworks/kservice/kservice-9999.ebuild
@@ -17,12 +17,12 @@ RDEPEND="
        $(add_frameworks_dep kcrash)
        $(add_frameworks_dep kdbusaddons)
        $(add_frameworks_dep ki18n)
-       dev-qt/qtdbus:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtxml)
 "
 DEPEND="${RDEPEND}
        man? ( $(add_frameworks_dep kdoctools) )
-       test? ( dev-qt/qtconcurrent:5 )
+       test? ( $(add_qt_dep qtconcurrent) )
 "
 
 # requires running kde environment

diff --git a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild 
b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild
index 12a105f..7d71360 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild
@@ -30,15 +30,15 @@ RDEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
        $(add_frameworks_dep sonnet)
-       dev-qt/qtgui:5
-       dev-qt/qtprintsupport:5
-       dev-qt/qtscript:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtprintsupport)
+       $(add_qt_dep qtscript)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
        git? ( dev-libs/libgit2:= )
 "
 DEPEND="${RDEPEND}
-       dev-qt/qtxmlpatterns:5
+       $(add_qt_dep qtxmlpatterns)
        test? ( $(add_frameworks_dep kservice) )
 "
 

diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild 
b/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild
index 9b20b51..1d24d6d 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild
@@ -23,9 +23,9 @@ RDEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep sonnet)
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       speech? ( dev-qt/qtspeech:5 )
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
+       speech? ( $(add_qt_dep qtspeech) )
 "
 DEPEND="${RDEPEND}"
 

diff --git a/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild 
b/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild
index edcf1f0..cfc4958 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild
@@ -13,7 +13,7 @@ IUSE=""
 
 RDEPEND="
        $(add_frameworks_dep ki18n)
-       dev-qt/qtnetwork:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtxml)
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-frameworks/kwallet/kwallet-9999.ebuild 
b/kde-frameworks/kwallet/kwallet-9999.ebuild
index 7648dfd..54bd6f6 100644
--- a/kde-frameworks/kwallet/kwallet-9999.ebuild
+++ b/kde-frameworks/kwallet/kwallet-9999.ebuild
@@ -22,9 +22,9 @@ RDEPEND="
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
        dev-libs/libgcrypt:0=
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        gpg? (
                $(add_kdeapps_dep gpgmepp)
                app-crypt/gpgme

diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-9999.ebuild 
b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-9999.ebuild
index b6c277f..2bffff7 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-9999.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-9999.ebuild
@@ -13,10 +13,10 @@ KEYWORDS=""
 IUSE="nls"
 
 RDEPEND="
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
-       test? ( dev-qt/designer:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
+       test? ( $(add_qt_dep designer) )
 "

diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild 
b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild
index b3e2338..0bbfc1f 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild
@@ -13,10 +13,10 @@ KEYWORDS=""
 IUSE="nls X"
 
 RDEPEND="
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        X? (
-               dev-qt/qtx11extras:5
+               $(add_qt_dep qtx11extras)
                x11-libs/libX11
                x11-libs/libXfixes
                x11-libs/libxcb
@@ -24,7 +24,7 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
        X? ( x11-proto/xproto )
 "
 

diff --git a/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild 
b/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild
index 8ea6580..0a6c782 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild
@@ -23,12 +23,12 @@ RDEPEND="
        $(add_frameworks_dep ktextwidgets)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kwindowsystem)
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5[ssl]
-       dev-qt/qtprintsupport:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtnetwork 'ssl')
+       $(add_qt_dep qtprintsupport)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
        attica? ( $(add_frameworks_dep attica) )
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-9999.ebuild 
b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-9999.ebuild
index 340922d..89d4722 100644
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-9999.ebuild
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-9999.ebuild
@@ -17,7 +17,7 @@ RDEPEND="
        $(add_frameworks_dep kcoreaddons)
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kio)
-       dev-qt/qtxml:5
+       $(add_qt_dep qtxml)
        !<kde-plasma/plasma-workspace-5.2.95
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild 
b/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild
index 171288a..10392ed 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild
@@ -12,8 +12,8 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-       dev-qt/qtdbus:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtxml)
        net-misc/modemmanager
        !kde-plasma/libmm-qt
 "

diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-9999.ebuild 
b/kde-frameworks/networkmanager-qt/networkmanager-qt-9999.ebuild
index 723fea8..7f0a9d6 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-9999.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-9999.ebuild
@@ -12,8 +12,8 @@ KEYWORDS=""
 IUSE="teamd"
 
 RDEPEND="
-       dev-qt/qtdbus:5
-       dev-qt/qtnetwork:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtnetwork)
        || (
                >=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
                >=net-misc/networkmanager-0.9.10.0[systemd,teamd=]

diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild 
b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
index cdf33f9..f23447b 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
@@ -18,6 +18,6 @@ IUSE=""
 
 DEPEND="
        $(add_frameworks_dep extra-cmake-modules)
-       test? ( dev-qt/qttest:5 )
+       test? ( $(add_qt_dep qttest) )
 "
 RDEPEND="!kde-frameworks/oxygen-icons:4"

diff --git a/kde-frameworks/plasma/plasma-9999.ebuild 
b/kde-frameworks/plasma/plasma-9999.ebuild
index ba9799c..16793b5 100644
--- a/kde-frameworks/plasma/plasma-9999.ebuild
+++ b/kde-frameworks/plasma/plasma-9999.ebuild
@@ -30,26 +30,26 @@ COMMON_DEPEND="
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep kwindowsystem)
        $(add_frameworks_dep kxmlgui)
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtgui:5[gles2=]
-       dev-qt/qtquickcontrols:5
-       dev-qt/qtscript:5
-       dev-qt/qtsql:5
-       dev-qt/qtsvg:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui 'gles2=')
+       $(add_qt_dep qtquickcontrols)
+       $(add_qt_dep qtscript)
+       $(add_qt_dep qtsql)
+       $(add_qt_dep qtsvg)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
        egl? ( media-libs/mesa[egl] )
        !gles2? ( virtual/opengl )
        X? (
-               dev-qt/qtx11extras:5
+               $(add_qt_dep qtx11extras)
                x11-libs/libX11
                x11-libs/libxcb
        )
 "
 DEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kdoctools)
-       dev-qt/qtquick1:5
+       $(add_qt_dep qtquick1)
        X? ( x11-proto/xproto )
 "
 RDEPEND="${COMMON_DEPEND}

diff --git a/kde-frameworks/polkit-qt/polkit-qt-9999.ebuild 
b/kde-frameworks/polkit-qt/polkit-qt-9999.ebuild
index 2fd202b..cd58a27 100644
--- a/kde-frameworks/polkit-qt/polkit-qt-9999.ebuild
+++ b/kde-frameworks/polkit-qt/polkit-qt-9999.ebuild
@@ -16,12 +16,12 @@ IUSE="examples"
 
 DEPEND="
        dev-libs/glib:2
-       dev-qt/qtcore:5
-       dev-qt/qtdbus:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtcore)
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        >=sys-auth/polkit-0.103
-       examples? ( dev-qt/qtxml:5 )
+       examples? ( $(add_qt_dep qtxml) )
 "
 RDEPEND="${DEPEND}
        !sys-auth/polkit-qt[qt5]

diff --git a/kde-frameworks/solid/solid-9999.ebuild 
b/kde-frameworks/solid/solid-9999.ebuild
index 2dc2df9..6a595d7 100644
--- a/kde-frameworks/solid/solid-9999.ebuild
+++ b/kde-frameworks/solid/solid-9999.ebuild
@@ -13,16 +13,16 @@ KEYWORDS=""
 IUSE="nls"
 
 RDEPEND="
-       dev-qt/qtdbus:5
-       dev-qt/qtdeclarative:5
-       dev-qt/qtwidgets:5
-       dev-qt/qtxml:5
+       $(add_qt_dep qtdbus)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
        sys-fs/udisks:2
        virtual/udev
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
-       test? ( dev-qt/qtconcurrent:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
+       test? ( $(add_qt_dep qtconcurrent) )
 "
 pkg_postinst() {
        kde5_pkg_postinst

diff --git a/kde-frameworks/sonnet/sonnet-9999.ebuild 
b/kde-frameworks/sonnet/sonnet-9999.ebuild
index dce4120..d05285c 100644
--- a/kde-frameworks/sonnet/sonnet-9999.ebuild
+++ b/kde-frameworks/sonnet/sonnet-9999.ebuild
@@ -12,13 +12,13 @@ KEYWORDS=""
 IUSE="aspell +hunspell nls"
 
 RDEPEND="
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
        aspell? ( app-text/aspell )
        hunspell? ( app-text/hunspell )
 "
 DEPEND="${RDEPEND}
-       nls? ( dev-qt/linguist-tools:5 )
+       nls? ( $(add_qt_dep linguist-tools) )
 "
 
 src_configure() {

Reply via email to