gentoo auto-resync : 08:04:2025 - 08:43:11

8 files changed, 203 insertions, 501 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index b26a445e9e03..a77fedac1720 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index ecdcdc505020..152cc8ff5f9c 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -4,6 +4,7 @@ AUX dxvk-2.4-d3d8-setup.patch 220 BLAKE2B 7f21542907d02e2924595aaff3270988214913
 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.3.tar.gz 1142475 BLAKE2B 04bfb577902effec9e22b6546cdfc2b3dd76b84e72c23cb26ac4e54f7aa9464b15d7d74b41dd810fc62d4fff9bbb24cee2771f562a7b931025abfa5995b000bc SHA512 93de46ab69dceea9e13904d9f267a53295a885676bce432c13d992ea33553250e03a695caf15f2c0a9a416c0ed3d799a9155a09dcadfeb43e516780fb188b122
+DIST dxvk-2.6.1.tar.gz 1209938 BLAKE2B 590a83297c0f4adc7828326cbb782103e1030e84c009d3983a756e285ea495cd55232a3e86626563a90fec328514c591a5d331df0cef51a8c422cb36fe723552 SHA512 0fcdfcacfecbcac2c638e2746d78759d144288975c7ee493b69d5dbcb3f13099e1472fd9ae50e52c12702f9fd74c91da8b1da5f8e6f96467826135947317829b
 DIST dxvk-2.6.tar.gz 1202585 BLAKE2B 5fe8f928dcb38b7842dcb6c8263e6e8d7f32a41722d331686e592b9424c2f2e8e5ba04808b99bd22be6da67ed554cfc7877fdca8608c886ca5845eba4528a9e1 SHA512 7b70cc5106716751603781c26377aeedd6180bba1872646f0d5d90e42167667ba79f9131c1a6050d87642da74563cd0d638f8c62e70b727a50e788e8d597f8dc
 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-2.3.1-r1.ebuild 6488 BLAKE2B 2278cfc65c5660e6f84a62596286c0697dd46313901c2dccbb4f7cfa935466d44a953fd79d88c3a8f5feb870ca3711bebca84e87dbe915a205b101e2b310ffe3 SHA512 1f7d64d29268881885778b61b4f51b17d6bbace0c4090df766b594f0a4c1ce7950844b6e310b996b9c316335b11eab012f6c9c8d756123712808b156991126cd
 EBUILD dxvk-2.4.1.ebuild 5927 BLAKE2B 6191560ce91c21d16b6376d2414b270ef361168dcae45bb7f10be862f22e6b5736d1db5775c6cd3871dbb2980f35aae6a1dcf0f9d53a8565cd471e4a8fc35f2d SHA512 2d8788903bbb549e95434e78ef74c00096b9a1ae62e4be3330a6b67ea6b63621a063996a12af54aadd82d0e7e09721cc702190a11ad8d66558d33834fb8030fc
 EBUILD dxvk-2.5.3.ebuild 5888 BLAKE2B 555b3d035f2f22865e65139b32c1d41581b7ac1869ce8cc997e759f00dd91165f8d920af96a9d9a866da6e04bc54a2d1fdab60e7aed7ddba358d98d38a05dd88 SHA512 8c31de7ac960060198217ab341fc8876c314f89436f77b2c50d5c233ad0aba244d4297dacbb98b0d952be5f7c4976f91cddc60e0a14c82308595ce1d185cbe4e
