Dev channel bump. Remove old.

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x30427902

5 files changed, 95 insertions, 609 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 3d9d116337e9..23a3232986f6 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.979 2013/11/13 07:47:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.980 2013/11/13 19:25:01 phajdan.jr Exp $
+
+*chromium-33.0.1707.0 (13 Nov 2013)
+
+  13 Nov 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-gnome-keyring-r0.patch, -chromium-30.0.1599.101.ebuild,
+  -chromium-31.0.1650.39.ebuild, +chromium-33.0.1707.0.ebuild:
+  Dev channel bump. Remove old.
 
   13 Nov 2013; Agostino Sarubbo <ago@gentoo.org> chromium-31.0.1650.48.ebuild:
   Stable for amd64, wrt bug #491128
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index dddee71773b7..aebcd161d766 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 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-chromedriver-r0.patch 583 SHA256 83335c81bfe71023c5d577dff2b9314f6ba33dadb30cb949e7a687a74c4e5add SHA512 9496a1c9a979b7f19823a6dfac5deec36c67895de212311a752ebf549c3390a28285c11a9b0b1c9e65feee841d09c600984ae1b49f502545ed833834d855a36b WHIRLPOOL 1c4e41b1ed4685f7f6f4d465365a4cd5e7e9bd8558664808e437b4500aaea2cbdb79e7367f2efadaeb5f87415fb840a16fbbf004976e25227ed5fd0e6ef9e232
+AUX chromium-gnome-keyring-r0.patch 881 SHA256 60bc75e6308d7348d1749e491a04918cc551e1bfdd2e204805bf956a91b33514 SHA512 ded33638266733a4a9dfe99ebae2ba4e4469fd8e275cd22e468aa75bade517641baf76e52cf6bfeb88bb40220a60ddeef519db32745486484d87d85ed0648fb4 WHIRLPOOL e028d271af1a9aca776711c70e2d716ca481430bd3aab18c3c05b7edf9d776204eda7f1bf71a0a3cfca22f5714604fa1608ee4119d3fe41bb48b70724877e333
 AUX chromium-gpsd-r0.patch 592 SHA256 9af056bd99e5176af6f5d8acb7d54241731b64fb3fa517fe1a698b35e21692d1 SHA512 72a668dbd5b343a34a1938c2a6f1147d14a149b9a4a981487e9ca8fa6d912791a6c11e29178c3abe1e691c0e1bf6e435a390eb89aa63bda72d592ab3b0a55b1c WHIRLPOOL 7f04535d674498e2f2d572b6feb5ee4a183ffcf9671f308947e5c4a7370399bc8388d53705f7ca23dd6038bb12c81af0fe0b8b1f3cb7d90465b255e4d3c8b7d9
 AUX chromium-launcher-r2.sh 940 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e SHA512 64ec5e0a4f524bd6164fe33a022419d6cf54822754b172e85ea003c47f9bfe6ed996353af707a4e16369a68d2f2e7d51f186397a48da42f13eb3dccb7e4ae4f8 WHIRLPOOL 4a2284957bb462ded600f14b1aaa7e29389181cda149b9090cb7b6fe8303dc5692519da6281769925b2122578ba2ea0ef8a1563077a62d7cdf7ca243c165805a
 AUX chromium-launcher-r3.sh 932 SHA256 2025eb484eb1a86da9aff3946847ffc47162080b7a7700102b1608235b87ba3e SHA512 92ce9e24e8862b4a437fb1eb97613cbb3f596650efd6bf4a46ded92d99d6c7549f4e184db48d1695ef4390145665a3acc4714427292ba19414d3d2e1f9ba0e34 WHIRLPOOL e0735b33e003dca28356a83194ca949f7799a513b24f44efbf60af877a67fd14d3ad7a860e5ba5b1f533a5a891001ac173465f664a4ee398b3c0b71e24f84370
@@ -15,38 +16,25 @@ AUX chromium-system-ply-r0.patch 560 SHA256 a1d9a17d91edeea93a8745a677b8e79e36ea
 AUX chromium-system-ply-r1.patch 531 SHA256 b2269a9878121a1c6160b27412d13c534f2f6d15bc1bc23fab4fda2eff6edd32 SHA512 1fb1516959b3800e1f22416849aabca078a0350cda32cf7648f15edb8d1396599cb466801211b28ad6701f693ba881b9032a576da0e9de806499c55f3d901182 WHIRLPOOL ac1003b6ba64d2eb007e22ea18b3841b14d76bb2219be91ce43702ad42fb4a99776807bd1b89c2de34715c331af21e9b1d59c8a57d0c2b1258b2001099f0566c
 AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a43154e97e812fcdd1 SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 WHIRLPOOL 2e51e864134426668cc73fc5081c35288677d8ce855b07dfbd3413397f9c43148a6d6096a9b7a617511388f87623a3ce7f3387103202db53876a74bccb9dbe6c
 AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d071384ed324 SHA512 ea858464ee8732536633259ed3d11990822e8b8493c07b83218856a127320ba21b9cfc184f7e7a899739bc5f938fbca25224e559fb7db8558cb86fccc743a685 WHIRLPOOL 72a5a9af7955e653151090b555c6a67a261ff807871fdda16d7c3fabf4b52449ac9caae466ba51a17d2efed74a68adc32687599ea4287cc033e75f787d874b55
-DIST chromium-30.0.1599.101-testdata.tar.xz 108826864 SHA256 b388b29a64e6d521839b405237ad93559ec93bf74e464b12e69aca6e3d5e1e8c SHA512 d55ae90b654dafe1583ba893cd95ac423811faba5cd7f4a4d75afba6980fb2ad8b4ea1d85a50d5bc7764a22f4a5ca5c94128704dd6f5f650bb8c71b2df9c79a6 WHIRLPOOL da5cfba6be0d4b26c43e7f0c900b6e7e09084af4b272bf3fc53bbac2a2cc65597d50b4d2d2c034cdbd405f517496a0baa04934d3e8bfe5c137214ca31deb360a
-DIST chromium-30.0.1599.101.tar.xz 159084116 SHA256 d9596f28c6922bb5c8d03215ece1a7c51421a2e6f882213eb997f98bd34ca42d SHA512 c0e483552b3e354a3f8deebff50c238e4f438dfc78e05d5954baf1fd0e833cb9b33878ce5b78595da308191e6af7dc7a68f7bf3d7d98a4dd16415d7489810c34 WHIRLPOOL eacaca10ed691d7c082ad5b4b806d0ec697dfd8d59fe3e64db3200076dbd632c392b8667f4be2e1d1372ae4f4f601b12a71fb23b9f0414aa5a9b8529d576acca
-DIST chromium-31.0.1650.39-testdata.tar.xz 111208312 SHA256 b74d1a2eb5b90c3070dc12e5ca4f43f02156149186c9e6fc12256d77d672a5b6 SHA512 97aad6eab2bee2cb3c0afe8320c4105814c5abea13e977f05830050726f76bcd7fd186e39aea84e338b0a1840f924d048434acf34ba1884657f42fcc869d6769 WHIRLPOOL 1ba3231b0b05ec401bbe7d8777cbdc3b6fd64849503a9c0e53ea670b0341ec77c868decf79e276a8464ecea12f922b67398da1dc7d1b1e76ee07cb4406c1ff0d
-DIST chromium-31.0.1650.39.tar.xz 174518600 SHA256 d78d36b23663c80582945f3fbdf80dd67f15a6e12004b76de9f972bd0640dc0d SHA512 459058932fa8025327beccaf0e0f836913fca3acd01f90fff7b43666a56ac8249ccb86f339edf717dde2db98198398d9bdfa80824e194a934e3e2495d623d271 WHIRLPOOL 13f27b19b8e193cba5c6156c39a029de6d4af71cd59293a005cf6d34a614dde4c37e05ba0cf9397f85ab1371493365471656d0d77d06b1adc7a8c175a73379f9
 DIST chromium-31.0.1650.48-testdata.tar.xz 111207036 SHA256 bc6e8ed9581d0edd5120c642e3cb32dc4103a9bffee180941da81ac48130f67f SHA512 6ebaacd295e27b626cdaeeb492cf65c39578e25e8c203106325c1faaf95d663ce50040802670f2820318b943c9f902bacb03d35d6aecd14cf32823a6fb91e4a4 WHIRLPOOL 9c4da1702dfa33f09c378eec1b3a19ccbeea53fc1a87b8109a932d60921c89d28a9ef86412cee75daa9a64e0dfa8975e9051799f801c1ee1c7e62902f7eb700e
 DIST chromium-31.0.1650.48.tar.xz 174509488 SHA256 3e478b5b85a023b3bba55b23d71cd6f585a08f865f7a98297a9a0757e9695c5d SHA512 7da87466ed4e86566d6c2c2cc51e3dd96c8a9cd6849f603a8b308cefef2e9e44e66a17ede53ab88890454cfae2073f87d806a13962e941b099edad334634f5c6 WHIRLPOOL 69d39719e372c164fb76a172501253781781252e48c1c5631e9c22b7a2e5a8ee6890b8f1cf30d7634086f3c9f61547e46a8f3cc7fdba554ae99c010d2ca05870
 DIST chromium-32.0.1700.2-testdata.tar.xz 112075752 SHA256 8d04ee90e9d368dd36ce132a0886232ecbea04a31666be17bd84e41179661383 SHA512 7cd7e0f1f9baa21378d854617e00020028802dced12245f21a530cbcf876f7353403d096d0ecc4c9b1bdf63a9685077cfab9bdbeb3bdd41d219b14340d4612b9 WHIRLPOOL 3e776eb44154811da203d129e5fd027500fde4d55bb9cdc99606f20a7adc6575ebeb655ec75bddd0625354bf1a327bdf0955c379e27a302c135bf091bf190d40
 DIST chromium-32.0.1700.2.tar.xz 176957368 SHA256 4b05c9ac26af2af941e60b3ef3d4319b1e1c5e8a85ea3cd423d553cdd6d36f66 SHA512 a72e216a8fab5cf35ba59f151d2c91844912ea881a2521e08bba6ad2e4a1281425236e040af4fc5921d5be91e5de4f7e954d5105425048b206b5e3e933745536 WHIRLPOOL 4fa63f2ae3bc606c488c3da802078e6ad0ad16885cd24e42f6f42d208faee1961db877d325a70ef40e8564a7e6083b9ea69f6db8f02ccb14320ff2a51bd68c02
 DIST chromium-32.0.1700.6-testdata.tar.xz 112081404 SHA256 edce045b0d46a1ec480d5d42cc03ae8f2a3634e549f671b4a248b1c8d93f9263 SHA512 5f111cc4b5ecdf32912212a399e235be486127b3f3ceb118011c88a76bf757b1a091080784cb6ce761d1a22f94dff1a4ad1f800dfca2b88bbe277b56d01bc7c3 WHIRLPOOL 8fb98a46eccb30b525071c17627b29a6169c12df1d3fa0a53bfa6ab73857bfdd4b354ee328eed9955f0635e192df9373b1404969dfb2839981b0587269f25e88
 DIST chromium-32.0.1700.6.tar.xz 176963440 SHA256 cbd1bfc5bc1bc3f3f8d57828097bd7f4d2fdacb0658a140871af63bb705c0a2c SHA512 e6e0e1d60b44796d281bfd3210f4e363d5c80fb884cde7bd96375c2013a03dc3a5ce6087a41571320fe1c2c149232ca39980cf08e9f526698570a0cbaa6b66ea WHIRLPOOL 5045211ff518f13cdb2ff42b9f2e07ddcbb9885e9986e4e8b276ce75a7da414ffa94b502f764106ef0dd56f34a13b46bd84a32e8790dc9692712ef3f3dbec798
-EBUILD chromium-30.0.1599.101.ebuild 17448 SHA256 bac9d4e807d6586e04c189a6c8d2454d17618d6f845b2482324382881c943ba3 SHA512 1a03f537efa2f470fd886d71b2c17107a1e9276e7a3397ba7361721f40607baf2a2974024696bc597441ff9aa5873ec900b5782c0a1022f6042de0ed7c3f8f35 WHIRLPOOL 4559b8f8ef43845131ced156426b5b95ba7c63047816c6a579f1f4a11d18f630dc467a1b0d06ffcafe07b9501b70e11c9c388dc0047897ea28255a1ed829e4db
-EBUILD chromium-31.0.1650.39.ebuild 17170 SHA256 d98b151e5fad978bb23210beeadfccd290744e1a8255f0b34f412e7ca5623390 SHA512 eb8c1aac1916619b71465fb541b60991af4b7163d8045490229ba7cd0c34efebf8f51c908c3606ef4a3cb5b52e2342536f7dfb0cd65edda4cf076841acb3b45d WHIRLPOOL ce4c8a2ca2c11fe38b654892a845fdb5bd69a1f8193fae89002c7e4759deea5061fa1861266901da83975a42dfc0ced47a7b954f6fed01767c178b0792c10f1e
+DIST chromium-33.0.1707.0-lite.tar.xz 154007504 SHA256 3dafd652ddc1c49f5d0594fe72502e8d5772b6065e53b100f2b2d126313f17f0 SHA512 b0b4e793e0752946543a09313d43f008ea43527f96d7527f8beaf2073227fcee2758ecc32d476017cf752aaabe8e653d7ebdb55a3ecd4458793e2d6c312ee3f4 WHIRLPOOL f1c647a07039e0a5bdf2b886348298ebbadaf7900c8bde2543677af0ffc617f3ff99cd10a98aa2fddba990bcfbaab372b70c16ef06f83bea3a153f1079291518
+DIST chromium-33.0.1707.0-testdata.tar.xz 112156276 SHA256 f36782ffd0c56dcc00f316b8267471e40afa72a37be1fa306a7ee20f5b9b4485 SHA512 dffe4cd94a32de09774abfdb3d46da401446416f0846a3498043951ffb7cc7f7279b11be67d2f300c109f3f7337a5c61f2558b4639e9a19b78a54bd375629e83 WHIRLPOOL d6d404a91c7a5118a8f61fe29c9677655cb411b27df38a8b7d450160161adfc39fffb1ff0755b8d3347147d3e30016f9bad8a2857b908d4d176bb1e3e1bdedb1
 EBUILD chromium-31.0.1650.48.ebuild 17190 SHA256 c55f914c79ca64879e11ed9aa7375f9b8363aea1727d7774d3cd04d923be434d SHA512 c3526996c3a60a219faffc98cafbc3176a008c870f8d9a75f65ac674b46641dd25c31d47798dc6ac38db1d371e8b1e1cfac2ec0c44895f1907d86ed65729ed57 WHIRLPOOL 2b7f8a29ff5f07505fc787b8a5c8a27082d0c63b89b3f09e8a8ec2b8dce2fe9a8c43e8f54aa723cfafc337103446f6263e4baf7962ea2dcdc98f1da1ba70286d
 EBUILD chromium-32.0.1700.2.ebuild 17836 SHA256 d32d57715c9003d8f791de28365b22e564e7ba103c5c17767b582977239b4207 SHA512 77ee2f057279a1a59943978c14a917711ce61b67aa3b24acf8806451f77d52e45fe31d2893995c05b21787b5ab46f7f19eb4c9c68949cc154562e70d9a125501 WHIRLPOOL cda722cc3f032f2b52b028d11a20b63ff11fba83baf69b5daa5f5b451a41d2c1a98b6df46149073216c03a45a95487497a1465dd551ee723adae184739fb4695
 EBUILD chromium-32.0.1700.6.ebuild 17862 SHA256 67c564b5835a8aef536536ca9fa1c084577965557576aec478efb08dd82025ce SHA512 bb985cdf2be53205f70ea75f6c10985ffade21eaddaf5d7de1aa0683016f5cbefff43fb7c350ffd775c295ae908b68b01a328166ba7ba474efc3abf55023deb8 WHIRLPOOL 1738b339018f9a31fc5dbcb8d7316ba3b87f80ea63f208e825371cf013ac5be0d74ecddaa538abce52804b4a21b118e099cb7aaeef4b69efb370ba984081a779
-MISC ChangeLog 88550 SHA256 130da02e8efe38eb07a69cbf3bf793eaaca16424f3e62aa4b21807a0e032d30e SHA512 3a2f64d49272cbe0407025938104c5dbbb65a59a23fae4445ff81ab63252280d30702ed34a18ccddcd8d09a8f0a00aebcf61d71b57dc154b48f788c1d17272f5 WHIRLPOOL 8297fb8be92a9a89b564c64c53bbdb8a9c7b14ccd3c40361eb9944779407ef9e1b281f2f46e244fba98522171495866b9f5181bf6d4de35be2b742f44763caea
+EBUILD chromium-33.0.1707.0.ebuild 17898 SHA256 425de1da05521d514cfd6b2ec3638da0b20435135acbac55e694fb6bb0255fc1 SHA512 f179855eed052a9790bbda4db0ad77424417630d4940aae362e7a7bc4e82496c986bdf367c0fd62c55b0736850c73666ca3faf5260bc390beaffb81325dfd92e WHIRLPOOL 4e8dc739f90d09a853f6bc6c98b43d5f848e645054ef6949c8d3b210035bb333a0415f8843fb77541145bcd8fa6f14a03bb3c4589c9e1099797084b2b180e04c
+MISC ChangeLog 88819 SHA256 ccceccc6c729c26c49536b738461fc51d8990c3c0f2f55dc5800ecb29f44bc4c SHA512 161e2292c306ed414f1748e475fed8a4a820ce2d56bdae75b4296db5da35e9a5cd3189e6e90ec599f8c54d04d9e71c2829fa2cc0efd4df704a647ec14a004f6c WHIRLPOOL a611720eb72e39d8103f04c7c57d48011c796f731fc945993aacc264f17efbff37b2a21b1ba13c57aca119fc18da6f043b845d1532b859991a10a91a2e9aaada
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 622 SHA256 0cc15c6cfce29d9372d650e883075630c844e262bb354a64c96d7e51580d25c9 SHA512 957d3b569ce2259d250681d91edf31d7dcea412d84c79017413866691d3b6fe27076f7d0d7c14f41421254438064d15c90d84940a3c6aa9c307c4db4277eadd1 WHIRLPOOL d621daeca803c0aa06b7abff6207a16cb9122c7ae6f7b02b57be88dd551ef4410fd20d592ea8ee7062bbef54ce09079dacd51e514febdebb16da24d8fb55f823
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSgy6qAAoJELp701BxlEWf5fgP/04HgUDOwQ+hwxFsgAjYcBXl
-SuFI4+gj1SD2E9QoF80GAolyWWxReb8caFz3lL7S6mEZu8O1hxMtcjXjL5spxXpu
-UOerbJCi2Hnf+0lLzxY+r49Z6NJl2ho5RAiSDV/ls/nt3Ejsn2Ob629J1FtjQUgo
-v/07CKLDszSGGPfbTOSusxg7X6XxRQdnWcJa8NoFwnwp/cA0oLX/AdIUifTiC2eQ
-54x7/UaSqn4XatZ8VuzS/sCuIngzxQnxBy5mneSiS5mrmC6O/3/gjrejgQEFb7CE
-9Gl3cm28W3WQ4QkVPuNI0vCpheC/mtK2hjiMXAiacemXYrsQK6m09fmHa9qPb6em
-/OhDvg5gj+s6u/YgmQFlBRCyWtjo9sye8+3G9v2sFwfs1u5xVIBbZCo/3lparogB
-hEZOOLgH96qj9SF/TDv2PStQ7aAnzvcYty4D0jyb9LznvDNB6mM9ju3AUK1Zd3WE
-NzjzD5WAUrTokHfYlynfEZ813l8aWr2ErqTFbI/weYqy3TYth8Vy2wtblDBQ97RJ
-2keBYWFGQqlkL2gBp66ufqzx4QhBHkvfU/hQeFYe3b8CKF3Nxxw6oupBm6IB3z7H
-cvnFGg0BwrdG1cGqACjnEjcssUmVkF4vCw1+P4VxKA7G3KcY4zTjnzSEfD3TFUTT
-7Ur5fsvTfbogOSUIGGMJ
-=uDBf
+iEYEAREIAAYFAlKD0hUACgkQuUQtlDBCeQIGJQCfQnsSHpYDRQlONkahxK2PGyXq
+5UEAn3mSzxvkfxWaQMjjhohJQ5/zEkow
+=z+K9
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-30.0.1599.101.ebuild b/www-client/chromium/chromium-30.0.1599.101.ebuild
deleted file mode 100644
index c4e4cd0c045d..000000000000
--- a/www-client/chromium/chromium-30.0.1599.101.ebuild
+++ /dev/null
@@ -1,565 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-30.0.1599.101.ebuild,v 1.5 2013/11/12 16:50:57 floppym Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils flag-o-matic multilib multiprocessing \
-	pax-utils portability python-any-r1 toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	test? ( https://commondatastorage.googleapis.com/chromium-browser-official/${P}-testdata.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="bindist cups gnome gnome-keyring gps kerberos neon pulseaudio selinux system-sqlite tcmalloc"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	system-sqlite? ( dev-db/sqlite:3 )
-	cups? (
-		dev-libs/libgcrypt:=
-		>=net-print/cups-1.3.11:=
-	)
-	>=dev-lang/v8-3.19.17:=
-	=dev-lang/v8-3.20*
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	>=dev-libs/icu-49.1.1-r1:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/protobuf:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= )
-	gps? ( >=sci-geosciences/gpsd-3.7:=[shm] )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/harfbuzz:=[icu(+)]
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.3.1:=
-	media-libs/opus:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/gtk+:2=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	kerberos? ( virtual/krb5 )
-	selinux? ( sec-policy/selinux-chromium )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	dev-python/jinja
-	dev-python/ply
-	dev-python/simplejson
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/pyftpdlib )"
-RDEPEND+="
-	!=www-client/chromium-9999
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-
-	if use bindist; then
-		elog "bindist enabled: H.264 video support will be disabled."
-	else
-		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
-	fi
-}
-
-src_prepare() {
-	# if ! use arm; then
-	#	mkdir -p out/Release/gen/sdk/toolchain || die
-	#	# Do not preserve SELinux context, bug #460892 .
-	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-	# fi
-
-	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-ply-r0.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	find third_party -type f \! -iname '*.gyp*' \
-		\! -path 'third_party/WebKit/*' \
-		\! -path 'third_party/angle_dx11/*' \
-		\! -path 'third_party/cacheinvalidation/*' \
-		\! -path 'third_party/cld/*' \
-		\! -path 'third_party/cros_system_api/*' \
-		\! -path 'third_party/ffmpeg/*' \
-		\! -path 'third_party/flot/*' \
-		\! -path 'third_party/hunspell/*' \
-		\! -path 'third_party/iccjpeg/*' \
-		\! -path 'third_party/jstemplate/*' \
-		\! -path 'third_party/khronos/*' \
-		\! -path 'third_party/leveldatabase/*' \
-		\! -path 'third_party/libjingle/*' \
-		\! -path 'third_party/libphonenumber/*' \
-		\! -path 'third_party/libsrtp/*' \
-		\! -path 'third_party/libusb/*' \
-		\! -path 'third_party/libvpx/*' \
-		\! -path 'third_party/libxml/chromium/*' \
-		\! -path 'third_party/libXNVCtrl/*' \
-		\! -path 'third_party/libyuv/*' \
-		\! -path 'third_party/lss/*' \
-		\! -path 'third_party/lzma_sdk/*' \
-		\! -path 'third_party/mesa/*' \
-		\! -path 'third_party/modp_b64/*' \
-		\! -path 'third_party/mongoose/*' \
-		\! -path 'third_party/mt19937ar/*' \
-		\! -path 'third_party/npapi/*' \
-		\! -path 'third_party/openssl/*' \
-		\! -path 'third_party/ots/*' \
-		\! -path 'third_party/pywebsocket/*' \
-		\! -path 'third_party/qcms/*' \
-		\! -path 'third_party/sfntly/*' \
-		\! -path 'third_party/skia/*' \
-		\! -path 'third_party/smhasher/*' \
-		\! -path 'third_party/sqlite/*' \
-		\! -path 'third_party/tcmalloc/*' \
-		\! -path 'third_party/tlslite/*' \
-		\! -path 'third_party/trace-viewer/*' \
-		\! -path 'third_party/undoview/*' \
-		\! -path 'third_party/usrsctp/*' \
-		\! -path 'third_party/webdriver/*' \
-		\! -path 'third_party/webrtc/*' \
-		\! -path 'third_party/widevine/*' \
-		\! -path 'third_party/x86inc/*' \
-		\! -path 'third_party/zlib/google/*' \
-		-delete || die
-
-	# Remove bundled v8.
-	find v8 -type f \! -iname '*.gyp*' -delete || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Optional tcmalloc. Note it causes problems with e.g. NVIDIA
-	# drivers, bug #413637.
-	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf+=" -Ddisable_nacl=1"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
-
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_libvpx (bug #487926).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_opus=1
-		-Duse_system_protobuf=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_v8=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use gps linux_use_libgps)
-		$(gyp_use gps linux_link_libgps)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)"
-
-	if use system-sqlite; then
-		elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/"
-		elog "will not work. Please report sites broken by this"
-		elog "to https://bugs.gentoo.org"
-		myconf+="
-			-Duse_system_sqlite=1
-			-Denable_sql_database=0"
-	fi
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	myconf+="
-		-Dlinux_use_gold_binary=0
-		-Dlinux_use_gold_flags=0"
-
-	# Always support proprietary codecs.
-	myconf+=" -Dproprietary_codecs=1"
-
-	if ! use bindist; then
-		# Enable H.264 support in bundled ffmpeg.
-		myconf+=" -Dffmpeg_branding=Chrome"
-	fi
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf+=" -Dtarget_arch=ia32"
-	elif [[ $myarch = arm ]] ; then
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dtarget_arch=arm
-			-Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	export AR_host=$(tc-getBUILD_AR)
-	export CC_host=$(tc-getBUILD_CC)
-	export CXX_host=$(tc-getBUILD_CXX)
-	export LD_host=${CXX_host}
-
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-src_compile() {
-	# TODO: add media_unittests after fixing compile (bug #462546).
-	local test_targets=""
-	for x in base cacheinvalidation content crypto \
-		gpu net printing sql; do
-		test_targets+=" ${x}_unittests"
-	done
-
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-	if use test; then
-		ninja_targets+=" $test_targets"
-	fi
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	ninja -C out/Release -v -j $(makeopts_jobs) ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-	if use test; then
-		for x in $test_targets; do
-			pax-mark m out/Release/${x}
-		done
-	fi
-}
-
-src_test() {
-	# For more info see bug #350349.
-	local LC_ALL="en_US.utf8"
-
-	if ! locale -a | grep -q "${LC_ALL}"; then
-		eerror "${PN} requires ${LC_ALL} locale for tests"
-		eerror "Please read the following guides for more information:"
-		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
-		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
-		die "locale ${LC_ALL} is not supported"
-	fi
-
-	# If we have the right locale, export it to the environment
-	export LC_ALL
-
-	# For more info see bug #370957.
-	if [[ $UID -eq 0 ]]; then
-		die "Tests must be run as non-root. Please use FEATURES=userpriv."
-	fi
-
-	# virtualmake dies on failure, so we run our tests in a function
-	VIRTUALX_COMMAND="chromium_test" virtualmake
-}
-
-chromium_test() {
-	# Keep track of the cumulative exit status for all tests
-	local exitstatus=0
-
-	runtest() {
-		local cmd=$1
-		shift
-		local IFS=:
-		set -- "${cmd}" "--gtest_filter=-$*"
-		einfo "$@"
-		"$@"
-		local st=$?
-		(( st )) && eerror "${cmd} failed"
-		(( exitstatus |= st ))
-	}
-
-	local excluded_base_unittests=(
-		"ICUStringConversionsTest.*" # bug #350347
-		"MessagePumpLibeventTest.*" # bug #398591
-		"TimeTest.JsTime" # bug #459614
-		"SecurityTest.NewOverflow" # bug #465724
-	)
-	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
-
-	runtest out/Release/cacheinvalidation_unittests
-
-	local excluded_content_unittests=(
-		"RendererDateTimePickerTest.*" # bug #465452
-	)
-	runtest out/Release/content_unittests "${excluded_content_unittests[@]}"
-
-	runtest out/Release/crypto_unittests
-	runtest out/Release/gpu_unittests
-
-	# TODO: add media_unittests after fixing compile (bug #462546).
-	# runtest out/Release/media_unittests
-
-	local excluded_net_unittests=(
-		"NetUtilTest.IDNToUnicode*" # bug 361885
-		"NetUtilTest.FormatUrl*" # see above
-		"DnsConfigServiceTest.GetSystemConfig" # bug #394883
-		"CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269
-		"CertDatabaseNSSTest.TrustIntermediateCa*" # http://crbug.com/224612
-		"URLFetcher*" # bug #425764
-		"HTTPSOCSPTest.*" # bug #426630
-		"HTTPSEVCRLSetTest.*" # see above
-		"HTTPSCRLSetTest.*" # see above
-		"SpdyFramerTests/SpdyFramerTest.CreatePushPromiseCompressed/2" # bug #478168
-		"*SpdyFramerTest.BasicCompression*" # bug #465444
-	)
-	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
-
-	runtest out/Release/printing_unittests
-
-	local excluded_sql_unittests=(
-		"SQLiteFeaturesTest.FTS2" # bug #461286
-	)
-	runtest out/Release/sql_unittests "${excluded_sql_unittests[@]}"
-
-	return ${exitstatus}
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || 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
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	doexe out/Release/libffmpegsumo.so || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-}
diff --git a/www-client/chromium/chromium-31.0.1650.39.ebuild b/www-client/chromium/chromium-33.0.1707.0.ebuild
index fb0bde074243..cf2dd5686806 100644
--- a/www-client/chromium/chromium-31.0.1650.39.ebuild
+++ b/www-client/chromium/chromium-33.0.1707.0.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/www-client/chromium/chromium-31.0.1650.39.ebuild,v 1.2 2013/11/08 16:39:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1707.0.ebuild,v 1.1 2013/11/13 19:25:01 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,18 +9,18 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
 	sv sw ta te th tr uk vi zh_CN zh_TW"
 
