From: Michał Górny <mgorny@gentoo.org>
Date: Sat, 3 Sep 2016 10:45:25 +0000 (+0200)
Subject: sys-apps/baselayout: Do not complain about lib+lib32 when it is valid
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ac6071c931acd281eddd9bae478386df7a1bfc3;p=gentoo.git

sys-apps/baselayout: Do not complain about lib+lib32 when it is valid

Remove the error on 'lib' directory with SYMLINK_LIB=no multilib layout
if lib32 is a valid directory as well. This fixes the wrong assert
in the new no-lib-symlink profile while preserving the check on regular
lib+lib64 profile.
---

diff --git a/sys-apps/baselayout/baselayout-2.3.ebuild b/sys-apps/baselayout/baselayout-2.3.ebuild
index b4e82d224cdd..d3d135162a91 100644
--- a/sys-apps/baselayout/baselayout-2.3.ebuild
+++ b/sys-apps/baselayout/baselayout-2.3.ebuild
@@ -87,7 +87,7 @@ multilib_layout() {
 				else
 					mkdir -p "${prefix}lib" || die
 				fi
-			elif [ -d "${prefix}lib" ] ; then
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
 				# make sure the old "lib" ABI location does not exist; we
 				# only symlinked the lib dir on systems where we moved it
 				# to "lib32" ...