Dev channel bump. Switch from make-based to ninja-based build. Fix bug #469144 by Alphat-PC.

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

5 files changed, 726 insertions, 33 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 769bd7e8e899..c3faaf39a984 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.887 2013/05/24 18:27:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.888 2013/05/25 00:13:09 phajdan.jr Exp $
+
+*chromium-29.0.1516.3 (25 May 2013)
+
+  25 May 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-system-ffmpeg-r6.patch, +chromium-29.0.1516.3.ebuild,
+  chromium-9999-r1.ebuild:
+  Dev channel bump. Switch from make-based to ninja-based build. Fix bug
+  #469144 by Alphat-PC.
 
   24 May 2013; Agostino Sarubbo <ago@gentoo.org> -chromium-26.0.1410.43.ebuild,
   -chromium-26.0.1410.63.ebuild, -chromium-27.0.1453.81.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index c9ab7a6547c2..f58ecd28eb1c 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX chromium-browser.xml 407 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca WHIRLPOOL be37cd2e7d02c510e84c484f32ab6ab2e1f38a2a03c0cdbc9b6b485d64feaf79944d8ce097f0838ae9bc71c42401b633350b847ad316b8e23cf5614e3913e7ec
 AUX chromium-gpsd-r0.patch 592 SHA256 9af056bd99e5176af6f5d8acb7d54241731b64fb3fa517fe1a698b35e21692d1 SHA512 72a668dbd5b343a34a1938c2a6f1147d14a149b9a4a981487e9ca8fa6d912791a6c11e29178c3abe1e691c0e1bf6e435a390eb89aa63bda72d592ab3b0a55b1c WHIRLPOOL 7f04535d674498e2f2d572b6feb5ee4a183ffcf9671f308947e5c4a7370399bc8388d53705f7ca23dd6038bb12c81af0fe0b8b1f3cb7d90465b255e4d3c8b7d9
@@ -14,6 +14,7 @@ AUX chromium-speech-dispatcher-0.8-r0.patch 562 SHA256 4f92686cb785a48a0e91de134
 AUX chromium-system-ffmpeg-r2a.patch 6627 SHA256 8344737762508e33f748a04a81fc460c82e1752ad49d214abf4ff670ecd06925 SHA512 fb7828ab03c6fe54945f37e829ba1e1b9ecb482b4df9c31e0e93a04065903a54b6887766806402aa1e9b13c63fb3a59eab1f0ce73207ab3ca6bcce362a2c3677 WHIRLPOOL 91891f9053fe1447808b3a3c015e9c8f08103cccd1944171c07bd3254ee85dfa88abdfb689b97949ae80a6cda59e6f561ab8a89fd45ab52bced9118d0679326b
 AUX chromium-system-ffmpeg-r4.patch 1237 SHA256 749c646c0084fea6ba90fbdd21e6185a7f3ad0d2c8633403fd1b3df3ffe5f7a8 SHA512 d50b103a28a51452d88bb3866d1daebf05eed038b091504f909020d84aa2b7f814321fee6b52df8c257767eb00978955f6096dcfadded7fca90e30f1daddd234 WHIRLPOOL 5c5eb0e86943ea43c9c19a7a0b8a92b1413ac18818277f88727c99e35d41c93d0dd6c5a235482b292fcd50dd9ec81aec63fb591c192b72f3515bfcbcc191fbb5
 AUX chromium-system-ffmpeg-r5.patch 3015 SHA256 b9b35f885f5662897e7d14a7335c9a2cd134a8763064bd3f1459dcec1b7b0cec SHA512 c52f20f3eeee5e2b0ede40e60d8f5da780f5e1fe91eaf83dc2aea206bbb54b0202acaf37e62bb1f456a3e4aefa4cd47285994b43abd1682aa0dab6a04a990bf4 WHIRLPOOL 57c1dce3f1aed33c8fa6f93acb9bece0d31d043e559a9bc29f04666604889f03cad99180d7c90936ca05a06fc926760484ae07420b7df651bfb80585883859b2
+AUX chromium-system-ffmpeg-r6.patch 4112 SHA256 ba33c67086fc8988b45839a6788bf20b58570cc86d25b41ec018deee42ac6d22 SHA512 91f150df59585945cc2bc370e12aa86923f8f80b8212e354ac6b56c97127f2c4542108e96629c447fbf5cd899925c9a6ab932fb75032f48c1da9e002fcee778b WHIRLPOOL c3244901883ceff526307f0a9649d29246c1069e0e60f4f74d9f21ed50cf1474acec0e9709f2dc4dab9ac3028e0a0546b22cb99984b62b26f5f4f5b0c8ba1f45
 AUX chromium-system-icu-r0.patch 434 SHA256 bfd5690c93dbdb56cbe93016b267c84be3dc67f7f8ed6c9e157dca9867260875 SHA512 5d697f97834315071fe9fb70979546a17b2432ce126f9d6e275a2a2cbdf0f64ace29e4c1d4285facaea6af35138d66046d7150ec71d2b3ed9e56da35daeecb53 WHIRLPOOL 79ad140bf926e4bbd0cb34d29a111162294c7e05001728da2e150dfb8ed968747cccd353f7cc4993d4977d352ba0930b2438ab9f5bfba25749ca9912d3a0fd50
 AUX chromium-system-libvpx-r0.patch 411 SHA256 9adf50fd15cab5e62fa4713e0e15f4525844d3d322f5f91304dd85e46d9b2b0e SHA512 0c0498656cb1162d1490191f8a5a70e274e27467c357b859adbc1b958e76235311654ef517c512dde12212ca9efc9f2ec7362fc2dc11bd85c3eb3529aa049a3d WHIRLPOOL acca1227aefc894606bac0a4a90e0a8b7a94d3ce8e0d15ce1157b40858f6533f45442009423369a6f742b9b796dcfb6208d2ec4898c5a10812f866a7b8aa877b
 AUX chromium-system-v8-r0.patch 397 SHA256 9b69099db82e3d4def410f887eb0b0b9006f4e68b59b8eb72d3b33c79a42da7c SHA512 83d44848d637d545aa851cdf2df81b24964d6febbde4ab28ff600f82ebd0c60a66059fc87a96bb1464363d2e2f098fe151ca3a9911f9ca2f3c11ba36bbf7e653 WHIRLPOOL 8fc87b7c1a0f8aca41ee17bef0d415d0f73619a2191807f5f0ce7340052ccb2fc0e34af033285fe62eb41b895b556b241f8c1182fa5daf68c6cc0d658a05af0f
@@ -27,27 +28,22 @@ DIST chromium-28.0.1500.11-lite.tar.xz 113632832 SHA256 42cc798b49c77c38c62aef29
 DIST chromium-28.0.1500.11-testdata.tar.xz 141035732 SHA256 9b762e27cc04d66ef4f0b05e6350951a42f28bddbe40bf0aea5daff7d5612e6a SHA512 ba140419da3aedbb20c47d00703c7cfe5bee5a7e5711cc5da104b423de32d28413c81d95ca4d4fe026fbf0a61de29654942cc51705701d911913322e24f62025 WHIRLPOOL ae8ad99798a396cef605daa1bc4cb66519fb97c03c6732ad3c828e630f4b24966e77d517094b6fe426a5acb9ede7bccbc8b2b25be51b764f9bc886f29fc242e1
 DIST chromium-28.0.1500.20-lite.tar.xz 113643972 SHA256 6f7cd9d477dc73e62139761ff2e0f42cc1600b354cbc59b39175f601095fc7a6 SHA512 79f48df0b897c6289ff8587ae78e3269a5eb6331e95f6b61baba6554cfd7f95cc401e01bb093a0e0ee8cde068e6c62a90193c3b56656275071cb665c2dc1b348 WHIRLPOOL 193a04fc856a155798ca4d78acb6fab237dd0fb9401c43a5e66c94966206fffcd4aaa29667398ed0f9fac4a7130e531191c88a73a427c0eef4db2d39480eb9ef
 DIST chromium-28.0.1500.20-testdata.tar.xz 141046188 SHA256 5184434c575858c586b0544d639d203e56bfac64a8b93feafad5b13972d53429 SHA512 275f49644f58aa6f6dbf921705250a75ff7aa404bf606002f618e4880dfe5594a0c49f7658d5eccc94da8cde0d99a574f96aac21171027a7e30ad87b821f808b WHIRLPOOL 104d452e53929f5f102a69070c3c49395ed9e07e4116e2e45cc0669aef62664dbbc5183fdf9e562e3cf770565833fddfdf569bb4b43d18978a8cc9839cb7fef7
