Version bump to latest release, yay changed api/abi again without bump. Remove overshadowed versions to keep life simpler.

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

10 files changed, 31 insertions, 552 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index 72e19be212c6..b9407fbf15cf 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,16 @@
 # 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.242 2013/05/20 18:03:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.243 2013/07/23 18:14:43 scarabeus Exp $
+
+*icu-51.2 (23 Jul 2013)
+
+  23 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> +icu-51.2.ebuild,
+  -files/icu-49.1.2-platforms.patch, -files/icu-50.1-char16_t.patch,
+  -files/icu-50.1.2-bsd.patch, -files/icu.7601.Indic-ccmp.patch,
+  -files/icu.8198.revert.icu5431.patch, -icu-49.1.2.ebuild, -icu-50.1-r2.ebuild,
+  -icu-50.1.2.ebuild:
+  Version bump to latest release, yay changed api/abi again without bump. Remove
+  overshadowed versions to keep life simpler.
 
   20 May 2013; Agostino Sarubbo <ago@gentoo.org> icu-51.1.ebuild:
   Stable for s390, wrt bug #467452
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 3d37378be5b6..ea29e7c1b3f7 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,38 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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.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.2-bsd.patch 256 SHA256 8e18a89adff9b36f433a2b481545622a739498a54c8af09b8628f7bb4ebc1a74 SHA512 f3f47d053076f4bb02b2f7c00044daea1064245566ba7b368759c15edd5459ad63f59ac5469ef88273f6ba15bcbed83f5b90f659cef686c962af80982cf33aac WHIRLPOOL ba9d26dd4ff4dd9bd0e72b3299817778d88b5c248211a15562b6458d8e802bd2a1c8cdd5cfee35f6b46c82e6969383f1715e6ae567562e3a8a039adb467b33d1
-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_2-src.tgz 21189361 SHA256 cb68067dcc60d682f8e037bf0961bdd5169cb4652ef8aa136e893780047dafd3 SHA512 473824582f1240bbe985ce449438e5130955b98d13af1cbc9df5fae26a2080a459501298a6a779c793e39578b771d55c0c67ab7e29c668320809506a41e87d2b WHIRLPOOL 51c2c2e297f01e894927d0485774f70f0da66221fc73ca49322c4ecfc806eefb628a46af0b7e4aa75771bb57109660f9f7fdc05d92cd58d8e738558d313eb4a7
 DIST icu4c-51_1-src.tgz 21815174 SHA256 87e5ae513bd29f25f8648044af01d5ab77460912f375f9fe11f58a54e783666b SHA512 e6ee38f8e380db41803bf5291f2abd88d2efd27a322fa2345111fee3b58b852e3c079fc5408d0da379f86540f1a20131916a598f2a14bd57edd2f15cd64935f3 WHIRLPOOL adbd1f35697fea0544bec6a5453ae0f1f9b3e22288f8d33ae239c5d06fc9ed96a2d1d737cb8d03031c747628f1d54f0786c71af4f0f03153c9d1daf1f7623715
