diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog index b730002..38d79bd 100644 --- a/dev-libs/icu/ChangeLog +++ b/dev-libs/icu/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*icu-4.4.2 (26 Jul 2011) + + 26 Jul 2011; Mario Fetka +files/icu-4.4.1-arm.patch, + +files/icu-4.4.1-et_EE.patch, +files/icu-4.4.1-pkgdata.patch, + +icu-4.4.2.ebuild, +files/icu-4.4.2-gcc-4.5.patch: + add 4.4 libs only package + 26 Jul 2011; Mario Fetka +metadata.xml: initial commit diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 04d8ccc..51e2d1f 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,6 +1,12 @@ AUX icu-4.0.1-TestDisplayNamesMeta.patch 8259 RMD160 4eb64876eee0ff21577f8330326ba96010545cc1 SHA1 d8fe22be87fbb99f8c1a0bbb9d94bc2d93ca083a SHA256 cfcedc486f4c530e43b5fffacf4068f76d026ab73dd4aa1dff253fc87c2e462c AUX icu-4.0.1-fix_parallel_building.patch 145 RMD160 d7e74631383b01a7cd9d18f9fda2949e1b3ec198 SHA1 5edcb46b7730b11aeaf5ed2e8e968e588eb1d492 SHA256 244bee4fcabe5c1bcf95af2d9a01d87b2de27407e662f2c1663c5ce15ac8a561 +AUX icu-4.4.1-arm.patch 991 RMD160 b3c38623023414e47280c5418744f05a96cd049e SHA1 84e4a7702c90fb4d7ca04e9f59ec6a84cea2098b SHA256 06b829f497b1bedf96db76a34720a548b10ffafc2101b19a0f756b2048771b8e +AUX icu-4.4.1-et_EE.patch 861 RMD160 bd2041795f3b1781fb5ddef85566487912c92c77 SHA1 730cae8657a162d6410be41580d86c9203183a4b SHA256 4719ac0e19e89b6bf48e17af9ccc7c7bb26e8e171576c348eb7b68664459b80c +AUX icu-4.4.1-pkgdata.patch 2316 RMD160 4dda06ef2791a5f986c4f0baada2e13e979ddf2c SHA1 9d40795b94650c76f5c5eebb7ce57ed8634059e0 SHA256 6eef0649b635286ea94d84076ea76c26049b97bfa9f858b3e1479bb7de7229c4 +AUX icu-4.4.2-gcc-4.5.patch 1040 RMD160 2b59457c373693ccf07fa57af20d59347df19a52 SHA1 cc2b853a85e6f2b427f248bcd2cb9590bd0f8bb2 SHA256 2ce96779636acbf6eb189b2953368b397297f04160f0cc80b5faf52240935f10 DIST icu4c-4_0_1-src.tgz 12356471 RMD160 e40e7ffddd3134a34fe7e7bc98d776c5b67b637c SHA1 65a65e9cd5670e113031def9448f65fb8f84f47a SHA256 fe4d33cc7393c355df7b13080e1c3717ec1acac2f8cfe452b691f33c5f467259 +DIST icu4c-4_4_2-src.tgz 16446776 RMD160 eb228e6fa9606855bbd881d98da738a61d72b74b SHA1 adc19231810eff2836a08b0e1f1a31a128d7a834 SHA256 2ecefdfb134b5b364ed01c2f613a9ccb11489dbae5857d63cd17ba5b6caca789 EBUILD icu-4.0.1.ebuild 1806 RMD160 15c61a54941d47a93d0bd9126ab6ac4e474f06fb SHA1 77101ae57cd9942cb941fd2a3a2ba57d782f1bed SHA256 f1a7ead02fd141ec03758588771fe525be0b4d22e142651b6538291bce6c7aab -MISC ChangeLog 197 RMD160 1da9c568005bd01e4e4187cd2833094644be8b27 SHA1 e7b390386210ae4929a34b941e648259ddd3ecd3 SHA256 657718cffb63d9e888b854df1565e56cbe93136f33ee309263aab6cd25766df3 +EBUILD icu-4.4.2.ebuild 1919 RMD160 20c395566df739b6a0c7b9e64cc20141c32d6f40 SHA1 f16e3c676493e6523bcffc03ba283bd7e75c2cb9 SHA256 00e6fc7e94e4fc64da93bf2dafc8ef970a70c470dc40ab3ea41c2084b75a9bde +MISC ChangeLog 448 RMD160 77a7eb37febd49e4bf00939a98dd22e439f7ea8a SHA1 f9e76cd0901b740543e53e071b2427d4cefb127e SHA256 e3ee29f32d21a7bd6ab8835f83acc5cbab1ccf71de32b91c836f16b367e6e128 MISC metadata.xml 278 RMD160 bbc1c0098322bba7d2edbf4d41f05e1c010026c2 SHA1 1dcc071f84b18baeca49a6a29ab79a44ac18baa0 SHA256 2b995d31dcd9de1724232025cd606514b27a59bb28a9d6b6bcc8ac42c4cb9e9d diff --git a/dev-libs/icu/files/icu-4.4.1-arm.patch b/dev-libs/icu/files/icu-4.4.1-arm.patch new file mode 100644 index 0000000..20f4852 --- /dev/null +++ b/dev-libs/icu/files/icu-4.4.1-arm.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/show_bug.cgi?id=329439 +https://bugs.icu-project.org/trac/ticket/7664 +https://bugs.icu-project.org/trac/changeset/28107 + +--- tools/toolutil/pkg_genc.c ++++ tools/toolutil/pkg_genc.c +@@ -1,5 +1,5 @@ + /****************************************************************************** +- * Copyright (C) 2009, International Business Machines ++ * Copyright (C) 2009-2010, International Business Machines + * Corporation and others. All Rights Reserved. + ******************************************************************************* + */ +@@ -118,10 +118,10 @@ + } assemblyHeader[] = { + {"gcc", + ".globl %s\n" +- "\t.section .note.GNU-stack,\"\",@progbits\n" ++ "\t.section .note.GNU-stack,\"\",%%progbits\n" + "\t.section .rodata\n" + "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */ +- "\t.type %s,@object\n" ++ "\t.type %s,%%object\n" + "%s:\n\n", + + ".long ","",HEX_0X 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 0000000..25f2106 --- /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/files/icu-4.4.1-pkgdata.patch b/dev-libs/icu/files/icu-4.4.1-pkgdata.patch new file mode 100644 index 0000000..8a1a5bc --- /dev/null +++ b/dev-libs/icu/files/icu-4.4.1-pkgdata.patch @@ -0,0 +1,80 @@ +https://bugs.icu-project.org/trac/ticket/7663 +https://bugs.icu-project.org/trac/changeset/28002 +https://bugs.icu-project.org/trac/ticket/7680 +https://bugs.icu-project.org/trac/changeset/28124 + +--- source/tools/pkgdata/pkgdata.cpp ++++ source/tools/pkgdata/pkgdata.cpp +@@ -98,6 +98,7 @@ + #endif + + #define LARGE_BUFFER_MAX_SIZE 2048 ++#define MEDIUM_BUFFER_MAX_SIZE 1024 + #define SMALL_BUFFER_MAX_SIZE 512 + + static void loadLists(UPKGOptions *o, UErrorCode *status); +@@ -472,29 +473,48 @@ + } + + static int runCommand(const char* command, UBool specialHandling) { +- char cmd[SMALL_BUFFER_MAX_SIZE]; ++ char *cmd = NULL; ++ char cmdBuffer[SMALL_BUFFER_MAX_SIZE]; ++ int32_t len = strlen(command); ++ ++ if (len == 0) { ++ return 0; ++ } + + if (!specialHandling) { ++#if defined(USING_CYGWIN) || defined(OS400) ++#define CMD_PADDING_SIZE 20 ++ if ((len + CMD_PADDING_SIZE) >= SMALL_BUFFER_MAX_SIZE) { ++ cmd = (char *)uprv_malloc(len + CMD_PADDING_SIZE); ++ } else { ++ cmd = cmdBuffer; ++ } + #ifdef USING_CYGWIN + sprintf(cmd, "bash -c \"%s\"", command); + + #elif defined(OS400) + sprintf(cmd, "QSH CMD('%s')", command); ++#endif + #else + goto normal_command_mode; + #endif + } else { + normal_command_mode: +- sprintf(cmd, "%s", command); ++ cmd = (char *)command; + } +- ++ + printf("pkgdata: %s\n", cmd); + int result = system(cmd); +- if (result != 0) { +- printf("-- return status = %d\n", result); ++ if (result != 0) { ++ printf("-- return status = %d\n", result); + } +- return result; +-} ++ ++ if (cmd != cmdBuffer && cmd != command) { ++ uprv_free(cmd); ++ } ++ ++ return result; ++} + + #define LN_CMD "ln -s" + #define RM_CMD "rm -f" +@@ -586,7 +606,7 @@ + pkgDataFlags = (char**)uprv_malloc(sizeof(char*) * PKGDATA_FLAGS_SIZE); + if (pkgDataFlags != NULL) { + for (int32_t i = 0; i < PKGDATA_FLAGS_SIZE; i++) { +- pkgDataFlags[i] = (char*)uprv_malloc(sizeof(char) * SMALL_BUFFER_MAX_SIZE); ++ pkgDataFlags[i] = (char*)uprv_malloc(sizeof(char) * MEDIUM_BUFFER_MAX_SIZE); + if (pkgDataFlags[i] != NULL) { + pkgDataFlags[i][0] = 0; + } else { diff --git a/dev-libs/icu/files/icu-4.4.2-gcc-4.5.patch b/dev-libs/icu/files/icu-4.4.2-gcc-4.5.patch new file mode 100644 index 0000000..0b5d2eb --- /dev/null +++ b/dev-libs/icu/files/icu-4.4.2-gcc-4.5.patch @@ -0,0 +1,32 @@ +https://ssl.icu-project.org/trac/ticket/7932 +https://ssl.icu-project.org/trac/changeset/28667 +https://ssl.icu-project.org/trac/ticket/8011 +https://ssl.icu-project.org/trac/changeset/28772 + +--- test/cintltst/cnumtst.c ++++ test/cintltst/cnumtst.c +@@ -405,7 +405,12 @@ + log_err("parse failed. The error is : %s\n", myErrorName(status)); + } + +- if(d1!=462.12345) ++ /* ++ * Note: "for strict standard conformance all operations and constants are now supposed to be evaluated in precision of long double". So, we assign a1 before comparing to a double. Bug #7932. ++ */ ++ a1 = 462.12345; ++ ++ if(d1!=a1) + log_err("Fail: Error in parsing\n"); + else + log_verbose("Pass: parsing successful\n"); +--- test/intltest/numfmtst.cpp ++++ test/intltest/numfmtst.cpp +@@ -6144,7 +6144,7 @@ + ) + { + errln("ERROR: parse failed - expected 123.0, 3 - returned %d, %i", +- result.getDouble(), parsePos); ++ result.getDouble(), parsePos.getIndex()); + } + } + diff --git a/dev-libs/icu/icu-4.4.2.ebuild b/dev-libs/icu/icu-4.4.2.ebuild new file mode 100644 index 0000000..041ea5c --- /dev/null +++ b/dev-libs/icu/icu-4.4.2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/Attic/icu-4.4.2.ebuild,v 1.10 2011/04/03 11:54:10 arfrever dead $ + +EAPI="3" + +inherit eutils flag-o-matic versionator + +MAJOR_MINOR_VERSION="$(get_version_component_range 1-2)" +MICRO_VERSION="$(get_version_component_range 3)" + +DESCRIPTION="International Components for Unicode (4.4 libs only" +HOMEPAGE="http://www.icu-project.org/" + +BASE_URI="http://download.icu-project.org/files/icu4c/${PV}" +DOCS_BASE_URI="http://download.icu-project.org/files/icu4c/${MAJOR_MINOR_VERSION}" +SRC_ARCHIVE="icu4c-${PV//./_}-src.tgz" + +SRC_URI="${BASE_URI}/${SRC_ARCHIVE}" + +LICENSE="BSD" +SLOT="4.4" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="debug" + +DEPEND="" +RDEPEND="" + +S="${WORKDIR}/${PN}/source" + +QA_DT_NEEDED="/usr/lib.*/libicudata.so.${MAJOR_MINOR_VERSION/./}.${MICRO_VERSION:-0}" + +src_unpack() { + unpack "${SRC_ARCHIVE}" +} + +src_prepare() { + # Do not hardcode used CFLAGS, LDFLAGS etc. into icu-config + # Bug 202059 + # https://bugs.icu-project.org/trac/ticket/6102 + for x in ARFLAGS CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do + sed -i -e "/^${x} =.*/s:@${x}@::" "config/Makefile.inc.in" || die "sed failed" + done + + epatch "${FILESDIR}/${PN}-4.4.1-pkgdata.patch" + epatch "${FILESDIR}/${PN}-4.4.1-et_EE.patch" + epatch "${FILESDIR}/${PN}-4.4.1-arm.patch" + epatch "${FILESDIR}/${P}-gcc-4.5.patch" +} + +src_configure() { + append-flags -fno-strict-aliasing + + econf \ + $(use_enable debug) +} + +src_test() { + emake check || die "emake check failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + rm -rf "${D}"/usr/bin + rm -rf "${D}"/usr/include + rm -rf "${D}"/usr/lib*/*.so + rm -rf "${D}"/usr/lib*/icu + rm -rf "${D}"/usr/sbin + rm -rf "${D}"/usr/share + #die + dohtml ../readme.html + dodoc ../unicode-license.txt +}