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

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

4 files changed, 40 insertions, 6 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/Manifest b/www-client/chromium/Manifest
index 59b4a12c88b6..a70fd15d0129 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -11,9 +11,9 @@ AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a9
 DIST chromium-10.0.612.1.tar.bz2 143485277 RMD160 396eaeb7d25ddb9b372be52d93a1de65ab646edf SHA1 96085dfee33727ff121d955dc093f3e293a7d1dc SHA256 dc1e0ccf1e56f5111acfb0686283bd2e8557a94513c9087a00910408f8fe89e4
 DIST chromium-8.0.552.224.tar.bz2 135345394 RMD160 e7bed4bc0b4d851e83bfc351ceca9af4ae739dad SHA1 4544ec2f753893e9a5426e4bad353bad8fd25f8a SHA256 c10b5f7cbafbc430ba25f6cdc00af5c86c6216b280101df2036a89474b75a848
 DIST chromium-9.0.597.19.tar.bz2 141604890 RMD160 9333fe36501215c2c3f717525216ec1f04ffd8b7 SHA1 01086ba4d186893b0a909be5f4c19c6dbf599baf SHA256 b3a1ae7aed12f8ab4d46ac9571259e1666e2abdd24c0a5d08638ea1b94d3c681
-EBUILD chromium-10.0.612.1.ebuild 9703 RMD160 2f85537003b7395700e721f74893d2dda343180a SHA1 4423bfe30808ed0768df6544118881f0e2c31133 SHA256 f000bb3efd7fda47d1fccc138cfaefc2deff8b9ce781eb7227388e15e4f26c58
+EBUILD chromium-10.0.612.1.ebuild 10372 RMD160 774aa901ec836e4681f53f28e1c44d0061a44586 SHA1 2b777c03f7ec840261caac80b873a8b6d2dad9e0 SHA256 8b95189499ac3cf4ccbb559178074be60822f4de8a93dfec799e9dc1e6b787de
 EBUILD chromium-8.0.552.224.ebuild 8606 RMD160 da7aba06f58b5f00f49fa2b5377be60f986ea7b4 SHA1 3c7127b56601c7db9684d561fffed18ed1246fd4 SHA256 5b4ca0dcf464bd316fd5d8ea36f10a2553748d0df821eed8a026a03c5f0e943f
 EBUILD chromium-9.0.597.19.ebuild 9757 RMD160 9cd2c3cccf511a487cdf37cc3cd6f1e7beea1d52 SHA1 7168fe29e7321cf84df4a912f794d1ac77065b6b SHA256 0bdcaaf83a5c3134359ad64f2fcaf362ac5b94d1de7147ba4b71e71b9e153a27
-EBUILD chromium-9999.ebuild 11360 RMD160 de86664824c5d6229959f69765567af3bcee89cf SHA1 c8540296db206ab2e6c4fb88df2ccb98e983a66b SHA256 93c331424c5fa68389ca925642d4bf4cf4d28a70ce98c16f6d747ba35db6a21d
-MISC ChangeLog 54365 RMD160 2681c0126c58814d7f10100029743426baac8c3b SHA1 c3e3db7f1538910658cd57b83c9d22b1eaeace05 SHA256 3a79dc9673db2d30c62592d4114f61d87efb2a269ae958d3cf7c29597bd69509
+EBUILD chromium-9999.ebuild 12029 RMD160 3c56b42384e97f73e955117e5da585fed0a0a34f SHA1 8396f35ff24cd50ab913ba6f095c284e19ac479c SHA256 0e4681fdb137c7cb83a942acd55455a3409dea34471e16579259ee226de63e34
+MISC ChangeLog 54549 RMD160 3530e65cc19f0b35b61cf07eaf4885c5218100dd SHA1 664f711ce4311ef233de6f30d2c5ee1d59cadc83 SHA256 51a170b2c8af7e8bed80f424190fbed5166e7192aa0e123b9653147485fe42f0
 MISC metadata.xml 607 RMD160 98f163b667c92c149e6ad82352ff5a1ea076361f SHA1 0d7d96013e31288c37a0e245cf2b538af1a46eaf SHA256 1d94b496c34342ce43cf7b1c6887d90930c0531e903e512d2d132e79e1d0d27d
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() {