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

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

9 files changed, 13 insertions, 524 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/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() {