6 files changed, 12 insertions, 383 deletions
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 62a3ffbf8a92..c50879652fc3 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -1,21 +1,13 @@
 AUX dxvk-1.10.3-gcc13.patch 398 BLAKE2B 48b1f18b8368a7dccdd479df8c37b6667fe918f4c47846e0c9e7bb5f04746fbb773decabd905a4877e1bea42ab9af88d042f667272969e0bda7d44f215d78938 SHA512 e3b84263641c3abb34c31721b29eaa314f02bbd15e1ee5b3e3cefd51f57f9123b2cbb32174ed1806dcb03994ee3db8df3282d5f4791d8f1188c09f7c55cbf113
 AUX dxvk-1.10.3-wow64-setup.patch 579 BLAKE2B bebc84f2cdcc32da5cd55db4041a26dd469175932536c02dc1049c95a259e6ab3a59dde507b04c8a29055ac0d8c2c96c2732efa81b5bf5b13c54300732e3d3a4 SHA512 1364feec383902e81a855929273126d519b0033064482a0662eda92569657b1a932bd8bd2584395a746bf14e443d9a9c2d75bf484bbb80654536a6c315ffa5dc
+AUX dxvk-2.3.1-gcc14.patch 167 BLAKE2B 3a52e5c02c145dd8732993f540db239ba8d9ef7b3d5546b90b1f64530700f7498e435a0acd0f9faee36138038f9aa374ec2fcf3e154be175892ce4d16b9ae2c5 SHA512 c3c2c16b0adcfbfff23a81c9bca02cc03954536366797688c5cce9e2a0b7dd14a904950e9b4e25a95e10da2a72044c1d6d214831fa639a4705cad46b9a282757
 DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B 3507ffe4abf9c45f2a138b05e7cf706322a6bf3d2e9ae86a9d6216b206c09f79eac696ee7dfe33d0bef55e727f51301c36eb89bfa3b3f429d7d5fafc1eebdcb4 SHA512 8995b231b3f3650beda04c01f30186d10a373075a4774b4ecbfb3bbeb4de99c57555f1db0611e5c61c6a411a7215e0faf228f9861f6b7adae6fc365e8056f7e3
-DIST dxvk-2.2.tar.gz 976671 BLAKE2B 537fb8d8adb69562f8e759c6f68e5ed38a62e6ebcf05d7ed1ea32fef518af30cd53d3ffec0e3dba175d449d80de980585f91bfcf8c3904a08385b17b55b9b63b SHA512 02d066093855c3ecae7123fcaeaa32212e03fcda9556c5b70ff23eadc07240199003b8e4673f5b492487fa6e240d70a36f5b4e60b0f389f422cf4474b7197e2f
 DIST dxvk-2.3.1.tar.gz 1005669 BLAKE2B d78448fcde9d600f7206dfa606fca4069e7563bb8b181fbc172691d6c45586904ae529550926a03612ed3cc1f2a2dff00990638125c1d7ce6179d3cd3ba8df04 SHA512 085567ac263872eb93d776ce7cf982690603e240a977dbb51ad69344af387fd745536ca62819afd4a809732a6f2d22b36c3df9538decf37dec527973d41e392f
-DIST dxvk-2.3.tar.gz 996736 BLAKE2B 55944472726e1d946b84cec386267bb65511c83a18647076b5d76c78d552ad2e4710a125c3e1a9f1c0c65b8de43a122c61aec5873ec0d566a20a1f4a9088f461 SHA512 d60421f6b93e09fb18d7f92f636bb228ec5d9ab6a90ca73e1e3c240c50ad35a90ac25fce1ac3f0a940c4da8e92e1c4267a2c602eaa78ff64db12507cc4d08173
-DIST dxvk-libdisplay-info-275e6459c7.tar.bz2 81172 BLAKE2B 7a1e9e2feeb95e06e9d3f49ad9d14a8a152cca525085e819cda0b69c238fb79dddd6d547cd0f0a4b51dfc1ec74ac4c006345b9fc48563807bc8ab3bab58ea5ff SHA512 794e94e8c16d65901a7b705d1ba3361817b4e9e19e520b1004bcab232d0347f5713594d67f3c2b79d4f86b3012e710c648975547d27a63de043fcbe9e6b7e66d
-DIST dxvk-libdisplay-info-d39344f466.tar.bz2 81232 BLAKE2B af76ccd3c40bc953008bc30d222c72f90bdc77f47f767b6e7423efaa0ec89d746396a755160b5470e219a15a0aa392be6066aab12921b45a1adb35d88132cd97 SHA512 79b4bf325cefc39bc587233bd82ff64c927ca5f829b8172d213c3d47af725c8dc7fe33576a8e96a869075ee2a8f00d165f3aa9e6c472e862a47e5c800b2b3315
-DIST dxvk-spirv-headers-0bcc624926.tar.gz 437771 BLAKE2B 08815e36ad99b84777e38ad0c5616b6608a552f993e7f67433f2b8e20de81e9bce41420ac5998f5b67bca70a92ce70aed91b238990bd431c7b97070dfb0c5a60 SHA512 5995cf75d5605d41e9643bca81c195ef5aaa17d596e0282807f6fa8f8c494f7b63a41d611c535ae43dc3d609436aabef1e0d89626f37e6f20bad17b5e122e32c
-DIST dxvk-vulkan-headers-85c2334e92.tar.gz 2046570 BLAKE2B 8e7f917d440793d85afae9227514fd97ae6cab6ece53abc54320808c10ddbc84a5421663f6b7549c98fbe8b8144a3c5b8bea73d39e6c99a289c5b0baadf3abd8 SHA512 eb7bcec11fb4e7302411c30501e72d567f481a14098ece9c54c023fe4644298f1c14268ef240cfe73ddb75f9817946513cc2218e34b706ea0be5e94ecbed0f91
-DIST dxvk-vulkan-headers-98f440ce68.tar.gz 1691979 BLAKE2B bf6fd288f16df7adcb5cebeb6e13713db1c26a0b833dead2fb522227861abc60b2d0cda8e3f46f8e89cccb629e01081ba27763989ad6fd336c60a475b198c1c8 SHA512 69238d37d0af0162e0fd68094cd2fa9baa320497d34a9de491dea086c23291d0815b51e89218b1f0ee2b3314cbc8ac1809d6edb15ca51fcb282fe1e2b39a1a77
 DIST libdisplay-info-275e6459c7ab1ddd4b125f28d0440716e4888078.tar.bz2 81172 BLAKE2B 7a1e9e2feeb95e06e9d3f49ad9d14a8a152cca525085e819cda0b69c238fb79dddd6d547cd0f0a4b51dfc1ec74ac4c006345b9fc48563807bc8ab3bab58ea5ff SHA512 794e94e8c16d65901a7b705d1ba3361817b4e9e19e520b1004bcab232d0347f5713594d67f3c2b79d4f86b3012e710c648975547d27a63de043fcbe9e6b7e66d
 DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121
 DIST spirv-headers-8b246ff75c6615ba4532fe4fde20f1be090c3764.tar.gz 472513 BLAKE2B f1ad7e11c306c62509655eb41d74efc5fb88688780d006c6944844e964b339baa000f70e115c4df2947e882c9ac33186e301b31138c38fe5f997f7af7260f521 SHA512 fe1d9d70b217b194c92dd397bca386ce8452bc5ec3967d64a257b3a531386fe6a6ecb5e9ed8ab5bc5a2707c5378f02f05809d6d197dcfb3f87cd33304c3b1959
 DIST vulkan-headers-46dc0f6e514f5730784bb2cac2a7c731636839e8.tar.gz 2255426 BLAKE2B efaf09df3274586c4df2bdd0b1dd9dd43b3b6125e0033ae87af999aea64709e9758bc7b675398b480ae063e28273732d768062d97f6cd61d63ccc798ca7410a5 SHA512 7ea993f7c8ff72dc6bedbfdaced29782ab372228e9111f747d931955e832a7920114f5d1953ecd34d220634a53449ca2ed4c0ed28d3165e258c4d9fafd0aa4be
 EBUILD dxvk-1.10.3-r1.ebuild 4988 BLAKE2B c1a07a25db7117285e6d0ba5bddcc5b9690b9171bf1c887547f6a9e9804bc3366b325859ac4f4d439b702ea38e96c51b5067cc21c354bd98a324430a2166b527 SHA512 8566dad60c3a8cc4e996bd8d1430ad7a62db5eae2860b635a998ea7c87c7f8a9fd2f268b1f736d27addbb3c408dac6ffb7f3993a02fb16d42b9c238f2692a945
-EBUILD dxvk-2.2-r1.ebuild 6586 BLAKE2B 7d4d75ad7d488a505a8d171df94e68442006a1f11070d3a3b932af1e639ec9d1694513f2c56a2084e1c5fdfce6ccecc09bb6f68a68efee4cdf4b015d43f5244e SHA512 3b1559fe19f983566203073d51d7c31cb821240f17f64f755c38b3bc7c97014c35b6b8574633f7096a35921234b14471928ee6fc4312094a88df2d50cc574188
-EBUILD dxvk-2.3.1-r1.ebuild 6628 BLAKE2B 6fcd0155b5a11000473d1405dc9ca0bffa074ab4b8dafd939c3699d8b5f39f531258a30778aa484e2feb65213278f37d03cb62347766ae200754db229932b87d SHA512 788ae1680e206ab956a09fc113095e19cef6ff2c441fc7631b7b1c214b2042edb592d3e7ffb63d174ca959ded7887a062de85e454e81008eba9db3bb420b40a8
-EBUILD dxvk-2.3.ebuild 6586 BLAKE2B 2d47d4e67b6077591f70998f08213cc58d9643f9b2b94eef6a3856fbbc38bbeafc9789bace6df1130ef91eb40e0e489a165ace1755f700644d5849515e034d90 SHA512 2147b8824e0a97ed7718769ed6a6fe0410a21ced0b02f368916dcb9c50d5a90972ab3a53ef56e6b892c244e900acaeb230ab331c0bfa8dc04df7b748f9aa4b5c
-EBUILD dxvk-9999.ebuild 6510 BLAKE2B b1a9aa080bc3d5248f79dada103bb2a95e2819dbe2cbd95f5d12491d5d042ad34199117181aee8f47fc50b1a24a217de6f5c09c78c4d76d29ddfdfe1a803067a SHA512 3896cfde2164f297a99cba69f7ea3bad3a068b53f88a944ad94421e571431ed900c85ec052a43b4ee912c7c7ba09157cab80cf92076a416f0c888076056e6232
+EBUILD dxvk-2.3.1-r1.ebuild 6667 BLAKE2B 95e1fae36421057feeaa3074dd7d366f27ba52dfd11ff418f26a162d6897abfed003a2da3c6babced0245af59935a96ff879b21dd5d31d629cc38514199e1a12 SHA512 2c2f5e4655b07abe4fa5d59aa52c7680eb45bbced21b5cc2e5e564690e20ddb2aec4081db12316594762b99a3df3cf861f7619b0679af7901ac856cd1933ac4b
+EBUILD dxvk-9999.ebuild 6549 BLAKE2B 74770ccd2d92d397c94ce43096a778b9703a40909175a56ee7257e0c124559692fde5405cc90466f0ebd31feae7daab8e2a30c177831796a0df31f21173ff315 SHA512 475805c56371a98c86b17e3403de24f67554d2360e9a9b9251c5a8371743406d4708e6d1647eaf78a764efa2eb6c0f38954cc2cee7da39205ebef3db00466170
 MISC metadata.xml 818 BLAKE2B 88081c074b99329c925174de4b7ff9b2c220ffc67eb64a5324f4eaf2a35f98f06c9978ddc0e929ba76b341a389a8eff025b7aa0a2414e3f7ae496c44a023c65c SHA512 90d76ac3df3abe003371cd25b9cf0e6570a53b371349fb2e048cae1818e51f0482e17b3d5490eb82c57d891bb43c4a7cd41530101b888591719c33c566788e3b
diff --git a/app-emulation/dxvk/dxvk-2.2-r1.ebuild b/app-emulation/dxvk/dxvk-2.2-r1.ebuild
deleted file mode 100644
index 1d3d3ded718f..000000000000
--- a/app-emulation/dxvk/dxvk-2.2-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb
-	HASH_VULKAN=98f440ce6868c94f5ec6e198cc1adda4760e8849
-	HASH_DISPLAYINFO=d39344f466caae0495ebac4d49b03a886d83ba3a
-	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
-			-> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
-			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
-		https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/${PN}-libdisplay-info-${HASH_DISPLAYINFO::10}.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 +d3d9 +d3d10 +d3d11 debug +dxgi"
-REQUIRED_USE="
-	|| ( d3d9 d3d10 d3d11 dxgi )
-	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
-)
-
-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}
-		$(meson_use {,enable_}d3d9)
-		$(meson_use {,enable_}d3d10)
-		$(meson_use {,enable_}d3d11)
-		$(meson_use {,enable_}dxgi)
-		$(usev !debug --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_preinst() {
-	[[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
-}
-
-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."
-	elif [[ -v DXVK_HAD_OVERLAY ]]; then
-		# temporary warning until this version is more widely used
-		elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays."
-		elog "If you were using symbolic links in wine prefixes it may be necessary to"
-		elog "refresh them by re-running the command:"
-		elog
-		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
-		elog
-		elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load"
-		elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for handling configs."
-	fi
-
-	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
-		ver_test ${REPLACING_VERSIONS##* } -lt 2.0
-	then
-		elog
-		elog ">=${PN}-2.0 requires drivers and Wine to support vulkan-1.3, meaning:"
-		elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
-		elog "For details, see: https://github.com/doitsujin/dxvk/wiki/Driver-support"
-	fi
-}
diff --git a/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild b/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild
index 71e43a8fd5eb..83b5127b668d 100644
--- a/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild
@@ -55,6 +55,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
+	"${FILESDIR}"/${PN}-2.3.1-gcc14.patch
 )
 
 pkg_pretend() {
diff --git a/app-emulation/dxvk/dxvk-2.3.ebuild b/app-emulation/dxvk/dxvk-2.3.ebuild
deleted file mode 100644
index 2a0cdc34b1a0..000000000000
--- a/app-emulation/dxvk/dxvk-2.3.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb
-	HASH_VULKAN=85c2334e92e215cce34e8e0ed8b2dce4700f4a50
-	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
-			-> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
-			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
-		https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/${PN}-libdisplay-info-${HASH_DISPLAYINFO::10}.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 +d3d9 +d3d10 +d3d11 +dxgi +strip"
-REQUIRED_USE="
-	|| ( d3d9 d3d10 d3d11 dxgi )
-	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
-)
-
-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}
-		$(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_preinst() {
-	[[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
-}
-
-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."
-	elif [[ -v DXVK_HAD_OVERLAY ]]; then
-		# temporary warning until this version is more widely used
-		elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays."
-		elog "If you were using symbolic links in wine prefixes it may be necessary to"
-		elog "refresh them by re-running the command:"
-		elog
-		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
-		elog
-		elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load"
-		elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for handling configs."
-	fi
-
-	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
-		ver_test ${REPLACING_VERSIONS##* } -lt 2.0
-	then
-		elog
-		elog ">=${PN}-2.0 requires drivers and Wine to support vulkan-1.3, meaning:"
-		elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
-		elog "For details, see: https://github.com/doitsujin/dxvk/wiki/Driver-support"
-	fi
-}
diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild
index 210cfcc0e294..d5c49f045d48 100644
--- a/app-emulation/dxvk/dxvk-9999.ebuild
+++ b/app-emulation/dxvk/dxvk-9999.ebuild
@@ -55,6 +55,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
+	"${FILESDIR}"/${PN}-2.3.1-gcc14.patch
 )
 
 pkg_pretend() {
diff --git a/app-emulation/dxvk/files/dxvk-2.3.1-gcc14.patch b/app-emulation/dxvk/files/dxvk-2.3.1-gcc14.patch
new file mode 100644
index 000000000000..957735b1909e
--- /dev/null
+++ b/app-emulation/dxvk/files/dxvk-2.3.1-gcc14.patch
@@ -0,0 +1,7 @@
+for std::remove_if
+--- a/src/d3d9/d3d9_mem.cpp
++++ b/src/d3d9/d3d9_mem.cpp
+@@ -5,2 +5,3 @@
+ #include "../util/util_likely.h"
++#include <algorithm>
+ #include <utility>