gentoo auto-resync : 28:01:2023 - 08:51:03

3 files changed, 21 insertions, 32 deletions

diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index 9d19d8deac91..b864a0331996 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -4,9 +4,9 @@ AUX godot-4.0-musl.patch 345 BLAKE2B 05057241c1e29ff886a38b815f68fcfe2b8c5e23fce
 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-beta14.tar.xz 31634268 BLAKE2B 6381d8efd0f2298a74c939a8c36f6d29f2b434ef870575fd01a844cfe04711fc29cccc280d6c0a92a4abd0344102b3fb36a87b9629e2cc08233ac7fde65a3be0 SHA512 38c5f33ed4d6c35d4eb45337399b525059caab7fff2efe611b2bbe9a36a23413c02690a94976cc63e6f4b857a1db7a0c7b86a8db3a504fdbf12a8d38c644acf2
 DIST godot-4.0-beta15.tar.xz 31921348 BLAKE2B 45482ac65e74b431d4f781a9055fdb578b8c838e659f459a09e3c39b80d50b1ee9222373159032d3eb25569f259330ef87967177765137491f793afe4d59ad93 SHA512 c0c0a139a437b2a27f38d6c104e64a2d4d9153d4b0c8ad66e157dde2422c86887796e1a1dd2eb9b9385013e7af2e513b8cd77d8bdcdb0750703fa5bba6770986
+DIST godot-4.0-beta16.tar.xz 31937624 BLAKE2B 998edcd6d9f118cb96a4f84b81b73c36d060d297702fa2a9dc4be936c7ca9aa35b77db16caf5ed19662fcae700f59e329393a17fd88448d8a6ff8f484a136f9c SHA512 c9cf5b66675dfe9253852eee7748a5c2bd04f356524def6e9925bef73baee3239f9f9405a92d373dcadbaff7c3288e54e547ae3cb46974bea61bfb68576b7c13
 EBUILD godot-3.5.1.ebuild 6752 BLAKE2B b7a6a3851292aa6bd134a45bf2ab7019a55da8bcc815e952ae3acd204b71314fb1a436fe5bab3c83906289566c274f1bc3240e3482c337aca488071d71618df5 SHA512 84a385fbcb01813c6b09e21a76b832b6e7329302e9d7ebd3d3ccbb37ce504f3cc13e1c0d460daa299ef40f9fe5cb04b7d1362e538004f96ef9b6c9dd56a115ac
-EBUILD godot-4.0_beta14.ebuild 7986 BLAKE2B 71456b92cf217ff2403b1c156132e05e433867811728b5f60a4ad4901321998eaa34a1110a423d6c6faafd07bfb979790b06dc6e9575ddc8a84c63c399ff8f43 SHA512 99028682672f894f46119a269388aa6f347fc048eea5ee726cdf212703dc3fe74c1624d2b570da7aa93f244c39f422baadfbd8e66a98c5720397d20b6bc1227c
 EBUILD godot-4.0_beta15.ebuild 7782 BLAKE2B c1ae4eaf5281e8ff8d553b359278b2c4be5a093075e95daf9c6e5582012651188744e3cf88ebb79f0675de368169901c5acacf4a134ef0493a43c3a93eafbb69 SHA512 ac25c9d9fe5068aa5cf14b07f2536ec5edf6b142255f4949ce5e7882ea8064a2ef7ec572ae391b8c6e83f30d2d0a13e8dba0572a191ad99b932fe18ba8e64370
-MISC metadata.xml 1606 BLAKE2B 5e4f1116549672d8cf6f88ef0b764e0710d5f5a1259110c323b67e911dc186c7b618ceb6e5d8b5ada540f531bf34b8e87c9de1652e13db9b08e865bacd7d0c29 SHA512 b4cdc297ad05067832bbd8ab849203201a3f65e00f0dd27ca4dd4c1f808ea2fd13a18615ac9fe6853ae30ae1e53168b73627d72df1f8f428d3979b06697defe5
+EBUILD godot-4.0_beta16.ebuild 7782 BLAKE2B c1ae4eaf5281e8ff8d553b359278b2c4be5a093075e95daf9c6e5582012651188744e3cf88ebb79f0675de368169901c5acacf4a134ef0493a43c3a93eafbb69 SHA512 ac25c9d9fe5068aa5cf14b07f2536ec5edf6b142255f4949ce5e7882ea8064a2ef7ec572ae391b8c6e83f30d2d0a13e8dba0572a191ad99b932fe18ba8e64370
+MISC metadata.xml 1547 BLAKE2B 39108142c8e34b3c2683d5bbab6989693156d320797d86efa36f3df39e3d667160cbdb1a0b0efe127f67b3977e1cf3cde151d07915542fa88831e626457bf86f SHA512 a099aacfdd27c4b9536512762fcc63f09ea71cce807b59ff70026a09d79856e1911405e64186597b8e3dd9fef0029c13944ceb3b77d7969adf7182218e532559
diff --git a/dev-games/godot/godot-4.0_beta14.ebuild b/dev-games/godot/godot-4.0_beta16.ebuild
index 4967572eeddd..180498ade9c3 100644
--- a/dev-games/godot/godot-4.0_beta14.ebuild
+++ b/dev-games/godot/godot-4.0_beta16.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
-inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
+inherit bash-completion-r1 desktop optfeature python-any-r1
+inherit scons-utils toolchain-funcs xdg
 
 MY_P="${PN}-$(ver_rs 2 -)"
 
