commit:     cc35e31c02fb8baaee555f0d4033be58dd62363d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  4 19:28:19 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 18:02:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc35e31c

app-text/calibre: support SIP v5

Closes: https://bugs.gentoo.org/793986
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 app-text/calibre/calibre-5.16.1.ebuild | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-text/calibre/calibre-5.16.1.ebuild 
b/app-text/calibre/calibre-5.16.1.ebuild
index 3a057d5d38e..6f924cf6720 100644
--- a/app-text/calibre/calibre-5.16.1.ebuild
+++ b/app-text/calibre/calibre-5.16.1.ebuild
@@ -123,8 +123,12 @@ src_prepare() {
        # disable_plugins: walking sec-hole, wait for upstream to use GHNS 
interface
        eapply \
                "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-               "${FILESDIR}/${PN}-disable_plugins.patch" \
-               "${WORKDIR}/${PN}-5.16.0-SIP-v4.patch"
+               "${FILESDIR}/${PN}-disable_plugins.patch"
+
+       if ! has_version ">=dev-python/sip-5"; then
+               einfo "Applying SIP v4 patch because SIP v5 was not detected"
+               eapply "${WORKDIR}/${PN}-5.16.0-SIP-v4.patch"
+       fi
 
        eapply_user
 

Reply via email to