From 4aa0c28b44c64bebb5b2d3477829f857d82a9fb5 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Sat, 19 Mar 2022 12:47:54 +0100 Subject: 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 Closes: https://github.com/gentoo/gentoo/pull/24661 Signed-off-by: Sam James --- app-office/libreoffice/libreoffice-7.2.6.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app-office') 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 ) -- cgit v1.2.3-65-gdbad