From 9d401da89e8ec24ae6ea71d663bf90414c247861 Mon Sep 17 00:00:00 2001
From: Paweł Hajdan <phajdan.jr@gentoo.org>
Date: Mon, 20 Dec 2010 19:55:17 +0000
Subject: Add more checks to prevent user problems like bug #299777.

Package-Manager: portage-2.1.9.25/cvs/Linux i686
---
 www-client/chromium-bin/ChangeLog                  |  6 +++++-
 www-client/chromium-bin/Manifest                   |  4 ++--
 .../chromium-bin/chromium-bin-8.0.552.224.ebuild   | 23 ++++++++++++++++++++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/www-client/chromium-bin/ChangeLog b/www-client/chromium-bin/ChangeLog
index b10ae0baaaa8..00cb10bf4fd5 100644
--- a/www-client/chromium-bin/ChangeLog
+++ b/www-client/chromium-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.83 2010/12/14 14:50:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.84 2010/12/20 19:55:17 phajdan.jr Exp $
+
+  20 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-bin-8.0.552.224.ebuild:
+  Add more checks to prevent user problems like bug #299777.
 
 *chromium-bin-8.0.552.224 (14 Dec 2010)
 
diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index 1a1d2482f9a9..ac9eceea86af 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -1,6 +1,6 @@
 AUX chromium.png 7266 RMD160 e9651563c5bb8021ef1c03a94f0a3da65eaac486 SHA1 8a83a66c09e282dd4b9428e653f7f41d5acf3184 SHA256 966fa6e9971b86ddec6a5dc9ff5f5ee08228c211ca76b2ed404b98a71b6612be
 DIST chromium-bin-amd64-8.0.552.224.tar.bz2 16876978 RMD160 31042fe163a35bad86262061bb793a79ca1b1ebe SHA1 0be62782c12213a112e18fb23a0172787a12600a SHA256 6a11f8828760f626da98b2b8d6ee5f0d3f91c089a2cd01388c705e2fe3395b4e
 DIST chromium-bin-x86-8.0.552.224.tar.bz2 15658624 RMD160 5dc684b5494275f3480ecd12916a03a451ff94c2 SHA1 ae5425806f9748303e9360de5890d2f9b223fa25 SHA256 1191b65ab869b7eb327c0222d3f3c6115c38507e62e021655c6a1376e666fd66
-EBUILD chromium-bin-8.0.552.224.ebuild 2166 RMD160 ab3ae31c94e7ab1891906b72109609e5a34f178b SHA1 55da1277ff33cc651024d8bd719679e0cef4da46 SHA256 057c75545d03f6dea93ebac3289406de9b6a0dac2bce64fcadd1178d0b9174d8
-MISC ChangeLog 19377 RMD160 e25435d3ae24f5c941e8cea30a37ae1c03b2e2f6 SHA1 044280661b5481dd734f5e064ff433ac70db09ab SHA256 2abb5e88034849ca724560bfbd27fdac6ce84ac3d3d0091886be136f02daa93b
+EBUILD chromium-bin-8.0.552.224.ebuild 2964 RMD160 3098e81a1e3e0c0021fec24c8a083f03727adf7b SHA1 fcd2ee35e8cdf9718e81727255d88189ed7ef088 SHA256 9a39d80e48d0ee6817f1f1094df33c68246af7b40985462104dc7ea0cc0db69c
+MISC ChangeLog 19529 RMD160 b02df0494323d074b33288bf1410105ab9b9efea SHA1 da23a932bd000e0947eb4cb94c5d75d519b744de SHA256 e947d46f8ca9039838394d1abaaa80a43a6177da4bee640fd40a0bffb8a0d3aa
 MISC metadata.xml 268 RMD160 9ff00833163599f39e038e1c8eeeb8fb26075eb5 SHA1 c4dbfb9b12c89298993a09c1253a50a103cd34a6 SHA256 077e9bbbea232ae4b86f8b50510c40c3494c5e8e4f9ea1600dc349abeb489580
diff --git a/www-client/chromium-bin/chromium-bin-8.0.552.224.ebuild b/www-client/chromium-bin/chromium-bin-8.0.552.224.ebuild
index beb18ef64f5e..6e56f59e3b2b 100644
--- a/www-client/chromium-bin/chromium-bin-8.0.552.224.ebuild
+++ b/www-client/chromium-bin/chromium-bin-8.0.552.224.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-8.0.552.224.ebuild,v 1.1 2010/12/14 14:50:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-8.0.552.224.ebuild,v 1.2 2010/12/20 19:55:17 phajdan.jr Exp $
 
 EAPI="2"
-inherit eutils multilib
+inherit eutils multilib portability
 
 DESCRIPTION="Open-source version of Google Chrome web browser (binary version)"
 HOMEPAGE="http://code.google.com/chromium/"
@@ -51,6 +51,25 @@ RDEPEND="app-arch/bzip2
 
 pkg_setup() {
 	CHROMIUM_HOME="/opt/chromium.org"
+
+	# 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."
+		ewarn "Please uncomment the /dev/shm entry in /etc/fstab,"
+		ewarn "and run 'mount /dev/shm'."
+	fi
+	if [ `stat -c %a /dev/shm` -ne 1777 ]; then
+		ewarn "/dev/shm does not have correct permissions."
+		ewarn "${PN} may fail to start in that configuration."
+		ewarn "Please run 'chmod 1777 /dev/shm'."
+	fi
 }
 
 src_install() {
-- 
cgit v1.2.3-65-gdbad