6 files changed, 162 insertions, 3 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index bdf6e0aed47c..1b2701ba3455 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/zig-bin/Manifest b/dev-lang/zig-bin/Manifest
index f500edd7a7a5..577c09960112 100644
--- a/dev-lang/zig-bin/Manifest
+++ b/dev-lang/zig-bin/Manifest
@@ -1,7 +1,13 @@
 DIST zig-linux-aarch64-0.10.0.tar.xz 40387688 BLAKE2B 47d0cb61f054b79dcd9e5f87f3f910c9440079dca7648a3017c871fb20bc76e07de5b76a438a9d8eda147e77061bebf43b1486160899eeca0972b547b269c607 SHA512 5db0df7fce49dd3ca7002c3d9782a8d16c8b92721cf5f8983978dddcfb42dd31c4e3edad5a321bceda627730320c95dc552226b9e5e06ba84315804153991de1
+DIST zig-linux-aarch64-0.10.1.tar.xz 40321280 BLAKE2B 39abefb80d540d52333ec76203893630ac5df2a784684397033e9ac766f67c4512be71513ebb80faac6c5ebaa2a737859b7bc27b82797232cf97d87d91e8492e SHA512 44dd15b1b2d7bc85a4f8e8171ae5c51122be352249273091b499de5a392c72e262585f981908afd1718a41fa7e67b36f1b65c6cacbf8e9f226a687bd85b7edc6
 DIST zig-linux-armv7a-0.10.0.tar.xz 50805936 BLAKE2B 57a2c8bf10d80a5b06570ebea786be725e6020a7184835a966ddae32a2126910915e2d2bae0932226edb644692ff39e7ab201a8d040c62106ac40539cd3e8096 SHA512 31d16e477a52e10d6ce4e646c7b97d6162c68d5938890b815fb9d5da527248ab46926649d68d5623953b9fbac707131c89d5c8388e9ae5128cf2182d0ab58278
+DIST zig-linux-armv7a-0.10.1.tar.xz 50718132 BLAKE2B 76ef431ef8957272b992f6b861913a961d348120106a7f4b77d1f6b2a042dd8904a1ac744ab6b02b78681eef68af4143372e5315cd113d40711bd26fc78e6632 SHA512 4ec3ccd7ac980bfd9fc7a2f6b2301051d3df43b00143914d869389fc44b48916820d996e27cb922dac152228c4b04a0cce51f7b125317de85440a5479fe8ff7d
 DIST zig-linux-i386-0.10.0.tar.xz 48451732 BLAKE2B e1ae0d48723e1439b612f56dee05776d83a9cabe4bd4ddc6198d777a51a5b2b8c696cf7ce7817641ab46edb91eff992abc4d12de7620d21b1bb63fc482d610da SHA512 6c4152137047efbf2cf3a65583697325baf29c5847734d38622207d15de04aa5bbcd15e37c3c07c51536a2f34ab16ceaf7776c009b0862cb510ed2a0494bdeef
+DIST zig-linux-i386-0.10.1.tar.xz 48367388 BLAKE2B 482ec9e42d9036177f41c459faf82c79ba525f35ed14150d97af9110efab3e9894b8c64f92f9257b224893179134e43306c985ad6a04ae6a7d427d14ef4e7a3f SHA512 97345a8f7f15a83e51635ec667e869833a597511a1b004fa4ab19d78ad234e05e8344823e0c623510c7c5dbeef447d13636223e8d339f6d53f2eca053852a8d3
 DIST zig-linux-riscv64-0.10.0.tar.xz 42272968 BLAKE2B 95fe8589b9be99625acb5c9a97fafd3126b838c7e0722529d34cfe87043cb0e8d6957e6f2bb3ac3ae1fc2f51cf6a062b98abe224c221ba659de1e16703b53255 SHA512 ae00cf4eb5e499bd44e94d6cd77464d85878881034ce088ef69aa1f3fdf58420768112b36007829ecaba74e77e96c0706222a2fc1397b773e3bb5f726a710549
