gentoo auto-resync : 29:11:2022 - 13:20:25

5 files changed, 28 insertions, 22 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7ed579671cfa..637443f520a6 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 3bc2bfaca1c2..7af5f550660f 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -4,5 +4,5 @@ DIST dxvk-spirv-headers-0bcc624926.tar.gz 437771 BLAKE2B 08815e36ad99b84777e38ad
 DIST dxvk-vulkan-headers-98f440ce68.tar.gz 1691979 BLAKE2B bf6fd288f16df7adcb5cebeb6e13713db1c26a0b833dead2fb522227861abc60b2d0cda8e3f46f8e89cccb629e01081ba27763989ad6fd336c60a475b198c1c8 SHA512 69238d37d0af0162e0fd68094cd2fa9baa320497d34a9de491dea086c23291d0815b51e89218b1f0ee2b3314cbc8ac1809d6edb15ca51fcb282fe1e2b39a1a77
 EBUILD dxvk-1.10.3.ebuild 4265 BLAKE2B d830295fb402291d9fafa65539857dec4aa140f1b1c8ac15d863b15b85d58176b45a0a17c0fbc9c418d67445227705b3f73fbb872426011f1d80a89530f6eb3e SHA512 e103838702f73954b7afa6266759c762ea0a0048643a17904f1436b52588e41a5afa5b9818c3cc08491cffe9be1f8fddb8b45422c46f974ed9578398534ad6db
 EBUILD dxvk-2.0.ebuild 5239 BLAKE2B b01f9ed7682a575fe44ec6ec951d09ae209ca52df04c63ed61e5f542b7e5261a7ad032297981b7a93b244f3c1a22918de0f24c56e131f7a38ddd3dfe379f0572 SHA512 237c2fedd0aff29e9c56f050985653bf756ee8e1d7bc1b5c37c4f5e453e991078f7c96e6caa5f86a3f1a15cf3b62ec3f294a9bda9d7837907882751a3dc6f02d
-EBUILD dxvk-9999.ebuild 5239 BLAKE2B b01f9ed7682a575fe44ec6ec951d09ae209ca52df04c63ed61e5f542b7e5261a7ad032297981b7a93b244f3c1a22918de0f24c56e131f7a38ddd3dfe379f0572 SHA512 237c2fedd0aff29e9c56f050985653bf756ee8e1d7bc1b5c37c4f5e453e991078f7c96e6caa5f86a3f1a15cf3b62ec3f294a9bda9d7837907882751a3dc6f02d
+EBUILD dxvk-9999.ebuild 5337 BLAKE2B 39b8608412d908541d1b9d9ed9127056cda3c3083d3cc05dfce817d49d87d5701e3d5134e26d2ce1b320fbc017d0699f417ab9cc7543764cb2a18d877d157740 SHA512 104c55d6cbc49056bad61ff453fa14ea454d9a8b59af20e1fef2e97b27f1de45b09aca88a0d307154285642389926bcc046acce7675c1ee0306dd22bc70a69e6
 MISC metadata.xml 818 BLAKE2B 88081c074b99329c925174de4b7ff9b2c220ffc67eb64a5324f4eaf2a35f98f06c9978ddc0e929ba76b341a389a8eff025b7aa0a2414e3f7ae496c44a023c65c SHA512 90d76ac3df3abe003371cd25b9cf0e6570a53b371349fb2e048cae1818e51f0482e17b3d5490eb82c57d891bb43c4a7cd41530101b888591719c33c566788e3b
diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild
index 19174e20a451..167b7c5d6901 100644
--- a/app-emulation/dxvk/dxvk-9999.ebuild
+++ b/app-emulation/dxvk/dxvk-9999.ebuild
@@ -12,14 +12,18 @@ if [[ ${PV} == 9999 ]]; then
 	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
 	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://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"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 
