gentoo auto-resync : 17:02:2025 - 00:13:57

29 files changed, 725 insertions, 442 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 31dae8c4ff5e..15d063fd6d10 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/mond/Manifest b/dev-lang/mond/Manifest
index 227baa77377f..712ee58101f1 100644
--- a/dev-lang/mond/Manifest
+++ b/dev-lang/mond/Manifest
@@ -34,7 +34,6 @@ DIST microsoft.sourcelink.common.8.0.0.nupkg 318281 BLAKE2B d53a9f305dd9ad5b6455
 DIST microsoft.sourcelink.github.8.0.0.nupkg 330089 BLAKE2B 5c9683ce4b55e6fad9b335495c993dfa656747b15a049f8df9cc7839c91618a157aeea1d5e3f14cf6d4b20a06c91aa37172cca6d12102b060aaf147ced103fba SHA512 1a46485ed34d76994c0eb761600400519edcbff97181f1bff2a2666d432bd912527e82a267c8a9c13497417c6dc4c503fe63672eea20c21fdfa857716e26db9b
 DIST microsoft.testplatform.objectmodel.17.8.0.nupkg 1492114 BLAKE2B 32a3a7f4e4cb9af1d330fcb2588ee9602414760eb4f2bda49888372b3ed64e8c47347dbdeda11259134e37b717ad5c23b06ffeda9a1a1772e1afe299429e828d SHA512 17119c472fd87ff721677f92a801693eab53a1897582150c26a60429c99eb1764628e7ba895b40e3b10b9edc00f803b18316a6fdc906ffe54dbd2d04ac63db33
 DIST microsoft.testplatform.testhost.17.8.0.nupkg 2806274 BLAKE2B dff54d1c59a6873793bbe2d6fc9ed75c2d610a8dc41f4f9349228b690db3beb7845660c7d90a5d2588443c13aff4d97b6e0a1df58e88a398b3631a344609060c SHA512 39fb1549fd23fc2c7b4f5525043fc1152b8c62cc813a88c9701f33a666041c6690dadd455899d247fef5e6df372d17f081d6098839086007b2c10618e187ac7a
-DIST mond-0.10.0.tar.gz 612465 BLAKE2B b802d7e97fbaf2fd8a7350d19623fe5e8319e0e36e54d98f01c8f49b2a1900003b4c144420faa5a2bd0718474cc93f7e2912ac4afdfe6461b300ce9f9386a0ec SHA512 2e16b4ed4cfa1009b21631cee1b722cf80ff2a3e7c17f53cd36fbc18bdf683e958b25fb60b701be1a164f69eb1d0689c2cb2ff0bfa2082446d8abfd60b23b1de
 DIST mond-0.10.2.tar.gz 612942 BLAKE2B 70be09334e89234cb2ac889c48c0cb6b04feecace1fad6ab0f93a448b49e289e12e49167b2075cad4404bcca0ec9ab68987d121376383b5a2d35da7910b3327d SHA512 0014fa673c0b213fd360642ec3008635ee6dae560da72c0e656e6c90bc48d1c45e15a2d2ebd34e63f5593fb708adb3b8739ad2ef3fe46d684b0f6546faa116d9
 DIST netstandard.library.2.0.0.nupkg 3143842 BLAKE2B 7e3fc865e7893fb531b21e2ca791b788af01481316e49a79c4676050c2b8ad413fd8a4ef9890557582ec8b9741c8aa01b080b8d2caa16e02bfff2a7b38777989 SHA512 e3d64072b9cd9f9e86209c06a22688ecda7070427c9a35327d2a9560824c0e1381ccf7bc1d21d2ef8b301761f4bfc7f38fba712df7188d2f4fe4f748aac4d0c7
 DIST netstandard.library.2.0.3.nupkg 3146139 BLAKE2B 311e5367398f76c74e78930bc2cd39e450a86bd8626311ded8d58bd84c94a8a84db3c11b2bc10f3eeba20a9d081fe7827981f702ad746b49ae3108c949ba1022 SHA512 e78f0cea69c14895b1b089644077dbce8631a626055d96522f4d29e061d8bfc3e48aa1419e74faf265b998612c03f721f5f0cef4690f824150a5689764dee601
@@ -54,6 +53,5 @@ DIST system.text.encoding.codepages.7.0.0.nupkg 3198933 BLAKE2B 077972f69636114b
 DIST system.text.encodings.web.8.0.0.nupkg 374440 BLAKE2B 97211e710df3dcd17932f168e254806d7c8692ac01d667a2e89a5ddc956b24fba8467fbc2d451057757b5c502442d2c91bcaf0f867da7e95456b2aa18136b354 SHA512 ba0822c38c3b658aba9495642d269e882b827e3be4ad2dc1426d8a97d3cbc5a2277c5f80847d0cb9381078af01523328c4992caa058146d5d8ee6b8a08609c32
 DIST system.text.json.8.0.0.nupkg 1983421 BLAKE2B 053f3200d5920a5a31b4e4e6d13f0a81490a518ed68363a1a04c1edbbc125f90b9fa8f469614127bde714df352052a0dc56d70c9595277686799d33a16df351b SHA512 59243516d9de8ce90be60d6c5d271ff4c5fc6b2a4b723443022a72bd1b8f98adac3d17439df5543fedead81a8e3b018fd9a89c40a2459d3cb2d1dd935d17b426
 DIST system.threading.tasks.extensions.4.5.4.nupkg 89582 BLAKE2B 728fc5794745b706a7e3a7d05186f34e2a8c1837cafdc7fc9a1bd8fc6fd42025448cbdfa53415a05d872aa08db1deb31d104054630c9ac7ecd29a2ddd973fd5c SHA512 68052086e77d3c7198737a3da163d67740b7c44f93250c39659b3bf21b6547a9abf64cbf40481f5c78f24361af3aaf47d52d188b371554a0928a7f7665c1fc14
-EBUILD mond-0.10.0.ebuild 2982 BLAKE2B ae1c4a8999fb5ae0e1b96d4b0c34589f781891909bee201c1bdfd37ffdfc3dd1c01ccd0d87318f66f5e9d35dcee56dd64d7e0e5f8445de7743a161d20f8d9255 SHA512 9a505ac1253e8ab61d9f8e28b7566210278639c3e56f4e95c2ee3a8952ee29f733cd38445017f3cdd745fdc5a6becf81b7877797fbc5dae145d355893eeabe45
 EBUILD mond-0.10.2.ebuild 2981 BLAKE2B 7ed3fafba2b8df8930fff47373247d2416369d47fe29ef7e2a507b7312638b70b2394959af03a634162cfe1ea225b9c46eeac62d8c99723d6400e9110beb18d1 SHA512 626b23630e5643d71eaaa680ef25d55a457ca27780d07088bf7c77b28b524be4556a37e03907143b086b018742b4ddd09112e1787c70fb5e7502d51da6c1e85c
 MISC metadata.xml 407 BLAKE2B c23e1813bba6b1e7beb547a075e0b283941571270493902195fd370854963ad07e1a6e30673dc7733b542d02839d84aa6f554d806aa0e8021d44570b655ca1fd SHA512 ff0fa87463543a559675a8397a7c1dceea2b59faa76435569cb996ad43ad123d2c5272642a73a35f4c7a132b8a3cb6bff6bc5a1114bf62887ef2f0461967eb5f