-EBUILD icu-49.1.2.ebuild 2303 SHA256 22b5fcfce6d5f8708fd606622648923b5146ac20d7e802af7c09aa8b2b9f6721 SHA512 02dcb2f28b89d09373518a86ec922831f52954ebe1846ca235e57db6cda3201df126ee5a13cb6597d0ffec762232d3ee33a360cb7f958a5de56a9823a729c965 WHIRLPOOL 54be9b6e9c912e7c193be83c2f20b3dd0f98b3d54961733a3622c7c314d51ae157f542c9ff996d46eeeba1b10f1167fc996e82576af2f8ebf242f6b9e27617da
-EBUILD icu-50.1-r2.ebuild 2864 SHA256 8f5de1407a22525a59297f56791c3f172aca0cd0309bf6df5a802794614f1998 SHA512 3570e3faccc39ba058421e14e298599d8fb390399c228a5ed6d86b44fed0786b43411af9e2dbbad168300a2260e4a0d00285b157c7bbf86c44a35d01d9d4f720 WHIRLPOOL 3cc0c57f5d1ec3ed434800c932097dc923a80a4a2fadf09a52955c04ae08cf5fc740dc02b6a08336d059b64d1b67cc369f2785037cf013ab04e0e5ea53504704
-EBUILD icu-50.1.2.ebuild 2921 SHA256 7babd3f77e767decb8ba9e0bfc17c7f32757adb9b51fad3aae9743f296ada4e1 SHA512 e23c006593436c9835fc0c418bc4e8a1cdea6d5d66866ef2d7e604b00c0f413e4d35f7760c1e845c1f6929844eadc721e8d6ab18db339ae5df663113b28d17b3 WHIRLPOOL 1a324800994f7698f48e21c80df0731b501b9ad91c670a81fe937e5dd99fac295b6a26b0bb872173150ae18048852e47eb3723f7fa6de7401c6ef22032dcab2f
+DIST icu4c-51_2-src.tgz 21841928 SHA256 deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc SHA512 74e22b792d6812c1bf2192f2572f75ec8a14fac5e9b00850f9225279fc09da913082001bef20595f6634a5c3f3335e92906568023544516da69a775bcf5e2a1a WHIRLPOOL 098d6c77543cd6b30cc39dd79776b7dc3b0c4111af289b43dab1dc6ca1fd056bdb99363f8e0af7a2f800b95fe7a50024fa395764c9e14582a0b3c54266b25946
 EBUILD icu-51.1.ebuild 2804 SHA256 5595bcf402bc19ad7fe713912ccf3fea82cffcfb22dc5c5e902f16b971e6de9b SHA512 977a9b83fc762b56cd17a6c9bd7b1928cf2ef74c887ef66432139b8092305e3410133c5b977fdcbcd5ccae83790351f896478c73b23c702cf73618b5d23a5b09 WHIRLPOOL f1fbf6cf7af17e93d61dd0ce8be91b4ec8d1dc43a6e747d12cc849f631621bb57e5124fd88b98675f6858f8d181b7fd5b6d2f8c7e9ce2becb55696edf7c59ff3
-MISC ChangeLog 31378 SHA256 bb7ba7c1e983561953d7d3642c60909585547babf8f2b7823e89a8183826165a SHA512 5b9aa1f2485cd97cb6a9601dad18461fd40bb3f2fa8a14252cdbc921858188922ba798eb931d646432f0ff2d803967134a1b66caf76749a8cbeb0df51406957e WHIRLPOOL 7dee7d0ec0a69809cce4dd50c8aaeb4eefc20614e197ee384d8d3fb10a11ab7f688f36f09920e49f4bc4301bebd7462459cc49ed1fb9fa9d31bf99621af4f7a9
+EBUILD icu-51.2.ebuild 2820 SHA256 1426af62082eec7d092227e7f66f18e612ecc0bf14eee006ca6feac33502feae SHA512 1872e790f824ba50c049941e1d68c1bb4a7299776ac9fb1900ceb664917c46aa5f1b226ad8cd6a301320867e5d5ef6151942cc51d3b8ed9be99f43c231774344 WHIRLPOOL c1912aba66000b8e170007294618fb24e9ddc6915e3bf68ff890d719b428a3fd437534a7d8c74f3b937300468449f6f74906137d3659fdd0503a345930fcd5a5
+MISC ChangeLog 31847 SHA256 3a82ebf6dec8e111ea600ad58ccfe5e28df0c313b2188fcbce018d6a1b7a86f3 SHA512 ef3dcfd550611d3c445eb2295e3d99e4fe4f90324729fcfe2565d37b970a729eab3187bf13430dcd2186a2386a8b68a69c57a6f577602d495b855be0a2c50883 WHIRLPOOL 4601e547d9e9a46350137c4deb671467b741c4c1c99d654e96b4c59b7c99b26a682e667a5babd394abee5454c14c3bbf7dcf02eb57af41f3076aad34a35e20c6
 MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRmmTaAAoJELp701BxlEWfaL8QAIqK0SPW0viTdnq/7qf5NkhX
