Bump to new patch release, remove some of our workarounds

(Portage version: 2.1.2_pre3-r5)
 (Unsigned Manifest commit)

2 files changed, 16 insertions, 443 deletions

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index d59df6d85625..7801a27e1dfa 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,14 +2,10 @@ AUX 2.0.3/gentoo-2.0.3.diff 523 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9
 MD5 919be84ef3c8315b84c37cdd1f5b947d files/2.0.3/gentoo-2.0.3.diff 523
 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 files/2.0.3/gentoo-2.0.3.diff 523
 SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527 files/2.0.3/gentoo-2.0.3.diff 523
-AUX 2.0.4/gentoo-2.0.4.diff 889 RMD160 c32c3187d475f93616e1ba83de5620d16dd3217b SHA1 91f68516051282588138053277ee54520a856e67 SHA256 ce23c9c02eb24ff3a233b7624fedd8637bdce5428c0380b6e271eb11780d6247
-MD5 2d44ca48ed3839810221347e0c269f06 files/2.0.4/gentoo-2.0.4.diff 889
-RMD160 c32c3187d475f93616e1ba83de5620d16dd3217b files/2.0.4/gentoo-2.0.4.diff 889
-SHA256 ce23c9c02eb24ff3a233b7624fedd8637bdce5428c0380b6e271eb11780d6247 files/2.0.4/gentoo-2.0.4.diff 889
-AUX 2.0.4/system-icu.diff 15718 RMD160 d083662ab42bd2871d5579da13e2f0370eb4dc6a SHA1 2d9b26e6dd127607f7b5a4561bc7d3b2b4069a41 SHA256 022c95ff7ccc24ce4d2a59180c252729801e61643a599d4353742dd7dd7fd9ef
-MD5 1b9d5379352595c6ceb0cb042413c4a9 files/2.0.4/system-icu.diff 15718
-RMD160 d083662ab42bd2871d5579da13e2f0370eb4dc6a files/2.0.4/system-icu.diff 15718
-SHA256 022c95ff7ccc24ce4d2a59180c252729801e61643a599d4353742dd7dd7fd9ef files/2.0.4/system-icu.diff 15718
+AUX 2.0.4/gentoo-2.0.4.diff 523 RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 SHA1 84f3aa66994463524e53fceac8d6e3fc143f00d1 SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527
+MD5 919be84ef3c8315b84c37cdd1f5b947d files/2.0.4/gentoo-2.0.4.diff 523
+RMD160 9e60f68dae950bc929d454a5d5d0a050a03b90e9 files/2.0.4/gentoo-2.0.4.diff 523
+SHA256 adf13d129e3a3a6fb513ada2046af98d10d4d46953603da13be8e4ae75d56527 files/2.0.4/gentoo-2.0.4.diff 523
 DIST OOO_2_0_3-binfilter.tar.bz2 17307831 RMD160 a8bb291789bee4692804f8fc3b32ce204689d7a3 SHA1 fa89f8f7c1414b365b78467dc4007d802e9ffd68 SHA256 eeb478603262ea62bc749f6698512bf0463d66cc2a5669db6ecedeb937577864
 DIST OOO_2_0_3-core.tar.bz2 109469286 RMD160 d40a11614ef9d25b6af96485877a347ffb6cefd0 SHA1 2ec6cee1fad05c128eb8c0b4e4ab7d9ca1b2c71f SHA256 0d6889e0426590e58c546ca03d227f266ced7de41bc55bcec7ff6f3cfd238c2d
 DIST OOO_2_0_3-lang.tar.bz2 64201627 RMD160 f893f84ad3c3526c15eb935163d7d98c201d225d SHA1 7525407d609a40ff1edb2c3b74642fd5e83d7921 SHA256 d9120ed91073ec624e60e604872611ecbde204300762874cf5a673addfda4dd8
@@ -24,21 +20,21 @@ DIST hunspell_UNO_1.1.tar.gz 13774 RMD160 9c0c31220d63894c9060a05fd136083b0b017b
 DIST libwpd-0.8.3.tar.gz 482757 RMD160 f8010300e50e1c43942e6a84a3b526738edb4ed5 SHA1 397b33bf77a6bfbab71ca3de7e42bc99ab80fdd6 SHA256 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c
 DIST lp_solve_5.5.tar.gz 495452 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 SHA1 1cb19a392a4b3370adc3513964f7a351ad605875 SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1
 DIST ooo-build-2.0.3.0.tar.gz 5158406 RMD160 45eb102b17f4b55b1b44f0eb08a933b75b9eb3dc SHA1 a8d5c3d264819620bcb0122342558debc50c8729 SHA256 b425013aa40d1fd4e3d596a38b2add86ae9c4d7e84cc23e1b2b5e924553efd7c
