gentoo resync : 06.04.2022

7 files changed, 48 insertions, 139 deletions

diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index e084df3d264d..4b3dfc133a45 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,12 +1,8 @@
 DIST zig-0.7.1.tar.gz 16082917 BLAKE2B 401bb079f2d0e2ad26837940e3b79c14237a492bd0b4df616f91b8b454ebd4ac3de36b2c988369c9eaaf7c2df4f95d4b1bb97760629f813ac8c7220e9542e12b SHA512 ad0b36f7b40481aca03940adfd42d34a724922993fc29a23a80412dc087ca6ce4876a400dc9bb7da455564521a88ea205c218988759ff6c56251a08232bfa41a
-DIST zig-0.8.0.tar.gz 19596459 BLAKE2B 7b688fdd201ce7b0b1e12127c4b1bf898699de18f410021e09bb056a56666aa8de512688a0048d6ac0ea8d6b7dfdb86e1a5416d2fab0a4911e16269d7b6be2a4 SHA512 2082810d5ab0560167766e80f0853e5ff99e32b1935836a6a0029b8e1c88061c55dd0c285cbcc506f4c38aac8477ec7162b771537699be9b3d387de94e3baa57
 DIST zig-0.8.1.tar.gz 19643170 BLAKE2B bc52f3399b3355a1fc7675329870dd107b21798fc562a9e55cd4a7c838cfdb2ed58ae3a01e3841a1a58c82fe27bec8758703b654b7548b9e431728aaabcd7ea6 SHA512 36bea566eee3dc5c00f2713cbc6616258dbadd3ee994749339f124f8b70c691cfe7fdce6a00194f879679ea417dadb3bcc244f8b79153957a426fea2d52caaf5
-DIST zig-0.9.0.tar.gz 21994175 BLAKE2B aadef89d5fddc3e802965125625e62140ac37bdac40b29ab8b7652056589c037cbed5d4e46889f335b3c296fb4ae2a7cafd5d064a02d728a8325ad515cdc8c7a SHA512 fef36221e818364b45cf65de210b0a9d535c411a510371a3ab4dfd6f4621c0a16dba786169f115a006966875102acc742abee19a74d83e2bc999ea5b8304b879
 DIST zig-0.9.1.tar.gz 22010374 BLAKE2B 24d6c945640aac1f7fd0eaf69937638181fb210c1f0be3110bc4e779cab3d56ef89286604b467013d52223a466addcb9bb81c85bbcf007d430a400669acf6279 SHA512 a9dc5fea25dde511122056832449658b00dbcf6d6bbfe658b375968a7bdb06c690abbdfe00c1afcfa481442392b051dcef5a5a5e81d4ceb23fa98a866b900f37
