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

["Ross Charles Campbell" <rossbridger.cc@gmail.com>]

commit:     f052cc776f97644ecd4cf94dbdfdad25e40762c0
Author:     Ross Charles Campbell <rossbridger.cc <AT> gmail <DOT> com>
AuthorDate: Mon Jun  7 13:39:56 2021 +0000
Commit:     Ross Charles Campbell <rossbridger.cc <AT> gmail <DOT> com>
CommitDate: Mon Jun  7 13:40:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f052cc77

dev-games/godot: depend on media-libs/embree unconditionally

This follows the logic in godot's build system.

Closes: https://bugs.gentoo.org/794556
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Ross Charles Campbell <rossbridger.cc <AT> gmail.com>

 dev-games/godot/{godot-3.3.2.ebuild => godot-3.3.2-r1.ebuild} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-games/godot/godot-3.3.2.ebuild b/dev-games/godot/godot-3.3.2-r1.ebuild
similarity index 93%
rename from dev-games/godot/godot-3.3.2.ebuild
rename to dev-games/godot/godot-3.3.2-r1.ebuild
index f301b3ee6..3224a44f5 100644
--- a/dev-games/godot/godot-3.3.2.ebuild
+++ b/dev-games/godot/godot-3.3.2-r1.ebuild
@@ -15,13 +15,14 @@ KEYWORDS="~amd64 ~x86"
 
 LICENSE="Apache-2.0 Boost-1.0 BSD CC-BY-3.0 MIT MPL-2.0 OFL-1.1 public-domain ZLIB"
 SLOT="0/3"
-IUSE="+bullet debug deprecated +enet +freetype lto +mbedtls +ogg +opus pulseaudio raycast +theora +udev +upnp +vorbis +webp"
+IUSE="+bullet debug deprecated +enet +freetype lto +mbedtls +ogg +opus pulseaudio +raycast +theora +udev +upnp +vorbis +webp"
 
 RDEPEND="
 	app-arch/lz4
 	app-arch/zstd
 	dev-libs/libpcre2[pcre32]
 	media-libs/alsa-lib
+	media-libs/embree:3
 	media-libs/libpng:0=
 	media-libs/libvpx
 	media-libs/mesa[gles2]
@@ -42,7 +43,6 @@ RDEPEND="
 		media-libs/opusfile
 	)
 	pulseaudio? ( media-sound/pulseaudio )
-	raycast? ( media-libs/embree:3 )
 	theora? ( media-libs/libtheora )
 	udev? ( virtual/udev )
 	upnp? ( net-libs/miniupnpc )
@@ -61,7 +61,7 @@ PATCHES=(
 
 src_prepare() {
 	default
-	rm -r thirdparty/{bullet,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zstd} || die
+	rm -r thirdparty/{bullet,embree,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zstd} || die
 }
 
 src_configure() {
@@ -94,13 +94,13 @@ src_configure() {
 	myesconsargs+=(
 		# Mono bindings requires MSBuild which is only available on Windows
 		module_mono_enabled=no
-		module_raycast_enabled=$(usex raycast)
 		module_bullet_enabled=$(usex bullet)
 		module_enet_enabled=$(usex enet)
 		module_freetype_enabled=$(usex freetype)
 		module_mbedtls_enabled=$(usex mbedtls)
 		module_ogg_enabled=$(usex ogg)
 		module_opus_enabled=$(usex opus)
+		module_raycast_enabled=$(usex raycast)
 		module_theora_enabled=$(usex theora)
 		module_upnp_enabled=$(usex upnp)
 		module_vorbis_enabled=$(usex vorbis)