[gentoo-commits] proj/kde:master commit in: media-gfx/symboleditor/, app-text/cutepaste/, sys-block/partitionmanager/, ...

[Michael Palimaka]

commit:     f80896d46a15abe4552bc812007ac7febef87299
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jan 31 16:49:45 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 16:50:21 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f80896d4

kde5.eclass: Convert remaining ebuilds to add_qt_dep

Package-Manager: portage-2.2.27

 app-backup/kfoldersync/kfoldersync-3.0.0.ebuild    |  4 ++--
 app-cdr/k3b/k3b-9999.ebuild                        |  8 +++----
 app-editors/kile/kile-9999.ebuild                  |  8 +++----
 app-text/cutepaste/cutepaste-9999.ebuild           |  4 ++--
 app-text/kbibtex/kbibtex-9999.ebuild               | 12 +++++-----
 dev-libs/purpose/purpose-9999.ebuild               |  8 +++----
 .../xembed-sni-proxy/xembed-sni-proxy-9999.ebuild  |  6 ++---
 .../kdevelop-cppcheck-9999.ebuild                  |  6 ++---
 dev-util/kdevelop-css/kdevelop-css-5.0.9999.ebuild |  6 ++---
 dev-util/kdevelop-css/kdevelop-css-9999.ebuild     |  6 ++---
 dev-util/kdevelop-go/kdevelop-go-9999.ebuild       |  4 ++--
 .../kdevelop-krazy2/kdevelop-krazy2-9999.ebuild    |  4 ++--
 dev-util/kdevelop-php/kdevelop-php-5.0.9999.ebuild |  6 ++---
 dev-util/kdevelop-php/kdevelop-php-9999.ebuild     |  6 ++---
 .../kdevelop-python-5.0.9999.ebuild                |  4 ++--
 .../kdevelop-python/kdevelop-python-9999.ebuild    |  4 ++--
 .../kdevelop-upload/kdevelop-upload-9999.ebuild    |  4 ++--
 .../kdevelop-valgrind-9999.ebuild                  |  6 ++---
 dev-util/kdevelop/kdevelop-5.0.9999.ebuild         | 14 +++++------
 dev-util/kdevelop/kdevelop-9999.ebuild             | 14 +++++------
 dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild | 18 +++++++-------
 dev-util/kdevplatform/kdevplatform-9999.ebuild     | 18 +++++++-------
 kde-apps/kjots/kjots-5.0.1.ebuild                  |  8 +++----
 kde-apps/ksirk/ksirk-5.9999.ebuild                 | 12 +++++-----
 kde-misc/skanlite/skanlite-2.0.ebuild              |  4 ++--
 media-gfx/digikam/digikam-9999.ebuild              | 20 ++++++++--------
 media-gfx/kgraphviewer/kgraphviewer-9999.ebuild    | 10 ++++----
 media-gfx/krita/krita-9999.ebuild                  | 28 +++++++++++-----------
 media-gfx/symboleditor/symboleditor-9999.ebuild    |  4 ++--
 media-libs/prison/prison-9999.ebuild               |  2 +-
 .../kipi-plugins/kipi-plugins-9999.ebuild          | 18 +++++++-------
 media-sound/amarok/amarok-5.9999.ebuild            | 20 ++++++++--------
 media-sound/kwave/kwave-9999.ebuild                |  8 +++----
 media-video/bangarang/bangarang-9999.ebuild        |  4 ++--
 media-video/kamoso/kamoso-9999.ebuild              |  6 ++---
 net-im/choqok/choqok-9999.ebuild                   | 14 +++++------
 net-irc/konversation/konversation-9999.ebuild      |  8 +++----
 net-libs/libkgapi/libkgapi-5.1.0.ebuild            | 10 ++++----
 net-libs/libkgapi/libkgapi-9999.ebuild             | 10 ++++----
 net-libs/libkvkontakte/libkvkontakte-9999.ebuild   |  8 +++----
 net-libs/libmediawiki/libmediawiki-9999.ebuild     |  2 +-
 net-libs/libtmdbqt/libtmdbqt-9999.ebuild           |  2 +-
 .../telepathy-logger-qt-9999.ebuild                |  2 +-
 net-misc/knemo/knemo-9999.ebuild                   | 10 ++++----
 net-misc/smb4k/smb4k-9999.ebuild                   | 10 ++++----
 .../partitionmanager/partitionmanager-9999.ebuild  |  4 ++--
 sys-libs/kpmcore/kpmcore-9999.ebuild               |  4 ++--
 www-client/rekonq/rekonq-9999.ebuild               | 14 +++++------
 48 files changed, 206 insertions(+), 206 deletions(-)

