| 1 |
commit: 36a871e8cef9c6845c49ac350090f0540beb3c4a |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 29 17:32:01 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 29 17:32:14 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a871e8 |
| 7 |
|
| 8 |
app-office/libreoffice: Add missing || ( ) |
| 9 |
|
| 10 |
Reported-by: jospezial <jospezial <AT> gmx.de> |
| 11 |
Bug: https://bugs.gentoo.org/739134 |
| 12 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 4 ++-- |
| 16 |
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++-- |
| 17 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild |
| 20 |
index 772f603dd25..f19fdc74caa 100644 |
| 21 |
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild |
| 22 |
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild |
| 23 |
@@ -257,11 +257,11 @@ RDEPEND="${COMMON_DEPEND} |
| 24 |
!app-office/openoffice |
| 25 |
media-fonts/liberation-fonts |
| 26 |
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) |
| 27 |
- java? ( |
| 28 |
+ java? ( || ( |
| 29 |
dev-java/openjdk:11 |
| 30 |
dev-java/openjdk-jre-bin:11 |
| 31 |
>=virtual/jre-1.8 |
| 32 |
- ) |
| 33 |
+ ) ) |
| 34 |
kde? ( kde-frameworks/breeze-icons:* ) |
| 35 |
" |
| 36 |
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then |
| 37 |
|
| 38 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 39 |
index 8f43fa5e8eb..267f4abfb6a 100644 |
| 40 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 41 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 42 |
@@ -257,11 +257,11 @@ RDEPEND="${COMMON_DEPEND} |
| 43 |
!app-office/openoffice |
| 44 |
media-fonts/liberation-fonts |
| 45 |
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) |
| 46 |
- java? ( |
| 47 |
+ java? ( || ( |
| 48 |
dev-java/openjdk:11 |
| 49 |
dev-java/openjdk-jre-bin:11 |
| 50 |
>=virtual/jre-1.8 |
| 51 |
- ) |
| 52 |
+ ) ) |
| 53 |
kde? ( kde-frameworks/breeze-icons:* ) |
| 54 |
" |
| 55 |
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then |
Archives