-hob+0IGZqO3g7IjuLY7D9iYhywiYBMZQ/m9BegN/++iFj4b6FR7yk1AkJN9HhV6v
-BBg72WUTPX3M8aNCUtzh+SneS2fyw4sGDNTig6vtCAzu7zjyoJlWZl37+e64YjJC
-OoM6l5KlgcYJ9tDVMYgqOiEKslyT8PiZrXiFh/qGyj9NZaM7/XCXCMLnuzkIWSHG
-9SKS3nuwp3SlT1xV8xxSL89LFzrKFLW908VRBtkANOQSFQ05aKySAXxrgxuLhG+k
-Ypx3fdg+DaWIHWEFi1PUWO8Hwx+4gu3CdzghzlgKXEkk3yRMof2OmwczNM5ZbmzI
-vqmC5kXT4p3Ht13Z52monA7p17ih7LFSkzw9YwvSNwD0dag0oeRPQSbF0IzizBUl
-nty+3jBxbq/2d3G08ckTtSElxqRFR1QLvc36yCfXJZZAe9JYSatNBXxDL3cPiGjz
-ZuteJQ0MVvCvrWLBHZje1r5msjdsBF2BypqrjcepSTfMDfpCRTqPQwgl0TJt9u/m
-xQwkEtytV5/t9dqhuvWBPLcz+dabOROhxtrbPq/rvd+Mb42iQ/uK0s57KtRDyGYq
-NhOHg0iBkWDwZfqAIsPbAATNsBl59fTdEOp1htt7ekJzUIeLA68bTV2frnU6P+N4
-k8Ls2ThJ86foT6Pe+Lq8
-=vGZ2
+iQIcBAEBCAAGBQJR7shzAAoJEOSiRoyO7jvorSwQAJj2x4noSseWmlJC1hXi5kj0
+gt2wbj5cialc6M/x6DTAB8U0rDnN3gC1OmETCzyZpiiZcJtyxZZP4Q/C9Q9AE9Oe
+CB8KWrIrruFrZzq39j0vUqe3VWkm4jgKQ9MEnsihl1/Wes2iyzaglUqtpRyVPYSi
+jk687txRJdYjybwsAsovyUXVzH6XEWGHNIBrrHR0Rld2XHt9PuVSxOvtEfP+ajgj
+dnY7DI/UByX5/GloM+J98PVUhVf3kpg7DCYnYqsAeGaOpUqy5FcmBzWbMP4zSCSQ
+socSzPADmheE8RA4Yy1f0Ld75UmuWCunM+VhlH4rkq/MiCdi0GSdu5MIOGmZhcnL
+emiBGui97tY9gP9+F0wuLG6vYcFFasul7GCzGN5uo8WZxMHHK8D2xS18aBLQ/7zJ
+M6fjWjlk3kFK8p3YXVRNrEpKDg+GwS1+vefR8zQYNZcZ9lGqBsPlLI41ce4IRqZw
+u9tOT5lVMphS8OE/5qnirllmJBgyE2IlQuo840OH87FJTJPoU113nJ4r7KyUluGa
+d6AW0jJMeZfOYGe8hdWdEwfPl989505eUMdPBw02uz//1QiODJfwTFUHYruDVgod
++Pr/Lrcvr2MR1rwCaU1pqX0kRjo+AxpTeRqFR2PCoB0ghMcIs0S51LwQjqWQ7foA
+fNeAVX3nM+eprsKQW0r5
+=0IO3
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/icu/files/icu-49.1.2-platforms.patch b/dev-libs/icu/files/icu-49.1.2-platforms.patch
deleted file mode 100644
index 1aaf58034b04..000000000000
--- a/dev-libs/icu/files/icu-49.1.2-platforms.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://ssl.icu-project.org/trac/ticket/9286
-https://ssl.icu-project.org/trac/ticket/9365
-https://ssl.icu-project.org/trac/changeset/31780
-https://ssl.icu-project.org/trac/changeset/31971
-https://ssl.icu-project.org/trac/changeset/32020
-https://ssl.icu-project.org/trac/changeset/32023
-
---- common/putilimp.h
-+++ common/putilimp.h
-@@ -117,6 +117,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__) || defined(__MirBSD__)
- #   define U_PLATFORM U_PF_BSD
- #elif defined(sun) || defined(__sun)
-     /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */
-@@ -268,6 +268,9 @@
- #elif U_PLATFORM == U_PF_SOLARIS
-     /* Solaris has inttypes.h but not stdint.h. */
- #   define U_HAVE_STDINT_H 0
-+#elif U_PLATFORM == U_PF_AIX && !defined(_AIX51) && defined(_POWER)
-+    /* PPC AIX <= 4.3 has inttypes.h but not stdint.h. */
-+#   define U_HAVE_STDINT_H 0
- #else
- #   define U_HAVE_STDINT_H 1
- #endif
-@@ -283,6 +286,9 @@
- #elif U_PLATFORM == U_PF_SOLARIS
-     /* Solaris has inttypes.h but not stdint.h. */
- #   define U_HAVE_INTTYPES_H 1
-+#elif U_PLATFORM == U_PF_AIX && !defined(_AIX51) && defined(_POWER)
-+    /* PPC AIX <= 4.3 has inttypes.h but not stdint.h. */
-+#   define U_HAVE_INTTYPES_H 1
- #else
-     /* Most platforms have both inttypes.h and stdint.h, or neither. */
- #   define U_HAVE_INTTYPES_H U_HAVE_STDINT_H
-@@ -352,6 +358,9 @@
- #elif defined(_PA_RISC1_0) || defined(_PA_RISC1_1) || defined(_PA_RISC2_0)
-     /* HPPA do not appear to predefine any endianness macros. */
- #   define U_IS_BIG_ENDIAN 1
-+#elif defined(sparc) || defined(__sparc) || defined(__sparc__)
-+    /* Some sparc based systems (e.g. Linux) do not predefine any endianness macros. */
-+#   define U_IS_BIG_ENDIAN 1
- #else
- #   define U_IS_BIG_ENDIAN 0
- #endif
diff --git a/dev-libs/icu/files/icu-50.1-char16_t.patch b/dev-libs/icu/files/icu-50.1-char16_t.patch
deleted file mode 100644
index a06c3d2ab299..000000000000
--- a/dev-libs/icu/files/icu-50.1-char16_t.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: /icu/trunk/source/test/intltest/strtest.cpp

