OpenOffice.org 2.3.1 release

Package-Manager: portage-2.1.4_rc7

12 files changed, 112 insertions, 80 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 19bffec2cb05..371e4e79a988 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.354 2007/12/02 20:32:09 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.355 2007/12/04 21:24:52 suka Exp $
+
+*openoffice-2.3.1 (04 Dec 2007)
+
+  04 Dec 2007; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.3.1/config_office-fix-system-icu-check.diff,
+  +files/2.3.1/disable-regcomp-python.diff, +files/2.3.1/ooo-env_log.diff,
+  -files/2.3.1_rc1/disable-regcomp-java.diff,
+  +files/2.3.1/regcompapply.diff, -files/2.3.1_rc1/regcompapply.diff,
+  -files/2.3.1_rc1/gentoo-2.3.1_rc1.diff, +files/2.3.1/gentoo-2.3.1.diff,
+  +files/2.3.1/disable-regcomp-java.diff,
+  +files/2.3.1/stlport-ppc-buildfix.diff,
+  +files/2.3.1/stlport-ppc-buildfix-apply.diff,
+  -files/2.3.1_rc1/disable-regcomp-python.diff,
+  -files/2.3.1_rc1/ooo-env_log.diff,
+  -files/2.3.1_rc1/stlport-ppc-buildfix.diff,
+  -files/2.3.1_rc1/stlport-ppc-buildfix-apply.diff,
+  -openoffice-2.3.1_rc1.ebuild, +openoffice-2.3.1.ebuild:
+  New release: OpenOffice.org 2.3.1. This also uses internal icu again, as the
+  support for the external one is broken atm.
 
 *openoffice-2.3.1_rc1 (02 Dec 2007)
 
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 64332a19115a..db5550184848 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -30,49 +30,53 @@ AUX 2.3.0/system-check-db-4.6.patch 1098 RMD160 475ef9a9347c7293d4080a8bc7c58255
 MD5 4aca6886a5814f2f93d23d7bb1790a34 files/2.3.0/system-check-db-4.6.patch 1098
 RMD160 475ef9a9347c7293d4080a8bc7c58255ce299094 files/2.3.0/system-check-db-4.6.patch 1098
 SHA256 39017466222a7ff075ea4079fd8830839b180f1068c677c2ac0058ca6facc859 files/2.3.0/system-check-db-4.6.patch 1098
-AUX 2.3.1_rc1/disable-regcomp-java.diff 965 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e SHA1 d5768499c6bf9290dd0dab867918596369dbbfab SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19
-MD5 c4d90c5fb8d48a5feb3ec4cd6d6e3f38 files/2.3.1_rc1/disable-regcomp-java.diff 965
-RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e files/2.3.1_rc1/disable-regcomp-java.diff 965
-SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19 files/2.3.1_rc1/disable-regcomp-java.diff 965
-AUX 2.3.1_rc1/disable-regcomp-python.diff 934 RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 SHA1 700513af0ae8eb2a1dcd4b62f06bbf3bc034b339 SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1
-MD5 1d4f1d467652abdd8481cfffc4ee64de files/2.3.1_rc1/disable-regcomp-python.diff 934
-RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 files/2.3.1_rc1/disable-regcomp-python.diff 934
-SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1 files/2.3.1_rc1/disable-regcomp-python.diff 934
-AUX 2.3.1_rc1/gentoo-2.3.1_rc1.diff 886 RMD160 e929a12ca1599fce78c02ff99a3824db1344e677 SHA1 61a8e87c453296957cc72211dafd095478f64274 SHA256 5ccc7d1c4dd93a57e3681b0a4c7ee05e8ba18775dbc7592c7f319ce34b309189
-MD5 e31b4184f1c8865cb8e58b665dcd5e5b files/2.3.1_rc1/gentoo-2.3.1_rc1.diff 886
-RMD160 e929a12ca1599fce78c02ff99a3824db1344e677 files/2.3.1_rc1/gentoo-2.3.1_rc1.diff 886
-SHA256 5ccc7d1c4dd93a57e3681b0a4c7ee05e8ba18775dbc7592c7f319ce34b309189 files/2.3.1_rc1/gentoo-2.3.1_rc1.diff 886
-AUX 2.3.1_rc1/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
-MD5 1f836c5ae6bd978035358290c001c579 files/2.3.1_rc1/ooo-env_log.diff 617
-RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e files/2.3.1_rc1/ooo-env_log.diff 617
-SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1 files/2.3.1_rc1/ooo-env_log.diff 617
-AUX 2.3.1_rc1/regcompapply.diff 312 RMD160 6f92774febf7a78091f2eddf2f589d271f155864 SHA1 a9328d636b94416d9a7ffdd6aa8a94d1cca77aeb SHA256 e6245f28282c5a43bca1c127f2622cf4ea5726bc5761c3d3a7be3dd0bf6068a8
-MD5 a3c247b8aa10aaa932997d36b4dd897a files/2.3.1_rc1/regcompapply.diff 312
-RMD160 6f92774febf7a78091f2eddf2f589d271f155864 files/2.3.1_rc1/regcompapply.diff 312
-SHA256 e6245f28282c5a43bca1c127f2622cf4ea5726bc5761c3d3a7be3dd0bf6068a8 files/2.3.1_rc1/regcompapply.diff 312
-AUX 2.3.1_rc1/stlport-ppc-buildfix-apply.diff 257 RMD160 777695a68b975bf3a584d5f125dfdc16d584a955 SHA1 f3e0df039c00881b02741afceada9676030b4c4e SHA256 dbe5d331fdf44964098791034164b61c2d4911066cd538c8908ca908dfd66da3
-MD5 a45f803f24087ab35b768ed1646f5759 files/2.3.1_rc1/stlport-ppc-buildfix-apply.diff 257
-RMD160 777695a68b975bf3a584d5f125dfdc16d584a955 files/2.3.1_rc1/stlport-ppc-buildfix-apply.diff 257
-SHA256 dbe5d331fdf44964098791034164b61c2d4911066cd538c8908ca908dfd66da3 files/2.3.1_rc1/stlport-ppc-buildfix-apply.diff 257
-AUX 2.3.1_rc1/stlport-ppc-buildfix.diff 2192 RMD160 9f1b5be42101f0abbc0be98570643cb42fe74246 SHA1 d6ad0f4a73778f7d0c29a65c004d8f2c962bce5b SHA256 979ef2431fd40e3142b4213370bd16c7f6b99ff49d43d572164c1b43adba1b1f
-MD5 e51522db455a6ea1ec886048093551eb files/2.3.1_rc1/stlport-ppc-buildfix.diff 2192
-RMD160 9f1b5be42101f0abbc0be98570643cb42fe74246 files/2.3.1_rc1/stlport-ppc-buildfix.diff 2192
-SHA256 979ef2431fd40e3142b4213370bd16c7f6b99ff49d43d572164c1b43adba1b1f files/2.3.1_rc1/stlport-ppc-buildfix.diff 2192
+AUX 2.3.1/config_office-fix-system-icu-check.diff 740 RMD160 96fb3ddce67ff9a377cc57d29307eb69d396da18 SHA1 c2ef5dd0d90e2e78e07ee2b0b68d9fe792258836 SHA256 f2b3020bc3e2032ea3ffb9b96fe70c21e305c4db58ab85944b0b32e0a8f83df7
+MD5 5d80c93c2e4ddccb51e859e3da124296 files/2.3.1/config_office-fix-system-icu-check.diff 740
+RMD160 96fb3ddce67ff9a377cc57d29307eb69d396da18 files/2.3.1/config_office-fix-system-icu-check.diff 740
+SHA256 f2b3020bc3e2032ea3ffb9b96fe70c21e305c4db58ab85944b0b32e0a8f83df7 files/2.3.1/config_office-fix-system-icu-check.diff 740
+AUX 2.3.1/disable-regcomp-java.diff 965 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e SHA1 d5768499c6bf9290dd0dab867918596369dbbfab SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19
+MD5 c4d90c5fb8d48a5feb3ec4cd6d6e3f38 files/2.3.1/disable-regcomp-java.diff 965
+RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e files/2.3.1/disable-regcomp-java.diff 965
+SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19 files/2.3.1/disable-regcomp-java.diff 965
+AUX 2.3.1/disable-regcomp-python.diff 934 RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 SHA1 700513af0ae8eb2a1dcd4b62f06bbf3bc034b339 SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1
+MD5 1d4f1d467652abdd8481cfffc4ee64de files/2.3.1/disable-regcomp-python.diff 934
+RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 files/2.3.1/disable-regcomp-python.diff 934
+SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1 files/2.3.1/disable-regcomp-python.diff 934
+AUX 2.3.1/gentoo-2.3.1.diff 539 RMD160 136075423096a14625cc45a06982de6fed49f8ce SHA1 6ecde5c785b09917732fd9736e5d7d9d64980502 SHA256 ef77fdaf236c968e7715daf9c63f4e0464bd13207ee61ad07b103efc3c721163
+MD5 0487df619de83debac2e9c5fdd2f203f files/2.3.1/gentoo-2.3.1.diff 539
+RMD160 136075423096a14625cc45a06982de6fed49f8ce files/2.3.1/gentoo-2.3.1.diff 539
+SHA256 ef77fdaf236c968e7715daf9c63f4e0464bd13207ee61ad07b103efc3c721163 files/2.3.1/gentoo-2.3.1.diff 539
+AUX 2.3.1/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
+MD5 1f836c5ae6bd978035358290c001c579 files/2.3.1/ooo-env_log.diff 617
+RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e files/2.3.1/ooo-env_log.diff 617
+SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1 files/2.3.1/ooo-env_log.diff 617
+AUX 2.3.1/regcompapply.diff 312 RMD160 6f92774febf7a78091f2eddf2f589d271f155864 SHA1 a9328d636b94416d9a7ffdd6aa8a94d1cca77aeb SHA256 e6245f28282c5a43bca1c127f2622cf4ea5726bc5761c3d3a7be3dd0bf6068a8
+MD5 a3c247b8aa10aaa932997d36b4dd897a files/2.3.1/regcompapply.diff 312
+RMD160 6f92774febf7a78091f2eddf2f589d271f155864 files/2.3.1/regcompapply.diff 312
+SHA256 e6245f28282c5a43bca1c127f2622cf4ea5726bc5761c3d3a7be3dd0bf6068a8 files/2.3.1/regcompapply.diff 312
+AUX 2.3.1/stlport-ppc-buildfix-apply.diff 257 RMD160 777695a68b975bf3a584d5f125dfdc16d584a955 SHA1 f3e0df039c00881b02741afceada9676030b4c4e SHA256 dbe5d331fdf44964098791034164b61c2d4911066cd538c8908ca908dfd66da3
+MD5 a45f803f24087ab35b768ed1646f5759 files/2.3.1/stlport-ppc-buildfix-apply.diff 257
+RMD160 777695a68b975bf3a584d5f125dfdc16d584a955 files/2.3.1/stlport-ppc-buildfix-apply.diff 257
+SHA256 dbe5d331fdf44964098791034164b61c2d4911066cd538c8908ca908dfd66da3 files/2.3.1/stlport-ppc-buildfix-apply.diff 257
+AUX 2.3.1/stlport-ppc-buildfix.diff 2192 RMD160 9f1b5be42101f0abbc0be98570643cb42fe74246 SHA1 d6ad0f4a73778f7d0c29a65c004d8f2c962bce5b SHA256 979ef2431fd40e3142b4213370bd16c7f6b99ff49d43d572164c1b43adba1b1f
+MD5 e51522db455a6ea1ec886048093551eb files/2.3.1/stlport-ppc-buildfix.diff 2192
+RMD160 9f1b5be42101f0abbc0be98570643cb42fe74246 files/2.3.1/stlport-ppc-buildfix.diff 2192
+SHA256 979ef2431fd40e3142b4213370bd16c7f6b99ff49d43d572164c1b43adba1b1f files/2.3.1/stlport-ppc-buildfix.diff 2192
 DIST OOo_2.3.0_src_binfilter.tar.bz2 6477306 RMD160 441a43c2a2d5418c9d3b55a89790f31598000bde SHA1 a45b356092fc61aba68d0b7536bb3f723cd62937 SHA256 b2a54d9238a5a316151286f007549b9de633d61b216ef258cc0392c5694e9585
 DIST OOo_2.3.0_src_core.tar.bz2 145104450 RMD160 67c7a97aac4652f8a9cfb3019b9649689977b076 SHA1 339453f169e63f531e24f3d5774e6a5da65b26c1 SHA256 830555d47376b6fc842c32addf2d4c827091df1989b05ea7cc03b82171b27d56
 DIST OOo_2.3.0_src_l10n.tar.bz2 78634672 RMD160 a84678c0bf786869464814b0fa21137acb3250a9 SHA1 ca7dcd4d19d1f5df21fb931fe31cdd779128f49c SHA256 d57d03e6c5ba8e160fa3dfd416ac4cd3baaa14d1588604452551b3d420261120
 DIST OOo_2.3.0_src_sdk.tar.bz2 24033163 RMD160 57a9538cd0722747b19505078ab2d92f8b6c7e6a SHA1 6f43be9c013469f5fe4095826f67776fb53d968c SHA256 0b9663b7db893bcde36bf46205361150237ae38f178150645b0d75e20bf30fc7
