gentoo auto-resync : 10:12:2022 - 15:20:44

3 files changed, 53 insertions, 5 deletions

diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index 2420c1e52bf5..4633d4b4a6f4 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -3,10 +3,11 @@ AUX godot-3.5-scons.patch 2568 BLAKE2B 0da3a29689293a0d9681eaa2877c667fbe484e7d4
 AUX godot-4.0-musl.patch 345 BLAKE2B 05057241c1e29ff886a38b815f68fcfe2b8c5e23fce6ae1e754bd9f2837f632887712de52065dd669fd12b0ffc5542859a4da67282ef337fdf9a76bccddbd410 SHA512 267bd42d3381d8af608a117bc423da62c86c04bffcdf46d54a19fc1bb5f690bbb311d088b842719843f9acc0a4db65c048786e39cadd32902bc8a09bde3c33e3
 AUX godot-4.0_alpha14-scons.patch 972 BLAKE2B e67f2350fdd18f66e3416320dac4d7fa0b9b44dc7c033f4970e7bb66d195515cf8fabed250225a661f8743d180fd60bf6410bb56a542fe582af277acaeb7461a SHA512 1a34bc6d1bc01de8eac127b71e1796263774b9059532755e990ff4ef6ad9f7ae0785bfeb8c2788e226189362d67354852aeaa33172127367c0a7cb0b2302745c
 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-beta6.tar.xz 31397808 BLAKE2B bd67aa9e1447a9caf6c914545262df3f04c181a729dd62cf02c8caaf9e96592a56a9387e15ba3d0050fc57911ba31f5782e609bedd00e3da39cc199d214d7353 SHA512 921aa694380458763cda552791b2bd9976913444dd24b8be8038f37d94a666ba18f72bee2365222d7e7130acd916766833c69a810693725d525bca1c986b6055
 DIST godot-4.0-beta7.tar.xz 31508396 BLAKE2B e6f65bd345dda8360ce7ab4234ba045f301b66b0e7b1cda31652e78d96ab023c368ded982fd33d583cf55ec481fda05bcc734abe094e7b18707a73973533c22b SHA512 72e6b52a35d2f077a21339d5c07a36529d10aa05d6d1d1d975b91b42ce6a08f7804cd88b7760ebaa0165a65bc318d2ef971458ecfb7743e579d1b040086b7fd4
+DIST godot-4.0-beta8.tar.xz 31575000 BLAKE2B 27c3f18f1106684e8a4381a5a54240a6513ca3319c1cfc533a6c0b9021474e7246eded4a00f8242df41412b98fd11d38974add72cee4f6936fcc01507b801125 SHA512 f18c22bb7a29062c6bd3106f87656f0eadab3befb2715942bcf114850bf818b9530eb14859480bb82cb5c77a5cecd6f98ed5006643b5cf3b016ee21b1f07f022
 EBUILD godot-3.5.1.ebuild 6747 BLAKE2B b19789b1ea9890973b16c2c6e7bc015f033fc218587e529a715ff2813e21c3fa8c89476c8f16cca707b2b93d35e2bd53ac7e6521af5c0aa088edd4e4a93b4fad SHA512 f6858b117eadca56a3539bf19d6ce1e8e04ade2e3b82a7abd49a30f89184681982d889eb82a5f9832107d8d5ad62326729eb286aaef4602e257391c0924e0e68
-EBUILD godot-4.0_beta6.ebuild 7984 BLAKE2B 0e52f54e88fec735ed856e4dec68481729c2aad8f0618ddf78fb576e822475457446f2909caa0b8d4d2fc4e7b590e946ac557b0e94a0ab6c9f4c3985133d7bc8 SHA512 2384f804a529d0ed2acf2d01df0a4adec81c6fab77072b43a962eb02ce0c746cd9bc56c1f0b6313817d1f48e100607e7ddbe6821f4a5279bfed55b7d9d8840c4
 EBUILD godot-4.0_beta7.ebuild 8214 BLAKE2B fdfe10682b1d3e87d543f105f524497fcc4225e7c2c0de8aa7d3bafd0df7dfc2cd79c47bf2fec098d45e5806f70f22b1dd62df7e1d01990fdb42142594a6eb22 SHA512 553af82ceaad5ba3b58849b62d764adcdad65270fbb3c5dc7619b4b106e0ee3f5e85f847febc18b72978087a2c1fe3049d57f6736d9d05df831fcffc3b7c678e
