Add check for $ROOT in the /dev/shm sanity check wrt latest comments in bug #299777.
authorPaweł Hajdan <phajdan.jr@gentoo.org>
Mon, 1 Mar 2010 10:30:21 +0000 (10:30 +0000)
committerPaweł Hajdan <phajdan.jr@gentoo.org>
Mon, 1 Mar 2010 10:30:21 +0000 (10:30 +0000)
Package-Manager: portage-2.1.7.16/cvs/Linux i686

www-client/chromium-bin/ChangeLog
www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild
www-client/chromium-bin/chromium-bin-9999.ebuild
www-client/chromium/ChangeLog
www-client/chromium/chromium-5.0.307.11.ebuild
www-client/chromium/chromium-5.0.335.0.ebuild
www-client/chromium/chromium-9999.ebuild

index 9c0fab0db4322cf3382447db71e42da486a0b4a3..7e6bc49d94331ffdc4d4d7988ac7ec8e09fcf3f6 100644 (file)
@@ -1,6 +1,11 @@
 # 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.58 2010/02/11 17:01:59 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.59 2010/03/01 10:30:21 phajdan.jr Exp $
+
+  01 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-bin-5.0.308.0_p37385.ebuild, chromium-bin-9999.ebuild:
+  Add check for $ROOT in the /dev/shm sanity check wrt latest comments in
+  bug #299777.
 
   11 Feb 2010; Bernard Cafarelli <voyageur@gentoo.org>
   chromium-bin-4.0.295.0_p35884.ebuild,
index d92864dd62fd626e6c9ac795eb08085777485133..8a3b2c4cf62b10f3e46ed65572bb5dc9e64f406a 100644 (file)
@@ -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-bin/chromium-bin-5.0.308.0_p37385.ebuild,v 1.4 2010/02/11 17:01:59 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild,v 1.5 2010/03/01 10:30:21 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils multilib portability
@@ -46,24 +46,26 @@ QA_TEXTRELS="opt/chromium.org/chrome-linux/libffmpegsumo.so"
 QA_PRESTRIPPED="opt/chromium.org/chrome-linux/libffmpegsumo.so"
 
 pkg_setup() {
-       # Built with SSE2 enabled, so will fail on older processors
-       if [[ ${ROOT} == "/" ]] && ! grep -q sse2 /proc/cpuinfo; then
-               die "This binary requires SSE2 support, it will not work on older processors"
-       fi
-
-       # Prevent user problems like bug 299777.
-       if ! grep -q /dev/shm <<< $(get_mounts); then
-               eerror "You don't have tmpfs mounted at /dev/shm."
-               eerror "${PN} isn't going to work in that configuration."
-               eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
-               eerror "run 'mount /dev/shm' and try again."
-               die "/dev/shm is not mounted"
-       fi
-       if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-               eerror "/dev/shm does not have correct permissions."
-               eerror "${PN} isn't going to work in that configuration."
-               eerror "Please run chmod 1777 /dev/shm and try again."
-               die "/dev/shm has incorrect permissions"
+       if [[ "${ROOT}" == "/" ]]; then
+               # Built with SSE2 enabled, so will fail on older processors
+               if ! grep -q sse2 /proc/cpuinfo; then
+                       die "This binary requires SSE2 support, it will not work on older processors"
+               fi
+
+               # Prevent user problems like bug 299777.
+               if ! grep -q /dev/shm <<< $(get_mounts); then
+                       eerror "You don't have tmpfs mounted at /dev/shm."
+                       eerror "${PN} isn't going to work in that configuration."
+                       eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
+                       eerror "run 'mount /dev/shm' and try again."
+                       die "/dev/shm is not mounted"
+               fi
+               if [ `stat -c %a /dev/shm` -ne 1777 ]; then
+                       eerror "/dev/shm does not have correct permissions."
+                       eerror "${PN} isn't going to work in that configuration."
+                       eerror "Please run chmod 1777 /dev/shm and try again."
+                       die "/dev/shm has incorrect permissions"
+               fi
        fi
 }
 
