Move Qt dependencies to the new category

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

4 files changed, 56 insertions, 50 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/Manifest b/dev-python/PyQt4/Manifest
index f2494966c79a..111b32326531 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX PyQt4-4.7.2-configure.py.patch 933 SHA256 1a87c58ccb14441f77c7c764b6e6c40d1bdd64c5b35581f3deda54019a3461be SHA512 e2484a7361fabe32861913fe2e81e8c4a2d4e0d697a82a643dfc45332e99221767b0224df3fb0b5da27e33f7c2e6585d5b09a022e3fe35e9c8e3af2ba5feb4a3 WHIRLPOOL 44435221972b24dff022c78ffaa0c5888e035a88e95ebf2220605e34ca736d272b46cf875bbe7bde16b3137f255026f8d07e51c35fc6a9fd52d1256feba32312
 AUX PyQt4-4.7.3-qreal_float_support.patch 6460 SHA256 8183d7a12c094d02eb4f1ac2b983690c39ee54182a0d28adba52348f705e9c16 SHA512 b333f4016b048af66bb13177981dc468f6e645d9280c18a4f419127c48aca8b4d5c034a167be7353884b715e67ec110ff7d4d4e850793883186ebfef7678e372 WHIRLPOOL 9c7a0409023e8c3af3626bfb3887aea687c07feb5235506ea0ed01171095d575b5681171dc5cde1c796448bb83e26449cab7df2432e172b47b43ec751bf99317
 AUX PyQt4-4.9.4-pyuic-custom-widgets.patch 3212 SHA256 8a59ee0fcd3f1d8a52745c68c35eed5e4b0e2b31e6e7bf2f5dca7bdb2396e44c SHA512 58e4e4bb43c32408f3ead09c619c414d717a2ad3b15025a54698d2287c085ac3ec2e14760b6f9e36d11a28202c65aed2a3e378e7c7ed65ee9f6d3b7edc5eaee0 WHIRLPOOL 16d32a6f885fc71205c9208ea8e1ca7fcb6f8fed8f31305e907395dfd3bcb1723c3ea4aeda1eb1f04824cc7424eb00b1318834a98350f5a1d789ca0a2b480b19
 DIST PyQt-x11-gpl-4.9.4.tar.gz 9801300 SHA256 29416e9b2dd394d39c3034e103717a40b9090ec05f457600a4d62b6f29b27e48 SHA512 719abd2dc5504c9fdab3151d9649915d80d4b9e59f4f122127c7d9c5938cb4116ba993d7ff1a8468d098bb76d49c7f36aa5f13b30f44fedc38192e89e751e1f3 WHIRLPOOL 294a6d77ecf6540561795219ea02d687d906fd635b1de0c8d78cc60ddf51bf870f819127f58c9bb406edb942a3c8caaf4d581045920b99ecd4b9bb831d16d214
 DIST PyQt-x11-gpl-4.9.6.tar.gz 9349834 SHA256 a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d SHA512 1d0ca00d529f67d33e51b947b9e2c49a64611a842f1a78220c9390afd1657e909451d9b758d0c008b6efbba7ed047f18ca41323e4db2269d685b9d2400a604aa WHIRLPOOL fd9e2339014e2cce9c4106f92593abca3d71881c57a90e6084a08fdc55213cd640723b988fa792bf4e20e448fb7f6fc43fb72bb45fb7c81bf5819684620ad4ae
-EBUILD PyQt4-4.9.4-r1.ebuild 5742 SHA256 601ced757792b9e858a0c4ad69a5aa5ccb6fd961c791f681de8ad2469db0b83b SHA512 294287e228c70a3ca41b52cfeebc7e35b121aeea46ce6c84ead7e9239f1cd2a15d195535376306f917a9b51a9936a8b48c1c985410cd1b402f1be80f5a001820 WHIRLPOOL 6ff0cb2300333730e50222b00bc2f1b3ff66f03e379e33872214df44be9773b324645964aee7a1ff87d1140187e7737dd3f1892163fdc70c88d00b94bed52de2
-EBUILD PyQt4-4.9.6-r2.ebuild 5301 SHA256 0d27750a9f5e4cf9bde1069032d11d381066f67ba4a42c1c60c8109baff34422 SHA512 8ae6d5b9b619d71449afd68809c029fe13bb52c7ddedb1e446c02e14f517864639a6a719667c66c2c2ccd423d43957be7a63fc56b49f75bba92ae26b5727863a WHIRLPOOL 525767f7e4bf4cf73a58080b442b2e17e361bbd43d028a4c26569e6972e67cbc4bb73db2b8bb2ca91000178f7d1c96d53751b0fcb875f032129d2f4026e15975
-MISC ChangeLog 30140 SHA256 a59c78fc6202b412001bf50a1dda77bca71cd8e490c289607c62f3613bfe4520 SHA512 2926675c98b8adf1f79480767254760c3042c1ba4e68f71d46c00d5cfbb140679552b645deda18aa39f726afc93609dd8934565693d973b4577665bfc89ec729 WHIRLPOOL fc8e736f402cad8da80e8accef7f043b8b49e0402961985cefc11d8081e47a0465d6140b69f766f5a0ef9527bd2c81be365656addd208b6efabbb7de9fbf579d
+EBUILD PyQt4-4.9.4-r1.ebuild 5691 SHA256 b7c690f8e50a26079771bbd776e3c814411d7d345527789badad2a449804824e SHA512 d9fd47db0b7a3e2e5e0726ada90ba66ca6df561054839ca66279fe47058ae479c3fc1dbf3802b917a0b44f0a6dce66d7b9472eff85e05ea838087c9758da8190 WHIRLPOOL e53b90e88bbed69941436459d983d2d9debe95d3f7930121fcf961b9a227845451c88ca73d71a85cc85d8a243fe0a50a377b2b64fe1ff080c447ea65afa732c3
+EBUILD PyQt4-4.9.6-r2.ebuild 5259 SHA256 62f0632ed3c331b307f61f9183e20ca4e1c8a94a2afd642ff1fc8d75c8607f77 SHA512 c10ff84b4ce60acc97ae858e4ef2e9bf371f9f73bd302d2739744c578997481468af0383f4ae75b405fa57a6c58c781f3ca922ce0b39dec8918167d7f8834c97 WHIRLPOOL fe78822ae6a7bb93c5d3332023e6a66fe236f88c427bb3a8ef2f2fd4c401f29da69ccb9deb12e7730cc0ddd697bc0a15b0d9bdbf3fa2e13024ed8050a64d4fae
+MISC ChangeLog 30290 SHA256 7c3964e0bee0146b3cd5768140692d722cfdd9588fdb02649808309b0e865ba2 SHA512 0b6a77dad379c3faa0de551021c827e9d683b7b2ded0d9abee3dca79cf42ba0a3a3ada1886d7faec1f848ea022b579e920d145c3dea53adb2718ca55780d106c WHIRLPOOL 667a68446fee31f8d0417a1a04b5223421a37984e93b0e9e9c237022c706f103c9a540c8e79bd4c0921987de7ddd0583bfbc3ef083e50fd7ffba1e6da65703db
 MISC metadata.xml 1259 SHA256 6e84edc762013d947ce99abe16bc677889a2df354930daa460cac89c7719b972 SHA512 afed2276d4b93648b7706013cf6877cb7cfb1df94d42aa7dd26b902cbd2ccdc3e420e267aeb26d5899a8c69b4cd17909ee30e0b13982fd0f9c8e6c7b13362857 WHIRLPOOL a65b3dabe625baf77ecdaac2a00c36b5bf42bb2f310b5238bc975cee192f87531175d88e02cbe22db85121ac01d5a23df292db474350b87db038a373cb79cda1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRJiBOAAoJELp701BxlEWfFhkP/i4t8p/iEyjPA16RWCSYKncK
