diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2013-07-10 08:35:31 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2013-07-10 08:35:31 +0000 |
| commit | 0e664b0fe79aba70a4c86c8da7883741ed4b6aad (patch) | |
| tree | 52d11d5ecc36f87ad1981dd629827063f74d0c84 | |
| parent | dev-lang/icc: Version Bump; fix collision 476330 (diff) | |
| download | gentoo-2-0e664b0fe79aba70a4c86c8da7883741ed4b6aad.tar.gz gentoo-2-0e664b0fe79aba70a4c86c8da7883741ed4b6aad.tar.bz2 gentoo-2-0e664b0fe79aba70a4c86c8da7883741ed4b6aad.zip | |
Fixing qtgui/designer deps for qt-4.8.5
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, unsigned Manifest commit)
| -rw-r--r-- | dev-python/PyQt4/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/PyQt4/PyQt4-4.10.1.ebuild | 3 | ||||
| -rw-r--r-- | dev-python/PyQt4/PyQt4-4.10.2.ebuild | 3 | ||||
| -rw-r--r-- | dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild | 3 |
4 files changed, 11 insertions, 4 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog index bba7b7eda470..4d2fac16d79e 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.227 2013/07/10 04:50:15 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.228 2013/07/10 08:35:31 patrick Exp $ + + 10 Jul 2013; Patrick Lauer <patrick@gentoo.org> PyQt4-4.10.1.ebuild, + PyQt4-4.10.2.ebuild, PyQt4-4.9.6-r2.ebuild: + Fixing qtgui/designer deps for qt-4.8.5 10 Jul 2013; Patrick Lauer <patrick@gentoo.org> PyQt4-4.10.1.ebuild, PyQt4-4.9.6-r2.ebuild: diff --git a/dev-python/PyQt4/PyQt4-4.10.1.ebuild b/dev-python/PyQt4/PyQt4-4.10.1.ebuild index 3353a3ddf700..7e68e97a0c9f 100644 --- a/dev-python/PyQt4/PyQt4-4.10.1.ebuild +++ b/dev-python/PyQt4/PyQt4-4.10.1.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.10.1.ebuild,v 1.3 2013/07/10 04:50:15 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.1.ebuild,v 1.4 2013/07/10 08:35:31 patrick Exp $ EAPI=5 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} ) @@ -45,6 +45,7 @@ RDEPEND=" >=dev-qt/qtcore-${QT_PV} X? ( >=dev-qt/qtgui-${QT_PV}[dbus(+)?] + || ( <dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) >=dev-qt/qttest-${QT_PV} ) dbus? ( diff --git a/dev-python/PyQt4/PyQt4-4.10.2.ebuild b/dev-python/PyQt4/PyQt4-4.10.2.ebuild index 21d8c5e9f08f..c63160673627 100644 --- a/dev-python/PyQt4/PyQt4-4.10.2.ebuild +++ b/dev-python/PyQt4/PyQt4-4.10.2.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.10.2.ebuild,v 1.2 2013/07/08 06:04:50 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.2.ebuild,v 1.3 2013/07/10 08:35:31 patrick Exp $ EAPI=5 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} ) @@ -45,6 +45,7 @@ RDEPEND=" >=dev-qt/qtcore-${QT_PV} X? ( >=dev-qt/qtgui-${QT_PV} + || ( <dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) >=dev-qt/qttest-${QT_PV} ) dbus? ( diff --git a/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild b/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild index a66ac8ecb6ee..efc374fb10d3 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.14 2013/07/10 04:50:15 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild,v 1.15 2013/07/10 08:35:31 patrick Exp $ EAPI=5 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} ) @@ -44,6 +44,7 @@ RDEPEND=" >=dev-qt/qtcore-${QT_PV} X? ( >=dev-qt/qtgui-${QT_PV}[dbus(+)?] + || ( <dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) >=dev-qt/qttest-${QT_PV} ) dbus? ( |