gentoo auto-resync : 02:02:2023 - 21:08:25

3 files changed, 55 insertions, 2 deletions

diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index b864a0331996..4bd01b12c72f 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -1,12 +1,13 @@
 AUX godot-3.5-musl.patch 325 BLAKE2B 6069b159c7844d471ecf79d080cb4b3d5b21cf82093379961e163efe52866e1d25ca8075ee1ba653aabcaf912592968dca6fba43cb4907d703711af237bacf50 SHA512 828e5870fdec8cd4c4f132db24de722f73f330dc278b21020cf38aaf26498c69723e1fc75855dd01683452c3628a782a3957ff47d5ecf2e13da1bd8aee3a5805
 AUX godot-3.5-scons.patch 2568 BLAKE2B 0da3a29689293a0d9681eaa2877c667fbe484e7d479eb7525f3621640f397dc77bd000780a142418a74e671b6f5b241e27898f5cac71376eb684d3e995a9ac33 SHA512 d7f230da26ebcc40ad0c8c59046a863aeca69c314661ccbcab86c49f545df9662c68bc51d72a146033385ed09812ce2de92aae58a32462402f89542a47069202
 AUX godot-4.0-musl.patch 345 BLAKE2B 05057241c1e29ff886a38b815f68fcfe2b8c5e23fce6ae1e754bd9f2837f632887712de52065dd669fd12b0ffc5542859a4da67282ef337fdf9a76bccddbd410 SHA512 267bd42d3381d8af608a117bc423da62c86c04bffcdf46d54a19fc1bb5f690bbb311d088b842719843f9acc0a4db65c048786e39cadd32902bc8a09bde3c33e3
+AUX godot-4.0_beta17-no-deprecated-fix.patch 1657 BLAKE2B f2084220af3bf81913f55147c49d066abf21bdffa4968aa9b9f3f2ec388f42b02c5dde1c7415e49db29e6a69f7ca301a5fe8518e0854e157d4d1448314ed3f46 SHA512 a3e82ad8c67c21d39f2ecf7ecb111b81bfa008b7a94294cd6c2e7e07a60fd92255365415ac6fb07de89bc2ef119e888f7eee7c7c30cf2d1ce1741cddaf5e6c84
 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-beta15.tar.xz 31921348 BLAKE2B 45482ac65e74b431d4f781a9055fdb578b8c838e659f459a09e3c39b80d50b1ee9222373159032d3eb25569f259330ef87967177765137491f793afe4d59ad93 SHA512 c0c0a139a437b2a27f38d6c104e64a2d4d9153d4b0c8ad66e157dde2422c86887796e1a1dd2eb9b9385013e7af2e513b8cd77d8bdcdb0750703fa5bba6770986
 DIST godot-4.0-beta16.tar.xz 31937624 BLAKE2B 998edcd6d9f118cb96a4f84b81b73c36d060d297702fa2a9dc4be936c7ca9aa35b77db16caf5ed19662fcae700f59e329393a17fd88448d8a6ff8f484a136f9c SHA512 c9cf5b66675dfe9253852eee7748a5c2bd04f356524def6e9925bef73baee3239f9f9405a92d373dcadbaff7c3288e54e547ae3cb46974bea61bfb68576b7c13
+DIST godot-4.0-beta17.tar.xz 31965968 BLAKE2B 897153aa9b36ccb7aea29749534e7a04452cd24ef5e8404063a1f96c6b61633d3f175279f08e49bbc6479a9df0f0ffe7cf4030d483502af7a90cc5cdd24f4010 SHA512 1a0a74a3538947cc3942fdbc27e941e8fe1b4424b257444176ea19fb6db3cc6c374f24190d1779a530cb61b5e42ff242842692d0878280862c5644e9de93d5c9
 EBUILD godot-3.5.1.ebuild 6752 BLAKE2B b7a6a3851292aa6bd134a45bf2ab7019a55da8bcc815e952ae3acd204b71314fb1a436fe5bab3c83906289566c274f1bc3240e3482c337aca488071d71618df5 SHA512 84a385fbcb01813c6b09e21a76b832b6e7329302e9d7ebd3d3ccbb37ce504f3cc13e1c0d460daa299ef40f9fe5cb04b7d1362e538004f96ef9b6c9dd56a115ac
