Adding metadata

6 files changed, 97 insertions, 497 deletions

diff --git a/dev-games/godot-dotnet/Manifest b/dev-games/godot-dotnet/Manifest
index c9408d44dffd..a2e9746cad69 100644
--- a/dev-games/godot-dotnet/Manifest
+++ b/dev-games/godot-dotnet/Manifest
@@ -1,9 +1,8 @@
 DIST coverlet.collector.6.0.4.nupkg 2243960 BLAKE2B 93e9e1adbcaa34baedb68d37659115af044210ce828a0e112de9075c89d55f22e0d0c8ef8d0bb8991460e763075c6aa63feb3095f25d67024b50948a6b7c45a3 SHA512 a0abce1ef08dc1267cbe07de8d8bc69a32a3559ea9cd55de1ea340bad1397364c305b304e1a8a718e41549e0e64123ee706fb38ca23eab3f959928b94193e939
 DIST diffplex.1.7.2.nupkg 92255 BLAKE2B dc735fc95dad6a62d97e0aacf27f3b6cf2c094cfa8d490c125f67f93fc7ef416665033bbdcc778109a08b7cf2adc9440e314235796c290e3d156e1a75ee27348 SHA512 24fb44832dc3c975afa54eee2558a43a1c14e5ae0dfdbde80a155f61efe8f25a9cc8a290a8c24916a8db648afb90a91ceec800ea24edb0a9af0c37074c864d99
 DIST envdte.17.8.37221.nupkg 158612 BLAKE2B 01ce699e809c684d957f92822a5a5e0740e7d98f905f9d6b2c24bd6571d469c37265fc874acb1a32206964a0414b97641df04bac22af055ba61a5ba4d4842fdc SHA512 68a892707d5637a4170e14d89d7039349c32b3722723b63ea396681c6ed07a6e8ba626ebce393eb03c7034b94e1a21fdf80dbcb18fe0224d55192779d6ee63fe
-DIST godot-4.6.1-stable.tar.xz 44445668 BLAKE2B 8cfc477472d224579b525a36df98f5cc7616b66e9ba4fc943753351cc6093bd0c7f542916cc26ddb625bbbbb8de850015b72610af05df443ec8c0a3c2e03ff3f SHA512 b2062e98337203a39cb0a7af704da6113f232f4645e0d557efb1f77790d6e39fc2b219369778af6a5877e0746b400b812b3a4bdcf21a4cc82133b36a0ced0e78
-DIST godot-4.6.2-stable.tar.xz 44462576 BLAKE2B fe07d756bbdf5e0c8fcb42e42fcc955b488b55267959aad40b1a7c908b80557e830a6a06f9c95c0dfa51e46db151a7f0f7f4a8cfe090363fefb5db9980993bff SHA512 02ac162288af72441814961d703b5b48df8a5e12af760fc0ac333c033b1175c11c57db7eb6b3e327af827957e6effa8aedface2c73cdcfa9a52573ce604a9ac9
 DIST godot-4.6.3-stable.tar.xz 44471880 BLAKE2B 9d4b0fdf4b75db3062e229b2cf43746620e51da83f9859bf06e691d36249bd5394ca8f6086dbc943a7eb4e44f55a28b32fb615fcb94b511bf41ad82dfc718ed9 SHA512 b3e4c63eae7b7e0c47da07ae64d49dca5bf033912ea0a0da5440fcee48b4eb16c75e446374e7916c4ca2c6ff39ed7f3833e4cc2761df73765a660f715770f803
+DIST godot-4.7-stable.tar.xz 46684188 BLAKE2B 6055f1203d5d4f865bee419b7c01eb7603c1cd16895476fd259734c54f68697787ed746d05157bf4f7d4ac9574eb69ce6fc3de3a12aeee38c40084c6e5fada22 SHA512 0afddbd2acb1e2eba0bb2b885d58c321e9b7d4adc30481d7ab70b348dc96d9ccf1c11fd7de39900eb646c543488225280b7321831b0237cde9d27655962fefc0
 DIST humanizer.core.2.14.1.nupkg 538179 BLAKE2B c3e3c3c7d3fb3484dc85f5eaf25ff4f4428cd36b3458c5664fa7c29cb62ea291aded48a369823459d684ff79ce63a16650dcd37e8cd123c23ab943faea92cfd7 SHA512 cb3a8653f1ca34b67d52fafa92f49cdf0615fd2e4efc8be4948516e5617b32e8af18b63cc12e486672cf92dec3d4a5bc12dd849e5d08dcbce0daf196336e17b3
 DIST humanizer.core.2.2.0.nupkg 104728 BLAKE2B 6c383abbbed9250f2a7eeec4478ead8f23ad53aa62a5b0f22e71fed9157aa6644a9a7518842d637885b7b63a4300754e1a7e9f3f9968725607ad30bf18e27a21 SHA512 e232459f914c8e7fc3f8dee69a85e66beb8c44515d4c83a976ee24084a91f32aae61c6f845ff38edcae02d0bcab44f9ec253277dccf2f4ae7e82235047bc6ade
 DIST jetbrains.annotations.2019.1.3.nupkg 109848 BLAKE2B 55c50a110ce3206d39160e8b731369d75f469a627131e0f8987795ce01c93f0b3a86ae8605078b0afdd3b3f9d9eee491ad299928bdb51837bce27e1cab378adb SHA512 b655a923edc9c4948fd75b56689e07fc9151dfef0b63bc8d3e0a315a72b41559d3d6e69dbf662c0303dd00d9efc5a6238d1bd9081d5e8d1b379486ff8ebb0776
