Remvoe obsolete patches.

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

34 files changed, 20 insertions, 789 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index d18a31d55801..e0db015628e7 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1145 2014/10/09 13:26:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1146 2014/10/10 02:01:33 floppym Exp $
+
+  10 Oct 2014; Mike Gilbert <floppym@gentoo.org> -files/chromium-angle-r0.patch,
+  -files/chromium-angle-r1.patch, -files/chromium-arm-r0.patch,
+  -files/chromium-blink-crash-r0.patch, -files/chromium-build_ffmpeg-r0.patch,
+  -files/chromium-chromedriver-r0.patch, -files/chromium-cups-r0.patch,
+  -files/chromium-d8-r0.patch, -files/chromium-depot-tools-r0.patch,
+  -files/chromium-ffmpeg-r0.patch, -files/chromium-ffmpeg-r1.patch,
+  -files/chromium-ffmpeg-r2.patch, -files/chromium-ffmpeg-r3.patch,
+  -files/chromium-gn-r0.patch, -files/chromium-gn-r1.patch,
+  -files/chromium-gn-r2.patch, -files/chromium-gnome-keyring-r0.patch,
+  -files/chromium-gpsd-r0.patch, -files/chromium-libaddressinput-r0.patch,
+  -files/chromium-nacl-r0.patch, -files/chromium-pnacl-r0.patch,
+  -files/chromium-system-harfbuzz-r0.patch, -files/chromium-system-icu-r0.patch,
+  -files/chromium-system-jinja-r0.patch, -files/chromium-system-jinja-r1.patch,
+  -files/chromium-system-jinja-r2.patch, -files/chromium-system-jinja-r3.patch,
+  -files/chromium-system-jinja-r4.patch, -files/chromium-system-jinja-r5.patch,
+  -files/chromium-system-libjpeg-r0.patch, -files/chromium-system-ply-r0.patch,
+  -files/chromium-system-ply-r1.patch, -files/chromium-system-zlib-r0.patch:
+  Remvoe obsolete patches.
 
   09 Oct 2014; Agostino Sarubbo <ago@gentoo.org> -chromium-37.0.2062.120.ebuild,
   -chromium-38.0.2125.77.ebuild:
diff --git a/www-client/chromium/files/chromium-angle-r0.patch b/www-client/chromium/files/chromium-angle-r0.patch
deleted file mode 100644
index 05c1f3a14305..000000000000
--- a/www-client/chromium/files/chromium-angle-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/angle/src/angle.gypi.orig	2014-06-03 15:21:44.892885543 +0000
-+++ third_party/angle/src/angle.gypi	2014-06-03 15:22:07.833345520 +0000
-@@ -56,7 +56,7 @@
-                         {
-                             'action_name': 'Generate Commit ID Header',
-                             'message': 'Generating commit ID header...',
--                            'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.py', '<(angle_path)/.git/index' ],
-+                            'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.py' ],
-                             'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit.h' ],
-                             'action': [ 'python', '<(SHARED_INTERMEDIATE_DIR)/commit_id.py', '<(SHARED_INTERMEDIATE_DIR)/commit.h' ],
-                         },
diff --git a/www-client/chromium/files/chromium-angle-r1.patch b/www-client/chromium/files/chromium-angle-r1.patch
deleted file mode 100644
index ab9b45f815ce..000000000000
--- a/www-client/chromium/files/chromium-angle-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/third_party/angle/src/angle.gypi
-+++ b/third_party/angle/src/angle.gypi
-@@ -52,7 +52,7 @@
-                             'action_name': 'Generate ANGLE Commit ID Header',
-                             'message': 'Generating ANGLE Commit ID',
-                             # reference the git index as an input, so we rebuild on changes to the index
--                            'inputs': [ '<(angle_id_script)', '<(angle_path)/.git/index' ],
-+                            'inputs': [ '<(angle_id_script)' ],
-                             'outputs': [ '<(angle_id_header)' ],
-                             'msvs_cygwin_shell': 0,
-                             'action':
diff --git a/www-client/chromium/files/chromium-arm-r0.patch b/www-client/chromium/files/chromium-arm-r0.patch
deleted file mode 100644
index df02e2434929..000000000000
--- a/www-client/chromium/files/chromium-arm-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/icu/icu.gyp.orig	2014-03-16 17:49:02.561203814 -0500
-+++ third_party/icu/icu.gyp	2014-03-16 17:49:23.191037086 -0500
-@@ -30,7 +30,7 @@
-       }],
-       ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
-          or OS=="netbsd" or OS=="mac" or OS=="android") and \
--        (target_arch=="arm" or target_arch=="ia32" or \
-+        (target_arch=="ia32" or \
-          target_arch=="mipsel")', {
-         'target_conditions': [
-           ['_toolset=="host"', {
diff --git a/www-client/chromium/files/chromium-blink-crash-r0.patch b/www-client/chromium/files/chromium-blink-crash-r0.patch
deleted file mode 100644
index 436a06505480..000000000000
--- a/www-client/chromium/files/chromium-blink-crash-r0.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Backport https://codereview.chromium.org/64243002/ to fix a renderer crash.
---- third_party/WebKit/Source/platform/fonts/AlternateFontFamily.h.orig	2013-11-07 18:46:58.174333486 +0000
-+++ third_party/WebKit/Source/platform/fonts/AlternateFontFamily.h	2013-11-07 18:47:13.974434037 +0000
-@@ -117,9 +117,8 @@
-     case FontDescription::MonospaceFamily:
-         return monospaceStr;
-     case FontDescription::SansSerifFamily:
--        return sansStr;
-     default:
--        return AtomicString();
-+        return sansStr;
-     }
- }
- 
diff --git a/www-client/chromium/files/chromium-build_ffmpeg-r0.patch b/www-client/chromium/files/chromium-build_ffmpeg-r0.patch
deleted file mode 100644
index da7ea1cf202b..000000000000
--- a/www-client/chromium/files/chromium-build_ffmpeg-r0.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Fix HOST_OS detection in build_ffpeg.sh
-https://bugs.gentoo.org/show_bug.cgi?id=491466
-
-Enable gold linker
-https://bugs.gentoo.org/show_bug.cgi?id=491850
-
---- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh
-+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh
-@@ -75,7 +75,7 @@
- LIBAVUTIL_VERSION_MAJOR=52
- 
- case $(uname -sm) in
--  Linux\ i386)
-+  Linux\ i?86)
-     HOST_OS=linux
-     HOST_ARCH=ia32
-     JOBS=$(grep processor /proc/cpuinfo | wc -l)
-@@ -85,6 +85,11 @@
-     HOST_ARCH=x64
-     JOBS=$(grep processor /proc/cpuinfo | wc -l)
-     ;;
-+  Linux\ arm*)
-+    HOST_OS=linux
-+    HOST_ARCH=arm
-+    JOBS=$(grep processor /proc/cpuinfo | wc -l)
-+    ;;
-   Darwin\ i386)
-     HOST_OS=mac
-     HOST_ARCH=ia32
-@@ -117,14 +122,6 @@
- echo "LD          = $(ld --version | head -n1)"
- echo
- 
--# As of this writing gold 2.20.1-system.20100303 is unable to link FFmpeg.
--if ld --version | grep -q gold; then
--  echo "gold is unable to link FFmpeg"
--  echo
--  echo "Switch /usr/bin/ld to the regular binutils ld and try again"
--  exit 1
--fi
--
- # We want to use a sufficiently recent version of yasm on Windows.
- if [[ "$TARGET_OS" == "win" || "$TARGET_OS" == "win-vs2013" ]]; then
-   if !(which yasm 2>&1 > /dev/null); then
-@@ -292,14 +289,16 @@
-     add_flag_common --extra-cflags=-m32
-     add_flag_common --extra-ldflags=-m32
-   elif [ "$TARGET_ARCH" = "arm" ]; then
--    # This if-statement essentially is for chroot tegra2.
--    add_flag_common --enable-cross-compile
-+    if [ "$HOST_ARCH" != "arm" ]; then
-+      # This if-statement essentially is for chroot tegra2.
-+      add_flag_common --enable-cross-compile
- 
--    # Location is for CrOS chroot. If you want to use this, enter chroot
--    # and copy ffmpeg to a location that is reachable.
--    add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
--    add_flag_common --target-os=linux
--    add_flag_common --arch=arm
-+      # Location is for CrOS chroot. If you want to use this, enter chroot
-+      # and copy ffmpeg to a location that is reachable.
-+      add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
-+      add_flag_common --target-os=linux
-+      add_flag_common --arch=arm
-+    fi
- 
-     # TODO(ihf): ARM compile flags are tricky. The final options
-     # overriding everything live in chroot /build/*/etc/make.conf
-@@ -322,11 +321,13 @@
-     # NOTE: softfp/hardfp selected at gyp time.
-     add_flag_common --extra-cflags=-mfloat-abi=hard
-   elif [ "$TARGET_ARCH" = "arm-neon" ]; then
--    # This if-statement is for chroot arm-generic.
--    add_flag_common --enable-cross-compile
--    add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
--    add_flag_common --target-os=linux
--    add_flag_common --arch=arm
-+    if [ "$HOST_ARCH" != "arm" ]; then
-+      # This if-statement is for chroot arm-generic.
-+      add_flag_common --enable-cross-compile
-+      add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi-
-+      add_flag_common --target-os=linux
-+      add_flag_common --arch=arm
-+    fi
-     add_flag_common --enable-armv6
-     add_flag_common --enable-armv6t2
-     add_flag_common --enable-vfp
diff --git a/www-client/chromium/files/chromium-chromedriver-r0.patch b/www-client/chromium/files/chromium-chromedriver-r0.patch
deleted file mode 100644
index d43941ad610b..000000000000
--- a/www-client/chromium/files/chromium-chromedriver-r0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- chrome/test/chromedriver/embed_version_in_cpp.py.orig	2013-09-27 18:44:27.221221038 +0000
-+++ chrome/test/chromedriver/embed_version_in_cpp.py	2013-09-27 18:44:59.861416643 +0000
-@@ -25,9 +25,8 @@
-   options, args = parser.parse_args()
- 
-   version = open(options.version_file, 'r').read().strip()
--  revision = lastchange.FetchVersionInfo(None).revision.strip()
-   global_string_map = {
--      'kChromeDriverVersion': version + '.' + revision
-+      'kChromeDriverVersion': version
-   }
-   cpp_source.WriteSource('version',
-                          'chrome/test/chromedriver',
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 3ab0d59c7fef..000000000000
--- a/www-client/chromium/files/chromium-cups-r0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- chrome/browser/ui/libgtk2ui/libgtk2ui.gyp.orig	2014-02-28 02:42:18.993134286 +0000
-+++ chrome/browser/ui/libgtk2ui/libgtk2ui.gyp	2014-02-28 02:43:37.633657361 +0000
-@@ -17,6 +17,7 @@
-         '../../../../build/linux/system.gyp:gconf',
-         '../../../../build/linux/system.gyp:gtk',
-         '../../../../build/linux/system.gyp:gtkprint',
-+        '../../../../printing/printing.gyp:cups',
-         '../../../../skia/skia.gyp:skia',
-         '../../../../ui/base/strings/ui_strings.gyp:ui_strings',
-         '../../../../ui/resources/ui_resources.gyp:ui_resources',
-@@ -29,7 +30,6 @@
-       ],
-       'defines': [
-         'LIBGTK2UI_IMPLEMENTATION',
--        'USE_CUPS',
-       ],
-       # Several of our source files are named _gtk2.cc. This isn't to
-       # differentiate them from their source files (ninja and make are sane
diff --git a/www-client/chromium/files/chromium-d8-r0.patch b/www-client/chromium/files/chromium-d8-r0.patch
deleted file mode 100644
index 590e531a18dc..000000000000
--- a/www-client/chromium/files/chromium-d8-r0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- build/all.gyp.orig	2014-02-12 19:11:50.200718819 +0000
-+++ build/all.gyp	2014-02-12 19:12:11.160850317 +0000
-@@ -676,7 +676,6 @@
-             }],
-             ['chromeos==0', {
-               'dependencies': [
--                '../v8/src/d8.gyp:d8',
-               ],
-             }],
-             ['internal_filter_fuzzer==1', {
diff --git a/www-client/chromium/files/chromium-depot-tools-r0.patch b/www-client/chromium/files/chromium-depot-tools-r0.patch
deleted file mode 100644
index 19b92ce40d07..000000000000
--- a/www-client/chromium/files/chromium-depot-tools-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/gyp_chromium.orig	2014-01-29 01:22:52.527247671 +0000
-+++ build/gyp_chromium	2014-01-29 01:23:49.857623290 +0000
-@@ -38,8 +38,6 @@
- sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
-     'Source', 'build', 'scripts'))
- 
--import find_depot_tools
--
- # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
- # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
- # seconds.  Conversely, memory usage of build/gyp_chromium with Psyco
diff --git a/www-client/chromium/files/chromium-ffmpeg-r0.patch b/www-client/chromium/files/chromium-ffmpeg-r0.patch
deleted file mode 100644
index f16d51969502..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-r0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- third_party/ffmpeg/libavcodec/x86/vp3dsp_init.c.orig	2014-05-22 08:12:08.770613935 +0000
-+++ third_party/ffmpeg/libavcodec/x86/vp3dsp_init.c	2014-05-22 08:20:23.970456534 +0000
-@@ -43,7 +43,7 @@
- void ff_vp3_h_loop_filter_mmxext(uint8_t *src, int stride,
-                                  int *bounding_values);
- 
--#if HAVE_MMX_INLINE
-+#if HAVE_MMX_INLINE && HAVE_6REGS
- 
- #define MOVQ_BFE(regd)                                  \
-     __asm__ volatile (                                  \
-@@ -95,15 +95,15 @@
-         :"memory");
- //    STOP_TIMER("put_vp_no_rnd_pixels8_l2_mmx")
- }
--#endif /* HAVE_MMX_INLINE */
-+#endif /* HAVE_MMX_INLINE && HAVE_6REGS */
- 
- av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags)
- {
-     int cpu_flags = av_get_cpu_flags();
- 
--#if HAVE_MMX_INLINE
-+#if HAVE_MMX_INLINE && HAVE_6REGS
-     c->put_no_rnd_pixels_l2 = put_vp_no_rnd_pixels8_l2_mmx;
--#endif /* HAVE_MMX_INLINE */
-+#endif /* HAVE_MMX_INLINE && HAVE_6REGS */
- 
- #if ARCH_X86_32
-     if (EXTERNAL_MMX(cpu_flags)) {
diff --git a/www-client/chromium/files/chromium-ffmpeg-r1.patch b/www-client/chromium/files/chromium-ffmpeg-r1.patch
deleted file mode 100644
index 821c9e7ca7b9..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-r1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig	2014-06-11 10:13:47.246416916 +0000
-+++ third_party/ffmpeg/chromium/scripts/build_ffmpeg.py	2014-06-11 10:19:55.333739033 +0000
-@@ -170,12 +170,13 @@
-                     'is not necessary for generate_gyp.py')
-   options, args = parser.parse_args(argv)
- 
--  if len(args) != 2:
-+  if len(args) < 2:
-     parser.print_help()
-     return 1
- 
-   target_os = args[0]
-   target_arch = args[1]
-+  configure_args = args[2:]
- 
-   if target_os not in ('linux', 'linux-noasm', 'win', 'win-vs2013', 'mac'):
-     parser.print_help()
-@@ -429,9 +430,9 @@
-       BuildFFmpeg, target_os, target_arch, host_os, host_arch, parallel_jobs,
-       options.config_only)
-   do_build_ffmpeg(
--      'Chromium', configure_flags['Common'] + configure_flags['Chromium'])
-+      'Chromium', configure_flags['Common'] + configure_flags['Chromium'] + configure_args)
-   do_build_ffmpeg(
--      'Chrome', configure_flags['Common'] + configure_flags['Chrome'])
-+      'Chrome', configure_flags['Common'] + configure_flags['Chrome'] + configure_args)
- 
-   if target_os == 'linux':
-     do_build_ffmpeg('ChromiumOS',
---- third_party/ffmpeg/chromium/scripts/generate_gyp.py.orig	2014-06-13 13:13:35.762996021 +0000
-+++ third_party/ffmpeg/chromium/scripts/generate_gyp.py	2014-06-13 13:13:38.693099249 +0000
-@@ -131,7 +131,7 @@
- """
- 
- # Controls GYP conditional stanza generation.
--SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon']
-+SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon', 'x64']
- SUPPORTED_TARGETS = ['Chromium', 'Chrome', 'ChromiumOS', 'ChromeOS']
- # Mac doesn't have any platform specific files, so just use linux and win.
- SUPPORTED_PLATFORMS = ['linux', 'win']
diff --git a/www-client/chromium/files/chromium-ffmpeg-r2.patch b/www-client/chromium/files/chromium-ffmpeg-r2.patch
deleted file mode 100644
index 32344c8a60ef..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-r2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/ffmpeg/chromium/scripts/generate_gyp.py.orig	2014-06-13 13:13:35.762996021 +0000
-+++ third_party/ffmpeg/chromium/scripts/generate_gyp.py	2014-06-13 13:13:38.693099249 +0000
-@@ -131,7 +131,7 @@
- """
- 
- # Controls GYP conditional stanza generation.
--SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon']
-+SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon', 'x64']
- SUPPORTED_TARGETS = ['Chromium', 'Chrome', 'ChromiumOS', 'ChromeOS']
- # Mac doesn't have any platform specific files, so just use linux and win.
- SUPPORTED_PLATFORMS = ['linux', 'win']
diff --git a/www-client/chromium/files/chromium-ffmpeg-r3.patch b/www-client/chromium/files/chromium-ffmpeg-r3.patch
deleted file mode 100644
index aa2699fde0f6..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-r3.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
-+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
-@@ -7,7 +7,6 @@
- from __future__ import print_function
- 
- import collections
--import functools
- import multiprocessing
- import optparse
- import os
-@@ -22,6 +21,14 @@ SCRIPTS_DIR = os.path.abspath(os.path.dirname(__file__))
- FFMPEG_DIR = os.path.abspath(os.path.join(SCRIPTS_DIR, '..', '..'))
- 
- 
-+BRANDINGS = [
-+  'Chrome',
-+  'ChromeOS',
-+  'Chromium',
-+  'ChromiumOS',
-+]
-+
-+
- USAGE = """Usage: %prog TARGET_OS TARGET_ARCH [options] -- [configure_args]
- 
- Valid combinations are linux       [ia32|x64|mipsel|arm|arm-neon]
-@@ -113,8 +120,6 @@ def RewriteFile(path, search, replace):
- 
- def BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
-                 config_only, config, configure_flags):
--  print('%s configure/build:' % config)
--
-   config_dir = 'build.%s.%s/%s' % (target_arch, target_os, config)
-   shutil.rmtree(config_dir, ignore_errors=True)
-   os.makedirs(os.path.join(config_dir, 'out'))
-@@ -165,6 +170,9 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
- 
- def main(argv):
-   parser = optparse.OptionParser(usage=USAGE)
-+  parser.add_option('--branding', action='append', dest='brandings',
-+                    choices=BRANDINGS,
-+                    help='Branding to build; determines e.g. supported codecs')
-   parser.add_option('--config-only', action='store_true',
-                     help='Skip the build step. Useful when a given platform '
-                     'is not necessary for generate_gyp.py')
-@@ -426,9 +434,15 @@ def main(argv):
-       '--enable-parser=gsm',
-   ])
- 
--  do_build_ffmpeg = functools.partial(
--      BuildFFmpeg, target_os, target_arch, host_os, host_arch, parallel_jobs,
--      options.config_only)
-+  def do_build_ffmpeg(branding, configure_flags):
-+    if options.brandings and branding not in options.brandings:
-+      print('%s skipped' % branding)
-+      return
-+
-+    print('%s configure/build:' % branding)
-+    BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
-+                options.config_only, branding, configure_flags)
-+
-   do_build_ffmpeg('Chromium',
-                   configure_flags['Common'] +
-                   configure_flags['Chromium'] +
diff --git a/www-client/chromium/files/chromium-gn-r0.patch b/www-client/chromium/files/chromium-gn-r0.patch
deleted file mode 100644
index 5cb8c0ebc82a..000000000000
--- a/www-client/chromium/files/chromium-gn-r0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- build/gyp_chromium.orig	2013-12-11 03:07:03.941915587 +0000
-+++ build/gyp_chromium	2013-12-11 03:07:29.812073301 +0000
-@@ -221,9 +221,6 @@
- 
-   supplemental_includes = GetSupplementalFiles()
- 
--  if not RunGN(supplemental_includes):
--    sys.exit(1)
--
-   args.extend(
-       ['-I' + i for i in additional_include_files(supplemental_includes, args)])
- 
diff --git a/www-client/chromium/files/chromium-gn-r1.patch b/www-client/chromium/files/chromium-gn-r1.patch
deleted file mode 100644
index 9d3071de56d2..000000000000
--- a/www-client/chromium/files/chromium-gn-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/gyp_chromium.orig	2014-01-16 22:55:50.292718339 +0000
-+++ build/gyp_chromium	2014-01-16 23:15:17.890248708 +0000
-@@ -370,8 +370,6 @@
-     args.append('--check')
- 
-   supplemental_includes = GetSupplementalFiles()
--  if not RunGN(supplemental_includes):
--    sys.exit(1)
-   args.extend(
-       ['-I' + i for i in additional_include_files(supplemental_includes, args)])
- 
diff --git a/www-client/chromium/files/chromium-gn-r2.patch b/www-client/chromium/files/chromium-gn-r2.patch
deleted file mode 100644
index ab3486def0f4..000000000000
--- a/www-client/chromium/files/chromium-gn-r2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/gyp_chromium.orig	2014-02-28 01:05:10.794646362 +0000
-+++ build/gyp_chromium	2014-02-28 01:05:52.764917862 +0000
-@@ -537,8 +537,6 @@
-           'GYP_CROSSCOMPILE' not in os.environ)):
-     os.environ['GYP_CROSSCOMPILE'] = '1'
- 
--  if not RunGN(gn_vars_dict):
--    sys.exit(1)
-   args.extend(
-       ['-I' + i for i in additional_include_files(supplemental_includes, args)])
- 
diff --git a/www-client/chromium/files/chromium-gnome-keyring-r0.patch b/www-client/chromium/files/chromium-gnome-keyring-r0.patch
deleted file mode 100644
index c9d70f416da5..000000000000
--- a/www-client/chromium/files/chromium-gnome-keyring-r0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- chrome/chrome_browser.gypi.orig	2013-11-13 18:24:41.237282707 +0000
-+++ chrome/chrome_browser.gypi	2013-11-13 18:26:03.357780490 +0000
-@@ -3064,7 +3064,11 @@
-             'browser/password_manager/native_backend_gnome_x.cc',
-             'browser/password_manager/native_backend_gnome_x.h',
-           ],
--        }],
-+        }, {
-+          'dependencies': [
-+            '../build/linux/system.gyp:gnome_keyring',
-+          ],
-+	}],
-         ['use_aura==1', {
-           'sources/': [
-             ['exclude', '^browser/automation/testing_automation_provider_win.cc'],
-@@ -3153,11 +3157,6 @@
-                 ],
-               },
-             }],
--            ['use_gnome_keyring==1', {
--              'dependencies': [
--                '../build/linux/system.gyp:gnome_keyring',
--              ],
--            }],
-           ],
-         }],
-         ['input_speech==0', {
diff --git a/www-client/chromium/files/chromium-gpsd-r0.patch b/www-client/chromium/files/chromium-gpsd-r0.patch
deleted file mode 100644
index 1327ecc9ca68..000000000000
--- a/www-client/chromium/files/chromium-gpsd-r0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- build/linux/system.gyp.orig	2013-01-28 16:03:43.709477316 +0000
-+++ build/linux/system.gyp	2013-01-28 16:06:14.210254835 +0000
-@@ -175,9 +175,6 @@
-                          'gps_open',
-                          'gps_close',
-                          'gps_read',
--                         # We don't use gps_shm_read() directly, just to make
--                         # sure that libgps has the shared memory support.
--                         'gps_shm_read',
-               ],
-               'message': 'Generating libgps library loader.',
-               'process_outputs_as_sources': 1,
diff --git a/www-client/chromium/files/chromium-libaddressinput-r0.patch b/www-client/chromium/files/chromium-libaddressinput-r0.patch
deleted file mode 100644
index 7e9342b51c42..000000000000
--- a/www-client/chromium/files/chromium-libaddressinput-r0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- third_party/libaddressinput/libaddressinput.gyp.orig	2014-07-21 09:32:45.801591233 +0000
-+++ third_party/libaddressinput/libaddressinput.gyp	2014-07-21 09:34:41.779946012 +0000
-@@ -86,6 +86,7 @@
-         ],
-       },
-       'dependencies': [
-+        '../../base/base.gyp:base',
-         '../re2/re2.gyp:re2',
-         'libaddressinput_strings',
-       ],
diff --git a/www-client/chromium/files/chromium-nacl-r0.patch b/www-client/chromium/files/chromium-nacl-r0.patch
deleted file mode 100644
index 69a8e47d09a7..000000000000
--- a/www-client/chromium/files/chromium-nacl-r0.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-[NaCl] Build fix for disable_nacl=1 desktop chrome build.
-
-https://codereview.chromium.org/398273002
-
-Index: chrome/browser/extensions/plugin_manager.cc
-diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc
-index b018c6d1e0cbe296e8ac93592b1f3b63f6c7e213..86bbe93ca3550ddcf984ed3515a370d6be9a6b50 100644
---- a/chrome/browser/extensions/plugin_manager.cc
-+++ b/chrome/browser/extensions/plugin_manager.cc
-@@ -21,7 +21,9 @@
- 
- using content::PluginService;
- 
-+#if !defined(DISABLE_NACL)
- static const char kNaClPluginMimeType[] = "application/x-nacl";
-+#endif
- 
- namespace extensions {
- 
-@@ -67,6 +69,7 @@ void PluginManager::OnExtensionLoaded(content::BrowserContext* browser_context,
-     }
-   }
- 
-+#if !defined(DISABLE_NACL)
-   const NaClModuleInfo::List* nacl_modules =
-       NaClModuleInfo::GetNaClModules(extension);
-   if (nacl_modules) {
-@@ -78,6 +81,7 @@ void PluginManager::OnExtensionLoaded(content::BrowserContext* browser_context,
-     }
-     UpdatePluginListWithNaClModules();
-   }
-+#endif
- 
-   const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
-   if (handler && !handler->handler_url().empty()) {
-@@ -122,6 +126,7 @@ void PluginManager::OnExtensionUnloaded(
-     }
-   }
- 
-+#if !defined(DISABLE_NACL)
-   const NaClModuleInfo::List* nacl_modules =
-       NaClModuleInfo::GetNaClModules(extension);
-   if (nacl_modules) {
-@@ -133,6 +138,7 @@ void PluginManager::OnExtensionUnloaded(
-     }
-     UpdatePluginListWithNaClModules();
-   }
-+#endif
- 
-   const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
-   if (handler && !handler->handler_url().empty()) {
-@@ -148,6 +154,8 @@ void PluginManager::OnExtensionUnloaded(
-     PluginService::GetInstance()->PurgePluginListCache(profile_, false);
- }
- 
-+#if !defined(DISABLE_NACL)
-+
- void PluginManager::RegisterNaClModule(const NaClModuleInfo& info) {
-   DCHECK(FindNaClModule(info.url) == nacl_module_list_.end());
-   nacl_module_list_.push_front(info);
-@@ -216,4 +224,6 @@ NaClModuleInfo::List::iterator PluginManager::FindNaClModule(const GURL& url) {
-   return nacl_module_list_.end();
- }
- 
-+#endif  // !defined(DISABLE_NACL)
-+
- }  // namespace extensions
-Index: chrome/browser/extensions/plugin_manager.h
-diff --git a/chrome/browser/extensions/plugin_manager.h b/chrome/browser/extensions/plugin_manager.h
-index 56eb9f7eb51cd05ae156d79caac76d294a4cfc43..79854ab437c15e28c34aafa7d900cf517288ab93 100644
---- a/chrome/browser/extensions/plugin_manager.h
-+++ b/chrome/browser/extensions/plugin_manager.h
-@@ -35,6 +35,8 @@ class PluginManager : public BrowserContextKeyedAPI,
-  private:
-   friend class BrowserContextKeyedAPIFactory<PluginManager>;
- 
-+#if !defined(DISABLE_NACL)
-+
-   // We implement some Pepper plug-ins using NaCl to take advantage of NaCl's
-   // strong sandbox. Typically, these NaCl modules are stored in extensions
-   // and registered here. Not all NaCl modules need to register for a MIME
-@@ -50,6 +52,8 @@ class PluginManager : public BrowserContextKeyedAPI,
- 
-   extensions::NaClModuleInfo::List::iterator FindNaClModule(const GURL& url);
- 
-+#endif  // !defined(DISABLE_NACL)
-+
-   // ExtensionRegistryObserver implementation.
-   virtual void OnExtensionLoaded(content::BrowserContext* browser_context,
-                                  const Extension* extension) OVERRIDE;
-Index: chrome/browser/ui/startup/bad_flags_prompt.cc
-diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
-index 4ce4ea19465e9070bea7a64f913919bcdc0dc57b..e3161d71d1d4f8a9dfe37f3499f2b7ed56081f3f 100644
---- a/chrome/browser/ui/startup/bad_flags_prompt.cc
-+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -43,7 +43,9 @@ void ShowBadFlagsPrompt(Browser* browser) {
-     switches::kDisableSeccompFilterSandbox,
-     switches::kDisableSetuidSandbox,
-     switches::kDisableWebSecurity,
-+#if !defined(DISABLE_NACL)
-     switches::kNaClDangerousNoSandboxNonSfi,
-+#endif
-     switches::kNoSandbox,
-     switches::kSingleProcess,
- 
-Index: chrome/common/extensions/chrome_manifest_handlers.cc
-diff --git a/chrome/common/extensions/chrome_manifest_handlers.cc b/chrome/common/extensions/chrome_manifest_handlers.cc
-index b08d004790fdfa14cc2b5495ffb54a74fa9ff86d..c05117d7c04a4aae2066501e820fa75b09555566 100644
---- a/chrome/common/extensions/chrome_manifest_handlers.cc
-+++ b/chrome/common/extensions/chrome_manifest_handlers.cc
-@@ -61,7 +61,9 @@ void RegisterChromeManifestHandlers() {
- #endif
-   (new MimeTypesHandlerParser)->Register();
-   (new MinimumChromeVersionChecker)->Register();
-+#if !defined(DISABLE_NACL)
-   (new NaClModulesHandler)->Register();
-+#endif
-   (new OAuth2ManifestHandler)->Register();
-   (new OmniboxHandler)->Register();
-   (new OptionsPageHandler)->Register();
-Index: chrome/test/ppapi/ppapi_test.cc
-diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
-index 7bd3284cd51752b57d6668b2d7f53087a3e5ba58..9a951458a71585b80c17ff6d234eda62b0de1738 100644
---- a/chrome/test/ppapi/ppapi_test.cc
-+++ b/chrome/test/ppapi/ppapi_test.cc
-@@ -426,8 +426,10 @@ void PPAPIPrivateNaClPNaClTest::SetUpCommandLine(
- 
- void PPAPINaClPNaClNonSfiTest::SetUpCommandLine(
-     base::CommandLine* command_line) {
-+#if !defined(DISABLE_NACL)
-   PPAPINaClTest::SetUpCommandLine(command_line);
-   command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
-+#endif
- }
- 
- std::string PPAPINaClPNaClNonSfiTest::BuildQuery(
diff --git a/www-client/chromium/files/chromium-pnacl-r0.patch b/www-client/chromium/files/chromium-pnacl-r0.patch
deleted file mode 100644
index 6618aa2ae5ed..000000000000
--- a/www-client/chromium/files/chromium-pnacl-r0.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- chrome/browser/component_updater/pnacl/pnacl_component_installer.cc.orig	2014-07-21 10:19:23.550094151 +0000
-+++ chrome/browser/component_updater/pnacl/pnacl_component_installer.cc	2014-07-21 10:20:23.419299929 +0000
-@@ -372,8 +372,12 @@
- void PnaclComponentInstaller::RegisterPnaclComponent(
-     ComponentUpdateService* cus,
-     const CommandLine& command_line) {
-+#if defined(DISABLE_NACL)
-+  updates_disabled_ = true;
-+#else
-   // Register PNaCl by default (can be disabled).
-   updates_disabled_ = command_line.HasSwitch(switches::kDisablePnaclInstall);
-+#endif
-   cus_ = cus;
-   BrowserThread::PostTask(BrowserThread::FILE,
-                           FROM_HERE,
diff --git a/www-client/chromium/files/chromium-system-harfbuzz-r0.patch b/www-client/chromium/files/chromium-system-harfbuzz-r0.patch
deleted file mode 100644
index 96ba8fb772c6..000000000000
--- a/www-client/chromium/files/chromium-system-harfbuzz-r0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- build/linux/unbundle/harfbuzz.gyp.orig	2014-05-29 12:43:32.814569782 +0000
-+++ build/linux/unbundle/harfbuzz.gyp	2014-05-29 12:44:40.685923614 +0000
-@@ -33,6 +33,15 @@
-           '<!@(pkg-config --libs-only-l <(harfbuzz_libraries))',
-         ],
-       },
-+      'variables': {
-+        'headers_root_path': 'src',
-+        'header_filenames': [
-+          'hb.h',
-+        ],
-+      },
-+      'includes': [
-+        '../../build/shim_headers.gypi',
-+      ],
-     },
-   ],
- }
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 5138afc681db..000000000000
--- a/www-client/chromium/files/chromium-system-icu-r0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- build/linux/unbundle/icu.gyp.orig	2013-09-27 18:18:50.531839532 +0000
-+++ build/linux/unbundle/icu.gyp	2013-09-27 18:19:08.301950500 +0000
-@@ -7,6 +7,7 @@
-     {
-       'target_name': 'system_icu',
-       'type': 'none',
-+      'toolsets': ['host', 'target'],
-       'direct_dependent_settings': {
-         'defines': [
-           'U_USING_ICU_NAMESPACE=0',
-@@ -30,6 +31,7 @@
-     {
-       'target_name': 'icui18n',
-       'type': 'none',
-+      'toolsets': ['host', 'target'],
-       'dependencies': ['system_icu'],
-       'export_dependent_settings': ['system_icu'],
-       'variables': {
-@@ -116,6 +118,7 @@
-     {
-       'target_name': 'icuuc',
-       'type': 'none',
-+      'toolsets': ['host', 'target'],
-       'dependencies': ['system_icu'],
-       'export_dependent_settings': ['system_icu'],
-       'variables': {
diff --git a/www-client/chromium/files/chromium-system-jinja-r0.patch b/www-client/chromium/files/chromium-system-jinja-r0.patch
deleted file mode 100644
index b099cf37a69f..000000000000
--- a/www-client/chromium/files/chromium-system-jinja-r0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- third_party/WebKit/Source/core/core.gypi.orig	2013-09-27 18:25:24.634284363 +0000
-+++ third_party/WebKit/Source/core/core.gypi	2013-09-27 18:25:48.614432099 +0000
-@@ -3863,10 +3863,6 @@
-             'tests/TreeTestHelpers.h',
-         ],
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'scripts/in_file.py',
-             'scripts/in_generator.py',
-             'scripts/license.py',
diff --git a/www-client/chromium/files/chromium-system-jinja-r1.patch b/www-client/chromium/files/chromium-system-jinja-r1.patch
deleted file mode 100644
index 6cc2c4557a35..000000000000
--- a/www-client/chromium/files/chromium-system-jinja-r1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- third_party/WebKit/Source/core/core.gypi.orig	2013-10-16 18:07:10.783245029 +0000
-+++ third_party/WebKit/Source/core/core.gypi	2013-10-16 18:07:31.253373879 +0000
-@@ -3613,10 +3613,6 @@
-             'rendering/RenderOverflowTest.cpp',
-         ],
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             '../build/scripts/hasher.py',
-             '../build/scripts/in_file.py',
-             '../build/scripts/in_generator.py',
diff --git a/www-client/chromium/files/chromium-system-jinja-r2.patch b/www-client/chromium/files/chromium-system-jinja-r2.patch
deleted file mode 100644
index f5f7c4d48c36..000000000000
--- a/www-client/chromium/files/chromium-system-jinja-r2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- third_party/WebKit/Source/bindings/derived_sources.gyp.orig	2013-11-06 18:36:38.369949986 +0000
-+++ third_party/WebKit/Source/bindings/derived_sources.gyp	2013-11-06 18:37:06.980134563 +0000
-@@ -53,11 +53,6 @@
-     ],
-     'compiler_module_files': [
-         'scripts/idl_compiler.py',
--        '<(DEPTH)/third_party/ply/lex.py',
--        '<(DEPTH)/third_party/ply/yacc.py',
--        # jinja2/__init__.py contains version string, so sufficient for package
--        '<(DEPTH)/third_party/jinja2/__init__.py',
--        '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-         '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-         '<(DEPTH)/tools/idl_parser/idl_node.py',
-         '<(DEPTH)/tools/idl_parser/idl_parser.py',
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2013-11-06 18:42:10.042086211 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi	2013-11-06 18:42:19.412146455 +0000
-@@ -1,10 +1,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
diff --git a/www-client/chromium/files/chromium-system-jinja-r3.patch b/www-client/chromium/files/chromium-system-jinja-r3.patch
deleted file mode 100644
index f78a0a3a5133..000000000000
--- a/www-client/chromium/files/chromium-system-jinja-r3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- third_party/WebKit/Source/bindings/generated_bindings.gyp.orig	2014-01-29 01:37:10.832866464 +0000
-+++ third_party/WebKit/Source/bindings/generated_bindings.gyp	2014-01-29 01:37:29.082985891 +0000
-@@ -74,11 +74,6 @@
- 
-     'compiler_module_files': [
-         'scripts/idl_compiler.py',
--        '<(DEPTH)/third_party/ply/lex.py',
--        '<(DEPTH)/third_party/ply/yacc.py',
--        # jinja2/__init__.py contains version string, so sufficient for package
--        '<(DEPTH)/third_party/jinja2/__init__.py',
--        '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-         '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-         '<(DEPTH)/tools/idl_parser/idl_node.py',
-         '<(DEPTH)/tools/idl_parser/idl_parser.py',
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-01-29 01:37:58.853180703 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-01-29 01:38:06.423230239 +0000
-@@ -1,10 +1,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
diff --git a/www-client/chromium/files/chromium-system-jinja-r4.patch b/www-client/chromium/files/chromium-system-jinja-r4.patch
deleted file mode 100644
index e301016124e6..000000000000
--- a/www-client/chromium/files/chromium-system-jinja-r4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- third_party/WebKit/Source/bindings/generated_bindings.gyp.orig	2014-02-20 03:49:21.821527295 +0000
-+++ third_party/WebKit/Source/bindings/generated_bindings.gyp	2014-02-20 03:49:34.401607238 +0000
-@@ -110,9 +110,6 @@
-       'scripts/unstable/idl_compiler.py',
-       '<(DEPTH)/third_party/ply/lex.py',
-       '<(DEPTH)/third_party/ply/yacc.py',
--      # jinja2/__init__.py contains version string, so sufficient for package
--      '<(DEPTH)/third_party/jinja2/__init__.py',
--      '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-       '<(DEPTH)/tools/idl_parser/idl_node.py',
-       '<(DEPTH)/tools/idl_parser/idl_parser.py',
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-02-20 03:49:59.351765796 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-02-20 03:50:08.111821470 +0000
-@@ -1,10 +1,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
diff --git a/www-client/chromium/files/chromium-system-jinja-r5.patch b/www-client/chromium/files/chromium-system-jinja-r5.patch
deleted file mode 100644
index 4a1d2e3985b6..000000000000
--- a/www-client/chromium/files/chromium-system-jinja-r5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- third_party/WebKit/Source/bindings/generated_bindings.gyp.orig	2014-03-04 23:10:29.140572304 +0000
-+++ third_party/WebKit/Source/bindings/generated_bindings.gyp	2014-03-04 23:12:53.991556052 +0000
-@@ -109,15 +109,9 @@
- 
-     # Python source
-     'jinja_module_files': [
--      # jinja2/__init__.py contains version string, so sufficient for package
--      '<(DEPTH)/third_party/jinja2/__init__.py',
--      '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-     'idl_compiler_files': [
-       'scripts/idl_compiler.py',
--      # PLY (Python Lex-Yacc)
--      '<(DEPTH)/third_party/ply/lex.py',
--      '<(DEPTH)/third_party/ply/yacc.py',
-       # Web IDL lexer/parser (base parser)
-       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-       '<(DEPTH)/tools/idl_parser/idl_node.py',
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-03-04 23:11:54.731153647 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-03-04 23:12:05.861229233 +0000
-@@ -1,10 +1,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
--            # jinja2/__init__.py contains version string, so sufficient as
--            # dependency for whole jinja2 package
--            '<(DEPTH)/third_party/jinja2/__init__.py',
--            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
diff --git a/www-client/chromium/files/chromium-system-libjpeg-r0.patch b/www-client/chromium/files/chromium-system-libjpeg-r0.patch
deleted file mode 100644
index d450ca2a33f2..000000000000
--- a/www-client/chromium/files/chromium-system-libjpeg-r0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- third_party/libyuv/libyuv.gyp.orig	2014-01-16 23:27:36.335011975 +0000
-+++ third_party/libyuv/libyuv.gyp	2014-01-16 23:28:05.845202472 +0000
-@@ -24,8 +24,7 @@
-             'HAVE_JPEG'
-           ],
-           'conditions': [
--            # Android uses libjpeg for system jpeg support.
--            [ 'OS == "android" and use_system_libjpeg == 1', {
-+            [ 'use_system_libjpeg == 1', {
-               'dependencies': [
-                  '<(DEPTH)/third_party/libjpeg/libjpeg.gyp:libjpeg',
-               ],
diff --git a/www-client/chromium/files/chromium-system-ply-r0.patch b/www-client/chromium/files/chromium-system-ply-r0.patch
deleted file mode 100644
index 2ab2c8a080db..000000000000
--- a/www-client/chromium/files/chromium-system-ply-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/bindings/derived_sources.gyp.orig	2013-07-30 22:29:53.610647573 +0000
-+++ third_party/WebKit/Source/bindings/derived_sources.gyp	2013-07-30 22:30:05.150721649 +0000
-@@ -262,8 +262,6 @@
-         'msvs_external_rule': 1,
-         'inputs': [
-           'scripts/idl_compiler.py',
--          '<(DEPTH)/third_party/ply/lex.py',
--          '<(DEPTH)/third_party/ply/yacc.py',
-           '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-           '<(DEPTH)/tools/idl_parser/idl_node.py',
-           '<(DEPTH)/tools/idl_parser/idl_parser.py',
diff --git a/www-client/chromium/files/chromium-system-ply-r1.patch b/www-client/chromium/files/chromium-system-ply-r1.patch
deleted file mode 100644
index 0eba7d7a0982..000000000000
--- a/www-client/chromium/files/chromium-system-ply-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/bindings/derived_sources.gyp.orig	2013-09-09 17:53:37.709978765 +0000
-+++ third_party/WebKit/Source/bindings/derived_sources.gyp	2013-09-09 17:53:50.540054303 +0000
-@@ -57,8 +57,6 @@
-     ],
-     'compiler_module_files': [
-         'scripts/idl_compiler.py',
--        '<(DEPTH)/third_party/ply/lex.py',
--        '<(DEPTH)/third_party/ply/yacc.py',
-         '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-         '<(DEPTH)/tools/idl_parser/idl_node.py',
-         '<(DEPTH)/tools/idl_parser/idl_parser.py',
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 df030b0c99b5..000000000000
--- a/www-client/chromium/files/chromium-system-zlib-r0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- media/cast/logging/logging.gyp.orig	2014-03-18 22:32:33.802818765 +0000
-+++ media/cast/logging/logging.gyp	2014-03-18 22:33:14.683093733 +0000
-@@ -40,6 +40,7 @@
-         'cast_common_logging',
-         'cast_logging_proto_lib',
-         '<(DEPTH)/base/base.gyp:base',
-+        '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
-       ],
-       'export_dependent_settings': [
-         'cast_logging_proto_lib',