+DIST chromium-29.0.1516.3-lite.tar.xz 117242084 SHA256 f4cfc2a79d30b1155e631d43d028539a929237d42d9ea6e8ef60d5ed8d544ff4 SHA512 2406b742c86bc1400d21a086f54e779bd7302cc9762ee5d5e03463c449f304e1f48848f354ab411a4d9c8499fbe0286a9dba6cd1bfe5e3ff0a33757d7750de5a WHIRLPOOL 58daeb601629f7040cf12ef9d041ecaafcf6a546130eaeec486aa8a1b161c8a776d7e6b5bfc65792624ccb1d1354867cd44ed94d1f474701f18068f285fb3710
+DIST chromium-29.0.1516.3-testdata.tar.xz 116003424 SHA256 b843e6d8084a4d73480e0256f3bb900d333c849a978b22ef23da0fe3f226a99d SHA512 9889d76e3e67d9404dc860be51285806e088862e28775ee78d164258aee47c3266c6fbe43a7fba4971dd0b4a95aad1c3a6bdca7d38d228b4283426f5dc029c4a WHIRLPOOL 5b5931d2c07e443161c3e529ff7c32285e1e9ff869d55ad6523a9b7455148a3937841c9946f9fc27b25ba8f55b84a70ff444619aca4787e8d928124ab7d4c472
 EBUILD chromium-27.0.1453.93.ebuild 16989 SHA256 5d6694addc24b6468f3bab924f5e0be56a0a42314d6177ffcbe7851465eb1646 SHA512 025a906f617d2af945dcb9afc32b91e4b71ea1cdd965ae3781f2523e3052254b5fa660b1b393ec69405be970f24c0f94da8b9f0650c31ecd64d5b09b4b712741 WHIRLPOOL 8db967e4dd33d7fd96ef466b08228d766a72c2ce8041db961f66edb36e4d218078577696f8992acee2c89c393faa890531ac8bf0dd05c4c17e236a836bd05911
 EBUILD chromium-28.0.1500.11.ebuild 16870 SHA256 ff64c7feb9a294ca5e292ec737cd09ff316914a20950fea466aa8f3ca02f489d SHA512 b00262e3e6dba49c0a5156a788c55f85aa15b713caa3db5c66d4d221dbfb07fe342d5e90a975af20bb40ec6895e49e79d96731b54e6a54c0562407d81365f325 WHIRLPOOL 19933ac0a645ebaff94c4200222c647ec2cabec68d6bff837557aeb51be8cae009d4e6915240f653c2780c2d60f5975940cea2cdcd753c07f077fd64a28f84cc
 EBUILD chromium-28.0.1500.20.ebuild 16870 SHA256 297e07edef53c1fd97da746a1a276ac32f37d5c10ba75fc241751503b33ca3cf SHA512 fb9b606f26562fe619f280995b3dd33f0a6b2a9fd1b188ff2dd6d0ad9ee29a5673ae827454a5c7026a5f0acd7339981a6e0a00e556e3ac02684c7ef19cf214d3 WHIRLPOOL 09e6b38116496765080484e05a1dd0625fb010c8223217061176cf1eab85383f3dabcbd4671e98249af19bdc000671bf014a2a20b850c54f95fb0e0e687bffc8
