diff options
author | Mike Gilbert <floppym@gentoo.org> | 2012-09-30 18:23:24 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2012-09-30 18:23:24 +0000 |
commit | 4907176e04de225a11b1d36c3d7e73ec983a16c8 (patch) | |
tree | 2a64be04a363096cbc82dc6f1f7ee0df3d3e6bb5 /dev-libs | |
parent | Drop alpha keywords (diff) | |
download | historical-4907176e04de225a11b1d36c3d7e73ec983a16c8.tar.gz historical-4907176e04de225a11b1d36c3d7e73ec983a16c8.tar.bz2 historical-4907176e04de225a11b1d36c3d7e73ec983a16c8.zip |
Remove old per Arfrever.
Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/icu/ChangeLog | 6 | ||||
-rw-r--r-- | dev-libs/icu/Manifest | 13 | ||||
-rw-r--r-- | dev-libs/icu/files/icu-49.1.1-bsd.patch | 25 | ||||
-rw-r--r-- | dev-libs/icu/files/icu-49.1.1-regex.patch | 128 | ||||
-rw-r--r-- | dev-libs/icu/icu-49.1.1-r1.ebuild | 97 |
5 files changed, 9 insertions, 260 deletions
diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog index c323aa6f7316..20eab3f04360 100644 --- a/dev-libs/icu/ChangeLog +++ b/dev-libs/icu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/icu # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.207 2012/09/30 16:19:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.208 2012/09/30 18:23:24 floppym Exp $ + + 30 Sep 2012; Mike Gilbert <floppym@gentoo.org> -files/icu-49.1.1-bsd.patch, + -files/icu-49.1.1-regex.patch, -icu-49.1.1-r1.ebuild: + Remove old per Arfrever. 30 Sep 2012; Raúl Porcel <armin76@gentoo.org> icu-49.1.2.ebuild: alpha/ia64/s390/sh/sparc stable wrt #428074 diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 4c4ad1b260a3..ac3b4fa47744 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -3,21 +3,16 @@ Hash: SHA256 AUX icu-4.8.1-fix_binformat_fonts.patch 530 SHA256 17eae8386e720cc86c4305d29dca8e393111fbc899cc550ae9eb2db91b810bfe SHA512 517d22146cf95d5c104f399084593a4c98cb6214473606b3f86545b83d81288ac3858bf6f2f2d1487107fc58c7ba94d1ca3f7939ef93a30e68f406e6810284a0 WHIRLPOOL ad4f426c50c348d28f65ded02369436f40a5095894865310bcb694fabf019cc7b1e2730515ab4513429bc7d61a03271e559c3928552086c1d2ffe5b160bb1b16 AUX icu-4.8.1.1-fix_ltr.patch 2175 SHA256 ecef8b305a8ab43c9164a2aaa39b3509e042008d374d6661900efea78372946a SHA512 c4557debcb3e40f821fd8291e0eb631085941c4ac6ee24f408c9e0b0c368b71232aef2c24203073228af39d2e7a7e4b377b2f29c109adc17ac2f127e2fbb150e WHIRLPOOL 31f41cd3070ac0f1f267e5fc9e66ede1f31e7537dc934466cac65cfbbe3681b59109bc0683184a18a43078d656b9f52c3eb30ed9026e3b7144e63f9e0f8f2150 -AUX icu-49.1.1-bsd.patch 970 SHA256 65aa0d5543ab8a6975eeab5f8dd28cb624cc95f03e10ac2ce86288fe731a76df SHA512 e3dadc58b20ac8f8e5df0b9ce2b6c98450d07426acb99771e936b5ae995c680717c45d907bad9eacd6f4920efe797cad693818e50df4443c6462786d8ea2434e WHIRLPOOL de7e0fb14e04e9b5a3f8deac6bd4e8df7484adf015cb6a3db8a07219a17ef48dcae95febc2f1a3c98ea1c8086f5dedaae43e85ba35348107c5797907653d0585 -AUX icu-49.1.1-regex.patch 4862 SHA256 b2dc7c082371743d1ca68c31ae3b29e592e8df81b7230a0c7a3a88d073265c04 SHA512 d2dca7b7ece90b50c2a627917d7d56b7dfb17f229c7a152beff9f5ee60779604bf57170a46dff07a43582ce7098e66b3fca0f416bf308d58a5b4fa9bdafdf37c WHIRLPOOL bba94e7f7e2eb6c0fd93c60fe1ae374a6110d657a357b1a809de9e50135ba045e4b31af204b8fb2d368763f6e945f07cb15123d64a949ca58a2a82831b189fca AUX icu-49.1.2-platforms.patch 2368 SHA256 e90a4c2c11b25fd511a754b4c8f7b2a491f75bd7a72dc03fc1c8821f6c8fe004 SHA512 30266ed021df921e4c502ec453e842c9aec607281dcd542a76680c0be72724a0c596542043580d96ae4098f7b08cb42827757d630cb6e12aaea0d1e034104891 WHIRLPOOL 2ff2499d6306db27866487a90014e330d7bda25fb671aa6dd238130d2255f1551a2337270a20731ea9fcf5ce15914c9cc939ca76e30aac246c807495ba439883 -DIST icu4c-49_1_1-docs.zip 4243474 SHA256 0cd59f0782b1330aa1b7c520dba315a8da48262639336f12bb123995dadcd80f SHA512 d5dc54cde5327c8870f990609e7ae3183615e0f6e36b30f93bc9e57a6022cb7e703cbf6f4ccb43d37a93d0e6c5522e589c4fcaf8bd9b9fca19ca84683111a5fe WHIRLPOOL c1cda4de3f445656e5711b46c55f6e33721c2385ddbb969727973b5018136a2e24c21dc2646535fdb7f2e7bfe6b8fe9de63e15e5d45808527e874e1858831448 -DIST icu4c-49_1_1-src.tgz 19001722 SHA256 e6f079e9bd92d9eddc3fcdeb943408c4bfd3d25a569a7060c9221f174403cdf1 SHA512 4b9136e6f8eeb54b1fb6115e50d1f806fa7136c30f379c0c6452236494028aa04d4c9c0ca3afac8f41ee32b890eaaf9125f949760e1e7bef3b8a096c8cf3b822 WHIRLPOOL 6dc99b816318aae84396c309941571fc7155c222418b4be05f28749084b3451b9a1a776ab38a977bee799a82d5787977014b54919a9b288ee6ba7dea7b460295 DIST icu4c-49_1_2-docs.zip 4245617 SHA256 50fcc81a797b20ebaf12167479f24eac323bad21d012ca366701f62eccdabb94 SHA512 84ddc1e4cc3e4617e6a93c6ada3e7e5fa470fb34fed3ca4e3c57a741bbdd279d402d3fd313543230f2c73c3197300311eafd2d91c207ff64d3eca9833907a32b WHIRLPOOL 44fde7cfc560bb29e16f32ab4ca300c87469747719ba5a0e0622ed5eb64911e5f5969328a9cef71f0c4aee455093233d0a5c0f8719559d705c2698de2f457662 DIST icu4c-49_1_2-src.tgz 19010646 SHA256 cce83cc88a2ff79d65c05426facbf30530bbe13a1cfda04b3ab81b55414cf5a3 SHA512 83997878222ada25be281c35b766906a9997da350068d4f7400874ea37133baeef0e8277dc117219c37ab486b643125b4b73ace956507d2237c1c9002173a140 WHIRLPOOL 68ff12ab0b3b5e471ced5d07c7170494e24526591587669b86a2a732ce3d0dda4abd74e2dcfdc3dd2e66a30b28d897836a6b0c1f1148101e1b51ffc87a87f080 -EBUILD icu-49.1.1-r1.ebuild 2476 SHA256 8862418ad56065bdb83a6354ec40b6647e8a4af7f7dd8081b315d62de61a1ebe SHA512 6c85608cb01bcf09a5eb6903950863a9d64a738ae8ec35cad09090163c71153de2411ff2a825e06ef2666079db23fa635a6bec82f627e0ceb413066a1c302154 WHIRLPOOL 814e25d6b18aea566808fffd089bc5a37e3306f7d254dcec25fea98893be2814b00571bb27075522270e13ac8cc443965b94a43fa151571a2dc71d8c26296a57 EBUILD icu-49.1.2.ebuild 2303 SHA256 22b5fcfce6d5f8708fd606622648923b5146ac20d7e802af7c09aa8b2b9f6721 SHA512 02dcb2f28b89d09373518a86ec922831f52954ebe1846ca235e57db6cda3201df126ee5a13cb6597d0ffec762232d3ee33a360cb7f958a5de56a9823a729c965 WHIRLPOOL 54be9b6e9c912e7c193be83c2f20b3dd0f98b3d54961733a3622c7c314d51ae157f542c9ff996d46eeeba1b10f1167fc996e82576af2f8ebf242f6b9e27617da -MISC ChangeLog 25876 SHA256 66d7f11c6bc6ef4d4e9edcfe1070020e6d1a85d1fd25e826da9eaaa9a076e5db SHA512 d8209d5586129ddc1fa7052322e18e6246e7a906ce9cfeac4a66f741cb0b28da56db8c441aab574834b85292d60b39b2b275d284e0ff5f5a75e065d349a55c36 WHIRLPOOL a316f0cceba5f7609ab2c072c75ca34f684eb058311c8b2104a63591aa130c8a95df9590d04643e5cb769e8a58227a53d33793441497fff982bddf81cac935bd +MISC ChangeLog 26038 SHA256 b6133fc13eb8e1b97074eba25ce9445dbd8e09b10637e2ff91a7dd8656597c20 SHA512 5e2ad812f20745088322225a0808166d94ac20de63c8262237c241ce06fac59a3f46f0c482bb0f2c41f17be148ea1b717174ab129cefb75e507cd26eb8d83e55 WHIRLPOOL 3d98d128f4a8745f852e0d51335f39e7c8b969b7deae13056afd8da4294820193e0ac7af29063de5b89485801c87ca35ce964ded3216b1500d1f20ed42b27931 MISC metadata.xml 294 SHA256 501a5b0d4dc6215cd3302bdbdd6aa8e8037036996fadbe48f20acd2e037a31d9 SHA512 2ee4ee252b4391df3ee227351028eeea0309ff928f58d67d5dd2b807a1fca714be7dd5b892aea9b8061263d0c6d3729e114fb8b0b0c7f3322cef49be0deae2ea WHIRLPOOL 555ce5514834036d90b287c4ffea668f534ffae1a060430934b8278d9e23f92a260fd1af0baf083af1fd8cd9b786623cc1a0e26ff08f1eff6fa52891f64f104b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlBocQMACgkQuQc30/atMkCyjQCfTFfvzyGY8qyiL+5kZ+8E++mv -tCoAoI5SMVTg5xzoGZBBstY7M8QR6Zx7 -=+uYq +iF4EAREIAAYFAlBojiEACgkQC77qH+pIQ6S/xgD/eS+kYaNvoS7Csg7dOwW/1hXA +Pw+Gjd1jC8O3AS4NQyMA/ROvh/mN9/MgxKrXm+dc5dFLbM8NyaxCruuPSp08IvR6 +=U0mI -----END PGP SIGNATURE----- diff --git a/dev-libs/icu/files/icu-49.1.1-bsd.patch b/dev-libs/icu/files/icu-49.1.1-bsd.patch deleted file mode 100644 index 665087f97b41..000000000000 --- a/dev-libs/icu/files/icu-49.1.1-bsd.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://ssl.icu-project.org/trac/ticket/9286 -https://ssl.icu-project.org/trac/changeset/31780 - ---- common/putilimp.h -+++ common/putilimp.h -@@ -116,6 +116,8 @@ - # define U_TIMEZONE __timezone - #elif U_PLATFORM_USES_ONLY_WIN32_API - # define U_TIMEZONE _timezone -+#elif U_PLATFORM == U_PF_BSD && !defined(__NetBSD__) -+ /* not defined */ - #elif U_PLATFORM == U_PF_OS400 - /* not defined */ - #else ---- common/unicode/platform.h -+++ common/unicode/platform.h -@@ -131,7 +131,7 @@ - # include <android/api-level.h> - #elif defined(linux) || defined(__linux__) || defined(__linux) - # define U_PLATFORM U_PF_LINUX --#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) - # define U_PLATFORM U_PF_BSD - #elif defined(sun) || defined(__sun) - /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */ diff --git a/dev-libs/icu/files/icu-49.1.1-regex.patch b/dev-libs/icu/files/icu-49.1.1-regex.patch deleted file mode 100644 index 0ff59b958dc7..000000000000 --- a/dev-libs/icu/files/icu-49.1.1-regex.patch +++ /dev/null @@ -1,128 +0,0 @@ -https://ssl.icu-project.org/trac/ticket/9283 -https://ssl.icu-project.org/trac/changeset/31782 - ---- i18n/regexcmp.cpp -+++ i18n/regexcmp.cpp -@@ -3306,10 +3306,31 @@ - } - - case URX_STRING_I: -- // TODO: Is the case-folded string the longest? -- // If so we can optimize this the same as URX_STRING. -- loc++; -- currentLen = INT32_MAX; -+ // TODO: This code assumes that any user string that matches will be no longer -+ // than our compiled string, with case insensitive matching. -+ // Our compiled string has been case-folded already. -+ // -+ // Any matching user string will have no more code points than our -+ // compiled (folded) string. Folding may add code points, but -+ // not remove them. -+ // -+ // There is a potential problem if a supplemental code point -+ // case-folds to a BMP code point. In this case our compiled string -+ // could be shorter (in code units) than a matching user string. -+ // -+ // At this time (Unicode 6.1) there are no such characters, and this case -+ // is not being handled. A test, intltest regex/Bug9283, will fail if -+ // any problematic characters are added to Unicode. -+ // -+ // If this happens, we can make a set of the BMP chars that the -+ // troublesome supplementals fold to, scan our string, and bump the -+ // currentLen one extra for each that is found. -+ // -+ { -+ loc++; -+ int32_t stringLenOp = (int32_t)fRXPat->fCompiledPat->elementAti(loc); -+ currentLen = safeIncrement(currentLen, URX_VAL(stringLenOp)); -+ } - break; - - case URX_CTR_INIT: ---- test/intltest/regextst.cpp -+++ test/intltest/regextst.cpp -@@ -26,6 +26,7 @@ - #include "unicode/regex.h" - #include "unicode/uchar.h" - #include "unicode/ucnv.h" -+#include "unicode/uniset.h" - #include "unicode/ustring.h" - #include "regextst.h" - #include "uvector.h" -@@ -127,6 +128,9 @@ - case 20: name = "CheckInvBufSize"; - if (exec) CheckInvBufSize(); - break; -+ case 21: name = "Bug 9283"; -+ if (exec) Bug9283(); -+ break; - - default: name = ""; - break; //needed to end loop -@@ -5184,6 +5188,34 @@ - delete pMatcher; - } - -+// Bug 9283 -+// This test is checking for the existance of any supplemental characters that case-fold -+// to a bmp character. -+// -+// At the time of this writing there are none. If any should appear in a subsequent release -+// of Unicode, the code in regular expressions compilation that determines the longest -+// posssible match for a literal string will need to be enhanced. -+// -+// See file regexcmp.cpp, case URX_STRING_I in RegexCompile::maxMatchLength() -+// for details on what to do in case of a failure of this test. -+// -+void RegexTest::Bug9283() { -+ UErrorCode status = U_ZERO_ERROR; -+ UnicodeSet supplementalsWithCaseFolding("[[:CWCF:]&[\\U00010000-\\U0010FFFF]]", status); -+ REGEX_CHECK_STATUS; -+ int32_t index; -+ UChar32 c; -+ for (index=0; ; index++) { -+ c = supplementalsWithCaseFolding.charAt(index); -+ if (c == -1) { -+ break; -+ } -+ UnicodeString cf = UnicodeString(c).foldCase(); -+ REGEX_ASSERT(cf.length() >= 2); -+ } -+} -+ -+ - void RegexTest::CheckInvBufSize() { - if(inv_next>=INV_BUFSIZ) { - errln("%s: increase #define of INV_BUFSIZ ( is %d but needs to be at least %d )\n", ---- test/intltest/regextst.h -+++ test/intltest/regextst.h -@@ -1,6 +1,6 @@ - /******************************************************************** - * COPYRIGHT: -- * Copyright (c) 2002-2011, International Business Machines Corporation and -+ * Copyright (c) 2002-2012, International Business Machines Corporation and - * others. All Rights Reserved. - ********************************************************************/ - -@@ -45,6 +45,7 @@ - virtual void Bug7740(); - virtual void Bug8479(); - virtual void Bug7029(); -+ virtual void Bug9283(); - virtual void CheckInvBufSize(); - - // The following functions are internal to the regexp tests. ---- test/testdata/regextst.txt -+++ test/testdata/regextst.txt -@@ -1141,6 +1141,11 @@ - "[\w]+" " <0>abc\u200cdef\u200dghi</0> " - "[\w]+" i " <0>abc\u200cdef\u200dghi</0> " - -+# Bug 9283 -+# uregex_open fails for look-behind assertion + case-insensitive -+ -+"(ab)?(?<=ab)cd|ef" i "<0><1>ab</1>cd</0>" -+ - # Random debugging, Temporary - # - #"^(?:a?b?)*$" "a--" diff --git a/dev-libs/icu/icu-49.1.1-r1.ebuild b/dev-libs/icu/icu-49.1.1-r1.ebuild deleted file mode 100644 index 11c991ef51cf..000000000000 --- a/dev-libs/icu/icu-49.1.1-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-49.1.1-r1.ebuild,v 1.11 2012/06/05 20:57:37 jer Exp $ - -EAPI="4" - -inherit eutils versionator flag-o-matic - -MAJOR_VERSION="$(get_version_component_range 1)" -if [[ "${PV}" =~ ^[[:digit:]]+_rc[[:digit:]]*$ ]]; then - MINOR_VERSION="0" -else - MINOR_VERSION="$(get_version_component_range 2)" -fi - -DESCRIPTION="International Components for Unicode" -HOMEPAGE="http://www.icu-project.org/" - -BASE_URI="http://download.icu-project.org/files/icu4c/${PV/_/}" -SRC_ARCHIVE="icu4c-${PV//./_}-src.tgz" -DOCS_ARCHIVE="icu4c-${PV//./_}-docs.zip" - -SRC_URI="${BASE_URI}/${SRC_ARCHIVE} - doc? ( ${BASE_URI}/${DOCS_ARCHIVE} )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="debug doc examples static-libs" - -DEPEND="doc? ( app-arch/unzip )" -RDEPEND="" - -S="${WORKDIR}/${PN}/source" - -QA_DT_NEEDED="/usr/lib.*/libicudata\.so\.${MAJOR_VERSION}\.${MINOR_VERSION}.*" - -src_unpack() { - unpack "${SRC_ARCHIVE}" - if use doc; then - mkdir docs - pushd docs > /dev/null - unpack "${DOCS_ARCHIVE}" - popd > /dev/null - fi -} - -src_prepare() { - # Do not hardcode flags into icu-config. - # https://ssl.icu-project.org/trac/ticket/6102 - local variable - for variable in CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do - sed -i -e "/^${variable} =.*/s:@${variable}@::" config/Makefile.inc.in || die "sed failed" - done - - epatch "${FILESDIR}/${PN}-4.8.1-fix_binformat_fonts.patch" - epatch "${FILESDIR}/${PN}-4.8.1.1-fix_ltr.patch" - epatch "${FILESDIR}/${P}-regex.patch" - epatch "${FILESDIR}/${P}-bsd.patch" -} - -src_configure() { - # Fails without this on hppa/s390/sparc - if use hppa || use s390 || use sparc; then - append-flags "-DU_IS_BIG_ENDIAN=1" - fi - - econf \ - $(use_enable debug) \ - $(use_enable examples samples) \ - $(use_enable static-libs static) -} - -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 check -} - -src_install() { - emake DESTDIR="${D}" install - - dohtml ../readme.html - dodoc ../unicode-license.txt - if use doc; then - insinto /usr/share/doc/${PF}/html/api - doins -r "${WORKDIR}/docs/"* - fi -} |