gentoo resync : 14.07.2018

10 files changed, 1095 insertions, 0 deletions

diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
new file mode 100644
index 000000000000..f466f3f6cc54
--- /dev/null
+++ b/dev-libs/icu/Manifest
@@ -0,0 +1,12 @@
+AUX icu-58.1-iterator.patch 4097 BLAKE2B 826626cbb471ebbd9d40c4827d8244d91a94020fb22051b2e4e1abdc633617cb5ad7de063c8b1c84ed2220ac30846c8666fadf18bd41ba65959687b36cd13794 SHA512 46c51629fb5ff14cdfcbc355bff6cceb7132fc79176ec7fcf76bd9ac8553fccbf6528508753b73a0a4301721260ad60a359bf56c66e3bd0151415a4a226ff21c
+AUX icu-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a615272dcf1ad3a5ae2ddfdb08eeaa9bec4d037493583bf181417df49087fcca6f6aa3d977a8e72b98df68e3389c4e47343c062d036 SHA512 54835db4db5bca704aed015a911a1f5285fbd3f6d09493cdcf98493d87a03851c9ee79cc9cbcb45da409513ad5b3af38b302aa5d164992d94af1f80c6349aeb8
+AUX icu-58.2-CVE-2017-7867.patch 8934 BLAKE2B 7f934d75a99953d69ac54f8544c698d3bd774a37a463237b6b043713a35f2991a444a482191107070b1d1c0055f813d3692102cb08091cc7cda575e37fb076db SHA512 6e29326f378461ae07b253c59550447096352be1247e575d974839cea37ec326f7fa8dca58caab63544582ef9f4b3c71c9e3fa0eceb2e85fb7380ee71b138c5a
+AUX icu-58.2-darwin.patch 2076 BLAKE2B d85d07ae3ade827a81bf2ce4eb2813a6535d7cd70e68241b29ee72c0a41115e3cab0490727771309c32f1eb0853c1a8ce3cf6aae64186037d8ee75d035cb0478 SHA512 fe884a72d354324ad0b1e5502d834fbecafae22a290fb152058d6507b218c4f07efc34cc7d978bae0adb54f74dadf00df7a2679c480dc7681ee287da7f678cb7
+AUX icu-58.2-glibc226.patch 463 BLAKE2B 840440c4a3eb0882ac6733d3c5f44568bc081fce6f3f641e01d76f01fe1f35f74cc2465e89b3353ab86569c7478090df459a659d69143810ba121e15c27923dd SHA512 20d8e76c43ef5549ca7f104b052661269c99d4af45b2a65bd9d72e28b01d0c3b70c066b51799e09d7117a4a39e44fd463fae2522a238a41972c0679c290c5da3
+DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
+DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
+DIST icu4c-61_1-src.tgz 23400587 BLAKE2B 6c6c78b4169ad3e900ff8a8a8fc7286f3dfb692dc04cc88103804799d1ce1fc7d1a3a7b1fc1b379e92196dd5976cfea3fe014a09dc65d387f34f141eae5b9465 SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94
+EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
+EBUILD icu-60.2.ebuild 3710 BLAKE2B 11a56611d570980031040391168bd5c18ca2000c30e9e56edf2662b9ead959c684cada13656726e5e868803ab9c4f81309b51f3b65693175298cb163417f32b0 SHA512 65919063056eb718f860664d42f466278da3bf5d78e54e4ad24b22768b244c76c81053ead55871fefd2d185dfcdfb065e93c38ccc4515000996d7ef307d4a1cb
+EBUILD icu-61.1.ebuild 3721 BLAKE2B 72fd1527eb1bd7425397de5eccf60ed03c22a58dc113f6fe4c9a1853f0553c3cde723583d24c875e2f928393ff8b494a889a98800bfb9948a314fa804c15f6eb SHA512 d766de018dfe7a908dd23914ac0994dbd98c9d515ba0cee76a4b7d6c1a9f44809cefe414c9a8ca556aef08e3e7f3a4d249b6af12449651cd2ea303818f12effd
+MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/files/icu-58.1-iterator.patch b/dev-libs/icu/files/icu-58.1-iterator.patch
new file mode 100644
index 000000000000..6f52375eb790
--- /dev/null
+++ b/dev-libs/icu/files/icu-58.1-iterator.patch
@@ -0,0 +1,127 @@
+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.1-remove-bashisms.patch b/dev-libs/icu/files/icu-58.1-remove-bashisms.patch
new file mode 100644
index 000000000000..ef60ce4569b8
--- /dev/null
+++ b/dev-libs/icu/files/icu-58.1-remove-bashisms.patch
@@ -0,0 +1,224 @@
+diff -ruN a/config/Makefile.inc.in b/config/Makefile.inc.in
+--- a/config/Makefile.inc.in	2016-09-09 23:28:18.000000000 +0200
++++ b/config/Makefile.inc.in	2016-11-05 19:43:07.688466668 +0100
+@@ -124,12 +124,6 @@
+ # with usually. Many applications will want to add $(ICULIBS_I18N) as well. 
+ ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) 
+ 
+-# Proper echo newline handling is needed in icu-config
+-ECHO_N=@ICU_ECHO_N@
+-ECHO_C=@ICU_ECHO_C@
+-# Not currently being used but good to have for proper tab handling
+-ECHO_T=@ICU_ECHO_T@
+-
+ ##################################################################
+ ##################################################################
+ #
+diff -ruN a/config/icu-config-bottom b/config/icu-config-bottom
+--- a/config/icu-config-bottom	2016-09-09 23:28:18.000000000 +0200
++++ b/config/icu-config-bottom	2016-11-05 19:49:00.854481361 +0100
+@@ -218,65 +218,65 @@
+ 	    ;;
+ 
+ 	--cflags)
+-	    echo $ECHO_N "${CFLAGS} ${ECHO_C}"
++	    printf "%s" "${CFLAGS} "
+ 	    ;;
+ 
+ 	--cc)
+-	    echo $ECHO_N "${CC} ${ECHO_C}"
++	    printf "%s" "${CC} "
+ 	    ;;
+ 
+ 	--cxx)
+-	    echo $ECHO_N "${CXX} ${ECHO_C}"
++	    printf "%s" "${CXX} "
+ 	    ;;
+ 
+ 	--cxxflags)
+-	    echo $ECHO_N "${CXXFLAGS} ${ECHO_C}"
++	    printf "%s" "${CXXFLAGS} "
+ 	    ;;
+ 
+ 	--cppflags)
+ 	    # Don't echo the -I. - it's unneeded.
+-	    echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //'
++	    printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //'
+ 	    ;;
+ 
+ 	--cppflags-searchpath)
+-	    echo $ECHO_N "-I${prefix}/include ${ECHO_C}"
++	    printf "%s" "-I${prefix}/include "
+ 	    ;;
+ 
+ 	--cppflags-dynamic)
+-	    echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}"
++	    printf "%s" "${SHAREDLIBCPPFLAGS} "
+ 	    ;;
+ 
+ 	--cxxflags-dynamic)
+-	    echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}"
++	    printf "%s" "${SHAREDLIBCXXFLAGS} "
+ 	    ;;
+ 
+ 	--cflags-dynamic)
+-	    echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}"
++	    printf "%s" "${SHAREDLIBCFLAGS} "
+ 	    ;;
+ 
+ 	--ldflags-system)
+-	    echo $ECHO_N "${LIBS} ${ECHO_C}"
++	    printf "%s" "${LIBS} "
+ 	    ;;
+ 
+ 	--ldflags)
+-	    echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}"
++	    printf "%s" "${LDFLAGS} ${ICULIBS} "
+ # $RPATH_LDFLAGS
+ 	    ;;
+ 
+ 	--ldflags-libsonly)
+-	    echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}"
++	    printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
+ 	    ;;
+ 
+ 	--ldflags-icuio)
+-	    echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}"
++	    printf "%s" " ${ICULIBS_ICUIO} "
+ 	    ;;
+ 
+ 	--ldflags-obsolete)
+-	    echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}"
++	    printf "%s" "${ICULIBS_OBSOLETE} "
+ 	    ;;
+ 
+ 	--ldflags-toolutil)
+-	    echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}"
++	    printf "%s" " ${ICULIBS_TOOLUTIL} "
+ 	    ;;
+ 
+ 	--ldflags-layout)
+@@ -285,7 +285,7 @@
+ 	    ;;
+ 
+ 	--ldflags-searchpath)
+-	    echo $ECHO_N "-L${libdir} ${ECHO_C}"
++	    printf "%s" "-L${libdir} "
+ 	    ;;
+ 
+ 	--detect-prefix)
+@@ -321,47 +321,47 @@
+ 	    ;;
+ 
+ 	--shared-datadir)
+-	    echo $ECHO_N "${datadir} ${ECHO_C}"
++	    printf "%s" "${datadir} "
+ 	    ;;
+ 
+         --incfile)
+-	    echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}"
++	    printf "%s" "${pkglibdir}/Makefile.inc "
+ 	    ;;
+ 
+ 	--incpkgdatafile)
+-	    echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}"
++	    printf "%s" "${pkglibdir}/pkgdata.inc "
+ 	    ;;
+ 
+ 	--icudata)
+-	    echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}"
++	    printf "%s" "${ICUDATA_NAME} "
+ 	    ;;
+ 
+ 	--icudata-mode)
+-	    echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}"
++	    printf "%s" "${PKGDATA_MODE} "
+ 	    ;;
+ 
+ 	--icudata-install-dir)
+-        echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}"
++        printf "%s" "${ICUPKGDATA_DIR} "
+ 	    ;;
+ 
+ 	--icudatadir)
+-	    echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}"
++	    printf "%s" "${ICUDATA_DIR} "
+ 	    ;;
+ 
+ 	--shlib-c)
+-	    echo $ECHO_N "${SHLIB_c} ${ECHO_C}"
++	    printf "%s" "${SHLIB_c} "
+ 	    ;;
+ 
+ 	--shlib-cc)
+-	    echo $ECHO_N "${SHLIB_cc} ${ECHO_C}"
++	    printf "%s" "${SHLIB_cc} "
+ 	    ;;
+ 
+ 	--version)
+-	    echo $ECHO_N $VERSION
++	    printf "%s" "$VERSION"
+ 	    ;;
+ 
+ 	--unicode-version)
+-	    echo $ECHO_N $UNICODE_VERSION
++	    printf "%s" "$UNICODE_VERSION"
+ 	    ;;
+ 
+ 	--host)
+diff -ruN a/configure.ac b/configure.ac
+--- a/configure.ac	2016-10-04 21:30:20.000000000 +0200
++++ b/configure.ac	2016-11-05 19:43:07.688466668 +0100
+@@ -22,24 +22,6 @@
+ PACKAGE="icu"
+ AC_SUBST(PACKAGE)
+ 
+-# Use custom echo test for newline option
+-# Current autoconf (2.65) gives incorrect echo newline option
+-# for icu-config
+-# This may be removed later - mow (June 17, 2010)
+-ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T=
+-case `/bin/sh -c "echo -n x"` in
+--n*)
+-  case `/bin/sh -c "echo 'x\c'"` in
+-  *c*) ICU_ECHO_T=' ';;     # ECHO_T is single tab character.
+-  *)   ICU_ECHO_C='\c';;
+-  esac;;
+-*)
+-  ICU_ECHO_N='-n';;
+-esac
+-AC_SUBST(ICU_ECHO_N)
+-AC_SUBST(ICU_ECHO_C)
+-AC_SUBST(ICU_ECHO_T)
+-
+ AC_MSG_CHECKING(for ICU version numbers)
+ 
+ # Get the ICU version from uversion.h or other headers
+diff -ruN a/icudefs.mk.in b/icudefs.mk.in
+--- a/icudefs.mk.in	2016-09-09 23:28:18.000000000 +0200
++++ b/icudefs.mk.in	2016-11-05 19:43:07.688466668 +0100
+@@ -157,11 +157,6 @@
+ ENABLE_STATIC = @ENABLE_STATIC@
+ ENABLE_SHARED = @ENABLE_SHARED@
+ 
+-# Echo w/o newline
+-
+-#ECHO_N = @ICU_ECHO_N@
+-#ECHO_C = @ICU_ECHO_C@
+-
+ # Commands to compile
+ COMPILE.c=    $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c
+ COMPILE.cc=   $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c
+diff -ruN a/test/hdrtst/Makefile.in b/test/hdrtst/Makefile.in
+--- a/test/hdrtst/Makefile.in	2016-09-28 06:17:24.000000000 +0200
++++ b/test/hdrtst/Makefile.in	2016-11-05 19:43:07.688466668 +0100
+@@ -35,9 +35,6 @@
+ include $(shell icu-config --incfile)
+ DIRS=$(prefix)/include/unicode
+ LDIRS=$(prefix)/include/layout
+-ECHO_T=@ECHO_T@
+-ECHO_C=@ECHO_C@
+-ECHO_N=@ECHO_N@
+ 
+ all: 
+ 	@echo Please read this Makefile for more information.
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
new file mode 100644
index 000000000000..a34537bb6cb7
--- /dev/null
+++ b/dev-libs/icu/files/icu-58.2-CVE-2017-7867.patch
@@ -0,0 +1,155 @@
+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 000000000000..e5a9000a346c
--- /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
new file mode 100644
index 000000000000..7003173a13f9
--- /dev/null
+++ b/dev-libs/icu/files/icu-58.2-glibc226.patch
@@ -0,0 +1,16 @@
+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-58.2-r1.ebuild
new file mode 100644
index 000000000000..cb2f808c5fc5
--- /dev/null
+++ b/dev-libs/icu/icu-58.2-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~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="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+	)
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+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() {
+	if tc-is-gcc ; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
+			|| $(gcc-major-version) -lt 4 ]] ; then
+				die "You need at least sys-devel/gcc-4.9"
+		fi
+	fi
+}
+
+src_prepare() {
+	# apply patches
+	default
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	# Fix compilation on Solaris due to enabling of conflicting standards
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e '/define _XOPEN_SOURCE_EXTENDED/s/_XOPEN/no_XOPEN/' \
+			common/uposixdefs.h || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-gcc ; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
+			|| $(gcc-major-version) -lt 4 ]] ; then
+				die "You need at least sys-devel/gcc-4.9"
+		fi
+	fi
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	multilib_is_native_abi && myeconfargs+=(
+		$(use_enable examples samples)
+	)
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# 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[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	docinto html
+	dodoc ../readme.html
+}
diff --git a/dev-libs/icu/icu-60.2.ebuild b/dev-libs/icu/icu-60.2.ebuild
new file mode 100644
index 000000000000..31e541168d99
--- /dev/null
+++ b/dev-libs/icu/icu-60.2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+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="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+	)
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-58.2-darwin.patch"
+)
+
+pkg_pretend() {
+	if tc-is-gcc ; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
+			|| $(gcc-major-version) -lt 4 ]] ; then
+				die "You need at least sys-devel/gcc-4.9"
+		fi
+	fi
+}
+
+src_prepare() {
+	# apply patches
+	default
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-gcc ; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
+			|| $(gcc-major-version) -lt 4 ]] ; then
+				die "You need at least sys-devel/gcc-4.9"
+		fi
+	fi
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	multilib_is_native_abi && myeconfargs+=(
+		$(use_enable examples samples)
+	)
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# 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[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	docinto html
+	dodoc ../readme.html
+}
diff --git a/dev-libs/icu/icu-61.1.ebuild b/dev-libs/icu/icu-61.1.ebuild
new file mode 100644
index 000000000000..bebf5f978415
--- /dev/null
+++ b/dev-libs/icu/icu-61.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+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="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+	)
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-58.2-darwin.patch"
+)
+
+pkg_pretend() {
+	if tc-is-gcc ; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
+			|| $(gcc-major-version) -lt 4 ]] ; then
+				die "You need at least sys-devel/gcc-4.9"
+		fi
+	fi
+}
+
+src_prepare() {
+	# apply patches
+	default
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-gcc ; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
+			|| $(gcc-major-version) -lt 4 ]] ; then
+				die "You need at least sys-devel/gcc-4.9"
+		fi
+	fi
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	multilib_is_native_abi && myeconfargs+=(
+		$(use_enable examples samples)
+	)
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# 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[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	docinto html
+	dodoc ../readme.html
+}
diff --git a/dev-libs/icu/metadata.xml b/dev-libs/icu/metadata.xml
new file mode 100644
index 000000000000..13ce236ee519
--- /dev/null
+++ b/dev-libs/icu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+</pkgmetadata>