Version bump for dev channel release. Added src_test (tests fail for now, the failures are non-fatal). Removed old ebuilds and patches.

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

14 files changed, 71 insertions, 911 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 96ebd61f022a..05d1e15c8443 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,20 @@
 # 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.235 2010/12/09 16:14:13 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.236 2010/12/10 16:35:10 phajdan.jr Exp $
+
+*chromium-9.0.597.15 (10 Dec 2010)
+
+  10 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -files/chromium-gconf-optional-r0.patch,
+  -files/chromium-system-icu-r0.patch, +files/chromium-tests-r0.patch,
+  -files/chromium-make-3.82-compatibility-r0.patch,
+  -chromium-7.0.517.44.ebuild, -files/chromium-gnome-keyring-r0.patch,
+  -chromium-8.0.552.210.ebuild, -files/chromium-plugins-path-r0.patch,
+  -chromium-9.0.587.0-r1.ebuild, -files/chromium-system-sqlite-r0.patch,
+  +chromium-9.0.597.15.ebuild, -files/chromium-system-ssl-r0.patch,
+  chromium-9999.ebuild, -files/chromium-system-vpx-r0.patch:
+  Version bump for dev channel release. Added src_test (tests fail for now,
+  the failures are non-fatal). Removed old ebuilds and patches.
 
   09 Dec 2010; Richard Freeman <rich0@gentoo.org>
   chromium-8.0.552.215.ebuild:
diff --git a/www-client/chromium/chromium-7.0.517.44.ebuild b/www-client/chromium/chromium-7.0.517.44.ebuild
deleted file mode 100644
index c3955b0990e1..000000000000
--- a/www-client/chromium/chromium-7.0.517.44.ebuild
+++ /dev/null
@@ -1,235 +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-7.0.517.44.ebuild,v 1.5 2010/11/07 19:23:50 anarchy Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib pax-utils portability 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="cups gnome gnome-keyring"
-
-RDEPEND="app-arch/bzip2
-	>=dev-libs/icu-4.4.1
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	>=gnome-base/gconf-2.24.0
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
-	>=media-libs/alsa-lib-1.0.19
-	virtual/jpeg
-	media-libs/libpng
-	cups? ( >=net-print/cups-1.3.11 )
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver"
-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-misc/xdg-utils
-	virtual/ttf-fonts"
-
-remove_bundled_lib() {
-	einfo "Removing bundled library $1 ..."
-	local out
-	out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \
-		|| die "failed to remove bundled library $1"
-	if [[ -z $out ]]; then
-		die "no files matched when removing bundled library $1"
-	fi
-}
-
-pkg_setup() {
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-
-	# Prevent user problems like bug #299777.
-	if ! grep -q /dev/shm <<< $(get_mounts); then
-		ewarn "You don't have tmpfs mounted at /dev/shm."
-		ewarn "${PN} may fail to start in that configuration."
-		ewarn "Please uncomment the /dev/shm entry in /etc/fstab,"
-		ewarn "and run 'mount /dev/shm'."
-	fi
-	if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-		ewarn "/dev/shm does not have correct permissions."
-		ewarn "${PN} may fail to start in that configuration."
-		ewarn "Please run 'chmod 1777 /dev/shm'."
-	fi
-}
-
-src_prepare() {
-	# 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
-
-	# Backport a fix for bug #343971.
-	epatch "${FILESDIR}"/${PN}-locale-glib-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"
-	remove_bundled_lib "third_party/libjpeg"
-	remove_bundled_lib "third_party/libpng"
-	remove_bundled_lib "third_party/libxml"
-	remove_bundled_lib "third_party/libxslt"
-	remove_bundled_lib "third_party/lzma_sdk"
-	remove_bundled_lib "third_party/molokocacao"
-	remove_bundled_lib "third_party/ocmock"
-	remove_bundled_lib "third_party/pyftpdlib"
-	remove_bundled_lib "third_party/simplejson"
-	remove_bundled_lib "third_party/tlslite"
-	# TODO: also remove third_party/zlib. For now the compilation fails if we
-	# remove it (minizip-related).
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg (http://crbug.com/50678).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl when we have a recent enough system NSS.
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_icu=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libxml=1
-		-Duse_system_zlib=1"
-
-	# The dependency on cups is optional, see bug #324105.
-	if use cups; then
-		myconf+=" -Duse_cups=1"
-	else
-		myconf+=" -Duse_cups=0"
-	fi
-
-	if use "gnome-keyring"; then
-		myconf+=" -Duse_gnome_keyring=1 -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"
-	fi
-
-	# Enable sandbox.
-	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+=" -Dv8_use_snapshot=0"
-
-	# Disable tcmalloc memory allocator. It causes problems,
-	# for example bug #320419.
-	myconf+=" -Dlinux_use_tcmalloc=0"
-
-	# Use target arch detection logic from bug #296917.
-	local myarch="$ABI"
-	[[ $myarch = "" ]] && myarch="$ARCH"
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		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"
-	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"
-	fi
-
-	# Work around a likely GCC bug, see bug #331945.
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
-		append-flags -fno-ipa-cp
-	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+=" -Dwerror="
-
-	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die
-}
-
-src_compile() {
-	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		|| die
-}
-
-src_install() {
-	exeinto "${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
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/chrome.pak || die
-	doins out/Release/resources.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1 || die
-	newman out/Release/chrome.1 chromium.1 || die
-
-	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
-	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
-
-	# 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
-}
diff --git a/www-client/chromium/chromium-8.0.552.210.ebuild b/www-client/chromium/chromium-8.0.552.210.ebuild
deleted file mode 100644
index 7f9b4215a1e6..000000000000
--- a/www-client/chromium/chromium-8.0.552.210.ebuild
+++ /dev/null
@@ -1,276 +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-8.0.552.210.ebuild,v 1.1 2010/11/24 15:59:10 phajdan.jr Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib pax-utils portability 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="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite system-v8"
-
-RDEPEND="app-arch/bzip2
-	system-sqlite? (
-		>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
-	)
-	system-v8? ( ~dev-lang/v8-2.4.9.13 )
-	>=dev-libs/icu-4.4.1
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	>=gnome-base/gconf-2.24.0
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
-	>=media-libs/alsa-lib-1.0.19
-	virtual/jpeg
-	media-libs/libpng
-	>=media-video/ffmpeg-0.6_p25423[threads]
-	cups? ( >=net-print/cups-1.3.11 )
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver"
-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-misc/xdg-utils
-	virtual/ttf-fonts
-	gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )"
-
-remove_bundled_lib() {
-	einfo "Removing bundled library $1 ..."
-	local out
-	out="$(find $1 -type f \! -iname '*.gyp' -print -delete)" \
-		|| die "failed to remove bundled library $1"
-	if [[ -z $out ]]; then
-		die "no files matched when removing bundled library $1"
-	fi
-}
-
-pkg_setup() {
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Prevent user problems like bug #299777.
-	if ! grep -q /dev/shm <<< $(get_mounts); then
-		ewarn "You don't have tmpfs mounted at /dev/shm."
-		ewarn "${PN} may fail to start in that configuration."
-		ewarn "Please uncomment the /dev/shm entry in /etc/fstab,"
-		ewarn "and run 'mount /dev/shm'."
-	fi
-	if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-		ewarn "/dev/shm does not have correct permissions."
-		ewarn "${PN} may fail to start in that configuration."
-		ewarn "Please run 'chmod 1777 /dev/shm'."
-	fi
-}
-
-src_prepare() {
-	# Small fix to the system-provided icu support,
-	# to be upstreamed.
-	epatch "${FILESDIR}"/${PN}-system-icu-r1.patch
-
-	# Enable optional support for gecko-mediaplayer.
-	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch
-
-	# Backport a fix for bug #343971.
-	epatch "${FILESDIR}"/${PN}-locale-glib-r1.patch
-
-	remove_bundled_lib "third_party/bzip2"
-	remove_bundled_lib "third_party/codesighs"
-	remove_bundled_lib "third_party/icu"
-	remove_bundled_lib "third_party/jemalloc"
-	remove_bundled_lib "third_party/lcov"
-	remove_bundled_lib "third_party/libevent"
-	remove_bundled_lib "third_party/libjpeg"
-	remove_bundled_lib "third_party/libpng"
-	remove_bundled_lib "third_party/libxml"
-	remove_bundled_lib "third_party/libxslt"
-	remove_bundled_lib "third_party/lzma_sdk"
-	remove_bundled_lib "third_party/molokocacao"
-	remove_bundled_lib "third_party/ocmock"
-	remove_bundled_lib "third_party/pyftpdlib"
-	remove_bundled_lib "third_party/simplejson"
-	remove_bundled_lib "third_party/tlslite"
-	# TODO: also remove third_party/ffmpeg (needs to be compile-tested).
-	# TODO: also remove third_party/zlib. For now the compilation fails if we
-	# remove it (minizip-related).
-
-	if use system-sqlite; then
-		remove_bundled_lib "third_party/sqlite/src"
-		remove_bundled_lib "third_party/sqlite/preprocessed"
-	fi
-
-	if use system-v8; then
-		# Provide our own gyp file that links with the system v8.
-		# TODO: move this upstream.
-		cp "${FILESDIR}"/v8.gyp v8/tools/gyp || die
-
-		remove_bundled_lib "v8"
-
-		# The implementation files include v8 headers with full path,
-		# like #include "v8/include/v8.h". Make sure the system headers
-		# will be used.
-		# TODO: find a solution that can be upstreamed.
-		rmdir v8/include || die
-		ln -s /usr/include v8/include || die
-	fi
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl (need to consult upstream).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_ffmpeg=1
-		-Duse_system_icu=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libxml=1
-		-Duse_system_zlib=1"
-
-	if use system-sqlite; then
-		myconf+=" -Duse_system_sqlite=1"
-	fi
-
-	# The dependency on cups is optional, see bug #324105.
-	if use cups; then
-		myconf+=" -Duse_cups=1"
-	else
-		myconf+=" -Duse_cups=0"
-	fi
-
-	if use "gnome-keyring"; then
-		myconf+=" -Duse_gnome_keyring=1 -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"
-	fi
-
-	# Enable sandbox.
-	myconf+="
-		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-	if host-is-pax; then
-		# Prevent the build from failing (bug #301880). The performance
-		# difference is very small.
-		myconf+=" -Dv8_use_snapshot=0"
-	fi
-
-	if use gecko-mediaplayer; then
-		# Disable hardcoded blacklist for gecko-mediaplayer.
-		# When www-plugins/gecko-mediaplayer is compiled with USE=gnome, it causes
-		# the browser to hang. We can handle the situation via dependencies,
-		# thus making it possible to use gecko-mediaplayer.
-		append-flags -DGENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
-	fi
-
-	# Our system ffmpeg should support more codecs than the bundled one
-	# for Chromium.
-	myconf+=" -Dproprietary_codecs=1"
-
-	# Use target arch detection logic from bug #296917.
-	local myarch="$ABI"
-	[[ $myarch = "" ]] && myarch="$ARCH"
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		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"
-	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"
-	fi
-
-	# Work around a likely GCC bug, see bug #331945.
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
-		append-flags -fno-ipa-cp
-	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+=" -Dwerror="
-
-	build/gyp_chromium --depth=. ${myconf} || die
-}
-
-src_compile() {
-	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
-}
-
-src_install() {
-	exeinto "${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
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/chrome.pak || die
-	doins out/Release/resources.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1 || die
-	newman out/Release/chrome.1 chromium.1 || die
-
-	# 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}" || die
-	dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
-	dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || 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
-	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
-
-	# 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
-}
diff --git a/www-client/chromium/chromium-9.0.587.0-r1.ebuild b/www-client/chromium/chromium-9.0.597.15.ebuild
index ada34752dce6..5a6006a6ac06 100644
--- a/www-client/chromium/chromium-9.0.587.0-r1.ebuild
+++ b/www-client/chromium/chromium-9.0.597.15.ebuild
@@ -1,12 +1,12 @@
 # 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-9.0.587.0-r1.ebuild,v 1.2 2010/11/29 11:39:42 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.597.15.ebuild,v 1.1 2010/12/10 16:35:10 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
 
 inherit eutils flag-o-matic multilib pax-utils portability python \
