summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-07-02 22:45:03 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-07-02 22:45:03 +0000
commit1f9d62d412f335ac7fcc52f9e350b89c7bc65dac (patch)
tree1c9e2384adb495baf0fbddf32cd4d1ae25df4210 /dev-libs/icu
parentVersion bump (bug #322315). Clean up ebuild and remove old. (diff)
downloadgentoo-2-1f9d62d412f335ac7fcc52f9e350b89c7bc65dac.tar.gz
gentoo-2-1f9d62d412f335ac7fcc52f9e350b89c7bc65dac.tar.bz2
gentoo-2-1f9d62d412f335ac7fcc52f9e350b89c7bc65dac.zip
Fix icu-config with et_EE locale (bug #260127).
(Portage version: HEAD/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/icu')
-rw-r--r--dev-libs/icu/ChangeLog6
-rw-r--r--dev-libs/icu/files/icu-4.4.1-et_EE.patch17
-rw-r--r--dev-libs/icu/icu-4.4.1.ebuild3
3 files changed, 24 insertions, 2 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/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() {