@@ -15,19 +16,17 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="
 	MIT
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
+	AFL-2.1 Apache-2.0 BSD Boost-1.0 CC0-1.0 LGPL-2.1+ Unlicense ZLIB
 	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
 SLOT="4"
 KEYWORDS="~amd64"
 # 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 +vulkan +webp"
+IUSE="debug deprecated +gui raycast +runner test +theora +tools +upnp +vulkan +webp"
 # disable tests until out of beta, tests themselves are new and can be volatile
 RESTRICT="test"
 
-# dlopen: alsa-lib,dbus,fontconfig,libX*,pulseaudio,speech-dispatcher,udev
+# dlopen: libX*,libglvnd
 RDEPEND="
 	app-arch/zstd:=
 	dev-games/recastnavigation:=
@@ -41,9 +40,7 @@ RDEPEND="
 	<net-libs/mbedtls-3:=
 	net-libs/wslay
 	sys-libs/zlib:=
-	fontconfig? ( media-libs/fontconfig )
 	gui? (
-		media-libs/alsa-lib
 		media-libs/libglvnd[X]
 		x11-libs/libX11
 		x11-libs/libXcursor
@@ -52,20 +49,15 @@ RDEPEND="
 		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 )
 		vulkan? ( media-libs/vulkan-loader[X] )
 	)
-	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? ( x11-base/xorg-proto )
 	tools? ( test? ( dev-cpp/doctest ) )"
 BDEPEND="virtual/pkgconfig"
 
@@ -91,6 +83,10 @@ src_prepare() {
 		libpng libtheora libvorbis libwebp mbedtls miniupnpc
 		pcre2 recastnavigation volk wslay zlib zstd
 		# certs: unused by generated header, but scons panics if not found
+		# linuxbsd_headers: would /want/ to unbundle these, but it is rather
+		# messy given godot has dropped all the pkg-config calls and uses
+		# hardcoded paths on top -- on the plus side, removes a real need
+		# to have IUSE="alsa dbus fontconfig pulseaudio speech udev" (dlopen)
 	)
 	rm -r "${unbundle[@]/#/thirdparty/}" || die
 
@@ -114,13 +110,7 @@ src_compile() {
 
 		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 $(usex vulkan))
 		x11=$(usex gui)
@@ -154,11 +144,7 @@ src_compile() {
 		builtin_xatlas=yes # not wired for unbundling nor packaged
 		builtin_zlib=no
 		builtin_zstd=no
-		# also bundled but lacking a builtin_* switch:
-		#	amd-fsr, astcenc, 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, and the misc directory.
+		# (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)
@@ -242,9 +228,13 @@ src_install() {
 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."
+	# these use bundled headers then get dlopen()'ed if available, USE=gui
+	# itself could technically be a optfeature too but it'd be messy here
+	if use gui; then
+		optfeature "gamepad connection detection support" virtual/libudev
+		optfeature "screensaver and portal desktop handling" sys-apps/dbus
+		optfeature "sound support" media-libs/alsa-lib media-libs/libpulse
 	fi
+	optfeature "system fonts support" media-libs/fontconfig
+	optfeature "text-to-speech support" app-accessibility/speech-dispatcher
 }
diff --git a/dev-games/godot/metadata.xml b/dev-games/godot/metadata.xml
index ad0df117f2fd..82c690208342 100644
--- a/dev-games/godot/metadata.xml
+++ b/dev-games/godot/metadata.xml
@@ -24,7 +24,6 @@
 		<flag name="deprecated">Enable support for deprecated features</flag>
 		<flag name="raycast">Enable the raycast Editor module using <pkg>media-libs/embree</pkg></flag>
 		<flag name="runner">Build an additional binary optimized for running games (only relevant with USE=tools)</flag>
-		<flag name="speech">Enable text-to-speech support</flag>
 		<flag name="tools">Enable the Godot Editor for game development</flag>
 		<flag name="vulkan">Enable support for Vulkan</flag>
 		<flag name="webm">Enable the WebM module</flag>