Remove unused files from FILESDIR.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

15 files changed, 15 insertions, 339 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 6d63b108c1fd..8224f3718c16 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,16 @@
 # 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.450 2011/09/26 23:07:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.451 2011/09/26 23:18:54 floppym Exp $
+
+  26 Sep 2011; Mike Gilbert <floppym@gentoo.org> -files/chromium.xml,
+  -files/chromium-cups-r0.patch, -files/chromium-kerberos-r1.patch,
+  -files/chromium-system-libevent-r1.patch,
+  -files/chromium-glibc-2.14-r0.patch, -files/chromium-ffmpeg-build-r0.patch,
+  -files/chromium-kerberos-r0.patch, -files/chromium-launcher-r1.sh,
+  -files/chromium-libgcrypt-r0.patch, -files/chromium-system-vpx-r3.patch,
+  -files/chromium-perl-5.14-r0.patch, -files/chromium-system-vpx-r4.patch,
+  -files/chromium-system-zlib-r0.patch:
+  Remove unused files from FILESDIR.
 
   26 Sep 2011; Mike Gilbert <floppym@gentoo.org> -chromium-13.0.782.215.ebuild,
   -chromium-13.0.782.220.ebuild, -chromium-14.0.835.162.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 2cd3864a37ca..ea7b447f89f8 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,23 +2,10 @@
 Hash: SHA256
 
 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
-AUX chromium-cups-r0.patch 1237 RMD160 601fc9a46027580a1817a77abfb47b2b59e212ca SHA1 9826e90746229c7c12d767bb3b6cbdbc5c300041 SHA256 594af80456d977a19949909a7c79cae706964f7ced47634c9c9b19478dc089a2
-AUX chromium-ffmpeg-build-r0.patch 774 RMD160 a11ebd15927195fb047a366b1f9ab412a35d1262 SHA1 1972826179eed503f70a1499521072eb99c1fd16 SHA256 205a136035d09fb88549dfe4dbb97508e43a46f35ca791efa79d6c401aea5d84
-AUX chromium-glibc-2.14-r0.patch 1508 RMD160 6f8e88858cb02b825e512d1f030e681dbe1699b3 SHA1 c70e6dc5379f934ce726aa9ee46cd9db1ffefbbb SHA256 c434606b1599a47d8905d33c22dd65dd950d322108860572c55532189434a8ee
 AUX chromium-icu-compatibility-r0.patch 1659 RMD160 5d1fcc18d27b96f0c1b4f14b24dd8ab40ce917ca SHA1 517155769d0f421a4a81bffbcac39d17fa099956 SHA256 f70d99472d56e0aa7398b5638412d440d22943eb2c5962957f973e90992fdc99
-AUX chromium-kerberos-r0.patch 756 RMD160 24531a656e2a745d6961f806b62324d076628a8e SHA1 d66ea3176cc5a9ea1201950dd7797b077313ec03 SHA256 7e911e82ba80d94bcefc413dff82b076d6f0215abe883bd1f4a9cc71fd223b13
-AUX chromium-kerberos-r1.patch 905 RMD160 cb57cfe2db38bcba60bf83f43f15ca1d9a59b1fa SHA1 c552daea570cf3e3c29f762d383fb56ef6547e8f SHA256 2582f7f08f41b6f3c3ff4a0f74f372366eec767ac2701cb23c53b1a3e1806ed9
-AUX chromium-launcher-r1.sh 680 RMD160 17fdc3576819c41d9320fab4b2dde3b8dc3c251b SHA1 5be5d25be14906458eb93cd7275c47f73c55fce4 SHA256 fa9cd53ee929ac77a52abc09eb65bb605b72b384533ba52fb90a905c72c3c208
 AUX chromium-launcher-r2.sh 940 RMD160 7a64e597998a8f95a7e3d1c26377842ff8106f89 SHA1 9630a36af707a810cbd646f3bac5deba984439f6 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e
-AUX chromium-libgcrypt-r0.patch 436 RMD160 855ecc89bd61f95378dc5aa5726b48cac7ede92c SHA1 3346e667a6581f7f62020ebc16fbf608c3a47cb6 SHA256 a81c598f544278a5638f3707db8a2fab85173e93b9a3ff097648babe58b665b0
-AUX chromium-perl-5.14-r0.patch 1062 RMD160 3e3205f298ae15bfc886160611508da975764edc SHA1 c23076b04b1a1f12c31cd203077c3c93e407840f SHA256 3e4f19cfd21a6f5526bb7fd2e7ecf6f78f55d2b9f5536ec926b78d44f7765975
 AUX chromium-system-libevent-r0.patch 404 RMD160 0dc32cfbd0770e4be1b6f9d3cf8ac08987a5992d SHA1 f6127a903eeb4ce13a4f8fc75dda0102e68d759a SHA256 127945ad45ede0e2aefbc28d8d5eb241675abb83f3aedc2569133e437f98a841
-AUX chromium-system-libevent-r1.patch 400 RMD160 6685c2cf563abc14558e277bf1e96ee1cd85b1f7 SHA1 f2a452f7a3b45008ffcb50d7cc65b30bfd8aca98 SHA256 dd8aa91d1d95c20b7716667445f064b5469be79a31e0bf7df39b997192e0eba3
-AUX chromium-system-vpx-r3.patch 1168 RMD160 3f59b6dfff335be21b55de70ccd9a77b008f5cd0 SHA1 09d1d4a6b0b031839d002abc62ec4efef6faef71 SHA256 c46f61559bdbd7e29bb47607f0b152647f73e2cc3e836f53c67bb2925e8957d7
-AUX chromium-system-vpx-r4.patch 476 RMD160 ff7feff7dff9de28bdc4c80b43c9574d7769a288 SHA1 b87516b0dac8f65431fdce86f26a3c92cfc313af SHA256 6bf0801a8d4ff208f558fa5740adfbed6178d391314297c80e0c3a058910a10e
-AUX chromium-system-zlib-r0.patch 1318 RMD160 2debfc4f179a57119d5022305134307f4cbbe04d SHA1 036e7573b04046ee0275abcb99a7e7a8b490e47b SHA256 79668fbf6206cd958db328798298a0514d3a95683b41affd3a607a0ac95453e3
 AUX chromium.default 147 RMD160 4c0669585499b94c225e34e985e615d0299b66fb SHA1 1cdcbcd4a3517f70ba67c749da95c2a307971846 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df950c1d9472b589d9
-AUX chromium.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf
 AUX nacl.gypi 98 RMD160 fa4806fbc8c2e19763c1905a3bc431022b247825 SHA1 df4cee39e1d49e10f9c075f5e6e9db28e8260926 SHA256 25bddd2eee7821e18ddda06f6e69552c359e1c04a10971ac3985556c3d8ef059
 DIST chromium-14.0.835.163.tar.bz2 155868619 RMD160 36009ea3db7270a90ffe9d77ba3a52d86d5d5a84 SHA1 f38e8835f4c12a61734eb99ee0a16d1386e2726d SHA256 2a16908fce65fda294448c43ec16dbbe3ff07603f0695126e5e845f727c6b5aa
@@ -28,12 +15,12 @@ EBUILD chromium-14.0.835.163.ebuild 13690 RMD160 517fe75786dabe160892afa24d3e0f3
 EBUILD chromium-15.0.874.15.ebuild 14066 RMD160 a9a633e0c69d10def0e4fa9b5b24b243a83e7a5d SHA1 20b313a3bc24f143a387a8cc45c169ad7366a5a9 SHA256 a983db355f72d76b9396df8a4751c1b0d94fb548f1f8e2f8d94ba015b1fd02fb
 EBUILD chromium-15.0.874.21.ebuild 14069 RMD160 4815764356b9d3635e321a92d350b310481433a3 SHA1 00d034231ba33bb43f8f2d6245c429eeb3647f60 SHA256 c85e18151374f7322fe6a9d5d0420f0afc972bb3f997269657dfa47bdc463564
 EBUILD chromium-9999-r1.ebuild 16651 RMD160 77d0c708ea3729d78f3344be783d79bd2dee46d8 SHA1 b707a400622bf548e3d883eb5c0e4e55b5da47a7 SHA256 6ff63c2455a1ee708c76ba30f448e08c38f97d61572ea3b9a3430422ddeab867
