gentoo auto-resync : 19:11:2024 - 03:03:00

23 files changed, 251 insertions, 17 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 5e3925fbfb6c..d4734c0f6267 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 504caba587f2..afbac485b36d 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -5,6 +5,7 @@ AUX dxvk-2.4-d3d8-setup.patch 220 BLAKE2B 7f21542907d02e2924595aaff3270988214913
 DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B 3507ffe4abf9c45f2a138b05e7cf706322a6bf3d2e9ae86a9d6216b206c09f79eac696ee7dfe33d0bef55e727f51301c36eb89bfa3b3f429d7d5fafc1eebdcb4 SHA512 8995b231b3f3650beda04c01f30186d10a373075a4774b4ecbfb3bbeb4de99c57555f1db0611e5c61c6a411a7215e0faf228f9861f6b7adae6fc365e8056f7e3
 DIST dxvk-2.3.1.tar.gz 1005669 BLAKE2B d78448fcde9d600f7206dfa606fca4069e7563bb8b181fbc172691d6c45586904ae529550926a03612ed3cc1f2a2dff00990638125c1d7ce6179d3cd3ba8df04 SHA512 085567ac263872eb93d776ce7cf982690603e240a977dbb51ad69344af387fd745536ca62819afd4a809732a6f2d22b36c3df9538decf37dec527973d41e392f
 DIST dxvk-2.4.1.tar.gz 1060662 BLAKE2B 43294af5829fe306acdb72c07b94c28d34eb798a2eaf6d2e42c2b80900e9b6f4f323569dfd51d565c836237fddce26b843f69e4ff57fc2a5838382993a9dd6ed SHA512 629e45bbdaddf83cd8a394877289781e8f54330b4c865b2d453ba3068a6054511a3697ca115497b64df0ce9ee36748a7fdb01fdc5f49a7dc44c4a3d3e47bf6de
+DIST dxvk-2.5.1.tar.gz 1130762 BLAKE2B 2941f3702d0f478d140d8f39a97e29f24e8ce6a3f22160fe26a8cfb70a132fc39b43960f34ea3be8786e7ccdbbf4ff2ddc961d2cc93956e63422579cb934b2fb SHA512 44b200e2d468f9280444b888c8326becca123e1c8a50fbfa544165d24fb2a51478e00a8ab93d0777cab47be85ca67f63bb3627ea75757a4e0ab85209f93b1053
 DIST dxvk-2.5.tar.gz 1130334 BLAKE2B d8485d7ed8256676f2138d6c917ef8875da7604f304e3c2adba8204b15264ee8fb77fd86b67c7cda16220348288f40d2e736cdfd973d3e91d0141e1522860559 SHA512 2610d9a9e546635e5476278ec30c699fbefe32fb418335fada25e941d9bca705e02dbd9eb8b5f6a9afb0ec194f2002857ad00cbe27d1a90222f5e28a496da125
 DIST libdisplay-info-275e6459c7ab1ddd4b125f28d0440716e4888078.tar.bz2 81172 BLAKE2B 7a1e9e2feeb95e06e9d3f49ad9d14a8a152cca525085e819cda0b69c238fb79dddd6d547cd0f0a4b51dfc1ec74ac4c006345b9fc48563807bc8ab3bab58ea5ff SHA512 794e94e8c16d65901a7b705d1ba3361817b4e9e19e520b1004bcab232d0347f5713594d67f3c2b79d4f86b3012e710c648975547d27a63de043fcbe9e6b7e66d
 DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121
@@ -13,6 +14,7 @@ DIST vulkan-headers-46dc0f6e514f5730784bb2cac2a7c731636839e8.tar.gz 2255426 BLAK
 EBUILD dxvk-1.10.3-r1.ebuild 4988 BLAKE2B c1a07a25db7117285e6d0ba5bddcc5b9690b9171bf1c887547f6a9e9804bc3366b325859ac4f4d439b702ea38e96c51b5067cc21c354bd98a324430a2166b527 SHA512 8566dad60c3a8cc4e996bd8d1430ad7a62db5eae2860b635a998ea7c87c7f8a9fd2f268b1f736d27addbb3c408dac6ffb7f3993a02fb16d42b9c238f2692a945
 EBUILD dxvk-2.3.1-r1.ebuild 6667 BLAKE2B ac8620ba4b92cfa33c88db128f98304df7060dcdbaddcff8a570ebe9b2a5e9e6a5ab559088b2d2c30254160bfdc91f414a942421bddf387330f72721eedced08 SHA512 ce8129e47bd4a1a8431e052fc60e831ef6fd692d970d430fc4b111d71b4130915967679d8a96d4ba9c4647826dc34c924b585e3b07db67abb78c6b5e1b458de5
 EBUILD dxvk-2.4.1.ebuild 6104 BLAKE2B 74a6bd12561ec92336b95aa9b8aa1c7167fa5ce984f5d8104e0e3d76140a337891a70215d907929bd7d06c8ef7c5e35a24572aff615ab1479357f0e712d8e999 SHA512 042a6473b19dd1d1a735a8092f944944f0c94e40124e6c96f118de08f2bd83a3a1c6e02767f2cb8a475ca40a540b0d264414e956ecc77a939cf89775ec727d65
