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

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

17 files changed, 0 insertions, 559 deletions

diff --git a/www-client/chromium/files/chromium-ffmpeg-build-r1.patch b/www-client/chromium/files/chromium-ffmpeg-build-r1.patch
deleted file mode 100644
index 54e831b45c3c..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-build-r1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- trunk/src/media/ffmpeg/ffmpeg_common.h	2011/04/01 19:12:49	80199
-+++ trunk/src/media/ffmpeg/ffmpeg_common.h	2011/04/01 19:30:32	80200
-@@ -19,7 +19,6 @@
- // TODO(scherkus): fix and upstream the compiler warnings.
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
--#include <libavcore/samplefmt.h>
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
diff --git a/www-client/chromium/files/chromium-gecko-mediaplayer-r0.patch b/www-client/chromium/files/chromium-gecko-mediaplayer-r0.patch
deleted file mode 100644
index fb5376b82137..000000000000
--- a/www-client/chromium/files/chromium-gecko-mediaplayer-r0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- webkit/glue/plugins/plugin_list.cc_posix.orig	2010-10-09 11:05:44.000000000 +0200
-+++ webkit/glue/plugins/plugin_list_posix.cc	2010-10-09 11:06:35.000000000 +0200
-@@ -89,7 +89,9 @@
- bool IsBlacklistedPlugin(const FilePath& path) {
-   const char* kBlackListedPlugins[] = {
-     "nppdf.so",           // Adobe PDF
-+#ifndef GENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
-     "gecko-mediaplayer",  // Gecko Media Player
-+#endif  // GENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
-   };
-   std::string filename = path.BaseName().value();
-   for (size_t i = 0; i < arraysize(kBlackListedPlugins); i++) {
diff --git a/www-client/chromium/files/chromium-gecko-mediaplayer-r1.patch b/www-client/chromium/files/chromium-gecko-mediaplayer-r1.patch
deleted file mode 100644
index 05515f6bd1d8..000000000000
--- a/www-client/chromium/files/chromium-gecko-mediaplayer-r1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- webkit/glue/plugins/plugin_list.cc_posix.orig	2010-10-09 11:05:44.000000000 +0200
-+++ webkit/plugins/npapi/plugin_list_posix.cc	2010-10-09 11:06:35.000000000 +0200
-@@ -89,7 +89,9 @@
- bool IsBlacklistedPlugin(const FilePath& path) {
-   const char* kBlackListedPlugins[] = {
-     "nppdf.so",           // Adobe PDF
-+#ifndef GENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
-     "gecko-mediaplayer",  // Gecko Media Player
-+#endif  // GENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
-   };
-   std::string filename = path.BaseName().value();
-   for (size_t i = 0; i < arraysize(kBlackListedPlugins); i++) {
diff --git a/www-client/chromium/files/chromium-gssapi-heimdal-r0.patch b/www-client/chromium/files/chromium-gssapi-heimdal-r0.patch
deleted file mode 100644
index 15ec98a620e4..000000000000
--- a/www-client/chromium/files/chromium-gssapi-heimdal-r0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- net/http/http_auth_gssapi_posix.cc.orig	2011-04-05 08:25:52.000000000 +0200
-+++ net/http/http_auth_gssapi_posix.cc	2011-04-05 08:26:32.000000000 +0200
-@@ -437,6 +437,7 @@
- #else
-       "libgssapi_krb5.so.2",  // MIT Kerberos - FC, Suse10, Debian
-       "libgssapi.so.4",       // Heimdal - Suse10, MDK
-+      "libgssapi.so.2",       // Heimdal - Gentoo
-       "libgssapi.so.1"        // Heimdal - Suse9, CITI - FC, MDK, Suse10
- #endif
-     };
diff --git a/www-client/chromium/files/chromium-launcher.sh b/www-client/chromium/files/chromium-launcher.sh
deleted file mode 100644
index 32e563c8c5a8..000000000000
--- a/www-client/chromium/files/chromium-launcher.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Let the wrapped binary know that it has been run through the wrapper
-export CHROME_WRAPPER="`readlink -f "$0"`"
-
-PROGDIR="`dirname "$CHROME_WRAPPER"`"
-
-case ":$PATH:" in
-  *:$PROGDIR:*)
-    # $PATH already contains $PROGDIR
-    ;;
-  *)
-    # Append $PROGDIR to $PATH
-    export PATH="$PATH:$PROGDIR"
-    ;;
-esac
-
-# Set the .desktop file name
-export CHROME_DESKTOP="chromium-chromium.desktop"
-
-exec "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins "$@"
diff --git a/www-client/chromium/files/chromium-net-tests-r0.patch b/www-client/chromium/files/chromium-net-tests-r0.patch
deleted file mode 100644
index 1ee941df07b0..000000000000
--- a/www-client/chromium/files/chromium-net-tests-r0.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Index: net/data/ssl/certificates/expired_cert.pem
-===================================================================
---- net/data/ssl/certificates/expired_cert.pem	(revision 80751)
-+++ net/data/ssl/certificates/expired_cert.pem	(working copy)
-@@ -1,3 +1,18 @@
-+-----BEGIN RSA PRIVATE KEY-----
-+MIICWwIBAAKBgQDuUjUPzXBw61Xsh1RGSyJowrqC+TYvpf44P2c5sF/Y/KX0LoJE
-+A72in+2d7N8sf3IsJvy6X1uPnVdX7wKzgtHI6FFjOcbRzs9MiyEJkeFKADI+ZMV0
-+httNOy93ajESsjZMwgoHMKOv5ikNCdwE/nefSfu6ZuapCsadArkHe3d5dwIDAQAB
-+AoGARF1wu0fDqaDY1TE9C60iActalZfH44NKmfgWNIZT+HsBYDq3Q6uPCse18kew
-+/aLRrbjBZvVT3q7UD3WQ4M32P44rEAAhdYGhMndF53xrtX5SQ7LPb381mlPoJ2AE
-+Wv9R+0X45aRtiSC/Y7E9ebN5p4RY9NjRUjcaI67d1NgNAwECQQD6k83u6R73tsJt
-+k2OCTnUxvQi9Oo5GwDfiubHOQx3tG3ZDIjsyg1GCJa/PVRiP6PXkgIoAWmiyGFIR
-++gIO86kPAkEA83qA4L4HxLQLapDvBDNgiz9eHA/FJvsk5yH0jupR+CDLRqM6Dfzj
-+iLeztyJV3n96lMDIc4lEzplysDw/TD6ZGQJABzYFsSBoUbyir8CUFoXnfXzxKXDr
-+80FI2m95nHP2AoLNznTHu1ZoHBS1kIPkZw/PM7o3Pndbl/R3OCk3sfJ1JQJABSB7
-+PkBCIZ4471GF9uyuB8CZ1rVuTVfUexl38Np2R2dJYH9nZYwBrotPuXd7n2fHyQIW
-+NniZflA03gkmvBBFYQJADftQ5+jabFxXkqwZsrsvtG+Ji53BZrLrczFxgPyGVfUF
-+A1pyQE3M6SykYjp+S3Zg6eS+yKE06guecEVhTQtwBA==
-+-----END RSA PRIVATE KEY-----
- -----BEGIN CERTIFICATE-----
- MIIEZDCCAkygAwIBAgIBAzANBgkqhkiG9w0BAQUFADBgMRAwDgYDVQQDEwdUZXN0
- IENBMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN
-@@ -24,18 +39,3 @@
- za7vs4El0Ei7YZYC0vxqpUbiS6l7Ul+TPfk6q/OAkYjaJ76uYlcKVmN060wK83z5
- Vtoy6YuY/8hrMRl3jrMaiVsMSMg+nOsM
- -----END CERTIFICATE-----
-------BEGIN RSA PRIVATE KEY-----
--MIICWwIBAAKBgQDuUjUPzXBw61Xsh1RGSyJowrqC+TYvpf44P2c5sF/Y/KX0LoJE
--A72in+2d7N8sf3IsJvy6X1uPnVdX7wKzgtHI6FFjOcbRzs9MiyEJkeFKADI+ZMV0
--httNOy93ajESsjZMwgoHMKOv5ikNCdwE/nefSfu6ZuapCsadArkHe3d5dwIDAQAB
--AoGARF1wu0fDqaDY1TE9C60iActalZfH44NKmfgWNIZT+HsBYDq3Q6uPCse18kew
--/aLRrbjBZvVT3q7UD3WQ4M32P44rEAAhdYGhMndF53xrtX5SQ7LPb381mlPoJ2AE
--Wv9R+0X45aRtiSC/Y7E9ebN5p4RY9NjRUjcaI67d1NgNAwECQQD6k83u6R73tsJt
--k2OCTnUxvQi9Oo5GwDfiubHOQx3tG3ZDIjsyg1GCJa/PVRiP6PXkgIoAWmiyGFIR
--+gIO86kPAkEA83qA4L4HxLQLapDvBDNgiz9eHA/FJvsk5yH0jupR+CDLRqM6Dfzj
--iLeztyJV3n96lMDIc4lEzplysDw/TD6ZGQJABzYFsSBoUbyir8CUFoXnfXzxKXDr
--80FI2m95nHP2AoLNznTHu1ZoHBS1kIPkZw/PM7o3Pndbl/R3OCk3sfJ1JQJABSB7
--PkBCIZ4471GF9uyuB8CZ1rVuTVfUexl38Np2R2dJYH9nZYwBrotPuXd7n2fHyQIW
--NniZflA03gkmvBBFYQJADftQ5+jabFxXkqwZsrsvtG+Ji53BZrLrczFxgPyGVfUF
--A1pyQE3M6SykYjp+S3Zg6eS+yKE06guecEVhTQtwBA==
-------END RSA PRIVATE KEY-----
-Index: net/data/ssl/certificates/ok_cert.pem
-===================================================================
---- net/data/ssl/certificates/ok_cert.pem	(revision 80751)
-+++ net/data/ssl/certificates/ok_cert.pem	(working copy)
-@@ -1,3 +1,18 @@
-+-----BEGIN RSA PRIVATE KEY-----
-+MIICXQIBAAKBgQDQj2tPWPUgbuI4H3/3dnttqVbndwU33BdRCd67DFM44GRrsjDS
-+H4bY/EbFyX9D52d/iy6ZaAmDePcCz5k/fgP3DMujykYGqgNiV2ywxTlMj7NlN2C7
-+SRt68fQMZr5iI7rypdxuaZt9lSMD3ENBffYtuLTyZd9a3JPJe1TaIab5GwIDAQAB
-+AoGANHXu8z2YIzlhE+bwhGm8MGBpKL3qhRuKjeriqMA36tWezOw8lY4ymEAU+Ulv
-+BsCdaxqydQoTYou57m4TyUHEcxq9pq3H0zB0qL709DdHi/t4zbV9XIoAzC5v0/hG
-+9+Ca29TwC02FCw+qLkNrtwCpwOcQmc+bPxqvFu1iMiahURECQQD2I/Hi2413CMZz
-+TBjl8fMiVO9GhA2J0sc8Qi+YcgJakaLD9xcbaiLkTzPZDlA389C1b6Ia+poAr4YA
-+Ve0FFbxpAkEA2OobayyHE/QtPEqoy6NLR57jirmVBNmSWWd4lAyL5UIHIYVttJZg
-+8CLvbzaU/iDGwR+wKsM664rKPHEmtlyo4wJBAMeSqYO5ZOCJGu9NWjrHjM3fdAsG
-+8zs2zhiLya+fcU0iHIksBW5TBmt71Jw/wMc9R5J1K0kYvFml98653O5si1ECQBCk
-+RV4/mE1rmlzZzYFyEcB47DQkcM5ictvxGEsje0gnfKyRtAz6zI0f4QbDRUMJ+LWw
-+XK+rMsYHa+SfOb0b9skCQQCLdeonsIpFDv/Uv+flHISy0WA+AFkLXrRkBKh6G/OD
-+dMHaNevkJgUnpceVEnkrdenp5CcEoFTI17pd+nBgDm/B
-+-----END RSA PRIVATE KEY-----
- -----BEGIN CERTIFICATE-----
- MIIEZDCCAkygAwIBAgIBATANBgkqhkiG9w0BAQUFADBgMRAwDgYDVQQDEwdUZXN0
- IENBMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN
-@@ -24,18 +39,3 @@
- AYFvn6I8nj9IldMJiIc3DdhacEAEzRMeRgPdzAa1griKUGknxsyTyRii8ru0WS6w
- DCNrlDOVXdzYGEZooBI76BDVY0W0akjV
- -----END CERTIFICATE-----
-------BEGIN RSA PRIVATE KEY-----
--MIICXQIBAAKBgQDQj2tPWPUgbuI4H3/3dnttqVbndwU33BdRCd67DFM44GRrsjDS
--H4bY/EbFyX9D52d/iy6ZaAmDePcCz5k/fgP3DMujykYGqgNiV2ywxTlMj7NlN2C7
--SRt68fQMZr5iI7rypdxuaZt9lSMD3ENBffYtuLTyZd9a3JPJe1TaIab5GwIDAQAB
--AoGANHXu8z2YIzlhE+bwhGm8MGBpKL3qhRuKjeriqMA36tWezOw8lY4ymEAU+Ulv
--BsCdaxqydQoTYou57m4TyUHEcxq9pq3H0zB0qL709DdHi/t4zbV9XIoAzC5v0/hG
--9+Ca29TwC02FCw+qLkNrtwCpwOcQmc+bPxqvFu1iMiahURECQQD2I/Hi2413CMZz
--TBjl8fMiVO9GhA2J0sc8Qi+YcgJakaLD9xcbaiLkTzPZDlA389C1b6Ia+poAr4YA
--Ve0FFbxpAkEA2OobayyHE/QtPEqoy6NLR57jirmVBNmSWWd4lAyL5UIHIYVttJZg
--8CLvbzaU/iDGwR+wKsM664rKPHEmtlyo4wJBAMeSqYO5ZOCJGu9NWjrHjM3fdAsG
--8zs2zhiLya+fcU0iHIksBW5TBmt71Jw/wMc9R5J1K0kYvFml98653O5si1ECQBCk
--RV4/mE1rmlzZzYFyEcB47DQkcM5ictvxGEsje0gnfKyRtAz6zI0f4QbDRUMJ+LWw
--XK+rMsYHa+SfOb0b9skCQQCLdeonsIpFDv/Uv+flHISy0WA+AFkLXrRkBKh6G/OD
--dMHaNevkJgUnpceVEnkrdenp5CcEoFTI17pd+nBgDm/B
-------END RSA PRIVATE KEY-----
diff --git a/www-client/chromium/files/chromium-system-flac-r0.patch b/www-client/chromium/files/chromium-system-flac-r0.patch
deleted file mode 100644
index a7bc9bbaff5c..000000000000
--- a/www-client/chromium/files/chromium-system-flac-r0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- third_party/flac/flac.h.orig	2011-01-22 14:23:20.000000000 +0000
-+++ third_party/flac/flac.h	2011-01-22 14:24:34.000000000 +0000
-@@ -9,6 +9,10 @@
- // This is a shim header to include the right flac headers.
- // Use this instead of referencing the flac headers directly.
- 
-+#if defined(USE_SYSTEM_FLAC)
-+#include <FLAC/stream_encoder.h>
-+#else
- #include "third_party/flac/include/FLAC/stream_encoder.h"
-+#endif
- 
- #endif  // THIRD_PARTY_FLAC_FLAC_H_
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 df5b2fb4797c..000000000000
--- a/www-client/chromium/files/chromium-system-icu-r0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: chrome/browser/autofill/autofill_country.cc
-diff --git a/chrome/browser/autofill/autofill_country.cc b/chrome/browser/autofill/autofill_country.cc
-index a0f1bc8fcfe4a8f90f9845a101dc90959176600a..f39c6511f0e39f55bf972015c35e6919f8cd7266 100644
---- a/chrome/browser/autofill/autofill_country.cc
-+++ b/chrome/browser/autofill/autofill_country.cc
-@@ -13,12 +13,12 @@
- #include "base/utf_string_conversions.h"
- #include "chrome/browser/browser_process.h"
- #include "grit/generated_resources.h"
--#include "third_party/icu/public/common/unicode/locid.h"
--#include "third_party/icu/public/common/unicode/uloc.h"
--#include "third_party/icu/public/i18n/unicode/coll.h"
--#include "third_party/icu/public/i18n/unicode/ucol.h"
- #include "ui/base/l10n/l10n_util_collator.h"
- #include "ui/base/l10n/l10n_util.h"
-+#include "unicode/coll.h"
-+#include "unicode/locid.h"
-+#include "unicode/ucol.h"
-+#include "unicode/uloc.h"
- 
- namespace {
- 
diff --git a/www-client/chromium/files/chromium-system-speex-r0.patch b/www-client/chromium/files/chromium-system-speex-r0.patch
deleted file mode 100644
index 095082d9b3ed..000000000000
--- a/www-client/chromium/files/chromium-system-speex-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/speech/speech_recognizer.cc.orig	2010-12-22 09:58:16.000000000 +0000
-+++ chrome/browser/speech/speech_recognizer.cc	2010-12-22 09:58:45.000000000 +0000
-@@ -10,7 +10,7 @@
- #include "chrome/browser/browser_thread.h"
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/common/net/url_request_context_getter.h"
--#include "third_party/speex/include/speex/speex.h"
-+#include "speex/speex.h"
- 
- using media::AudioInputController;
- using std::list;
diff --git a/www-client/chromium/files/chromium-system-vpx-r1.patch b/www-client/chromium/files/chromium-system-vpx-r1.patch
deleted file mode 100644
index a5faa49e292f..000000000000
--- a/www-client/chromium/files/chromium-system-vpx-r1.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- remoting/base/encoder_vp8.cc.orig	2010-11-10 09:52:56.000000000 +0100
-+++ remoting/base/encoder_vp8.cc	2010-11-10 09:53:32.000000000 +0100
-@@ -11,9 +11,9 @@
- 
- extern "C" {
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/include/vpx/vpx_codec.h"
--#include "third_party/libvpx/include/vpx/vpx_encoder.h"
--#include "third_party/libvpx/include/vpx/vp8cx.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_encoder.h"
-+#include "vpx/vp8cx.h"
- }
- 
- namespace remoting {
---- remoting/base/decoder_vp8.cc.orig	2010-11-10 09:54:14.000000000 +0100
-+++ remoting/base/decoder_vp8.cc	2010-11-10 09:54:37.000000000 +0100
-@@ -10,9 +10,9 @@
- 
- extern "C" {
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/include/vpx/vpx_codec.h"
--#include "third_party/libvpx/include/vpx/vpx_decoder.h"
--#include "third_party/libvpx/include/vpx/vp8dx.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_decoder.h"
-+#include "vpx/vp8dx.h"
- }
- 
- namespace remoting {
---- third_party/ffmpeg/ffmpeg_stub_headers.fragment.orig	2010-11-10 09:55:43.000000000 +0100
-+++ third_party/ffmpeg/ffmpeg_stub_headers.fragment	2010-11-10 09:56:09.000000000 +0100
-@@ -7,9 +7,9 @@
- #include <libavformat/avformat.h>
- 
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/include/vpx/vpx_codec.h"
--#include "third_party/libvpx/include/vpx/vpx_encoder.h"
--#include "third_party/libvpx/include/vpx/vpx_decoder.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_encoder.h"
-+#include "vpx/vpx_decoder.h"
- 
- typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);
- 
---- third_party/ffmpeg/ffmpeg.gyp.orig	2010-11-19 10:32:50.000000000 +0000
-+++ third_party/ffmpeg/ffmpeg.gyp	2010-11-19 10:36:33.000000000 +0000
-@@ -898,6 +898,16 @@
-               },
-             }],
- 
-+            ['use_system_vpx!=0', {
-+              'direct_dependent_settings': {
-+                'link_settings': {
-+                  'libraries': [
-+                    '-lvpx',
-+                  ],
-+                },
-+              },
-+            }],
-+
-             # Add pkg-config result to include path when use_system_ffmpeg!=0
-             ['use_system_ffmpeg!=0', {
-               'cflags': [
diff --git a/www-client/chromium/files/chromium-system-vpx-r2.patch b/www-client/chromium/files/chromium-system-vpx-r2.patch
deleted file mode 100644
index 258ff5bcc63e..000000000000
--- a/www-client/chromium/files/chromium-system-vpx-r2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- remoting/base/encoder_vp8.cc.orig	2010-11-10 09:52:56.000000000 +0100
-+++ remoting/base/encoder_vp8.cc	2010-11-10 09:53:32.000000000 +0100
-@@ -11,9 +11,9 @@
- 
- extern "C" {
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h"
--#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h"
--#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_encoder.h"
-+#include "vpx/vp8cx.h"
- }
- 
- namespace remoting {
---- remoting/base/decoder_vp8.cc.orig	2010-11-10 09:54:14.000000000 +0100
-+++ remoting/base/decoder_vp8.cc	2010-11-10 09:54:37.000000000 +0100
-@@ -10,9 +10,9 @@
- 
- extern "C" {
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h"
--#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
--#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_decoder.h"
-+#include "vpx/vp8dx.h"
- }
- 
- namespace remoting {
---- third_party/ffmpeg/ffmpeg_stub_headers.fragment.orig	2010-11-10 09:55:43.000000000 +0100
-+++ third_party/ffmpeg/ffmpeg_stub_headers.fragment	2010-11-10 09:56:09.000000000 +0100
-@@ -7,9 +7,9 @@
- #include <libavformat/avformat.h>
- 
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/include/vpx/vpx_codec.h"
--#include "third_party/libvpx/include/vpx/vpx_encoder.h"
--#include "third_party/libvpx/include/vpx/vpx_decoder.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_encoder.h"
-+#include "vpx/vpx_decoder.h"
- 
- typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);
- 
---- third_party/ffmpeg/ffmpeg.gyp.orig	2010-11-19 10:32:50.000000000 +0000
-+++ third_party/ffmpeg/ffmpeg.gyp	2010-11-19 10:36:33.000000000 +0000
-@@ -898,6 +898,16 @@
-               },
-             }],
- 
-+            ['use_system_vpx!=0', {
-+              'direct_dependent_settings': {
-+                'link_settings': {
-+                  'libraries': [
-+                    '-lvpx',
-+                  ],
-+                },
-+              },
-+            }],
-+
-             # Add pkg-config result to include path when use_system_ffmpeg!=0
-             ['use_system_ffmpeg!=0', {
-               'cflags': [
diff --git a/www-client/chromium/files/chromium-system-xdg-utils-r0.patch b/www-client/chromium/files/chromium-system-xdg-utils-r0.patch
deleted file mode 100644
index 143bff4b742a..000000000000
--- a/www-client/chromium/files/chromium-system-xdg-utils-r0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- chrome/chrome_exe.gypi.orig	2011-01-14 16:57:11.000000000 +0000
-+++ chrome/chrome_exe.gypi	2011-01-14 17:00:50.000000000 +0000
-@@ -141,6 +141,7 @@
-       'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC',
-       'variables': {
-         'chrome_exe_target': 1,
-+        'use_system_xdg_utils%': 0,
-       },
-       'conditions': [
-         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-@@ -203,23 +204,27 @@
-             'app/chrome_main.cc',
-             'app/chrome_dll_resource.h',
-           ],
--          'copies': [
--            {
--              'destination': '<(PRODUCT_DIR)',
--              'files': ['tools/build/linux/chrome-wrapper',
--                        '../third_party/xdg-utils/scripts/xdg-mime',
--                        '../third_party/xdg-utils/scripts/xdg-settings',
--                        ],
--              # The wrapper script above may need to generate a .desktop file,
--              # which requires an icon. So, copy one next to the script.
--              'conditions': [
--                ['branding=="Chrome"', {
--                  'files': ['app/theme/google_chrome/product_logo_48.png']
--                }, { # else: 'branding!="Chrome"
--                  'files': ['app/theme/chromium/product_logo_48.png']
--                }],
-+          'conditions': [
-+            ['use_system_xdg_utils==0', {
-+              'copies': [
-+                {
-+                  'destination': '<(PRODUCT_DIR)',
-+                  'files': ['tools/build/linux/chrome-wrapper',
-+                            '../third_party/xdg-utils/scripts/xdg-mime',
-+                            '../third_party/xdg-utils/scripts/xdg-settings',
-+                            ],
-+                  # The wrapper script above may need to generate a .desktop file,
-+                  # which requires an icon. So, copy one next to the script.
-+                  'conditions': [
-+                    ['branding=="Chrome"', {
-+                      'files': ['app/theme/google_chrome/product_logo_48.png']
-+                    }, { # else: 'branding!="Chrome"
-+                      'files': ['app/theme/chromium/product_logo_48.png']
-+                    }],
-+                  ],
-+                },
-               ],
--            },
-+            }],
-           ],
-         }],
-         ['OS=="mac"', {
diff --git a/www-client/chromium/files/chromium-webkit-version.patch b/www-client/chromium/files/chromium-webkit-version.patch
deleted file mode 100644
index 5bcba7ec2a2b..000000000000
--- a/www-client/chromium/files/chromium-webkit-version.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: webkit/build/webkit_version.py
-diff --git a/webkit/build/webkit_version.py b/webkit/build/webkit_version.py
-index 58110727fee9250058c4318e8f50eb402008f741..f488a2ed8242891542925b6aa21e38748268b253 100755
---- a/webkit/build/webkit_version.py
-+++ b/webkit/build/webkit_version.py
-@@ -45,21 +45,24 @@ def GetWebKitRevision(webkit_dir, version_file):
- 
-   # "svn info" tells us what we want, but third_party/WebKit does *not*
-   # point at the upstream repo.  So instead we run svn info on the directory
--  # containing the versioning file (which is some subdirectory of WebKit),
--  # then strip that path back off of the resulting URL.
-+  # containing the versioning file (which is some subdirectory of WebKit).
-   version_file_dir = os.path.dirname(version_file)
-   version_info = lastchange.FetchVersionInfo(
-       default_lastchange=None,
-       directory=os.path.join(webkit_dir, version_file_dir))
- 
--  # Now compute the real WebKit URL by stripping off the version file
--  # directory from the URL we get out of version_info.
--  # Further, we want to strip off the "http://svn..." from the left.
--  # This is the root URL from the repository.
--  assert version_info.url.startswith(version_info.root)
--  assert version_info.url.endswith(version_file_dir)
--  webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)]
--  webkit_url = webkit_url.strip('/')
-+  if (version_info.url.startswith(version_info.root) and
-+      version_info.url.endswith(version_file_dir)):
-+    # Now compute the real WebKit URL by stripping off the version file
-+    # directory from the URL we get out of version_info.
-+    # Further, we want to strip off the "http://svn..." from the left.
-+    # This is the root URL from the repository.
-+    webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)]
-+    webkit_url = webkit_url.strip('/')
-+  else:
-+    # The data isn't as we expect: perhaps they're using git without svn?
-+    # Just dump the output directly.
-+    webkit_url = version_info.url
- 
-   return "%s@%s" % (webkit_url, version_info.revision)
- 
diff --git a/www-client/chromium/files/experimental.gyp b/www-client/chromium/files/experimental.gyp
deleted file mode 100644
index d3bedc29b7f4..000000000000
--- a/www-client/chromium/files/experimental.gyp
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  'targets': [
-    {
-      'target_name': 'i18n_api',
-      'type': 'none',
-    },
-  ],
-}
diff --git a/www-client/chromium/files/flac.gyp b/www-client/chromium/files/flac.gyp
deleted file mode 100644
index 3abd34865ada..000000000000
--- a/www-client/chromium/files/flac.gyp
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  'targets': [
-    {
-      'target_name': 'libflac',
-      'type': 'settings',
-      'direct_dependent_settings': {
-        'defines': [
-          'USE_SYSTEM_FLAC',
-        ],
-      },
-      'link_settings': {
-        'ldflags': [
-          '<!@(pkg-config --libs-only-L --libs-only-other flac)',
-        ],
-        'libraries': [
-          '<!@(pkg-config --libs-only-l flac)',
-        ],
-      },
-    },
-  ],
-}
diff --git a/www-client/chromium/files/speex.gyp b/www-client/chromium/files/speex.gyp
deleted file mode 100644
index 43bcc51d55e2..000000000000
--- a/www-client/chromium/files/speex.gyp
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  'targets': [
-    {
-      'target_name': 'libspeex',
-      'type': 'settings',
-      'direct_dependent_settings': {
-        'cflags': [
-          '<!@(pkg-config --cflags speex)',	
-        ],
-      },
-      'link_settings': {
-        'ldflags': [
-          '<!@(pkg-config --libs-only-L --libs-only-other speex)',
-        ],
-        'libraries': [
-          '<!@(pkg-config --libs-only-l speex)',
-        ],
-      },
-    },
-  ],
-}
diff --git a/www-client/chromium/files/v8.gyp b/www-client/chromium/files/v8.gyp
deleted file mode 100644
index d37920732883..000000000000
--- a/www-client/chromium/files/v8.gyp
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2009-2010 the V8 project authors. All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of Google Inc. nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-{
-  'variables': {
-    'msvs_use_common_release': 0,
-    'gcc_version%': 'unknown',
-    'v8_target_arch%': '<(target_arch)',
-    'v8_use_snapshot%': 'true',
-  },
-  'targets': [
-    {
-      'target_name': 'v8',
-      'type': 'settings',
-      'link_settings': {
-        'libraries': [
-          '-lv8',
-        ],
-      },
-    },
-    {
-      'target_name': 'v8_snapshot',
-      'type': 'none',
-      'dependencies': [
-        'v8'
-      ],
-    },
-    {
-      'target_name': 'v8_nosnapshot',
-      'type': 'none',
-      'dependencies': [
-        'v8'
-      ],
-    },
-    {
-      'target_name': 'v8_base',
-      'type': 'none',
-      'dependencies': [
-        'v8'
-      ],
-    },
-    {
-      'target_name': 'js2c',
-      'type': 'none',
-      'dependencies': [
-        'v8'
-      ],
-    },
-    {
-      'target_name': 'mksnapshot',
-      'type': 'none',
-      'dependencies': [
-        'v8'
-      ],
-    },
-    {
-      'target_name': 'v8_shell',
-      'type': 'none',
-      'dependencies': [
-        'v8'
-      ],
-    },
-  ],
-}