+EBUILD dxvk-2.6.1.ebuild 5890 BLAKE2B 453576e4b025fc91b24e20dc101d114f786cb4b139751796d87e25d1905b4b5fd682779713053f89203b33cf0c3a1bbd981fca121c3dc9d8d36474c338efa019 SHA512 d0a0b106dacc6916adcaa2876929295a932000adcf0dcc5f3e98545cdb3b5210d6ed4cb66f2a8f51103269eaff6498e4a293c4282b2f22f946043de47c516ffe
 EBUILD dxvk-2.6.ebuild 5888 BLAKE2B 086da12a679d95d52eb733a871cda2a75b5a17861a977183dbd41947788eb82b71317fc208c26a306e863e030af352595d1da072a3f11d3572e9aeac192866bd SHA512 98dc6a2b86d09a7404f88cb9cbaae3bb55943a2f41aecf0fea262f8d3d812ed8b629a462438bf51e44d5f95a6e8d7bc4284f063d2c98456391d806dfaed7c2b8
 EBUILD dxvk-9999.ebuild 5770 BLAKE2B 175a20e55893182579689dd6fb6d08d68a4a19e14864f8d357b0f91cfa48047cc31541e4e28e0a9a67c61629fe50193909b83f95271f3af683f3a256fffbce41 SHA512 9c0eb71c36e46e5e4f69823daa1a010ff10aa173508f6306e465a80aca9ce4a3e55425a10e35a1f993803a35158203b85cc22147511923e83c6835ed1bfd6f24
 MISC metadata.xml 944 BLAKE2B 804e365c1a6f88001f88c96e0e7cd67d444bee147d764b6c2dff0fb37d836754a2c21a1ea8b505b11c9de93dbc2533e10d0e15dea72b0c05db9d5ada2123a90e SHA512 c7f045fed2ef25fed4094551d0a420fe218d541a678cce4a18fce3d8c090e64dfacbdcce67fcfa202d4c3aeed8911a83b2bf5077e7e13a75aa0e5902d33e4716
diff --git a/app-emulation/dxvk/dxvk-2.6.1.ebuild b/app-emulation/dxvk/dxvk-2.6.1.ebuild
new file mode 100644
index 000000000000..5700f2a8b954
--- /dev/null
+++ b/app-emulation/dxvk/dxvk-2.6.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2022-2025 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 eapi9-ver 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=234c4b7370a8ea3239a214c9e871e4b17c89f4ab
+	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 and mingw-gcc do not mix safely here
+	# https://github.com/doitsujin/dxvk/issues/4746#issuecomment-2708869202
+	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 && ver_replacing -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/libvirt/Manifest b/app-emulation/libvirt/Manifest
index f644316ba7aa..edc288bd329d 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -20,6 +20,6 @@ DIST libvirt-11.1.0.tar.xz 9775904 BLAKE2B 81ce8d537d6d069d44b3e24f2091729acd8b0
 DIST libvirt-11.1.0.tar.xz.asc 833 BLAKE2B c1d580c77a336eb83fcc47fd12e0595952612cdb6765adb7c1bb8708457642799833fb7082410198ccf9f22c82714ec0cb288045e0ad4fefdff219b259815b15 SHA512 914237e6341f6df60f407d5e47d4ae1193a75fee905d9faa4a439eda421e446c84909d08b21927b41e0972c90c0eeecb4821fefefcf454872e2887ce91344be3
 EBUILD libvirt-10.10.0-r1.ebuild 10172 BLAKE2B 4fcfec9ef56ba146955ba821f8badbc1de0350a88b216a6e705a3d15546f52cb083a9aac612ae5ab3d6ab38eb0b4d12be7c9965084c3c213ad9f86a74b1e3258 SHA512 92d179c3fc9d0ed53d83f930a107081e62c67efab1ff136adc3332a080d4ce3aea9d93c332ee32406804a99ee3bad4951b7408292770bd0c21911d73f2008c81
 EBUILD libvirt-11.0.0.ebuild 10088 BLAKE2B cd8d867441289e994ae329426272bdbf49ed4d79e8145556c2b168fc7a1c07c4242ca7969359eca74e5ad8f4caa837dd517d28a7c11fb4cb60a04e455289ff5a SHA512 c50841c8dc8a7eb3cd0ab543f4a15098707729e2ff3c531bc9e3efaf8efa2d8ef8ac7f58858d43d228bff46768d237077454cde4adf7fc6d048dae1eb1f1e57b
