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

[Michał Górny]

commit:     0e071b3d533ce1bba96e0371931b1426e6d9993f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 17:42:44 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 21:41:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e071b3d

sys-apps/baselayout: Fix handling transitional lib32 symlink

 sys-apps/baselayout/baselayout-2.4.1-r2.ebuild | 2 +-
 sys-apps/baselayout/baselayout-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild 
b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index d137c15e527..bc82d2ddcdb 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -93,7 +93,7 @@ multilib_layout() {
                                case ${CHOST} in
                                *-gentoo-freebsd*) ;; # We want it the other 
way on fbsd.
                                i?86*|x86_64*|powerpc*|sparc*|s390*)
-                                       if [ -d "${prefix}lib32" ] ; then
+                                       if [[ -d ${prefix}lib32 && ! -h 
${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"

diff --git a/sys-apps/baselayout/baselayout-9999.ebuild 
b/sys-apps/baselayout/baselayout-9999.ebuild
index 7e43ea7af59..a7d95e53ed4 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -111,7 +111,7 @@ multilib_layout() {
                                case ${CHOST} in
                                *-gentoo-freebsd*) ;; # We want it the other 
way on fbsd.
                                i?86*|x86_64*|powerpc*|sparc*|s390*)
-                                       if [ -d "${prefix}lib32" ] ; then
+                                       if [[ -d ${prefix}lib32 && ! -h 
${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"