commit: fc8f9b505478b47275ad3318d9179390b04dd55d Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sun Nov 29 13:06:39 2020 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Nov 29 13:07:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc8f9b50
app-text/calibre: Fix build with icu-68, now really Bug: https://bugs.gentoo.org/752015 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> app-text/calibre/calibre-4.22.0.ebuild | 5 +++-- app-text/calibre/calibre-4.23.0.ebuild | 5 +++-- app-text/calibre/calibre-5.4.2.ebuild | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app-text/calibre/calibre-4.22.0.ebuild b/app-text/calibre/calibre-4.22.0.ebuild index 317dde69399..e4e9240c23b 100644 --- a/app-text/calibre/calibre-4.22.0.ebuild +++ b/app-text/calibre/calibre-4.22.0.ebuild @@ -122,8 +122,9 @@ 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" \ - "${FILESDIR}/${PN}-4.22.0-icu68.patch" + "${FILESDIR}/${PN}-disable_plugins.patch" + + has_version ">=dev-libs/icu-68.1" && eapply "${FILESDIR}/${PN}-4.22.0-icu68.patch" eapply_user diff --git a/app-text/calibre/calibre-4.23.0.ebuild b/app-text/calibre/calibre-4.23.0.ebuild index fffb7f953b4..52871226e47 100644 --- a/app-text/calibre/calibre-4.23.0.ebuild +++ b/app-text/calibre/calibre-4.23.0.ebuild @@ -122,8 +122,9 @@ 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" \ - "${FILESDIR}/${PN}-4.22.0-icu68.patch" + "${FILESDIR}/${PN}-disable_plugins.patch" + + has_version ">=dev-libs/icu-68.1" && eapply "${FILESDIR}/${PN}-4.22.0-icu68.patch" eapply_user diff --git a/app-text/calibre/calibre-5.4.2.ebuild b/app-text/calibre/calibre-5.4.2.ebuild index ca89fb15aef..69b04b33a89 100644 --- a/app-text/calibre/calibre-5.4.2.ebuild +++ b/app-text/calibre/calibre-5.4.2.ebuild @@ -124,9 +124,10 @@ src_prepare() { eapply \ "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ "${FILESDIR}/${PN}-disable_plugins.patch" \ - "${FILESDIR}/${PN}-4.22.0-icu68.patch" \ "${WORKDIR}/${PN}-5.4.2-SIP-v4.patch" + has_version ">=dev-libs/icu-68.1" && eapply "${FILESDIR}/${PN}-4.22.0-icu68.patch" + eapply_user # Fix outdated version constant.
