[gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/

[Andreas Hüttel]

commit:     7bb8a9efebd6b2292734380bf7c0b65520d2efcc
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  3 19:44:00 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Mar  3 19:44:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb8a9ef

dev-libs/icu: Backport fix for bug 573294

Package-Manager: portage-2.2.27

 dev-libs/icu/files/icu-flagparser.patch | 13 +++++++++++++
 dev-libs/icu/icu-56.1-r1.ebuild         |  1 +
 2 files changed, 14 insertions(+)

diff --git a/dev-libs/icu/files/icu-flagparser.patch 
b/dev-libs/icu/files/icu-flagparser.patch
new file mode 100644
index 0000000..bd64276
--- /dev/null
+++ b/dev-libs/icu/files/icu-flagparser.patch
@@ -0,0 +1,13 @@
+Index: source/tools/toolutil/flagparser.c
+===================================================================
+--- a/source/tools/toolutil/flagparser.c       (revision 38080)
++++ b/source/tools/toolutil/flagparser.c       (revision 38081)
+@@ -97,7 +97,7 @@
+ 
+     T_FileStream_close(f);
+     
+-    if (U_FAILURE(*status)) {
++    if (U_FAILURE(*status) && *status != U_BUFFER_OVERFLOW_ERROR) {
+         return -1;
+     }
+ 

diff --git a/dev-libs/icu/icu-56.1-r1.ebuild b/dev-libs/icu/icu-56.1-r1.ebuild
index e8a0e2b..3968b3a 100644
--- a/dev-libs/icu/icu-56.1-r1.ebuild
+++ b/dev-libs/icu/icu-56.1-r1.ebuild
@@ -34,6 +34,7 @@ src_prepare() {
        local variable
 
        epatch "${FILESDIR}/${PN}-remove-bashisms.patch"
+       epatch "${FILESDIR}/${PN}-flagparser.patch"
        epatch_user
 
        # Disable renaming as it is stupind thing to do