-DIST OOo_2.3.1rc1_src_binfilter.tar.bz2 6476673 RMD160 497aec1de49ea941ab8305331a9fc9e8e04a5162 SHA1 0643c52da3850a164928342e7651897b7a76ca1f SHA256 9a76f8eae3dd546f42db883c12f8f21823e0e28ed6d43e83871dd1c1e07fff57
-DIST OOo_2.3.1rc1_src_core.tar.bz2 144156134 RMD160 ab75c022d00ed6269eb9437f9c022e44181c6d3a SHA1 de189e03a329cdd334823a52b800fad0c033ab4d SHA256 4c807dd262eb714397de9e78d244d587968a92142a917dbb47f5180c40db6753
-DIST OOo_2.3.1rc1_src_l10n.tar.bz2 79077332 RMD160 bc10b1e05574aced79532fbef316e66dcb810fbf SHA1 004defae1496cf4b953a233abb20fd4c7e162423 SHA256 c4834074b97c39b14b89d35bf87cf06bfd690cdbf5d4473d4e15f8a23ebbdb64
-DIST OOo_2.3.1rc1_src_sdk.tar.bz2 24032680 RMD160 59b245c81e9cc6d43c60070fd5dc78c38d806db6 SHA1 65093dc8224d5b9771c58651f5ae6c6df1a58748 SHA256 11fed832b5a32390885a387cbf9ce2d31b652af8dedebc844ab95a80b5aa5066
+DIST OOo_2.3.1_src_binfilter.tar.bz2 6476673 RMD160 497aec1de49ea941ab8305331a9fc9e8e04a5162 SHA1 0643c52da3850a164928342e7651897b7a76ca1f SHA256 9a76f8eae3dd546f42db883c12f8f21823e0e28ed6d43e83871dd1c1e07fff57
+DIST OOo_2.3.1_src_core.tar.bz2 144156134 RMD160 ab75c022d00ed6269eb9437f9c022e44181c6d3a SHA1 de189e03a329cdd334823a52b800fad0c033ab4d SHA256 4c807dd262eb714397de9e78d244d587968a92142a917dbb47f5180c40db6753
+DIST OOo_2.3.1_src_l10n.tar.bz2 79077332 RMD160 bc10b1e05574aced79532fbef316e66dcb810fbf SHA1 004defae1496cf4b953a233abb20fd4c7e162423 SHA256 c4834074b97c39b14b89d35bf87cf06bfd690cdbf5d4473d4e15f8a23ebbdb64
+DIST OOo_2.3.1_src_sdk.tar.bz2 24032680 RMD160 59b245c81e9cc6d43c60070fd5dc78c38d806db6 SHA1 65093dc8224d5b9771c58651f5ae6c6df1a58748 SHA256 11fed832b5a32390885a387cbf9ce2d31b652af8dedebc844ab95a80b5aa5066
 DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
 DIST extras-2.tar.bz2 94740 RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd SHA1 2c7fca93c106e23961f4aaa7cdfcaeb97064eed1 SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
 DIST libwpg-0.1.0.tar.gz 398724 RMD160 0270b9fdc1a1f4307d2243a10c7163ee3c9150a9 SHA1 0e7cc503bf0015c68f02fd68768ee54b3b91f118 SHA256 78ea2fdcd542144a7336918123f57908b37f1eb2c41274cd675e18d03f0feb68
 DIST libwps-0.1.0.tar.gz 555470 RMD160 aabc3b7938baa50c866f769317476893e5cba231 SHA1 c0f063c4d3913ddb6acc0ebb4b2304713eab0a6c SHA256 c3c4e0a63b0d1e2a3063172b44c722dde84608c3675fb124bb6f7e00f270379e
 DIST lp_solve_5.5.0.10_source.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
 DIST ooo-build-2.3.0.5.tar.gz 7947424 RMD160 c3a062283cbbd9c60419b8ef5555f5c9707336ad SHA1 078fbd73198bd1dbe7dc8fd54bd4dfa2b7c8b3ff SHA256 a330b072d8e70b8d8a832558531cbdb0ac11280ff9c2521e3de6fac85f94f101