-EBUILD zig-0.7.1.ebuild 1399 BLAKE2B 082b8b334ff914edfecdf59ed73201fa4a2b7988e97652304d3ef2f38545aacf1f2d03285c31139798140b8a119e4eea0bc39fecf2238ff3c2e159fdd9123275 SHA512 abbd6231a5090f6f37bd12a762864eb1d19fdc425570ea4e77c2314be5eb364839a644da38873d22429fbefeba53c289e045f693975002a414aa340da9698e4f
-EBUILD zig-0.8.0.ebuild 1399 BLAKE2B 997269a639e0993cceab1bf48ea8b395d8644228461bd548b404e6dbe7d69a4dc30e4dbc7ecd1142993c9c67f850b972d3419ca65dd3c24947326544b66d4464 SHA512 ef53ad8dad89c7f1a3805b8a7be38ed09879c0c28e0766cca1037b1e19f1a18015a0cb2da7d1229b8e0c380bab42f4a67299391d43cb672ad893e950681b2889
-EBUILD zig-0.8.1-r1.ebuild 1340 BLAKE2B 38c5990ffa9a28a6ceac5054569d186e26e79b5839435ec85203ec80fb5d8c4b8fb4990a65f740485b6cd302c7ad89f18146307ecb625760816f2608a738f860 SHA512 b9d54410407d1dcb41ff0290d53ca76f50718f02483df9a46c4424b80acb03dad802b1ef55d26659daa601288c53236378fa5c428fe71b222245f4f310d605ac
-EBUILD zig-0.9.0.ebuild 1374 BLAKE2B d89db854175aef06fdd8d0b747044b153cb9b7043ce7a1f94e544e50a56a44f1c69e3d94daea3a23babcc1b24b1850044224d74f1054c80a000d4f289b9ea21a SHA512 4fe58ac7082f79f53f89a59f370aea86c3e99e1af86982d8df8e9b58154589fe14b96e3b316861d98ff666fcbaec676774d339f62c3bf1cd2debc584fb50998e
-EBUILD zig-0.9.1.ebuild 1374 BLAKE2B c158df27df36c2182e6590bcf2aa218f024de32ed6c1a8893d2f85633de5add4cd1e700933235917febdb939d6bc36e08d30f44509892c0edbc80aa89cb64f67 SHA512 df850bc82ea6154181cd93af8c1ae18dcb899bf789aaeb0b98692a71338a1f6218e864772c2193ef127218a808471b150ff5903690c6b789518fce4c29208405
-EBUILD zig-9999.ebuild 1369 BLAKE2B fc325fcc3b89df99752b6a06d2694bd8afa88573759fb427f9dd8ff156c97a17b1562f24d1493e0478ea25bdf1fc0f8848c828e6b6410dd2a9d4a1e89426d0fd SHA512 0ebb58269f9b6ec9726a7c9747bfdee83da19b002f08947f108e32e2e6930f395b12583cdaae1b235dcdea77d7d8526ccb6b6879a4c687aeeb6714c659513d44
+EBUILD zig-0.7.1.ebuild 1584 BLAKE2B 0da719b1ad8b4f82d93b69c7e1a2c1517b8b12f63ab5a3ba9765c79a3a8558877e481fa863c030ac3fc35f6ba3d11a4136b6437052e3cbcd1170204fd780ba90 SHA512 cb838c8d467f953a5d4ac9af0eae4b7e5be0df02a5a2a269da11f8e8d2b6d73779dd81f1c4f3a6be8cde94de7b795043385fac9eb6d73db0802e875eefbad44f
+EBUILD zig-0.8.1-r1.ebuild 1526 BLAKE2B b9273f2ca35c55ca05cb723192a1cad346434a58c335ed69f9d34fa79d8e1d4935db62eccc7954c6b1b9f161d4f7acc50ac95aa86cdbd98eb33c84ca6fe75eee SHA512 38e42088e5ed671027a139ff06bcada608ac0c95bfe188b3e7b22bb5fd147a6a8de0ec02818c88284cdb86a5c89deebe28047659288d81af363b5bcf3cf16fc5
+EBUILD zig-0.9.1.ebuild 1560 BLAKE2B 49f972a954b2bcb01717128187eb3e3b771047fe3b45993355b236df13f11dc5e7ce2373a6d84931bf1bd26f28360e5698a417da4a019256dc47d5521df3be4a SHA512 8d520cec02567bf56fb7d5e3d7ae0f187ba1d998e93e380f40c841471e57c6cbbff75ca39dfa28544f9cbe76c0dce1a5ecf568783d46c1648bcd6431853e7d04
+EBUILD zig-9999.ebuild 1560 BLAKE2B 49f972a954b2bcb01717128187eb3e3b771047fe3b45993355b236df13f11dc5e7ce2373a6d84931bf1bd26f28360e5698a417da4a019256dc47d5521df3be4a SHA512 8d520cec02567bf56fb7d5e3d7ae0f187ba1d998e93e380f40c841471e57c6cbbff75ca39dfa28544f9cbe76c0dce1a5ecf568783d46c1648bcd6431853e7d04
 MISC metadata.xml 363 BLAKE2B d0bd697b6c053d67a9140bdba55c3b221f294b13716faf13ab296d17c082952115ad689793baf88994f44036f493d82c94797278f7dc3c5b2b2a336ccb078860 SHA512 72b11e0bf02c4c3aa2d0c483c3728b22e06d0035964f876e4f0402f1864874f85113dabc293415eeef3cfac71d0679a2f3735a67b4020e72755b1e09905db885
diff --git a/dev-lang/zig/zig-0.7.1.ebuild b/dev-lang/zig/zig-0.7.1.ebuild
index d775cde187a1..1c70ae2f502d 100644
--- a/dev-lang/zig/zig-0.7.1.ebuild
+++ b/dev-lang/zig/zig-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake llvm
+inherit cmake llvm check-reqs
 
 DESCRIPTION="A robust, optimal, and maintainable programming language"
 HOMEPAGE="https://ziglang.org/"
@@ -46,6 +46,14 @@ llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
 }
 
+# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
+CHECKREQS_MEMORY="6G"
+
+pkg_setup() {
+	llvm_pkg_setup
+	check-reqs_pkg_setup
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DZIG_USE_CCACHE=OFF
diff --git a/dev-lang/zig/zig-0.8.0.ebuild b/dev-lang/zig/zig-0.8.0.ebuild
deleted file mode 100644
index 3a6741c72cdc..000000000000
--- a/dev-lang/zig/zig-0.8.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake llvm
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-LICENSE="MIT"
-SLOT="0"
-IUSE="+experimental test"
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-BUILD_DIR="${S}/build"
-
-# According to zig's author, zig builds that do not support all targets are not
-# supported by the upstream project.
-ALL_LLVM_TARGETS=(
-	AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX
-	PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-)
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
-
-LLVM_MAX_SLOT=12
-
-RDEPEND="
-	sys-devel/clang:${LLVM_MAX_SLOT}
-	>=sys-devel/lld-12.0.0
-	<sys-devel/lld-13.0.0
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	!experimental? ( sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] )
-"
-DEPEND="${RDEPEND}"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DZIG_USE_CCACHE=OFF
-		-DZIG_PREFER_CLANG_CPP_DYLIB=ON
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	./zig build test || die
-}
diff --git a/dev-lang/zig/zig-0.8.1-r1.ebuild b/dev-lang/zig/zig-0.8.1-r1.ebuild
index 659a2ac1dbca..0390c51f9678 100644
--- a/dev-lang/zig/zig-0.8.1-r1.ebuild
+++ b/dev-lang/zig/zig-0.8.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake llvm
+inherit cmake llvm check-reqs
 
 DESCRIPTION="A robust, optimal, and maintainable programming language"
 HOMEPAGE="https://ziglang.org/"
@@ -45,6 +45,14 @@ llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
 }
 
+# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
+CHECKREQS_MEMORY="10G"
+
+pkg_setup() {
+	llvm_pkg_setup
+	check-reqs_pkg_setup
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DZIG_USE_CCACHE=OFF
diff --git a/dev-lang/zig/zig-0.9.0.ebuild b/dev-lang/zig/zig-0.9.0.ebuild
deleted file mode 100644
index a433638a0feb..000000000000
--- a/dev-lang/zig/zig-0.9.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LLVM_MAX_SLOT=13
-inherit cmake llvm
-
-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://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BUILD_DIR="${S}/build"
-
-# According to zig's author, zig builds that do not support all targets are not
-# supported by the upstream project.
-ALL_LLVM_TARGETS=(
-	AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX
-	PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-)
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]}"
-
-RDEPEND="
-	sys-devel/clang:${LLVM_MAX_SLOT}
-	>=sys-devel/lld-${LLVM_MAX_SLOT}
-	<sys-devel/lld-$((${LLVM_MAX_SLOT} + 1))
-	sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}]
-"
-DEPEND="${RDEPEND}"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DZIG_USE_CCACHE=OFF
-		-DZIG_PREFER_CLANG_CPP_DYLIB=ON
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	./zig build test || die
-}
diff --git a/dev-lang/zig/zig-0.9.1.ebuild b/dev-lang/zig/zig-0.9.1.ebuild
index f3e935ec2f28..1ce53e760265 100644
--- a/dev-lang/zig/zig-0.9.1.ebuild
+++ b/dev-lang/zig/zig-0.9.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LLVM_MAX_SLOT=13
-inherit cmake llvm
+inherit cmake llvm check-reqs
 
 DESCRIPTION="A robust, optimal, and maintainable programming language"
 HOMEPAGE="https://ziglang.org/"
@@ -44,6 +44,14 @@ llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
 }
 
+# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
+CHECKREQS_MEMORY="10G"
+
+pkg_setup() {
+	llvm_pkg_setup
+	check-reqs_pkg_setup
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DZIG_USE_CCACHE=OFF
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index ca45b1e7e4dc..1ce53e760265 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LLVM_MAX_SLOT=13
-inherit cmake llvm
+inherit cmake llvm check-reqs
 
 DESCRIPTION="A robust, optimal, and maintainable programming language"
 HOMEPAGE="https://ziglang.org/"
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
 LICENSE="MIT"
@@ -44,6 +44,14 @@ llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
 }
 
+# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
+CHECKREQS_MEMORY="10G"
+
+pkg_setup() {
+	llvm_pkg_setup
+	check-reqs_pkg_setup
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DZIG_USE_CCACHE=OFF