diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 43ba3e398..a93c13f92 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -6,15 +6,15 @@ AUX 1.6.1-add_compiler_flags.patch 2745 BLAKE2B b664a09dc698c24b0d699b1b717c33fd
 AUX flags.patch 1400 BLAKE2B c69951eddea7b94836e9d64b39870395c4eb54dcfff31fb9ff9eafa801d989acddcf738802bbc3600a871053546dc5f641726f7e75cfdb9f101973aebd2b3571 SHA512 fd4a053775a4ab7b4df24da38ba602a5e8d43a75676bf3e870a82dd4f4e3bcf228e043139604c95941b09086ecd21887a8eaf81f2229d00abb47fdc83419284c
 DIST dxvk-1.6.1.tar.gz 894553 BLAKE2B a45f905f33b255beed65daebbb946b36c28d00dc4d3830e46de342f16d95541361a31243e6ce3e8cde3b2c7297dd2b1044aa61955f1803b8bfb34ec83367c2a9 SHA512 0f3cb7096643d1bcb1db51696824c8ca16720adfe6894392122b21f400cfa416e79eb74cdcc46d1a63a276697d324324d7657afb70b9490e22e6792643fc5805
 DIST dxvk-1.6.tar.gz 892463 BLAKE2B 84d1ca0b42b9b63c5efa15d284ffedd76d4f5c09a1ca3e51971d36d68f0a5346f4bf3e5ee119a90fdbf489a3e21137e9d981710cb2b33b4b6a195f941baefa15 SHA512 5b1ba21515e5f7a75baba1e182a0b15285712c2a6e8946fcc0eadb82b64d43122e1c211304af2c890e368098fd2a69d174f86c05f9b0de0b417b0f2390d4a0ca
-EBUILD dxvk-1.6.1-r1.ebuild 5021 BLAKE2B 98411a4a22e77fa8d06caefd73b2531ebec01894eef063a37154b24d321d82e39ea3992dd2f738683c9d74811f482eef27b6f1402382f04244570cfe89b8487d SHA512 d71570ffde6d098604b40867f66186930463aed9112d2aafbd22b40bd85a423a4e738d5e8b9e787212a65593ba7bb2875f50a113bc9dd33f13df10dc0ee2fd7d
+EBUILD dxvk-1.6.1-r1.ebuild 4925 BLAKE2B e1589d6a8df377d8be08f100bc02f150c2636f8c558d0b1846ec943a022827dd35fc77193715ce361b339f56b3a5eb57372a67f363e2399d3d6a643eb2871ac3 SHA512 a07b7e6791b3b29f836f4ef3863e78aeeae8bc074dedf37fbc0ddb432fc8b83bd51bddf70521d521c262918b2ca30cb62f082d23ebab1320ff00fafcc8fd168c
 EBUILD dxvk-1.6.1.ebuild 2975 BLAKE2B 0060d4b28590fe43b4c2aed3913d10fbd5055b67671c00d920c61aa4541334e454c18578c6bfd8661932dd44d174675886d4dbc2f5ba311147be10bb25f02b87 SHA512 1019c3376b74b14f6834d4fef7f9d36e60ef1e09801c7de598fcc7dceb5cd09c929af2b527c516e88ab7dbcd67275749a690df7a95af670a3256b65429dded4e
 EBUILD dxvk-1.6.ebuild 2381 BLAKE2B c77d62c0dc71ec4f78fe7d5dc15435b123bfd97073dd05d1fbfadf69c84bec940bbe7fcdba2cfff9a841f00a5079f9ddc5651991893828072ea76ea9554b2a8d SHA512 b36a83d0065d8216a01ec6a1b50bc842acbac9f25b0315bbf250df2cb6413dca709464ef9e081ea4fa7c0ce41cf357abc19793c9925db16a319ecc4387fdd844
 EBUILD dxvk-9999-r3.ebuild 2975 BLAKE2B 0060d4b28590fe43b4c2aed3913d10fbd5055b67671c00d920c61aa4541334e454c18578c6bfd8661932dd44d174675886d4dbc2f5ba311147be10bb25f02b87 SHA512 1019c3376b74b14f6834d4fef7f9d36e60ef1e09801c7de598fcc7dceb5cd09c929af2b527c516e88ab7dbcd67275749a690df7a95af670a3256b65429dded4e
 MISC metadata.xml 643 BLAKE2B 0b5aa604f15a049ffce213c45e4731da24bc903d54dfce84692be92f106a271fde885ada19f5a44781452423178b1361e9fe2152cc4c689dbd4fe8e04f241ade SHA512 49f429099195f87d22cf8a5a549074b881aed6b7ff1f76427497f730137d002ee3d8b0a6d1cf4322588e8d3a4d61d9387d72e668eab8b9fa2e0cebb17f942802
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXp8RYgAKCRDPw5SX8bJu
-BzpPAP44s7nuoY95m9ztBtfVj0Q5G2jVr5XDFR9bQ2w2yEgx7AD8CHcpL7V+tJYY
-KXwNR1AgsF+O+QqIM+Dd2hV3/23X9ak=
-=O9mz
+iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXp8VuAAKCRDPw5SX8bJu
+B8G4APsFYyr7N5QdLtlHiaUyXYKgw77vp3focB8elpNHDRFuuAEAjDgPpqCTQJ+L
+7nRBe1X0Xm8T8ymnxGpqKXT6kqtSd6g=
+=Y+pS
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/dxvk/dxvk-1.6.1-r1.ebuild b/app-emulation/dxvk/dxvk-1.6.1-r1.ebuild
index 14cc3a068..9a215586e 100644
--- a/app-emulation/dxvk/dxvk-1.6.1-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-1.6.1-r1.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 if [[ "${PV}" == "9999" ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS=""
+	KEYWORDS="~amd64"
 fi
 IUSE="+d3d9 +d3d10 +d3d11 debug +dxgi +mingw video_cards_nvidia test winegcc"
 REQUIRED_USE="^^ ( mingw winegcc )"
@@ -32,10 +32,6 @@ DEPEND="
 	dev-util/glslang
 "
 BDEPEND="
-	mingw? (
-		abi_x86_64? ( cross-x86_64-w64-mingw32/gcc )
-		abi_x86_32? ( cross-i686-w64-mingw32/gcc )
-	)
 	winegcc? ( || (
 		>=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP},vulkan]
 		>=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP},vulkan]
@@ -65,7 +61,7 @@ pkg_pretend () {
 		use abi_x86_32 && categories+=("cross-i686-w64-mingw32")
 
 		for cat in ${categories[@]}; do
-			if ! has_version "${cat}/gcc"; then
+			if ! has_version -b "${cat}/gcc"; then
 				eerror "${cat}/gcc is not installed."
 				elog "See <https://wiki.gentoo.org/wiki/Mingw> on how to install it."
 				einfo "In short:"