Version bump for dev channel release. Remove old.

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

6 files changed, 27 insertions, 339 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 7c898f7c0e86..ee53cf284312 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.307 2011/03/12 13:19:57 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.308 2011/03/12 14:40:33 phajdan.jr Exp $
+
+*chromium-11.0.696.3 (12 Mar 2011)
+
+  12 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -files/chromium-tests-r0.patch, -chromium-9.0.597.107.ebuild,
+  -chromium-11.0.686.3.ebuild, +chromium-11.0.696.3.ebuild, metadata.xml:
+  Version bump for dev channel release. Remove old.
 
   12 Mar 2011; Christian Faulhammer <fauli@gentoo.org>
   chromium-10.0.648.127.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 3ee51dda6f0b..4d39418d3514 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX chromium-gecko-mediaplayer-r0.patch 590 RMD160 8b01e801ef4a8d3aaa842ab217929e71ebb70a87 SHA1 916ecd1c7a405fc12de579538c07c42cd9e84ecc SHA256 491cfaa353ad965a0cbfe2fc6370e4df5d1cd55398698b838996053f9e46f12c
 AUX chromium-gecko-mediaplayer-r1.patch 591 RMD160 fbfa62e79687fb1d3939d34a21f1b6d4ac4a7d0a SHA1 145d3e50933e14e9213002bebf4a4b2c8d39b177 SHA256 8d822835c1f3b39ce77ad920003bc509e7e1ef85f03b4123a71ac1a00224fce0
@@ -13,7 +10,6 @@ AUX chromium-system-vpx-r1.patch 2171 RMD160 7b5e5e624084a0a63c15e7e783676a9365a
 AUX chromium-system-vpx-r2.patch 2207 RMD160 7b33f474c4bcd498dfc3e7ce803b9f6c4505b3b0 SHA1 a28a1629937c686aa4ad3b1ea16479d9b11d3789 SHA256 b33e0e66a257837ba3e10d68ad44434e5f0bb75a143ff095379097722c14d211
 AUX chromium-system-vpx-r3.patch 1168 RMD160 3f59b6dfff335be21b55de70ccd9a77b008f5cd0 SHA1 09d1d4a6b0b031839d002abc62ec4efef6faef71 SHA256 c46f61559bdbd7e29bb47607f0b152647f73e2cc3e836f53c67bb2925e8957d7
 AUX chromium-system-xdg-utils-r0.patch 2313 RMD160 3e68d4860b04c30749d319642002dc435c1b8595 SHA1 f4ca5f19ad4c5d9b2814268d38f02c1f30193fdd SHA256 1241583ada4b3d67727de941da8a81e1762dfac3963f6a45ecb61126e5275ed8
-AUX chromium-tests-r0.patch 555 RMD160 6f26a053196f15924e939d1d84b959ccae68eb8d SHA1 be5c142e2a36dcc5eb7be1a619528be41cb1c293 SHA256 a7f1fd8b31491401420705d89e38f0e4811a92066ede1d6019275c46360d6711
 AUX chromium-webkit-version.patch 2085 RMD160 654a4d3bd87de789e80a0364c9167ca8557d072d SHA1 27b29a0fbcb09d044d8dfe037503faaae2d4e96b SHA256 a48fc2c7cd9fe30a6ecc98da1ed6a9d0f77cf89302caec4d5844f1471617cceb
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 AUX experimental.gyp 92 RMD160 1c86ce8ea3cd4ae83ce416868e493e6263651054 SHA1 1a543f30e8543fbebb7a67ebd8b06f667bfdc0bd SHA256 60ba421744968fcc90359ae55316756d76aaa1a997bb373633e6c7399c9b5e62
@@ -22,21 +18,12 @@ AUX speex.gyp 434 RMD160 6111f912450ece1cb016f3800e1a22f135cc68ff SHA1 23c1917b8
 AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a921f30b0c3ed33a5593f1059832c96 SHA256 bc5342501d71754f23bd87914bb11841a7487330ba2f0462611dd1b0f99a2a43
 DIST chromium-10.0.648.127.tar.bz2 144078290 RMD160 9838b58b7798a742a86d5d8421356c1edbae94c9 SHA1 818348df9cb4c2d5041fd412b1c0ace0bf8aef0e SHA256 f6944e182b48f2c56ba65772a3adb9f26d0003d72b1293c2786186d1717c7527
 DIST chromium-10.0.648.133.tar.bz2 144075776 RMD160 5b55914fd6371041daad4b2ff819e9acd3d27351 SHA1 cc2fa6a62bf3ffb9e0c4a76a2f3db7db4b69d996 SHA256 ace8796f8390bf4866598fd950197e5305885d8e0041920d5e4f6d0631f0ac29