@@ -67,8 +71,6 @@ src_prepare() {
 	fi
 
 	default
-
-	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die
 }
 
 src_configure() {
@@ -116,7 +118,6 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	dobin setup_dxvk.sh
 	dodoc README.md dxvk.conf
 
 	find "${ED}" -type f -name '*.a' -delete || die
@@ -127,13 +128,15 @@ pkg_preinst() {
 }
 
 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."
-	elif [[ -v DXVK_HAD_OVERLAY ]]; then
+	# TODO: setup_dxvk.sh script was removed, need to figure out a new way to
+	# explain/handle (leaving this alone for now in live in case gets restored)
+#	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."
+	if [[ -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"
diff --git a/app-emulation/vkd3d-proton/Manifest b/app-emulation/vkd3d-proton/Manifest
index e3fe3b61c831..8533fa5684bf 100644
--- a/app-emulation/vkd3d-proton/Manifest
+++ b/app-emulation/vkd3d-proton/Manifest
@@ -8,5 +8,5 @@ DIST vkd3d-proton-vulkan-headers-5177b119bb.tar.gz 1588963 BLAKE2B 3e973c9fc1fd8
 DIST vkd3d-proton-vulkan-headers-83e1a9ed8c.tar.gz 1299014 BLAKE2B 0b1e635aaa6eebec3525b13698a064e0e5b8a78829a772cbe9e1890148059bf396bc5c830e8d6ee3070a3343775991642565283994c65acfa0d82a91590b7d84 SHA512 ecb2158cad55edb4ba069383668f3b311a2f6aa6777b5b7ed94795d454622426ee34fee52b13c97d2f07b5b2f965815ee61a0203b76a0b0d2c708a4786d06b96
 EBUILD vkd3d-proton-2.6.ebuild 6053 BLAKE2B 50d2d2fea9801e9a84546a3d3fc3ab4c982ad61ccc56ad2f0e99865bf6e4214032a8f6514a0e7981bb8f9ed55de71db33e6bec832f825d7b08c7f81513dcd30c SHA512 f3a6606f9fb3abfbf474039e6b6dbaa900d0142b0e5dff9d43c60066f3ce7be97bc0d3b4e4b4b248d3b8f99c7358cad53ccccf1e17dcead99b9a797fe8bd30ee
 EBUILD vkd3d-proton-2.7.ebuild 6384 BLAKE2B 269ec641805d0b4933f31b44a82011b5bbb09399991687299c76bb0b6d687684b68362388600808ca47f128e52c9ef69e436007dd6a2f29932f5cfe31a12e466 SHA512 b99b1f2a819641b477be633a55c6c7f92afc03f1357a8b1d150abb6b8a32c58ba179d433e2d18cfcc34c4c0fce4487b11bc053b0362a625cf6f3c59c8ad4b4ea
-EBUILD vkd3d-proton-9999.ebuild 6486 BLAKE2B 0012121dd1c6044bf5a59e65ff2eb665aed72d752cfc6871701af76471c29f1e84e889602cdc1ee918b36fc2b0a07d58e393cb96306d1ed0ef9314cd26c96f3b SHA512 415bd72931b2025afc14651c94131829cc7a3b1bbf879022037da3142ef837c31d61104ff92acf409187c506d40e80bd3372f1f2a514099db2c468bcd70872f4
+EBUILD vkd3d-proton-9999.ebuild 6392 BLAKE2B 1b1ce6d4bb4173722850fd6a365f6e14ebb5c4bfe3d12b6a5246b931e3b7510df324289af733c4d4a5ffecc2db5b335fc745c84e77d43a40b837ba8bf153978e SHA512 458451234d899ab68ec18f05ad0547638f0948a721edc5074587c2a80b839f856cbe4a759df05678f435c11944811f19987b56e5881653de0e27cfae345d530d
 MISC metadata.xml 618 BLAKE2B 4382557118c0ea56972d05a10c9cc1f94a4fbcc58a414f1cd5e4354ce6ed1de15c95377f167ed5627231c2887ecce3c00756908720458fedddea5ed6732771ff SHA512 b5cc86b412c30ee5d54868a87c9f4892337c83988b738806532cd9e2cc295a2326e776030c19cae9a2e9dd4f5f615b1d962ec48a4b310fd8a94ec4024dde99ab
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
index 9bdbc904dc8e..6c6b0e82479d 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
@@ -23,11 +23,16 @@ else
 	HASH_SPIRV_DXIL=87d5b782bec60822aa878941e6b13c0a9a954c9b
 	HASH_VULKAN=5177b119bbdf463b7b909855a83230253c2d8b68
 	SRC_URI="
-		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz -> ${PN}-dxil-spirv-${HASH_DXIL::10}.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/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz -> ${PN}-spirv-headers-${HASH_SPIRV_DXIL::10}.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
+		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+		https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz
+			-> ${PN}-dxil-spirv-${HASH_DXIL::10}.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/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz
+			-> ${PN}-spirv-headers-${HASH_SPIRV_DXIL::10}.tar.gz
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 
@@ -151,8 +156,6 @@ multilib_src_install_all() {
 	dobin setup_vkd3d_proton.sh
 	einstalldocs
 
-	# unnecesasry files, see package-release.sh
-	rm "${ED}"/usr/lib/${PN}/x*/libvkd3d-proton-utils-3.dll || die
 	find "${ED}" -type f -name '*.a' -delete || die
 }