-	toolchain-funcs versionator
+	toolchain-funcs versionator virtualx
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -21,7 +21,7 @@ RDEPEND="app-arch/bzip2
 	system-sqlite? (
 		>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
 	)
-	system-v8? ( ~dev-lang/v8-2.5.6 )
+	system-v8? ( >=dev-lang/v8-2.5.9.1 )
 	dev-libs/dbus-glib
 	>=dev-libs/icu-4.4.1
 	>=dev-libs/libevent-1.4.13
@@ -84,6 +84,7 @@ pkg_setup() {
 
 	# Make sure the build system will use the right python, bug #344367.
 	python_set_active_version 2
+	python_pkg_setup
 
 	# Prevent user problems like bug #299777.
 	if ! grep -q /dev/shm <<< $(get_mounts); then
@@ -106,6 +107,9 @@ src_prepare() {
 	# Make sure we don't use bundled libvpx headers.
 	epatch "${FILESDIR}"/${PN}-system-vpx-r1.patch
 
+	# Small fixes to make tests compile, to be upstreamed.
+	epatch "${FILESDIR}"/${PN}-tests-r0.patch
+
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/codesighs"
 	remove_bundled_lib "third_party/icu"
@@ -120,9 +124,6 @@ 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/pyftpdlib"
-	remove_bundled_lib "third_party/simplejson"
-	remove_bundled_lib "third_party/tlslite"
 	remove_bundled_lib "third_party/yasm"
 	# TODO: also remove third_party/ffmpeg (needs to be compile-tested).
 	# TODO: also remove third_party/zlib. For now the compilation fails if we
@@ -259,12 +260,26 @@ src_configure() {
 }
 
 src_compile() {
-	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
+	emake chrome chrome_sandbox base_unittests net_unittests \
+		BUILDTYPE=Release V=1 || die
+	pax-mark m out/Release/chrome
+	if use test; then
+		emake base_unittests net_unittests \
+			BUILDTYPE=Release V=1 || die
+		pax-mark m out/Release/{base_unittests,net_unittests}
+	fi
+}
+
+src_test() {
+	# Make test failures non-fatal for now. This needs more investigation.
+	maketype=out/Release/base_unittests virtualmake \
+		|| eerror "base_unittests failed"
+	maketype=out/Release/net_unittests virtualmake \
+		|| eerror "net_unittests failed"
 }
 
 src_install() {
 	exeinto "${CHROMIUM_HOME}"
-	pax-mark m out/Release/chrome
 	doexe out/Release/chrome
 	doexe out/Release/chrome_sandbox || die
 	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 733eaf56f0bb..43e3204c8a7d 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,12 +1,12 @@
 # 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-9999.ebuild,v 1.113 2010/11/29 11:39:42 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.114 2010/12/10 16:35:10 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
 
 inherit eutils flag-o-matic multilib pax-utils portability python subversion \
-	toolchain-funcs versionator
+	toolchain-funcs versionator virtualx
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -129,6 +129,7 @@ pkg_setup() {
 
 	# Make sure the build system will use the right python, bug #344367.
 	python_set_active_version 2
+	python_pkg_setup
 
 	# Prevent user problems like bug #299777.
 	if ! grep -q /dev/shm <<< $(get_mounts); then
@@ -151,6 +152,9 @@ src_prepare() {
 	# Make sure we don't use bundled libvpx headers.
 	epatch "${FILESDIR}"/${PN}-system-vpx-r1.patch
 
+	# Small fixes to make tests compile, to be upstreamed.
+	epatch "${FILESDIR}"/${PN}-tests-r0.patch
+
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/codesighs"
 	remove_bundled_lib "third_party/icu"
@@ -165,9 +169,6 @@ 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/pyftpdlib"
-	remove_bundled_lib "third_party/simplejson"
-	remove_bundled_lib "third_party/tlslite"
 	remove_bundled_lib "third_party/yasm"
 	# TODO: also remove third_party/ffmpeg (needs to be compile-tested).
 	# TODO: also remove third_party/zlib. For now the compilation fails if we
@@ -304,12 +305,26 @@ src_configure() {
 }
 
 src_compile() {
-	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
+	emake chrome chrome_sandbox base_unittests net_unittests \
+		BUILDTYPE=Release V=1 || die
+	pax-mark m out/Release/chrome
+	if use test; then
+		emake base_unittests net_unittests \
+			BUILDTYPE=Release V=1 || die
+		pax-mark m out/Release/{base_unittests,net_unittests}
+	fi
+}
+
+src_test() {
+	# Make test failures non-fatal for now. This needs more investigation.
+	maketype=out/Release/base_unittests virtualmake \
+		|| eerror "base_unittests failed"
+	maketype=out/Release/net_unittests virtualmake \
+		|| eerror "net_unittests failed"
 }
 
 src_install() {
 	exeinto "${CHROMIUM_HOME}"
-	pax-mark m out/Release/chrome
 	doexe out/Release/chrome
 	doexe out/Release/chrome_sandbox || die
 	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
diff --git a/www-client/chromium/files/chromium-gconf-optional-r0.patch b/www-client/chromium/files/chromium-gconf-optional-r0.patch
deleted file mode 100644
index 26e219685777..000000000000
--- a/www-client/chromium/files/chromium-gconf-optional-r0.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- net/proxy/proxy_config_service_linux.cc.orig	2010-11-07 15:14:52.000000000 +0000
-+++ net/proxy/proxy_config_service_linux.cc	2010-11-07 15:21:16.000000000 +0000
-@@ -6,7 +6,9 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(USE_GCONF)
- #include <gconf/gconf-client.h>
-+#endif
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -185,6 +187,7 @@
- 
- const int kDebounceTimeoutMilliseconds = 250;
- 
-+#if defined(USE_GCONF)
- // This is the "real" gconf version that actually uses gconf.
- class GConfSettingGetterImplGConf
-     : public ProxyConfigServiceLinux::GConfSettingGetter {
-@@ -419,6 +422,7 @@
- 
-   DISALLOW_COPY_AND_ASSIGN(GConfSettingGetterImplGConf);
- };
-+#endif  // defined(USE_GCONF)
- 
- // This is the KDE version that reads kioslaverc and simulates gconf.
- // Doing this allows the main Delegate code, as well as the unit tests
-@@ -1064,7 +1068,9 @@
-   // Figure out which GConfSettingGetterImpl to use, if any.
-   switch (base::nix::GetDesktopEnvironment(env_var_getter)) {
-     case base::nix::DESKTOP_ENVIRONMENT_GNOME:
-+#if defined(USE_GCONF)
-       gconf_getter_.reset(new GConfSettingGetterImplGConf());
-+#endif
-       break;
-     case base::nix::DESKTOP_ENVIRONMENT_KDE3:
-     case base::nix::DESKTOP_ENVIRONMENT_KDE4:
---- chrome/browser/gtk/browser_titlebar.cc.orig	2010-11-07 15:55:54.000000000 +0000
-+++ chrome/browser/gtk/browser_titlebar.cc	2010-11-07 15:57:39.000000000 +0000
-@@ -23,7 +23,9 @@
- #include "chrome/browser/gtk/accelerators_gtk.h"
- #include "chrome/browser/gtk/browser_window_gtk.h"
- #include "chrome/browser/gtk/custom_button.h"
-+#if defined(USE_GCONF)
- #include "chrome/browser/gtk/gconf_titlebar_listener.h"
-+#endif
- #include "chrome/browser/gtk/gtk_theme_provider.h"
- #include "chrome/browser/gtk/gtk_util.h"
- #include "chrome/browser/gtk/menu_gtk.h"
-@@ -299,9 +301,13 @@
-   gtk_box_pack_end(GTK_BOX(container_hbox_), titlebar_right_buttons_vbox_,
-                    FALSE, FALSE, 0);
- 
-+#if defined(USE_GCONF)
-   // Either read the gconf database and register for updates (on GNOME), or use
-   // the default value (anywhere else).
-   Singleton<GConfTitlebarListener>()->SetTitlebarButtons(this);
-+#else
-+  BuildButtons(":minimize,maximize,close");
-+#endif
- 
-   // We use an alignment to control the titlebar height.
-   titlebar_alignment_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
-@@ -363,7 +369,9 @@
- 
- BrowserTitlebar::~BrowserTitlebar() {
-   ActiveWindowWatcherX::RemoveObserver(this);
-+#if defined(USE_GCONF)
-   Singleton<GConfTitlebarListener>()->RemoveObserver(this);
-+#endif
- }
- 
- void BrowserTitlebar::BuildButtons(const std::string& button_string) {
---- build/common.gypi.orig	2010-11-07 14:55:25.000000000 +0000
-+++ build/common.gypi	2010-11-07 14:57:31.000000000 +0000
-@@ -314,6 +314,9 @@
-     # whether to compile in the sources for the GPU plugin / process.
-     'enable_gpu%': 1,
- 
-+    # Use GConf, the GNOME configuration system.
-+    'use_gconf%': 1,
-+
-     # Use OpenSSL instead of NSS. Currently in development.
-     'use_openssl%': 0,
- 
---- build/linux/system.gyp.orig	2010-11-07 16:34:57.000000000 +0000
-+++ build/linux/system.gyp	2010-11-07 16:35:55.000000000 +0000
-@@ -188,11 +188,14 @@
-       'target_name': 'gconf',
-       'type': 'settings',
-       'conditions': [
--        ['_toolset=="target"', {
-+        ['use_gconf==1 and _toolset=="target"', {
-           'direct_dependent_settings': {
-             'cflags': [
-               '<!@(<(pkg-config) --cflags gconf-2.0)',
-             ],
-+            'defines': [
-+              'USE_GCONF',
-+            ],
-           },
-           'link_settings': {
-             'ldflags': [
---- chrome/chrome_browser.gypi.orig	2010-11-07 15:53:31.000000000 +0000
-+++ chrome/chrome_browser.gypi	2010-11-07 15:55:04.000000000 +0000
-@@ -3393,6 +3393,12 @@
-             ],
-           },
-         }],
-+	['use_gconf==0', {
-+	  'sources!': [
-+            'browser/gtk/gconf_titlebar_listener.cc',
-+            'browser/gtk/gconf_titlebar_listener.h',
-+	  ],
-+	}],
-         ['use_gnome_keyring==0', {
-           'sources!': [
-             'browser/password_manager/native_backend_gnome_x.h',
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 3d7911748271..000000000000
--- a/www-client/chromium/files/chromium-gnome-keyring-r0.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- build/linux/system.gyp.orig	2010-09-07 01:22:40.000000000 +0200
-+++ build/linux/system.gyp	2010-09-07 01:31:23.000000000 +0200
-@@ -3,6 +3,10 @@
- # found in the LICENSE file.
- 
- {
-+  'variables': {
-+    'use_gnome_keyring%': 1,
-+  },
-+
-   'conditions': [
-     ['sysroot!=""', {
-       'variables': {
-@@ -259,11 +263,14 @@
-       'target_name': 'gnome-keyring',
-       'type': 'settings',
-       'conditions': [
--        ['chromeos==0', {
-+        ['chromeos==0 and use_gnome_keyring==1', {
-           'direct_dependent_settings': {
-             'cflags': [
-               '<!@(<(pkg-config) --cflags gnome-keyring-1)',
-             ],
-+            'defines': [
-+              'USE_GNOME_KEYRING',
-+            ],
-             'conditions': [
-               ['linux_link_gnome_keyring==0', {
-                 'defines': ['DLOPEN_GNOME_KEYRING'],
---- chrome/chrome_browser.gypi.orig	2010-09-07 02:57:21.000000000 +0200
-+++ chrome/chrome_browser.gypi	2010-09-07 02:58:23.000000000 +0200
-@@ -3062,6 +3062,12 @@
-             ],
-           },
-         }],
-+        ['chromeos==1 or use_gnome_keyring==0', {
-+          'sources!': [
-+            'browser/password_manager/native_backend_gnome_x.h',
-+            'browser/password_manager/native_backend_gnome_x.cc',
-+          ],
-+        }],
-         ['touchui==0', {
-           'sources!': [
-             # Nothing yet.
-@@ -3096,7 +3102,7 @@
-             'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
-           ],
-           'conditions': [
--            ['chromeos==0', {
-+            ['chromeos==0 and use_gnome_keyring==1', {
-               'dependencies': [
-                 '../build/linux/system.gyp:gnome-keyring',
-               ],
---- chrome/browser/profile_impl.cc.orig	2010-09-07 01:35:40.000000000 +0200
-+++ chrome/browser/profile_impl.cc	2010-09-07 01:36:26.000000000 +0200
-@@ -89,7 +89,9 @@
- #include "chrome/browser/password_manager/password_store_mac.h"
- #elif defined(OS_POSIX) && !defined(OS_CHROMEOS)
- #include "base/xdg_util.h"
-+#if defined(USE_GNOME_KEYRING)
- #include "chrome/browser/password_manager/native_backend_gnome_x.h"
-+#endif
- #include "chrome/browser/password_manager/native_backend_kwallet_x.h"
- #include "chrome/browser/password_manager/password_store_x.h"
- #endif
-@@ -923,12 +925,14 @@
-       backend.reset();
-   } else if (desktop_env == base::DESKTOP_ENVIRONMENT_GNOME ||
-              desktop_env == base::DESKTOP_ENVIRONMENT_XFCE) {
-+#if defined(USE_GNOME_KEYRING)
-     LOG(INFO) << "Trying GNOME keyring for password storage.";
-     backend.reset(new NativeBackendGnome());
-     if (backend->Init())
-       LOG(INFO) << "Using GNOME keyring for password storage.";
-     else
-       backend.reset();
-+#endif  // defined(USE_GNOME_KEYRING)
-   }
-   // TODO(mdm): this can change to a WARNING when we detect by default.
-   if (!backend.get())
diff --git a/www-client/chromium/files/chromium-make-3.82-compatibility-r0.patch b/www-client/chromium/files/chromium-make-3.82-compatibility-r0.patch
deleted file mode 100644
index bf3f062eeeb6..000000000000
--- a/www-client/chromium/files/chromium-make-3.82-compatibility-r0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tools/gyp/pylib/gyp/generator/make.py.orig	2010-08-10 23:58:52.000000000 +0200
-+++ tools/gyp/pylib/gyp/generator/make.py	2010-08-11 00:00:15.000000000 +0200
-@@ -656,7 +656,7 @@
-     part_of_all: flag indicating this target is part of 'all'
-     """
-     for action in actions:
--      name = self.target + '_' + action['action_name']
-+      name = self.target + '_' + action['action_name'].replace(' ', '_')
-       self.WriteLn('### Rules for action "%s":' % action['action_name'])
-       inputs = action['inputs']
-       outputs = action['outputs']
-@@ -725,7 +725,7 @@
-     part_of_all: flag indicating this target is part of 'all'
-     """
-     for rule in rules:
--      name = self.target + '_' + rule['rule_name']
-+      name = self.target + '_' + rule['rule_name'].replace(' ', '_')
-       count = 0
-       self.WriteLn('### Generated for rule %s:' % name)
- 
diff --git a/www-client/chromium/files/chromium-plugins-path-r0.patch b/www-client/chromium/files/chromium-plugins-path-r0.patch
deleted file mode 100644
index 2cf8274e492d..000000000000
--- a/www-client/chromium/files/chromium-plugins-path-r0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- webkit/glue/plugins/plugin_list_posix.cc.orig	2010-08-11 02:50:36.000000000 +0200
-+++ webkit/glue/plugins/plugin_list_posix.cc	2010-08-11 02:51:37.000000000 +0200
-@@ -146,6 +146,7 @@
-   // This varies across different browsers and versions, so check 'em all.
-   plugin_dirs->push_back(FilePath("/usr/lib/browser-plugins"));
-   plugin_dirs->push_back(FilePath("/usr/lib/mozilla/plugins"));
-+  plugin_dirs->push_back(FilePath("/usr/lib/nsbrowser/plugins"));
-   plugin_dirs->push_back(FilePath("/usr/lib/firefox/plugins"));
-   plugin_dirs->push_back(FilePath("/usr/lib/xulrunner-addons/plugins"));
- 
-@@ -154,6 +155,7 @@
-   // But a user reported on their Fedora system they are separate.
-   plugin_dirs->push_back(FilePath("/usr/lib64/browser-plugins"));
-   plugin_dirs->push_back(FilePath("/usr/lib64/mozilla/plugins"));
-+  plugin_dirs->push_back(FilePath("/usr/lib64/nsbrowser/plugins"));
-   plugin_dirs->push_back(FilePath("/usr/lib64/firefox/plugins"));
-   plugin_dirs->push_back(FilePath("/usr/lib64/xulrunner-addons/plugins"));
- #endif
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 1e487a90501e..000000000000
--- a/www-client/chromium/files/chromium-system-icu-r0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- webkit/glue/plugins/pepper_private.cc.orig	2010-10-06 01:20:05.000000000 +0200
-+++ webkit/glue/plugins/pepper_private.cc	2010-10-06 01:20:39.000000000 +0200
-@@ -6,13 +6,14 @@
- 
- #include "webkit/glue/plugins/pepper_private.h"
- 
-+#include "unicode/usearch.h"
-+
- #include "app/resource_bundle.h"
- #include "base/utf_string_conversions.h"
- #include "grit/webkit_resources.h"
- #include "grit/webkit_strings.h"
- #include "skia/ext/platform_canvas.h"
- #include "third_party/skia/include/core/SkBitmap.h"
--#include "third_party/icu/public/i18n/unicode/usearch.h"
- #include "webkit/glue/webkit_glue.h"
- #include "webkit/glue/plugins/pepper_image_data.h"
- #include "webkit/glue/plugins/pepper_plugin_module.h"
diff --git a/www-client/chromium/files/chromium-system-sqlite-r0.patch b/www-client/chromium/files/chromium-system-sqlite-r0.patch
deleted file mode 100644
index 1fa919769731..000000000000
--- a/www-client/chromium/files/chromium-system-sqlite-r0.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- third_party/sqlite/sqlite3.h.orig	2010-09-30 13:13:26.000000000 +0200
-+++ third_party/sqlite/sqlite3.h	2010-09-30 13:13:37.000000000 +0200
-@@ -14,7 +14,7 @@
- 
- // A no-op implementation of database preloading (not available
- // when using system sqlite).
--int sqlite3Preload(sqlite3 *db) { return SQLITE_OK; }
-+int sqlite3Preload(sqlite3 *db);
- #else
- #include "third_party/sqlite/preprocessed/sqlite3.h"
- #endif
---- third_party/sqlite/sqlite.gyp.orig	2010-09-30 11:49:48.000000000 +0200
-+++ third_party/sqlite/sqlite.gyp	2010-09-30 11:51:38.000000000 +0200
-@@ -32,7 +32,7 @@
-           },
-         }],
-         ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and use_system_sqlite', {
--          'type': 'settings',
-+          'type': '<(library)',
-           'direct_dependent_settings': {
-             'cflags': [
-               # This next command produces no output but it it will fail (and
-@@ -54,6 +54,9 @@
-               '<!@(pkg-config --libs-only-l sqlite3)',
-             ],
-           },
-+          'sources': [
-+            'stubs.cc',
-+          ],
-         }, { # else: OS != "linux" or ! use_system_sqlite
-           'product_name': 'sqlite3',
-           'type': '<(library)',
---- /dev/null	2010-09-03 08:04:12.886666449 +0200
-+++ third_party/sqlite/stubs.cc	2010-09-30 11:53:35.000000000 +0200
-@@ -0,0 +1,5 @@
-+#include <sqlite3.h>
-+
-+int sqlite3Preload(sqlite3 *db) {
-+  return SQLITE_OK;
-+}
---- chrome/chrome.gyp.orig	2010-10-01 06:57:23.000000000 +0200
-+++ chrome/chrome.gyp	2010-10-01 06:58:09.000000000 +0200
-@@ -1018,6 +1018,7 @@
-         '_USE_32BIT_TIME_T',
-       ],
-       'dependencies': [
-+        'common',
-         '../skia/skia.gyp:skia',
-         '../third_party/libjingle/libjingle.gyp:libjingle',
-         'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
diff --git a/www-client/chromium/files/chromium-system-ssl-r0.patch b/www-client/chromium/files/chromium-system-ssl-r0.patch
deleted file mode 100644
index 43273b4b53f8..000000000000
--- a/www-client/chromium/files/chromium-system-ssl-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- net/socket/ssl_client_socket_nss.cc.orig	2010-10-05 12:52:08.000000000 +0200
-+++ net/socket/ssl_client_socket_nss.cc	2010-10-05 12:52:52.000000000 +0200
-@@ -211,7 +211,7 @@
-       return ERR_SSL_BAD_RECORD_MAC_ALERT;
-     case SSL_ERROR_UNSAFE_NEGOTIATION:
-       return ERR_SSL_UNSAFE_NEGOTIATION;
--    case SSL_ERROR_WEAK_SERVER_KEY:
-+    case SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY:
-       return ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY;
- 
-     default: {
diff --git a/www-client/chromium/files/chromium-system-vpx-r0.patch b/www-client/chromium/files/chromium-system-vpx-r0.patch
deleted file mode 100644
index 102a083ac589..000000000000
--- a/www-client/chromium/files/chromium-system-vpx-r0.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- remoting/base/encoder_vp8.cc.orig	2010-11-10 09:52:56.000000000 +0100
-+++ remoting/base/encoder_vp8.cc	2010-11-10 09:53:32.000000000 +0100
-@@ -11,9 +11,9 @@
- 
- extern "C" {
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/include/vpx/vpx_codec.h"
--#include "third_party/libvpx/include/vpx/vpx_encoder.h"
--#include "third_party/libvpx/include/vpx/vp8cx.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_encoder.h"
-+#include "vpx/vp8cx.h"
- }
- 
- namespace remoting {
---- remoting/base/decoder_vp8.cc.orig	2010-11-10 09:54:14.000000000 +0100
-+++ remoting/base/decoder_vp8.cc	2010-11-10 09:54:37.000000000 +0100
-@@ -10,9 +10,9 @@
- 
- extern "C" {
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/include/vpx/vpx_codec.h"
--#include "third_party/libvpx/include/vpx/vpx_decoder.h"
--#include "third_party/libvpx/include/vpx/vp8dx.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_decoder.h"
-+#include "vpx/vp8dx.h"
- }
- 
- namespace remoting {
---- third_party/ffmpeg/ffmpeg_stub_headers.fragment.orig	2010-11-10 09:55:43.000000000 +0100
-+++ third_party/ffmpeg/ffmpeg_stub_headers.fragment	2010-11-10 09:56:09.000000000 +0100
-@@ -7,9 +7,9 @@
- #include <libavformat/avformat.h>
- 
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/include/vpx/vpx_codec.h"
--#include "third_party/libvpx/include/vpx/vpx_encoder.h"
--#include "third_party/libvpx/include/vpx/vpx_decoder.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_encoder.h"
-+#include "vpx/vpx_decoder.h"
- 
- typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);
- 
---- third_party/ffmpeg/ffmpeg.gyp.orig	2010-11-10 11:53:27.000000000 +0100
-+++ third_party/ffmpeg/ffmpeg.gyp	2010-11-10 11:55:07.000000000 +0100
-@@ -902,10 +902,20 @@
-               'cflags': [
-                 '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
-               ],
-+              'link_settings': {
-+                'libraries': [
-+                  '-lvpx',
-+                ],
-+              },
-               'direct_dependent_settings': {
-                 'cflags': [
-                   '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
-                 ],
-+                'link_settings': {
-+                  'libraries': [
-+                    '-lvpx',
-+                  ],
-+                },
-               },
-             }, {  # else use_system_ffmpeg==0, add local copy to include path
-               'include_dirs': [
diff --git a/www-client/chromium/files/chromium-tests-r0.patch b/www-client/chromium/files/chromium-tests-r0.patch
new file mode 100644
index 000000000000..c8461366adc1
--- /dev/null
+++ b/www-client/chromium/files/chromium-tests-r0.patch
@@ -0,0 +1,11 @@
+--- base/watchdog_unittest.cc.orig	2010-12-09 10:31:32.000000000 +0000
++++ base/watchdog_unittest.cc	2010-12-09 10:31:53.000000000 +0000
+@@ -86,7 +86,7 @@
+ 
+ // Make sure a basic alarm fires when the time has expired.
+ TEST_F(WatchdogTest, AlarmPriorTimeTest) {
+-  WatchdogCounter watchdog(TimeDelta::TimeDelta(), "Enabled2", true);
++  WatchdogCounter watchdog(TimeDelta(), "Enabled2", true);
+   // Set a time in the past.
+   watchdog.ArmSomeTimeDeltaAgo(TimeDelta::FromSeconds(2));
+   // It should instantly go off, but certainly in less than 5 minutes.