Update KDE overlay to use new Qt package names.

Package-Manager: portage-2.2.0_alpha164
RepoMan-Options: --force

54 files changed, 147 insertions, 147 deletions

diff --git a/app-misc/strigi/strigi-9999.ebuild b/app-misc/strigi/strigi-9999.ebuild
index 9d27f67912a..efd2633b5de 100644
--- a/app-misc/strigi/strigi-9999.ebuild
+++ b/app-misc/strigi/strigi-9999.ebuild
@@ -32,7 +32,7 @@ COMMONDEPEND="
 	clucene? ( >=dev-cpp/clucene-0.9.21[-debug] )
 	dbus? (
 		sys-apps/dbus
-		qt4? ( x11-libs/qt-dbus:4 )
+		qt4? ( dev-qt/qtdbus:4 )
 	)
 	exif? ( >=media-gfx/exiv2-0.17 )
 	fam? ( virtual/fam )
@@ -40,8 +40,8 @@ COMMONDEPEND="
 	hyperestraier? ( app-text/hyperestraier )
 	log? ( >=dev-libs/log4cxx-0.10.0 )
 	qt4? (
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
 	)
 "
 DEPEND="${COMMONDEPEND}
diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 6686b897aff..12d0372ba77 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -27,9 +27,9 @@ IUSE="+mysql postgres sqlite test"
 CDEPEND="
 	dev-libs/boost
 	>=dev-libs/soprano-2.6.51
-	>=x11-libs/qt-gui-4.5.0:4[dbus]
-	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
-	>=x11-libs/qt-test-4.5.0:4
+	>=dev-qt/qtgui-4.5.0:4[dbus]
+	>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
+	>=dev-qt/qttest-4.5.0:4
 	x11-misc/shared-mime-info
 "
 DEPEND="${CDEPEND}
diff --git a/app-office/skrooge/skrooge-9999.ebuild b/app-office/skrooge/skrooge-9999.ebuild
index f506b5a038f..85fd09abbc3 100644
--- a/app-office/skrooge/skrooge-9999.ebuild
+++ b/app-office/skrooge/skrooge-9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	app-crypt/qca:2
 	dev-libs/grantlee
 	>=dev-libs/libofx-0.9.1
-	x11-libs/qt-sql:4[sqlite]
+	dev-qt/qtsql:4[sqlite]
 "
 RDEPEND="${DEPEND}
 	|| (
diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild
index 9d8bf42317a..e5f42f37e58 100644
--- a/dev-libs/grantlee/grantlee-9999.ebuild
+++ b/dev-libs/grantlee/grantlee-9999.ebuild
@@ -17,13 +17,13 @@ SLOT="0"
 IUSE="debug doc test"
 
 COMMON_DEPEND="
-	>=x11-libs/qt-core-${QT_MINIMAL}:4
-	>=x11-libs/qt-gui-${QT_MINIMAL}:4
-	>=x11-libs/qt-script-${QT_MINIMAL}:4
+	>=dev-qt/qtcore-${QT_MINIMAL}:4
+	>=dev-qt/qtgui-${QT_MINIMAL}:4
+	>=dev-qt/qtscript-${QT_MINIMAL}:4
 "
 DEPEND="${COMMON_DEPEND}
 	doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] ) )
-	test? ( >=x11-libs/qt-test-${QT_MINIMAL}:4 )
+	test? ( >=dev-qt/qttest-${QT_MINIMAL}:4 )
 "
 RDEPEND="${COMMON_DEPEND}"
 
diff --git a/dev-libs/libattica/libattica-9999.ebuild b/dev-libs/libattica/libattica-9999.ebuild
index a6917382c00..2283ca070e1 100644
--- a/dev-libs/libattica/libattica-9999.ebuild
+++ b/dev-libs/libattica/libattica-9999.ebuild
@@ -15,8 +15,8 @@ KEYWORDS=""
 SLOT="0"
 IUSE="debug"
 
-RDEPEND="x11-libs/qt-core:4"
+RDEPEND="dev-qt/qtcore:4"
 DEPEND="${RDEPEND}
-	x11-libs/qt-test:4"
+	dev-qt/qttest:4"
 
 DOCS=(AUTHORS ChangeLog README)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
index 50257570b5a..e4d5279184b 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
@@ -27,15 +27,15 @@ SLOT="0"
 IUSE="debug doc"
 
 RDEPEND="
