| 1 |
commit: bd783dbfd39642eb1bdc1f7d3629f4841a80460e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 29 08:37:05 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 29 10:40:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd783dbf |
| 7 |
|
| 8 |
app-office/libreoffice: DEPEND on dev-java/openjdk{,-bin}:11 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/libreoffice/libreoffice-9999.ebuild | 18 ++++++++++++++---- |
| 14 |
1 file changed, 14 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 17 |
index 0b84974d047..0c444e2be5c 100644 |
| 18 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 19 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 20 |
@@ -239,7 +239,10 @@ DEPEND="${COMMON_DEPEND} |
| 21 |
x11-libs/libXtst |
| 22 |
java? ( |
| 23 |
dev-java/ant-core |
| 24 |
- >=virtual/jdk-1.8 |
| 25 |
+ || ( |
| 26 |
+ dev-java/openjdk:11 |
| 27 |
+ dev-java/openjdk-bin:11 |
| 28 |
+ ) |
| 29 |
) |
| 30 |
test? ( |
| 31 |
app-crypt/gnupg |
| 32 |
@@ -254,7 +257,11 @@ RDEPEND="${COMMON_DEPEND} |
| 33 |
!app-office/openoffice |
| 34 |
media-fonts/liberation-fonts |
| 35 |
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) |
| 36 |
- java? ( >=virtual/jre-1.8 ) |
| 37 |
+ java? ( |
| 38 |
+ dev-java/openjdk:11 |
| 39 |
+ dev-java/openjdk-jre-bin:11 |
| 40 |
+ >=virtual/jre-1.8 |
| 41 |
+ ) |
| 42 |
kde? ( kde-frameworks/breeze-icons:* ) |
| 43 |
" |
| 44 |
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then |
| 45 |
@@ -487,9 +494,12 @@ src_configure() { |
| 46 |
--without-junit |
| 47 |
--without-system-hsqldb |
| 48 |
--with-ant-home="${ANT_HOME}" |
| 49 |
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null) |
| 50 |
- --with-jvm-path="${EPREFIX}/usr/lib/" |
| 51 |
) |
| 52 |
+ if has_version "dev-java/openjdk:11"; then |
| 53 |
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" ) |
| 54 |
+ elif has_version "dev-java/openjdk-bin:11"; then |
| 55 |
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" ) |
| 56 |
+ fi |
| 57 |
|
| 58 |
use libreoffice_extensions_scripting-beanshell && \ |
| 59 |
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) |
Archives