Fix build on arm, bug #504002 by maekke.

Package-Manager: portage-2.2.8-r1/cvs/Linux i686
Manifest-Sign-Key: 0x4F1A2555EA71991D!

5 files changed, 39 insertions, 20 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 4c1b737247cd..6769c37bbd4d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1044 2014/03/18 16:23:23 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1045 2014/03/18 16:29:13 phajdan.jr Exp $
 
-  15 Mar 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  18 Mar 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-34.0.1847.60.ebuild, chromium-35.0.1870.2.ebuild,
+  +files/chromium-arm-r0.patch:
+  Fix build on arm, bug #504002 by maekke.
+
+  18 Mar 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   -chromium-33.0.1750.146.ebuild, -chromium-33.0.1750.149.ebuild,
   chromium-33.0.1750.152.ebuild:
   x86 stable wrt security bug #504890 . Remove old.
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 7f58728ee5cd..074e6b2b8b9f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX chromium-arm-r0.patch 495 SHA256 3c6138787d83390100fa6b7571759e975c9011e3ae345c6bbbb1e00a9e611e60 SHA512 5438e04d870752e945d3fe6f0f623f82724c59b8226be314243119c04605e0d5835e0b2c3657f550ef19f0645bcf889643315a8016bcad5c466ebb78a89a5331 WHIRLPOOL 5706bd14249b30cff386e25967a46011f5fa9ed3b27a96bbeece73d2b726642d6fc3fc8848a67f0f20b31bccff77b4e8145c7c6c03c807259d3daf2038dc3643
 AUX chromium-blink-crash-r0.patch 533 SHA256 79a174c3ff58dd4e4b340a498f0f59b915a3fe6605b82002d6dbaf7145bd3ef8 SHA512 51db3e10d36dd40f7cb446784769802f5aac6c5ba1cbc17d50a2b13d958d4c6ce81afeb094211988fafc7df1946e18e65c7fab9430dad718b14f078cdc2119c4 WHIRLPOOL 9b5eff70013f5c54197d569bee23a228037dd8c66476665ea39b80fdd5da778fac90bd9c181fe4a260cbab0993a9f67e3dce40f5ab80c713d5a892dbcd049d65
 AUX chromium-browser.xml 407 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca WHIRLPOOL be37cd2e7d02c510e84c484f32ab6ab2e1f38a2a03c0cdbc9b6b485d64feaf79944d8ce097f0838ae9bc71c42401b633350b847ad316b8e23cf5614e3913e7ec
 AUX chromium-build_ffmpeg-r0.patch 3142 SHA256 625f9a9695ba4960010bc96998798a1c7732fb6a1f4e375151ee2fb745489031 SHA512 da346f9f5e40385fc4a9b1ad8182b9676c1443ecfcc6efd76547389e2a6dca6814eaee75096e64e431d35069defade81a418559515a78d11476ef5d1a49add47 WHIRLPOOL 9d5350285c643e5ebd8fc5f9833fb8249efb327514177a8bd757fd724f9af9c46a6799469fce6c37ab5b34780fbdca9f60b8ca3bf0b2a8bd035d609d2c14944d