-	>=x11-libs/qt-core-${QT_DEPEND}:4
-	>=x11-libs/qt-dbus-${QT_DEPEND}:4
-	>=x11-libs/qt-gui-${QT_DEPEND}:4[dbus]
+	>=dev-qt/qtcore-${QT_DEPEND}:4
+	>=dev-qt/qtdbus-${QT_DEPEND}:4
+	>=dev-qt/qtgui-${QT_DEPEND}:4[dbus]
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? (
 		dev-libs/qjson
-		>=x11-libs/qt-test-${QT_DEPEND}:4
+		>=dev-qt/qttest-${QT_DEPEND}:4
 	)
 "
 
diff --git a/dev-libs/libqzeitgeist/libqzeitgeist-9999.ebuild b/dev-libs/libqzeitgeist/libqzeitgeist-9999.ebuild
index d3ea6f79630..b8712479c0e 100644
--- a/dev-libs/libqzeitgeist/libqzeitgeist-9999.ebuild
+++ b/dev-libs/libqzeitgeist/libqzeitgeist-9999.ebuild
@@ -23,7 +23,7 @@ IUSE="debug"
 
 RDEPEND="
 	dev-libs/libzeitgeist
-	x11-libs/qt-declarative:4
+	dev-qt/qtdeclarative:4
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild
index 0739797ffe6..f745e6e6f02 100644
--- a/dev-libs/soprano/soprano-9999.ebuild
+++ b/dev-libs/soprano/soprano-9999.ebuild
@@ -23,8 +23,8 @@ SLOT="0"
 IUSE="+dbus debug doc elibc_FreeBSD +raptor +redland test +virtuoso"
 
 COMMON_DEPEND="
-	>=x11-libs/qt-core-4.5.0:4
-	dbus? ( >=x11-libs/qt-dbus-4.5.0:4 )
+	>=dev-qt/qtcore-4.5.0:4
+	dbus? ( >=dev-qt/qtdbus-4.5.0:4 )
 	raptor? ( >=media-libs/raptor-2.0.4:2 )
 	redland? (
 		>=dev-libs/rasqal-0.9.26
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )
-	test? ( >=x11-libs/qt-test-4.5.0:4 )
+	test? ( >=dev-qt/qttest-4.5.0:4 )
 "
 RDEPEND="${COMMON_DEPEND}
 	virtuoso? ( >=dev-db/virtuoso-server-6.1.6 )
diff --git a/dev-util/automoc/automoc-9999.ebuild b/dev-util/automoc/automoc-9999.ebuild
index 9a903647cc5..ebcc3b2ab2f 100644
--- a/dev-util/automoc/automoc-9999.ebuild
+++ b/dev-util/automoc/automoc-9999.ebuild
@@ -16,7 +16,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	x11-libs/qt-core:4
+	dev-qt/qtcore:4
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
index b455710d328..1ff43363c23 100644
--- a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
+++ b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
@@ -24,8 +24,8 @@ DEPEND="
 	virtual/pkgconfig
 	ncurses? ( sys-libs/ncurses )
 	qt4? (
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
 	)
 "
 RDEPEND="${DEPEND}
diff --git a/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild b/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild
index 7103f47494d..ef26c60d596 100644
--- a/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild
+++ b/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild
@@ -17,9 +17,9 @@ IUSE="debug"
 
 RDEPEND="
 	media-gfx/graphviz
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.35.0
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index da0b2699a69..32ce0e76fda 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -24,11 +24,11 @@ DEPEND="
 	$(add_kdebase_dep ksysguard)
 	$(add_kdebase_dep libkworkspace)
 	okteta? ( $(add_kdebase_dep okteta) )
-	qthelp? ( x11-libs/qt-assistant:4 )
+	qthelp? ( dev-qt/qthelp:4 )
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep kapptemplate)
-	x11-libs/qt-declarative:4[webkit]
+	dev-qt/qtdeclarative:4[webkit]
 	cxx? ( >=sys-devel/gdb-7.0[python] )
 "
 RESTRICT="test"
diff --git a/dev-util/krazy2/krazy2-9999.ebuild b/dev-util/krazy2/krazy2-9999.ebuild
index 00f48a344c0..aa119737531 100644
--- a/dev-util/krazy2/krazy2-9999.ebuild
+++ b/dev-util/krazy2/krazy2-9999.ebuild
@@ -20,8 +20,8 @@ DEPEND="
 	>=dev-perl/Tie-IxHash-1.20
 	>=dev-perl/XML-LibXML-1.57
 	dev-perl/yaml