+DIST zig-linux-riscv64-0.10.1.tar.xz 42196008 BLAKE2B a7ae37b1d1db1281b09bbd7e35ecaf390bbe28774bd1a4fa76b4468255be19b07fb514326d48576946f3c4eb04dcef34d6ab14f550407aa33803754fabbd848c SHA512 1a1da96924fa4a16a53721017eadc3363859a4f53671e27b11588200d0302d9065de9ba517ad40940aad98725e617cf853f2e83f732a4e23c33deacb99487ad0
 DIST zig-linux-x86_64-0.10.0.tar.xz 44142400 BLAKE2B 7ba72ce57e616c5ead2fb84dc7e1b0ff08e8dffab56ca30cd00bff1d9b80fd62034f3d78b903f37f911665239a4717a6e93230faa77b3f387b0dada835672fb7 SHA512 87037766e58a736d7e4f9fca1c21dce070f2de8cd08dae7951e67252327b72dd69f79831f5c8e406be7ecc6522184400eba3bd265d3c7020c8fa4d2efc9f8766
-EBUILD zig-bin-0.10.0.ebuild 1987 BLAKE2B 37cd05153fe49d90878ce7ea7a93718acf84bcf9e9f99ac162fccc848a71dbb84ea1d23d4290de487e3ef3afb90192b66db5beba6d296859e342fecbcd62917e SHA512 5897db05f2b4ce8c920ed96a542ecd833b3c4f1191c56bd2684cc93186374f397ae96b756dc5fcd6336d2a820d8ed36af2d7855394d04ee261f9459257e8454b
+DIST zig-linux-x86_64-0.10.1.tar.xz 44085596 BLAKE2B d689a469dbbe790593a561dd4df01c506212754c48be7de03773c7e690cbab197af10d639e80148f3343204ddf9ecfe09a88a62fb6ef63a262bcc2dd79fecd34 SHA512 1cf88a492b1a47800e213b8801477f4ffabf269f960d27d1849c5aec805b5db3768c83d4daa4a738532b1b7367e8c6812e3eea47c205ea732d7a6269a47e16dc
+EBUILD zig-bin-0.10.0.ebuild 1999 BLAKE2B 5f58d0fb901f1ddcbdd5939687ea4c3d5f6211198efebb0e215999f4156af2a1e76df3bffd7781f57579c2a3026bb8805b2dcc53863141b299155c0f9be08743 SHA512 449e70f2ba79903e6aa97d96260fced9cf2efb76e4a4b111e37c83de735662a7b7ef31d07a2da8b39995e6ab3c55f69aa53b5076fc80e5d2960eee70b60ad61f
+EBUILD zig-bin-0.10.1.ebuild 1978 BLAKE2B 88c315e88ebb5c3e4398709ed6c30f7ecc6e21d0975b99f3da59d362dd81690d509a08474ce19a07c76b37a94584c8e03d18cae9a395857ae8bfb50e1c8cad74 SHA512 e0d998899bb55576ad37b8d88c0a8e593a8361ffc43249d4f861f3546832d859ec61c203b914d49e8bce2a2a6c83f29836f459d1c191a9ce105714bfa904e0f4
 MISC metadata.xml 541 BLAKE2B 6f5c7fbf759f0430f69073a17a0dae4b8bebf335b54c3b43da6b24104dc3de05a3b686cddbbd31e4dae1fc31695a2f08d000d22437ed6f1847de8fa95e3b1952 SHA512 d49cf0a8ad76ac9a6f6fb091effddbbcd812b56f91df6d3c782e15197cb4ff4423fb1076671a232aabcb9833af19ef8c820ad6df312a1e4d72e665680314c083
