Drop obsolete patches.

Package-Manager: portage-2.2.3/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

16 files changed, 17 insertions, 476 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 9d973aeb82e1..629cc753aee2 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,18 @@
 # 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.945 2013/09/12 16:41:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.946 2013/09/13 00:27:24 floppym Exp $
+
+  13 Sep 2013; Mike Gilbert <floppym@gentoo.org>
+  -files/chromium-bug471198.patch, -files/chromium-nss-3.15.patch,
+  -files/chromium-pnacl-r0.patch, -files/chromium-smhasher-r0.patch,
+  -files/chromium-system-ffmpeg-r4.patch,
+  -files/chromium-system-ffmpeg-r5.patch,
+  -files/chromium-system-ffmpeg-r7.patch,
+  -files/chromium-system-harfbuzz-r0.patch, -files/chromium-system-icu-r0.patch,
+  -files/chromium-system-libusb-r0.patch,
+  -files/chromium-system-libvpx-r0.patch, -files/chromium-system-v8-r0.patch,
+  -files/chromium-system-v8-r1.patch, -files/chromium-system-zlib-r0.patch:
+  Drop obsolete patches.
 
 *chromium-30.0.1599.28 (12 Sep 2013)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a2a9c048daf7..f20056c00f9d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,25 +2,11 @@
 Hash: SHA256
 
 AUX chromium-browser.xml 407 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca WHIRLPOOL be37cd2e7d02c510e84c484f32ab6ab2e1f38a2a03c0cdbc9b6b485d64feaf79944d8ce097f0838ae9bc71c42401b633350b847ad316b8e23cf5614e3913e7ec
-AUX chromium-bug471198.patch 1774 SHA256 e1bce3b82147702faf8f0f5bcfadcccb831247b27904b89d9b17403004839f1c SHA512 2785752ab74d59b3248dc3ec7e49b307de71d357b339364261a254a938f8560074bb5d21d51fb28c3b0e85d037eccd5a5f9f84af895e7211eea5b5541e22773a WHIRLPOOL ca5741478ad245cba10fa75168de07a656e73921fb9474ef04ff645f12ea7da0f8bcc297fb6f1b39e257ea5d51626fc1d331f9b5980afbe9d68918698beb61b8
 AUX chromium-gpsd-r0.patch 592 SHA256 9af056bd99e5176af6f5d8acb7d54241731b64fb3fa517fe1a698b35e21692d1 SHA512 72a668dbd5b343a34a1938c2a6f1147d14a149b9a4a981487e9ca8fa6d912791a6c11e29178c3abe1e691c0e1bf6e435a390eb89aa63bda72d592ab3b0a55b1c WHIRLPOOL 7f04535d674498e2f2d572b6feb5ee4a183ffcf9671f308947e5c4a7370399bc8388d53705f7ca23dd6038bb12c81af0fe0b8b1f3cb7d90465b255e4d3c8b7d9
 AUX chromium-launcher-r2.sh 940 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e SHA512 64ec5e0a4f524bd6164fe33a022419d6cf54822754b172e85ea003c47f9bfe6ed996353af707a4e16369a68d2f2e7d51f186397a48da42f13eb3dccb7e4ae4f8 WHIRLPOOL 4a2284957bb462ded600f14b1aaa7e29389181cda149b9090cb7b6fe8303dc5692519da6281769925b2122578ba2ea0ef8a1563077a62d7cdf7ca243c165805a
 AUX chromium-launcher-r3.sh 932 SHA256 2025eb484eb1a86da9aff3946847ffc47162080b7a7700102b1608235b87ba3e SHA512 92ce9e24e8862b4a437fb1eb97613cbb3f596650efd6bf4a46ded92d99d6c7549f4e184db48d1695ef4390145665a3acc4714427292ba19414d3d2e1f9ba0e34 WHIRLPOOL e0735b33e003dca28356a83194ca949f7799a513b24f44efbf60af877a67fd14d3ad7a860e5ba5b1f533a5a891001ac173465f664a4ee398b3c0b71e24f84370
