| 1 |
commit: 4f225953bf397136c27786c17f39255cb9a6b81d |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 28 21:08:11 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 28 21:11:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/eselect-wine.git/commit/?id=4f225953 |
| 7 |
|
| 8 |
wine.eselect: adjust legacy check for 17.0 lib32/lib64 profile |
| 9 |
|
| 10 |
Should have hardly any users left, but no real harm in adding |
| 11 |
more legacy handling in the legacy checks function. |
| 12 |
|
| 13 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 14 |
|
| 15 |
wine.eselect | 7 +++++-- |
| 16 |
1 file changed, 5 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/wine.eselect b/wine.eselect |
| 19 |
index 42c6bac..720c24d 100644 |
| 20 |
--- a/wine.eselect |
| 21 |
+++ b/wine.eselect |
| 22 |
@@ -336,10 +336,13 @@ wine-legacy_checks() { |
| 23 |
return 1 |
| 24 |
fi |
| 25 |
|
| 26 |
- if [[ -d ${WINEREL}/usr/lib64/${slot} ]]; then |
| 27 |
+ # older wine ebuilds split between lib{,32} and lib64, this is unsupported |
| 28 |
+ if [[ -d ${WINEREL}/usr/lib64/${slot} ]] && |
| 29 |
+ [[ ! -L ${WINEREL}/usr/lib || -d ${WINEREL}/usr/lib32/${slot} ]] |
| 30 |
+ then |
| 31 |
write_warning_msg "ignored legacy installation at ${EROOT}/usr/lib64/${slot}" |
| 32 |
[[ -e ${WINEREL}/usr/bin/${slot} ]] && |
| 33 |
- write_warning_msg "should still be usable by calling versioned ${EROOT}/usr/bin/${slot}" |
| 34 |
+ write_warning_msg "-> should still be usable by calling the versioned ${EROOT}/usr/bin/${slot}" |
| 35 |
return 1 |
| 36 |
fi |
| 37 |
} |
Archives