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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2906A158003 for ; Sat, 19 Mar 2022 20:59:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFD8CE08DD; Sat, 19 Mar 2022 20:59:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B43DE08BB for ; Sat, 19 Mar 2022 20:59:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B7C0343887 for ; Sat, 19 Mar 2022 20:59:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 914CA29 for ; Sat, 19 Mar 2022 20:59:06 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1647722563.4aa0c28b44c64bebb5b2d3477829f857d82a9fb5.sam@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.2.6.2.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4aa0c28b44c64bebb5b2d3477829f857d82a9fb5 X-VCS-Branch: master Date: Sat, 19 Mar 2022 20:59:06 +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: 4ff3de61-c583-4f82-a0d3-d2d639c38527 X-Archives-Hash: 6a3e01548b970479fc32c336733f7255 commit: 4aa0c28b44c64bebb5b2d3477829f857d82a9fb5 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sat Mar 19 11:47:54 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Mar 19 20:42:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aa0c28b app-office/libreoffice: Push rhino dep to >=1.7.14 Closes: https://bugs.gentoo.org/835518 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/24661 Signed-off-by: Sam James gentoo.org> app-office/libreoffice/libreoffice-7.2.6.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild index e51b271e87c1..8250a1278b19 100644 --- a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild @@ -210,7 +210,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) - libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) @@ -570,7 +570,7 @@ src_configure() { myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) use libreoffice_extensions_scripting-javascript && \ - myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) + myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) fi is-flagq "-flto*" && myeconfargs+=( --enable-lto )