diff options
author | Alex Alexander <wired@gentoo.org> | 2012-01-25 13:24:31 +0000 |
---|---|---|
committer | Alex Alexander <wired@gentoo.org> | 2012-01-25 13:24:31 +0000 |
commit | a5ab55b845714513ff68dfad5dc3f3c0d4bb0fbc (patch) | |
tree | 26c1761606c132224b088819d42b6b42f7878518 /dev-python | |
parent | Version bump (diff) | |
download | gentoo-2-a5ab55b845714513ff68dfad5dc3f3c0d4bb0fbc.tar.gz gentoo-2-a5ab55b845714513ff68dfad5dc3f3c0d4bb0fbc.tar.bz2 gentoo-2-a5ab55b845714513ff68dfad5dc3f3c0d4bb0fbc.zip |
builds with qt-opengl-4.8.0[egl], updated dep
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
-rw-r--r-- | dev-python/PyQt4/ChangeLog | 7 | ||||
-rw-r--r-- | dev-python/PyQt4/PyQt4-4.9.ebuild | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog index 9009beed0fd6..bd8dfd14df04 100644 --- a/dev-python/PyQt4/ChangeLog +++ b/dev-python/PyQt4/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/PyQt4 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.163 2011/12/27 18:10:31 maksbotan Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.164 2012/01/25 13:24:31 wired Exp $ + + 25 Jan 2012; Alex Alexander <wired@gentoo.org> PyQt4-4.9.ebuild: + builds with qt-opengl-4.8.0[egl], updated dep 27 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> PyQt4-4.9.ebuild: Enable versioning of /usr/bin/pyuic4. Run eqmake4() in qpy/QtDBus directory. diff --git a/dev-python/PyQt4/PyQt4-4.9.ebuild b/dev-python/PyQt4/PyQt4-4.9.ebuild index 5133c5c21dc1..4ff26a40261c 100644 --- a/dev-python/PyQt4/PyQt4-4.9.ebuild +++ b/dev-python/PyQt4/PyQt4-4.9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.ebuild,v 1.2 2011/12/27 18:10:31 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.ebuild,v 1.3 2012/01/25 13:24:31 wired Exp $ EAPI="3" PYTHON_DEPEND="*" @@ -36,7 +36,7 @@ DEPEND=">=dev-python/sip-4.13.1 ) declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 ) multimedia? ( >=x11-libs/qt-multimedia-${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 ) ) + opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.8.0: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-libs/phonon ) ) kde? ( media-libs/phonon ) |