diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-11-23 16:16:19 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-11-23 16:16:19 +0000 |
| commit | 443f3656104c4e78a205055bd6858546b84f453e (patch) | |
| tree | 988db1de50a82ef6b68986c41ebae91c20459140 /app-office/libreoffice | |
| parent | Depend on sampleicc during build. (diff) | |
| download | gentoo-2-443f3656104c4e78a205055bd6858546b84f453e.tar.gz gentoo-2-443f3656104c4e78a205055bd6858546b84f453e.tar.bz2 gentoo-2-443f3656104c4e78a205055bd6858546b84f453e.zip | |
Use internal saxon.
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
| -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 50f9f243fb95..efcf11776bc2 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.206 2011/11/23 16:00:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.207 2011/11/23 16:16:19 scarabeus Exp $ + + 23 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-9999-r2.ebuild: + Use internal saxon. 23 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 8eb9d4bb3d49..ee631ba5a0a5 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.7 2011/11/23 16:00:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.8 2011/11/23 16:16:19 scarabeus Exp $ EAPI=4 @@ -60,6 +60,7 @@ ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1 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+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" SRC_URI+=" ${ADDONS_SRC}" @@ -128,7 +129,6 @@ COMMON_DEPEND=" >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 - dev-java/saxon:0 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) @@ -315,8 +315,11 @@ src_configure() { " if use java; then + # hsqldb: system one is too new + # saxon: system one does not work properly java_opts=" --without-system-hsqldb + --without-system-saxon --with-ant-home="${ANT_HOME}" --with-jdk-home=$(java-config --jdk-home 2>/dev/null) --with-java-target-version=$(java-pkg_get-target) @@ -324,7 +327,6 @@ src_configure() { --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) --with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar) --with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar) - --with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar) " if use test; then java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)" |