-DIST ooo-build-2.3.0.7.tar.gz 8912618 RMD160 0417912202778a0a78445757baa7cade31f46327 SHA1 243869e863b3d9d4c4a00854b68a3f0fbcfb919c SHA256 32101c76acf0da36ba888cef1ffd0f283fa7d6a52b6b4221e84291d5cbf58fe5
+DIST ooo-build-2.3.1.tar.gz 8912396 RMD160 9e444aa7e1968d9059cd0a299579fbfe14a7cbb2 SHA1 9530414a2b36c28e4fbeeb20957b20fda04f4643 SHA256 f75ad2d0a10eff71f8ccef97532e5e0eac8876a81fb1c12a93efde061de17fe3
 DIST oox.2007-09-05.tar.bz2 357665 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 SHA1 88336ac37450db579246212026c5b2c7745bd47a SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
@@ -80,14 +84,14 @@ EBUILD openoffice-2.3.0.ebuild 12518 RMD160 18ea710613c79acc7f6ec54d7adcb61ca5ed
 MD5 f441c74547e1be5c472a3f6593a4b3c9 openoffice-2.3.0.ebuild 12518
 RMD160 18ea710613c79acc7f6ec54d7adcb61ca5ed4d5d openoffice-2.3.0.ebuild 12518
 SHA256 a24e4b6b125c47a35525422f5460f216bd719ef3e1fd76febab66a730deeb79f openoffice-2.3.0.ebuild 12518
