Revision bump to 3.5.4.2-r1 to fix issues with hebrew. Depend on icu-49 hard. Fixes bug#418095.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

6 files changed, 237 insertions, 568 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index fed49c163ece..4a6da07c064b 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,15 @@
 # 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.318 2012/05/27 15:30:31 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.319 2012/05/29 09:02:19 scarabeus Exp $
+
+*libreoffice-3.5.4.2-r1 (29 May 2012)
+
+  29 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/libreoffice-3.5-hebrew-icu49.patch, +libreoffice-3.5.4.2-r1.ebuild,
+  -libreoffice-3.5.3.2.ebuild, -libreoffice-3.5.4.2.ebuild,
+  libreoffice-3.5.9999.ebuild:
+  Revision bump to 3.5.4.2-r1 to fix issues with hebrew. Depend on icu-49 hard.
+  Fixes bug#418095.
 
   27 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   files/generate_libreoffice_package.sh:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 7b54f06988ca..9cfecdf997cf 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX generate_libreoffice_package.sh 3601 RMD160 0ce44e076c1d146c4590b3dead79bab67441049e SHA1 a417cb8dddccd21e7da005b7701fbeec9b755f68 SHA256 9ef6dfc77a5707c592589270adf5105d8fc07a7f7b564fd73abb37e6e8d51f55
 AUX libreoffice-3.5-doublebuild.patch 887 RMD160 dd38de91af9b513e3b66bfa53a5d74635fdc16e2 SHA1 5cae5b8aedd7f18d526e61c465f944d46e06de4d SHA256 15dba3ca6be47bffe26e9eae73ed356a3e75fde97c5000b9a19b61906af8f5f8
+AUX libreoffice-3.5-hebrew-icu49.patch 5661 RMD160 0eb99d6c5a30512820540e285667e3b6aefdedfc SHA1 f7dda045920175b03e683ad440913088e6c485b9 SHA256 169ec723b1453b932deefafada3e4dcbc038a336c427657021e1de8afadd8ab9
 AUX libreoffice-3.5-propagate-gb_FULLDEPS.patch 922 RMD160 251ea777df53418e6acbb208e2a57ba374ad17a3 SHA1 09ede0550fcc518a3d30e4ebc06f842ef79b39c4 SHA256 73cbbec0744fc8cce99f5c9dd499935e9bf2db2e3d994045fab4c328116e3724
 AUX libreoffice-3.5.2-icu-49.patch 3762 RMD160 c729b31e645b8b7b58a7611e0b69e6e33901418c SHA1 7a3b36e8911e1db416b9d76f82a9795aab56c518 SHA256 04c2c9104361d8f308a86d115e5724fd9b18739ed480884990bfae77248d2096
 AUX libreoffice-3.5.2-tests-headless.patch 1454 RMD160 1ccaef750685e358b358d8d3f094ba888d3d8d0c SHA1 8b84eda96ec4583adb42a3786566b27879a8c000 SHA256 35453c99132f8c65b744f43cbb93f42a668298aa2d752039842cb830844230f9
@@ -19,36 +20,32 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 RMD160 923870cf8802
 DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 RMD160 28bdf89bab559d82d82c75f6a339b5351ee06f48 SHA1 528dc8fa11343fa2a5d584dd2f8d5e2238ed78ba SHA256 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825
 DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 RMD160 a2776747753219a110e8d5b39939d0914cfec37d SHA1 908c4053f8f4e6214426a41b1e4134e7bc86098e SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941
 DIST libreoffice-binfilter-3.5.2.2.tar.xz 5979532 RMD160 104eb7ef0c53700b664d7cae871d96ac9cd2a286 SHA1 feeaa103adf07f9eb5578f4073a8a464b2abadfd SHA256 aadccf388989331d0738059e6fd0c70b9fb48bb6ca622a243365d8253b1a4b30