diff --git a/dev-lang/mond/mond-0.10.0.ebuild b/dev-lang/mond/mond-0.10.0.ebuild
deleted file mode 100644
index bca70e07819d..000000000000
--- a/dev-lang/mond/mond-0.10.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOTNET_PKG_COMPAT=8.0
-NUGETS="
-fleck@1.2.0
-microsoft.aspnetcore.authorization@8.0.0
-microsoft.aspnetcore.components.analyzers@8.0.0
-microsoft.aspnetcore.components.forms@8.0.0
-microsoft.aspnetcore.components.web@8.0.0
-microsoft.aspnetcore.components.webassembly.devserver@8.0.0
-microsoft.aspnetcore.components.webassembly@8.0.0
-microsoft.aspnetcore.components@8.0.0
-microsoft.aspnetcore.metadata@8.0.0
-microsoft.build.tasks.git@8.0.0
-microsoft.codeanalysis.analyzers@3.3.4
-microsoft.codeanalysis.common@4.8.0
-microsoft.codeanalysis.csharp@4.8.0
-microsoft.codecoverage@17.8.0
-microsoft.extensions.configuration.abstractions@8.0.0
-microsoft.extensions.configuration.binder@8.0.0
-microsoft.extensions.configuration.fileextensions@8.0.0
-microsoft.extensions.configuration.json@8.0.0
-microsoft.extensions.configuration@8.0.0
-microsoft.extensions.dependencyinjection.abstractions@8.0.0
-microsoft.extensions.dependencyinjection@8.0.0
-microsoft.extensions.fileproviders.abstractions@8.0.0
-microsoft.extensions.fileproviders.physical@8.0.0
-microsoft.extensions.filesystemglobbing@8.0.0
-microsoft.extensions.logging.abstractions@8.0.0
-microsoft.extensions.logging@8.0.0
-microsoft.extensions.options@8.0.0
-microsoft.extensions.primitives@8.0.0
-microsoft.jsinterop.webassembly@8.0.0
-microsoft.jsinterop@8.0.0
-microsoft.net.test.sdk@17.8.0
-microsoft.netcore.platforms@1.1.0
-microsoft.sourcelink.common@8.0.0
-microsoft.sourcelink.github@8.0.0
-microsoft.testplatform.objectmodel@17.8.0
-microsoft.testplatform.testhost@17.8.0
-netstandard.library@2.0.0
-newtonsoft.json@13.0.1
-nuget.frameworks@6.5.0
-nunit3testadapter@4.5.0
-nunit@3.14.0
-system.collections.immutable@7.0.0
-system.io.pipelines@8.0.0
-system.reflection.metadata@1.6.0
-system.reflection.metadata@7.0.0
-system.runtime.compilerservices.unsafe@6.0.0
-system.text.encodings.web@8.0.0
-system.text.json@8.0.0
-netstandard.library@2.0.3
-system.buffers@4.5.1
-system.memory@4.5.5
-system.numerics.vectors@4.4.0
-system.text.encoding.codepages@7.0.0
-system.threading.tasks.extensions@4.5.4
-"
-
-inherit dotnet-pkg
-
-DESCRIPTION="Mond is a scripting language for .NET Core"
-HOMEPAGE="https://rohbot.net/mond/
-	https://github.com/Rohansi/Mond/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/Rohansi/${PN^}.git"
-else
-	SRC_URI="https://github.com/Rohansi/${PN^}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/${P^}"
-
-	KEYWORDS="amd64"
-fi
-
-SRC_URI+=" ${NUGET_URIS} "
-
-LICENSE="MIT"
-SLOT="0"
-
-DOTNET_PKG_BAD_PROJECTS=( TryMond/TryMond.csproj )
-DOTNET_PKG_PROJECTS=( Mond.Repl/Mond.Repl.csproj )
-
-DOCS=( README.md Examples )
-
-src_unpack() {
-	dotnet-pkg_src_unpack
-
-	if [[ -n "${EGIT_REPO_URI}" ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_install() {
-	dotnet-pkg-base_install
-	dotnet-pkg-base_dolauncher "/usr/share/${P}/Mond.Repl" "${PN}"
-
-	docompress -x "/usr/share/doc/${PF}/Examples"
-	einstalldocs
-}
diff --git a/dev-lang/nprolog/Manifest b/dev-lang/nprolog/Manifest
index c5848ddcd96f..97422228b4c3 100644
--- a/dev-lang/nprolog/Manifest
+++ b/dev-lang/nprolog/Manifest
@@ -4,8 +4,10 @@ DIST nprolog-3.53.tar.gz 682333 BLAKE2B 827e6ff1b066e42fd10df8788a6752ef4df7692c
 DIST nprolog-3.88.gh.tar.gz 1337137 BLAKE2B 0d8f8d5e8242e3ab172f0a1256252ef99b6daf76a77fb75710c0286d55aa02e79e78601ec4347e42d88411cc7528d4e3b041496df04335496b71fc41cb3573c6 SHA512 12ef940792a6c9cd44cafad5440829d43b0c4736732341172255733f163d48b189233b62288e4fd59d36e5a378742f783a0400c2c4dc3d6b06570143b06685db
 DIST nprolog-3.89.gh.tar.gz 1286015 BLAKE2B 006e9ecfc541cc57cd67454ce3c10e6f8c9fce63695a4395d1b1d3db82aa30483d78503544d5b4ffbe2e87902fa05fe39fd2c6ad2fe4d3e54d54e96901a6e69f SHA512 9df70ec2c37861a6374fd0093b426cc0ba55138680e164f9d84ed830470cc955c2da7a24ba3fb517b4dbf5c0154062f9431905d9d326db6f7a7ddccee250a7ea
 DIST nprolog-3.90.gh.tar.gz 1294763 BLAKE2B 70f728c44b3abce4c3d969ab4c015d89414412a6db06c6041c34376d4ddd10977a1cd2a33d6bdc07d1dd8f77d46ab0a704478d0534ec71bb85952ec29f8bc087 SHA512 9ab0fbed24bf57931af7b430c0f68c9b2cb93a63a5d8e6f6079bcde3f8d7adb181a44f6e2517860af9d3e011faec8577b448146a2dcfd2a2ccee6373f3187ada
+DIST nprolog-3.92.gh.tar.gz 1295861 BLAKE2B 87b84b793c19e9fb9021ccc593cc59b638570b422a80bb86d9066fd852b3f627ff70538758f5a38620478c8287ddff1420c77521c76358ed4190a4f83f9ab97b SHA512 eddd8f59a0efd7d16da04b98eb413eae0dc083fcc1776b5027ebf60d8bcad6ac09a5990b1d394c469437b67cacf1ddf3ea79ab9ebd495b3a4158db34d56431e5
 EBUILD nprolog-3.53.ebuild 888 BLAKE2B 1a70453da30466404a14daa097c7df96cd95bcf759becad989cd538e6b17739f86a06301950ed1913314b750955c3c8f3a07f650ce41a3fab431102f414deaaf SHA512 8fc94200ca57c0a592500c1f10a8b58fafb41c8ee28f5dcfea20327784a1221a5440bf72f6a53e1c365dd3bc1006da99d8aa2e8b541d07956a8502f9187c68e5
 EBUILD nprolog-3.88.ebuild 1100 BLAKE2B 7f056d2d92d21e2d343f65f8aebee3934d7badd69aefe5fdeaf1230fb54cd13e09bee73c89f51c78fd2accbe9c91a8b2e2890133a567d8d9cd9a525c8eb79f64 SHA512 b697953177b8f268da8bdfa308750fa67be3b9b079c8ce2d1d01cc82db21771cd29daac509a8aed2013c24c2902e8c03acd9b415f40925010fb92e210583c811
 EBUILD nprolog-3.89.ebuild 1032 BLAKE2B e39dc2dd493eebcdd307a5453f9e312c01848280a042ace8eb4255e78a35379d8829581c8635740da506419af011e0f9daa7f2a17ef966b6ff36b93108dd96fa SHA512 e1d11da019820e23d60ccbea7cfa3deabd1466112aeeb7ef4942f624860553d9736cfad4329439e04f0a9ee7ee5d200b972391e38249d28567926098e56e9b3f
 EBUILD nprolog-3.90.ebuild 995 BLAKE2B c6b2e855cd048ab041273a3f464f153db96fbaf05e9b62770b03b3971c8188096b0d694c4ee3488ac0dfda775e94d312934e78e5bc70afe966ff9e6976c597e8 SHA512 7ad20ffc7a913cc779ce4feee01d4a6f0c3b5275c68cea81bfd09245ebf49885605d4054a65c76c1eda2ccb9c4c74509279fbb2ed6e2cfe4d6b2e7ed6dd4cb6b
+EBUILD nprolog-3.92.ebuild 939 BLAKE2B 54af8f133e704ed030d70711ef580ee4340d1e2957ac19a18e40caece971a186860f25a6fc977e2eed2ed0b38ff6ee37e43e7c74c4ee9b56c03463286fce9185 SHA512 a5ab0c3c604717b0c64009e95e9aaaba96c73f44f9f2dd19cd3f2de262a769c9e7f1c4a7a6e5706bbe12367f96ab0ca5a2112b39d3cf51f5117fdbb7ad1c702b
 MISC metadata.xml 657 BLAKE2B 9331358542d57958385bc1218b4a1c5d38185ab0822d0cc68e51bcc5f8b00645a523a1a4f60d30188efc3ed7cb934f0a6a964d27bf0915c5956c69774c734590 SHA512 972ae4d1f2179887f77d8805f2e5482c17767e38b078fa9d9ee65a2f43e0b56b76fccd0166f4c5121de9a7cead4faa7683bd8e9076c257ffb2d1deb673eb276e
diff --git a/dev-lang/nprolog/nprolog-3.92.ebuild b/dev-lang/nprolog/nprolog-3.92.ebuild
new file mode 100644
index 000000000000..7cd886b90578
--- /dev/null
+++ b/dev-lang/nprolog/nprolog-3.92.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interpreter and compiler to be compatible with Arity/Prolog32"
+HOMEPAGE="https://github.com/sasagawa888/nprolog/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sasagawa888/${PN}"
+else
+	SRC_URI="https://github.com/sasagawa888/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc"
+
+DOCS=( README{,-ja}.md )
+
+src_prepare() {
+	if [[ -f edlog ]] ; then
+		rm edlog || die
+	fi
+
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe npl
+
+	insinto "/usr/share/${PN}"
+	doins -r example library
+
+	if use doc ; then
+		DOCS+=( document )
+
+		docompress -x "/usr/share/doc/${PF}/document"
+	fi
+
+	einstalldocs
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 3d08c8e892b6..edc0575fe14d 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -44,17 +44,17 @@ DIST rustc-1.84.0-src.tar.xz 354993944 BLAKE2B e4697d8a9f42484556ed490390aef535b
 DIST rustc-1.84.0-src.tar.xz.asc 801 BLAKE2B b1846702f36b92c479499f5eb704ce1e272131fc1b6b625c8d64c873a82ed79b1de8cceb1f21ae4b9dccf81e258547debf367b7b769ac94ed10a59dee18f79f1 SHA512 5ada0e0fed9901044eaa0d7cb657f685c7e183e91245714abe4a0a8bf3062a7de281932c7de7587220df0542511f6011d057bd8bed19d98c755eab74091cdfdb
 DIST rustc-1.84.1-src.tar.xz 355078168 BLAKE2B 849e8c909493bf76ce9749b9dcb1967180223b91a41d690bc477e78557d4e24949c9a8d8276d824af8c54ad62bc4a998e7a8efbc0bbd2008a4f64f51a7690d48 SHA512 f1cc4765736551508408126e44086988e8ddc30c1a929bf7b61c6be85ad0d65928dd5fb1041cfaeee8eb37d2208f2c1917e276aef2bc9a8e40e34f6713b349e1
 DIST rustc-1.84.1-src.tar.xz.asc 801 BLAKE2B f3decd3470fd1eff33adbb376490a30eb8db28dd4176bde0fefe4f60acf79c3dd0e1a330d519b5319360136ea7d0a124f6720dea08617202d9e9298da992ccf6 SHA512 a241fe3efba293f3e872b74f09dd0d184e0239afd1416326d57bf1134d92721c65b187f5c99962b51671877a539f18e82d2d797c76af42615c11a8bb3905f796
-EBUILD rust-1.71.1-r101.ebuild 22030 BLAKE2B 58e75a73001d98eb55cbe015daf1a25b432594dcd455b7a068695d149ae22ac4934e05494716d25c45976f8c17f826d0022d38044710f4a7f0c1aeea46a875ad SHA512 51b9c7898587ace9e812b51db86e3fdc51e53eba29bb65ab6dd903da417adab07b15cad5f99cabbe541c08391043ba06bcdf7da8b20d45817fb5bc6cfc30f77c
-EBUILD rust-1.74.1-r101.ebuild 37643 BLAKE2B 3c25e40a1c7a2e2b6223e544f5c5dd041715b04dec89d0afd25e072ebb5f836b91943330d0010f3b6a17e728811718cbaf344a5dabf001227f48788b157a6851 SHA512 3e89d30915b7c92f2edb164f1a3fe1e2fea47a4a952717f2a110379852f85cf3f4013ef2436f003a79b60ccc76888056a15da2c8eccc19e502bfede9f4ebd7b4
-EBUILD rust-1.75.0-r101.ebuild 23537 BLAKE2B 3314232dbba9bd04f761e50f963f95db91f45eab4ee4dbbf578c05bed09e079edc27ee37a7d71aa9b6969e1ed32d2ff91ee5cdff3cd7676e60bfba0344f4aba2 SHA512 e09ecdbbbb53a872b0a628610585239c3e53165e8ca5737bcbcfff74e1f5418ca818a1f3ba38227cd477a630993ecb05fed20c8010c9a1b56c2efa32c88a6d65
-EBUILD rust-1.76.0-r101.ebuild 20045 BLAKE2B b7d74577b9491930c6f950bfd4bcaec6bbf25c938f67d293f85ca818b56791ed7a64b7a8fc0ea5f15be00a4bfb384c91725a200061bce16a188b83659881bdf4 SHA512 c272ce7816b9ca45fc7f86019ca0c37944191632d5d6491489ead86b7ff7b6b35a65b85bf97ef0a8415d29e6b9cd53649a3d93c6670fd22f734a4bb96d0c2b75
-EBUILD rust-1.77.1-r101.ebuild 23501 BLAKE2B 29040b14df7538cf8cd450a6a6b4bcfed4d40e507327dae34287363c3069b151ee55eb53f4e5df14954a9b81de74484a05fc48f44bd71139d45d74e21014d1fd SHA512 aedaa5c9c7c400fc3d76e8eb99e93c5ed7f5419f97cb0516f6f065c90919df4309235cd6ed10264d02f36cc470152e355a6c90cf4c6b937347115f198bc686bf
-EBUILD rust-1.78.0-r101.ebuild 23736 BLAKE2B 555bab47f61ab8520369a7878ae5ab644eeaeef46cf87b2b38783b2c04e2778e844d6aae1de85bde4a9c0be4dda25e22829fd4cbf71bf9915ddb4ef90d94995a SHA512 3d0b3f539e509c9d4436a150a3b0598cdc7e30d57b2eb41e9371ff824a05bb28ff031e604c7936f4b2c492d3153f602acc2ed5c821cea757b992c5a4faa4d36a
-EBUILD rust-1.79.0-r101.ebuild 23736 BLAKE2B 555bab47f61ab8520369a7878ae5ab644eeaeef46cf87b2b38783b2c04e2778e844d6aae1de85bde4a9c0be4dda25e22829fd4cbf71bf9915ddb4ef90d94995a SHA512 3d0b3f539e509c9d4436a150a3b0598cdc7e30d57b2eb41e9371ff824a05bb28ff031e604c7936f4b2c492d3153f602acc2ed5c821cea757b992c5a4faa4d36a
-EBUILD rust-1.80.1-r101.ebuild 23608 BLAKE2B 418beedaf87e3c1dfefdce12564dde1e10ff6722690f4d7a60faff0aa89bc1953c0a3fddbae5de131cd386f7d0c0c1377ecaa6acbdba3f3c0aeedd4f4fe75067 SHA512 3006aab0d8138ba6dcf5715386d69bfaafc1767dcc8019253f27e615e198588b3ff0b7d98b7bb70a05804dda846572c49f9590ca0f228481c4168456e27af1b7
-EBUILD rust-1.81.0-r101.ebuild 23805 BLAKE2B 682aa0f041d84310e3fe85f2b92ef476090207c619d92d75c84173b63b86c14b052ae93d105d85a6ddcc1fa887dd791dcd9d3af3c4b9302af27f5902fb190dcf SHA512 fafe7c8b80c5a5c6c0783a113c2dce3c96dc5c8684da29241836ff59d266b0ea0e1d4d34ceb0c1c94f79f66bfc2221ea23b2d6aeb797e348d0e465ca1c5297f0
-EBUILD rust-1.82.0-r102.ebuild 24000 BLAKE2B a40774735acbe3af636566bd83c799422bb365f5b3cbc16f35ee4a13cd2415f3a2aade6ae59c910e8aa6671d26a5387eb66acf3aa9a38b494bae90a5171dc1ba SHA512 7be689a92fd46a71425088f388cb5fc380a5baf82f85119450b1c8a7464f8435e49b2ba4cf4479c728bc8c4d250455d33bd77262952b9f0143ed2a0ccdb4638d
-EBUILD rust-1.83.0-r2.ebuild 23233 BLAKE2B b85425b5ed8eb8e344df196f4728e5d4d3606a0fb4c4ead41b9d8ff631736c566ffb8559579c0ee00675a4b1457c4b19d54cd06ff63abe3d997ad46b07028551 SHA512 767ccf3e9ee1812b70268239123f1ebdf45be6be3ae498d359b9b09ad2f095da1c21fbe519ce7971850aee2760826655576e0ef560e93b0f5432ef25cc180ef6
-EBUILD rust-1.84.0-r1.ebuild 21926 BLAKE2B 66c3092a1e85825a1f1cebdca4a565b8cac89dc48c52d39fa594dec33c95bbb2b9567a3160d3b632643dc9e46fdbd416511d6560179639343437d68d95ef9c52 SHA512 b23b45a6bd4faa321a953ecb8b202edb03cce2a29905f272eeefcd52d4626350487300cbef91306f0cf6f3c919a59c318ca54e637b31dc97d0d3439f87a58265
-EBUILD rust-1.84.1-r1.ebuild 21911 BLAKE2B fdaf45f702f65a7050fd14b960437c476063706127d82bc154234f8be1ec5058874baee6f4043c43ee45b7e473a88dcac7efe3ba61b49bef48052e24c740f16c SHA512 839b6ee0d8ce2fc139bfbaca64008ba55fee0728c9c004c1e79a5f9adec6159eaeb7e054054fcf4dc6f2687ffeff31a5aa5ed0ef5b46dc7ff01352bbcd765b3a
+EBUILD rust-1.71.1-r101.ebuild 22222 BLAKE2B 389248dc13ba90147c4ffb09d91e7e6f68510652dc008bd273f6b21bb077438e0418aa477134b5cd6f8021f168f60e67408b6d95e5154c1e23082b55697b4164 SHA512 77ede16712fa98043bb7fc8f6c399675640331a8402ab287fcde41d16fde778207d9a79c20194af654a3d43355f56609de1b3302f29442e56f8f0a81c0a69d2f
+EBUILD rust-1.74.1-r101.ebuild 37835 BLAKE2B 4c20c4a0c6812dc7d3bf718d01c48ad558d872dda343e0ed785efb3a3273700431f562c2c41524f1d780f981483b22c9fe9fa43e4a854bf4e6b260618b0e07ae SHA512 4dca67aebd18c9c4e6305b3105882e744470f92612fc13c42f113e2cc95df74d5e11c1a2af4207113436ff44dd8d7421f1749c5ac37bfaf2389298aaccf58ad5
+EBUILD rust-1.75.0-r101.ebuild 23729 BLAKE2B 9850cc208abad5dccabf650e1b3360a7d9cd4f6f9a53d7b1f426113e6575d05e33fe50a7b5d7a0ab44493ad76fe9321b7a240ebd149bf469befff232594db85d SHA512 e1913083fb332ec53d859aa821ccefee101415d30ffecafc9d55d87289d54406327e257073a46f3fd8222e47998170bb1edfb08c6ca61cdb3a274e8cd5aff8a2
+EBUILD rust-1.76.0-r101.ebuild 20237 BLAKE2B 9bbff813775d3f2947f2926d657dabecc92031d3f6dc18e7b93feb029b150c4b649a655e51f355bfe6ad4676215c3d857b2c3d244fa665128ffdda93c3012858 SHA512 d0331cf3efdaf57434c8e0d59036fe03f03f74934f0a6927da01d457b98bc72a7d3ce41734b53458bdebafe2fa3b0e6bb84ab9fdad5026e83382c4d81270c5a9
+EBUILD rust-1.77.1-r101.ebuild 23693 BLAKE2B bc45bfaab3af838cf56875f6b6f990e03b7757bb7a174a3da76036a64542a835dc9f540f84d38df4f4dd263af1aa9d47649443183392578fe8b6957fa4b86931 SHA512 e66af1b7bc69038053216a024edab7c3d4aa20fbfeef54e5cbb6629df2f10302fec803faf42e6604c3cac2fa3d553514dcd41061624ad97ef570966fe985818c
+EBUILD rust-1.78.0-r101.ebuild 23928 BLAKE2B 4692851507c96ceb330b41851c0068e763c6be8ff0f065c81be059b7fc324ac3f8bc6290b05ea10d4e0b37aef801fc949d9b347c7645c4e2489c6d0432849ba1 SHA512 4cc2de304089ca8a90134183dc9de95cad2c1a01239e75cb4274a64487c3670bb82d65624060b55255be03ca3a1ba98b170c5f6ce655b102c9adf3aed7daf2b3
+EBUILD rust-1.79.0-r101.ebuild 23928 BLAKE2B 4692851507c96ceb330b41851c0068e763c6be8ff0f065c81be059b7fc324ac3f8bc6290b05ea10d4e0b37aef801fc949d9b347c7645c4e2489c6d0432849ba1 SHA512 4cc2de304089ca8a90134183dc9de95cad2c1a01239e75cb4274a64487c3670bb82d65624060b55255be03ca3a1ba98b170c5f6ce655b102c9adf3aed7daf2b3
+EBUILD rust-1.80.1-r101.ebuild 23800 BLAKE2B ad754d8b88329318ba8ec8d4547fe52399e166c6b6f4d7cc3d77ed8028222b2c238760b9f1159570760d49ee0bf852101a7471e0d13588ef706f85e16e2e6e81 SHA512 d731b8c92162e01a07e7697ab703106692cd069686b02f49b24758021e5ddaf8696c7cf2b76fa13628f457f0079f211c0df6cb0a9d5213f8ed1f3c46bf5bc1c2
+EBUILD rust-1.81.0-r101.ebuild 23997 BLAKE2B d7538f20e3b1ab9b883564004dfc121bf5d5c862dd4e187d3e6d5cb9d93df14c1db5fa7eaf846c6c520355b45719ec7e662141c0514d5159eaf07b99f151f3da SHA512 0aec6578cd53d6331e191bbb932f993531d493b0eb59102cbb68016ac650121ed4dac801ba090526ed58e70d3acbdab26b597fcb0e0f75601f68b26f54c321a5
+EBUILD rust-1.82.0-r102.ebuild 24192 BLAKE2B 4720b5bbd9d607cbcbcf6a6a13617b4edb631f2ec5cee689bf27af4f3fd6d0ed2d6633da34e19152c53e2cd8e87cc8c8974ed9946bbb516ee95a71fa349c009a SHA512 b3dde6d3c32482c6f877dfa852f79a9e79513657b6f34f4b728355fa5163f6d6c4fd60cf1e419bbecefdff14961c781b09a40f066934ecce121b541822ef45f7
+EBUILD rust-1.83.0-r2.ebuild 23425 BLAKE2B dec9ca6c10ebda088fb7dc6aed3e41e7124d7a02227ad28cb8ff3152396b19ae97f7a483be3a69ab90c54f7598ea52f0162a50420b570c0da13122f65e8c3394 SHA512 3ae087c440571e50dfc578e40cfe388b58a1c46ade6c0755ddae25c084259b76a46d624ee17d6a5a5823b7e419cec60d0b8f7035f07d272919560653d0f714b0
+EBUILD rust-1.84.0-r1.ebuild 22118 BLAKE2B fdac2b75f72994203c656ff75d59d93df2769eaf9de55b975f028367dc100e8f336801740ac31889ce0ca65234cf66b1c370eec033ff3e7de22733c786be5178 SHA512 5ac1e67176eb00e535ca94e8b9dc4e9424bdd5585fd80a8a057e5e097b36b2a65fdf63da259548b7a3d935496777fdb03a9d5837398e5bf4a7d768ef899d0cec
+EBUILD rust-1.84.1-r1.ebuild 22103 BLAKE2B e3d7e5b272dc16bd6e5c362d6e1abc84e12dc429fc708100725ae0312f091f01e2850a418bd08812694cffb89df43392e6ff71ba7d69155957a0a0b09e7faf4b SHA512 fcb82f2009c29baffbb3e86ea78d4d267538fe34d7f69c2a38bec4f03d401aca4e7adc199862bb8ea308802a16f474be3a3bce2bf7ad110642f3be773c6f1a73
 MISC metadata.xml 1841 BLAKE2B 48a8167ae44a7f4892b917895298627ac920af6c488180980e65bdeec53b650455fc6d7dddad0a7a8257d473080082377fb6b6df6a834b294b6e6485e6784a1e SHA512 1f5fd792b65ccac89a61233004980d9f7cbaecea5d05f35f9cc2dc9cab4e3ccfcd46828e88770a1b8ba5ca23064b6a75eea72a0b32bcce52bb399b85ac95f755
diff --git a/dev-lang/rust/rust-1.71.1-r101.ebuild b/dev-lang/rust/rust-1.71.1-r101.ebuild
index a454fcc7d08a..ae01f2f9a301 100644
--- a/dev-lang/rust/rust-1.71.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.71.1-r101.ebuild
@@ -38,7 +38,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai LoongArch Mips MSP43
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="${PV}"
@@ -49,6 +50,12 @@ LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
 	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ "${_xx}" == "${_x}" ]] ; then
+			ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+			break
+		fi
+	done
 done
 LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
 LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
diff --git a/dev-lang/rust/rust-1.74.1-r101.ebuild b/dev-lang/rust/rust-1.74.1-r101.ebuild
index cabb75e7e37c..68108ee8a593 100644
--- a/dev-lang/rust/rust-1.74.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.74.1-r101.ebuild
@@ -44,7 +44,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
@@ -55,6 +56,12 @@ LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
 	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ "${_xx}" == "${_x}" ]] ; then
