[gentoo-dev] [PATCH 3/4] sys-apps/baselayout: Do not complain about lib+lib32 when it is valid

[Michał Górny]

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.
---
 sys-apps/baselayout/baselayout-2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/baselayout/baselayout-2.2-r1.ebuild b/sys-apps/baselayout/baselayout-2.2-r1.ebuild
index a9e1a65..3c3aa95 100644
--- a/sys-apps/baselayout/baselayout-2.2-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.2-r1.ebuild
@@ -99,7 +99,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" ...
-- 
2.9.0