From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 82D571581EE for ; Fri, 28 Mar 2025 17:25:11 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 6E5F6343186 for ; Fri, 28 Mar 2025 17:25:11 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 9E7B11104B2; Fri, 28 Mar 2025 17:25:07 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 945481104B2 for ; Fri, 28 Mar 2025 17:25:07 +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 4AF10343007 for ; Fri, 28 Mar 2025 17:25:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A23D52837 for ; Fri, 28 Mar 2025 17:25:05 +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: <1743182576.7cc3a0d1cc11b7b491cea0e644a2bc2df76d2c2c.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-25.2.9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7cc3a0d1cc11b7b491cea0e644a2bc2df76d2c2c X-VCS-Branch: master Date: Fri, 28 Mar 2025 17:25:05 +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: d4ba3402-9f04-47d8-9071-8ce3bd44124c X-Archives-Hash: 4f3a6052c536a847682af5fd548f19f0 commit: 7cc3a0d1cc11b7b491cea0e644a2bc2df76d2c2c Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Mar 28 16:16:20 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri Mar 28 17:22:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc3a0d1 app-office/libreoffice: switch 25.2.9999 to rhino slot 0 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/41348 Signed-off-by: Sam James gentoo.org> app-office/libreoffice/libreoffice-25.2.9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-office/libreoffice/libreoffice-25.2.9999.ebuild b/app-office/libreoffice/libreoffice-25.2.9999.ebuild index cc94097eec3b..9b098731d764 100644 --- a/app-office/libreoffice/libreoffice-25.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-25.2.9999.ebuild @@ -219,7 +219,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) - libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) + libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.8.0:0 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) @@ -642,7 +642,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 rhino.jar) ) + myeconfargs+=( --with-rhino-jar=$(java-pkg_getjars rhino) ) fi tc-is-lto && myeconfargs+=( --enable-lto )