Deal with the icu49 for good now.

(Portage version: 2.2.0_alpha98/cvs/Linux x86_64)

3 files changed, 88 insertions, 172 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index c14f51dc2fd1..f99348da1ada 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.277 2012/04/03 13:35:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.278 2012/04/03 16:07:36 scarabeus Exp $
+
+  03 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/libreoffice-3.5.2-icu-49-part2.patch,
+  files/libreoffice-3.5.2-icu-49.patch:
+  Deal with the icu49 for good now.
 
   03 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.2.2.ebuild:
   Do not apply icu49-patch2 for now as it fails on 3.5 now.
diff --git a/app-office/libreoffice/files/libreoffice-3.5.2-icu-49-part2.patch b/app-office/libreoffice/files/libreoffice-3.5.2-icu-49-part2.patch
deleted file mode 100644
index c571586f2149..000000000000
--- a/app-office/libreoffice/files/libreoffice-3.5.2-icu-49-part2.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 43084e8b30c101a44510b7a8267d5c2b316a17bb Mon Sep 17 00:00:00 2001
-From: Eike Rathke <erack@redhat.com>
-Date: Mon, 02 Apr 2012 20:24:00 +0000
-Subject: only as of ICU 4.9 RBBI the Prepend property is empty
-
-This reverts 0c08a84c04b166ab6479716e2c33cd444d7e3dbe and instead strips the
-Prepend variable during build time.
----
-diff --git a/config_host.mk.in b/config_host.mk.in
-index ed5f6df..0e896d8 100644
---- a/config_host.mk.in
-+++ b/config_host.mk.in
-@@ -208,6 +208,7 @@ export ICU_MAJOR=@ICU_MAJOR@
- export ICU_MICRO=@ICU_MICRO@
- export ICU_MINOR=@ICU_MINOR@
- export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@
-+export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@
- export ILIB=@ILIB@
- @x_Cygwin@ export INCLUDE=
- export INPATH=@INPATH@
-diff --git a/configure.in b/configure.in
-index 0100f97..067fa4f 100644
---- a/configure.in
-+++ b/configure.in
-@@ -7487,6 +7487,7 @@ ICU_MAJOR=
- ICU_MINOR=
- ICU_MICRO=
- ICU_RECLASSIFIED_CLOSE_PARENTHESIS=
-+ICU_RECLASSIFIED_PREPEND_SET_EMPTY=
- AC_MSG_CHECKING([which icu to use])
- if test "$with_system_icu" = "yes"; then
-     AC_MSG_RESULT([external])
-@@ -7549,6 +7550,9 @@ You can use --with-system-icu-for-build=force to use it anyway.])
-         if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "4"; then
-             ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
-         fi
-+        if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "9"; then
-+            ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
-+        fi
-     fi
- 
-     libo_MINGW_CHECK_DLL([ICUDATA], [icudata][$ICU_MAJOR][$ICU_MINOR])
-@@ -7558,6 +7562,7 @@ else
-     AC_MSG_RESULT([internal])
-     SYSTEM_ICU="NO"
-     ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
-+    # ICU_RECLASSIFIED_PREPEND_SET_EMPTY not applied for our internal ICU 4.4.2
-     BUILD_TYPE="$BUILD_TYPE ICU"
- fi
- 
-@@ -7569,6 +7574,7 @@ AC_SUBST(ICU_MAJOR)
- AC_SUBST(ICU_MINOR)
- AC_SUBST(ICU_MICRO)
- AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
-+AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
- AC_SUBST([MINGW_ICUDATA_DLL])
- AC_SUBST([MINGW_ICUI18N_DLL])
- AC_SUBST([MINGW_ICUUC_DLL])
-diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
-index 10dce5f..a8379d7 100644
---- a/i18npool/CustomTarget_breakiterator.mk
-+++ b/i18npool/CustomTarget_breakiterator.mk
-@@ -95,10 +95,16 @@ $(IPBI)/%.brk : $(IPBI)/%.txt $(GENBRKTARGET)
- 	$(call gb_Helper_abbreviate_dirs_native,\
- 		$(GENBRK) -r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
- 
--# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards
-+# fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4
-+# Prepend set empty as of Unicode Version 6.1 / ICU 4.9, which bails out if used.
-+# NOTE: strips every line with _word_ 'Prepend', including $Prepend
- $(IPBI)/%.txt : $(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(IPBI)/.dir
- ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES)
-+ifeq ($(ICU_RECLASSIFIED_PREPEND_SET_EMPTY),YES)
-+	sed "s#\[:LineBreak =  Close_Punctuation:\]#\[\[:LineBreak =  Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#;/\<Prepend\>/d" $< > $@
-+else
- 	sed "s#\[:LineBreak =  Close_Punctuation:\]#\[\[:LineBreak =  Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
-+endif
- else
- 	cp $< $@
- endif
-diff --git a/i18npool/source/breakiterator/data/char.txt b/i18npool/source/breakiterator/data/char.txt
-index acb932e..8e49a56 100644
---- a/i18npool/source/breakiterator/data/char.txt
-+++ b/i18npool/source/breakiterator/data/char.txt
-@@ -16,6 +16,7 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
-+$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data
-diff --git a/i18npool/source/breakiterator/data/char_in.txt b/i18npool/source/breakiterator/data/char_in.txt
-index 5ad12a7..5e1ed67 100644
---- a/i18npool/source/breakiterator/data/char_in.txt
-+++ b/i18npool/source/breakiterator/data/char_in.txt
-@@ -15,6 +15,7 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
-+$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
-@@ -71,6 +72,7 @@ $L ($L | $V | $LV | $LVT);
- [^$Control $CR $LF] $Extend;
- 
- [^$Control $CR $LF] $SpacingMark;
-+$Prepend [^$Control $CR $LF];
- 
- 
- ## -------------------------------------------------
-@@ -92,6 +94,7 @@ $T ($LVT | $T);
- 
- $Extend      [^$Control $CR $LF];
- $SpacingMark [^$Control $CR $LF];
-+[^$Control $CR $LF] $Prepend;
- 
- 
- ## -------------------------------------------------
---
-cgit v0.9.0.2-2-gbebe
diff --git a/app-office/libreoffice/files/libreoffice-3.5.2-icu-49.patch b/app-office/libreoffice/files/libreoffice-3.5.2-icu-49.patch
index 9f0693958213..66ea45a5ae37 100644
--- a/app-office/libreoffice/files/libreoffice-3.5.2-icu-49.patch
+++ b/app-office/libreoffice/files/libreoffice-3.5.2-icu-49.patch
@@ -1,54 +1,87 @@
-From 0c08a84c04b166ab6479716e2c33cd444d7e3dbe Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Date: Mon, 2 Apr 2012 18:46:32 +0200
-Subject: [PATCH] Make ICU build with icu-49 by removing no-longer used variables.
+From ba3550bc82b8fb697b905c9913e399e1835b7cc0 Mon Sep 17 00:00:00 2001
+From: Eike Rathke <erack@redhat.com>
+Date: Tue, 03 Apr 2012 14:15:48 +0000
+Subject: as of ICU 4.9 RBBI the Prepend property is empty
 
-Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
----
- i18npool/source/breakiterator/data/char.txt    |    1 -
- i18npool/source/breakiterator/data/char_in.txt |    3 ---
- 2 files changed, 0 insertions(+), 4 deletions(-)
+Backport of 43084e8b30c101a44510b7a8267d5c2b316a17bb
+* config_host.mk doesn't exist, instead changes to set_soenv.in
+* i18npool/CustomTarget_breakiterator.mk doesn't exist, instead same changes
+  to i18npool/source/breakiterator/Makefile
+* char.txt and char_in.txt unchanged
 
-diff --git a/i18npool/source/breakiterator/data/char.txt b/i18npool/source/breakiterator/data/char.txt
-index 8e49a56..acb932e 100644
---- a/i18npool/source/breakiterator/data/char.txt
-+++ b/i18npool/source/breakiterator/data/char.txt
-@@ -16,7 +16,6 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
--$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data
-diff --git a/i18npool/source/breakiterator/data/char_in.txt b/i18npool/source/breakiterator/data/char_in.txt
-index 5e1ed67..5ad12a7 100644
---- a/i18npool/source/breakiterator/data/char_in.txt
-+++ b/i18npool/source/breakiterator/data/char_in.txt
-@@ -15,7 +15,6 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
--$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
-@@ -72,7 +71,6 @@ $L ($L | $V | $LV | $LVT);
- [^$Control $CR $LF] $Extend;
- 
- [^$Control $CR $LF] $SpacingMark;
--$Prepend [^$Control $CR $LF];
- 
- 
- ## -------------------------------------------------
-@@ -94,7 +92,6 @@ $T ($LVT | $T);
+Signed-off-by: Tomáš Chvátal <tomas.chvatal@gmail.com>
+---
+diff --git a/configure.in b/configure.in
+index ea959e6..8e45756 100644
+--- a/configure.in
++++ b/configure.in
+@@ -6162,6 +6162,7 @@ ICU_MAJOR=
+ ICU_MINOR=
+ ICU_MICRO=
+ ICU_RECLASSIFIED_CLOSE_PARENTHESIS=
++ICU_RECLASSIFIED_PREPEND_SET_EMPTY=
+ AC_MSG_CHECKING([which icu to use])
+ if test "$with_system_icu" = "yes"; then
+     AC_MSG_RESULT([external])
+@@ -6207,6 +6208,9 @@ if test "$with_system_icu" = "yes"; then
+         if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "4"; then
+             ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
+         fi
++        if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "9"; then
++            ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
++        fi
+     fi
  
- $Extend      [^$Control $CR $LF];
- $SpacingMark [^$Control $CR $LF];
--[^$Control $CR $LF] $Prepend;
+     MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS icui18n$ICU_MAJOR$ICU_MINOR.dll icuuc$ICU_MAJOR$ICU_MINOR.dll icudata$ICU_MAJOR$ICU_MINOR.dll"
+@@ -6214,6 +6218,7 @@ else
+     AC_MSG_RESULT([internal])
+     SYSTEM_ICU="NO"
+     ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
++    # ICU_RECLASSIFIED_PREPEND_SET_EMPTY not applied for our internal ICU 4.4.2
+     BUILD_TYPE="$BUILD_TYPE ICU"
+ fi
+ AC_SUBST(SYSTEM_ICU)
+@@ -6224,6 +6229,7 @@ AC_SUBST(ICU_MAJOR)
+ AC_SUBST(ICU_MINOR)
+ AC_SUBST(ICU_MICRO)
+ AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
++AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
  
+ dnl ===================================================================
+ dnl Graphite
+diff --git a/i18npool/source/breakiterator/Makefile b/i18npool/source/breakiterator/Makefile
+index b34217a..6aed8b2 100644
+--- a/i18npool/source/breakiterator/Makefile
++++ b/i18npool/source/breakiterator/Makefile
+@@ -83,10 +83,16 @@ OpenOffice_dat.c : $(subst .brk,_brk.c,$(BRKFILES))
+ %.brk : %.txt.p
+ 	$(GENBRK) -r $< -o $@
  
- ## -------------------------------------------------
--- 
-1.7.3.4
-
+-# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards
++# fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4
++# Prepend set empty as of Unicode Version 6.1 / ICU 4.9, which bails out if used.
++# NOTE: strips every line with _word_ 'Prepend', including $Prepend
+ %.txt.p : $(realpath $(SRC_ROOT)/i18npool/source/breakiterator/data)/%.txt
+ ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES)
++ifeq ($(ICU_RECLASSIFIED_PREPEND_SET_EMPTY),YES)
++	sed "s#\[:LineBreak =  Close_Punctuation:\]#\[\[:LineBreak =  Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#;/\<Prepend\>/d" $< > $@
++else
+ 	sed "s#\[:LineBreak =  Close_Punctuation:\]#\[\[:LineBreak =  Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
++endif
+ else
+ 	cp $< $@
+ endif
+diff --git a/set_soenv.in b/set_soenv.in
+index 3dc9cfa..a8561cd 100755
+--- a/set_soenv.in
++++ b/set_soenv.in
+@@ -1881,6 +1881,7 @@ ToFile( "ICU_MAJOR",         "@ICU_MAJOR@",        "e" );
+ ToFile( "ICU_MINOR",         "@ICU_MINOR@",        "e" );
+ ToFile( "ICU_MICRO",         "@ICU_MICRO@",        "e" );
+ ToFile( "ICU_RECLASSIFIED_CLOSE_PARENTHESIS", "@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@", "e" );
++ToFile( "ICU_RECLASSIFIED_PREPEND_SET_EMPTY", "@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@", "e" );
+ ToFile( "SYSTEM_GENBRK",     "@SYSTEM_GENBRK@",    "e" );
+ ToFile( "SYSTEM_GENCCODE",   "@SYSTEM_GENCCODE@",  "e" );
+ ToFile( "SYSTEM_GENCMN",     "@SYSTEM_GENCMN@",    "e" );
+--
+cgit v0.9.0.2-2-gbebe