Adding metadata

7 files changed, 13 insertions, 254 deletions

diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index dccec3278748..6b6300899942 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -1,4 +1,3 @@
-DIST godot-4.4.1-stable.tar.xz 37561040 BLAKE2B 6c424f1faa28b43a9835ea80a75de273f81877e180c0664b39080a7fa57d4d580a9b9fc6bed50a308f3a15a429c9b93d63cee99a347d6cf1cbe87b870a76f284 SHA512 f67882a70dc9e2d2efbbc9cda657f292ba05bb4c8341809c56fe054979032a93b04f9125815865efeaa269cf404010eb74f075a37faebb2a8f28be5abb706480
 DIST godot-4.5.2-stable.tar.xz 43877740 BLAKE2B fc54a347534697fa7eea0a53d977689f2ece35b997fe3546f8c8175745628ba14b0880c177783bdfbd5cb0052eb54d1c710841bacda8200a26c51822e06ba635 SHA512 18ee93e0b39d965244662e64f82597722e99a17e63f90d976de65abf77238587e00e11b68ce749698d625babe0077de6e12a66dc0aa68e0039bb93dbb7243c75
 DIST godot-4.6.3-stable.tar.xz 44471880 BLAKE2B 9d4b0fdf4b75db3062e229b2cf43746620e51da83f9859bf06e691d36249bd5394ca8f6086dbc943a7eb4e44f55a28b32fb615fcb94b511bf41ad82dfc718ed9 SHA512 b3e4c63eae7b7e0c47da07ae64d49dca5bf033912ea0a0da5440fcee48b4eb16c75e446374e7916c4ca2c6ff39ed7f3833e4cc2761df73765a660f715770f803
 DIST godot-4.7-stable.tar.xz 46684188 BLAKE2B 6055f1203d5d4f865bee419b7c01eb7603c1cd16895476fd259734c54f68697787ed746d05157bf4f7d4ac9574eb69ce6fc3de3a12aeee38c40084c6e5fada22 SHA512 0afddbd2acb1e2eba0bb2b885d58c321e9b7d4adc30481d7ab70b348dc96d9ccf1c11fd7de39900eb646c543488225280b7321831b0237cde9d27655962fefc0
