Update PyQt4 deps.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

6 files changed, 33 insertions, 27 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index b0b269bab6cc..601e1b6a806b 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/eric
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.186 2012/11/07 09:09:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.187 2012/12/26 03:46:58 pesa Exp $
+
+  26 Dec 2012; Davide Pesavento <pesa@gentoo.org> eric-4.5.6.ebuild,
+  eric-4.5.7.ebuild, eric-5.2.5.ebuild, eric-5.2.6.ebuild:
+  Update PyQt4 deps.
 
   07 Nov 2012; Davide Pesavento <pesa@gentoo.org> -eric-4.5.4.ebuild,
   -eric-5.2.3.ebuild, eric-4.5.6.ebuild, eric-5.2.5.ebuild:
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 55dc5b7e1759..0c1c8ec2eb52 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -43,26 +43,26 @@ DIST eric5-i18n-tr-5.2.5.tar.gz 450362 SHA256 701b4e270540abbe071c097d21219f90c7
 DIST eric5-i18n-tr-5.2.6.tar.gz 450665 SHA256 db672d59569252b322100fb42b5997e82b215ea7e1df398f5dcc88981f23cf27 SHA512 e8b72b7b1dc60d28fc833f442782c3214fa41f19e991cd2fa3ce8e245ee734711375c039274487f3ed118c2a52a14873b92bda534f403cea99ff3a19704fd3b7 WHIRLPOOL a8f3e4695d71c9051ea507e816d57f814d8c13e9d568f7296c958ce0d7ee11475629de1594966a73a665e636e1e896e1a1e1d084e4b368ce2e03cdeb55010142
 DIST eric5-i18n-zh_CN.GB2312-5.2.5.tar.gz 436238 SHA256 cabde401fc1eb6d5456c07185304191fbf75f507e48e2c37582c959a41297ade SHA512 d8331ac5d8c20d6b4805efff2e6b89c1a774043d66ed50e29cf00af1bd710df46307c7819093c7fcb4459202352f728ff48b904d838a1870ccb9413e39119205 WHIRLPOOL 4a01e9dd6349af174e57921b763d8967f2d3a8981e63bf74126939a8e217c097fa7bd32e6b800a2627560b382f2e540ac394a92681e1f150726ba48d64f02b5b
 DIST eric5-i18n-zh_CN.GB2312-5.2.6.tar.gz 436568 SHA256 70bde33c2a73d7859459edf66be953c1735be540aa82462e9d3e096fdf5d94db SHA512 ac63ca9f95ce0b104c1bb8878e2fb63bb6abdeff2fa13fd2bd8673c5b430fc69db7cd6179bb629993c58f46ba3cbbb26a58db564dd3be37f5aa51e32f51df463 WHIRLPOOL f64e8726f8e124165e71df5349e2d4aaa064ed2191983bd5eb24e85da3de2f107eb4d9abe48a898c6f270511ea66ac95d829a62173d16b2d828acb1cbed4722a