-AUX chromium-nss-3.15.patch 675 SHA256 a5ca532d213cc6f9ad19341445309ad4e4aec9530f4309536fb42ee97deca5a6 SHA512 865cc692cf8adf6897f42e0093dd9eb98d6d2123bdb22afbc37e3f3d0210c826f3204ec84b79d80d7c00ead0f95317906c63fe106fd468dccaf910557b5d593a WHIRLPOOL f72b409ec78d2be41f62afae2f8f17c7e7745202058091f2c0192477c65ba652ea6246d32853364b5928ffafffffc9232a17cdf5e7d16c8c94e8a8fe21c72c15
-AUX chromium-pnacl-r0.patch 710 SHA256 9875ffcc0e9ae9420876ac66b130b1b017d445a031d43cbe0119793e1fb3781c SHA512 1446bd48f61ac11764232be959d5eb507d6bb42b66a77e10ddd41d3ea884e655e412e4e12fba06c716a1cae779ad030a3b347d1e4552be12e4722a09368eee55 WHIRLPOOL 2603f431b6bc647ccb808a6ea3e80702ba3cca8af346b10647f7457968c1bd1e0a84592e531fec31f06156f7113d34cf59ec16817f49051b3cd109f0fa4ff979
-AUX chromium-smhasher-r0.patch 741 SHA256 dece763d41b41bb6876b8eba0346612a7541918b4cf3f0c00507d79f3f26fc22 SHA512 6979c489334b338c1956e78f1adabb78a84f726ac449eabbd54c79666fc38e98345bee6e73f697d976089ce8de16ab2c13d77804b115dee18d2eba4c209f9433 WHIRLPOOL 846f0da629d09957c733faa3f6e25ea5e23b845d087c379d2e1827463152ec3d8794ccceacc406263f2dae18d67113d22e7d6e66a1e2bd1a1125abb0671ac277
-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-r7.patch 3505 SHA256 4093f87f16f8dc4dd846a88d5b6faf91bed2542308c6a11fef93400c94dbf192 SHA512 333a7d5faac8172e22beacda871a5d8cb9fe4cefbebeb173d1da28d97dc2b98912378a7b6f3972581065f63957facb64b1fc29b4f973421878859ef24f3a96dd WHIRLPOOL 0bfb31381bac7015778ed30efcb807993d0bf2e77f6f6b72795e9d0a7c4157d577246c5483c7584733eee789762bf878ba5ecfd68a6564a366a4a8a9216cc185
-AUX chromium-system-harfbuzz-r0.patch 1522 SHA256 2bc4cf17adac9864f4e832e57247984f28fce171d3699c0fc2c3596d1ab20386 SHA512 601951322f0f2467a6e6286196f4d97bf15097638f464329c78c982fafac82096ee9207ed6a678dbffecf255736b1083994736297aa8f65d988029e698333bbb WHIRLPOOL 272f6e3d76f63e9b25fc3c59cf3842a6c450919a31274235ef1d7cda32525e9b3e523389bfa5d1ee9d93c93781e35356f05c4dd7019d3143d61fb79ff2462724
-AUX chromium-system-icu-r0.patch 933 SHA256 f65321f825c23a0a4ce7ce0fcd7cb7a569493900df757bf51adbc054d4be7df8 SHA512 c7268a6806a69fe926b41df49a3c7a5abe30a89a4c8bf0ef886f3f7cb64cf2122e5acfd2b0d4d733548b57a334e37f36697af3c79803d66323b29dad48e874b7 WHIRLPOOL 3242dcc2e55f7f31802a2a1f1e56afd62e1adeb74eca4c048319f8b221f17ed13b41b718946ccf2b0b642719af174d1f7b99959fa329d33ea16d0b46e9c1e45a
-AUX chromium-system-libusb-r0.patch 436 SHA256 4c369f726b9b0712d26af58807904eb8e08c23d8acf1818c29b865011a60c005 SHA512 11fa38ceac514b58b3bbcdc7701a20d08259a0c19dcd32937c231ec5e7328ce415e6f58115cfd24f11113df3128b9504b62ad99360f904b7c51e6f2868eeef9b WHIRLPOOL 3fb925d238cd9e5efd5531de386529b0487386819587c8b7f83fd991377bf1c71b43a4e2177239a3aa15e3968b95a95ccf689f7855a719eeae8255f61fe13ae9
-AUX chromium-system-libvpx-r0.patch 369 SHA256 0bcee4260b1650f290524594e4ea623db18dff52bbec72f1ee432bf176d4a1fd SHA512 bf6cb5e44ef6d526e9be02fcaa89d8612e406e7c068a12e0d8435227ba91f01ea87f19f72ef3157dc4a4acee46cd9a528189a97badb7a0b0c9a008e2905d97c7 WHIRLPOOL 21029ad592edcfd75afdf3600ba44ea6ddd9925af270e84d255e81fe5b1f778aadcf82369696c91d0221bbf85a72ecebd9d90d3c5c1706990f44d93620d90ca9
 AUX chromium-system-ply-r0.patch 560 SHA256 a1d9a17d91edeea93a8745a677b8e79e36ea10569ab32e09b86e666262fb5ca6 SHA512 b54517042abe3f8de8a5b4d3fdf4c5da9ef94538d150b5c92349db43f221720be09a9e70818746d797cfcfb203c1129eea8e0eef026ce9c5fab8b74f9aa70b31 WHIRLPOOL 9feb572f887b6e819e2b97e97a0e6f864c3eea05b2cd185b972098dab997b59ea35ce1e6cf15e72cfb2874cb003f486ab369cb1cc3be665419f0a4cd2d88a5d0
 AUX chromium-system-ply-r1.patch 531 SHA256 b2269a9878121a1c6160b27412d13c534f2f6d15bc1bc23fab4fda2eff6edd32 SHA512 1fb1516959b3800e1f22416849aabca078a0350cda32cf7648f15edb8d1396599cb466801211b28ad6701f693ba881b9032a576da0e9de806499c55f3d901182 WHIRLPOOL ac1003b6ba64d2eb007e22ea18b3841b14d76bb2219be91ce43702ad42fb4a99776807bd1b89c2de34715c331af21e9b1d59c8a57d0c2b1258b2001099f0566c