-EBUILD chromium-9999-r1.ebuild 18634 SHA256 6c70673d9ac374e288ed7525dbee8e277847f7c4027307c78fd3b970f71fb657 SHA512 0a46f65d60f5ceb38216314f2854107542641d26b55df38aea57dd6ce7009355431d877fb16b743072dcdec6017b6b5221d7e73c47eceebc20e3110c9ee4f7de WHIRLPOOL 000589ec5fe1d5dbfce233b310d15c59ec4d4597b0f8a02b771aab87a6d13358635a5006a9c33fcefc143dfda4fa8433878458cf1334c0c4d164191b3fff2933
-MISC ChangeLog 70226 SHA256 7db7f52e5c586ccc268ba20cd67a242062ee7e7d147cb0c5a26459a11a2f22cc SHA512 a3b2b890ccf2726df2ebac5211ba616a9bb82ce26b05f36d935250e50b2b6377e04314b8b479a1f3b065051bb1ac6417171dd7a606396ae4ce26ea0f6a3fcb8e WHIRLPOOL 3aa01d6c176e90991928a305454b57e9876c50b2b4bba9fe039c75dd18148ee86b95b4fcdacc22fdea9a338ed38296bdf0a3363ae546831d2e128827731fcbdb
+EBUILD chromium-29.0.1516.3.ebuild 17109 SHA256 cd8df43a373c2394b9b8f1bd7d438635fbab8fb96143705c8da847a10fd7a6a6 SHA512 4175befec92965b848843bf80a78fef3df7bb0b4f47cf7627b1b7048b4d7c03a3f3f4b02709080b45fdf9f34b0c49a8333ea2ca4b765f8f07366b4dcbd47d65d WHIRLPOOL ebd4475ee3af802ebe53e0b5029aa24c0f03825e6f2e5c64d76458cdcfa6dea88c476f0c21bc62a052d81c4052c2745f0ef6a10b856c04cfda263631bb94c120
+EBUILD chromium-9999-r1.ebuild 18882 SHA256 6426f1ef1ba2a27f621a948373068b387ba7268b25faade9696951cfeee9220b SHA512 d80c418e23966456b18ca7e0d9f6afb39a08cc28a38f87bb6ec64e4f986d029e8e7eefe80074ef9fa69138276b855cb762f288f44953ce29bbb3628c537e52f4 WHIRLPOOL 115f6a392b5e66c2c1bf7903b5cc79531e8f06c21d0f147a288272218332d6fc2b72fb608c445f6ec426957839544e94c1bfaf237963e1efbc7f941ee78ef62f
+MISC ChangeLog 70522 SHA256 36e9e08468ac8fa1d230433bbb3bccd6485ecbba6a7a94eb919ac314bb7fb933 SHA512 e35243e2cbdad84a84051f505d9cde44637a624fd3e639f3d09370c6c2a3199a27733a0387e964f71d01f4be8bfeb6c5c7bb0cf0d9be3b8d267ee9cef5784530 WHIRLPOOL 665724ed1bf571fbefda3661c05b6ca9f16c3a12a0cf2821e5fb8f0f980086f7a7d19cae3bd4a0396d0c9e2b9c9fb6f69e836502bc0a9274f3d72200f178c273
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
+MISC chromium-9999-r1.ebuild.orig 18634 SHA256 6c70673d9ac374e288ed7525dbee8e277847f7c4027307c78fd3b970f71fb657 SHA512 0a46f65d60f5ceb38216314f2854107542641d26b55df38aea57dd6ce7009355431d877fb16b743072dcdec6017b6b5221d7e73c47eceebc20e3110c9ee4f7de WHIRLPOOL 000589ec5fe1d5dbfce233b310d15c59ec4d4597b0f8a02b771aab87a6d13358635a5006a9c33fcefc143dfda4fa8433878458cf1334c0c4d164191b3fff2933
+MISC chromium-9999-r1.ebuild.rej 1900 SHA256 be8deb2abae1f1d4a4414eaab16099fb21221462e1fd1488b0b758f1e9ef3acd SHA512 520b1c46b924d27c14154ec716007117ce9def8fd19d2abad89c426f7ce0167554937e9adcf7f2f4d1a99bbefa6e118ed62b86c872d7b36ecf325364a6b955f4 WHIRLPOOL 0ea3770e0930eb767b38d0b03a909b0e6a529a27484f4a262118025b3be6d47bf0afd3f8034abe90b330fb8a1c96d0ea9af398a1c68f7bb4464fcdd95adc65c6
 MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRn7EOAAoJELp701BxlEWfD7UP/2BNioWGpKwBK4KwAwzFhMSf
