From 4c014c10a58155bc324d0e051a25de5d97aeb862 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Fri, 14 Feb 2025 01:16:59 -0500 Subject: [PATCH] app-emulation/wine-vanilla: update live Real "wine64" only existed with USE="abi_x86_64 -wow64" but this now has a new loader only installed as "wine" regardless of USE. Many scripts still try to call wine64 though, will likely keep the symlink for a while. wine-preloader and wine64-preloader are also both gone, but not aware of anything using these. wrt the man pages bit for that block, seem they get installed properly even if USE"abi_x86_64 -abi_x86_32" now likely thanks to the same change. Signed-off-by: Ionen Wolkens --- .../wine-vanilla/wine-vanilla-9999.ebuild | 26 +++---------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index d653eed512f51..a3201550680ae 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -364,28 +364,8 @@ src_install() { use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last - # Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64, - # -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where - # one or the other could be missing and that is unexpected for users - # and some tools like winetricks) - if use abi_x86_64; then - if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then - dosym wine64 ${WINE_PREFIX}/bin/wine - dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader - - # also install wine(1) man pages (incl. translations) - local man - for man in ../build64/loader/wine.*man; do - : "${man##*/wine}" - : "${_%.*}" - insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1 - newins ${man} wine.1 - done - elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then - dosym wine ${WINE_PREFIX}/bin/wine64 - dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader - fi - fi + # "wine64" is no longer provided, but a keep symlink for old scripts + use abi_x86_64 && dosym wine ${WINE_PREFIX}/bin/wine64 use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \ "${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die