-inherit chromium eutils flag-o-matic multilib multiprocessing \
-	pax-utils portability python-any-r1 toolchain-funcs versionator virtualx
+inherit chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz
 	test? ( https://commondatastorage.googleapis.com/chromium-browser-official/${P}-testdata.tar.xz )"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring gps kerberos neon pulseaudio selinux system-sqlite tcmalloc"
+IUSE="bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux system-sqlite tcmalloc"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -46,11 +46,10 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	dev-libs/libxslt:=
 	dev-libs/nspr:=
 	>=dev-libs/nss-3.14.3:=
-	dev-libs/protobuf:=
+	>=dev-libs/protobuf-2.5.0:=
 	dev-libs/re2:=
 	gnome? ( >=gnome-base/gconf-2.24.0:= )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= )
-	gps? ( >=sci-geosciences/gpsd-3.7:=[shm] )
 	>=media-libs/alsa-lib-1.0.19:=
 	media-libs/flac:=
 	media-libs/harfbuzz:=[icu(+)]
@@ -64,6 +63,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	sys-libs/zlib:=[minizip]
 	virtual/udev
 	x11-libs/gtk+:2=
+	>=x11-libs/libXi-1.6.0:=
 	x11-libs/libXinerama:=
 	x11-libs/libXScrnSaver:=
 	x11-libs/libXtst:=
