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 4E6521582EF for ; Mon, 24 Feb 2025 02:37:50 +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 340593431A1 for ; Mon, 24 Feb 2025 02:37:50 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 387AB1102B7; Mon, 24 Feb 2025 02:37:49 +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 2F2F71102B7 for ; Mon, 24 Feb 2025 02:37:49 +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 CE3C434318E for ; Mon, 24 Feb 2025 02:37:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA4732741 for ; Mon, 24 Feb 2025 02:37:46 +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: <1740364643.901fe14d546bb460dfdf86cb5c90bdf6020b988f.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.1.1.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 901fe14d546bb460dfdf86cb5c90bdf6020b988f X-VCS-Branch: master Date: Mon, 24 Feb 2025 02:37:46 +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: 6b9b9698-7068-4ed0-a5da-613115db89a1 X-Archives-Hash: 188599f690246b520aa1f5e35f3a1b7a commit: 901fe14d546bb460dfdf86cb5c90bdf6020b988f Author: Sam James gentoo org> AuthorDate: Mon Feb 24 02:36:00 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Feb 24 02:37:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=901fe14d app-office/libreoffice: restore rhino configure arg I *think* dropping that src_configure line was a mistake (in fa7c7501a6f296ca91716e29c06db818ee926e77). We would either want to download a copy, or we'd use the system one and pass the configure arg. We dropped downloading a copy, therefore we surely want the configure arg. And the dep wasn't dropped anyway. Bug: https://bugs.gentoo.org/929974 Closes: https://bugs.gentoo.org/950212 Signed-off-by: Sam James gentoo.org> app-office/libreoffice/libreoffice-25.2.1.1.ebuild | 3 +++ app-office/libreoffice/libreoffice-9999.ebuild | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app-office/libreoffice/libreoffice-25.2.1.1.ebuild b/app-office/libreoffice/libreoffice-25.2.1.1.ebuild index 40944770c7f7..53bd4a8178d4 100644 --- a/app-office/libreoffice/libreoffice-25.2.1.1.ebuild +++ b/app-office/libreoffice/libreoffice-25.2.1.1.ebuild @@ -626,6 +626,9 @@ src_configure() { use libreoffice_extensions_scripting-beanshell && \ 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) ) fi tc-is-lto && myeconfargs+=( --enable-lto ) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 40944770c7f7..bde82a65e131 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -227,7 +227,7 @@ DEPEND="${COMMON_DEPEND} dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 - dev-util/mdds:1/2.1 + dev-util/mdds:1/3.0 media-libs/glm x11-base/xorg-proto x11-libs/libXt @@ -626,6 +626,9 @@ src_configure() { use libreoffice_extensions_scripting-beanshell && \ 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) ) fi tc-is-lto && myeconfargs+=( --enable-lto )