[gentoo-commits] proj/eselect-wine:master commit in: /

[Ionen Wolkens]

commit:     4f225953bf397136c27786c17f39255cb9a6b81d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 21:08:11 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 21:11:33 2022 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-wine.git/commit/?id=4f225953

wine.eselect: adjust legacy check for 17.0 lib32/lib64 profile

Should have hardly any users left, but no real harm in adding
more legacy handling in the legacy checks function.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 wine.eselect | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/wine.eselect b/wine.eselect
index 42c6bac..720c24d 100644
--- a/wine.eselect
+++ b/wine.eselect
@@ -336,10 +336,13 @@ wine-legacy_checks() {
                return 1
        fi
 
-       if [[ -d ${WINEREL}/usr/lib64/${slot} ]]; then
+       # older wine ebuilds split between lib{,32} and lib64, this is 
unsupported
+       if [[ -d ${WINEREL}/usr/lib64/${slot} ]] &&
+               [[ ! -L ${WINEREL}/usr/lib || -d ${WINEREL}/usr/lib32/${slot} ]]
+       then
                write_warning_msg "ignored legacy installation at 
${EROOT}/usr/lib64/${slot}"
                [[ -e ${WINEREL}/usr/bin/${slot} ]] &&
-                       write_warning_msg "should still be usable by calling 
versioned ${EROOT}/usr/bin/${slot}"
+                       write_warning_msg "-> should still be usable by calling 
the versioned ${EROOT}/usr/bin/${slot}"
                return 1
        fi
 }