summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2014-07-17 10:59:25 +0000
committerMichael Palimaka <kensington@gentoo.org>2014-07-17 10:59:25 +0000
commitdc7ece7925774d1cd4e9cf97e7f5a275140e73ec (patch)
tree4e772de1b43c09d36b7a026a6340281691b72a60 /kde-base
parentStable for amd64 wrt bug #506676 (diff)
downloadgentoo-2-dc7ece7925774d1cd4e9cf97e7f5a275140e73ec.tar.gz
gentoo-2-dc7ece7925774d1cd4e9cf97e7f5a275140e73ec.tar.bz2
gentoo-2-dc7ece7925774d1cd4e9cf97e7f5a275140e73ec.zip
Restrict incompatible versions of dev-python/sip and dev-python/PyQt4 wrt bug #506452.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/pykde4/ChangeLog7
-rw-r--r--kde-base/pykde4/pykde4-4.12.5.ebuild4
-rw-r--r--kde-base/pykde4/pykde4-4.13.2.ebuild4
3 files changed, 12 insertions, 3 deletions
diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index a0cce64a8b9d..01072c8b2198 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/pykde4
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.294 2014/07/17 10:49:14 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.295 2014/07/17 10:59:25 kensington Exp $
+
+ 17 Jul 2014; Michael Palimaka <kensington@gentoo.org> pykde4-4.12.5.ebuild,
+ pykde4-4.13.2.ebuild:
+ Restrict incompatible versions of dev-python/sip and dev-python/PyQt4 wrt bug
+ #506452.
17 Jul 2014; Michael Palimaka <kensington@gentoo.org> pykde4-4.13.3.ebuild:
Raise dev-python/sip and dev-python/PyQt4 dependencies as patch to solve bug
diff --git a/kde-base/pykde4/pykde4-4.12.5.ebuild b/kde-base/pykde4/pykde4-4.12.5.ebuild
index 3425b2ac7f6a..a1a6f57c5677 100644
--- a/kde-base/pykde4/pykde4-4.12.5.ebuild
+++ b/kde-base/pykde4/pykde4-4.12.5.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/kde-base/pykde4/pykde4-4.12.5.ebuild,v 1.5 2014/05/08 07:32:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.12.5.ebuild,v 1.6 2014/07/17 10:59:25 kensington Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -19,7 +19,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( semantic-desktop )"
RDEPEND="
${PYTHON_DEPS}
>=dev-python/PyQt4-4.9.5[${PYTHON_USEDEP},dbus,declarative,script(+),sql,svg,webkit,X]
+ <dev-python/PyQt4-4.11
>=dev-python/sip-4.14:=[${PYTHON_USEDEP}]
+ <dev-python/sip-4.16
$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
semantic-desktop? (
$(add_kdebase_dep kdepimlibs)
diff --git a/kde-base/pykde4/pykde4-4.13.2.ebuild b/kde-base/pykde4/pykde4-4.13.2.ebuild
index 44837ef73eef..d40584c7c4ab 100644
--- a/kde-base/pykde4/pykde4-4.13.2.ebuild
+++ b/kde-base/pykde4/pykde4-4.13.2.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/kde-base/pykde4/pykde4-4.13.2.ebuild,v 1.2 2014/06/25 04:12:13 jcallen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.13.2.ebuild,v 1.3 2014/07/17 10:59:25 kensington Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -19,7 +19,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( nepomuk )"
RDEPEND="
${PYTHON_DEPS}
>=dev-python/PyQt4-4.9.5[${PYTHON_USEDEP},dbus,declarative,script(+),sql,svg,webkit,X]
+ <dev-python/PyQt4-4.11
>=dev-python/sip-4.14:=[${PYTHON_USEDEP}]
+ <dev-python/sip-4.16
$(add_kdebase_dep kdelibs 'nepomuk?,opengl')
akonadi? ( $(add_kdebase_dep kdepimlibs) )
nepomuk? ( >=dev-libs/soprano-2.9.0 )