-DIST ooo-build-2.0.4.tar.gz 4446745 RMD160 5d85d32b892f90c3a888ad0a340758d85d5ae4cb SHA1 efcd1674a118ce0d9904d5138a6cae8ae2c1afe2 SHA256 11a80c4a76bce4c831aa459745779c295a22b169403e553285e187705e96d5b5
+DIST ooo-build-2.0.4.1.tar.gz 4453648 RMD160 277d4fc0eeeb39b34253da86f0d4fd5c020e56ba SHA1 d78086057b1849c3dae3c2443eab43ceee48c494 SHA256 7be9022682bc65f77f995f33c91938f2fd83f819377851f77a71790e243d1ae9
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
 EBUILD openoffice-2.0.3.ebuild 9145 RMD160 60a33696dbe9eecd555720610c34ccfdf834efcb SHA1 d42a09fee83af8596c59250f711d2618b93b10b3 SHA256 ca6828638a3c30e4cde1ebd454e566f6718fbea528befc1c1fd9caf928054f30
 MD5 59f7b5eb1b353c0bbd22dc07607acfcf openoffice-2.0.3.ebuild 9145
 RMD160 60a33696dbe9eecd555720610c34ccfdf834efcb openoffice-2.0.3.ebuild 9145
 SHA256 ca6828638a3c30e4cde1ebd454e566f6718fbea528befc1c1fd9caf928054f30 openoffice-2.0.3.ebuild 9145
-EBUILD openoffice-2.0.4.ebuild 9601 RMD160 c3e9565f18a11f4c4987eb08f8d7ba48d5e2adca SHA1 f7bde3b92de92900d0c9577dab43e689ed15f172 SHA256 02077f274eff61560c7fb8ab2f1d7c0622596ff2c023aa5a5cf514f1062640ba
-MD5 b7cb14d02aaf0eec816981c32d65380b openoffice-2.0.4.ebuild 9601
-RMD160 c3e9565f18a11f4c4987eb08f8d7ba48d5e2adca openoffice-2.0.4.ebuild 9601
-SHA256 02077f274eff61560c7fb8ab2f1d7c0622596ff2c023aa5a5cf514f1062640ba openoffice-2.0.4.ebuild 9601
-MISC ChangeLog 55434 RMD160 73c6d4987ab4a06f8b39024e562f5809df2f81dc SHA1 6770254d4ce32f193fa606c7988943a405ce77bc SHA256 096dee6fffc621828a6a345cf530a34f807e6023e1040ccff3af29253ca6a32e
-MD5 b5ecffb5b7813397ae0b0fe90d4c4bd0 ChangeLog 55434
-RMD160 73c6d4987ab4a06f8b39024e562f5809df2f81dc ChangeLog 55434
-SHA256 096dee6fffc621828a6a345cf530a34f807e6023e1040ccff3af29253ca6a32e ChangeLog 55434
+EBUILD openoffice-2.0.4.ebuild 9492 RMD160 e5e334100dda98f236c338cad7d397183f56f46b SHA1 f0217265eb05693599c28c06fe756646ccdbf916 SHA256 638e82d50d2adfdf6038e7e66b35f80a94a2df5176b0720ed3d841bdccf22d53
+MD5 f8e925faad2e508f3afb8d0b4ed4a60c openoffice-2.0.4.ebuild 9492
+RMD160 e5e334100dda98f236c338cad7d397183f56f46b openoffice-2.0.4.ebuild 9492
+SHA256 638e82d50d2adfdf6038e7e66b35f80a94a2df5176b0720ed3d841bdccf22d53 openoffice-2.0.4.ebuild 9492
+MISC ChangeLog 55690 RMD160 f5c32c509154986bb3d675ceeb235117368b3213 SHA1 dab92a76233f1ff200e871aa42200e15b1cc9d3e SHA256 9e3fff9a0a281f18fa96b70ea381306ac26d9f4fa9a9ef023d52cb1bc6b6b1b2
+MD5 acaa57a72f3163068a8be79b03d395ab ChangeLog 55690
+RMD160 f5c32c509154986bb3d675ceeb235117368b3213 ChangeLog 55690
+SHA256 9e3fff9a0a281f18fa96b70ea381306ac26d9f4fa9a9ef023d52cb1bc6b6b1b2 ChangeLog 55690
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -46,6 +42,6 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 f9a102aadbdca7178bbd6e999c927fa1 files/digest-openoffice-2.0.3 2494
 RMD160 1da3fb19c062a849391223360384da3dd4089361 files/digest-openoffice-2.0.3 2494
 SHA256 411493117843e817aad3c972ce94b2f9ca92f59a815b20b985e875c32da8cdba files/digest-openoffice-2.0.3 2494
-MD5 314f75d3986e19a42c8488550886725d files/digest-openoffice-2.0.4 2681
-RMD160 fa0410aec51a2682e033e5e3bb68cfb9d978aec1 files/digest-openoffice-2.0.4 2681
-SHA256 7aa1616b192f08aba28d042d51872cb3343baad34ba169d2c5f01bd284a170ed files/digest-openoffice-2.0.4 2681
+MD5 95b233af2d8be2567d654bc8ea7fb544 files/digest-openoffice-2.0.4 2687
+RMD160 19c874825016b07956caab11376ff5a351369624 files/digest-openoffice-2.0.4 2687
+SHA256 1dfc0f85e43ebef74f0fc6f3d92cb0238f5ae465b61e2dac0c23aa0275b21931 files/digest-openoffice-2.0.4 2687
diff --git a/app-office/openoffice/files/2.0.4/system-icu.diff b/app-office/openoffice/files/2.0.4/system-icu.diff
deleted file mode 100644
index dd1bb09d75f5..000000000000
--- a/app-office/openoffice/files/2.0.4/system-icu.diff
+++ /dev/null
@@ -1,423 +0,0 @@
-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