[gentoo-commits] repo/gentoo:master commit in: dev-games/godot/

[Ionen Wolkens]

commit:     1dc2725a16ab5330826c6e167a20d3547f1022aa
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  4 16:00:43 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jul  4 16:07:47 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc2725a

dev-games/godot: merge 2nd scons args array into the first

No reason for it to be this way anymore, the code that made use
of the 2nd array was cleaned up but merging was forgotten.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-games/godot/godot-4.4.1-r1.ebuild | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/dev-games/godot/godot-4.4.1-r1.ebuild 
b/dev-games/godot/godot-4.4.1-r1.ebuild
index 1469cb5b8864..a788a1e07794 100644
--- a/dev-games/godot/godot-4.4.1-r1.ebuild
+++ b/dev-games/godot/godot-4.4.1-r1.ebuild
@@ -122,7 +122,9 @@ src_compile() {
                progress=no
                verbose=yes
 
-               use_sowrap=no
+               target=$(usex tools editor template_$(usex debug{,} release))
+               dev_build=$(usex debug)
+               tests=$(usex tools $(usex test)) # bakes in --test in final 
binary
 
                alsa=$(usex alsa)
                dbus=$(usex dbus)
@@ -134,6 +136,7 @@ src_compile() {
                pulseaudio=$(usex pulseaudio)
                speechd=$(usex speech)
                udev=$(usex udev)
+               use_sowrap=no
                use_volk=no # unnecessary when linking directly to libvulkan
                vulkan=$(usex gui $(usex vulkan))
                wayland=$(usex wayland)
@@ -191,14 +194,6 @@ src_compile() {
                use_static_cpp=no
        )
 
-       esconsargs+=(
-               target=$(usex tools editor template_$(usex debug{,} release))
-               dev_build=$(usex debug)
-
-               # harmless but note this bakes in --test in the final binary
-               tests=$(usex tools $(usex test))
-       )
-
        escons "${esconsargs[@]}"
 }