Add more checks to prevent user problems like bug #299777 or bug #348235.

(Portage version: 2.1.9.25/cvs/Linux i686)

3 files changed, 37 insertions, 3 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index afa82a13c19a..bd0506a1fe35 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # 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.245 2010/12/19 09:43:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.246 2010/12/20 19:06:38 phajdan.jr Exp $
+
+  20 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-10.0.612.1.ebuild, chromium-9999.ebuild:
+  Add more checks to prevent user problems like bug #299777 or bug #348235.
 
   19 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   +files/chromium-tests-r0.patch:
diff --git a/www-client/chromium/chromium-10.0.612.1.ebuild b/www-client/chromium/chromium-10.0.612.1.ebuild
index a537609067c8..0afe87c808f0 100644
--- a/www-client/chromium/chromium-10.0.612.1.ebuild
+++ b/www-client/chromium/chromium-10.0.612.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-10.0.612.1.ebuild,v 1.1 2010/12/18 15:05:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.612.1.ebuild,v 1.2 2010/12/20 19:06:38 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -87,6 +87,12 @@ pkg_setup() {
 	python_pkg_setup
 
 	# Prevent user problems like bug #299777.
+	if ! egrep -q '^shm.+/dev/shm' /etc/fstab; then
+		ewarn "You don't have /dev/shm entry in /etc/fstab."
+		ewarn "${PN} may fail to start in that configuration."
+		ewarn "Please add the following line to your /etc/fstab:"
+		ewarn "shm			/dev/shm	tmpfs		nodev,nosuid,noexec	0 0"
+	fi
 	if ! grep -q /dev/shm <<< $(get_mounts); then
 		ewarn "You don't have tmpfs mounted at /dev/shm."
 		ewarn "${PN} may fail to start in that configuration."
@@ -98,6 +104,15 @@ pkg_setup() {
 		ewarn "${PN} may fail to start in that configuration."
 		ewarn "Please run 'chmod 1777 /dev/shm'."
 	fi
+
+	# Prevent user problems like bug #348235.
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
+		ewarn "You may experience really long compilation times and/or increased memory usage."
+		ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug."
+	fi
+	eshopts_pop
 }
 
 src_prepare() {
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index c91a0baa4165..3f4d5ab42880 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.115 2010/12/12 17:18:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.116 2010/12/20 19:06:38 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -132,6 +132,12 @@ pkg_setup() {
 	python_pkg_setup
 
 	# Prevent user problems like bug #299777.
+	if ! egrep -q '^shm.+/dev/shm' /etc/fstab; then
+		ewarn "You don't have /dev/shm entry in /etc/fstab."
+		ewarn "${PN} may fail to start in that configuration."
+		ewarn "Please add the following line to your /etc/fstab:"
+		ewarn "shm			/dev/shm	tmpfs		nodev,nosuid,noexec	0 0"
+	fi
 	if ! grep -q /dev/shm <<< $(get_mounts); then
 		ewarn "You don't have tmpfs mounted at /dev/shm."
 		ewarn "${PN} may fail to start in that configuration."
@@ -143,6 +149,15 @@ pkg_setup() {
 		ewarn "${PN} may fail to start in that configuration."
 		ewarn "Please run 'chmod 1777 /dev/shm'."
 	fi
+
+	# Prevent user problems like bug #348235.
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
+		ewarn "You may experience really long compilation times and/or increased memory usage."
+		ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug."
+	fi
+	eshopts_pop
 }
 
 src_prepare() {