-J2aywGZssPD7SwvW3v4ZudF/40EbF23iITJEm1IVPtDI6uhElj6UMmI7KD0nNqL9
-jyJVvUmHDJIX3nGH+uee4E4CmEApIO3f46dsnB5J1E+qyKcWRTU9HwRScSj/du1O
-JlVyTuJzjdRYtK7rLk+AQX6M+9tGwv1VC52tpQwldjR5tWJ8kLM1crXJzTo3eH5i
-YZqaICY4yDiU+nrdNSGiQK4xBRqXXuW3yOY3GeZFbBx937iMQeC3OmaOCZiU9qc5
-UhhkqTsX5J0G7OzxMawaTURHlRCmLiEDGCTYmivqsGfElJuQLK1/c37adNdNEtlA
-ZznBuphFj2WLQOcoORdTBZiltNX1CCPppKBUI0zW551wqtQfITXIjvqhfZzzkxb6
-d5rD54ocTIK7/XQ1MFL8FRx+FOls4NVNC6X/yVKvvXrfrj6DxIjmGxNgon4PUWIV
-MIqMpayOVUn7bBKJng17VmkepxiBe0dHi2r65NYnzsKixY2jjZoOFABTwjfyBHsh
-3feedKaWUuU9iL+uGixMOHJE2gdocueHm6f93rhN0OUZtvvASYheVMoXrmfq+tj5
-EMeMquOGRpKhu4ATlGKVqSPP2QJjLVWRhih1GFFY3GZ/K41TP4oUkaHAzmQdqqRI
-4kdYR10C2BY2+OP5u/S0
-=dKZA
+iEYEAREIAAYFAlGgAh4ACgkQuUQtlDBCeQJ6NACfRnMS9vLj9s7nKO9/02XT+o24
+fn0Anjz/B2xgHXGiR1NVTIDimC7P1bc7
+=kQ+0
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-29.0.1516.3.ebuild b/www-client/chromium/chromium-29.0.1516.3.ebuild
new file mode 100644
index 000000000000..6294d45f97d8
--- /dev/null
+++ b/www-client/chromium/chromium-29.0.1516.3.ebuild
@@ -0,0 +1,545 @@
+# 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-29.0.1516.3.ebuild,v 1.1 2013/05/25 00:13:09 phajdan.jr 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}-lite.tar.xz
+	test? ( https://commondatastorage.googleapis.com/chromium-browser-official/${P}-testdata.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-ffmpeg 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.17.6:=
+	=dev-lang/v8-3.19*
+	>=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.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:0=
+	media-libs/libvpx:=
+	>=media-libs/libwebp-0.2.0_rc1:=
+	!arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) )
+	media-libs/opus:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( || (
+		>=media-video/ffmpeg-1.0:=[opus]
+		>=media-video/libav-9.5:=[opus]
+	) )
+	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 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	!arm? (
+		>=dev-lang/nacl-toolchain-newlib-0_p9093
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	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 && ! 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/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-ffmpeg-r6.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/khronos/*' \
+		\! -path 'third_party/leveldatabase/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libsrtp/*' \
+		\! -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/*' \
+		\! -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/*' \
+		\! -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 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_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_libusb=1
+		-Duse_system_libvpx=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
+		$(gyp_use system-ffmpeg use_system_ffmpeg)"
+
+	# TODO: Use system mesa on x86, bug #457130 .
+	if ! use x86 && ! use arm; then
+		myconf+="
+			-Duse_system_mesa=1"
+	fi
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# TODO: re-enable on vp9 libvpx release (http://crbug.com/174287).
+	myconf+="
+		-Dmedia_use_libvpx=0"
+
+	# 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"
+
+	# Enable SUID sandbox.
+	myconf+="
+		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+
+	# 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
+			-Dsysroot=
+			-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
+
+	# 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 \
+		googleurl 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 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
+		"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/googleurl_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
+		"*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[@]}"
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	doexe out/Release/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
+
+	newexe "${FILESDIR}"/chromium-launcher-r3.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 9a4cd1a7ed63..447f6be429eb 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.194 2013/05/09 20:59:28 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.195 2013/05/25 00:13:09 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,7 +9,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 \
+inherit chromium eutils flag-o-matic multilib multiprocessing \
 	pax-utils portability python-any-r1 subversion toolchain-funcs versionator virtualx
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
@@ -24,6 +24,10 @@ IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-f
 # 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:=
@@ -33,7 +37,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 		>=net-print/cups-1.3.11:=
 	)
 	>=dev-lang/v8-3.17.6:=
-	=dev-lang/v8-3.18*
+	=dev-lang/v8-3.19*
 	>=dev-libs/elfutils-0.149
 	dev-libs/expat:=
 	>=dev-libs/icu-49.1.1-r1:=
@@ -81,13 +85,14 @@ DEPEND="${RDEPEND}
 		dev-lang/yasm
 	)
 	dev-lang/perl
+	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
-	>=sys-devel/make-3.81-r2
 	virtual/pkgconfig
 	test? ( dev-python/pyftpdlib )"
 RDEPEND+="
@@ -180,14 +185,14 @@ pkg_setup() {
 
 src_prepare() {
 	if ! use arm; then
-		mkdir -p out/Release/obj/gen/sdk/toolchain || die
+		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/obj/gen/sdk/toolchain/linux_x86_newlib || die
-		touch out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+			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}-system-ffmpeg-r5.patch"
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r6.patch"
 
 	epatch_user
 
@@ -410,6 +415,12 @@ src_configure() {
 	# Tools for building programs to be executed on the build system, bug #410883.
 	tc-export_build_env BUILD_AR BUILD_CC BUILD_CXX
 
+	# 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
 }
@@ -422,17 +433,14 @@ src_compile() {
 		test_targets+=" ${x}_unittests"
 	done
 
-	local make_targets="chrome chrome_sandbox chromedriver"
+	local ninja_targets="chrome chrome_sandbox chromedriver"
 	if use test; then
-		make_targets+=" $test_targets"
+		ninja_targets+=" $test_targets"
 	fi
 
-	# See bug #410883 for more info about the .host mess.
-	emake ${make_targets} BUILDTYPE=Release V=1 \
-		CC.host="${BUILD_CC}" CFLAGS.host="${BUILD_CFLAGS}" \
-		CXX.host="${BUILD_CXX}" CXXFLAGS.host="${BUILD_CXXFLAGS}" \
-		LINK.host="${BUILD_CXX}" LDFLAGS.host="${BUILD_LDFLAGS}" \
-		AR.host="${BUILD_AR}" || die
+	# 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
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r6.patch b/www-client/chromium/files/chromium-system-ffmpeg-r6.patch
new file mode 100644
index 000000000000..3ac050bd4468
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-ffmpeg-r6.patch
@@ -0,0 +1,136 @@
+--- a/media/filters/ffmpeg_glue.h
++++ b/media/filters/ffmpeg_glue.h
+@@ -28,9 +28,9 @@
+ #include "base/basictypes.h"
+ #include "base/memory/scoped_ptr.h"
+ #include "media/base/media_export.h"
++#include "media/ffmpeg/ffmpeg_common.h"
+ 
+ struct AVFormatContext;
+-struct AVIOContext;
+ 
+ namespace media {
+ 
+--- a/media/media.gyp
++++ b/media/media.gyp
+@@ -363,6 +363,9 @@
+           'dependencies': [
+             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+           ],
++          'export_dependent_settings': [
++            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++          ],
+         }, {  # media_use_ffmpeg == 0
+           # Exclude the sources that depend on ffmpeg.
+           'sources!': [
+--- a/media/ffmpeg/ffmpeg_common.cc.orig	2013-01-17 00:07:51.635057013 +0000
++++ b/media/ffmpeg/ffmpeg_common.cc	2013-01-17 00:15:50.867406811 +0000
+@@ -10,6 +10,8 @@
+ #include "media/base/video_frame.h"
+ #include "media/base/video_util.h"
+ 
++#undef SampleFormat
++
+ namespace media {
+ 
+ // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
+@@ -85,8 +85,10 @@
+       return kCodecGSM_MS;
+     case AV_CODEC_ID_PCM_MULAW:
+       return kCodecPCM_MULAW;
++#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS
+     case AV_CODEC_ID_OPUS:
+       return kCodecOpus;
++#endif
+     default:
+       DVLOG(1) << "Unknown audio CodecID: " << codec_id;
+   }
+@@ -130,8 +132,10 @@
+       return AV_CODEC_ID_GSM_MS;
+     case kCodecPCM_MULAW:
+       return AV_CODEC_ID_PCM_MULAW;
++#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS
+     case kCodecOpus:
+       return AV_CODEC_ID_OPUS;
++#endif
+     default:
+       DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
+   }
+@@ -149,8 +153,10 @@
+       return kCodecMPEG4;
+     case AV_CODEC_ID_VP8:
+       return kCodecVP8;
++#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
+     case AV_CODEC_ID_VP9:
+       return kCodecVP9;
++#endif
+     default:
+       DVLOG(1) << "Unknown video CodecID: " << codec_id;
+   }
+@@ -167,8 +173,10 @@
+       return AV_CODEC_ID_MPEG4;
+     case kCodecVP8:
+       return AV_CODEC_ID_VP8;
++#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
+     case kCodecVP9:
+       return AV_CODEC_ID_VP9;
++#endif
+     default:
+       DVLOG(1) << "Unknown VideoCodec: " << video_codec;
+   }
+--- a/media/filters/ffmpeg_demuxer.cc.orig	2013-05-09 18:04:25.089276403 +0000
++++ b/media/filters/ffmpeg_demuxer.cc	2013-05-09 18:05:16.289599070 +0000
+@@ -111,12 +111,15 @@
+   // Get side data if any. For now, the only type of side_data is VP8 Alpha. We
+   // keep this generic so that other side_data types in the future can be
+   // handled the same way as well.
+-  av_packet_split_side_data(packet.get());
+   int side_data_size = 0;
+-  uint8* side_data = av_packet_get_side_data(
++  uint8* side_data = NULL;
++#ifndef CHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL
++  av_packet_split_side_data(packet.get());
++  side_data = av_packet_get_side_data(
+       packet.get(),
+       AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
+       &side_data_size);
++#endif
+ 
+   // If a packet is returned by FFmpeg's av_parser_parse2() the packet will
+   // reference inner memory of FFmpeg.  As such we should transfer the packet
+--- a/media/base/media_posix.cc.orig	2013-05-24 20:59:12.963046035 +0000
++++ b/media/base/media_posix.cc	2013-05-24 20:59:50.593275882 +0000
+@@ -11,12 +11,15 @@
+ #include "base/path_service.h"
+ #include "base/strings/stringize_macros.h"
+ #include "media/ffmpeg/ffmpeg_common.h"
++
++#if !defined(USE_SYSTEM_FFMPEG)
+ #include "third_party/ffmpeg/ffmpeg_stubs.h"
+ 
+ using third_party_ffmpeg::kNumStubModules;
+ using third_party_ffmpeg::kModuleFfmpegsumo;
+ using third_party_ffmpeg::InitializeStubs;
+ using third_party_ffmpeg::StubPathMap;
++#endif
+ 
+ namespace media {
+ namespace internal {
+@@ -46,6 +49,9 @@
+ #endif
+ 
+ bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) {
++#if defined(USE_SYSTEM_FFMPEG)
++  return true;
++#else
+   StubPathMap paths;
+ 
+   // First try to initialize with Chrome's sumo library.
+@@ -61,6 +67,7 @@
+       FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION))).value());
+ 
+   return InitializeStubs(paths);
++#endif
+ }
+ 
+ }  // namespace internal