6 files changed, 14 insertions, 205 deletions
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index d731c7efaa95..eeef05782c18 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -3,15 +3,13 @@ AUX dxvk-2.3.1-gcc14.patch 167 BLAKE2B 3a52e5c02c145dd8732993f540db239ba8d9ef7b3
 AUX dxvk-2.4-d3d8-setup.patch 220 BLAKE2B 7f21542907d02e2924595aaff32709882149137b97b2e00bb0196293315dd04b7f72fbd2cd4d0ffc6b28ca1ef2c5047b29039ef3d2a0cc953439307e5ecb0ef6 SHA512 ec510f45686f5222044486e659729b3126aed58a9e66dfd72434e44255ea3507b19e53111e7c430fe96f3058847a3fd32a8f903f3cee1e2ce45ab11bd9f2f2f7
 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.2.tar.gz 1135676 BLAKE2B 4f0f030867365e75ec4fdc56fcbbaba26393ed4beb2fb34c351457fe4a23c2e1d9c50f96370112ac4eb98af86e833788f9b075ca399915e37b87a27591d9847a SHA512 b7ee35911c777e27a56aa3b43c26acec14a03531a39f9c465460011d0f2f0c3ee43d09095fbaa8890beae37dcb48520fe232def79279d6a11d0295224b60ce5f
 DIST dxvk-2.5.3.tar.gz 1142475 BLAKE2B 04bfb577902effec9e22b6546cdfc2b3dd76b84e72c23cb26ac4e54f7aa9464b15d7d74b41dd810fc62d4fff9bbb24cee2771f562a7b931025abfa5995b000bc SHA512 93de46ab69dceea9e13904d9f267a53295a885676bce432c13d992ea33553250e03a695caf15f2c0a9a416c0ed3d799a9155a09dcadfeb43e516780fb188b122
 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-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.2.ebuild 6065 BLAKE2B e93f18c43646759f9220da686e014f71fc2f65d22e0edb80456f1ac53334b78599289edc700a97402564285719d75ded9aa3bbd8b0c9c4b908f65afed0b89a37 SHA512 a067fc8c3b09cc67d6aa6c265488e78732b48deb601c3d2a6a26610f391f0c41c9a5bdbddccf8cf7d7688ce933e5e17f4d0bd5f2f47e10f2ba3f99406f8ad44a
-EBUILD dxvk-2.5.3.ebuild 6065 BLAKE2B 9ea9bab828b43dbea7259959a76364d72e1d0167f8c1a95de7896736487f39551bf8a3ce9f609ec6a70f4440a5838b5b5fb7241aade1f0f1f1a78504fbdcc661 SHA512 1dd7320105a01cdbf25de83538996fd006d1ebd2042e653749f6a1dd8c1f45e616f5220bb6c0a73dfe60022ee041d78d73ac853bb40f1a99a4ae7cdf3dd5f331
-EBUILD dxvk-9999.ebuild 5675 BLAKE2B 1a648a3beb76989d2ca6ba95568df20ffaf8499bebfbef49954106c10f3c89ec421f3ddb342d9e540f79e3ee315be53c0bef3f86fffb906ec7a6c754ac43a272 SHA512 c76c11f47704e5a2593abd65d3576555c4a4a96982755d68dc63103d80333a539327c6f2cc0e72c604cfe0d7b5c0a2067f01a12cffa20d65d78d3dcefc595fb2
+EBUILD dxvk-2.3.1-r1.ebuild 6617 BLAKE2B 47f91edb7dd06c3c66922fc3c4f2069d89adecc61a629f0307070651e74cae9cbaaf081524f12c2c95827633f98996a1955adf82b3c888fd6f6f2c5297dfdfa0 SHA512 af2e1915d711b7aa37d281903dc05621c20962eb7d34e40d2ba2233fc8371657f62ef3616410db091caf1cab41500e6bbc7c8ed1a523bfacbfd6c90a9b804dbb
+EBUILD dxvk-2.4.1.ebuild 6056 BLAKE2B 988a2cb5a59389949e28af242d42af8f72b4cc60773205dd311eb50e3157908bd6d74fa83d14d983fd4a1a1c2623ebe1b2ba5659002aa335d5b99d57906b6f8d SHA512 016104a49fda4fe4a3bbc946f53917e532a8ab7eb9206502b30bb474183cd2b8015b7f2afc0f9bbb93e206aee19c52f56f0b16b6446276c3623c13a0fd1375f5
+EBUILD dxvk-2.5.3.ebuild 6017 BLAKE2B 86e20a255fe28aec6c3381fb1bfad4aa2fabf4b4727ac96bdc8ec861194b97ac4a5cda8a586b06cd377c5be09fe67daabfb878aaab451400a148cd8fce786a99 SHA512 7ef56bc5856134e57c920c49513efb5dd7cebe760a8f7cebf671e89af2eb227babf2c50c849bb1e5b84d2f619a2ab68db22d4b93cbc3aae9a8ace65a22b4e3fe
+EBUILD dxvk-9999.ebuild 5627 BLAKE2B b389cce248d282f570ad07d85ea59e6f09805e3f3bb1982b7d0e29c867025b6c56130d62c60f3f6e399e763f4c953ee14e7528d3ec77e7e0612eb79af869f1cd SHA512 01436e1d5781948298b8ec3d2ff585e68c16d29b251a12a2e3c9a7e35703fbe3f525ef9d60b13419df7405d6bb6441e4a888853d4b8211050c4c87df3c72ab86
 MISC metadata.xml 944 BLAKE2B 804e365c1a6f88001f88c96e0e7cd67d444bee147d764b6c2dff0fb37d836754a2c21a1ea8b505b11c9de93dbc2533e10d0e15dea72b0c05db9d5ada2123a90e SHA512 c7f045fed2ef25fed4094551d0a420fe218d541a678cce4a18fce3d8c090e64dfacbdcce67fcfa202d4c3aeed8911a83b2bf5077e7e13a75aa0e5902d33e4716