diff --git a/app-backup/kfoldersync/kfoldersync-3.0.0.ebuild b/app-backup/kfoldersync/kfoldersync-3.0.0.ebuild
index fbf8ae3..497bfe0 100644
--- a/app-backup/kfoldersync/kfoldersync-3.0.0.ebuild
+++ b/app-backup/kfoldersync/kfoldersync-3.0.0.ebuild
@@ -26,8 +26,8 @@ RDEPEND="
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 460e5e8..09824ce 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -41,10 +41,10 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep solid)
 	$(add_kdeapps_dep libkcddb)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread )
 	ffmpeg? (

diff --git a/app-editors/kile/kile-9999.ebuild b/app-editors/kile/kile-9999.ebuild
index 09195d4..ba59e47 100644
--- a/app-editors/kile/kile-9999.ebuild
+++ b/app-editors/kile/kile-9999.ebuild
@@ -33,10 +33,10 @@ DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep okular)
-	dev-qt/qtdbus:5
-	dev-qt/qtscript:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
 "
 
 RDEPEND="${DEPEND}

diff --git a/app-text/cutepaste/cutepaste-9999.ebuild b/app-text/cutepaste/cutepaste-9999.ebuild
index 3074a4c..0b2c249 100644
--- a/app-text/cutepaste/cutepaste-9999.ebuild
+++ b/app-text/cutepaste/cutepaste-9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 KEYWORDS=""
 
 DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
+	$(add_qt_dep qtcore)
+	$(add_qt_dep qtnetwork)
 "
 RDEPEND="${DEPEND}"

diff --git a/app-text/kbibtex/kbibtex-9999.ebuild b/app-text/kbibtex/kbibtex-9999.ebuild
index 2c30229..c17e823 100644
--- a/app-text/kbibtex/kbibtex-9999.ebuild
+++ b/app-text/kbibtex/kbibtex-9999.ebuild
@@ -40,12 +40,12 @@ DEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-libs/qoauth:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	virtual/tex-base
 "
 RDEPEND="${DEPEND}

diff --git a/dev-libs/purpose/purpose-9999.ebuild b/dev-libs/purpose/purpose-9999.ebuild
index cb2dea3..7054938 100644
--- a/dev-libs/purpose/purpose-9999.ebuild
+++ b/dev-libs/purpose/purpose-9999.ebuild
@@ -17,10 +17,10 @@ DEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_kdeapps_dep kaccounts-integration)
-	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)
 	net-libs/accounts-qt
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-libs/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild b/dev-libs/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
index 8ad31c9..0a97ded 100644
--- a/dev-libs/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
+++ b/dev-libs/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
@@ -14,9 +14,9 @@ IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep kwindowsystem)
-	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
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image

diff --git a/dev-util/kdevelop-cppcheck/kdevelop-cppcheck-9999.ebuild b/dev-util/kdevelop-cppcheck/kdevelop-cppcheck-9999.ebuild
index 6ed3473..a783491 100644
--- a/dev-util/kdevelop-cppcheck/kdevelop-cppcheck-9999.ebuild
+++ b/dev-util/kdevelop-cppcheck/kdevelop-cppcheck-9999.ebuild
@@ -22,9 +22,9 @@ COMMON_DEPEND="
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep threadweaver)
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
 	dev-util/kdevplatform:5
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/dev-util/kdevelop-css/kdevelop-css-5.0.9999.ebuild b/dev-util/kdevelop-css/kdevelop-css-5.0.9999.ebuild
index d2f105a..7cefcc7 100644
--- a/dev-util/kdevelop-css/kdevelop-css-5.0.9999.ebuild
+++ b/dev-util/kdevelop-css/kdevelop-css-5.0.9999.ebuild
@@ -25,9 +25,9 @@ COMMON_DEPEND="
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep threadweaver)
-	dev-qt/qtgui:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
 	dev-util/kdevelop-pg-qt:5
 	dev-util/kdevplatform:5
 "

