Use patches from fedora to fix few more issues.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

7 files changed, 199 insertions, 185 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index 58d8a3334eec..88cfd884bb7a 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/icu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.226 2013/02/06 14:21:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.227 2013/02/06 14:45:53 scarabeus Exp $
+
+  06 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/icu.7601.Indic-ccmp.patch, +files/icu.8198.revert.icu5431.patch,
+  -files/icu-50.1-no-c++11.patch, -icu-50.1-r1.ebuild, icu-50.1.2.ebuild:
+  Use patches from fedora to fix few more issues.
 
 *icu-50.1.2 (06 Feb 2013)
 
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 45740129f152..1c7f083f8b09 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -5,33 +5,33 @@ AUX icu-4.8.1-fix_binformat_fonts.patch 530 SHA256 17eae8386e720cc86c4305d29dca8
 AUX icu-4.8.1.1-fix_ltr.patch 2175 SHA256 ecef8b305a8ab43c9164a2aaa39b3509e042008d374d6661900efea78372946a SHA512 c4557debcb3e40f821fd8291e0eb631085941c4ac6ee24f408c9e0b0c368b71232aef2c24203073228af39d2e7a7e4b377b2f29c109adc17ac2f127e2fbb150e WHIRLPOOL 31f41cd3070ac0f1f267e5fc9e66ede1f31e7537dc934466cac65cfbbe3681b59109bc0683184a18a43078d656b9f52c3eb30ed9026e3b7144e63f9e0f8f2150
 AUX icu-49.1.2-platforms.patch 2368 SHA256 e90a4c2c11b25fd511a754b4c8f7b2a491f75bd7a72dc03fc1c8821f6c8fe004 SHA512 30266ed021df921e4c502ec453e842c9aec607281dcd542a76680c0be72724a0c596542043580d96ae4098f7b08cb42827757d630cb6e12aaea0d1e034104891 WHIRLPOOL 2ff2499d6306db27866487a90014e330d7bda25fb671aa6dd238130d2255f1551a2337270a20731ea9fcf5ce15914c9cc939ca76e30aac246c807495ba439883
 AUX icu-50.1-char16_t.patch 3182 SHA256 1d8de564401eb103a11eda1cc9c26b8c2cb159434644b5e0fa705432afa3dcbe SHA512 657e426bc6c43142773731ac294789091762d7c40a2c3dcdbb64121e38ee788d62b8719ddf5a9a294df94f622cd85d5a11d05b1113c359a3fd2a540f6d7ce511 WHIRLPOOL dfaeba4ea62fd8dd8b159a7ee0f4113a9bba4a896ad35fe4858de30a7457e4b3465b14d21ed8c9157754d0106c4e58b6233a577cd984a323c0180616164a0d88
-AUX icu-50.1-no-c++11.patch 1744 SHA256 2f7ef3c9de733037b7aa39d097a5e9eceef96524a329f6377dccea02bb917d25 SHA512 c6076f36c68232f2990610584f9179eec9fae2303209b72fa33b10c1673cec6fa556bca3280f30eb47e5079d0cc2bfcdeca715645c8b632dacc1822ea3671fec WHIRLPOOL 8b5cbe8de20e92afba4a152261a06f3a3f9696a5e2394d2bbb465584609e1e64119c2559ffd19baf0eb184747b916f3f4a1037fba2d7fc8f12f100ce435d76f8
+AUX icu.7601.Indic-ccmp.patch 1881 SHA256 c22d516ac17de1f6abb1e93a4327e1ebdc34578e1421c44275225ecbe312a4ed SHA512 896695d2bbf9635bf7554942576d22901831d17e52fd4a257e3499a330f2886d7bdfc5c9649f19d9101d71c6b7a45a7830b138adf2dfd3887ad269a6787c98ec WHIRLPOOL 57d762e15579eb98bebde8475d06c300b409a1f0f0a04b2aecaa44481681b962ae190b49ef4fbfe917640538d6271e37e9cc9a7f2bf94226b2d4fcd590fd360e
+AUX icu.8198.revert.icu5431.patch 5544 SHA256 41c7d6adeee217f01cffb48da9101c790a21b432776b7eb596768781bc174820 SHA512 f672a81ff5436ca8827ed904c23738e3629e0cbadc9933a07e7ec3519f970570d2c63fd1811e55284dc99602a1ebc93a365a934ef6dbee43223ab790f6d78969 WHIRLPOOL c2a5525ad3aca089e96d2009560a7951b31ed5b36c6cfb2ad6b4aaf844c7f17a14e38df2f4477c9b92c5ea1ea2949735ce1e8b54b591af3434fedde243107ba2
 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
 DIST icu4c-50_1-src.tgz 21181132 SHA256 68592b3c07d9b86100f41d0172eb1a81f3ffb2a8fef1104d7395099079ba7350 SHA512 01a3e42b6180641ae7569bba70c31509d2c65bc7cdd8e84a74444d5da1964486af001d0436c0e6b85ce8867d75bbdcf0b2ad2d18ed24196104db73fc469a301d WHIRLPOOL c7f958be4734d05cc0fcf1a541cc77618fbaabdeeda986b96de14e2a76ccf3eb2ed4b57548d9fb931f510f46207441e99f6f96217aa481bea3bb540b20b6d687
 DIST icu4c-50_1_1-src.tgz 21189084 SHA256 a6f426e3c04749c74bcb9d2ce229f905de88deda2353db2249f2e96fe604df8f SHA512 0af83f880eeacbd9e095c21a63312b94885f11f5c57826b2bbacbae49e589ccacfccccc0c95f37a186a55b5aed7cdb125dd98a0f8b39963b716687506dca3615 WHIRLPOOL b434902fc96e4f6f637813a766ac6989add7470800a6ae5927787e3cc1b5bd5a53556d48c880270c4aa50aae388b7aa65c6f186014e04eca86f4ca4c6d45be16
 DIST icu4c-50_1_2-src.tgz 21189361 SHA256 cb68067dcc60d682f8e037bf0961bdd5169cb4652ef8aa136e893780047dafd3 SHA512 473824582f1240bbe985ce449438e5130955b98d13af1cbc9df5fae26a2080a459501298a6a779c793e39578b771d55c0c67ab7e29c668320809506a41e87d2b WHIRLPOOL 51c2c2e297f01e894927d0485774f70f0da66221fc73ca49322c4ecfc806eefb628a46af0b7e4aa75771bb57109660f9f7fdc05d92cd58d8e738558d313eb4a7
 EBUILD icu-49.1.2.ebuild 2303 SHA256 22b5fcfce6d5f8708fd606622648923b5146ac20d7e802af7c09aa8b2b9f6721 SHA512 02dcb2f28b89d09373518a86ec922831f52954ebe1846ca235e57db6cda3201df126ee5a13cb6597d0ffec762232d3ee33a360cb7f958a5de56a9823a729c965 WHIRLPOOL 54be9b6e9c912e7c193be83c2f20b3dd0f98b3d54961733a3622c7c314d51ae157f542c9ff996d46eeeba1b10f1167fc996e82576af2f8ebf242f6b9e27617da
-EBUILD icu-50.1-r1.ebuild 2864 SHA256 d9140a3a77d1d4dc32b2a4c2e2b59c9a5e1059ba4c3f84038b0e910ecc74d027 SHA512 7374ab3c7d418e841b9a5e35a5f1dbc78de1f63c7d4a32a623c80782354acf2f243efea3d21a15d79df00d7a51b497a2f5b6f022c81411f182f935bb837e00d5 WHIRLPOOL 1a710220a3fc2098808845761e1299a2ffb60770186ad4932ebf989d1a96f6cbb69a1617b71369260734a66c1ef3063e04040e34bc9cf93d5e2c8294583d1141
 EBUILD icu-50.1-r2.ebuild 2864 SHA256 c37a3af54656395bab213194e913c69fd783ecc6042dc44d9deacdd9f14b5bc1 SHA512 a4fb9436a486bc2f5271414d5b41942a7cc589ed05f8ee738f26e01c65b3ae4f522d1b4475a714eb846367442369bb9e20afcddf3f3ec29d71b0dd7bb8e59763 WHIRLPOOL ba6f614e00aa41b0f6694306e4c9311b0e9d882d69ed70c28651590563b3846046bc3a98f899f0a6134a65f407482b7af8f85a67d9dfde7595423b79185d3fcc
 EBUILD icu-50.1.1.ebuild 2822 SHA256 4255fc70ac7cd287dcf55dae776a66098d0c5e5251a8c8a04553518b67b1c162 SHA512 9e30386d3715b7c0dc598c04b9782bd0e6e78f5f2a99184fa53ed1949c37c7feb3bac5e62a33f501c3d5e6c90906c3d44fdd31de11603a30addf0e318e078ac4 WHIRLPOOL 5d2a98f35da2780d7e80ab27aff527fff766fc10f2b61dfe01b5d1374d4a6f0ebc79ab911074f1eaa295d0ac5d5839cb9ab12e0fa666f26bfa7029b51abde200
