Version bump for stable channel release. Remove old. Remove unusded patches.

(Portage version: 2.1.8.3/cvs/Linux i686)

13 files changed, 75 insertions, 598 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index adeab7334520..35a0a4717272 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.181 2010/09/20 12:51:55 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.182 2010/09/20 16:21:23 phajdan.jr Exp $
+
+*chromium-6.0.472.62-r1 (20 Sep 2010)
+*chromium-6.0.472.62 (20 Sep 2010)
+
+  20 Sep 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-5.0.375.127.ebuild, -chromium-6.0.472.59-r1.ebuild,
+  +chromium-6.0.472.62.ebuild, +chromium-6.0.472.62-r1.ebuild,
+  -files/chromium-6.0.495.0-gcc-4.5.patch,
+  -files/chromium-disable-vp8-r1.patch, -chromium-7.0.503.1-r1.ebuild,
+  -files/chromium-ffmpeg-compatibility-r0.patch,
+  -files/chromium-20100122-ubuntu-html5-video-mimetypes.patch,
+  -files/chromium-drop_sse2-r0.patch, -files/chromium-yuv-crash-r0.patch,
+  -files/chromium-libpng-1.4.patch, -files/chromium-yuv-crash-r1.patch:
+  Version bump for stable channel release. Remove old. Remove unusded
+  patches.
 
   20 Sep 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-9999.ebuild:
   Use gclient sync --nohooks to avoid a problem with gyp running to early.
diff --git a/www-client/chromium/chromium-5.0.375.127.ebuild b/www-client/chromium/chromium-5.0.375.127.ebuild
deleted file mode 100644
index e74a1ac6f1e2..000000000000
--- a/www-client/chromium/chromium-5.0.375.127.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.127.ebuild,v 1.3 2010/08/20 08:35:45 hwoarang Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib pax-utils toolchain-funcs
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+plugins-symlink"
-
-RDEPEND="app-arch/bzip2
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	>=gnome-base/gconf-2.24.0
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/jpeg:0
-	media-libs/libpng
-	media-video/ffmpeg[threads]
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver"
-#	dev-db/sqlite:3
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	sys-devel/flex"
-RDEPEND+="
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/oxygen-molecule
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)
-	x11-apps/xmessage
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-src_prepare() {
-	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
-	epatch "${FILESDIR}"/${PN}-drop_sse2-r0.patch
-
-	# Allow supporting more media types.
-	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
-
-	# Fix build failure with libpng-1.4, bug 310959.
-	epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
-}
-
-src_configure() {
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	# Workaround for bug #318969.
-	# TODO: remove when http://crbug.com/43778 is fixed.
-	append-flags -D__STDC_CONSTANT_MACROS
-
-	# Fails to build on arm if we don't do this
-	use arm && append-flags -fno-tree-sink
-
-	# Configuration options (system libraries)
-	local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
-	# -Duse_system_sqlite=1 : http://crbug.com/22208
-	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
-
-	# Sandbox paths
-	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
-	# and the performance gain isn't worth it.
-	myconf="${myconf} -Dv8_use_snapshot=0"
-
-	# Disable tcmalloc memory allocator. It causes problems,
-	# for example bug #320419.
-	myconf="${myconf} -Dlinux_use_tcmalloc=0"
-
-	# Disable gpu rendering, it is incompatible with nvidia-drivers,
-	# bug #319331.
-	myconf="${myconf} -Denable_gpu=0"
-
-	# Use target arch detection logic from bug #296917.
-	local myarch="$ABI"
-	[[ $myarch = "" ]] && myarch="$ARCH"
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf="${myconf} -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf="${myconf} -Dtarget_arch=ia32"
-	elif [[ $myarch = arm ]] ; then
-		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf="${myconf} -Dwerror="
-
-	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
-}
-
-src_compile() {
-	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-		rootdir="${S}" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		|| die "compilation failed"
-}
-
-src_install() {
-	# Chromium does not have "install" target in the build system.
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	dodir ${CHROMIUM_HOME}
-
-	exeinto ${CHROMIUM_HOME}
-	pax-mark m out/Release/chrome
-	doexe out/Release/chrome
-	doexe out/Release/chrome_sandbox
-	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
-	doexe out/Release/xdg-settings
-	doexe "${FILESDIR}"/chromium-launcher.sh
-
-	insinto ${CHROMIUM_HOME}
-	doins out/Release/chrome.pak
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1
-	newman out/Release/chrome.1 chromium.1
-
-	# Chromium looks for these in its folder
-	# See media_posix.cc and base_paths_linux.cc
-	dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
-	dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
-	dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
-
-	# Plugins symlink, optional wrt bug #301911
-	if use plugins-symlink; then
-		dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
-	fi
-
-	# Icon and desktop entry
-	newicon out/Release/product_logo_48.png ${PN}-browser.png
-	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
-	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
-		|| die "desktop file sed failed"
-	# Gnome default application entry
-	dodir /usr/share/gnome-control-center/default-apps
-	insinto /usr/share/gnome-control-center/default-apps
-	doins "${FILESDIR}"/chromium.xml
-}
diff --git a/www-client/chromium/chromium-6.0.472.59-r1.ebuild b/www-client/chromium/chromium-6.0.472.62-r1.ebuild
index 7053549c643d..6cbb9dd3cfed 100644
--- a/www-client/chromium/chromium-6.0.472.59-r1.ebuild
+++ b/www-client/chromium/chromium-6.0.472.62-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.59-r1.ebuild,v 1.1 2010/09/15 01:34:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.62-r1.ebuild,v 1.1 2010/09/20 16:21:23 phajdan.jr Exp $
 
 EAPI="2"
 