index f72e27cb2976c6ffa554f882de233d74047ad382..efe43eedbc813ac806977988aecaf4af00240e4e 100644 (file)
@@ -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-bin/chromium-bin-9999.ebuild,v 1.34 2010/02/11 17:01:59 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.35 2010/03/01 10:30:21 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils multilib portability
@@ -40,24 +40,26 @@ QA_TEXTRELS="opt/chromium.org/chrome-linux/libffmpegsumo.so"
 QA_PRESTRIPPED="opt/chromium.org/chrome-linux/libffmpegsumo.so"
 
 pkg_setup() {
-       # Built with SSE2 enabled, so will fail on older processors
-       if [[ ${ROOT} == "/" ]] && ! grep -q sse2 /proc/cpuinfo; then
-               die "This binary requires SSE2 support, it will not work on older processors"
-       fi
-
-       # Prevent user problems like bug 299777.
-       if ! grep -q /dev/shm <<< $(get_mounts); then
-               eerror "You don't have tmpfs mounted at /dev/shm."
-               eerror "${PN} isn't going to work in that configuration."
-               eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
-               eerror "run 'mount /dev/shm' and try again."
-               die "/dev/shm is not mounted"
-       fi
-       if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-               eerror "/dev/shm does not have correct permissions."
-               eerror "${PN} isn't going to work in that configuration."
-               eerror "Please run chmod 1777 /dev/shm and try again."
-               die "/dev/shm has incorrect permissions"
+       if [[ "${ROOT}" == "/" ]]; then
+               # Built with SSE2 enabled, so will fail on older processors
+               if ! grep -q sse2 /proc/cpuinfo; then
+                       die "This binary requires SSE2 support, it will not work on older processors"
+               fi
+
+               # Prevent user problems like bug 299777.
+               if ! grep -q /dev/shm <<< $(get_mounts); then
+                       eerror "You don't have tmpfs mounted at /dev/shm."
+                       eerror "${PN} isn't going to work in that configuration."
+                       eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
+                       eerror "run 'mount /dev/shm' and try again."
+                       die "/dev/shm is not mounted"
+               fi
+               if [ `stat -c %a /dev/shm` -ne 1777 ]; then
+                       eerror "/dev/shm does not have correct permissions."
+                       eerror "${PN} isn't going to work in that configuration."
+                       eerror "Please run chmod 1777 /dev/shm and try again."
+                       die "/dev/shm has incorrect permissions"
+               fi
        fi
 }
 
index 9cbb2bce48ccfbc91a1790a6a4944422f6771c3f..84b50f4408f550c1d971ec595891db627e0b7007 100644 (file)
@@ -1,6 +1,12 @@
 # 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.61 2010/02/27 15:50:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.62 2010/03/01 10:26:59 phajdan.jr Exp $
+
+  01 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-5.0.307.11.ebuild, chromium-5.0.335.0.ebuild,
+  chromium-9999.ebuild:
+  Add check for $ROOT in the /dev/shm sanity check wrt latest comments in
+  bug #299777.
 
 *chromium-5.0.307.11 (27 Feb 2010)
 