@@ -39,26 +40,26 @@ DIST chromium-35.0.1870.2-testdata.tar.xz 108475640 SHA256 d8dbfb8b89cb44a3f956b
 DIST chromium-35.0.1870.2.tar.xz 190408932 SHA256 430d9d205f9db50ab2f9912fbf4e3d8145d267743497cfb2d0acdad9258075cb SHA512 378801a922d90e9618641a346403ffeb1b15a84daec6dd3558a168c4383d3a165a74f1908ee02554e51cee0a5024551adc7f62cf32aab3cbf5738dc228ba179c WHIRLPOOL 4b2f763536d5061345e096dd4ad3a17fcca67154bd63a696c70db7946f302b59a5b9558d5472e26bf028a39ed4e5db30da27433928dc2e0bc5a8ccde505a42cf
 EBUILD chromium-33.0.1750.152.ebuild 19283 SHA256 c1816882b41fd85ef9fa6639bcb0ed549887e0eb6b8755a16eecd587a4dcc33d SHA512 d4d73f9a3ff03d5a1991b0e8d6c99e2c2f65f61e997388f541f82faf62065933cebf0e6404c73aca22a95dfd95ef4f9427481b5d6cd728dc306029ed4840f0ce WHIRLPOOL 0af8d4f2bb256e2dbc36beb1b0a632f027045d8381e170bb964da90f4c4f658ab4f92c0917ba34637d8b92ed6180646cf3e3ba8c6e937c8c1a413f6b4f42b854
 EBUILD chromium-34.0.1847.14-r1.ebuild 19594 SHA256 a0dcc319bb390602e5ec1381bbe9e939714e18dc8bd1799d05e57dff4f82dea9 SHA512 f84f32f82eeed4fe2c5d7dec86a81ccc69784814dcd98f7d06643f64420ddb158ea6f9cb619dcf2b4a0a7615df7f35c51e714a4f6ef35d7740e1a2ddd15fb8f7 WHIRLPOOL 66ebd25ca5fb45ad6e3ec9c20cb97710809276cd4b3e9ac56c7cee047537dd89a8fe828a50f2b2c904f327b70ea522428b36274dff43a5516c182dbb3530110d
-EBUILD chromium-34.0.1847.60.ebuild 19592 SHA256 21c0569185383ada43721f80755e8362f83dcf6eedae82d426e38d4d556f401c SHA512 0037db91fac8e0a793c62d89c0afda9595e9cd56e87fa93097f97caa076eaa988e242d774731e851b8dfb54ee449ee637795be46c7585430c2e965017fb05c89 WHIRLPOOL 50d4be0f7298bb726f6842f9587e17845d6b4a02ea74d7f731e684e24b7da0f195d8cd83c8e734e3cfea442f16276eb70b6e677ae326e586fe939ca98adc8f15
+EBUILD chromium-34.0.1847.60.ebuild 19636 SHA256 9bd8eebcdebc9cc2fbf00b8e8059744dcfb2898f9241916adfc151aa54f6bad6 SHA512 e5a8e0253831aac1af64df136f4260dda97f35dfdc441801405f79e53a82158cb477047b371ecc0aac8869b8fac52d1f9e9a0b05b6d1bc661e67d425823f7838 WHIRLPOOL d3b7e5f4c7341fffb06af5dc429face79c38eb4220915b5ad53d81889d505af9846a9796d8672a94156a1fb829c16d97ae1c091b7a97ca1509c1e6d919b17bb8
 EBUILD chromium-35.0.1862.2.ebuild 19712 SHA256 284c4b558abd7abf7ce7155e753c784d5053803dedd29c42c4324819a7bcc246 SHA512 55b147cedbd9f8b296c51c8cfda81f83a367ccd8ae8fd19b952bdd2739da39fab13bfefebf3d8dca63e3e74f00420fe36ef039563ff2c0140f0d37991c46c274 WHIRLPOOL 7da0d246dff0c4480aeb99dd36053eeb6e2f06819463b6af352c2c4b3153c6004e2bfb503d03ace62966f72582b0b7bc72a8951b923edf982b1d0713e5c7905a
