dev-libs/icu : version bump

10 files changed, 68 insertions, 324 deletions

diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index dc6f8971..8cc3e3d4 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1 +1 @@
-DIST icu4c-58_2-src.tgz 23369902 SHA256 2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a WHIRLPOOL 25829f8ee870b703fd604ae5b9b584390a142f5011e2a5db18332453e2f1640d81270086f243318eeb93f187b04ea23dab14901ab81c8d924c8d47b1f77aee5a
+DIST icu4c-60_2-src.tgz 23317835 SHA256 f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418 SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694 WHIRLPOOL 1f2d0e1bb5790fa4a3f6e6dc4a8a59c052e01b21f87bbbdc615377a9880889fe37ec40f9f0c16a10e3ef5e7a68a95986143ff9ab82ee97b22e9fbe72e557722b
diff --git a/dev-libs/icu-layoutex/files/icu-58.2-glibc226.patch b/dev-libs/icu-layoutex/files/icu-58.2-glibc226.patch
deleted file mode 100644
index 7003173a..00000000
--- a/dev-libs/icu-layoutex/files/icu-58.2-glibc226.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN a/i18n/digitlst.cpp b/i18n/digitlst.cpp
---- a/i18n/digitlst.cpp	2016-10-27 01:37:56.000000000 -0000
-+++ b/i18n/digitlst.cpp	2017-09-21 20:39:29.873030393 -0000
-@@ -61,11 +61,7 @@
- #endif
- 
- #if U_USE_STRTOD_L
--# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
--#   include <locale.h>
--# else
--#   include <xlocale.h>
--# endif
-+# include <locale.h>
- #endif
- 
- // ***************************************************************************
diff --git a/dev-libs/icu-layoutex/icu-layoutex-58.2-r1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-60.2-r1.ebuild
index b393329f..df4a632e 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-58.2-r1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-60.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86"
 IUSE="debug static-libs"
 
 RDEPEND="
@@ -30,7 +30,6 @@ S="${WORKDIR}/${PN/-layoutex}/source"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/icu-${PV}-glibc226.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
index 2f1397b4..2f1397b4 100644
--- a/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild
+++ b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index dc6f8971..8cc3e3d4 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1 +1 @@
-DIST icu4c-58_2-src.tgz 23369902 SHA256 2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a WHIRLPOOL 25829f8ee870b703fd604ae5b9b584390a142f5011e2a5db18332453e2f1640d81270086f243318eeb93f187b04ea23dab14901ab81c8d924c8d47b1f77aee5a
+DIST icu4c-60_2-src.tgz 23317835 SHA256 f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418 SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694 WHIRLPOOL 1f2d0e1bb5790fa4a3f6e6dc4a8a59c052e01b21f87bbbdc615377a9880889fe37ec40f9f0c16a10e3ef5e7a68a95986143ff9ab82ee97b22e9fbe72e557722b
diff --git a/dev-libs/icu/files/icu-58.1-iterator.patch b/dev-libs/icu/files/icu-58.1-iterator.patch
deleted file mode 100644
index 6f52375e..00000000
--- a/dev-libs/icu/files/icu-58.1-iterator.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-source: http://bugs.icu-project.org/trac/changeset/39484/

-

-

-Index: icu/common/ulist.c

-===================================================================

---- icu/common/ulist.c	(revision 39483)

-+++ icu/common/ulist.c	(revision 39484)

-@@ -30,5 +30,4 @@

-     

-     int32_t size;

--    int32_t currentIndex;

- };

- 

-@@ -52,5 +51,4 @@

-     newList->tail = NULL;

-     newList->size = 0;

--    newList->currentIndex = -1;

-     

-     return newList;

-@@ -81,6 +79,7 @@

-         p->next->previous = p->previous;

-     }

--    list->curr = NULL;

--    list->currentIndex = 0;

-+    if (p == list->curr) {

-+        list->curr = p->next;

-+    }

-     --list->size;

-     if (p->forceDelete) {

-@@ -151,5 +150,4 @@

-         list->head->previous = newItem;

-         list->head = newItem;

--        list->currentIndex++;

-     }

-     

-@@ -194,5 +192,4 @@

-     curr = list->curr;

-     list->curr = curr->next;

--    list->currentIndex++;

-     

-     return curr->data;

-@@ -210,5 +207,4 @@

-     if (list != NULL) {

-         list->curr = list->head;

--        list->currentIndex = 0;

-     }

- }

-@@ -273,3 +269,2 @@

-     return (UList *)(en->context);

- }

--

-Index: icu/i18n/ucol_res.cpp

-===================================================================

---- icu/i18n/ucol_res.cpp	(revision 39483)

-+++ icu/i18n/ucol_res.cpp	(revision 39484)

-@@ -681,4 +681,5 @@

-     }

