Remove unused files from FILESDIR.

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

14 files changed, 11 insertions, 322 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/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>