-EBUILD openoffice-2.3.1_rc1.ebuild 12599 RMD160 202993f9d147716e246f5f6dc7f3fabb04d1d9e9 SHA1 ecdd9f8308bc5ffea94cafaece68d8c5cce4f77b SHA256 e1bba4077546d44111764e54f8cfbd6601924cdbf1ac8d3afd10c76785feac05
-MD5 5ad3b68d14c5170ed7f10bb6cd464727 openoffice-2.3.1_rc1.ebuild 12599
-RMD160 202993f9d147716e246f5f6dc7f3fabb04d1d9e9 openoffice-2.3.1_rc1.ebuild 12599
-SHA256 e1bba4077546d44111764e54f8cfbd6601924cdbf1ac8d3afd10c76785feac05 openoffice-2.3.1_rc1.ebuild 12599
-MISC ChangeLog 74164 RMD160 26894c301c60d9be41f14e8198ba618b6624a898 SHA1 573323fab4b2cf6852562b5a1aa5b47597e31a67 SHA256 feef2b3e090a2437cec82bd6ed828670045d58b81ebebda63f3460844ddf01c6
-MD5 93ce4b015bcbe17b42381f8e3c55e99f ChangeLog 74164
-RMD160 26894c301c60d9be41f14e8198ba618b6624a898 ChangeLog 74164
-SHA256 feef2b3e090a2437cec82bd6ed828670045d58b81ebebda63f3460844ddf01c6 ChangeLog 74164
+EBUILD openoffice-2.3.1.ebuild 12523 RMD160 380d4b0a66aba709565c386b243a75c9fdd02a45 SHA1 7a14e2d856c41274e0bda93c405240d48bb4084b SHA256 b0839326bf72fdb0ee73f2cf59aa154facb167a563976d5268e879f04ea134d9
+MD5 da140db4e8704fc5f6a70076272a96cb openoffice-2.3.1.ebuild 12523
+RMD160 380d4b0a66aba709565c386b243a75c9fdd02a45 openoffice-2.3.1.ebuild 12523
+SHA256 b0839326bf72fdb0ee73f2cf59aa154facb167a563976d5268e879f04ea134d9 openoffice-2.3.1.ebuild 12523
+MISC ChangeLog 75070 RMD160 ad6f42f39a435fc6c8b1f4dce0bb34943eb3cc43 SHA1 dfd1ec66f38f7229342ca3ddb8c478acf3b09b99 SHA256 83ec383ce13091cb507ccf593557ee06e5e6412b967ef06ddcb340da8f29061c
+MD5 aa2260c80a125127983482f17cb4e5c9 ChangeLog 75070
+RMD160 ad6f42f39a435fc6c8b1f4dce0bb34943eb3cc43 ChangeLog 75070
+SHA256 83ec383ce13091cb507ccf593557ee06e5e6412b967ef06ddcb340da8f29061c ChangeLog 75070
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -95,6 +99,6 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 857c016a3789a77724469389d0930850 files/digest-openoffice-2.3.0 3235
 RMD160 a05e4c886544faf249cd1bcb7acb9c078b5d5800 files/digest-openoffice-2.3.0 3235
 SHA256 3a4edef8570093f9646d38a76d6ae492e8e118827f57b6d9f05647e1b8d1b91a files/digest-openoffice-2.3.0 3235
