Use internal saxon.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 50f9f243fb95ce17cc0b740647321059e6eddbf0..efcf11776bc26eaf37cb3585387ab9f1e2a48b93 100644 (file)
--- 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/Manifest b/app-office/libreoffice/Manifest
index a60a9327722a7c1e97b97b44e3a58a0a86c48544..b80f4669cdb2f105e7ebc04a6d8c3f96bcc8a5df 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,9 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
 AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4
@@ -178,40 +175,23 @@ EBUILD libreoffice-3.3.4.ebuild 18266 RMD160 c0204063e1a6bd7621267fd4dc92d8b7334
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 08657e1067a7769b11aa1a095a9e755a478f9a24 SHA1 035c05abc1ccc7fd3834ebc0150103be35bec5eb SHA256 4265eb3af09948f4145550f372ad3d632ca36472ec461aa93d2fcbea4a27d242
 EBUILD libreoffice-3.4.4.2-r1.ebuild 16541 RMD160 c7ceaab85af40e4ba3fc4eec2d0525301b17c819 SHA1 f76f95c4499831be5154ef2fea8993d86078e23d SHA256 13ee29e0f298ef5b80066cf40b24da0947e07cab675663ccbbf2ddd35d7ab5a3
 EBUILD libreoffice-3.4.9999-r2.ebuild 14991 RMD160 c631ed3d46a3fbb78e27e50ac201aa26296e02a7 SHA1 3daa308162e437e9d05db7c6fa14f08ca12a8384 SHA256 fc37c7bc4201c923297ef9a9c97201876009df1a7b30511058e6074cb8506e90
-EBUILD libreoffice-9999-r2.ebuild 13694 RMD160 653831026f1cff681a057b20fb8b7aa632fc97b2 SHA1 ecc6c0ef605528815dd81310a106eb4760994e85 SHA256 d2215cd70ea041a2c046982bad54ad2a7e6662430d2d0ae1b0d30f1e88ab2ef7
-MISC ChangeLog 37358 RMD160 2d37cae0a448cfc1844a3d6ee4057a61199df0d9 SHA1 1ad0b2f89bdc402616c9d993b40f32aee40ddc52 SHA256 c090f9ed4242a7daa57391d0d659cc7ca33b0363daa651de87ad2cb57047d48c
+EBUILD libreoffice-9999-r2.ebuild 13818 RMD160 6e5bb5c7d5f80e545bababdf8d2e9760121e4327 SHA1 7ef13cd5f62adfba92af26cedabb9ef3a9f2c228 SHA256 f2326ab0d400e6e484e7e76e0101db3b0a47bc8a870a2710e54c8aeb2a26911b
+MISC ChangeLog 37466 RMD160 373709084878c16ed648aaef69b3cefadbdffc99 SHA1 81e89f695735999eb3d03bfe20545db9aec1cc64 SHA256 1efe36e197e22b543bb4a2cfb57e8c0db71228a2c23f14484f102ae55374ce1d
 MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBAgAGBQJOzRiWAAoJEOSiRoyO7jvoVowP/2NmvhYygvtpqJnt1wAY028n
-2T/s8T1YOGGEcm23gl4+9eGtwPueas1wXanAKzz/MZF6eUMym4jnRi55e8VAx6BB
-BZfVas7h+1b6/iGHTxugoMr1i6Wfm00ywHTxHWTpc01y+3dAQKWtBeT/bKF4j4UP
-0Hfvj7r13yErYEu+2AktPjU+qzy+xM3zGAn9wXnFZNgBoANgXK5S1eEw8ekaD6lo
-Jjv79BEZCGoxXAt1wZ+vmMpOd8NHs7rq6yIm1p+6lwDkLkxZacElCzvSzl6Zqn7r
-18+RYBseb1fLR96aUF5jGx3FGt/Y31kUJ9HHrsjg/Qg/d35IJtX9YIN0YRhX7y8+
-BdkML1pRfEJ1gGmdTEow1ojb38BkHFMxWN7WtDLmXhEWZ5tX7MZrzmaIS9crZSUw
-u8zNrwBMqVXmGm6B2xpxifGcg9aLzHYEzIx7Mn0BI2OpfmPapQ+hNRl6ZPmCl1kS
-FOA5T82DTRj8QfLUW/ujXRWe9hqR5pOspdvWySGI6wskm0Zy7RK5vLdJQCPNOat/
-J/jCPPNkmscPiyoEE3vQTi5d8DA/x6QuyiRiyUQX/T69icnU9OkVvbbUjNLi+6+n
-tGjf4NA3eBrfgKrK2y+LNNAkcL36CeEnzDBFw4M2kT0D5GASrnUVDV0wveTPutHf
-xd6t8s1GupieCrxJNb2z
-=Lmm3
-- -----END PGP SIGNATURE-----
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOzRiaAAoJEOSiRoyO7jvo9FQP/jtxph7lBHWSihaCBtBK1K+R
-RCvIIAObcj1D1AwsArzbdr5kU8LbDhRX9Ay7KUsceuBG553nHemvg6Jul3LD+KId
-YQezbMzQ5464pjjCPYDybjtvlL6IhLmWNqoj7rUA1ubq3Hso+itIwK75juWyDbJa
-qmxkYFYXW2+eTzcFUI+zaQ3yiAbYxRY/yPz843zzWTWZYYHFCwRGZAvAhgEn0j3B
-fh+uYu9ppOR8Ey+Cep4sTNF5yHo3m0ak8OSR5NELTogx+sUt4MghsaOI6i8xflFu
-c+rRuj3OZ5PZ4TC3RxYJ0wHsVHnVpu3Ywpt6bxvsYyh8f7VBTAe4hi0Ltrwflqni
-hFuQOhGWwewjJiY0p9GmO64nsIfn/24G5oNfcF5eyhuGR1OpaZrXW5snwhQxy3Xs
-V3DCttXeOCjdF7wDof7jozAtCtrhUZZPBxBngcrvUQDmo20iNmksS+8XEk5JRP0j
-zLacG5cPo6Lt4+YKGyWJGMyDHJVAP/xjigWP0zeuMCF8n/Ydd3gd89wrT5ANkZop
-A7Cpnh8pB/xDrfwvKv0YVjrUI7+8dz6wxZnFMyHNwzOOlChF1I8W9VXwdn647QJX
-1BzV9v6l+utQoAXhoHSMEDqXhq+nvj4y8ecF+fr+C4QA5sNgnajBG4VRY9ZGCTYO
-GykaiILcBWOY47E1Evvj
-=GXPQ
+iQIcBAEBAgAGBQJOzRxuAAoJEOSiRoyO7jvoYNAP+wbQ9vt1eMtmPLcpWcaT0d2j
+afOP97A3fHTU6lrHikwt8qSV1w3MknZX6NdrCk7tZzrWLWevym6gDulHH7jW+5o1
+JMjpdTaTz2NrXWo6f8yyUZWVtFXtRaMaH5vtP0dm2ZnUos3QrlwCrllTIG6reDT2
+W3v6C+83zst0ctk85tMsF+c17QbuJO4ImcrBzgI1LIqtMlgw4uyZVEt6jta6SRa5
+2Wv2FswtGxbm0eOev/ehmuWAUQ2WOUZUYrwmFzeYO/Wz56pLjeJNLTPunHNwAv9s
+oSWyleBwbz1vYCaKuS/C9q+Vqh9hslw/v8SgcmKfpqcPcWkrH7eDYgu9rEAmXrMG
+us5SIZwjXE2XYD36HQeK0XAQrSJ7qk3343wVq9C/Qv3YPF0GjXdUuafEAkaOTas0
+xk4eQUT8Vt5Vkohs8MJGpSduagHirfniUI/DsGeOlc8yZ5NIXCbNkSAXE54zOcsV
+4lmIxoNLEmFz263UGePHnmIs2ewl4XO5u4N7pb5aLMiFA4oA/RpHvoakuJU5IQKt
+HchZSne3veh51qyO8mEU0guWqOe89WSaG6UqC8rrMqCAk7DM9DA4Z+mfaKCikON+
+wzNhMU/BMuqx1yjyQzaKdDgCADXkte8gOHTXnuYNhi3oodWgkxVG1iQBLZdVaukB
+CbN6r2L3lRj73ShBIsyN
+=rNl3
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 8eb9d4bb3d49e2f75d1c8a8a10f3502abcef511a..ee631ba5a0a52242183ec008d4e4b2a072c88f1c 100644 (file)
--- 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)"