Add patch to fix ltr ligatures issue. Wrt bug#405143.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

6 files changed, 96 insertions, 117 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index 218a41c7bdaa..aad1cdc2eaac 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/icu
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.168 2011/12/28 19:14:10 halcy0n Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.169 2012/02/27 16:19:35 scarabeus Exp $
+
+*icu-4.8.1.1-r1 (27 Feb 2012)
+*icu-4.8.1-r3 (27 Feb 2012)
+
+  27 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/icu-4.8.1-fix_ltr.patch, +icu-4.8.1-r3.ebuild, +icu-4.8.1.1-r1.ebuild,
+  -icu-4.8.1-r1.ebuild, -icu-4.8.1.1.ebuild, -icu-4.8.ebuild:
+  Add patch to fix ltr ligatures issue. Wrt bug#405143.
 
   28 Dec 2011; Mark Loeser <halcy0n@gentoo.org> icu-4.8.1-r2.ebuild:
   Stable for ppc/ppc64; bug #387259
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 12d95f18536f..7a2f680ca8b5 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -4,36 +4,34 @@ Hash: SHA1
 AUX icu-4.6-pkgdata.patch 4214 RMD160 0cdc3d409dcdedf7ac62cc0a29142d75dbb6aeee SHA1 c0bf9c4ca0767887ef4839e5f7ae31636d01d34a SHA256 643cfce19b2091fee859462a86dac7b6119063ee67abc1132d4700c44a79c271
 AUX icu-4.6.1-parallel_installation.patch 1329 RMD160 48b673c8e56d046880340eca0c05cb0e52efde2a SHA1 2c00430f7ac4351a30ef048cf299288ab3735a33 SHA256 03ce917d8211af55ba2833039c90cf957696f6579e9b067ee26aa246363eaac7
 AUX icu-4.8.1-fix_binformat_fonts.patch 673 RMD160 b13e5d06ecb2c8b331addc7703f4d4278d5977f1 SHA1 b38a0d0f5b773069b70cae572fa2ffc5b4629547 SHA256 f298ebd4c9334f4855fecec2cb9c2d02a12653ac98b2f4bb31df3030c5b2acf7
+AUX icu-4.8.1-fix_ltr.patch 2154 RMD160 4d35706305de4a00825e8d98cee620305ff27544 SHA1 f5d4f24ceacf57c15d92eb40ccf314a0e9cf0c8a SHA256 e701ad66912f863882064d9be599b181623a5584336fafc340bcb5a6f354d836
 AUX icu-4.8.1-fix_nan.patch 2246 RMD160 289f11b2a260de557c30eb8527c8a0886cfe6ecb SHA1 5964b99936cb2c0c9af2234c02502799d10eb367 SHA256 6e2375c96cfdf87028e6c3d3235ab7bfc6258cd0a505a75f3518611b1caba8e4
 DIST icu4c-4_6-docs.zip 4884171 RMD160 ac5bc160bdb0f183ab0c5aa31324fa197b1a43f5 SHA1 c56518ffededdebea15525e1e25499e3e58aaec3 SHA256 863f88a12d63e1cfa449ff4010404610e2c7be4f22f98ac412d15c9e66d8a6d8
 DIST icu4c-4_6-src.tgz 15543712 RMD160 1cb84839384af5cba75bda6358c8bdaa82adaa9c SHA1 efc68a73a424d5822565feaf4468336f77294e8e SHA256 b5a1ada8127d8b79187f887903e34a87dbecea2659a139993bf81ad7309ddffc
