summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2014-11-20 00:41:25 +0000
committerDavide Pesavento <pesa@gentoo.org>2014-11-20 00:41:25 +0000
commit285dd4b442a939ac50ef7fd4c023bf99b40d4840 (patch)
treee4b8d759fdbb0cb0e5b775687f42926267e0987f
parentAdd missing dep on dev-qt/designer, bug 529630 by Toralf Förster. Remove old. (diff)
downloadgentoo-2-285dd4b442a939ac50ef7fd4c023bf99b40d4840.tar.gz
gentoo-2-285dd4b442a939ac50ef7fd4c023bf99b40d4840.tar.bz2
gentoo-2-285dd4b442a939ac50ef7fd4c023bf99b40d4840.zip
Adjust PyQt4 deps wrt bug 529872.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
-rw-r--r--dev-python/qscintilla-python/ChangeLog6
-rw-r--r--dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild6
-rw-r--r--dev-python/qscintilla-python/qscintilla-python-2.8.4-r1.ebuild4
3 files changed, 10 insertions, 6 deletions
diff --git a/dev-python/qscintilla-python/ChangeLog b/dev-python/qscintilla-python/ChangeLog
index 20ffa88af2e5..e2f6ace6bd7b 100644
--- a/dev-python/qscintilla-python/ChangeLog
+++ b/dev-python/qscintilla-python/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/qscintilla-python
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.113 2014/10/19 23:57:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.114 2014/11/20 00:41:25 pesa Exp $
+
+ 20 Nov 2014; Davide Pesavento <pesa@gentoo.org>
+ qscintilla-python-2.7.2.ebuild, qscintilla-python-2.8.4-r1.ebuild:
+ Adjust PyQt4 deps wrt bug 529872.
*qscintilla-python-2.8.4-r1 (19 Oct 2014)
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild
index 22311db52304..a3db3e114c8a 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild,v 1.9 2013/12/23 15:31:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild,v 1.10 2014/11/20 00:41:25 pesa Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -21,7 +21,7 @@ IUSE="debug"
DEPEND="
${PYTHON_DEPS}
>=dev-python/sip-4.12:=[${PYTHON_USEDEP}]
- >=dev-python/PyQt4-4.8[X,${PYTHON_USEDEP}]
+ =dev-python/PyQt4-4.10*[X,${PYTHON_USEDEP}]
dev-qt/qtcore:4
dev-qt/qtgui:4
~x11-libs/qscintilla-${PV}:=
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.8.4-r1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.8.4-r1.ebuild
index d768f869fc0e..c661eb7df1c1 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.8.4-r1.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.8.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.8.4-r1.ebuild,v 1.1 2014/10/19 23:57:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.8.4-r1.ebuild,v 1.2 2014/11/20 00:41:25 pesa Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -21,7 +21,7 @@ IUSE="debug"
DEPEND="
${PYTHON_DEPS}
>=dev-python/sip-4.16:=[${PYTHON_USEDEP}]
- >=dev-python/PyQt4-4.11.2-r1[X,${PYTHON_USEDEP}]
+ >=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
dev-qt/qtcore:4
dev-qt/qtgui:4
~x11-libs/qscintilla-${PV}:=