diff --git a/dev-util/kdevelop-css/kdevelop-css-9999.ebuild b/dev-util/kdevelop-css/kdevelop-css-9999.ebuild
index a5c338c..db84c1b 100644
--- a/dev-util/kdevelop-css/kdevelop-css-9999.ebuild
+++ b/dev-util/kdevelop-css/kdevelop-css-9999.ebuild
@@ -24,9 +24,9 @@ COMMON_DEPEND="
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep threadweaver)
-	dev-qt/qtgui:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
 	dev-util/kdevelop-pg-qt:5
 	dev-util/kdevplatform:5
 "

diff --git a/dev-util/kdevelop-go/kdevelop-go-9999.ebuild b/dev-util/kdevelop-go/kdevelop-go-9999.ebuild
index d50d02c..5452dc2 100644
--- a/dev-util/kdevelop-go/kdevelop-go-9999.ebuild
+++ b/dev-util/kdevelop-go/kdevelop-go-9999.ebuild
@@ -19,8 +19,8 @@ COMMON_DEPEND="
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep threadweaver)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 	dev-util/kdevplatform:5
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/dev-util/kdevelop-krazy2/kdevelop-krazy2-9999.ebuild b/dev-util/kdevelop-krazy2/kdevelop-krazy2-9999.ebuild
index 1eb6f60..8ff7e75 100644
--- a/dev-util/kdevelop-krazy2/kdevelop-krazy2-9999.ebuild
+++ b/dev-util/kdevelop-krazy2/kdevelop-krazy2-9999.ebuild
@@ -22,8 +22,8 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 	dev-util/kdevplatform:5
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/dev-util/kdevelop-php/kdevelop-php-5.0.9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.0.9999.ebuild
index 7a1bb82..af00591 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.0.9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.0.9999.ebuild
@@ -32,9 +32,9 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep threadweaver)
-	dev-qt/qtgui:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
 	dev-util/kdevelop-pg-qt:5
 	>=dev-util/kdevplatform-${PV}:${SLOT}
 "

diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
index 88ac35a..29e992d 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
@@ -31,9 +31,9 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep threadweaver)
-	dev-qt/qtgui:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
 	dev-util/kdevelop-pg-qt:5
 	>=dev-util/kdevplatform-${PV}:${SLOT}
 "

diff --git a/dev-util/kdevelop-python/kdevelop-python-5.0.9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.0.9999.ebuild
index 9eefba1..af02c8b 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.0.9999.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.0.9999.ebuild
@@ -26,8 +26,8 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep threadweaver)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 	dev-util/kdevplatform:5
 	${PYTHON_DEPS}
 "

diff --git a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
index 9f72952..5a5484f 100644
--- a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
@@ -25,8 +25,8 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep threadweaver)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 	dev-util/kdevplatform:5
 	${PYTHON_DEPS}
 "

diff --git a/dev-util/kdevelop-upload/kdevelop-upload-9999.ebuild b/dev-util/kdevelop-upload/kdevelop-upload-9999.ebuild
index c309c13..8eb230f 100644
--- a/dev-util/kdevelop-upload/kdevelop-upload-9999.ebuild
+++ b/dev-util/kdevelop-upload/kdevelop-upload-9999.ebuild
@@ -29,8 +29,8 @@ DEPEND="
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 	dev-util/kdevplatform:5
 "
 RDEPEND="${DEPEND}

