diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
| commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
| tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /app-text/calibre/calibre-5.16.1.ebuild | |
| parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) | |
gentoo resync : 15.06.2021
Diffstat (limited to 'app-text/calibre/calibre-5.16.1.ebuild')
| -rw-r--r-- | app-text/calibre/calibre-5.16.1.ebuild | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app-text/calibre/calibre-5.16.1.ebuild b/app-text/calibre/calibre-5.16.1.ebuild index cb40b52ae21f..6f924cf6720a 100644 --- a/app-text/calibre/calibre-5.16.1.ebuild +++ b/app-text/calibre/calibre-5.16.1.ebuild @@ -105,7 +105,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} $(python_gen_cond_dep ' >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}] - dev-python/sip[${PYTHON_MULTI_USEDEP}] + <dev-python/sip-5[${PYTHON_MULTI_USEDEP}] ') >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig" @@ -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 |