diff options
| -rw-r--r-- | dev-python/PyQt4/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-python/PyQt4/PyQt4-4.8.1.ebuild | 4 | ||||
| -rw-r--r-- | dev-python/PyQt4/PyQt4-4.8.2.ebuild | 4 |
4 files changed, 11 insertions, 7 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/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 ) |