Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/
Date: Mon, 14 Jun 2021 18:03:50
Message-Id: 1623693747.cc35e31c02fb8baaee555f0d4033be58dd62363d.zmedico@gentoo
1 commit: cc35e31c02fb8baaee555f0d4033be58dd62363d
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 4 19:28:19 2021 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 14 18:02:27 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc35e31c
7
8 app-text/calibre: support SIP v5
9
10 Closes: https://bugs.gentoo.org/793986
11 Package-Manager: Portage-3.0.19, Repoman-3.0.3
12 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
13
14 app-text/calibre/calibre-5.16.1.ebuild | 8 ++++++--
15 1 file changed, 6 insertions(+), 2 deletions(-)
16
17 diff --git a/app-text/calibre/calibre-5.16.1.ebuild b/app-text/calibre/calibre-5.16.1.ebuild
18 index 3a057d5d38e..6f924cf6720 100644
19 --- a/app-text/calibre/calibre-5.16.1.ebuild
20 +++ b/app-text/calibre/calibre-5.16.1.ebuild
21 @@ -123,8 +123,12 @@ src_prepare() {
22 # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
23 eapply \
24 "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
25 - "${FILESDIR}/${PN}-disable_plugins.patch" \
26 - "${WORKDIR}/${PN}-5.16.0-SIP-v4.patch"
27 + "${FILESDIR}/${PN}-disable_plugins.patch"
28 +
29 + if ! has_version ">=dev-python/sip-5"; then
30 + einfo "Applying SIP v4 patch because SIP v5 was not detected"
31 + eapply "${WORKDIR}/${PN}-5.16.0-SIP-v4.patch"
32 + fi
33
34 eapply_user