kde5.eclass: Convert remaining ebuilds to add_qt_dep

Package-Manager: portage-2.2.27

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 fbf8ae3077c..497bfe0ed05 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 460e5e8a39a..09824cedf4c 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 09195d4f578..ba59e47130c 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 3074a4ccbab..0b2c2491871 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 2c302291af2..c17e8231688 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 cb2dea3013e..7054938b7aa 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 8ad31c9778d..0a97ded7358 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 6ed3473fdc1..a7834915f99 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 d2f105a91bc..7cefcc71f0c 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 a5c338cadc7..db84c1bec66 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 d50d02c8274..5452dc2430e 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 1eb6f60fd0a..8ff7e75718c 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 7a1bb82ed96..af0059199e0 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 88ac35a4ba5..29e992def98 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 9eefba13d6c..af02c8bcf14 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 9f72952b4d1..5a5484f0f43 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 c309c130f0f..8eb230f8dfe 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 93542f347aa..d8493a3e9b5 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 461100622b4..111e16df4e1 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 f82cf986dfb..3c6c36689bf 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 e6ef6c221bf..1e271d6bba2 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 e88d1735a2b..f788c9114be 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 c38d6a3ab4a..708fb756e32 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 df990e614f8..4e108640d94 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 489678746a5..68df244b141 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 15d3612e118..f289368b088 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 ee66d3c4d81..d5b2b2def73 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 6a7181b8aa1..8593d29a5a4 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 e4916fccd3a..d9bce13ca76 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