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 39EDF138359 for ; Thu, 29 Oct 2020 17:32:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 866DCE093D; Thu, 29 Oct 2020 17:32:33 +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 72B06E093D for ; Thu, 29 Oct 2020 17:32:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 92D97340E31 for ; Thu, 29 Oct 2020 17:32:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 909333BC for ; Thu, 29 Oct 2020 17:32:30 +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: <1603992734.36a871e8cef9c6845c49ac350090f0540beb3c4a.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-7.0.9999.ebuild 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: 36a871e8cef9c6845c49ac350090f0540beb3c4a X-VCS-Branch: master Date: Thu, 29 Oct 2020 17:32:30 +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: 5928cca0-b279-4e85-b19b-2fe53ddd0fd0 X-Archives-Hash: 246ad7b22d9dca0077128fd04d9e76c5 commit: 36a871e8cef9c6845c49ac350090f0540beb3c4a Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 29 17:32:01 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 29 17:32:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a871e8 app-office/libreoffice: Add missing || ( ) Reported-by: jospezial gmx.de> Bug: https://bugs.gentoo.org/739134 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/libreoffice/libreoffice-7.0.9999.ebuild | 4 ++-- app-office/libreoffice/libreoffice-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild index 772f603dd25..f19fdc74caa 100644 --- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild @@ -257,11 +257,11 @@ RDEPEND="${COMMON_DEPEND} !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( + 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 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 8f43fa5e8eb..267f4abfb6a 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -257,11 +257,11 @@ RDEPEND="${COMMON_DEPEND} !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( + 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