Version bump for dev channel release. Incomplete fixes for arm. Remove old.

Package-Manager: portage-2.1.11.9/cvs/Linux i686

4 files changed, 51 insertions, 24 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 09460821df17..04e9ece67d7b 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.703 2012/08/31 20:01:47 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.704 2012/09/01 08:40:23 phajdan.jr Exp $
+
+*chromium-23.0.1251.2 (01 Sep 2012)
+
+  01 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-23.0.1243.2.ebuild, +chromium-23.0.1251.2.ebuild,
+  chromium-9999-r1.ebuild:
+  Version bump for dev channel release. Incomplete fixes for arm. Remove old.
 
 *chromium-21.0.1180.89 (31 Aug 2012)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index db6b53202cff..b3a54730ec31 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -27,24 +27,25 @@ DIST chromium-21.0.1180.89.tar.bz2 192638239 SHA256 16cca8d90a3369840f79a6f06d11
 DIST chromium-22.0.1229.12.tar.bz2 209869596 SHA256 09b5d0b5bc7c1951cc84ceb5a2a1ea6556aabdc9517e3f872979c6e5dd217bc1 SHA512 6672f7112c3c567b9f4c40e3df86eda5cad19498cdc20f58d4d9848c0ec7881574f1f1e6cf75421fa19fdc1afd390e618d9b32b2852c7b22fec578a8fa64d2d7 WHIRLPOOL c977157ed457db27cecc02e317785a8e1f8327e833e733a75c9673f214cc1f8e14c379bbe251864d926e283b85b9ee4f4573f0afe7f9c953967b82cb9969f465
 DIST chromium-22.0.1229.14.tar.bz2 209857785 SHA256 c53635bba0332a3dfc12c7c06b40e64b64ecd3b97660ad955e83905203e3e587 SHA512 38c232f100bf95038fcab27e9913822dcd9189f1aea9aedbd0b034e10005ecdc2e116aa160dc1e07cf25f21b39a5e6ee4f837d9d10d9f7a012736f77f1d0301b WHIRLPOOL 789aa423d8718f5c9c8b74927e72092af55e41992ed12cf7f209f6e775f07f9bcdc63224cbe6215d947447075b7f8ab3bf45831f882ca3aa8fd1734f6a624c28
 DIST chromium-22.0.1229.26.tar.bz2 209917396 SHA256 7b85a2ceea48d97d985cfb70cd925defbd410b1b625b2cff354bb3b546aed52e SHA512 66e6286648601a1e838ddafe2f6342b80a4fcdd44f5ae3474702e7a15f9a90c453397977d8aaca60093b5dfe81a084c75ad940035f6ad9df99460196e8c5fb26 WHIRLPOOL d4ba5989554955b90edfb698bfe9d61c25ed1f987eb0065a5e0ca7cbf306d6ee3f2dfcddad43415b6f444c1c4fdd818f2998d976c2b7a2fa0e375bbbfead088b
-DIST chromium-23.0.1243.2.tar.bz2 215356298 SHA256 308b319d5165a90ad24d904614966abf6650b206dbc12ce0ae220d066660bac5 SHA512 d5f29fa279057ecbcd5c79df48f49b64bc15a8217e9c77baea620015594ff5da56be1e8627ffb2af7fbcf3fddfed1a993bbbe1439f02e8b65c59fcb869da5731 WHIRLPOOL 54835049cddc886e3411073b756211e79bb3abc645e403ae16fc3940c38dfa96d4239894313ad26a7c7ceed35e186a8976530661062c5e1e83a6c2e8a5eddeca
 DIST chromium-23.0.1246.0.tar.bz2 216003896 SHA256 b71b99c774a4513c78b4c2d767a05420edbfcec5694b194f608105a8f2b7f6c3 SHA512 c6717a9fb174bc1576823a2e39bfdebdcec3493691ff574adb87d02498578759b637451419d4ba3778d4f8885b419cd3e525d793d43b10236d71d45dae25575b WHIRLPOOL 763ecb8dee3a64f3a56b1d2fac6239e4da084cf69628fded309ae3e8b95dabaf1310662ef8da302a261c9236d8567994c54e426ed57abfcdd0e5b18620570b18
