From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6F62D1382FE for ; Sun, 10 Jul 2016 17:57:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA32EE0B57; Sun, 10 Jul 2016 17:57:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 59452E0B57 for ; Sun, 10 Jul 2016 17:57:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0913E340E70 for ; Sun, 10 Jul 2016 17:57:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AF152435 for ; Sun, 10 Jul 2016 17:57:01 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1468173409.3c522f384fd1b723494881efb163101ac3debfee.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/calibre/calibre-1.20.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 3c522f384fd1b723494881efb163101ac3debfee X-VCS-Branch: master Date: Sun, 10 Jul 2016 17:57:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 472ccc89-1fbb-43c9-aa3f-ddfe59750ce5 X-Archives-Hash: fd855d7b7e693b6f662d99485115687d commit: 3c522f384fd1b723494881efb163101ac3debfee Author: Michael Palimaka gentoo org> AuthorDate: Sun Jul 10 17:56:27 2016 +0000 Commit: Michael Palimaka gentoo 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] =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