-EBUILD libvirt-11.1.0.ebuild 9809 BLAKE2B 40b5a8069907614a504a2d6d718c3b4a190d6999ee8f0aafed0fbe3c5d01e142e4bc5958a76d5a69ef5a4a8a683027cc4e0dd5c9e51c4ed79e2e0ca49b503a71 SHA512 7122fce57ffb212382a4724d869a67b050341792c146b18fab7c7bb22ef7830c863234a7f36f05f1378c35649e9b38eeab779b797a6a2d656fffa5b649c19a21
+EBUILD libvirt-11.1.0.ebuild 9806 BLAKE2B f671eef8ad22011e124f1bf40de69f9813bc092a8ace13e152a79e965ed2d1ae1bb7e724268a9ff66eaad562269563a969e47b685107c1eb07ba2eff0c2ac69b SHA512 1538ef994049dbf1fe9cdc5db4f23140623af7cad6007b396e9d06955d93624a33f935b1f2183c3dbb706b0d0c3d3b38ff563f445d55b0136fcd084340631e6c
 EBUILD libvirt-9999.ebuild 9809 BLAKE2B 40b5a8069907614a504a2d6d718c3b4a190d6999ee8f0aafed0fbe3c5d01e142e4bc5958a76d5a69ef5a4a8a683027cc4e0dd5c9e51c4ed79e2e0ca49b503a71 SHA512 7122fce57ffb212382a4724d869a67b050341792c146b18fab7c7bb22ef7830c863234a7f36f05f1378c35649e9b38eeab779b797a6a2d656fffa5b649c19a21
 MISC metadata.xml 3822 BLAKE2B badb40564def06854a0c3af011b5de2888d722996c9b15df570a709161e49796f3d76ba2365c4adc1724f16bee3518d0e87ed6d2619d505b5ba2f1fd02c90f34 SHA512 f31e86b4d0c1faaf5bf0ac253cf20ce7728b94841debb590356efc0fa1e1a3d095a94e69ce0a34f793faadf10ed00ae1212aac54d13288f1975db4f032fd8b50