diff --git a/dev-games/godot/files/godot-4.4-scons.patch b/dev-games/godot/files/godot-4.4-scons.patch
deleted file mode 100644
index 0c1ab346d0e3..000000000000
--- a/dev-games/godot/files/godot-4.4-scons.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -274,2 +274,3 @@
- opts.Add("CC", "C compiler binary")
-+opts.Add("AR", "Archiver")
- opts.Add("LINK", "Linker binary")
-@@ -749,8 +750,2 @@
-             env.Append(CCFLAGS=[f"-ffile-prefix-map={project_path}=."])
--    else:
--        if methods.is_apple_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"])
- 
diff --git a/dev-games/godot/files/godot-4.5-scons.patch b/dev-games/godot/files/godot-4.5-scons.patch
index ac1fd270ed22..581d5dda072e 100644
--- a/dev-games/godot/files/godot-4.5-scons.patch
+++ b/dev-games/godot/files/godot-4.5-scons.patch
@@ -1,16 +1,20 @@
+Respect AR (bug #977691), RANLIB, and avoid passing unnecessary flags.
 --- a/SConstruct
 +++ b/SConstruct
-@@ -304,2 +304,3 @@
- opts.Add("CC", "C compiler binary")
-+opts.Add("AR", "Archiver")
- opts.Add("LINK", "Linker binary")
-@@ -745,3 +746,3 @@
+@@ -804,3 +804,3 @@
          # `-msse2` is implied when compiling for x86_64.
 -        env.Append(CCFLAGS=["-msse4.2", "-mpopcnt"])
 +        pass
  elif env["arch"] == "x86_32":
-@@ -817,3 +818,3 @@
+@@ -883,3 +883,3 @@
          else:
 -            env.AppendUnique(LINKFLAGS=["-s"])
 +            pass
  
+--- a/platform/linuxbsd/detect.py
++++ b/platform/linuxbsd/detect.py
+@@ -118,2 +118,4 @@
+     ## Compiler configuration
++    env["AR"] = os.environ["AR"]
++    env["RANLIB"] = os.environ["RANLIB"]
+ 
diff --git a/dev-games/godot/godot-4.4.1-r1.ebuild b/dev-games/godot/godot-4.4.1-r1.ebuild
deleted file mode 100644
index d02a961c5da8..000000000000
--- a/dev-games/godot/godot-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 2022-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{13..14} )
-inherit branding desktop python-any-r1 flag-o-matic scons-utils
-inherit shell-completion toolchain-funcs xdg
-
-DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
-HOMEPAGE="https://godotengine.org/"
-SRC_URI="
-	https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz
-"
-S=${WORKDIR}/${P}-stable
-
-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"
-# Enable roughly same as upstream by default so it works as expected,
-# except raycast (tools-only heavy dependency), and deprecated.
-IUSE="
-	alsa +dbus debug deprecated double-precision +fontconfig +gui
-	pulseaudio raycast speech test +theora +tools +udev +upnp +vulkan
-	wayland +webp
-"
-REQUIRED_USE="wayland? ( gui )"
-# TODO: tests still need more figuring out
-RESTRICT="test"
-
-# dlopen: libglvnd
-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.6.2-r101:3=
-	net-libs/wslay
-	virtual/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 )
-	upnp? ( net-libs/miniupnpc:= )
-	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 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4-scons.patch
-)
-
-src_prepare() {
-	default
-
-	# mbedtls normally has mbedtls.pc, but Gentoo's slotted one is mbedtls-3.pc
-	sed -E "/pkg-config/s/(mbedtls|mbedcrypto|mbedx509)/&-3/g" \
-		-i platform/linuxbsd/detect.py || die
-
-	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
-
-	# use of builtin_ switches can be messy (see below), delete to be sure
-	local unbundle=(
-		brotli doctest embree freetype graphite harfbuzz icu4c libogg
-		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
-		miniupnpc pcre2 recastnavigation volk wslay zlib zstd
-		# certs: unused by generated header, but scons panics if not found
-	)
-	rm -r "${unbundle[@]/#/thirdparty/}" || die
-
-	ln -s -- "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
-}
-
-src_compile() {
-	local -x BUILD_NAME=${BRANDING_OS_ID} # replaces "custom_build" in version
-
-	filter-lto #921017
-
-	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-		progress=no
-		verbose=yes
-
-		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)
-		deprecated=$(usex deprecated)
-		precision=$(usex double-precision double single)
-		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_sowrap=no
-		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=$(usex !upnp)
-		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_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 and USE should
-		# be masked for other keywords if added, 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
-	)
-
-	escons "${esconsargs[@]}"
-}
-
-src_test() {
-	xdg_environment_reset
-
-	bin/godot* --headless --test || die
-}
-
-src_install() {
-	# suffix varies depending on arch/features, use wildcard to simplify
-	newbin bin/godot* godot
-
-	doman misc/dist/linux/godot.6
-	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
-
-	if use gui; then
-		newicon icon.svg godot.svg
-		domenu misc/dist/linux/org.godotengine.Godot.desktop
-
-		insinto /usr/share/metainfo
-		doins misc/dist/linux/org.godotengine.Godot.appdata.xml
-
-		insinto /usr/share/mime/application
-		doins misc/dist/linux/org.godotengine.Godot.xml
-	fi
-
-	newbashcomp misc/dist/shell/godot.bash-completion godot
-	newfishcomp misc/dist/shell/godot.fish godot.fish
-	newzshcomp misc/dist/shell/_godot.zsh-completion _godot
-}
diff --git a/dev-games/godot/godot-4.5.2.ebuild b/dev-games/godot/godot-4.5.2.ebuild
index 778e69f11085..526bde796afd 100644
--- a/dev-games/godot/godot-4.5.2.ebuild
+++ b/dev-games/godot/godot-4.5.2.ebuild
@@ -118,11 +118,10 @@ src_prepare() {
 src_compile() {
 	local -x BUILD_NAME=${BRANDING_OS_ID} # replaces "custom_build" in version
 
+	tc-export AR CC CXX RANLIB
 	filter-lto #921017
 
 	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
 		progress=no
 		verbose=yes
 
diff --git a/dev-games/godot/godot-4.6.3.ebuild b/dev-games/godot/godot-4.6.3.ebuild
index 8b99967f0b32..be4e3bb77845 100644
--- a/dev-games/godot/godot-4.6.3.ebuild
+++ b/dev-games/godot/godot-4.6.3.ebuild
@@ -118,11 +118,10 @@ src_prepare() {
 src_compile() {
 	local -x BUILD_NAME=${BRANDING_OS_ID} # replaces "custom_build" in version
 
+	tc-export AR CC CXX RANLIB
 	filter-lto #921017
 
 	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
 		progress=no
 		verbose=yes
 
diff --git a/dev-games/godot/godot-4.7.ebuild b/dev-games/godot/godot-4.7.ebuild
index 6e9dae40424c..036e54b4459e 100644
--- a/dev-games/godot/godot-4.7.ebuild
+++ b/dev-games/godot/godot-4.7.ebuild
@@ -119,11 +119,10 @@ src_prepare() {
 src_compile() {
 	local -x BUILD_NAME=${BRANDING_OS_ID} # replaces "custom_build" in version
 
+	tc-export AR CC CXX RANLIB
 	filter-lto #921017
 
 	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
 		progress=no
 		verbose=yes