+			ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+			break
+		fi
+	done
 done
 LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
 LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
diff --git a/dev-lang/rust/rust-1.75.0-r101.ebuild b/dev-lang/rust/rust-1.75.0-r101.ebuild
index 5bec96815fdf..582cd097c120 100644
--- a/dev-lang/rust/rust-1.75.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.75.0-r101.ebuild
@@ -39,7 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
@@ -50,6 +51,12 @@ LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
 	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ "${_xx}" == "${_x}" ]] ; then
+			ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+			break
+		fi
+	done
 done
 LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
 LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
diff --git a/dev-lang/rust/rust-1.76.0-r101.ebuild b/dev-lang/rust/rust-1.76.0-r101.ebuild
index f26d3673bb4f..8d72491db7fb 100644
--- a/dev-lang/rust/rust-1.76.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.76.0-r101.ebuild
@@ -39,7 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
@@ -50,6 +51,12 @@ LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
 	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ "${_xx}" == "${_x}" ]] ; then
+			ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+			break
+		fi
+	done
 done
 LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
 LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
diff --git a/dev-lang/rust/rust-1.77.1-r101.ebuild b/dev-lang/rust/rust-1.77.1-r101.ebuild
index a84253b3343f..8e71a450c7e6 100644
--- a/dev-lang/rust/rust-1.77.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.77.1-r101.ebuild
@@ -39,7 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
@@ -50,6 +51,12 @@ LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
 	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ "${_xx}" == "${_x}" ]] ; then