-DIST chromium-11.0.686.3.tar.bz2 143214922 RMD160 bc05b25f56e61f1313d3d848716a9c8ceeff69c8 SHA1 e952e949bfc4036483cd85c422b63c72fe598baf SHA256 4eed622c743f9a4a2f26140b7cb25983dbbc19d1794ccb5999570142ffbbe549
 DIST chromium-11.0.696.1.tar.bz2 143604263 RMD160 3ac78c880bdbd9872b320f3fce7d15a817d26d83 SHA1 ea2689edfbc653386bd2ca3196857024c990aadf SHA256 30668c9bb3e5ed626a484415338a1877e466614d6c9004e4a9f1fe079dba6d63
-DIST chromium-9.0.597.107.tar.bz2 141198237 RMD160 7eec80b363fcc47b460e9a54c21940d309cc079d SHA1 4ebc93e202f87f724effb174459c3f5c2a10c9cd SHA256 1fde635017cd278e09242478de3469166dd89f93c95ce67acf8dfc67dddf8159
+DIST chromium-11.0.696.3.tar.bz2 143652787 RMD160 652bf3a7db652a709b967d23b6c3b321d60e310f SHA1 6df2b295a109158fcfa42bd3c0051dfa7420cffe SHA256 fd536046e3434ea7514e9e886bd61996dc6fd252be9a88bb99feedc3922065c7
 EBUILD chromium-10.0.648.127.ebuild 10389 RMD160 2cfd1b405d4385073a383d70c840f0b7bd95ad5d SHA1 a1932ecfd1514a4b0b27900d71bff83cd5ba3167 SHA256 d30201b2a7beb4b27f1885c44c4544fe393a37b4d0f8fa2842c76a4e93224f69
 EBUILD chromium-10.0.648.133.ebuild 10396 RMD160 cbbe442816b12b85b6dfb3e3b737ed6c031aa964 SHA1 c0b51a9de767a7d28d0f889984c402e22598cb3b SHA256 d3effba51cb6d0f610760f1c321de19a13b8c8a02c3323a3bab58dc1a840ec5a
-EBUILD chromium-11.0.686.3.ebuild 9997 RMD160 b4b2b17ec383a99ab9ad12b9a5e6d245bb1c9c18 SHA1 c03bf6a945d78135bf6329dbb7deeaa87d40d1b7 SHA256 9e038933b4e28e922f26138d8fb905849e01bd93c0017e07735a76f8454c4d4b
 EBUILD chromium-11.0.696.1.ebuild 10288 RMD160 e4824f9fb3b5246ac563bbc77b7a9d8103d6c230 SHA1 2aa2ff084cd530535767d09c0fb05a337fde7e68 SHA256 c9237d3dd31362ee9229335287e3135ade7278889374f3454c84c8ee68260d09
-EBUILD chromium-9.0.597.107.ebuild 9095 RMD160 2d7c9cba8475050d2a30fb699f16c6b1c0023b7c SHA1 93b1f4f2acc5839eb70ddbba8348143da1d12763 SHA256 09b4b0cccb794d5db7df3c5df0ca62a6f7f3e8831d5823cda2270bfd49ce08fb
+EBUILD chromium-11.0.696.3.ebuild 10288 RMD160 2144055e2ff2608594ce8dbf8ba37aa24755197c SHA1 ff55586ce6dc476625b76a8ddf93a651062f9a59 SHA256 75aa79767208da9597313ec08a5c90135da8a3fb9511b5c1936a615d2579805d
 EBUILD chromium-9999-r1.ebuild 12845 RMD160 c393e058a38b3a7d0191ddd7986c9f84a94635d1 SHA1 84f54ce5199617b2f88a6bd656a4ee23d25fa60b SHA256 906f8a73723600ecbb36ef929acb9e02778e27ba7aa9a23ea341d23be0f54396
-MISC ChangeLog 68109 RMD160 e95e234a7ebb441c3350131064f95476e0728a61 SHA1 45dbedd253d20748186e7f42951541e071876462 SHA256 ee57d7f590f8899a94e65128e9425c77aee9ef1bb6e2a04affec777130c7d536
-MISC metadata.xml 483 RMD160 f460db8d828791caa3496ad57a3c059a89912cf8 SHA1 2de8750f401b4e1f427545b5310a98716d719638 SHA256 ebc3ca0074799466d0f7485e6afca1dcd0a0ecf5768b3c2f9aabe64a1ec52759
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk17cwIACgkQNQqtfCuFneMLFgCeLFBQm5O0gZXCQhB4qoPFcsu3
-1Y4AoIldYw6m5m2cQSTYQYJYy9KwvGbH
-=IT5a
------END PGP SIGNATURE-----
+MISC ChangeLog 68396 RMD160 9287d1b7ec16f1810440449a9ec27d7d37671afd SHA1 cc9782ffaaf7f788141116b1a03ee584ab2c316c SHA256 4c04826f61ddce9a1bafdc92e23fa528403be1502026e12f11a6bec94a07e23a
+MISC metadata.xml 392 RMD160 5fbc2d4aaba9b5262830ad7201bbb58d13b49787 SHA1 7834b589940775fae16e006524e4cbe808ad5cc7 SHA256 3022ab24c39c42b1bc53666fe4fc3da2305d69db5655ccf261cb521ecfb17282
diff --git a/www-client/chromium/chromium-11.0.686.3.ebuild b/www-client/chromium/chromium-11.0.696.3.ebuild
index 505cfb6a49bf..3697aa276f22 100644
--- a/www-client/chromium/chromium-11.0.686.3.ebuild
+++ b/www-client/chromium/chromium-11.0.696.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.686.3.ebuild,v 1.1 2011/03/04 12:48:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.696.3.ebuild,v 1.1 2011/03/12 14:40:33 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
-V8_DEPEND="3.1.6.1"
+V8_DEPEND="3.1.8"
 
 inherit eutils fdo-mime flag-o-matic multilib pax-utils portability python \
 	toolchain-funcs versionator virtualx
@@ -32,7 +32,7 @@ RDEPEND="app-arch/bzip2
 	media-libs/flac
 	virtual/jpeg
 	media-libs/libpng
-	media-libs/libvpx
+	>=media-libs/libvpx-0.9.5
 	media-libs/speex
 	>=media-video/ffmpeg-0.6_p25767[threads]
 	cups? ( >=net-print/cups-1.3.11 )
@@ -49,10 +49,6 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	>=sys-devel/make-3.81-r2"
 RDEPEND+="
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/xfce4-icon-theme
-	)
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
@@ -97,10 +93,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Make sure we don't use bundled libvpx headers.
-	epatch "${FILESDIR}"/${PN}-system-vpx-r2.patch
-
-	# Make sure we don't use bundled ICU headers.
-	epatch "${FILESDIR}"/${PN}-system-icu-r0.patch
+	epatch "${FILESDIR}/${PN}-system-vpx-r3.patch"
 
 	# Remove most bundled libraries. Some are still needed.
 	find third_party -type f \! -iname '*.gyp*' \