-	>=x11-libs/qt-core-4.4:4
-	>=x11-libs/qt-gui-4.4:4
+	>=dev-qt/qtcore-4.4:4
+	>=dev-qt/qtgui-4.4:4
 "
 RDEPEND="${DEPEND}
 	dev-util/desktop-file-utils
diff --git a/dev-vcs/kdesvn/kdesvn-9999.ebuild b/dev-vcs/kdesvn/kdesvn-9999.ebuild
index 1cafba10578..87afb5a13df 100644
--- a/dev-vcs/kdesvn/kdesvn-9999.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-9999.ebuild
@@ -29,7 +29,7 @@ DEPEND="
 	dev-libs/apr-util:1
 	>=dev-vcs/subversion-1.4
 	sys-devel/gettext
-	x11-libs/qt-sql:4[sqlite]
+	dev-qt/qtsql:4[sqlite]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-active/contour/contour-0.3.ebuild b/kde-active/contour/contour-0.3.ebuild
index ec656f4eba5..20673fcea78 100644
--- a/kde-active/contour/contour-0.3.ebuild
+++ b/kde-active/contour/contour-0.3.ebuild
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND="
 	dev-libs/shared-desktop-ontologies
 	dev-libs/soprano
-	x11-libs/qt-mobility
+	dev-qt/qt-mobility
 	$(add_kdebase_dep nepomuk)
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/cantor/cantor-4.10.1.ebuild b/kde-base/cantor/cantor-4.10.1.ebuild
index 666edca04c9..bc0b4cb1fbc 100644
--- a/kde-base/cantor/cantor-4.10.1.ebuild
+++ b/kde-base/cantor/cantor-4.10.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	)
 	postscript? ( app-text/libspectre )
 	R? ( dev-lang/R )
-	x11-libs/qt-xmlpatterns:4
+	dev-qt/qtxmlpatterns:4
 "
 DEPEND="${RDEPEND}
 	>=dev-cpp/eigen-2.0.3:2
diff --git a/kde-base/cantor/cantor-4.10.49.9999.ebuild b/kde-base/cantor/cantor-4.10.49.9999.ebuild
index 262998063da..3af4f296875 100644
--- a/kde-base/cantor/cantor-4.10.49.9999.ebuild
+++ b/kde-base/cantor/cantor-4.10.49.9999.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	)
 	postscript? ( app-text/libspectre )
 	R? ( dev-lang/R )
-	x11-libs/qt-xmlpatterns:4
+	dev-qt/qtxmlpatterns:4
 "
 DEPEND="${RDEPEND}
 	>=dev-cpp/eigen-2.0.3:2
diff --git a/kde-base/cantor/cantor-9999.ebuild b/kde-base/cantor/cantor-9999.ebuild
index 262998063da..3af4f296875 100644
--- a/kde-base/cantor/cantor-9999.ebuild
+++ b/kde-base/cantor/cantor-9999.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	)
 	postscript? ( app-text/libspectre )
 	R? ( dev-lang/R )
-	x11-libs/qt-xmlpatterns:4
+	dev-qt/qtxmlpatterns:4
 "
 DEPEND="${RDEPEND}
 	>=dev-cpp/eigen-2.0.3:2
diff --git a/kde-base/kdelibs/kdelibs-4.10.1.ebuild b/kde-base/kdelibs/kdelibs-4.10.1.ebuild
index 4338147449e..d13aa4bc95d 100644
--- a/kde-base/kdelibs/kdelibs-4.10.1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.10.1.ebuild
@@ -93,7 +93,7 @@ DEPEND="${COMMONDEPEND}
 	nls? ( virtual/libintl )
 "
 RDEPEND="${COMMONDEPEND}
-	!x11-libs/qt-phonon
+	!dev-qt/qtphonon
 	>=app-crypt/gnupg-2.0.11
 	app-misc/ca-certificates
 	$(add_kdebase_dep kde-env)
diff --git a/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild
index 54ba9d6643c..c10f7dddfa3 100644
--- a/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild
@@ -93,7 +93,7 @@ DEPEND="${COMMONDEPEND}
 	nls? ( virtual/libintl )
 "
 RDEPEND="${COMMONDEPEND}
-	!x11-libs/qt-phonon
+	!dev-qt/qtphonon
 	>=app-crypt/gnupg-2.0.11
 	app-misc/ca-certificates
 	$(add_kdebase_dep kde-env)
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index c95a7eb6d36..fca1e8fea86 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -93,7 +93,7 @@ DEPEND="${COMMONDEPEND}
 	nls? ( virtual/libintl )
 "
 RDEPEND="${COMMONDEPEND}