-EBUILD icu-50.1.2.ebuild 2823 SHA256 705e6004e41570b306c97c9dd11f18bb27c792545f431bc71d3170bf15fa5142 SHA512 59b071755b5834a97b465f5245262aa477c8a61a2cac4c1886b8c0e7cc84bd30a134dfbf4b1cb12b353384069676ddfc88219abd3a7fe6694e47bfd0dedc030b WHIRLPOOL f238ffca82b6a3af2db0d23c6f5e6b5bdbe5d80892d8b47757028fcc85c7cf66b3357eaad6581a1b081d1226d0d027f898ef9bb830ca04e2596694c4b387c380
-MISC ChangeLog 29181 SHA256 3b3db8b4815e5da8a597ef9da3db236b4f14c44ff245e832b6d5cc824734b4df SHA512 75ebf3ee77d2241a18865446b7b0ab12c00b9f3507eb77422533d77d058be562b89e32a6063a9166dfc899ceff7c651783c0cf9baf23a51017ce23a99df6e011 WHIRLPOOL e57265d04912d952b855f24bd3f079c75b7cb772cb41d4e0a16dcae36daba6cce95c905f2121b33d9cc6335921467f2391a5965dabfa26e05edf0a70a0638085
+EBUILD icu-50.1.2.ebuild 2884 SHA256 bd50218c843f8bb22d374640ab8b93b730ae94e0a37ca77bfdeb42f7f4a1c5c1 SHA512 3dca3895dc34c5ee9ebc14d0b729a07e96b245d5b06ffe4d573486fef235f07caa2044543fef771bdf9a8e51295463834d07e10ca1e7dcb10fffcdc6cf13e46a WHIRLPOOL d57c00d1b43c8c4bce277a9500d84677e81947a84679f45af9a026dba017597f10e152b0892965c5c73079fbe741856aa3e526a00e7e34a1c3f7576fed6159ce
+MISC ChangeLog 29435 SHA256 b74c77ac340660ac1d4fdf6226575b40c9ccd9613e5aaa677feea9ec7206bee2 SHA512 2495b04577c0ae95a210e61aba7d79f6b78f9724d3ad8004e88dde842cabf56e63d1762ffd9f1a85eedc62f2ce8fb0145a235e7439922cc66e8f068e493d25e2 WHIRLPOOL cb4fb48322f6c1f407882bc1de3470ba3852ad3bcdf5c3d56222a852593d61af89f46f31793ae9e6cf0916f89db88449a03cbd3f604e8b332f125f744cc12a00
 MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJREmbXAAoJEOSiRoyO7jvoQn0QAJS4ZVKvN8HJCDF02PktPLsm
