OpenOffice.org 2.3.1 release

(Portage version: 2.1.4_rc7)

11 files changed, 64 insertions, 36 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/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