-DIST libreoffice-binfilter-3.5.3.2.tar.xz 5979484 RMD160 48a65d7d3b5f7de01ee4e2d74a1ba2a3ec29805a SHA1 b499371af021ee59622d179c3a32dc736611653d SHA256 332344f8b8241e30ef31fc2f4ed24b2b1b2d252a7eae64cd9709fd1a7c7da847
 DIST libreoffice-binfilter-3.5.4.2.tar.xz 5978820 RMD160 272f7467b82eb99ca3a81fdea5692ae6da59aedf SHA1 89a156c9603aac1f70dc1b4108fa3cb335ffe1fa SHA256 7c1a471358c4028ef8aa542c50ce0852ba2960be9dfb2ebbf0103ad59389d07a
 DIST libreoffice-branding-gentoo-0.4.tar.xz 130792 RMD160 39c693e84e13d7199f9505b5616cffd5b7072d3b SHA1 e12d41b67b75f3507b86d12b3c182195269d6210 SHA256 9a870560cd470234039ab136c1bb023a0da3fa8d0ffa4f6770b830fec707fc9a
 DIST libreoffice-branding-gentoo-0.5.tar.xz 150616 RMD160 e8d475d184fdfd75f348772edac6a6eb76613341 SHA1 83da8ba0db288a827e805780e01edeccd2f51ccc SHA256 91beaf63fca297914cb4390b760ffef52b03450ecb52affab0f124a2dbd63a63
 DIST libreoffice-core-3.5.2.2.tar.xz 103296172 RMD160 8e1b87e2ea35683ee31e0a2b209d85f14ba85753 SHA1 ab0cfa84a11ec4d18afe7095235a4b4c904e9649 SHA256 df681145f7f1dda30e3f82d4924722957662d744df0e7b6fa024b2bd53fb3dc6
-DIST libreoffice-core-3.5.3.2.tar.xz 103327220 RMD160 cb084b763e6a8136ab23f368b7fc44a911ee2744 SHA1 33bdaec948367c5b06c2b6a7c39ceaa865abe28d SHA256 182a1dadbf4ed7dc758466aa4f1c2ee79dbc57d65ba94872fa6aaeef3f3847ad
 DIST libreoffice-core-3.5.4.2.tar.xz 103422460 RMD160 e118cfa44ba198fa3d3fe8fc21bd1e3940270868 SHA1 a01d77612c9678d52a75fb160590bb76d670d7f6 SHA256 3eeb89d05fa423c446767defd54ff89456b2ead8fc4628c3403043d4c1845faa
-DIST libreoffice-help-3.5.3.2.tar.xz 1857688 RMD160 e836522c25b19a03af5645baeb8e5349a9d74e46 SHA1 305c5fa9213f90c9f87d67e5e7d4b8faac49ee1a SHA256 cf6e6d9610aa594597fb079cac5091b0f4ab4a063c5f4a82021b0b4a6fa539ae
 DIST libreoffice-help-3.5.4.2.tar.xz 1857756 RMD160 ce00c1893e0315fa7cee156707553fdcebb552d2 SHA1 0d417affc2b91ef345cb010f3a2d11a6417b7f44 SHA256 61e93d4ad9c1ad1308fe85f8416bf9dfafd875ba9cdb2050890b7b0e1abf4869
 EBUILD libreoffice-3.5.2.2.ebuild 14796 RMD160 50e705b52d06cbe7e2aa820fbafd8cbe56997d7a SHA1 c0130bdd1cd67d9d60a285ff2842581952d6eb24 SHA256 69394c1cf5045771069a2cd2fcbb0b2e64127b57ae637447364f53947db5033f
-EBUILD libreoffice-3.5.3.2.ebuild 15391 RMD160 ab20a10477855e6f862dbb81ec27c01a7c8f69e5 SHA1 1feb39d7eb3c4de770abc2969e30524972d82bbd SHA256 a2c0135be6478664ff1cdc1df4ae30056aa65e19bfcc562ccbfded04135e756c
-EBUILD libreoffice-3.5.4.2.ebuild 15585 RMD160 22055c455c0a2da2f177d1fff0cad13f2a719905 SHA1 c26a1d0f78ea1f57a8f9c5c25c8e5832e2f5dbf2 SHA256 9ceaae1f93448b4eaa517251a9bf76bba0992069be9fb22eeb8ebbb883386ea9
-EBUILD libreoffice-3.5.9999.ebuild 15586 RMD160 a78bf12f84f4df571a84ab33fe9990a9a647814d SHA1 8a05f6987bd13b33dcc8addb91cbfa369e85144e SHA256 934a486bf305efd79929dbacac5515d34b55552847be5fca26de57231d4c191f
+EBUILD libreoffice-3.5.4.2-r1.ebuild 15626 RMD160 fe49f600b207f00da13fba22fbf9d5cac84c5113 SHA1 c2c9e22175137b6e5557c447d3b7efc0b2025f47 SHA256 91ffc5865b001afc1f84a55e02518f9ffcd86c0a5f2fca262c505ec16fb83d85
+EBUILD libreoffice-3.5.9999.ebuild 15625 RMD160 413c2b2bd9e38194a354d698e0982bd10b0d1073 SHA1 0b2b8f7ed19cb170f1dfb7d95e0d80fe86e76f72 SHA256 b12a77280c596c6c7362bbf2f0a6fd574db8875849382fb45280ec9ec429a734
 EBUILD libreoffice-9999-r2.ebuild 17293 RMD160 01ff4e9e5001f517d8a40782aa28f5009ac4678c SHA1 5181780996cef5caa68f029dbf8979a874ba1f22 SHA256 9ad355d40096bb62838abfe221948fdecd73285dc9df05ce10b32745f7ee6c30