@@ -118,6 +111,7 @@ src_prepare() {
 		\! -path 'third_party/launchpad_translations/*' \
 		\! -path 'third_party/libjingle/*' \
 		\! -path 'third_party/libsrtp/*' \
+		\! -path 'third_party/libvpx/libvpx.h' \
 		\! -path 'third_party/libwebp/*' \
 		\! -path 'third_party/mesa/*' \
 		\! -path 'third_party/modp_b64/*' \
@@ -318,4 +312,14 @@ src_install() {
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+
+	# For more info see bugs #292201 and bug #352263.
+	elog "Depending on your desktop environment, you may need"
+	elog "to install additional packages to get icons on the Downloads page."
+	elog
+	elog "For KDE, the required package is kde-base/oxygen-icons."
+	elog
+	elog "For other desktop environments, try one of the following:"
+	elog " - x11-themes/gnome-icon-theme"
+	elog " - x11-themes/xfce4-icon-theme"
 }
diff --git a/www-client/chromium/chromium-9.0.597.107.ebuild b/www-client/chromium/chromium-9.0.597.107.ebuild
deleted file mode 100644
index 550aec41be2b..000000000000
--- a/www-client/chromium/chromium-9.0.597.107.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.597.107.ebuild,v 1.4 2011/03/02 10:49:13 tomka Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils flag-o-matic multilib pax-utils portability python \
-	toolchain-funcs versionator
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-v8"
-
-RDEPEND="app-arch/bzip2
-	system-v8? ( >=dev-lang/v8-2.5.9.15 )
-	dev-libs/dbus-glib
-	>=dev-libs/icu-4.4.1
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	gnome? ( >=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-libs/libvpx
-	>=media-video/ffmpeg-0.6_p25767[threads]
-	cups? ( >=net-print/cups-1.3.11 )
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/chromium-tools-0.1.4
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	sys-devel/flex
-	>=sys-devel/make-3.81-r2"
-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] )"
-
-egyp() {
-	set -- build/gyp_chromium --depth=. "${@}"
-	echo "${@}" >&2
-	"${@}"
-}
-
-get_installed_v8_version() {
-	best_version dev-lang/v8 | sed -e 's@dev-lang/v8-@@g'
-}
-
-remove_bundled_lib() {
-	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
-
-	# 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
-		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() {
-	# Enable optional support for gecko-mediaplayer.
-	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch
-
-	# 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"
-	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/libvpx"
-	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/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
-	# remove it (minizip-related).
-
-	local v8_bundled="$(v8-extract-version v8/src/version.cc)"
-	if use system-v8; then
-		local v8_installed="$(get_installed_v8_version)"
-		einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
-		version_is_at_least "${v8_bundled}" "${v8_installed}" || die
-	else
-		einfo "Bundled V8 version: ${v8_bundled}"
-	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
-
-	# Make sure the build system will use the right python, bug #344367.
-	# Only convert directories that need it, to save time.
-	python_convert_shebangs -q -r 2 build tools
-}
-
-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_vpx=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
-
-	# Make GConf dependency optional, http://crbug.com/13322.
-	if use gnome; then
-		myconf+=" -Duse_gconf=1"
-	else
-		myconf+=" -Duse_gconf=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
-
-	# 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="
-
-	# Avoid a build error with -Os, bug #352457.
-	replace-flags "-Os" "-O2"
-
-	egyp ${myconf} || die
-}
-
-src_compile() {
-	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	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/files/chromium-tests-r0.patch b/www-client/chromium/files/chromium-tests-r0.patch
deleted file mode 100644
index c8461366adc1..000000000000
--- a/www-client/chromium/files/chromium-tests-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 778e787a2a6a..b041af774003 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -6,7 +6,5 @@
 	<use>
 		<flag name="gecko-mediaplayer">Allow the browser to load
 			<pkg>www-plugins/gecko-mediaplayer</pkg></flag>
-		<flag name="system-v8">Use the system-wide <pkg>dev-lang/v8</pkg>
-			installation</flag>
 	</use>
 </pkgmetadata>