From 5f2c06323188f3f7cf918872f6aacea3ebba1c56 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 12 May 2015 18:05:59 +0000
Subject: [PATCH] icu: enable namespace renaming for x86_gcc2 too.

---
 dev-libs/icu/icu-55.1.recipe                |  8 ++-----
 dev-libs/icu/patches/icu-55.1.gcc2.patchset | 26 ---------------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/dev-libs/icu/icu-55.1.recipe b/dev-libs/icu/icu-55.1.recipe
index 387fc2f25..667b6a4c4 100644
--- a/dev-libs/icu/icu-55.1.recipe
+++ b/dev-libs/icu/icu-55.1.recipe
@@ -8,7 +8,7 @@ SRC_URI_3="http://download.icu-project.org/files/icu4c/$portVersion/icu4c-55_1-d
 CHECKSUM_SHA256="e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b"
 CHECKSUM_SHA256_2="8b9f5008277f09e251e97dba7813f56168d691115bda90ade4638d72f296d531"
 CHECKSUM_SHA256_3="84ae6a6512b6f38b417497d05e4ed90d8fa7447b46db9905032354c8574b8f59"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -60,12 +60,8 @@ BUILD()
 	unzip -oq ../../../sources-3/icu4c-*-data.zip
 	rm -f data/in/icudt??l.dat
 	autoconf
-	configureOption=
-	if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
-		configureOption="--disable-renaming"
-	fi
 	runConfigure ./configure \
-		--disable-samples --disable-extras $configureOption
+		--disable-samples --disable-extras
 	make $jobArgs
 }
 
diff --git a/dev-libs/icu/patches/icu-55.1.gcc2.patchset b/dev-libs/icu/patches/icu-55.1.gcc2.patchset
index 6ea036171..fdd0d3622 100644
--- a/dev-libs/icu/patches/icu-55.1.gcc2.patchset
+++ b/dev-libs/icu/patches/icu-55.1.gcc2.patchset
@@ -719,32 +719,6 @@ index 35e353d..30f40d9 100644
 2.2.2
 
 
-From 1e79fa03b6cd114d4c7fb7c03251bc10a48897c2 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Thu, 2 Oct 2014 14:54:39 +0200
-Subject: Force definition of U_DISABLE_RENAMING
-
-We build ICU with this flag disabled, but somehow this isn't added tothe
-header, and later on trying to build haiku without the flag would fail.
-So we just change the default value to keep things simpler.
-
-diff --git a/source/common/unicode/uconfig.h b/source/common/unicode/uconfig.h
-index f6223bb..7c67263 100644
---- a/source/common/unicode/uconfig.h
-+++ b/source/common/unicode/uconfig.h
-@@ -87,7 +87,7 @@
-  * @internal
-  */
- #ifndef U_DISABLE_RENAMING
--#define U_DISABLE_RENAMING 0
-+#define U_DISABLE_RENAMING 1
- #endif
- 
- /**
--- 
-2.2.2
-
-
 From efa9ee8612ac7482e56fa2190ce1b1afd188e268 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@gmail.com>
 Date: Mon, 6 Oct 2014 13:28:09 +0200