gentoo auto-resync : 16:02:2025 - 00:13:18

5 files changed, 11 insertions, 25 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index d659d8b2ea08..981adb9ecba2 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 74cf1390c0b7..b328b1a6edea 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -11,5 +11,5 @@ DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 0012978f54c618e73d407dd49dccff02853
 EBUILD wine-staging-10.0.ebuild 15622 BLAKE2B c5b6dfd62b9349b62d321c0387e6865a1f57d1aa3618160778988e7bae088ec7150d7159187e2d6c9b6f0975f0adc7a338bb499443a6ba5c4c957dd05e3cc2d3 SHA512 ae7aaac96d218a2e14b7d2cad6c67a4687a4326c24f494ec1b819916b6e4a06f51122bc2dd225e8b9a8df45ee2b8185b954c2a04750fa6e658e21bd3058d5fcb
 EBUILD wine-staging-10.1.ebuild 15622 BLAKE2B c5b6dfd62b9349b62d321c0387e6865a1f57d1aa3618160778988e7bae088ec7150d7159187e2d6c9b6f0975f0adc7a338bb499443a6ba5c4c957dd05e3cc2d3 SHA512 ae7aaac96d218a2e14b7d2cad6c67a4687a4326c24f494ec1b819916b6e4a06f51122bc2dd225e8b9a8df45ee2b8185b954c2a04750fa6e658e21bd3058d5fcb
 EBUILD wine-staging-9.0.ebuild 15827 BLAKE2B c5943aca5853c48e7738344a4dd3e527af8f9b17f38a4062e16009c51ccbf6b351f4ccee1b9fe06c7a606f7255c0293ee7f8090a6d3e11ca288ef7f41cbfc260 SHA512 e0f743a8d86e93e166f45148780e52c9582fdfd94a93a685c95694469a83c7333129efcc4fd63e9942a41111a6ff5015ca50158c76160494be91829671f4c58f
-EBUILD wine-staging-9999.ebuild 15577 BLAKE2B 89236ab018b719162dcd15ce17e8130983b223596f3a434444cea02716ecce181f059606d90e3344e0aa14dc99582ae45989f9a685a527639dc1ce700ea3c02a SHA512 57ec46c07d740785b9f3322f1efa94fa3b0ec653d4366ad037103433fd58f4d8d6c733adf2bcc990e9f88e532e998dc2d92547800c59585bf7dedc62e0ad8b30
+EBUILD wine-staging-9999.ebuild 14927 BLAKE2B 206cc77280c4c086bdd24c9753a0ac17e94b789e30f813367e6757290d87b1258b35c91200a10072a3202cdb0d460d816cf62ec7597c1d27cc582476c055d037 SHA512 185ece52b99d56c29e309434404d733bfc0158b6009954feb105cc64afb53b727891aaf675f72a9a1c053b96a1df2ab1e93eda06cdce7812b24f7d787fc31cf6
 MISC metadata.xml 2718 BLAKE2B 6848ef9723706ba3437fe18dbacf798cc2f266545c9241ceb9b5e83600bd1e82e80e9bc1d963f7a62e3b974af90d6e330305aaa77b9d578e20201ba1172fd775 SHA512 c89ca2bce23e50982f5cf846d58fe9f962da0eb8e13d7065fbba5e07afa072a9df000accf1fdb3829225b1fe3434d706be55749aa6b7d34e1f28ac91f82fa436
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 079299786741..a759ced54cf4 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-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
@@ -401,27 +401,10 @@ 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
+	# "wine64" is no longer provided, but a keep symlink for old scripts
+	# TODO: remove the guard later, only useful for bisecting -9999
+	if [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 ]]; then
+		use abi_x86_64 && dosym wine ${WINE_PREFIX}/bin/wine64
 	fi
 
 	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index c79baee704d0..f7051ccf384b 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -10,5 +10,5 @@ EBUILD wine-vanilla-10.0.ebuild 14538 BLAKE2B 1abaa69f1bacf4834d7b7def542b67bc7a
 EBUILD wine-vanilla-10.1.ebuild 14539 BLAKE2B 2a0bc0ff6f1937599d35f41db8b79f514e2a92e4887911f3cf55a975833dc65a8ac41f2be8dec34e5bd19a73cd65106bebd6103957dec7af355b366127e60111 SHA512 0a35a294a4c8c398baec956344278635d950c7db78a3b31e4e97e95877999b79d833fb1af386fbefbfaf8e7ce9310ab1167774fef87fc02d59689c63e8f52ff1
 EBUILD wine-vanilla-8.0.2.ebuild 13034 BLAKE2B 898ed541c3311528ba4a4055da4043833428b2732b06ab5f51f5d87872cc591179c1362dc37b4eab9d6fdd3f1678c7fb1750469cd45c84afb8422de57cfab4a1 SHA512 099c2443f3e6a28bd0cd49c6a81f720f9eaa51c6da0759ee2ba9a4aa204306a319493e581efccef2ca437cc16df80cd7a90427c93e3981d631c82f5268b6ec62
 EBUILD wine-vanilla-9.0.ebuild 14311 BLAKE2B d8f6afb2bf29b3d8e4ecd51265cd3427c1e1711d97d2c77f16f70ba808ddbaca910d8b6993d66b684dc264f05e409fb6c0b62b59225047180ba79aa09cbcc2bd SHA512 b01db0b4849d60181035270e80a9043f659ebf19543d9451a4c5ecdaa73f40bf9eaba514d3c0d59c90429d8da64aad662e1f9dd16d96ce9963dc613f6b675b18
-EBUILD wine-vanilla-9999.ebuild 13722 BLAKE2B 326c9d3f4e877afc9f066b1ddad018cc68ce39e46a76c74d107d2c59c560b2b1f38cd3968e0809272d80dae5ff02d2642c0fa5e5231186336ca6f1936b1091ca SHA512 a576a236d7ec3eb3eeabd32d0cbf6d4f0d0ddffce62c5191a5d076c194d136903410c8103d16afb1126f65e6ea23b75710e5f82a4c5eba3db47c654c2c0743b0
+EBUILD wine-vanilla-9999.ebuild 13844 BLAKE2B c4b316be226dea3967f79f761cd58702f2572b7433f392231972cece4084a68e77b277dd3452c43468b0ee0a77455dd5c6c1232e846cf3546a4a7452e4d9ec6e SHA512 2646b9e866bd530875079b695c4743e4fbba5318c2f7ddf41f7bb14da1799615afbf49b831a94076489b1d19b42d9f2649c56ef6130250ffcc822e17c7660237
 MISC metadata.xml 2694 BLAKE2B 01c000d837b123829986a3f60d8d70b7f3a294ed5b51a024f65c132daa7536237632c76113c866c250178bd44f833c2de6d3e4c77904dfa5ff7e8fb9a7dd332e SHA512 749d959889c8669c07e3f85c79780a08038b2547f4a9b343cb4f38bd79e62a36909723d405ce2f9c8c509720d7817bd2da21fd832b15ff63dd0bca04745319b6
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index a3201550680a..88708ce71147 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -365,7 +365,10 @@ src_install() {
 	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
 
 	# "wine64" is no longer provided, but a keep symlink for old scripts
-	use abi_x86_64 && dosym wine ${WINE_PREFIX}/bin/wine64
+	# TODO: remove the guard later, only useful for bisecting -9999
+	if [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 ]]; then
+		use abi_x86_64 && dosym wine ${WINE_PREFIX}/bin/wine64
+	fi
 
 	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
 		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die