From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 11 Oct 2011 21:06:57 +0000 (+0000)
Subject: Make sure we apply the lib32 de-hack to only the arches where said hack was put into... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f85547c882eed2b34274f46fb6f7c3924ebdb221;p=gentoo.git

Make sure we apply the lib32 de-hack to only the arches where said hack was put into place #386821 by Jim Faulkner.

Package-Manager: portage-2.2.0_alpha65/cvs/Linux x86_64
---

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index a7fc64374eb5..57bd8d62b0de 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.514 2011/10/09 16:34:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.515 2011/10/11 21:06:57 vapier Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  11 Oct 2011; Mike Frysinger <vapier@gentoo.org> baselayout-2.1.ebuild:
+  Make sure we apply the lib32 de-hack to only the arches where said hack was
+  put into place #386821 by Jim Faulkner.
+
   09 Oct 2011; Mike Frysinger <vapier@gentoo.org> baselayout-2.1.ebuild:
   Add sanity check for $DEFAULT_ABI #385993 by Christian Samsel.
 
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 26e6dacc116e..7038853269cb 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST baselayout-2.0.3.tar.bz2 39969 RMD160 ca4ae235382780cd386c89f0147fbe17bb599414 SHA1 c5dbcc2d131254b2bb14b782101e2318d1dfcd2d SHA256 879308781d845f467eb2b45b9ff006aa799e943f45ddba518f43acae1ec84bdd
 DIST baselayout-2.1.tar.bz2 40398 RMD160 bba874c5d3290848236703125c130107c1244f55 SHA1 84783a773ec050700b3b0ce4c7645ae878f7f7fb SHA256 2ac6f2156513a2820a0eeeecc2cf7e7c0b5e0c750b324f1e21912d5f3cda4956
 EBUILD baselayout-2.0.3.ebuild 7366 RMD160 579ac15844268e72cd9e1f593501e9a5806f4043 SHA1 3dcb7064e613d063fbe2428f7e3f57d92a2d9219 SHA256 e72e760fbc2452212fee89e5f4c00437b11d7973b5c27933c58481e9a656f5a4
-EBUILD baselayout-2.1.ebuild 7550 RMD160 0458a515d3c0ac9b974592418a621b8935c8d44b SHA1 fcbbd9b360cf38d05a364c9438280d21b2c39eb2 SHA256 bbc878a0c76101c962b4f88dd3d2c340a70cddbf36b4f3de9ee761bba4ef2212
-MISC ChangeLog 107767 RMD160 69c3df4f9e534d684bcf72db29ac75bacd380b0e SHA1 126bf125fac61f8dbcbe1f24c3ae8053647696df SHA256 c10bafefc3e649cdfa1dc37af2c083c795a160ab5900a806fe17cd0a0f9a81d3
+EBUILD baselayout-2.1.ebuild 7636 RMD160 585df9b4cec0f80c055fdb9ef9c9ee2fd98aa766 SHA1 9caec4caefc2cef827b82e44cec89461cfa760c9 SHA256 2bfa82915b55808d0cdadbbdd8bd89cf8b48863cf68c08827f8bad3d756c20eb
+MISC ChangeLog 107961 RMD160 e9b9fb830b36388b0dd48eeb88fb181a19563e88 SHA1 8e2bea7cf34c70e7d60179a1fd46fbf753c8189c SHA256 6e4b5f87906a7cfad3c74892129862f16ef02f5227c80c2baf4790c44072abaf
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6RzSUACgkQaC/OocHi7JavcwD/TMULjO8pICHOGGCOCHvMF001
-oOs0paHQCoRwuOnc87MBAIHJFFtUBt0m8zXJbqY5jH/EMOtUnVsr94BFfsL4UMqx
-=g7oI
+iF4EAREIAAYFAk6Ur/gACgkQaC/OocHi7JaqpAD/VZAE3SH+Z7VK/JCfvMWPdyyg
+3zF0DPx+e4/B1I+nEMcA/27PMEUO7/Kv5jnHPIWy0zgxVEl4qVFAZ3VVnw+JMs1Q
+=cLXc
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout/baselayout-2.1.ebuild b/sys-apps/baselayout/baselayout-2.1.ebuild
index f84919f392a0..bf1c865a7785 100644
--- a/sys-apps/baselayout/baselayout-2.1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.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/sys-apps/baselayout/baselayout-2.1.ebuild,v 1.3 2011/10/09 16:34:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild,v 1.4 2011/10/11 21:06:57 vapier Exp $
 
 inherit eutils multilib
 
@@ -102,13 +102,17 @@ multilib_layout() {
 				# make sure the old "lib" ABI location does not exist; we
 				# only symlinked the lib dir on systems where we moved it
 				# to "lib32" ...
-				if [ -d "${prefix}lib32" ] ; then
-					rm -f "${prefix}lib32"/.keep
-					if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-						ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-						die "non-empty dir found where there should be none: ${prefix}lib32"
+				case ${CHOST} in
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [ -d "${prefix}lib32" ] ; then
+						rm -f "${prefix}lib32"/.keep
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
 					fi
-				fi
+					;;
+				esac
 			else
 				# nothing exists, so just set it up sanely
 				ewarn "Initializing ${prefix}lib as a dir"