index 2f3eb21e79d50a4fb85469f6a07d717cbc68bdbb..b41c52caee1531b9e0b5d449ee9059931b7681a5 100644 (file)
@@ -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.307.11.ebuild,v 1.1 2010/02/27 15:50:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.307.11.ebuild,v 1.2 2010/03/01 10:26:59 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -41,19 +41,21 @@ DEPEND="${RDEPEND}
        sys-devel/flex"
 
 pkg_setup() {
-       # Prevent user problems like bug 299777.
-       if ! grep -q /dev/shm <<< $(get_mounts); then
-               eerror "You don't have tmpfs mounted at /dev/shm."
-               eerror "${PN} isn't going to work in that configuration."
-               eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
-               eerror "run 'mount /dev/shm' and try again."
-               die "/dev/shm is not mounted"
-       fi
-       if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-               eerror "/dev/shm does not have correct permissions."
-               eerror "${PN} isn't going to work in that configuration."
-               eerror "Please run chmod 1777 /dev/shm and try again."
-               die "/dev/shm has incorrect permissions"
+       if [[ "${ROOT}" == "/" ]]; then
+               # Prevent user problems like bug 299777.
+               if ! grep -q /dev/shm <<< $(get_mounts); then
+                       eerror "You don't have tmpfs mounted at /dev/shm."
+                       eerror "${PN} isn't going to work in that configuration."
+                       eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
+                       eerror "run 'mount /dev/shm' and try again."
+                       die "/dev/shm is not mounted"
+               fi
+               if [ `stat -c %a /dev/shm` -ne 1777 ]; then
+                       eerror "/dev/shm does not have correct permissions."
+                       eerror "${PN} isn't going to work in that configuration."
+                       eerror "Please run chmod 1777 /dev/shm and try again."
+                       die "/dev/shm has incorrect permissions"
+               fi
        fi
 
        elog "${PN} might crash occasionally. To get more useful backtraces"
index 62cb9f2c9a90641ff1c344c3c8ca34c63d8bb7d8..3b14c08e20c74b955de589efe0bf700c048b8fa8 100644 (file)
@@ -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.335.0.ebuild,v 1.1 2010/02/25 09:06:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.335.0.ebuild,v 1.2 2010/03/01 10:26:59 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -41,19 +41,21 @@ DEPEND="${RDEPEND}
        sys-devel/flex"
 
 pkg_setup() {
-       # Prevent user problems like bug 299777.
-       if ! grep -q /dev/shm <<< $(get_mounts); then
-               eerror "You don't have tmpfs mounted at /dev/shm."
-               eerror "${PN} isn't going to work in that configuration."
-               eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
-               eerror "run 'mount /dev/shm' and try again."
-               die "/dev/shm is not mounted"
-       fi
-       if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-               eerror "/dev/shm does not have correct permissions."
-               eerror "${PN} isn't going to work in that configuration."
-               eerror "Please run chmod 1777 /dev/shm and try again."
-               die "/dev/shm has incorrect permissions"
+       if [[ "${ROOT}" == "/" ]]; then
+               # Prevent user problems like bug 299777.
+               if ! grep -q /dev/shm <<< $(get_mounts); then
+                       eerror "You don't have tmpfs mounted at /dev/shm."
+                       eerror "${PN} isn't going to work in that configuration."
+                       eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
+                       eerror "run 'mount /dev/shm' and try again."
+                       die "/dev/shm is not mounted"
+               fi
+               if [ `stat -c %a /dev/shm` -ne 1777 ]; then
+                       eerror "/dev/shm does not have correct permissions."
+                       eerror "${PN} isn't going to work in that configuration."
+                       eerror "Please run chmod 1777 /dev/shm and try again."
+                       die "/dev/shm has incorrect permissions"
+               fi
        fi
 
        elog "${PN} might crash occasionally. To get more useful backtraces"
index 2b83a69c353a1ef8373b427e9eecfa134d453846..59dc39ed4ed094ef0967a931402810472dd87c87 100644 (file)
@@ -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.30 2010/02/23 18:26:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.31 2010/03/01 10:26:59 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
@@ -42,19 +42,21 @@ DEPEND="${RDEPEND}
        sys-devel/flex"
 
 pkg_setup() {
-       # Prevent user problems like bug 299777.
-       if ! grep -q /dev/shm <<< $(get_mounts); then
-               eerror "You don't have tmpfs mounted at /dev/shm."
-               eerror "${PN} isn't going to work in that configuration."
-               eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
-               eerror "run 'mount /dev/shm' and try again."
-               die "/dev/shm is not mounted"
-       fi
-       if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-               eerror "/dev/shm does not have correct permissions."
-               eerror "${PN} isn't going to work in that configuration."
-               eerror "Please run chmod 1777 /dev/shm and try again."
-               die "/dev/shm has incorrect permissions"
+       if [[ "${ROOT}" == "/" ]]; then
+               # Prevent user problems like bug 299777.
+               if ! grep -q /dev/shm <<< $(get_mounts); then
+                       eerror "You don't have tmpfs mounted at /dev/shm."
+                       eerror "${PN} isn't going to work in that configuration."
+                       eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
+                       eerror "run 'mount /dev/shm' and try again."
+                       die "/dev/shm is not mounted"
+               fi
+               if [ `stat -c %a /dev/shm` -ne 1777 ]; then
+                       eerror "/dev/shm does not have correct permissions."
+                       eerror "${PN} isn't going to work in that configuration."
+                       eerror "Please run chmod 1777 /dev/shm and try again."
+                       die "/dev/shm has incorrect permissions"
+               fi
        fi
 
        elog "${PN} might crash occasionally. To get more useful backtraces"