From 81b8f20732954c4508baf2f77472b5435e3f851f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 14 Sep 2022 11:10:11 +0100
Subject: gentoo auto-resync : 14:09:2022 - 11:10:10

---
 dev-games/godot/Manifest                 |   6 +-
 dev-games/godot/godot-4.0_alpha14.ebuild | 256 -------------------------------
 dev-games/godot/godot-4.0_alpha15.ebuild | 256 -------------------------------
 dev-games/godot/godot-4.0_alpha17.ebuild | 256 +++++++++++++++++++++++++++++++
 4 files changed, 258 insertions(+), 516 deletions(-)
 delete mode 100644 dev-games/godot/godot-4.0_alpha14.ebuild
 delete mode 100644 dev-games/godot/godot-4.0_alpha15.ebuild
 create mode 100644 dev-games/godot/godot-4.0_alpha17.ebuild

(limited to 'dev-games/godot')

diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index 929ca6d735f7..539623b65e8d 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -3,11 +3,9 @@ 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
 DIST godot-3.5-stable.tar.xz 24044340 BLAKE2B 9d77ecdfa6bd90065fff26c2334f13c32bbbc4b26aad111b5aab2563d1e4782457ea6cf2115f1a809e0d8aac3d3ee9a138ad224998068983ad36e54a577d89c3 SHA512 23785e39ccc7e1406c97ee33b5e90f7f397aa907d79d72ed08ea3f4b7e68788030a1bcdd07c9f782a21ee3a84636a2cea47a57dcfc94c24e327fa210ae0515b0
-DIST godot-4.0-alpha14.tar.xz 30970116 BLAKE2B 213616f3a80f97c09580324bf9296d12b6213a2941b3070353b45e160dc7d7bfd32fcae3fc2b64a91fa7d935c23d97fd02a015bc3501441d67261ee6e45e85e1 SHA512 511cb5d3f48c747232350bee25765c17032b99179fd70877f906bcd1a09449260a928c3df9f84c6f3afb47f564b8f4bf75d0a07d37f5a22dd5f5a96d1b1f4df5
-DIST godot-4.0-alpha15.tar.xz 30959600 BLAKE2B 0631519d81147d64a01b543111b8317c436d4070f27cf54801a68a66b8d380e5ce33b85a78f09547ffc1b2573f9ac0c7860712808380849c26a0336c89d1c7f4 SHA512 47c750062e4e8262ee95e5b0337744e86b0092789a62c3847d27ab929281c414e5ca1d666a1f03f0a180203ee0f78f53e311976b52d54ee9f8a7b266afa3beb0
 DIST godot-4.0-alpha16.tar.xz 31012408 BLAKE2B 6492953945e3f2f77da5dcf042d791dd2dc903e65b787704c8053d1ac61852dd3c1d8f8aa0a383f1c86495c863d1f15f6d5e77e6ecadda7ff87ae7c87bdce810 SHA512 56e87c7a02abf9dee15e89be829046b9335a7c01b7bd3bb38d71b3fe1f262f6e923741c47c2d96b2633b9a16f71882ec87aaf06bad42d4bdf7a429ff2db0b4b1
+DIST godot-4.0-alpha17.tar.xz 31106496 BLAKE2B 4ac31703dac68a0e204e095c421015632ca8fbbb3dc379cd937f1375ab4c830c89ddeca8f9fe5cb080ea82616c786df4c1bf0d0fa7f52e552d750f1bb2d56a08 SHA512 9840391fbcbaa88b73b3fe8b133f0537c1f2a12eedb8bc0931922cf724a1d815516b7566cfac98787706a6eca6e2a35ecea3d9d14266501c8612dcb929a975d1
 EBUILD godot-3.5.ebuild 6747 BLAKE2B b19789b1ea9890973b16c2c6e7bc015f033fc218587e529a715ff2813e21c3fa8c89476c8f16cca707b2b93d35e2bd53ac7e6521af5c0aa088edd4e4a93b4fad SHA512 f6858b117eadca56a3539bf19d6ce1e8e04ade2e3b82a7abd49a30f89184681982d889eb82a5f9832107d8d5ad62326729eb286aaef4602e257391c0924e0e68
