From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RTFUu-0003OC-Ck for garchives@archives.gentoo.org; Wed, 23 Nov 2011 16:16:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B57821C02C; Wed, 23 Nov 2011 16:16:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0486821C02C for ; Wed, 23 Nov 2011 16:16:21 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19B151B4020 for ; Wed, 23 Nov 2011 16:16:21 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id E0BB02004B; Wed, 23 Nov 2011 16:16:19 +0000 (UTC) From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: libreoffice-9999-r2.ebuild ChangeLog X-VCS-Directories: app-office/libreoffice X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: <20111123161619.E0BB02004B@flycatcher.gentoo.org> Date: Wed, 23 Nov 2011 16:16:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 2d603560-ca95-483f-822d-64eadb25118e X-Archives-Hash: 67ea58405c47189a98938365b720d3e1 scarabeus 11/11/23 16:16:19 Modified: libreoffice-9999-r2.ebuild ChangeLog Log: Use internal saxon. =20 (Portage version: 2.2.0_alpha77/cvs/Linux x86_64) Revision Changes Path 1.8 app-office/libreoffice/libreoffice-9999-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-9999-r2.ebuild?rev=3D1.8&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-9999-r2.ebuild?rev=3D1.8&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/libreoffice-9999-r2.ebuild?r1=3D1.7&r2=3D1.8 Index: libreoffice-9999-r2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999= -r2.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libreoffice-9999-r2.ebuild 23 Nov 2011 16:00:14 -0000 1.7 +++ libreoffice-9999-r2.ebuild 23 Nov 2011 16:16:19 -0000 1.8 @@ -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-99= 99-r2.ebuild,v 1.7 2011/11/23 16:00:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-99= 99-r2.ebuild,v 1.8 2011/11/23 16:16:19 scarabeus Exp $ =20 EAPI=3D4 =20 @@ -60,6 +60,7 @@ ADDONS_SRC+=3D" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-h= sqldb_1_8_0.zip )" ADDONS_SRC+=3D" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-r= hino1_5R5.zip )" ADDONS_SRC+=3D" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-s= wingExSrc.zip )" +ADDONS_SRC+=3D" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-s= ource-9.0.0.7-bj.zip )" ADDONS_SRC+=3D" odk? ( http://download.go-oo.org/extern/185d60944ea76707= 5d27247c3162b3bc-unowinreg.dll )" SRC_URI+=3D" ${ADDONS_SRC}" =20 @@ -128,7 +129,6 @@ >=3Ddev-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? ( >=3Ddev-db/mysql-connector-c++-1.1.0 ) @@ -315,8 +315,11 @@ " =20 if use java; then + # hsqldb: system one is too new + # saxon: system one does not work properly java_opts=3D" --without-system-hsqldb + --without-system-saxon --with-ant-home=3D"${ANT_HOME}" --with-jdk-home=3D$(java-config --jdk-home 2>/dev/null) --with-java-target-version=3D$(java-pkg_get-target) @@ -324,7 +327,6 @@ --with-beanshell-jar=3D$(java-pkg_getjar bsh bsh.jar) --with-lucene-core-jar=3D$(java-pkg_getjar lucene-2.9 lucene-core.jar= ) --with-lucene-analyzers-jar=3D$(java-pkg_getjar lucene-analyzers-2.3 = lucene-analyzers.jar) - --with-saxon-jar=3D$(java-pkg_getjar saxon saxon8.jar) " if use test; then java_opts+=3D" --with-junit=3D$(java-pkg_getjar junit-4 junit.jar)" 1.207 app-office/libreoffice/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/ChangeLog?rev=3D1.207&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/ChangeLog?rev=3D1.207&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice/ChangeLog?r1=3D1.206&r2=3D1.207 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- ChangeLog 23 Nov 2011 16:00:14 -0000 1.206 +++ ChangeLog 23 Nov 2011 16:16:19 -0000 1.207 @@ -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=C3=A1=C5=A1 Chv=C3=A1tal + libreoffice-9999-r2.ebuild: + Use internal saxon. =20 23 Nov 2011; Tom=C3=A1=C5=A1 Chv=C3=A1tal libreoffice-9999-r2.ebuild: