Version bump for dev channel release. Remove old ebuilds and patches.

Package-Manager: portage-2.1.9.25/cvs/Linux i686

7 files changed, 14 insertions, 504 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index cb17f395dc86..3ddec593a73d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.283 2011/02/14 09:42:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.284 2011/02/17 15:16:40 phajdan.jr Exp $
+
+*chromium-10.0.648.82 (17 Feb 2011)
+
+  17 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -files/chromium-locale-glib-r1.patch, -chromium-10.0.648.18.ebuild,
+  -files/chromium-system-icu-r1.patch, +chromium-10.0.648.82.ebuild,
+  -files/chromium-system-icu-r2.patch, -files/extract_v8_version.py:
+  Version bump for dev channel release. Remove old ebuilds and patches.
 
 *chromium-9.0.597.98 (14 Feb 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 46beebc11f02..a67269f25e78 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,10 +1,7 @@
 AUX chromium-gecko-mediaplayer-r0.patch 590 RMD160 8b01e801ef4a8d3aaa842ab217929e71ebb70a87 SHA1 916ecd1c7a405fc12de579538c07c42cd9e84ecc SHA256 491cfaa353ad965a0cbfe2fc6370e4df5d1cd55398698b838996053f9e46f12c
 AUX chromium-gecko-mediaplayer-r1.patch 591 RMD160 fbfa62e79687fb1d3939d34a21f1b6d4ac4a7d0a SHA1 145d3e50933e14e9213002bebf4a4b2c8d39b177 SHA256 8d822835c1f3b39ce77ad920003bc509e7e1ef85f03b4123a71ac1a00224fce0
 AUX chromium-launcher.sh 648 RMD160 d9331083750789d5c514c0fa1843037337ac476a SHA1 015efb2faacfc000c23644323c56795acfb7bc7e SHA256 3ae91f5bee0107adf3511205a062465901c7daaa13e3758ae970a6da4f0fa12c
-AUX chromium-locale-glib-r1.patch 14823 RMD160 78159c294e953941b35346fc3b228ccbdd988b0d SHA1 b6de887cc67e3db01edb22ccd2eec3048f34df87 SHA256 71b1c2c3cd7382938e1cb4097428ded1dd019b8ef6be3ed6e882647e8e65b2f6
 AUX chromium-system-flac-r0.patch 453 RMD160 5313955501e3d9c985169f5ab45c9c8dae4e1099 SHA1 9c25e31570277b134540a77352ab0910e4a8cfeb SHA256 973e538be539b13b17d99f812ce1bfa6bfdd524d182e5186b89148fbafda175f
-AUX chromium-system-icu-r1.patch 735 RMD160 d3fabb98c3de79afd87f4dad2fd842eac31b0167 SHA1 6f2d38dcd26dbd948237a3a6185e2dfff753fb5a SHA256 f37bcb4938d7600a1c56fd6494fa8680ff19749a3a50df82b5c88b8c996e2185
-AUX chromium-system-icu-r2.patch 1082 RMD160 7b908b8b34c0beaa969aa6c3bc4d0349ca8a7616 SHA1 17e9c7704164ac224e227e535bd4031670994590 SHA256 1bbdec893ed6d158981e33a2f661a47733ceaec3b686025ba5f233f3fe031264
 AUX chromium-system-speex-r0.patch 472 RMD160 8a8d573ae2ee08828d2376547a1755cc640875d9 SHA1 815ceb8513bbf20355c6c83dbfae2f7d3bfa4cd8 SHA256 967486edb2f7c0503bb2b373944ce8c5ce050e0f39da65d245f8695b6e8436f6
 AUX chromium-system-vpx-r1.patch 2171 RMD160 7b5e5e624084a0a63c15e7e783676a9365ad211f SHA1 68142ca461ec721f8134af2e9cf45ff18093da10 SHA256 684a88573c33bb5c987f7e08611b4a3a019eac9ea9ec14fe60f79141e75763c5
 AUX chromium-system-vpx-r2.patch 2207 RMD160 7b33f474c4bcd498dfc3e7ce803b9f6c4505b3b0 SHA1 a28a1629937c686aa4ad3b1ea16479d9b11d3789 SHA256 b33e0e66a257837ba3e10d68ad44434e5f0bb75a143ff095379097722c14d211
@@ -12,18 +9,17 @@ AUX chromium-system-xdg-utils-r0.patch 2313 RMD160 3e68d4860b04c30749d319642002d
 AUX chromium-tests-r0.patch 555 RMD160 6f26a053196f15924e939d1d84b959ccae68eb8d SHA1 be5c142e2a36dcc5eb7be1a619528be41cb1c293 SHA256 a7f1fd8b31491401420705d89e38f0e4811a92066ede1d6019275c46360d6711
 AUX chromium-webkit-version.patch 2085 RMD160 654a4d3bd87de789e80a0364c9167ca8557d072d SHA1 27b29a0fbcb09d044d8dfe037503faaae2d4e96b SHA256 a48fc2c7cd9fe30a6ecc98da1ed6a9d0f77cf89302caec4d5844f1471617cceb
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
-AUX extract_v8_version.py 731 RMD160 71b134c9b88902259cb20ec232b8da6c3d8a15de SHA1 3dc5d6f9437f4b0ffb584395e19663450384b53a SHA256 4011f1e2f44bd18ad1266dffc1d3fbc13a6430afade2b19240b31ee9437dcbda
 AUX flac.gyp 416 RMD160 5af2709cae77ba139b32b0f22bca347a87170e0b SHA1 cdb2f5404c21ca8375ce9b753577df1df6a9cb78 SHA256 a4f24205b691e21d6208876a7f56859b9c3fc22eb39ec29fb2d0e3d067894932
 AUX speex.gyp 434 RMD160 6111f912450ece1cb016f3800e1a22f135cc68ff SHA1 23c1917b8bc7a4b395a8b5c1b91b6661d73f3df3 SHA256 34b977ccf3092a3af963c6ec1dc79a1f26bf5114571e3dfd2e94c2a6633537b9
 AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a921f30b0c3ed33a5593f1059832c96 SHA256 bc5342501d71754f23bd87914bb11841a7487330ba2f0462611dd1b0f99a2a43
-DIST chromium-10.0.648.18.tar.bz2 144204439 RMD160 ae910f6edd964e6fd263da11612f886c29092194 SHA1 c0bbc6dc5cac8b445fa19e85bcc9fd8dbb3a7c54 SHA256 8f2276de4381e9d97750df941eea29c559038c2ca0c45a1e64af4e6cb1cfba03
 DIST chromium-10.0.648.45.tar.bz2 144272619 RMD160 c5dfbc54d87f8c2050e19193cdcc180b2ba7b18c SHA1 8969f376968f277086f8476efe37c2e01a4ee050 SHA256 6563fe1e400c7c87be9adbccfee038f874e73e01ff782def474bb94ab325d4e5
+DIST chromium-10.0.648.82.tar.bz2 144519973 RMD160 91560d901c81a2ba23bba24bdf2a17011fc6c1c6 SHA1 02c61847f3a765cf54e1d67d019fe84ed04d577d SHA256 6dd79f9571f37fce63e3a2e17fe219898f0fb3b2b5ebea665fb5744bbfe41ffd
 DIST chromium-9.0.597.94.tar.bz2 140800844 RMD160 5816c28ddfaeb31c5b8aa882de2248c780f8cb0c SHA1 4a870da41ae25781e4806ec2c95703282fccc4d8 SHA256 7194d999a03bb54813cc49f978dd88f5b08cdd40cee4dcbe4ff5639c0ca3e8d5
 DIST chromium-9.0.597.98.tar.bz2 141115336 RMD160 5d0f3b83048363533919932a84a95fefd278cd42 SHA1 ea129fd68d78e84a573e25aef94a1f8697a22476 SHA256 48f7d849d3bfec40d6f7e5c76a964a36e9203127bafcb8068bcd63817c706d5f
-EBUILD chromium-10.0.648.18.ebuild 10458 RMD160 cc4c722c81e636a25d045262d9c470f43b667e32 SHA1 8d578ee7a31c2b460c500a29d374ca829db85a50 SHA256 d5f5a6b17a7934e59476226bcde285b0925615d8df6fc7f14be68b47dda89692
 EBUILD chromium-10.0.648.45.ebuild 10459 RMD160 5822f7f5bea8413b3496af06de28f9ca7bf69256 SHA1 a56bff78d46d7c167ca117bc6285d2d2289f3d88 SHA256 746507338a2d073f6f4b87b711e31bb5fbf5cfc800b9cbdb9be306474af27b5a
+EBUILD chromium-10.0.648.82.ebuild 10459 RMD160 e7685f3fd263d1e226fc83d3f8499f3edbcb277e SHA1 52a2bccd361e09aa5e20a7f27cf64e9d3fac7394 SHA256 ee080daed82bd54f2585099ac49edf81f2723004cf5759649072eb6cca134cad
 EBUILD chromium-9.0.597.94.ebuild 9414 RMD160 f923a3e5779fbaaed3eaf45a6a36d71ce677948d SHA1 fce8f48cf25e1a16a982755d6f934d63f0bc2bef SHA256 102a346c48e5802dec49ace8d90aacf420c5c3b839e0533ec7f9fa7bf50cdd99
 EBUILD chromium-9.0.597.98.ebuild 9407 RMD160 c51bbe7154b37345b4b6ca9f79e3c7d8bd7f7a37 SHA1 ef1d275ff7df633a26bc91ee3d89b5b3d5e2917c SHA256 7146c824db7e8f8efc9d3a68d5ea484ea19b1ce7a0e650a13b1597525b2afc2a
 EBUILD chromium-9999.ebuild 11541 RMD160 fa614350031e09789239bbb21eaffb42cffa937b SHA1 84ad145d91010ce3fc0737188180646937af2033 SHA256 c594dee44fa411b0561fadbdd5b53447c9afaf912a15adf0bda7cebea2d676a5
-MISC ChangeLog 62188 RMD160 50979ff7d08ca86f4caacae9fb11b875206c3e50 SHA1 5ce2faa7917c7c9f574d7a559813df8b2eaae235 SHA256 5adc2a2db52cf4b95c71d646f1167aa850ecf5e8bb9a53d972196484e7b91c3f
+MISC ChangeLog 62561 RMD160 10b7020f7b0c2b281341e2bd971eab1ffbc5d7f2 SHA1 95d6716b41b563b39adc3c91e531a500788e07f1 SHA256 24a003a13e696e29a951e7b07d3072e26842df340b230a8bd591c5599c0e12c4
 MISC metadata.xml 607 RMD160 98f163b667c92c149e6ad82352ff5a1ea076361f SHA1 0d7d96013e31288c37a0e245cf2b538af1a46eaf SHA256 1d94b496c34342ce43cf7b1c6887d90930c0531e903e512d2d132e79e1d0d27d
diff --git a/www-client/chromium/chromium-10.0.648.18.ebuild b/www-client/chromium/chromium-10.0.648.82.ebuild
index 4a3264f404d7..56b2ab6d00d5 100644
--- a/www-client/chromium/chromium-10.0.648.18.ebuild
+++ b/www-client/chromium/chromium-10.0.648.82.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.18.ebuild,v 1.2 2011/02/13 11:43:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.82.ebuild,v 1.1 2011/02/17 15:16:40 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
-V8_DEPEND="3.0.12.8"
+V8_DEPEND="3.0.12.18"
 
 inherit eutils flag-o-matic multilib pax-utils portability python \
 	toolchain-funcs versionator virtualx
diff --git a/www-client/chromium/files/chromium-locale-glib-r1.patch b/www-client/chromium/files/chromium-locale-glib-r1.patch
deleted file mode 100644
index 1c9c72608680..000000000000
--- a/www-client/chromium/files/chromium-locale-glib-r1.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-Index: app/l10n_util.cc
-===================================================================
---- app/l10n_util.cc	(revision 63359)
-+++ app/l10n_util.cc	(working copy)
-@@ -4,6 +4,10 @@
- 
- #include "app/l10n_util.h"
- 
-+#if defined(TOOLKIT_USES_GTK)
-+#include <glib/gutils.h>
-+#endif
-+
- #include <cstdlib>
- 
- #include "app/app_paths.h"
-@@ -384,43 +335,71 @@
- namespace l10n_util {
- 
- std::string GetApplicationLocale(const std::string& pref_locale) {
--#if !defined(OS_MACOSX)
-+#if defined(OS_MACOSX)
-+
-+  // Use any override (Cocoa for the browser), otherwise use the preference
-+  // passed to the function.
-+  std::string app_locale = l10n_util::GetLocaleOverride();
-+  if (app_locale.empty())
-+    app_locale = pref_locale;
-+
-+  // The above should handle all of the cases Chrome normally hits, but for some
-+  // unit tests, we need something to fall back too.
-+  if (app_locale.empty())
-+    app_locale = "en-US";
-+
-+  // Windows/Linux call SetICUDefaultLocale after determining the actual locale
-+  // with CheckAndResolveLocal to make ICU APIs work in that locale.
-+  // Mac doesn't use a locale directory tree of resources (it uses Mac style
-+  // resources), so mirror the Windows/Linux behavior of calling
-+  // SetICUDefaultLocale.
-+  base::i18n::SetICUDefaultLocale(app_locale);
-+  return app_locale;
-+
-+#else
-+
-   FilePath locale_path;
-   PathService::Get(app::DIR_LOCALES, &locale_path);
-   std::string resolved_locale;
-   std::vector<std::string> candidates;
--  const std::string system_locale = GetSystemLocale();
- 
-   // We only use --lang and the app pref on Windows.  On Linux, we only
-   // look at the LC_*/LANG environment variables.  We do, however, pass --lang
-   // to renderer and plugin processes so they know what language the parent
-   // process decided to use.
-+
- #if defined(OS_WIN)
-+
-   // First, try the preference value.
-   if (!pref_locale.empty())
-     candidates.push_back(pref_locale);
- 
-   // Next, try the system locale.
--  candidates.push_back(system_locale);
-+  candidates.push_back(base::i18n::GetConfiguredLocale());
- 
- #elif defined(OS_CHROMEOS)
-+
-   // On ChromeOS, use the application locale preference.
-   if (!pref_locale.empty())
-     candidates.push_back(pref_locale);
- 
--#elif defined(OS_POSIX)
--  // On POSIX, we also check LANGUAGE environment variable, which is supported
--  // by gettext to specify a priority list of prefered languages.
--  const char* env_language = ::getenv("LANGUAGE");
--  if (env_language)
--    SplitAndNormalizeLanguageList(env_language, &candidates);
-+#elif defined(OS_POSIX) && defined(TOOLKIT_USES_GTK)
- 
--  // Only fallback to the system locale if LANGUAGE is not specified.
--  // We emulate gettext's behavior here, which ignores LANG/LC_MESSAGES/LC_ALL
--  // when LANGUAGE is specified. If no language specified in LANGUAGE is valid,
--  // then just fallback to the locale based on LC_ALL/LANG.
--  if (candidates.empty())
--    candidates.push_back(system_locale);
-+  // GLib implements correct environment variable parsing with
-+  // the precedence order: LANGUAGE, LC_ALL, LC_MESSAGES and LANG.
-+  // We used to use our custom parsing code along with ICU for this purpose.
-+  // If we have a port that does not depend on GTK, we have to
-+  // restore our custom code for that port.
-+  const char* const* languages = g_get_language_names();
-+  DCHECK(languages);  // A valid pointer is guaranteed.
-+  DCHECK(*languages);  // At least one entry, "C", is guaranteed.
-+
-+  for (; *languages != NULL; ++languages) {
-+    candidates.push_back(base::i18n::GetCanonicalLocale(*languages));
-+  }
-+
-+#else
-+#error Unsupported platform, see build/build_config.h
- #endif
- 
-   std::vector<std::string>::const_iterator i = candidates.begin();
-@@ -443,27 +422,7 @@
- 
-   return std::string();
- 
--#else  // !defined(OS_MACOSX)
--
--  // Use any override (Cocoa for the browser), otherwise use the preference
--  // passed to the function.
--  std::string app_locale = l10n_util::GetLocaleOverride();
--  if (app_locale.empty())
--    app_locale = pref_locale;
--
--  // The above should handle all of the cases Chrome normally hits, but for some
--  // unit tests, we need something to fall back too.
--  if (app_locale.empty())
--    app_locale = "en-US";
--
--  // Windows/Linux call SetICUDefaultLocale after determining the actual locale
--  // with CheckAndResolveLocal to make ICU APIs work in that locale.
--  // Mac doesn't use a locale directory tree of resources (it uses Mac style
--  // resources), so mirror the Windows/Linux behavior of calling
--  // SetICUDefaultLocale.
--  base::i18n::SetICUDefaultLocale(app_locale);
--  return app_locale;
--#endif  // !defined(OS_MACOSX)
-+#endif
- }
- 
- string16 GetDisplayNameForLocale(const std::string& locale,
-Index: app/l10n_util_unittest.cc
-===================================================================
---- app/l10n_util_unittest.cc	(revision 63359)
-+++ app/l10n_util_unittest.cc	(working copy)
-@@ -100,7 +100,17 @@
- // The meaning of that API, on the Mac, is "the locale used by Cocoa's main
- // nib file", which clearly can't be stubbed by a test app that doesn't use
- // Cocoa.
-+
-+void SetDefaultLocaleForTest(const std::string& tag, base::Environment* env) {
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-+  env->SetVar("LANGUAGE", tag);
-+#else
-+  SetICUDefaultLocale(tag);
-+#endif
-+}
-+
- TEST_F(L10nUtilTest, GetAppLocale) {
-+  scoped_ptr<base::Environment> env;
-   // Use a temporary locale dir so we don't have to actually build the locale
-   // dlls for this test.
-   FilePath orig_locale_dir;
-@@ -140,7 +150,7 @@
-   icu::Locale locale = icu::Locale::getDefault();
- 
- #if defined(OS_POSIX) && !defined(OS_CHROMEOS)
--  scoped_ptr<base::Environment> env(base::Environment::Create());
-+  env.reset(base::Environment::Create());
- 
-   // Test the support of LANGUAGE environment variable.
-   SetICUDefaultLocale("en-US");
-@@ -163,15 +173,25 @@
-   env->SetVar("LANGUAGE", "/fr:zh_CN");
-   EXPECT_EQ("zh-CN", l10n_util::GetApplicationLocale(""));
- 
--  // Make sure the follow tests won't be affected by LANGUAGE environment
--  // variable.
-+  // Test prioritization of the different environment variables.
-+  env->SetVar("LANGUAGE", "fr");
-+  env->SetVar("LC_ALL", "es");
-+  env->SetVar("LC_MESSAGES", "he");
-+  env->SetVar("LANG", "nb");
-+  EXPECT_EQ("fr", l10n_util::GetApplicationLocale(""));
-   env->UnSetVar("LANGUAGE");
-+  EXPECT_EQ("es", l10n_util::GetApplicationLocale(""));
-+  env->UnSetVar("LC_ALL");
-+  EXPECT_EQ("he", l10n_util::GetApplicationLocale(""));
-+  env->UnSetVar("LC_MESSAGES");
-+  EXPECT_EQ("nb", l10n_util::GetApplicationLocale(""));
-+  env->UnSetVar("LANG");
- #endif  // defined(OS_POSIX) && !defined(OS_CHROMEOS)
- 
--  SetICUDefaultLocale("en-US");
-+  SetDefaultLocaleForTest("en-US", env.get());
-   EXPECT_EQ("en-US", l10n_util::GetApplicationLocale(""));
- 
--  SetICUDefaultLocale("xx");
-+  SetDefaultLocaleForTest("xx", env.get());
-   EXPECT_EQ("en-US", l10n_util::GetApplicationLocale(""));
- 
- #if defined(OS_CHROMEOS)
-@@ -184,31 +204,31 @@
-   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("en-GB"));
- 
- #else  // defined(OS_CHROMEOS)
--  SetICUDefaultLocale("en-GB");
-+  SetDefaultLocaleForTest("en-GB", env.get());
-   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(""));
- 
--  SetICUDefaultLocale("fr-CA");
-+  SetDefaultLocaleForTest("fr-CA", env.get());
-   EXPECT_EQ("fr", l10n_util::GetApplicationLocale(""));
- 
--  SetICUDefaultLocale("es-MX");
-+  SetDefaultLocaleForTest("es-MX", env.get());
-   EXPECT_EQ("es-419", l10n_util::GetApplicationLocale(""));
- 
--  SetICUDefaultLocale("es-AR");
-+  SetDefaultLocaleForTest("es-AR", env.get());
-   EXPECT_EQ("es-419", l10n_util::GetApplicationLocale(""));
- 
--  SetICUDefaultLocale("es-ES");
-+  SetDefaultLocaleForTest("es-ES", env.get());
-   EXPECT_EQ("es", l10n_util::GetApplicationLocale(""));
- 
--  SetICUDefaultLocale("es");
-+  SetDefaultLocaleForTest("es", env.get());
-   EXPECT_EQ("es", l10n_util::GetApplicationLocale(""));
- 
--  SetICUDefaultLocale("zh-HK");
-+  SetDefaultLocaleForTest("zh-HK", env.get());
-   EXPECT_EQ("zh-TW", l10n_util::GetApplicationLocale(""));
- 
--  SetICUDefaultLocale("zh-MK");
-+  SetDefaultLocaleForTest("zh-MK", env.get());
-   EXPECT_EQ("zh-TW", l10n_util::GetApplicationLocale(""));
- 
--  SetICUDefaultLocale("zh-SG");
-+  SetDefaultLocaleForTest("zh-SG", env.get());
-   EXPECT_EQ("zh-CN", l10n_util::GetApplicationLocale(""));
- #endif  // defined (OS_CHROMEOS)
- 
-Index: base/i18n/rtl.cc
-===================================================================
---- base/i18n/rtl.cc	(revision 63359)
-+++ base/i18n/rtl.cc	(working copy)
-@@ -18,26 +18,58 @@
- #include <gtk/gtk.h>
- #endif
- 
-+namespace {
-+
-+// Extract language and country, ignore keywords, concatenate using dash.
-+std::string GetLocaleString(const icu::Locale& locale) {
-+  const char* language = locale.getLanguage();
-+  const char* country = locale.getCountry();
-+
-+  std::string result =
-+      (language != NULL && *language != '\0') ? language : "und";
-+
-+  if (country != NULL && *country != '\0') {
-+    result += '-';
-+    result += country;
-+  }
-+
-+  return result;
-+}
-+
-+}  // namespace
-+
- namespace base {
- namespace i18n {
- 
- // Represents the locale-specific ICU text direction.
- static TextDirection g_icu_text_direction = UNKNOWN_DIRECTION;
- 
-+#if defined(OS_WIN)
- void GetLanguageAndRegionFromOS(std::string* lang, std::string* region) {
-   // Later we may have to change this to be OS-dependent so that
-   // it's not affected by ICU's default locale. It's all right
-   // to do this way because SetICUDefaultLocale is internal
-   // to this file and we know that it's not yet called when this function
-   // is called.
--  icu::Locale locale = icu::Locale::getDefault();
-+  const icu::Locale& locale = icu::Locale::getDefault();
-   const char* language = locale.getLanguage();
-   const char* country = locale.getCountry();
-   DCHECK(language);
-   *lang = language;
-   *region = country;
- }
-+#endif
- 
-+// Convert the ICU default locale to a string.
-+std::string GetConfiguredLocale() {
-+  return GetLocaleString(icu::Locale::getDefault());
-+}
-+
-+// Convert the ICU canonicalized locale to a string.
-+std::string GetCanonicalLocale(const char* locale) {
-+  return GetLocaleString(icu::Locale::createCanonical(locale));
-+}
-+
- // Convert Chrome locale name to ICU locale name
- std::string ICULocaleName(const std::string& locale_string) {
-   // If not Spanish, just return it.
-@@ -50,13 +82,14 @@
-   // locale.  If it's es-RR other than es-ES, map to es-RR. Otherwise, map
-   // to es-MX (the most populous in Spanish-speaking Latin America).
-   if (LowerCaseEqualsASCII(locale_string, "es-419")) {
--    std::string lang, region;
--    GetLanguageAndRegionFromOS(&lang, &region);
--    if (LowerCaseEqualsASCII(lang, "es") &&
--      !LowerCaseEqualsASCII(region, "es")) {
--        lang.append("-");
--        lang.append(region);
--        return lang;
-+    const icu::Locale& locale = icu::Locale::getDefault();
-+    std::string language = locale.getLanguage();
-+    const char* country = locale.getCountry();
-+    if (LowerCaseEqualsASCII(language, "es") &&
-+      !LowerCaseEqualsASCII(country, "es")) {
-+        language += '-';
-+        language += country;
-+        return language;
-     }
-     return "es-MX";
-   }
-Index: base/i18n/rtl.h
-===================================================================
---- base/i18n/rtl.h	(revision 63359)
-+++ base/i18n/rtl.h	(working copy)
-@@ -29,9 +29,19 @@
-   LEFT_TO_RIGHT,
- };
- 
--// Get language and region from the OS.
-+#if defined(OS_WIN)
-+// Get language and region from the OS. Used by Chrome Frame.
- void GetLanguageAndRegionFromOS(std::string* lang, std::string* region);
-+#endif
- 
-+// Get the locale that the currently running process has been configured to use.
-+// The return value is of the form language[-country] (e.g., en-US) where the
-+// language is the 2 or 3 letter code from ISO-639.
-+std::string GetConfiguredLocale();
-+
-+// Canonicalize a string (eg. a POSIX locale string) to a Chrome locale name.
-+std::string GetCanonicalLocale(const char* locale);
-+
- // Sets the default locale of ICU.
- // Once the application locale of Chrome in GetApplicationLocale is determined,
- // the default locale of ICU need to be changed to match the application locale
-@@ -136,7 +146,7 @@
- // string is wrapped with LRE (Left-To-Right Embedding) and PDF (Pop
- // Directional Formatting) marks and returned. In LTR locale, the string itself
- // is returned.
--string16 GetDisplayStringInLTRDirectionality(const string16& text) 
-+string16 GetDisplayStringInLTRDirectionality(const string16& text)
-     WARN_UNUSED_RESULT;
- 
- // Strip the beginning (U+202A..U+202B, U+202D..U+202E) and/or ending (U+202C)
---- app/l10n_util.cc.orig	2010-11-04 19:18:08.000000000 +0100
-+++ app/l10n_util.cc	2010-11-04 19:18:41.000000000 +0100
-@@ -314,59 +314,6 @@
- 
-   return false;
- }
--
--// Get the locale of the operating system.  The return value is of the form
--// language[-country] (e.g., en-US) where the language is the 2 letter code from
--// ISO-639.
--std::string GetSystemLocale() {
--  std::string language, region;
--  base::i18n::GetLanguageAndRegionFromOS(&language, &region);
--  std::string ret;
--  if (!language.empty())
--    ret.append(language);
--  if (!region.empty()) {
--    ret.append("-");
--    ret.append(region);
--  }
--  return ret;
--}
--#endif
--
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
--// Split and normalize the language list specified by LANGUAGE environment.
--// LANGUAGE environment specifies a priority list of user prefered locales for
--// application UI messages. Locales are separated by ':' character. The format
--// of a locale is: language[_territory[.codeset]][@modifier]
--//
--// This function splits the language list and normalizes each locale into
--// language[-territory] format, eg. fr, zh-CN, etc.
--void SplitAndNormalizeLanguageList(const std::string& env_language,
--                                   std::vector<std::string>* result) {
--  std::vector<std::string> langs;
--  SplitString(env_language, ':', &langs);
--  std::vector<std::string>::iterator i = langs.begin();
--  for (; i != langs.end(); ++i) {
--    size_t end_pos = i->find_first_of(".@");
--    // Erase encoding and modifier part.
--    if (end_pos != std::string::npos)
--      i->erase(end_pos);
--
--    if (!i->empty()) {
--      std::string locale;
--      size_t sep = i->find_first_of("_-");
--      if (sep != std::string::npos) {
--        // language part is always in lower case.
--        locale = StringToLowerASCII(i->substr(0, sep));
--        locale.append("-");
--        // territory part is always in upper case.
--        locale.append(StringToUpperASCII(i->substr(sep + 1)));
--      } else {
--        locale = StringToLowerASCII(*i);
--      }
--      result->push_back(locale);
--    }
--  }
--}
- #endif
- 
- // On Linux, the text layout engine Pango determines paragraph directionality
diff --git a/www-client/chromium/files/chromium-system-icu-r1.patch b/www-client/chromium/files/chromium-system-icu-r1.patch
deleted file mode 100644
index 289e78d7ded8..000000000000
--- a/www-client/chromium/files/chromium-system-icu-r1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- webkit/glue/plugins/pepper_private.cc.orig	2010-10-13 13:22:28.000000000 +0200
-+++ webkit/glue/plugins/pepper_private.cc	2010-10-13 13:22:56.000000000 +0200
-@@ -6,6 +6,8 @@
- 
- #include "webkit/glue/plugins/pepper_private.h"
- 
-+#include "unicode/usearch.h"
-+
- #include "app/resource_bundle.h"
- #include "base/utf_string_conversions.h"
- #include "grit/webkit_resources.h"
-@@ -13,7 +15,6 @@
- #include "skia/ext/platform_canvas.h"
- #include "third_party/ppapi/c/pp_resource.h"
- #include "third_party/skia/include/core/SkBitmap.h"
--#include "third_party/icu/public/i18n/unicode/usearch.h"
- #include "webkit/glue/webkit_glue.h"
- #include "webkit/glue/plugins/pepper_image_data.h"
- #include "webkit/glue/plugins/pepper_plugin_delegate.h"
diff --git a/www-client/chromium/files/chromium-system-icu-r2.patch b/www-client/chromium/files/chromium-system-icu-r2.patch
deleted file mode 100644
index 778eeaed81ff..000000000000
--- a/www-client/chromium/files/chromium-system-icu-r2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- base/i18n/word_iterator.cc.orig	2010-12-17 07:27:02.000000000 +0000
-+++ base/i18n/word_iterator.cc	2010-12-17 07:29:03.000000000 +0000
-@@ -21,7 +21,7 @@
- 
- WordIterator::~WordIterator() {
-   if (iter_)
--    ubrk_close(iter_);
-+    ubrk_close(static_cast<UBreakIterator*>(iter_));
- }
- 
- bool WordIterator::Init() {
-@@ -45,13 +45,13 @@
-     NOTREACHED() << "ubrk_open failed";
-     return false;
-   }
--  ubrk_first(iter_);  // Move the iterator to the beginning of the string.
-+  ubrk_first(static_cast<UBreakIterator*>(iter_));  // Move the iterator to the beginning of the string.
-   return true;
- }
- 
- bool WordIterator::Advance() {
-   prev_ = pos_;
--  const int32_t pos = ubrk_next(iter_);
-+  const int32_t pos = ubrk_next(static_cast<UBreakIterator*>(iter_));
-   if (pos == UBRK_DONE) {
-     pos_ = npos;
-     return false;
-@@ -62,7 +62,7 @@
- }
- 
- bool WordIterator::IsWord() const {
--  return (ubrk_getRuleStatus(iter_) != UBRK_WORD_NONE);
-+  return (ubrk_getRuleStatus(static_cast<UBreakIterator*>(iter_)) != UBRK_WORD_NONE);
- }
- 
- string16 WordIterator::GetWord() const {
diff --git a/www-client/chromium/files/extract_v8_version.py b/www-client/chromium/files/extract_v8_version.py
deleted file mode 100644
index 55615138b863..000000000000
--- a/www-client/chromium/files/extract_v8_version.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/python2
-
-import re
-import sys
-
-MAJOR_VERSION_PATTERN = re.compile(r"#define\s+MAJOR_VERSION\s+(.*)")
-MINOR_VERSION_PATTERN = re.compile(r"#define\s+MINOR_VERSION\s+(.*)")
-BUILD_NUMBER_PATTERN = re.compile(r"#define\s+BUILD_NUMBER\s+(.*)")
-PATCH_LEVEL_PATTERN = re.compile(r"#define\s+PATCH_LEVEL\s+(.*)")
-
-patterns = [MAJOR_VERSION_PATTERN,
-            MINOR_VERSION_PATTERN,
-            BUILD_NUMBER_PATTERN,
-            PATCH_LEVEL_PATTERN]
-
-source = open(sys.argv[1]).read()
-version_components = []
-for pattern in patterns:
-  version_components.append(pattern.search(source).group(1).strip())
-
-if version_components[len(version_components) - 1] == '0':
-  version_components.pop()
-
-print  '.'.join(version_components)