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.

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

4 files changed, 42 insertions, 61 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/Manifest b/www-client/chromium/Manifest
index 1dec36e58c2c..e80bebafb61a 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,12 +7,12 @@ AUX chromium-supported-media-mime-types.patch 1016 RMD160 9b3fad22b90e4bea62e343
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 DIST chromium-5.0.375.29.tar.bz2 161965067 RMD160 fcdc113d014f2a58e6ba40d7e352db0dce42bdf3 SHA1 1484a1295853e7a021278e897b11f845603e5e04 SHA256 26616b68fb69257216d8d229669246704c8401c97409e5e5b13394a50f4e3f1b
 DIST chromium-5.0.375.38.tar.bz2 163360507 RMD160 fcb75ca4aa61e81378c45005601bd292a6ae19c8 SHA1 557df642958846a25e92fe00e1fe46e7d78adc05 SHA256 26912fdf57e32b2d859af45631a6797bb83af42d62b4cc94c3625382712d8ac2
-DIST chromium-5.0.396.0.tar.bz2 168297098 RMD160 b941e1e94483ae35f61d71e6a15f50ac96a57002 SHA1 ec53faddff39b09dfc9609c7b61042cc91a5f405 SHA256 08b89b9ead59114b2c53a462e42032da53f9e2e024ae77318fbdfb1f7415fcff
 DIST chromium-6.0.401.1.tar.bz2 170937577 RMD160 7d4218faf521e0c7d08719f8e9d8685939cc94ea SHA1 ceeb841185872adc0b62cbac9e8e595e7ebf634a SHA256 44cdf122a4b4d9a09e771cdcb74cc3d54dd1f6cf5773d5988e0653eb8fc404db
+DIST chromium-6.0.408.1.tar.bz2 171427450 RMD160 53940a407744860e2c16bf5f468ea5b2dc523d5d SHA1 1df3bfa36a78d9f3d0295839511c253fbc4c4526 SHA256 31c93349f79df3a501d7a1a2dc650dcf949c05a32b95d20c01aaf70d2e8f77df
 EBUILD chromium-5.0.375.29.ebuild 6436 RMD160 189b59588b8be4b9cc73f17843f565f31533e071 SHA1 eda8acc93eae49d8748cac49fcbf8f55203c8243 SHA256 72220d7c31cd7c378e0e3113c379519d35ac7cd1ade061b61c284598755db65e
 EBUILD chromium-5.0.375.38.ebuild 5440 RMD160 f51212584075bf894458925729b9beaced45a941 SHA1 4ef358d10c68640cc13f52368cccc27f29f02659 SHA256 fa002da09aa98a98c6c27e7e1ba02d82fabe44fb7f0c811a35c6376224b7dd45
-EBUILD chromium-5.0.396.0.ebuild 5253 RMD160 a77c0ec95c5987fc48624a588eb4af956a52a126 SHA1 14576bcb0c9818777691dcfad63336ba6e280805 SHA256 b1613e582d974bb5ced25681e395d9da4e55787340a096618f337213d8345c96
 EBUILD chromium-6.0.401.1.ebuild 5276 RMD160 f49259b1cdf9821a4933a44dded75410e5422a05 SHA1 8870657017ae63d11e8c8d0610d9ce847182486c SHA256 6eafbfe4babbf3600a4d7d0cad069789e9bc4688228d76e9649013f6f9453729
-EBUILD chromium-9999.ebuild 7029 RMD160 4201b67deec2ae2c8d7da33910e9c0d931942263 SHA1 17d093724f616ee32621c18bce80ac24a3dea48c SHA256 a559d8b3bb52e9f2f4fe513e370f5e7c700f5533e11b9587e5fafca53b8ed16c
-MISC ChangeLog 22893 RMD160 4a447c802c9d5cea7cc9859afc2cae9f2e4b5877 SHA1 9b20591baa0c55b83dcfdabe57f2af3701915a9c SHA256 5a54affd9a2c6a82443471874b46f5525241eca29d77d87ddb51e429cc458e9b
+EBUILD chromium-6.0.408.1.ebuild 5027 RMD160 09ab14447ce7a1fefc021e4c0027eedf0fb6aff1 SHA1 f146211adaf1f5c1503f8beea843af6c4da5d95d SHA256 dd66f79c39247514a8cd4e4d53a03d5bc3549b3954f10ea2619f14e157dd26f7
+EBUILD chromium-9999.ebuild 6780 RMD160 837998ec6dc028d7cb8ac40080806f0e0d603917 SHA1 3b19bbb5238d207e5dd0d8530049490c8d09b685 SHA256 aaaf5d2ee9ec2f95167c5e8dcc3576e6597bbbc4b52f577bf3d1b2833f43e2ca
+MISC ChangeLog 23327 RMD160 588d6c03fb2cc0c739bee8b6089af8498e36eabc SHA1 5af7a9669664b41c04f55df3b5460404943ecfe6 SHA256 eb22d72ab38aa747d75c8b9c718e36fa56e09dbc75a06d940af9f2e47a757384
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
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