Dev channel bump. Back to bundled libvpx and bigger tarball. Use system mesa and re2. Add optional support for libgps. Remove old.

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

6 files changed, 558 insertions, 23 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index fdbf6708aa82..b4d04e54580d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # 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.801 2013/01/31 01:22:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.802 2013/02/05 10:31:43 phajdan.jr Exp $
+
+*chromium-26.0.1403.0 (05 Feb 2013)
+
+  05 Feb 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-gpsd-r0.patch, +files/chromium-system-v8-r0.patch,
+  +chromium-26.0.1403.0.ebuild, chromium-9999-r1.ebuild:
+  Dev channel bump. Back to bundled libvpx and bigger tarball. Use system mesa
+  and re2. Add optional support for libgps. Remove old.
 
 *chromium-25.0.1364.58 (31 Jan 2013)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ce7bbd56e240..c74c9c762f1d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -8,6 +8,7 @@ AUX chromium-browser.xml 407 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb58130
 AUX chromium-dbus-glib-r0.patch 1630 SHA256 ab71465374c9d03a3764798bf7d2f28d76512f15181a0f34152420c238ef18ba SHA512 e79d1ad32b07e559416b326400dc1bbfbce45d5c903d061907afcd6c753896dbde54f2fd6eda8e3f3d866214ffea46d95ff3f7143bc10354266388ab5f17cc88 WHIRLPOOL bb993ed5ec801b41ae2b7abc0327b978930149054e693a7e1a5def0f370faf9e5d5349bd4965e1f6266a570d4308bcc9181adfa095e635b49cb657a799b419f9
 AUX chromium-expat-r0.patch 513 SHA256 af117c11c385a8d401601118ed0d31ea7486684c0c32b78c3089dd3229e0945a SHA512 67a9bec3deb025b5686e8c1b83effdff2bbba7343a6a6dd265ad417f814319ddb3abde7072280218caadc965ae22be102f1e572aac551917150294a722a973e3 WHIRLPOOL 1e113cebf5ec8a6a197969d434f84e41e516b0854113d0f45aa976054ded798d202f982ddbe2e609e0687af440253c60cd46d6128a88af511a94bbf2c70a252a
 AUX chromium-glib-r0.patch 451 SHA256 42469853c5cb1d4376567419f78af848b0f4a1b9f68ce9b5c8ce8c0b3d506193 SHA512 cddac3fa7a2b9b62e73a3ae36d67a29469d76d8c48378a7c08db617325c2b193d0f4ebb81b3b0c9a375ef6d9bd922e9f4d8a3177083ce260bf94336f17792432 WHIRLPOOL d31c9fbcaa7561e8f44273966740f63be93970518c177a449ff6164a2dd0792aba2e171b3df3187960388ce4c5a1e677017951d96d44ff40b1f35e7ec03735bd
+AUX chromium-gpsd-r0.patch 592 SHA256 9af056bd99e5176af6f5d8acb7d54241731b64fb3fa517fe1a698b35e21692d1 SHA512 72a668dbd5b343a34a1938c2a6f1147d14a149b9a4a981487e9ca8fa6d912791a6c11e29178c3abe1e691c0e1bf6e435a390eb89aa63bda72d592ab3b0a55b1c WHIRLPOOL 7f04535d674498e2f2d572b6feb5ee4a183ffcf9671f308947e5c4a7370399bc8388d53705f7ca23dd6038bb12c81af0fe0b8b1f3cb7d90465b255e4d3c8b7d9
 AUX chromium-gyp-settings-r0.patch 383 SHA256 709e4c8937d7f839f0dd16db905e1834a502bc2cf192329d720b508ef006cfc6 SHA512 7d1d640ea6c5e442f1fce20b3689bdebc108ea3a03444f5a638b21a9a73cfc8739b7e01351fc9a724eb006f78b1c2ea7277c1a44f0a6ac10e7c8f5b820d99e53 WHIRLPOOL e35acd35e2ca208bb9c1852cc4b4299eb4df574fe70d172961303dd0f30b97675482157755662f304a6021199293c4e33f45c8af1e0984cd4265b87e9559d9cc
 AUX chromium-icu50-tests-r0.patch 1994 SHA256 b8ddf9dc432278f299b42c9abd683af00a1014ecd14f737a6b9c3b6cb948240a SHA512 d871c4bfaec01ab7507b3cb924683a51317083d6b5613cb32dd4f51d08973671f6665ec347a19df3d8dc5600e047452874e3e1231d037403b954678f33ef30fc WHIRLPOOL cdd512951f61ceb5880a7c40a79dcb13ea34f9334690f2043a1daf74d98f11943230696e7c87ec678adfa1efad5f5ba7b91e5b3b17ba8b205d0ca0f6fbffdfd3
 AUX chromium-launcher-r2.sh 940 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e SHA512 64ec5e0a4f524bd6164fe33a022419d6cf54822754b172e85ea003c47f9bfe6ed996353af707a4e16369a68d2f2e7d51f186397a48da42f13eb3dccb7e4ae4f8 WHIRLPOOL 4a2284957bb462ded600f14b1aaa7e29389181cda149b9090cb7b6fe8303dc5692519da6281769925b2122578ba2ea0ef8a1563077a62d7cdf7ca243c165805a
@@ -25,6 +26,7 @@ AUX chromium-system-libpng-r0.patch 385 SHA256 d0a8b8f5b3d25be4bd2f060422c467dc8
 AUX chromium-system-nspr-r0.patch 540 SHA256 f1a441b8890dcb880fda9533b0206f17f1e85ee3e84e542d9c8fba5e54c88226 SHA512 b79923850623152feb0af595c266fb2f5a5f68ceae5565e9b4908f11c0d75a1fb3a14c0c98a06f12402072088c4379c68a73c81e37816c0554a48dd89377954d WHIRLPOOL d7e4620a1df2575d6fca281278dcaa99714e205beb1c7a2835b93bbe69c5cf236472522667cbea650399adb1bb8bb692cf0c96d588f1524c1093ef432a2b843e
 AUX chromium-system-opus-r0.patch 1007 SHA256 87d1b6befff07d9a1dfca86e1304e0b80dfc41b57acd892683850f2f080adfb4 SHA512 bfcd3007c32e08d1ccc2aeb6294cc2c95eb3253ee1de78cedb9d07f28411c8efa12261cb2c9ab1265cb33aa8211b1a7759ecc2b99048f6d222fd1e602366180e WHIRLPOOL 219898437d9bd173ae56015331daad10fb0fdcfc5f5835a929205320968f092565465912821f914cf0c922969dcecd2c601473e455ade981eb26706b5193cadf
 AUX chromium-system-speex-r0.patch 1376 SHA256 65efd8d2e10d0fd41b5dbbdca9e3e4cc8ac7ec4d17ed9da295e85f885f1cb5c6 SHA512 a3f9c821169e82c62eb28e071907ee0b7bed8bbc0527c726d5026697fef1974fd4f30211d42ea1e64d5b95035d91a7e3ffcdd08e3d3e96f4b8fe62a5ab6a8218 WHIRLPOOL d02d751843fde3c4bc2f407a4bd484d0d89853fd9bb5e7f5124c1adb4733a3bf303a0c805bb8b8e32893d5690141dc4dd312d05bfbf99f0e175954db3fda2c85
+AUX chromium-system-v8-r0.patch 397 SHA256 9b69099db82e3d4def410f887eb0b0b9006f4e68b59b8eb72d3b33c79a42da7c SHA512 83d44848d637d545aa851cdf2df81b24964d6febbde4ab28ff600f82ebd0c60a66059fc87a96bb1464363d2e2f098fe151ca3a9911f9ca2f3c11ba36bbf7e653 WHIRLPOOL 8fc87b7c1a0f8aca41ee17bef0d415d0f73619a2191807f5f0ce7340052ccb2fc0e34af033285fe62eb41b895b556b241f8c1182fa5daf68c6cc0d658a05af0f
 AUX chromium-tcmalloc-r0.patch 916 SHA256 ae37da023f0b5cda27c3396b5a197d6aba9f3810a32238450f490a8e93f92b63 SHA512 947bd1176863ef7320c0007e0ba906d86a90f47f23932a581613bb1ca28965d8ecdbe285a118bc6d212a6ba59fa55760fe4a71be46d64a6322fffa29e9737ac3 WHIRLPOOL f1761ba96fd3bad70160ecc4d45cf06c9b3b30de0762228cadb5065377a2d3c48e7106400bbc50e6c591988d1d2f24bb7331fb3f6d36223c2351f9fd8dfd09c5
 AUX chromium-tcmalloc-r1.patch 2412 SHA256 df57cc238905c027b844ab680f6c66d879cc7bd9d03603f1ae2c4b10b7715f5b SHA512 b4b47b217c4511c5ff00358ad3d0ebc7e9272d41ef39c3e680fc618843fa5fa1a7ccb88681d2e9bf8b67abcc34f03042f924c977240e87005f621a507330dd9b WHIRLPOOL 1acd99c27ceaf2ab0837fc888d04bb3ef5b48946df96e0981b1698cab986126fe02b3157c5c10dff19c8444b41e1f6053541d6020dcc42bc2ee08eafdd2b477a
 AUX chromium-unistd-r0.patch 354 SHA256 45c11f845424a7e197e3ea826066a5987fff6b309f4091a9a775038543a0656d SHA512 949517b25aac38fcdd229b71f1a7eeefad57b7896aa066258ca6d35972c9a5d97b6432e6317b8d086575a0c7f94f317f068136902327ef747bb380e46d143e70 WHIRLPOOL 271362646f6c5af2e41081e77c6307e87330c43149573b162bee26c6b716a9dd43dd302539a63e7de9aeab04a7af4e4dff25b6e575dd4192d744a6a33ba2066b
@@ -38,20 +40,24 @@ DIST chromium-25.0.1364.45-lite.tar.bz2 125402473 SHA256 d0fa28f7ad13942af7301b2
 DIST chromium-25.0.1364.58-lite.tar.bz2 125415539 SHA256 f6431601339f5de8bbdecb3fd3b7e4133cec8bb9ca0b90f28c251a35bccdf1bb SHA512 67952a02b39bfc711fdff89e449a5b084dac31770e05026f0e8752203f9f6aa212d92f47a32946de799f916ba9414e721d8b528a6e8bb1ae6009aaa01f124ae5 WHIRLPOOL 61fd1f8307ef374cb4feca3ac27b0a90b6389fd4432c3fe8e0a73e5700a6a78e52bc6793399ce834d775e6655d9c1d476141512edda922ec3343dc8f8d6a86ac
 DIST chromium-26.0.1384.2-lite.tar.xz 103884752 SHA256 624d5ffc6939818172c8c76c49d736e0a2171133e5be39a55a32e6413ed3b82b SHA512 5989b337a6aac03418531c4b681980debbd7f291ea982065110657cc45f6f2f0549f0c40f0d212d21ec8e9fed10ff589ac111f03d3b00a1bc69c73ea62443f1d WHIRLPOOL 6729eb5354879872d417d04812b29e0ce7f62fe9a00f0efa95f77d09e97cd3f5b8ff7bae96ca68654e4e29395cbc05ece66b963df932c9d968bc790f626a0a3e
 DIST chromium-26.0.1386.0-lite.tar.xz 104034868 SHA256 1e99751df931f877327506cba1b1958c670abe449f88f0e3880bb418370d389f SHA512 9781ce24973835e39a0078a3feb162f830cc4e590fc7446314d02cbcb1b793ac5b95c5808f6576506f6da35afe53948ed8b39460c972b073278ebb3a7b0a37fd WHIRLPOOL 9af7bf3fcf03823f040f007e4adff223ea162d816f7789802220e42ef667aa702e18c12859e7293cad7ca518523aa74ef2d80af150f51789df13475e5bd65d25
+DIST chromium-26.0.1403.0.tar.xz 140497404 SHA256 8eef12f629a22220e79797ed7c716a805f920092b46ca64b364fdb21db803d2e SHA512 a9160797e2996d2aa87d1f219ef323c43fddc3ea9db909e1d327c59fa7164f8f453fa0c381647daf09d78a1cc968a9a059a1ca700dfdf44e282934f7c364f16c WHIRLPOOL 6312ca67494008d23ce273d6f2572e949e734bf0b440954c53a3a9d7f4c194dcd7ade8f522824a142420779224b529fe26420d6a159bbb6a9249c6d8413d90b4
 EBUILD chromium-24.0.1312.52.ebuild 15868 SHA256 65f300829a756d014096cd034453a3a7a8a15fab194df7586f426715b0c8c207 SHA512 e55b9bf028646fdc1780674de3b9dbd8b19b5a83f9d3cc7dd6a2317f0dde79b9fba170ea9b41a50c7fa140d6d0cdc341bbc998fd183a00a897dc2a86c079cf1c WHIRLPOOL 209630457c9a4352282b091a8d67b5404d0fe2695a328207df76d149257a6c4fd723b98aac6718b54fa966d876f3cca3d8b4f374dbf09031db1a2eca98a84587
 EBUILD chromium-24.0.1312.56.ebuild 15868 SHA256 a1c1a269c9e1f4e423e4dd7eca56f76253059b2bb0aa3beec92ff6de12fbee9c SHA512 6d80ed07889d34aa719f310a7bd69f5279e3a3cef0aac1f12ca8248b11a6151b3af7b563b12e296a8f73f537abe0830bc21de52d1a79bf2160e3e7d581d2b92d WHIRLPOOL fa15d18d5aa17181afbdac9b56d4403ddc98359765c4ce5ff6986ff5115f0fac9909980fd8b11bf9132684e23d7625a50f0d478603bb108103bb4370ace43120
 EBUILD chromium-25.0.1364.45.ebuild 16223 SHA256 7461d8b8f4fd0ec866d5618fc6a001b6d9cea8cd1035e920fa3165ab0b0a74b6 SHA512 2a34501ef4f85e866c3671cdc89ed05f0e84c910178949bcc86b3f4340e765756960593e20354159caa5a2f2e8b38db255632a18c6bbe194a1d76917d82d3e68 WHIRLPOOL 2605db94c4109cd164c235b1b940e286ee4617473825fd73835bc38cd77d06f470034475e6ef535f4082aee38d4c386d926df38df9a6ddc53836e333b01419bf
 EBUILD chromium-25.0.1364.58.ebuild 16223 SHA256 3ffe656053de68d6d911332c2c32ade3ad15283f38614384d7fa1c65215806b6 SHA512 4dda11731a0c01915dff453a334413f8aab3e2c33159d824babceaf5fee2d15c56772d7621e75554b1b0e906c5ff2a001a94fea1189b78f558cb2922e32ea040 WHIRLPOOL 9af10b16d93d27b48f456abed8139880ff4989f3dd2dbd499babcae1a11a23bb3ea39c7f5d9c02a0d9eb3017934a39c9ba47d66b4e251fcd636b64ca3e6dc776
 EBUILD chromium-26.0.1384.2.ebuild 15686 SHA256 96b65ef658b0df34e3f8d625d6b673f9e51eba6e500f217eed9ec0728fe578e6 SHA512 ed1ec1e145aae265f668c9817b52c6e9ba3d3b5e797363027b4d29ce29a17d8903fb1d981354ecea59028ab0af99dcfa288ff13ff1db171921d246ff5d5b071b WHIRLPOOL f7ad67f1281ceb60fcadd2c46a1974b87b671336c6f981179622260eb4246b4a124c7a4cdbcaa87890826360e74b35176d8504f43bd2610fc2845a70167c9abf
 EBUILD chromium-26.0.1386.0.ebuild 15843 SHA256 4dbeb02dec06f6c9f455d40ad6b3249151a2afddc8c97e60758fad957d351062 SHA512 abf641a14b20cbe95e358ccdf244a335a0eaef334cbb049c7cf6492ddd4d5b6d50cd90ede6db7b09cafe3a3fdc4e7f83e4ee01f0d5fbdd2a82ea8d86dc35d8e6 WHIRLPOOL 048003587244d0a3407483de8b1dc5a7d50db2bdc0a1c9972403eb08a59e85a525236c63bd148f3e155e41b73e969b0542fe0bb1eb0e75d071696a63c281db16
-EBUILD chromium-9999-r1.ebuild 17190 SHA256 7ebdec1a17705adc19a31e2201842cc00fcfe5cd24e7635ae0b28662f1822b2c SHA512 14c43905ac7569fa91fdf50512da0a0cad83eb66f32f94153fd3787fda5e42d573e0e5dec72b2f30110f261179640e9d81ba61c1de763b983fd8776dfc3f336f WHIRLPOOL bc6f871e6f1bf2b53b9752011dd482a2c32e959910e584258add52346b1e838cc2a624e5f416ad7258afd2b92f6e355153b028913e135ee80a760b9f9fd1537d
-MISC ChangeLog 52560 SHA256 5414602357533e87ad2ff8747fbc1f527bb363df77662b31128882f29baafab5 SHA512 e5bc2806e9e5025c9580b685eb26e6333407a6d30aa1e16032c7817d09ef126c61d8334d2b5652ff38b93f10ac0aa02af23d7276d4bc05ec0889f363eedd060c WHIRLPOOL 7107f541be333348f0382ee0307b1b667501b18ae7f0005f002479b100b2bfa284c849040c878cf59e25d356cc5acc89e6c0fe3fc4e6c7a43e90fdfae9ff2186
+EBUILD chromium-26.0.1403.0.ebuild 15295 SHA256 1da093f37dbea13cd14a5b757f88a4e49bfc838c0786cbd8969e226fe4fa7470 SHA512 f92f1e6f9d0d9764a50d258830552f4632e3c91eeac30a3261a41f138251d00a9ed4ed53501bd3d7a847343134492f463af48be4af5c204ec27db77ee73ad650 WHIRLPOOL d9333fedd4505bf76eb21b296844054f13ea2820809cf96929131447f32059aaecc2e8287de8e3ad6c0f4bb1fa0e2a8dadc91969af496c91c487502e9807c639
+EBUILD chromium-9999-r1.ebuild 17038 SHA256 9fd18601a4014a09a6c117a60b2fed7d15f2820c6d0bbaf29baa4a9e470a0ef6 SHA512 b705f0c35481c1dcaa86a4ad9d860541d45e770b127571f6631edecd9cc199c2879557160555998e2ebfaee1ae778fcb3f9a180a2a2a43346c5ebebbe0b9dfa1 WHIRLPOOL 8838a43430fc299610e8d09ec024899607b0e52b2865b69d1e22a6a19d72b1a210483083282a7310b9e1af22450868d351b0d57ad6524d5798c7569a16086205
+MISC ChangeLog 52917 SHA256 1687c0ea3493148c03bf5691e56fe281979ec10beb25912c6ab9f33b174b5b04 SHA512 60f4d6ad975ea12e067d027b01ce377533d10f1372aacba00a2e738cb8eaeacd896465601030ac76f58a4c10148a3223aa535a377f165920cf96ebb47abaa889 WHIRLPOOL 8200cf1598236eccc79dcc4f987a4ea41e3026d78a458071b8ca6905c54985cd97cd41c848581db0f0f167df01e1253d1119b7daa94c6d0cbb3fd1d482bbaf69
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
+MISC chromium-9999-r1.ebuild.orig 17190 SHA256 7ebdec1a17705adc19a31e2201842cc00fcfe5cd24e7635ae0b28662f1822b2c SHA512 14c43905ac7569fa91fdf50512da0a0cad83eb66f32f94153fd3787fda5e42d573e0e5dec72b2f30110f261179640e9d81ba61c1de763b983fd8776dfc3f336f WHIRLPOOL bc6f871e6f1bf2b53b9752011dd482a2c32e959910e584258add52346b1e838cc2a624e5f416ad7258afd2b92f6e355153b028913e135ee80a760b9f9fd1537d
+MISC chromium-9999-r1.ebuild.rej 1807 SHA256 f79cde8d1bf57e0aa1d5f1434c3433e6ce6e56d375ca341957ef3302db964693 SHA512 6a981a3dfa4e90ae4fae90d3816afc34322fe02a2a7b47d33d0d013208bf56bb9a66932eb2a50fe6f929c5181d039cf6792180d273560d5f61099392651ba6cb WHIRLPOOL a46c0d448b70153bdc218840bb8bc3d621b6c9c6b84d76d7000ccf3e3ff535e9a40faf65eb73ec37b5c8ffe19091bd31d14a1ce1ee47d767fa6f737a3d454aba
 MISC metadata.xml 516 SHA256 e5ca0cf3ef65ca054555c35bbb492d02b40138a907fae82aaa236f774fdef32f SHA512 580852722eb6ce8c660ea05b4b9a6a6ca04582c1438401e92425b6733e7a9423f048818153f59394081df6f89bee349da2b3c97a61e030f995df5ae00bc41b58 WHIRLPOOL 03ac4c1574b769bdeebe082281809af638223bdcbdea1bc2faef86f484e0f26298be769f6311023642257d49eb3d31f223c445b07dba5c6aa699775fcedff8ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEJx1cACgkQC77qH+pIQ6ROCQD+NOiKFmtgVnsTPaKpYg9Rp6xw
