sys-apps/baselayout: Fix handling transitional lib32 symlink

diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index d137c15e5274c595565e0878c2f750f5d052739c..bc82d2ddcdb2744dcc39be231816cd9525992daf 100644 (file)
--- 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 7e43ea7af598da196fa37e31637316592c65ba0e..a7d95e53ed436b28231105014e42821163a929ce 100644 (file)
--- 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"