+			ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+			break
+		fi
+	done
 done
 LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
 LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
diff --git a/dev-lang/rust/rust-1.78.0-r101.ebuild b/dev-lang/rust/rust-1.78.0-r101.ebuild
index a2ab0b579d5f..7bcddb3c4dba 100644
--- a/dev-lang/rust/rust-1.78.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.78.0-r101.ebuild
@@ -39,7 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
@@ -50,6 +51,12 @@ LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
 	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ "${_xx}" == "${_x}" ]] ; then
+			ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+			break
+		fi
+	done
 done
 LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
 LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
diff --git a/dev-lang/rust/rust-1.79.0-r101.ebuild b/dev-lang/rust/rust-1.79.0-r101.ebuild
index a2ab0b579d5f..7bcddb3c4dba 100644
--- a/dev-lang/rust/rust-1.79.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.79.0-r101.ebuild
@@ -39,7 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
@@ -50,6 +51,12 @@ LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
 	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ "${_xx}" == "${_x}" ]] ; then
+			ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+			break
+		fi
+	done
 done
 LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
 LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
diff --git a/dev-lang/rust/rust-1.80.1-r101.ebuild b/dev-lang/rust/rust-1.80.1-r101.ebuild
index c569cb53351c..28e670946d40 100644
--- a/dev-lang/rust/rust-1.80.1-r101.ebuild
+++ b/dev-lang/rust/rust-1.80.1-r101.ebuild
@@ -39,7 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
@@ -50,6 +51,12 @@ LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
 	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ "${_xx}" == "${_x}" ]] ; then
+			ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+			break
+		fi
+	done
 done
 LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
 LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
diff --git a/dev-lang/rust/rust-1.81.0-r101.ebuild b/dev-lang/rust/rust-1.81.0-r101.ebuild
index 01d49bc018e9..7f53129202cc 100644
--- a/dev-lang/rust/rust-1.81.0-r101.ebuild
+++ b/dev-lang/rust/rust-1.81.0-r101.ebuild
@@ -40,7 +40,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
@@ -51,6 +52,12 @@ LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
 	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ "${_xx}" == "${_x}" ]] ; then
+			ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+			break
+		fi
+	done
 done
 LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
 LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
diff --git a/dev-lang/rust/rust-1.82.0-r102.ebuild b/dev-lang/rust/rust-1.82.0-r102.ebuild
index 4408b27683cb..bc55c3ded7c1 100644
--- a/dev-lang/rust/rust-1.82.0-r102.ebuild
+++ b/dev-lang/rust/rust-1.82.0-r102.ebuild
@@ -39,7 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
@@ -50,6 +51,12 @@ LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
 	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ "${_xx}" == "${_x}" ]] ; then
+			ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+			break
+		fi
+	done
 done
 LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
 LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
diff --git a/dev-lang/rust/rust-1.83.0-r2.ebuild b/dev-lang/rust/rust-1.83.0-r2.ebuild
index d98a717dc572..f92f170184fb 100644
--- a/dev-lang/rust/rust-1.83.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.83.0-r2.ebuild
@@ -39,7 +39,8 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai
 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
@@ -50,6 +51,12 @@ LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
 	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ "${_xx}" == "${_x}" ]] ; then
+			ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+			break
+		fi
+	done
 done
 LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
 LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
diff --git a/dev-lang/rust/rust-1.84.0-r1.ebuild b/dev-lang/rust/rust-1.84.0-r1.ebuild
index 10294bcfad06..1bac5bdc9e11 100644
--- a/dev-lang/rust/rust-1.84.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.84.0-r1.ebuild
@@ -40,7 +40,8 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
 # https://github.com/rust-lang/llvm-project/blob/rustc-1.84.0/llvm/CMakeLists.txt
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
@@ -51,6 +52,12 @@ LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
 	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ "${_xx}" == "${_x}" ]] ; then
+			ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+			break
+		fi
+	done
 done
 LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
 LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
diff --git a/dev-lang/rust/rust-1.84.1-r1.ebuild b/dev-lang/rust/rust-1.84.1-r1.ebuild
index 8ae682155bcc..94980bdb59c0 100644
--- a/dev-lang/rust/rust-1.84.1-r1.ebuild
+++ b/dev-lang/rust/rust-1.84.1-r1.ebuild
@@ -40,7 +40,8 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
 
 # https://github.com/rust-lang/llvm-project/blob/rustc-1.84.0/llvm/CMakeLists.txt
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="${PV}"
@@ -51,6 +52,12 @@ LLVM_DEPEND=()
 # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
 for _x in "${ALL_LLVM_TARGETS[@]}"; do
 	LLVM_DEPEND+=( "	${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+	for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do
+		if [[ "${_xx}" == "${_x}" ]] ; then
+			ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} )
+			break
+		fi
+	done
 done
 LLVM_DEPEND+=( "	wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" )
 LLVM_DEPEND+=( "	$(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" )
diff --git a/dev-lang/zig-bin/Manifest b/dev-lang/zig-bin/Manifest
index a0aef7d47929..d5ab1e2e9dde 100644
--- a/dev-lang/zig-bin/Manifest
+++ b/dev-lang/zig-bin/Manifest
@@ -21,6 +21,6 @@ DIST zig-linux-x86_64-0.10.1.tar.xz 44085596 BLAKE2B d689a469dbbe790593a561dd4df
 DIST zig-linux-x86_64-0.10.1.tar.xz.minisig 325 BLAKE2B 41cf60ae99405ed55449c35e76a3de761e5de75bf07d8500fe64bf2e45b0dc5f63a929ff6bf47233ea0472f167d9e2305d66c48fbe3da66b6f1223d83ed6fa2b SHA512 309fe97b56673e4f111e2408aa1162194d77cd6976cf7ae491d3a035ef0319b8b634c59977dbc18466182b37d4a12f294d8c258d2d793a3aa3eced448f06e30e
 DIST zig-linux-x86_64-0.13.0.tar.xz 47082308 BLAKE2B 587565eaac53f0137bdfb4c58e51ee290a9f582c103957bc1d6183e7f53f6ce459c204fd0197c0e36d3de08a48fc68412a7fc84cf9cd77c8be918a9390d492b9 SHA512 97ca9b91c6c025cc1746036239063df45bab6aafbe72a861acd266019a11d154b4710b310224c860c6515f09436ca0ff796546aa45cba5d1dc7b3b669dfcdf36
 DIST zig-linux-x86_64-0.13.0.tar.xz.minisig 325 BLAKE2B 9161b9b36c38c2b388a0850011bcc22119bb7b0333615914780fe63fb741298524be196db07277771b6f3f053079c7f95b5786dbb9059c4a627a9786752ebe4e SHA512 279cf9abb3b86893a3fd4ac124e954d8f01d6823831591cf2c869538bce4b2cbfcdb67279b9875bfe3a865841ca976b9fb7b4c4c63fe2b56937d3023664e81c6
-EBUILD zig-bin-0.10.1-r3.ebuild 3703 BLAKE2B 9adb8b312566ede767b4e9d40c8465c8a3c70df1429aff159267c648646825a19c9a0e1a77014aea83a9c6d73fd3277d5bf5b26a14ac774947a637ee8beefd33 SHA512 590ddc47d59c22abb5a0767c76c54206fa990526581b45ceee1c9f38225588e2bd2ca8e08ab9dd2e8663fbf3262dd42274b2730d8c7707d9c6034a6b40580e74
-EBUILD zig-bin-0.13.0.ebuild 3624 BLAKE2B 62a9a0412e27c729d89c4850b3290c05da923b9d4824321bfd9438bbad2db74595a1ff056bfcc5c13ceece52ec86a2680ad7319191058471422cc04376cdae25 SHA512 1bc35c6f11b3f5017b7f21adcfd282c1e6a1cfc06b8ea43fa14b3de638623aec9f9920e38ecfbbc9d6aca6cbd8812b8afd2ee755ca26d7a8509a550ddfaa236c
+EBUILD zig-bin-0.10.1-r3.ebuild 3617 BLAKE2B 7455f9663a7483ec599f7114d1e926976dc9352f80471645acfb7e5b9ffc5f6302182b6f1673ac248cfb1c5000975b7d58d1073a5db8f5700eb2cf74ffef2330 SHA512 a8fb1b55e10c71bbbee34b055ec848bce816bd6906e05a13a5640e595e86c1ec8e7f5a812a438034f0edf1b3482b31b5634037c773b3a5aa284f9e862c8cd92b
+EBUILD zig-bin-0.13.0.ebuild 3617 BLAKE2B e51435e87ef2a6ae643421a6cbe80189d825ca952748804d0c67a2a776929cb7066d03a2462af77a1f8c16966b7f7b9ce5ac04065009df6c5a4628717bf75b4f SHA512 14d22e674fdaf8a126ea31b961a51379900397f92111a3d125684cb8c257aa77cb101967e2f268e66fb1afa6479605bd3852adab1f1259732153cf494d753af5
 MISC metadata.xml 543 BLAKE2B 7c2e6b94030332dcb621c19d85f0cc390fa3df60f51d5cb15f6fb26c174a234eb7fd2b7284260a14bf8abd87f7c56bba846bc346ec425049dd2d63d04930e8f1 SHA512 c900ae0dac56d9aedab82606fafacbdd4da413eea960c2dcb92881dadfe47a177570378de5cc2902eb45a452421f9e4706fda2f236d825b8377ef2b234767c81