+DIST chromium-23.0.1251.2.tar.bz2 216054936 SHA256 621e114aaebd9baf0a1228d14cb406209b4addbc3797f8ec5e518bb7f023f1d9 SHA512 7aa8c8eba2e0a483250bc2b1561bbf89a8d4f5eac5ddd18a05abba2c068991a1a93e615d87d673c681110dd93f5347885024b9432eb9f3bc1844a040842e9175 WHIRLPOOL 08259fee2a4951d6e31e88aca4eee9eee7fdf1f35160d4d33a15ab0b98f1fa4ba9a89773cc519f9c419d281df04d4561e7af5c3e75550a7bbdf24a96f6eba979
 EBUILD chromium-21.0.1180.57.ebuild 13975 SHA256 2e5ec11d48c18a39a415699649ec83a791d9627735dcaab07cfd07c204c7fd96 SHA512 2032ac98eb1940a9d8d91eacb8c901d12a6c50417a71fa4c5814413d9150ccc782f3469b463be3257fdbfa5c04fa0b56fadb74d1e6a62bb72a541524a2504a62 WHIRLPOOL ff69f9e4cc1829363d9ac61e15b4033ff6844225c1d50ed7d0b2417b8df83e78da1c5f46a627cff757d9df324a90ef64b30a316f5aa40edb710f89a38ccaaef3
 EBUILD chromium-21.0.1180.81.ebuild 14032 SHA256 567148e0a92c7d10d1f7dfc7033706355bd45f396a47d499c4eafe73092e56b5 SHA512 6713b8336594a9553af6d28f9b6827eac67e0cf910f23f761a61565061f4f7a3f0caa37556e3952427e93125b48a66d859a912c44ed0f03dc711ce27a6ae691b WHIRLPOOL 00e51ba9ab8966eae0f36f5498bc6240372ddc88fac1c382a590dbb1579d2829e6acb7724cac71118b4bf72c62742e7e24328f5d00e4cf85c08b240851830a86
 EBUILD chromium-21.0.1180.89.ebuild 14032 SHA256 bb8053304f33e1688a4f025c5db56bf0ac4191d626b1c8e5845d1b875f3c16f2 SHA512 54a01a31505b6a95aab5415c10164e2f7e9d39dced2ee2711ab0c06be5c166d76a11b26c9b90b18e128cac39810daff968ca1021dd0db5300e07ab64ee8b7b32 WHIRLPOOL 1f00d6f56fa66dad57c56d9240a295dcc2174aa825b7826a248c750d7f4a92f71e789f0aefe8e10546fe32613f45e3a5b7b5fef789bcd7c2f036b74113d67e5c
 EBUILD chromium-22.0.1229.12.ebuild 13948 SHA256 32cc25014fdfe9222e66457f5fd6a631af25282e3bfc76ee512a8bd1d97c4957 SHA512 99c202ffde955dba4e45f2577c1712230400b2a706f4bbc87465729aec995f348c1bb454015f287fc09ffebc87ab27b217762ab157d04f79a29a9b67fae64585 WHIRLPOOL 49600f6eb3df94d72687121b0b3182150a587b6e73124977998f80305dbbd3d4384837dab1a4ac8cfc89c5ea6dbdcea5829f339b3a304ef9c92de6efce226c68
 EBUILD chromium-22.0.1229.14.ebuild 13948 SHA256 d5e591f6210fe0828e1c2aedff765a57f89425d8a270feaf66a95066ba58df1c SHA512 bd175d4fb8a56cfcc14e0242ae5737c4a0f5311e66d050dcdadfcd6b94510fc23457029ac68e0c0263669f472148521b81d6ab19f578dc69b51dbcf922cbc9e2 WHIRLPOOL 7cab6c9577941b2435ff1831189e49470281072fa989f6a640e2e7584b7b5fbb9a827f0ed4e10516f292ce312998c6a0552703310be6dda810cf2bf33e2b8301
 EBUILD chromium-22.0.1229.26.ebuild 13948 SHA256 f8e5b08e74d7806b4ac3069a7a91a4a28df9857040b3cdc6b26ef3474bc74111 SHA512 2e3832f6483f261ec1ac1d42304e7f98afac715ae9aabcc7fe78e386395d9ef55ed3c714a26048d37ed0a6560c60ee51ac0cd40e5033f2494d9c6d9d863fcb50 WHIRLPOOL 74478c0e7cfa1cd646591bf42fe27ed0133245265907dd1f3d450019e6fbe0648e24a9a6d9470c51a2376f5af1b55b9302c56a09d6c2a35e0d16188328377999
-EBUILD chromium-23.0.1243.2.ebuild 14477 SHA256 8aa0cfdd3b15931bbbd540453b1d3cc7b4443c40f9ca1ede977b8d076af0cd6c SHA512 dfdc0f8eae6818a137956bc657d6b687f6899f03b7ecc66e10450aad47301c6b72fb2c0de9b7ec0c1d338672257a66035483e00acc64b91e091f483b00932824 WHIRLPOOL da4d09f3bd1287abc9621d5d02a56a261aaae0d2651f8c8c6868b9685c05a35f29a1f048c3a1111faf026b509e6f8ba364299f106ee90c581f40888fd2c50897
 EBUILD chromium-23.0.1246.0.ebuild 14514 SHA256 7c0836f78c025824ae101fcedbfa00887a7a6f855c8c749736df072605da055f SHA512 e701352f7c84ea02afea72d364e172728b7e4f125ab8bdc58fe22a9c05f37fb67513efb4d90e2c5174b8be03c17e94c57cbba23fbc27ff666d21cfd5dc2aec20 WHIRLPOOL fa1884dcfb4a2805dc43d2482fe788e1e6f2e0c82c7366858be188d0a9cfa448c41d1062b7462e625542fbc5ecddf12c20f49354b6e398df1ede311b9ba674ef
