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 b4e82d224cdd283c8a53ac68362a4c5e128ce44f..d3d135162a91ac4db168f2e56311b4c6b2bbdc7a 100644 (file)
--- 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" ...