Version bump for dev channel release. Removed old ebuilds and patches.

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

8 files changed, 42 insertions, 327 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 74986de075d1..a9eeb0d8603d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,15 @@
 # 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.135 2010/07/07 15:33:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.136 2010/07/10 19:01:48 phajdan.jr Exp $
+
+*chromium-6.0.458.1 (10 Jul 2010)
+
+  10 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -files/chromium-flash-hang-workaround-r1.patch,
+  -chromium-5.0.375.86.ebuild, -files/chromium-gyp-fixes-r1.patch,
+  -chromium-6.0.437.3.ebuild, -files/chromium-gyp-fixes-r2.patch,
+  +chromium-6.0.458.1.ebuild, -files/chromium-optional-cups-r1.patch:
+  Version bump for dev channel release. Removed old ebuilds and patches.
 
   07 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> metadata.xml:
   Transfer ownership to the new chromium herd.
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 3a0e32db7945..e80f9a0b43d1 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,21 +1,15 @@
 AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566
 AUX chromium-disable-vp8-r1.patch 1204 RMD160 22264b89adf908149e5405c316e4666c4eda4ad8 SHA1 7e104772a645f50449432d4c970d52ffc3555c8a SHA256 ebb9031cd447aca0f3d7f9a2b4081f64dd8244ffd90564ecab06724e1dda63e8
 AUX chromium-drop_sse2-r0.patch 1387 RMD160 5be0a252d4e99064e2cc5ba3fce33a5f525ba785 SHA1 a356549db631a7b147bf0046be8ab09d88874f15 SHA256 f035f196eea72855cf37d269810f4f99a5f348b7b8d7aaf537e35a11d6e1f1df
-AUX chromium-flash-hang-workaround-r1.patch 2225 RMD160 837c49e1fe0b2bdb8a96391e01b730b4f7a7bbef SHA1 32c7f82c80b79ec48d09488481ede323dcf47ce1 SHA256 f2a6ba25834107bd7e673f0ed6361cb7bad1432c5fb9908d0bcdf3151c84df51
-AUX chromium-gyp-fixes-r1.patch 1122 RMD160 8f37f016c9ca937ac0b02d4af533ddd0bb21b340 SHA1 d481f92313ad2aee0b00e2fda3698057e7de4c7e SHA256 22cd04c272d07cef36b1b3e639fad78486dc85dfd21c6cf542dbf4ebea0c2fe5
-AUX chromium-gyp-fixes-r2.patch 446 RMD160 ff89b0b16b55e0a6109b6c083e8c91973abd7a28 SHA1 6f72fc64cdb1e733666597d1237eed783ece42fa SHA256 33f6391dfefce19115f08034943f936a24c7edb23fd3f185b4bcba0a8b03f4d4
 AUX chromium-launcher.sh 1097 RMD160 6a35819d6ae463d1614ecd5976fe8aeae1a3519e SHA1 93b8259fe9ddf6914faa9a4cdbaf451a97031228 SHA256 9d16e2afe508c33aa987001a0442696eaefd5cf91e7a6c9eeb900bc9824390c9
 AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506b SHA1 e96283b523a14e8fb369838b35051c8ba0cc6f96 SHA256 b92ba935589f01b28a4ddeb5fd7fd42f8f643eaf1e24cafc2458d97fa1489d8e
-AUX chromium-optional-cups-r1.patch 647 RMD160 990d9d33e43cb2429eb6019df8a2625f980be64e SHA1 0387d604d1926e56bbdb68a56b6137e542386fb7 SHA256 444179d3c3f2b86006b032f62220353f04f6d740777982c2a871618a3334303e
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
-DIST chromium-5.0.375.86.tar.bz2 163295338 RMD160 ccff650d9520bd6dbd7758ec65e288cc649c0cae SHA1 8e95d93903e9c7cd5321c32ed46d3137ef2d99d8 SHA256 c94034cbcc883eec229f259f3d09637317fbbbca4a3d438a339bfc42953c3ec1
 DIST chromium-5.0.375.99.tar.bz2 163269200 RMD160 0164f7b0fa099ac30279e3886d1d46ef5ed531c8 SHA1 6943978ea3262bf9ee913cbc36b03202774607ff SHA256 cfe592d252de04fd5051b6282740fe69dc7c8c86e13b419eeb1962b1a0ece82e
-DIST chromium-6.0.437.3.tar.bz2 124160001 RMD160 74be10daf0727b76d9ed5e02210796998ccf0069 SHA1 1568aa0e368af02e60ad7746743b332948fbad75 SHA256 88671254bc0a911beefef866ac263a489bf91fca7ad967ad25921ef29b5b8150
 DIST chromium-6.0.453.1.tar.bz2 123140746 RMD160 97423641f926a9fb39408f54e7cd4872a52003da SHA1 4618f50f81fa99df340cdeb62006d41f0ae7fcae SHA256 3e357383752b5f3059997c24c5c4bab396c69df9e4fd657060347960277f4cc0