-	!x11-libs/qt-phonon
+	!dev-qt/qtphonon
 	>=app-crypt/gnupg-2.0.11
 	app-misc/ca-certificates
 	$(add_kdebase_dep kde-env)
diff --git a/kde-base/kopete/kopete-4.10.1.ebuild b/kde-base/kopete/kopete-4.10.1.ebuild
index d03cd65a144..2be2c176872 100644
--- a/kde-base/kopete/kopete-4.10.1.ebuild
+++ b/kde-base/kopete/kopete-4.10.1.ebuild
@@ -68,7 +68,7 @@ COMMONDEPEND="
 	dev-libs/libpcre
 	$(add_kdebase_dep kdepimlibs)
 	media-libs/qimageblitz
-	>=x11-libs/qt-gui-4.4.0:4[mng]
+	>=dev-qt/qtgui-4.4.0:4[mng]
 	!aqua? ( x11-libs/libXScrnSaver )
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2 )
diff --git a/kde-base/kopete/kopete-4.10.49.9999.ebuild b/kde-base/kopete/kopete-4.10.49.9999.ebuild
index 6bfe217bb9c..14467fbaa5f 100644
--- a/kde-base/kopete/kopete-4.10.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.10.49.9999.ebuild
@@ -68,7 +68,7 @@ COMMONDEPEND="
 	dev-libs/libpcre
 	$(add_kdebase_dep kdepimlibs)
 	media-libs/qimageblitz
-	>=x11-libs/qt-gui-4.4.0:4[mng]
+	>=dev-qt/qtgui-4.4.0:4[mng]
 	!aqua? ( x11-libs/libXScrnSaver )
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2 )
diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 6bfe217bb9c..14467fbaa5f 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -68,7 +68,7 @@ COMMONDEPEND="
 	dev-libs/libpcre
 	$(add_kdebase_dep kdepimlibs)
 	media-libs/qimageblitz
-	>=x11-libs/qt-gui-4.4.0:4[mng]
+	>=dev-qt/qtgui-4.4.0:4[mng]
 	!aqua? ( x11-libs/libXScrnSaver )
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2 )
diff --git a/kde-base/lokalize/lokalize-4.10.1.ebuild b/kde-base/lokalize/lokalize-4.10.1.ebuild
index 467b2c9d3d8..7e2641f2152 100644
--- a/kde-base/lokalize/lokalize-4.10.1.ebuild
+++ b/kde-base/lokalize/lokalize-4.10.1.ebuild
@@ -20,7 +20,7 @@ IUSE="debug semantic-desktop"
 
 DEPEND="
 	>=app-text/hunspell-1.2.8
-	>=x11-libs/qt-sql-4.5.0:4[sqlite]
+	>=dev-qt/qtsql-4.5.0:4[sqlite]
 	semantic-desktop? ( >=dev-libs/soprano-2.9.0 )
 "
 RDEPEND="${DEPEND}
diff --git a/kde-base/lokalize/lokalize-4.10.49.9999.ebuild b/kde-base/lokalize/lokalize-4.10.49.9999.ebuild
index a3476da11e1..5c98d469e01 100644
--- a/kde-base/lokalize/lokalize-4.10.49.9999.ebuild
+++ b/kde-base/lokalize/lokalize-4.10.49.9999.ebuild
@@ -20,7 +20,7 @@ IUSE="debug semantic-desktop"
 
 DEPEND="
 	>=app-text/hunspell-1.2.8
-	>=x11-libs/qt-sql-4.5.0:4[sqlite]
+	>=dev-qt/qtsql-4.5.0:4[sqlite]
 	semantic-desktop? ( >=dev-libs/soprano-2.9.0 )
 "
 RDEPEND="${DEPEND}
diff --git a/kde-base/lokalize/lokalize-9999.ebuild b/kde-base/lokalize/lokalize-9999.ebuild
index 76c4763054f..1dc76874d46 100644
--- a/kde-base/lokalize/lokalize-9999.ebuild
+++ b/kde-base/lokalize/lokalize-9999.ebuild
@@ -14,7 +14,7 @@ IUSE="debug semantic-desktop"
 
 DEPEND="
 	>=app-text/hunspell-1.2.8
-	>=x11-libs/qt-sql-4.5.0:4[sqlite]
+	>=dev-qt/qtsql-4.5.0:4[sqlite]
 	semantic-desktop? ( >=dev-libs/soprano-2.9.0 )
 "
 RDEPEND="${DEPEND}
