Final release of OOo 2.0.4, should be unmasked soonish

Package-Manager: portage-2.1.2_pre2-r9

5 files changed, 808 insertions, 1 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 166572164711..51d8cdad3d5c 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.258 2006/10/12 15:23:33 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.259 2006/10/13 14:06:35 suka Exp $
+
+*openoffice-2.0.4 (13 Oct 2006)
+
+  13 Oct 2006; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.0.4_rc2/gentoo-2.0.4_rc2.diff, +files/2.0.4/gentoo-2.0.4.diff,
+  +files/2.0.4/system-icu.diff, -openoffice-2.0.4_rc2.ebuild,
+  +openoffice-2.0.4.ebuild:
+  Final release of OOo 2.0.4, should be unmasked soonish.
 
   12 Oct 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.3.ebuild, openoffice-2.0.4_rc2.ebuild:
diff --git a/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff b/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
new file mode 100644
index 000000000000..95ef0738d19c
--- /dev/null
+++ b/app-office/openoffice/files/2.0.4/gentoo-2.0.4.diff
@@ -0,0 +1,33 @@
+--- bin/package-ooo 
++++ bin/package-ooo 
+@@ -57,6 +57,7 @@
+ #!/bin/sh
+ export OOO_EXTRA_ARG='$2'
++unset PYTHONPATH
+ $OOINSTBASE/program/ooqstart $3 "\$@"
+ EOT
+     chmod 755 $1
+ }
+--- bin/ooo-wrapper.in 
++++ bin/ooo-wrapper.in 
+@@ -92,6 +89,9 @@
+     print STDERR "\n\n --- Warning - OO.o will not work without a mounted /proc filesystem --- \n\n\n";
+ }
+ 
++# Clear PYTHONPATH, otherwise Python scripting does not work
++delete $ENV{'PYTHONPATH'};
++
+ # And here we go.
+ exec "$SystemInstallDir/program/$Binary", @ooo_argv
+ 
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -214,7 +214,7 @@
+ [ Fixes ]
+ # backport revision 1.31.61.1 from cws impress107 to fix crash on
+ # the impress wizard
+-sd-slideshowimpl-check-for-viewframe.diff, i#69530
++#sd-slideshowimpl-check-for-viewframe.diff, i#69530
+ 
+ # let sd accept uri-list drop, n#183719
+ sd-accept-uri-list-drop.diff, n#183719, rodo
diff --git a/app-office/openoffice/files/2.0.4/system-icu.diff b/app-office/openoffice/files/2.0.4/system-icu.diff
new file mode 100644
index 000000000000..dd1bb09d75f5
--- /dev/null
+++ b/app-office/openoffice/files/2.0.4/system-icu.diff
@@ -0,0 +1,423 @@
+diff -ru config_office.orig/configure.in config_office/configure.in
+--- config_office/configure.in	2005-09-09 08:23:03.000000000 +0100
++++ config_office/configure.in	2005-09-09 08:24:46.000000000 +0100
+@@ -226,9 +226,9 @@
+ AC_ARG_WITH(system-python,
+ [  --with-system-python    Use python already on system
+ ],,)
+-#AC_ARG_WITH(system-icu,
+-#[  --with-system-icu       Use icu already on system
+-#],,)
++AC_ARG_WITH(system-icu,
++[  --with-system-icu       Use icu already on system
++],,)
+ AC_ARG_WITH(system-db,
+ [  --with-system-db        Use berkeley db already on system
+ ],,)
+@@ -2965,32 +2965,32 @@
+ fi
+ AC_SUBST(SYSTEM_SANE_HEADER)
+ 
+-# DISABLED; INCOMPLETE
+ dnl ===================================================================
+ dnl Check for system icu
+ dnl ===================================================================
+-#AC_MSG_CHECKING([which icu to use])
+-#if test -n "$with_system_icu" -o -n "$with_system_libs" && \
+-#	test "$with_system_icu" != "no"; then
+-#   AC_MSG_RESULT([external])
+-#   SYSTEM_ICU=YES
+-#   AC_MSG_CHECKING([for unicode/rbbi.h])
+-#   AC_TRY_CPP(unicode/rbbi.h, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([icu headers not found.]))
+-#   AC_PATH_PROG(SYSTEM_GENBRK, genbrk)
+-#   if test -z "$SYSTEM_GENBRK"; then
+-#      AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])
+-#   fi
+-#   AC_PATH_PROG(SYSTEM_GENCCODE, genccode)
+-#   if test -z "$SYSTEM_GENCCODE"; then
+-#      AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\])
+-#   fi
+-#else
+-#    AC_MSG_RESULT([internal])
+-#    SYSTEM_ICU=NO
+-#fi
+-#AC_SUBST(SYSTEM_ICU)
+-#AC_SUBST(SYSTEM_GENBRK)
+-#AC_SUBST(SYSTEM_GENCCODE)
++AC_MSG_CHECKING([which icu to use])
++if test -n "$with_system_icu" -o -n "$with_system_libs" && \
++	test "$with_system_icu" != "no"; then
++   AC_MSG_RESULT([external])
++   SYSTEM_ICU=YES
++   AC_MSG_CHECKING([for unicode/rbbi.h])
++   AC_TRY_CPP(unicode/rbbi.h, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([icu headers not found.]))
++   AC_PATH_PROG(SYSTEM_GENBRK, genbrk)
++   if test -z "$SYSTEM_GENBRK"; then
++      AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])
++   fi
++   AC_PATH_PROG(SYSTEM_GENCCODE, genccode)
++   if test -z "$SYSTEM_GENCCODE"; then
++      AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\])
++   fi
++else
++    AC_MSG_RESULT([internal])
++    SYSTEM_ICU=NO
++    BUILD_TYPE="$BUILD_TYPE ICU"
++fi
++AC_SUBST(SYSTEM_ICU)
++AC_SUBST(SYSTEM_GENBRK)
++AC_SUBST(SYSTEM_GENCCODE)
+ 
+ dnl ===================================================================
+ dnl Checks for libraries.
+diff -ru config_office.orig/set_soenv.in config_office/set_soenv.in
+--- config_office/set_soenv.in	2005-09-09 08:23:03.000000000 +0100
++++ config_office/set_soenv.in	2005-09-09 08:25:28.000000000 +0100
+@@ -1731,9 +1731,9 @@
+ ToFile( "SYSTEM_PYTHON",     "@SYSTEM_PYTHON@",    "e" );
+ ToFile( "PYTHON_CFLAGS",     "@PYTHON_CFLAGS@",    "e" );
+ ToFile( "PYTHON_LIBS",       "@PYTHON_LIBS@",      "e" );
+-#ToFile( "SYSTEM_ICU",        "@SYSTEM_ICU@",       "e" );
+-#ToFile( "SYSTEM_GENBRK",     "@SYSTEM_GENBRK@",    "e" );
+-#ToFile( "SYSTEM_GENCCODE",   "@SYSTEM_GENCCODE@",  "e" );
++ToFile( "SYSTEM_ICU",        "@SYSTEM_ICU@",       "e" );
++ToFile( "SYSTEM_GENBRK",     "@SYSTEM_GENBRK@",    "e" );
++ToFile( "SYSTEM_GENCCODE",   "@SYSTEM_GENCCODE@",  "e" );
+ ToFile( "SYSTEM_JPEG",       "@SYSTEM_JPEG@",      "e" );
+ ToFile( "SYSTEM_FREETYPE",   "@SYSTEM_FREETYPE@",  "e" );
+ ToFile( "FREETYPE_CFLAGS",   "@FREETYPE_CFLAGS@",  "e" );
+Index: inc/collator_unicode.hxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/inc/collator_unicode.hxx,v
+retrieving revision 1.7
+diff -u -p -u -r1.7 collator_unicode.hxx
+--- i18npool/inc/collator_unicode.hxx	21 Jul 2005 14:26:51 -0000	1.7
++++ i18npool/inc/collator_unicode.hxx	13 Sep 2005 13:49:44 -0000
+@@ -110,6 +110,7 @@ protected:
+     const sal_uInt8 *rulesImage;
+ private:
+ 	RuleBasedCollator *collator;
++	RuleBasedCollator *ucacollator;
+ };
+ 
+ #define COLLATOR( algorithm ) \
+Index: source/breakiterator/makefile.mk
+===================================================================
+RCS file: /cvs/l10n/i18npool/source/breakiterator/makefile.mk,v
+retrieving revision 1.7
+diff -u -p -u -r1.7 makefile.mk
+--- i18npool/source/breakiterator/makefile.mk	23 Mar 2005 10:51:00 -0000	1.7
++++ i18npool/source/breakiterator/makefile.mk	13 Sep 2005 13:49:44 -0000
+@@ -79,6 +79,8 @@ MY_BRK_TXTFILES:=$(shell ls data/*.txt)
+ # insert "OpenOffice" as icu package name in front of the  name of each rule file for searching on application provided data
+ MY_BRK_BRKFILES:=$(subst,data/,$(MISC)$/OpenOffice_ $(MY_BRK_TXTFILES:s/.txt/.brk/))
+ 
++MY_BRK_NAMEDBRKFILES:=$(subst,data/,OpenOffice_ $(MY_BRK_TXTFILES:s/.txt/.brk/))
++
+ # OpenOffice_icu_dat.c is a generated file from the rule file list by gencmn
+ MY_MISC_CXXFILES := \
+         $(MISC)$/OpenOffice_icu_dat.c \
+@@ -107,12 +109,12 @@ APP1STDLIBS = $(SALLIB) \
+ # so the output (OpenOffice_icu_dat.c) is changed here to include a pragma to disable the warnings.
+ # Output of gencmn is redirected to OpenOffice_icu_tmp.c with the -t switch.
+ $(MISC)$/OpenOffice_icu_dat.c :  $(MY_BRK_BRKFILES)
+-    +$(WRAPCMD) $(SOLARBINDIR)$/gencmn -e OpenOffice_icu -n OpenOffice_icu -t tmp -S -d $(MISC) O $(mktmp $(MY_BRK_BRKFILES:t"\n"))
++    +$(WRAPCMD) gencmn -e OpenOffice_icu -n OpenOffice_icu -t tmp -S -d $(MISC) O $(mktmp $(MY_BRK_NAMEDBRKFILES:t"\n"))
+     +echo $(USQ)#ifdef _MSC_VER$(USQ) > $@
+     +echo $(USQ)#pragma warning( disable : 4229 4668 )$(USQ) >> $@
+     +echo $(USQ)#endif$(USQ) >> $@
+     +$(TYPE) $(@:s/_dat/_tmp/) >> $@
+ $(MISC)$/OpenOffice_%.brk : data/%.txt
+-    +$(WRAPCMD) $(SOLARBINDIR)$/genbrk -r $< -o $(MISC)$/OpenOffice_$*.brk
++    +$(WRAPCMD) genbrk -r $< -o $(MISC)$/OpenOffice_$*.brk
+ $(MISC)$/%_brk.c : $(MISC)$/%.brk
+-    +$(WRAPCMD) $(SOLARBINDIR)$/genccode -d $(MISC)$ $(MISC)$/$*.brk
++    +$(WRAPCMD) genccode -e OpenOffice_icu -n OpenOffice_icu -d $(MISC)$ $(MISC)$/$*.brk
+Index: source/collator/collator_unicode.cxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/source/collator/collator_unicode.cxx,v
+retrieving revision 1.7
+diff -u -p -u -r1.7 collator_unicode.cxx
+--- i18npool/source/collator/collator_unicode.cxx	30 Jul 2004 14:39:21 -0000	1.7
++++ i18npool/source/collator/collator_unicode.cxx	13 Sep 2005 13:49:44 -0000
+@@ -50,11 +50,13 @@
+ {
+ 	implementationName = "com.sun.star.i18n.Collator_Unicode";
+ 	collator = NULL;
++	ucacollator = NULL;
+ }
+ 
+ Collator_Unicode::~Collator_Unicode()
+ {
+ 	if (collator) delete collator;
++	if (ucacollator) delete ucacollator;
+ }
+ 
+ sal_Int32 SAL_CALL
+@@ -110,7 +112,14 @@
+                 }
+                 if (func) {
+                     const sal_uInt8* ruleImage=func();
++#ifdef SYSTEM_ICU
++                    ucacollator = (RuleBasedCollator*) icu::Collator::createInstance("", status);
++                    if (! U_SUCCESS(status))
++                        throw RuntimeException();
++                    collator = new RuleBasedCollator(reinterpret_cast<const uint8_t*>(ruleImage), -1, ucacollator, status);
++#else
+                     collator = new RuleBasedCollator(reinterpret_cast<const uint8_t*>(ruleImage), status);
++#endif
+                     if (! U_SUCCESS(status))
+                         throw RuntimeException();
+                 }
+Index: source/hhconvdic.cxx
+===================================================================
+RCS file: /cvs/sw/linguistic/source/hhconvdic.cxx,v
+retrieving revision 1.4
+diff -u -p -u -r1.4 hhconvdic.cxx
+--- linguistic/source/hhconvdic.cxx	26 Nov 2004 14:29:09 -0000	1.4
++++ linguistic/source/hhconvdic.cxx	10 Sep 2005 07:47:25 -0000
+@@ -60,7 +60,7 @@
+  ************************************************************************/
+ 
+ #ifndef USCRIPT_H
+-#include <external/unicode/uscript.h>
++#include <unicode/uscript.h>
+ #endif
+ 
+ #ifndef _LANG_HXX //autogen wg. LANGUAGE_ENGLISH_US
+diff -ru scp2.orig/prj/build.lst scp2/prj/build.lst
+--- scp2/prj/build.lst	2005-09-09 10:00:30.000000000 +0100
++++ scp2/prj/build.lst	2005-09-09 08:37:48.000000000 +0100
+@@ -1,4 +1,4 @@
+-cp    scp2    :    setup_native transex3 PYTHON:python icu NULL
++cp    scp2    :    setup_native transex3 PYTHON:python ICU:icu NULL
+ cp    scp2                        usr1     -    all    cp_mkout NULL
+ cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
+ cp    scp2\source\activex         nmake    -    all    cp_activex cp_langmacros NULL
+diff -ru scp2.orig/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
+--- scp2/source/ooo/file_library_ooo.scp	2005-09-09 10:00:18.000000000 +0100
++++ scp2/source/ooo/file_library_ooo.scp	2005-09-09 10:04:07.000000000 +0100
+@@ -801,6 +801,8 @@
+     Styles = (PACKED,PATCH);
+ End
+ 
++#ifndef SYSTEM_ICU
++
+ File gid_File_Lib_Icudata
+     TXT_FILE_BODY;
+   #ifdef UNX
+@@ -845,6 +847,8 @@
+     Styles = (PACKED);
+ End
+ 
++#endif
++
+ File gid_File_Lib_Iiopbrdg
+     TXT_FILE_BODY;
+     Styles = (PACKED,UNO_COMPONENT);
+diff -ru scp2.orig/source/ooo/makefile.mk scp2/source/ooo/makefile.mk
+--- scp2/source/ooo/makefile.mk	2005-09-09 10:00:18.000000000 +0100
++++ scp2/source/ooo/makefile.mk	2005-09-09 13:00:17.000000000 +0100
+@@ -68,7 +68,6 @@
+ # --- Settings -----------------------------------------------------
+ 
+ .INCLUDE :  settings.mk
+-.INCLUDE :  icuversion.mk
+ .INCLUDE :  i18npool/version.mk
+ 
+ .IF "$(ENABLE_CRASHDUMP)"!=""
+@@ -177,11 +176,17 @@
+ SCPDEFS+=-DENABLE_CAIRO
+ .ENDIF
+ 
++.IF "$(SYSTEM_ICU)" == "YES"
++SCPDEFS+=-DSYSTEM_ICU
++.ELSE
++.INCLUDE :  icuversion.mk
+ SCPDEFS+=\
+     -DICU_MAJOR=$(ICU_MAJOR) \
+     -DICU_MINOR=$(ICU_MINOR) \
+-    -DICU_MICRO=$(ICU_MICRO) \
+-	-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
++    -DICU_MICRO=$(ICU_MICRO)
++.ENDIF
++
++SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
+ 
+ .IF "$(DISABLE_NEON)" == "TRUE"
+ SCPDEFS+=-DDISABLE_NEON
+diff -ru scp2.orig/source/ooo/shortcut_ooo.scp scp2/source/ooo/shortcut_ooo.scp
+--- scp2/source/ooo/shortcut_ooo.scp	2005-09-09 10:00:18.000000000 +0100
++++ scp2/source/ooo/shortcut_ooo.scp	2005-09-09 10:05:21.000000000 +0100
+@@ -193,6 +193,7 @@
+ #endif
+ 
+ #ifdef UNX
++#ifndef SYSTEM_ICU
+ 
+ Shortcut gid_Shortcut_Lib_Icudata_0
+     FileID = gid_File_Lib_Icudata;
+@@ -201,10 +202,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icudata_1
+     FileID = gid_File_Lib_Icudata;
+     Dir = gid_Dir_Program;
+@@ -212,10 +209,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icui18n_0
+     FileID = gid_File_Lib_Icui18n;
+     Dir = gid_Dir_Program;
+@@ -223,10 +216,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icui18n_1
+     FileID = gid_File_Lib_Icui18n;
+     Dir = gid_Dir_Program;
+@@ -234,10 +223,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icule_0
+     FileID = gid_File_Lib_Icule;
+     Dir = gid_Dir_Program;
+@@ -245,10 +230,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icule_1
+     FileID = gid_File_Lib_Icule;
+     Dir = gid_Dir_Program;
+@@ -256,10 +237,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icuuc_0
+     FileID = gid_File_Lib_Icuuc;
+     Dir = gid_Dir_Program;
+@@ -267,10 +244,6 @@
+     Styles = (NETWORK,RELATIVE);
+ End
+ 
+-#endif
+-
+-#ifdef UNX
+-
+ Shortcut gid_Shortcut_Lib_Icuuc_1
+     FileID = gid_File_Lib_Icuuc;
+     Dir = gid_Dir_Program;
+@@ -279,6 +252,7 @@
+ End
+ 
+ #endif
++#endif
+ 
+ #ifdef UNX
+ 
+--- vcl/prj/build.lst	2005-09-13 08:51:51.000000000 +0100
++++ vcl/prj/build.lst	2005-09-09 08:37:54.000000000 +0100
+@@ -1,4 +1,4 @@
+-vc	vcl	:	BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx SNDFILE:sndfile PORTAUDIO:portaudio transex3 SO:officenames NULL
++vc	vcl	:	BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx SNDFILE:sndfile PORTAUDIO:portaudio transex3 SO:officenames NULL
+ vc	vcl										usr1	-	all	vc_mkout NULL
+ vc	vcl\source\unotypes						nmake	-	all	vc_unot NULL
+ vc	vcl\source\glyphs						nmake	-	all	vc_glyphs vc_unot NULL
+Index: prj/build.lst
+===================================================================
+RCS file: /cvs/l10n/i18npool/prj/build.lst,v
+retrieving revision 1.18
+diff -u -r1.18 build.lst
+--- i18npool/prj/build.lst	1 Nov 2005 14:51:56 -0000	1.18
++++ i18npool/prj/build.lst	5 Nov 2005 16:13:03 -0000
+@@ -1,4 +1,4 @@
+-inp  i18npool    :   bridges sax stoc comphelper icu i18nutil regexp NULL
++inp  i18npool    :   bridges sax stoc comphelper ICU:icu i18nutil regexp NULL
+ inp  i18npool                                   usr1    -   all inp_mkout NULL
+ inp  i18npool\source\unotypes                   nmake   -   all inp_utypes NULL
+ inp  i18npool\source\registerservices           nmake   -   all inp_rserv inp_utypes NULL
+Index: source/breakiterator/breakiterator_unicode.cxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx,v
+retrieving revision 1.20
+diff -u -r1.20 breakiterator_unicode.cxx
+--- i18npool/source/breakiterator/breakiterator_unicode.cxx	17 Oct 2005 15:42:30 -0000	1.20
++++ i18npool/source/breakiterator/breakiterator_unicode.cxx	5 Nov 2005 16:14:56 -0000
+@@ -42,7 +42,9 @@
+ extern const char OpenOffice_icu_dat[];
+ U_CDECL_END
+ 
+-using namespace ::com::sun::star::uno;
++using ::com::sun::star::uno::RuntimeException;
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::uno::Sequence;
+ using namespace ::com::sun::star::lang;
+ using namespace ::rtl;
+ 
+@@ -103,13 +105,21 @@
+             if ( !U_SUCCESS(status) ) throw ERROR;
+ 
+             status = U_ZERO_ERROR;
+-            icuBI->aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", 
++            UDataMemory *pData;
++            if (!rLocale.Language.getLength())
++                pData=0;
++            else
++                pData = udata_open("OpenOffice_icu/OpenOffice", "brk", 
+                     OUStringToOString(OUString::createFromAscii(rule)+OUString::createFromAscii("_")+rLocale.Language,
+-                    RTL_TEXTENCODING_ASCII_US).getStr(), &status), status);
+-            if (!U_SUCCESS(status) ) {
++                    RTL_TEXTENCODING_ASCII_US).getStr(), &status);
++
++            icuBI->aBreakIterator = (pData && U_SUCCESS(status)) ? new RuleBasedBreakIterator(pData, status) : 0;
++
++            if ((!U_SUCCESS(status) || !icuBI->aBreakIterator)) {
+                 status = U_ZERO_ERROR;
+-                icuBI->aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", rule, &status), status);
+-                if (!U_SUCCESS(status) ) icuBI->aBreakIterator=NULL;
++                pData = udata_open("OpenOffice_icu/OpenOffice", "brk", rule, &status);
++                icuBI->aBreakIterator = (pData && U_SUCCESS(status)) ? new RuleBasedBreakIterator(pData, status) : 0;
++                if (!U_SUCCESS(status) ) icuBI->aBreakIterator=NULL;
+             }
+         }
+ 
+--- i18npool/source/collator/makefile.mk.orig	2005-12-07 21:29:09.591358096 +0100
++++ i18npool/source/collator/makefile.mk	2005-12-07 21:29:33.881665408 +0100
+@@ -88,6 +88,10 @@
+ 		$(ICUINLIB) \
+ 		$(ICUUCLIB)
+ 
++.IF "$(SYSTEM_ICU)" == "YES"
++CFLAGS += -DSYSTEM_ICU
++.ENDIF
++
+ # --- Targets ------------------------------------------------------
+ 
+ .INCLUDE :	target.mk
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.4 b/app-office/openoffice/files/digest-openoffice-2.0.4
new file mode 100644
index 000000000000..fb6dc4e87ccf
--- /dev/null
+++ b/app-office/openoffice/files/digest-openoffice-2.0.4
@@ -0,0 +1,33 @@
+MD5 81f5c0b4b51b47c968e71d6685e022c5 OOO_2_0_4-binfilter.tar.bz2 16802527
+RMD160 2574dd0cef9d6976b62e0a16d75b577d8002b139 OOO_2_0_4-binfilter.tar.bz2 16802527
+SHA256 45bf3993ddeab5a1bc724111f6066933cac9129493db24204ffe35840842af35 OOO_2_0_4-binfilter.tar.bz2 16802527
+MD5 3f18ee3d2e67c8f9daef02ed2dd2fc51 OOO_2_0_4-core.tar.bz2 121332967
+RMD160 bc57ce5f6ff0a4ef714cbf7097b319d61d7ffc25 OOO_2_0_4-core.tar.bz2 121332967
+SHA256 010dfa7b87a426ccea82a14c53877280a771448b9d935a49a636e82512e58cff OOO_2_0_4-core.tar.bz2 121332967
+MD5 fbe2fb266ecbdca0dcf55ce677d0fe2b OOO_2_0_4-lang.tar.bz2 71585371
+RMD160 acc3c0507011bad12a8c423e73bf5ea4750500e1 OOO_2_0_4-lang.tar.bz2 71585371
+SHA256 f22f54afe7a8bc4aae9b0714b5028600911bc8bd2b54b4c4f40839c508daaa5f OOO_2_0_4-lang.tar.bz2 71585371
+MD5 7d5aa9932eaf739bd63449d16cc6a6d0 OOO_2_0_4-system.tar.bz2 28794627
+RMD160 f47a7d516f79ac4734e04cf6cbbcb7424a573d59 OOO_2_0_4-system.tar.bz2 28794627
+SHA256 4601d6dd0483b1df1f975bc3ccae1f6c354a4e083ade94483e8a31842bd9da5c OOO_2_0_4-system.tar.bz2 28794627
+MD5 1948e39a68f12bfa0b7eb309c14d940c biblio.tar.bz2 6000
+RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 biblio.tar.bz2 6000
+SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b biblio.tar.bz2 6000
+MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
+RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740
+SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740
+MD5 4cc68d37ed3a3191bb78a14630e14c64 hunspell_UNO_1.1.tar.gz 13774
+RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 hunspell_UNO_1.1.tar.gz 13774
+SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell_UNO_1.1.tar.gz 13774
+MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
+RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
+SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
+MD5 51b3311a4e5f0fc15d5d06fdb88c91b5 ooo-build-2.0.4.tar.gz 4446745
+RMD160 5d85d32b892f90c3a888ad0a340758d85d5ae4cb ooo-build-2.0.4.tar.gz 4446745
+SHA256 11a80c4a76bce4c831aa459745779c295a22b169403e553285e187705e96d5b5 ooo-build-2.0.4.tar.gz 4446745
+MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
+RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
+SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144
+MD5 0395e6e7da27c1cea7e1852286f6ccf9 xt-20051206-src-only.zip 423516
+RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d xt-20051206-src-only.zip 423516
+SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e xt-20051206-src-only.zip 423516
diff --git a/app-office/openoffice/openoffice-2.0.4.ebuild b/app-office/openoffice/openoffice-2.0.4.ebuild
new file mode 100644
index 000000000000..d09c98090363
--- /dev/null
+++ b/app-office/openoffice/openoffice-2.0.4.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.1 2006/10/13 14:06:35 suka Exp $
+
+inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions multilib toolchain-funcs
+
+IUSE="binfilter branding cairo cups dbus eds firefox gnome gstreamer gtk kde ldap sound odk pam webdav"
+
+MY_PV="${PV}"
+PATCHLEVEL="OOD680"
+SRC="OOO_2_0_4"
+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="http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-core.tar.bz2
+	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-system.tar.bz2
+	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-lang.tar.bz2
+	binfilter? ( http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-binfilter.tar.bz2 )
+	http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
+	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
+	http://go-oo.org/packages/SRC680/hunspell_UNO_1.1.tar.gz
+	http://go-oo.org/packages/xt/xt-20051206-src-only.zip
+	http://go-oo.org/packages/SRC680/lp_solve_5.5.tar.gz"
+
+LANGS="af ar be_BY bg bn bs ca cs cy da de el en en_GB en_US en_ZA es et fa fi fr gu_IN he hi_IN hr hu it ja km ko lt mk nb nl nn nr ns pa_IN pl pt pt_BR ru rw sh_YU sk sl sr_CS st sv sw_TZ th tn tr ts vi xh zh_CN zh_TW zu"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+HOMEPAGE="http://go-oo.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="!app-office/openoffice-bin
+	x11-libs/libXaw
+	x11-libs/libXinerama
+	virtual/libc
+	>=dev-lang/perl-5.0
+	dbus? ( >=sys-apps/dbus-0.60 )
+	gnome? ( >=x11-libs/gtk+-2.4
+		>=gnome-base/gnome-vfs-2.6
+		>=gnome-base/gconf-2.0 )
+	gtk? ( >=x11-libs/gtk+-2.4 )
+	cairo? ( >=x11-libs/cairo-1.0.2
+		>=x11-libs/gtk+-2.8 )
+	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	gstreamer? ( >=media-libs/gstreamer-0.10
+			>=media-libs/gst-plugins-base-0.10 )
+	kde? ( >=kde-base/kdelibs-3.2 )
+	firefox? ( >=www-client/mozilla-firefox-1.5-r9
+		>=dev-libs/nspr-4.6.2
+		>=dev-libs/nss-3.11-r1 )
+	sound? ( =media-libs/portaudio-18*
+			>=media-libs/libsndfile-1.0.9 )
+	webdav? ( >=net-misc/neon-0.24.7 )
+	>=x11-libs/startup-notification-0.5
+	>=media-libs/freetype-2.1.10-r2
+	>=media-libs/fontconfig-2.2.0
+	cups? ( net-print/cups )
+	media-libs/libpng
+	sys-devel/flex
+	sys-devel/bison
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.1.4-r1
+	dev-libs/expat
+	java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* )  )
+	>=dev-libs/boost-1.33.1
+	>=dev-libs/icu-3.4
+	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
+	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
+	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
+
+DEPEND="${RDEPEND}
+	x11-libs/libXrender
+	x11-proto/printproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xineramaproto
+	>=sys-apps/findutils-4.1.20-r1
+	>=sys-devel/gcc-3.2.1
+	dev-perl/Archive-Zip
+	dev-perl/Compress-Zlib
+	dev-util/pkgconfig
+	dev-util/intltool
+	>=net-misc/curl-7.9.8
+	sys-libs/zlib
+	sys-apps/coreutils
+	pam? ( sys-libs/pam )
+	!dev-util/dmake
+	>=dev-lang/python-2.3.4
+	>=app-admin/eselect-oodict-20060706
+	java? ( || ( =virtual/jre-1.4* =virtual/jre-1.5* )
+		dev-java/ant-core )
+	dev-libs/libxslt
+	ldap? ( net-nds/openldap )
+	>=dev-libs/libxml2-2.0"
+
+PROVIDE="virtual/ooo"
+
+# FIXME executable stacks should be addressed upstream!
+QA_EXECSTACK_x86="usr/lib/openoffice/program/libgcc3_uno.so"
+
+pkg_setup() {
+
+	ewarn
+	ewarn " It is important to note that OpenOffice.org is a very fragile  "
+	ewarn " build when it comes to CFLAGS.  A number of flags have already "
+	ewarn " been filtered out.  If you experience difficulty merging this  "
+	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
+	ewarn " merge again. Also note that building OOo takes a lot of time and "
+	ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are "
+	ewarn " the minimum requirements. If you have less, use openoffice-bin "
+	ewarn " instead. "
+	ewarn
+
+	# Check if we have enough RAM and free diskspace to build this beast
+	CHECKREQS_MEMORY="256"
+	use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="5120"
+	check_reqs
+
+	strip-linguas ${LANGS}
+
+	if [ -z "${LINGUAS}" ]; then
+		export LINGUAS_OOO="en-US"
+		ewarn
+		ewarn " To get a localized build, set the according LINGUAS variable(s). "
+		ewarn
+	else
+		export LINGUAS_OOO=`echo ${LINGUAS} | \
+			sed -e 's/\ben\b/en_US/g' -e 's/_/-/g'`
+	fi
+
+	if use !java; then
+		ewarn " You are building with java-support disabled, this results in some "
+		ewarn " of the OpenOffice.org functionality (i.e. help) being disabled. "
+		ewarn " If something you need does not work for you, rebuild with "
+		ewarn " java in your USE-flags. "
+		ewarn
+	fi
+
+	if is-flagq -ffast-math ; then
+		eerror " You are using -ffast-math, which is known to cause problems. "
+		eerror " Please remove it from your CFLAGS, using this globally causes "
+		eerror " all sorts of problems. "
+		eerror " After that you will also have to - at least - rebuild python otherwise "
+		eerror " the openoffice build will break. "
+		die
+	fi
+
+	java-pkg-opt-2_pkg_setup
+
+}
+
+src_unpack() {
+
+	unpack ooo-build-${MY_PV}.tar.gz
+
+	# Hackish workaround for overlong path problem, see bug #130837
+	mv ${S_OLD} ${S} || die
+
+	#Some fixes for our patchset
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
+
+	#Replace broken patch with older version
+	cp -f ${FILESDIR}/${PV}/system-icu.diff ${S}/patches/src680 || die
+
+	#Use flag checks
+	use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE}
+	use branding && echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}
+	use amd64 && echo "--with-system-boost" >> ${CONFFILE}
+
+	echo "`use_enable binfilter`" >> ${CONFFILE}
+
+	echo "`use_enable firefox mozilla`" >> ${CONFFILE}
+	echo "`use_with firefox system-mozilla`" >> ${CONFFILE}
+	echo "`use_with firefox`" >> ${CONFFILE}
+
+	echo "`use_enable ldap`" >> ${CONFFILE}
+	echo "`use_with ldap openldap`" >> ${CONFFILE}
+	echo "`use_enable eds evolution2`" >> ${CONFFILE}
+	echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
+	echo "`use_enable gnome lockdown`" >> ${CONFFILE}
+	echo "`use_enable gnome atkbridge`" >> ${CONFFILE}
+	echo "`use_enable gstreamer`" >> ${CONFFILE}
+	echo "`use_enable dbus`" >> ${CONFFILE}
+	echo "`use_enable webdav neon`" >> ${CONFFILE}
+	echo "`use_with webdav system-neon`" >> ${CONFFILE}
+
+	echo "`use_enable sound pasf`" >> ${CONFFILE}
+	echo "`use_with sound system-portaudio`" >> ${CONFFILE}
+	echo "`use_with sound system-sndfile`" >> ${CONFFILE}
+
+	echo "`use_enable odk`" >> ${CONFFILE}
+	echo "`use_enable debug crashdump`" >> ${CONFFILE}
+
+	echo "--with-system-icu" >> ${CONFFILE}
+
+}
+
+src_compile() {
+
+	unset LIBC
+	addpredict "/bin"
+	addpredict "/root/.gconfd"
+	addpredict "/root/.gnome"
+
+	# Should the build use multiprocessing? Not enabled by default, as it tends to break
+	export JOBS="1"
+	if [ "${WANT_MP}" == "true" ]; then
+		export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
+	fi
+
+	# Compile problems with these ...
+	filter-flags "-funroll-loops"
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-fno-default-inline"
+	filter-flags "-fstack-protector"
+	filter-flags "-fstack-protector-all"
+	filter-flags "-ftracer"
+	filter-flags "-fforce-addr"
+	replace-flags "-O?" "-O2"
+
+	use ppc && append-flags "-D_STLP_STRICT_ANSI"
+
+	# Now for our optimization flags ...
+	export ARCH_FLAGS="${CXXFLAGS}"
+	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+	# Make sure gnome-users get gtk-support
+	export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
+
+	cd ${S}
+	autoconf || die
+	./configure ${MYCONF} \
+		--with-distro="Gentoo" \
+		--with-arch="${ARCH}" \
+		--with-srcdir="${DISTDIR}" \
+		--with-lang="${LINGUAS_OOO}" \
+		--with-num-cpus="${JOBS}" \
+		--with-binsuffix="2" \
+		--with-installed-ooo-dirname="openoffice" \
+		--with-tag=${SRC} \
+		"${GTKFLAG}" \
+		`use_enable kde` \
+		`use_enable cairo` \
+		`use_with cairo system-cairo` \
+		`use_enable gnome quickstart` \
+		`use_enable pam` \
+		`use_enable !debug strip` \
+		--disable-access \
+		--disable-mono \
+		--disable-post-install-scripts \
+		--enable-hunspell \
+		--with-system-hunspell \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		|| die "Configuration failed!"
+
+	einfo "Building OpenOffice.org..."
+	use kde && set-kdedir 3
+	make || die "Build failed"
+
+}
+
+src_install() {
+
+	einfo "Preparing Installation"
+	make DESTDIR=${D} install || die "Installation failed!"
+
+	# Install corrected Symbol Font
+	insinto /usr/share/fonts/TTF/
+	doins fonts/*.ttf
+
+	# Fix the permissions for security reasons
+	chown -R root:root ${D} || die
+
+}
+
+pkg_postinst() {
+
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	eselect oodict update --libdir $(get_libdir)
+
+	[ -x /sbin/chpax ] && [ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
+
+	einfo " To start OpenOffice.org, run:"
+	einfo
+	einfo " $ ooffice2"
+	einfo
+	einfo " Also, for individual components, you can use any of:"
+	einfo
+	einfo " oobase2, oocalc2, oodraw2, oofromtemplate2, ooimpress2, oomath2,"
+	einfo " ooweb2 or oowriter2"
+	einfo
+	einfo " Spell checking is now provided through our own myspell-ebuilds, "
+	einfo " if you want to use it, please install the correct myspell package "
+	einfo " according to your language needs. "
+
+}