diff --git a/dev-lang/zig-bin/zig-bin-0.10.1-r3.ebuild b/dev-lang/zig-bin/zig-bin-0.10.1-r3.ebuild
index d3bcaa24399a..4e0d582f7f85 100644
--- a/dev-lang/zig-bin/zig-bin-0.10.1-r3.ebuild
+++ b/dev-lang/zig-bin/zig-bin-0.10.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -43,16 +43,15 @@ IUSE="doc"
 BDEPEND="verify-sig? ( sec-keys/minisig-keys-zig-software-foundation )"
 IDEPEND="app-eselect/eselect-zig"
 
-# Zig provides its standard library in source form "/opt/zig-bin-{PV}/lib/",
-# and all other Zig libraries are meant to be consumed in source form,
-# because they can use compile-time mechanics (and it is easier for distributions to patch them)
-# Here we use this feature for fixing programs that use standard library
-# Note: Zig build system is also part of standard library, so we can fix it too
+# Zig provides its standard library and some compiler code in source form "/opt/zig-bin-{PV}/lib/".
+# Here we use this feature to fix programs that use standard library.
+# Note: Zig build system is also part of standard library, so we can fix it too.
+# Don't remove this comment so that other contributors won't be misleaded by "-bin" suffix.
 PATCHES=(
 	"${FILESDIR}/zig-0.10.1-musl-1.2.4-lfs64.patch"
 )
 
-QA_PREBUILT="opt/${P}/zig"
+QA_PREBUILT="opt/zig-bin-${PV}/zig"
 
 src_unpack() {
 	verify-sig_src_unpack
@@ -68,20 +67,20 @@ src_install() {
 	rm -r ./doc/ || die
 
 	doins -r "${S}"
-	fperms 0755 "/opt/${P}/zig"
-	dosym -r "/opt/${P}/zig" "/usr/bin/zig-bin-${PV}"
+	fperms 0755 /opt/zig-bin-${PV}/zig
+	dosym -r /opt/zig-bin-${PV}/zig /usr/bin/zig-bin-${PV}
 }
 
 pkg_postinst() {
-	eselect zig update ifunset
+	eselect zig update ifunset || die
 
-	elog "0.10.1 release uses self-hosted compiler by default and fixes some bugs from 0.10.0"
-	elog "But your code still can be un-compilable since some features still not implemented or bugs not fixed"
-	elog "Upstream recommends:"
-	elog " * Using old compiler if experiencing such breakage (flag '-fstage1')"
-	elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)"
-	elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
-	elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
+	elog "0.10.1 release uses self-hosted compiler by default and fixes some bugs from 0.10.0."
+	elog "If you wanted to try async/await syntax (which is still absent in newer versions),"
+	elog "use '-fstage1' flag to enable old C++-based compiler, since only stage1 supports this syntax."
+	elog ""
+	elog "See also: https://ziglang.org/download/0.10.0/release-notes.html#Falling-short-of-stage1 ,"
+	elog "https://github.com/ziglang/zig/wiki/FAQ#what-is-the-status-of-async-in-zig"
+	elog "and https://github.com/ziglang/zig/issues/6025"
 }
 
 pkg_postrm() {
diff --git a/dev-lang/zig-bin/zig-bin-0.13.0.ebuild b/dev-lang/zig-bin/zig-bin-0.13.0.ebuild
index ba3a7c7bda35..3b8dd1ae891a 100644
--- a/dev-lang/zig-bin/zig-bin-0.13.0.ebuild
+++ b/dev-lang/zig-bin/zig-bin-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -85,5 +85,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	eselect zig update ifunset || die
+	eselect zig update ifunset
 }
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 258015816825..6b6388540826 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,10 +1,9 @@
 AUX zig-0.13.0-skip-test-stack_iterator.patch 1443 BLAKE2B 347a7a397c706105456ba83d9511633d3f1a75aa33a06dfccfde457c93af79149c4bb704e0e493a6b69a840784739c34b7a4f570608c368bb84673def0404857 SHA512 7b446efad0a95d3483a570552f3a1df2a535a757e16eb8484571ab1c9fd525b7b68b36ca84fb30bcce77709f9936e4c361ae04362456a60a9f59516824e3a254
-AUX zig-0.13.0-test-fmt-no-doc.patch 653 BLAKE2B 92f28d86fde0ce3315b8e7b50dcdf03c1ef8a95964701d3c3c05dc8c16b08f9e327d190e9f9631c2a3a287b8b2945025abbf1b5c75d3bdb3adf719d1a6513703 SHA512 310d356f07505fa44e8425ec32f823eab5e20f9a0144c2e2ecff38e19ac1814d4320430373d4f2fa5ed9cf57000a126089c185fd6336daed8cc7dc0cffc0c023
 AUX zig-0.13.0-test-std-kernel-version.patch 1304 BLAKE2B a266cc8d41df8eabc44cc381fe66e5b548d0e10eb0d0098350ddf596602204a77062b8e4632f58250a40781f7a1d5c7e9905c1387ecf7a0c505e330612944f38 SHA512 a62977e3ba675b60866d7cebdc5ff676825e77dac93029d32af403e567b5ae462d49355407f9dbd33843c8b8393d8f05a39de73a8818daf3424df083e0185da6
 DIST zig-0.13.0-llvm-18.1.8-r6-fix.patch 45968 BLAKE2B a07c47b22b079d324b200fe84af5c89ffe51a1c81f50ca894a80f9f9db51a9d4119ae51c2e4e84a9b4f0111b2b809978b88adca42480ee800693afbd78f47387 SHA512 148b3f4807763dfb6a4d4e201890fa8204deaf73e620a8b592dfa03b997bc16ed01ea26e4d85f242473e91ccc45b1a06af22f786851f8e26cec1ac821b14efdc
 DIST zig-0.13.0.tar.xz 17220728 BLAKE2B f4bbacc2012950c556bebc28fc322fc6424bf20fe118e8362373336b6460e514028978584087f6e7f25ed8b8e6991610edce625676a1dd80c1975c5f9ef48775 SHA512 6f5f31f4ba71a11d8b16c7a5a613e124095e503fa6b02d2b77e5b177674c739287e81d98d96dc261fed24bc836caf196f71c3fcc7a6518387df86ba9e03df4dd
 DIST zig-0.13.0.tar.xz.minisig 312 BLAKE2B 2d061257c9c75f9c36b01cfb08dcd2040538a125b9ea2cae8617ae5496e685b165933ce8981494419522b7e19b51fc69a651ecaa4a8930753acf2e4ae3d6e00f SHA512 21c6139c06cba6c5e23a3305fed0c0f1b9b32d9140bd686c26365ce0279d5f53cd081894eaba29f0c1ed51b2e831edf7bd4ae6a7eaee5018a252e312e9b65507
