Fix bug 258377, gcc-4.4 compatibility. Thanks to Daniel J. <sleeperseven@hotmail.com> for the patch.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 19 insertions, 8 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index a7e776bed092..ad2239f4dc3a 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,11 @@
 # 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.84 2009/04/18 17:33:16 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.85 2009/05/08 00:39:40 loki_val Exp $
+
+  08 May 2009; Peter Alfredsen <loki_val@gentoo.org> icu-3.8.1-r1.ebuild,
+  icu-4.0.1.ebuild:
+  Fix bug 258377, gcc-4.4 compatibility. Thanks to Daniel J.
+  <sleeperseven@hotmail.com> for the patch.
 
   18 Apr 2009; Raúl Porcel <armin76@gentoo.org> icu-4.0.1.ebuild:
   arm/ia64/s390/sh/sparc stable wrt #239538
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 81a5d2e2635a..7f92258ae6cf 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -13,8 +13,8 @@ DIST icu4c-4_0_1-src.tgz 12356471 RMD160 e40e7ffddd3134a34fe7e7bc98d776c5b67b637
 EBUILD icu-3.6-r1.ebuild 827 RMD160 4dda53f3f3560cd667143462de4f034ad9d71a0c SHA1 0ea8df090aa3549d4eb9080e212979a27cc3e06c SHA256 66cce0a23df2455195996e26c6926149d4047acdc62b5802f6fae1e990ff3fc6
 EBUILD icu-3.6-r2.ebuild 951 RMD160 9bbf921a1e5cdf0c14d3cbc6319f15c99c9fd255 SHA1 88de3f6de23f0a3a3d55d158a7f3f880aee23f4b SHA256 948a2a6ef61fb2669fc38f57bfb10773e9835523446f7356259058a0cdf6b086
 EBUILD icu-3.6.ebuild 785 RMD160 eb6909d0df984843c91f207457a6ff278feb4ca3 SHA1 64f830d48b4dfb5c483092fef9e461dd6921f07d SHA256 b7d25aa35769dcbd7efe3fa0c56aca95563ba357aaa9930ed353f5811a843790
-EBUILD icu-3.8.1-r1.ebuild 2198 RMD160 7191b20982e0739652806b340b05c8aa26b08c04 SHA1 0a2fd2fd31b7c76c2604dc66ca6e9eb0e9170969 SHA256 dd6eb86d0420cd217fe40e26b9c5bf9eec5464430112747d97ba596f5d783285
+EBUILD icu-3.8.1-r1.ebuild 2305 RMD160 6b6537758e8ff7038e362b02d412afb3d4e267b4 SHA1 1d37dd15f7c899010807726bf25a723776f80ba1 SHA256 a766cd6d4950c0fe44126c53a8fa14704a7293cf0b1120b0ba9611247b84e6e0
 EBUILD icu-3.8.1.ebuild 2127 RMD160 36529afc1e92db143f9242644673ea427899b5f4 SHA1 35f5dc7a078af711c4aa34cea1dd4f3e2465a887 SHA256 047b24905b0dd4bccf88b7948c702aeee4dd868558fb40149baaed817befe1b1
-EBUILD icu-4.0.1.ebuild 2066 RMD160 234107ad248e16ad785b91e089a313c5a28593a7 SHA1 c0c6dd1cf87dc03d15063f089c401a44dd5c1a1b SHA256 9e6512e7efbb7c9ea0a3ec864793c3951e69762dc25e8a9d2fd6ccd9ba3d2e85
-MISC ChangeLog 10009 RMD160 fd8c4998f34db33347fdd6c665b68bebc7726c41 SHA1 ef2d93d226743fd8f8aadba7fb74f68f287fac10 SHA256 d087eb5c502c1b139729456addb5509de2631fff4f731ce36de15b774fadca52
+EBUILD icu-4.0.1.ebuild 2172 RMD160 bf0956acfe882128b7be0508b473cc45d2fa5827 SHA1 90f225176c33db740be4f0a7eade80bf9a3b5f1c SHA256 89ec96ebcbe1520c215887b127c3b1b6cf71a0d68af43f975f086cc3e6257a3a
+MISC ChangeLog 10210 RMD160 e8eefce9d7dff4100dec2112ad884e2daa181eda SHA1 498d37f49c8b9d61e7d094ad7cc6f3e22ef12d39 SHA256 ec4ee1b42f691e75805524898ebe100920c3fe210aeb4da5224c0e9fc67edf21
 MISC metadata.xml 274 RMD160 c5ce174bf40a37d632d003bab5e2c5b97777a1c6 SHA1 ccf8f018b8d3a49a1557b5f77e29802cbbc6140d SHA256 b2c70fe9d0595a367c5d41793662a02d301f77b09b6dc70f5b675c2725419a6a
diff --git a/dev-libs/icu/icu-3.8.1-r1.ebuild b/dev-libs/icu/icu-3.8.1-r1.ebuild
index 4c70bfd0d33f..a6bba797b215 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
 
@@ -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-4.0.1.ebuild b/dev-libs/icu/icu-4.0.1.ebuild
index 3b4562ed0736..4b6bc9e8f9e2 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 @@ src_prepare() {
 		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"
 }