Version bump for dev channel release. Fix bug #319783 by Richard <shiningarcanine@gmail.com>. Fix bug #320145 by Tomas Racek <racek.t@seznam.cz>. Fix bug #320419 by fkhp <fkhp101@tom.com>, used solution by Evan Teran <eteran@alum.rit.edu>. Remove old.

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 38 insertions, 57 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 1ebcf43a21b7..eff36d789d6f 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,16 @@
 # 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.99 2010/05/14 19:39:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.100 2010/05/21 09:10:13 phajdan.jr Exp $
+
+*chromium-6.0.408.1 (21 May 2010)
+
+  21 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-5.0.396.0.ebuild, +chromium-6.0.408.1.ebuild,
+  chromium-9999.ebuild:
+  Version bump for dev channel release. Fix bug #319783 by Richard
+  <shiningarcanine@gmail.com>. Fix bug #320145 by Tomas Racek
+  <racek.t@seznam.cz>. Fix bug #320419 by fkhp <fkhp101@tom.com>, used
+  solution by Evan Teran <eteran@alum.rit.edu>. Remove old.
 
 *chromium-6.0.401.1 (14 May 2010)
 
diff --git a/www-client/chromium/chromium-5.0.396.0.ebuild b/www-client/chromium/chromium-6.0.408.1.ebuild
index 73089e3d0740..ed4e24732873 100644
--- a/www-client/chromium/chromium-5.0.396.0.ebuild
+++ b/www-client/chromium/chromium-6.0.408.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-5.0.396.0.ebuild,v 1.2 2010/05/11 11:23:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.408.1.ebuild,v 1.1 2010/05/21 09:10:13 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+plugins-symlink"
+IUSE=""
 
 RDEPEND="app-arch/bzip2
 	>=dev-libs/libevent-1.4.13
@@ -45,38 +45,21 @@ RDEPEND+="
 	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() {
-	# Allow supporting more media types.
-	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
-}
-
 src_configure() {
 	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
 
 	# 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}"
+	# Workaround for bug #318969. Remove when upstream http://crbug.com/43778 is
+	# fixed.
+	append-flags -D__STDC_CONSTANT_MACROS
+
+	# Workaround for bug #320145. TODO(phajdan.jr): rather use a gyp define.
+	append-flags -DUSE_SSE=0
 
 	# Configuration options (system libraries and disable forced SSE2)
-	local myconf="-Ddisable_sse2=1 -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"
+	local myconf="-Ddisable_sse2=1 -Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Dproprietary_codecs=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)
 
@@ -87,6 +70,10 @@ EOF
 	# 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"
@@ -153,10 +140,8 @@ src_install() {
 	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
+	# Use system plugins by default.
+	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
 
 	# Icon and desktop entry
 	newicon out/Release/product_logo_48.png ${PN}-browser.png
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 1995acf82277..5599dde3c5a8 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.51 2010/05/14 19:39:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.52 2010/05/21 09:10:13 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="+plugins-symlink"
+IUSE=""
 
 RDEPEND="app-arch/bzip2
 	>=dev-libs/libevent-1.4.13
@@ -47,13 +47,6 @@ RDEPEND+="
 	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_unpack() {
 	subversion_src_unpack
 	mv "${S}" "${WORKDIR}"/depot_tools
@@ -104,19 +97,10 @@ src_configure() {
 
 	# Workaround for bug #318969. Remove when upstream http://crbug.com/43778 is
 	# fixed.
-	append-cflags -D__STDC_CONSTANT_MACROS
-
-	# 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}"
+	append-flags -D__STDC_CONSTANT_MACROS
+
+	# Workaround for bug #320145. TODO(phajdan.jr): rather use a gyp define.
+	append-flags -DUSE_SSE=0
 
 	# Configuration options (system libraries and disable forced SSE2)
 	local myconf="-Ddisable_sse2=1 -Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Dproprietary_codecs=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
@@ -130,6 +114,10 @@ EOF
 	# 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"
@@ -196,10 +184,8 @@ src_install() {
 	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
+	# Use system plugins by default.
+	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
 
 	# Icon and desktop entry
 	newicon out/Release/product_logo_48.png ${PN}-browser.png