diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2017-12-10 18:42:44 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2017-12-10 22:41:21 +0100 |
| commit | 0e071b3d533ce1bba96e0371931b1426e6d9993f (patch) | |
| tree | 25da5d2b32e5c5f500dd31a34888ee088c6d5f6d | |
| parent | games-rpg/vendetta-online-bin: Update Manifest hashes (diff) | |
| download | gentoo-0e071b3d533ce1bba96e0371931b1426e6d9993f.tar.gz gentoo-0e071b3d533ce1bba96e0371931b1426e6d9993f.tar.bz2 gentoo-0e071b3d533ce1bba96e0371931b1426e6d9993f.zip | |
sys-apps/baselayout: Fix handling transitional lib32 symlink
| -rw-r--r-- | sys-apps/baselayout/baselayout-2.4.1-r2.ebuild | 2 | ||||
| -rw-r--r-- | 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 d137c15e5274..bc82d2ddcdb2 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 7e43ea7af598..a7d95e53ed43 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" |