-ia8M5ZVs9DsFMAmo2xty9fbjBbsgxvOirP4Kaf1l2Q4v5qCxron4xNKJZKq2yQbN
-XgkySRxJzEP41vhrOvXhZuppSRGUJnreylISYlq0MRbAKtHYPut0uqd+NWKkwTuT
-Tr6zDPf9A3dMpdReI3F2MT7LcoOkl9UWQs85NoxIiM1fvmJMiUfNEBPi7RiXJWoV
-vq61kWQFR7vopZ+yAc+IJ8j4JEmiWCvSnOlTQhJE0tWIQSo30K0azovujbsbS+cW
-mIOX0DupuU5rwhjvsuLdHRlYJmxHtSsCSHWdy/oo/Owy1ZzRX4gSUwVe6eQBizC8
-k16uNfYOQfHoVzvntCNieG/+ozeREyAHn930Nxfapkz4XDB7ACzxmN9dYtqZq/0S
-SgPaWPWi5ke3TgJ6N60zDjfkdnXD+e/7NOdlzw41Urng4NXxWHeOjQJb8cBAq8C5
-Ik7iKnMbdHkCEjOPL3vhPEgvDYah6dcRXoQQ92VXlNyO+lJXuXfcVZc6OjVMHNwf
-wSPHn2YhFSKkXu6Eyppv4uC+xmUqSJGfI785URMHHYuFeelRBnGev96mSeDE/7A8
-PFf9I157aIyCVJRZpqOA30Zp66H7V2ormGaW4sawZA/Rcuse9cMu009noAVDQHwI
-Lxkq52G8xK0W7+StYUT1
-=TmA+
+iQIcBAEBCAAGBQJREmz0AAoJEOSiRoyO7jvo3iYP/0J2ecB/r1K4wiHyBJC3I35f
+++ZMz++/6cW/CN42cdx9i3du+s5r2rWHjlJkZuOb4iNPhlQc/G0FpUVtb2DFGFQv
+g5m1lAFDvxxWrM80wgzRhjEQTtjuNkqOIDbfJyhD8Kk4Et2rrn5IgMHq2Ns4XgAY
+rCMOxAcEKmr5QAAAWAN8g8SlJwwnzkN8zEaz5NX3M108UsLO8PCwaBTkpj8/RwID
+3JtCHnXrqhx9wCkKsOkTffipBp8+4G2vsDyw6O1VcSsMmW09vvT68eoxyy7j3/1x
+R0nOdxZLVIPhNSkexwpfD24Vj3CKEiodb83j3jDaXQneAU7/Y+P+wiFMKkFPrbuU
+1iid8A5lxIOuZC6aDXMgp0OTQGHqGciND5w6NtjEY+VOrWTXy403+mP6vlu6YQln
+i9t3QpB/ERgj53tXkJHcl9KvTDz3krRF52wM1b9VmEctpuPM1qQemZ6OqSUhV6wL
+fwrh+BWK/P4VkETXHlO9tQw8h70ZujUDkQoOU11rR/1ODqBMR3sct6Z8GaJcO2zD
+3Ns2mD4cf/lFct3v6IShWWuRJiLEGWw2ITGSS+YWxbVqQFem8mYfRUVrI9DiwQB6
+efn/H3CfXYR8Sln0/MWQNQh2MGGkrHlhMjkQLSC7KcwgkwsTafubWLzuuOagkfoR
+kZTjlzX1kFgdcjChmIr3
+=h4Gh
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/icu/files/icu-50.1-no-c++11.patch b/dev-libs/icu/files/icu-50.1-no-c++11.patch
deleted file mode 100644
index 87256bd9b4b8..000000000000
--- a/dev-libs/icu/files/icu-50.1-no-c++11.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur icu.orig/source/configure.in icu/source/configure.in
---- icu.orig/source/configure.in	2012-11-03 09:16:37.937159045 +0100
-+++ icu/source/configure.in	2012-11-03 09:20:30.019550761 +0100
-@@ -955,42 +955,6 @@
-     ;;
- esac
- 
--# GCC >= 4.4 supports UTF16 string literals. The CFLAGS and CXXFLAGS may change in the future.
--if test "$CHECK_UTF16_STRING_RESULT" = "unknown"; then
--    if test "$GCC" = yes; then
--        OLD_CFLAGS="${CFLAGS}"
--        CFLAGS="${CFLAGS} -std=gnu99"
--        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
--static const char16_t test[] = u"This is a UTF16 literal string.";
--        ]], [[]])],[CC_UTF16_STRING=1],[CC_UTF16_STRING=0])
--        if test "$CC_UTF16_STRING" = 1; then
--            CHECK_UTF16_STRING_RESULT="C only";
--        else
--            CFLAGS="${OLD_CFLAGS}"
--        fi
--    fi
--    if test "$GXX" = yes; then
--        OLD_CXXFLAGS="${CXXFLAGS}"
--        # -Wno-return-type-c-linkage is desired so that stable ICU API is not warned about.
--        CXXFLAGS="${CXXFLAGS} -std=c++11"
--        AC_LANG_PUSH([C++])
--        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
--static const char16_t test[] = u"This is a UTF16 literal string.";
--        ]], [[]])],[CXX_UTF16_STRING=1],[CXX_UTF16_STRING=0])
--        AC_LANG_POP([C++])
--        if test "$CXX_UTF16_STRING" = 1; then
--            if test "$CC_UTF16_STRING" = 1; then
--                CHECK_UTF16_STRING_RESULT="available";
--            else
--                CHECK_UTF16_STRING_RESULT="C++ only";
--            fi
--        else
--            CXXFLAGS="${OLD_CXXFLAGS}"
--        fi
--    fi
--fi
--AC_MSG_RESULT($CHECK_UTF16_STRING_RESULT)
--
- # Enable/disable extras
- AC_ARG_ENABLE(extras,
- 	[  --enable-extras         build ICU extras [default=yes]],
diff --git a/dev-libs/icu/files/icu.7601.Indic-ccmp.patch b/dev-libs/icu/files/icu.7601.Indic-ccmp.patch
new file mode 100644
index 000000000000..328a2854aa5c
--- /dev/null
+++ b/dev-libs/icu/files/icu.7601.Indic-ccmp.patch
@@ -0,0 +1,43 @@
+--- icu/source/layout/IndicReordering.cpp	2009-07-01 20:51:26.000000000 +0200
++++ icu/source/layout/IndicReordering.cpp	2011-01-08 11:12:49.950566538 +0100
+@@ -13,6 +13,7 @@
+ 
+ U_NAMESPACE_BEGIN
+ 
++#define ccmpFeatureTag LE_CCMP_FEATURE_TAG
+ #define loclFeatureTag LE_LOCL_FEATURE_TAG
+ #define initFeatureTag LE_INIT_FEATURE_TAG
+ #define nuktFeatureTag LE_NUKT_FEATURE_TAG
+@@ -35,6 +36,7 @@
+ #define caltFeatureTag LE_CALT_FEATURE_TAG
+ #define kernFeatureTag LE_KERN_FEATURE_TAG
+ 
++#define ccmpFeatureMask 0x00000001UL
+ #define loclFeatureMask 0x80000000UL
+ #define rphfFeatureMask 0x40000000UL
+ #define blwfFeatureMask 0x20000000UL
+@@ -73,7 +75,7 @@
+ 
+ #define repositionedGlyphMask   0x00000002UL
+ 
+-#define basicShapingFormsMask ( loclFeatureMask | nuktFeatureMask | akhnFeatureMask | rkrfFeatureMask | blwfFeatureMask | halfFeatureMask | vatuFeatureMask | cjctFeatureMask )
++#define basicShapingFormsMask ( ccmpFeatureMask | loclFeatureMask | nuktFeatureMask | akhnFeatureMask | rkrfFeatureMask | blwfFeatureMask | halfFeatureMask | vatuFeatureMask | cjctFeatureMask )
+ #define positioningFormsMask ( kernFeatureMask | distFeatureMask | abvmFeatureMask | blwmFeatureMask )
+ #define presentationFormsMask ( presFeatureMask | abvsFeatureMask | blwsFeatureMask | pstsFeatureMask | halnFeatureMask | caltFeatureMask )
+ 
+@@ -480,6 +482,7 @@
+ #define tagArray0 (rphfFeatureMask | tagArray1)
+ 
+ static const FeatureMap featureMap[] = {
++    {ccmpFeatureTag, ccmpFeatureMask},
+     {loclFeatureTag, loclFeatureMask},
+     {initFeatureTag, initFeatureMask},
+     {nuktFeatureTag, nuktFeatureMask},
+@@ -502,6 +505,7 @@
+ static const le_int32 featureCount = LE_ARRAY_SIZE(featureMap);
+ 
+ static const FeatureMap v2FeatureMap[] = {
++    {ccmpFeatureTag, ccmpFeatureMask},
+ 	{loclFeatureTag, loclFeatureMask},
+     {nuktFeatureTag, nuktFeatureMask},
+     {akhnFeatureTag, akhnFeatureMask},
diff --git a/dev-libs/icu/files/icu.8198.revert.icu5431.patch b/dev-libs/icu/files/icu.8198.revert.icu5431.patch
new file mode 100644
index 000000000000..4c3e78b8ed5d
--- /dev/null
+++ b/dev-libs/icu/files/icu.8198.revert.icu5431.patch
@@ -0,0 +1,129 @@
+Index: icu/trunk/source/layout/IndicReordering.cpp

+===================================================================

+--- icu/trunk/source/layout/IndicReordering.cpp	(revision 25772)

++++ icu/trunk/source/layout/IndicReordering.cpp	(revision 26090)

+@@ -126,4 +126,8 @@

+     FeatureMask fSMFeatures;

+ 

++    LEUnicode   fPreBaseConsonant;

++    LEUnicode   fPreBaseVirama;

++    le_int32    fPBCIndex;

++    FeatureMask fPBCFeatures;

+ 

+     void saveMatra(LEUnicode matra, le_int32 matraIndex, IndicClassTable::CharClass matraClass)

+@@ -172,5 +176,6 @@

+           fMatraFeatures(0), fMPreOutIndex(-1), fMPreFixups(mpreFixups),

+           fVMabove(0), fVMpost(0), fVMIndex(0), fVMFeatures(0),

+-          fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0)

++          fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0),

++          fPreBaseConsonant(0), fPreBaseVirama(0), fPBCIndex(0), fPBCFeatures(0)

+     {

+         // nothing else to do...

+@@ -191,4 +196,6 @@

+         fVMabove = fVMpost  = 0;

+         fSMabove = fSMbelow = 0;

++

++        fPreBaseConsonant = fPreBaseVirama = 0;

+     }

+ 

+@@ -386,4 +393,12 @@

+     }