-     memcpy(en, &defaultKeywordValues, sizeof(UEnumeration));

-+    ulist_resetList(sink.values);  // Initialize the iterator.

-     en->context = sink.values;

-     sink.values = NULL;  // Avoid deletion in the sink destructor.

-Index: icu/test/intltest/apicoll.cpp

-===================================================================

---- icu/test/intltest/apicoll.cpp	(revision 39483)

-+++ icu/test/intltest/apicoll.cpp	(revision 39484)

-@@ -82,14 +82,7 @@

-     col = Collator::createInstance(Locale::getEnglish(), success);

-     if (U_FAILURE(success)){

--        errcheckln(success, "Default Collator creation failed. - %s", u_errorName(success));

--        return;

--    }

--

--    StringEnumeration* kwEnum = col->getKeywordValuesForLocale("", Locale::getEnglish(),true,success);

--    if (U_FAILURE(success)){

--        errcheckln(success, "Get Keyword Values for Locale failed. - %s", u_errorName(success));

--        return;

--    }

--    delete kwEnum;

-+        errcheckln(success, "English Collator creation failed. - %s", u_errorName(success));

-+        return;

-+    }

- 

-     col->getVersion(versionArray);

-@@ -230,4 +223,27 @@

-     delete aFrCol;

-     delete junk;

-+}

-+

-+void CollationAPITest::TestKeywordValues() {

-+    IcuTestErrorCode errorCode(*this, "TestKeywordValues");

-+    LocalPointer<Collator> col(Collator::createInstance(Locale::getEnglish(), errorCode));

-+    if (errorCode.logIfFailureAndReset("English Collator creation failed")) {

-+        return;

-+    }

-+

-+    LocalPointer<StringEnumeration> kwEnum(

-+        col->getKeywordValuesForLocale("collation", Locale::getEnglish(), TRUE, errorCode));

-+    if (errorCode.logIfFailureAndReset("Get Keyword Values for English Collator failed")) {

-+        return;

-+    }

-+    assertTrue("expect at least one collation tailoring for English", kwEnum->count(errorCode) > 0);

-+    const char *kw;

-+    UBool hasStandard = FALSE;

-+    while ((kw = kwEnum->next(NULL, errorCode)) != NULL) {

-+        if (strcmp(kw, "standard") == 0) {

-+            hasStandard = TRUE;

-+        }

-+    }

-+    assertTrue("expect at least the 'standard' collation tailoring for English", hasStandard);

- }

- 

-@@ -2467,4 +2483,5 @@

-     TESTCASE_AUTO_BEGIN;

-     TESTCASE_AUTO(TestProperty);

-+    TESTCASE_AUTO(TestKeywordValues);

-     TESTCASE_AUTO(TestOperators);

-     TESTCASE_AUTO(TestDuplicate);

-Index: icu/test/intltest/apicoll.h

-===================================================================

---- icu/test/intltest/apicoll.h	(revision 39483)

-+++ icu/test/intltest/apicoll.h	(revision 39484)

-@@ -36,4 +36,5 @@

-      */

-     void TestProperty(/* char* par */);

-+    void TestKeywordValues();

- 

