| 1 |
commit: 54a413761897ba5ca5be71fc8ea0b20e0d0dd4da |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 8 16:34:55 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 8 16:51:32 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a41376 |
| 7 |
|
| 8 |
app-office/libreoffice: Update USE !java and add USE !firebird notice |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 7 +++++-- |
| 14 |
app-office/libreoffice/libreoffice-6.3.0.4.ebuild | 7 +++++-- |
| 15 |
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 7 +++++-- |
| 16 |
app-office/libreoffice/libreoffice-9999.ebuild | 7 +++++-- |
| 17 |
4 files changed, 20 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 20 |
index 95d3b41a720..8a89bd5092b 100644 |
| 21 |
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 22 |
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 23 |
@@ -267,8 +267,11 @@ _check_reqs() { |
| 24 |
} |
| 25 |
|
| 26 |
pkg_pretend() { |
| 27 |
- use java || \ |
| 28 |
- ewarn "If you plan to use Base application you should enable java or you will get various crashes." |
| 29 |
+ if ! use java && ! use firebird; then |
| 30 |
+ ewarn "If you plan to use Base application you must enable either firebird or java." |
| 31 |
+ fi |
| 32 |
+ |
| 33 |
+ use java || ewarn "Without java, several wizards are not going to be available." |
| 34 |
|
| 35 |
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then |
| 36 |
ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" |
| 37 |
|
| 38 |
diff --git a/app-office/libreoffice/libreoffice-6.3.0.4.ebuild b/app-office/libreoffice/libreoffice-6.3.0.4.ebuild |
| 39 |
index 29524e6854c..0797f73f72d 100644 |
| 40 |
--- a/app-office/libreoffice/libreoffice-6.3.0.4.ebuild |
| 41 |
+++ b/app-office/libreoffice/libreoffice-6.3.0.4.ebuild |
| 42 |
@@ -265,8 +265,11 @@ _check_reqs() { |
| 43 |
} |
| 44 |
|
| 45 |
pkg_pretend() { |
| 46 |
- use java || \ |
| 47 |
- ewarn "If you plan to use Base application you should enable java or you will get various crashes." |
| 48 |
+ if ! use java && ! use firebird; then |
| 49 |
+ ewarn "If you plan to use Base application you must enable either firebird or java." |
| 50 |
+ fi |
| 51 |
+ |
| 52 |
+ use java || ewarn "Without java, several wizards are not going to be available." |
| 53 |
|
| 54 |
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then |
| 55 |
ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" |
| 56 |
|
| 57 |
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild |
| 58 |
index 29524e6854c..0797f73f72d 100644 |
| 59 |
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild |
| 60 |
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild |
| 61 |
@@ -265,8 +265,11 @@ _check_reqs() { |
| 62 |
} |
| 63 |
|
| 64 |
pkg_pretend() { |
| 65 |
- use java || \ |
| 66 |
- ewarn "If you plan to use Base application you should enable java or you will get various crashes." |
| 67 |
+ if ! use java && ! use firebird; then |
| 68 |
+ ewarn "If you plan to use Base application you must enable either firebird or java." |
| 69 |
+ fi |
| 70 |
+ |
| 71 |
+ use java || ewarn "Without java, several wizards are not going to be available." |
| 72 |
|
| 73 |
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then |
| 74 |
ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" |
| 75 |
|
| 76 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 77 |
index 52c32f853b5..f0ca704cc85 100644 |
| 78 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 79 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 80 |
@@ -265,8 +265,11 @@ _check_reqs() { |
| 81 |
} |
| 82 |
|
| 83 |
pkg_pretend() { |
| 84 |
- use java || \ |
| 85 |
- ewarn "If you plan to use Base application you should enable java or you will get various crashes." |
| 86 |
+ if ! use java && ! use firebird; then |
| 87 |
+ ewarn "If you plan to use Base application you must enable either firebird or java." |
| 88 |
+ fi |
| 89 |
+ |
| 90 |
+ use java || ewarn "Without java, several wizards are not going to be available." |
| 91 |
|
| 92 |
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then |
| 93 |
ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" |
Archives