diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 1cdd283..7141bb0 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST v1.0.3.tar.gz 598715 BLAKE2B 76bff0b62916867e232bd41d9bba324e98aebc37358ff369fe0e6a9b646db503848ccd7520b9ff9810aa751ce49cca979b9a6434fd115d1d524b49a032e059fb SHA512 cab516e9de7445edca65a174ea3c9a2d87c9e19927bc584c2cf01e83f17897f6133d0a55984c1784b1c33242493c1f69f18b13f2ad749deef980d378247b3462
-DIST v1.2.3.tar.gz 627504 BLAKE2B a148be0a709ef5ee22196da284b76caa855fe556a35b310ae2aba87ad38342aeeb6339cdf2e298f6da11204fb2edc3f4c90ccfad6f9f4a286cb5019cc4eb819c SHA512 bf53e38405fa8eb92e778f4dc49efbe2d559bbc58dd94f8414955fdeee47cc765d4332d7bfac43742c981a7e9524d295ee91accc7334069724d449a471d44a7f
-DIST v1.3.2.tar.gz 642995 BLAKE2B eee5f4c4373bf3a981c0c420f14e8d83c140611340ea2041bf0837f8f6fc8f156c06f7d31dd769b00be7d8632f062b2726f7712095e53c52493c59f3aa7f96ff SHA512 2fcbaeaeded72ac439cc9e653b94ca547b17b7f53000cfb721a8f14f290fa467db9ccb2d13bc30775c1a28081da1638a948921bf82f6425f4c7ab0e55007df48
-EBUILD dxvk-1.0.3-r1.ebuild 1871 BLAKE2B 48242bf651c2530c2da41c69bf5f125414e0b968bbe6d5c7d295666227fa1826016a6f4ed3feeddd368e2750b33cc0e8ee1f058a8cac9dfcbeb79038fb6681b9 SHA512 c03b609e04623c4d1584c7d356071ba142027ab1b048ecb4749c6157ecfeac5e3dd1021563c8cdaa2e7ca3e12ee499d6b1b7c4c7b255dc294277d01717827782
-EBUILD dxvk-1.2.3-r1.ebuild 2152 BLAKE2B 64e4dfbfc2c1d382b32367cddc214640e6f938842ec37eee79e414b12b48174a1c7dbd822582720f07a587e6321d513fd300753f7a3952c2d5bf4ebf42fa4c2b SHA512 eaff350eaa38b2f55c951cbc94e560cb9832f89d81cdb883b1f87dedd9dd18f6ecd45fea1845a634d0e7941e9e8cf7ff8b12dfefef29bfa22ef6b6f6c7139971
-EBUILD dxvk-1.3.2-r1.ebuild 2152 BLAKE2B 683e986a894951632d2dbb674f2e57e03b6553b2ce8e83ba8839b664490d3d6c6b3625e6d1f075ee50665edea9b484f228a8ff8355f05df051ec530276b097a0 SHA512 41d7833b998d3b1193f833ea33a3f813edabd687c3268371a6d2cde6f9d7ccac69d922699374ac80a3aadc5891a51e6eff5977568c28ed85c1d71e16260114a5
-EBUILD dxvk-9999-r2.ebuild 2152 BLAKE2B 64e4dfbfc2c1d382b32367cddc214640e6f938842ec37eee79e414b12b48174a1c7dbd822582720f07a587e6321d513fd300753f7a3952c2d5bf4ebf42fa4c2b SHA512 eaff350eaa38b2f55c951cbc94e560cb9832f89d81cdb883b1f87dedd9dd18f6ecd45fea1845a634d0e7941e9e8cf7ff8b12dfefef29bfa22ef6b6f6c7139971
+DIST dxvk-1.0.3.tar.gz 598715 BLAKE2B 76bff0b62916867e232bd41d9bba324e98aebc37358ff369fe0e6a9b646db503848ccd7520b9ff9810aa751ce49cca979b9a6434fd115d1d524b49a032e059fb SHA512 cab516e9de7445edca65a174ea3c9a2d87c9e19927bc584c2cf01e83f17897f6133d0a55984c1784b1c33242493c1f69f18b13f2ad749deef980d378247b3462
+DIST dxvk-1.2.3.tar.gz 627504 BLAKE2B a148be0a709ef5ee22196da284b76caa855fe556a35b310ae2aba87ad38342aeeb6339cdf2e298f6da11204fb2edc3f4c90ccfad6f9f4a286cb5019cc4eb819c SHA512 bf53e38405fa8eb92e778f4dc49efbe2d559bbc58dd94f8414955fdeee47cc765d4332d7bfac43742c981a7e9524d295ee91accc7334069724d449a471d44a7f
+DIST dxvk-1.3.2.tar.gz 642995 BLAKE2B eee5f4c4373bf3a981c0c420f14e8d83c140611340ea2041bf0837f8f6fc8f156c06f7d31dd769b00be7d8632f062b2726f7712095e53c52493c59f3aa7f96ff SHA512 2fcbaeaeded72ac439cc9e653b94ca547b17b7f53000cfb721a8f14f290fa467db9ccb2d13bc30775c1a28081da1638a948921bf82f6425f4c7ab0e55007df48
+EBUILD dxvk-1.0.3-r1.ebuild 1847 BLAKE2B 6b18da42de117bd041aa26d45963608683dcaab7a5655ec5041ce95f9944fcfc57608c291bc2a6c2b96b9e07303a9316545b56a883533e723695918b8e0b233a SHA512 775f5162340f9dd9c0c150015898b8b9f71a3aa2d51403c96417f567803167630341458f2215341a1c885fa23157ec47c14fa3648faf3c2e9dcbd591bba6490a
+EBUILD dxvk-1.2.3-r1.ebuild 2128 BLAKE2B 4f326490f5f12ce5e5a525d26d5fa27323adf77f0a45c91e6dcbde741c948aae9ff897765dd371bc598c43e32af848f40902e5489a0e534e5ae245fd75b95b55 SHA512 0138b9d2d5d26de52d15c29e1dbc80bdc3ee3f56fb3038c97b20a2d57e757e3b448f59a0b8943d0ed0cd45c7e007cb52991f6d9d95286ebd79135115207899e7
+EBUILD dxvk-1.3.2-r1.ebuild 2128 BLAKE2B 767f4daae863e87e3cf881e841ac3b7907264f86fd3aafb293ceca8fad6ae26d2d0754aa9dbbee0d2588b6be505b37abb35e6a6d77f297540a630296edbdc9c6 SHA512 414f8981d0b17af25be050281732f2d89e92bd32e24f427f39b8cb4b539b0ad442b64116612506e47181c39bd341868b29c13e850c85b3e1bb393e78c5e820d2
+EBUILD dxvk-9999-r2.ebuild 2128 BLAKE2B 4f326490f5f12ce5e5a525d26d5fa27323adf77f0a45c91e6dcbde741c948aae9ff897765dd371bc598c43e32af848f40902e5489a0e534e5ae245fd75b95b55 SHA512 0138b9d2d5d26de52d15c29e1dbc80bdc3ee3f56fb3038c97b20a2d57e757e3b448f59a0b8943d0ed0cd45c7e007cb52991f6d9d95286ebd79135115207899e7
 MISC metadata.xml 339 BLAKE2B 2c3c82d9b14bca7f4b3b2d01aadad24d534c74201952505d3d579d636c6053cb8fdc3a91c269d500876af972015d48756c7ea4b5cec089c4a7c5c4fbfdc63d70 SHA512 f2694f77e348ae5cc9053b7380b0efe41dc4a82a4fd100e2a8c87a15c11452400581145938ed80816a2c9ec86e5cd4444b99b713c2404efa7225a0e39025c7be
------BEGIN PGP SIGNATURE-----
-
-iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXV7eGwAKCRDPw5SX8bJu
-B/LwAP45LLHs1U17oO6ltVINa46DF5/95DhOyd+bRcK0WTEG/gD+MoW47hahdpbw
-kjHnHsX8EqXtdibPJC10zAyNSmSoJVk=
-=84WF
------END PGP SIGNATURE-----
diff --git a/app-emulation/dxvk/dxvk-1.0.3-r1.ebuild b/app-emulation/dxvk/dxvk-1.0.3-r1.ebuild
index 4cc8c1e..44a3cdf 100644
--- a/app-emulation/dxvk/dxvk-1.0.3-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-1.0.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/doitsujin/dxvk"
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
 else
-	SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz"
+	SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="ZLIB"
@@ -39,8 +39,8 @@ RDEPEND="
 src_prepare() {
 	default
 	sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
-	sed -i 's|"x64"|"usr/lib64/dxvk"|' setup_dxvk.sh || die
-	sed -i 's|"x32"|"usr/lib/dxvk"|' setup_dxvk.sh || die
+	sed -i "s|\"x64\"|\"usr/${LIBDIR_amd64}/dxvk\"|" setup_dxvk.sh || die
+	sed -i "s|\"x32\"|\"usr/${LIBDIR_x86}/dxvk\"|" setup_dxvk.sh || die
 
 	if ! use abi_x86_64; then
 		sed -i '|installFile "$win64_sys_path"|d' setup_dxvk.sh
@@ -53,15 +53,10 @@ src_prepare() {
 
 multilib_src_configure() {
 	local bit="${MULTILIB_ABI_FLAG:8:2}"
-	local libdir="lib"
-
-	if [[ "${bit}" == "64" ]]; then
-		libdir="lib64"
-	fi
 
 	local emesonargs=(
-		--libdir=${libdir}/dxvk
-		--bindir=${libdir}/dxvk/bin
+		--libdir=$(get_libdir)/dxvk
+		--bindir=$(get_libdir)/dxvk/bin
 		--cross-file=../${P}/build-wine${bit}.txt
 	)
 	meson_src_configure
diff --git a/app-emulation/dxvk/dxvk-1.2.3-r1.ebuild b/app-emulation/dxvk/dxvk-1.2.3-r1.ebuild
index 9b77f1d..3eb4c55 100644
--- a/app-emulation/dxvk/dxvk-1.2.3-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-1.2.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/doitsujin/dxvk"
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
 else
-	SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz"
+	SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="ZLIB"
@@ -49,8 +49,8 @@ RDEPEND="
 src_prepare() {
 	default
 	sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
-	sed -i 's|"x64"|"usr/lib64/dxvk"|' setup_dxvk.sh || die
-	sed -i 's|"x32"|"usr/lib/dxvk"|' setup_dxvk.sh || die
+	sed -i "s|\"x64\"|\"usr/${LIBDIR_amd64}/dxvk\"|" setup_dxvk.sh || die
+	sed -i "s|\"x32\"|\"usr/${LIBDIR_x86}/dxvk\"|" setup_dxvk.sh || die
 
 	if ! use abi_x86_64; then
 		sed -i '|installFile "$win64_sys_path"|d' setup_dxvk.sh
@@ -63,15 +63,10 @@ src_prepare() {
 
 multilib_src_configure() {
 	local bit="${MULTILIB_ABI_FLAG:8:2}"
-	local libdir="lib"
-
-	if [[ "${bit}" == "64" ]]; then
-		libdir="lib64"
-	fi
 
 	local emesonargs=(
-		--libdir=${libdir}/dxvk
-		--bindir=${libdir}/dxvk/bin
+		--libdir=$(get_libdir)/dxvk
+		--bindir=$(get_libdir)/dxvk/bin
 		--cross-file=../${P}/build-wine${bit}.txt
 	)
 	meson_src_configure
diff --git a/app-emulation/dxvk/dxvk-1.3.2-r1.ebuild b/app-emulation/dxvk/dxvk-1.3.2-r1.ebuild
index 85e377d..8c3828a 100644
--- a/app-emulation/dxvk/dxvk-1.3.2-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-1.3.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/doitsujin/dxvk"
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
 else
-	SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz"
+	SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="ZLIB"
@@ -49,8 +49,8 @@ RDEPEND="
 src_prepare() {
 	default
 	sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
-	sed -i 's|"x64"|"usr/lib64/dxvk"|' setup_dxvk.sh || die
-	sed -i 's|"x32"|"usr/lib/dxvk"|' setup_dxvk.sh || die
+	sed -i "s|\"x64\"|\"usr/${LIBDIR_amd64}/dxvk\"|" setup_dxvk.sh || die
+	sed -i "s|\"x32\"|\"usr/${LIBDIR_x86}/dxvk\"|" setup_dxvk.sh || die
 
 	if ! use abi_x86_64; then
 		sed -i '|installFile "$win64_sys_path"|d' setup_dxvk.sh
@@ -63,15 +63,10 @@ src_prepare() {
 
 multilib_src_configure() {
 	local bit="${MULTILIB_ABI_FLAG:8:2}"
-	local libdir="lib"
-
-	if [[ "${bit}" == "64" ]]; then
-		libdir="lib64"
-	fi
 
 	local emesonargs=(
-		--libdir=${libdir}/dxvk
-		--bindir=${libdir}/dxvk/bin
+		--libdir=$(get_libdir)/dxvk
+		--bindir=$(get_libdir)/dxvk/bin
 		--cross-file=../${P}/build-wine${bit}.txt
 	)
 	meson_src_configure
diff --git a/app-emulation/dxvk/dxvk-9999-r2.ebuild b/app-emulation/dxvk/dxvk-9999-r2.ebuild
index 9b77f1d..3eb4c55 100644
--- a/app-emulation/dxvk/dxvk-9999-r2.ebuild
+++ b/app-emulation/dxvk/dxvk-9999-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/doitsujin/dxvk"
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
 else
-	SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz"
+	SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="ZLIB"
@@ -49,8 +49,8 @@ RDEPEND="
 src_prepare() {
 	default
 	sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
-	sed -i 's|"x64"|"usr/lib64/dxvk"|' setup_dxvk.sh || die
-	sed -i 's|"x32"|"usr/lib/dxvk"|' setup_dxvk.sh || die
+	sed -i "s|\"x64\"|\"usr/${LIBDIR_amd64}/dxvk\"|" setup_dxvk.sh || die
+	sed -i "s|\"x32\"|\"usr/${LIBDIR_x86}/dxvk\"|" setup_dxvk.sh || die
 
 	if ! use abi_x86_64; then
 		sed -i '|installFile "$win64_sys_path"|d' setup_dxvk.sh
@@ -63,15 +63,10 @@ src_prepare() {
 
 multilib_src_configure() {
 	local bit="${MULTILIB_ABI_FLAG:8:2}"
-	local libdir="lib"
-
-	if [[ "${bit}" == "64" ]]; then
-		libdir="lib64"
-	fi
 
 	local emesonargs=(
-		--libdir=${libdir}/dxvk
-		--bindir=${libdir}/dxvk/bin
+		--libdir=$(get_libdir)/dxvk
+		--bindir=$(get_libdir)/dxvk/bin
 		--cross-file=../${P}/build-wine${bit}.txt
 	)
 	meson_src_configure