Fix detection of some platforms. Patch by Arfrever.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 66 insertions, 3 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index 551cbb7eaf42..37347a31bbfd 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/icu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.200 2012/06/07 00:42:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.201 2012/07/23 14:51:23 floppym Exp $
+
+  23 Jul 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/icu-49.1.2-platforms.patch, icu-49.1.2.ebuild:
+  Fix detection of some platforms. Patch by Arfrever.
 
 *icu-49.1.2 (07 Jun 2012)
 
diff --git a/dev-libs/icu/files/icu-49.1.2-platforms.patch b/dev-libs/icu/files/icu-49.1.2-platforms.patch
new file mode 100644
index 000000000000..1aaf58034b04
--- /dev/null
+++ b/dev-libs/icu/files/icu-49.1.2-platforms.patch
@@ -0,0 +1,59 @@
+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/icu-49.1.2.ebuild b/dev-libs/icu/icu-49.1.2.ebuild
index d0c70504b297..274b22e37226 100644
--- a/dev-libs/icu/icu-49.1.2.ebuild
+++ b/dev-libs/icu/icu-49.1.2.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2012/06/07 00:42:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-49.1.2.ebuild,v 1.2 2012/07/23 14:51:22 floppym Exp $
 
 EAPI="4"
 
@@ -55,7 +55,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-4.8.1-fix_binformat_fonts.patch"
 	epatch "${FILESDIR}/${PN}-4.8.1.1-fix_ltr.patch"
-	epatch "${FILESDIR}/${PN}-49.1.1-bsd.patch"
+	epatch "${FILESDIR}/${P}-platforms.patch"
 }
 
 src_configure() {