From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 07DDA13835A for ; Thu, 29 Oct 2020 10:40:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33C51E096F; Thu, 29 Oct 2020 10:40:21 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E547E096F for ; Thu, 29 Oct 2020 10:40:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E94D1340CEA for ; Thu, 29 Oct 2020 10:40:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6001C3BD for ; Thu, 29 Oct 2020 10:40:18 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1603968000.bd783dbfd39642eb1bdc1f7d3629f4841a80460e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: bd783dbfd39642eb1bdc1f7d3629f4841a80460e X-VCS-Branch: master Date: Thu, 29 Oct 2020 10:40:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 758532c8-980c-4a23-9fa8-e0ad5dd243c1 X-Archives-Hash: 1f0a68092d3970fa34c62bf728bc4c75 commit: bd783dbfd39642eb1bdc1f7d3629f4841a80460e Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 29 08:37:05 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 29 10:40:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd783dbf app-office/libreoffice: DEPEND on dev-java/openjdk{,-bin}:11 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/libreoffice/libreoffice-9999.ebuild | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 0b84974d047..0c444e2be5c 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -239,7 +239,10 @@ DEPEND="${COMMON_DEPEND} x11-libs/libXtst java? ( dev-java/ant-core - >=virtual/jdk-1.8 + || ( + dev-java/openjdk:11 + dev-java/openjdk-bin:11 + ) ) test? ( app-crypt/gnupg @@ -254,7 +257,11 @@ RDEPEND="${COMMON_DEPEND} !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-1.8 ) + java? ( + dev-java/openjdk:11 + dev-java/openjdk-jre-bin:11 + >=virtual/jre-1.8 + ) kde? ( kde-frameworks/breeze-icons:* ) " if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then @@ -487,9 +494,12 @@ src_configure() { --without-junit --without-system-hsqldb --with-ant-home="${ANT_HOME}" - --with-jdk-home=$(java-config --jdk-home 2>/dev/null) - --with-jvm-path="${EPREFIX}/usr/lib/" ) + if has_version "dev-java/openjdk:11"; then + myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" ) + elif has_version "dev-java/openjdk-bin:11"; then + myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" ) + fi use libreoffice_extensions_scripting-beanshell && \ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )