summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2021-10-21 22:41:09 -0700
committerZac Medico <zmedico@gentoo.org>2021-10-21 22:44:34 -0700
commit797e48fc572e31870215cba1559198909ad363f3 (patch)
treeab1d2c3a52ca52b02145c90cc5fa9b563a811b39 /app-text/calibre
parentdev-python/jsmin: drop 2.2.2 (diff)
downloadgentoo-797e48fc572e31870215cba1559198909ad363f3.tar.gz
gentoo-797e48fc572e31870215cba1559198909ad363f3.tar.bz2
gentoo-797e48fc572e31870215cba1559198909ad363f3.zip
app-text/calibre: remove 5.16.1-r1 sipv4 conditional
The ebuild explicitly requires sipv4 via DEPEND, and therefore the conditional is inappropriate. Bug: https://bugs.gentoo.org/793986#c29 Reported-by: Eli Schwartz <eschwartz@archlinux.org> Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'app-text/calibre')
-rw-r--r--app-text/calibre/calibre-5.16.1-r1.ebuild8
1 files changed, 2 insertions, 6 deletions
diff --git a/app-text/calibre/calibre-5.16.1-r1.ebuild b/app-text/calibre/calibre-5.16.1-r1.ebuild
index 023d6a32a358..32b84b85f211 100644
--- a/app-text/calibre/calibre-5.16.1-r1.ebuild
+++ b/app-text/calibre/calibre-5.16.1-r1.ebuild
@@ -124,12 +124,8 @@ src_prepare() {
eapply \
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
"${FILESDIR}/${PN}-disable_plugins.patch" \
- "${FILESDIR}/${P}-zeroconf.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
+ "${FILESDIR}/${P}-zeroconf.patch" \
+ "${WORKDIR}/${PN}-5.16.0-SIP-v4.patch"
eapply_user