Clean up: remove /dev/shm checks (hopefully obsolete thanks to openrc), remove unused _WARNING variables, remove libsrtp from bundled libs exclusion list, switch to tc-arch for arch detection (for simplicity - we shouldn't have custom code for that).

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

4 files changed, 18 insertions, 67 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index b248e7bc33ac..c1d7aa8d1d47 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.374 2011/06/02 12:58:20 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.375 2011/06/02 18:40:41 phajdan.jr Exp $
+
+  02 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-13.0.782.1.ebuild, chromium-9999-r1.ebuild:
+  Clean up: remove /dev/shm checks (hopefully obsolete thanks to openrc),
+  remove unused _WARNING variables, remove libsrtp from bundled libs exclusion
+  list, switch to tc-arch for arch detection (for simplicity - we shouldn't
+  have custom code for that).
 
 *chromium-13.0.782.1 (02 Jun 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 9808c31926ae..704f66e6fbdf 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -21,14 +21,14 @@ EBUILD chromium-11.0.696.71.ebuild 10572 RMD160 648e467be38dbdee3d0cddfdb2ae0db0
 EBUILD chromium-12.0.742.60.ebuild 11561 RMD160 d034650f7a32b433c99d0d066abe55ba0b08c23b SHA1 c1cb4926f37910f6f40c39bee5db4a40642704d3 SHA256 da4fec3b131eacc0b2639a4757085778c0ac797e713f4caf7fc8d1776d8c74fb
 EBUILD chromium-12.0.742.68.ebuild 11565 RMD160 43f245f42d7b78167f306710382471f8875605e4 SHA1 7ab5daca1d056e4a0f1ec04e73b21a98e6d725f4 SHA256 2c3f753707277a8aef524856acc90a9166feec604a8bb01761c91ade8c909933
 EBUILD chromium-13.0.772.0-r1.ebuild 13098 RMD160 a602532a5edb10c8ebf8e9df36943790cd615ac4 SHA1 512a981af9d9ac500e62fe78b58a1ac5a82ca78d SHA256 e65425eed6663524386c6f8ed752da755666736431a4a5bc8d6da71bd99769ad
-EBUILD chromium-13.0.782.1.ebuild 13101 RMD160 392c2a780f2b71d53a8f19d52f3d06780acaddac SHA1 e38248a4577716b0099a0aacaddc30a5470b8750 SHA256 8fb81c05ed37fa8cdebb04a7b23b187d0aca53370cf96be99407ac454219b6ba
-EBUILD chromium-9999-r1.ebuild 15222 RMD160 0cffef4d18ec234facfb7256ef143f2a88b686e9 SHA1 7773570f0e6b1c172701069080f8192daf32b218 SHA256 cf444b0342ca7752f7d123f9294d045abc8710f4e2a29765e8e2691e84a090d2
-MISC ChangeLog 83154 RMD160 a2d8186c6f5cb57a42fb8bfcba7ad56349b451ee SHA1 a0c8ecabda1152e0e7899445a3864f6c7797b2ef SHA256 11a8092ead21778cc94e5eae273bac1c10d5d5be0da702fc79cd8c41e1d7cf83
+EBUILD chromium-13.0.782.1.ebuild 12190 RMD160 ee733e5911a1f9fdcf8d8e435d90b4b36348828b SHA1 9d89dced7a3b97d05460cc6840c87f943cbea9c1 SHA256 d4a56f87bec6c3be486e0b361211529329d13e3c7ace855c12caf6a4c8f635a0
+EBUILD chromium-9999-r1.ebuild 14311 RMD160 17307acefe04e3c54de2295690573db6c577523c SHA1 f07b01bb1aa0b9ed45aad21816fba5b493314878 SHA256 254598e5b11664695f9623112b43dddeb020aacced9bfc623a5afaae7564cb9a
+MISC ChangeLog 83524 RMD160 1b62fe76f382faf5b959c36c065b1a1b7ecb8682 SHA1 5badea2453c2d5499c3df713ec67df904b068131 SHA256 fd7bcf7ef7147abe5181f3405ad02e518af6a19d4edf593236adf7d554fea88c
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3niPgACgkQuUQtlDBCeQJinwCfd6ScLjQqlkCAOFJTIpsgN0TG
-SEkAn23WYE08UiwlyYgJgctxDdZouvU5
-=GsxN
+iEYEARECAAYFAk3n2YsACgkQuUQtlDBCeQLdDwCfVFpMUN7CnGu/0gHrobiC2ldu
+FPYAnRDzHMTSaZJz0QwWIs3nnm5xLvyL
+=xPWx
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-13.0.782.1.ebuild b/www-client/chromium/chromium-13.0.782.1.ebuild
index 3a435e10d0a2..13e73735585f 100644
--- a/www-client/chromium/chromium-13.0.782.1.ebuild
+++ b/www-client/chromium/chromium-13.0.782.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.782.1.ebuild,v 1.1 2011/06/02 12:58:20 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.782.1.ebuild,v 1.2 2011/06/02 18:40:41 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -99,19 +99,6 @@ pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
 
-	# Prevent user problems like bug #299777.
-	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
-
 	# Prevent user problems like bug #348235.
 	eshopts_push -s extglob
 	if is-flagq '-g?(gdb)?([1-9])'; then
@@ -124,8 +111,6 @@ pkg_setup() {
 	# Warn if the kernel doesn't support features useful for sandboxing,
 	# bug #363907.
 	CONFIG_CHECK="~PID_NS ~NET_NS"
-	PID_NS_WARNING="PID (process id) namespaces are needed for sandboxing."
-	NET_NS_WARNING="Network namespaces are needed for sandboxing."
 	check_extra_config
 }
 
@@ -150,7 +135,6 @@ src_prepare() {
 		\! -path 'third_party/leveldb/*' \
 		\! -path 'third_party/libjingle/*' \
 		\! -path 'third_party/libphonenumber/*' \
-		\! -path 'third_party/libsrtp/*' \
 		\! -path 'third_party/libvpx/libvpx.h' \
 		\! -path 'third_party/mesa/*' \
 		\! -path 'third_party/modp_b64/*' \
@@ -220,19 +204,7 @@ src_configure() {
 	# for Chromium.
 	myconf+=" -Dproprietary_codecs=1"
 
-	# Use target arch detection logic from bug #354601.
-	case ${CHOST} in
-		i?86-*) myarch=x86 ;;
-		x86_64-*)
-			if [[ $ABI = "" ]] ; then
-				myarch=amd64
-			else
-				myarch="$ABI"
-			fi ;;
-		arm*-*) myarch=arm ;;
-		*) die "Unrecognized CHOST: ${CHOST}"
-	esac
-
+	local myarch="$(tc-arch)"
 	if [[ $myarch = amd64 ]] ; then
 		myconf+=" -Dtarget_arch=x64"
 	elif [[ $myarch = x86 ]] ; then
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 21686fe5e547..6c34a769a715 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.30 2011/06/02 12:58:20 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.31 2011/06/02 18:40:41 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -128,19 +128,6 @@ pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
 
-	# Prevent user problems like bug #299777.
-	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
-
 	# Prevent user problems like bug #348235.
 	eshopts_push -s extglob
 	if is-flagq '-g?(gdb)?([1-9])'; then
@@ -153,8 +140,6 @@ pkg_setup() {
 	# Warn if the kernel doesn't support features useful for sandboxing,
 	# bug #363907.
 	CONFIG_CHECK="~PID_NS ~NET_NS"
-	PID_NS_WARNING="PID (process id) namespaces are needed for sandboxing."
-	NET_NS_WARNING="Network namespaces are needed for sandboxing."
 	check_extra_config
 }
 
@@ -179,7 +164,6 @@ src_prepare() {
 		\! -path 'third_party/leveldb/*' \
 		\! -path 'third_party/libjingle/*' \
 		\! -path 'third_party/libphonenumber/*' \
-		\! -path 'third_party/libsrtp/*' \
 		\! -path 'third_party/libvpx/libvpx.h' \
 		\! -path 'third_party/mesa/*' \
 		\! -path 'third_party/modp_b64/*' \
@@ -249,19 +233,7 @@ src_configure() {
 	# for Chromium.
 	myconf+=" -Dproprietary_codecs=1"
 
-	# Use target arch detection logic from bug #354601.
-	case ${CHOST} in
-		i?86-*) myarch=x86 ;;
-		x86_64-*)
-			if [[ $ABI = "" ]] ; then
-				myarch=amd64
-			else
-				myarch="$ABI"
-			fi ;;
-		arm*-*) myarch=arm ;;
-		*) die "Unrecognized CHOST: ${CHOST}"
-	esac
-
+	local myarch="$(tc-arch)"
 	if [[ $myarch = amd64 ]] ; then
 		myconf+=" -Dtarget_arch=x64"
 	elif [[ $myarch = x86 ]] ; then