-EBUILD chromium-35.0.1870.2.ebuild 19847 SHA256 d95de7f2b1e52a89d90b5a475a7e3b626c39d83f21d2e9a4dcd4342e0a6e502f SHA512 879ec6ce88f39a1fdb21f77d39cebaa10e19d842c9e1a17c14e59248cd0157a2fa2c4762960402c7dd9b98b04c6a29544fbbe5cae052416331c7f9f48a1ba5bf WHIRLPOOL 28bccbf635dfcb64375ba1074e3ad9a58f7d86a1da85948cf5613fc7fddf06ce6c0a68607e23e3a259469d13d98dd8c9b1c15e75c43d862f940fd6364859c66d
-MISC ChangeLog 100500 SHA256 d16c8561caf213c2b499ced2a28aa2f136b121aa48ec0c158a5c2aee9319e1f4 SHA512 ffe2fad8cab62ec239fb67dec2128fc94b86e0a7ae107ea2a9f28e13d9d0f3ddc3c96c1b82e546a67d06ce120575a328900f515214e9600534e915f2a6897319 WHIRLPOOL 0c8f1d4d6fb36507a536b3eee69fa22d9d040a37fdd52a5f2389afc4bbe91d5c2a26f60ef6af161020ec30061744f1c521a32dc7fc242f9628f322c5c5521b49
+EBUILD chromium-35.0.1870.2.ebuild 19888 SHA256 e22a5b23ee911cb58337ff1ec3c052a76ff6c44d0f20bd3dfc6eee9d4a3f6a96 SHA512 63b1e05b585b05f2aa3559199747f24d6bd1557a5dde4adcf0b4c47ac93c94735e0ef0f79a9edbb15c47eaf70f0e998edb7d4c7eca1b6dc146325f31e0af879c WHIRLPOOL cf35eb2604d953220101e93f75d32b17f603b1afdd5fff181ebec264ed3b28c3e596c3f4defdf2be40c2fbbb4fd72be7a890ed77b1a5f0c70c4659118a988f82
+MISC ChangeLog 100692 SHA256 588cf5cec13094d0a363ca889170d02d37c82bfe545de530bff8ef8316e933cf SHA512 defa04eae3555ff799c6d5f513ebd4b83279a7f86d46d958b58b252b4e8e5e5b75a71f04ddc9b9f1d1fb576dc8e3df80ef098d8c34a4d766daad45bdb47cc158 WHIRLPOOL f97247d215befeaf269078d01a2f920dda3ed1226b666db8f03390d486e44365f81eab86771328226661a90c9ef0e167334b3c65b0f26469d894aa97662b59ee
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 599 SHA256 445f23a3d80f257019d11074a593608bc3f3abd22b6985b89f533d94f7799008 SHA512 606d4ead8b6e9c4852110a5b5efe5a5d6219d2e9d546ad114f01d496f4966df0238b8c1fdec93916715887a08e7737c138b6c0a22267256616edded58914c951 WHIRLPOOL d6273eb9bdc89b4a08a572a27708128985094bd684323c2c17587e80364bc446762b325d31977bed1bdbaec31e5dc6d22c29b5bc49c9943e99e837bf529bbea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTJHrHAAoJEE8aJVXqcZkdTqkP/0Q9kzA7y/mhU6L329aD9g8K
-O5u+RwpcrTTbJT6V//tFMh657bI+c3xLVtW93aKvLADPX8JAVd+dcfE2xSCGiJzh
-Z0HDe983ZEHxbwZOBcklbOE541R/jb9JbOkp/TKBWbOoIB+VdILl7RNnhw0lzPrc
-XuigzfbknsMK/vKa+5NXVButLQLUISl5TWwjTqMU6vjGF89mAE6cqVP3/mu3e3Oz
-HdLBPNJ0dWMw4heBqchjtD02CHuQSOgHiICnQ9hl678uzjkUEP+vjJrtg5RIO3gy
-BAg9XoEVa5rxU1Oa+ZM1tf8Q8hpVJtviQA7i4lLSQvWddp5MqLIMnxF+ZHsC4r//
-Ecgvoz7aGR0hp/mn8P3MXLd8Hl/Jww8+moF5sgp1UEmM04j/8r6WEiRrAJelNq0C
-m/DOgQw2u/M6IeExLWkHpRFCsQt8Ju0tbaefHJ5DlttAt2TA5X4cD2OPwhgS8NL9
-RwLSeNsXPIuMeF2bJr1u9UEi+hkLftNRKy64SM0+lMlK6NhWuUhGTluewMnaZIT/
-v8vUeZWne4cXD0wMsfGEd14epRbOMWd8Pxa89ON+5EuH0eJ9+O+kq3jHahwvyR+p
-lg+nWLvxLx5vj3M0XIOxRyCae12daRJfe+GyRS+kmUmYxY/rma0Cw4BKk+cCO/Ur
-q8/0Vx1C//MLHF+EM2Xe
-=v2xR
+iQIcBAEBCAAGBQJTKHUaAAoJEE8aJVXqcZkdIHAQAMCrml7j70xkcxcCkaag7tlx
+D9ZsiHpAy35A18+idn17b8epAH8yGbZKmU1DG4s0I47aIjnmwd6Y8OHLqo5RNCwc
+HgZA72cc8O8VdK96/bjlmjyt3nCiFNFydMLomlTM81bUaCSKwn/xxwQvGTAaijEP
+mZi/ap5iJoNLEWqMEf8gMn/+P478rsWDwYzr0cJN63rYGtesuV/1iz9U2un1OncO
+ojR7fMKNiQHK2sxUjPa6fYrZE26kEhgviG/musHATsUsSjmx5Et+CPmPcxatWKqB
+VXYwaq4j5ikZCGKp+RtihQ9QmfazTh4pbQr/vxVLuD8MliRUJqRSJZPovOWkvRg7
+Od03ANMwNGm8qy//NU1Cn0yzog+7Q19E3gK9ES7v7iJdVRpMV7N/BJYGZ3LD5uyi
+ba3rs+Ez5Hi/goUKxF4GYSkZzu0kh5RxaNvNQIYXd698//XhXf8330QMM3ktfDEG
+1PTAn7NmPUk+cATbbGCBouyLVPd5oPZOnrBr7VOc7zyjtiOtS+R3cbRdBaC+pEIu
+wFflB/wrjidtUgqqAWXtkxOc49iHsZGM8EGsLX77Y1CpuriuH7n3uwsm4GWdRce/
+ZO5lLKbhpHA2iktMggCB+8pUruXy7+G+T5qUEAIHrJhMbT6dkQFRcIdaECf3uQOw
+bSbgaxejI2wm6IVEc2Qe
+=+v8P
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-34.0.1847.60.ebuild b/www-client/chromium/chromium-34.0.1847.60.ebuild
index 49476be0a6fa..9ae1e332c9fb 100644
--- a/www-client/chromium/chromium-34.0.1847.60.ebuild
+++ b/www-client/chromium/chromium-34.0.1847.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-34.0.1847.60.ebuild,v 1.1 2014/03/14 14:42:53 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-34.0.1847.60.ebuild,v 1.2 2014/03/18 16:29:13 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -167,6 +167,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-gn-r1.patch"
 	epatch "${FILESDIR}/${PN}-depot-tools-r0.patch"
 	epatch "${FILESDIR}/${PN}-cups-r0.patch"
