commit: 797e48fc572e31870215cba1559198909ad363f3 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Fri Oct 22 05:41:09 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Oct 22 05:44:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=797e48fc
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 <AT> archlinux.org> Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-text/calibre/calibre-5.16.1-r1.ebuild | 8 ++------ 1 file 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 023d6a32a35..32b84b85f21 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