diff --git a/dev-util/kdevelop-valgrind/kdevelop-valgrind-9999.ebuild b/dev-util/kdevelop-valgrind/kdevelop-valgrind-9999.ebuild
index 93542f3..d8493a3 100644
--- a/dev-util/kdevelop-valgrind/kdevelop-valgrind-9999.ebuild
+++ b/dev-util/kdevelop-valgrind/kdevelop-valgrind-9999.ebuild
@@ -23,9 +23,9 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep threadweaver)
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
 	dev-util/kdevplatform:5
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
index 4611006..111e16d 100644
--- a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
@@ -33,12 +33,12 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep threadweaver)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
 	>=dev-util/kdevplatform-${PV}:5
 	cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) )
 	plasma? (
@@ -46,7 +46,7 @@ DEPEND="
 		$(add_frameworks_dep plasma)
 	)
 	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	qthelp? ( dev-qt/qthelp:5 )
+	qthelp? ( $(add_qt_dep qthelp) )
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kapptemplate)

diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index f82cf98..3c6c366 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -32,12 +32,12 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep threadweaver)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
 	>=dev-util/kdevplatform-${PV}:5
 	cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) )
 	plasma? (
@@ -45,7 +45,7 @@ DEPEND="
 		$(add_frameworks_dep plasma)
 	)
 	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	qthelp? ( dev-qt/qthelp:5 )
+	qthelp? ( $(add_qt_dep qthelp) )
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kapptemplate)

diff --git a/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild b/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild
index e6ef6c2..1e271d6 100644
--- a/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild
@@ -48,13 +48,13 @@ COMMON_DEPEND="
 	$(add_frameworks_dep sonnet)
 	$(add_frameworks_dep threadweaver)
 	$(add_kdeapps_dep libkomparediff2)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	subversion? (
 		dev-libs/apr:1
 		dev-libs/apr-util:1
@@ -64,8 +64,8 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
-	dev-qt/qtconcurrent:5
-	dev-qt/qttest:5
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qttest)
 "
 RDEPEND="${COMMON_DEPEND}
 	cvs? ( dev-vcs/cvs )

diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index e88d173..f788c91 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -47,13 +47,13 @@ COMMON_DEPEND="
 	$(add_frameworks_dep sonnet)
 	$(add_frameworks_dep threadweaver)
 	$(add_kdeapps_dep libkomparediff2)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	subversion? (
 		dev-libs/apr:1
 		dev-libs/apr-util:1
@@ -63,8 +63,8 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
-	dev-qt/qtconcurrent:5
-	dev-qt/qttest:5
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qttest)
 "
 RDEPEND="${COMMON_DEPEND}
 	cvs? ( dev-vcs/cvs )

diff --git a/kde-apps/kjots/kjots-5.0.1.ebuild b/kde-apps/kjots/kjots-5.0.1.ebuild
index c38d6a3..708fb75 100644
--- a/kde-apps/kjots/kjots-5.0.1.ebuild
+++ b/kde-apps/kjots/kjots-5.0.1.ebuild
@@ -33,10 +33,10 @@ RDEPEND="
 	$(add_kdeapps_dep kpimtextedit)
 	dev-libs/grantlee:5
 	dev-libs/libxslt
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext

diff --git a/kde-apps/ksirk/ksirk-5.9999.ebuild b/kde-apps/ksirk/ksirk-5.9999.ebuild
index df990e6..4e10864 100644
--- a/kde-apps/ksirk/ksirk-5.9999.ebuild
+++ b/kde-apps/ksirk/ksirk-5.9999.ebuild
@@ -38,12 +38,12 @@ DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep libkdegames)
 	app-crypt/qca:2[qt5]
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	media-libs/phonon[qt5]
 	sys-libs/zlib
 "

diff --git a/kde-misc/skanlite/skanlite-2.0.ebuild b/kde-misc/skanlite/skanlite-2.0.ebuild
index 4896787..68df244 100644
--- a/kde-misc/skanlite/skanlite-2.0.ebuild
+++ b/kde-misc/skanlite/skanlite-2.0.ebuild
@@ -24,8 +24,8 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep libksane)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 	media-libs/libpng:0=
 "
 RDEPEND="${DEPEND}

diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index 15d3612..f289368 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -39,15 +39,15 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep libkexiv2)
 	dev-libs/boost[threads]
 	dev-libs/expat
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5[mysql]
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql 'mysql')
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	>=media-gfx/exiv2-0.24:=
 	media-libs/jasper
 	media-libs/lcms:2
@@ -74,7 +74,7 @@ COMMON_DEPEND="
 	mysql? ( virtual/mysql )
 	video? ( dev-qt/qtmultimedia[widgets] )
 	X? (
-		dev-qt/qtx11extras:5
+		$(add_qt_dep qtx11extras)
 		x11-libs/libX11
 	)
 "

diff --git a/media-gfx/kgraphviewer/kgraphviewer-9999.ebuild b/media-gfx/kgraphviewer/kgraphviewer-9999.ebuild
index ee66d3c..d5b2b2d 100644
--- a/media-gfx/kgraphviewer/kgraphviewer-9999.ebuild
+++ b/media-gfx/kgraphviewer/kgraphviewer-9999.ebuild
@@ -27,11 +27,11 @@ RDEPEND="
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
 	>=media-gfx/graphviz-2.30
 "
 DEPEND="${RDEPEND}

diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 6a7181b..8593d29 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -30,19 +30,19 @@ COMMON_DEPEND="
 	dev-cpp/eigen:3
 	dev-lang/perl
 	dev-libs/boost
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
+	$(add_qt_dep designer)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
 	media-gfx/exiv2:=
 	media-libs/lcms
 	sys-libs/zlib
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 	tiff? ( media-libs/tiff:0 )
 	vc? ( dev-libs/vc )
 	X? (
-		dev-qt/qtx11extras:5
+		$(add_qt_dep qtx11extras)
 		x11-libs/libX11
 		x11-libs/libxcb
 	)

diff --git a/media-gfx/symboleditor/symboleditor-9999.ebuild b/media-gfx/symboleditor/symboleditor-9999.ebuild
index e4916fc..d9bce13 100644
--- a/media-gfx/symboleditor/symboleditor-9999.ebuild
+++ b/media-gfx/symboleditor/symboleditor-9999.ebuild
@@ -28,8 +28,8 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext

diff --git a/media-libs/prison/prison-9999.ebuild b/media-libs/prison/prison-9999.ebuild
index f7fce00..0fd14df 100644
--- a/media-libs/prison/prison-9999.ebuild
+++ b/media-libs/prison/prison-9999.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	dev-qt/qtgui:5
+	$(add_qt_dep qtgui)
 	media-gfx/qrencode
 	media-libs/libdmtx
 "

diff --git a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
index f7d13ae..b2e4e6d 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild
@@ -47,14 +47,14 @@ COMMON_DEPEND="
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
 	kde-apps/libkipi:5=
 	calendar? ( $(add_kdeapps_dep kcalcore) )
 	flashexport? ( $(add_frameworks_dep karchive) )