diff --git a/app-emulation/libvirt/libvirt-11.1.0.ebuild b/app-emulation/libvirt/libvirt-11.1.0.ebuild
index 78840580fa60..c8935a98ecc8 100644
--- a/app-emulation/libvirt/libvirt-11.1.0.ebuild
+++ b/app-emulation/libvirt/libvirt-11.1.0.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://download.libvirt.org/${P}.tar.xz
 		verify-sig? ( https://download.libvirt.org/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 fi
 
 DESCRIPTION="C toolkit to manipulate virtual machines"
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 5b8e43e5adfd..fc5f0a7377cc 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -3,22 +3,19 @@ AUX wine-staging-7.17-noexecstack.patch 223 BLAKE2B 6e6cfc208f11c2c2b7bbc392e370
 AUX wine-staging-7.20-unwind.patch 1450 BLAKE2B 80e9222c95393aaa4b95e05597a4181030fc988d95e416d2f92631f29f640b9abb3dd0853d005de4725b41c09224e478741902075259d48a30830a923790579f SHA512 e1a72f1463be32975daa02064acb96189cd79cb41ff98f89b58e46c97100a3ac46405b1b9982378c9de275acbdb74168853e47b932e06398cdd2981b23f483ce
 AUX wine-staging-8.13-rpath.patch 554 BLAKE2B 209d8c581a9178242ee622338c5252f79b798cf5574f72b3984d71b7933e011b488060502715aa75630fbc3d10fcb03743ac31ed31664cacfc22b725253a117b SHA512 bbb25e02d19bd7c1a1f2d7db331d93cfcd5ce9172206ad9e19a44c52e5ece865d474eac024c2a5791dfa006c6efe0f68cd783ffc925ac793bf447d56090bdd02
 DIST wine-10.0.tar.xz 32011244 BLAKE2B 92178cf484cf33e9f3b8340429ee8e68c36e0d25eee4a892f059ab73f103cfcb9eb15e1883bc9fd8c8fe311d4ccbb56582d1f780da7b1406a7839a13addd29ae SHA512 effb41c5641993e2e52eaa825cc19b7d9846e084992c5a5b066ead2339b24384d320898a9cee347a9a87106bcb3b0f54c8cd2c8d4de3a887a658052ddd5168d6
-DIST wine-10.1.tar.xz 32026152 BLAKE2B 573c4cc10c96c164eb02111b0a457be5500ab42c6d103180af5b2f88cdbcc134ea1fdb794687e6c736ebb5f9aa266e51424df26cd239fa26679d968ab5844cc3 SHA512 2dbc63e43e2cc1e0bf6294a926e8afc316e9f32efdce644229cb33bba98f6001c3f285b527767a83e5284558ef11f00515048aad031c6fc9122a4ce0692952af
-DIST wine-10.2.tar.xz 32050716 BLAKE2B 78a60d82640c9ffdf8a96b58aaa8a86cce0f67d48dc082e97a2bfaf077f849b99fa7d5418a42d2f18176afedd9a7270a08ca872af5c43c10fd64fe1eddf7cfdf SHA512 893395e29d72898579850c4084838c76b8a53659b4a3917e47d853733fafaa0e57bfde31437862955cdfab94327622eb290488d6120d76eeb2a4fa70dff5ef67
 DIST wine-10.3.tar.xz 32280996 BLAKE2B 49e3e1d4da74a647c01b3326b2d79ac102fa67b43cd3134e8ca66696003ee9f1a5835b093896d8b8e4ff1fd2c229db8c004fdcfec79fbc0d559985094374a4e1 SHA512 361edb93f062f44592b55ba298d1e2b49857bf067791cc92424c812412aff93955dcb7726e3f87fd304f3e567693b547fa5a149b58990c914f91c585fede2716
 DIST wine-10.4.tar.xz 32326532 BLAKE2B f51bee9115f236d13be717f524bfb21d4aa3bd3bc4114d8fe9f106957e01f57e14bdd415e6cc494e6860244d43fd906d69e17055822954490ae6e7562e562e6c SHA512 e1f2bf5bd021fe9937cb27e1ee3ce0e5ff06a32abe3d1e07eb6083f5dcdfcd84e5b4d631dd1a83686dd7a42a1b84eec848ec08a256c2570a709d830ce7f7208a
+DIST wine-10.5.tar.xz 32353760 BLAKE2B a8551905f63ec7806a89986bfdb73b1f171b74f604bd00d9815cf8efe457268b99655b12d0d8d9aa19e08a6566aa4f20ddfc6b4549f4eb81abc49a61d195d444 SHA512 d923e4406665721e1fb6db53cd4199b513b49f9f3a6825327635a2fa169d992067408b8958f749d05d59f66f32bfe418dabb73768fb97a5501c90d1bc0cb7c50
 DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1 SHA512 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 DIST wine-staging-10.0.tar.gz 9490601 BLAKE2B 2843d6fbeca285a258dbb7505e2451d183b175a9d0b95a03551d635ca8a81c5ba5702d634f45be8d8574435a0fc77b84ca289350e4e74e97b9d5c7b1b8706fbe SHA512 1340473c0ede35450d9cb91bdca2fb237dd2c19e7cde7a05f3c2c70b741f4321e54a1cc4042a48dc83e07dc6967c904fae6c22233ce28fbc6dfa836cef281250
-DIST wine-staging-10.1.tar.gz 9542987 BLAKE2B d23934dd7da9f324935087ad7cff74e544bc8191e3570a125e468c18a170459135ef37cce3780f4625c8b4e330c5bf3f32c59d1cd034a465def3ec60c7efa65c SHA512 1b837a2b0c417dcf1821139b0cf220995305b22e59cc5d93b5055d4c6dc9c36da7b05f6a9f136b5f1a60618e497c0e4d295343880504f7ebb1e9fafeb2f0b38a
-DIST wine-staging-10.2.tar.gz 9386579 BLAKE2B 2a6346a3091bc187cb6ecacb5bff28975cf1e0343254b83cb6fcb907eb0f2f418838e29b7093f4e1683f4402f3a8278fd58465b92f4f83a20e4962faa9a55a6a SHA512 e5ef197786c8dd50f21d000a19ec3c9acff6d93fcf975f3539e5fe54a951e31bbe97b882ce8f8b00f35757c85ffe377c966bb7b95b6cfb8e25d95ca9f2bc5e10
 DIST wine-staging-10.3.tar.gz 9417555 BLAKE2B 535dc17d7bd0880a07b119287e58c921d6a51472ea71d87e5deea2673bb11cd2abefdedca3480817d7603296e58f9e80b0c588374572f6e9d18c82fe98fc5515 SHA512 e767f3c1ed49eec5e0522bc7c8f02d97c3e8fdac2003e4833b27d58eb8347c65663ce4a081705142cff8ae0e5326196a36fe9b545a9fb8359994c94cc39a466a
 DIST wine-staging-10.4.tar.gz 9476104 BLAKE2B 6d34e553ae81bcd496b6fbb8ebcdd1c35501cf8fb8d0860766a6b89612d47fb3e4a9cd5f1d43f38627f6293274bcee20166b8df36ea2d4e24851038bfe37e113 SHA512 3b0580baeb5dd7a5a224a2977fd6693795d7a86d7692b1707eba8bc9f849057a88566aa45bacbb5ded609ede3b0196c68116b368a527d695cafda1ac4ebef3cf
+DIST wine-staging-10.5.tar.gz 9483907 BLAKE2B 82fa1c199d208036b28e23b79f18045d1f856379314144fd96c3901d99a94b0813832dfe2a53dd3f352489c271d92d8491f5b28dacd33747b1d86806be89d3cb SHA512 f4f0b53093024043e3f63da4a4b5568d5eb33cdf8e4db8aa71c43a6e3cd534822c9ba7b4af19b52069f8049a47df53058a0dcc07b26f4f60162c3e0dbb4d4e20
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718 SHA512 362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
 EBUILD wine-staging-10.0.ebuild 15733 BLAKE2B d6be4c6972952e010bdf73f222f3bc7d3f12ef30afc5207813f7f80ddbcd4d51f207ac9001a65cd631011dd9122262124b60a456ab404fa6ca787f538064a99a SHA512 6f46e260620932b1fd59cafcf406963e447230416d1cd82606bd7baed5e67688d0e7f487fe0df3261df60a548ae6df46ac4f4f8d342115d38f32015e4a0cd34d
-EBUILD wine-staging-10.1.ebuild 15733 BLAKE2B d6be4c6972952e010bdf73f222f3bc7d3f12ef30afc5207813f7f80ddbcd4d51f207ac9001a65cd631011dd9122262124b60a456ab404fa6ca787f538064a99a SHA512 6f46e260620932b1fd59cafcf406963e447230416d1cd82606bd7baed5e67688d0e7f487fe0df3261df60a548ae6df46ac4f4f8d342115d38f32015e4a0cd34d
-EBUILD wine-staging-10.2.ebuild 15038 BLAKE2B cb8cf1bfe03760dbdf92a26bd96a822460ce7e3f63ca5eac2f94bdd5469c78cc0b5af7eab3952cb2a8929e21d2476d1091ce6db115443984604a24085115c4da SHA512 4559680f35c1f333e4c3b1a78156b26c497a82a1162422ad485c3eb51c3d875da00114bb4ae96b2c411ae5bed12108486c8480f7f417132139ff50358461f063
 EBUILD wine-staging-10.3.ebuild 15072 BLAKE2B a831a394db07824df28a797026c1440fe1670da2f1680500c41146ed4c0a01fa0830626f06a1965eacf926371e262d44bab57d7097624ce754293d139982f54a SHA512 7160d214a90eeb5dafc41a61b4bdd4ff2fa83aca47d33d5c6e6d3f1d306ea5c0f8ae93ab6325a913a8cc4c288b90d7de0d423961122d0a17e90727ec6ddc373a
 EBUILD wine-staging-10.4.ebuild 15072 BLAKE2B a831a394db07824df28a797026c1440fe1670da2f1680500c41146ed4c0a01fa0830626f06a1965eacf926371e262d44bab57d7097624ce754293d139982f54a SHA512 7160d214a90eeb5dafc41a61b4bdd4ff2fa83aca47d33d5c6e6d3f1d306ea5c0f8ae93ab6325a913a8cc4c288b90d7de0d423961122d0a17e90727ec6ddc373a
+EBUILD wine-staging-10.5.ebuild 15247 BLAKE2B a44cbc6a4544798bed9f4875607fea9910f59d2c68af2b5193554862c2ac0acbff8ed3ce0f8623e10fc5d4624825eafa99d1b28dcf87bb4b806982da075f4a41 SHA512 22f983df8e08436c743b2c4ba6f6bfe6763f68a20bdc7d9dbeda9efd9f87f2a13faa4b53240c18d0892395f8163cc5d87a1f704fc7721727ccb65eae018d1a5c
 EBUILD wine-staging-9.0.ebuild 15938 BLAKE2B 54dca02aa0f97e101b83f982136e5f2af432a3e2393c0a2948d2054990c0919d91c091512a92406ead1bc644b0e786d911b70b1722f488b9540349a114eae7cb SHA512 0a81f20d234ae18a9a4cef65f65263da5af0572366bd4a7cdf9ba66631a5bb022dd05f5d7c14dfee7b9e0a3a05edc481f43cb8bf58941147687db8be4a50581a
 EBUILD wine-staging-9999.ebuild 15247 BLAKE2B a44cbc6a4544798bed9f4875607fea9910f59d2c68af2b5193554862c2ac0acbff8ed3ce0f8623e10fc5d4624825eafa99d1b28dcf87bb4b806982da075f4a41 SHA512 22f983df8e08436c743b2c4ba6f6bfe6763f68a20bdc7d9dbeda9efd9f87f2a13faa4b53240c18d0892395f8163cc5d87a1f704fc7721727ccb65eae018d1a5c
 MISC metadata.xml 2633 BLAKE2B 9e8d90c3e1057c2087150657a6cb7e33609d981b11a8a490bf9479c85e9759b32dfb0d4d3179e1cd04192f6949c083d21097eac5ac47e7e38e9fd252b1df5133 SHA512 3f4df059fe41f12b5cbe8f5a5596646bae991860dad281572dcf4cb74596446bcea50d274418c6b2640d4e2a1818e9f14c784596ab3ceff8a7fa2551839371cd
diff --git a/app-emulation/wine-staging/wine-staging-10.1.ebuild b/app-emulation/wine-staging/wine-staging-10.1.ebuild
deleted file mode 100644
index 123f2df0684d..000000000000
--- a/app-emulation/wine-staging/wine-staging-10.1.ebuild
+++ /dev/null
@@ -1,485 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit autotools edo flag-o-matic multilib multilib-build optfeature
-inherit prefix python-any-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.4.0
-WINE_P=wine-$(ver_cut 1-2)
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git"
-	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="
-		https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
-		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="
-	https://wiki.winehq.org/Wine-Staging
-	https://gitlab.winehq.org/wine/wine-staging/
-"
-
-S="${WORKDIR}/${WINE_P}"
-
-LICENSE="LGPL-2.1+ BSD BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
-	llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
-	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
-	+strip +truetype udev +unwind usb v4l +vulkan wayland wow64
-	+xcomposite xinerama
-"
-# bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )
-	wow64? ( abi_x86_64 !abi_x86_32 mingw )
-"
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-	wayland? (
-		dev-libs/wayland[${MULTILIB_USEDEP}]
-		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? (
-		|| (
-			games-emulation/dosbox
-			games-emulation/dosbox-staging
-		)
-	)
-	gecko? (
-		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
-		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
-	)
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	samba? ( net-fs/samba[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )
-"
-# gitapply.sh "can" work without git but that is hardly tested
-# and known failing with some versions, so force real git
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		sys-devel/binutils
-		llvm-core/lld
-	)
-	dev-lang/perl
-	dev-vcs/git
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? (
-		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-	) )
-	nls? ( sys-devel/gettext )
-	wayland? ( dev-util/wayland-scanner )
-"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900334)
-	res_getservers # false positive
-)
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.20-unwind.patch
-	"${FILESDIR}"/${PN}-8.13-rpath.patch
-	"${FILESDIR}"/${PN}-10.0-binutils2.44.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local mingw=-w64-mingw32
-		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
-			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
-			if ! type -P ${mingw}-gcc >/dev/null; then
-				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
-				eerror "yourself by installing sys-devel/crossdev then running:"
-				eerror
-				eerror "    crossdev --target ${mingw}"
-				eerror
-				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
-				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
-			fi
-		done
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-		git-r3_src_unpack
-
-		# hack: use subshell to preserve state (including what git-r3 unpack
-		# sets) for smart-live-rebuild as this is not the repo to look at
-		(
-			EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-			EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-			EGIT_CHECKOUT_DIR=${S}
-			einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
-			git-r3_src_unpack
-		)
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	local patchinstallargs=(
-		--all
-		--no-autoconf
-		${MY_WINE_STAGING_CONF}
-	)
-
-	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
-
-	# sanity check, bumping these has a history of oversights
-	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-		dlls/appwiz.cpl/addons.c || die)
-	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-		local gmfatal=
-		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
-		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
-	fi
-
-	default
-
-	if tc-is-clang; then
-		if use mingw; then
-			# -mabi=ms was ignored by <clang:16 then turned error in :17
-			# 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
-			# 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
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# datadir is not where wine-mono is installed, so prefixy alternate paths
-	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
-
-	# always update for patches (including user's wrt #432348)
-	eautoreconf
-	tools/make_requests || die # perl
-	# tip: if need more for user patches, with portage can e.g. do
-	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
-	#     > /etc/portage/env/app-emulation/wine-staging
-}
-
-src_configure() {
-	WINE_PREFIX=/usr/lib/${P}
-	WINE_DATADIR=/usr/share/${P}
-
-	local conf=(
-		--prefix="${EPREFIX}"${WINE_PREFIX}
-		--datadir="${EPREFIX}"${WINE_DATADIR}
-		--includedir="${EPREFIX}"/usr/include/${P}
-		--libdir="${EPREFIX}"${WINE_PREFIX}
-		--mandir="${EPREFIX}"${WINE_DATADIR}/man
-
-		$(usev wow64 --enable-archs=x86_64,i386)
-
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		--disable-tests
-
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
-		$(use_with dbus)
-		$(use_with ffmpeg)
-		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
-		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with opencl)
-		$(use_with opengl)
-		--without-osmesa # media-libs/mesa no longer supports this
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
-		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_with smartcard pcsclite)
-		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vulkan)
-		$(use_with wayland)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(usev !odbc ac_cv_lib_soname_odbc=)
-	)
-
-	filter-lto # build failure
-	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)* ]]
-	then
-		has_version -b sys-devel/binutils &&
-			append-ldflags -fuse-ld=bfd ||
-			append-ldflags -fuse-ld=lld
-		strip-unsupported-flags
-	fi
-
-	if use mingw; then
-		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-		# CROSSCC was formerly recognized by wine, thus been using similar
-		# variables (subject to change, esp. if ever make a mingw.eclass).
-		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
-		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
-		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
-
-		conf+=(
-			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
-			ac_cv_prog_i386_CC="${mingwcc_x86}"
-
-			CROSSCFLAGS="${CROSSCFLAGS:-$(
-				filter-flags '-fstack-protector*' #870136
-				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,*'
-
-				# -mavx with mingw-gcc has a history of issues and still see
-				# users have problems despite -mpreferred-stack-boundary=2
-				append-cflags -mno-avx
-
-				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-			)}"
-
-			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
-				filter-flags '-fuse-ld=*'
-
-				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-			)}"
-		)
-	fi
-
-	# order matters with multilib: configure+compile 64->32, install 32->64
-	local -i bits
-	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-	(
-		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
-		mkdir ../build${bits} || die
-		cd ../build${bits} || die
-
-		if (( bits == 64 )); then
-			conf+=( --enable-win64 )
-		elif use amd64; then
-			conf+=(
-				$(usev abi_x86_64 --with-wine64=../build64)
-				TARGETFLAGS=-m32 # for widl
-			)
-			# _setup is optional, but use over Wine's auto-detect (+#472038)
-			multilib_toolchain_setup x86
-		fi
-
-		ECONF_SOURCE=${S} econf "${conf[@]}"
-	)
-	done
-}
-
-src_compile() {
-	use abi_x86_64 && emake -C ../build64 # do first
-	use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
-	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
-	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
-	# one or the other could be missing and that is unexpected for users
-	# and some tools like winetricks)
-	if use abi_x86_64; then
-		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine64 ${WINE_PREFIX}/bin/wine
-			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-
-			# also install wine(1) man pages (incl. translations)
-			local man
-			for man in ../build64/loader/wine.*man; do
-				: "${man##*/wine}"
-				: "${_%.*}"
-				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-				newins ${man} wine.1
-			done
-		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
-			dosym wine ${WINE_PREFIX}/bin/wine64
-			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
-		fi
-	fi
-
-	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
-	# create variant wrappers for eselect-wine
-	local bin
-	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-	done
-
-	if use mingw; then
-		# don't let portage try to strip PE files with the wrong
-		# strip executable and instead handle it here (saves ~120MB)
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-
-		if use strip; then
-			ebegin "Stripping Windows (PE) binaries"
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
-			eend ${?} || die
-		fi
-	fi
-
-	dodoc ANNOUNCE* AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	if use !abi_x86_32 && use !wow64; then
-		ewarn "32bit support is disabled. While 64bit applications themselves will"
-		ewarn "work, be warned that it is not unusual that installers or other helpers"
-		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
-		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
-	elif use abi_x86_32 && { use opengl || use vulkan; }; then
-		# difficult to tell what is needed from here, but try to warn
-		if has_version 'x11-drivers/nvidia-drivers'; then
-			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
-				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
-				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-				ewarn "applications under ${PN} will likely not be usable."
-				ewarn "Multi-card setups may need this on media-libs/mesa as well."
-			fi
-		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
-			ewarn "media-libs/mesa seems to be in use but is built without"
-			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
-			ewarn "applications under ${PN} will likely not be usable."
-		fi
-	fi
-
-	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
-		games-util/game-device-udev-rules
-
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	if has_version -b app-eselect/eselect-wine; then
-		eselect wine update --if-unset || die
-	fi
-}
diff --git a/app-emulation/wine-staging/wine-staging-10.2.ebuild b/app-emulation/wine-staging/wine-staging-10.5.ebuild
index 9dfefa4db762..4d42567b583c 100644
--- a/app-emulation/wine-staging/wine-staging-10.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-10.5.ebuild
@@ -9,7 +9,7 @@ inherit autotools edo flag-o-matic multilib multilib-build optfeature
 inherit prefix python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.4.0
+WINE_MONO=10.0.0
 WINE_P=wine-$(ver_cut 1-2)
 
 if [[ ${PV} == *9999 ]]; then
@@ -32,20 +32,25 @@ HOMEPAGE="
 
 S="${WORKDIR}/${WINE_P}"
 
-LICENSE="LGPL-2.1+ BSD BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+LICENSE="
+	LGPL-2.1+
+	BSD BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
+	|| ( WTFPL-2 public-domain )
+"
 SLOT="${PV}"
 IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
-	llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2
-	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
-	+strip +truetype udev +unwind usb v4l +vulkan wayland wow64
+	+X +abi_x86_32 +abi_x86_64 +alsa bluetooth capi crossdev-mingw cups
+	+dbus dos llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko
+	gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl
+	+opengl pcap perl pulseaudio samba scanner +sdl selinux smartcard
+	+ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64
 	+xcomposite xinerama
 "
 # bug #551124 for truetype
-# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
+# TODO?: wow64 can be done without mingw if using clang (needs bug #912237)
 REQUIRED_USE="
 	X? ( truetype )
+	bluetooth? ( dbus )
 	crossdev-mingw? ( mingw )
 	wow64? ( abi_x86_64 !abi_x86_32 mingw )
 "
@@ -136,6 +141,7 @@ DEPEND="
 	${WINE_COMMON_DEPEND}
 	sys-kernel/linux-headers
 	X? ( x11-base/xorg-proto )
+	bluetooth? ( net-wireless/bluez )
 "
 # gitapply.sh "can" work without git but that is hardly tested
 # and known failing with some versions, so force real git
@@ -310,6 +316,11 @@ src_configure() {
 		$(use_with wayland)
 		$(use_with xcomposite)
 		$(use_with xinerama)
+
+		$(usev !bluetooth '
+			ac_cv_header_bluetooth_bluetooth_h=no
+			ac_cv_header_bluetooth_rfcomm_h=no
+		')
 		$(usev !odbc ac_cv_lib_soname_odbc=)
 	)