Dev channel bump. Add pic USE flag to build libffmpegsumo.so without text relocations on x86 (bug #493670 by ago). Remove old.

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

5 files changed, 72 insertions, 118 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index b65d5e828c8d..30b831228547 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1090 2014/06/12 00:18:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1091 2014/06/12 06:36:11 phajdan.jr Exp $
+
+*chromium-37.0.2041.4 (12 Jun 2014)
+
+  12 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-37.0.2041.4.ebuild, +files/chromium-ffmpeg-r1.patch,
+  -chromium-37.0.2017.2.ebuild, metadata.xml:
+  Dev channel bump. Add pic USE flag to build libffmpegsumo.so without text
+  relocations on x86 (bug #493670 by ago). Remove old.
 
 *chromium-35.0.1916.153 (12 Jun 2014)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 666ad8e7be3a..c1cb6d64dc6b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -11,6 +11,7 @@ AUX chromium-cups-r0.patch 838 SHA256 f8a9e97c91b99474c968001a7fd58ee1996afd5f84
 AUX chromium-d8-r0.patch 334 SHA256 6c7be33f0e5d0b18edc06be416bd41b0a2567ee5463d97a20ecdd0421a1793ba SHA512 c83a3d6fd99f3396db2a05ddc0177e6a2027c6439a6c9dc4c9b57c1ca64887075f8e899ee899812b0c5f234ec3a513254ef1ee2cbeb32a38de589194a5fc8c10 WHIRLPOOL 60a47a08308d8a21615cfcc43501a5a4e891f10b0d1a31cd89f75be3a8f5d84b3c50adbc353aec8a51b35c590b03047bcc88327d2bf31a3299345afef9f26f84
 AUX chromium-depot-tools-r0.patch 488 SHA256 14d86770eaaead42e244007ebe5a94d188f8668c2598fa6042ada87a90cae671 SHA512 0ed853976c2e6f2cfe3bc4a7e2cb89bc5e32e9ed1bcc6b5fa8abac1d6a9384526a5204a3dc8cbcfc23b86bcd984e73ac772ca1741eea0884237fd6846c516623 WHIRLPOOL ebe1d5c170fb5ced7b8f4a8fe3e59eca145af54ef847b19eb38b5ced14798067033b43e9988b64a940bf43d3322d7b5979d4019fd378293b17db8bba9e23b84a
 AUX chromium-ffmpeg-r0.patch 1018 SHA256 9f0ff544b0873f9017b11b55128dd4c1be1825bcc55cc6e941aa60eb9eace988 SHA512 11e66153a904fe4ecca34129a2b7fb6fc3893647acf3bb740bea531e2d2c6f473a1e33940383fd954828a0ccca0e8480a4134a22c4a59b8ea846ab408feef2e4 WHIRLPOOL 8846d23bbdcc359fb6ea5fbacb44cbeef2e2ce1a6a25b0eb6d820b7b4afd75ebcfb9d886fcfe7d9bbe028da60f62f1d2afc9a7b3898092fa73cd2084382b8ecc
+AUX chromium-ffmpeg-r1.patch 1144 SHA256 dda795b5085261f8fa918f4f12ae8caeb61aba8e76b7adbeb054916bfdd736eb SHA512 ae1610fa068b5c430b8e2ab73b4884d4bba661227ba7d71e6f482c79ab7d2eb1ef1e5d9ef1f476d0a5d40ad3db81a3167b100f3625641ae400b0bd9c1414b268 WHIRLPOOL 06aab498225665a37a818dd86572bdf2eed1fb4b0994d67ca0191bbe03adf0e984e164dbc1e4abb6b8be2ef4b94be3eeb4e9f3f976b8d49c681ca556585be99e
 AUX chromium-gn-r0.patch 356 SHA256 a1145e83d775101b28dcdceb3ca076fc7e9a4b9f69a1a2236d0c97ad39afb3d3 SHA512 e91a59ed1865efb394614c13b7ecde10c72002b1daba5c40062b970529071419d461d07aab17cd60a5e06e382436384787b940edda5694c4b87b30423129eb63 WHIRLPOOL dec9ecd10253ccc6162557349c013db7a17f9c53f735f1ad8f5b3cbc1cd8e20e553a882ea111c6808be7864f258447b3f0fd2fc1cb46c89b9c593e4460527ef1
 AUX chromium-gn-r1.patch 380 SHA256 b1ca3f17959be4fb6c031563b1ee587b7e990166c41b9d5b9dce2f91bf01fe1c SHA512 9112a0b2688e0e1fdb27315873f1b829bfc0221320aed43ac92988b65c9ceb50f64af8e77c90c58efd670d3932c0b0e4555f06c25e35ed5a35de9f2316c0df00 WHIRLPOOL c967b0c8e9e2e5484a25903692dec33f3f2abb26ae4d814ccb3fe0aac205710f217627057c58ba21e92f466eb2e5917c8617e826390523ced633751a0655a4fc
 AUX chromium-gn-r2.patch 386 SHA256 f307300f5a124d9b262f850b2c44fb250c150c07a0d1a44ef01a25145bb1c05a SHA512 f59fcadd4310a90f9c92b58024a81ad3d195cb593a9d535bc5fbdf5eb9e78860fb35c8b5550ea0020510d8b15992899821494b6c943a27a7e2b6769b9517111f WHIRLPOOL b3712f7d2f6c32ad9056bd1fc96c91c0c993eb1363d1842f7a8e9e65833a2ea8df4f830f42f2d51c4e3caada6a7f3f4680328f22a97f8080e5b7f638526f4beb
@@ -40,22 +41,31 @@ DIST chromium-36.0.1985.32-testdata.tar.xz 111516116 SHA256 32787a9aa4522fb6f881
 DIST chromium-36.0.1985.32.tar.xz 205391144 SHA256 0446ab27fc538fe27aacd02f75e30f47ef66954a8f8c9755675d1cdfbe02b125 SHA512 af8cf8e635d0027bdd6db3014e5d6f8e72d6c232802bbd6e67d91b1736805616c5d7676685076cd81c7100f2bdc0d0d843bf62bda6a43d016d5078179fe2cf17 WHIRLPOOL 492b37a9b451299dafc33c3cdd40b9ed4a9d14bc771fcbc0b3c7bad0c6c69d0daa644134ffa4772c40b40f52a5f3f6d9e6e349b697c9efe9f7cd739da0f3e971
 DIST chromium-36.0.1985.49-testdata.tar.xz 111518564 SHA256 4585924236b6090f5f8d5d232167dd75934597739c727df2adac04f74c17c0a9 SHA512 c0c1f7ba7b624f76af9624f6659fa0c9a42a8df7d49fee4a308025b71ee98dd8b842f52ab7d1144299727e0d81541343aaa1a526366408b7490f383ec32060c9 WHIRLPOOL f932daf2730275fdb29b19d4b66c03d900823d6844b601b9d93511c53f231c3d412ac3eb3d275687afe2a1542d370ee4526ac533b2ed963e45edf9ec0c574662
 DIST chromium-36.0.1985.49.tar.xz 205473668 SHA256 f7e122ac79254a2344909b986a25879782029b72a702d1839326e010d94b1856 SHA512 fbb2c3d6089ff2cc869a657c6021067c1eccdbcf20c9288ae93255af70384f6dcb06e3b1cce7ce36f927841f55766cd55e0f186dc6175df2cb10ca8bd5fd0230 WHIRLPOOL 45189493c57e0bf8bece7f2cb9504c32cbf44b70c6c8dc399e4137e778ad1f7bde77afd5e58e942b9ddb59b38f0faf0d1a189f7fbbd0a941b179d8a2ada6db8c
-DIST chromium-37.0.2017.2-testdata.tar.xz 115562260 SHA256 359094979c37ef0dc3121cc535b3b80499e5879febb06b923668a9a9cd81eb71 SHA512 8468dca5326649be74c9a4b5690bea4c66b3d890aad2cdfbb1cc2d0addc08ff56775180c0dfd4422a0799acd65c9a7d22eba8fc7d1a13354b914ffbe9a6789df WHIRLPOOL a1029bfa8cb8f60cc40fb5106ed620eafcdcef6a9272e05cf95743a0e898d7837e2359f9179e8d9324b4139f48612486decb7aadc5bcdc90d475c0183216192e
-DIST chromium-37.0.2017.2.tar.xz 216289744 SHA256 35138d98e3ca73a7d4d840964adb16fbde5a5a33aca308162af6e2e94b91fa30 SHA512 f35a03a56e39d872bd0b560e1f9e9e5cd05d9f88a5097fc9d8d9d87bdd6755c6469b8118f50d44fa1508f9646597e343b49a906eca1a9aa79d72b2e8a32f55f2 WHIRLPOOL 1bea2f4f7f02cd5ff74e2ebdfb49a351751b93e5d167bed6b60663d5ac62fc0117d6f2ef63469750fb720b5b573a74bebe823746ee6324d2202bc9ae06403ff5
 DIST chromium-37.0.2024.2-lite.tar.xz 213204116 SHA256 00c7882138b28821b0a6afab526e196e75b0de5f8036465c92a5b48a237aa3f0 SHA512 8af7384c3cea95e16f92264e6adeb5a646336cc93211759fdb9621e3ff9aaa0e1296c4ac1cd73627e367493008bf3ec72a510cb6796c80a4b721de9bf945ed43 WHIRLPOOL 43a2005d444602f1da76f559e9a3efd372a46d3b9446e34311b658174eb3ba621b1838f09e3d9b2211bde5cbb9e67d01909d7a8b31187aa9c94461270c283e0b
+DIST chromium-37.0.2041.4-lite.tar.xz 213286632 SHA256 9d2a41fa67e1a8f9f51af9a6446d7ab9377f0bbb3300b47e2666b1bf432b4bbe SHA512 7800f496d071b0c159d8cee8fc28170d2e8e7f5cd4037ddfa968c6cd7ca5608c5a61c7388afb6599d62d0d2f6d55cd7c684e8c178b8335a3cb3fb67a6650df6a WHIRLPOOL 1597658c62c6f1f7b120f21dc4e27f766d202d2c7bfb1253427d2e28428b16fc56cadecf56447dc29af2a71b1791a0ff6fbf39f501b4a7158bafd0a0ac0d191e
 EBUILD chromium-35.0.1916.114-r1.ebuild 19982 SHA256 47db1785b1767cb4b0cfd8237d65f1d74d8438a5c6faf34223f58bad96cd4c0b SHA512 74f456a9d8a8648d43691a897f326328cbe6afe68f2413426b18b6652a43f273fa2f699c91b5fcbf31505bbc9289547e36ee71ddea57fb9dab0a6047ec2c8fd2 WHIRLPOOL ab203a3b0c7c642d133898b99eeb34be4c1057b73bb93c8d091e2e4e2a8ac8765edd788b42e0f8016fe96e03d741e413a731e683dd857bc168e9c3528dd8635d
 EBUILD chromium-35.0.1916.153.ebuild 19978 SHA256 fa459ba329519ed6595b9a2b5af59a6e757efd045fb2b35c3635f0cde7b198f9 SHA512 2003ccd16900d3c028ff668a24e78250ea3ea405478afbd9aaeb65cbcdf38b28734340eb64d621bd0b5e08c74e7b87762f10ca2b50958d7f76ab0571cec929b4 WHIRLPOOL 547457462646b07e38c1bd14c8b05b6192bb2eba97551de3a4251c767a726d953ec10aa4a90588645d0ecce9334be93c41c871f1b9ce4ce2d37844835cb5a168
 EBUILD chromium-36.0.1985.32.ebuild 20035 SHA256 cedca29f38fc50bba0723620938e56f5d1f234543a5225d7e0276d5f446f0ee5 SHA512 82faab83dec3dc59dafb19326cf24f662dfaf5585ffeb23cddefedebaa557418cc5d3adb06329693c397fa8cd6b62e737134f7cf82ce5fe02d455d8ed24e1e2d WHIRLPOOL f21f86d20ab00f5b40e18df7a29d4b15647f3c82ea046ab1dcb50d3442d2c59a0e1abeeeadc33c1cb3b26587fea30064e429a8b8bf46911bbab0fa76083a44af
 EBUILD chromium-36.0.1985.49.ebuild 20035 SHA256 4674237348092501f5d105e37f831f86813b0731afa292408dfd71f2c832e88f SHA512 8d96224b565ad4f884e292cb05839140a2c5c7a7380f6a42c2ee1e2be8f0e14a3fc0a06324223ad11e8aa849fa191cc4aebe3a22c3de5bc2a9b995fbeccad9e8 WHIRLPOOL 32a4529823285f1dbee2227847fc91548817d5053bce45377ce99ac81a285dabaebd5bd83218c0a3c24981704bb5aba0a9f735d1b0f92d95c8407d72c1ab124e
-EBUILD chromium-37.0.2017.2.ebuild 20110 SHA256 f0394de888033eef15fbc11113a1e23ff32efac569c1af5152bc96bf1fb0b3de SHA512 e1598add6fd43b0057f99700f51e473c0238cabff5832d2f77268e0eb235c6e3ab616c0c9d73736893b4b5a8564926e19d44a2b3477b21e2f42e04f7f30b6ffb WHIRLPOOL 096cf4d2d50398f944e315405c92172f13573fc23bd6a5380865ad4f421ac97dbfaeaec2e5c96703323fca06bda27a6e7518c10e1a7d06e48f5f7f22eb917385
 EBUILD chromium-37.0.2024.2.ebuild 17060 SHA256 5fe03cc7004516e38cebd3eb52de17ecb338ecca7f6e9aa18b94f39ebd15e12c SHA512 9cd5ec23a1717d950944af1cb9f6aeebbcb36cff5affc8eb1c668ffd2691694906a7d40040f3323735b24213d8704e999c9892bb9054c016b72210327818c63d WHIRLPOOL 90bdd5a1f7d370148a3fc246bafa90321bd73c27177b833e026873374329de162c2ab3949bf49aff346d07d04654d5186eda2a5ea298265eb0480d06eb1a2039
-MISC ChangeLog 107881 SHA256 c3bfc547c93d9e1741208f5d31870061243cad668a35d61f972e2a429ff3d432 SHA512 7a89372abfb8566428f86120c652884e08889327f4bcf313ac25ab17579da6e245f1ecdd34c9f1b8963ddc8852949989779b1a62c396c58234d313433139ee97 WHIRLPOOL b960ebf346bc145e812b3733ade373b1db7cc444097ac8bae5ce33d70c4f3d32b27ea23e8cad6b6180f52e1fa65abe8a2ded7112c219ea46c70221bcaf2b649e
+EBUILD chromium-37.0.2041.4.ebuild 17238 SHA256 2a3bb3e3b80a1e10f1cca0e70b31776478379021ff9a1acc8bb678bb65a5eebf SHA512 b766df857f91c93020f2a0495dafe864b413eaa38781a1b925bb50b843c6f543be87ec9d745e4b63a68d9ba35beb9c3be7c69f6082375ff6e5b340e1c9bcfd7c WHIRLPOOL 8b38db7993240b1270134394ecb00c790a9564a7dfcaea2ed41956f641fc167d9f37d0524d2e771f168f89aa70c95b8feccfa6122a7ea95f9c46564ae3d9eb8b
+MISC ChangeLog 108219 SHA256 fb5d5c025468cd691aff65d16f7326f9f7bc33a8e4499cc7ffecf1dd75d6ae17 SHA512 024665f8c0bf32d07ef0dc52e9e6b9e0b8f7e15b74d85e099105b43c109cae59d8672f3ebd6b64763d2228e819c876f84a11890cae371e84827e9188b41c93cd WHIRLPOOL 4731834d55e0c5de08249c2b42800bc03b9ed4cdb775f753e0619839f7aa65d8031250f805bc7d4358bba3403fc111f46edddaa5050a0ed20dd9106df1468671
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
-MISC metadata.xml 435 SHA256 248299749d87d01c12d9118cbf4c498af9d26304a55d94c4cbfe1fa50477d71b SHA512 fb922294d5c5d802faeba4380f2e2a12acef90c0febcf3e6e6e942eb85763ed548b5ae620e06d868426b1ab26221e1842ed903122a0dd75b24b6aeea328b2ea9 WHIRLPOOL 190f35d82e6d565fb672996d8fbaacf5e059827c34d3e827c2db5993203a466c28dbfea4a6cd692362b2b88e1fc85b7bec8d67bc709184cd7c8b70b1c41e7317
+MISC metadata.xml 518 SHA256 821944f32fcf203b2573c164aeaa52fbc69e5f651d366cdda66901633461f5ef SHA512 01d29c4ce93a8a624fc8926e7e72e8bf124b91ae6fdbf6e7179e9d6ddd6db33d73acde62541777118da1c9d197c83d6c615c247d785e76a8ab560f915abd08d5 WHIRLPOOL f9b21a0d032d1f78b6aeb78f759b9f126b1b1cc118a5edd3a08eefcb2d7b51ff406abb95323fe05b4c04468aca68dddd3d39ce7edfb9b352abc1bc3890d7e1ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlOY8bsACgkQC77qH+pIQ6QCZwEAr0y4y6l2Jt+oGMIWr6r8+OQE
-cso7IlezFPeKSMKAPLEA/jFV7yyTPIQ9KaWdVL+eEAwgX1tHx9WN3gnpcYpcjbeL
-=G8Tu
+iQIcBAEBCAAGBQJTmUpjAAoJEE8aJVXqcZkdIHoQANQ1n6MjkFAnbdw6DDzzeBqE
+isN7mD/Ss9QHw6YyHpfGWtRYp+/i3D2L9rPlhbJZAyMx0aJcrTcMPvFSCQIqbpm+
+nElfKNhNxv/CeUjStkUaTqDWAlzrfAaFrnFqz1S4qQwavGLcUdzCDnNSDsDo+Fqp
+ZDYqP0F8gFmzYXTXkVfWJuOWAWKW+Rwn3Mehh3zz5Y/G9IBS/COszvrCwjT0sMot
+wc16aXF1bWVywxOezJ/J9PzHdKmqwiPTXtFnyfHj1pHtWh9YC0u3SGIyr1QpY92o
+HQ3vrsA04p2K1QmJF8QSeAIFc517SPaplFQCgEEjPyWrVsK3lXmoBoxNY+5NyPdo
+zjXqTzCB7Nj/80y68XA+nd9E8cuBNJIRRAYm994ggneSXgikxBGx5bjHslzxNuSH
+YX7CCXdJNfTYxpqtRks2RskiBRVxK/YSyAOctjFtSPYiqijo4iTqRuYjzogawDnd
+RYj4lVHRlmfnbK+zc2kpqhADrsAre6F5J2Qnj72B+oGRSuko2r7Oo9OK686pAP09
+IcU4wCmcZwvUnU5GLjwDK+BmCgEyx5ndUX/4E1fH32CIWlNad2VbPVeylp75f1Vj
+JBB81b839QBzRmM/Wvzxy+tNobImjVp1tgm15rGXKfeKKJ7nO2ezZpgynk4uGXCj
+Vs18k4WfkG8ocfpXWSwu
+=+TWa
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-37.0.2017.2.ebuild b/www-client/chromium/chromium-37.0.2041.4.ebuild
index fbabf3906428..58cb629ad8f0 100644
--- a/www-client/chromium/chromium-37.0.2017.2.ebuild
+++ b/www-client/chromium/chromium-37.0.2041.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2017.2.ebuild,v 1.1 2014/05/30 07:21:20 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2041.4.ebuild,v 1.1 2014/06/12 06:36:11 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -14,13 +14,12 @@ inherit chromium eutils flag-o-matic multilib multiprocessing pax-utils \
 
 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 )"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux +tcmalloc"
+IUSE="bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -81,10 +80,7 @@ DEPEND="${RDEPEND}
 	sys-apps/hwids
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
-	virtual/pkgconfig
-	test? (
-		dev-libs/openssl:0
-	)"
+	virtual/pkgconfig"
 # For nvidia-drivers blocker, see bug #413637 .
 RDEPEND+="
 	!=www-client/chromium-9999
@@ -97,11 +93,9 @@ RDEPEND+="
 # with python_check_deps.
 DEPEND+=" $(python_gen_any_dep '
 	dev-python/simplejson[${PYTHON_USEDEP}]
-	test? ( dev-python/pyftpdlib[${PYTHON_USEDEP}] )
 ')"
 python_check_deps() {
-	has_version "dev-python/simplejson[${PYTHON_USEDEP}]" && \
-		{ ! use test || has_version "dev-python/pyftpdlib[${PYTHON_USEDEP}]"; }
+	has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
 }
 
 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
@@ -161,7 +155,8 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
-	epatch "${FILESDIR}/${PN}-system-harfbuzz-r0.patch"
+	epatch "${FILESDIR}/${PN}-angle-r0.patch"
+	epatch "${FILESDIR}/${PN}-ffmpeg-r1.patch"
 
 	epatch_user
 
@@ -429,11 +424,17 @@ src_configure() {
 	export TMPDIR="${WORKDIR}/temp"
 	mkdir -m 755 "${TMPDIR}" || die
 
+	local build_ffmpeg_args=""
+	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+		build_ffmpeg_args+=" --disable-asm"
+	fi
+
 	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
 	einfo "Configuring bundled ffmpeg..."
 	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py --config-only linux ${ffmpeg_target_arch} || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} -- ${build_ffmpeg_args} || die
 	chromium/scripts/copy_config.sh || die
+	chromium/scripts/generate_gyp.py || die
 	popd > /dev/null || die
 
 	einfo "Configuring Chromium..."
@@ -459,17 +460,7 @@ eninja() {
 }
 
 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
 
 	# Build mksnapshot and pax-mark it.
 	eninja -C out/Release mksnapshot || die
@@ -480,91 +471,6 @@ src_compile() {
 	eninja -C out/Release ${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}" --test-launcher-bot-mode "--gtest_filter=-$*"
-		einfo "$@"
-		"$@"
-		local st=$?
-		(( st )) && eerror "${cmd} failed"
-		(( exitstatus |= st ))
-	}
-
-	local excluded_base_unittests=(
-		"OutOfMemoryDeathTest.ViaSharedLibraries" # bug #497512
-	)
-	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
-		"SpdyFramerTests/SpdyFramerTest.CreatePushPromiseCompressed/2" # bug #478168
-		"SpdyFramerTests/SpdyFramerTest.CreateContinuationCompressed/2" # see above
-		"HostResolverImplTest.BypassCache" # bug #498304
-		"HostResolverImplTest.FlushCacheOnIPAddressChange" # bug #481812
-		"HostResolverImplTest.ResolveFromCache" # see above
-		"ProxyResolverV8TracingTest.*" # see above
-		"SSLClientSocketTest.ConnectMismatched" # see above
-		"UDPSocketTest.*" # see above
-		"*EndToEndTest*" # see above
-		"Version/QuicHttpStreamTest.Priority/0" # bug #503010
-		"Version/QuicHttpStreamTest.DestroyedEarly/0" # see above
-	)
-	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
-
-	runtest out/Release/printing_unittests
-	runtest out/Release/sql_unittests
-
-	return ${exitstatus}
 }
 
 src_install() {
diff --git a/www-client/chromium/files/chromium-ffmpeg-r1.patch b/www-client/chromium/files/chromium-ffmpeg-r1.patch
new file mode 100644
index 000000000000..ed037ddb6dc1
--- /dev/null
+++ b/www-client/chromium/files/chromium-ffmpeg-r1.patch
@@ -0,0 +1,29 @@
+--- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig	2014-06-11 10:13:47.246416916 +0000
++++ third_party/ffmpeg/chromium/scripts/build_ffmpeg.py	2014-06-11 10:19:55.333739033 +0000
+@@ -170,12 +170,13 @@
+                     'is not necessary for generate_gyp.py')
+   options, args = parser.parse_args(argv)
+ 
+-  if len(args) != 2:
++  if len(args) < 2:
+     parser.print_help()
+     return 1
+ 
+   target_os = args[0]
+   target_arch = args[1]
++  configure_args = args[2:]
+ 
+   if target_os not in ('linux', 'linux-noasm', 'win', 'win-vs2013', 'mac'):
+     parser.print_help()
+@@ -429,9 +430,9 @@
+       BuildFFmpeg, target_os, target_arch, host_os, host_arch, parallel_jobs,
+       options.config_only)
+   do_build_ffmpeg(
+-      'Chromium', configure_flags['Common'] + configure_flags['Chromium'])
++      'Chromium', configure_flags['Common'] + configure_flags['Chromium'] + configure_args)
+   do_build_ffmpeg(
+-      'Chrome', configure_flags['Common'] + configure_flags['Chrome'])
++      'Chrome', configure_flags['Common'] + configure_flags['Chrome'] + configure_args)
+ 
+   if target_os == 'linux':
+     do_build_ffmpeg('ChromiumOS',
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index f70f1e129129..f04266601ab6 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -5,6 +5,7 @@
 	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
 	<use>
 		<flag name="bindist">Disable patent-encumbered HTML5 video codecs</flag>
+		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
 		<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc.</flag>
 	</use>
 </pkgmetadata>