-MD5 2e02f46061b54051a2193a7e512a6d75 files/digest-openoffice-2.3.1_rc1 3271
-RMD160 5b30e319868410ef7567a169a0574faaeb27c92a files/digest-openoffice-2.3.1_rc1 3271
-SHA256 31c4ec2801bba28b0a603ac512c29d50d09cf7a735f2610a8d19975ec410ed01 files/digest-openoffice-2.3.1_rc1 3271
+MD5 d682ed5e587579c5d7c24b45b57c323b files/digest-openoffice-2.3.1 3229
+RMD160 6d2b41c43e64cadbc2a6abbd4b3f134ab0aba720 files/digest-openoffice-2.3.1 3229
+SHA256 74d54335421eb8430868bb932ae689143a632b719fda2de9ccad798e8be5f703 files/digest-openoffice-2.3.1 3229
diff --git a/app-office/openoffice/files/2.3.1/config_office-fix-system-icu-check.diff b/app-office/openoffice/files/2.3.1/config_office-fix-system-icu-check.diff
new file mode 100644
index 000000000000..baa1e543f2b6
--- /dev/null
+++ b/app-office/openoffice/files/2.3.1/config_office-fix-system-icu-check.diff
@@ -0,0 +1,22 @@
+--- config_office/configure.in.orig	2007-11-30 23:50:32.000000000 +0100
++++ config_office/configure.in	2007-11-30 23:47:39.000000000 +0100
+@@ -4061,8 +4061,8 @@
+ }
+       ], [AC_MSG_RESULT(OK)], [AC_MSG_RESULT([not suitable, only 3.6 supported currently])])
+      AC_MSG_CHECKING(whether setBreakType is public)
+-     save_LDFLAGS="$LDFLAGS"
+-     LDFLAGS="$LDFLAGS -licuuc"
++     save_LIBS="$LIBS"
++     LIBS="$LIBS -licuuc"
+ 	   AC_TRY_LINK([#include <unicode/rbbi.h>], [
+ 	   RuleBasedBreakIterator *rbi = NULL;
+ 	   rbi = new RuleBasedBreakIterator();
+@@ -4073,7 +4073,7 @@
+       else
+         AC_MSG_RESULT(yes)
+       fi
+-      LDFLAGS="$save_LDFLAGS"
++      LIBS="$save_LIBS"
+ else
+     AC_MSG_RESULT([internal])
+     SYSTEM_ICU=NO
diff --git a/app-office/openoffice/files/2.3.1_rc1/disable-regcomp-java.diff b/app-office/openoffice/files/2.3.1/disable-regcomp-java.diff
index f9a1ff10a483..f9a1ff10a483 100644
--- a/app-office/openoffice/files/2.3.1_rc1/disable-regcomp-java.diff
+++ b/app-office/openoffice/files/2.3.1/disable-regcomp-java.diff
diff --git a/app-office/openoffice/files/2.3.1_rc1/disable-regcomp-python.diff b/app-office/openoffice/files/2.3.1/disable-regcomp-python.diff
index e63a91f009eb..e63a91f009eb 100644
--- a/app-office/openoffice/files/2.3.1_rc1/disable-regcomp-python.diff
+++ b/app-office/openoffice/files/2.3.1/disable-regcomp-python.diff
diff --git a/app-office/openoffice/files/2.3.1_rc1/gentoo-2.3.1_rc1.diff b/app-office/openoffice/files/2.3.1/gentoo-2.3.1.diff
index 614b021b8666..a8e4bc5e6404 100644
--- a/app-office/openoffice/files/2.3.1_rc1/gentoo-2.3.1_rc1.diff
+++ b/app-office/openoffice/files/2.3.1/gentoo-2.3.1.diff
@@ -24,15 +24,4 @@
  --with-system-libxslt
  --with-system-xmlsec
  --with-system-xrender-headers
---- configure.in 
-+++ configure.in 
-@@ -1048,7 +1048,7 @@
- if test "$with_tag" = "OOG680_m5" ; then # more milestones to come...
-    UPSTREAM_VERSION=2.3.0
- elif test "$with_tag" = "OOG680_m9" ; then
--   UPSTREAM_VERSION=2.3.1
-+   UPSTREAM_VERSION=2.3.1rc1
- fi
- if test -n "$UPSTREAM_VERSION"; then
-    UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
 
diff --git a/app-office/openoffice/files/2.3.1_rc1/ooo-env_log.diff b/app-office/openoffice/files/2.3.1/ooo-env_log.diff
index 908169ab6c5a..908169ab6c5a 100644
--- a/app-office/openoffice/files/2.3.1_rc1/ooo-env_log.diff
+++ b/app-office/openoffice/files/2.3.1/ooo-env_log.diff
diff --git a/app-office/openoffice/files/2.3.1_rc1/regcompapply.diff b/app-office/openoffice/files/2.3.1/regcompapply.diff
index e3554ea16aa8..e3554ea16aa8 100644
--- a/app-office/openoffice/files/2.3.1_rc1/regcompapply.diff
+++ b/app-office/openoffice/files/2.3.1/regcompapply.diff
diff --git a/app-office/openoffice/files/2.3.1_rc1/stlport-ppc-buildfix-apply.diff b/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix-apply.diff
index 49f69c796699..49f69c796699 100644
--- a/app-office/openoffice/files/2.3.1_rc1/stlport-ppc-buildfix-apply.diff
+++ b/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix-apply.diff
diff --git a/app-office/openoffice/files/2.3.1_rc1/stlport-ppc-buildfix.diff b/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix.diff
index af70e4f26f13..af70e4f26f13 100644
--- a/app-office/openoffice/files/2.3.1_rc1/stlport-ppc-buildfix.diff
+++ b/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix.diff
diff --git a/app-office/openoffice/files/digest-openoffice-2.3.1_rc1 b/app-office/openoffice/files/digest-openoffice-2.3.1
index 550ccd4dbde2..ea96338177c6 100644
--- a/app-office/openoffice/files/digest-openoffice-2.3.1_rc1
+++ b/app-office/openoffice/files/digest-openoffice-2.3.1
@@ -1,15 +1,15 @@
-MD5 a56cf6ed9bd9759faec5760bacb848cd OOo_2.3.1rc1_src_binfilter.tar.bz2 6476673
-RMD160 497aec1de49ea941ab8305331a9fc9e8e04a5162 OOo_2.3.1rc1_src_binfilter.tar.bz2 6476673
-SHA256 9a76f8eae3dd546f42db883c12f8f21823e0e28ed6d43e83871dd1c1e07fff57 OOo_2.3.1rc1_src_binfilter.tar.bz2 6476673
-MD5 9555a2d5fae9a25c788cc732921ef57a OOo_2.3.1rc1_src_core.tar.bz2 144156134
-RMD160 ab75c022d00ed6269eb9437f9c022e44181c6d3a OOo_2.3.1rc1_src_core.tar.bz2 144156134
-SHA256 4c807dd262eb714397de9e78d244d587968a92142a917dbb47f5180c40db6753 OOo_2.3.1rc1_src_core.tar.bz2 144156134
-MD5 3bb80a2c96e3363186377f7aae9f7c13 OOo_2.3.1rc1_src_l10n.tar.bz2 79077332
-RMD160 bc10b1e05574aced79532fbef316e66dcb810fbf OOo_2.3.1rc1_src_l10n.tar.bz2 79077332
-SHA256 c4834074b97c39b14b89d35bf87cf06bfd690cdbf5d4473d4e15f8a23ebbdb64 OOo_2.3.1rc1_src_l10n.tar.bz2 79077332
-MD5 9cf0ddbb55f0b43b49c59c6962ea567c OOo_2.3.1rc1_src_sdk.tar.bz2 24032680
-RMD160 59b245c81e9cc6d43c60070fd5dc78c38d806db6 OOo_2.3.1rc1_src_sdk.tar.bz2 24032680
-SHA256 11fed832b5a32390885a387cbf9ce2d31b652af8dedebc844ab95a80b5aa5066 OOo_2.3.1rc1_src_sdk.tar.bz2 24032680
+MD5 a56cf6ed9bd9759faec5760bacb848cd OOo_2.3.1_src_binfilter.tar.bz2 6476673
+RMD160 497aec1de49ea941ab8305331a9fc9e8e04a5162 OOo_2.3.1_src_binfilter.tar.bz2 6476673
+SHA256 9a76f8eae3dd546f42db883c12f8f21823e0e28ed6d43e83871dd1c1e07fff57 OOo_2.3.1_src_binfilter.tar.bz2 6476673
+MD5 9555a2d5fae9a25c788cc732921ef57a OOo_2.3.1_src_core.tar.bz2 144156134
+RMD160 ab75c022d00ed6269eb9437f9c022e44181c6d3a OOo_2.3.1_src_core.tar.bz2 144156134
+SHA256 4c807dd262eb714397de9e78d244d587968a92142a917dbb47f5180c40db6753 OOo_2.3.1_src_core.tar.bz2 144156134
+MD5 3bb80a2c96e3363186377f7aae9f7c13 OOo_2.3.1_src_l10n.tar.bz2 79077332
+RMD160 bc10b1e05574aced79532fbef316e66dcb810fbf OOo_2.3.1_src_l10n.tar.bz2 79077332
+SHA256 c4834074b97c39b14b89d35bf87cf06bfd690cdbf5d4473d4e15f8a23ebbdb64 OOo_2.3.1_src_l10n.tar.bz2 79077332
+MD5 9cf0ddbb55f0b43b49c59c6962ea567c OOo_2.3.1_src_sdk.tar.bz2 24032680
+RMD160 59b245c81e9cc6d43c60070fd5dc78c38d806db6 OOo_2.3.1_src_sdk.tar.bz2 24032680
+SHA256 11fed832b5a32390885a387cbf9ce2d31b652af8dedebc844ab95a80b5aa5066 OOo_2.3.1_src_sdk.tar.bz2 24032680
 MD5 1948e39a68f12bfa0b7eb309c14d940c biblio.tar.bz2 6000
 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 biblio.tar.bz2 6000
 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b biblio.tar.bz2 6000
@@ -25,9 +25,9 @@ SHA256 c3c4e0a63b0d1e2a3063172b44c722dde84608c3675fb124bb6f7e00f270379e libwps-0
 MD5 26b3e95ddf3d9c077c480ea45874b3b8 lp_solve_5.5.0.10_source.tar.gz 769268
 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 lp_solve_5.5.0.10_source.tar.gz 769268
 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695 lp_solve_5.5.0.10_source.tar.gz 769268
-MD5 f1e9371f145edf21e9838fe3e5f2fb1a ooo-build-2.3.0.7.tar.gz 8912618
-RMD160 0417912202778a0a78445757baa7cade31f46327 ooo-build-2.3.0.7.tar.gz 8912618
-SHA256 32101c76acf0da36ba888cef1ffd0f283fa7d6a52b6b4221e84291d5cbf58fe5 ooo-build-2.3.0.7.tar.gz 8912618
+MD5 b56667042556ad230b6aec7b4fb29464 ooo-build-2.3.1.tar.gz 8912396
+RMD160 9e444aa7e1968d9059cd0a299579fbfe14a7cbb2 ooo-build-2.3.1.tar.gz 8912396
+SHA256 f75ad2d0a10eff71f8ccef97532e5e0eac8876a81fb1c12a93efde061de17fe3 ooo-build-2.3.1.tar.gz 8912396
 MD5 42aceb3508ff8b5ed04d0451b30f6ccf oox.2007-09-05.tar.bz2 357665
 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 oox.2007-09-05.tar.bz2 357665
 SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769 oox.2007-09-05.tar.bz2 357665
diff --git a/app-office/openoffice/openoffice-2.3.1_rc1.ebuild b/app-office/openoffice/openoffice-2.3.1.ebuild
index 913aaaa5f41d..3377ca218a22 100644
--- a/app-office/openoffice/openoffice-2.3.1_rc1.ebuild
+++ b/app-office/openoffice/openoffice-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.1_rc1.ebuild,v 1.1 2007/12/02 20:32:09 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.1.ebuild,v 1.1 2007/12/04 21:24:52 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -9,19 +9,18 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2
 
 IUSE="binfilter cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono sound odk pam seamonkey webdav xulrunner"
 
-MY_PV="2.3.0.7"
-MY_PV2="2.3.1rc1"
+MY_PV="2.3.1"
 PATCHLEVEL="OOG680"
-SRC="OOo_${MY_PV2}_src"
+SRC="OOo_${PV}_src"
 S="${WORKDIR}/ooo"
 S_OLD="${WORKDIR}/ooo-build-${MY_PV}"
 CONFFILE="${S}/distro-configs/Gentoo.conf.in"
 DESCRIPTION="OpenOffice.org, a full office productivity suite."
 
-SRC_URI="mirror://openoffice/contrib/rc/${MY_PV2}/${SRC}_core.tar.bz2
-	binfilter? ( mirror://openoffice/contrib/rc/${MY_PV2}/${SRC}_binfilter.tar.bz2 )
+SRC_URI="mirror://openoffice/stable/${PV}/${SRC}_core.tar.bz2
+	binfilter? ( mirror://openoffice/stable/${PV}/${SRC}_binfilter.tar.bz2 )
 	http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
-	odk? ( mirror://openoffice/contrib/rc/${MY_PV2}/${SRC}_sdk.tar.bz2
+	odk? ( mirror://openoffice/stable/${PV}/${SRC}_sdk.tar.bz2
 		java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
 	http://go-oo.org/packages/SRC680/extras-2.tar.bz2
 	http://go-oo.org/packages/SRC680/biblio.tar.bz2
@@ -39,7 +38,7 @@ for X in ${LANGS} ; do
 done
 
 for Y in ${LANGS1} ; do
-	SRC_URI="${SRC_URI} linguas_${Y}? ( mirror://openoffice/contrib/rc/${PV}/${SRC}_l10n.tar.bz2 )"
+	SRC_URI="${SRC_URI} linguas_${Y}? ( mirror://openoffice/stable/${PV}/${SRC}_l10n.tar.bz2 )"
 done
 
 HOMEPAGE="http://go-oo.org"
@@ -93,7 +92,6 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	>=app-text/hunspell-1.1.4-r1
 	>=app-admin/eselect-oodict-20060706
 	dev-libs/expat
-	>=dev-libs/icu-3.6
 	>=sys-libs/db-4.3
 	>=dev-libs/STLport-5.1.2
 	>=app-text/libwpd-0.8.8