-59Pjb+4TUKBByOAkQUQKysuU/2pCP3kYBQSui98DFBPMBoJNmOE8p5CuuqKard+A
-JVKgT7a3ZGGc85rS61MtbHRa2LUpMGFk6Mzm7ockp4Flvr7TLbaMET8n7O1619LK
-1vy9ORfziQpEi5U3epOqLmylYJUtbwicyjJIdufxnMgwLYSUIJTuPJjQ4M0thzfV
-zHJK0INgAziFg567PQU7ngnlrSaYH39XRnxldNtNGpHUIDvH3u6jDCjODuRttlok
-QTZrO/WyesOANRk8Mu1B9RDu6PERqB7vYhVXy4G/JhtA1kVgod+siK0MqhWTE1o/
-thZuPPSl+cJF+OP5fLKLQn40cAytyGuGFPltmDHObSdqlAYQRcnb4H8ulFVW0aFN
-pmfMPa+YC0yu4bohtRs46T1KzOwkAF/0mmaeCVZcd13XJJc09eDUtykm38Wm8kxV
-ZiSSYE7/zz9FjsyzJpw0/HAE2Kw3dEJsWpMY7i+YYYvH8nLNCqjLzuVnPlP5p5pp
-7ByhrLWAAQkl5fRdY5WANHlbmLWLJNGTXMjbVFsPstI3z5Kk+V3+VMwgi5yO1pmt
-3cy3+2/Li1rWYZM9ZTh8VloWm+5eMDHkS2DCcfLRphBcKzqIWlGC9yjZkaBypGuv
-zRPNRAEbWQnlvgw9gZOz
-=01cg
+iQJ8BAEBCABmBQJRMpsHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88tTEQANNre3ceZlQh8SLQhDCOAg6R
+HAxSY9cGhM3KR+GIdGLCPc8tx9FuPfackhya2b54cyvVxSue0F4KHPNz8PA/xU2J
+U3x4HuYE9MRtry+o5W3V+sf+FWgyyg7NrIOEK8SOTN7l0EkYKJHqbrV1UtSNctGu
+DNdyUKHcoJZVZC/U8X7nh/DxNm5IhMbw3TTU5mUMiIFN9tC0o/WQNxBbH8r5mb8/
+SnOgp0d85rlNIET8XkDx3PYUyhq52jCnpoEToY6tabr+oqboMLv40zkjnsIESG4f
+36LP6AVbYDH/PyuDBYQygo84QjyMOCEQA7aZOHSQkC8kCkeZj4CatrUr90QVCMl5
+hqVOPJmadx6kamrM2QlTtUXM7i85IfHW5AoJAePgBjBMUrpXlktxUXaaotYQNpWy
+jyLtysA+6Q79N8tdHySvfe84TVXRSX/021+Pr6EYyG/QO+whxXiUQDt4yM6p9413
+rTuBuCj6JRjArEfBTAg0uXdnVR/1xqVAUMq6uQJF+LLtL3MIJY8Kukqm/k9QHfC1
+VE+6pb8NMXWuP8X8h3R1lQh5bTaQ6zemhjhoZWvH29v4GlxRO8tZzBF1vWtNIonv
+6qfD94/Qit42/qkIuMZMKXlLNpQsU0xeaG6nwR1rN2ussihNpqECWKqVQ6LnfTpD
+6YUZYQr6yZKXy3qGHvXv
+=8B9V
 -----END PGP SIGNATURE-----
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 )