Fix icu-config with et_EE locale (bug #260127).

Package-Manager: portage-HEAD/cvs/Linux x86_64

4 files changed, 27 insertions, 4 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index 20a59db55923..03602c9afcdf 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/icu
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.113 2010/06/26 12:36:11 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.114 2010/07/02 22:45:03 arfrever Exp $
+
+  02 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  icu-4.4.1.ebuild, +files/icu-4.4.1-et_EE.patch:
+  Fix icu-config with et_EE locale (bug #260127).
 
   26 Jun 2010; <nixnut@gentoo.org> icu-4.4.1.ebuild:
   ppc stable #322297
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index a52adc196d09..68c5a37bf31d 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -3,6 +3,7 @@ AUX icu-4.0.1-fix_parallel_building.patch 145 RMD160 d7e74631383b01a7cd9d18f9fda
 AUX icu-4.2.1-fix_misoptimizations.patch 792 RMD160 e2057694f0e29ab4cd121811e1dcd727252589ef SHA1 805e3f9f2396d49d7212d1ef6e76a211f3c9e222 SHA256 b464091bc0f0f018b7597400851f628b1236938e090a9b3fe49c0baa45d2b60f
 AUX icu-4.2.1-pkgdata-build_data_without_assembly.patch 378 RMD160 37f147df705c906f9af47b4c865fe7c865952313 SHA1 a5228b4587915d3ff89d81bad1ba0ae0566dd2e4 SHA256 7ee4dafc261b569229e86553248da738a8bb8ab758dd0c557e69eb891c667e5c
 AUX icu-4.2.1-pkgdata.patch 4823 RMD160 3ab8ac44294ca6133429fdfbf962ac7b73fdfe72 SHA1 55c618ac12906b3778b129b83cc1db0d153accd3 SHA256 f8dd5dcd0f2a01e6b5859e05cc21bb8a3469b940a918903fc086c58643ecbd55
+AUX icu-4.4.1-et_EE.patch 861 RMD160 bd2041795f3b1781fb5ddef85566487912c92c77 SHA1 730cae8657a162d6410be41580d86c9203183a4b SHA256 4719ac0e19e89b6bf48e17af9ccc7c7bb26e8e171576c348eb7b68664459b80c
 AUX icu-4.4.1-pkgdata.patch 2316 RMD160 4dda06ef2791a5f986c4f0baada2e13e979ddf2c SHA1 9d40795b94650c76f5c5eebb7ce57ed8634059e0 SHA256 6eef0649b635286ea94d84076ea76c26049b97bfa9f858b3e1479bb7de7229c4
 DIST icu-4_0-userguide.zip 2201832 RMD160 efbde385d89be4f91f4945c963d3abc118121f50 SHA1 a4c7bbe4ce0b99bf907b598620aa58daf51d6883 SHA256 db9accfdfdb6536881513d8d0c09ff53cee0340804f0f06ed4fb303cceed1092
 DIST icu4c-4_0-docs.zip 4366805 RMD160 ce81012d86ff609b443b710f822f107d629a75ed SHA1 9a7c0a0c63adf02fb156b076d76acaa7dc59a15b SHA256 d99ffa2356e45620b49d71c43a21f830f92d3cf7eb5aa0b02b23580c2289bed6
@@ -13,6 +14,6 @@ DIST icu4c-4_4-docs.zip 4743886 RMD160 6321fdc500d018358578249d32e84cfdc3f17db7
 DIST icu4c-4_4_1-src.tgz 15373744 RMD160 dae3634f7a1f9ce78e0b36c49503e5d3c43ebdc5 SHA1 0d011f7e1e042ec8e8833ac910056021d0924d91 SHA256 34994fc183da20a6572bbab56b0dc85d372ec3e574fffb5d571a0da95f723063
 EBUILD icu-4.0.1.ebuild 2176 RMD160 6fd1b0c4220e5dfe12ef064c5663f866de5977ae SHA1 af689bdb675cc730d5c2b95bd56c96fb040d2800 SHA256 b9f89b027fc1dad41b2f127360dde6af6b3285bbb1ff57ef990f26dd533e0a6c
 EBUILD icu-4.2.1.ebuild 2100 RMD160 de2ea2e8a6e47ba2c86f807ff3d9bcbb544de13f SHA1 8548bb7cefd5e8a1ee7a0cbe07463b31e135bdd9 SHA256 839d5a42f6a4e2ee16dfb9899bd98241cc06372d08b24dc067a471e08abe7ab7
-EBUILD icu-4.4.1.ebuild 2028 RMD160 c77061d0e784fa30705440ac69a29cec8aec8a1c SHA1 3305d21c431af489711cb3a97a505072651c2852 SHA256 bd47616c4d1db5efb3acf59d43ee2968e96dc683c14584579f0314014a49eb93
-MISC ChangeLog 14000 RMD160 4f3dc01adf8968eb6548e93045118ae98345ed7d SHA1 441de383de7185c5ca7932809fdaad78c4072f47 SHA256 1189d2864cefa4b829fa4c242de35d9b2d555300543e91772c3fda9018e8f9f3
+EBUILD icu-4.4.1.ebuild 2069 RMD160 f5a2298aa0308302f4fbef99a6dcb4a14f334dc1 SHA1 ba2cdb04f76e2f6499596f8e0d88ebc717f0cad8 SHA256 66fd1b8fb2b512c7c87e994e28dc65dc52e900290e93d86f78bea01b2cf00aa7
+MISC ChangeLog 14176 RMD160 f0a223718e2222d4f577a83405c44ea473cdffd8 SHA1 b4b16a0bdf489a2210c5204b310ff0144b6a0d3a SHA256 534fc0f293624153ce1faa32385bd2cb7a7a4a5e5f0f35db99d71c2b5bffc3ab
 MISC metadata.xml 274 RMD160 c5ce174bf40a37d632d003bab5e2c5b97777a1c6 SHA1 ccf8f018b8d3a49a1557b5f77e29802cbbc6140d SHA256 b2c70fe9d0595a367c5d41793662a02d301f77b09b6dc70f5b675c2725419a6a
diff --git a/dev-libs/icu/files/icu-4.4.1-et_EE.patch b/dev-libs/icu/files/icu-4.4.1-et_EE.patch
new file mode 100644
index 000000000000..25f21066882f
--- /dev/null
+++ b/dev-libs/icu/files/icu-4.4.1-et_EE.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/show_bug.cgi?id=260127
+https://bugs.icu-project.org/trac/ticket/6934
+https://bugs.icu-project.org/trac/changeset/28160
+
+--- Makefile.in
++++ Makefile.in
+@@ -219,8 +219,8 @@
+ 	$(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
+ 	chmod u+w $@
+ 	@echo "# Following from @platform_make_fragment@" >> $@
+-	sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
+-	sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
++	LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
++	LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
+ 	cat $(top_srcdir)/config/icu-config-bottom >> $@
+ 	echo "# Rebuilt on "`date` >> $@
+ 	chmod u-w $@
diff --git a/dev-libs/icu/icu-4.4.1.ebuild b/dev-libs/icu/icu-4.4.1.ebuild
index 467e880bdf8a..6428b95c7ebd 100644
--- a/dev-libs/icu/icu-4.4.1.ebuild
+++ b/dev-libs/icu/icu-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.4.1.ebuild,v 1.7 2010/06/26 12:36:11 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.4.1.ebuild,v 1.8 2010/07/02 22:45:03 arfrever Exp $
 
 EAPI="3"
 
@@ -51,6 +51,7 @@ src_prepare() {
 	done
 
 	epatch "${FILESDIR}/${P}-pkgdata.patch"
+	epatch "${FILESDIR}/${P}-et_EE.patch"
 }
 
 src_configure() {