diff --git a/dev-lang/zig-bin/zig-bin-0.10.0.ebuild b/dev-lang/zig-bin/zig-bin-0.10.0.ebuild
index 45c577eadde5..41c7ad1570e5 100644
--- a/dev-lang/zig-bin/zig-bin-0.10.0.ebuild
+++ b/dev-lang/zig-bin/zig-bin-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,7 +29,7 @@ QA_PREBUILT="opt/${P}/zig"
 src_unpack() {
 	unpack ${A}
 
-	mv "${WORKDIR}/"* "${S}"
+	mv "${WORKDIR}/"* "${S}" || die
 }
 
 src_install() {
diff --git a/dev-lang/zig-bin/zig-bin-0.10.1.ebuild b/dev-lang/zig-bin/zig-bin-0.10.1.ebuild
new file mode 100644
index 000000000000..7c9d05764a48
--- /dev/null
+++ b/dev-lang/zig-bin/zig-bin-0.10.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+SRC_URI="
+	amd64? ( https://ziglang.org/download/${PV}/zig-linux-x86_64-${PV}.tar.xz )
+	arm? ( https://ziglang.org/download/${PV}/zig-linux-armv7a-${PV}.tar.xz )
+	arm64? ( https://ziglang.org/download/${PV}/zig-linux-aarch64-${PV}.tar.xz )
+	riscv? ( https://ziglang.org/download/${PV}/zig-linux-riscv64-${PV}.tar.xz )
+	x86? ( https://ziglang.org/download/${PV}/zig-linux-i386-${PV}.tar.xz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="!dev-lang/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
+#PATCHES=( )
+
+QA_PREBUILT="opt/${P}/zig"
+
+src_unpack() {
+	unpack ${A}
+
+	mv "${WORKDIR}/"* "${S}" || die
+}
+
+src_install() {
+	insinto /opt/
+	doins -r "${S}"
+
+	dosym -r /opt/${P}/doc/ /usr/share/doc/${PF}
+	dosym -r /opt/${P}/zig /usr/bin/zig
+	fperms 0755 /usr/bin/zig
+}
+
+pkg_postinst() {
+	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"
+}
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index a77e84fe040f..aa442bd46cb6 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,6 +1,8 @@
 AUX zig-0.10.0-avoid-cmake-bug.patch 2200 BLAKE2B 6c06d318f2da258f3c003c5d8eaf66261ec736cb4ea0a87f3b0ff3d7c350bd51523ba2f23ea2bccbaed237fe76dfd6e1b56b1741a5ac6ba3539f7551e2347f70 SHA512 8e5ff85b26fe3f5a19e73aa9ad8d9f6446f936e3c2157b50212218a77747913e1199c0b52181e884755a90dfa839b23f305da82edeba6e8d3ceaff1d20a16efd
 AUX zig-0.10.0-build-dir-install-stage3.patch 1430 BLAKE2B cca909207cadfe1c9b31b9481a705882506363aaf41db7672f42cc66937f85f7b2f2b53346d29a4d748d1aef05e77efcc6e668ac498a7d172a6d8654034d5c4a SHA512 6704adb1f146ed78c8030aad2c739e30d0ec7ffda40273b5520914b16cc67d497afd9b1b59a1acfbb0097d7f5b0a5517973c45ef43ccbc35d8af051500577117
 DIST zig-0.10.0.tar.xz 14530912 BLAKE2B 5949a44ee039b7d5a163344a0fc26af8dd9cf311ed25c7092a665bb59ec7dec8dc3cd39918d81ef02c707aa8989b038fb21dfba3927fd31153a1404739b4ea3c SHA512 9d83ce51cc0ce404c06da820179c1cc47aa50e573fb1c831a96baa12c6b5226abe85b384110f2ffc4cbdc5f24eaba1f14a4e3249ffeaa248c0d73ba29859e682
+DIST zig-0.10.1.tar.xz 15143112 BLAKE2B 4954d95ad763000eedf73a78e62bc0e99d65bba91c7127cdf1ea4503eb67817265daf572f645b7efbe9e24087e690b2768f0b2bc6c43b5fd76eab33143e964fe SHA512 d443adf61556bc95470537c6b0371a0ac99d19a06b15635cf1e5055ae7849039680c9006105e06e1bd6ba0fc12da14c54c1d28ac597c7dee17ee3a5cd9cf79f8
 EBUILD zig-0.10.0-r1.ebuild 3295 BLAKE2B 0997f58541abc6687278dd7eec16944a16b90bd58dc5a4ededea12dbfe9006264fc087c937eb5d1a4579d016df222a5aa8ed721fe42124a0fc85984fe7b38ec3 SHA512 ea1dec43578750945a3401ca1a2cefce0be9bc8da06a65c0e6da2684be6be0ff41b315f110a9ec9f8af99298c16b7369a37c21027ee1f53e82ecaceee13dce56
+EBUILD zig-0.10.1.ebuild 3205 BLAKE2B 977a4dec97a9bb7708581758e8f99155c3d03b68723e2703f657c096d661555ba50549854c5c31d0ff8bdd412442dd223dd4323182999b8f1fed61dcfe4c06d4 SHA512 0e7861a183c917b9ed8452d302bcec688ca891cfe0a68b88ae59204e96fda138c4f1fc6e17a581708769ee1696aec28c6b25af1af16fe8c4c88a9eab6675ecce
 EBUILD zig-9999.ebuild 1671 BLAKE2B b753bbd37c7f1f60bdb2bc8fe3914d21f5b30787768460b55bd9e1980dc4727eb4f71c63a03da17a8a98c681df5e33e311b48c9c42fde8ab1b43a3bc9b3f4f90 SHA512 2b4d5a8fdfe5eba60896915b81168d5eb0aa3bcf53d6df8326c593f275556cf8652c401f0780f977325e877d36aa9348a196168f3e2c3dc3af99a8f5a1b46301
 MISC metadata.xml 541 BLAKE2B 6f5c7fbf759f0430f69073a17a0dae4b8bebf335b54c3b43da6b24104dc3de05a3b686cddbbd31e4dae1fc31695a2f08d000d22437ed6f1847de8fa95e3b1952 SHA512 d49cf0a8ad76ac9a6f6fb091effddbbcd812b56f91df6d3c782e15197cb4ff4423fb1076671a232aabcb9833af19ef8c820ad6df312a1e4d72e665680314c083
diff --git a/dev-lang/zig/zig-0.10.1.ebuild b/dev-lang/zig/zig-0.10.1.ebuild
new file mode 100644
index 000000000000..b5ed03b123f1
--- /dev/null
+++ b/dev-lang/zig/zig-0.10.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=15
+inherit edo cmake llvm check-reqs
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+	inherit git-r3
+else
+	SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+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="
+	sys-devel/clang:${LLVM_MAX_SLOT}=
+	sys-devel/lld:${LLVM_MAX_SLOT}=
+	sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
+"
+
+RDEPEND="
+	${DEPEND}
+	!dev-lang/zig-bin
+"
+
+# see https://github.com/ziglang/zig/issues/3382
+# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
+QA_FLAGS_IGNORED="usr/bin/zig"
+
+# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
+# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping
+# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler
+# (transpiled to C via C backend) for bootstrapping
+CHECKREQS_MEMORY="10G"
+
+PATCHES=(
+	"${FILESDIR}/zig-0.10.0-build-dir-install-stage3.patch"
+)
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	ewarn "This version requires 10G of memory for building compiler."
+	ewarn "If you don't have enough memory, you can wait until 0.11.0 release"
+	ewarn "or (if you are risky) use 9999 version (currently requires only 4GB)"
+	check-reqs_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DZIG_USE_CCACHE=OFF
+		-DZIG_SHARED_LLVM=ON
+		-DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true -Drelease -Dtarget=native"
+	local ZIG_TEST_STEPS=(
+		test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
+		test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
+		test-run-translated-c test-std
+	)
+
+	local step
+	for step in "${ZIG_TEST_STEPS[@]}" ; do
+		edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
+	done
+}
+
+pkg_postinst() {
+	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"
+}