Also disable tcmalloc for 5.0.x.x versions, see bug #320419. This improves our compatibility.

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

3 files changed, 20 insertions, 11 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index ae415ff7c8bf..58e8dea03992 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # 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.103 2010/05/26 06:35:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.104 2010/05/29 15:47:26 phajdan.jr Exp $
+
+  29 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-5.0.375.55.ebuild:
+  Also disable tcmalloc for 5.0.x.x versions, see bug #320419. This improves
+  our compatibility.
 
   26 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-5.0.375.53.ebuild, chromium-5.0.375.55.ebuild,
@@ -270,7 +275,7 @@
   -chromium-5.0.307.5.ebuild, +chromium-5.0.335.0.ebuild:
   Version bump for dev channel release. Remove old.
 
-  23 Feb 2010; Raúl Porcel <armin76@gentoo.org> chromium-5.0.322.2.ebuild,
+  23 Feb 2010; Raúl Porcel <armin76@gentoo.org> chromium-5.0.322.2.ebuild,
   chromium-9999.ebuild:
   Add fix for arm build
 
@@ -341,7 +346,7 @@
   Dev channel release bump, also include gnome default-apps file from pacho
   in bug #303100
 
-  01 Feb 2010; Raúl Porcel <armin76@gentoo.org> chromium-4.0.302.2.ebuild,
+  01 Feb 2010; Raúl Porcel <armin76@gentoo.org> chromium-4.0.302.2.ebuild,
   chromium-9999.ebuild:
   Fix build on arm
 
@@ -390,11 +395,11 @@
   +chromium-4.0.302.2.ebuild:
   Version bump for dev channel release. Remove old.
 
-  22 Jan 2010; Raúl Porcel <armin76@gentoo.org>
+  22 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   -files/chromium-drop_armel_m32.patch, chromium-9999.ebuild:
   Drop unneded arm patch
 
-  18 Jan 2010; Raúl Porcel <armin76@gentoo.org> chromium-4.0.266.0.ebuild,
+  18 Jan 2010; Raúl Porcel <armin76@gentoo.org> chromium-4.0.266.0.ebuild,
   chromium-4.0.288.1.ebuild, chromium-4.0.295.0.ebuild:
   Add ~arm
 
@@ -423,11 +428,11 @@
   +chromium-4.0.288.1.ebuild:
   Version bump for dev channel release.
 
-  07 Jan 2010; Raúl Porcel <armin76@gentoo.org>
+  07 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   +files/chromium-drop_armel_m32.patch, chromium-9999.ebuild:
   Add patch to fix build on ARM, enable v8 build on ARM
 
-  25 Dec 2009; Raúl Porcel <armin76@gentoo.org> chromium-4.0.266.0.ebuild,
+  25 Dec 2009; Raúl Porcel <armin76@gentoo.org> chromium-4.0.266.0.ebuild,
   chromium-9999.ebuild:
   Add arm support, but don't keyword it as its still a big buggy
 
@@ -492,7 +497,7 @@
   Version bump, enables bookmarks sync (with --enable-sync), and fix menu
   location for adblock+ extension
 
-  15 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> chromium-9999.ebuild:
+  15 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> chromium-9999.ebuild:
   QA: Drop keywords on live ebuilds.
 
   09 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org>
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index f44a96aa841b..f10802802264 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -8,9 +8,9 @@ DIST chromium-5.0.375.55.tar.bz2 163068281 RMD160 da44a6f2ed91c6b39a8505cb12e66d
 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.53.ebuild 5427 RMD160 4851dffda9bd8bdfaf8f300f42f597cf2a0f2ede SHA1 4a21e604801056f6cab1b6f9d32ac64cc6353899 SHA256 bc447bd11c46c34047a7a8cafc55d2b5f821f86bb3867acffcba607bd507328e
-EBUILD chromium-5.0.375.55.ebuild 5427 RMD160 f6b361f8a501cae7cd904e13ba56b13cba17baeb SHA1 9746528bdd75db04bdc9b1db62618dc7bba30403 SHA256 a7854ed31fd884a32b5da7932d02ea1eb2eaf57c2bb8a7395cfa653fc8f39c5f
+EBUILD chromium-5.0.375.55.ebuild 5557 RMD160 8b55ac12b49b688ae7a312551f2813c28a839de7 SHA1 9e08e458665814a152fdff97489a9e29f967ae12 SHA256 2563280afb8865e643be623b38ca5ec30c1c913836b057b539d66a1b60d37279
 EBUILD chromium-6.0.401.1.ebuild 5263 RMD160 4a58c94f482757a42e4d11d8a4c4f6c34f49d194 SHA1 c2e2521e6c06e3ecd70cebbcf8ccebfc8ffaf5a3 SHA256 54de518788f9bd04e7a3cc63d7840a074dca33e6d889fef4e4b4b255036b431c
 EBUILD chromium-6.0.408.1.ebuild 5014 RMD160 8401919f4e64dee18965d8ab3fc7a4c48e2368ab SHA1 a8b05a36e8ee74837f108177ac5aff4c663aebd4 SHA256 29cf2c643d7aee5ae9136f0705923ab243d89b935f66dde21d8e925910cb0ef4
 EBUILD chromium-9999.ebuild 6767 RMD160 1e012da7ef74265659676f256d0da4cab72cdfdf SHA1 dd8723f99d2d211eee6d2ee044f63df048fe9440 SHA256 924248fbf0eabd3b1ef15a3034391cfc6d779497a773a1f197fbb941d923cd4d
-MISC ChangeLog 24163 RMD160 439e4dd0d1dc312e0ac118109e5e315fe49c061d SHA1 82370c441ae0584ede2a49c35a0c1ab13bb20146 SHA256 a7621949f0f3817ca75d26f964e4f4cf837300bd321a4571ccf23470a8cdd126
+MISC ChangeLog 24365 RMD160 08c72856a919299d44d7fe37e5288b9795a60889 SHA1 4eeedbe514782c6164e0cc0a361c973d6aff4b78 SHA256 fbd743896fc72e6751a36198c0a51b5e4ef37ab495b5ef878356ba5848699557
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
diff --git a/www-client/chromium/chromium-5.0.375.55.ebuild b/www-client/chromium/chromium-5.0.375.55.ebuild
index 0dd3c42efbbd..91a41a8b57b3 100644
--- a/www-client/chromium/chromium-5.0.375.55.ebuild
+++ b/www-client/chromium/chromium-5.0.375.55.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.55.ebuild,v 1.2 2010/05/26 06:35:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.55.ebuild,v 1.3 2010/05/29 15:47:26 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -93,6 +93,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"