summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2014-12-05 18:04:47 +0000
committerIan Stakenvicius <axs@gentoo.org>2014-12-05 18:04:47 +0000
commit6c99d70097e482b8cb03b06e8ec9fca573d6ea69 (patch)
tree2853b76921ac0af71870344fb3bda10b538c173b /app-text/calibre
parentVersion bump. (diff)
downloadgentoo-2-6c99d70097e482b8cb03b06e8ec9fca573d6ea69.tar.gz
gentoo-2-6c99d70097e482b8cb03b06e8ec9fca573d6ea69.tar.bz2
gentoo-2-6c99d70097e482b8cb03b06e8ec9fca573d6ea69.zip
added alternative PyQt4 dep, for Funtoo
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'app-text/calibre')
-rw-r--r--app-text/calibre/ChangeLog5
-rw-r--r--app-text/calibre/calibre-1.48-r1.ebuild7
2 files changed, 9 insertions, 3 deletions
diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index d3b760979e72..5eeb5aad5447 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-text/calibre
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.336 2014/11/23 12:37:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.337 2014/12/05 18:04:47 axs Exp $
+
+ 05 Dec 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> calibre-1.48-r1.ebuild:
+ added alternative PyQt4 dep, for Funtoo
*calibre-1.48-r1 (23 Nov 2014)
diff --git a/app-text/calibre/calibre-1.48-r1.ebuild b/app-text/calibre/calibre-1.48-r1.ebuild
index edda3a5edcd4..2aa985138550 100644
--- a/app-text/calibre/calibre-1.48-r1.ebuild
+++ b/app-text/calibre/calibre-1.48-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/app-text/calibre/calibre-1.48-r1.ebuild,v 1.1 2014/11/23 12:37:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.48-r1.ebuild,v 1.2 2014/12/05 18:04:47 axs Exp $
EAPI=5
@@ -53,7 +53,10 @@ COMMON_DEPEND="
>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
>=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
>=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]
- <dev-python/PyQt4-4.11.3[X,svg,webkit,${PYTHON_USEDEP}]
+ || (
+ <dev-python/PyQt4-4.11.3[X,svg,webkit,${PYTHON_USEDEP}]
+ =dev-python/PyQt4-4.11.3-r1000[X,svg,webkit,${PYTHON_USEDEP}]
+ )
dev-python/netifaces[${PYTHON_USEDEP}]
dev-qt/qtdbus:4=
dev-qt/qtsvg:4=