diff options
| author |   Sam James <sam@gentoo.org> | 2022-03-20 00:51:29 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-03-20 00:51:29 +0000 |
| commit | 8555403004d8047987dcce007a4590f704d706f5 (patch) | |
| tree | a26f5d2677efe715e8e88c55d0fceca00744dfe5 /app-office | |
| parent | dev-libs/dotconf: [QA] fix tc-get* quoting (diff) | |
| download | gentoo-8555403004d8047987dcce007a4590f704d706f5.tar.gz gentoo-8555403004d8047987dcce007a4590f704d706f5.tar.bz2 gentoo-8555403004d8047987dcce007a4590f704d706f5.zip | |
app-office/libreoffice: sync live ebuilds for Java build fix
Bug: https://bugs.gentoo.org/835518
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/libreoffice-7.3.1.3.ebuild | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-7.3.9999.ebuild | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app-office/libreoffice/libreoffice-7.3.1.3.ebuild b/app-office/libreoffice/libreoffice-7.3.1.3.ebuild index 9b774db180ef..f47286769364 100644 --- a/app-office/libreoffice/libreoffice-7.3.1.3.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.1.3.ebuild @@ -214,7 +214,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] ) @@ -575,7 +575,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 ) diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild index 74a8caa49137..fc4fd4820cf0 100644 --- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild @@ -214,7 +214,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] ) @@ -572,7 +572,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 ) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index e4211ec16391..f53fee56e61b 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -214,7 +214,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] ) @@ -572,7 +572,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 ) |