-===================================================================

---- /icu/trunk/source/test/intltest/strtest.cpp	(revision 32779)

-+++ /icu/trunk/source/test/intltest/strtest.cpp	(revision 32780)

-@@ -1,5 +1,5 @@

- /********************************************************************

-  * COPYRIGHT: 

-- * Copyright (c) 1997-2011, International Business Machines Corporation and

-+ * Copyright (c) 1997-2012, International Business Machines Corporation and

-  * others. All Rights Reserved.

-  ********************************************************************/

-@@ -95,5 +95,5 @@

- StringTest::Test_U_STRING() {

-     U_STRING_INIT(ustringVar, "aZ0 -", 5);

--    if( sizeof(ustringVar)/sizeof(*ustringVar)!=6 ||

-+    if( u_strlen(ustringVar)!=5 ||

-         ustringVar[0]!=0x61 ||

-         ustringVar[1]!=0x5a ||

-Index: /icu/trunk/source/common/unicode/ustring.h

-===================================================================

---- /icu/trunk/source/common/unicode/ustring.h	(revision 32779)

-+++ /icu/trunk/source/common/unicode/ustring.h	(revision 32780)

-@@ -940,5 +940,5 @@

-  */

- #if defined(U_DECLARE_UTF16)

--#   define U_STRING_DECL(var, cs, length) static const UChar var[(length)+1]=U_DECLARE_UTF16(cs)

-+#   define U_STRING_DECL(var, cs, length) static const UChar *var=(const UChar *)U_DECLARE_UTF16(cs)

-     /**@stable ICU 2.0 */

- #   define U_STRING_INIT(var, cs, length)

-Index: /icu/trunk/source/common/unicode/platform.h

-===================================================================

---- /icu/trunk/source/common/unicode/platform.h	(revision 32779)

-+++ /icu/trunk/source/common/unicode/platform.h	(revision 32780)

-@@ -665,7 +665,7 @@

-      * gcc 4.4 defines the __CHAR16_TYPE__ macro to a usable type but

-      * does not support u"abc" string literals.

--     * C++11 requires support for UTF-16 literals

-+     * C++11 and C11 require support for UTF-16 literals

-      */

--#   if (defined(__cplusplus) && __cplusplus >= 201103L)

-+#   if (defined(__cplusplus) && __cplusplus >= 201103L) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)

- #       define U_HAVE_CHAR16_T 1

- #   else

-Index: /icu/trunk/source/common/unicode/umachine.h

-===================================================================

---- /icu/trunk/source/common/unicode/umachine.h	(revision 32779)

-+++ /icu/trunk/source/common/unicode/umachine.h	(revision 32780)

-@@ -257,5 +257,5 @@

- /**

-  * \var UChar

-- * Define UChar to be char16_t, if available,

-+ * Define UChar to be UCHAR_TYPE, if that is #defined (for example, to char16_t),

-  * or wchar_t if that is 16 bits wide; always assumed to be unsigned.

-  * If neither is available, then define UChar to be uint16_t.

-@@ -267,8 +267,8 @@

-  * @stable ICU 4.4

-  */

--

--/* Define UChar to be compatible with char16_t or wchar_t if possible. */

--#if U_HAVE_CHAR16_T

--    typedef char16_t UChar;

-+#if defined(UCHAR_TYPE)

-+    typedef UCHAR_TYPE UChar;

-+/* Not #elif U_HAVE_CHAR16_T -- because that is type-incompatible with pre-C++11 callers

-+    typedef char16_t UChar;  */

- #elif U_SIZEOF_WCHAR_T==2

-     typedef wchar_t UChar;

diff --git a/dev-libs/icu/files/icu-50.1.2-bsd.patch b/dev-libs/icu/files/icu-50.1.2-bsd.patch
deleted file mode 100644
index 4515a92ebc78..000000000000
--- a/dev-libs/icu/files/icu-50.1.2-bsd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/genrb/derb.c.orig	2012-11-05 18:14:54.000000000 +0100
-+++ tools/genrb/derb.c	2012-12-17 04:02:54.787359037 +0100
-@@ -27,6 +27,7 @@
- #include "ustrfmt.h"
- 
- #include <stdlib.h>
-+#define _TRUNCATE_DECLARED
- #include <stdio.h>
- #include <ctype.h>
- 
diff --git a/dev-libs/icu/files/icu.7601.Indic-ccmp.patch b/dev-libs/icu/files/icu.7601.Indic-ccmp.patch
deleted file mode 100644
index 328a2854aa5c..000000000000
--- a/dev-libs/icu/files/icu.7601.Indic-ccmp.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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
deleted file mode 100644
index 4c3e78b8ed5d..000000000000
--- a/dev-libs/icu/files/icu.8198.revert.icu5431.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-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-49.1.2.ebuild b/dev-libs/icu/icu-49.1.2.ebuild
deleted file mode 100644
index 31c32bb8bd79..000000000000
--- a/dev-libs/icu/icu-49.1.2.ebuild
+++ /dev/null
@@ -1,91 +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.2.ebuild,v 1.8 2012/09/30 16:19:09 armin76 Exp $
-
-EAPI="4"
-
-inherit eutils versionator
-
-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}-platforms.patch"
-}
-
-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
-}
-
-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
-}
diff --git a/dev-libs/icu/icu-50.1.2.ebuild b/dev-libs/icu/icu-50.1.2.ebuild
deleted file mode 100644
index e0ca07b03857..000000000000
--- a/dev-libs/icu/icu-50.1.2.ebuild
+++ /dev/null
@@ -1,121 +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.2.ebuild,v 1.4 2013/03/06 21:41:31 scarabeus 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/50.1"
-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}.7601.Indic-ccmp.patch"
-	"${FILESDIR}/${PN}-50.1.2-bsd.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
-	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-r2.ebuild b/dev-libs/icu/icu-51.2.ebuild
index 1841c317c52c..2bb7f8968954 100644
--- a/dev-libs/icu/icu-50.1-r2.ebuild
+++ b/dev-libs/icu/icu-51.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-r2.ebuild,v 1.6 2013/03/06 21:41:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-51.2.ebuild,v 1.1 2013/07/23 18:14:43 scarabeus Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.icu-project.org/"
 SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
 
 LICENSE="BSD"
-SLOT="0/50.1"
+SLOT="0/51.2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
 IUSE="debug doc examples static-libs"
 
@@ -26,7 +26,6 @@ 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-char16_t.patch"
 )
 
 src_prepare() {