-     /**

diff --git a/dev-libs/icu/files/icu-58.2-CVE-2017-7867.patch b/dev-libs/icu/files/icu-58.2-CVE-2017-7867.patch
deleted file mode 100644
index a34537bb..00000000
--- a/dev-libs/icu/files/icu-58.2-CVE-2017-7867.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-Index: /trunk/icu4c/source/common/utext.cpp

-===================================================================

---- a/common/utext.cpp	(revision 39670)

-+++ b/common/utext.cpp	(revision 39671)

-@@ -848,7 +848,13 @@

- 

- // Chunk size.

--//     Must be less than 85, because of byte mapping from UChar indexes to native indexes.

--//     Worst case is three native bytes to one UChar.  (Supplemenaries are 4 native bytes

--//     to two UChars.)

-+//     Must be less than 42  (256/6), because of byte mapping from UChar indexes to native indexes.

-+//     Worst case there are six UTF-8 bytes per UChar.

-+//         obsolete 6 byte form fd + 5 trails maps to fffd

-+//         obsolete 5 byte form fc + 4 trails maps to fffd

-+//         non-shortest 4 byte forms maps to fffd

-+//         normal supplementaries map to a pair of utf-16, two utf8 bytes per utf-16 unit

-+//     mapToUChars array size must allow for the worst case, 6.

-+//     This could be brought down to 4, by treating fd and fc as pure illegal,

-+//     rather than obsolete lead bytes. But that is not compatible with the utf-8 access macros.

- //

- enum { UTF8_TEXT_CHUNK_SIZE=32 };

-@@ -890,5 +896,5 @@

-                                                      //    one for a supplementary starting in the last normal position,

-                                                      //    and one for an entry for the buffer limit position.

--    uint8_t   mapToUChars[UTF8_TEXT_CHUNK_SIZE*3+6]; // Map native offset from bufNativeStart to

-+    uint8_t   mapToUChars[UTF8_TEXT_CHUNK_SIZE*6+6]; // Map native offset from bufNativeStart to

-                                                      //   correspoding offset in filled part of buf.

-     int32_t   align;

-@@ -1033,4 +1039,5 @@

-             u8b = (UTF8Buf *)ut->p;   // the current buffer

-             mapIndex = ix - u8b->toUCharsMapStart;

-+            U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars));

-             ut->chunkOffset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx;

-             return TRUE;

-@@ -1299,4 +1306,8 @@

-         //   If index is at the end, there is no character there to look at.

-         if (ix != ut->b) {

-+            // Note: this function will only move the index back if it is on a trail byte

-+            //       and there is a preceding lead byte and the sequence from the lead 

-+            //       through this trail could be part of a valid UTF-8 sequence

-+            //       Otherwise the index remains unchanged.

-             U8_SET_CP_START(s8, 0, ix);

-         }

-@@ -1312,5 +1323,8 @@

-         uint8_t *mapToNative = u8b->mapToNative;

-         uint8_t *mapToUChars = u8b->mapToUChars;

--        int32_t  toUCharsMapStart = ix - (UTF8_TEXT_CHUNK_SIZE*3 + 1);

-+        int32_t  toUCharsMapStart = ix - sizeof(UTF8Buf::mapToUChars) + 1;

-+        // Note that toUCharsMapStart can be negative. Happens when the remaining

-+        // text from current position to the beginning is less than the buffer size.

-+        // + 1 because mapToUChars must have a slot at the end for the bufNativeLimit entry.

-         int32_t  destIx = UTF8_TEXT_CHUNK_SIZE+2;   // Start in the overflow region

-                                                     //   at end of buffer to leave room

-@@ -1339,4 +1353,5 @@

-                 // Special case ASCII range for speed.

-                 buf[destIx] = (UChar)c;

-+                U_ASSERT(toUCharsMapStart <= srcIx);

-                 mapToUChars[srcIx - toUCharsMapStart] = (uint8_t)destIx;

-                 mapToNative[destIx] = (uint8_t)(srcIx - toUCharsMapStart);

-@@ -1368,4 +1383,5 @@

-                     mapToUChars[sIx-- - toUCharsMapStart] = (uint8_t)destIx;

-                 } while (sIx >= srcIx);

-+                U_ASSERT(toUCharsMapStart <= (srcIx+1));

- 

-                 // Set native indexing limit to be the current position.

-@@ -1542,4 +1558,5 @@

-     U_ASSERT(index<=ut->chunkNativeLimit);

-     int32_t mapIndex = index - u8b->toUCharsMapStart;

-+    U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars));

-     int32_t offset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx;

-     U_ASSERT(offset>=0 && offset<=ut->chunkLength);

-Index: /trunk/icu4c/source/test/intltest/utxttest.cpp

-===================================================================

---- a/test/intltest/utxttest.cpp	(revision 39670)

-+++ b/test/intltest/utxttest.cpp	(revision 39671)

-@@ -68,4 +68,6 @@

-         case 7: name = "Ticket12130";

-             if (exec) Ticket12130(); break;

-+        case 8: name = "Ticket12888";

-+            if (exec) Ticket12888(); break;

-         default: name = "";          break;

-     }

-@@ -1584,2 +1586,62 @@

-     utext_close(&ut);

- }

-+

-+// Ticket 12888: bad handling of illegal utf-8 containing many instances of the archaic, now illegal,

-+//               six byte utf-8 forms. Original implementation had an assumption that

-+//               there would be at most three utf-8 bytes per UTF-16 code unit.

-+//               The five and six byte sequences map to a single replacement character.

-+

-+void UTextTest::Ticket12888() {

-+    const char *badString = 

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"

-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80";

-+

-+    UErrorCode status = U_ZERO_ERROR;

-+    LocalUTextPointer ut(utext_openUTF8(NULL, badString, -1, &status));

-+    TEST_SUCCESS(status);

-+    for (;;) {

-+        UChar32 c = utext_next32(ut.getAlias());

-+        if (c == U_SENTINEL) {

-+            break;

-+        }

-+    }

-+    int32_t endIdx = utext_getNativeIndex(ut.getAlias());

-+    if (endIdx != (int32_t)strlen(badString)) {

-+        errln("%s:%d expected=%d, actual=%d", __FILE__, __LINE__, strlen(badString), endIdx);

-+        return;

-+    }

-+

-+    for (int32_t prevIndex = endIdx; prevIndex>0;) {

-+        UChar32 c = utext_previous32(ut.getAlias());

-+        int32_t currentIndex = utext_getNativeIndex(ut.getAlias());

-+        if (c != 0xfffd) {

-+            errln("%s:%d (expected, actual, index) = (%d, %d, %d)\n",

-+                    __FILE__, __LINE__, 0xfffd, c, currentIndex);

-+            break;

-+        }

-+        if (currentIndex != prevIndex - 6) {

-+            errln("%s:%d: wrong index. Expected, actual = %d, %d",

-+                    __FILE__, __LINE__, prevIndex - 6, currentIndex);

-+            break;

-+        }

-+        prevIndex = currentIndex;

-+    }

-+}

-Index: /trunk/icu4c/source/test/intltest/utxttest.h

-===================================================================

---- a/test/intltest/utxttest.h	(revision 39670)

-+++ b/test/intltest/utxttest.h	(revision 39671)

-@@ -39,4 +39,5 @@

-     void Ticket10983();

-     void Ticket12130();

-+    void Ticket12888();

- 

- private:

diff --git a/dev-libs/icu/files/icu-58.2-darwin.patch b/dev-libs/icu/files/icu-58.2-darwin.patch
new file mode 100644
index 00000000..e5a9000a
--- /dev/null
+++ b/dev-libs/icu/files/icu-58.2-darwin.patch
@@ -0,0 +1,55 @@
+same as 4.7, but retargetted to apply with eapply
+
+--- a/config/mh-darwin
++++ b/config/mh-darwin
+@@ -4,6 +4,13 @@
+ ## Copyright (c) 1999-2011 International Business Machines Corporation and
+ ## others. All Rights Reserved.
+ 
++
++SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
++FINAL_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION).$(SO)
++MIDDLE_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION_MAJOR).$(SO)
++
++IS_DARWIN = yes
++
+ ## Flags for position independent code
+ SHAREDLIBCFLAGS = -dynamic
+ SHAREDLIBCXXFLAGS = -dynamic
+@@ -28,7 +35,7 @@
+ ifeq ($(ENABLE_RPATH),YES)
+ LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
+ else
+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
+ endif
+ 
+ ## Compiler switch to embed a runtime search path
+--- a/stubdata/Makefile.in
++++ b/stubdata/Makefile.in
+@@ -32,7 +32,11 @@
+ 
+ 
+ ifneq ($(ENABLE_SHARED),)
++ifeq ($(IS_DARWIN),)
+ SO_TARGET = $(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
++else
++SO_TARGET = $(LIBDIR)/$(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
++endif
+ ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT)
+ endif
+ 
+--- a/tools/ctestfw/Makefile.in
++++ b/tools/ctestfw/Makefile.in
+@@ -31,7 +31,11 @@
+ endif
+ 
+ ifneq ($(ENABLE_SHARED),)
++ifeq ($(IS_DARWIN),)
+ SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
++else
++SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
++endif
+ ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
+ endif
+ 
diff --git a/dev-libs/icu/files/icu-58.2-glibc226.patch b/dev-libs/icu/files/icu-58.2-glibc226.patch
deleted file mode 100644
index 7003173a..00000000
--- a/dev-libs/icu/files/icu-58.2-glibc226.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN a/i18n/digitlst.cpp b/i18n/digitlst.cpp
---- a/i18n/digitlst.cpp	2016-10-27 01:37:56.000000000 -0000
-+++ b/i18n/digitlst.cpp	2017-09-21 20:39:29.873030393 -0000
-@@ -61,11 +61,7 @@
- #endif
- 
- #if U_USE_STRTOD_L
--# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
--#   include <locale.h>
--# else
--#   include <xlocale.h>
--# endif
-+# include <locale.h>
- #endif
- 
- // ***************************************************************************
diff --git a/dev-libs/icu/icu-58.2-r1.ebuild b/dev-libs/icu/icu-60.2-r1.ebuild
index 1eaa578e..ec5c4e6b 100644
--- a/dev-libs/icu/icu-58.2-r1.ebuild
+++ b/dev-libs/icu/icu-60.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
@@ -31,9 +31,7 @@ MULTILIB_CHOST_TOOLS=(
 
 PATCHES=(
 	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-58.1-iterator.patch"
-	"${FILESDIR}/${PN}-58.2-CVE-2017-7867.patch"
-	"${FILESDIR}/${PN}-58.2-glibc226.patch"
+	"${FILESDIR}/${PN}-58.2-darwin.patch"
 )
 
 pkg_pretend() {
@@ -116,6 +114,12 @@ multilib_src_configure() {
 	# icu tries to use clang by default
 	tc-export CC CXX
 
+	# make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL=${EPREFIX}/bin/sh
+	# probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL=${BASH}
+
 	ECONF_SOURCE=${S} \
 	econf "${myeconfargs[@]}"
 }