-EBUILD godot-4.0_alpha14.ebuild 8188 BLAKE2B af2ce88e06a2e13147bf8fd248bc3a860c7e9bd81c4166fa3f60e913325ac3b70f56781e9baefec60cbd1158d0c7932cefc71451fbc53129a5c81d20e9472230 SHA512 96cb03edea657f5a790106e662bf08a502cad4416d3106a546961ccc7c7ced10157a77756910de8d58b85e8edee6aec54a80b529d6ae29f9a01c23e41fe21487
-EBUILD godot-4.0_alpha15.ebuild 8204 BLAKE2B d421ca65921c423f14806472ae5e2a67888a6a41097ec9bbc82b5d43b0c050f06509af4f072f44a664356f0afd87331f6ce01799bcc13184775c0d4398a7746f SHA512 2b9fe01040179702134edd1e6a5544f2866219367aff3486871b527fd26f8ad86383b153494cd3c2644f588abfa71fba077c7bae841a85ef5d799df3cb9d3216
 EBUILD godot-4.0_alpha16.ebuild 8204 BLAKE2B d421ca65921c423f14806472ae5e2a67888a6a41097ec9bbc82b5d43b0c050f06509af4f072f44a664356f0afd87331f6ce01799bcc13184775c0d4398a7746f SHA512 2b9fe01040179702134edd1e6a5544f2866219367aff3486871b527fd26f8ad86383b153494cd3c2644f588abfa71fba077c7bae841a85ef5d799df3cb9d3216
+EBUILD godot-4.0_alpha17.ebuild 8206 BLAKE2B b4ef8f8bff7fa984d15590f830a30c901729c76c15c051634fc4e757e4246c74b22d2c2832800ec9c08d524da687921068680200595928ffbefa7ce934dbf2d7 SHA512 4ce16b99fdb634a0e22286bb546d5cfc5c61290cb7a53dc457a95013d77cd760564d8c5f5ad8881678b7dffeefce8c7313a4d9bc3342df7595d33659fbc32de2
 MISC metadata.xml 1551 BLAKE2B 718ca848e6b90fad730ea413ff8d25a9c23836da1ff890d7c93d458a0b46b503a4d1b949742a4a819eb0323eb0626a3541cd35d41f809b600891fa470f565ff6 SHA512 b935ee9256ae07a8f01bc458ee41c46e25be8a38b6921cf353a20332c59b6083bd6f73e2112858827b3b7bccdb256f9122e1d9691d2a3751aba85bbb8c4ab262