-WsognQBHh+AiBxigtw8A/2oIZgDJk4zdDTgvBhLcLYKfvJNeKexInK5dMkVwOpl9
-=8YeA
+iEYEAREIAAYFAlEQ35YACgkQuUQtlDBCeQIq8gCdGVPqQn0wGQFIMggSLEYCYCjj
+EQsAn0MDgU0/XGVejHLjnvbOSguEBPOe
+=JYn0
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-26.0.1403.0.ebuild b/www-client/chromium/chromium-26.0.1403.0.ebuild
new file mode 100644
index 000000000000..cd0fbbe73b60
--- /dev/null
+++ b/www-client/chromium/chromium-26.0.1403.0.ebuild
@@ -0,0 +1,502 @@
+# 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-26.0.1403.0.ebuild,v 1.1 2013/02/05 10:31:43 phajdan.jr Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2:2.6"
+
+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 \
+	pax-utils portability python 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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc"
+
+RDEPEND="app-accessibility/speech-dispatcher
+	app-arch/bzip2
+	cups? (
+		dev-libs/libgcrypt
+		>=net-print/cups-1.3.11
+	)
+	>=dev-lang/v8-3.16.11.1:=
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat
+	>=dev-libs/icu-49.1.1-r1:=
+	dev-libs/jsoncpp
+	>=dev-libs/libevent-1.4.13
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/nspr
+	>=dev-libs/nss-3.12.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
+	>=media-libs/libjpeg-turbo-1.2.0-r1
+	media-libs/libpng
+	>=media-libs/libwebp-0.2.0_rc1
+	media-libs/mesa[gles2]
+	media-libs/opus
+	media-libs/speex
+	pulseaudio? ( media-sound/pulseaudio )
+	system-ffmpeg? ( || (
+		>=media-video/ffmpeg-1.0[opus]
+		<media-video/ffmpeg-1.0
+		media-video/libav
+	) )
+	>=net-libs/libsrtp-1.4.4_p20121108
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/zlib[minizip]
+	virtual/udev
+	virtual/libusb:1
+	x11-libs/gtk+:2
+	x11-libs/libXinerama
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	kerberos? ( virtual/krb5 )
+	selinux? (
+		sec-policy/selinux-chromium
+		sys-libs/libselinux
+	)"
+DEPEND="${RDEPEND}
+	!arm? (
+		>=dev-lang/nacl-toolchain-newlib-0_p9093
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-python/ply
+	dev-python/simplejson
+	>=dev-util/gperf-3.0.3
+	sys-apps/hwids
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	>=sys-devel/make-3.81-r2
+	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 tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Make sure the build system will use the right python, bug #344367.
+	python_set_active_version 2
+	python_pkg_setup
+
+	if ! use selinux; then
+		chromium_suid_sandbox_check_kernel_config
+	fi
+
+	if use bindist && ! use system-ffmpeg; then
+		elog "bindist enabled: H.264 video support will be disabled."
+	fi
+	if ! use bindist; then
+		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+	fi
+}
+
+src_prepare() {
+	if ! use arm; then
+		mkdir -p out/Release/obj/gen/sdk/toolchain || die
+		cp -a /usr/$(get_libdir)/nacl-toolchain-newlib \
+			out/Release/obj/gen/sdk/toolchain/linux_x86_newlib || die
+		touch out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	fi
+
+	# Fix build without NaCl glibc toolchain.
+	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
+
+	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
+
+	epatch "${FILESDIR}/${PN}-system-v8-r0.patch"
+
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r1.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/*' \
+		\! -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/hyphen/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/jstemplate/*' \
+		\! -path 'third_party/leveldatabase/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libvpx/*' \
+		\! -path 'third_party/libxml/chromium/*' \
+		\! -path 'third_party/libXNVCtrl/*' \
+		\! -path 'third_party/libyuv/*' \
+		\! -path 'third_party/lss/*' \
+		\! -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/*' \
+		\! -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/v8-i18n/*' \
+		\! -path 'third_party/webdriver/*' \
+		\! -path 'third_party/webrtc/*' \
+		\! -path 'third_party/widevine/*' \
+		-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 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_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_libvpx (http://crbug.com/174287).
+	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_libsrtp=1
+		-Duse_system_libusb=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_mesa=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_opus=1
+		-Duse_system_protobuf=1
+		-Duse_system_re2=1
+		-Duse_system_speex=1
+		-Duse_system_v8=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_yasm=1
+		-Duse_system_zlib=1
+		$(gyp_use system-ffmpeg use_system_ffmpeg)"
+
+	# 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)
+		$(gyp_use selinux selinux)"
+
+	# 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"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	if ! use selinux; then
+		# Enable SUID sandbox.
+		myconf+="
+			-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+			-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+	fi
+
+	# 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 && ! use system-ffmpeg; then
+		# Enable H.624 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).
+		myconf+=" -Dtarget_arch=arm
+			-Darmv7=0
+			-Darm_neon=0
+			-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
+	fi
+
+	egyp_chromium ${myconf} || die
+}
+
+src_compile() {
+	local test_targets
+	for x in base cacheinvalidation crypto \
+		googleurl gpu media net printing sql; do
+		test_targets+=" ${x}_unittests"
+	done
+
+	local make_targets="chrome chromedriver"
+	if ! use selinux; then
+		make_targets+=" chrome_sandbox"
+	fi
+	if use test; then
+		make_targets+=$test_targets
+	fi
+
+	# See bug #410883 for more info about the .host mess.
+	emake ${make_targets} BUILDTYPE=Release V=1 \
+		CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
+		CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
+		LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
+		AR.host="$(tc-getAR)" || 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 mylocale='en_US.utf8'
+	if ! locale -a | grep -q "$mylocale"; then
+		eerror "${PN} requires ${mylocale} 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 ${mylocale} is not supported"
+	fi
+
+	# For more info see bug #370957.
+	if [[ $UID -eq 0 ]]; then
+		die "Tests must be run as non-root. Please use FEATURES=userpriv."
+	fi
+
+	runtest() {
+		local cmd=$1
+		shift
+		local filter="--gtest_filter=$(IFS=:; echo "-${*}")"
+		einfo "${cmd}" "${filter}"
+		LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}"
+	}
+
+	local excluded_base_unittests=(
+		"ICUStringConversionsTest.*" # bug #350347
+		"MessagePumpLibeventTest.*" # bug #398591
+	)
+	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
+
+	runtest out/Release/cacheinvalidation_unittests
+	runtest out/Release/crypto_unittests
+	runtest out/Release/googleurl_unittests
+	runtest out/Release/gpu_unittests
+
+	# TODO: re-enable when we get the test data in a separate tarball.
+	# 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
+	#	"URLFetcher*" # bug #425764
+	#	"HTTPSOCSPTest.*" # bug #426630
+	#	"HTTPSEVCRLSetTest.*" # see above
+	#	"HTTPSCRLSetTest.*" # see above
+	#)
+	# runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
+
+	runtest out/Release/printing_unittests
+	runtest out/Release/sql_unittests
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	if ! use selinux; then
+		doexe out/Release/chrome_sandbox || die
+		fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+	fi
+
+	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
+
+	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
+	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+		sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+	fi
+
+	# 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
+
+	if ! use system-ffmpeg; then
+		doexe out/Release/libffmpegsumo.so || die
+	fi
+
+	# 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-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 6d4f75360b12..dc7e3c13696f 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.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-9999-r1.ebuild,v 1.163 2013/01/26 04:14:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.164 2013/02/05 10:31:43 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2:2.6"
@@ -19,7 +19,7 @@ ESVN_REPO_URI="http://src.chromium.org/svn/trunk/src"
 LICENSE="BSD"
 SLOT="live"
 KEYWORDS=""
-IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux system-ffmpeg tcmalloc"
+IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc"
 
 RDEPEND="app-accessibility/speech-dispatcher
 	app-arch/bzip2
@@ -27,7 +27,7 @@ RDEPEND="app-accessibility/speech-dispatcher
 		dev-libs/libgcrypt
 		>=net-print/cups-1.3.11
 	)
-	>=dev-lang/v8-3.15.11.1:=
+	>=dev-lang/v8-3.16.11.1:=
 	>=dev-libs/elfutils-0.149
 	dev-libs/expat
 	>=dev-libs/icu-49.1.1-r1:=
@@ -38,15 +38,17 @@ RDEPEND="app-accessibility/speech-dispatcher
 	dev-libs/nspr
 	>=dev-libs/nss-3.12.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
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
-	media-libs/libvpx
 	>=media-libs/libwebp-0.2.0_rc1
+	media-libs/mesa[gles2]
 	media-libs/opus
 	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
@@ -206,15 +208,15 @@ src_prepare() {
 		\! -path 'third_party/hunspell/*' \
 		\! -path 'third_party/hyphen/*' \
 		\! -path 'third_party/iccjpeg/*' \
-		\! -path 'third_party/khronos/*' \
+		\! -path 'third_party/jstemplate/*' \
 		\! -path 'third_party/leveldatabase/*' \
 		\! -path 'third_party/libjingle/*' \
 		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libvpx/*' \
 		\! -path 'third_party/libxml/chromium/*' \
 		\! -path 'third_party/libXNVCtrl/*' \
 		\! -path 'third_party/libyuv/*' \
 		\! -path 'third_party/lss/*' \
-		\! -path 'third_party/mesa/*' \
 		\! -path 'third_party/modp_b64/*' \
 		\! -path 'third_party/mongoose/*' \
 		\! -path 'third_party/mt19937ar/*' \
@@ -223,7 +225,6 @@ src_prepare() {
 		\! -path 'third_party/ots/*' \
 		\! -path 'third_party/pywebsocket/*' \
 		\! -path 'third_party/qcms/*' \
-		\! -path 'third_party/re2/*' \
 		\! -path 'third_party/sfntly/*' \
 		\! -path 'third_party/skia/*' \
 		\! -path 'third_party/smhasher/*' \
@@ -244,13 +245,6 @@ src_prepare() {
 
 	# Remove bundled v8.
 	find v8 -type f \! -iname '*.gyp*' -delete || die
-
-	# The implementation files include v8 headers with full path,
-	# like #include "v8/include/v8.h". Make sure the system headers
-	# will be used.
-	# TODO: find a solution that can be upstreamed.
-	rmdir v8/include || die
-	ln -s /usr/include v8/include || die
 }
 
 src_configure() {
@@ -279,10 +273,10 @@ src_configure() {
 	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
 
 	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg
 	# TODO: use_system_hunspell (upstream changes needed).
 	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_libvpx (http://crbug.com/174287).
 	myconf+="
 		-Duse_system_bzip2=1
 		-Duse_system_flac=1
@@ -294,13 +288,14 @@ src_configure() {
 		-Duse_system_libpng=1
 		-Duse_system_libsrtp=1
 		-Duse_system_libusb=1
-		-Duse_system_libvpx=1
 		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
+		-Duse_system_mesa=1
 		-Duse_system_minizip=1
 		-Duse_system_nspr=1
 		-Duse_system_opus=1
 		-Duse_system_protobuf=1
+		-Duse_system_re2=1
 		-Duse_system_speex=1
 		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
@@ -310,12 +305,13 @@ src_configure() {
 
 	# Optional dependencies.
 	# TODO: linux_link_kerberos, bug #381289.
-	# TODO: linux_use_libgps, linux_link_libgps.
 	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)
 		$(gyp_use selinux selinux)"
diff --git a/www-client/chromium/files/chromium-gpsd-r0.patch b/www-client/chromium/files/chromium-gpsd-r0.patch
new file mode 100644
index 000000000000..1327ecc9ca68
--- /dev/null
+++ b/www-client/chromium/files/chromium-gpsd-r0.patch
@@ -0,0 +1,12 @@
+--- build/linux/system.gyp.orig	2013-01-28 16:03:43.709477316 +0000
++++ build/linux/system.gyp	2013-01-28 16:06:14.210254835 +0000
+@@ -175,9 +175,6 @@
+                          'gps_open',
+                          'gps_close',
+                          'gps_read',
+-                         # We don't use gps_shm_read() directly, just to make
+-                         # sure that libgps has the shared memory support.
+-                         'gps_shm_read',
+               ],
+               'message': 'Generating libgps library loader.',
+               'process_outputs_as_sources': 1,
diff --git a/www-client/chromium/files/chromium-system-v8-r0.patch b/www-client/chromium/files/chromium-system-v8-r0.patch
new file mode 100644
index 000000000000..4c85b7052695
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-v8-r0.patch
@@ -0,0 +1,11 @@
+--- v8/tools/gyp/v8.gyp.orig	2013-02-05 08:41:52.390427791 +0000
++++ v8/tools/gyp/v8.gyp	2013-02-05 08:42:14.330559664 +0000
+@@ -993,7 +993,7 @@
+           'include_dirs++': [
+             '<(shim_headers_path)',
+           ],
+-          'direct_dependent_settings': {
++          'all_dependent_settings': {
+             'include_dirs+++': [
+               '<(shim_headers_path)',
+             ],