gentoo auto-resync : 14:01:2023 - 11:51:16

2 files changed, 10 insertions, 7 deletions

diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index ae07bae7ebd1..00bde1661c51 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -4,9 +4,9 @@ AUX godot-4.0-musl.patch 345 BLAKE2B 05057241c1e29ff886a38b815f68fcfe2b8c5e23fce
 AUX godot-4.0_beta3-headless-header.patch 498 BLAKE2B 401942c17829136aace28e34f7c9a4f843457d5a76c8b7035f40894f3d4d06936ddf3f1bcedf81584a65c0bff96e6e556d20ed8856107dd76deb173c98256964 SHA512 f83ec6b0667108b7c8f744b90944cd686de114db5694e09febf20a359a7d3fe11457b0c3279719a1281309a647e856b729354d3bed5f6d5048548b8dd259f63b
 AUX godot-4.0_beta8-scons.patch 1445 BLAKE2B 6fc5a18911681da54191af590afb9fa62181e485eb06a5eb89e9c1f5a52fd53abf712e0f58f48b9a3bf8c8adc47aa1e7833ea025ede7436873b0a8a7f46cf92a SHA512 cb579d8c8925ee20152aa48a89171433b9e663ee9a44c869987bd9f736cdf9213d77e63d1ddaf45cbecf8b55113e204c80a378dfd8637aa6d0ba64933d48b2cb
 DIST godot-3.5.1-stable.tar.xz 24153448 BLAKE2B 9d61276a2d82ef4f4487ec1046b7fa58f2b3626640b2db25c1f98c3f8e2ff40eddcf943fd9ffaaf6814fbafbbe7ef1d3f642d77af953b87731cff570ac3a5473 SHA512 59e5ca88534f542562971efb83b76561705f9ca8761311f01b4453857e7ae046c17cadd0d5ca6f6f56e262b5031294a8b9ad970fa6ffc95e1a6a1e1bae48d55f
-DIST godot-4.0-beta10.tar.xz 31668884 BLAKE2B 25fead426d6f5d1e572363a2f4b895454d0e35434d570bb894cbb5b20db9c6db076942e126730f210661a2f8a75e1e780a02226ee732fdb1f5c8f0043e115a81 SHA512 8806471abc699beca9cef87b8e386c6a044083e9a9dc6ff3c0a65655222c874eeb1fb2cfbd6c479ead4b4106beed530f7205a4873a3da16b4b4fa5f95496168b
 DIST godot-4.0-beta11.tar.xz 31506140 BLAKE2B d8769aea5aa235fc132291cbeb60c285986d3191e9b746b8f0d6ae852fc3380d11ae457900650d512e4a34e5e155f5ce55125e32504344026aa80c3baf108960 SHA512 36179a7d295a99f35d1fe7a50b650f5cca4cfaefd5cbda8722dbcff320bc67bddbbcd678a1d1c647d5857461453e79cabc13f16388107b0b9b4ddc34168fa9a8
+DIST godot-4.0-beta12.tar.xz 31517584 BLAKE2B aceb582f6fdc330bc57dd76e101cc0196bfe8beccca9fece573943869ac74d6a03043eaf02b1bdaf45c8ffdc24463c69baa1a1673808449597b76c62fa76c7f8 SHA512 df85fb98b8c1f7161e707252f1261ffd5a1b1baa277d7a3bb01690a3bd51a770522658c43e31ca00adcb4d385d8661489d27c67ea9d7694a736021f3642e500f
 EBUILD godot-3.5.1.ebuild 6747 BLAKE2B b19789b1ea9890973b16c2c6e7bc015f033fc218587e529a715ff2813e21c3fa8c89476c8f16cca707b2b93d35e2bd53ac7e6521af5c0aa088edd4e4a93b4fad SHA512 f6858b117eadca56a3539bf19d6ce1e8e04ade2e3b82a7abd49a30f89184681982d889eb82a5f9832107d8d5ad62326729eb286aaef4602e257391c0924e0e68
