diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2020-11-29 15:06:39 +0200 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2020-11-29 15:07:16 +0200 |
| commit | fc8f9b505478b47275ad3318d9179390b04dd55d (patch) | |
| tree | 15b6e45a9ceb17f88b933c8b43e5498a4d71b341 /app-text | |
| parent | x11-misc/virtualgl: Drop old (diff) | |
| download | gentoo-fc8f9b505478b47275ad3318d9179390b04dd55d.tar.gz gentoo-fc8f9b505478b47275ad3318d9179390b04dd55d.tar.bz2 gentoo-fc8f9b505478b47275ad3318d9179390b04dd55d.zip | |
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@gentoo.org>
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/calibre/calibre-4.22.0.ebuild | 5 | ||||
| -rw-r--r-- | app-text/calibre/calibre-4.23.0.ebuild | 5 | ||||
| -rw-r--r-- | 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 317dde693999..e4e9240c23ba 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 fffb7f953b4e..52871226e47f 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 ca89fb15aef0..69b04b33a89e 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. |