-EBUILD zig-0.13.0-r1.ebuild 6212 BLAKE2B dc9966d60858e0c8c9c4a062bc826b502ae56d9432cf447021759976dca3e03d1b8ed7632e210a3f21a5414041d1b490321db970dcffa9181857cc096080577b SHA512 53651f874ee9a26d1d4fd2c6ba5a3d722f1aa086c02d57fed7be6e8e56dcd5dd5746f35c7dfe116cfaf5a008e9033697c8e2fe808f6e4ffc9fb0da357d455b8c
-EBUILD zig-0.13.0-r2.ebuild 7263 BLAKE2B e62e6b54292e65fb008e7b005fd87ac1b7dc0caeca7a81c61f45bc3ee03dc18437caef7b320ee2ebf5daefe78799d7a6cde352fe61f4b3397eeee6aef6a9ec0c SHA512 4c535c7407af0bf2f907949e7ae139c06bc864e321829af59a213cc372796f843ebee2b6e449c2eed0b565e3b801521bfc1071487a73d07e5372c4344c16b476
-EBUILD zig-9999.ebuild 6977 BLAKE2B b4c58c01278d130eb0d7bff7bd91c576dda5de97f426ceb55139b0e298836f915f9cb53a39fee3d01de57e2b310d3e2f32d4a16fcf44f22b75a89efdf057f10a SHA512 d998a5b2bee29dd1bf4328858187bd65ac494df53d1e612b61bdaac54c1eba25270a6458c4978e96253ddaa9b23567530b6cec09779f27f56193139f7d51a0e0
-MISC metadata.xml 633 BLAKE2B 46cca8909b0b7d65213dee9c7aa7a2c4b5b529734e3bde4f65320074bc38d68420dfaa28041873c7c2c0f1127aca327e32c103c06ab1b5d5ee0e485cb33bb133 SHA512 1d030ca79a3d49b6f573e7995e6f6ef50a6e33ea7e2755a678625645d5b0587f7877a357ea71905034b7029c8c6315b89ebdb5313102b6638b16c467e2ba1864
+EBUILD zig-0.13.0-r2.ebuild 8233 BLAKE2B cc6ad37897182d87fba862d7ba79207c115817e0f160d32a522ebb6e77af6ecc56dc875a9a332680fdae247fb1a25e99d6aa6933deb34fcca34cd139c427930d SHA512 b22575882bfcf3e39d30cc9e032383ae3f731f769d9493b84735a1b30e3f9a799c139b1272e68835f32d506cbadd50fe15af0528a50e023df396ded001d55fc4
+EBUILD zig-0.13.0-r3.ebuild 11183 BLAKE2B cb17900a2e3d898f768e461c1989e41bf15b8fc9968b2ae48ac8dc8230522ec47bc4a4e1caf9998caead9c5369ba6732982fd2b21c3a49b52a7f31cb4e284b98 SHA512 e47bffbe18e9e6aac725abbbc014a08ef1ad1c91ec68c17a1a656ae4215898c8dc3439fac0d30a920fb1aaf2d042ce453397c23fad4420aae32810aa69ec4db7
+EBUILD zig-9999.ebuild 10890 BLAKE2B 1ecd6a200784792b8f48b5987160cdb41d40e2ac560233d22a325c58762bea69d00b45d41c861f71053f050f5a70203157451951333700f7e12c3126c2a45534 SHA512 1d249d1fe18bf38776abe4f8cc10e9212173e49d1f1d75989875bac13195aa74506f45548ec61f164c3e9f5689df8c0645b9980d81b61af87c44d8c8ac05d81f
+MISC metadata.xml 698 BLAKE2B a87c750ce5bf5b4070d9bb175aa7241da124b6362db4fff9cc51f5508d15f16595f79d5018025ae837f48aa2168102dd923798c291ddb455ac7686deb2b74d03 SHA512 9e0109a58cfb1a14e9815951ef7b55d01ffd08ae3936d759bdbaf4ba0180f7720f489e57b3e1773285331da38cd1103176372262372ab6c6924b65daf5f4c1ec
diff --git a/dev-lang/zig/files/zig-0.13.0-test-fmt-no-doc.patch b/dev-lang/zig/files/zig-0.13.0-test-fmt-no-doc.patch
deleted file mode 100644
index 7bbda741dc6f..000000000000
--- a/dev-lang/zig/files/zig-0.13.0-test-fmt-no-doc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# Docs contain examples of badly formatted code,
-# so they should be excluded for test-fmt to pass.
-# In the upstream, the "doc" directory
-# was removed from fmt_include_paths in
-# https://github.com/ziglang/zig/commit/cb1d1bdf
-
---- a/build.zig
-+++ b/build.zig
-@@ -428,7 +428,7 @@
-     }
-     const optimization_modes = chosen_opt_modes_buf[0..chosen_mode_index];
- 
--    const fmt_include_paths = &.{ "doc", "lib", "src", "test", "tools", "build.zig" };
-+    const fmt_include_paths = &.{ "lib", "src", "test", "tools", "build.zig" };
-     const fmt_exclude_paths = &.{"test/cases"};
-     const do_fmt = b.addFmt(.{
-         .paths = fmt_include_paths,
diff --git a/dev-lang/zig/metadata.xml b/dev-lang/zig/metadata.xml
index 2364982009cc..34e44a88bfa3 100644
--- a/dev-lang/zig/metadata.xml
+++ b/dev-lang/zig/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="debug">Build with debug extensions enabled.</flag>
 		<flag name="llvm">Build with LLVM backend and extensions enabled.</flag>
 	</use>
 	<upstream>
diff --git a/dev-lang/zig/zig-0.13.0-r1.ebuild b/dev-lang/zig/zig-0.13.0-r1.ebuild
deleted file mode 100644
index 867fa84f3b19..000000000000
--- a/dev-lang/zig/zig-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=18
-inherit edo check-reqs cmake llvm multiprocessing toolchain-funcs
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org https://github.com/ziglang/zig"
-
-BDEPEND="test? ( !!<sys-apps/sandbox-2.39 )"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
-	inherit git-r3
-else
-	VERIFY_SIG_METHOD=minisig
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/minisig-keys/zig-software-foundation.pub
-	inherit verify-sig
-
-	SRC_URI="
-		https://ziglang.org/download/${PV}/${P}.tar.xz
-		verify-sig? ( https://ziglang.org/download/${PV}/${P}.tar.xz.minisig )
-		https://codeberg.org/BratishkaErik/distfiles/releases/download/dev-lang%2Fzig-${PV}/${P}-llvm-18.1.8-r6-fix.patch
-	"
-	KEYWORDS="~amd64 ~arm ~arm64"
-
-	BDEPEND+=" verify-sig? ( sec-keys/minisig-keys-zig-software-foundation )"
-fi
-
-# project itself: MIT
-# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
-# Files that are unnecessary for cross-compilation are removed by upstream
-# and therefore their licenses (if any special) are not included.
-# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
-# lib/libc/musl: MIT BSD-2
-# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
-# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
-LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
-SLOT="$(ver_cut 1-2)"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BUILD_DIR="${S}/build"
-
-# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
-# (non-LLVM backends don't require these)
-# They are not required "on their own", so please don't add them here.
-# You can check https://github.com/ziglang/zig-bootstrap in future, to see
-# options that are passed to LLVM CMake building (excluding "static" ofc).
-DEPEND="
-	llvm-core/clang:${LLVM_MAX_SLOT}=
-	llvm-core/lld:${LLVM_MAX_SLOT}=
-	llvm-core/llvm:${LLVM_MAX_SLOT}=[zstd]
-"
-
-RDEPEND="
-	${DEPEND}
-"
-
-IDEPEND="app-eselect/eselect-zig"
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
-
-# Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
-# Zig uses self-hosted compiler only
-CHECKREQS_MEMORY="4G"
-
-PATCHES=(
-	"${FILESDIR}/${P}-test-fmt-no-doc.patch"
-	"${FILESDIR}/${P}-test-std-kernel-version.patch"
-	"${DISTDIR}/${P}-llvm-18.1.8-r6-fix.patch"
-)
-
-llvm_check_deps() {
-	has_version "llvm-core/clang:${LLVM_SLOT}"
-}
-
-ctarget_to_zigtarget() {
-	# Zig's Target Format: arch-os-abi
-	local CTARGET="${CTARGET:-${CHOST}}"
-
-	local ZIG_ARCH
-	case "${CTARGET%%-*}" in
-		i?86)		ZIG_ARCH=x86;;
-		sparcv9)	ZIG_ARCH=sparc64;;
-		*)		ZIG_ARCH="${CTARGET%%-*}";; # Same as in CHOST
-	esac
-
-	local ZIG_OS
-	case "${CTARGET}" in
-		*linux*)	ZIG_OS=linux;;
-		*apple*)	ZIG_OS=macos;;
-	esac
-
-	local ZIG_ABI
-	case "${CTARGET##*-}" in
-		gnu)		ZIG_ABI=gnu;;
-		solaris*)	ZIG_OS=solaris ZIG_ABI=none;;
-		darwin*)	ZIG_ABI=none;;
-		*)		ZIG_ABI="${CTARGET##*-}";; # Same as in CHOST
-	esac
-
-	echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}"
-}
-
-get_zig_mcpu() {
-	local ZIG_DEFAULT_MCPU=native
-	tc-is-cross-compiler && ZIG_DEFAULT_MCPU=baseline
-	echo "${ZIG_MCPU:-${ZIG_DEFAULT_MCPU}}"
-}
-
-get_zig_target() {
-	local ZIG_DEFAULT_TARGET=native
-	tc-is-cross-compiler && ZIG_DEFAULT_TARGET="$(ctarget_to_zigtarget)"
-	echo "${ZIG_TARGET:-${ZIG_DEFAULT_TARGET}}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.minisig}
-	fi
-	default
-}
-
-src_configure() {
-	# Useful for debugging and a little bit more deterministic.
-	export ZIG_LOCAL_CACHE_DIR="${T}/zig-local-cache"
-	export ZIG_GLOBAL_CACHE_DIR="${T}/zig-global-cache"
-
-	local mycmakeargs=(
-		-DZIG_SHARED_LLVM=ON
-		-DZIG_TARGET_TRIPLE="$(get_zig_target)"
-		-DZIG_TARGET_MCPU="$(get_zig_mcpu)"
-		-DZIG_USE_LLVM_CONFIG=ON
-		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	# Remove "limit memory usage" flags, it's already verified by
-	# CHECKREQS_MEMORY and causes unneccessary errors. Upstream set them
-	# according to CI OOM failures, which are higher than during Gentoo build.
-	sed -i -e '/\.max_rss = .*,/d' build.zig || die
-
-	cmake_src_compile
-
-	"${BUILD_DIR}/stage3/bin/zig" env || die "Zig compilation failed"
-
-	if use doc; then
-		cd "${BUILD_DIR}" || die
-		edo ./stage3/bin/zig build std-docs --prefix "${S}/docgen/"
-		edo ./stage3/bin/zig build langref --prefix "${S}/docgen/"
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	local ZIG_TEST_ARGS=(
-		-j$(makeopts_jobs)
-		--color on
-		--summary all
-		--verbose
-		-Dstatic-llvm=false
-		-Denable-llvm
-		-Dskip-non-native
-		-Doptimize=Debug
-		-Dtarget="$(get_zig_target)"
-		-Dcpu="$(get_zig_mcpu)"
-	)
-	local ZIG_TEST_STEPS=(
-		test-asm-link
-		test-behavior
-		test-c-abi
-		test-c-import
-		test-cases
-		test-cli
-		test-compare-output
-		test-compiler-rt
-		test-fmt
-		test-link
-		test-run-translated-c
-		test-stack-traces
-		test-standalone
-		test-std
-		test-translate-c
-		test-universal-libc
-	)
-
-	local step
-	for step in "${ZIG_TEST_STEPS[@]}" ; do
-		# to keep the verbosity, don't use edob here
-		./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS[@]} || die
-	done
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "docgen/doc/langref.html" "docgen/doc/std" )
-	cmake_src_install
-
-	cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die
-	mv lib/zig/ lib2/ || die
-	rm -rf lib/ || die
-	mv lib2/ lib/ || die
-	dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}"
-}
-
-pkg_postinst() {
-	eselect zig update ifunset || die
-}
-
-pkg_postrm() {
-	eselect zig update ifunset || die
-}
diff --git a/dev-lang/zig/zig-0.13.0-r2.ebuild b/dev-lang/zig/zig-0.13.0-r2.ebuild
index b970092ce4e4..a17a501b392e 100644
--- a/dev-lang/zig/zig-0.13.0-r2.ebuild
+++ b/dev-lang/zig/zig-0.13.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -209,8 +209,35 @@ src_compile() {
 }
 
 src_test() {
+	if has_version -b app-emulation/qemu; then
+		ewarn "QEMU executable was found on your building system."
+		ewarn "If you have qemu-binfmt (binfmt_misc) hooks enabled for"
+		ewarn "foreign architectures, Zig tests might fail."
+		ewarn "In this case, please disable qemu-binfmt and try again."
+	fi
+
 	cd "${BUILD_DIR}" || die
+
+	# XXX: When we pass a libc installation to Zig, it will fail to find
+	#      the bundled libraries for targets like aarch64-macos and
+	#      *-linux-musl. Zig doesn't run binaries for these targets when
+	#      -Dskip-non-native is passed, but they are still compiled, so
+	#      the test will fail. There's no way to disable --libc once passed,
+	#      so we need to strip it from ZBS_ARGS.
+	#      See: https://github.com/ziglang/zig/issues/22383
+	local args_backup=("${ZBS_ARGS[@]}")
+
+	for ((i = 0; i < ${#ZBS_ARGS[@]}; i++)); do
+		if [[ "${ZBS_ARGS[i]}" == "--libc" ]]; then
+			unset ZBS_ARGS[i]
+			unset ZBS_ARGS[i+1]
+			break
+		fi
+	done
+
 	ZIG_EXE="./stage3/bin/zig" zig_src_test -Dskip-non-native
+
+	ZBS_ARGS=("${args_backup[@]}")
 }
 
 src_install() {
@@ -244,5 +271,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	eselect zig update ifunset || die
+	eselect zig update ifunset
 }
diff --git a/dev-lang/zig/zig-0.13.0-r3.ebuild b/dev-lang/zig/zig-0.13.0-r3.ebuild
new file mode 100644
index 000000000000..15de59370bbb
--- /dev/null
+++ b/dev-lang/zig/zig-0.13.0-r3.ebuild
@@ -0,0 +1,355 @@
+# Copyright 2019-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+LLVM_OPTIONAL=1
+
+ZIG_SLOT="$(ver_cut 1-2)"
+ZIG_OPTIONAL=1
+
+inherit check-reqs cmake flag-o-matic edo llvm-r2 toolchain-funcs zig
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/ https://github.com/ziglang/zig/"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+	inherit git-r3
+else
+	VERIFY_SIG_METHOD=minisig
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/minisig-keys/zig-software-foundation.pub
+	inherit verify-sig
+
+	SRC_URI="
+		https://ziglang.org/download/${PV}/${P}.tar.xz
+		verify-sig? ( https://ziglang.org/download/${PV}/${P}.tar.xz.minisig )
+		https://codeberg.org/BratishkaErik/distfiles/releases/download/dev-lang%2Fzig-${PV}/${P}-llvm-18.1.8-r6-fix.patch
+	"
+	KEYWORDS="~amd64 ~arm ~arm64"
+
+	BDEPEND="verify-sig? ( sec-keys/minisig-keys-zig-software-foundation )"
+fi
+
+# project itself: MIT
+# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
+# Files that are unnecessary for cross-compilation are removed by upstream
+# and therefore their licenses (if any special) are not included.
+# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
+# lib/libc/musl: MIT BSD-2
+# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
+# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
+LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
+SLOT="${ZIG_SLOT}"
+IUSE="debug doc +llvm"
+REQUIRED_USE="
+	!llvm? ( !doc )
+	llvm? ( ${LLVM_REQUIRED_USE} )
+"
+
+# Used by both "cmake" and "zig" eclasses.
+BUILD_DIR="${WORKDIR}/${P}_build"
+
+# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
+# (non-LLVM backends don't require these)
+# They are not required "on their own", so please don't add them here.
+# You can check https://github.com/ziglang/zig-bootstrap in future, to see
+# options that are passed to LLVM CMake building (excluding "static" ofc).
+LLVM_DEPEND="$(llvm_gen_dep '
+	llvm-core/clang:${LLVM_SLOT}
+	llvm-core/lld:${LLVM_SLOT}[zstd]
+	llvm-core/llvm:${LLVM_SLOT}[zstd]
+')"
+
+BDEPEND+=" llvm? ( ${LLVM_DEPEND} )"
+DEPEND="llvm? ( ${LLVM_DEPEND} )"
+RDEPEND="${DEPEND}"
+IDEPEND="app-eselect/eselect-zig"
+
+DOCS=( "README.md" "doc/build.zig.zon.md" )
+
+PATCHES=(
+	"${FILESDIR}/zig-0.13.0-test-std-kernel-version.patch"
+	"${FILESDIR}/zig-0.13.0-skip-test-stack_iterator.patch"
+	"${DISTDIR}/${P}-llvm-18.1.8-r6-fix.patch"
+)
+
+# zig.eclass does not set this for us since we use ZIG_OPTIONAL=1
+QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
+
+# Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
+# Zig uses self-hosted compiler only
+CHECKREQS_MEMORY="4G"
+
+pkg_setup() {
+	# Skip detecting zig executable.
+	declare -r -g ZIG_VER="${PV}"
+	ZIG_EXE="not-applicable" zig_pkg_setup
+
+	declare -r -g ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+
+	if use llvm; then
+		[[ ${MERGE_TYPE} != binary ]] && llvm_cbuild_setup
+	fi
+
+	# Requires running stage3 which is built for cross-target.
+	if use doc && tc-is-cross-compiler; then
+		die "USE=doc is not yet supported when cross-compiling"
+	fi
+
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.minisig}
+		fi
+	fi
+	zig_src_unpack
+}
+
+src_prepare() {
+	if use llvm; then
+		cmake_src_prepare
+	else
+		# Sync with zig_src_prepare
+		default_src_prepare
+		mkdir -p "${BUILD_DIR}" || die
+		einfo "BUILD_DIR: \"${BUILD_DIR}\""
+		# "--system" mode is not used during bootstrap.
+	fi
+
+	# Remove "limit memory usage" flags, it's already verified by
+	# CHECKREQS_MEMORY and causes unneccessary errors. Upstream set them
+	# according to CI OOM failures, which are not applicable to normal Gentoo build.
+	sed -i -e '/\.max_rss = .*,/d' build.zig || die
+}
+
+src_configure() {
+	# Has no effect on final binary and only causes failures during bootstrapping.
+	filter-lto
+
+	# Used during bootstrapping. stage1/stage2 have limited functionality
+	# and can't resolve native target, so we pass target in exact form.
+	declare -r -g ZIG_HOST_AS_TARGET="$(zig-utils_c_env_to_zig_target "${CBUILD:-${CHOST}}" "${CFLAGS}"})"
+
+	# Note that if we are building with CMake, "my_zbs_args"
+	# are used only after compiling zig2.
+	local my_zbs_args=(
+		--zig-lib-dir "${S}/lib/"
+		# Will be a subdir under ZIG_SYS_INSTALL_DEST.
+		--prefix-lib-dir lib/
+
+		# These are built separately
+		-Dno-langref=true
+		-Dstd-docs=false
+
+		# More commands and options if "debug" is enabled.
+		-Ddebug-extensions=$(usex debug true false)
+		# More asserts and so on by default if "debug" is enabled.
+		--release=$(usex debug safe fast)
+	)
+
+	# Scenarios of compilation:
+
+	# With LLVM, native:
+	# CMake:
+	#   * generate "config.h" for LLVM libraries and build "zigcpp"
+	#   * build "zig2" using common "config.h" and "zigcpp"
+	# build.zig:
+	#   * build "stage3" using common "config.h" and "zigcpp"
+
+	# With LLVM, cross-compiled:
+	# CMake:
+	#   * generate cross-target "config.h" for LLVM libraries from ESYSROOT
+	#     and build cross-target "zigcpp", and stash them away
+	#   * generate native "config.h" for LLVM libraries from BROOT and
+	#     build native "zigcpp"
+	#   * build native "zig2" using native "config.h" and "zigcpp"
+	# build.zig:
+	#   * build cross-target "stage3" using stashed "config.h" and "zigcpp"
+
+	# Without LLVM:
+	# bootstrap.c:
+	#   * build native "zig2"
+	# build.zig:
+	#   * build (cross-)target "stage3"
+
+	if use llvm; then
+		my_zbs_args+=(
+			-Denable-llvm=true
+			-Dstatic-llvm=false
+			-Dconfig_h="${BUILD_DIR}/config.h"
+		)
+	else
+		my_zbs_args+=(
+			-Denable-llvm=false
+		)
+	fi
+	zig_src_configure
+
+	if use llvm; then
+		local mycmakeargs=(
+			-DZIG_SHARED_LLVM=ON
+			-DZIG_USE_LLVM_CONFIG=ON
+			-DZIG_HOST_TARGET_TRIPLE="${ZIG_HOST_AS_TARGET}"
+			# Don't set ZIG_TARGET_TRIPLE, ZIG_TARGET_MCPU and
+			# CMAKE_INSTALL_PREFIX because we build up to zig2 max,
+			# after that "zig build" is used to compile stage3.
+
+			# Don't set CMAKE_PREFIX_PATH because "llvm_chost_setup"
+			# and "llvm_cbuild_setup" already set PATH in such way
+			# that suitable llvm-config is found and used in
+			# "cmake/Findllvm.cmake", and "cmake.eclass" help with
+			# cross-compilation pathes for "Findclang" and "Findlld".
+
+			# CMP0144, Zig has own packages with these names, so ignore
+			# LLVM_ROOT, Clang_ROOT, LLD_ROOT from "llvm_chost_setup".
+			-DCMAKE_FIND_USE_PACKAGE_ROOT_PATH=OFF
+		)
+		if tc-is-cross-compiler; then
+			# Enable cross-compilation for CMake when filling "config.h"
+			# and building "zigcpp". They would be used for stage3 build.
+			# Here we are using LLVM from ESYSROOT/DEPEND.
+			# Uses script llvm-config.
+
+			# Isolate PATH changes in subshell so that it would not
+			# affect next `cmake_src_configure` with BROOT/BDEPEND.
+			(
+				llvm_chost_setup
+				cmake_src_configure
+				cmake_build zigcpp
+			)
+
+			mv "${BUILD_DIR}/config.h" "${T}/target_config.h" || die
+			mv "${BUILD_DIR}/zigcpp/" "${T}/target_zigcpp/" || die
+			rm -rf "${BUILD_DIR}" || die
+		fi
+
+		# Force disable cross-compilation for CMake when building "zig2".
+		# Here we are using LLVM from BROOT/BDEPEND.
+		# Uses native llvm-config.
+
+		# Isolate environment changes in subshell so that it would not
+		# affect next phases.
+		(
+			export BUILD_CFLAGS="${CFLAGS}"
+			export BUILD_CXXFLAGS="${CXXFLAGS}"
+			export BUILD_CPPFLAGS="${CPPFLAGS}"
+			export BUILD_LDFLAGS="${LDFLAGS}"
+			tc-env_build
+
+			unset SYSROOT
+			export CHOST="${CBUILD:-${CHOST}}"
+			strip-unsupported-flags
+			cmake_src_configure
+		)
+	fi
+}
+
+src_compile() {
+	if use llvm; then
+		cmake_build zig2
+
+		if tc-is-cross-compiler; then
+			rm -rf "${BUILD_DIR}/zigcpp/" || die
+			rm -f "${BUILD_DIR}/config.h" || die
+
+			mv "${T}/target_zigcpp/" "${BUILD_DIR}/zigcpp/" || die
+			mv "${T}/target_config.h" "${BUILD_DIR}/config.h" || die
+		fi
+	else
+		cd "${BUILD_DIR}" || die
+		ln -s "${S}/stage1/" . || die
+		ln -s "${S}/src/" . || die
+		ln -s "${S}/lib/" . || die
+
+		local native_cc="$(tc-getBUILD_CC)"
+		"${native_cc}" -o bootstrap "${S}/bootstrap.c" || die "Zig's bootstrap.c compilation failed"
+		ZIG_HOST_TARGET_TRIPLE="${ZIG_HOST_AS_TARGET}" CC="${native_cc}" edo ./bootstrap
+	fi
+
+	cd "${BUILD_DIR}" || die
+	ZIG_EXE="./zig2" zig_src_compile --prefix stage3/
+
+	# Requires running stage3 which is built for cross-target.
+	if ! tc-is-cross-compiler; then
+		./stage3/bin/zig env || die "Zig compilation failed"
+
+		if use doc; then
+			ZIG_EXE="./stage3/bin/zig" zig_src_compile langref --prefix "${S}/docgen/"
+		fi
+	fi
+}
+
+src_test() {
+	if has_version -b app-emulation/qemu; then
+		ewarn "QEMU executable was found on your building system."
+		ewarn "If you have qemu-binfmt (binfmt_misc) hooks enabled for"
+		ewarn "foreign architectures, Zig tests might fail."
+		ewarn "In this case, please disable qemu-binfmt and try again."
+	fi
+
+	cd "${BUILD_DIR}" || die
+
+	# XXX: When we pass a libc installation to Zig, it will fail to find
+	#      the bundled libraries for targets like aarch64-macos and
+	#      *-linux-musl. Zig doesn't run binaries for these targets when
+	#      -Dskip-non-native is passed, but they are still compiled, so
+	#      the test will fail. There's no way to disable --libc once passed,
+	#      so we need to strip it from ZBS_ARGS.
+	#      See: https://github.com/ziglang/zig/issues/22383
+	local args_backup=("${ZBS_ARGS[@]}")
+
+	for ((i = 0; i < ${#ZBS_ARGS[@]}; i++)); do
+		if [[ "${ZBS_ARGS[i]}" == "--libc" ]]; then
+			unset ZBS_ARGS[i]
+			unset ZBS_ARGS[i+1]
+			break
+		fi
+	done
+
+	ZIG_EXE="./stage3/bin/zig" zig_src_test -Dskip-non-native
+
+	ZBS_ARGS=("${args_backup[@]}")
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "docgen/doc/langref.html" )
+
+	ZIG_EXE="./zig2" zig_src_install --prefix "${ZIG_SYS_INSTALL_DEST}"
+
+	cd "${D}/${ZIG_SYS_INSTALL_DEST}" || die
+	mv lib/zig/ lib2/ || die
+	rm -rf lib/ || die
+	mv lib2/ lib/ || die
+	dosym -r "${ZIG_SYS_INSTALL_DEST}/bin/zig" /usr/bin/zig-${PV}
+}
+
+pkg_postinst() {
+	eselect zig update ifunset || die
+
+	elog "Starting from 0.12.0, Zig no longer installs"
+	elog "precompiled standard library documentation."
+	elog "Instead, you can call \`zig std\` to compile it on-the-fly."
+	elog "It reflects all edits in standard library automatically."
+	elog "See \`zig std --help\` for more information."
+	elog "More details here: https://ziglang.org/download/0.12.0/release-notes.html#Redesign-How-Autodoc-Works"
+
+	if ! use llvm; then
+		elog "Currently, Zig built without LLVM support lacks some"
+		elog "important features such as most optimizations, @cImport, etc."
+		elog "They are listed under \"Building from Source without LLVM\""
+		elog "section of the README file from \"/usr/share/doc/${PF}\" ."
+	fi
+}
+
+pkg_postrm() {
+	eselect zig update ifunset || die
+}
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index 4f0358a96629..8fb29ab10b9e 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ LLVM_OPTIONAL=1
 ZIG_SLOT="$(ver_cut 1-2)"
 ZIG_OPTIONAL=1
 
-inherit check-reqs cmake flag-o-matic edo llvm-r1 toolchain-funcs zig
+inherit check-reqs cmake flag-o-matic edo llvm-r2 toolchain-funcs zig
 
 DESCRIPTION="A robust, optimal, and maintainable programming language"
 HOMEPAGE="https://ziglang.org/ https://github.com/ziglang/zig/"
@@ -43,7 +43,7 @@ fi
 # lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
 LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
 SLOT="${ZIG_SLOT}"
-IUSE="doc +llvm"
+IUSE="debug doc +llvm"
 REQUIRED_USE="
 	!llvm? ( !doc )
 	llvm? ( ${LLVM_REQUIRED_USE} )
@@ -57,18 +57,14 @@ BUILD_DIR="${WORKDIR}/${P}_build"
 # They are not required "on their own", so please don't add them here.
 # You can check https://github.com/ziglang/zig-bootstrap in future, to see
 # options that are passed to LLVM CMake building (excluding "static" ofc).
-DEPEND="
-	llvm? (
-		$(llvm_gen_dep '
-			llvm-core/clang:${LLVM_SLOT}
-			llvm-core/lld:${LLVM_SLOT}
-			llvm-core/llvm:${LLVM_SLOT}[zstd]
-		')
-	)
-"
-BDEPEND+="
-	${DEPEND}
-"
+LLVM_DEPEND="$(llvm_gen_dep '
+	llvm-core/clang:${LLVM_SLOT}
+	llvm-core/lld:${LLVM_SLOT}[zstd]
+	llvm-core/llvm:${LLVM_SLOT}[zstd]
+')"
+
+BDEPEND+=" llvm? ( ${LLVM_DEPEND} )"
+DEPEND="llvm? ( ${LLVM_DEPEND} )"
 RDEPEND="${DEPEND}"
 IDEPEND="app-eselect/eselect-zig"
 
@@ -83,13 +79,18 @@ CHECKREQS_MEMORY="4G"
 
 pkg_setup() {
 	# Skip detecting zig executable.
-	ZIG_EXE="not-applicable" ZIG_VER="${PV}" zig_pkg_setup
+	declare -r -g ZIG_VER="${PV}"
+	ZIG_EXE="not-applicable" zig_pkg_setup
 
-	export ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
+	declare -r -g ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
 
 	if use llvm; then
-		tc-is-cross-compiler && die "USE=llvm is not yet supported when cross-compiling"
-		llvm-r1_pkg_setup
+		[[ ${MERGE_TYPE} != binary ]] && llvm_cbuild_setup
+	fi
+
+	# Requires running stage3 which is built for cross-target.
+	if use doc && tc-is-cross-compiler; then
+		die "USE=doc is not yet supported when cross-compiling"
 	fi
 
 	check-reqs_pkg_setup
@@ -139,11 +140,40 @@ src_configure() {
 		--prefix-lib-dir lib/
 
 		# These are built separately
-		-Dno-langref
+		-Dno-langref=true
 		-Dstd-docs=false
 
-		--release=fast
+		# More commands and options if "debug" is enabled.
+		-Ddebug-extensions=$(usex debug true false)
+		# More asserts and so on by default if "debug" is enabled.
+		--release=$(usex debug safe fast)
 	)
+
+	# Scenarios of compilation:
+
+	# With LLVM, native:
+	# CMake:
+	#   * generate "config.h" for LLVM libraries and build "zigcpp"
+	#   * build "zig2" using common "config.h" and "zigcpp"
+	# build.zig:
+	#   * build "stage3" using common "config.h" and "zigcpp"
+
+	# With LLVM, cross-compiled:
+	# CMake:
+	#   * generate cross-target "config.h" for LLVM libraries from ESYSROOT
+	#     and build cross-target "zigcpp", and stash them away
+	#   * generate native "config.h" for LLVM libraries from BROOT and
+	#     build native "zigcpp"
+	#   * build native "zig2" using native "config.h" and "zigcpp"
+	# build.zig:
+	#   * build cross-target "stage3" using stashed "config.h" and "zigcpp"
+
+	# Without LLVM:
+	# bootstrap.c:
+	#   * build native "zig2"
+	# build.zig:
+	#   * build (cross-)target "stage3"
+
 	if use llvm; then
 		my_zbs_args+=(
 			-Denable-llvm=true
@@ -155,31 +185,78 @@ src_configure() {
 			-Denable-llvm=false
 		)
 	fi
-
 	zig_src_configure
 
 	if use llvm; then
-		# Build for native only, it's for zig2 (build-time executable)
-		# LLVM from BDEPEND
 		local mycmakeargs=(
 			-DZIG_SHARED_LLVM=ON
 			-DZIG_USE_LLVM_CONFIG=ON
-
-			-DZIG_TARGET_TRIPLE=native
-			-DZIG_TARGET_MCPU=native
 			-DZIG_HOST_TARGET_TRIPLE="${ZIG_HOST_AS_TARGET}"
-
-			-DCMAKE_PREFIX_PATH="$(get_llvm_prefix -b)"
-			-DCMAKE_INSTALL_PREFIX="${ZIG_SYS_INSTALL_DEST}"
+			# Don't set ZIG_TARGET_TRIPLE, ZIG_TARGET_MCPU and
+			# CMAKE_INSTALL_PREFIX because we build up to zig2 max,
+			# after that "zig build" is used to compile stage3.
+
+			# Don't set CMAKE_PREFIX_PATH because "llvm_chost_setup"
+			# and "llvm_cbuild_setup" already set PATH in such way
+			# that suitable llvm-config is found and used in
+			# "cmake/Findllvm.cmake", and "cmake.eclass" help with
+			# cross-compilation pathes for "Findclang" and "Findlld".
+
+			# CMP0144, Zig has own packages with these names, so ignore
+			# LLVM_ROOT, Clang_ROOT, LLD_ROOT from "llvm_chost_setup".
+			-DCMAKE_FIND_USE_PACKAGE_ROOT_PATH=OFF
 		)
+		if tc-is-cross-compiler; then
+			# Enable cross-compilation for CMake when filling "config.h"
+			# and building "zigcpp". They would be used for stage3 build.
+			# Here we are using LLVM from ESYSROOT/DEPEND.
+			# Uses script llvm-config.
+
+			# Isolate PATH changes in subshell so that it would not
+			# affect next `cmake_src_configure` with BROOT/BDEPEND.
+			(
+				llvm_chost_setup
+				cmake_src_configure
+				cmake_build zigcpp
+			)
+
+			mv "${BUILD_DIR}/config.h" "${T}/target_config.h" || die
+			mv "${BUILD_DIR}/zigcpp/" "${T}/target_zigcpp/" || die
+			rm -rf "${BUILD_DIR}" || die
+		fi
 
-		cmake_src_configure
+		# Force disable cross-compilation for CMake when building "zig2".
+		# Here we are using LLVM from BROOT/BDEPEND.
+		# Uses native llvm-config.
+
+		# Isolate environment changes in subshell so that it would not
+		# affect next phases.
+		(
+			export BUILD_CFLAGS="${CFLAGS}"
+			export BUILD_CXXFLAGS="${CXXFLAGS}"
+			export BUILD_CPPFLAGS="${CPPFLAGS}"
+			export BUILD_LDFLAGS="${LDFLAGS}"
+			tc-env_build
+
+			unset SYSROOT
+			export CHOST="${CBUILD:-${CHOST}}"
+			strip-unsupported-flags
+			cmake_src_configure
+		)
 	fi
 }
 
 src_compile() {
 	if use llvm; then
 		cmake_build zig2
+
+		if tc-is-cross-compiler; then
+			rm -rf "${BUILD_DIR}/zigcpp/" || die
+			rm -f "${BUILD_DIR}/config.h" || die
+
+			mv "${T}/target_zigcpp/" "${BUILD_DIR}/zigcpp/" || die
+			mv "${T}/target_config.h" "${BUILD_DIR}/config.h" || die
+		fi
 	else
 		cd "${BUILD_DIR}" || die
 		ln -s "${S}/stage1/" . || die
@@ -192,18 +269,48 @@ src_compile() {
 	fi
 
 	cd "${BUILD_DIR}" || die
-	ZIG_EXE="./zig2" zig_src_compile --prefix "${BUILD_DIR}/stage3/"
+	ZIG_EXE="./zig2" zig_src_compile --prefix stage3/
 
-	./stage3/bin/zig env || die "Zig compilation failed"
+	# Requires running stage3 which is built for cross-target.
+	if ! tc-is-cross-compiler; then
+		./stage3/bin/zig env || die "Zig compilation failed"
 
-	if use doc; then
-		ZIG_EXE="./stage3/bin/zig" zig_src_compile langref --prefix "${S}/docgen/"
+		if use doc; then
+			ZIG_EXE="./stage3/bin/zig" zig_src_compile langref --prefix "${S}/docgen/"
+		fi
 	fi
 }
 
 src_test() {
+	if has_version -b app-emulation/qemu; then
+		ewarn "QEMU executable was found on your building system."
+		ewarn "If you have qemu-binfmt (binfmt_misc) hooks enabled for"
+		ewarn "foreign architectures, Zig tests might fail."
+		ewarn "In this case, please disable qemu-binfmt and try again."
+	fi
+
 	cd "${BUILD_DIR}" || die
+
+	# XXX: When we pass a libc installation to Zig, it will fail to find
+	#      the bundled libraries for targets like aarch64-macos and
+	#      *-linux-musl. Zig doesn't run binaries for these targets when
+	#      -Dskip-non-native is passed, but they are still compiled, so
+	#      the test will fail. There's no way to disable --libc once passed,
+	#      so we need to strip it from ZBS_ARGS.
+	#      See: https://github.com/ziglang/zig/issues/22383
+	local args_backup=("${ZBS_ARGS[@]}")
+
+	for ((i = 0; i < ${#ZBS_ARGS[@]}; i++)); do
+		if [[ "${ZBS_ARGS[i]}" == "--libc" ]]; then
+			unset ZBS_ARGS[i]
+			unset ZBS_ARGS[i+1]
+			break
+		fi
+	done
+
 	ZIG_EXE="./stage3/bin/zig" zig_src_test -Dskip-non-native
+
+	ZBS_ARGS=("${args_backup[@]}")
 }
 
 src_install() {
@@ -237,5 +344,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	eselect zig update ifunset || die
+	eselect zig update ifunset
 }