synced dev-libs/icu with main tree

8 files changed, 15 insertions, 438 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
deleted file mode 100644
index f3cf9d883..000000000
--- a/dev-libs/icu/ChangeLog
+++ /dev/null
@@ -1,281 +0,0 @@
-# ChangeLog for dev-libs/icu
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.77 2009/04/05 17:03:46 arfrever Exp $
-
-*icu-4.0.1 (05 Apr 2009)
-
-  05 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  metadata.xml, +icu-4.0.1.ebuild:
-  Version bump (bug #248912).
-
-  20 Feb 2008; Steve Dibb <beandog@gentoo.org> icu-3.6-r2.ebuild:
-  amd64 stable, security bug 208001
-
-  10 Feb 2008; Olivier Crête <tester@gentoo.org> icu-3.8.1-r1.ebuild:
-  Stable amd64, security bug #208001
-
-  07 Feb 2008; Raúl Porcel <armin76@gentoo.org> icu-3.6-r2.ebuild,
-  icu-3.8.1-r1.ebuild:
-  alpha/ia64/sparc stable wrt security #208001
-
-  04 Feb 2008; Christian Faulhammer <opfer@gentoo.org> icu-3.6-r2.ebuild,
-  icu-3.8.1-r1.ebuild:
-  stable x86, security bug 208001
-
-  03 Feb 2008; Jeroen Roovers <jer@gentoo.org> icu-3.6-r2.ebuild,
-  icu-3.8.1-r1.ebuild:
-  Stable for HPPA (bug #208001).
-
-  03 Feb 2008; Brent Baude <ranger@gentoo.org> icu-3.8.1-r1.ebuild:
-  Marking icu-3.8.1-r1 ppc and ppc64 for bug 208001
-
-  03 Feb 2008; Brent Baude <ranger@gentoo.org> icu-3.6-r2.ebuild:
-  Marking icu-3.6-r2 ppc and ppc64 for bug 208001
-
-*icu-3.6-r2 (02 Feb 2008)
-
-  02 Feb 2008; Christian Hoffmann <hoffie@gentoo.org>
-  +files/icu-3.6-regexp-CVE-2007-4770+4771.diff, +icu-3.6-r2.ebuild:
-  adding patch (by redhat) for CVE-2007-{4770,4771} per bug #208001 for 3.6
-  series as well
-
-*icu-3.8.1-r1 (02 Feb 2008)
-
-  02 Feb 2008; Christian Hoffmann <hoffie@gentoo.org>
-  +files/icu-3.8-regexp-CVE-2007-4770+4771.diff, +icu-3.8.1-r1.ebuild:
-  adding patch for CVE-2007-{4770,4771} per bug #208001, thanks to jakub
-
-*icu-3.8.1 (04 Jan 2008)
-
-  04 Jan 2008; Markus Ullmann <jokey@gentoo.org>
-  +files/icu-3.8-setBreakType-public.diff, +icu-3.8.1.ebuild:
-  Version bump from project overlay
-
-  14 Nov 2007; Samuli Suominen <drac@gentoo.org> icu-3.6-r1.ebuild:
-  amd64 stable wrt #198580
-
-  14 Nov 2007; Jeroen Roovers <jer@gentoo.org> icu-3.6-r1.ebuild:
-  Stable for HPPA (bug #198580).
-
-  11 Nov 2007; Raúl Porcel <armin76@gentoo.org> icu-3.6-r1.ebuild:
-  alpha/ia64/sparc stable wrt #198580
-
-  11 Nov 2007; Dawid Węgliński <cla@gentoo.org> icu-3.6-r1.ebuild:
-  Stable on x86 (bug #198580)
-
-  10 Nov 2007; Markus Rothe <corsair@gentoo.org> icu-3.6-r1.ebuild:
-  Stable on ppc64; bug #198580
-
-  09 Nov 2007; nixnut <nixnut@gentoo.org> icu-3.6-r1.ebuild:
-  Stable on ppc wrt bug 198580
-
-  27 Aug 2007; Markus Ullmann <jokey@gentoo.org> -icu-2.8.ebuild,
-  -icu-3.2.ebuild, -icu-3.4.1.ebuild:
-  some cleanup
-
-*icu-3.6-r1 (27 Aug 2007)
-
-  27 Aug 2007; Markus Ullmann <jokey@gentoo.org> +icu-3.6-r1.ebuild:
-  Version bump from project overlay
-
-  21 Aug 2007; Jakub Moc <jakub@gentoo.org> icu-3.6-r1.ebuild:
-  Add debug use flag
-
-  21 Aug 2007; Jakub Moc <jakub@gentoo.org> +metadata.xml, +icu-3.6-r1.ebuild:
-  Always install static libs as well, Bug 167481
-
-  14 Jul 2007; Raúl Porcel <armin76@gentoo.org> icu-3.6.ebuild:
-  alpha stable
-
-  02 Jun 2007; Raúl Porcel <armin76@gentoo.org> icu-3.6.ebuild:
-  Add ~alpha wrt #148659
-
-  08 May 2007; Fabian Groffen <grobian@gentoo.org> icu-3.4.1.ebuild,
-  icu-3.6.ebuild:
-  Dropped ppc-macos keyword, see you in prefix
-
-  21 Apr 2007; Raúl Porcel <armin76@gentoo.org> icu-3.6.ebuild:
-  ia64 stable
-
-  28 Mar 2007; Raúl Porcel <armin76@gentoo.org> icu-3.6.ebuild:
-  Add ~ia64 wrt bug 148659
-
-  28 Dec 2006; Jeroen Roovers <jer@gentoo.org> icu-3.6.ebuild:
-  Stable for HPPA (bug #158770).
-
-  23 Dec 2006; Peter Weller <welp@gentoo.org> icu-3.6.ebuild:
-  Stable on amd64
-
-  03 Dec 2006; Markus Rothe <corsair@gentoo.org> icu-3.6.ebuild:
-  Stable on ppc64
-
-  26 Nov 2006; Tiziano Müller <dev-zero@gentoo.org> icu-3.6.ebuild:
-  ~x86-fbsd keyword added
-
-  12 Nov 2006; Luca Longinotti <chtekk@gentoo.org> -icu-2.6.ebuild,
-  -icu-2.6.2.ebuild, icu-2.8.ebuild, icu-3.4.1.ebuild, icu-3.6.ebuild:
-  Cleanup of old ebuilds, sync new ones.
-
-*icu-3.6 (06 Nov 2006)
-
-  06 Nov 2006; Sebastian Bergmann <sebastian@gentoo.org> +icu-3.6.ebuild:
-  Version bump for bug #154203.
-
-  30 Oct 2006; Stuart Longland <redhatter@gentoo.org> icu-3.4.1.ebuild:
-  Tested successfully (using inbuilt testkit) -- ~mips keyword added on
-  request of bug #148659.
-
-  25 Oct 2006; Joshua Jackson <tsunam@gentoo.org> icu-3.4.1.ebuild:
-  Stable x86; bug #148658
-
-  01 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> icu-3.4.1.ebuild:
-  Added ~hppa, bug #148659
-
-  26 Sep 2006; Jason Wever <weeve@gentoo.org> icu-3.4.1.ebuild:
-  Stable on SPARC wrt bug #148658.
-
-  23 Sep 2006; <nixnut@gentoo.org> icu-3.4.1.ebuild:
-  Stable on ppc wrt bug 148658
-
-  22 Sep 2006; Luca Longinotti <chtekk@gentoo.org> icu-3.2.ebuild,
-  icu-3.4.1.ebuild:
-  Fix again parallel build failure, seems it doesn't work with high values,
-  sorry!
-
-  22 Sep 2006; Markus Rothe <corsair@gentoo.org> icu-3.4.1.ebuild:
-  Added ~ppc64; bug #148659
-
-  22 Sep 2006; Luca Longinotti <chtekk@gentoo.org> -icu-2.0.ebuild,
-  -icu-2.2.ebuild, icu-2.6.ebuild, icu-2.6.2.ebuild, icu-2.8.ebuild,
-  icu-3.2.ebuild, -icu-3.4.ebuild, icu-3.4.1.ebuild:
-  Cleanup ebuilds, remove -j1 forcing since I couldn't reproduce any failure
-  with the compile, remove --enable-layout since it's already default.
-
-  15 Sep 2006; Daniel Gryniewicz <dang@gentoo.org> icu-3.4.1.ebuild:
-  Marked ~amd64 For bug #111545
-
-  13 Sep 2006; Luca Barbato <lu_zero@gentoo.org> icu-3.4.1.ebuild:
-  Marked ~ppc
-
-  15 Aug 2006; Sebastian Bergmann <sebastian@gentoo.org> metadata.xml:
-  This package is now maintained by php-bugs@gentoo.org.
-
-*icu-3.4.1 (15 Aug 2006)
-
-  15 Aug 2006; Sebastian Bergmann <sebastian@gentoo.org> +icu-3.4.1.ebuild:
-  Version bump.
-
-  10 Nov 2005; Jason Wever <weeve@gentoo.org> icu-3.4.ebuild:
-  Added ~sparc keyword as it went the way of the dodo in the version bump.
-
-  02 Oct 2005; Fabian Groffen <grobian@gentoo.org> icu-3.4.ebuild:
-  Marking ~ppc-macos (bug #107641)
-
-*icu-3.4 (16 Sep 2005)
-
-  16 Sep 2005; Sebastian Bergmann <sebastian@gentoo.org> +icu-3.4.ebuild:
-  Version bump, closes bug 102191.
-
-  03 Sep 2005; Stefan Briesenick <sbriesen@gentoo.org> icu-3.2.ebuild:
-  fixing parallel build problems using 'emake -j1' (see bug 102426)
-
-  20 Mar 2005; Jason Wever <weeve@gentoo.org> icu-2.8.ebuild:
-  Stable on SPARC.
-
-  14 Mar 2005; Peter Johanson <latexer@gentoo.org> icu-2.8.ebuild:
-  Stable on x86
-
-  26 Feb 2005; Peter Johanson <latexer@gentoo.org> icu-2.0.ebuild,
-  icu-2.2.ebuild, icu-2.6.2.ebuild, icu-2.6.ebuild, icu-2.8.ebuild,
-  icu-3.2.ebuild:
-  Update the homepage. See bug #83280.
-
-*icu-3.2 (24 Feb 2005)
-
-  24 Feb 2005; Matthew Kennedy <mkennedy@gentoo.org> +icu-3.2.ebuild:
-  New upstream version.
-
-  19 Feb 2005; David Holm <dholm@gentoo.org> icu-2.8.ebuild:
-  Stable on ppc
-
-  20 Jan 2005; Aron Griffis <agriffis@gentoo.org> icu-2.8.ebuild:
-  stable on ia64
-
-  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  17 Dec 2004; Markus Rothe <corsair@gentoo.org> icu-2.8.ebuild:
-  Stable on ppc64
-
-  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> icu-2.8.ebuild:
-  Added to ~sparc.
-
-  08 Nov 2004; Markus Rothe <corsair@gentoo.org> icu-2.8.ebuild:
-  Marked ~ppc64
-
-*icu-2.6.2 (07 Nov 2004)
-
-  07 Nov 2004; <peter@gentoo.org> +metadata.xml, +icu-2.6.2.ebuild:
-  Bump to the latest 2.6.x series, and add a metadata.xml.
-
-  21 Oct 2004; Aron Griffis <agriffis@gentoo.org> icu-2.8.ebuild:
-  add ~ia64
-
-  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> icu-2.0.ebuild,
-  icu-2.2.ebuild, icu-2.6.ebuild, icu-2.8.ebuild:
-  virtual/glibc -> virtual/libc
-
-  23 May 2004; Bryan Østergaard <kloeri@gentoo.org> icu-2.8.ebuild:
-  Stable on alpha.
-
-  13 May 2004; Michael McCabe <randy@gentoo.org> icu-2.8.ebuild:
-  Added s390 keywords
-
-  05 May 2004; David Holm <dholm@gentoo.org> icu-2.8.ebuild:
-  Added to ~ppc.
-
-  20 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> icu-2.8.ebuild:
-  Added ~alpha to keywords.
-
-  27 Mar 2004; Chuck Short <zul@gentoo.org> icu-2.6.ebuild:
-  Stable on sparc.
-
-  10 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> icu-2.8.ebuild:
-  Adding amd64 keyword.
-
-*icu-2.8 (25 Feb 2004)
-
-  25 Feb 2004; Markus Nigbur <pyrania@gentoo.org> icu-2.8.ebuild:
-  Version bump.
-
-  17 Feb 2004; <agriffis@gentoo.org> icu-2.6.ebuild:
-  add ~alpha and ~ia64
-
-  15 Feb 2004; David Holm <dholm@gentoo.org> icu-2.6.ebuild:
-  Added to ~ppc.
-
-*icu-2.6 (06 Oct 2003)
-
-  06 Oct 2003; Markus Nigbur <pyrania@gentoo.org> icu-2.6.ebuild:
-  Bumped. Thanks to davidslists@gmx.net (David Blue) (bug 29812).
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*icu-2.2 (05 Oct 2002)
-
-  05 Oct 2002; Seemant Kulleen <seemant@gentoo.org> icu-2.2.ebuild
-  files/digest-icu-2.2 :
-
-  Version bump (long needed), thanks to: davidslists@gmx.net (David Blue) in
-  bug #8789
-
-*icu-2.0 (24 Feb 2002)
-
-  05 Oct 2002; Seemant Kulleen <seemant@gentoo.org> icu-2.0.ebuild :
-
-  emake->make. Thanks to: davidslists@gmx.net (David Blue) in bug #8789.
-
-  24 Feb 2002; Chris Houser <chouser@gentoo.org> icu-2.0.ebuild
-	 files/digest-icu-2.0 ChangeLog :
-
-  Initial Gentoo package; thanks, Charles Kerr.
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index df4838f6c..75cd99a11 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -12,12 +12,7 @@ DIST icu4c-4_0-docs.zip 4366805 RMD160 ce81012d86ff609b443b710f822f107d629a75ed
 DIST icu4c-4_0_1-src.tgz 12356471 RMD160 e40e7ffddd3134a34fe7e7bc98d776c5b67b637c SHA1 65a65e9cd5670e113031def9448f65fb8f84f47a SHA256 fe4d33cc7393c355df7b13080e1c3717ec1acac2f8cfe452b691f33c5f467259
 DIST icu4c-4_2-docs.zip 4767072 RMD160 0ef1c2ef6f649924fa9ee603a48ae664965b0eec SHA1 703760245543aa64fa92084d77bba4f019bab0ae SHA256 2310cc74088ea715b083e24ff75d9d2c71533712b190eaccc901c6cb6bfd196f
 DIST icu4c-4_2-src.tgz 13721262 RMD160 255c9d999952c02e959540d8181fbfbe79c7968d SHA1 a1694b49d01c0104a573cca7e94e83b39931b0e4 SHA256 65ab82b70614adf759b1e94324178597f703ad17878513e4802ccc4f061408a5
-EBUILD icu-3.6-r1.ebuild 877 RMD160 efedcdf0a712be78bb03bbe083eb452d783f1072 SHA1 027764cf64c962027f8e139000f930c0182b0bc8 SHA256 34893bb9a9b7d0811f4dce704149fda59efb9ffb1bb6bbea0ab12531d080d53d
 EBUILD icu-3.6-r2.ebuild 1017 RMD160 fd41f654007368571a6123621494f63237451ed4 SHA1 3f0c1db51b5440bf21338a21b4bec46f23e23450 SHA256 91a63d453e4da950b6f7a4269a4647d7621cefd59f821e5a14ba3635301c2146
-EBUILD icu-3.6.ebuild 835 RMD160 878d307f8176cbc515ab7749006911ca0cafd57f SHA1 434461729977b5c4536b7e598079baf7b396eb3c SHA256 d99e2c0d97ec20026ae54a26df4d8b410f42ebabd7ee1380dbd503c188ac2f38
-EBUILD icu-3.8.1-r1.ebuild 2264 RMD160 c60a44866dc9d8c90a155621ba72c441dabc6000 SHA1 b1dc413b85123966c31a657f766c7d2d46378b50 SHA256 8f6ed1cf834f810088eabc724350304ef57affdabc97300b6441f02de1fa80a7
-EBUILD icu-3.8.1.ebuild 2193 RMD160 b19ec002b8c12bd49806b3880abaad35e9458933 SHA1 1bdca9f631e21a430e7fc776162d2fbd0684f197 SHA256 40c7159c1856a1ec667df2ffbb5f7195aefad9942b0c582917586c66c9c8981d
-EBUILD icu-4.0.1.ebuild 2185 RMD160 f52944664e0cbd8a6930425032f6a3dac50c7121 SHA1 0482e8109274c18d4ff56c2bbc239cfaf09c6a66 SHA256 4a47dffbc444e1c17dc7dbe3889f4e8bc2c6a7532e3bca719b531c7a910ac4ae
+EBUILD icu-3.8.1-r1.ebuild 2371 RMD160 4434ccecdfa352224ca3251a59eabfecdd8c0c68 SHA1 293e07c7e235676f1421358b2d95eb6d2cb2b593 SHA256 37fd30299dc5dab6eb5e1c4e1c831d31eb8d942b54569b91b19ad37d1b7e5943
+EBUILD icu-4.0.1.ebuild 2264 RMD160 70bae8d19f1b4dc7f1c84e3261d21fb76992c7af SHA1 479522d6c1dd491470c9722410edcfb88ddbc56b SHA256 5d98cba727a45f6f68d16a0c62b527f881f470290b1b274b5ebc64845c189992
 EBUILD icu-4.2.ebuild 1892 RMD160 cef22265347709a6ee10bdc87eeb166d166226cb SHA1 055d8b3a03cd3edc475fca9c329754550db0757a SHA256 4ae6ddcab957d39894c6b67b2a281fa6d4492e6492f60df94b3eeef21c76910b
-MISC ChangeLog 9116 RMD160 c5760c710ab8ec9efeb985133a05e378e8a0e5bf SHA1 cf6507f20620371b6671be2bca921612b61fd4b6 SHA256 acf385c1bf1374dc52df05679ea6545a1d68aaac11b02de3efcd2f78dd05642d
-MISC metadata.xml 274 RMD160 c5ce174bf40a37d632d003bab5e2c5b97777a1c6 SHA1 ccf8f018b8d3a49a1557b5f77e29802cbbc6140d SHA256 b2c70fe9d0595a367c5d41793662a02d301f77b09b6dc70f5b675c2725419a6a
diff --git a/dev-libs/icu/icu-3.6-r1.ebuild b/dev-libs/icu/icu-3.6-r1.ebuild
deleted file mode 100644
index b7c7b3fd8..000000000
--- a/dev-libs/icu/icu-3.6-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-3.6-r1.ebuild,v 1.8 2007/12/11 10:09:43 vapier Exp $
-
-DESCRIPTION="IBM Internationalization Components for Unicode"
-HOMEPAGE="http://ibm.com/software/globalization/icu/"
-SRC_URI="ftp://ftp.software.ibm.com/software/globalization/icu/${PV}/icu4c-${PV/./_}-src.tgz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${PN}/source
-
-multilib-native_src_compile_internal() {
-	econf --enable-static $(use_enable debug) || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-multilib-native_src_install_internal() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dohtml ../readme.html ../license.html
-}
diff --git a/dev-libs/icu/icu-3.6.ebuild b/dev-libs/icu/icu-3.6.ebuild
deleted file mode 100644
index c86c2382d..000000000
--- a/dev-libs/icu/icu-3.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-3.6.ebuild,v 1.13 2007/07/14 18:13:16 armin76 Exp $
-
-DESCRIPTION="IBM Internationalization Components for Unicode"
-HOMEPAGE="http://ibm.com/software/globalization/icu/"
-SRC_URI="ftp://ftp.software.ibm.com/software/globalization/icu/${PV}/icu4c-${PV/./_}-src.tgz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${PN}/source
-
-multilib-native_src_compile_internal() {
-	econf || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-multilib-native_src_install_internal() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dohtml ../readme.html ../license.html
-}
diff --git a/dev-libs/icu/icu-3.8.1-r1.ebuild b/dev-libs/icu/icu-3.8.1-r1.ebuild
index 39b6c8b43..6c429b1dc 100644
--- a/dev-libs/icu/icu-3.8.1-r1.ebuild
+++ b/dev-libs/icu/icu-3.8.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-3.8.1-r1.ebuild,v 1.7 2008/12/07 12:06:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-3.8.1-r1.ebuild,v 1.8 2009/05/08 00:39:40 loki_val Exp $
 
 inherit eutils versionator multilib-native
 
@@ -51,6 +51,9 @@ src_unpack() {
 	# Bug 208001
 	epatch "${FILESDIR}"/${PN}-3.8-regexp-CVE-2007-4770+4771.diff
 
+	# Bug 258377
+	sed -i -e 's:^#elif$:#else:g' ${S}/layoutex/ParagraphLayout.cpp || die 'elif sed failed'
+
 	# do not hardcode used CFLAGS, LDFLAGS etc. into icu-config
 	# Bug 202059
 	# http://bugs.icu-project.org/trac/ticket/6102
diff --git a/dev-libs/icu/icu-3.8.1.ebuild b/dev-libs/icu/icu-3.8.1.ebuild
deleted file mode 100644
index 853bebbd0..000000000
--- a/dev-libs/icu/icu-3.8.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-3.8.1.ebuild,v 1.1 2008/01/04 13:34:10 jokey Exp $
-
-inherit eutils versionator multilib-native
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/ http://ibm.com/software/globalization/icu/"
-
-BASEURI="http://download.icu-project.org/files/${PN}4c/${PV}"
-DOCS_PV="$(get_version_component_range 1-2)"
-DOCS_BASEURI="http://download.icu-project.org/files/${PN}4c/${DOCS_PV}"
-DOCS_PV="${DOCS_PV/./_}"
-SRCPKG="${PN}4c-${PV//./_}-src.tgz"
-USERGUIDE="${PN}-${DOCS_PV}-userguide.zip"
-APIDOCS="${PN}4c-${DOCS_PV}-docs.zip"
-
-SRC_URI="${BASEURI}/${SRCPKG}
-	doc? ( ${DOCS_BASEURI}/${USERGUIDE}
-		${DOCS_BASEURI}/${APIDOCS} )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc examples"
-
-DEPEND="doc? ( app-arch/unzip )"
-RDEPEND=""
-
-S=${WORKDIR}/${PN}/source
-
-src_unpack() {
-	unpack ${SRCPKG}
-	if use doc ; then
-		mkdir userguide
-		pushd ./userguide > /dev/null
-		unpack ${USERGUIDE}
-		popd
-
-		mkdir apidocs
-		pushd ./apidocs > /dev/null
-		unpack ${APIDOCS}
-		popd
-	fi
-
-	# See http://qa.openoffice.org/issues/show_bug.cgi?id=83146
-	# and http://bugs.icu-project.org/trac/ticket/5498 for details
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.8-setBreakType-public.diff
-
-	# do not hardcode used CFLAGS, LDFLAGS etc. into icu-config
-	# Bug 202059
-	# http://bugs.icu-project.org/trac/ticket/6102
-	for x in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS ; do
-		sed -i -e "/^${x} =.*/s:@${x}@::" config/Makefile.inc.in || die "sed failed"
-	done
-}
-
-multilib-native_src_compile_internal() {
-	econf \
-		--enable-static \
-		$(use_enable debug) \
-		$(use_enable examples samples)
-
-	emake -j1 || die "emake failed"
-}
-
-multilib-native_src_install_internal() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dohtml ../readme.html
-	dodoc ../unicode-license.txt
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/html/userguide
-		doins -r "${WORKDIR}"/userguide/*
-
-		insinto /usr/share/doc/${PF}/html/apidocs
-		doins -r "${WORKDIR}"/apidocs/*
-	fi
-}
diff --git a/dev-libs/icu/icu-4.0.1.ebuild b/dev-libs/icu/icu-4.0.1.ebuild
index 900ee2192..56f2b8c2c 100644
--- a/dev-libs/icu/icu-4.0.1.ebuild
+++ b/dev-libs/icu/icu-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.0.1.ebuild,v 1.8 2009/04/18 17:33:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.0.1.ebuild,v 1.9 2009/05/08 00:39:40 loki_val Exp $
 
 EAPI="2"
 
@@ -54,6 +54,9 @@ multilib-native_src_prepare_internal() {
 		sed -i -e "/^${x} =.*/s:@${x}@::" config/Makefile.inc.in || die "sed failed"
 	done
 
+	# Bug 258377
+	sed -i -e 's:^#elif$:#else:g' ${S}/layoutex/ParagraphLayout.cpp || die 'elif sed failed'
+	
 	epatch "${FILESDIR}/${P}-fix_parallel_building.patch"
 	epatch "${FILESDIR}/${P}-TestDisplayNamesMeta.patch"
 }
@@ -68,13 +71,13 @@ multilib-native_src_configure_internal() {
 multilib-native_src_install_internal() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	dohtml ../readme.html || die
-	dodoc ../unicode-license.txt || die
+	dohtml ../readme.html
+	dodoc ../unicode-license.txt
 	if use doc ; then
 		insinto /usr/share/doc/${PF}/html/userguide
-		doins -r "${WORKDIR}"/userguide/userguide/* || die
+		doins -r "${WORKDIR}"/userguide/userguide/*
 
 		insinto /usr/share/doc/${PF}/html/apidocs
-		doins -r "${WORKDIR}"/apidocs/* || die
+		doins -r "${WORKDIR}"/apidocs/*
 	fi
 }
diff --git a/dev-libs/icu/metadata.xml b/dev-libs/icu/metadata.xml
deleted file mode 100644
index 4d0c1d40e..000000000
--- a/dev-libs/icu/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>php</herd>
-	<maintainer>
-		<email>arfrever@gentoo.org</email>
-		<name>Arfrever Frehtes Taifersar Arahesis</name>
-	</maintainer>
-</pkgmetadata>