-EBUILD chromium-5.0.375.86.ebuild 5531 RMD160 30b33b47d27be694bfd07036a875384a2e091c4f SHA1 cd4141553b04034c9cd17a2cd65b632849afdf10 SHA256 d69079c9bdc0b98466cc2e9afcf0d862762ab81377e4f21d4c9f04d5401154de
+DIST chromium-6.0.458.1.tar.bz2 123651881 RMD160 3422c4f7b58fc70fb6df66e85838a39f74ad6344 SHA1 5d50404c6004558bfe265f5c8c43471f73fa084d SHA256 7c9302240d75e36aa133b6d22b361ad5eea0c7b35d8c59c8e4d2970eeee44598
 EBUILD chromium-5.0.375.99.ebuild 5529 RMD160 1493ffc1c3a7c9fb3decd3e0e6ed9fec731ecdac SHA1 bab40e60d015598cc147d4c86363975206dbaa38 SHA256 b6b76232849e3b70ae03a254d58076de6b378cc3898c939c8a169dc8bfc4a47c
-EBUILD chromium-6.0.437.3.ebuild 6375 RMD160 fdd78c6b6509a82d0fbfa1aa150d558cd0955007 SHA1 b9ea6ec0d556ddd5d6304b5dfb925f637243e970 SHA256 d88ac315f20b122b8280d6783ada3eb42b1ae45eb2b2e0ef75d84f2ba5b1b8b4
 EBUILD chromium-6.0.453.1.ebuild 6372 RMD160 1d661dc680f4c2c0fd39ed8dff80403f1d5d8343 SHA1 aa1f71d25a4131bdb1aa000d758d981e924ff245 SHA256 b76a5f83c216ae3458f50ce7028c4548de4caf0b43247364db58f5b54c71ea17
+EBUILD chromium-6.0.458.1.ebuild 6372 RMD160 d55f91e318a7a4e46b0ded28e779a453c802537c SHA1 20e0e149feae550e29849d018b50000e4842464e SHA256 1c536f70ac0d81ec131269078f7cd41ded347dfdd1646f381c0312edad7e689d
 EBUILD chromium-9999.ebuild 8016 RMD160 d15cd316543a289681e25cb464a206df7b5ef80f SHA1 c48d3325d47aaae887b84652e245729d07ddfcbc SHA256 eca8579e9f9cd6cdcf016b30654a9892f17b6488729b9a45ad666cb0b2440d1b
-MISC ChangeLog 29691 RMD160 41624dd7357c43b562e462a9be7b41ae5762ca76 SHA1 db93127bee2de480d775d5e5108231b8d0a77a7c SHA256 0ddcb71ba2c8774274073ce60f2ce5110f0c3e2eda500b518d2bda7eb73711ba
+MISC ChangeLog 30108 RMD160 62a81cee0970d5c8761565dd2bf5024f36ab408d SHA1 35b43bcbe305784e04723dad3bc004589a3140d7 SHA256 2f28686da25bf05546347ff21ef570bef5f25c22aef1135755683891bb66e955
 MISC metadata.xml 378 RMD160 3309b2d1fb60157d0da1e22070ba3c448bd46b74 SHA1 0a8d13bb94e9836a14255b724b738c5df1f8ed7e SHA256 7d02fdca1b3c68d1202c720f1987713c28e38b1f9f3e30cbc3138c000572f08e
diff --git a/www-client/chromium/chromium-5.0.375.86.ebuild b/www-client/chromium/chromium-5.0.375.86.ebuild
deleted file mode 100644
index 184c3bdd644f..000000000000
--- a/www-client/chromium/chromium-5.0.375.86.ebuild
+++ /dev/null
@@ -1,177 +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.86.ebuild,v 1.3 2010/06/25 20:16:02 angelos 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"
-
-# Incompatible system plugins:
-# www-plugins/gecko-mediaplayer, bug #309231.
-RDEPEND+="
-	plugins-symlink? (
-		!www-plugins/gecko-mediaplayer[gnome]
-	)"
-
-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.437.3.ebuild b/www-client/chromium/chromium-6.0.458.1.ebuild
index 40309db98fff..b0c0ca045bea 100644
--- a/www-client/chromium/chromium-6.0.437.3.ebuild
+++ b/www-client/chromium/chromium-6.0.458.1.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.437.3.ebuild,v 1.2 2010/06/21 09:25:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.458.1.ebuild,v 1.1 2010/07/10 19:01:48 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -17,8 +17,6 @@ IUSE="cups sse2"
 
 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
