Apply arch detection logic from bug #296917 by ferret

<ferret@explodingferret.com>
Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 2efa7b48c91dfd219bf25965ff4139c573a580aa..d561a1caf921a7fee61310bdc4ee144776037973 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # 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.80 2010/04/09 17:29:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.81 2010/04/11 15:26:29 phajdan.jr Exp $
+
+  11 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-5.0.371.0.ebuild, chromium-9999.ebuild:
+  Apply arch detection logic from bug #296917 by ferret
+  <ferret@explodingferret.com>
 
   09 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-5.0.371.0.ebuild, chromium-9999.ebuild:

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 1f8f630e1fe13a85359099ba7e3f2e4b862d8391..81c537bb9fc094be9780fe8d7b8b3e5699806136 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -14,8 +14,7 @@ EBUILD chromium-5.0.342.7.ebuild 6565 RMD160 c36ab88fb6211e01358dbda562d54350be8
 EBUILD chromium-5.0.342.9.ebuild 6565 RMD160 7e4d556a9820abcdd46e0240d9116836b321bdcb SHA1 5e56e82d276b58298e76e015974aa2f888698c52 SHA256 7faab279b35573483cafc4ada425535f3f1552f53d3db20f306b9179e2a02b2e
 EBUILD chromium-5.0.360.5.ebuild 6565 RMD160 8bf565d0bacae19cd0e6ea407c81a888bc6f9aa5 SHA1 44484d9d2aba8f51a63a2f824b79fb2b9b83047f SHA256 646737d054efb4bf8793341c562afbf2181fc9a03d4d8ce34b2a3f65ddbb9e77
 EBUILD chromium-5.0.366.2.ebuild 6534 RMD160 8bc649c153aeed1df97e6a814e336e97654d837f SHA1 11b9f35fc7f7dedbbb9673ed9717d1954dcb6397 SHA256 ecabef1f0c9c8cad45349caa9734b7b0fa96285c177c3f19772a63be9ddbebaf
-EBUILD chromium-5.0.371.0.ebuild 6330 RMD160 b82dd319c37e1a3a96edf413b608c43cd34c4410 SHA1 84ade81b43dafe34933a0c15abf6aff838ccb9a7 SHA256 f10fa43f6829f52bf8284572fe1e22a4482f67177dbaf614e7c5d7d4ef34e27d
-EBUILD chromium-9999.ebuild 8083 RMD160 893a2ed1b45b0e9d43adbb2440d2a85bd6914525 SHA1 4bf0ad46e5ead90c6eaa97c56c421690f9047a60 SHA256 11b4f6cf83c3784ad6ab3bd71f675fe816c8959f923b2c7d069b27a8cab5fea3
-MISC ChangeLog 18397 RMD160 e282ddb460d593860059113f7f92fc7a6e768383 SHA1 6b2c3549a39b432916175f9d084440a89adb1cc2 SHA256 54e15a14e2dea549123201db21ad2f2cd6faf5d51cbe6b546d32e1b45357e8ac
-MISC chromium-9999.ebuild.orig 8287 RMD160 d1d186c7a1207a35665ffc6317e0990c75b75831 SHA1 cd8097e1c9a6b8f9b7928149a9c2b26b98187cb7 SHA256 8a70d5ebe1d3dd864ad7963e5c27f1a8242e3231a11887e99ee3e02d69837596
+EBUILD chromium-5.0.371.0.ebuild 6536 RMD160 256737feea89c3add8d1a15502251c6e68b9c745 SHA1 f903a5d485668f907a40631fdaaef2dcbeeb0d18 SHA256 b058279f439ecce78e02452dffa260253baf71d57b31325400bda0b68b4c8123
+EBUILD chromium-9999.ebuild 8289 RMD160 d1dd70d16b008b8ac7ca81f6b54ef0f3b86e15a6 SHA1 24666eae3feb6133e98dfd9575e7821f152fadcd SHA256 872794d2819ad0161429a7a463481b072ed96700ce3df6be6403476d7bbc3321
+MISC ChangeLog 18591 RMD160 0987d1c6156d5a23e318b2d8cedc9590896fe8f8 SHA1 a50419b4bddd43516a6ea58ea38419a2f1b01953 SHA256 637968c2925d61624f1e4f7e2750a81635c9b2e6bc427f05b5f3057b29eba690
 MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c

diff --git a/www-client/chromium/chromium-5.0.371.0.ebuild b/www-client/chromium/chromium-5.0.371.0.ebuild
index 85bd541d800e41df582d3e1dd4e4bf9917174b3f..35796352a05549349335d3697802e9f698446433 100644 (file)
--- a/www-client/chromium/chromium-5.0.371.0.ebuild
+++ b/www-client/chromium/chromium-5.0.371.0.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-5.0.371.0.ebuild,v 1.2 2010/04/09 17:29:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.371.0.ebuild,v 1.3 2010/04/11 15:26:29 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -127,16 +127,18 @@ EOF
        # Sandbox paths
        myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
-       if use amd64 ; then
-               myconf="${myconf} -Dtarget_arch=x64"
-       fi
+       # Use target arch detection logic from bug #296917.
+       local myarch="$ABI"
+       [[ $myarch = "" ]] && myarch="$ARCH"
 
-       if use x86 ; then
+       if [[ $myarch = amd64 ]] ; then
+               myconf="${myconf} -Dtarget_arch=x64"
+       elif [[ $myarch = x86 ]] ; then
                myconf="${myconf} -Dtarget_arch=ia32"
-       fi
-
-       if use arm; then
+       elif [[ $myarch = arm ]] ; then
                myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
+       else
+               die "Failed to determine target arch, got '$myarch'."
        fi
 
        if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then

diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index e50bf27054d497c32099d1f9d4067c1b2222ae92..098dc199e9a7f6c8c4d80ac3fafd655c192650ee 100644 (file)
--- 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.39 2010/04/09 17:29:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.40 2010/04/11 15:26:29 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
@@ -171,16 +171,18 @@ EOF
        # Sandbox paths
        myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
-       if use amd64 ; then
-               myconf="${myconf} -Dtarget_arch=x64"
-       fi
+       # Use target arch detection logic from bug #296917.
+       local myarch="$ABI"
+       [[ $myarch = "" ]] && myarch="$ARCH"
 
-       if use x86 ; then
+       if [[ $myarch = amd64 ]] ; then
+               myconf="${myconf} -Dtarget_arch=x64"
+       elif [[ $myarch = x86 ]] ; then
                myconf="${myconf} -Dtarget_arch=ia32"
-       fi
-
-       if use arm; then
+       elif [[ $myarch = arm ]] ; then
                myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
+       else
+               die "Failed to determine target arch, got '$myarch'."
        fi
 
        if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then