diff --git a/www-client/chromium/chromium-7.0.503.1-r1.ebuild b/www-client/chromium/chromium-6.0.472.62.ebuild
index 6789a5b47979..a1863021a411 100644
--- a/www-client/chromium/chromium-7.0.503.1-r1.ebuild
+++ b/www-client/chromium/chromium-6.0.472.62.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-7.0.503.1-r1.ebuild,v 1.2 2010/09/11 16:10:20 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.62.ebuild,v 1.1 2010/09/20 16:21:23 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -13,10 +13,9 @@ SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups gnome gnome-keyring sse2"
+IUSE="cups gnome-keyring sse2"
 
 RDEPEND="app-arch/bzip2
-	>=dev-libs/icu-4.4.1
 	>=dev-libs/libevent-1.4.13
 	>=dev-libs/nss-3.12.3
 	>=gnome-base/gconf-2.24.0
@@ -24,7 +23,7 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
-	cups? ( >=net-print/cups-1.4.4 )
+	cups? ( >=net-print/cups-1.3.11 )
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
 	x11-libs/libXScrnSaver"
@@ -32,6 +31,7 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	>=dev-util/gperf-3.0.3
 	>=dev-util/pkgconfig-0.23
+	>=gnome-base/gnome-keyring-2.28.2
 	sys-devel/flex"
 RDEPEND+="
 	|| (
@@ -44,6 +44,10 @@ RDEPEND+="
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
+get_chromium_home() {
+	echo "/usr/$(get_libdir)/chromium-browser"
+}
+
 remove_bundled_lib() {
 	einfo "Removing bundled library $1 ..."
 	local out
@@ -54,21 +58,16 @@ remove_bundled_lib() {
 	fi
 }
 
-pkg_setup() {
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-}
-
 src_prepare() {
+	# Fix compilation, bug #332131.
+	epatch "${FILESDIR}"/${PN}-make-3.82-compatibility-r0.patch
+
 	# Add Gentoo plugin paths.
 	epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch
 
-	# Make compile-time dependency on gnome-keyring optional, bug #332411.
-	epatch "${FILESDIR}"/${PN}-gnome-keyring-r0.patch
-
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/codesighs"
 	remove_bundled_lib "third_party/cros"
-	remove_bundled_lib "third_party/icu"
 	remove_bundled_lib "third_party/jemalloc"
 	remove_bundled_lib "third_party/lcov"
 	remove_bundled_lib "third_party/libevent"
@@ -77,6 +76,7 @@ src_prepare() {
 	remove_bundled_lib "third_party/lzma_sdk"
 	remove_bundled_lib "third_party/molokocacao"
 	remove_bundled_lib "third_party/ocmock"
+	remove_bundled_lib "third_party/py"
 	remove_bundled_lib "third_party/pyftpdlib"
 	remove_bundled_lib "third_party/simplejson"
 	remove_bundled_lib "third_party/tlslite"
@@ -91,20 +91,19 @@ src_configure() {
 
 	# Make it possible to build chromium on non-sse2 systems.
 	if use sse2; then
-		myconf+=" -Ddisable_sse2=0"
+		myconf="${myconf} -Ddisable_sse2=0"
 	else
-		myconf+=" -Ddisable_sse2=1"
+		myconf="${myconf} -Ddisable_sse2=1"
 	fi
 
 	# Use system-provided libraries.
 	# TODO: use_system_ffmpeg (http://crbug.com/50678).
 	# TODO: use_system_libxml (http://crbug.com/29333).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
-	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_icu, use_system_hunspell (upstream changes needed).
 	# TODO: use_system_ssl when we have a recent enough system NSS.
-	myconf+="
+	myconf="${myconf}
 		-Duse_system_bzip2=1
-		-Duse_system_icu=1
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
@@ -112,52 +111,56 @@ src_configure() {
 
 	# The dependency on cups is optional, see bug #324105.
 	if use cups; then
-		myconf+=" -Duse_cups=1"
+		myconf="${myconf} -Duse_cups=1"
 	else
-		myconf+=" -Duse_cups=0"
+		myconf="${myconf} -Duse_cups=0"
 	fi
 
 	if use "gnome-keyring"; then
-		myconf+=" -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1"
+		myconf="${myconf} -Dlinux_link_gnome_keyring=1"
 	else
 		# TODO: we should also disable code trying to dlopen
 		# gnome-keyring in that case.
-		myconf+=" -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0"
+		myconf="${myconf} -Dlinux_link_gnome_keyring=0"
 	fi
 
 	# Enable sandbox.
-	myconf+="
-		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+	myconf="${myconf}
+		-Dlinux_sandbox_path=$(get_chromium_home)/chrome_sandbox
+		-Dlinux_sandbox_chrome_path=$(get_chromium_home)/chrome"
 
 	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
 	# and the performance gain isn't worth it.
-	myconf+=" -Dv8_use_snapshot=0"
+	myconf="${myconf} -Dv8_use_snapshot=0"
 
 	# Disable tcmalloc memory allocator. It causes problems,
 	# for example bug #320419.
-	myconf+=" -Dlinux_use_tcmalloc=0"
+	myconf="${myconf} -Dlinux_use_tcmalloc=0"
+
+	# Disable gpu rendering, it is incompatible with nvidia-drivers,
+	# bug #319331.
+	myconf="${myconf} -Denable_gpu=0"
 
 	# Use target arch detection logic from bug #296917.
 	local myarch="$ABI"
 	[[ $myarch = "" ]] && myarch="$ARCH"
 
 	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
+		myconf="${myconf} -Dtarget_arch=x64"
 	elif [[ $myarch = x86 ]] ; then
-		myconf+=" -Dtarget_arch=ia32"
+		myconf="${myconf} -Dtarget_arch=ia32"
 	elif [[ $myarch = arm ]] ; then
 		# TODO: check this again after
 		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
 		append-flags -fno-tree-sink
 
-		myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
+		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
 	else
 		die "Failed to determine target arch, got '$myarch'."
 	fi
 
 	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-		myconf+=" -Dno_strict_aliasing=1 -Dgcc_version=44"
+		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
 	fi
 
 	# Work around a likely GCC bug, see bug #331945.
@@ -168,54 +171,56 @@ src_configure() {
 	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
 	# Depending on GCC version the warnings are different and we don't want
 	# the build to fail because of that.
-	myconf+=" -Dwerror="
+	myconf="${myconf} -Dwerror="
 
-	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die
+	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
 }
 
 src_compile() {
 	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
+		rootdir="${S}" \
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \
 		AR="$(tc-getAR)" \
 		RANLIB="$(tc-getRANLIB)" \
-		|| die
+		|| die "compilation failed"
 }
 
 src_install() {
-	exeinto "${CHROMIUM_HOME}"
+	dodir "$(get_chromium_home)"
+
+	exeinto "$(get_chromium_home)"
 	pax-mark m out/Release/chrome
 	doexe out/Release/chrome
-	doexe out/Release/chrome_sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
-	doexe out/Release/xdg-settings || die
-	doexe "${FILESDIR}"/chromium-launcher.sh || die
+	doexe out/Release/chrome_sandbox
+	fperms 4755 "$(get_chromium_home)/chrome_sandbox"
+	doexe out/Release/xdg-settings
+	doexe "${FILESDIR}"/chromium-launcher.sh
 
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/chrome.pak || die
-	doins out/Release/resources.pak || die
+	insinto "$(get_chromium_home)"
+	doins out/Release/chrome.pak || die "installing chrome.pak failed"
+	doins out/Release/resources.pak || die "installing resources.pak failed"
 
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
+	doins -r out/Release/locales
+	doins -r out/Release/resources
 
 	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1 || die
-	newman out/Release/chrome.1 chromium.1 || die
+	newman out/Release/chrome.1 chrome.1
+	newman out/Release/chrome.1 chromium.1
 
 	doexe out/Release/ffmpegsumo_nolink || die
 	doexe out/Release/libffmpegsumo.so || die
 
 	# Install icon and desktop entry.
-	newicon out/Release/product_logo_48.png ${PN}-browser.png || die
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
+	newicon out/Release/product_logo_48.png ${PN}-browser.png
+	dosym "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium
 	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \
 		"MimeType=text/html;text/xml;application/xhtml+xml;"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
+	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
+		|| die "desktop file sed failed"
 
 	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		doins "${FILESDIR}"/chromium.xml || die
-	fi
+	dodir /usr/share/gnome-control-center/default-apps
+	insinto /usr/share/gnome-control-center/default-apps
+	doins "${FILESDIR}"/chromium.xml
 }
diff --git a/www-client/chromium/files/chromium-20100122-ubuntu-html5-video-mimetypes.patch b/www-client/chromium/files/chromium-20100122-ubuntu-html5-video-mimetypes.patch
deleted file mode 100644
index f4e534a16603..000000000000
--- a/www-client/chromium/files/chromium-20100122-ubuntu-html5-video-mimetypes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
----
- net/base/mime_util.cc |    4 ----
- 1 file changed, 4 deletions(-)
-
-Index: src/net/base/mime_util.cc
-===================================================================
---- src.orig/net/base/mime_util.cc
-+++ src/net/base/mime_util.cc
-@@ -183,39 +183,35 @@
- // A list of media types: http://en.wikipedia.org/wiki/Internet_media_type
- // A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php
- static const char* const supported_media_types[] = {
-   // Ogg.
-   "video/ogg",
-   "audio/ogg",
-   "application/ogg",
- 
--#if defined(GOOGLE_CHROME_BUILD)
-   // MPEG-4.
-   "video/mp4",
-   "video/x-m4v",
-   "audio/mp4",
-   "audio/x-m4a",
- 
-   // MP3.
-   "audio/mp3",
-   "audio/x-mp3",
-   "audio/mpeg",
--#endif
- };
- 
- // List of supported codecs when passed in with <source type="...">.
- //
- // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support
- // for more information.
- static const char* const supported_media_codecs[] = {
--#if defined(GOOGLE_CHROME_BUILD)
-   "avc1",
-   "mp4a",
--#endif
-   "theora",
-   "vorbis",
- };
- 
- // Note: does not include javascript types list (see supported_javascript_types)
- static const char* const supported_non_image_types[] = {
-   "text/html",
-   "text/xml",
diff --git a/www-client/chromium/files/chromium-6.0.495.0-gcc-4.5.patch b/www-client/chromium/files/chromium-6.0.495.0-gcc-4.5.patch
deleted file mode 100644
index 6b63d8f70a2b..000000000000
--- a/www-client/chromium/files/chromium-6.0.495.0-gcc-4.5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur chromium-6.0.495.0_old/ipc/ipc_message_utils.h chromium-6.0.495.0/ipc/ipc_message_utils.h
---- chromium-6.0.495.0_old/ipc/ipc_message_utils.h	2010-08-15 11:41:25.000000000 +0300
-+++ chromium-6.0.495.0/ipc/ipc_message_utils.h	2010-08-18 21:38:48.000000000 +0300
-@@ -27,7 +27,7 @@
- // ipc_message_utils_impl.h in those files) and exported, instead of expanded
- // at every call site. Special note: GCC happily accepts the attribute before
- // the method declaration, but only acts on it if it is after.
--#define IPC_MSG_NOINLINE  __attribute__((noinline));
-+#define IPC_MSG_NOINLINE  __attribute__((noinline, noclone));
- #elif defined(COMPILER_MSVC)
- // MSVC++ doesn't do this.
- #define IPC_MSG_NOINLINE
diff --git a/www-client/chromium/files/chromium-disable-vp8-r1.patch b/www-client/chromium/files/chromium-disable-vp8-r1.patch
deleted file mode 100644
index e996afe6a622..000000000000
--- a/www-client/chromium/files/chromium-disable-vp8-r1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- media/filters/ffmpeg_demuxer.cc.orig	2010-06-10 12:28:10.000000000 +0200
-+++ media/filters/ffmpeg_demuxer.cc	2010-06-10 12:29:13.000000000 +0200
-@@ -413,9 +413,8 @@
-     CodecType codec_type = codec_context->codec_type;
-     if (codec_type == CODEC_TYPE_AUDIO || codec_type == CODEC_TYPE_VIDEO) {
-       AVStream* stream = format_context_->streams[i];
--      // WebM is currently strictly VP8 and Vorbis.
--      if (kDemuxerIsWebm && (stream->codec->codec_id != CODEC_ID_VP8 &&
--        stream->codec->codec_id != CODEC_ID_VORBIS)) {
-+      // WebM is currently strictly Vorbis.
-+      if (kDemuxerIsWebm && (stream->codec->codec_id != CODEC_ID_VORBIS)) {
-         packet_streams_.push_back(NULL);
-         continue;
-       }
---- net/base/mime_util.cc.orig	2010-06-10 12:30:13.000000000 +0200
-+++ net/base/mime_util.cc	2010-06-10 12:30:38.000000000 +0200
-@@ -227,7 +227,6 @@
- #endif
-   "theora",
-   "vorbis",
--  "vp8"
- };
- 
- // Note: does not include javascript types list (see supported_javascript_types)
-@@ -297,7 +296,7 @@
- };
- 
- static const MediaFormatStrict format_codec_mappings[] = {
--  { "video/webm", "vorbis,vp8,vp8.0" },
-+  { "video/webm", "vorbis" },
-   { "audio/webm", "vorbis" }
- };
- 
diff --git a/www-client/chromium/files/chromium-drop_sse2-r0.patch b/www-client/chromium/files/chromium-drop_sse2-r0.patch
deleted file mode 100644
index 7006246118ee..000000000000
--- a/www-client/chromium/files/chromium-drop_sse2-r0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- build/common.gypi.orig	2010-04-19 18:19:49.000000000 +0200
-+++ build/common.gypi	2010-04-19 18:20:41.000000000 +0200
-@@ -881,24 +881,24 @@
-             # used during computation does not change depending on how the
-             # compiler optimized the code, since the value is always kept
-             # in its specified precision.
--            'conditions': [
--              ['branding=="Chromium"', {
--                'cflags': [
--                  '-march=pentium4',
--                  '-msse2',
--                  '-mfpmath=sse',
--                ],
--              }],
--            ],
-+            #'conditions': [
-+            #  ['branding=="Chromium"', {
-+            #    'cflags': [
-+            #      '-march=pentium4',
-+            #      '-msse2',
-+            #      '-mfpmath=sse',
-+            #    ],
-+            #  }],
-+            #],
-             # -mmmx allows mmintrin.h to be used for mmx intrinsics.
-             # video playback is mmx and sse2 optimized.
--            'cflags': [
--              '-m32',
--              '-mmmx',
--            ],
--            'ldflags': [
--              '-m32',
--            ],
-+            #'cflags': [
-+            #  '-m32',
-+            #  '-mmmx',
-+            #],
-+            #'ldflags': [
-+            #  '-m32',
-+            #],
-           }],
-           ['target_arch=="arm"', {
-             'target_conditions': [
diff --git a/www-client/chromium/files/chromium-ffmpeg-compatibility-r0.patch b/www-client/chromium/files/chromium-ffmpeg-compatibility-r0.patch
deleted file mode 100644
index 183598ff536f..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-compatibility-r0.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- media/filters/ffmpeg_glue.cc.orig	2010-08-05 15:27:11.000000000 +0200
-+++ media/filters/ffmpeg_glue.cc	2010-08-05 15:27:25.000000000 +0200
-@@ -134,7 +134,7 @@
- 
-   // Register our protocol glue code with FFmpeg.
-   avcodec_init();
--  av_register_protocol2(&kFFmpegURLProtocol, sizeof(kFFmpegURLProtocol));
-+  av_register_protocol(&kFFmpegURLProtocol);
-   av_lockmgr_register(&LockManagerOperation);
- 
-   // Now register the rest of FFmpeg.
---- third_party/ffmpeg/ffmpeg.gyp.orig	2010-08-05 18:25:34.000000000 +0200
-+++ third_party/ffmpeg/ffmpeg.gyp	2010-08-05 18:29:12.000000000 +0200
-@@ -836,10 +836,20 @@
-               'cflags': [
-                 '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
-               ],
-+              'link_settings': {
-+                'libraries': [
-+                  '<!@(pkg-config --libs libavcodec libavformat libavutil)',
-+                ],
-+              },
-               'direct_dependent_settings': {
-                 'cflags': [
-                   '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
-                 ],
-+                'link_settings': {
-+                  'libraries': [
-+                    '<!@(pkg-config --libs libavcodec libavformat libavutil)',
-+                  ],
-+                },
-               },
-             }, {  # else use_system_ffmpeg==0, add local copy to include path
-               'include_dirs': [
---- media/base/media_posix.cc.orig	2010-08-06 02:17:43.000000000 +0200
-+++ media/base/media_posix.cc	2010-08-06 02:18:00.000000000 +0200
-@@ -72,20 +72,7 @@
- // Attempts to initialize the media library (loading DSOs, etc.).
- // Returns true if everything was successfully initialized, false otherwise.
- bool InitializeMediaLibrary(const FilePath& module_dir) {
--  // TODO(ajwong): We need error resolution.
--  tp_ffmpeg::StubPathMap paths;
--  for (int i = 0; i < static_cast<int>(tp_ffmpeg::kNumStubModules); ++i) {
--    tp_ffmpeg::StubModules module = static_cast<tp_ffmpeg::StubModules>(i);
--
--    // Add the sumo library first so it takes precedence.
--    paths[module].push_back(module_dir.Append(sumo_name).value());
--
--    // Add the more specific FFmpeg library name.
--    FilePath path = module_dir.Append(GetDSOName(module));
--    paths[module].push_back(path.value());
--  }
--
--  return tp_ffmpeg::InitializeStubs(paths);
-+  return true;
- }
- 
- #if defined(OS_LINUX)
diff --git a/www-client/chromium/files/chromium-libpng-1.4.patch b/www-client/chromium/files/chromium-libpng-1.4.patch
deleted file mode 100644
index 55b86198ae21..000000000000
--- a/www-client/chromium/files/chromium-libpng-1.4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp.orig	2010-04-03 18:37:29.000000000 +0200
-+++ third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp	2010-04-03 18:38:20.000000000 +0200
-@@ -130,9 +130,9 @@
-     }
- 
-     png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
--                                                 png_voidp_NULL,
--                                                 png_error_ptr_NULL,
--                                                 png_error_ptr_NULL);
-+                                                 0,
-+                                                 0,
-+                                                 0);
-     if (!pngPtr)
-         return false;
- 
diff --git a/www-client/chromium/files/chromium-yuv-crash-r0.patch b/www-client/chromium/files/chromium-yuv-crash-r0.patch
deleted file mode 100644
index 24780f8e39cb..000000000000
--- a/www-client/chromium/files/chromium-yuv-crash-r0.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- media/base/yuv_row_posix.cc.orig	2010-08-12 19:17:00.000000000 +0200
-+++ media/base/yuv_row_posix.cc	2010-08-12 19:19:55.000000000 +0200
-@@ -271,6 +271,7 @@
-                               int width);
- 
-   asm(
-+  ".text\n"
-   ".global FastConvertYUVToRGB32Row\n"
- "FastConvertYUVToRGB32Row:\n"
-   "pusha\n"
-@@ -331,6 +332,7 @@
-                         int source_dx);
- 
-   asm(
-+  ".text\n"
-   ".global ScaleYUVToRGB32Row\n"
- "ScaleYUVToRGB32Row:\n"
-   "pusha\n"
-@@ -405,6 +407,7 @@
-                               int source_dx);
- 
-   asm(
-+  ".text\n"
-   ".global LinearScaleYUVToRGB32Row\n"
- "LinearScaleYUVToRGB32Row:\n"
-   "pusha\n"
-@@ -517,6 +520,7 @@
-                                     int width,
-                                     int16 *kCoefficientsRgbY);
-   __asm__(
-+  ".text\n"
- "_PICConvertYUVToRGB32Row:\n"
-   "pusha\n"
-   "mov    0x24(%esp),%edx\n"
-@@ -586,6 +590,7 @@
-                                int16 *kCoefficientsRgbY);
- 
-   __asm__(
-+  ".text\n"
- "_PICScaleYUVToRGB32Row:\n"
-   "pusha\n"
-   "mov    0x24(%esp),%edx\n"
-@@ -671,6 +676,7 @@
-                                  int16 *kCoefficientsRgbY);
- 
-   asm(
-+  ".text\n"
- "_PICLinearScaleYUVToRGB32Row:\n"
-   "pusha\n"
-   "mov    0x24(%esp),%edx\n"
-@@ -824,29 +830,6 @@
-                                         (packuswb(a) << 24);
- }
- 
--#if TEST_MMX_YUV
--static inline void YuvPixel(uint8 y,
--                            uint8 u,
--                            uint8 v,
--                            uint8* rgb_buf) {
--
--  __asm {
--    movzx     eax, u
--    movq      mm0, [kCoefficientsRgbY+2048 + 8 * eax]
--    movzx     eax, v
--    paddsw    mm0, [kCoefficientsRgbY+4096 + 8 * eax]
--    movzx     eax, y
--    movq      mm1, [kCoefficientsRgbY + 8 * eax]
--    paddsw    mm1, mm0
--    psraw     mm1, 6
--    packuswb  mm1, mm1
--    mov       eax, rgb_buf
--    movd      [eax], mm1
--    emms
--  }
--}
--#endif
--
- void FastConvertYUVToRGB32Row(const uint8* y_buf,
-                               const uint8* u_buf,
-                               const uint8* v_buf,
diff --git a/www-client/chromium/files/chromium-yuv-crash-r1.patch b/www-client/chromium/files/chromium-yuv-crash-r1.patch
deleted file mode 100644
index 94a757361e30..000000000000
--- a/www-client/chromium/files/chromium-yuv-crash-r1.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- media/base/yuv_row_posix.cc.orig	2010-08-13 06:42:21.000000000 +0200
-+++ media/base/yuv_row_posix.cc	2010-08-13 06:44:49.000000000 +0200
-@@ -270,6 +270,7 @@
-                               uint8* rgb_buf,
-                               int width);
-   asm(
-+  ".text\n"
-   ".global FastConvertYUVToRGB32Row\n"
- "FastConvertYUVToRGB32Row:\n"
-   "pusha\n"
-@@ -329,6 +330,7 @@
-                         int width,
-                         int source_dx);
-   asm(
-+  ".text\n"
-   ".global ScaleYUVToRGB32Row\n"
- "ScaleYUVToRGB32Row:\n"
-   "pusha\n"
-@@ -402,6 +404,7 @@
-                               int width,
-                               int source_dx);
-   asm(
-+  ".text\n"
-   ".global LinearScaleYUVToRGB32Row\n"
- "LinearScaleYUVToRGB32Row:\n"
-   "pusha\n"
-@@ -514,7 +517,7 @@
-                                     int width,
-                                     int16 *kCoefficientsRgbY);
-   asm(
--
-+  ".text\n"
- #if defined(OS_MACOSX)
- "_PICConvertYUVToRGB32Row:\n"
- #else
-@@ -588,6 +591,7 @@
-                                int16 *kCoefficientsRgbY);
- 
-   asm(
-+  ".text\n"
- #if defined(OS_MACOSX)
- "_PICScaleYUVToRGB32Row:\n"
- #else
-@@ -676,6 +680,7 @@
-                                  int source_dx,
-                                  int16 *kCoefficientsRgbY);
-   asm(
-+  ".text\n"
- #if defined(OS_MACOSX)
- "_PICLinearScaleYUVToRGB32Row:\n"
- #else
-@@ -833,29 +838,6 @@
-                                         (packuswb(a) << 24);
- }
- 
--#if TEST_MMX_YUV
--static inline void YuvPixel(uint8 y,
--                            uint8 u,
--                            uint8 v,
--                            uint8* rgb_buf) {
--
--  asm {
--    movzx     eax, u
--    movq      mm0, [kCoefficientsRgbY+2048 + 8 * eax]
--    movzx     eax, v
--    paddsw    mm0, [kCoefficientsRgbY+4096 + 8 * eax]
--    movzx     eax, y
--    movq      mm1, [kCoefficientsRgbY + 8 * eax]
--    paddsw    mm1, mm0
--    psraw     mm1, 6
--    packuswb  mm1, mm1
--    mov       eax, rgb_buf
--    movd      [eax], mm1
--    emms
--  }
--}
--#endif
--
- void FastConvertYUVToRGB32Row(const uint8* y_buf,
-                               const uint8* u_buf,
-                               const uint8* v_buf,
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 85c857fa121c..47002a437f00 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -3,7 +3,4 @@
 <pkgmetadata>
 	<herd>chromium</herd>
 	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
-	<use>
-		<flag name='plugins-symlink'>Add support for system web browser plugins out of the box</flag>
-	</use>
 </pkgmetadata>