diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-05 10:30:08 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-05 10:30:08 +0000 |
| commit | 1305f038a399aafe8fca822bf38219a661ceed8f (patch) | |
| tree | d0b3a7ea3ba8d658517cffcb26375a389354556d /app-office | |
| parent | Add workaround for large memory on x86. #405239 (diff) | |
| download | gentoo-2-1305f038a399aafe8fca822bf38219a661ceed8f.tar.gz gentoo-2-1305f038a399aafe8fca822bf38219a661ceed8f.tar.bz2 gentoo-2-1305f038a399aafe8fca822bf38219a661ceed8f.zip | |
Require beanshel/rhino only when building the specified extensions.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 060f628a0e65..918a7a10cea1 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,9 @@ # 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.301 2012/05/05 08:31:40 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.302 2012/05/05 10:30:08 scarabeus Exp $ + + 05 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: + Require beanshel/rhino only when building the specified extensions. 05 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: Update comment about ct2n. diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 8bb520696924..2680e42332e3 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.62 2012/05/05 08:31:40 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.63 2012/05/05 10:30:08 scarabeus Exp $ EAPI=4 @@ -60,9 +60,9 @@ unset DEV_URI ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz" ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )" ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" -ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" -ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.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+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" SRC_URI+=" ${ADDONS_SRC}" @@ -148,9 +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-beanshell? ( >=dev-java/bsh-2.0_beta4 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) @@ -367,8 +365,11 @@ src_configure() { --with-jdk-home=$(java-config --jdk-home 2>/dev/null) --with-java-target-version=$(java-pkg_get-target) --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/" - --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) " + + use libreoffice_extensions_scripting-beanshell && \ + java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" + if use test; then java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)" else |