-AUX chromium-system-v8-r0.patch 397 SHA256 9b69099db82e3d4def410f887eb0b0b9006f4e68b59b8eb72d3b33c79a42da7c SHA512 83d44848d637d545aa851cdf2df81b24964d6febbde4ab28ff600f82ebd0c60a66059fc87a96bb1464363d2e2f098fe151ca3a9911f9ca2f3c11ba36bbf7e653 WHIRLPOOL 8fc87b7c1a0f8aca41ee17bef0d415d0f73619a2191807f5f0ce7340052ccb2fc0e34af033285fe62eb41b895b556b241f8c1182fa5daf68c6cc0d658a05af0f
-AUX chromium-system-v8-r1.patch 407 SHA256 7cd5c51e289a79818d3b8d674a3036bae78489f8cd8087650701035e802e35f7 SHA512 4e7034fff81c3918d821469d60f975f063a2a9d06bb8a704ef2875c5046ca952bb197d7b638048d1ef6bbf6a31921b3f219a78e6e52844bde4c76734a157b890 WHIRLPOOL 040566f12a21d16db35fe6cf0a40c2641302d24c922f080db934020dc6c5457d98c156534c34bbf350aac0c764ccddae46339bae3e0636a7c8d3a88c1d37655c
-AUX chromium-system-zlib-r0.patch 707 SHA256 246201ec880d7f0288fe0179cd13b2feab807def3deb500a3ef96ce66a1ff907 SHA512 35db337e5cf7069f1fed63aee39572d90b493b35527f00029d1bcb7a75e23ec840a9cdc974f6465b95faf4a937d0963cc99c200df06919d3935ee2affff69eda WHIRLPOOL a7a075977f3f2a9e5348fe1d92b57e71e93737803fe04c1034981c48f2aa945b07c2ca87c92143a4707b1ebd7729f36d4ded2e38284a148f40cfa748a69d75cf
 AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a43154e97e812fcdd1 SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 WHIRLPOOL 2e51e864134426668cc73fc5081c35288677d8ce855b07dfbd3413397f9c43148a6d6096a9b7a617511388f87623a3ce7f3387103202db53876a74bccb9dbe6c
 AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d071384ed324 SHA512 ea858464ee8732536633259ed3d11990822e8b8493c07b83218856a127320ba21b9cfc184f7e7a899739bc5f938fbca25224e559fb7db8558cb86fccc743a685 WHIRLPOOL 72a5a9af7955e653151090b555c6a67a261ff807871fdda16d7c3fabf4b52449ac9caae466ba51a17d2efed74a68adc32687599ea4287cc033e75f787d874b55
 DIST chromium-29.0.1547.57-lite.tar.xz 124488252 SHA256 30c949120f7fb2e1d020b4a9d755baf139cebc9a1dbcc32cb06db2314c917805 SHA512 5b697d106013132cf12daf7f8c636637ca2b42ba3fd7bd6e1cf7bc29958e9009ae66b1232f19021f6e6314004a75061d18c752150399a5c274e63291c8e5af27 WHIRLPOOL e8c62ea0816032786f875b909f18f20f884fe25ac94a7e99d11b4e28ad30431754a56918baac32da063fbc3c6dcdb700154882bec77fa870afc1b5bf50b0b6f8
