Check /dev/shm sanity, bug #299777. Remove old.

(Portage version: 2.1.7.16/cvs/Linux i686)

5 files changed, 58 insertions, 99 deletions

diff --git a/www-client/chromium-bin/ChangeLog b/www-client/chromium-bin/ChangeLog
index c128657301a1..890137885d94 100644
--- a/www-client/chromium-bin/ChangeLog
+++ b/www-client/chromium-bin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.56 2010/02/08 11:35:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.57 2010/02/11 12:21:47 phajdan.jr Exp $
+
+  11 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-bin-4.0.266.0_p33995.ebuild,
+  chromium-bin-4.0.295.0_p35884.ebuild,
+  chromium-bin-5.0.308.0_p37385.ebuild, chromium-bin-9999.ebuild:
+  Check /dev/shm sanity in pkg_setup, bug #299777. Also remove old.
 
   08 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-bin-5.0.308.0_p37385.ebuild, chromium-bin-9999.ebuild,
diff --git a/www-client/chromium-bin/chromium-bin-4.0.266.0_p33995.ebuild b/www-client/chromium-bin/chromium-bin-4.0.266.0_p33995.ebuild
deleted file mode 100644
index 697106b48719..000000000000
--- a/www-client/chromium-bin/chromium-bin-4.0.266.0_p33995.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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-4.0.266.0_p33995.ebuild,v 1.4 2010/01/26 08:09:05 phajdan.jr Exp $
-
-EAPI="2"
-inherit eutils multilib
-
-# Latest revision id can be found at
-# http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/LATEST
-MY_PV="${PV/[0-9.]*\_p}"
-
-DESCRIPTION="Open-source version of Google Chrome web browser (binary version)"
-HOMEPAGE="http://code.google.com/chromium/"
-SRC_URI="x86? ( http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${MY_PV}/chrome-linux.zip -> ${PN}-x86-${MY_PV}.zip )
-	amd64? ( http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${MY_PV}/chrome-linux.zip -> ${PN}-amd64-${MY_PV}.zip )"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="gnome-base/gconf
-	>=media-libs/alsa-lib-1.0.19
-	>=sys-devel/gcc-4.2
-	>=dev-libs/nspr-4.7
-	>=dev-libs/nss-3.12.3
-	x11-libs/pango
-	x11-misc/xdg-utils
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)"
-
-S=${WORKDIR}
-
-QA_EXECSTACK="opt/chromium.org/chrome-linux/chrome"
-
-# Ogg/Theora/Vorbis-only FFmpeg binaries
-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
-}
-
-src_install() {
-	declare CHROMIUM_HOME=/opt/chromium.org
-
-	dodir ${CHROMIUM_HOME}
-	cp -R chrome-linux/ "${D}"${CHROMIUM_HOME} || die "Unable to install chrome-linux folder"
-
-	# Man page (rename to prevent collision with chromium)
-	newman chrome-linux/chrome.1 chromium-bin.1
-	rm "${D}"${CHROMIUM_HOME}/chrome-linux/chrome.1
-
-	# Plugins symlink
-	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/chrome-linux/plugins
-
-	# Create symlinks for needed libraries
-	dodir ${CHROMIUM_HOME}/nss-nspr
-	NSS_DIR=/usr/$(get_libdir)/nss
-	NSPR_DIR=/usr/$(get_libdir)/nspr
-
-	dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/nss-nspr/libnspr4.so.0d
-	dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/nss-nspr/libplc4.so.0d
-	dosym ${NSPR_DIR}/libplds4.so ${CHROMIUM_HOME}/nss-nspr/libplds4.so.0d
-	dosym ${NSS_DIR}/libnss3.so ${CHROMIUM_HOME}/nss-nspr/libnss3.so.1d
-	dosym ${NSS_DIR}/libnssutil3.so ${CHROMIUM_HOME}/nss-nspr/libnssutil3.so.1d
-	dosym ${NSS_DIR}/libsmime3.so ${CHROMIUM_HOME}/nss-nspr/libsmime3.so.1d
-	dosym ${NSS_DIR}/libssl3.so ${CHROMIUM_HOME}/nss-nspr/libssl3.so.1d
-
-	# Create chromium-bin wrapper
-	make_wrapper chromium-bin ./chrome ${CHROMIUM_HOME}/chrome-linux ${CHROMIUM_HOME}/nss-nspr:${CHROMIUM_HOME}/chrome-linux
-	newicon "${FILESDIR}"/chromium.png ${PN}.png
-	make_desktop_entry chromium-bin "Chromium (bin)" ${PN} "Network;WebBrowser"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
-		|| die "desktop file sed failed"
-}
-
-pkg_postinst() {
-	ewarn "This binary requires the C++ runtime from >=sys-devel/gcc-4.2"
-	ewarn "If you get the \"version \`GLIBCXX_3.4.9' not found\" error message,"
-	ewarn "switch your active gcc to a version >=4.2 with gcc-config"
-	if [[ ${ROOT} != "/" ]]; then
-		ewarn "This package will not work on processors without SSE2 instruction"
-		ewarn "set support (Intel Pentium III/AMD Athlon or older)."
-	fi
-}
diff --git a/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild b/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild
index 46daf3baa941..657cb8d8c23d 100644
--- a/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild
+++ b/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.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-4.0.295.0_p35884.ebuild,v 1.5 2010/01/26 08:09:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild,v 1.6 2010/02/11 12:21:47 phajdan.jr Exp $
 
 EAPI="2"
-inherit eutils multilib
+inherit eutils multilib portability
 
 # Latest revision id can be found at
 # http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/LATEST
@@ -49,6 +49,21 @@ pkg_setup() {
 	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"
+	fi
 }
 
 src_install() {
diff --git a/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild b/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild
index aa87338b0772..982e391af3e6 100644
--- a/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild
+++ b/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.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-5.0.308.0_p37385.ebuild,v 1.2 2010/02/08 11:35:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild,v 1.3 2010/02/11 12:21:47 phajdan.jr Exp $
 
 EAPI="2"
-inherit eutils multilib
+inherit eutils multilib portability
 
 # Latest revision id can be found at
 # http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/LATEST
@@ -50,6 +50,21 @@ pkg_setup() {
 	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"
+	fi
 }
 
 src_install() {
diff --git a/www-client/chromium-bin/chromium-bin-9999.ebuild b/www-client/chromium-bin/chromium-bin-9999.ebuild
index afbe798ef126..fb7ecfa84aa2 100644
--- a/www-client/chromium-bin/chromium-bin-9999.ebuild
+++ b/www-client/chromium-bin/chromium-bin-9999.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-9999.ebuild,v 1.32 2010/02/08 11:35:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.33 2010/02/11 12:21:47 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/"
@@ -44,6 +44,21 @@ pkg_setup() {
 	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"
+	fi
 }
 
 src_unpack() {