-EBUILD eric-4.5.6.ebuild 2848 SHA256 fe87498ac6997681042a66c39f6378736b0266837052db68c5eb4770b8a57c8c SHA512 e7c58c230c9de5981b8a77502e58f12dd781f2a4cc2fbbed192cd6e348f17750c95a980720ee850cbc2d6dc9e2a249dde03f07be36d8936b9f957cdc087901cf WHIRLPOOL 22c5ec3a383bb793dfb260dee467fd35daf04e47fee1ca4c5824ad04ee064909a4dee65674bd825696f7f44060403a72d317c546d00bd90731eddbd47dde25ee
-EBUILD eric-4.5.7.ebuild 2850 SHA256 19ccc1521fbf6a7f6441666e98c55c93649cd11ca7a4eb18bfeddc63c2c94b4b SHA512 ecaac89c2ac1f3a788a00c7b33ae2b18c365fb77a9c42c98bb64f446fefa8c66db5f9d1b8747a5ba95f7b3ce1e29f6f10c1e21726605f431774392db465e0075 WHIRLPOOL e164a38e03a23edaa258993a016c783044b60b5f769af3e4cef242cd058c8690cf595649b87e8b0b5541699986b1224a0c658a362a487fc89f430b84c0cc22e0
-EBUILD eric-5.2.5.ebuild 2947 SHA256 8b8010b4d4aaa3474b5edfa89a7189bb677c9fd1b3733cc00aa648433a919a5c SHA512 92c590dc1b686ee40ac3da5fde957b079e6b1ff653aca82034ea2898ff85c99676746ba25c336a43f5fb7e1c388ee7e0debdc2271ec8814800a7b8be3013c861 WHIRLPOOL c8a9e7cb604ba6a1db144dc0674aa44b88bd2af94647c7952233468f5244f3e7afc07757b24d75b94138c77757a155446daf49fc4d39a85037b186c6f8288f0c
-EBUILD eric-5.2.6.ebuild 2949 SHA256 eab7626cef2fb453beed1a91cc07ed41f25d4af64d3ea28fa2e2873d37f108d1 SHA512 82f0ab399bd1be8220dd841019c39ea7feb328c1fb33022aad1da88227926291c5b2522ad831367ee883f6c57bbdb26655ca41f353e083736fd0cd6ee05b5bb3 WHIRLPOOL 5e852ab1e10a6f1cc69ae62abfba5a1f431c7b8737d3e95fd913d36c6936eaadb42748e775b54c95cfd6e9ee7290c37a14d04a99de0b0d980aa234330ab03a63
-MISC ChangeLog 24949 SHA256 d12159c8895a08d488599dc0669d7ed43d832fc1973bbb3db06f1541caa79553 SHA512 d75bae9b72e29e53edd818b80c32fe3c0aabdfe519b9a7681ab80faf3fa8c5b330db38787415c7ba341a8dc852d15e73720d1fd39ccace22f6114c30668e8ae2 WHIRLPOOL b5bd7a0e10a57176beb54b37c765ec04b2ea1caa58d800072083f8381f5d618b3e80c0c86293e3dccb5b575364925d25b92024c5795a32da5d9647c5db745156
+EBUILD eric-4.5.6.ebuild 2908 SHA256 9bc315b9d6782a4a6f53ba01a27796760375f4ca2cf270e461b6e479c3a9b0c6 SHA512 49b83a99a89531eedcf0a38cfd38ec505964d18a745959b66c9a92a1c16b9acd773e754652963f3bc89895c9b2e733a6328e4483e90eaadfe4b30764cd4d23e2 WHIRLPOOL bcd65edccc19a5aa677cd0a2111ecda5f11b0c2911ec07042f1821659536631cef92944685444fa4a0b71109d356b81a5270e5cff86e6c98b98a618f6dd7834f
+EBUILD eric-4.5.7.ebuild 2850 SHA256 023f9af65dd674f3132cb23798ea49447d2793c29ca78e8dc16b2d7b6d7ec669 SHA512 9e20d54dda4f6232246696f44b4bab093eb8230566906fdf930d88ee91fd8ecd1fdfd65521f83d479a2d8b6be6ed11f5c8ced62f4ea7e3d0ab2b47d412aa8a76 WHIRLPOOL 347faa26514e2addafc00f2aed34869d495dfda12b5520beb013691cb822b228628c20c39c4a12355bebc53d5216413263d712632ccda09c947056d5a104eccb
+EBUILD eric-5.2.5.ebuild 3007 SHA256 249faec3dbad12aee42bbecb450820947e437ba243030364f74e646baaa32349 SHA512 d2815d92ef3e8faf3ce88a316b22cba5073ac94289f65c4dba0f64916ce622184689fc6630654532017e4086aa406c7760a65e9ddd5e7eafff2fb26f25e44e71 WHIRLPOOL be274b078881fd7cb56b0d8adb82dfb0e05eeca24d0b85b13723f61ef8a48daf89c1ba70f5f37904569a4ae33a6d446b07698c18efde3fc7b28e0bb2c19d8cb5
+EBUILD eric-5.2.6.ebuild 2949 SHA256 877f65f02ce3b72cce95aef7a60df538ce87d6e1648d75c5b27bc0d7b468f8e4 SHA512 1912ef8599511042e2299ac935df44921cfbe822dca2415db23fd1d21529014d07a00e3667a9cf0d85f9857eedacb9518bdf416224aa49512f81632d6f78e98f WHIRLPOOL f5b16ba0b411a519bb48deb06f830860c55400aba2ff43ecf53c3a067de60816ed08fdd3c64403fd0eb5053703daf3f78b1e6ffb9070657f945c58ccbbeb21d5
+MISC ChangeLog 25099 SHA256 4ce4ad26a26a90cfb4f7ca7925f309af1ef7821b59f2cae5a25a7786717ec5a5 SHA512 e313cfbd57c268705a4ddb787085833748b60777e887bddb98f4808c890c0513faf36cf6be96b2c9c001da8297e6b7326a590500a5607b97bcdc6268db85ec7a WHIRLPOOL f18d5ccd53fa1f70563747c3a323f1c22e6a1021ad5e7e42d117828c402434c92a9f13a50a96307cb88a4c9ae2644ccf1d11ec9ec36091c47ff536b40db14e53
 MISC metadata.xml 179 SHA256 1fbdee58e0ba0f8730f6a27979cb7eeed8ebd3afa316d61b34a5f4893291a646 SHA512 27c5c95cf5b26cd3fd03c986b4baa00980d4af079adb673854fc49de3e506f4a9d6a28fba9a5b7439cc7b54fcd5c71c16c1d5b87646c7e2fcaa1962fca839c75 WHIRLPOOL cd2ad0bbb86536f7b810597a04019b1de20c7a3baef72aa7c11d9fcc1bb9a225bb97d043c1ecb2af49c8e1796c265520ae8996b5521dd3476e7610e91e5b2d5a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQmiVpAAoJENXLsxwXqFxy4BkQALpfU5OD2X+LfQsSEZkISV0p