@@ -98,6 +98,30 @@ if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
 fi
 
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-base/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
 pkg_setup() {
 	if [[ "${SLOT}" == "0" ]]; then
 		CHROMIUM_SUFFIX=""
@@ -127,10 +151,8 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
-	epatch "${FILESDIR}/${PN}-chromedriver-r0.patch"
-	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-icu-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-jinja-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r2.patch"
+	epatch "${FILESDIR}/${PN}-gnome-keyring-r0.patch"
 
 	epatch_user
 
@@ -177,6 +199,7 @@ src_prepare() {
 		'third_party/mt19937ar' \
 		'third_party/npapi' \
 		'third_party/ots' \
+		'third_party/polymer' \
 		'third_party/pywebsocket' \
 		'third_party/qcms' \
 		'third_party/sfntly' \
@@ -269,8 +292,6 @@ src_configure() {
 		$(gyp_use gnome use_gconf)
 		$(gyp_use gnome-keyring use_gnome_keyring)
 		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use gps linux_use_libgps)
-		$(gyp_use gps linux_link_libgps)
 		$(gyp_use kerberos)
 		$(gyp_use pulseaudio)"
 
@@ -322,10 +343,11 @@ src_configure() {
 
 	local myarch="$(tc-arch)"
 	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
+		target_arch=x64
 	elif [[ $myarch = x86 ]] ; then
-		myconf+=" -Dtarget_arch=ia32"
+		target_arch=ia32
 	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
 		# TODO: re-enable NaCl (NativeClient).
 		local CTARGET=${CTARGET:-${CHOST}}
 		if [[ $(tc-is-softfloat) == "no" ]]; then
@@ -340,19 +362,14 @@ src_configure() {
 		else
 			myconf+=" -Darmv7=0"
 		fi
-		myconf+=" -Dtarget_arch=arm
-			-Dsysroot=
+		myconf+=" -Dsysroot=
 			$(gyp_use neon arm_neon)
 			-Ddisable_nacl=1"
 	else
 		die "Failed to determine target arch, got '$myarch'."
 	fi
 
-	if host-is-pax; then
-		# Prevent the build from failing (bug #301880, bug #487144). The performance
-		# difference is very small.
-		myconf+=" -Dv8_use_snapshot=0"
-	fi
+	myconf+=" -Dtarget_arch=${target_arch}"
 
 	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
 	# Depending on GCC version the warnings are different and we don't want
@@ -396,6 +413,10 @@ src_compile() {
 		ninja_targets+=" $test_targets"
 	fi
 
+	# Build mksnapshot and pax-mark it.
+	ninja -C out/Release -v -j $(makeopts_jobs) mksnapshot.${target_arch} || die
+	pax-mark m out/Release/mksnapshot.${target_arch}
+
 	# Even though ninja autodetects number of CPUs, we respect
 	# user's options, for debugging with -j 1 or any other reason.
 	ninja -C out/Release -v -j $(makeopts_jobs) ${ninja_targets} || die
@@ -567,4 +588,12 @@ src_install() {
 				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
 		fi
 	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
 }
diff --git a/www-client/chromium/files/chromium-gnome-keyring-r0.patch b/www-client/chromium/files/chromium-gnome-keyring-r0.patch
new file mode 100644
index 000000000000..c9d70f416da5
--- /dev/null
+++ b/www-client/chromium/files/chromium-gnome-keyring-r0.patch
@@ -0,0 +1,27 @@
+--- chrome/chrome_browser.gypi.orig	2013-11-13 18:24:41.237282707 +0000
++++ chrome/chrome_browser.gypi	2013-11-13 18:26:03.357780490 +0000
+@@ -3064,7 +3064,11 @@
+             'browser/password_manager/native_backend_gnome_x.cc',
+             'browser/password_manager/native_backend_gnome_x.h',
+           ],
+-        }],
++        }, {
++          'dependencies': [
++            '../build/linux/system.gyp:gnome_keyring',
++          ],
++	}],
+         ['use_aura==1', {
+           'sources/': [
+             ['exclude', '^browser/automation/testing_automation_provider_win.cc'],
+@@ -3153,11 +3157,6 @@
+                 ],
+               },
+             }],
+-            ['use_gnome_keyring==1', {
+-              'dependencies': [
+-                '../build/linux/system.gyp:gnome_keyring',
+-              ],
+-            }],
+           ],
+         }],
+         ['input_speech==0', {