| 1 |
scarabeus 11/11/23 16:16:19 |
| 2 |
|
| 3 |
Modified: libreoffice-9999-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Use internal saxon. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.8 app-office/libreoffice/libreoffice-9999-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.8&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.8&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.7&r2=1.8 |
| 15 |
|
| 16 |
Index: libreoffice-9999-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v |
| 19 |
retrieving revision 1.7 |
| 20 |
retrieving revision 1.8 |
| 21 |
diff -u -r1.7 -r1.8 |
| 22 |
--- libreoffice-9999-r2.ebuild 23 Nov 2011 16:00:14 -0000 1.7 |
| 23 |
+++ libreoffice-9999-r2.ebuild 23 Nov 2011 16:16:19 -0000 1.8 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.7 2011/11/23 16:00:14 scarabeus Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.8 2011/11/23 16:16:19 scarabeus Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
@@ -60,6 +60,7 @@ |
| 33 |
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" |
| 34 |
ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" |
| 35 |
ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" |
| 36 |
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )" |
| 37 |
ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" |
| 38 |
SRC_URI+=" ${ADDONS_SRC}" |
| 39 |
|
| 40 |
@@ -128,7 +129,6 @@ |
| 41 |
>=dev-java/bsh-2.0_beta4 |
| 42 |
dev-java/lucene:2.9 |
| 43 |
dev-java/lucene-analyzers:2.3 |
| 44 |
- dev-java/saxon:0 |
| 45 |
) |
| 46 |
jemalloc? ( dev-libs/jemalloc ) |
| 47 |
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) |
| 48 |
@@ -315,8 +315,11 @@ |
| 49 |
" |
| 50 |
|
| 51 |
if use java; then |
| 52 |
+ # hsqldb: system one is too new |
| 53 |
+ # saxon: system one does not work properly |
| 54 |
java_opts=" |
| 55 |
--without-system-hsqldb |
| 56 |
+ --without-system-saxon |
| 57 |
--with-ant-home="${ANT_HOME}" |
| 58 |
--with-jdk-home=$(java-config --jdk-home 2>/dev/null) |
| 59 |
--with-java-target-version=$(java-pkg_get-target) |
| 60 |
@@ -324,7 +327,6 @@ |
| 61 |
--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) |
| 62 |
--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar) |
| 63 |
--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar) |
| 64 |
- --with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar) |
| 65 |
" |
| 66 |
if use test; then |
| 67 |
java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)" |
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
1.207 app-office/libreoffice/ChangeLog |
| 72 |
|
| 73 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.207&view=markup |
| 74 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.207&content-type=text/plain |
| 75 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.206&r2=1.207 |
| 76 |
|
| 77 |
Index: ChangeLog |
| 78 |
=================================================================== |
| 79 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v |
| 80 |
retrieving revision 1.206 |
| 81 |
retrieving revision 1.207 |
| 82 |
diff -u -r1.206 -r1.207 |
| 83 |
--- ChangeLog 23 Nov 2011 16:00:14 -0000 1.206 |
| 84 |
+++ ChangeLog 23 Nov 2011 16:16:19 -0000 1.207 |
| 85 |
@@ -1,6 +1,10 @@ |
| 86 |
# ChangeLog for app-office/libreoffice |
| 87 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 88 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.206 2011/11/23 16:00:14 scarabeus Exp $ |
| 89 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.207 2011/11/23 16:16:19 scarabeus Exp $ |
| 90 |
+ |
| 91 |
+ 23 Nov 2011; Tomáš Chvátal <scarabeus@g.o> |
| 92 |
+ libreoffice-9999-r2.ebuild: |
| 93 |
+ Use internal saxon. |
| 94 |
|
| 95 |
23 Nov 2011; Tomáš Chvátal <scarabeus@g.o> |
| 96 |
libreoffice-9999-r2.ebuild: |
Archives