@@ -62,7 +62,7 @@ COMMON_DEPEND="
 	panorama? ( $(add_frameworks_dep threadweaver) )
 	phonon? ( media-libs/phonon[qt5] )
 	viewers? (
-		dev-qt/qtopengl:5
+		$(add_qt_dep qtopengl)
 		x11-libs/libX11
 		x11-libs/libXrandr
 		virtual/opengl

diff --git a/media-sound/amarok/amarok-5.9999.ebuild b/media-sound/amarok/amarok-5.9999.ebuild
index 54cb288..17f6cd5 100644
--- a/media-sound/amarok/amarok-5.9999.ebuild
+++ b/media-sound/amarok/amarok-5.9999.ebuild
@@ -51,16 +51,16 @@ COMMONDEPEND="
 	$(add_frameworks_dep solid)
 	$(add_frameworks_dep threadweaver)
 	app-crypt/qca:2[qt5]
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5[scripttools]
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	media-libs/phonon[qt5]
 	>=media-libs/taglib-1.7[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1

diff --git a/media-sound/kwave/kwave-9999.ebuild b/media-sound/kwave/kwave-9999.ebuild
index 67f0146..f74677b 100644
--- a/media-sound/kwave/kwave-9999.ebuild
+++ b/media-sound/kwave/kwave-9999.ebuild
@@ -34,9 +34,9 @@ COMMON_DEPEND="
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 	media-libs/audiofile:=
 	>=sci-libs/fftw-3
 	media-libs/libsamplerate
@@ -47,7 +47,7 @@ COMMON_DEPEND="
 		media-libs/libmad
 		|| ( media-sound/lame media-sound/twolame media-sound/toolame )
 	)
-	qtmedia? ( dev-qt/qtmultimedia:5 )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
 	opus? (
 		media-libs/libogg
 		media-libs/opus

diff --git a/media-video/bangarang/bangarang-9999.ebuild b/media-video/bangarang/bangarang-9999.ebuild
index c079adc..26bf083 100644
--- a/media-video/bangarang/bangarang-9999.ebuild
+++ b/media-video/bangarang/bangarang-9999.ebuild
@@ -21,8 +21,8 @@ RDEPEND="
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep solid)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 	media-libs/phonon[qt5]
 	media-libs/taglib
 	!media-video/bangarang:4

diff --git a/media-video/kamoso/kamoso-9999.ebuild b/media-video/kamoso/kamoso-9999.ebuild
index 920bbbc..42c75b3 100644
--- a/media-video/kamoso/kamoso-9999.ebuild
+++ b/media-video/kamoso/kamoso-9999.ebuild
@@ -21,9 +21,9 @@ DEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	dev-libs/purpose:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 	media-libs/qt-gstreamer[qt5]
 	virtual/libudev:=
 "

diff --git a/net-im/choqok/choqok-9999.ebuild b/net-im/choqok/choqok-9999.ebuild
index 80b1c0b..1b7bfc7 100644
--- a/net-im/choqok/choqok-9999.ebuild
+++ b/net-im/choqok/choqok-9999.ebuild
@@ -35,13 +35,13 @@ DEPEND="
 	app-crypt/qca[qt5]
 	dev-libs/qjson
 	dev-libs/qoauth:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	net-libs/telepathy-qt[qt5]
 	attica? ( dev-libs/libattica )
 	konqueror? (

diff --git a/net-irc/konversation/konversation-9999.ebuild b/net-irc/konversation/konversation-9999.ebuild
index be4373e..c37b9d3 100644
--- a/net-irc/konversation/konversation-9999.ebuild
+++ b/net-irc/konversation/konversation-9999.ebuild
@@ -41,10 +41,10 @@ DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep solid)
 	$(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)
 	media-libs/phonon[qt5]
 	crypt? ( app-crypt/qca:2[qt5] )
 	sys-devel/gettext

diff --git a/net-libs/libkgapi/libkgapi-5.1.0.ebuild b/net-libs/libkgapi/libkgapi-5.1.0.ebuild
index 42a64d6..bcd9591 100644
--- a/net-libs/libkgapi/libkgapi-5.1.0.ebuild
+++ b/net-libs/libkgapi/libkgapi-5.1.0.ebuild
@@ -24,11 +24,11 @@ DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/net-libs/libkgapi/libkgapi-9999.ebuild b/net-libs/libkgapi/libkgapi-9999.ebuild
index b3e4910..45b391b 100644
--- a/net-libs/libkgapi/libkgapi-9999.ebuild
+++ b/net-libs/libkgapi/libkgapi-9999.ebuild
@@ -23,11 +23,11 @@ DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/net-libs/libkvkontakte/libkvkontakte-9999.ebuild b/net-libs/libkvkontakte/libkvkontakte-9999.ebuild
index de63880..8c20dae 100644
--- a/net-libs/libkvkontakte/libkvkontakte-9999.ebuild
+++ b/net-libs/libkvkontakte/libkvkontakte-9999.ebuild
@@ -22,10 +22,10 @@ DEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
-	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)
 	>=dev-libs/qjson-0.7.0
 "
 RDEPEND="${DEPEND}"

