Disable gpu rendering to fix nvidia-drivers compatibility problems, bug #319331 by mjbjr@beaudesign.com.

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

8 files changed, 33 insertions, 392 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 92b0dfacae73..9f7a3f633798 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # 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.123 2010/06/21 07:12:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.124 2010/06/21 09:25:10 phajdan.jr Exp $
+
+  21 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-5.0.375.70.ebuild, chromium-5.0.375.70-r1.ebuild,
+  -chromium-6.0.427.0.ebuild, chromium-6.0.437.1.ebuild,
+  chromium-6.0.437.3.ebuild, chromium-9999.ebuild:
+  Disable gpu rendering to fix nvidia-drivers compatibility problems, bug
+  #319331 by mjbjr@beaudesign.com.
 
 *chromium-6.0.437.3 (21 Jun 2010)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a504ce7201d4..b099e062840b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -9,14 +9,11 @@ AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506
 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.70.tar.bz2 163191937 RMD160 cb43307d095dc7ba146762b2a997ba32c5c12907 SHA1 96234ce716e5124f8c8ada92ed9a8cbe6183c5ed SHA256 dd2e440b1a230b1adcc8941d825155e5aeaf887fe67702697a845bd459455902
-DIST chromium-6.0.427.0.tar.bz2 179247836 RMD160 6b42d4145514557eba30b99a0799e181e2f45a16 SHA1 65897ae8d05e04e821333fca05d77cbe0b08771f SHA256 e5ab816d0b39511d6718c2f76c3436c4db3664c06496fe413273a70864d4f3d8
 DIST chromium-6.0.437.1.tar.bz2 124160031 RMD160 80ac4d434de50a923f11aebaf7755c9de4b16a5b SHA1 01440e58c29bc24f9dbf646391859475dd34b856 SHA256 82207de9036cbfe30e91f3e81c5faab35a2077b9007af89b8e87c2218d8ba269
 DIST chromium-6.0.437.3.tar.bz2 124160001 RMD160 74be10daf0727b76d9ed5e02210796998ccf0069 SHA1 1568aa0e368af02e60ad7746743b332948fbad75 SHA256 88671254bc0a911beefef866ac263a489bf91fca7ad967ad25921ef29b5b8150
