multilib cleanups, thanks to ferret <ferret@explodingferret.com> in bug #296917

Package-Manager: portage-2.2_rc59/cvs/Linux x86_64

4 files changed, 31 insertions, 14 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 53c204325135..d8f592813583 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.30 2009/12/08 12:14:48 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.31 2009/12/15 14:05:25 voyageur Exp $
+
+  15 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  chromium-4.0.266.0.ebuild, chromium-9999.ebuild:
+  multilib cleanups, thanks to ferret <ferret@explodingferret.com> in bug
+  #296917
 
 *chromium-4.0.266.0 (08 Dec 2009)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ecd6dc4186af..c9bba24a037e 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,7 +7,7 @@ DIST chromium-4.0.260.0.tar.bz2 134032408 RMD160 6b390458306572f473b4858c8a06fb9
 DIST chromium-4.0.266.0.tar.bz2 133383431 RMD160 ac2d6c2bdb12cae603c644c63f1b63ed82251994 SHA1 65a8e7496f26b6c1bf663199d77fe238418f8250 SHA256 df0bce0541041c6d22ff177b4ea9cfbeee0c18d0805f1d371e6442688f42577f
 EBUILD chromium-4.0.251.0.ebuild 4236 RMD160 c5997b5fc9fc2b394469c3d0ca6fe954659b0da6 SHA1 6ee4a87e064368631767f2d8c89230d5dd692473 SHA256 63ff133a9bfcca4ca37885a6ed3f1f536df246c143311f675af1bcecfeae73d1
 EBUILD chromium-4.0.260.0.ebuild 4223 RMD160 1b0767f025db21877cab4d7638e01e010ad92b03 SHA1 af22b3ef16f4e18bc05ae7cf335d99210a6b5510 SHA256 a5824b574bf8a7701f77f65a62a6a9d133786c38b9ee3fb86bec7fc0df766e14
-EBUILD chromium-4.0.266.0.ebuild 4223 RMD160 e8a790819f6129e8e2e8cc771874ce94069ae371 SHA1 d709d5bf820628a3cc9130da6a552e78f38f0ecd SHA256 eb9e62e4c9a3dd48214d08b5e842e27236183a8b40a2908af329b5bc10d3c508
-EBUILD chromium-9999.ebuild 5961 RMD160 91e5385324554740eb332fb4758012c11614a679 SHA1 b5c33ca819b41b090280bd7ffd63d785b3e6898a SHA256 d9c6f6658f9832ea91f1c59a33cd2b90c19a3c2fee7676ad21224642b310a0f2
-MISC ChangeLog 6872 RMD160 a45f9a16f0e44db17b45277b7cce8d3c71e8d3f8 SHA1 d4bcb8ec0f1ca0795df8a951ea058abcba3d53a5 SHA256 b8f803a59032789a324a79c5b3422649cb1e753f2656f2aaa6dd4ddeea21cbf3
+EBUILD chromium-4.0.266.0.ebuild 4376 RMD160 7de719bb5e4f830d3044dc321fce6d4486b12e8e SHA1 75d069559d6717a3fa5addb72547a8673bda3fc7 SHA256 e1f2eaa7372511e8740bcb83345926e2d0a124f86a964f8e3d656d85ca4ff540
+EBUILD chromium-9999.ebuild 6094 RMD160 94182a4f0e36971c39346f13465b5465714a3886 SHA1 5137b75c6d6961bd8ffd0c0057628a718bf74a55 SHA256 e480017288e55e3f748ac9e9358187767c3d13a8e8230e8fa6bdc5d05bffa54d
+MISC ChangeLog 7063 RMD160 ba9d1d4b2b0123fc7fe84e0776be48935d31d19c SHA1 78779da9e74fb40097058bbf43b1dcdb673f8260 SHA256 fa2665c1176b380bd6eb15abdbb535ece0204d78b8f9c791eab1e2944b80848c
 MISC metadata.xml 482 RMD160 f426cbc83d5b780c7fbb40bbda4dd332d95a8835 SHA1 56486139b7d1bb63d31cb146672fa88405387969 SHA256 b32aa557e06fec6a5e2b838ced4bb8e7504369d8dbb78a1b87f1c385b646e552
diff --git a/www-client/chromium/chromium-4.0.266.0.ebuild b/www-client/chromium/chromium-4.0.266.0.ebuild
index 2f9d5ab275ee..1a2b9c3bbe0a 100644
--- a/www-client/chromium/chromium-4.0.266.0.ebuild
+++ b/www-client/chromium/chromium-4.0.266.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.266.0.ebuild,v 1.1 2009/12/08 12:14:48 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.266.0.ebuild,v 1.2 2009/12/15 14:05:25 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -34,8 +34,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.3
 	>=dev-util/pkgconfig-0.23"
 
-export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
 src_prepare() {
 	# Gentoo uses .kde4, not .kde
 	sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
@@ -54,6 +52,8 @@ src_prepare() {
 }
 
 src_configure() {
+	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+
 	# CFLAGS/LDFLAGS
 	mkdir -p "${S}"/.gyp
 	cat << EOF > "${S}"/.gyp/include.gypi
@@ -74,9 +74,14 @@ EOF
 	# Sandbox paths
 	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
-	if use amd64; then
+	if [[ "$ABI" == "amd64" ]] ; then
 		myconf="${myconf} -Dtarget_arch=x64"
 	fi
+
+	if [[ "$ABI" == "x86" ]] ; then
+		myconf="${myconf} -Dtarget_arch=ia32"
+	fi
+
 	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
 		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
 	fi
@@ -96,6 +101,7 @@ src_compile() {
 
 src_install() {
 	# Chromium does not have "install" target in the build system.
+	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
 
 	dodir ${CHROMIUM_HOME}
 
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 692a26d32b49..2ce7d0423d7e 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.11 2009/12/02 17:14:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.12 2009/12/15 14:05:25 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs subversion
@@ -35,8 +35,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.3
 	>=dev-util/pkgconfig-0.23"
 
-export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
 src_unpack() {
 	subversion_src_unpack
 	mv "${S}" "${WORKDIR}"/depot_tools
@@ -98,6 +96,8 @@ src_prepare() {
 }
 
 src_configure() {
+	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+
 	# CFLAGS/LDFLAGS
 	mkdir -p "${S}"/.gyp
 	cat << EOF > "${S}"/.gyp/include.gypi
@@ -118,9 +118,14 @@ EOF
 	# Sandbox paths
 	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
-	if use amd64; then
+	if [[ "$ABI" == "amd64" ]] ; then
 		myconf="${myconf} -Dtarget_arch=x64"
 	fi
+
+	if [[ "$ABI" == "x86" ]] ; then
+		myconf="${myconf} -Dtarget_arch=ia32"
+	fi
+
 	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
 		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
 	fi
@@ -140,6 +145,7 @@ src_compile() {
 
 src_install() {
 	# Chromium does not have "install" target in the build system.
+	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
 
 	dodir ${CHROMIUM_HOME}
 
@@ -157,8 +163,8 @@ src_install() {
 	doins -r out/Release/resources
 
 	# chrome.1 is for chromium --help
-	newman out/Release/chromium-browser.1 chrome.1
-	newman out/Release/chromium-browser.1 chromium.1
+	newman out/Release/chrome.1 chrome.1
+	newman out/Release/chrome.1 chromium.1
 
 	if use ffmpeg; then
 		# Chromium looks for these in its folder