Fix detection of some platforms. Patch by Arfrever.

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

4 files changed, 79 insertions, 5 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/Manifest b/dev-libs/icu/Manifest
index 0fbec305981b..2eb4e226af55 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.1-bsd.patch 970 SHA256 65aa0d5543ab8a6975eeab5f8dd28cb624cc95f03e10ac2ce86288fe731a76df SHA512 e3dadc58b20ac8f8e5df0b9ce2b6c98450d07426acb99771e936b5ae995c680717c45d907bad9eacd6f4920efe797cad693818e50df4443c6462786d8ea2434e WHIRLPOOL de7e0fb14e04e9b5a3f8deac6bd4e8df7484adf015cb6a3db8a07219a17ef48dcae95febc2f1a3c98ea1c8086f5dedaae43e85ba35348107c5797907653d0585
 AUX icu-49.1.1-regex.patch 4862 SHA256 b2dc7c082371743d1ca68c31ae3b29e592e8df81b7230a0c7a3a88d073265c04 SHA512 d2dca7b7ece90b50c2a627917d7d56b7dfb17f229c7a152beff9f5ee60779604bf57170a46dff07a43582ce7098e66b3fca0f416bf308d58a5b4fa9bdafdf37c WHIRLPOOL bba94e7f7e2eb6c0fd93c60fe1ae374a6110d657a357b1a809de9e50135ba045e4b31af204b8fb2d368763f6e945f07cb15123d64a949ca58a2a82831b189fca
+AUX icu-49.1.2-platforms.patch 2368 SHA256 e90a4c2c11b25fd511a754b4c8f7b2a491f75bd7a72dc03fc1c8821f6c8fe004 SHA512 30266ed021df921e4c502ec453e842c9aec607281dcd542a76680c0be72724a0c596542043580d96ae4098f7b08cb42827757d630cb6e12aaea0d1e034104891 WHIRLPOOL 2ff2499d6306db27866487a90014e330d7bda25fb671aa6dd238130d2255f1551a2337270a20731ea9fcf5ce15914c9cc939ca76e30aac246c807495ba439883
 DIST icu4c-49_1_1-docs.zip 4243474 SHA256 0cd59f0782b1330aa1b7c520dba315a8da48262639336f12bb123995dadcd80f SHA512 d5dc54cde5327c8870f990609e7ae3183615e0f6e36b30f93bc9e57a6022cb7e703cbf6f4ccb43d37a93d0e6c5522e589c4fcaf8bd9b9fca19ca84683111a5fe WHIRLPOOL c1cda4de3f445656e5711b46c55f6e33721c2385ddbb969727973b5018136a2e24c21dc2646535fdb7f2e7bfe6b8fe9de63e15e5d45808527e874e1858831448
 DIST icu4c-49_1_1-src.tgz 19001722 SHA256 e6f079e9bd92d9eddc3fcdeb943408c4bfd3d25a569a7060c9221f174403cdf1 SHA512 4b9136e6f8eeb54b1fb6115e50d1f806fa7136c30f379c0c6452236494028aa04d4c9c0ca3afac8f41ee32b890eaaf9125f949760e1e7bef3b8a096c8cf3b822 WHIRLPOOL 6dc99b816318aae84396c309941571fc7155c222418b4be05f28749084b3451b9a1a776ab38a977bee799a82d5787977014b54919a9b288ee6ba7dea7b460295
 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
 EBUILD icu-49.1.1-r1.ebuild 2476 SHA256 8862418ad56065bdb83a6354ec40b6647e8a4af7f7dd8081b315d62de61a1ebe SHA512 6c85608cb01bcf09a5eb6903950863a9d64a738ae8ec35cad09090163c71153de2411ff2a825e06ef2666079db23fa635a6bec82f627e0ceb413066a1c302154 WHIRLPOOL 814e25d6b18aea566808fffd089bc5a37e3306f7d254dcec25fea98893be2814b00571bb27075522270e13ac8cc443965b94a43fa151571a2dc71d8c26296a57
-EBUILD icu-49.1.2.ebuild 2316 SHA256 60fa9cc6be1f83e628ab642fc943e881fcb6cc35340072aacdf44e84456e7f84 SHA512 8acdc769fd95959e6f9b0846300287aa9bcb3e69aecf08cdb5f030286f6be5eea4488eb652a324c5334b791aedc9c04fa291b87bb5b902b778c6989bab2670c1 WHIRLPOOL aa355d4617d5e2e9296fd968bda262d37beafe1fd832b17cfda22c70df48a210af5a5f2d7b524b7dc764626eed38450ef48935b445a3ed07bcd8709305a0a245
-MISC ChangeLog 25091 SHA256 0932821eab70a7724b16247cf05cdfb29d409ee8c6f011fac0e137014f6e0ee0 SHA512 56e0a1230dac7ddddca886ff21c712ccc361b03125a431c64e93a6c79eced83a44bad7342192ebe547dd75643864e2cb84476d72fb37797ba6a5881ac9bb2dcc WHIRLPOOL cd24d2c3d311df5330708c8fdebebd058de1dfe441d7a60c80f7ab47fb92e0726dbbe9afdb536cd3c51638658600b25706a20a07645b831ed9f8e00c736f3510
+EBUILD icu-49.1.2.ebuild 2314 SHA256 4205750f5ba46c39faf3e02e0b237a0e05a406479cc70e9dc06c133b0c0e464a SHA512 6325ba3867a3d5c52ceaf93d848e14c371a675ef0dc99f076543a843c19ae11c976999e1a8302c1cc003c16381e44c3587e4ef76041df59432bfe7253f6241b9 WHIRLPOOL 19c042de37022d76ae1693e36993dd3ed956fb77133ec9e70cfbf90a91b210d83ff30f14f5da224054a99cf8329b7b862b8c4247c67faba24f2f7b291ee10408
+MISC ChangeLog 25251 SHA256 7b9c108963484b8d3aee557721e3966ed1ffc02eae504291da0b3d2893f5e241 SHA512 b664ebf7285e2679b1437061d122b7ef936c4ab51f155a54cf7c17388ece3ba1946070e6598bd33c8989e4292d5be066873ab90437691a002617a7170a9184ea WHIRLPOOL 2ce9aa5645c7524c3077b47be44190374f6c99a26bc01e88cde967e926e5e988476909ca933a8360a6a1e46fa5c9a0a3ad98ab5c70b21b5a85eab92816585845
 MISC metadata.xml 294 SHA256 501a5b0d4dc6215cd3302bdbdd6aa8e8037036996fadbe48f20acd2e037a31d9 SHA512 2ee4ee252b4391df3ee227351028eeea0309ff928f58d67d5dd2b807a1fca714be7dd5b892aea9b8061263d0c6d3729e114fb8b0b0c7f3322cef49be0deae2ea WHIRLPOOL 555ce5514834036d90b287c4ffea668f534ffae1a060430934b8278d9e23f92a260fd1af0baf083af1fd8cd9b786623cc1a0e26ff08f1eff6fa52891f64f104b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlANZPAACgkQC77qH+pIQ6QvYAD/XOtuDy+6Ql1r1vQtawtJAUHS
+PdwVJV1gzNoUcCzaixIA/2nM/zGFONOeh+B8jXxN0R7dH5ldd0fv+6WobC5ezQuj
+=oDoO
+-----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
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() {