@@ -46,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
@@ -60,37 +62,28 @@ src_prepare() {
 	# Disable VP8 until we have a recent enough system-provided ffmpeg.
 	epatch "${FILESDIR}"/${PN}-disable-vp8-r1.patch
 
-	# Make dependency on cups optional, bug #324105.
-	epatch "${FILESDIR}"/${PN}-optional-cups-r1.patch
-
-	# Fix gyp files to correctly support system-provided libraries.
-	epatch "${FILESDIR}"/${PN}-gyp-fixes-r2.patch
-
 	remove_bundled_lib "third_party/bzip2"
 	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"
+	# TODO: also remove third_party/libxml and third_party/libxslt when
+	# http://crbug.com/29333 is fixed.
 	# TODO: also remove third_party/zlib. For now the compilation fails if we
 	# remove it (minizip-related).
 }
 
 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
-
 	local myconf=""
 
 	# Make it possible to build chromium on non-sse2 systems.
-	if ! use sse2; then
+	if use sse2; then
+		myconf="${myconf} -Ddisable_sse2=0"
+	else
 		myconf="${myconf} -Ddisable_sse2=1"
 	fi
 
 	# Use system-provided libraries.
+	# TODO: use_system_libxml (http://crbug.com/29333).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 	# TODO: use_system_icu, use_system_hunspell (upstream changes needed).
 	# TODO: use_system_ssl when we have a recent enough system NSS.