diff --git a/kde-base/marble/marble-4.10.1.ebuild b/kde-base/marble/marble-4.10.1.ebuild
index 23dc4b58aeb..898ef28d54f 100644
--- a/kde-base/marble/marble-4.10.1.ebuild
+++ b/kde-base/marble/marble-4.10.1.ebuild
@@ -18,13 +18,13 @@ IUSE="debug designer-plugin gps +kde plasma python shapefile test"
 RESTRICT="test"
 
 RDEPEND="
-	x11-libs/qt-core:4
-	x11-libs/qt-declarative:4
-	x11-libs/qt-gui:4[dbus]
-	x11-libs/qt-script:4
-	x11-libs/qt-sql:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-webkit:4
+	dev-qt/qtcore:4
+	dev-qt/qtdeclarative:4
+	dev-qt/qtgui:4[dbus]
+	dev-qt/qtscript:4
+	dev-qt/qtsql:4
+	dev-qt/qtsvg:4
+	dev-qt/qtwebkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
@@ -34,7 +34,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	test? ( x11-libs/qt-test:4 )
+	test? ( dev-qt/qttest:4 )
 "
 # the qt dependencies are needed because with USE=-kde nothing is pulled in
 # by default... bugs 414165 & 429346
diff --git a/kde-base/marble/marble-4.10.49.9999.ebuild b/kde-base/marble/marble-4.10.49.9999.ebuild
index 6204d619dad..7efe2ba3b34 100644
--- a/kde-base/marble/marble-4.10.49.9999.ebuild
+++ b/kde-base/marble/marble-4.10.49.9999.ebuild
@@ -18,13 +18,13 @@ IUSE="debug designer-plugin gps +kde plasma python shapefile test"
 RESTRICT="test"
 
 RDEPEND="
-	x11-libs/qt-core:4
-	x11-libs/qt-declarative:4
-	x11-libs/qt-gui:4[dbus]
-	x11-libs/qt-script:4
-	x11-libs/qt-sql:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-webkit:4
+	dev-qt/qtcore:4
+	dev-qt/qtdeclarative:4
+	dev-qt/qtgui:4[dbus]
+	dev-qt/qtscript:4
+	dev-qt/qtsql:4
+	dev-qt/qtsvg:4
+	dev-qt/qtwebkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
@@ -34,7 +34,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	test? ( x11-libs/qt-test:4 )
+	test? ( dev-qt/qttest:4 )
 "
 # the qt dependencies are needed because with USE=-kde nothing is pulled in
 # by default... bugs 414165 & 429346
diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 6204d619dad..7efe2ba3b34 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -18,13 +18,13 @@ IUSE="debug designer-plugin gps +kde plasma python shapefile test"
 RESTRICT="test"
 
 RDEPEND="
-	x11-libs/qt-core:4
-	x11-libs/qt-declarative:4
-	x11-libs/qt-gui:4[dbus]
-	x11-libs/qt-script:4
-	x11-libs/qt-sql:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-webkit:4
+	dev-qt/qtcore:4
+	dev-qt/qtdeclarative:4
+	dev-qt/qtgui:4[dbus]
+	dev-qt/qtscript:4
+	dev-qt/qtsql:4
+	dev-qt/qtsvg:4
+	dev-qt/qtwebkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
@@ -34,7 +34,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	test? ( x11-libs/qt-test:4 )
+	test? ( dev-qt/qttest:4 )
 "
 # the qt dependencies are needed because with USE=-kde nothing is pulled in
 # by default... bugs 414165 & 429346
diff --git a/kde-base/smokegen/smokegen-4.10.1.ebuild b/kde-base/smokegen/smokegen-4.10.1.ebuild
index dd968f6b29e..00a1e3ce587 100644
--- a/kde-base/smokegen/smokegen-4.10.1.ebuild
+++ b/kde-base/smokegen/smokegen-4.10.1.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="aqua debug"
 
 DEPEND="
-	x11-libs/qt-core:4[aqua=]
+	dev-qt/qtcore:4[aqua=]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/smokegen/smokegen-4.10.49.9999.ebuild b/kde-base/smokegen/smokegen-4.10.49.9999.ebuild
index fe40d4c88fe..a67e8104f72 100644
--- a/kde-base/smokegen/smokegen-4.10.49.9999.ebuild
+++ b/kde-base/smokegen/smokegen-4.10.49.9999.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=""
 IUSE="aqua debug"
 
 DEPEND="
-	x11-libs/qt-core:4[aqua=]
+	dev-qt/qtcore:4[aqua=]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/smokegen/smokegen-9999.ebuild b/kde-base/smokegen/smokegen-9999.ebuild
index