-EBUILD chromium-9999-r1.ebuild 15677 SHA256 023163b6a5fbe86d5321f0da9c73095bd978499f2633f633b8bcada2dcaa2b36 SHA512 1b45f8e53db68a64a85d9a29030f6697009f5e30992a69ac4a774d1a566cba08313a2b198cdd4a7c303f22d991b8b204ffdf43b90e6121dae84511697cf4cb85 WHIRLPOOL 40973031791e46e8c2a9c8815c295507a37603c0393b9d5241292fc1ad97aa8a4ad4d1c20f02676a9f4d572e8edaf390f080778c5c81d41c4a14d7f4160a126d
-MISC ChangeLog 35050 SHA256 2202bf6c1b051812711f5edcc0e88764310f17e802d3621ef1c0543eb5fdf104 SHA512 0ba795701b81171916d9a1de42793ece37361a9f6c4df23d10331414f82cb608e5c3337d0d7545c3fd6891d3e4e1dfaa22421f26ce1da3f74fbd4e77f68f1c12 WHIRLPOOL c219f94b9841c8824c977f957d41b391ae171d9f228a24887a2a66bf8984e0de486d70f198dee09e1d9c8c98dbb816400ffb7c76733063565de9d83ed8a9b75d
+EBUILD chromium-23.0.1251.2.ebuild 14722 SHA256 f60d66882812be5bb4d1a8b8df54600a6401e5de38dcae48371b81a840cc8863 SHA512 7aa4efbbc679c90f6395b0e387343bfa806a75367a5765490d7e119bb5dced4017e45e8851c04529c55773e4a4c89fb61ff7e46db9441d8cfea99dfe7399c0ee WHIRLPOOL 96c9212ffed7900169b4c05368e41d9ea16ce28556602b95a9f43de16be68342cb3dd6d64e938008eff3c15d916adf17e40746be360e5919a4a0a458f0ae99e6
+EBUILD chromium-9999-r1.ebuild 15885 SHA256 75b46aa4ca29a63182e4b637544d634920be0a74f9c6d52555e087173700f594 SHA512 f8dad31d692d30f6364d2658427cd861ff825dbf1237fa5dc125dce6594862d1de600eb70ffad96824f0a63119c6fa733187451452a64b14d4f7b0bd0d58ee58 WHIRLPOOL 8244bb687a99afe32ee97219ce8d2f8f2e4c9832f3445293cbe74c2794f581aa33c768c5ddd4c0b72d24005c725afa5e430435d85cd54728dfe43baf2b22ef78
+MISC ChangeLog 35313 SHA256 a0ac72bd9fe6e5de31cd6e3605b00aba5edf50bb3da42c741611ec82b5ebcc3e SHA512 b18989a5e08edb0e5e5303e23e4ed3f2e381bcb37e76cbb0f736e3ba3f773d3c3833bf51e126ab77d76f38e3bf6c36aaff548b8acedbbdb5917cf75049b850a8 WHIRLPOOL 1f761804dfa46d8b12e63b5df4400fd4d75fabca74113ca84b387865ca1072d1c47c55b2482f1296b36e73d30bfe668ad7b3ffb4072fffaca45d171068312b3e
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
+MISC chromium-9999-r1.ebuild.orig 15677 SHA256 023163b6a5fbe86d5321f0da9c73095bd978499f2633f633b8bcada2dcaa2b36 SHA512 1b45f8e53db68a64a85d9a29030f6697009f5e30992a69ac4a774d1a566cba08313a2b198cdd4a7c303f22d991b8b204ffdf43b90e6121dae84511697cf4cb85 WHIRLPOOL 40973031791e46e8c2a9c8815c295507a37603c0393b9d5241292fc1ad97aa8a4ad4d1c20f02676a9f4d572e8edaf390f080778c5c81d41c4a14d7f4160a126d
 MISC metadata.xml 267 SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8 SHA512 f6d64d50bfbfad74db0ca0454fcba335a1744d11a44f921f19545c478219c507994cfcaba13160215cbb5a77d0bc82cdbf64a90a4b1b169184e404e404f9029e WHIRLPOOL 66a5cdeac3a86b910040d4c601fef50465fb0e0a0805e6b1c22cde2a83a63a2a1d441643af5454775becdfc65c71116d00b27703a7dd15ced183fb223c32f075
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlBBGDIACgkQC77qH+pIQ6TFOwD/a94x2Ogyb+k9pkIiK9sbo/p2
-fSfaFXtMxhZDWkuEakgBALacQM5IcQDNClegPhnusU4Brx1o0rjkjHWvHOx2BpPK
-=HpfT
+iEYEAREIAAYFAlBBygYACgkQuUQtlDBCeQITXgCeJ6BPdxnc6psTQngxwcc00DmS
+gcEAn2kHdgth2B/rdblNFFs+2CBTu6Mi
+=14+G
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-23.0.1243.2.ebuild b/www-client/chromium/chromium-23.0.1251.2.ebuild
index c86293fe5940..6cebdd0d000b 100644
--- a/www-client/chromium/chromium-23.0.1243.2.ebuild
+++ b/www-client/chromium/chromium-23.0.1251.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/www-client/chromium/chromium-23.0.1243.2.ebuild,v 1.2 2012/08/26 17:20:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1251.2.ebuild,v 1.1 2012/09/01 08:40:23 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -54,7 +54,7 @@ RDEPEND="app-arch/bzip2
 	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
-	>=dev-lang/nacl-toolchain-newlib-0_p9093
+	!arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 )
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/ply
@@ -103,8 +103,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
-		native_client/toolchain/linux_x86_newlib || die
+	if ! use arm; then
+		ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
+			native_client/toolchain/linux_x86_newlib || die
+	fi
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	sed -i '1i#define OF(x) x' \
@@ -164,6 +166,7 @@ src_prepare() {
 		\! -path 'third_party/mesa/*' \
 		\! -path 'third_party/modp_b64/*' \
 		\! -path 'third_party/mongoose/*' \
+		\! -path 'third_party/mt19937ar/*' \
 		\! -path 'third_party/npapi/*' \
 		\! -path 'third_party/openmax/*' \
 		\! -path 'third_party/ots/*' \
@@ -285,6 +288,11 @@ src_configure() {
 		myconf+=" -Dtarget_arch=x64"
 	elif [[ $myarch = x86 ]] ; then
 		myconf+=" -Dtarget_arch=ia32"
+	elif [[ $myarch = arm ]] ; then
+		# TODO: re-enable NaCl (NativeClient).
+		myconf+=" -Dtarget_arch=arm
+			-Darm_neon=0
+			-Ddisable_nacl=1"
 	else
 		die "Failed to determine target arch, got '$myarch'."
 	fi
@@ -393,10 +401,12 @@ src_install() {
 
 	doexe out/Release/chromedriver || die
 
-	doexe out/Release/nacl_helper{,_bootstrap} || die
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/nacl_irt_*.nexe || die
-	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	if ! use arm; then
+		doexe out/Release/nacl_helper{,_bootstrap} || die
+		insinto "${CHROMIUM_HOME}"
+		doins out/Release/nacl_irt_*.nexe || die
+		doins out/Release/libppGoogleNaClPluginChrome.so || die
+	fi
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 2cda8d1bbec2..75b839d5b42a 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.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/www-client/chromium/chromium-9999-r1.ebuild,v 1.132 2012/08/28 20:49:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.133 2012/09/01 08:40:23 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -54,7 +54,7 @@ RDEPEND="app-arch/bzip2
 	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
-	>=dev-lang/nacl-toolchain-newlib-0_p9093
+	!arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 )
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/ply
@@ -161,8 +161,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
-		native_client/toolchain/linux_x86_newlib || die
+	if ! use arm; then
+		ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
+			native_client/toolchain/linux_x86_newlib || die
+	fi
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	sed -i '1i#define OF(x) x' \
@@ -323,6 +325,11 @@ src_configure() {
 		myconf+=" -Dtarget_arch=x64"
 	elif [[ $myarch = x86 ]] ; then
 		myconf+=" -Dtarget_arch=ia32"
+	elif [[ $myarch = arm ]] ; then
+		# TODO: re-enable NaCl (NativeClient).
+		myconf+=" -Dtarget_arch=arm
+			-Darm_neon=0
+			-Ddisable_nacl=1"
 	else
 		die "Failed to determine target arch, got '$myarch'."
 	fi
@@ -431,10 +438,12 @@ src_install() {
 
 	doexe out/Release/chromedriver || die
 
-	doexe out/Release/nacl_helper{,_bootstrap} || die
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/nacl_irt_*.nexe || die
-	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	if ! use arm; then
+		doexe out/Release/nacl_helper{,_bootstrap} || die
+		insinto "${CHROMIUM_HOME}"
+		doins out/Release/nacl_irt_*.nexe || die
+		doins out/Release/libppGoogleNaClPluginChrome.so || die
+	fi
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then