@@ -42,13 +28,13 @@ EBUILD chromium-30.0.1599.28.ebuild 17494 SHA256 92f2780e46d19e6f305fc91e79bd327
 EBUILD chromium-31.0.1612.0.ebuild 17524 SHA256 7fe843618b794ab18af09c61acbbf36d489e85cbb7fb4b067c9471e53c00e541 SHA512 4154d0da00e939a9cc98253d6079f9c1122480ff7f3b929566205f400c19b9595bcc6205f438c6f1a2ef272e623a41e177615d64df71d2e0e490e0bc5244191b WHIRLPOOL 906e8760e3ef3a387463a6042617784ca209df80ea0e69b4b7d97f1afb5c2692b8d889a07314dfd2e91d4bdcf0a62a4ca63275ab58a1605617f75f341c17d75f
 EBUILD chromium-31.0.1622.0.ebuild 17550 SHA256 d2a8f20e23ed6779fedfa83bf463ba0d0e6d607b111cd61e0eac938d0246f751 SHA512 61d8bb8e59691755ea4b32527c2743c7b5d0066dd47f77534347657028592143154ae9dd8b1fa50f682e8d72c33216954cb50343c92b69e8e8c978b2fcb12de2 WHIRLPOOL 9687596c97da05bcc49a44e311292534fba3e0abf486fbfcd40a9f7cf93405c852e868a0ecccaa23dc1dcbbb7e123ab19bd3664c7aeda6eb4835aafb8faf2160
 EBUILD chromium-9999-r1.ebuild 19610 SHA256 89d5441c4aa2370c2bcaefec7e8e9f25b69c3c8ea7f45f2fe09a6f08787c71f5 SHA512 b0b728fb4146c108ab8cf8d0f584f1f7802766db78f1dae2165ff3c63528a7a657fe955dd81deaaad6603f1409f62d6862adc73a15cd8ae6026d97d30aad2f97 WHIRLPOOL fb648c058e6294b12e01d3033c7da4f6d47fc3f08388db1274e514e65ef848c528f1d423964bf555d484304149c384d396940a37901f931c49e18c0704679e3b
-MISC ChangeLog 81635 SHA256 99271a04ca803137e0f1e7ca1b2b2fc14d1806f2ead76c8d19fc0159b58b46aa SHA512 fdc16f9e2ff19198979ff694edb4d50413cbf775233da883d317ba2395597b349b35b950b6dff63e287936d4f6d9ef3682c1182c033171129f45cee820dd40c9 WHIRLPOOL 047e8c783aced510676e11df1edf68b9821a37f9a08a416ea59af666bb29695487b90f15ae24a38a6c282dbf99ab7751e6f3e4621946c2559ecf0c30fff1d288
+MISC ChangeLog 82249 SHA256 dfe3663f392c8049dc9e9391ea9b7eed17aae2329476acc38549ae18446c2923 SHA512 810b88835efafb8e5d18b6475d5b81907c70a0b74176358fa59c88dff0f956d2ebe8ec059293bfcf8d40b36eecd63dc260daeb6fe37b4ac438324b81a1dc88c5 WHIRLPOOL c4c4faf5b13f7a577b02caf26e1f2aa5f9fcacfe33ee0fd39a38d2044192d3191dc0453fc4eec871e8b0caf2c027e9f4db3ed61224a0bb1eb24d0b2cb3187bcb
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iF4EAREIAAYFAlIx7qsACgkQC77qH+pIQ6R4yQEAsDSbUQpcuCEpaCGLh8OF6peP
-eOXb+V2p13YMPkYGifgA/Ai9YHfS91p0dHhfd3HJttHlrv0pWPUIocZSnruw7P4y
-=yuEs
+iF4EAREIAAYFAlIyW+0ACgkQC77qH+pIQ6SI1AD7BKUoP0g4QnpFrq778anUFZNd
+5BGLSZWhkCBCsk2dj0oA/RlQ8CK3XCwEmhxRT8KuyChrzdiGEAWPsL/MOmn/O6nO
+=1vC+
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/files/chromium-bug471198.patch b/www-client/chromium/files/chromium-bug471198.patch
deleted file mode 100644
index e55f55e663e2..000000000000
--- a/www-client/chromium/files/chromium-bug471198.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- trunk/src/sandbox/linux/services/broker_process.cc	2013/07/09 21:47:01	210650
-+++ trunk/src/sandbox/linux/services/broker_process.cc	2013/07/09 21:47:27	210651
-@@ -53,7 +53,7 @@
- // async signal safe if |file_to_open| is NULL.
- // TODO(jln): assert signal safety.
- bool GetFileNameInWhitelist(const std::vector<std::string>& allowed_file_names,
--                            const std::string& requested_filename,
-+                            const char* requested_filename,
-                             const char** file_to_open) {
-   if (file_to_open && *file_to_open) {
-     // Make sure that callers never pass a non-empty string. In case callers
-@@ -62,13 +62,17 @@
-     RAW_LOG(FATAL, "*file_to_open should be NULL");
-     return false;
-   }
-+
-+  // Look for |requested_filename| in |allowed_file_names|.
-+  // We don't use ::find() because it takes a std::string and
-+  // the conversion allocates memory.
-   std::vector<std::string>::const_iterator it;
--  it = std::find(allowed_file_names.begin(), allowed_file_names.end(),
--                 requested_filename);
--  if (it < allowed_file_names.end()) {  // requested_filename was found?
--    if (file_to_open)
--      *file_to_open = it->c_str();
--    return true;
-+  for (it = allowed_file_names.begin(); it != allowed_file_names.end(); it++) {
-+    if (strcmp(requested_filename, it->c_str()) == 0) {
-+      if (file_to_open)
-+        *file_to_open = it->c_str();
-+      return true;
-+    }
-   }
-   return false;
- }
-@@ -393,6 +397,7 @@
-   const char* file_to_access = NULL;
-   const bool safe_to_access_file = GetFileNameIfAllowedToAccess(
-       requested_filename.c_str(), mode, &file_to_access);
-+
-   if (safe_to_access_file) {
-     CHECK(file_to_access);
-     int access_ret = access(file_to_access, mode);
diff --git a/www-client/chromium/files/chromium-nss-3.15.patch b/www-client/chromium/files/chromium-nss-3.15.patch
deleted file mode 100644
index 2a641478e129..000000000000
--- a/www-client/chromium/files/chromium-nss-3.15.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/net/third_party/nss/ssl/bodge/secitem_array.c
-+++ b/net/third_party/nss/ssl/bodge/secitem_array.c
-@@ -6,6 +6,7 @@
-  * Support routines for SECItemArray data structure.
-  */
- 
-+#include "nssutil.h"
- #include "seccomon.h"
- #include "secitem.h"
- #include "secerr.h"
-@@ -13,10 +14,15 @@
- 
-+#define NSSUTIL_VERSION_NUM \
-+    (NSSUTIL_VMAJOR * 10000 + NSSUTIL_VMINOR * 100 + NSSUTIL_VPATCH)
-+#if NSSUTIL_VERSION_NUM < 31500
-+// Added in NSS 3.15.
- typedef struct SECItemArrayStr SECItemArray;
- 
- struct SECItemArrayStr {
-     SECItem *items;
-     unsigned int len;
- };
-+#endif
- 
- SECItemArray *
- SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len)
diff --git a/www-client/chromium/files/chromium-pnacl-r0.patch b/www-client/chromium/files/chromium-pnacl-r0.patch
deleted file mode 100644
index 8ec0151d24b9..000000000000
--- a/www-client/chromium/files/chromium-pnacl-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp.orig	2013-03-27 19:49:17.000000000 +0100
-+++ ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp	2013-03-27 19:49:59.000000000 +0100
-@@ -13,7 +13,7 @@
-     'target_name': 'pnacl_support_extension',
-     'type': 'none',
-     'conditions': [
--      ['disable_nacl==0 and disable_nacl_untrusted==0', {
-+      ['disable_nacl==0 and disable_pnacl==0 and disable_nacl_untrusted==0', {
-         'dependencies': [
-           '../../../../../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim',
-           '../../../../../native_client/tools.gyp:prep_toolchain',
diff --git a/www-client/chromium/files/chromium-smhasher-r0.patch b/www-client/chromium/files/chromium-smhasher-r0.patch
deleted file mode 100644
index 06dcd4e8ed13..000000000000
--- a/www-client/chromium/files/chromium-smhasher-r0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- third_party/smhasher/src/City.cpp.orig	2013-03-13 23:48:29.232407565 +0000
-+++ third_party/smhasher/src/City.cpp	2013-03-13 23:49:24.092714006 +0000
-@@ -351,7 +351,7 @@
-   }
- }
- 
--#ifdef __SSE4_2__
-+#if defined(__SSE4_2__) && defined(__x86_64__)
- #include <nmmintrin.h>
- 
- // Requires len >= 240.
---- third_party/smhasher/src/City.h.orig	2013-03-13 23:49:50.122859412 +0000
-+++ third_party/smhasher/src/City.h	2013-03-13 23:50:18.043015349 +0000
-@@ -90,7 +90,7 @@
- 
- // Conditionally include declarations for versions of City that require SSE4.2
- // instructions to be available.
--#ifdef __SSE4_2__
-+#if defined(__SSE4_2__) && defined(__x86_64__)
- 
- // Hash function for a byte array.
- uint128 CityHashCrc128(const char *s, size_t len);
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r4.patch b/www-client/chromium/files/chromium-system-ffmpeg-r4.patch
deleted file mode 100644
index 9ea68f185681..000000000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r4.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
-index 17241b9..8a92312 100644
---- 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 {
- 
-diff --git a/media/media.gyp b/media/media.gyp
-index df217d2..fde3830 100644
---- 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
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r5.patch b/www-client/chromium/files/chromium-system-ffmpeg-r5.patch
deleted file mode 100644
index be625ad67e9a..000000000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r5.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
-index 17241b9..8a92312 100644
---- 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 {
- 
-diff --git a/media/media.gyp b/media/media.gyp
-index df217d2..fde3830 100644
---- 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
---- a/media/media.gyp.orig	2013-05-09 18:02:50.958682676 +0000
-+++ b/media/media.gyp	2013-05-09 18:03:45.009023680 +0000
-@@ -530,6 +530,12 @@
-             '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
-                 '--code "#define __STDC_CONSTANT_MACROS\n'
-                 '#include <libavcodec/avcodec.h>\n'
-+                'int test() { return AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL; }" '
-+                '--on-failure -DCHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL=1)',
-+
-+            '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
-+                '--code "#define __STDC_CONSTANT_MACROS\n'
-+                '#include <libavcodec/avcodec.h>\n'
-                 'int test() { struct AVFrame frame;\n'
-                 'return av_frame_get_channels(&frame); }" '
-                 '--on-failure -DCHROMIUM_NO_AVFRAME_CHANNELS=1)',
---- 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
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r7.patch b/www-client/chromium/files/chromium-system-ffmpeg-r7.patch
deleted file mode 100644
index f3c2b96d1bb1..000000000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r7.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- 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/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
-@@ -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
diff --git a/www-client/chromium/files/chromium-system-harfbuzz-r0.patch b/www-client/chromium/files/chromium-system-harfbuzz-r0.patch
deleted file mode 100644
index 769b67313cfe..000000000000
--- a/www-client/chromium/files/chromium-system-harfbuzz-r0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: build/linux/unbundle/harfbuzz.gyp
-diff --git a/build/linux/unbundle/harfbuzz.gyp b/build/linux/unbundle/harfbuzz.gyp
-index 456dd384df2d5c57d9857cfb775d46ef87add2bc..93b2a69c12d7b7524fa0c2aa67b52136b779196d 100644
---- a/build/linux/unbundle/harfbuzz.gyp
-+++ b/build/linux/unbundle/harfbuzz.gyp
-@@ -3,24 +3,34 @@
- # found in the LICENSE file.
- 
- {
-+  'variables': {
-+    # Check for presence of harfbuzz-icu library, use it if present.
-+    'harfbuzz_libraries':
-+        '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
-+        '--code "int main() { return 0; }" '
-+        '--run-linker '
-+        '--on-success "harfbuzz harfbuzz-icu" '
-+        '--on-failure "harfbuzz" '
-+        '-- -lharfbuzz-icu)',
-+  },
-   'targets': [
-     {
-       'target_name': 'harfbuzz-ng',
-       'type': 'none',
-       'cflags': [
--        '<!@(pkg-config --cflags harfbuzz)',
-+        '<!@(pkg-config --cflags <(harfbuzz_libraries))',
-       ],
-       'direct_dependent_settings': {
-         'cflags': [
--          '<!@(pkg-config --cflags harfbuzz)',
-+          '<!@(pkg-config --cflags <(harfbuzz_libraries))',
-         ],
-       },
-       'link_settings': {
-         'ldflags': [
--          '<!@(pkg-config --libs-only-L --libs-only-other harfbuzz)',
-+          '<!@(pkg-config --libs-only-L --libs-only-other <(harfbuzz_libraries))',
-         ],
-         'libraries': [
--          '<!@(pkg-config --libs-only-l harfbuzz)',
-+          '<!@(pkg-config --libs-only-l <(harfbuzz_libraries))',
-         ],
-       },
-     },
diff --git a/www-client/chromium/files/chromium-system-icu-r0.patch b/www-client/chromium/files/chromium-system-icu-r0.patch
deleted file mode 100644
index 9761cc7f39c8..000000000000
--- a/www-client/chromium/files/chromium-system-icu-r0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- build/linux/unbundle/icu.gyp.orig	2013-07-30 23:57:09.894162340 +0000
-+++ build/linux/unbundle/icu.gyp	2013-07-30 23:57:30.604293370 +0000
-@@ -33,7 +33,7 @@
-       'dependencies': ['system_icu'],
-       'export_dependent_settings': ['system_icu'],
-       'variables': {
--        'headers_root_path': 'public/i18n',
-+        'headers_root_path': 'source/i18n',
-         'header_filenames': [
-           # This list can easily be updated using the command below:
-           # find third_party/icu/source/i18n/unicode -iname '*.h' \
-@@ -119,7 +119,7 @@
-       'dependencies': ['system_icu'],
-       'export_dependent_settings': ['system_icu'],
-       'variables': {
--        'headers_root_path': 'public/common',
-+        'headers_root_path': 'source/common',
-         'header_filenames': [
-           # This list can easily be updated using the command below:
-           # find third_party/icu/source/common/unicode -iname '*.h' \
diff --git a/www-client/chromium/files/chromium-system-libusb-r0.patch b/www-client/chromium/files/chromium-system-libusb-r0.patch
deleted file mode 100644
index e6a97df6b139..000000000000
--- a/www-client/chromium/files/chromium-system-libusb-r0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- chrome/chrome.gyp.orig	2013-07-24 21:16:37.701455700 +0000
-+++ chrome/chrome.gyp	2013-07-24 21:17:07.871649032 +0000
-@@ -216,6 +216,7 @@
-             '../third_party/icu/icu.gyp:icui18n',
-             '../third_party/icu/icu.gyp:icuuc',
-             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
-+            '../third_party/libusb/libusb.gyp:libusb',
-           ],
-           'include_dirs': [
-             '..',
diff --git a/www-client/chromium/files/chromium-system-libvpx-r0.patch b/www-client/chromium/files/chromium-system-libvpx-r0.patch
deleted file mode 100644
index 38044467043a..000000000000
--- a/www-client/chromium/files/chromium-system-libvpx-r0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- content/content_renderer.gypi.orig	2013-07-24 21:53:10.005389471 +0000
-+++ content/content_renderer.gypi	2013-07-24 21:53:30.755521603 +0000
-@@ -5,6 +5,7 @@
- {
-   'dependencies': [
-     '../jingle/jingle.gyp:jingle_glue',
-+    '../media/media.gyp:media',
-     '../net/net.gyp:net',
-     '../skia/skia.gyp:skia',
-     '../third_party/WebKit/public/blink.gyp:blink',
diff --git a/www-client/chromium/files/chromium-system-v8-r0.patch b/www-client/chromium/files/chromium-system-v8-r0.patch
deleted file mode 100644
index 4c85b7052695..000000000000
--- a/www-client/chromium/files/chromium-system-v8-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)',
-             ],
diff --git a/www-client/chromium/files/chromium-system-v8-r1.patch b/www-client/chromium/files/chromium-system-v8-r1.patch
deleted file mode 100644
index 1a0e7e5d02bd..000000000000
--- a/www-client/chromium/files/chromium-system-v8-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/linux/unbundle/v8.gyp.orig	2013-07-24 18:59:21.777276631 +0000
-+++ build/linux/unbundle/v8.gyp	2013-07-24 18:59:44.847427272 +0000
-@@ -26,7 +26,7 @@
- # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- {
--  'includes': ['../../build/common.gypi'],
-+  'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'],
-   'targets': [
-     {
-       'target_name': 'v8',
diff --git a/www-client/chromium/files/chromium-system-zlib-r0.patch b/www-client/chromium/files/chromium-system-zlib-r0.patch
deleted file mode 100644
index 183df4a139a3..000000000000
--- a/www-client/chromium/files/chromium-system-zlib-r0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- chrome/browser/metrics/compression_utils.cc.orig	2013-07-24 21:34:25.648251116 +0000
-+++ chrome/browser/metrics/compression_utils.cc	2013-07-24 21:34:40.228343391 +0000
-@@ -8,7 +8,6 @@
- 
- #include "base/basictypes.h"
- #include "third_party/zlib/zlib.h"
--#include "third_party/zlib/zutil.h"
- 
- namespace {
- 
-@@ -45,7 +44,7 @@
-                             Z_DEFAULT_COMPRESSION,
-                             Z_DEFLATED,
-                             MAX_WBITS + kWindowBitsToGetGzipHeader,
--                            DEF_MEM_LEVEL,
-+                            8,
-                             Z_DEFAULT_STRATEGY,
-                             ZLIB_VERSION,
-                             sizeof(z_stream));