@@ -17,6 +16,7 @@ DIST microsoft.build.15.1.548.nupkg 1731420 BLAKE2B 8958880869a0edee1f6bddf0267c
 DIST microsoft.build.framework.15.1.548.nupkg 111406 BLAKE2B 43f923e7f39559b91946175cf4760625a87a35876ebedb2baaedb2f5c1eaeb0c9f21e2d09dad6e4d1152747ab9efb59db1b87d4715e44d6b121126ff569b63fb SHA512 b7d1b538664c0c208610b5f9a5632f08b4ba0a9567a7ca9c35eec86097ff43bcb55d86d272dc2ab1e83ba39031d581c411a80947ffa441bc9a19ba0b0fc4dd43
 DIST microsoft.build.locator.1.2.6.nupkg 52350 BLAKE2B 168e69698b00c624c4ca8466426b16856f14676224c7aa787f14cc0e0488c6e5741b8eff2e112466ec59ce65ec22e6443bf6a3a49aa01783d21d647604c4fb72 SHA512 e764a97bfa5089b45c995862915d679743ebd8a904d8c2a591261376f18b5b9618c0c0bc01b139fa17498e81d87f740ec5eccced64e4afc22fab2a575327ce90
 DIST microsoft.build.notargets.2.0.1.nupkg 34598 BLAKE2B d25000701875e53482de53713124af290de4fbb5fa8bcb1e75db13f0eb07cd61e44ba046b34e87058d3ffe7cd8c7d355cf3bb61228da6d25593bbe242e86368e SHA512 19fd7d616993d12d633674fe1e9779eab0aa40aa21eec412561e28e8a7e2de3bae8d9fef9595257134d73f33a9dea9ee0e4ebbafbd32525c123320c1eb5bf160
+DIST microsoft.build.notargets.3.7.56.nupkg 40351 BLAKE2B 1d0ded460d27c49f71dcedeb162a18474dff67a3548e4136e4f13750ea8b8c44255ee382cdf77299561d8d8987a80cb427a67e9a342eec227da8c44bd9527798 SHA512 1a85c64538c85955596ff55b5b24448b3bb4a045ef04c7ed9f798d8e51a0067ac65198131e4a4c32d82ef5db1015328a53a1fc5a25b30af5b57f08ae7a3847db
 DIST microsoft.codeanalysis.analyzer.testing.1.1.2.nupkg 1561613 BLAKE2B 0b921f09433302a7b29ab4111ab1313402951a798929f4e9e55adf376421888b62d0554bef7d305bfacfdf9be9dc70f55b72a2bff664e2bb506a4e47fea5e4d9 SHA512 610d2e2789a16eadbfa871f91af3319312b137bdfbf8d912229dc73fcaf7a09edeb47592eee608cd9033e21a2ea0c493ff23403f34753f8a8127140736a89870
 DIST microsoft.codeanalysis.analyzers.3.3.2.nupkg 1001624 BLAKE2B c8ec28a23a7b628c2efbe1d3b7b3163f6dc5dd8aaf4650042bc380ec90409ce28a81d20f4d5c6bef2146f88859274cbe2107b0f840ca577af13ce8f7390e2338 SHA512 9a2806f43e3c3e7ee6d3a7c0cc996cf4196420169db58092e79b5e656666d2c1cbb448b53ce0ff280a3b3ab1cb9458f60993ec43df6fa7d2574eb4d86eedc430
 DIST microsoft.codeanalysis.analyzers.3.3.4.nupkg 1461577 BLAKE2B 43f2f6df0bfded6ad334f5be4627657f1d013b73a13eeef28c5da5c134f43c1880313711a7dfa577b4dea5ced0df6df6acc4236fc8371c1f7288b96cb34997d9 SHA512 23e462c3affa5a33480b276888da438cdfc618feeee17b0be95b08f651bf3a316e7c7ddf96f484cbf7f1361183546c195b0abfe41967a97f8b1f676685e68f7e
