gentoo auto-resync : 12:06:2024 - 00:08:13

4 files changed, 8 insertions, 8 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index e80cec736489..8a44ffea8ea7 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index dd4df243ddf1..613d4b8058d2 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -5,6 +5,6 @@ AUX godot-4.0_rc2-musl.patch 878 BLAKE2B d10e22acc29e14df6b42b180ed480908c61e6a9
 AUX godot-4.0_rc3-scons.patch 506 BLAKE2B 2fd1421760f082ea65febce90459f8a2d63e06e5b02b5e86e59bbacd14db78f76448ee50d0fa7c935b1a867f528b46a9b82b5bb03765d0b237e9af73d7fd14da SHA512 9ac654edc66a5a330055d1af0b706a5fa143061712146ddc02657add45d4518d96391d9e980c0a6b33d9fa966b5914a3f90a7b333f20885f0a05a7b8985fc667
 DIST godot-3.5.3-stable.tar.xz 24072964 BLAKE2B a4c03328e3aa77d741a1c642cfd645de04084f2852e865757fc8960c4919d3b8b8571e772f44004901fdd80a967e8e21bd8c6be8b36263db7afae787dcbd3ed6 SHA512 4c008af5bb7c298d465edbe03f6ebc642f5bbbb0a4254e99d7a7a88919e1f9424b98c5dff95a55ae68d4e2e5878c7c0bb7d13a66869cb632ecb51a913f865155
 DIST godot-4.2.2-stable.tar.xz 26768552 BLAKE2B e4a6040d7a1f63f841f56d74bb7b04e58f2fa26ddd8850df7f93937deb10c4af925ea2059c174d9f457222e0cddfe477498e3462bfaaf69ec8e57de8f2d43c83 SHA512 4a623063be5488957e1ede7e45b6865f6cd61bc954ac311587b9e97bed848a4083c4a7225d0a81bca285d854d33be9b07d7d0c21465c9f25b90e92b08090429c
-EBUILD godot-3.5.3.ebuild 6564 BLAKE2B a2d12f6ffeb748314eadd122537d8b76d835c66e3c2a3776bd2f91c0a98c69b7b47ef8099e9a97f16f6170da29ca1a27c1d01b9837559067e91b6a397e83b28f SHA512 5de17a38a6c16cf8f0b514e223a2a75e54254b612c3c66e9f4512ff612b4bcf5e5448ea2f32a92a6b1a6240023ba5f5f2da5a1581d705f4a7533f3c14482049b
-EBUILD godot-4.2.2.ebuild 6970 BLAKE2B 7636bbc9570e98a0e5eea9557b45e1389f3284d622a3705753f3a5b28eb47e7f93294f5f89fb0d7a12e63255332793818112b708003f2f7ffaea0a5fc33138f0 SHA512 930b0327472d38b10b0039d200e9fe20cb05c3b3fb5d86966d83d0d85baf498b1d2001c84472e687418562e0686a6941d0b80cf6e7ea029f90521f7f184aca59
+EBUILD godot-3.5.3-r1.ebuild 6614 BLAKE2B 4fc3a695c62c1b4baf0295499b9bcc15373521810e5619e057a63154faacce5473d00d4446d6a7a75b2afb5608c19e7eb654df2bf4b0cf3410184e5632bf2c51 SHA512 bad47cd4c49bd7c10efbc461ed0d8ea3ccd473dee97f0fec6dac20118f37b90c3171d77e837726492b03d8098125daf0c2b910e6ece914c91577c96f1dff96f1
+EBUILD godot-4.2.2-r1.ebuild 7008 BLAKE2B 249385e33643809f6d3021454f353aef250c343be7f6814357d7efb7204a4f45d845718d98c5fb5fc2ef889ab76c88c8ed5d26b383f92cf43f6b3102f03003be SHA512 769fb7d2145a0293f707e698886de146a2d68a6d0519732e1000607070f7b482181b907175f0368d5e7a0b8e97188e4de6414d3e4efdc037c9f1b6b31302d795
 MISC metadata.xml 1492 BLAKE2B ae5789569351fbb3df1da26f655750404bc22d56d0e252ca83b973abaa9ed29f26afd48c263c29266eb883444c6399ab35939d57e081d4733f7ea8b5a161f737 SHA512 fe692458dbe8293a1b76a1f0f79fe01f86ed61c731eb8b6c5acf0ef24a5d0b4cba94dd1ad72abe287d584883bc08e090f48d2b709ffbf06758c45d8996432973
diff --git a/dev-games/godot/godot-3.5.3.ebuild b/dev-games/godot/godot-3.5.3-r1.ebuild
index c4e78535e32d..9a41621d39b5 100644
--- a/dev-games/godot/godot-3.5.3.ebuild
+++ b/dev-games/godot/godot-3.5.3-r1.ebuild
@@ -59,7 +59,6 @@ RDEPEND="
 	)
 	tools? ( app-misc/ca-certificates )
 	udev? ( virtual/udev )
-	upnp? ( net-libs/miniupnpc:= )
 	webm? (
 		media-libs/libvorbis
 		media-libs/libvpx:=
@@ -95,8 +94,9 @@ src_prepare() {
 	# use of builtin_ switches can be messy (see below), delete to be sure
 	local unbundle=(
 		bullet embree freetype libogg libpng libtheora libvorbis libvpx
-		libwebp mbedtls miniupnpc opus pcre2 recastnavigation wslay zlib zstd
+		libwebp mbedtls opus pcre2 recastnavigation wslay zlib zstd # miniupnpc
 		# certs: unused by generated header, but scons panics if not found
+		# miniupnpc: check if can re-add on bump, bug #934044
 	)
 	rm -r "${unbundle[@]/#/thirdparty/}" || die
 }
@@ -134,7 +134,7 @@ src_compile() {
 		builtin_libvpx=$(usex !webm)
 		builtin_libwebp=$(usex !webp)
 		builtin_mbedtls=no
-		builtin_miniupnpc=$(usex !upnp)
+		builtin_miniupnpc=yes #934044 (for now, should revisit)
 		builtin_opus=$(usex !webm)
 		builtin_pcre2=no
 		builtin_recast=no
diff --git a/dev-games/godot/godot-4.2.2.ebuild b/dev-games/godot/godot-4.2.2-r1.ebuild
index bda89ed4d705..d9ea297149f2 100644
--- a/dev-games/godot/godot-4.2.2.ebuild
+++ b/dev-games/godot/godot-4.2.2-r1.ebuild
@@ -67,7 +67,6 @@ RDEPEND="
 	theora? ( media-libs/libtheora )
 	tools? ( app-misc/ca-certificates )
 	udev? ( virtual/udev )
-	upnp? ( net-libs/miniupnpc:= )
 	webp? ( media-libs/libwebp:= )
 "
 DEPEND="
@@ -99,8 +98,9 @@ src_prepare() {
 	local unbundle=(
 		brotli doctest embree freetype graphite harfbuzz icu4c libogg
 		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
-		miniupnpc pcre2 recastnavigation volk wslay zlib zstd
+		pcre2 recastnavigation volk wslay zlib zstd
 		# certs: unused by generated header, but scons panics if not found
+		# miniupnpc: check if can re-add on bump, bug #934044
 	)
 	rm -r "${unbundle[@]/#/thirdparty/}" || die
 
@@ -153,7 +153,7 @@ src_compile() {
 		builtin_libvorbis=no
 		builtin_libwebp=$(usex !webp)
 		builtin_mbedtls=no
-		builtin_miniupnpc=$(usex !upnp)
+		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