+	epatch "${FILESDIR}/${PN}-arm-r0.patch"
 
 	epatch_user
 
diff --git a/www-client/chromium/chromium-35.0.1870.2.ebuild b/www-client/chromium/chromium-35.0.1870.2.ebuild
index 5c8252bce2d9..e283a7f3b86a 100644
--- a/www-client/chromium/chromium-35.0.1870.2.ebuild
+++ b/www-client/chromium/chromium-35.0.1870.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-35.0.1870.2.ebuild,v 1.1 2014/03/05 04:37:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-35.0.1870.2.ebuild,v 1.2 2014/03/18 16:29:13 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -165,6 +165,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-system-jinja-r5.patch"
 	epatch "${FILESDIR}/${PN}-gn-r2.patch"
 	epatch "${FILESDIR}/${PN}-cups-r0.patch"
+	epatch "${FILESDIR}/${PN}-arm-r0.patch"
 
 	epatch_user
 
diff --git a/www-client/chromium/files/chromium-arm-r0.patch b/www-client/chromium/files/chromium-arm-r0.patch
new file mode 100644
index 000000000000..df02e2434929
--- /dev/null
+++ b/www-client/chromium/files/chromium-arm-r0.patch
@@ -0,0 +1,11 @@
+--- third_party/icu/icu.gyp.orig	2014-03-16 17:49:02.561203814 -0500
++++ third_party/icu/icu.gyp	2014-03-16 17:49:23.191037086 -0500
+@@ -30,7 +30,7 @@
+       }],
+       ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
+          or OS=="netbsd" or OS=="mac" or OS=="android") and \
+-        (target_arch=="arm" or target_arch=="ia32" or \
++        (target_arch=="ia32" or \
+          target_arch=="mipsel")', {
+         'target_conditions': [
+           ['_toolset=="host"', {