commit: 3c522f384fd1b723494881efb163101ac3debfee Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sun Jul 10 17:56:27 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Jul 10 17:56:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c522f38
app-text/calibre: fix build with >=dev-python/PyQt4-4.11.2-r1 Gentoo-bug: 526524 Package-Manager: portage-2.3.0 app-text/calibre/calibre-1.20.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app-text/calibre/calibre-1.20.ebuild b/app-text/calibre/calibre-1.20.ebuild index 314a26a..1384753 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
