Move Qt dependencies to the new category

(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

3 files changed, 37 insertions, 33 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 9d6914d39d70..e9ebccc79044 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.217 2013/02/21 13:27:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.218 2013/03/03 00:36:24 hwoarang Exp $
+
+  03 Mar 2013; Markos Chandras <hwoarang@gentoo.org> PyQt4-4.9.4-r1.ebuild,
+  PyQt4-4.9.6-r2.ebuild:
+  Move Qt dependencies to the new category
 
   21 Feb 2013; Agostino Sarubbo <ago@gentoo.org> PyQt4-4.9.6-r2.ebuild:
   Stable for ia64, wrt bug #457046
diff --git a/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild b/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild
index d332fc2895bf..4c49af1b1511 100644
--- a/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild,v 1.3 2012/11/22 21:03:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild,v 1.4 2013/03/03 00:36:24 hwoarang Exp $
 
 EAPI=4
 
@@ -43,31 +43,31 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-python/sip-4.13.3
-	>=x11-libs/qt-core-${QT_VER}:4
-	>=x11-libs/qt-script-${QT_VER}:4
+	>=dev-qt/qtcore-${QT_VER}:4
+	>=dev-qt/qtscript-${QT_VER}:4
 	X? (
-		>=x11-libs/qt-gui-${QT_VER}:4[dbus?]
-		>=x11-libs/qt-test-${QT_VER}:4
+		>=dev-qt/qtgui-${QT_VER}:4[dbus?]
+		>=dev-qt/qttest-${QT_VER}:4
 	)
-	assistant? ( >=x11-libs/qt-assistant-${QT_VER}:4 )
+	assistant? ( >=dev-qt/qthelp-${QT_VER}:4 )
 	dbus? (
 		>=dev-python/dbus-python-0.80
-		>=x11-libs/qt-dbus-${QT_VER}:4
+		>=dev-qt/qtdbus-${QT_VER}:4
 	)
-	declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 )
-	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
+	declarative? ( >=dev-qt/qtdeclarative-${QT_VER}:4 )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_VER}:4 )
 	opengl? (
-		>=x11-libs/qt-opengl-${QT_VER}:4
-		|| ( >=x11-libs/qt-opengl-4.8.0:4 <x11-libs/qt-opengl-4.8.0:4[-egl] )
+		>=dev-qt/qtopengl-${QT_VER}:4
+		|| ( >=dev-qt/qtopengl-4.8.0:4 <dev-qt/qtopengl-4.8.0:4[-egl] )
 	)
 	phonon? (
-		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) )
+		!kde? ( || ( >=dev-qt/qtphonon-${QT_VER}:4 media-libs/phonon ) )
 		kde? ( media-libs/phonon )
 	)
-	sql? ( >=x11-libs/qt-sql-${QT_VER}:4 )
-	svg? ( >=x11-libs/qt-svg-${QT_VER}:4 )
-	webkit? ( >=x11-libs/qt-webkit-${QT_VER}:4 )
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )
+	sql? ( >=dev-qt/qtsql-${QT_VER}:4 )
+	svg? ( >=dev-qt/qtsvg-${QT_VER}:4 )
+	webkit? ( >=dev-qt/qtwebkit-${QT_VER}:4 )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_VER}:4 )
 "
 DEPEND="${RDEPEND}
 	dbus? ( virtual/pkgconfig )
diff --git a/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild b/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
index c4c2a0661152..aaf362707e51 100644
--- a/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild,v 1.11 2013/02/21 13:27:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild,v 1.12 2013/03/03 00:36:24 hwoarang Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@@ -41,28 +41,28 @@ QT_PV="4.8.0:4"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/sip-4.14.2:=[${PYTHON_USEDEP}]
-	>=x11-libs/qt-core-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
 	X? (
-		>=x11-libs/qt-gui-${QT_PV}[dbus?]
-		>=x11-libs/qt-test-${QT_PV}
+		>=dev-qt/qtgui-${QT_PV}[dbus?]
+		>=dev-qt/qttest-${QT_PV}
 	)
 	dbus? (
 		>=dev-python/dbus-python-0.80
-		>=x11-libs/qt-dbus-${QT_PV}
+		>=dev-qt/qtdbus-${QT_PV}
 	)
-	declarative? ( >=x11-libs/qt-declarative-${QT_PV} )
-	help? ( >=x11-libs/qt-assistant-${QT_PV} )
-	multimedia? ( >=x11-libs/qt-multimedia-${QT_PV} )
-	opengl? ( >=x11-libs/qt-opengl-${QT_PV} )
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
 	phonon? (
 		kde? ( media-libs/phonon )
-		!kde? ( || ( >=x11-libs/qt-phonon-${QT_PV} media-libs/phonon ) )
+		!kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon ) )
 	)
-	script? ( >=x11-libs/qt-script-${QT_PV} )
-	sql? ( >=x11-libs/qt-sql-${QT_PV} )
-	svg? ( >=x11-libs/qt-svg-${QT_PV} )
-	webkit? ( >=x11-libs/qt-webkit-${QT_PV} )
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_PV} )
+	script? ( >=dev-qt/qtscript-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
 "
 DEPEND="${RDEPEND}
 	dbus? ( virtual/pkgconfig )