dev-libs/icu: Revbump for bug 599142

Package-Manager: portage-2.3.2

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 (file)
index 0000000..6f52375
--- /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/\r
+\r
+\r
+Index: icu/common/ulist.c\r
+===================================================================\r
+--- icu/common/ulist.c (revision 39483)\r
++++ icu/common/ulist.c (revision 39484)\r
+@@ -30,5 +30,4 @@\r
+     \r
+     int32_t size;\r
+-    int32_t currentIndex;\r
+ };\r
+ \r
+@@ -52,5 +51,4 @@\r
+     newList->tail = NULL;\r
+     newList->size = 0;\r
+-    newList->currentIndex = -1;\r
+     \r
+     return newList;\r
+@@ -81,6 +79,7 @@\r
+         p->next->previous = p->previous;\r
+     }\r
+-    list->curr = NULL;\r
+-    list->currentIndex = 0;\r
++    if (p == list->curr) {\r
++        list->curr = p->next;\r
++    }\r
+     --list->size;\r
+     if (p->forceDelete) {\r
+@@ -151,5 +150,4 @@\r
+         list->head->previous = newItem;\r
+         list->head = newItem;\r
+-        list->currentIndex++;\r
+     }\r
+     \r
+@@ -194,5 +192,4 @@\r
+     curr = list->curr;\r
+     list->curr = curr->next;\r
+-    list->currentIndex++;\r
+     \r
+     return curr->data;\r
+@@ -210,5 +207,4 @@\r
+     if (list != NULL) {\r
+         list->curr = list->head;\r
+-        list->currentIndex = 0;\r
+     }\r
+ }\r
+@@ -273,3 +269,2 @@\r
+     return (UList *)(en->context);\r
+ }\r
+-\r
+Index: icu/i18n/ucol_res.cpp\r
+===================================================================\r
+--- icu/i18n/ucol_res.cpp      (revision 39483)\r
++++ icu/i18n/ucol_res.cpp      (revision 39484)\r
+@@ -681,4 +681,5 @@\r
+     }\r
+     memcpy(en, &defaultKeywordValues, sizeof(UEnumeration));\r
++    ulist_resetList(sink.values);  // Initialize the iterator.\r
+     en->context = sink.values;\r
+     sink.values = NULL;  // Avoid deletion in the sink destructor.\r
+Index: icu/test/intltest/apicoll.cpp\r
+===================================================================\r
+--- icu/test/intltest/apicoll.cpp      (revision 39483)\r
++++ icu/test/intltest/apicoll.cpp      (revision 39484)\r
+@@ -82,14 +82,7 @@\r
+     col = Collator::createInstance(Locale::getEnglish(), success);\r
+     if (U_FAILURE(success)){\r
+-        errcheckln(success, "Default Collator creation failed. - %s", u_errorName(success));\r
+-        return;\r
+-    }\r
+-\r
+-    StringEnumeration* kwEnum = col->getKeywordValuesForLocale("", Locale::getEnglish(),true,success);\r
+-    if (U_FAILURE(success)){\r
+-        errcheckln(success, "Get Keyword Values for Locale failed. - %s", u_errorName(success));\r
+-        return;\r
+-    }\r
+-    delete kwEnum;\r
++        errcheckln(success, "English Collator creation failed. - %s", u_errorName(success));\r
++        return;\r
++    }\r
+ \r
+     col->getVersion(versionArray);\r
+@@ -230,4 +223,27 @@\r
+     delete aFrCol;\r
+     delete junk;\r
++}\r
++\r
++void CollationAPITest::TestKeywordValues() {\r
++    IcuTestErrorCode errorCode(*this, "TestKeywordValues");\r
++    LocalPointer<Collator> col(Collator::createInstance(Locale::getEnglish(), errorCode));\r
++    if (errorCode.logIfFailureAndReset("English Collator creation failed")) {\r
++        return;\r
++    }\r
++\r
++    LocalPointer<StringEnumeration> kwEnum(\r
++        col->getKeywordValuesForLocale("collation", Locale::getEnglish(), TRUE, errorCode));\r
++    if (errorCode.logIfFailureAndReset("Get Keyword Values for English Collator failed")) {\r
++        return;\r
++    }\r
++    assertTrue("expect at least one collation tailoring for English", kwEnum->count(errorCode) > 0);\r
++    const char *kw;\r
++    UBool hasStandard = FALSE;\r
++    while ((kw = kwEnum->next(NULL, errorCode)) != NULL) {\r
++        if (strcmp(kw, "standard") == 0) {\r
++            hasStandard = TRUE;\r
++        }\r
++    }\r
++    assertTrue("expect at least the 'standard' collation tailoring for English", hasStandard);\r
+ }\r
+ \r
+@@ -2467,4 +2483,5 @@\r
+     TESTCASE_AUTO_BEGIN;\r
+     TESTCASE_AUTO(TestProperty);\r
++    TESTCASE_AUTO(TestKeywordValues);\r
+     TESTCASE_AUTO(TestOperators);\r
+     TESTCASE_AUTO(TestDuplicate);\r
+Index: icu/test/intltest/apicoll.h\r
+===================================================================\r
+--- icu/test/intltest/apicoll.h        (revision 39483)\r
++++ icu/test/intltest/apicoll.h        (revision 39484)\r
+@@ -36,4 +36,5 @@\r
+      */\r
+     void TestProperty(/* char* par */);\r
++    void TestKeywordValues();\r
+ \r
+     /**\r

diff --git a/dev-libs/icu/icu-58.1-r1.ebuild b/dev-libs/icu/icu-58.1-r1.ebuild
new file mode 100644 (file)
index 0000000..449b5d5
--- /dev/null
+++ b/dev-libs/icu/icu-58.1-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+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"
+)
+
+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-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
+
+       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
+}