-rVlXgYWOAWcSYwg1mQgtF0S5E6lF/7hN/G20nfzHP4oWa77xS08lPsYqNYIzDSnk
-V0mCF6RO448Sy7QwL6zDnO9jepOHuJ7sAmwS55TwadBKJbG9vSxLBTaBqnqEdph3
-pgQimvfhbTSLRhqS5CL1lmIH2/Nb1/RPsgDvYPydphmWL17t5B9ww2Miq48gqNNA
-sDGP6uMZlJKhpPBZ4CFcrdudhP2myPcl5xifweke6iY6Ba0uuC4mkEZGJdd+GD3I
-jtRQokEPle3SDrDzSsd3jufobs8IV9qJ2uHETkiBKMU5hg+kidoL7QUKE0uxQQFP
-3DSdORiWpmx+GVlADTKdSqtW0jfVisotO05ffWvczWLNzP/2vE4IuD6NvE+zINNb
-aMdl87K+qGFcOxzLct94Yfs75PohMM/KGTRLs3BxlozDmfvOjOu7yr3lS6Fr3kOS
-6c/M6IiXeSB8AE/tM0ThE/ujK3Yce65UPpcxsVWF1AdyphwGI/XDdXSmz7Vshwyy
-LKBJy9uB4B8YOrOPCFqzrNI73VOQTfQa1sPj7tawcr3bgT0XGX1D87i6Tn6sRhot
-U+RpZO75bOlZVlDiX9dflr6I16s1xCEqCETTKHoFYR4anTrxWpBM+5HuI6RYknIC
-irB+XV/NDndwgVn7AOWg
-=9K3R
+iQIcBAEBCAAGBQJQ2nMyAAoJENXLsxwXqFxyRqoP/jSQDFe3q99EYaKNYrjNOU83
++3g3Ab1mosQn9zUxIbmFao2qjyiEqMDmgXbI8p2UDPQGGl4cvy8kCOja9JVBHsNR
+DWpukAfx4At/sIu29QLaeU5S/7EaD830atDStc8BrEK8yLGn6DYzeyzizljuIBXR
+DyFa6+jWGCg/mV5DF2mDGG27a48wJklTb3Qrr4oqlnOG8z/Fw6ZGdrTnqmWRlfnJ
+Qx6Qm8o8eyE3lF8yE1AN64l3bpp0wZOKRuDQLTVrG8UlBrY2F4xZM+C0ruKM5hj9
+w+RKSBqfEj7YWJ/nyQo9KUPZvi4HRXkJH7NzhAyEsKwydgvLBy7t16fHxPppTajk
+WoCnohBgZudIj5zAWRyQ9iur56+QiNrqruqCKBQWZ3NPIHehSd8iG6zNHOeQBbzr
+oxTbgRZNE56EhRLp+MKlaq2uO7K16XafEtzqnY5QAUeWG3SYzEJt89jgHP+MhnXl
+eMf4cqS1nR46hxzSCkQHMrmKXF+1G/efPRv+H4v5YE1NLNL46Ot28HDqGRsj/pwy
+V4FeGD/fqSHfYG7g8LvNR8FcfhPv+0tnqD2foATXxmSmi0AhgQUP2j2yr1vPOr4w
+juUwjdWDSkHiKSHl6VOtVH7uNMtmEw9C1lWexv9L4UgkwqZzBTzbt6wxgDKa53LS
+iSsIKrbdsC83UxmQREoV
+=GJIq
 -----END PGP SIGNATURE-----
diff --git a/dev-util/eric/eric-4.5.6.ebuild b/dev-util/eric/eric-4.5.6.ebuild
index 4bd09a2b05b0..2a8f9041d1d6 100644
--- a/dev-util/eric/eric-4.5.6.ebuild
+++ b/dev-util/eric/eric-4.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.6.ebuild,v 1.3 2012/11/07 09:09:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.6.ebuild,v 1.4 2012/12/26 03:46:58 pesa Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -26,7 +26,8 @@ IUSE="kde spell"
 
 DEPEND="
 	>=dev-python/sip-4.12.4
-	>=dev-python/PyQt4-4.6[assistant,svg,webkit,X]
+	|| ( >=dev-python/PyQt4-4.9.6-r1[X,help,svg,webkit]
+		<dev-python/PyQt4-4.9.6-r1[X,assistant,svg,webkit] )
 	>=dev-python/qscintilla-python-2.3
 	kde? ( kde-base/pykde4 )
 "
diff --git a/dev-util/eric/eric-4.5.7.ebuild b/dev-util/eric/eric-4.5.7.ebuild
index 86bb761276c3..c15cb9b5b961 100644
--- a/dev-util/eric/eric-4.5.7.ebuild
+++ b/dev-util/eric/eric-4.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.7.ebuild,v 1.1 2012/10/20 10:13:20 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.7.ebuild,v 1.2 2012/12/26 03:46:58 pesa Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -26,7 +26,7 @@ IUSE="kde spell"
 
 DEPEND="
 	>=dev-python/sip-4.12.4
-	>=dev-python/PyQt4-4.6[assistant,svg,webkit,X]
+	>=dev-python/PyQt4-4.9.6-r1[X,help,svg,webkit]
 	>=dev-python/qscintilla-python-2.3
 	kde? ( kde-base/pykde4 )
 "
diff --git a/dev-util/eric/eric-5.2.5.ebuild b/dev-util/eric/eric-5.2.5.ebuild
index 569c1c9f820b..b644fd467068 100644
--- a/dev-util/eric/eric-5.2.5.ebuild
+++ b/dev-util/eric/eric-5.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.2.5.ebuild,v 1.3 2012/11/07 09:09:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.2.5.ebuild,v 1.4 2012/12/26 03:46:58 pesa Exp $
 
 EAPI="4"
 PYTHON_DEPEND="3:3.1"
@@ -25,7 +25,8 @@ IUSE="spell"
 
 DEPEND="
 	>=dev-python/sip-4.12.4
-	>=dev-python/PyQt4-4.8[assistant,svg,webkit,X]
+	|| ( >=dev-python/PyQt4-4.9.6-r1[X,help,svg,webkit]
+		<dev-python/PyQt4-4.9.6-r1[X,assistant,svg,webkit] )
 	>=dev-python/qscintilla-python-2.4
 "
 RDEPEND="${DEPEND}
diff --git a/dev-util/eric/eric-5.2.6.ebuild b/dev-util/eric/eric-5.2.6.ebuild
index 4bc9325cbee1..7227b7fcb809 100644
--- a/dev-util/eric/eric-5.2.6.ebuild
+++ b/dev-util/eric/eric-5.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.2.6.ebuild,v 1.1 2012/10/20 10:13:20 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.2.6.ebuild,v 1.2 2012/12/26 03:46:58 pesa Exp $
 
 EAPI="4"
 PYTHON_DEPEND="3:3.1"
@@ -25,7 +25,7 @@ IUSE="spell"
 
 DEPEND="
 	>=dev-python/sip-4.12.4
-	>=dev-python/PyQt4-4.8[assistant,svg,webkit,X]
+	>=dev-python/PyQt4-4.9.6-r1[X,help,svg,webkit]
 	>=dev-python/qscintilla-python-2.4
 "
 RDEPEND="${DEPEND}