diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-06 10:55:04 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-06 10:55:04 +0000 |
| commit | c65d5c30a43a8a36c043f77120b4ca68c48161e6 (patch) | |
| tree | f488684b783b13a48d42ece99a24560edd3502a1 /app-office | |
| parent | fix typo (diff) | |
| download | gentoo-2-c65d5c30a43a8a36c043f77120b4ca68c48161e6.tar.gz gentoo-2-c65d5c30a43a8a36c043f77120b4ca68c48161e6.tar.bz2 gentoo-2-c65d5c30a43a8a36c043f77120b4ca68c48161e6.zip | |
First attempt to use sytem rhino. Still needs code fixes wrt internal debug interface.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 9431189cbc26..d8a1b9be6b12 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.305 2012/05/05 16:12:02 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.306 2012/05/06 10:55:04 scarabeus Exp $ + + 06 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: + First attempt to use sytem rhino. Still needs code fixes wrt internal debug + interface. 05 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: Make the wiki-publisher actually work. diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 564099ad372e..23bac8fbf94d 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.66 2012/05/05 16:12:02 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.67 2012/05/06 10:55:04 scarabeus Exp $ EAPI=4 @@ -62,8 +62,6 @@ ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz" ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )" # modifies source code ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )" -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable SRC_URI+=" ${ADDONS_SRC}" @@ -150,6 +148,7 @@ COMMON_DEPEND=" jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 @@ -379,6 +378,9 @@ src_configure() { use libreoffice_extensions_scripting-beanshell && \ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" + use libreoffice_extensions_scripting-javascript && \ + java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" + if use libreoffice_extensions_wiki-publisher; then java_opts+=" --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) |