| 1 |
commit: 3c522f384fd1b723494881efb163101ac3debfee |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 10 17:56:27 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 10 17:56:49 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c522f38 |
| 7 |
|
| 8 |
app-text/calibre: fix build with >=dev-python/PyQt4-4.11.2-r1 |
| 9 |
|
| 10 |
Gentoo-bug: 526524 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0 |
| 13 |
|
| 14 |
app-text/calibre/calibre-1.20.ebuild | 6 ++++-- |
| 15 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-text/calibre/calibre-1.20.ebuild b/app-text/calibre/calibre-1.20.ebuild |
| 18 |
index 314a26a..1384753 100644 |
| 19 |
--- a/app-text/calibre/calibre-1.20.ebuild |
| 20 |
+++ b/app-text/calibre/calibre-1.20.ebuild |
| 21 |
@@ -4,7 +4,7 @@ |
| 22 |
|
| 23 |
EAPI=5 |
| 24 |
|
| 25 |
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs |
| 26 |
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs qmake-utils |
| 27 |
|
| 28 |
DESCRIPTION="Ebook management application" |
| 29 |
HOMEPAGE="http://calibre-ebook.com/" |
| 30 |
@@ -53,7 +53,7 @@ COMMON_DEPEND=" |
| 31 |
>=dev-python/lxml-2.2.1 |
| 32 |
>=dev-python/mechanize-0.1.11 |
| 33 |
>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)] |
| 34 |
- >=dev-python/PyQt4-4.9.1[X,svg,webkit] |
| 35 |
+ || ( >=dev-python/PyQt4-4.11.2-r1[X,compat(-),svg,webkit] <dev-python/PyQt4-4.11.2-r1[X,svg,webkit] ) |
| 36 |
media-fonts/liberation-fonts |
| 37 |
>=media-gfx/imagemagick-6.5.9[jpeg,png] |
| 38 |
>=media-libs/freetype-2:= |
| 39 |
@@ -146,6 +146,8 @@ src_install() { |
| 40 |
local libdir=$(get_libdir) |
| 41 |
[[ -n $libdir ]] || die "get_libdir returned an empty string" |
| 42 |
|
| 43 |
+ export QMAKE="$(qt4_get_bindir)/qmake" |
| 44 |
+ |
| 45 |
# Bug #472690 - Avoid sandbox violation for /dev/dri/card0. |
| 46 |
local x |
| 47 |
for x in /dev/dri/card[0-9] ; do |
Archives