From 4f225953bf397136c27786c17f39255cb9a6b81d Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Mon, 28 Nov 2022 16:08:11 -0500 Subject: 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 --- 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 } -- cgit v1.2.3-65-gdbad