-MISC ChangeLog 99483 RMD160 a5fb8554c40a55bc43e07c0f47c0457b0bdd2942 SHA1 53d92897487efd7f06543f0675772f3edd327907 SHA256 c623e0a3822da1219e3e9369dcc62cf484b3a0b6c803ae599621f0b132525018
+MISC ChangeLog 100040 RMD160 b14dface6fc9da053ac211bfc115a2ae646f52a3 SHA1 33e345e79f8d97aafbeeae6036938cb46904713b SHA256 0e351dfde31efefa66a956f44e11d13471843efd2ecd7e7966560335f2dc69ca
 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6BBa8ACgkQC77qH+pIQ6S3LgD+N6vQua2kNS+Y++DvFFbPcAhm
-xhdU+ihkr7f6AEFcPhMBAJ0Yg3cPkAwhJbJl6c6gqsS44sxfPU3w3SPi9nhbHugV
-=POei
+iF4EAREIAAYFAk6BCGYACgkQC77qH+pIQ6TdLQEAp/HTYHMq/cHWxQ8OQQoyE4Hv
+m/nLdsh3l+l3OvKEFvYA/Amos4fOIsADGVUMqO7BiUqtnxrGZlQhzeYlxWJUg8qN
+=h3oG
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/files/chromium-cups-r0.patch b/www-client/chromium/files/chromium-cups-r0.patch
deleted file mode 100644
index 5d0808c049de..000000000000
--- a/www-client/chromium/files/chromium-cups-r0.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- chrome/browser/ui/webui/print_preview_handler.cc.orig	2011-04-23 09:05:25.000000000 +0200
-+++ chrome/browser/ui/webui/print_preview_handler.cc	2011-04-23 09:13:07.000000000 +0200
-@@ -28,7 +28,7 @@
- #include "printing/metafile_impl.h"
- #include "printing/print_job_constants.h"
- 
--#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-+#if defined(CP_PRINT_SYSTEM_AVAILABLE)
- #include <cups/cups.h>
- 
- #include "base/file_util.h"
-@@ -42,7 +42,7 @@
- const char kDisableColorOption[] = "disableColorOption";
- const char kSetColorAsDefault[] = "setColorAsDefault";
- 
--#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-+#if defined(CP_PRINT_SYSTEM_AVAILABLE)
- const char kColorDevice[] = "ColorDevice";
- #endif
- 
-@@ -131,7 +131,7 @@
-       return;
-     }
- 
--  #if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-+#if defined(CP_PRINT_SYSTEM_AVAILABLE)
-     FilePath ppd_file_path;
-     if (!file_util::CreateTemporaryFile(&ppd_file_path))
-       return;
-@@ -153,9 +153,9 @@
-       ppdClose(ppd);
-     }
-     file_util::Delete(ppd_file_path, false);
--  #elif defined(OS_WIN) || defined(OS_CHROMEOS)
-+#else
-     NOTIMPLEMENTED();
--  #endif
-+#endif
- 
-     DictionaryValue settings_info;
-     settings_info.SetBoolean(kDisableColorOption, !supports_color);
diff --git a/www-client/chromium/files/chromium-ffmpeg-build-r0.patch b/www-client/chromium/files/chromium-ffmpeg-build-r0.patch
deleted file mode 100644
index b46017d5e2a1..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-build-r0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: media/ffmpeg/ffmpeg_common.h
-diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
-index ac1774a5b1dc7a80aee96e7e35fa2f5366e8f589..46dbe07bf5dad14e897b21b7f479776127ff7ef7 100644
---- a/media/ffmpeg/ffmpeg_common.h
-+++ b/media/ffmpeg/ffmpeg_common.h
-@@ -19,11 +19,15 @@ extern "C" {
- // 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>
- #include <libavutil/log.h>
-+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(50, 38, 0)
-+#include <libavutil/samplefmt.h>
-+#else
-+#include <libavcore/samplefmt.h>
-+#endif
- MSVC_POP_WARNING();
- }  // extern "C"
- 
diff --git a/www-client/chromium/files/chromium-glibc-2.14-r0.patch b/www-client/chromium/files/chromium-glibc-2.14-r0.patch
deleted file mode 100644
index be7fdcd32a35..000000000000
--- a/www-client/chromium/files/chromium-glibc-2.14-r0.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- third_party/tcmalloc/chromium/src/tcmalloc.cc.orig	2011-06-23 13:45:05.000000000 +0200
-+++ third_party/tcmalloc/chromium/src/tcmalloc.cc	2011-06-23 13:47:51.000000000 +0200
-@@ -135,6 +135,10 @@
- # define WIN32_DO_PATCHING 1
- #endif
- 
-+#if !defined(__MALLOC_HOOK_VOLATILE)
-+#define __MALLOC_HOOK_VOLATILE
-+#endif
-+
- using std::max;
- using tcmalloc::PageHeap;
- using tcmalloc::SizeMap;
-@@ -375,7 +379,7 @@
-   return tc_malloc(size);
- }
- 
--void* (*__malloc_hook)(
-+void* (*__MALLOC_HOOK_VOLATILE __malloc_hook)(
-     size_t size, const void* caller) = tc_ptmalloc_malloc_hook;
- 
- static void* tc_ptmalloc_realloc_hook(
-@@ -383,14 +387,14 @@
-   return tc_realloc(ptr, size);
- }
- 
--void* (*__realloc_hook)(
-+void* (*__MALLOC_HOOK_VOLATILE __realloc_hook)(
-     void* ptr, size_t size, const void* caller) = tc_ptmalloc_realloc_hook;
- 
- static void tc_ptmalloc_free_hook(void* ptr, const void* caller) {
-   tc_free(ptr);
- }
- 
--void (*__free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook;
-+void (*__MALLOC_HOOK_VOLATILE __free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook;
- 
- #endif
- 
-@@ -1584,7 +1588,7 @@
-   MallocHook::InvokeNewHook(result, size);
-   return result;
- }
--void *(*__memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
-+void *(*__MALLOC_HOOK_VOLATILE __memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
- #endif  // #ifndef TCMALLOC_FOR_DEBUGALLOCATION
- 
- // ---Double free() debugging implementation -----------------------------------
diff --git a/www-client/chromium/files/chromium-kerberos-r0.patch b/www-client/chromium/files/chromium-kerberos-r0.patch
deleted file mode 100644
index b38748b1b74d..000000000000
--- a/www-client/chromium/files/chromium-kerberos-r0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: net/http/http_auth.cc
-diff --git a/net/http/http_auth.cc b/net/http/http_auth.cc
-index 23e26637f95242fab9b8858776c8135163fa8ffc..2e42b064a4fd707a087fa31dc327ce6c8febe706 100644
---- a/net/http/http_auth.cc
-+++ b/net/http/http_auth.cc
-@@ -9,10 +9,8 @@
- #include "base/basictypes.h"
- #include "base/string_util.h"
- #include "net/base/net_errors.h"
--#include "net/http/http_auth_handler_basic.h"
--#include "net/http/http_auth_handler_digest.h"
--#include "net/http/http_auth_handler_negotiate.h"
--#include "net/http/http_auth_handler_ntlm.h"
-+#include "net/http/http_auth_handler.h"
-+#include "net/http/http_auth_handler_factory.h"
- #include "net/http/http_request_headers.h"
- #include "net/http/http_response_headers.h"
- #include "net/http/http_util.h"
diff --git a/www-client/chromium/files/chromium-kerberos-r1.patch b/www-client/chromium/files/chromium-kerberos-r1.patch
deleted file mode 100644
index ebe6bb3c6a54..000000000000
--- a/www-client/chromium/files/chromium-kerberos-r1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: net/http/http_auth_gssapi_posix.cc
-diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc
-index cc27e70b18af1375bdb7fcd28d83fb3339a122cf..37b28df8f845cd2a597b887377bd0703f93c52c1 100644
---- a/net/http/http_auth_gssapi_posix.cc
-+++ b/net/http/http_auth_gssapi_posix.cc
-@@ -17,7 +17,6 @@
- #include "net/base/net_errors.h"
- #include "net/base/net_util.h"
- 
--#if defined(DLOPEN_KERBEROS)
- // These are defined for the GSSAPI library:
- // Paraphrasing the comments from gssapi.h:
- // "The implementation must reserve static storage for a
-@@ -63,7 +62,6 @@ gss_OID GSS_C_NT_HOSTBASED_SERVICE_X = &GSS_C_NT_HOSTBASED_SERVICE_X_VAL;
- gss_OID GSS_C_NT_HOSTBASED_SERVICE = &GSS_C_NT_HOSTBASED_SERVICE_VAL;
- gss_OID GSS_C_NT_ANONYMOUS = &GSS_C_NT_ANONYMOUS_VAL;
- gss_OID GSS_C_NT_EXPORT_NAME = &GSS_C_NT_EXPORT_NAME_VAL;
--#endif  // defined(DLOPEN_KERBEROS)
- 
- namespace net {
- 
diff --git a/www-client/chromium/files/chromium-launcher-r1.sh b/www-client/chromium/files/chromium-launcher-r1.sh
deleted file mode 100644
index 761e56148d98..000000000000
--- a/www-client/chromium/files/chromium-launcher-r1.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# 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-browser-chromium.desktop"
-
-exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins "$@"
diff --git a/www-client/chromium/files/chromium-libgcrypt-r0.patch b/www-client/chromium/files/chromium-libgcrypt-r0.patch
deleted file mode 100644
index d75a06a27445..000000000000
--- a/www-client/chromium/files/chromium-libgcrypt-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/linux/system.gyp.orig	2011-06-28 07:58:51.000000000 +0000
-+++ build/linux/system.gyp	2011-06-28 08:00:05.000000000 +0000
-@@ -314,7 +314,7 @@
-       'target_name': 'libgcrypt',
-       'type': 'settings',
-       'conditions': [
--        ['_toolset=="target"', {
-+        ['_toolset=="target" and use_cups==1', {
-           'direct_dependent_settings': {
-             'cflags': [
-               '<!@(libgcrypt-config --cflags)',
diff --git a/www-client/chromium/files/chromium-perl-5.14-r0.patch b/www-client/chromium/files/chromium-perl-5.14-r0.patch
deleted file mode 100644
index 40d6ea35357c..000000000000
--- a/www-client/chromium/files/chromium-perl-5.14-r0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: third_party/WebKit/Source/WebCore/make-hash-tools.pl
-===================================================================
---- third_party/WebKit/Source/WebCore/make-hash-tools.pl	(revision 72664)
-+++ third_party/WebKit/Source/WebCore/make-hash-tools.pl	(revision 89265)
-@@ -21,5 +21,4 @@
- 
- use strict;
--use Switch;
- use File::Basename;
- 
-@@ -29,7 +28,5 @@
- 
- 
--switch ($option) {
--
--case "DocTypeStrings" {
-+if ($option eq "DocTypeStrings") {
- 
-     my $docTypeStringsGenerated    = "$outdir/DocTypeStrings.cpp";
-@@ -39,7 +36,5 @@
-     system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?";
- 
--} # case "DocTypeStrings"
--
--case "ColorData" {
-+} elsif ($option eq "ColorData") {
- 
-     my $colorDataGenerated         = "$outdir/ColorData.cpp";
-@@ -49,5 +44,5 @@
-     system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?";
- 
--} # case "ColorData"
--
--} # switch ($option)
-+} else {
-+    die "Unknown option.";
-+}
diff --git a/www-client/chromium/files/chromium-system-libevent-r1.patch b/www-client/chromium/files/chromium-system-libevent-r1.patch
deleted file mode 100644
index 24f30880858e..000000000000
--- a/www-client/chromium/files/chromium-system-libevent-r1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- third_party/libevent/libevent.gyp.orig	2011-08-12 19:02:14.000000000 +0200
-+++ third_party/libevent/libevent.gyp	2011-08-12 19:02:50.000000000 +0200
-@@ -67,6 +67,7 @@
-         {
-           'target_name': 'libevent',
-           'type': 'settings',
-+          'toolsets': ['host', 'target'],
-           'direct_dependent_settings': {
-             'defines': [
-               'USE_SYSTEM_LIBEVENT',
diff --git a/www-client/chromium/files/chromium-system-vpx-r3.patch b/www-client/chromium/files/chromium-system-vpx-r3.patch
deleted file mode 100644
index de1590943554..000000000000
--- a/www-client/chromium/files/chromium-system-vpx-r3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- remoting/remoting.gyp.orig	2011-03-10 14:43:29.000000000 +0000
-+++ remoting/remoting.gyp	2011-03-10 14:44:50.000000000 +0000
-@@ -127,6 +127,7 @@
-         '../ui/gfx/gfx.gyp:gfx',
-         '../media/media.gyp:media',
-         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-+        '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-         '../third_party/libvpx/libvpx.gyp:libvpx_include',
-         '../third_party/zlib/zlib.gyp:zlib',
-         'chromoting_jingle_glue',
---- third_party/ffmpeg/ffmpeg.gyp.orig	2011-03-10 15:39:13.000000000 +0000
-+++ third_party/ffmpeg/ffmpeg.gyp	2011-03-10 15:39:41.000000000 +0000
-@@ -728,11 +728,14 @@
-                 '../libvpx/include',
-               ],
-             }, { # use_system_vpx != 0
-+              'defines': [
-+                'USE_SYSTEM_VPX',
-+              ],
-               'direct_dependent_settings': {
-+                'defines': [
-+                  'USE_SYSTEM_VPX',
-+                ],
-                 'link_settings': {
--                  'defines': [
--                    'USE_SYSTEM_VPX',
--                  ],
-                   'libraries': [
-                     '-lvpx',
-                   ],
diff --git a/www-client/chromium/files/chromium-system-vpx-r4.patch b/www-client/chromium/files/chromium-system-vpx-r4.patch
deleted file mode 100644
index 35500654ba15..000000000000
--- a/www-client/chromium/files/chromium-system-vpx-r4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- remoting/remoting.gyp.orig	2011-03-10 14:43:29.000000000 +0000
-+++ remoting/remoting.gyp	2011-03-10 14:44:50.000000000 +0000
-@@ -127,6 +127,7 @@
-         '../ui/gfx/gfx.gyp:gfx',
-         '../media/media.gyp:media',
-         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-+        '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-         '../third_party/libvpx/libvpx.gyp:libvpx_include',
-         '../third_party/zlib/zlib.gyp:zlib',
-         'chromoting_jingle_glue',
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 894525de69cd..000000000000
--- a/www-client/chromium/files/chromium-system-zlib-r0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- content/browser/renderer_host/clipboard_message_filter.cc.orig	2011-04-21 12:29:49.000000000 +0200
-+++ content/browser/renderer_host/clipboard_message_filter.cc	2011-04-21 12:31:14.000000000 +0200
-@@ -4,6 +4,12 @@
- 
- #include "content/browser/renderer_host/clipboard_message_filter.h"
- 
-+#if defined(USE_SYSTEM_ZLIB)
-+#include <zlib.h>
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
-+
- #include "base/stl_util-inl.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/clipboard_dispatcher.h"
-@@ -11,7 +17,6 @@
- #include "googleurl/src/gurl.h"
- #include "ipc/ipc_message_macros.h"
- #include "third_party/skia/include/core/SkBitmap.h"
--#include "third_party/zlib/zlib.h"
- #include "ui/gfx/codec/png_codec.h"
- #include "ui/gfx/size.h"
- 
---- content/content_browser.gypi.orig	2011-04-21 12:32:18.000000000 +0200
-+++ content/content_browser.gypi	2011-04-21 12:32:56.000000000 +0200
-@@ -13,7 +13,8 @@
-         '../ppapi/ppapi.gyp:ppapi_proxy',
-         '../skia/skia.gyp:skia',
-         '../third_party/flac/flac.gyp:libflac',
--        '../third_party/speex/speex.gyp:libspeex',
-+        '../third_party/speex/speex.gyp:libspeex',	
-+        '../third_party/zlib/zlib.gyp:zlib',
-         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-         '../ui/ui.gyp:ui_base',
-       ],
diff --git a/www-client/chromium/files/chromium.xml b/www-client/chromium/files/chromium.xml
deleted file mode 100644
index 2c95a5584b33..000000000000
--- a/www-client/chromium/files/chromium.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd">
-<default-apps>
-  <web-browsers>
-    <web-browser>
-      <name>Chromium</name>
-      <executable>chromium-browser</executable>
-      <command>chromium-browser %s</command>
-      <icon-name>chromium-browser</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </web-browser>
-  </web-browsers>
-</default-apps>