@@ -100,7 +93,6 @@ src_configure() {
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
-		-Duse_system_libxml=1
 		-Duse_system_zlib=1"
 
 	# The system-provided ffmpeg supports more codecs. Enable them in chromium.
@@ -115,8 +107,8 @@ src_configure() {
 
 	# Enable sandbox.
 	myconf="${myconf}
-		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+		-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.
@@ -139,7 +131,10 @@ src_configure() {
 	elif [[ $myarch = x86 ]] ; then
 		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="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
 	else
 		die "Failed to determine target arch, got '$myarch'."
@@ -168,20 +163,19 @@ src_compile() {
 }
 
 src_install() {
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	dodir ${CHROMIUM_HOME}
+	dodir "$(get_chromium_home)"
 
-	exeinto ${CHROMIUM_HOME}
+	exeinto "$(get_chromium_home)"
 	pax-mark m out/Release/chrome
 	doexe out/Release/chrome
 	doexe out/Release/chrome_sandbox
-	fperms 4755 ${CHROMIUM_HOME}/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
+	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
 	doins -r out/Release/resources
@@ -192,17 +186,18 @@ src_install() {
 
 	# 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}
+	dosym /usr/$(get_libdir)/libavcodec.so.52 "$(get_chromium_home)"
+	dosym /usr/$(get_libdir)/libavformat.so.52 "$(get_chromium_home)"
+	dosym /usr/$(get_libdir)/libavutil.so.50 "$(get_chromium_home)"
 
 	# Use system plugins by default.
-	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
+	dosym /usr/$(get_libdir)/nsbrowser/plugins "$(get_chromium_home)/plugins"
 
 	# Install 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"
+	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 "desktop file sed failed"
 
diff --git a/www-client/chromium/files/chromium-flash-hang-workaround-r1.patch b/www-client/chromium/files/chromium-flash-hang-workaround-r1.patch
deleted file mode 100644
index bafeb23d82eb..000000000000
--- a/www-client/chromium/files/chromium-flash-hang-workaround-r1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: webkit/glue/plugins/webplugin_delegate_impl.h
-===================================================================
---- webkit/glue/plugins/webplugin_delegate_impl.h	(revision 48979)
-+++ webkit/glue/plugins/webplugin_delegate_impl.h	(working copy)
-@@ -68,6 +68,7 @@
-     PLUGIN_QUIRK_PATCH_REGENUMKEYEXW = 2048, // Windows
-     PLUGIN_QUIRK_ALWAYS_NOTIFY_SUCCESS = 4096, // Windows
-     PLUGIN_QUIRK_ALLOW_FASTER_QUICKDRAW_PATH = 8192, // Mac
-+    PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK = 32768, // Linux
-   };
- 
-   static WebPluginDelegateImpl* Create(const FilePath& filename,
-Index: webkit/glue/plugins/webplugin_delegate_impl_gtk.cc
-===================================================================
---- webkit/glue/plugins/webplugin_delegate_impl_gtk.cc	(revision 48979)
-+++ webkit/glue/plugins/webplugin_delegate_impl_gtk.cc	(working copy)
-@@ -55,9 +55,13 @@
-   memset(&window_, 0, sizeof(window_));
-   if (instance_->mime_type() == "application/x-shockwave-flash") {
-     // Flash is tied to Firefox's whacky behavior with windowless plugins. See
--    // comments in WindowlessPaint
-+    // comments in WindowlessPaint.
-+    // TODO(viettrungluu): PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK: Don't allow
-+    // right-clicks in windowless content since Flash 10.1 (initial release, at
-+    // least) hangs in that case. Remove this once Flash is fixed.
-     quirks_ |= PLUGIN_QUIRK_WINDOWLESS_OFFSET_WINDOW_TO_DRAW
--        | PLUGIN_QUIRK_WINDOWLESS_INVALIDATE_AFTER_SET_WINDOW;
-+        | PLUGIN_QUIRK_WINDOWLESS_INVALIDATE_AFTER_SET_WINDOW
-+        | PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK;
-   }
- 
-   // TODO(evanm): I played with this for quite a while but couldn't
-@@ -696,6 +700,14 @@
-   if (!NPEventFromWebInputEvent(event, timestamp, &np_event)) {
-     return false;
-   }
-+  // See comment about PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK in constructor.
-+  if (windowless_ &&
-+      (quirks_ & PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK) &&
-+      (np_event.type == ButtonPress || np_event.type == ButtonRelease) &&
-+      (np_event.xbutton.button == Button3)) {
-+    return false;
-+  }
-+
-   bool ret = instance()->NPP_HandleEvent(&np_event) != 0;
- 
-   // Flash always returns false, even when the event is handled.
diff --git a/www-client/chromium/files/chromium-gyp-fixes-r1.patch b/www-client/chromium/files/chromium-gyp-fixes-r1.patch
deleted file mode 100644
index 885e8ed0f09c..000000000000
--- a/www-client/chromium/files/chromium-gyp-fixes-r1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- chrome/chrome.gyp.orig	2010-06-10 10:25:49.000000000 +0200
-+++ chrome/chrome.gyp	2010-06-10 10:26:52.000000000 +0200
-@@ -462,6 +462,7 @@
-         ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-           'dependencies': [
-             '../build/linux/system.gyp:gtk',
-+            '../third_party/libevent/libevent.gyp:libevent',
-           ],
-         }],
-       ],
---- net/net.gyp.orig	2010-06-10 11:42:35.000000000 +0200
-+++ net/net.gyp	2010-06-10 11:43:21.000000000 +0200
-@@ -179,6 +179,7 @@
-               '../build/linux/system.gyp:gconf',
-               '../build/linux/system.gyp:gdk',
-               '../build/linux/system.gyp:nss',
-+              '../third_party/libevent/libevent.gyp:libevent',
-             ],
-           },
-           {  # else: OS is not in the above list
-@@ -560,6 +561,7 @@
-               '../build/linux/system.gyp:gconf',
-               '../build/linux/system.gyp:gdk',
-               '../build/linux/system.gyp:nss',
-+              '../third_party/libevent/libevent.gyp:libevent',
-             ],
-           },
-           {  # else: OS is not in the above list
diff --git a/www-client/chromium/files/chromium-gyp-fixes-r2.patch b/www-client/chromium/files/chromium-gyp-fixes-r2.patch
deleted file mode 100644
index ffd4fba3a696..000000000000
--- a/www-client/chromium/files/chromium-gyp-fixes-r2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- chrome/chrome_common.gypi.orig	2010-06-16 21:14:51.000000000 +0200
-+++ chrome/chrome_common.gypi	2010-06-16 21:16:13.000000000 +0200
-@@ -130,6 +130,7 @@
-         '../ipc/ipc.gyp:ipc',
-         '../net/net.gyp:net',
-         '../skia/skia.gyp:skia',
-+        '../third_party/bzip2/bzip2.gyp:bzip2',
-         '../third_party/icu/icu.gyp:icui18n',
-         '../third_party/icu/icu.gyp:icuuc',
-         '../third_party/libxml/libxml.gyp:libxml',
diff --git a/www-client/chromium/files/chromium-optional-cups-r1.patch b/www-client/chromium/files/chromium-optional-cups-r1.patch
deleted file mode 100644
index f9e87a76643e..000000000000
--- a/www-client/chromium/files/chromium-optional-cups-r1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- chrome/chrome.gyp.orig	2010-06-16 21:19:14.000000000 +0200
-+++ chrome/chrome.gyp	2010-06-16 21:26:33.000000000 +0200
-@@ -1098,6 +1098,9 @@
-       'include_dirs': [
-         '..',
-       ],
-+      'variables': {
-+      	'use_cups%': 1,
-+      },
-       'conditions': [
-         ['OS=="win"', {
-           'defines': [
-@@ -1114,7 +1117,7 @@
-             '../build/linux/system.gyp:gtk',
-           ],
-         }],
--        ['OS=="linux" and chromeos==0 and target_arch!="arm"', {
-+        ['OS=="linux" and chromeos==0 and target_arch!="arm" and use_cups==1', {
-           'link_settings': {
-             'libraries': [
-               '-lcups',