| 1 |
commit: fc8f9b505478b47275ad3318d9179390b04dd55d |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 29 13:06:39 2020 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 29 13:07:16 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc8f9b50 |
| 7 |
|
| 8 |
app-text/calibre: Fix build with icu-68, now really |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/752015 |
| 11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
| 12 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 13 |
|
| 14 |
app-text/calibre/calibre-4.22.0.ebuild | 5 +++-- |
| 15 |
app-text/calibre/calibre-4.23.0.ebuild | 5 +++-- |
| 16 |
app-text/calibre/calibre-5.4.2.ebuild | 3 ++- |
| 17 |
3 files changed, 8 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-text/calibre/calibre-4.22.0.ebuild b/app-text/calibre/calibre-4.22.0.ebuild |
| 20 |
index 317dde69399..e4e9240c23b 100644 |
| 21 |
--- a/app-text/calibre/calibre-4.22.0.ebuild |
| 22 |
+++ b/app-text/calibre/calibre-4.22.0.ebuild |
| 23 |
@@ -122,8 +122,9 @@ src_prepare() { |
| 24 |
# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface |
| 25 |
eapply \ |
| 26 |
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ |
| 27 |
- "${FILESDIR}/${PN}-disable_plugins.patch" \ |
| 28 |
- "${FILESDIR}/${PN}-4.22.0-icu68.patch" |
| 29 |
+ "${FILESDIR}/${PN}-disable_plugins.patch" |
| 30 |
+ |
| 31 |
+ has_version ">=dev-libs/icu-68.1" && eapply "${FILESDIR}/${PN}-4.22.0-icu68.patch" |
| 32 |
|
| 33 |
eapply_user |
| 34 |
|
| 35 |
|
| 36 |
diff --git a/app-text/calibre/calibre-4.23.0.ebuild b/app-text/calibre/calibre-4.23.0.ebuild |
| 37 |
index fffb7f953b4..52871226e47 100644 |
| 38 |
--- a/app-text/calibre/calibre-4.23.0.ebuild |
| 39 |
+++ b/app-text/calibre/calibre-4.23.0.ebuild |
| 40 |
@@ -122,8 +122,9 @@ src_prepare() { |
| 41 |
# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface |
| 42 |
eapply \ |
| 43 |
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ |
| 44 |
- "${FILESDIR}/${PN}-disable_plugins.patch" \ |
| 45 |
- "${FILESDIR}/${PN}-4.22.0-icu68.patch" |
| 46 |
+ "${FILESDIR}/${PN}-disable_plugins.patch" |
| 47 |
+ |
| 48 |
+ has_version ">=dev-libs/icu-68.1" && eapply "${FILESDIR}/${PN}-4.22.0-icu68.patch" |
| 49 |
|
| 50 |
eapply_user |
| 51 |
|
| 52 |
|
| 53 |
diff --git a/app-text/calibre/calibre-5.4.2.ebuild b/app-text/calibre/calibre-5.4.2.ebuild |
| 54 |
index ca89fb15aef..69b04b33a89 100644 |
| 55 |
--- a/app-text/calibre/calibre-5.4.2.ebuild |
| 56 |
+++ b/app-text/calibre/calibre-5.4.2.ebuild |
| 57 |
@@ -124,9 +124,10 @@ src_prepare() { |
| 58 |
eapply \ |
| 59 |
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ |
| 60 |
"${FILESDIR}/${PN}-disable_plugins.patch" \ |
| 61 |
- "${FILESDIR}/${PN}-4.22.0-icu68.patch" \ |
| 62 |
"${WORKDIR}/${PN}-5.4.2-SIP-v4.patch" |
| 63 |
|
| 64 |
+ has_version ">=dev-libs/icu-68.1" && eapply "${FILESDIR}/${PN}-4.22.0-icu68.patch" |
| 65 |
+ |
| 66 |
eapply_user |
| 67 |
|
| 68 |
# Fix outdated version constant. |
Archives