+EBUILD dxvk-2.5.1.ebuild 6067 BLAKE2B 825fee4c6315f0341c220c14fed9d241e45d8dca5177ece87ba1369c3893fb20ab28da587603c72e20cb52ff1c1b0072162b0f24170e6632054f9cd9bddb2064 SHA512 2b1185990a72d895d7f7600078a70b8905d856ba34a851ca687764deb2b583c86da96b3035ba6e0c185a0f832135d79afcd5f3c779284795e427165c9128b62a
 EBUILD dxvk-2.5.ebuild 6067 BLAKE2B 825fee4c6315f0341c220c14fed9d241e45d8dca5177ece87ba1369c3893fb20ab28da587603c72e20cb52ff1c1b0072162b0f24170e6632054f9cd9bddb2064 SHA512 2b1185990a72d895d7f7600078a70b8905d856ba34a851ca687764deb2b583c86da96b3035ba6e0c185a0f832135d79afcd5f3c779284795e427165c9128b62a
 EBUILD dxvk-9999.ebuild 5947 BLAKE2B 3a86082b1890360375d0dba2b037da7b9e6c05440c2f2057283ebe109e22ded34d0c55263c96b1ae28f319a2e5a0a5063111ea38aaca9c74ae6ea7a488dfc770 SHA512 439f121ae0dac4b3f7f0de3bb6ad8ca39dd5fb71d82b7f2544562db4832edb5eccd2a61fb3cb66301f6fd81f40868af3b6a8d8115f5d9ea545ffd2a93b815aa7
 MISC metadata.xml 885 BLAKE2B c21b9383a626cfea8b758d171ebbe7180d7a0dc09da611ad5f05b3e877f4051e33544e29c9c5e58fa20143bf724d8d27da9279bcf49e3465a7aa6cb7eeca4eb1 SHA512 3ad1138cbe63473b6da56d73214913e9a3e68d270e1df01fa4202e76a6efe35c6971595660724e30b16db31fba404441bc36b075e2197944a699c436ed60ebb8
diff --git a/app-emulation/dxvk/dxvk-2.5.1.ebuild b/app-emulation/dxvk/dxvk-2.5.1.ebuild
new file mode 100644
index 000000000000..56cafa91a05c
--- /dev/null
+++ b/app-emulation/dxvk/dxvk-2.5.1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit flag-o-matic meson-multilib python-any-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
+	EGIT_SUBMODULES=(
+		# picky about headers and is cross-compiled making -I/usr/include troublesome
+		include/{spirv,vulkan}
+		subprojects/libdisplay-info
+	)
+else
+	HASH_SPIRV=8b246ff75c6615ba4532fe4fde20f1be090c3764
+	HASH_VULKAN=46dc0f6e514f5730784bb2cac2a7c731636839e8
+	HASH_DISPLAYINFO=275e6459c7ab1ddd4b125f28d0440716e4888078
+	SRC_URI="
+		https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
+			-> spirv-headers-${HASH_SPIRV}.tar.gz
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+			-> vulkan-headers-${HASH_VULKAN}.tar.gz
+		https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/libdisplay-info-${HASH_DISPLAYINFO}.tar.bz2
+	"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
+HOMEPAGE="https://github.com/doitsujin/dxvk/"
+
+# setup_dxvk.sh is no longer provided, fetch old until a better solution
+SRC_URI+=" https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh"
+
+LICENSE="ZLIB Apache-2.0 MIT"
+SLOT="0"
+IUSE="+abi_x86_32 crossdev-mingw +d3d8 +d3d9 +d3d10 +d3d11 +dxgi +strip"
+REQUIRED_USE="
+	|| ( d3d8 d3d9 d3d10 d3d11 dxgi )
+	d3d8? ( d3d9 )
+	d3d10? ( d3d11 )
+	d3d11? ( dxgi )
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glslang
+	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
+	"${FILESDIR}"/${PN}-2.4-d3d8-setup.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local tool=-w64-mingw32-g++
+		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
+			if ! type -P ${tool} >/dev/null; then
+				eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
+				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
+				use abi_x86_32 && use abi_x86_64 &&
+					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
+				die "USE=crossdev-mingw is set but ${tool} was not found"
+			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
+				eerror "${PN} requires GCC to be built with --enable-threads=posix"
+				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
+				die "USE=crossdev-mingw is set but ${tool} does not use POSIX threads"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]]; then
+		rmdir include/{spirv,vulkan} subprojects/libdisplay-info || die
+		mv ../SPIRV-Headers-${HASH_SPIRV} include/spirv || die
+		mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die
+		mv ../libdisplay-info-${HASH_DISPLAYINFO} subprojects/libdisplay-info || die
+	fi
+	cp -- "${DISTDIR}"/setup_dxvk.sh . || die
+
+	default
+
+	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die
+}
+
+src_configure() {
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# random segfaults been reported with LTO in some games, filter as
+	# a safety (note that optimizing this further won't really help
+	# performance, GPU does the actual work)
+	filter-lto
+
+	# -mavx with mingw-gcc has a history of obscure issues and
+	# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
+	# crashes with -march=skylake >=wine-8.10, similar issues with
+	# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+	append-flags -mno-avx
+
+	if [[ ${CHOST} != *-mingw* ]]; then
+		if [[ ! -v MINGW_BYPASS ]]; then
+			unset AR CC CXX RC STRIP
+			filter-flags '-fuse-ld=*'
+			filter-flags '-mfunction-return=thunk*' #878849
+
+			# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
+			# strip-unsupported-flags miss these during compile-only tests
+			# (primarily done for 23.0 profiles' -z, not full coverage)
+			filter-flags '-Wl,-z,*' #928038
+		fi
+
+		CHOST_amd64=x86_64-w64-mingw32
+		CHOST_x86=i686-w64-mingw32
+		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
+
+		strip-unsupported-flags
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
+	# unset again so meson eclass will set ${CHOST}-gcc + others
+	use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP
+
+	local emesonargs=(
+		--prefix="${EPREFIX}"/usr/lib/${PN}
+		--{bin,lib}dir=x${MULTILIB_ABI_FLAG: -2}
+		--force-fallback-for=libdisplay-info # system's is ELF (unusable)
+		$(meson_use {,enable_}d3d8)
+		$(meson_use {,enable_}d3d9)
+		$(meson_use {,enable_}d3d10)
+		$(meson_use {,enable_}d3d11)
+		$(meson_use {,enable_}dxgi)
+		$(usev strip --strip) # portage won't strip .dll, so allow it here
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	dobin setup_dxvk.sh
+	dodoc README.md dxvk.conf
+
+	find "${ED}" -type f -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "To enable ${PN} on a wine prefix, you can run the following command:"
+		elog
+		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
+		elog "Note: setup_dxvk.sh is unofficially temporarily provided as it was"
+		elog "removed upstream, handling may change in the future."
+	fi
+
+	if use d3d8 && [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 2.4
+	then
+		elog
+		elog ">=${PN}-2.4 now provides d3d8.dll, to make use of it will need to"
+		elog "update old wine prefixes which is typically done by re-running:"
+		elog
+		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
+		elog
+	fi
+}
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index 6cb5779f7deb..12943c33f96b 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -13,9 +13,9 @@ DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb SHA512 0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d
 DIST proton-wine-9.0-2.tar.gz 49125171 BLAKE2B ac1e4a63f94689bc4fcc6ab4e2d12cfc214f54181515434ab950d8975d131a5f6333b1e6cb9b67eda61cf3e652e57e27e60ba3cff6a6ac403b07178f382f7e25 SHA512 82efee3100da80f650229d1abf3df4896ab71af4a79c6e5cf03aa646c56f435daf07c6f084a3264067cf90ce509102e3d7ee6d4bf7d0650baf645b5ece08cc7c
 DIST proton-wine-9.0-3.tar.gz 49153588 BLAKE2B 81f80fbcf7045c9e08b8c4fd5feeb24fdc65f4266d6ecc2198e8638e56e6fd65cbf7e6d3d113d84ea0bd24ac8bb4780db0bb8dbfdf93f120b4f3b6a5948eedae SHA512 1ec948c781576bc21d5735db4ad572c7d73ecd046d2d2e45958ddc08ec9591441397bb582bfe8b5eb94c584da7000cf4ab138b67bda4b3e717568842595f0d8f
-EBUILD wine-proton-7.0.6.ebuild 13048 BLAKE2B b3376426ad4640c0ed1bb843712d005a0cf173f40b7bba5c14e1e53817c3f913b0984bc8da2161413aff1a8c3b3c666265564b235f3937480039875c8757ba14 SHA512 33663aa37d17d7226444c96a3537fd312f7280e78e1c22743a540ddf85f5ec7284149178446a7c4380a08111613e8b9cf54a7a731b752f90f180497fb91b160b
-EBUILD wine-proton-8.0.5c.ebuild 13663 BLAKE2B b37ed37cd2d5aa835a1a16885a95abe752a6ef45c9eb5d44712d5dd2b251d38ba04823e8402f1e6ffcfdbdfab6671106d59c03053cc992f0a5a8103179425418 SHA512 5c3f14f380d7661cfbfdb166039d94cdbfbbc0607b69cf3820705a7cc063bcb3ca44e2b6d3d8d8a2b4804368f621ac8d0e112c31b50788c4e17414686441650d
-EBUILD wine-proton-9.0.2.ebuild 14563 BLAKE2B 019e87c00e672fd27db6e00a7d873d101b5ee5b3a557b14e7827896db301b4dd3fd0c067c5106e0b19d7d8929277e79146759bde2eab43ca0d2179311eb86282 SHA512 ccbcc00e944be6a0433e36e82a1537a45d5736c14f1c5b35ca737baed3e765471cd98aed9dc705a30e9d7dcfcd45b0dbd0cc4e84bbcd1af09fcd00b3e3ab6dd2
-EBUILD wine-proton-9.0.3.ebuild 14564 BLAKE2B 7618af97ab0d3ac49afffcb12a79058f06e56c770446f159215fa8c9d4c69efa4712e4e2737a7fc29fedbc0154bbc660998dd93e78c03311aa33449ff6920f6c SHA512 44da095915897939b9200fa9baa5ff1d09caff2cf70676bf7770cd81c3a32570e6c8f5deabb97462a9553adb38c4d0dc6483a066714918c48afa220d665fc499
-EBUILD wine-proton-9999.ebuild 14610 BLAKE2B 44efcd1f538f69d9674787eb3c8bc756480562d85c39a9a62719f4183d3f693ace8c5182ce64d9e6c793f04893d0f014787f7a8fc4670ace24c7548b13de7fcd SHA512 5bf5f09f35f93d58065a35024eecf589426acac6dd032c46a0a116335717512bbcbff056f809c11901790ae860998a7da783a9d79ab68ed86ccbbf9d5dade375
+EBUILD wine-proton-7.0.6.ebuild 13153 BLAKE2B 3774cef4e20e5fa5c4d10c981d2d93f1930c9459f479d7fdf5f61040640b9d353819a6e4a7839b00391fa6ae2866ab09182ba0385b21144b342f6636fbcfbee0 SHA512 cd4ff8343b63d46a1daef66f8f037a371d02b1f4828db3e6dbc58e26629ba1804e77e37cc0b598d17d312ac2d1a4313957c757218cc02115b74741683b3abd40
+EBUILD wine-proton-8.0.5c.ebuild 13768 BLAKE2B 15f8ba9ebb229d4b506a58908cec3ad693a0ef8a79432d16ed8f501ce1be5f6ca6722ae37855e0340f45c8ca5f710b9c13429077ce6170b0d0eda00ceced41a3 SHA512 ce37db2fb759018feac35435fcdca98d9b810d805cce07edb20260a4640c02e9c0660054e29e277287e37434849ab8846bc9a8adc1341601b034fc9f9a399129
+EBUILD wine-proton-9.0.2.ebuild 14668 BLAKE2B 81f3ab3da1ad104da6920a0513fe084aa1cefd0dc7c7659ed76e70e66a8538720ac9f1ef9881c8c104a1bc05264bfb737f289a876b6dd0891794d12b432b516d SHA512 db0113d2e9273a2a16e2eb2fe3f140912b6d0d00fe1d314af0b88a390140acb5fc95c2ec55fa3587025fa66d6173baad4fa2e5c76a7164334db3b7d94f9ade74
+EBUILD wine-proton-9.0.3.ebuild 14669 BLAKE2B 078e4c9c1ad27669f363a45512219a9ea2f299551d0b65a6e78f2340a2bbbdf86f514a2bac85d9581577f2a57035ed5fcec2a8004353a916a616051b2f27e3d1 SHA512 43d38039008d57884b8aaae3a36347dc05d6662bbb71c2b78f5e8f9a5e3e23277b1ea3cfaaa454fe256a9089cef56656780b98254d9457087d03f4c4babf7726
+EBUILD wine-proton-9999.ebuild 14715 BLAKE2B afc9ea39038c655373ac4d45c6b3aff9e1494ce2deaac3e60910bbb9f679087b15b55872784da9ec9bba263ab51b2f2c042a4da72772a84428d9c87c7fa1f0e0 SHA512 62cea6f07d6dca8e1221c5c6309b41066c74c4a548782eef682d9ea17acb9e4ba2bb7269091f4698015813f32a17907257b6192081fb55ae078b08edfc0e9b5f
 MISC metadata.xml 1593 BLAKE2B 2e07980ce479dbb737394a5b74576925da936ca2ef5c0767b036cad7f56460ae0a6c73e8a416679f512a5195d037329ce9d3ace9808f68e024baf8640f462d94 SHA512 9f99896328a6337e7a2228977a3b7d853e78aef50a19ee40c43d18f657ead529553d7ea788bae1d408bd074f240cb555ba42558a54cd3ff8ab530b167e813d55
diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index 0885f72efe17..4ebc2d33e911 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -247,6 +247,9 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
 	# https://github.com/gentoo/gentoo/pull/28355
 	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index cd3bf6391ea7..fe281d763060 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -251,6 +251,9 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
 	# https://github.com/gentoo/gentoo/pull/28355
 	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
diff --git a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
index d8dfaa48476b..4a959910a693 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
@@ -271,6 +271,9 @@ src_configure() {
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
 	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
 	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
diff --git a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
index 158df4efa795..1b6c3be815f9 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
@@ -271,6 +271,9 @@ src_configure() {
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
 	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
 	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
diff --git a/app-emulation/wine-proton/wine-proton-9999.ebuild b/app-emulation/wine-proton/wine-proton-9999.ebuild
index 10f556feb152..512564eccefb 100644
--- a/app-emulation/wine-proton/wine-proton-9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9999.ebuild
@@ -273,6 +273,9 @@ src_configure() {
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
 	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
 	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index fa583c18ada8..12be8ee62f96 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -9,9 +9,9 @@ DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 0012978f54c618e73d407dd49dccff02853
 DIST wine-staging-9.19.tar.gz 9460757 BLAKE2B 20b5cb89b73409bb45129cc59ed776271cb45347bb344a3f5b4b8075d783dd6f6ff03b14ab0bc4237b67020b909f6235c0fb8822331f171915dbf2c4417cb78e SHA512 c2504af047125e2bf29e4c1d9d7bef275a7bc236bc85344977448a8c4a2bd32cdb813db4ebe26de1b91d04371751ffe3498b9d9c96793d3d3d236fe6be9903dd
 DIST wine-staging-9.20.tar.gz 9518651 BLAKE2B 77bd59dfc9f18a159d6256e3b5c92a8badbdf64c7e2f86fe0dbd2372d28e7643adb35b9f209ea431f4ea49c0db65f07681fc53272e9e26e3f8a6284baba352fe SHA512 fec41c68bc9396d0c40545f6eadd7ad7ba2ecdd886df6e5060be9e288e95790040f70a3c889ce8fa26b42829bef702d31f105eeede795f0a1d17f716f6c6682d
 DIST wine-staging-9.21.tar.gz 9564841 BLAKE2B e890ecf3743ec662325a248829d69011ae48189e4694c357ddded0d0f4b46ed7431b94715960f52ceaabe0f7b8790c546f98c78febe8c93fd613848283f94d8e SHA512 fb7a5c0c0c72047649d031c1caaeb6b3626f23c38535b37cc331acd30dac26fd299b0f7abd54dc2396940ef01dc816415c74bd894bb77f08bcab988eb3685890
-EBUILD wine-staging-9.0.ebuild 15677 BLAKE2B a60e2f72c3896f6de7b045ba51c41338531eb2dccd0b783725c1c793cddf4f17311c5941c99b0d29bc1b61607bb4e26c4114b3240b4c3b219927d26151406593 SHA512 affaba6aff52e930d8345a5b3c6ecf4df5479463f4bf8ad036b9215f7f802bc94efa5ac47897af11bdd9a12f5d93947fdda4407ddc75b937a489f783c9cf2389
-EBUILD wine-staging-9.19.ebuild 15468 BLAKE2B 9cb861dd4f2018ee042a968c93da960fc332426e970769e3a96de2378a7e51f458e45cf32344f2cd03454f88d9caa01800beb9723f119d3c51acfa3cc9248f1b SHA512 eb2b3a9d0e986e1ba785891a274afbd08fde4bd6132fa3e1bc4cb76c36cb3cb7489a177ea8c44966b1d3d0939335b7f2475d60e89849ed779621dd4eb943dafd
-EBUILD wine-staging-9.20.ebuild 15472 BLAKE2B b8b13031f73e42796085049da0a2119bd15b1745b7cd2fcdc6a7202bf1f14df18189bb7467cb5ec600fa6831586bc104bc2d24fb98c77ec343196bd07881a404 SHA512 1316993868030c4f4daee9474c66988e2710d64b10702c515eb052ba3d4f42e4e5c22eda277fa4d778fbc68583596936c0e522ced24e36f183bd17869d1d741d
-EBUILD wine-staging-9.21.ebuild 15472 BLAKE2B b8b13031f73e42796085049da0a2119bd15b1745b7cd2fcdc6a7202bf1f14df18189bb7467cb5ec600fa6831586bc104bc2d24fb98c77ec343196bd07881a404 SHA512 1316993868030c4f4daee9474c66988e2710d64b10702c515eb052ba3d4f42e4e5c22eda277fa4d778fbc68583596936c0e522ced24e36f183bd17869d1d741d
-EBUILD wine-staging-9999.ebuild 15472 BLAKE2B b8b13031f73e42796085049da0a2119bd15b1745b7cd2fcdc6a7202bf1f14df18189bb7467cb5ec600fa6831586bc104bc2d24fb98c77ec343196bd07881a404 SHA512 1316993868030c4f4daee9474c66988e2710d64b10702c515eb052ba3d4f42e4e5c22eda277fa4d778fbc68583596936c0e522ced24e36f183bd17869d1d741d
+EBUILD wine-staging-9.0.ebuild 15782 BLAKE2B 7a1174b6a68d487a92dc64f4da323e69a55462fe9beefdf4f3641dbe9bdc389a9860608ab13eac39574c6b79e4162520826743048d150ef6cfcf00b8a4c76ad6 SHA512 1c95ae0ad40513bd9c582601db8f906b0fd56865a2ac2108057016785c33d5991e4ceade3c9f3dc06a6eeb7e0b3b5349b3142d1881cc429e19c7da951154568e
+EBUILD wine-staging-9.19.ebuild 15573 BLAKE2B 61a48483d56cdad3b3ac281fc75f41a04ee347b927ebd66ebae9a6d0e60c23fc543c7fd7152f59dcbc2d251f60a26e06f021c49bbc94fb31f8b99101b50536cf SHA512 b7ff1ece6f3bdb508307ff0a583b04a7e5d09d4fc49a1c70076deaef854fadc9a09ec6ee40b438c5b9a02980d482678be95c94f8131dd4aeb5fde22a6cb525ef
+EBUILD wine-staging-9.20.ebuild 15577 BLAKE2B 985a2ce2583921b6ea3c5eb4e38acf786a09eb10953a8ac35f8cdb8c0e7f85324b0cf7484a3afa5fd08f3aaaecadc4486d73e62ea3576892257ec6f079415611 SHA512 9be8a7a7c9003b3612241d0cefef4acd26eba63c53a08b2654396614dfaf064d5f85d360639b32083ff3bbdc7f78eb081dbea965073e54be804bfd1f520c913a
+EBUILD wine-staging-9.21.ebuild 15577 BLAKE2B 985a2ce2583921b6ea3c5eb4e38acf786a09eb10953a8ac35f8cdb8c0e7f85324b0cf7484a3afa5fd08f3aaaecadc4486d73e62ea3576892257ec6f079415611 SHA512 9be8a7a7c9003b3612241d0cefef4acd26eba63c53a08b2654396614dfaf064d5f85d360639b32083ff3bbdc7f78eb081dbea965073e54be804bfd1f520c913a
+EBUILD wine-staging-9999.ebuild 15577 BLAKE2B 985a2ce2583921b6ea3c5eb4e38acf786a09eb10953a8ac35f8cdb8c0e7f85324b0cf7484a3afa5fd08f3aaaecadc4486d73e62ea3576892257ec6f079415611 SHA512 9be8a7a7c9003b3612241d0cefef4acd26eba63c53a08b2654396614dfaf064d5f85d360639b32083ff3bbdc7f78eb081dbea965073e54be804bfd1f520c913a
 MISC metadata.xml 2659 BLAKE2B 8a80b12643e82b98b71bc408e2fd79736da01c8f7d914c7a592cb685893ea3896bc44fecf0160faec803b284d3f6bb38cf36fb4745d9d43e0e1ced8702fcaf9d SHA512 a271e537318a4e90236c195f1f8c24c3255b5465345246627797d37238e2b6292d0734a9ab19542ee34fc1e9312dc4418694992f5ce3c53310228cc6bf14ef90
diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index f82e62bb333f..991310a78caf 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -328,6 +328,9 @@ src_configure() {
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
 	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
 	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
diff --git a/app-emulation/wine-staging/wine-staging-9.19.ebuild b/app-emulation/wine-staging/wine-staging-9.19.ebuild
index 69c45f1c51f2..e0c51c2bc68d 100644
--- a/app-emulation/wine-staging/wine-staging-9.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.19.ebuild
@@ -321,6 +321,9 @@ src_configure() {
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
 	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
 	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
diff --git a/app-emulation/wine-staging/wine-staging-9.20.ebuild b/app-emulation/wine-staging/wine-staging-9.20.ebuild
index 983b7367f85a..fb3dc75e7ce3 100644
--- a/app-emulation/wine-staging/wine-staging-9.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.20.ebuild
@@ -321,6 +321,9 @@ src_configure() {
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
 	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
 	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
diff --git a/app-emulation/wine-staging/wine-staging-9.21.ebuild b/app-emulation/wine-staging/wine-staging-9.21.ebuild
index 983b7367f85a..fb3dc75e7ce3 100644
--- a/app-emulation/wine-staging/wine-staging-9.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.21.ebuild
@@ -321,6 +321,9 @@ src_configure() {
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
 	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
 	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 983b7367f85a..fb3dc75e7ce3 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -321,6 +321,9 @@ src_configure() {
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
 	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
 	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 75b6aeb8f797..7ec0c3f7e4a7 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -8,11 +8,11 @@ DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a
 DIST wine-9.19.tar.xz 30812468 BLAKE2B 24bdcd8d06c9f6b480dbb92469b41ff21b4174fcea6eaccf2359616f018d1c0a1305b5ae8acfcb2f7161b285963f26cc16530d1518db3d1bda7cdbb9807860d5 SHA512 530219c6a337f2996eac92d644ab603528b82cc6136cc37c1e6aa736d418f33c6f4b0d54f3537b04bceaf4487d84abcf926a2f5e9536ed4e966c4fe63c5b6ddd
 DIST wine-9.20.tar.xz 31807848 BLAKE2B f2fef5c941284a5f89f92696cb242641ad88ea8a4388dd6d72977d9696ab63c1632b91b678567525527c80e30ad5ef2971e5bcf700e4f2d7db9bf3357488ed34 SHA512 65d229cfa1c4daffd0b1cec4480bdc4f8a2bbdeb08a7885efea403b0533beda6a22616e57f8e55038fe9e033137cf2718148e38076409a8c0341b29127bbefa3
 DIST wine-9.21.tar.xz 31888916 BLAKE2B 2d9b08263d2d3d174cf42ef8cb23d47c4516a394b44c4a2c5b1d220c4680239b84f47dfeea8b28c763593c725289cf7c257ad3f9fe0ee407b725391a2e956e90 SHA512 9dc64eb49755342f9a3f5fbb5665d1b3b4fafeb9b2723c198b04bb6f5d486f8feb00198e32e519d618bd87d1cf6c7e6a134bf9110b91023334e949eff00e758f
-EBUILD wine-vanilla-7.0.2.ebuild 12796 BLAKE2B fd5a6973c5dbc591dc7b236f350e9ba6088e6cae206ddea99e8a2efbc0215cc589026c1f9c24c0c8232b02e7775113d33a211487724a81cab199a83d48634eb9 SHA512 b6807da97fb721e97231556d76e682f8a7c9ccbc7985f68b778e557816bb9201eab438e7419ece5a3b93db4c1c1416e65e65062c3d08fc4a743fc8e619e0b47f
-EBUILD wine-vanilla-8.0.2.ebuild 12884 BLAKE2B c9eeea8f957ba52e5f984c66ad470e5f966cb65c868a11727e14308107dca6690158414f9d6761f880a2ea64a4ddbea4cd319a904904127f2f73f29081239e74 SHA512 f3646c01612250d1eec6b041ffdee8a9669111bbfbfd5e2bc31335e692e6491f59f934cdc69d1176e7e0fa4d36c56fafbaffe9acc28499d1754fa8fac6e6c49c
-EBUILD wine-vanilla-9.0.ebuild 14161 BLAKE2B b37f13bf578900bda3eeffaf29d6fa03232c4d2088cc7b1756858a9f4b8c0acd44b11f192dbff87be166419222eefb2f7b51e4d07f8758704c35cbd617c75359 SHA512 ef3191fc6e274cbfaf9f32c78072832b07f8b1fd83faa142b2744fa5377c5bb96f4f8f81bb313ef56ee0506dd725b3b7e711d26c5926eaff670d434e9740288a
-EBUILD wine-vanilla-9.19.ebuild 14385 BLAKE2B c0f7f7429a4b9006c1c58642a9b80ef1325dfdce9f7f109abce82b41fb606e8f1f917ce57b4597484ba978e27ffec1fd56837fbb70eb9c06b01d68c53fe9237e SHA512 c5f7f9d438a6457136b49f0dba4b8b1c524ac6567cd038bbc72608c1475a7bc001833c7ac29309bb679818f6df26188de5cd9cd757aaeb0b44f2661132170ece
-EBUILD wine-vanilla-9.20.ebuild 14389 BLAKE2B 2b3d1b90dfa82eeead70707be9db45b48e174ddaa6b02ceb1c91ea8597a705705901da2f089c4cc30d3737c745e018c6666c29344d08c2290a16ba4bc38ffffa SHA512 68a0c0894d7ff6ad62245cb44a72f37790b37cab5a064b35a43dc3f6665d5d4dea6d7993568aa067ef7f855aa566e43f9ea1b893012cb8de1e9d8170157b2cfa
-EBUILD wine-vanilla-9.21.ebuild 14389 BLAKE2B 2b3d1b90dfa82eeead70707be9db45b48e174ddaa6b02ceb1c91ea8597a705705901da2f089c4cc30d3737c745e018c6666c29344d08c2290a16ba4bc38ffffa SHA512 68a0c0894d7ff6ad62245cb44a72f37790b37cab5a064b35a43dc3f6665d5d4dea6d7993568aa067ef7f855aa566e43f9ea1b893012cb8de1e9d8170157b2cfa
-EBUILD wine-vanilla-9999.ebuild 14389 BLAKE2B 2b3d1b90dfa82eeead70707be9db45b48e174ddaa6b02ceb1c91ea8597a705705901da2f089c4cc30d3737c745e018c6666c29344d08c2290a16ba4bc38ffffa SHA512 68a0c0894d7ff6ad62245cb44a72f37790b37cab5a064b35a43dc3f6665d5d4dea6d7993568aa067ef7f855aa566e43f9ea1b893012cb8de1e9d8170157b2cfa
+EBUILD wine-vanilla-7.0.2.ebuild 12901 BLAKE2B c2404cd2f002199d0a44640ed70ac0532ff8a018b1ef580f32d150d7510cf205c9d284d867aedf9698537408ca29b72eac293c43e9352fe09cf97ac28896e519 SHA512 c52451ff842802ecb6fb9473a650e3b71ed8c398f150d0fdf0a9444426ddac05f69829684cfc2485ca057e9809614779ce423c868b6a3404b5c42246b6a09756
+EBUILD wine-vanilla-8.0.2.ebuild 12989 BLAKE2B 364e5407a3a51e1c76708bd7c8bac6c5ccce08f704c191b9b0873d49dcff58dc9ddba8efee7af3be811f1067532386b5694d5171c5c4e7783b60fe8357eedd2f SHA512 f1445732634459ede7e0aa51fc9aa763c861c02a50c711821dd05d61bd4acacd157062727d13ef074256c7e2bd1c686428a373522a27efa68468e45514af5776
+EBUILD wine-vanilla-9.0.ebuild 14266 BLAKE2B f1223c0bdff37d9a2930f543af31634f4506f526c7b8a31f23f0fec265d457ae7bf20e981d63cf605623347d1265d4ca9c994b7711f20cf14847d7f7522e624c SHA512 dd17665408102fb8243fc547181c352232ff9bc07da3f4ce35b6b467c1c86b0f06e3cd20198a454555a2cdedc1346e1d1e531e6e4de95d8cd6fed0acbfbf6789
+EBUILD wine-vanilla-9.19.ebuild 14490 BLAKE2B a5e2fe36065d4dfa50ea453120a67dc8e8e9ba139e07af85955f2134b8d9777d85af9d24215b585cb59149f11ac16e647d6238a2f4cccae822b76c87232aec6c SHA512 8dcc642644e129aed6f5f031c74a0cabb5d38a29ac4205fa68fc00c13801f0e2375daa06c45a3ea4f5dc241b8795b022b4e2b8d0c0e12c43fd937642dd39f42a
+EBUILD wine-vanilla-9.20.ebuild 14494 BLAKE2B c3fe419dba1ca93bdbd92beb0521cd836bd7335bae52445ce159d336762672a437c6b4efab354c6eb90d1b81d96857873c1dd28129d880cecfce9495ed3fb821 SHA512 651c8af50aacb059d4340467e73ceeff929163b2f9e4ff33dea6c2303531a6c32d38ae9772e508691a457639d1d00d1cc6041de5bf7ad73123ef8a2bae24e1ad
+EBUILD wine-vanilla-9.21.ebuild 14494 BLAKE2B c3fe419dba1ca93bdbd92beb0521cd836bd7335bae52445ce159d336762672a437c6b4efab354c6eb90d1b81d96857873c1dd28129d880cecfce9495ed3fb821 SHA512 651c8af50aacb059d4340467e73ceeff929163b2f9e4ff33dea6c2303531a6c32d38ae9772e508691a457639d1d00d1cc6041de5bf7ad73123ef8a2bae24e1ad
+EBUILD wine-vanilla-9999.ebuild 14494 BLAKE2B c3fe419dba1ca93bdbd92beb0521cd836bd7335bae52445ce159d336762672a437c6b4efab354c6eb90d1b81d96857873c1dd28129d880cecfce9495ed3fb821 SHA512 651c8af50aacb059d4340467e73ceeff929163b2f9e4ff33dea6c2303531a6c32d38ae9772e508691a457639d1d00d1cc6041de5bf7ad73123ef8a2bae24e1ad
 MISC metadata.xml 2726 BLAKE2B 7dc7490fabcda06a27061726225890ee203fe7d22209697c3997f0ccdb4699bfaa09f983c22c4919ce75d2eab6ebdb1add9d9af04f24aee63bae81116fc04094 SHA512 5cdbb062462ae791ff9727d184935af3af147c0bd1e49846731941513301b720313b3356f56a8295780ab822e3117146c9a669d2d96efba6f072d84adba770e6
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 bb1d6d125649..dfb613e944ad 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -261,6 +261,9 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
 	# https://github.com/gentoo/gentoo/pull/28355
 	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
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 3402577a7c2d..1f1319815791 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -255,6 +255,9 @@ src_configure() {
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
 	# https://github.com/gentoo/gentoo/pull/28355
 	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index c8cced499644..977ede6ca160 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -281,6 +281,9 @@ src_configure() {
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
 	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
 	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild
index 838210bfb98a..9c6db6a38766 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.19.ebuild
@@ -284,6 +284,9 @@ src_configure() {
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
 	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
 	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild
index 6feb10a57429..28fa6e38456c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.20.ebuild
@@ -284,6 +284,9 @@ src_configure() {
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
 	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
 	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild
index 6feb10a57429..28fa6e38456c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.21.ebuild
@@ -284,6 +284,9 @@ src_configure() {
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
 	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
 	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 6feb10a57429..28fa6e38456c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -284,6 +284,9 @@ src_configure() {
 	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
 	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
 	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]