Require x11-libs/qt-opengl[-egl] until bug #344513 is fixed.

Package-Manager: portage-2.2.0_alpha10_p22/cvs/Linux x86_64

5 files changed, 15 insertions, 11 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index be51c94199e8..e705d7fa3e39 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.140 2010/12/30 01:11:19 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.141 2010/12/30 18:08:19 arfrever Exp $
+
+  30 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  PyQt4-4.8.1.ebuild, PyQt4-4.8.1-r1.ebuild, PyQt4-4.8.2.ebuild:
+  Require x11-libs/qt-opengl[-egl] until bug #344513 is fixed.
 
 *PyQt4-4.8.1-r1 (30 Dec 2010)
 
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 67587bd870a4..b6f38998e476 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -8,8 +8,8 @@ DIST PyQt-x11-gpl-4.8.1.tar.gz 9409175 RMD160 e5ba0d98359ce315432f479a5f44b2c1ae
 DIST PyQt-x11-gpl-4.8.2.tar.gz 9605005 RMD160 ba9948dcd05964c6f27d24b0f2d224a3d6109258 SHA1 fd26aed89a6032c85a553bfd5228280ac982b85c SHA256 ea9f4643d090a4416daa745ecf527c04429b89614d4fde8143a2155f64300fe4
 EBUILD PyQt4-4.7.3.ebuild 4672 RMD160 157969a93dfb7f4dbc8bb9baa60a112f9fe61d0e SHA1 522a3ba34963cd0a539babb333112580721998d5 SHA256 021e4f0b244ea19e60c030d6d38ffb67294c9856a3f127dcfc1dbf78b1df0583
 EBUILD PyQt4-4.7.7-r1.ebuild 4646 RMD160 4d638a8e96fdc64335a8cdc27caa4f7e5d35c1a3 SHA1 22f8061422deab563300cc765ed43c9d3aa8c50a SHA256 c27219498de969cfd4a039f413c76cbf5d3f4d8f2aff2cf463db5d3e3b0cc286
-EBUILD PyQt4-4.8.1-r1.ebuild 4854 RMD160 7d73c74a0ca56497e71e83b0d4f93dd6e37e0086 SHA1 037921e86b452877eed10b9e471cf873468f02f8 SHA256 dcf3ebed5a55c8af140debaad4280db6bb9ab615ed33937c24a5ff372839aab9
-EBUILD PyQt4-4.8.1.ebuild 4734 RMD160 3e8990b2bbee9a57b7d71b62e5d0510279987077 SHA1 fdc10bf01b55f10b1e1449e32e9f9aefa99fb003 SHA256 fe1679bc592bc03d44d7478492bedcb8261956b559ac2b8befee3707d7c6534d
-EBUILD PyQt4-4.8.2.ebuild 4849 RMD160 20b42fdf8fcf96740d759e4c1699b237aa3cde7a SHA1 73c3657d2690849c132d22edf5cc88f514866812 SHA256 a76d5d6b812bf00e1b703e0ddf6ab99a667bff5993e09b538628013ae3490265
-MISC ChangeLog 19437 RMD160 c5996e8cda8d967521a00b9a035753334886e2de SHA1 2b4ec95c9b08a203f9e1a7609bb5292e35002880 SHA256 dc75392e0280e908e963f6d586cbabf5f9fa43700499f21c1f33a631d0c27193
+EBUILD PyQt4-4.8.1-r1.ebuild 4924 RMD160 0dbcb6e16dec1c99853fa863726427d336718280 SHA1 6f274869d750a17948dc1082debea94238503c40 SHA256 c0e4857017d34ce5f19de2ada41291cf4a56045361c1333f55d5f5fb0e8c4310
+EBUILD PyQt4-4.8.1.ebuild 4804 RMD160 966e53c6b011b8d80067b78b165b5a590bc517b2 SHA1 a4ff81e0f748965a074d91f435e6f349524aa6d8 SHA256 ad9eed55a5b13646d09a828a8dbc4c45e70d9aa3b4c213dbba23e0cff99b1079
+EBUILD PyQt4-4.8.2.ebuild 4919 RMD160 bcbec38035409739e3784257a408f5a9a0b2cd20 SHA1 9e474ddf2287953130bc0b882dd8baa4b5c95647 SHA256 78de5cd1be4c00b17bd0099c7469a74053c87b4c396674d369dd2690212b2851
+MISC ChangeLog 19639 RMD160 f4542e03cf5eb71c8ba3fb4d6ec4241e9559dfac SHA1 46a471508f7a831dace77323eb024b3e80dc0b6c SHA256 2e4101015c60e108b1b5e5fecc12fde39c0f879f18bad0877381bcf4d29b2e5a
 MISC metadata.xml 878 RMD160 cdc42fae8ad9f67bbe0dcc949f7822cc72d0acf9 SHA1 f1907739ab33d27cd8276c57b4d062a3b44ae402 SHA256 89c99beeac252dc158fb953793675d0133b2daa91b22f4c5a016262348323afe
diff --git a/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild b/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild
index 5d74331f20bd..c3cb53867e37 100644
--- a/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild,v 1.1 2010/12/30 01:11:19 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild,v 1.2 2010/12/30 18:08:19 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -36,7 +36,7 @@ DEPEND=">=dev-python/sip-4.11.2
 	)
 	declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 )
 	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
-	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 )
+	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
 	phonon? (
 		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-sound/phonon ) )
 		kde? ( media-sound/phonon )
diff --git a/dev-python/PyQt4/PyQt4-4.8.1.ebuild b/dev-python/PyQt4/PyQt4-4.8.1.ebuild
index 8d2bb8a11f32..5a12e5717fa6 100644
--- a/dev-python/PyQt4/PyQt4-4.8.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild,v 1.5 2010/12/30 01:11:19 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild,v 1.6 2010/12/30 18:08:19 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -35,7 +35,7 @@ DEPEND=">=dev-python/sip-4.11.2
 		>=x11-libs/qt-dbus-${QT_VER}:4
 	)
 	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
-	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 )
+	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
 	phonon? (
 		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-sound/phonon ) )
 		kde? ( media-sound/phonon )
diff --git a/dev-python/PyQt4/PyQt4-4.8.2.ebuild b/dev-python/PyQt4/PyQt4-4.8.2.ebuild
index 84366b58673c..89fa60325d8b 100644
--- a/dev-python/PyQt4/PyQt4-4.8.2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.2.ebuild,v 1.2 2010/12/25 15:01:17 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.2.ebuild,v 1.3 2010/12/30 18:08:19 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -36,7 +36,7 @@ DEPEND=">=dev-python/sip-4.12
 	)
 	declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 )
 	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
-	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 )
+	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
 	phonon? (
 		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-sound/phonon ) )
 		kde? ( media-sound/phonon )