-DIST icu4c-4_8-docs.zip 10750270 RMD160 74149a52b21cdea7b4779bb1585888c82ac4b708 SHA1 c10d4dc711438763631564ace8200e3cef66f190 SHA256 dff1e6d5e674985e89b30a336d1d142cc5cf8e6c70acf398db50223cb837f0e4
-DIST icu4c-4_8-src.tgz 18620856 RMD160 77674ce09823f80810b7f5a0898881b5a62d938c SHA1 f458b41800cc21bbb92ceb119380ad3249252fd6 SHA256 45e17667b5c6886b49b43e98b8a3f6684e77e5dceda8e939af6f5c8bebd7a939
 DIST icu4c-4_8_1-docs.zip 5364512 RMD160 bc1794f99be91b7646f13ac06a96b912a1b388f5 SHA1 51f796df86f2e69c0ef1e398727a1fcb5fcbb7a3 SHA256 efcedde8bfaaf6aa33816a4124980058187868a6eedd4fe68d2d15f19977b3bd
 DIST icu4c-4_8_1-src.tgz 18677882 RMD160 2196dffbc2d074cf56f5dcbb4e2b802c950cfcf0 SHA1 f0252b2b7ad1ef861ac39b177b7a6fcb6c94eb45 SHA256 19a4cd6e94187a03bca7514d694c5a5a666567e2884ce008ca9f14fa400af88f
 DIST icu4c-4_8_1_1-docs.zip 4078464 RMD160 ee07a9042714ff306de6e086a1510c9f884551ed SHA1 2b1cec2d684919c89b61a37aa845ecf68197beeb SHA256 03bd6dd2f3a2482af471840462512af4217984688e6ff2a2686a97c3a1980c2a
 DIST icu4c-4_8_1_1-src.tgz 18675781 RMD160 c1ac8098b3815604da9e278d752051fb861bea63 SHA1 7146ee269b39273fa98d750f73136b14f781758a SHA256 0a70491c5fdfc5a0fa7429f820da73951e07d59a268b3d8ffe052eec65820ca1
 EBUILD icu-4.6.ebuild 2298 RMD160 6d1c590d0ea65070ad719210284c2d8587523868 SHA1 adb4f653ccbe95464797d7770ef6b62c3f634517 SHA256 e8d571cbfb718379372612180632df65979bb211c6526d1014c28e599d4f8b59
-EBUILD icu-4.8.1-r1.ebuild 2361 RMD160 881cbcdb7a7e3b16dc1514810f3f54db1a0d50fb SHA1 e05aaad5c5bc96cc614af7fa1c9a9c8ab4e4b034 SHA256 f274c506c28efee5375f071de45c527ac8af7269eeaf55fe3c108fc40234417c
 EBUILD icu-4.8.1-r2.ebuild 2397 RMD160 847fb0cd19f27445101b08cb2ca9d6f074679c5d SHA1 a0cf6793a95a3c22326f9b72269acf9aeaed4b8e SHA256 d865cdf050eceff6d1a3a15cc1b549ad054df8baefbfd97a96cae6c50e19f5cf
-EBUILD icu-4.8.1.1.ebuild 2334 RMD160 536e6320a0d6857d447cae2498565475333e9e91 SHA1 5b41c935a6f191a85b70327cbb0f0d0cce057643 SHA256 ece5482ad20250b2dd1c0ca1173a0282e195b0c642254ea9fa89774bafa9c51e
-EBUILD icu-4.8.ebuild 2283 RMD160 6ce2edd45c7147e53ff6f91a90846a8f6547de6a SHA1 4ce52186d0e8cfa0c867508300218abdb7bd59bd SHA256 bec58ae299472cdbb5a89d5a416013e21598cf66ae586d78f71a073684331155
-MISC ChangeLog 20816 RMD160 79aad56bad9dd8d7603c960db11fd8be1591cbd2 SHA1 387db126f4b631e235f8ea202983ed3de4f1d3e8 SHA256 351680487669faa26a189f65fac350d5c2e608e02f1b6a319b76b45a8f7d7f07
+EBUILD icu-4.8.1-r3.ebuild 2452 RMD160 643d44d979d81b793758319630dcf428ed88ae31 SHA1 b81d641a32125ab8fa894440f8c11d506bfe7ec1 SHA256 7e2af49c4d71c8e6635eb3e880b88565e288734bc9ba0c88ed85f2fbc683a908
+EBUILD icu-4.8.1.1-r1.ebuild 2376 RMD160 778f6c3cc963836bf73393b82d6d54a602ef69dc SHA1 097b7a1b60515d4df53d7dfb947e48e15be502a3 SHA256 185035b99bbf6def31bc4d9ad924db80096a738c216ef1ffc74ded85a71416f2
+MISC ChangeLog 21131 RMD160 87377d37919d01ac8129a8957818b9905da97b13 SHA1 4f4e34cf93cfac26ade8ac265a27ba3d5543f7a7 SHA256 6a80274f5dd966b0b9ca77b32474f2e511f4952ed46a70c416b3a34ae1ac93a1
 MISC metadata.xml 416 RMD160 a0cb34c06171b26aa6c8327bfbffbded6329bd4c SHA1 6527f1a54252da5ce94a59da162831c360af0287 SHA256 327e9387b2e51e95fb33707787c6a4e3bf2e2fcea2924bd241f4b257951c4c9d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO+2qUAAoJEPTTRK0uRVaNL0MP/iEisXBBYSs/Vbl7tiTTBmp+
