summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-07-11 03:56:27 +1000
committerMichael Palimaka <kensington@gentoo.org>2016-07-11 03:56:49 +1000
commit3c522f384fd1b723494881efb163101ac3debfee (patch)
tree1f702d843c6c2f9baae88f4f47b0ea73c7085add /app-text/calibre
parentdev-python/pyqwt: fix build with >=dev-python/PyQt4-4.11.2-r1 (diff)
downloadgentoo-3c522f384fd1b723494881efb163101ac3debfee.tar.gz
gentoo-3c522f384fd1b723494881efb163101ac3debfee.tar.bz2
gentoo-3c522f384fd1b723494881efb163101ac3debfee.zip
app-text/calibre: fix build with >=dev-python/PyQt4-4.11.2-r1
Gentoo-bug: 526524 Package-Manager: portage-2.3.0
Diffstat (limited to 'app-text/calibre')
-rw-r--r--app-text/calibre/calibre-1.20.ebuild6
1 files changed, 4 insertions, 2 deletions
diff --git a/app-text/calibre/calibre-1.20.ebuild b/app-text/calibre/calibre-1.20.ebuild
index 314a26abbd91..138475369e60 100644
--- a/app-text/calibre/calibre-1.20.ebuild
+++ b/app-text/calibre/calibre-1.20.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs qmake-utils
DESCRIPTION="Ebook management application"
HOMEPAGE="http://calibre-ebook.com/"
@@ -53,7 +53,7 @@ COMMON_DEPEND="
>=dev-python/lxml-2.2.1
>=dev-python/mechanize-0.1.11
>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
- >=dev-python/PyQt4-4.9.1[X,svg,webkit]
+ || ( >=dev-python/PyQt4-4.11.2-r1[X,compat(-),svg,webkit] <dev-python/PyQt4-4.11.2-r1[X,svg,webkit] )
media-fonts/liberation-fonts
>=media-gfx/imagemagick-6.5.9[jpeg,png]
>=media-libs/freetype-2:=
@@ -146,6 +146,8 @@ src_install() {
local libdir=$(get_libdir)
[[ -n $libdir ]] || die "get_libdir returned an empty string"
+ export QMAKE="$(qt4_get_bindir)/qmake"
+
# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
local x
for x in /dev/dri/card[0-9] ; do