+ 

++    void notePreBaseConsonant(le_uint32 index,LEUnicode PBConsonant, LEUnicode PBVirama, FeatureMask features)

++    {

++        fPBCIndex = index;

++        fPreBaseConsonant = PBConsonant;

++        fPreBaseVirama = PBVirama;

++        fPBCFeatures = features;

++    }

++

+     void noteBaseConsonant()

+     {

+@@ -465,4 +480,20 @@

+     }

+     

++    void writePreBaseConsonant()

++    {

++        // The TDIL spec says that consonant + virama + RRA should produce a rakar in Malayalam.  However,

++        // it seems that almost none of the fonts for Malayalam are set up to handle this.

++        // So, we're going to force the issue here by using the rakar as defined with RA in most fonts.

++

++        if (fPreBaseConsonant == 0x0d31) { // RRA

++            fPreBaseConsonant = 0x0d30; // RA

++        }

++        

++        if (fPreBaseConsonant != 0) {

++            writeChar(fPreBaseConsonant, fPBCIndex, fPBCFeatures);

++            writeChar(fPreBaseVirama,fPBCIndex-1,fPBCFeatures);

++        }

++    }

++

+     le_int32 getOutputIndex()

+     {

+@@ -723,4 +754,5 @@

+             }

+ 

++            