-EBUILD chromium-5.0.375.70-r1.ebuild 5488 RMD160 205ca5061edb7b0c539e5ca1b49c74c99ba51d36 SHA1 afcd267d652f1ed6bf7f52ad226fda3d7b830959 SHA256 3e819f24058e913f530a060be65d750c48735a160d81b910ae421ddbbdf8e38b
-EBUILD chromium-5.0.375.70.ebuild 5653 RMD160 accd9bebc41a61e8544e2d2073bfa8eb558cb8cc SHA1 c48b195937ea1c65bde66fdf9be0dabba470644c SHA256 68904b0221796b90cbf779d107dd81c7f31bcab12068e27fe22d24c38977133a
-EBUILD chromium-6.0.427.0.ebuild 5869 RMD160 3db0e8f2a551247e1bf370dcc09f22af48dbb628 SHA1 7499494a3540b3e802dd5cbc75f857d7075c9e1d SHA256 caf0867efaa0c786653342e0e0b62b52f49f3ac705590bac62b978d80963883c
-EBUILD chromium-6.0.437.1.ebuild 6257 RMD160 794ae41a32cb52b8501b18406e4d48f3ecf4f876 SHA1 1bbd45716b4af4ace3320fcc7c08709459be1a03 SHA256 3a1a0761e5c37b11d5210df3c3b1781f015c08c15dd3b5565851fbf248f26d61
-EBUILD chromium-6.0.437.3.ebuild 6257 RMD160 bf1dd1448258ea55b07f7233a275005939979976 SHA1 a087c10e69e54e70a6098f8109b9cde0d65f9cf3 SHA256 80973e909da829a9815382ed6b54349a7038b890d7fe657cba9739aab6f4e579
-EBUILD chromium-9999.ebuild 7897 RMD160 ab9d3fe8bb0b01fd60ed1fb2f26c6c4f1a017b2d SHA1 b0e283bd961c63ce1a6c9e563810c2e602ed3a75 SHA256 48ec2139c73491e4c657629a19d3d0534029d45eb55b67f1718ab950c7c1cbd7
-MISC ChangeLog 27582 RMD160 7122a36b72abb0060987f79a644bf105d74ca769 SHA1 bfe27e0e3cd9dae7425cc8cd40aee8c2e59aa5b3 SHA256 bee313124510773bc13e1a24a70d0c9d3f484013e78cac8da5a7a1fcdbb5b6a4
+EBUILD chromium-5.0.375.70-r1.ebuild 5611 RMD160 2b6d6f5937ec91de14a996fa79a7932d7dc1cdd1 SHA1 df89526b66d81de5ba386bb413ce668d4bf72be8 SHA256 40188c74dd18e4d9946094e4916010b2cd8d4ee693bc97fb91820e880d8995fa
+EBUILD chromium-6.0.437.1.ebuild 6375 RMD160 be6be6f40fe24ad710314b4ddd10119686e5a69a SHA1 392b75700a9d76e65b9f5f1be4605d99e69e0754 SHA256 2f9b18544c81573161d9f1385c91f1f85c6110ce83f754b294806de44d7ee474
+EBUILD chromium-6.0.437.3.ebuild 6375 RMD160 fdd78c6b6509a82d0fbfa1aa150d558cd0955007 SHA1 b9ea6ec0d556ddd5d6304b5dfb925f637243e970 SHA256 d88ac315f20b122b8280d6783ada3eb42b1ae45eb2b2e0ef75d84f2ba5b1b8b4
+EBUILD chromium-9999.ebuild 8015 RMD160 d42ee04d46b3f00eb694020e505d103f7a76962f SHA1 64e1b49da8ae87f0d2f5feb604e9c3e798b57203 SHA256 cefdee9259ee7a892234a688f5db13b812314d8379e4218ee40edb3fa18dc700
+MISC ChangeLog 27917 RMD160 a172e0d7639525daae0bb2379dfb1bbf3cd7be85 SHA1 64f714fafb1262a2717511ee460f104198b24029 SHA256 f8ac874f850c555ddfb1ede111ca2f489aa22881c9504bbd8722be49f76363cf
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
diff --git a/www-client/chromium/chromium-5.0.375.70-r1.ebuild b/www-client/chromium/chromium-5.0.375.70-r1.ebuild
index 1448405bc8a2..0136eaba940f 100644
--- a/www-client/chromium/chromium-5.0.375.70-r1.ebuild
+++ b/www-client/chromium/chromium-5.0.375.70-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-5.0.375.70-r1.ebuild,v 1.3 2010/06/20 17:19:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.70-r1.ebuild,v 1.4 2010/06/21 09:25:10 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -92,6 +92,10 @@ src_configure() {
 	# 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"
diff --git a/www-client/chromium/chromium-5.0.375.70.ebuild b/www-client/chromium/chromium-5.0.375.70.ebuild
deleted file mode 100644
index 765157ee867d..000000000000
--- a/www-client/chromium/chromium-5.0.375.70.ebuild
+++ /dev/null
@@ -1,185 +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.70.ebuild,v 1.3 2010/06/16 19:59:32 phajdan.jr 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="mirror://gentoo/${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
-
-	# CFLAGS/LDFLAGS
-	mkdir -p "${S}"/.gyp || die "cflags mkdir failed"
-	cat << EOF > "${S}"/.gyp/include.gypi || die "cflags cat failed"
-{
-	'target_defaults': {
-		'cflags': [ '${CFLAGS// /','}' ],
-		'ldflags': [ '${LDFLAGS// /','}' ],
-	},
-}
-EOF
-	export HOME="${S}"
-
-	# 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"
-
-	# 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.427.0.ebuild b/www-client/chromium/chromium-6.0.427.0.ebuild
deleted file mode 100644
index 1f2633633647..000000000000
--- a/www-client/chromium/chromium-6.0.427.0.ebuild
+++ /dev/null
@@ -1,194 +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-6.0.427.0.ebuild,v 1.2 2010/06/11 09:44:59 voyageur 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="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-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]
-	>=net-print/cups-1.3.5
-	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-apps/xmessage
-	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
-}
-
-src_prepare() {
-	# Disable VP8 until we have a recent enough system-provided ffmpeg.
-	epatch "${FILESDIR}"/${PN}-disable-vp8-r1.patch
-
-	# Fix gyp files to correctly support system-provided libraries.
-	epatch "${FILESDIR}"/${PN}-gyp-fixes-r1.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/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
-
-	# Make it possible to build chromium on non-sse2 systems.
-	local myconf="-Ddisable_sse2=1"
-
-	# Use system-provided libraries.
-	# 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.
-	myconf="${myconf}
-		-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_zlib=1"
-
-	# The system-provided ffmpeg supports more codecs. Enable them in chromium.
-	myconf="${myconf} -Dproprietary_codecs=1"
-
-	# Enable sandbox.
-	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"
-
-	# 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
-		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'."
-	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() {
-	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}
-
-	# Use system plugins by default.
-	dosym /usr/$(get_libdir)/nsbrowser/plugins ${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"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
-		|| die "desktop file sed failed"
-
-	# Install GNOME default application entry (bug #303100).
-	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.1.ebuild b/www-client/chromium/chromium-6.0.437.1.ebuild
index e0c957dc6a57..c81ce9b20b67 100644
--- a/www-client/chromium/chromium-6.0.437.1.ebuild
+++ b/www-client/chromium/chromium-6.0.437.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.1.ebuild,v 1.4 2010/06/19 16:30:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.437.1.ebuild,v 1.5 2010/06/21 09:25:10 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -126,6 +126,10 @@ src_configure() {
 	# 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"
diff --git a/www-client/chromium/chromium-6.0.437.3.ebuild b/www-client/chromium/chromium-6.0.437.3.ebuild
index 7644a9dd890a..40309db98fff 100644
--- a/www-client/chromium/chromium-6.0.437.3.ebuild
+++ b/www-client/chromium/chromium-6.0.437.3.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.1 2010/06/21 07:12:46 phajdan.jr Exp $
+# $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 $
 
 EAPI="2"
 
@@ -126,6 +126,10 @@ src_configure() {
 	# 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"
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index ffc519980720..d3c832ae2cc0 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.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-9999.ebuild,v 1.61 2010/06/19 16:30:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.62 2010/06/21 09:25:10 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -168,6 +168,10 @@ src_configure() {
 	# 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"