[gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/

[Michał Górny]

commit:     5ac6071c931acd281eddd9bae478386df7a1bfc3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  3 10:45:25 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep  3 11:05:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac6071c

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.

 sys-apps/baselayout/baselayout-2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/baselayout/baselayout-2.3.ebuild 
b/sys-apps/baselayout/baselayout-2.3.ebuild
index b4e82d2..d3d1351 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" ...