-MISC ChangeLog 58632 RMD160 6f9465bdb8c91efb6ea16d08b011595604643b1b SHA1 e5ba3eac1f43f6c38ac747c8a7f176349198e262 SHA256 7ee04ebb9687c9f94903faddf11985bcf84bcb4b82f457b14c23af46f453229a
+MISC ChangeLog 58995 RMD160 a49b3eb1a6cfaf8b60db7a6583634e935ac91592 SHA1 bdd80bc41dfe99fad6d9e382a4178de47e10a090 SHA256 1d5b8032da6c7d47a66398aee54373f80cc1ed2574a4adf4fe305ba8c324d900
 MISC metadata.xml 1534 RMD160 24433486738eb58853e959332201611cf24fd5c6 SHA1 05d71c3efc820312fcf61f0fee4cb8d6e91a7c52 SHA256 2f095ea98ee3715366a47bfb72683434384d06526cb66a3db8b071fed537b401
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPwkjcAAoJENwGBM22xffemrgP/1bG3JpXYzTzRb52pbeLa8U0
-2NxwqOeqILiJ05F3uSUb4ihCP2HjjsfealbmR7nlqG7vbI040SwAzExiKhTm22+Q
-seaAivY05/iexyR9NPiI56ZcNIt35kTheGUar+5SmlIaKvu8hTFxiK8R1z/pfGby
-q7vN9ZKMvwBdeYuI64YkXTeiC6+6xLCkJR62tAYAZPi+3T0MbLd9UsOOz51u68q/
-YcPCVXvwHwljVICCMDORUHThii2NBLYdoQBFJzNNWjOKQ2olTiR9VBa6d/jKkNUS
-qjuypiZJ8RdtpN+YdQcbQZfC2cSH5X1IzY5mdNBTR4ov8H1pYxlPHhJj0lnFgUfx
-5TdZXKc9CgoG5jD+2wurvAa4QH85oduhe1tV5HddXb3w9SDrXBD9hQrFAUrYu+7F
-MnHOt4tMOLXlmEdVrv9psEbEmpQivfDl7mILWoZpIA/DLv2TNS0/kjbgWhSu4i0C
-23ZbNheiQBS6eKzXXNjsJGyRCoQBGzqOWh9LApzCISxorVAsekBFzuyGi9I+eb46
-zBqNDNW7XqMoc4yl8OBaLjzblu9lWdv3ejq6viCEyVKbtRrv0rPORnq8Cb7+NBeQ
-ckQkGX0AZXO15L09c40/1vrwImlnrXz46ANjNILr3rzsU/SGZqFgvwGdD4/RMnzo
-viqaJUPrrl6PuFXu7jOF
-=LSUR
+iQIcBAEBAgAGBQJPxJDpAAoJEOSiRoyO7jvo4RwQAKF6LfkZa8qpVMQeMRjnoOIl
+oU8u4Qka4IyVJJCMotqiT1+OAxYLGqUc4bBnLyD8sjRWeSQjeU6YOsjKDrhJ/UxQ
+ixSO51e+ENsSZutSyldSfXai90lADb1UGJLIm7VZhqFGVDZfVuP2S40UDHTn7e+V
+tZtLOKUVZunuA0cdFtsggQZzLGGE8T02zA/Er1oVqeYMwwbXCfs25483b1yeGXHt
+GIv4aE6MMeDmza19wEbFinX2Fb6TMXr3LDlujsPXfm47ap8yJ0Tf68nFcytR4V06
+LmvGXVqxvrK4rrL4gw6e7Wh25ezB+lGMV1GTrd+nDEHHs4nvhkC2hbIrKsr9P/rR
+NtttWLhbD8Wf5ZOZvfOymZ/NPzRuw7NXFRBa8bT8+LhgoEIbAb/gnfJIhPBjc+Pt
+nk21+SOcx06VzpKPghAZYhfhhXD52h51nPMVZImrHm8t5mz6EnUNzSY2fadcrZAs
+LRfF/kckuQZO43ApTUTSOweCYgOMCBjUXv/+xYzrnr4thmmPEaprH6TX5u8bwPrC
+vo9v6op9iPMCe8C2HOdxckB7dwds6xBVyye+Qg/CzlAb6ZD4H2nDZEt6/lPfH+By
+BJoPibVoUXHiQrCtc05pOa1R+aPl9sayhzFJowkT5+qHKQ8jok5+jl/YM/OaVghR
+pf/3NjJU8XNuvb03BflG
+=OOuk
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-3.5-hebrew-icu49.patch b/app-office/libreoffice/files/libreoffice-3.5-hebrew-icu49.patch
new file mode 100644
index 000000000000..6156f06f1ceb
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.5-hebrew-icu49.patch
@@ -0,0 +1,202 @@
+From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001
+From: Caolán McNamara <caolanm@redhat.com>
+Date: Sun, 13 May 2012 21:41:30 +0000
+Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules
+
+i.e.  sync with svn diff -c 31071
+http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt
+
+Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6
+---
+diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt
+index cbabee6..91c8f3d 100644
+--- a/i18npool/source/breakiterator/data/line.txt
++++ b/i18npool/source/breakiterator/data/line.txt
+@@ -61,11 +61,13 @@ $BB = [:LineBreak =  Break_Before:];
+ $BK = [:LineBreak =  Mandatory_Break:];
+ $B2 = [:LineBreak =  Break_Both:];
+ $CB = [:LineBreak =  Contingent_Break:];
++$CJ = [:LineBreak =  Conditional_Japanese_Starter:];
+ $CL = [:LineBreak =  Close_Punctuation:] ;
+ $CM = [:LineBreak =  Combining_Mark:];
+ $CR = [:LineBreak =  Carriage_Return:];
+ $EX = [:LineBreak =  Exclamation:];
+ $GL = [:LineBreak =  Glue:];
++$HL = [:LineBreak =  Hebrew_Letter:];
+ $HY = [:LineBreak =  Hyphen:];
+ $H2 = [:LineBreak =  H2:];
+ $H3 = [:LineBreak =  H3:];
+@@ -77,7 +79,7 @@ $JV = [:LineBreak =  JV:];
+ $JT = [:LineBreak =  JT:];
+ $LF = [:LineBreak =  Line_Feed:];
+ $NL = [:LineBreak =  Next_Line:];
+-$NS = [:LineBreak =  Nonstarter:];
++$NS = [[:LineBreak =  Nonstarter:] $CJ];
+ $NU = [:LineBreak =  Numeric:];
+ $OP = [[:LineBreak =  Open_Punctuation:] - $DG];
+ $PO = [:LineBreak =  Postfix_Numeric:];
+@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*;
+ $CLcm = $CL $CM*;
+ $EXcm = $EX $CM*;
+ $GLcm = $GL $CM*;
++$HLcm = $HL $CM*;
+ $HYcm = $HY $CM*;
+ $H2cm = $H2 $CM*;
+ $H3cm = $H3 $CM*;
+@@ -150,6 +153,7 @@ $B2 $CM+;
+ $CL $CM+;
+ $EX $CM+;
+ $GL $CM+;
++$HL $CM+;
+ $HY $CM+;
+ $H2 $CM+;
+ $H3 $CM+;
+@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM];       # Bases that can't take CMs
+ #            so for this one case we need to manually list out longer sequences.
+ #
+ $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP];
+-$AL_FOLLOW_CM   = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
++$AL_FOLLOW_CM   = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
+ $AL_FOLLOW      = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM];
+ 
+ 
+@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm);
+ $BBcm [^$CB];                                  #  $BB  x
+ $BBcm $LB20NonBreaks $CM*;
+ 
++# LB 21a Don't break after Hebrew + Hyphen
++#   HL (HY | BA) x
++#  
++$HLcm ($HYcm | $BAcm) [^$CB]?;
++
+ # LB 22
+-$ALcm    $INcm;
++($ALcm | $HLcm) $INcm;
+ $CM+     $INcm;     #  by rule 10, any otherwise unattached CM behaves as AL
+ $IDcm    $INcm;
+ $INcm    $INcm;
+@@ -331,16 +340,18 @@ $NUcm    $INcm;
+ # $LB 23
+ $IDcm  $POcm;
+ $ALcm  $NUcm;       # includes $LB19
++$HLcm  $NUcm;
+ $CM+   $NUcm;       # Rule 10, any otherwise unattached CM behaves as AL
+ $NUcm  $ALcm;
++$NUcm  $HLcm;
+ 
+ #
+ # LB 24
+ #
+ $PRcm $IDcm;
+ $ALcm $PRcm;
+-$PRcm $ALcm;
+-$POcm $ALcm;
++$PRcm ($ALcm | $HLcm);
++$POcm ($ALcm | $HLcm);
+ 
+ #
+ # LB 25   Numbers.
+@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
+ 
+ # LB 28   Do not break between alphabetics
+ #
+-$ALcm $ALcm;
+-$CM+ $ALcm;      # The $CM+ is from rule 10, and unattached CM is treated as AL
++($ALcm | $HLcm) ($ALcm | $HLcm);
++$CM+ ($ALcm | $HLcm);      # The $CM+ is from rule 10, an unattached CM is treated as AL
+ 
+ # LB 29
+ $IScm ($ALcm | $NUcm);
+@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm);
+ # Rule 30   Do not break between letters, numbers or ordinary symbols
+ #           and opening or closing punctuation
+ #
+-($ALcm | $NUcm) $OPcm;
++($ALcm | $HLcm | $NUcm) $OPcm;
+ $CM+ $OPcm;
+-$CLcm ($ALcm | $NUcm);
+-
+-
++$CLcm ($ALcm | $HLcm | $NUcm);
+ 
+ #
+ #  Reverse Rules.
+@@ -391,6 +400,7 @@ $CM+ $B2;
+ $CM+ $CL;
+ $CM+ $EX;
+ $CM+ $GL;
++$CM+ $HL;
+ $CM+ $HY;
+ $CM+ $H2;
+ $CM+ $H3;
+@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM];     #  . x (BA | HY | NS)
+ $CM* [$LB20NonBreaks-$CM] $CM* $BB;                   #  BB x .
+ [^$CB] $CM* $BB;                                      # 
+ 
+-
++# LB21a
++[^$CB] $CM* ($HY | $BA) $CM* $HL;
+ 
+ # LB 22
+-$CM* $IN $CM* $ALPlus;
++$CM* $IN $CM* ($ALPlus | $HL);
+ $CM* $IN $CM* $ID;
+ $CM* $IN $CM* $IN;
+ $CM* $IN $CM* $NU;
+ 
+ # LB 23
+ $CM* $PO $CM* $ID;
+-$CM* $NU $CM* $ALPlus;
+-$CM* $ALPlus $CM* $NU;
++$CM* $NU $CM* ($ALPlus | $HL);
++$CM* ($ALPlus | $HL) $CM* $NU;
+ 
+ # LB 24
+ $CM* $ID $CM* $PR;
+ $CM* $PR $CM* $ALPlus;
+-$CM* $ALPlus $CM* $PR;
+-$CM* $ALPlus $CM* $PO;
++$CM* ($ALPlus | $HL) $CM* $PR;
++$CM* ($ALPlus | $HL) $CM* $PO;
+ 
+ $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP;
+ $CM* $NU+ $CM* $HY+ / $SP;
+@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL);
+ $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR;
+ 
+ # LB 28
+-$CM* $ALPlus $CM* $ALPlus;
+-
++$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL);
+ 
+ # LB 29
+ $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP];
+ 
+ # LB 30
+-$CM* $OP $CM* ($NU | $ALPlus);
+-$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP];
++$CM* $OP $CM* ($ALPlus | $HL | $NU);
++$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP];
+ 
+ 
+ ## -------------------------------------------------
+@@ -609,6 +619,9 @@ $SP+ $CM* $QU;
+ $SP+ $CM* $CL;
+ $SP+ $CM* $B2;
+ 
++# LB 21
++$CM* ($HY | $BA) $CM* $HL;
++
+ # LB 18
+ ($CM* ($IS | $SY))+ $CM* $NU;
+ $CL $CM* ($NU | $IS | $SY);
+@@ -629,6 +642,6 @@ $dictionary $dictionary;
+ #  turn off rule chaining.  We don't want to move more
+ #  than necessary.
+ #
+-[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary];
++[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary];
+ $dictionary $dictionary;
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/app-office/libreoffice/libreoffice-3.5.3.2.ebuild b/app-office/libreoffice/libreoffice-3.5.3.2.ebuild
deleted file mode 100644
index 3c109a31e3c0..000000000000
--- a/app-office/libreoffice/libreoffice-3.5.3.2.ebuild
+++ /dev/null
@@ -1,541 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.3.2.ebuild,v 1.9 2012/05/13 21:34:32 dilfridge Exp $
-
-EAPI=4
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
-	http://dev-builds.libreoffice.org/pre-releases/src
-	http://download.documentfoundation.org/libreoffice/src
-	http://download.documentfoundation.org/libreoffice/old/src
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.5.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite."
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-MODULES="core binfilter help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		for mod in ${MODULES}; do
-			if [[ ${mod} == binfilter ]]; then
-				SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.xz )"
-			else
-				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
-			fi
-		done
-		unset mod
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
-ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="binfilter +branding +cups dbus eds gnome +graphite gstreamer +gtk
-jemalloc kde mysql nlpsolver +nsplugin odk opengl pdfimport postgres svg test
-+vba +webdav +xmlsec"
-LICENSE="LGPL-3"
-SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-NSS_DEPEND="
-	>=dev-libs/nspr-4.8.8
-	>=dev-libs/nss-3.12.9
-"
-
-COMMON_DEPEND="
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.3.2-r3
-	app-text/mythes
-	>=app-text/libexttextcat-3.2
-	app-text/libwpd:0.9[tools]
-	app-text/libwpg:0.2
-	>=app-text/libwps-0.2.2
-	dev-cpp/libcmis
-	dev-db/unixODBC
-	dev-libs/expat
-	>=dev-libs/glib-2.28
-	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.8.1.1
-	>=dev-lang/perl-5.0
-	>=dev-libs/openssl-1.0.0d
-	>=dev-libs/redland-1.0.14[ssl]
-	>=media-libs/fontconfig-2.8.0
-	media-libs/freetype:2
-	>=media-libs/libpng-1.4
-	media-libs/libvisio
-	>=net-misc/curl-7.21.4
-	sci-mathematics/lpsolve
-	>=sys-libs/db-4.8
-	virtual/jpeg
-	>=x11-libs/cairo-1.10.0[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	dbus? ( >=dev-libs/dbus-glib-0.92 )
-	eds? ( gnome-extra/evolution-data-server )
-	gnome? (
-		gnome-base/gconf:2
-		gnome-base/orbit
-	)
-	gtk? ( >=x11-libs/gtk+-2.24:2 )
-	graphite? ( media-gfx/graphite2 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10
-	)
-	java? (
-		>=dev-java/bsh-2.0_beta4
-		dev-java/lucene:2.9
-		dev-java/lucene-analyzers:2.3
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-	opengl? ( virtual/opengl )
-	pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] )
-	postgres? ( >=dev-db/postgresql-base-8.4.0 )
-	svg? ( gnome-base/librsvg )
-	webdav? ( net-libs/neon )
-	xmlsec? ( ${NSS_DEPEND} )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice-bin
-	!app-office/openoffice
-	media-fonts/libertine-ttf
-	media-fonts/liberation-fonts
-	media-fonts/urw-fonts
-	cups? ( net-print/cups )
-	java? ( >=virtual/jre-1.6 )
-"
-
-PDEPEND="
-	>=app-office/libreoffice-l10n-3.5.0
-"
-
-# FIXME: cppunit should be moved to test conditional
-#	 after everything upstream is under gbuild
-#	 as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.46
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
-	dev-perl/Archive-Zip
-	dev-util/cppunit
-	>=dev-util/gperf-3
-	dev-util/intltool
-	dev-util/mdds
-	virtual/pkgconfig
-	media-libs/sampleicc
-	net-misc/npapi-sdk
-	net-print/cups
-	>=sys-apps/findutils-4.4.2
-	sys-devel/bison
-	sys-apps/coreutils
-	sys-devel/flex
-	sys-devel/gettext
-	>=sys-devel/make-3.82
-	sys-libs/zlib
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-proto/randrproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	java? (
-		=virtual/jdk-1.6*
-		>=dev-java/ant-core-1.7
-		test? ( dev-java/junit:4 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.5.3-svtools-includes.patch"
-	# this can't be upstreamed :(
-	"${FILESDIR}/${PN}-system-pyuno.patch"
-	"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
-	"${FILESDIR}/${PN}-3.5-doublebuild.patch"
-)
-
-REQUIRED_USE="
-	nsplugin? ( gtk )
-	gnome? ( gtk )
-	eds? ( gnome )
-	nlpsolver? ( java )
-"
-
-S="${WORKDIR}/${PN}-core-${PV}"
-
-RESTRICT="test"
-
-pkg_pretend() {
-	local pgslot
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		CHECKREQS_DISK_BUILD="6G"
-		check-reqs_pkg_pretend
-
-		if [[ $(gcc-major-version) -lt 4 ]]; then
-			eerror "Compilation with gcc older than 4.0 is not supported"
-			die "Too old gcc found."
-		fi
-	fi
-
-	# ensure pg version
-	if use postgres; then
-		 pgslot=$(postgresql-config show)
-		 if [[ ${pgslot//.} < 90 ]] ; then
-		 	eerror "PostgreSQL slot must be set to 9.0 or higher."
-			eerror "    postgresql-config set 9.0"
-			die "PostgreSQL slot is not set to 9.0 or higher."
-		 fi
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	kde4-base_pkg_setup
-
-	python_set_active_version 2
-	python_pkg_setup
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		CHECKREQS_DISK_BUILD="6G"
-		check-reqs_pkg_pretend
-	fi
-}
-
-src_unpack() {
-	local mod dest tmplfile tmplname mypv
-
-	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-	if use branding; then
-		unpack "${BRANDING}"
-	fi
-
-	if [[ ${PV} != *9999* ]]; then
-		for mod in ${MODULES}; do
-			if [[ ${mod} == binfilter ]] && ! use binfilter; then
-				continue
-			fi
-			unpack "${PN}-${mod}-${PV}.tar.xz"
-			if [[ ${mod} != core ]]; then
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
-		done
-	else
-		for mod in ${MODULES}; do
-			if [[ ${mod} == binfilter ]] && ! use binfilter; then
-				continue
-			fi
-			mypv=${PV/.9999}
-			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
-			EGIT_PROJECT="${PN}/${mod}"
-			EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
-			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
-			EGIT_NOUNPACK="true"
-			git-2_src_unpack
-			if [[ ${mod} != core ]]; then
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
-		done
-		unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
-	fi
-}
-
-src_prepare() {
-	# optimization flags
-	export ARCH_FLAGS="${CXXFLAGS}"
-	export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-
-	# patchset
-	if [[ -n ${PATCHSET} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	base_src_prepare
-	eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-	# system pyuno mess
-	sed \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		-i pyuno/source/module/uno.py \
-		-i scripting/source/pyprov/officehelper.py || die
-
-}
-
-src_configure() {
-	local java_opts
-	local internal_libs
-	local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
-
-	# recheck that there is some value in jobs
-	[[ -z ${jbs} ]] && jbs="1"
-
-	# sane: just sane.h header that is used for scan in writer, not
-	#	linked or anything else, worthless to depend on
-	# vigra: just uses templates from there
-	#	 it is serious pain in the ass for packaging
-	#	 should be replaced by boost::gil if someone interested
-	internal_libs+="
-		--without-system-sane
-		--without-system-vigra
-	"
-
-	if use java; then
-		# hsqldb: system one is too new
-		# saxon: system one does not work properly
-		java_opts="
-			--without-system-hsqldb
-			--without-system-saxon
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-java-target-version=$(java-pkg_get-target)
-			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
-			--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
-			--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
-			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
-		"
-		if use test; then
-			java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
-		else
-			java_opts+=" --without-junit"
-		fi
-	fi
-
-	if use branding; then
-		internal_libs+="
-			--with-about-bitmap="${WORKDIR}/branding-about.png"
-			--with-intro-bitmap="${WORKDIR}/branding-intro.png"
-		"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --disable-gnome-vfs: old gnome virtual fs support
-	# --disable-kdeab: kde3 adressbook
-	# --disable-kde: kde3 support
-	# --disable-ldap: ldap requires internal mozilla stuff, same like mozab
-	# --disable-mozilla: disable mozilla build that is used for adresbook, not
-	#   affecting the nsplugin that is always ON
-	# --disable-pch: precompiled headers cause build crashes
-	# --disable-rpath: relative runtime path is not desired
-	# --disable-static-gtk: ensure that gtk is linked dynamically
-	# --disable-ugly: disable ugly pieces of code
-	# --disable-zenity: disable build icon
-	# --enable-extension-integration: enable any extension integration support
-	# --with-{max-jobs,num-cpus}: ensuring parallel building
-	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --without-stlport: disable deprecated extensions framework
-	# --disable-ext-report-builder: too much java packages pulled in
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
-		--with-system-headers \
-		--with-system-libs \
-		--with-system-jars \
-		--with-system-dicts \
-		--enable-cairo-canvas \
-		--enable-largefile \
-		--enable-python=system \
-		--enable-randr \
-		--enable-randr-link \
-		--enable-release-build \
-		--enable-unix-qstart-libpng \
-		--enable-mergelibs \
-		--disable-ccache \
-		--disable-crashdump \
-		--disable-dependency-tracking \
-		--disable-epm \
-		--disable-fetch-external \
-		--disable-gnome-vfs \
-		--disable-ext-report-builder \
-		--disable-kdeab \
-		--disable-kde \
-		--disable-ldap \
-		--disable-mozilla \
-		--disable-online-update \
-		--disable-pch \
-		--disable-rpath \
-		--disable-systray \
-		--disable-static-gtk \
-		--disable-strip-solver \
-		--disable-ugly \
-		--disable-zenity \
-		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
-		--with-build-version="Gentoo official package" \
-		--enable-extension-integration \
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-tar="${DISTDIR}" \
-		--with-lang="" \
-		--with-max-jobs=${jbs} \
-		--with-num-cpus=2 \
-		--with-unix-wrapper=libreoffice \
-		--with-vendor="Gentoo Foundation" \
-		--with-x \
-		--without-afms \
-		--without-fonts \
-		--without-myspell-dicts \
-		--without-stlport \
-		--without-system-mozilla \
-		--without-help \
-		--with-helppack-integration \
-		--without-sun-templates \
-		$(use_enable binfilter) \
-		$(use_enable dbus) \
-		$(use_enable eds evolution2) \
-		$(use_enable gnome gconf) \
-		$(use_enable gnome gio) \
-		$(use_enable gnome lockdown) \
-		$(use_enable graphite) \
-		$(use_enable gstreamer) \
-		$(use_enable gtk) \
-		--disable-gtk3 \
-		$(use_enable java ext-scripting-beanshell) \
-		$(use_enable kde kde4) \
-		$(use_enable mysql ext-mysql-connector) \
-		$(use_enable nlpsolver ext-nlpsolver) \
-		$(use_enable nsplugin) \
-		$(use_enable odk) \
-		$(use_enable opengl) \
-		$(use_enable pdfimport ext-pdfimport) \
-		$(use_enable postgres postgresql-sdbc) \
-		$(use_enable svg librsvg system) \
-		$(use_enable test linkoo) \
-		$(use_enable vba) \
-		$(use_enable vba activex-component) \
-		$(use_enable webdav neon) \
-		$(use_enable xmlsec) \
-		$(use_with java) \
-		$(use_with mysql system-mysql-cppconn) \
-		${internal_libs} \
-		${java_opts}
-}
-
-src_compile() {
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		 source "${S}/Env.Host.sh" 2&> /dev/null
-
-		 local path="${SOLARVER}/${INPATH}/res/img"
-		 mkdir -p "${path}" || die
-
-		 echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=default_images/res/helpimg > \"${path}/helpimg.ilst\""
-		 perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			  -dir=default_images/res/helpimg \
-			  > "${path}/helpimg.ilst"
-		 [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	# not a proper make script
-	make build || die
-}
-
-src_test() {
-	make check || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# Fix bash completion placement
-	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
-	rm -rf "${ED}"/etc/
-
-	# symlink the nsplugin to system location
-	if use nsplugin; then
-		inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
-	fi
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-	fi
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-}
-
-pkg_preinst() {
-	# Cache updates - all handled by kde eclass for all environments
-	kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-
-	use cups || \
-		ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
-
-	use java || \
-		ewarn 'If you plan to use lbase aplication you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-3.5.4.2.ebuild b/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild
index e2f54cd2d438..661426a1b63d 100644
--- a/app-office/libreoffice/libreoffice-3.5.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.4.2.ebuild,v 1.1 2012/05/23 00:22:24 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild,v 1.1 2012/05/29 09:02:19 scarabeus Exp $
 
 EAPI=4
 
@@ -96,7 +96,7 @@ COMMON_DEPEND="
 	dev-libs/expat
 	>=dev-libs/glib-2.28
 	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.8.1.1
+	>=dev-libs/icu-49
 	>=dev-lang/perl-5.0
 	>=dev-libs/openssl-1.0.0d
 	>=dev-libs/redland-1.0.14[ssl]
@@ -196,6 +196,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-system-pyuno.patch"
 	"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
 	"${FILESDIR}/${PN}-3.5-doublebuild.patch"
+	"${FILESDIR}/${PN}-3.5-hebrew-icu49.patch"
 )
 
 REQUIRED_USE="
@@ -227,7 +228,7 @@ pkg_pretend() {
 	if use postgres; then
 		 pgslot=$(postgresql-config show)
 		 if [[ ${pgslot//.} < 90 ]] ; then
-		 	eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "PostgreSQL slot must be set to 9.0 or higher."
 			eerror "    postgresql-config set 9.0"
 			die "PostgreSQL slot is not set to 9.0 or higher."
 		 fi
diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
index 6095eebe0ef3..c066d12e4981 100644
--- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.46 2012/05/23 08:45:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.47 2012/05/29 09:02:19 scarabeus Exp $
 
 EAPI=4
 
@@ -96,7 +96,7 @@ COMMON_DEPEND="
 	dev-libs/expat
 	>=dev-libs/glib-2.28
 	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.8.1.1
+	>=dev-libs/icu-49
 	>=dev-lang/perl-5.0
 	>=dev-libs/openssl-1.0.0d
 	>=dev-libs/redland-1.0.14[ssl]
@@ -196,6 +196,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-system-pyuno.patch"
 	"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
 	"${FILESDIR}/${PN}-3.5-doublebuild.patch"
+	"${FILESDIR}/${PN}-3.5-hebrew-icu49.patch"
 )
 
 REQUIRED_USE="