app-text/calibre: fix build with >=dev-python/PyQt4-4.11.2-r1

Gentoo-bug: 526524

Package-Manager: portage-2.3.0

diff --git a/app-text/calibre/calibre-1.20.ebuild b/app-text/calibre/calibre-1.20.ebuild
index 314a26abbd911daa729aab0a9d33cb05f83b4c1e..138475369e60a2be89d9399d2e7496632e803467 100644 (file)
--- 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