diff --git a/dev-games/godot-dotnet/files/godot-4.5-scons.patch b/dev-games/godot-dotnet/files/godot-4.5-scons.patch
index ac1fd270ed22..581d5dda072e 100644
--- a/dev-games/godot-dotnet/files/godot-4.5-scons.patch
+++ b/dev-games/godot-dotnet/files/godot-4.5-scons.patch
@@ -1,16 +1,20 @@
+Respect AR (bug #977691), RANLIB, and avoid passing unnecessary flags.
 --- a/SConstruct
 +++ b/SConstruct
-@@ -304,2 +304,3 @@
- opts.Add("CC", "C compiler binary")
-+opts.Add("AR", "Archiver")
- opts.Add("LINK", "Linker binary")
-@@ -745,3 +746,3 @@
+@@ -804,3 +804,3 @@
          # `-msse2` is implied when compiling for x86_64.
 -        env.Append(CCFLAGS=["-msse4.2", "-mpopcnt"])
 +        pass
  elif env["arch"] == "x86_32":
-@@ -817,3 +818,3 @@
+@@ -883,3 +883,3 @@
          else:
 -            env.AppendUnique(LINKFLAGS=["-s"])
 +            pass
  
+--- a/platform/linuxbsd/detect.py
++++ b/platform/linuxbsd/detect.py
+@@ -118,2 +118,4 @@
+     ## Compiler configuration
++    env["AR"] = os.environ["AR"]
++    env["RANLIB"] = os.environ["RANLIB"]
+ 
diff --git a/dev-games/godot-dotnet/files/godot-4.7-no-volk.patch b/dev-games/godot-dotnet/files/godot-4.7-no-volk.patch
new file mode 100644
index 000000000000..bfd155c64a3b
--- /dev/null
+++ b/dev-games/godot-dotnet/files/godot-4.7-no-volk.patch
@@ -0,0 +1,78 @@
+https://github.com/godotengine/godot/pull/120362
+--- a/drivers/vulkan/godot_vulkan.h
++++ b/drivers/vulkan/godot_vulkan.h
+@@ -39,2 +39,5 @@
+ #include <vulkan/vulkan.h>
++#ifdef VK_USE_PLATFORM_XLIB_KHR
++#undef CursorShape // vulkan.h transitively includes Xlib.h.
++#endif
+ #endif
+--- a/drivers/vulkan/rendering_device_driver_vulkan.cpp
++++ b/drivers/vulkan/rendering_device_driver_vulkan.cpp
+@@ -1537,2 +1537,5 @@
+ 			device_functions.CreateAccelerationStructureKHR = PFN_vkCreateAccelerationStructureKHR(functions.GetDeviceProcAddr(vk_device, "vkCreateAccelerationStructureKHR"));
++			device_functions.DestroyAccelerationStructureKHR = PFN_vkDestroyAccelerationStructureKHR(functions.GetDeviceProcAddr(vk_device, "vkDestroyAccelerationStructureKHR"));
++			device_functions.GetAccelerationStructureBuildSizesKHR = PFN_vkGetAccelerationStructureBuildSizesKHR(functions.GetDeviceProcAddr(vk_device, "vkGetAccelerationStructureBuildSizesKHR"));
++			device_functions.CmdBuildAccelerationStructuresKHR = PFN_vkCmdBuildAccelerationStructuresKHR(functions.GetDeviceProcAddr(vk_device, "vkCmdBuildAccelerationStructuresKHR"));
+ 		}
+@@ -1541,2 +1544,4 @@
+ 			device_functions.CreateRaytracingPipelinesKHR = PFN_vkCreateRayTracingPipelinesKHR(functions.GetDeviceProcAddr(vk_device, "vkCreateRayTracingPipelinesKHR"));
++			device_functions.GetRayTracingShaderGroupHandlesKHR = PFN_vkGetRayTracingShaderGroupHandlesKHR(functions.GetDeviceProcAddr(vk_device, "vkGetRayTracingShaderGroupHandlesKHR"));
++			device_functions.CmdTraceRaysKHR = PFN_vkCmdTraceRaysKHR(functions.GetDeviceProcAddr(vk_device, "vkCmdTraceRaysKHR"));
+ 		}
+@@ -6333,3 +6338,3 @@
+ 
+-	vkGetAccelerationStructureBuildSizesKHR(vk_device, VK_ACCELERATION_STRUCTURE_BUILD_TYPE_DEVICE_KHR, &accel_info->build_info, max_primitive_counts.ptr(), &size_info);
++	device_functions.GetAccelerationStructureBuildSizesKHR(vk_device, VK_ACCELERATION_STRUCTURE_BUILD_TYPE_DEVICE_KHR, &accel_info->build_info, max_primitive_counts.ptr(), &size_info);
+ 	_acceleration_structure_create(VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_KHR, size_info, accel_info);
+@@ -6378,3 +6383,3 @@
+ 	size_info.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_SIZES_INFO_KHR;
+-	vkGetAccelerationStructureBuildSizesKHR(vk_device, VK_ACCELERATION_STRUCTURE_BUILD_TYPE_DEVICE_KHR, &accel_info->build_info, &p_max_instance_count, &size_info);
++	device_functions.GetAccelerationStructureBuildSizesKHR(vk_device, VK_ACCELERATION_STRUCTURE_BUILD_TYPE_DEVICE_KHR, &accel_info->build_info, &p_max_instance_count, &size_info);
+ 
+@@ -6427,3 +6432,3 @@
+ 	accel_create_info.buffer = ((const BufferInfo *)buffer.id)->vk_buffer;
+-	VkResult err = vkCreateAccelerationStructureKHR(vk_device, &accel_create_info, nullptr, &r_accel_info->vk_acceleration_structure);
++	VkResult err = device_functions.CreateAccelerationStructureKHR(vk_device, &accel_create_info, nullptr, &r_accel_info->vk_acceleration_structure);
+ 	ERR_FAIL_COND_MSG(err, vformat("Couldn't create Vulkan raytracing acceleration structure (VkResult error %d).", err));
+@@ -6441,3 +6446,3 @@
+ 	if (accel_info->vk_acceleration_structure) {
+-		vkDestroyAccelerationStructureKHR(vk_device, accel_info->vk_acceleration_structure, nullptr);
++		device_functions.DestroyAccelerationStructureKHR(vk_device, accel_info->vk_acceleration_structure, nullptr);
+ 	}
+@@ -6479,3 +6484,3 @@
+ 
+-	vkCmdBuildAccelerationStructuresKHR(command_buffer->vk_command_buffer, 1, build_info, &range_infos);
++	device_functions.CmdBuildAccelerationStructuresKHR(command_buffer->vk_command_buffer, 1, build_info, &range_infos);
+ #endif
+@@ -6497,3 +6502,3 @@
+ 
+-	vkCmdBuildAccelerationStructuresKHR(command_buffer->vk_command_buffer, 1, build_info, &range_infos);
++	device_functions.CmdBuildAccelerationStructuresKHR(command_buffer->vk_command_buffer, 1, build_info, &range_infos);
+ #endif
+@@ -6520,3 +6525,3 @@
+ 	VkStridedDeviceAddressRegionKHR callable_sbt = {};
+-	vkCmdTraceRaysKHR(command_buffer->vk_command_buffer, &raygen_sbt, &miss_sbt, &hit_sbt, &callable_sbt, p_width, p_height, p_depth);
++	device_functions.CmdTraceRaysKHR(command_buffer->vk_command_buffer, &raygen_sbt, &miss_sbt, &hit_sbt, &callable_sbt, p_width, p_height, p_depth);
+ #endif
+@@ -6616,3 +6621,3 @@
+ 	VkPipeline vk_pipeline = VK_NULL_HANDLE;
+-	VkResult err = vkCreateRayTracingPipelinesKHR(vk_device, VK_NULL_HANDLE, pipelines_cache.vk_cache, 1, &pipeline_create_info, nullptr, &vk_pipeline);
++	VkResult err = device_functions.CreateRaytracingPipelinesKHR(vk_device, VK_NULL_HANDLE, pipelines_cache.vk_cache, 1, &pipeline_create_info, nullptr, &vk_pipeline);
+ 	ERR_FAIL_COND_V_MSG(err, RaytracingPipelineID(), vformat("Couldn't create Vulkan raytracing pipelines (VkResult error %d).", err));
+@@ -6639,3 +6644,3 @@
+ 	for (uint32_t i = 0; i < p_group_indices.size(); i++) {
+-		VkResult err = vkGetRayTracingShaderGroupHandlesKHR(vk_device, (VkPipeline)p_pipeline.id, p_group_index_offset + p_group_indices[i], 1, raytracing_capabilities.shader_group_handle_size, r_data);
++		VkResult err = device_functions.GetRayTracingShaderGroupHandlesKHR(vk_device, (VkPipeline)p_pipeline.id, p_group_index_offset + p_group_indices[i], 1, raytracing_capabilities.shader_group_handle_size, r_data);
+ 		ERR_FAIL_COND_V_MSG(err != VK_SUCCESS, false, vformat("Couldn't get Vulkan raytracing shader group handles (VkResult error %d).", err));
+--- a/drivers/vulkan/rendering_device_driver_vulkan.h
++++ b/drivers/vulkan/rendering_device_driver_vulkan.h
+@@ -131,3 +131,8 @@
+ 		PFN_vkCreateAccelerationStructureKHR CreateAccelerationStructureKHR = nullptr;
++		PFN_vkDestroyAccelerationStructureKHR DestroyAccelerationStructureKHR = nullptr;
++		PFN_vkGetAccelerationStructureBuildSizesKHR GetAccelerationStructureBuildSizesKHR = nullptr;
++		PFN_vkCmdBuildAccelerationStructuresKHR CmdBuildAccelerationStructuresKHR = nullptr;
+ 		PFN_vkCreateRayTracingPipelinesKHR CreateRaytracingPipelinesKHR = nullptr;
++		PFN_vkGetRayTracingShaderGroupHandlesKHR GetRayTracingShaderGroupHandlesKHR = nullptr;
++		PFN_vkCmdTraceRaysKHR CmdTraceRaysKHR = nullptr;
+ 	};
diff --git a/dev-games/godot-dotnet/godot-dotnet-4.6.2.ebuild b/dev-games/godot-dotnet/godot-dotnet-4.6.2.ebuild
deleted file mode 100644
index 762e6196cadc..000000000000
--- a/dev-games/godot-dotnet/godot-dotnet-4.6.2.ebuild
+++ /dev/null
@@ -1,481 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fork of dev-games/godot::gentoo
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{13..14} )
-DOTNET_PKG_COMPAT="8.0"
-NUGETS="
-coverlet.collector@6.0.4
-diffplex@1.7.2
-envdte@17.8.37221
-humanizer.core@2.14.1
-humanizer.core@2.2.0
-jetbrains.annotations@2019.1.3
-jetbrains.lifetimes@2024.3.0
-jetbrains.rdframework@2024.3.0
-jetbrains.rider.pathlocator@1.0.12
-microsoft.bcl.asyncinterfaces@5.0.0
-microsoft.bcl.asyncinterfaces@7.0.0
-microsoft.bcl.cryptography@9.0.10
-microsoft.build@15.1.548
-microsoft.build.framework@15.1.548
-microsoft.build.locator@1.2.6
-microsoft.build.notargets@2.0.1
-microsoft.codeanalysis.analyzers@3.3.2
-microsoft.codeanalysis.analyzers@3.3.4
-microsoft.codeanalysis.analyzer.testing@1.1.2
-microsoft.codeanalysis.codefix.testing@1.1.2
-microsoft.codeanalysis.common@3.11.0
-microsoft.codeanalysis.common@4.11.0
-microsoft.codeanalysis.common@4.8.0
-microsoft.codeanalysis.csharp@3.11.0
-microsoft.codeanalysis.csharp@4.11.0
-microsoft.codeanalysis.csharp@4.8.0
-microsoft.codeanalysis.csharp.analyzer.testing@1.1.2
-microsoft.codeanalysis.csharp.analyzer.testing.xunit@1.1.2
-microsoft.codeanalysis.csharp.codefix.testing@1.1.2
-microsoft.codeanalysis.csharp.codefix.testing.xunit@1.1.2
-microsoft.codeanalysis.csharp.sourcegenerators.testing@1.1.2
-microsoft.codeanalysis.csharp.sourcegenerators.testing.xunit@1.1.2
-microsoft.codeanalysis.csharp.workspaces@3.11.0
-microsoft.codeanalysis.csharp.workspaces@4.8.0
-microsoft.codeanalysis.sourcegenerators.testing@1.1.2
-microsoft.codeanalysis.testing.verifiers.xunit@1.1.2
-microsoft.codeanalysis.workspaces.common@3.11.0
-microsoft.codeanalysis.workspaces.common@4.8.0
-microsoft.codecoverage@18.0.0
-microsoft.netcore.platforms@1.0.1
-microsoft.netcore.platforms@1.1.0
-microsoft.netcore.platforms@2.0.0
-microsoft.netcore.platforms@5.0.0
-microsoft.netcore.targets@1.0.1
-microsoft.netcore.targets@1.1.0
-microsoft.netframework.referenceassemblies@1.0.0
-microsoft.netframework.referenceassemblies.net461@1.0.0
-microsoft.net.test.sdk@18.0.0
-microsoft.testplatform.objectmodel@18.0.0
-microsoft.testplatform.testhost@18.0.0
-microsoft.visualstudio.composition@16.1.8
-microsoft.visualstudio.composition.netfxattributes@16.1.8
-microsoft.visualstudio.interop@17.8.37221
-microsoft.visualstudio.solutionpersistence@1.0.52
-microsoft.visualstudio.validation@15.0.82
-microsoft.win32.primitives@4.0.1
-microsoft.win32.registry@4.0.0
-microsoft.win32.registry@5.0.0
-netstandard.library@2.0.3
-newtonsoft.json@13.0.1
-newtonsoft.json@13.0.3
-nuget.common@6.3.4
-nuget.configuration@6.3.4
-nuget.frameworks@6.12.1
-nuget.frameworks@6.3.4
-nuget.packaging@6.3.4
-nuget.protocol@6.3.4
-nuget.resolver@6.3.4
-nuget.versioning@6.3.4
-reflectionanalyzers@0.1.22-dev
-runtime.native.system@4.0.0
-runtime.native.system.io.compression@4.1.0
-system.appcontext@4.1.0
-system.buffers@4.5.1
-system.collections@4.0.11
-system.collections@4.3.0
-system.collections.concurrent@4.0.12
-system.collections.immutable@1.2.0
-system.collections.immutable@5.0.0
-system.collections.immutable@7.0.0
-system.collections.immutable@8.0.0
-system.collections.nongeneric@4.0.1
-system.componentmodel.composition@4.5.0
-system.composition@1.0.31
-system.composition@7.0.0
-system.composition.attributedmodel@1.0.31
-system.composition.attributedmodel@7.0.0
-system.composition.convention@1.0.31
-system.composition.convention@7.0.0
-system.composition.hosting@1.0.31
-system.composition.hosting@7.0.0
-system.composition.runtime@1.0.31
-system.composition.runtime@7.0.0
-system.composition.typedparts@1.0.31
-system.composition.typedparts@7.0.0
-system.console@4.0.0
-system.diagnostics.contracts@4.0.1
-system.diagnostics.debug@4.0.11
-system.diagnostics.debug@4.3.0
-system.diagnostics.fileversioninfo@4.0.0
-system.diagnostics.process@4.1.0
-system.diagnostics.tools@4.3.0
-system.diagnostics.tracesource@4.0.0
-system.diagnostics.tracing@4.1.0
-system.dynamic.runtime@4.0.11
-system.formats.asn1@9.0.10
-system.globalization@4.0.11
-system.globalization@4.3.0
-system.io@4.1.0
-system.io@4.3.0
-system.io.compression@4.1.0
-system.io.filesystem@4.0.1
-system.io.filesystem.primitives@4.0.1
-system.io.pipelines@5.0.1
-system.io.pipelines@7.0.0
-system.io.pipes@4.0.0
-system.linq@4.1.0
-system.linq@4.3.0
-system.linq.expressions@4.1.0
-system.linq.expressions@4.3.0
-system.linq.parallel@4.0.1
-system.memory@4.5.4
-system.memory@4.5.5
-system.net.primitives@4.0.11
-system.net.sockets@4.1.0
-system.numerics.vectors@4.4.0
-system.objectmodel@4.0.12
-system.objectmodel@4.3.0
-system.reflection@4.1.0
-system.reflection@4.3.0
-system.reflection.emit@4.0.1
-system.reflection.emit@4.3.0
-system.reflection.emit.ilgeneration@4.0.1
-system.reflection.emit.ilgeneration@4.3.0
-system.reflection.emit.lightweight@4.0.1
-system.reflection.emit.lightweight@4.3.0
-system.reflection.extensions@4.0.1
-system.reflection.extensions@4.3.0
-system.reflection.metadata@1.3.0
-system.reflection.metadata@5.0.0
-system.reflection.metadata@7.0.0
-system.reflection.metadata@8.0.0
-system.reflection.primitives@4.0.1
-system.reflection.primitives@4.3.0
-system.reflection.typeextensions@4.1.0
-system.reflection.typeextensions@4.3.0
-system.resources.resourcemanager@4.0.1
-system.resources.resourcemanager@4.3.0
-system.runtime@4.1.0
-system.runtime@4.3.0
-system.runtime.compilerservices.unsafe@5.0.0
-system.runtime.compilerservices.unsafe@6.0.0
-system.runtime.extensions@4.1.0
-system.runtime.extensions@4.3.0
-system.runtime.handles@4.0.1
-system.runtime.interopservices@4.1.0
-system.runtime.interopservices.runtimeinformation@4.0.0
-system.runtime.loader@4.0.0
-system.security.accesscontrol@4.5.0
-system.security.accesscontrol@5.0.0
-system.security.cryptography.cng@5.0.0
-system.security.cryptography.pkcs@9.0.10
-system.security.cryptography.protecteddata@4.4.0
-system.security.permissions@4.5.0
-system.security.principal@4.0.1
-system.security.principal.windows@4.5.0
-system.security.principal.windows@5.0.0
-system.text.encoding@4.0.11
-system.text.encoding@4.3.0
-system.text.encoding.codepages@4.5.1
-system.text.encoding.codepages@7.0.0
-system.text.encoding.extensions@4.0.11
-system.text.regularexpressions@4.1.0
-system.threading@4.0.11
-system.threading@4.3.0
-system.threading.channels@7.0.0
-system.threading.overlapped@4.0.1
-system.threading.tasks@4.0.11
-system.threading.tasks@4.3.0
-system.threading.tasks.dataflow@4.6.0
-system.threading.tasks.extensions@4.0.0
-system.threading.tasks.extensions@4.5.4
-system.threading.thread@4.0.0
-system.threading.threadpool@4.0.10
-system.xml.readerwriter@4.0.11
-system.xml.xmldocument@4.0.1
-system.xml.xpath@4.0.1
-system.xml.xpath.xmldocument@4.0.1
-xunit@2.9.3
-xunit.abstractions@2.0.3
-xunit.analyzers@1.18.0
-xunit.assert@2.9.3
-xunit.core@2.9.3
-xunit.extensibility.core@2.9.3
-xunit.extensibility.execution@2.9.3
-xunit.runner.visualstudio@3.1.5
-"
-
-inherit branding desktop dotnet-pkg python-any-r1 flag-o-matic scons-utils
-inherit shell-completion toolchain-funcs xdg
-
-MY_PN=godot
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
-HOMEPAGE="https://godotengine.org/"
-SRC_URI="
-	https://github.com/godotengine/godot/releases/download/${PV}-stable/${MY_P}-stable.tar.xz
-"
-
-SRC_URI+=" ${NUGET_URIS} "
-
-S=${WORKDIR}/${MY_P}-stable
-LICENSE="
-	MIT
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
-	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
-"
-SLOT="0"
-KEYWORDS="~amd64"
-# Enable roughly same as upstream by default so it works as expected,
-# except raycast (tools-only heavy dependency), and deprecated.
-IUSE="
-	accessibility alsa +dbus debug deprecated double-precision +fontconfig
-	+gui pulseaudio raycast speech test +sdl +theora +tools +udev +upnp
-	+vulkan wayland +webp
-"
-REQUIRED_USE="wayland? ( gui )"
-# TODO: tests still need more figuring out
-RESTRICT="test"
-
-# dlopen: libglvnd
-RDEPEND="
-	!!dev-games/godot
-	app-arch/brotli:=
-	app-arch/zstd:=
-	dev-games/recastnavigation:=
-	dev-libs/icu:=
-	dev-libs/libpcre2:=[pcre32]
-	media-libs/freetype[brotli,harfbuzz]
-	media-libs/harfbuzz:=[icu]
-	media-libs/libjpeg-turbo:=
-	media-libs/libogg
-	media-libs/libpng:=
-	media-libs/libvorbis
-	>=net-libs/mbedtls-3.6.2-r101:3=
-	net-libs/wslay
-	virtual/zlib:=
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	fontconfig? ( media-libs/fontconfig )
-	gui? (
-		media-libs/libglvnd
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libxkbcommon
-		tools? ( raycast? ( media-libs/embree:4 ) )
-		vulkan? ( media-libs/vulkan-loader[X,wayland?] )
-	)
-	pulseaudio? ( media-libs/libpulse )
-	sdl? ( media-libs/libsdl3 )
-	speech? ( app-accessibility/speech-dispatcher )
-	theora? (
-		media-libs/libtheora:=
-		tools? ( media-libs/libtheora[encode] )
-	)
-	tools? ( app-misc/ca-certificates )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/miniupnpc:= )
-	virtual/dotnet-sdk:8.0
-	wayland? (
-		dev-libs/wayland
-		gui-libs/libdecor
-	)
-	webp? ( media-libs/libwebp:= )
-"
-DEPEND="
-	${RDEPEND}
-	gui? ( x11-base/xorg-proto )
-	tools? ( test? ( dev-cpp/doctest ) )
-"
-BDEPEND="
-	virtual/pkgconfig
-	wayland? ( dev-util/wayland-scanner )
-"
-
-src_prepare() {
-	default
-
-	# PATCHES fails due to calling dotnet-pkg_src_prepare?
-	eapply "${FILESDIR}"/${MY_PN}-4.5-scons.patch
-
-	dotnet-pkg_src_prepare
-
-	# mbedtls normally has mbedtls.pc, but Gentoo's slotted one is mbedtls-3.pc
-	sed -E "/pkg-config/s/(mbedtls|mbedcrypto|mbedx509)/&-3/g" \
-		-i platform/linuxbsd/detect.py || 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=(
-		brotli doctest embree freetype graphite harfbuzz icu4c libjpeg-turbo
-		libogg libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
-		miniupnpc pcre2 recastnavigation sdl volk wslay zlib zstd
-		# certs: unused by generated header, but scons panics if not found
-	)
-	rm -r "${unbundle[@]/#/thirdparty/}" || die
-
-	ln -s -- "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
-}
-
-src_compile() {
-	local -x BUILD_NAME=${BRANDING_OS_ID} # replaces "custom_build" in version
-
-	filter-lto #921017
-
-	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-		progress=no
-		verbose=yes
-
-		target=$(usex tools editor template_$(usex debug{,} release))
-		dev_build=$(usex debug)
-		tests=$(usex tools $(usex test)) # bakes in --test in final binary
-
-		# TODO?: libgodot requires a separate build given the executable
-		# the library are mutally exculsive and so, unless we really need
-		# it, skipping support to ease maintenance at least for now
-		#library_type=$(usex libgodot shared_library executable)
-
-		accesskit=$(usex accessibility)
-		alsa=$(usex alsa)
-		dbus=$(usex dbus)
-		deprecated=$(usex deprecated)
-		precision=$(usex double-precision double single)
-		execinfo=no # not packaged, disables crash handler if non-glibc
-		fontconfig=$(usex fontconfig)
-		opengl3=$(usex gui)
-		pulseaudio=$(usex pulseaudio)
-		sdl=$(usex sdl)
-		speechd=$(usex speech)
-		udev=$(usex udev)
-		use_sowrap=no
-		use_volk=no # unnecessary when linking directly to libvulkan
-		vulkan=$(usex gui $(usex vulkan))
-		wayland=$(usex wayland)
-		# TODO: retry to add optional USE=X, wayland support is new
-		# and gui build is not well wired to handle USE="-X wayland" yet
-		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 many ignore whether the dep
-		# is actually used, so "enable" deleted builtins on disabled deps
-		builtin_accesskit=yes # not packaged
-		builtin_brotli=no
-		builtin_certs=no
-		builtin_clipper2=yes # not packaged
-		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=yes #879111 (for now, may revisit if more stable)
-		builtin_graphite=no
-		builtin_harfbuzz=no
-		builtin_icu4c=no
-		builtin_libjpeg_turbo=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_openxr=yes # not packaged
-		builtin_pcre2=no
-		builtin_recastnavigation=no
-		builtin_rvo2=yes # bundled copy has godot-specific changes
-		builtin_sdl=$(usex !sdl)
-		builtin_wslay=no
-		builtin_xatlas=yes # not wired for unbundling nor packaged
-		builtin_zlib=no
-		builtin_zstd=no
-		# (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)
-		module_mono_enabled=yes
-		# note raycast is only enabled on amd64+arm64 and USE should
-		# be masked for other keywords if added, 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
-		debug_symbols=no
-		lto=none
-		optimize=custom
-		use_static_cpp=no
-	)
-
-	escons "${esconsargs[@]}"
-
-	# godot requires access to input devices?
-	addwrite /dev/input
-	addwrite /dev/bus/usb
-
-	# generate mono glue
-	bin/godot* --headless --generate-mono-glue modules/mono/glue || die "Failed to generate mono glue"
-
-	local MSBUILDTERMINALLOGER=off # required for msbuild to succeed?
-
-	# build the C# assemblies; pass flags so assemblies match how engine was built
-	"${EPYTHON}" modules/mono/build_scripts/build_assemblies.py \
-		--godot-output-dir "${S}/bin" \
-		--precision="$(usex double-precision double single)" \
-		$(usex debug --dev-debug "") \
-		$(usex deprecated "" --no-deprecated) \
-		--push-nupkgs-local="${T}/.nuget/packages" \
-		|| die "Failed to build mono assemblies"
-}
-
-src_test() {
-	xdg_environment_reset
-
-	bin/godot* --headless --test || die
-}
-
-src_install() {
-	local instdir
-	instdir="/usr/$(get_libdir)/godot"
-
-	insinto "${instdir}"
-	doins -r bin/GodotSharp
-
-	exeinto "${instdir}"
-
-	local gin
-	gin=$(basename bin/godot*) # get once
-
-	doexe "bin/${gin}"
-
-	dosym "..${instdir#/usr}/${gin}" /usr/bin/godot
-
-	doman misc/dist/linux/godot.6
-	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
-
-	if use gui; then
-		newicon icon.svg godot.svg
-		domenu misc/dist/linux/org.godotengine.Godot.desktop
-
-		insinto /usr/share/metainfo
-		doins misc/dist/linux/org.godotengine.Godot.appdata.xml
-
-		insinto /usr/share/mime/application
-		doins misc/dist/linux/org.godotengine.Godot.xml
-	fi
-
-	newbashcomp misc/dist/shell/godot.bash-completion godot
-	newfishcomp misc/dist/shell/godot.fish godot.fish
-	newzshcomp misc/dist/shell/_godot.zsh-completion _godot
-}
diff --git a/dev-games/godot-dotnet/godot-dotnet-4.6.3.ebuild b/dev-games/godot-dotnet/godot-dotnet-4.6.3.ebuild
index 762e6196cadc..a234e7ef4b4a 100644
--- a/dev-games/godot-dotnet/godot-dotnet-4.6.3.ebuild
+++ b/dev-games/godot-dotnet/godot-dotnet-4.6.3.ebuild
@@ -241,7 +241,7 @@ RESTRICT="test"
 
 # dlopen: libglvnd
 RDEPEND="