diff --git a/dev-games/godot/godot-4.0_alpha14.ebuild b/dev-games/godot/godot-4.0_alpha14.ebuild
deleted file mode 100644
index 2e22a6f9fe5a..000000000000
--- a/dev-games/godot/godot-4.0_alpha14.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
-
-MY_P="${PN}-$(ver_rs 2 -)"
-
-DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
-HOMEPAGE="https://godotengine.org/"
-SRC_URI="https://downloads.tuxfamily.org/godotengine/$(ver_rs 2 /)/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="
-	MIT
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
-	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
-SLOT="4"
-#KEYWORDS="~amd64" # leaving 4 unkeyworded until at least first _beta
-# Enable roughly same as upstream by default so it works as expected,
-# except raycast (tools-only heavy dependency), and deprecated.
-IUSE="
-	+dbus debug deprecated +fontconfig +gui pulseaudio raycast
-	+runner speech test +theora +tools +udev +upnp +webp"
-RESTRICT="!test? ( test ) !tools? ( test )"
-
-# dlopen: alsa-lib,dbus,fontconfig,pulseaudio,speech-dispatcher,udev
-RDEPEND="
-	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:=
-	fontconfig? ( media-libs/fontconfig )
-	gui? (
-		dev-util/glslang
-		media-libs/alsa-lib
-		media-libs/libglvnd[X]
-		media-libs/vulkan-loader[X]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		dbus? ( sys-apps/dbus )
-		pulseaudio? ( media-libs/libpulse )
-		tools? ( raycast? ( media-libs/embree:3 ) )
-		udev? ( virtual/udev )
-	)
-	speech? ( app-accessibility/speech-dispatcher )
-	theora? ( media-libs/libtheora )
-	tools? ( app-misc/ca-certificates )
-	upnp? ( net-libs/miniupnpc:= )
-	webp? ( media-libs/libwebp:= )"
-DEPEND="
-	${RDEPEND}
-	gui? (
-		dev-util/vulkan-headers
-		x11-base/xorg-proto
-	)
-	tools? ( test? ( dev-cpp/doctest ) )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-musl.patch
-	"${FILESDIR}"/${PN}-4.0_alpha14-scons.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
-	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
-	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
-		-i misc/dist/linux/org.godotengine.Godot.desktop || 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=(
-		doctest embree freetype glslang graphite harfbuzz icu4c libogg libpng
-		libtheora libvorbis libwebp mbedtls miniupnpc pcre2 recastnavigation
-		volk vulkan/include wslay zlib zstd
-		# certs: unused by generated header, but scons panics if not found
-	)
-	rm -r "${unbundle[@]/#/thirdparty/}" || die
-
-	# do symlinks to avoid too much patching with hardcoded header paths
-	mkdir thirdparty/lib{vorbis,ogg} || die
-	ln -s "${ESYSROOT}"/usr/include thirdparty/zstd || die
-	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
-	ln -s "${ESYSROOT}"/usr/include/ogg thirdparty/libogg/ || die
-	ln -s "${ESYSROOT}"/usr/include/vorbis thirdparty/libvorbis/ || die
-}
-
-src_compile() {
-	local -x GODOT_VERSION_STATUS=$(ver_cut 3-4) # for dev versions only
-	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
-
-	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-		progress=no
-		verbose=yes
-
-		deprecated=$(usex deprecated)
-		#execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged
-		fontconfig=$(usex fontconfig)
-		minizip=yes # uses a modified bundled copy
-		opengl3=$(usex gui)
-		pulseaudio=$(usex gui $(usex pulseaudio))
-		speechd=$(usex speech)
-		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
-		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 ignores whether the dep is
-		# actually used, so "enable" deleted builtins on disabled deps
-		builtin_certs=no
-		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=$(usex !gui)
-		builtin_graphite=no
-		builtin_harfbuzz=no
-		builtin_icu=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_pcre2=no
-		builtin_recast=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
-		# also bundled but lacking a builtin_* switch:
-		#	amd-fsr, basis_universal, cvtt, etcpak, fonts, glad,
-		#	jpeg-compressor, meshoptimizer, minimp3, minizip (patched to
-		#	seek in archives), noise, oidn, openxr, spirv-reflect, thorvg,
-		#	tinyexr, vhacd, vulkan (minus include/) and the misc directory.
-
-		# modules with optional dependencies, "possible" to disable more but
-		# gets messy and breaks all sorts of features (expected enabled)
-		module_glslang_enabled=$(usex gui)
-		module_gridmap_enabled=$(usex deprecated) # fails without deprecated
-		module_mono_enabled=no # unhandled
-		# note raycast is disabled on many arches, 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, e.g. can pass -flto as-is
-		debug_symbols=no
-		optimize=none
-		use_lto=no
-		use_static_cpp=no
-	)
-
-	if use runner && use tools; then
-		# build alternate faster + ~60% smaller binary for running
-		# games or servers without game development debug paths
-		escons extra_suffix=runner target=release tools=no "${esconsargs[@]}"
-	fi
-
-	esconsargs+=(
-		# debug: debug for godot itself
-		# release_debug: debug for game development
-		# release: no debugging paths, only available with tools=no
-		target=$(usex debug{,} $(usex tools release_debug release))
-		tools=$(usex tools)
-
-		# harmless but note this bakes in --test in the final binary
-		tests=$(usex tools $(usex test))
-	)
-
-	escons extra_suffix=main "${esconsargs[@]}"
-}
-
-src_test() {
-	xdg_environment_reset
-	bin/godot*.main --headless --test || die
-}
-
-src_install() {
-	local s=godot${SLOT}
-
-	newbin bin/godot*.main ${s}
-	if use runner && use tools; then
-		newbin bin/godot*.runner ${s}-runner
-	else
-		# always available, revdeps shouldn't depend on [runner]
-		dosym ${s} /usr/bin/${s}-runner
-	fi
-
-	newman misc/dist/linux/godot.6 ${s}.6
-	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
-
-	if use gui; then
-		newicon icon.svg ${s}.svg
-		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
-			org.godotengine.${s^}.desktop
-
-		insinto /usr/share/metainfo
-		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
-			org.godotengine.${s^}.appdata.xml
-
-		insinto /usr/share/mime/application
-		newins misc/dist/linux/org.godotengine.Godot.xml \
-			org.godotengine.${s^}.xml
-	fi
-
-	newbashcomp misc/dist/shell/godot.bash-completion ${s}
-	bashcomp_alias ${s}{,-runner}
-
-	insinto /usr/share/fish/vendor_completions.d
-	newins misc/dist/shell/godot.fish ${s}.fish
-	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
-
-	insinto /usr/share/zsh/site-functions
-	newins misc/dist/shell/_godot.zsh-completion _${s}
-	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ ! ${REPLACING_VERSIONS} ]] && has_version ${CATEGORY}/${PN}:3; then
-		elog
-		elog "Remember to make backups before opening any Godot <=3.x projects in Godot 4."
-		elog "Automated migration is only partial, and it would be difficult to revert."
-	fi
-}
diff --git a/dev-games/godot/godot-4.0_alpha15.ebuild b/dev-games/godot/godot-4.0_alpha15.ebuild
deleted file mode 100644
index 02df805c8f56..000000000000
--- a/dev-games/godot/godot-4.0_alpha15.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
-
-MY_P="${PN}-$(ver_rs 2 -)"
-
-DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
-HOMEPAGE="https://godotengine.org/"
-SRC_URI="https://downloads.tuxfamily.org/godotengine/$(ver_rs 2 /)/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="
-	MIT
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
-	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
-SLOT="4"
-#KEYWORDS="~amd64" # leaving 4 unkeyworded until at least first _beta
-# Enable roughly same as upstream by default so it works as expected,
-# except raycast (tools-only heavy dependency), and deprecated.
-IUSE="
-	+dbus debug deprecated +fontconfig +gui pulseaudio raycast
-	+runner speech test +theora +tools +udev +upnp +webp"
-RESTRICT="!test? ( test ) !tools? ( test ) !webp? ( test )"
-
-# dlopen: alsa-lib,dbus,fontconfig,pulseaudio,speech-dispatcher,udev
-RDEPEND="
-	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:=
-	fontconfig? ( media-libs/fontconfig )
-	gui? (
-		dev-util/glslang
-		media-libs/alsa-lib
-		media-libs/libglvnd[X]
-		media-libs/vulkan-loader[X]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		dbus? ( sys-apps/dbus )
-		pulseaudio? ( media-libs/libpulse )
-		tools? ( raycast? ( media-libs/embree:3 ) )
-		udev? ( virtual/udev )
-	)
-	speech? ( app-accessibility/speech-dispatcher )
-	theora? ( media-libs/libtheora )
-	tools? ( app-misc/ca-certificates )
-	upnp? ( net-libs/miniupnpc:= )
-	webp? ( media-libs/libwebp:= )"
-DEPEND="
-	${RDEPEND}
-	gui? (
-		dev-util/vulkan-headers
-		x11-base/xorg-proto
-	)
-	tools? ( test? ( dev-cpp/doctest ) )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-musl.patch
-	"${FILESDIR}"/${PN}-4.0_alpha14-scons.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
-	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
-	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
-		-i misc/dist/linux/org.godotengine.Godot.desktop || 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=(
-		doctest embree freetype glslang graphite harfbuzz icu4c libogg libpng
-		libtheora libvorbis libwebp mbedtls miniupnpc pcre2 recastnavigation
-		volk vulkan/include wslay zlib zstd
-		# certs: unused by generated header, but scons panics if not found
-	)
-	rm -r "${unbundle[@]/#/thirdparty/}" || die
-
-	# do symlinks to avoid too much patching with hardcoded header paths
-	mkdir thirdparty/lib{vorbis,ogg} || die
-	ln -s "${ESYSROOT}"/usr/include thirdparty/zstd || die
-	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
-	ln -s "${ESYSROOT}"/usr/include/ogg thirdparty/libogg/ || die
-	ln -s "${ESYSROOT}"/usr/include/vorbis thirdparty/libvorbis/ || die
-}
-
-src_compile() {
-	local -x GODOT_VERSION_STATUS=$(ver_cut 3-4) # for dev versions only
-	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
-
-	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-		progress=no
-		verbose=yes
-
-		deprecated=$(usex deprecated)
-		#execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged
-		fontconfig=$(usex fontconfig)
-		minizip=yes # uses a modified bundled copy
-		opengl3=$(usex gui)
-		pulseaudio=$(usex gui $(usex pulseaudio))
-		speechd=$(usex speech)
-		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
-		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 ignores whether the dep is
-		# actually used, so "enable" deleted builtins on disabled deps
-		builtin_certs=no
-		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=$(usex !gui)
-		builtin_graphite=no
-		builtin_harfbuzz=no
-		builtin_icu=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_pcre2=no
-		builtin_recast=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
-		# also bundled but lacking a builtin_* switch:
-		#	amd-fsr, basis_universal, cvtt, etcpak, fonts, glad,
-		#	jpeg-compressor, meshoptimizer, minimp3, minizip (patched to
-		#	seek in archives), noise, oidn, openxr, spirv-reflect, thorvg,
-		#	tinyexr, vhacd, vulkan (minus include/) and the misc directory.
-
-		# modules with optional dependencies, "possible" to disable more but
-		# gets messy and breaks all sorts of features (expected enabled)
-		module_glslang_enabled=$(usex gui)
-		module_gridmap_enabled=$(usex deprecated) # fails without deprecated
-		module_mono_enabled=no # unhandled
-		# note raycast is disabled on many arches, 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, e.g. can pass -flto as-is
-		debug_symbols=no
-		optimize=none
-		use_lto=no
-		use_static_cpp=no
-	)
-
-	if use runner && use tools; then
-		# build alternate faster + ~60% smaller binary for running
-		# games or servers without game development debug paths
-		escons extra_suffix=runner target=release tools=no "${esconsargs[@]}"
-	fi
-
-	esconsargs+=(
-		# debug: debug for godot itself
-		# release_debug: debug for game development
-		# release: no debugging paths, only available with tools=no
-		target=$(usex debug{,} $(usex tools release_debug release))
-		tools=$(usex tools)
-
-		# harmless but note this bakes in --test in the final binary
-		tests=$(usex tools $(usex test))
-	)
-
-	escons extra_suffix=main "${esconsargs[@]}"
-}
-
-src_test() {
-	xdg_environment_reset
-	bin/godot*.main --headless --test || die
-}
-
-src_install() {
-	local s=godot${SLOT}
-
-	newbin bin/godot*.main ${s}
-	if use runner && use tools; then
-		newbin bin/godot*.runner ${s}-runner
-	else
-		# always available, revdeps shouldn't depend on [runner]
-		dosym ${s} /usr/bin/${s}-runner
-	fi
-
-	newman misc/dist/linux/godot.6 ${s}.6
-	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
-
-	if use gui; then
-		newicon icon.svg ${s}.svg
-		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
-			org.godotengine.${s^}.desktop
-
-		insinto /usr/share/metainfo
-		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
-			org.godotengine.${s^}.appdata.xml
-
-		insinto /usr/share/mime/application
-		newins misc/dist/linux/org.godotengine.Godot.xml \
-			org.godotengine.${s^}.xml
-	fi
-
-	newbashcomp misc/dist/shell/godot.bash-completion ${s}
-	bashcomp_alias ${s}{,-runner}
-
-	insinto /usr/share/fish/vendor_completions.d
-	newins misc/dist/shell/godot.fish ${s}.fish
-	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
-
-	insinto /usr/share/zsh/site-functions
-	newins misc/dist/shell/_godot.zsh-completion _${s}
-	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ ! ${REPLACING_VERSIONS} ]] && has_version ${CATEGORY}/${PN}:3; then
-		elog
-		elog "Remember to make backups before opening any Godot <=3.x projects in Godot 4."
-		elog "Automated migration is only partial, and it would be difficult to revert."
-	fi
-}
diff --git a/dev-games/godot/godot-4.0_alpha17.ebuild b/dev-games/godot/godot-4.0_alpha17.ebuild
new file mode 100644
index 000000000000..5aece9e648b7
--- /dev/null
+++ b/dev-games/godot/godot-4.0_alpha17.ebuild
@@ -0,0 +1,256 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
+
+MY_P="${PN}-$(ver_rs 2 -)"
+
+DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
+HOMEPAGE="https://godotengine.org/"
+SRC_URI="https://downloads.tuxfamily.org/godotengine/$(ver_rs 2 /)/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="
+	MIT
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
+	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
+SLOT="4"
+#KEYWORDS="~amd64" # leaving 4 unkeyworded until at least first _beta
+# Enable roughly same as upstream by default so it works as expected,
+# except raycast (tools-only heavy dependency), and deprecated.
+IUSE="
+	+dbus debug deprecated +fontconfig +gui pulseaudio raycast
+	+runner speech test +theora +tools +udev +upnp +webp"
+RESTRICT="!test? ( test ) !tools? ( test ) !webp? ( test )"
+
+# dlopen: alsa-lib,dbus,fontconfig,pulseaudio,speech-dispatcher,udev
+RDEPEND="
+	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:=
+	fontconfig? ( media-libs/fontconfig )
+	gui? (
+		dev-util/glslang
+		media-libs/alsa-lib
+		media-libs/libglvnd[X]
+		media-libs/vulkan-loader[X]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		dbus? ( sys-apps/dbus )
+		pulseaudio? ( media-libs/libpulse )
+		tools? ( raycast? ( media-libs/embree:3 ) )
+		udev? ( virtual/udev )
+	)
+	speech? ( app-accessibility/speech-dispatcher )
+	theora? ( media-libs/libtheora )
+	tools? ( app-misc/ca-certificates )
+	upnp? ( net-libs/miniupnpc:= )
+	webp? ( media-libs/libwebp:= )"
+DEPEND="
+	${RDEPEND}
+	gui? (
+		dev-util/vulkan-headers
+		x11-base/xorg-proto
+	)
+	tools? ( test? ( dev-cpp/doctest ) )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-musl.patch
+	"${FILESDIR}"/${PN}-4.0_alpha14-scons.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
+	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
+	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
+		-i misc/dist/linux/org.godotengine.Godot.desktop || 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=(
+		doctest embree freetype glslang graphite harfbuzz icu4c libogg libpng
+		libtheora libvorbis libwebp mbedtls miniupnpc pcre2 recastnavigation
+		volk vulkan/include wslay zlib zstd
+		# certs: unused by generated header, but scons panics if not found
+	)
+	rm -r "${unbundle[@]/#/thirdparty/}" || die
+
+	# do symlinks to avoid too much patching with hardcoded header paths
+	mkdir thirdparty/lib{vorbis,ogg} || die
+	ln -s "${ESYSROOT}"/usr/include thirdparty/zstd || die
+	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
+	ln -s "${ESYSROOT}"/usr/include/ogg thirdparty/libogg/ || die
+	ln -s "${ESYSROOT}"/usr/include/vorbis thirdparty/libvorbis/ || die
+}
+
+src_compile() {
+	local -x GODOT_VERSION_STATUS=$(ver_cut 3-4) # for dev versions only
+	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
+
+	local esconsargs=(
+		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+		progress=no
+		verbose=yes
+
+		deprecated=$(usex deprecated)
+		#execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged
+		fontconfig=$(usex fontconfig)
+		minizip=yes # uses a modified bundled copy
+		opengl3=$(usex gui)
+		pulseaudio=$(usex gui $(usex pulseaudio))
+		speechd=$(usex speech)
+		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
+		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 ignores whether the dep is
+		# actually used, so "enable" deleted builtins on disabled deps
+		builtin_certs=no
+		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=$(usex !gui)
+		builtin_graphite=no
+		builtin_harfbuzz=no
+		builtin_icu=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_pcre2=no
+		builtin_recast=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
+		# also bundled but lacking a builtin_* switch:
+		#	amd-fsr, basis_universal, cvtt, etcpak, fonts, glad,
+		#	jpeg-compressor, meshoptimizer, minimp3, minizip (patched to
+		#	seek in archives), noise, oidn, openxr, spirv-reflect, thorvg,
+		#	tinyexr, vhacd, vulkan (minus include/) and the misc directory.
+
+		# modules with optional dependencies, "possible" to disable more but
+		# gets messy and breaks all sorts of features (expected enabled)
+		module_glslang_enabled=$(usex gui)
+		module_gridmap_enabled=$(usex deprecated) # fails without deprecated
+		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, e.g. can pass -flto as-is
+		debug_symbols=no
+		lto=none
+		optimize=none
+		use_static_cpp=no
+	)
+
+	if use runner && use tools; then
+		# build alternate faster + ~60% smaller binary for running
+		# games or servers without game development debug paths
+		escons extra_suffix=runner target=release tools=no "${esconsargs[@]}"
+	fi
+
+	esconsargs+=(
+		# debug: debug for godot itself
+		# release_debug: debug for game development
+		# release: no debugging paths, only available with tools=no
+		target=$(usex debug{,} $(usex tools release_debug release))
+		tools=$(usex tools)
+
+		# harmless but note this bakes in --test in the final binary
+		tests=$(usex tools $(usex test))
+	)
+
+	escons extra_suffix=main "${esconsargs[@]}"
+}
+
+src_test() {
+	xdg_environment_reset
+	bin/godot*.main --headless --test || die
+}
+
+src_install() {
+	local s=godot${SLOT}
+
+	newbin bin/godot*.main ${s}
+	if use runner && use tools; then
+		newbin bin/godot*.runner ${s}-runner
+	else
+		# always available, revdeps shouldn't depend on [runner]
+		dosym ${s} /usr/bin/${s}-runner
+	fi
+
+	newman misc/dist/linux/godot.6 ${s}.6
+	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
+
+	if use gui; then
+		newicon icon.svg ${s}.svg
+		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
+			org.godotengine.${s^}.desktop
+
+		insinto /usr/share/metainfo
+		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
+			org.godotengine.${s^}.appdata.xml
+
+		insinto /usr/share/mime/application
+		newins misc/dist/linux/org.godotengine.Godot.xml \
+			org.godotengine.${s^}.xml
+	fi
+
+	newbashcomp misc/dist/shell/godot.bash-completion ${s}
+	bashcomp_alias ${s}{,-runner}
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins misc/dist/shell/godot.fish ${s}.fish
+	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/dist/shell/_godot.zsh-completion _${s}
+	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]] && has_version ${CATEGORY}/${PN}:3; then
+		elog
+		elog "Remember to make backups before opening any Godot <=3.x projects in Godot 4."
+		elog "Automated migration is only partial, and it would be difficult to revert."
+	fi
+}
-- 
cgit v1.2.3