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

6 files changed, 75 insertions, 57 deletions

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 \