-EBUILD godot-4.0_beta15.ebuild 7782 BLAKE2B c1ae4eaf5281e8ff8d553b359278b2c4be5a093075e95daf9c6e5582012651188744e3cf88ebb79f0675de368169901c5acacf4a134ef0493a43c3a93eafbb69 SHA512 ac25c9d9fe5068aa5cf14b07f2536ec5edf6b142255f4949ce5e7882ea8064a2ef7ec572ae391b8c6e83f30d2d0a13e8dba0572a191ad99b932fe18ba8e64370
 EBUILD godot-4.0_beta16.ebuild 7782 BLAKE2B c1ae4eaf5281e8ff8d553b359278b2c4be5a093075e95daf9c6e5582012651188744e3cf88ebb79f0675de368169901c5acacf4a134ef0493a43c3a93eafbb69 SHA512 ac25c9d9fe5068aa5cf14b07f2536ec5edf6b142255f4949ce5e7882ea8064a2ef7ec572ae391b8c6e83f30d2d0a13e8dba0572a191ad99b932fe18ba8e64370
+EBUILD godot-4.0_beta17.ebuild 7826 BLAKE2B 08c016b3bc1271702a2922c5ea4968814f501de60f0fe586f357e9463675f4a900e56a67d9905c353c3253daf5c4090c95b3442a628d4540b0c8aadf06dccaf6 SHA512 f46c7b15d744a3eb021c29916c61f4d06365f62c79d876fdcfefd178071c513c29a0743057c9a9cf9f391d84e22a12ce3602334bfd950f78419eaefad40b46c1
 MISC metadata.xml 1547 BLAKE2B 39108142c8e34b3c2683d5bbab6989693156d320797d86efa36f3df39e3d667160cbdb1a0b0efe127f67b3977e1cf3cde151d07915542fa88831e626457bf86f SHA512 a099aacfdd27c4b9536512762fcc63f09ea71cce807b59ff70026a09d79856e1911405e64186597b8e3dd9fef0029c13944ceb3b77d7969adf7182218e532559
diff --git a/dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch b/dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch
new file mode 100644
index 000000000000..8c4a14edc4bb
--- /dev/null
+++ b/dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch
@@ -0,0 +1,51 @@
+Backport to fix build with USE=-deprecated
+
+https://github.com/godotengine/godot/commit/c197b398c38727c6cce3d2fec7aa07d2e1020e09
+From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
+Date: Wed, 1 Feb 2023 22:29:33 +0100
+Subject: [PATCH] Fix build with `deprecated=no` not exclude
+ ProjectConverter3To4 options
+
+Fixes #72520.
+--- a/main/main.cpp
++++ b/main/main.cpp
+@@ -2366,8 +2366,10 @@ bool Main::start() {
+ 	String _export_preset;
+ 	bool export_debug = false;
+ 	bool export_pack_only = false;
++#ifndef DISABLE_DEPRECATED
+ 	bool converting_project = false;
+ 	bool validating_converting_project = false;
++#endif // DISABLE_DEPRECATED
+ #endif
+ 
+ 	main_timer_sync.init(OS::get_singleton()->get_ticks_usec());
+@@ -2383,10 +2385,12 @@ bool Main::start() {
+ #ifdef TOOLS_ENABLED
+ 		} else if (args[i] == "--no-docbase") {
+ 			doc_base = false;
++#ifndef DISABLE_DEPRECATED
+ 		} else if (args[i] == "--convert-3to4") {
+ 			converting_project = true;
+ 		} else if (args[i] == "--validate-conversion-3to4") {
+ 			validating_converting_project = true;
++#endif // DISABLE_DEPRECATED
+ 		} else if (args[i] == "-e" || args[i] == "--editor") {
+ 			editor = true;
+ 		} else if (args[i] == "-p" || args[i] == "--project-manager") {
+@@ -2547,6 +2551,7 @@ bool Main::start() {
+ 		return false;
+ 	}
+ 
++#ifndef DISABLE_DEPRECATED
+ 	if (converting_project) {
+ 		int exit_code = ProjectConverter3To4(converter_max_kb_file, converter_max_line_length).convert();
+ 		OS::get_singleton()->set_exit_code(exit_code);
+@@ -2557,6 +2562,7 @@ bool Main::start() {
+ 		OS::get_singleton()->set_exit_code(exit_code);
+ 		return false;
+ 	}
++#endif // DISABLE_DEPRECATED
+ 
+ #endif
+ 
diff --git a/dev-games/godot/godot-4.0_beta15.ebuild b/dev-games/godot/godot-4.0_beta17.ebuild
index 180498ade9c3..712797804adc 100644
--- a/dev-games/godot/godot-4.0_beta15.ebuild
+++ b/dev-games/godot/godot-4.0_beta17.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0-musl.patch
 	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
 	"${FILESDIR}"/${PN}-4.0_beta8-scons.patch
+	"${FILESDIR}"/${P}-no-deprecated-fix.patch
 )
 
 src_prepare() {