-EBUILD godot-4.0_beta10.ebuild 8215 BLAKE2B 68a432b3c7220b0441c43cb58df0ca02d52bfcd6a7be38bf5cee888b635b2f2d2636521723ff8a1111c4496f06c7e9395258aca90d4b79f83a809c3cf363cd79 SHA512 56071003d7a128cfd523238c30889d63587c278228cdd1eafe683fcfe7df84a2d8e74f73ca8666bd8e511cb4a7243794e4e3bd143f65659996104dac3063a8dc
 EBUILD godot-4.0_beta11.ebuild 8356 BLAKE2B eacf240bddf0c866ee2ca23201ec90ddc07900c85c9a11b847e58b8ef6da0dfeea626b0b093bdcc4a59c77df4ab7d55d771b2b9a4e1b206a9be3e047265ab7b9 SHA512 35cfb5050b261d3d619be5bee5d1096dc9a01ebe046c82209afd202b61256db8393c4028a11ae4309ad30540ff4f3f9a95e2dc9e0ddef13563e6e75697f38544
+EBUILD godot-4.0_beta12.ebuild 8356 BLAKE2B eacf240bddf0c866ee2ca23201ec90ddc07900c85c9a11b847e58b8ef6da0dfeea626b0b093bdcc4a59c77df4ab7d55d771b2b9a4e1b206a9be3e047265ab7b9 SHA512 35cfb5050b261d3d619be5bee5d1096dc9a01ebe046c82209afd202b61256db8393c4028a11ae4309ad30540ff4f3f9a95e2dc9e0ddef13563e6e75697f38544
 MISC metadata.xml 1606 BLAKE2B 5e4f1116549672d8cf6f88ef0b764e0710d5f5a1259110c323b67e911dc186c7b618ceb6e5d8b5ada540f531bf34b8e87c9de1652e13db9b08e865bacd7d0c29 SHA512 b4cdc297ad05067832bbd8ab849203201a3f65e00f0dd27ca4dd4c1f808ea2fd13a18615ac9fe6853ae30ae1e53168b73627d72df1f8f428d3979b06697defe5
diff --git a/dev-games/godot/godot-4.0_beta10.ebuild b/dev-games/godot/godot-4.0_beta12.ebuild
index ba144b6c7e6c..abf82c8076c2 100644
--- a/dev-games/godot/godot-4.0_beta10.ebuild
+++ b/dev-games/godot/godot-4.0_beta12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,13 +23,16 @@ KEYWORDS="~amd64"
 # except raycast (tools-only heavy dependency), and deprecated.
 IUSE="
 	+dbus debug deprecated +fontconfig +gui pulseaudio raycast
-	+runner speech test +theora +tools +udev +upnp +webp"
+	+runner speech test +theora +tools +udev +upnp +vulkan +webp"
 # disable tests until out of beta, tests themselves are new and can be volatile
 RESTRICT="test"
 
 # libX11 range is temporary while this is being looked into:
 # - https://github.com/godotengine/godot/issues/69352
 # - https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/170
+# Should in theory be at least improved for 1.8.4, so allowed preemptively.
+# 1.8.2 caused other issues (i.e. with firefox), fallback to 1.8.1 otherwise.
+
 # dlopen: alsa-lib,dbus,fontconfig,libX*,pulseaudio,speech-dispatcher,udev
 RDEPEND="
 	app-arch/zstd:=
@@ -48,10 +51,9 @@ RDEPEND="
 	gui? (
 		media-libs/alsa-lib
 		media-libs/libglvnd[X]
-		media-libs/vulkan-loader[X]
 		|| (
 			>x11-libs/libX11-1.8.3
-			<x11-libs/libX11-1.8.2-r1
+			<x11-libs/libX11-1.8.2
 		)
 		x11-libs/libXcursor
 		x11-libs/libXext
@@ -63,6 +65,7 @@ RDEPEND="
 		pulseaudio? ( media-libs/libpulse )
 		tools? ( raycast? ( media-libs/embree:3 ) )
 		udev? ( virtual/udev )
+		vulkan? ( media-libs/vulkan-loader[X] )
 	)
 	speech? ( app-accessibility/speech-dispatcher )
 	theora? ( media-libs/libtheora )
@@ -128,7 +131,7 @@ src_compile() {
 		udev=$(usex gui $(usex udev))
 		use_dbus=$(usex gui $(usex dbus))
 		use_volk=no # unnecessary when linking directly to libvulkan
-		vulkan=$(usex gui) # hard-required and favored by upstream over gles3
+		vulkan=$(usex gui $(usex vulkan))
 		x11=$(usex gui)
 
 		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt