Reduced unneeded stuff for the binary, added from source build.

4 files changed, 201 insertions, 127 deletions

diff --git a/dev-games/redot-bin/Manifest b/dev-games/redot-bin/Manifest
index 3375c87..260d983 100644
--- a/dev-games/redot-bin/Manifest
+++ b/dev-games/redot-bin/Manifest
@@ -1,3 +1,3 @@
 DIST redot-linuxbsd.zip 55256813 BLAKE2B 42e54c47aa208688a9a11ffcdc3982175e819f8fa690c2be33f35d5cede2f61fbb86f033581c3433f2bb73ed73c46409d814002219891d53d800f348d77c931b SHA512 dfb52799ad3441813e7866067aa347787427e591480a8c421e1634cf37d6281b32cc5ab1debe23265b495f056f4275c72373338f62ea451126169d41baa95722
-DIST redot-4.4_beta.zip 55256813 BLAKE2B 42e54c47aa208688a9a11ffcdc3982175e819f8fa690c2be33f35d5cede2f61fbb86f033581c3433f2bb73ed73c46409d814002219891d53d800f348d77c931b SHA512 dfb52799ad3441813e7866067aa347787427e591480a8c421e1634cf37d6281b32cc5ab1debe23265b495f056f4275c72373338f62ea451126169d41baa95722
+DIST redot-bin-4.4_beta.zip 55256813 BLAKE2B 42e54c47aa208688a9a11ffcdc3982175e819f8fa690c2be33f35d5cede2f61fbb86f033581c3433f2bb73ed73c46409d814002219891d53d800f348d77c931b SHA512 dfb52799ad3441813e7866067aa347787427e591480a8c421e1634cf37d6281b32cc5ab1debe23265b495f056f4275c72373338f62ea451126169d41baa95722
 
diff --git a/dev-games/redot-bin/redot-bin-4.4_beta.ebuild b/dev-games/redot-bin/redot-bin-4.4_beta.ebuild
index 58b2809..eca0644 100644
--- a/dev-games/redot-bin/redot-bin-4.4_beta.ebuild
+++ b/dev-games/redot-bin/redot-bin-4.4_beta.ebuild
@@ -18,7 +18,6 @@ IUSE="
 	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
 	speech test +theora +tools +udev +upnp +vulkan wayland +webp
 "
-REQUIRED_USE="wayland? ( gui )"
 RESTRICT="test"
 
 RDEPEND="
@@ -35,41 +34,33 @@ RDEPEND="
 	<net-libs/mbedtls-3:=
 	net-libs/wslay
 	sys-libs/zlib:=
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	fontconfig? ( media-libs/fontconfig )
-	gui? (
-		media-libs/libglvnd
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libxkbcommon
-		tools? ( raycast? ( media-libs/embree:4 ) )
-		vulkan? ( media-libs/vulkan-loader[X,wayland?] )
-	)
-	pulseaudio? ( media-libs/libpulse )
-	speech? ( app-accessibility/speech-dispatcher )
-	theora? ( media-libs/libtheora )
-	tools? ( app-misc/ca-certificates )
-	udev? ( virtual/udev )
-	wayland? (
-		dev-libs/wayland
-		gui-libs/libdecor
-	)
-	webp? ( media-libs/libwebp:= )
+	media-libs/alsa-lib
+	sys-apps/dbus
+	media-libs/fontconfig
+	media-libs/libglvnd
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxkbcommon
+	media-libs/embree:4
+	media-libs/vulkan-loader[X,wayland?]
+	media-libs/libpulse
+	media-libs/libtheora
+	app-misc/ca-certificates
+	virtual/udev
+	media-libs/libwebp:=
 "
 DEPEND="
 	${RDEPEND}
-	gui? ( x11-base/xorg-proto )
-	tools? ( test? ( dev-cpp/doctest ) )
+	x11-base/xorg-proto
 "
 BDEPEND="
 	virtual/pkgconfig
-	wayland? ( dev-util/wayland-scanner )
+	dev-util/wayland-scanner
 "
 
 src_unpack() {
@@ -78,103 +69,8 @@ src_unpack() {
 	mv ${P}/redot.linuxbsd.editor.x86_64 ${P}/${P}
 }
 
-src_compile() {
-	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
-
-	filter-lto #921017
-
-	local esconsargs=(
-		progress=no
-		verbose=yes
-
-		use_sowrap=no
-
-		alsa=$(usex alsa)
-		dbus=$(usex dbus)
-		deprecated=$(usex deprecated)
-		execinfo=no # not packaged, disables crash handler if non-glibc
-		fontconfig=$(usex fontconfig)
-		opengl3=$(usex gui)
-		pulseaudio=$(usex pulseaudio)
-		speechd=$(usex speech)
-		udev=$(usex udev)
-		use_volk=no # unnecessary when linking directly to libvulkan
-		vulkan=$(usex gui $(usex vulkan))
-		wayland=$(usex wayland)
-		# TODO: retry to add optional USE=X, wayland support is new
-		# and gui build is not well wired to handle USE="-X wayland" yet
-		x11=$(usex gui)
-
-		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-
-		# platform/*/detect.py uses builtin_* switches to check if need
-		# to link with system libraries, but many ignore whether the dep
-		# is actually used, so "enable" deleted builtins on disabled deps
-		builtin_brotli=no
-		builtin_certs=no
-		builtin_clipper2=yes # not packaged
-		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
-		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
-		builtin_freetype=no
-		builtin_glslang=yes #879111 (for now, may revisit if more stable)
-		builtin_graphite=no
-		builtin_harfbuzz=no
-		builtin_icu4c=no
-		builtin_libogg=no
-		builtin_libpng=no
-		builtin_libtheora=$(usex !theora)
-		builtin_libvorbis=no
-		builtin_libwebp=$(usex !webp)
-		builtin_mbedtls=no
-		builtin_miniupnpc=yes #934044 (for now, should revisit)
-		builtin_msdfgen=yes # not wired for unbundling nor packaged
-		builtin_openxr=yes # not packaged
-		builtin_pcre2=no
-		builtin_recastnavigation=no
-		builtin_rvo2=yes # bundled copy has redot-specific changes
-		builtin_squish=yes # ^ likewise, may not be safe to unbundle
-		builtin_wslay=no
-		builtin_xatlas=yes # not wired for unbundling nor packaged
-		builtin_zlib=no
-		builtin_zstd=no
-		# (more is bundled in third_party/ but they lack builtin_* switches)
-
-		# modules with optional dependencies, "possible" to disable more but
-		# gets messy and breaks all sorts of features (expected enabled)
-		module_mono_enabled=no # unhandled
-		# note raycast is only enabled on amd64+arm64, see raycast/config.py
-		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
-		module_theora_enabled=$(usex theora)
-		module_upnp_enabled=$(usex upnp)
-		module_webp_enabled=$(usex webp)
-
-		# let *FLAGS handle these
-		debug_symbols=no
-		lto=none
-		optimize=custom
-		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[@]}"
-}
-
-src_test() {
-	xdg_environment_reset
-
-	bin/redot* --headless --test || die
-}
-
 src_install() {
-	# suffix varies depending on arch/features, use wildcard to simplify
-	newbin redot* redot
+	newbin redot* redot-bin
 }
 
 
diff --git a/dev-games/redot/Manifest b/dev-games/redot/Manifest
new file mode 100644
index 0000000..9174906
--- /dev/null
+++ b/dev-games/redot/Manifest
@@ -0,0 +1 @@
+DIST redot-4.4_beta.tar.gz 47268130 BLAKE2B b8ec78c4fd1495df3aca57737f3742dc63f4751e0b7183ff5ba9a85f39a3f31b9c6964fd1f0f7176948bb2e95cb93e87dac9914148a5052d17058f6f7cfcba50 SHA512 316feda15f580247e34c06e0e484bd26c60dd20a1455c243b6506073bdcbaf8c6029ee9f717a717575d45e33d1f9adc40c8ec7854191e184cebfc992a04713b6
diff --git a/dev-games/redot/redot-4.4_beta.ebuild b/dev-games/redot/redot-4.4_beta.ebuild
new file mode 100644
index 0000000..1036258
--- /dev/null
+++ b/dev-games/redot/redot-4.4_beta.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Open-source game engine for everyone. No strings attached."
+HOMEPAGE="https://www.redotengine.org/"
+SRC_URI="https://github.com/Redot-Engine/redot-engine/archive/refs/tags/2024101114.tar.gz -> ${P}.tar.gz"
+
+LICENSE="
+	MIT
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
+	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="
+	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
+	speech test +theora +tools +udev +upnp +vulkan wayland +webp
+"
+REQUIRED_USE="wayland? ( gui )"
+RESTRICT="test"
+
+RDEPEND="
+	app-arch/brotli:=
+	app-arch/zstd:=
+	dev-games/recastnavigation:=
+	dev-libs/icu:=
+	dev-libs/libpcre2:=[pcre32]
+	media-libs/freetype[brotli,harfbuzz]
+	media-libs/harfbuzz:=[icu]
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libvorbis
+	<net-libs/mbedtls-3:=
+	net-libs/wslay
+	sys-libs/zlib:=
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	fontconfig? ( media-libs/fontconfig )
+	gui? (
+		media-libs/libglvnd
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libxkbcommon
+		tools? ( raycast? ( media-libs/embree:4 ) )
+		vulkan? ( media-libs/vulkan-loader[X,wayland?] )
+	)
+	pulseaudio? ( media-libs/libpulse )
+	speech? ( app-accessibility/speech-dispatcher )
+	theora? ( media-libs/libtheora )
+	tools? ( app-misc/ca-certificates )
+	udev? ( virtual/udev )
+	wayland? (
+		dev-libs/wayland
+		gui-libs/libdecor
+	)
+	webp? ( media-libs/libwebp:= )
+"
+DEPEND="
+	${RDEPEND}
+	gui? ( x11-base/xorg-proto )
+	tools? ( test? ( dev-cpp/doctest ) )
+"
+BDEPEND="
+	virtual/pkgconfig
+	wayland? ( dev-util/wayland-scanner )
+"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	mv redot-engine-2024101114/ ${P}
+	#mv ${P}/redot.linuxbsd.editor.x86_64 ${P}/${P}
+}
+
+
+src_compile() {
+	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
+
+	#filter-lto #921017
+
+	local esconsargs=(
+		#AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+		progress=no
+		verbose=yes
+
+		use_sowrap=no
+
+		alsa=$(usex alsa)
+		dbus=$(usex dbus)
+		deprecated=$(usex deprecated)
+		execinfo=no # not packaged, disables crash handler if non-glibc
+		fontconfig=$(usex fontconfig)
+		opengl3=$(usex gui)
+		pulseaudio=$(usex pulseaudio)
+		speechd=$(usex speech)
+		udev=$(usex udev)
+		use_volk=no # unnecessary when linking directly to libvulkan
+		vulkan=$(usex gui $(usex vulkan))
+		wayland=$(usex wayland)
+		# TODO: retry to add optional USE=X, wayland support is new
+		# and gui build is not well wired to handle USE="-X wayland" yet
+		x11=$(usex gui)
+
+		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+
+		# platform/*/detect.py uses builtin_* switches to check if need
+		# to link with system libraries, but many ignore whether the dep
+		# is actually used, so "enable" deleted builtins on disabled deps
+		builtin_brotli=no
+		builtin_certs=no
+		builtin_clipper2=yes # not packaged
+		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
+		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
+		builtin_freetype=no
+		builtin_glslang=yes #879111 (for now, may revisit if more stable)
+		builtin_graphite=no
+		builtin_harfbuzz=no
+		builtin_icu4c=no
+		builtin_libogg=no
+		builtin_libpng=no
+		builtin_libtheora=$(usex !theora)
+		builtin_libvorbis=no
+		builtin_libwebp=$(usex !webp)
+		builtin_mbedtls=no
+		builtin_miniupnpc=yes #934044 (for now, should revisit)
+		builtin_msdfgen=yes # not wired for unbundling nor packaged
+		builtin_openxr=yes # not packaged
+		builtin_pcre2=no
+		builtin_recastnavigation=no
+		builtin_rvo2=yes # bundled copy has godot-specific changes
+		builtin_squish=yes # ^ likewise, may not be safe to unbundle
+		builtin_wslay=no
+		builtin_xatlas=yes # not wired for unbundling nor packaged
+		builtin_zlib=no
+		builtin_zstd=no
+		# (more is bundled in third_party/ but they lack builtin_* switches)
+
+		# modules with optional dependencies, "possible" to disable more but
+		# gets messy and breaks all sorts of features (expected enabled)
+		module_mono_enabled=no # unhandled
+		# note raycast is only enabled on amd64+arm64, see raycast/config.py
+		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
+		module_theora_enabled=$(usex theora)
+		module_upnp_enabled=$(usex upnp)
+		module_webp_enabled=$(usex webp)
+
+		# let *FLAGS handle these
+		debug_symbols=no
+		lto=none
+		optimize=custom
+		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))
+	)
+
+	scons "${esconsargs[@]}"
+}
+
+src_install() {
+	# suffix varies depending on arch/features, use wildcard to simplify
+	newbin bin/redot* redot
+}
+
+