+EBUILD godot-4.0_beta8.ebuild 8218 BLAKE2B a52a64a391d77d90e889fedbd83a970ff667aeb4c1e21367b8eac2b45ec27f06f2df0ef56852e1df10a611b1059c1cd1931c7c50787c156ba346f93f842e8238 SHA512 9eab683254aca9b4ec15633c910dbb4ac49f496d82fde39892e625e36e80c95d03619d8d18d6a4f0cf4c14a1d1727af3de051a7fd07f664ebcdb30c205821c3b
 MISC metadata.xml 1551 BLAKE2B 718ca848e6b90fad730ea413ff8d25a9c23836da1ff890d7c93d458a0b46b503a4d1b949742a4a819eb0323eb0626a3541cd35d41f809b600891fa470f565ff6 SHA512 b935ee9256ae07a8f01bc458ee41c46e25be8a38b6921cf353a20332c59b6083bd6f73e2112858827b3b7bccdb256f9122e1d9691d2a3751aba85bbb8c4ab262
diff --git a/dev-games/godot/files/godot-4.0_beta8-scons.patch b/dev-games/godot/files/godot-4.0_beta8-scons.patch
new file mode 100644
index 000000000000..4a6254d93d72
--- /dev/null
+++ b/dev-games/godot/files/godot-4.0_beta8-scons.patch
@@ -0,0 +1,41 @@
+* add option to respect AR
+ (respecting PKG_CONFIG is handled in the ebuild)
+* don't strip even with debug symbols disabled
+* fix icu unbundling underlinking
+* handle recastnavigation unbundling
+--- a/SConstruct
++++ b/SConstruct
+@@ -239,4 +239,5 @@
+ opts.Add("CXX", "C++ compiler")
+ opts.Add("CC", "C compiler")
++opts.Add("AR", "Archiver")
+ opts.Add("LINK", "Linker")
+ opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers")
+@@ -545,10 +546,4 @@
+             else:
+                 env.Append(CCFLAGS=["-g2"])
+-        else:
+-            if methods.using_clang(env) and not methods.is_vanilla_clang(env):
+-                # Apple Clang, its linker doesn't like -s.
+-                env.Append(LINKFLAGS=["-Wl,-S", "-Wl,-x", "-Wl,-dead_strip"])
+-            else:
+-                env.Append(LINKFLAGS=["-s"])
+ 
+         if env["optimize"] == "speed":
+--- a/platform/linuxbsd/detect.py
++++ b/platform/linuxbsd/detect.py
+@@ -221,5 +221,5 @@
+ 
+     if not env["builtin_icu"]:
+-        env.ParseConfig("pkg-config icu-uc --cflags --libs")
++        env.ParseConfig("pkg-config icu-i18n --cflags --libs")
+ 
+     if not env["builtin_harfbuzz"]:
+@@ -232,4 +232,7 @@
+         env.ParseConfig("pkg-config libenet --cflags --libs")
+ 
++    if not env["builtin_recast"]:
++        env.ParseConfig("pkg-config recastnavigation --cflags --libs")
++
+     if not env["builtin_squish"]:
+         env.ParseConfig("pkg-config libsquish --cflags --libs")
diff --git a/dev-games/godot/godot-4.0_beta6.ebuild b/dev-games/godot/godot-4.0_beta8.ebuild
index 918839a123bf..8f872f4fdb83 100644
--- a/dev-games/godot/godot-4.0_beta6.ebuild
+++ b/dev-games/godot/godot-4.0_beta8.ebuild
@@ -27,7 +27,10 @@ IUSE="
 # disable tests until out of beta, tests themselves are new and can be volatile
 RESTRICT="test"
 
-# dlopen: alsa-lib,dbus,fontconfig,pulseaudio,speech-dispatcher,udev
+# 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
+# dlopen: alsa-lib,dbus,fontconfig,libX*,pulseaudio,speech-dispatcher,udev
 RDEPEND="
 	app-arch/zstd:=
 	dev-games/recastnavigation:=
@@ -46,7 +49,10 @@ RDEPEND="
 		media-libs/alsa-lib
 		media-libs/libglvnd[X]
 		media-libs/vulkan-loader[X]
-		x11-libs/libX11
+		|| (
+			>x11-libs/libX11-1.8.2-r1
+			<x11-libs/libX11-1.8.2-r1
+		)
 		x11-libs/libXcursor
 		x11-libs/libXext
 		x11-libs/libXi
@@ -71,8 +77,8 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.0-musl.patch
-	"${FILESDIR}"/${PN}-4.0_alpha14-scons.patch
 	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
+	"${FILESDIR}"/${PN}-4.0_beta8-scons.patch
 )
 
 src_prepare() {