Prepare for unmasking tcmalloc USE flag, add blocker on old nvidia-drivers. Thanks to Julien Sanchez and Pavel Volkov for testing (bug #413637).

(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 30427902)

3 files changed, 20 insertions, 17 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index bd866314e066..f8001918f5fb 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.991 2013/11/22 01:07:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.992 2013/11/23 18:51:09 phajdan.jr Exp $
+
+  23 Nov 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-32.0.1700.19.ebuild, chromium-33.0.1711.3.ebuild:
+  Prepare for unmasking tcmalloc USE flag, add blocker on old nvidia-drivers.
+  Thanks to Julien Sanchez and Pavel Volkov for testing (bug #413637).
 
   22 Nov 2013; Mike Gilbert <floppym@gentoo.org> chromium-32.0.1700.19.ebuild,
   chromium-33.0.1711.3.ebuild, files/chromium-build_ffmpeg-r0.patch:
diff --git a/www-client/chromium/chromium-32.0.1700.19.ebuild b/www-client/chromium/chromium-32.0.1700.19.ebuild
index 356d8911f626..9d5815eed123 100644
--- a/www-client/chromium/chromium-32.0.1700.19.ebuild
+++ b/www-client/chromium/chromium-32.0.1700.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild,v 1.2 2013/11/22 01:07:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild,v 1.3 2013/11/23 18:51:09 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux system-sqlite tcmalloc"
+IUSE="bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux system-sqlite +tcmalloc"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -90,10 +90,12 @@ DEPEND="${RDEPEND}
 		dev-libs/openssl:0
 		dev-python/pyftpdlib
 	)"
+# For nvidia-drivers blocker, see bug #413637 .
 RDEPEND+="
 	!=www-client/chromium-9999
 	x11-misc/xdg-utils
-	virtual/ttf-fonts"
+	virtual/ttf-fonts
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
 
 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
@@ -228,10 +230,6 @@ src_configure() {
 	# additions, bug #336871.
 	myconf+=" -Ddisable_sse2=1"
 
-	# Optional tcmalloc. Note it causes problems with e.g. NVIDIA
-	# drivers, bug #413637.
-	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
-
 	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
 	myconf+=" -Ddisable_nacl=1"
 
@@ -293,7 +291,8 @@ src_configure() {
 		$(gyp_use gnome-keyring use_gnome_keyring)
 		$(gyp_use gnome-keyring linux_link_gnome_keyring)
 		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)"
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc linux_use_tcmalloc)"
 
 	if use system-sqlite; then
 		elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/"
diff --git a/www-client/chromium/chromium-33.0.1711.3.ebuild b/www-client/chromium/chromium-33.0.1711.3.ebuild
index 79d5fefdc91b..f290b370a60c 100644
--- a/www-client/chromium/chromium-33.0.1711.3.ebuild
+++ b/www-client/chromium/chromium-33.0.1711.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1711.3.ebuild,v 1.2 2013/11/22 01:07:41 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1711.3.ebuild,v 1.3 2013/11/23 18:51:09 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="aura bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux system-sqlite tcmalloc"
+IUSE="aura bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux system-sqlite +tcmalloc"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -90,10 +90,12 @@ DEPEND="${RDEPEND}
 		dev-libs/openssl:0
 		dev-python/pyftpdlib
 	)"
+# For nvidia-drivers blocker, see bug #413637 .
 RDEPEND+="
 	!=www-client/chromium-9999
 	x11-misc/xdg-utils
-	virtual/ttf-fonts"
+	virtual/ttf-fonts
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
 
 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
@@ -229,10 +231,6 @@ src_configure() {
 	# additions, bug #336871.
 	myconf+=" -Ddisable_sse2=1"
 
-	# Optional tcmalloc. Note it causes problems with e.g. NVIDIA
-	# drivers, bug #413637.
-	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
-
 	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
 	myconf+=" -Ddisable_nacl=1"
 
@@ -295,7 +293,8 @@ src_configure() {
 		$(gyp_use gnome-keyring use_gnome_keyring)
 		$(gyp_use gnome-keyring linux_link_gnome_keyring)
 		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)"
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc linux_use_tcmalloc)"
 
 	if use system-sqlite; then
 		elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/"