diff --git a/net-libs/libmediawiki/libmediawiki-9999.ebuild b/net-libs/libmediawiki/libmediawiki-9999.ebuild
index e11307c..b0251e1 100644
--- a/net-libs/libmediawiki/libmediawiki-9999.ebuild
+++ b/net-libs/libmediawiki/libmediawiki-9999.ebuild
@@ -22,7 +22,7 @@ IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep kcoreaddons)
-	dev-qt/qtnetwork:5
+	$(add_qt_dep qtnetwork)
 "
 RDEPEND="${DEPEND}
 	!net-libs/libmediawiki:4

diff --git a/net-libs/libtmdbqt/libtmdbqt-9999.ebuild b/net-libs/libtmdbqt/libtmdbqt-9999.ebuild
index 1408975..935f73b 100644
--- a/net-libs/libtmdbqt/libtmdbqt-9999.ebuild
+++ b/net-libs/libtmdbqt/libtmdbqt-9999.ebuild
@@ -16,7 +16,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	dev-qt/qtnetwork:5
+	$(add_qt_dep qtnetwork)
 "
 RDEPEND="${DEPEND}"
 

diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild
index 703f847..60e9946 100644
--- a/net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild
+++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-9999.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib:2
 	dev-libs/libxml2
-	dev-qt/qtdbus:5
+	$(add_qt_dep qtdbus)
 	net-im/telepathy-logger
 	net-libs/telepathy-glib
 	net-libs/telepathy-qt[qt5]

diff --git a/net-misc/knemo/knemo-9999.ebuild b/net-misc/knemo/knemo-9999.ebuild
index 403a199..6ca7cbc 100644
--- a/net-misc/knemo/knemo-9999.ebuild
+++ b/net-misc/knemo/knemo-9999.ebuild
@@ -33,11 +33,11 @@ DEPEND="
 	$(add_plasma_dep libksysguard)
 	dev-libs/libnl:3
 	sys-apps/net-tools
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	wifi? ( net-wireless/wireless-tools )
 "
 RDEPEND="${DEPEND}

diff --git a/net-misc/smb4k/smb4k-9999.ebuild b/net-misc/smb4k/smb4k-9999.ebuild
index 3d892a1..99fb9c3 100644
--- a/net-misc/smb4k/smb4k-9999.ebuild
+++ b/net-misc/smb4k/smb4k-9999.ebuild
@@ -38,11 +38,11 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep solid)
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext

diff --git a/sys-block/partitionmanager/partitionmanager-9999.ebuild b/sys-block/partitionmanager/partitionmanager-9999.ebuild
index d704c5d..4ce889f 100644
--- a/sys-block/partitionmanager/partitionmanager-9999.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-9999.ebuild
@@ -26,8 +26,8 @@ DEPEND="
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 	sys-apps/util-linux
 	sys-libs/kpmcore
 "

diff --git a/sys-libs/kpmcore/kpmcore-9999.ebuild b/sys-libs/kpmcore/kpmcore-9999.ebuild
index f3788ed..49300a6 100644
--- a/sys-libs/kpmcore/kpmcore-9999.ebuild
+++ b/sys-libs/kpmcore/kpmcore-9999.ebuild
@@ -20,8 +20,8 @@ CDEPEND="
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kservice)
 	dev-libs/libatasmart
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
 	sys-apps/util-linux
 	>=sys-block/parted-3
 "

diff --git a/www-client/rekonq/rekonq-9999.ebuild b/www-client/rekonq/rekonq-9999.ebuild
index f4ea03b..2dc5404 100644
--- a/www-client/rekonq/rekonq-9999.ebuild
+++ b/www-client/rekonq/rekonq-9999.ebuild
@@ -44,13 +44,13 @@ DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep sonnet)
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}
 	!www-client/rekonq:4