+             IndicClassTable::CharClass charClass = CC_RESERVED;

+             IndicClassTable::CharClass nextClass = CC_RESERVED;

+@@ -730,7 +762,9 @@

+             le_bool  seenVattu = FALSE;

+             le_bool  seenBelowBaseForm = FALSE;

++            le_bool  seenPreBaseForm = FALSE;

+             le_bool  hasNukta = FALSE;

+             le_bool  hasBelowBaseForm = FALSE;

+             le_bool  hasPostBaseForm = FALSE;

++            le_bool  hasPreBaseForm = FALSE;

+ 

+             if (postBase < markStart && classTable->isNukta(chars[postBase])) {

+@@ -746,12 +780,20 @@

+                 hasBelowBaseForm = IndicClassTable::hasBelowBaseForm(charClass) && !hasNukta;

+                 hasPostBaseForm  = IndicClassTable::hasPostBaseForm(charClass)  && !hasNukta;

++                hasPreBaseForm = IndicClassTable::hasPreBaseForm(charClass) && !hasNukta;

+ 

+                 if (IndicClassTable::isConsonant(charClass)) {

+                     if (postBaseLimit == 0 || seenVattu ||

+                         (baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) ||

+-                        !(hasBelowBaseForm || hasPostBaseForm)) {

++                        !(hasBelowBaseForm || hasPostBaseForm || hasPreBaseForm)) {

+                         break;

+                     }

+ 

++                    // Note any pre-base consonants

++                    if ( baseConsonant == lastConsonant && lastConsonant > 0 && 

++                         hasPreBaseForm && classTable->isVirama(chars[baseConsonant - 1])) {

++                        output.notePreBaseConsonant(lastConsonant,chars[lastConsonant],chars[lastConsonant-1],tagArray2);

++                        seenPreBaseForm = TRUE;

++   

++                    }

+                     // consonants with nuktas are never vattus

+                     seenVattu = IndicClassTable::isVattu(charClass) && !hasNukta;

+@@ -786,10 +828,12 @@

+ 

+             // write any pre-base consonants

++            output.writePreBaseConsonant();

++

+             le_bool supressVattu = TRUE;

+ 

+             for (i = baseLimit; i < baseConsonant; i += 1) {

+                 LEUnicode ch = chars[i];

+-                // Don't put 'blwf' on first consonant.

+-                FeatureMask features = (i == baseLimit? tagArray2 : tagArray1);

++                // Don't put 'pstf' or 'blwf' on anything before the base consonant.

++                FeatureMask features = tagArray1 & ~( pstfFeatureMask | blwfFeatureMask );

+ 

+                 charClass = classTable->getCharClass(ch);

+@@ -842,5 +886,5 @@

+ 

+             // write below-base consonants

+-            if (baseConsonant != lastConsonant) {

++            if (baseConsonant != lastConsonant && !seenPreBaseForm) {

+                 for (i = bcSpan + 1; i < postBase; i += 1) {

+                     output.writeChar(chars[i], i, tagArray1);

+@@ -872,5 +916,5 @@

+             // write post-base consonants

+             // FIXME: does this put the right tags on post-base consonants?

+-            if (baseConsonant != lastConsonant) {

++            if (baseConsonant != lastConsonant && !seenPreBaseForm) {

+                 if (postBase <= lastConsonant) {

+                     for (i = postBase; i <= lastConsonant; i += 1) {

diff --git a/dev-libs/icu/icu-50.1-r1.ebuild b/dev-libs/icu/icu-50.1-r1.ebuild
deleted file mode 100644
index 53f85618ca6f..000000000000
--- a/dev-libs/icu/icu-50.1-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50.1-r1.ebuild,v 1.5 2013/02/02 10:53:04 aballier Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs base autotools
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
-IUSE="debug doc examples static-libs"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-	)
-"
-
-S="${WORKDIR}/${PN}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.1-fix_binformat_fonts.patch"
-	"${FILESDIR}/${PN}-4.8.1.1-fix_ltr.patch"
-	"${FILESDIR}/${PN}-50.1-no-c++11.patch"
-)
-
-src_prepare() {
-	local variable
-
-	base_src_prepare
-
-	# Do not hardcode flags in icu-config and icu-*.pc files.
-	# https://ssl.icu-project.org/trac/ticket/6102
-	for variable in CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
-		sed \
-			-e "/^${variable} =.*/s: *@${variable}@\( *$\)\?::" \
-			-i config/icu.pc.in \
-			-i config/Makefile.inc.in \
-			|| die
-	done
-
-	# Disable renaming as it is stupind 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.in || die
-	eautoreconf
-}
-
-src_configure() {
-	local cross_opts
-
-	# bootstrap for cross compilation
-	if tc-is-cross-compiler; then
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		./configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-		mkdir -p "${WORKDIR}/host/"
-		cp -a {bin,lib,config,tools} "${WORKDIR}/host/"
-		emake clean
-
-		cross_opts="--with-cross-build=${WORKDIR}/host"
-	fi
-
-	econf \
-		--disable-renaming \
-		$(use_enable debug) \
-		$(use_enable examples samples) \
-		$(use_enable static-libs static) \
-		${cross_opts}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-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
-}
-
-src_install() {
-	default
-
-	dohtml ../readme.html
-
-	use doc && dohtml -p api -r doc/html/
-}
diff --git a/dev-libs/icu/icu-50.1.2.ebuild b/dev-libs/icu/icu-50.1.2.ebuild
index 0bdd5630bd59..69baabfd71cd 100644
--- a/dev-libs/icu/icu-50.1.2.ebuild
+++ b/dev-libs/icu/icu-50.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50.1.2.ebuild,v 1.1 2013/02/06 14:21:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50.1.2.ebuild,v 1.2 2013/02/06 14:45:53 scarabeus Exp $
 
 EAPI=5
 
@@ -25,13 +25,15 @@ S="${WORKDIR}/${PN}/source"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.8.1-fix_binformat_fonts.patch"
-	"${FILESDIR}/${PN}-4.8.1.1-fix_ltr.patch"
+	"${FILESDIR}/${PN}.7601.Indic-ccmp.patch"
 )
 
 src_prepare() {
 	local variable
 
 	base_src_prepare
+	epatch -R \
+		"${FILESDIR}/${PN}.8198.revert.icu5431.patch"
 
 	# Do not hardcode flags in icu-config and icu-*.pc files.
 	# https://ssl.icu-project.org/trac/ticket/6102