-5ivYVlAzayYAsn0aGaA7hMVKYF3NZ8n/F/wISvEsMUoSyIWj7U49sGXtwGQM+F5V
-ishceW26MDhgqKNQv4yF3tfY1stmsvD37NQqyTWZgez1Y6SuGhKt2UT21XK8fQqK
-QSt6JeVkRx3KdKCgoSNuEf3w6t/t8upiEput4QDQ+pKoCtFZW4XjhWKWZvbTiqbg
-310NsFgaBzVYLxvPk1jA3QRJ24ci7MZUllqXzcQ+ixjavK0iPePfvI9pKmVb7H/w
-+1kgnv+VAq+pzOEKHfTc/I2nhBy4VkZlajMnTgFCfFFhBrnOMcFCzM3Zd+PfupqA
-7sbXwBQH9a9WdVJB2orMCy5Fb9Jur9ZqNXpqoIQnFxU/dETIHsegLghfWf5igxz+
-ygLoXA+m3hGaKooWeJQtyGGsllQrFhAFWfcNCUFsT0A0L7S1AlwDi3ort+zY35ro
-oXMYZbQgb51cDMkRm+BZ6ViyqSftZWxQOsXZu8cqyB/tfcX5vE9fuxCE/0yZi2/1
-97Hik8JtLc3QLC/A8ibvisy9mKTEtzqRRBRE0QLvpqpLU/oL+wchzPWy0CEo7s15
-HvjYGnE+xUrYzf68zQr4NGBSZN1o1MGhvWu6UYudYwOJNfDRmad1Sy4b1X2giKgI
-HEtmlJI9xuwM1iw3XPTF
-=BGeY
+iQIcBAEBAgAGBQJPS60hAAoJEOSiRoyO7jvoEAMP/1WxK7z9rtZcTOXVT809rb4R
+6hVj1m8iRwiL4bcCKSoj41xkpFcISIlu48Tvkgn+ULPRBMCNCYiNVBIVDc4O9e+A
+a0fbUeCzsl0YqNj8jTj2CSGGtxkhv7dXRvJK3NLJHf3nQnuEkr3/M0HBFx1mQwFm
+hd4ZweaJmCNYrlmodN3J/f/oO69LGXTFYk5uurs3XMx/DHa+ARv268idtxHDjbfK
+IKFwmho+DiFJCzwPgkkzsgRcXiIIok+qOh4CNacpWoISeUKgbg780CjWk3/yTK1h
+DX6MsTZthDZ5Y9ensTjwIKAFGqccePDDNtXs5P7uvomu6AulZRpyP2OxJLWlmPkx
+pAKwredRUPsn1bIR32J//fDgEtwa4R7Iue4CgfRzo1rTaFZ1szAm0ad+lncKimiY
+Fb0f6OaeX0e4V965Dp/tgi67FcVmxS8UzHDQUxO3PKwvw/avlCwwfjxiKi4+BCCt
+E9JaYpkz7WiCTBCEmqK4rsbYUflBbN9YC11WTCB/fqc/ZDWqf8cXWrkldplkMpy9
+VkfEl4uyBLH4ESRIFUz2E+KtvFa3vMp/fKMadnSKdsKR9hIlppMiuMn2u/3hWAks
+qH44lTKSTuGvGjlrqzUzyOqfs8vCDU4vPGHD1K9tkTLj2LHYk8OoFhGEerAgfts8
+0pNJcHO0FHStYLoUuC1S
+=w1Vc
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/icu/files/icu-4.8.1-fix_ltr.patch b/dev-libs/icu/files/icu-4.8.1-fix_ltr.patch
new file mode 100644
index 000000000000..9bcd217ff3c9
--- /dev/null
+++ b/dev-libs/icu/files/icu-4.8.1-fix_ltr.patch
@@ -0,0 +1,56 @@
+--- release-4-8-1/source/layout/LESwaps.h	2011-10-07 06:52:16.240688181 +0300
++++ release-4-8/source/layout/LESwaps.h	2011-10-07 05:56:26.915499700 +0300
+@@ -45,8 +45,8 @@
+ public:
+ 
+     /**
+-     * Reads a big-endian 16-bit word and returns a native-endian value.
+-     * No-op on a big-endian platform, byte-swaps on a little-endian platform.
++     * This method does the byte swap required on little endian platforms
++     * to correctly access a (16-bit) word.
+      *
+      * @param value - the word to be byte swapped
+      *
+@@ -56,19 +56,12 @@
+      */
+     static le_uint16 swapWord(le_uint16 value)
+     {
+-#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || (defined(BYTE_ORDER) && defined(BIG_ENDIAN)) || defined(__BIG_ENDIAN__)
+-        // Fastpath when we know that the platform is big-endian.
+-        return value;
+-#else
+-        // Reads a big-endian value on any platform.
+-        const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value);
+-        return (le_uint16)((p[0] << 8) | p[1]);
+-#endif
++        return (le_uint16)((value << 8) | (value >> 8));
+     };
+ 
+     /**
+-     * Reads a big-endian 32-bit word and returns a native-endian value.
+-     * No-op on a big-endian platform, byte-swaps on a little-endian platform.
++     * This method does the byte swapping required on little endian platforms
++     * to correctly access a (32-bit) long.
+      *
+      * @param value - the long to be byte swapped
+      *
+@@ -78,14 +71,11 @@
+      */
+     static le_uint32 swapLong(le_uint32 value)
+     {
+-#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || (defined(BYTE_ORDER) && defined(BIG_ENDIAN)) || defined(__BIG_ENDIAN__)
+-        // Fastpath when we know that the platform is big-endian.
+-        return value;
+-#else
+-        // Reads a big-endian value on any platform.
+-        const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value);
+-        return (le_uint32)((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
+-#endif
++        return (le_uint32)(
++            (value << 24) |
++            ((value << 8) & 0xff0000) |
++            ((value >> 8) & 0xff00) |
++            (value >> 24));
+     };
+ 
+ private:
diff --git a/dev-libs/icu/icu-4.8.1-r1.ebuild b/dev-libs/icu/icu-4.8.1-r3.ebuild
index 80100dee61be..39a9213b7b5e 100644
--- a/dev-libs/icu/icu-4.8.1-r1.ebuild
+++ b/dev-libs/icu/icu-4.8.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-4.8.1-r1.ebuild,v 1.2 2011/12/18 17:17:13 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.8.1-r3.ebuild,v 1.1 2012/02/27 16:19:35 scarabeus Exp $
 
 EAPI="3"
 
@@ -26,7 +26,7 @@ SRC_URI="${BASE_URI}/${SRC_ARCHIVE}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc examples static-libs"
 
 DEPEND="doc? ( app-arch/unzip )"
@@ -54,7 +54,10 @@ src_prepare() {
 		sed -i -e "/^${variable} =.*/s:@${variable}@::" config/Makefile.inc.in || die "sed failed"
 	done
 
-	epatch "${FILESDIR}/icu-4.8.1-fix_binformat_fonts.patch"
+	epatch \
+		"${FILESDIR}/icu-4.8.1-fix_binformat_fonts.patch" \
+		"${FILESDIR}/icu-4.8.1-fix_nan.patch" \
+		"${FILESDIR}/icu-4.8.1-fix_ltr.patch"
 }
 
 src_configure() {
diff --git a/dev-libs/icu/icu-4.8.1.1.ebuild b/dev-libs/icu/icu-4.8.1.1-r1.ebuild
index bf62b2ff5bf3..ad9552b455bb 100644
--- a/dev-libs/icu/icu-4.8.1.1.ebuild
+++ b/dev-libs/icu/icu-4.8.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-4.8.1.1.ebuild,v 1.1 2011/10/30 12:02:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.8.1.1-r1.ebuild,v 1.1 2012/02/27 16:19:35 scarabeus Exp $
 
 EAPI="4"
 
@@ -54,8 +54,10 @@ src_prepare() {
 		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-fix_nan.patch"
+	epatch \
+		"${FILESDIR}/icu-4.8.1-fix_binformat_fonts.patch" \
+		"${FILESDIR}/icu-4.8.1-fix_nan.patch" \
+		"${FILESDIR}/icu-4.8.1-fix_ltr.patch"
 }
 
 src_configure() {
diff --git a/dev-libs/icu/icu-4.8.ebuild b/dev-libs/icu/icu-4.8.ebuild
deleted file mode 100644
index 2fd3474d2715..000000000000
--- a/dev-libs/icu/icu-4.8.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.8.ebuild,v 1.6 2011/08/20 16:00:49 jer Exp $
-
-EAPI="3"
-
-inherit versionator
-
-MAJOR_VERSION="$(get_version_component_range 1)"
-MINOR_VERSION="$(get_version_component_range 2)"
-if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+(_rc[[:digit:]]*)?$ ]]; then
-	MICRO_VERSION="0"
-else
-	MICRO_VERSION="$(get_version_component_range 3)"
-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 ~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}\.${MICRO_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
-}
-
-src_configure() {
-	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 || die "emake check failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dohtml ../readme.html
-	dodoc ../unicode-license.txt
-	if use doc; then
-		insinto /usr/share/doc/${PF}/html/api
-		doins -r "${WORKDIR}/docs/"* || die "doins failed"
-	fi
-}