diff --git a/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild b/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild
index 640326b8a12d..6302477d338f 100644
--- a/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-2.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ 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
+inherit eapi9-ver flag-o-matic meson-multilib python-any-r1
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -180,9 +180,7 @@ pkg_postinst() {
 		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
+	if ver_replacing -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)"
diff --git a/app-emulation/dxvk/dxvk-2.4.1.ebuild b/app-emulation/dxvk/dxvk-2.4.1.ebuild
index c9d781e59ece..dcd2da53321e 100644
--- a/app-emulation/dxvk/dxvk-2.4.1.ebuild
+++ b/app-emulation/dxvk/dxvk-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ 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
+inherit eapi9-ver flag-o-matic meson-multilib python-any-r1
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -169,9 +169,7 @@ pkg_postinst() {
 		elog "removed upstream, handling may change in the future."
 	fi
 
-	if use d3d8 && [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 2.4
-	then
+	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:"
diff --git a/app-emulation/dxvk/dxvk-2.5.2.ebuild b/app-emulation/dxvk/dxvk-2.5.2.ebuild
deleted file mode 100644
index ae26f5d047a0..000000000000
--- a/app-emulation/dxvk/dxvk-2.5.2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# 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/dxvk/dxvk-2.5.3.ebuild b/app-emulation/dxvk/dxvk-2.5.3.ebuild
index 7e739356a90c..2e4e20063b47 100644
--- a/app-emulation/dxvk/dxvk-2.5.3.ebuild
+++ b/app-emulation/dxvk/dxvk-2.5.3.ebuild
@@ -6,7 +6,7 @@ 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
+inherit eapi9-ver flag-o-matic meson-multilib python-any-r1
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -168,9 +168,7 @@ pkg_postinst() {
 		elog "removed upstream, handling may change in the future."
 	fi
 
-	if use d3d8 && [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 2.4
-	then
+	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:"
diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild
index 9552c61fc99e..b24fcd5ba6ba 100644
--- a/app-emulation/dxvk/dxvk-9999.ebuild
+++ b/app-emulation/dxvk/dxvk-9999.ebuild
@@ -6,7 +6,7 @@ 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
+inherit eapi9-ver flag-o-matic meson-multilib python-any-r1
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -162,9 +162,7 @@ pkg_postinst() {
 		elog "removed upstream, handling may change in the future."
 	fi
 
-	if use d3d8 && [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 2.4
-	then
+	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:"