-	!!dev-games/godot
+	!dev-games/godot
 	app-arch/brotli:=
 	app-arch/zstd:=
 	dev-games/recastnavigation:=
@@ -328,11 +328,10 @@ src_prepare() {
 src_compile() {
 	local -x BUILD_NAME=${BRANDING_OS_ID} # replaces "custom_build" in version
 
+	tc-export AR CC CXX RANLIB
 	filter-lto #921017
 
 	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
 		progress=no
 		verbose=yes
 
diff --git a/dev-games/godot-dotnet/godot-dotnet-4.6.1-r1.ebuild b/dev-games/godot-dotnet/godot-dotnet-4.7.ebuild
index 762e6196cadc..c96c8dd49cdc 100644
--- a/dev-games/godot-dotnet/godot-dotnet-4.6.1-r1.ebuild
+++ b/dev-games/godot-dotnet/godot-dotnet-4.7.ebuild
@@ -23,7 +23,7 @@ microsoft.bcl.cryptography@9.0.10
 microsoft.build@15.1.548
 microsoft.build.framework@15.1.548
 microsoft.build.locator@1.2.6
-microsoft.build.notargets@2.0.1
+microsoft.build.notargets@3.7.56
 microsoft.codeanalysis.analyzers@3.3.2
 microsoft.codeanalysis.analyzers@3.3.4
 microsoft.codeanalysis.analyzer.testing@1.1.2
@@ -241,7 +241,7 @@ RESTRICT="test"
 
 # dlopen: libglvnd
 RDEPEND="
-	!!dev-games/godot
+	!dev-games/godot
 	app-arch/brotli:=
 	app-arch/zstd:=
 	dev-games/recastnavigation:=
@@ -304,6 +304,7 @@ src_prepare() {
 
 	# PATCHES fails due to calling dotnet-pkg_src_prepare?
 	eapply "${FILESDIR}"/${MY_PN}-4.5-scons.patch
+	eapply "${FILESDIR}"/${MY_P}-no-volk.patch
 
 	dotnet-pkg_src_prepare
 
@@ -328,11 +329,10 @@ src_prepare() {
 src_compile() {
 	local -x BUILD_NAME=${BRANDING_OS_ID} # replaces "custom_build" in version
 
+	tc-export AR CC CXX RANLIB
 	filter-lto #921017
 
 	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
 		progress=no
 		verbose=yes
 
@@ -465,7 +465,7 @@ src_install() {
 	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
 
 	if use gui; then
-		newicon icon.svg godot.svg
+		newicon misc/logo/icon.svg godot.svg
 		domenu misc/dist/linux/org.godotengine.Godot.desktop
 
 		insinto /usr/share/metainfo