gentoo auto-resync : 15:08:2023 - 00:14:05

15 files changed, 160 insertions, 124 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 335eb645ea50..60b87814897c 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 539d27a32681..94612ce231be 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -9,9 +9,9 @@ DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B c9540195ea885d9f1e980232b0af471e92c
 DIST wine-staging-8.11.tar.gz 9715880 BLAKE2B 2795389381d6e52215d8b1b2c437a47beaf61e9b36e78f99c45b3fcd79d554f2d4abafcbf34c366dcb7ce4fc14d66b8751466c30648ae0d7c451aaa345c30c5f SHA512 fb7a5f575c092e84afa78868e3b15fa33d67205a5e20deae61a60613714df784b18d54cd32167355ae38543f047f4304bfbc7f2ba2b3f6050c9f738812a15154
 DIST wine-staging-8.12.tar.gz 9764049 BLAKE2B 739c6dfdcef6e744fc7f6dcee24abdedd5f96b7ad688bdd5cc667627cec0b21d658354369ecc0de71a4ba682636e369105cef3de97dbf095f1ee1025d9a12fc2 SHA512 11364b2367e25706b98c168710288b796e9dea1e3400efc0d010ea8827cb8c4187385f53aebd1fda46611902f6619282ea97ce9d7c20fe18aa48c14f15c99d14
 DIST wine-staging-8.13.tar.gz 9785058 BLAKE2B 6c797cd50276009cc23619447a70ac972b5c7ad7684d7bd99f20cd7607b88f911eb89f59df98680ef8786495f2f8ff2910c8bbd930d811bb31147aa230105ce1 SHA512 b2104b0893ba27ee7f4f5495f7dee990962ff668786fd95e11af6d3975b7d00bc4ecb2572f280d27fbb6d1672745e0acbdb392ec7b3fd5b330a846783c23e12d
-EBUILD wine-staging-8.0.ebuild 12351 BLAKE2B 301039a50244470b6cb2bc914cee200d7664a6dc0a011f448f90f56da1097b173c2ba1e948055bb2c6eb9cd6da9e258a3c2cc65403498254107bac31597bcf3c SHA512 ee1f956efb7894aa24573aa485c9241482f5d7d5084b8dc72dadb05a0fb593565eda08a37ea88f57d87e241a55614ade93866bd5660e88499ecdaec3553f2168
-EBUILD wine-staging-8.11-r1.ebuild 12663 BLAKE2B 1bc790fbbcb569d9b6d770ffda0df85ab1b3f0dd019943fe959487fb273793c1a354683cd28bcea10b8636ca98156c80e0b46375e8bce14002344410558cc18f SHA512 01c8cd707c98ef4b8b9b96d7acf552ee1c5ac67958b2211775c09ee5ec9b8d89ec6779257af02882a79a401703734187a45f6cfac10e46be787a8461a1155b0b
-EBUILD wine-staging-8.12.ebuild 12663 BLAKE2B 1bc790fbbcb569d9b6d770ffda0df85ab1b3f0dd019943fe959487fb273793c1a354683cd28bcea10b8636ca98156c80e0b46375e8bce14002344410558cc18f SHA512 01c8cd707c98ef4b8b9b96d7acf552ee1c5ac67958b2211775c09ee5ec9b8d89ec6779257af02882a79a401703734187a45f6cfac10e46be787a8461a1155b0b
-EBUILD wine-staging-8.13.ebuild 13802 BLAKE2B a8c6c806e6124c561e2ee4e5f238bed454159c82a5c37a4e63f86aeaf72a4513860b21a97dc01d812391119a4395178701427496f1c670bc05db72a3e201a61c SHA512 b90c0a01c572c23743e6dd3bd161f4fd78c51a3569f8764244f809a9379fcd7ad4c56359f53fdfb3b00c0db03ca165ad2c9fc09600795802acff62e51ba54aa9
-EBUILD wine-staging-9999.ebuild 13802 BLAKE2B a8c6c806e6124c561e2ee4e5f238bed454159c82a5c37a4e63f86aeaf72a4513860b21a97dc01d812391119a4395178701427496f1c670bc05db72a3e201a61c SHA512 b90c0a01c572c23743e6dd3bd161f4fd78c51a3569f8764244f809a9379fcd7ad4c56359f53fdfb3b00c0db03ca165ad2c9fc09600795802acff62e51ba54aa9
+EBUILD wine-staging-8.0.ebuild 12328 BLAKE2B ba753d4c927608d8bb1b9c0ea14c023932c7e8c59f74708c13fcdb61b98e635b0e24a7ec1d0460691e7aca8d18dd2a4d6f9f2c859bf0f99101ddadf694d7d719 SHA512 558d73a19731963eb582225700ccd9734e0e58e8b0b0c16ddd80296a3937cdb1b9ca5e33f72ea2c9a80338507f25005a0da0977db61c8772fd762bccb953ec79
+EBUILD wine-staging-8.11-r1.ebuild 12640 BLAKE2B a51e8efdf50e6f0c4d9dfa35a616cbb1271584432d1eb63ec154570963188ea45f54d2015b9be200085d446bd41c6efc22b28fbf582341847407ad44a1b7f97b SHA512 8e18b6086b3e2ef193884685a1717e3f38d5b3f083b25f54950ff403f959378ff483d413ee51733775d81bdc7fca5e9b650dbab0bf4efed424390807b9ad90ad
+EBUILD wine-staging-8.12.ebuild 12640 BLAKE2B a51e8efdf50e6f0c4d9dfa35a616cbb1271584432d1eb63ec154570963188ea45f54d2015b9be200085d446bd41c6efc22b28fbf582341847407ad44a1b7f97b SHA512 8e18b6086b3e2ef193884685a1717e3f38d5b3f083b25f54950ff403f959378ff483d413ee51733775d81bdc7fca5e9b650dbab0bf4efed424390807b9ad90ad
+EBUILD wine-staging-8.13.ebuild 14319 BLAKE2B 9a1c79d356adf5f8998f1148f7e9838f95eb36528a92a22c661d6093b89eb596fdf1ad652c828d310813a5902bfaf2cdae198ad54a7abe6a8c4903aa0cfe9585 SHA512 aad1b63d33d7ae69dacbdc910e4ce3bf3a6f2a00a9ee56b9a7ef8033310005db66a18895bed91b6629662fb02e79f313c22e0b8ca01c6c485609a07c79b9474c
+EBUILD wine-staging-9999.ebuild 14319 BLAKE2B 9a1c79d356adf5f8998f1148f7e9838f95eb36528a92a22c661d6093b89eb596fdf1ad652c828d310813a5902bfaf2cdae198ad54a7abe6a8c4903aa0cfe9585 SHA512 aad1b63d33d7ae69dacbdc910e4ce3bf3a6f2a00a9ee56b9a7ef8033310005db66a18895bed91b6629662fb02e79f313c22e0b8ca01c6c485609a07c79b9474c
 MISC metadata.xml 2538 BLAKE2B cb657e04ad7f26b088f03f862a7e7ccbc4eb6592de17ec8022b5e4b306bd10f7daae7f6de113b142a9cf713a91cab9fbd0650cca4591adc13e4a77280f9812e3 SHA512 a87687fb1a0d2f639626f4a90e7fb78bd31926c53460af3cc80c93e9974f189b545c830278157893f5e48a54b20e5b49b2d1e996ccb5520a47f319b7048999a7
diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 913b48dd933e..66827fdc086d 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -204,12 +204,12 @@ src_prepare() {
 	if tc-is-clang; then
 		if use mingw; then
 			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# and it still gets used in install phase despite USE=mingw,
-			# drop as a quick fix for now which hopefully should be safe
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
 			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 		else
-			# known broken due to bug #912237, require mingw for now
-			die "building ${PN} with clang requires USE=mingw to be enabled"
+			# ./configure will fail, abort early
+			die "building ${PN} with clang is only supported with USE=mingw"
 		fi
 	fi
 
diff --git a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
index 099bf613a54c..67326eaf843f 100644
--- a/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
@@ -217,12 +217,12 @@ src_prepare() {
 	if tc-is-clang; then
 		if use mingw; then
 			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# and it still gets used in install phase despite USE=mingw,
-			# drop as a quick fix for now which hopefully should be safe
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
 			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 		else
-			# known broken due to bug #912237, require mingw for now
-			die "building ${PN} with clang requires USE=mingw to be enabled"
+			# ./configure will fail, abort early
+			die "building ${PN} with clang is only supported with USE=mingw"
 		fi
 	fi
 
diff --git a/app-emulation/wine-staging/wine-staging-8.12.ebuild b/app-emulation/wine-staging/wine-staging-8.12.ebuild
index 099bf613a54c..67326eaf843f 100644
--- a/app-emulation/wine-staging/wine-staging-8.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.12.ebuild
@@ -217,12 +217,12 @@ src_prepare() {
 	if tc-is-clang; then
 		if use mingw; then
 			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# and it still gets used in install phase despite USE=mingw,
-			# drop as a quick fix for now which hopefully should be safe
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
 			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 		else
-			# known broken due to bug #912237, require mingw for now
-			die "building ${PN} with clang requires USE=mingw to be enabled"
+			# ./configure will fail, abort early
+			die "building ${PN} with clang is only supported with USE=mingw"
 		fi
 	fi
 
diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index 9f7c5dfd6147..d93f2f74f1f5 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -230,12 +230,16 @@ src_prepare() {
 	if tc-is-clang; then
 		if use mingw; then
 			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# and it still gets used in install phase despite USE=mingw,
-			# drop as a quick fix for now which hopefully should be safe
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
 			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 		else
-			# known broken due to bug #912237, require mingw for now
-			die "building ${PN} with clang requires USE=mingw to be enabled"
+			# fails in ./configure unless --enable-archs is passed, allow to
+			# bypass with EXTRA_ECONF but is currently considered unsupported
+			# (by Gentoo) as additional work is needed for (proper) support
+			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
+			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
+				die "building ${PN} with clang is only supported with USE=mingw"
 		fi
 	fi
 
@@ -384,22 +388,27 @@ src_install() {
 	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
 	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
 
-	if use wow64; then
-		# compat symlinks, albeit ideally no one should call "wine64"
-		dosym wine ${WINE_PREFIX}/bin/wine64
-		dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-	elif use abi_x86_64 && use !abi_x86_32; then
-		# if no 32bit support it instead only installs "wine64" which may
-		# come as unexpected, so provide "wine" alongside its man page
-		dosym wine64 ${WINE_PREFIX}/bin/wine
-		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-		local man
-		for man in ../build64/loader/wine.*man; do
-			: "${man##*/wine}"
-			: "${_%.*}"
-			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-			newins ${man} wine.1
-		done
+	# 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
 
 	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 9f7c5dfd6147..d93f2f74f1f5 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -230,12 +230,16 @@ src_prepare() {
 	if tc-is-clang; then
 		if use mingw; then
 			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# and it still gets used in install phase despite USE=mingw,
-			# drop as a quick fix for now which hopefully should be safe
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
 			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 		else
-			# known broken due to bug #912237, require mingw for now
-			die "building ${PN} with clang requires USE=mingw to be enabled"
+			# fails in ./configure unless --enable-archs is passed, allow to
+			# bypass with EXTRA_ECONF but is currently considered unsupported
+			# (by Gentoo) as additional work is needed for (proper) support
+			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
+			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
+				die "building ${PN} with clang is only supported with USE=mingw"
 		fi
 	fi
 
@@ -384,22 +388,27 @@ src_install() {
 	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
 	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
 
-	if use wow64; then
-		# compat symlinks, albeit ideally no one should call "wine64"
-		dosym wine ${WINE_PREFIX}/bin/wine64
-		dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-	elif use abi_x86_64 && use !abi_x86_32; then
-		# if no 32bit support it instead only installs "wine64" which may
-		# come as unexpected, so provide "wine" alongside its man page
-		dosym wine64 ${WINE_PREFIX}/bin/wine
-		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-		local man
-		for man in ../build64/loader/wine.*man; do
-			: "${man##*/wine}"
-			: "${_%.*}"
-			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-			newins ${man} wine.1
-		done
+	# 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
 
 	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 b34fd3ce0744..00f918ff180b 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -8,11 +8,11 @@ DIST wine-8.0.2.tar.xz 29060452 BLAKE2B dcffaba6c90c4e02a7bc591a81e11aced06c0063
 DIST wine-8.11.tar.xz 29236492 BLAKE2B db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5 SHA512 f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
 DIST wine-8.12.tar.xz 29276732 BLAKE2B c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869 SHA512 6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
 DIST wine-8.13.tar.xz 29379824 BLAKE2B fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240 SHA512 952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5
-EBUILD wine-vanilla-7.0.2.ebuild 11395 BLAKE2B 55b32e16305fafc176a5f90d36ff4a8cddaa9e54eabfb199fd151a8a3ea789ffee5fe6e5ed6569bfa69c27c37df0c2d63b99bb6f9512b700b377cb708e566642 SHA512 0bfabc3f901d6a2dec9e91ca088be681a59be66dbf37efe0ca6212fedd5b7f522d6b26d153424f521f0cf311a852fa2101f669adabb305b10a4ada740f708fb1
-EBUILD wine-vanilla-8.0.1.ebuild 11412 BLAKE2B 6af1317397277df169dd7991b0a7138c2b2aebb84816db06b8715e5afc8d0e01a97b937634bb01f4fc5f44e2fe2b02216f42e8330a6730ab2a73512fec466793 SHA512 16231bd5b032330846a14c5bc439baac7210f8151a3548b38eb668d2a66b7e45af865c38b730b7818839b5ac69181991e873d092476900aae8300da3baca0b90
-EBUILD wine-vanilla-8.0.2.ebuild 11485 BLAKE2B e705cafdbf8172a829a1a5db8efd19eb03c20e174161c89c862e07ff449e409fd3c940b78f1ff082ae4257bf029d78404d3edfa449127a98cd087f18543b85f0 SHA512 9482194a8c034f38b4028c721263d28dcd5681cccb5188aafa5014bccaca4a3e6312b0f816823f4515fd7fa2c8d943491db25bd905d1fb0cd53220f1607795d7
-EBUILD wine-vanilla-8.11-r1.ebuild 11596 BLAKE2B 825c7db5d6ebfac7eb8e9bb7c2fd7d1dde2ddccaed284ac760b14bc3ccb6761c6246ea426e1b5d0cbe12e650674b10afc9e1635457d762e162abe3300417d4b3 SHA512 6af9d2bf6507dbe9c532b6098c336afb5dc82f4470cceef0ed6cdfe8439bf133a5d9e24310cc63f62ae6c8de14bf5ded765e913bd785a0a18edf6daf1e161416
-EBUILD wine-vanilla-8.12.ebuild 11596 BLAKE2B 825c7db5d6ebfac7eb8e9bb7c2fd7d1dde2ddccaed284ac760b14bc3ccb6761c6246ea426e1b5d0cbe12e650674b10afc9e1635457d762e162abe3300417d4b3 SHA512 6af9d2bf6507dbe9c532b6098c336afb5dc82f4470cceef0ed6cdfe8439bf133a5d9e24310cc63f62ae6c8de14bf5ded765e913bd785a0a18edf6daf1e161416
-EBUILD wine-vanilla-8.13.ebuild 12735 BLAKE2B fc40b709dbe21f842bc5641452449a186f7997e040cffff5a9f940351d560c2d64f7e62a9749c89f57d4bb4678bf1c2d88b3fe040e21a616bbb1e64062a0094c SHA512 853aaf03668673525c3c4ed7462abf0864f384b8c240c888143035146208418827a65c43b788a05ade988911784f23f166e4f4f7bc569b52e4096053ccbef00f
-EBUILD wine-vanilla-9999.ebuild 12735 BLAKE2B fc40b709dbe21f842bc5641452449a186f7997e040cffff5a9f940351d560c2d64f7e62a9749c89f57d4bb4678bf1c2d88b3fe040e21a616bbb1e64062a0094c SHA512 853aaf03668673525c3c4ed7462abf0864f384b8c240c888143035146208418827a65c43b788a05ade988911784f23f166e4f4f7bc569b52e4096053ccbef00f
+EBUILD wine-vanilla-7.0.2.ebuild 11372 BLAKE2B 12030c975970e41ae7b2d38bc44bf3fbd55e202fcb06000bd78f54c9f7aa8b6a4d80b8420bc14c4a19ad0dee40dd5da35822947a1c2a5c9de30936ea8e53d1f7 SHA512 81d0fafbdd248291a96361deb3be37b1d3155a9458716d9b9e193e6507e2e1fdbb0ce235b84138f6a52e64139884d47f4f3aef09f160ccd3e5050d3032fced63
+EBUILD wine-vanilla-8.0.1.ebuild 11389 BLAKE2B 223772e62296358f408c4286c3b605c3253f8d84845b2059b6498480ef621313710a37dd6d298db173dea0fdcbe096d041d20b4814c7eecc5d0ff8d106c3c497 SHA512 f65bdba562631939dba9697a1b3755466e8a03fd63685799ae2d0fb3d9f02c7d23faafe84a8ffbe8ce33492af00e79240aa386f94d719819e675d620fbea6cd8
+EBUILD wine-vanilla-8.0.2.ebuild 11462 BLAKE2B 7a01bbb647ead8117d3424047e3ec79a736bfa085f76c29c21f7687f6d109482ee773da6b1b3a90edd320b4ded32a89074ee76771c9002f70fb180682bd3c64d SHA512 7a469c56eddf3da4eb18c3fe774fb1df680ddc20ca441104d3f2ce3baed3321551fd71a76c1c1c50d4ad30bd6e74bd01b786b9bf14c8834c353a83bc0d83f76e
+EBUILD wine-vanilla-8.11-r1.ebuild 11573 BLAKE2B 34c0c1902afa8abc012d1fdb318f00918a541f6535bbbad27bd8bc68db94bda14b4a4ad316608ad377686794399948a4ef815b14d873608282d79aa891e31410 SHA512 b0f84f8b5556c49d82e49405448f829697101a6bc78376f52ee1a5d75fbb6ade096604d02b2068c28caa2d64606e0c70a463e30f5faa749c7d8afbcd78f284e9
+EBUILD wine-vanilla-8.12.ebuild 11573 BLAKE2B 34c0c1902afa8abc012d1fdb318f00918a541f6535bbbad27bd8bc68db94bda14b4a4ad316608ad377686794399948a4ef815b14d873608282d79aa891e31410 SHA512 b0f84f8b5556c49d82e49405448f829697101a6bc78376f52ee1a5d75fbb6ade096604d02b2068c28caa2d64606e0c70a463e30f5faa749c7d8afbcd78f284e9
+EBUILD wine-vanilla-8.13.ebuild 13252 BLAKE2B c90d3f2d86a3a2bda38e950f1c5c0810f0beb089f898fd4b06b90aced2ee19ac4b327b21e5f4664f8d9e3cef46067246ff278d5e3abedf79b8ace351dd3b98d0 SHA512 c9090bcf822864b1885333bb084a86b0da09f0d027ec8c7118b351cbb14714ff61ba99621097bc729887a5d901dabf75225514400d3beb3e14080162f204b26b
+EBUILD wine-vanilla-9999.ebuild 13252 BLAKE2B c90d3f2d86a3a2bda38e950f1c5c0810f0beb089f898fd4b06b90aced2ee19ac4b327b21e5f4664f8d9e3cef46067246ff278d5e3abedf79b8ace351dd3b98d0 SHA512 c9090bcf822864b1885333bb084a86b0da09f0d027ec8c7118b351cbb14714ff61ba99621097bc729887a5d901dabf75225514400d3beb3e14080162f204b26b
 MISC metadata.xml 2605 BLAKE2B 11bdcd81e6e4620229177026a6eea5bbbff4f2f8c92deabd08d096bd1ffab0bea06f950fe4631f227bb31dcf22e9d41456803a3924c0cf934c5d7b28aa7f0308 SHA512 e96b8ab85a6b124ae154b514b8dd9385158b999f7ffbd0a1e04d9bbb52288cd07b81a2fe989431ac214fc0ae37445e2c819b6593d31001fa54b0aa6f48561e8a
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index 3ce352533b56..d8a883dc6e14 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -174,12 +174,12 @@ src_prepare() {
 	if tc-is-clang; then
 		if use mingw; then
 			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# and it still gets used in install phase despite USE=mingw,
-			# drop as a quick fix for now which hopefully should be safe
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
 			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 		else
-			# known broken due to bug #912237, require mingw for now
-			die "building ${PN} with clang requires USE=mingw to be enabled"
+			# ./configure will fail, abort early
+			die "building ${PN} with clang is only supported with USE=mingw"
 		fi
 	fi
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
index 364fb01af774..ed19030553fe 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
@@ -172,12 +172,12 @@ src_prepare() {
 	if tc-is-clang; then
 		if use mingw; then
 			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# and it still gets used in install phase despite USE=mingw,
-			# drop as a quick fix for now which hopefully should be safe
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
 			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 		else
-			# known broken due to bug #912237, require mingw for now
-			die "building ${PN} with clang requires USE=mingw to be enabled"
+			# ./configure will fail, abort early
+			die "building ${PN} with clang is only supported with USE=mingw"
 		fi
 	fi
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index b95ead30f8be..47bb63ce2f1b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -172,12 +172,12 @@ src_prepare() {
 	if tc-is-clang; then
 		if use mingw; then
 			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# and it still gets used in install phase despite USE=mingw,
-			# drop as a quick fix for now which hopefully should be safe
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
 			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 		else
-			# known broken due to bug #912237, require mingw for now
-			die "building ${PN} with clang requires USE=mingw to be enabled"
+			# ./configure will fail, abort early
+			die "building ${PN} with clang is only supported with USE=mingw"
 		fi
 	fi
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild
index 5221f7e79d76..51ab700e53b0 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild
@@ -176,12 +176,12 @@ src_prepare() {
 	if tc-is-clang; then
 		if use mingw; then
 			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# and it still gets used in install phase despite USE=mingw,
-			# drop as a quick fix for now which hopefully should be safe
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
 			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 		else
-			# known broken due to bug #912237, require mingw for now
-			die "building ${PN} with clang requires USE=mingw to be enabled"
+			# ./configure will fail, abort early
+			die "building ${PN} with clang is only supported with USE=mingw"
 		fi
 	fi
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
index 5221f7e79d76..51ab700e53b0 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild
@@ -176,12 +176,12 @@ src_prepare() {
 	if tc-is-clang; then
 		if use mingw; then
 			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# and it still gets used in install phase despite USE=mingw,
-			# drop as a quick fix for now which hopefully should be safe
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
 			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 		else
-			# known broken due to bug #912237, require mingw for now
-			die "building ${PN} with clang requires USE=mingw to be enabled"
+			# ./configure will fail, abort early
+			die "building ${PN} with clang is only supported with USE=mingw"
 		fi
 	fi
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
index c6b837670cbb..1aaebe5aa269 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild
@@ -189,12 +189,16 @@ src_prepare() {
 	if tc-is-clang; then
 		if use mingw; then
 			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# and it still gets used in install phase despite USE=mingw,
-			# drop as a quick fix for now which hopefully should be safe
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
 			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 		else
-			# known broken due to bug #912237, require mingw for now
-			die "building ${PN} with clang requires USE=mingw to be enabled"
+			# fails in ./configure unless --enable-archs is passed, allow to
+			# bypass with EXTRA_ECONF but is currently considered unsupported
+			# (by Gentoo) as additional work is needed for (proper) support
+			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
+			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
+				die "building ${PN} with clang is only supported with USE=mingw"
 		fi
 	fi
 
@@ -344,22 +348,27 @@ src_install() {
 	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
 	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
 
-	if use wow64; then
-		# compat symlinks, albeit ideally no one should call "wine64"
-		dosym wine ${WINE_PREFIX}/bin/wine64
-		dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-	elif use abi_x86_64 && use !abi_x86_32; then
-		# if no 32bit support it instead only installs "wine64" which may
-		# come as unexpected, so provide "wine" alongside its man page
-		dosym wine64 ${WINE_PREFIX}/bin/wine
-		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-		local man
-		for man in ../build64/loader/wine.*man; do
-			: "${man##*/wine}"
-			: "${_%.*}"
-			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-			newins ${man} wine.1
-		done
+	# 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
 
 	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index c6b837670cbb..1aaebe5aa269 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -189,12 +189,16 @@ src_prepare() {
 	if tc-is-clang; then
 		if use mingw; then
 			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# and it still gets used in install phase despite USE=mingw,
-			# drop as a quick fix for now which hopefully should be safe
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
 			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 		else
-			# known broken due to bug #912237, require mingw for now
-			die "building ${PN} with clang requires USE=mingw to be enabled"
+			# fails in ./configure unless --enable-archs is passed, allow to
+			# bypass with EXTRA_ECONF but is currently considered unsupported
+			# (by Gentoo) as additional work is needed for (proper) support
+			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
+			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
+				die "building ${PN} with clang is only supported with USE=mingw"
 		fi
 	fi
 
@@ -344,22 +348,27 @@ src_install() {
 	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
 	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
 
-	if use wow64; then
-		# compat symlinks, albeit ideally no one should call "wine64"
-		dosym wine ${WINE_PREFIX}/bin/wine64
-		dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-	elif use abi_x86_64 && use !abi_x86_32; then
-		# if no 32bit support it instead only installs "wine64" which may
-		# come as unexpected, so provide "wine" alongside its man page
-		dosym wine64 ${WINE_PREFIX}/bin/wine
-		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-		local man
-		for man in ../build64/loader/wine.*man; do
-			: "${man##*/wine}"
-			: "${_%.*}"
-			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-			newins ${man} wine.1
-		done
+	# 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
 
 	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \