gentoo resync : 05.12.2021

4 files changed, 50 insertions, 4 deletions

diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 433863b54482..404239042dad 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,8 @@
+DIST spirv-tools-1.2.198.tar.gz 2888894 BLAKE2B 036f2457863c1bff47939d6238d6f270baee67253edeb5dc4cb1270eb32b9fdb6427c959bde4c5496056784c0334922276b9a4e0ac5530a4c662abdf0190f119 SHA512 90a53d0c7c6dfeb5ef2ee3e8b92c00cd39211f18f57aaeae079ac95b94ec4c839443017eb39fbee0f737d0c070ed64e2369609e81dba149f08676724b254f714
 DIST spirv-tools-2021.1.tar.gz 2613619 BLAKE2B ab5816e3407ba827f5db69cb391b0e4820661aa7367edfc5a9a41cb9fee98a7e814f765d99548cdab1a11869f79710e6243f2c97ec3ee4f6a919990dc24e63dd SHA512 74be4ecb3f6926cebdbfdc2351e3d3e0db18a8a312ce12882442d4e33737f9ccfb0ec6e1f5cd6bb5604525467605c080a8494b4aef6dd797dc805e12bc10226f
 DIST spirv-tools-20210825.tar.gz 2852443 BLAKE2B 87c24d6c5506097cf24b3008450e54a652c1e9d0ad1dd61499b65cc93e4783db2f86b3138ef2c8f33b8b242fc55dfa279d135d347bd21dd8977773ae302ae430 SHA512 d99cb85527810413e6df386342a5d0de201defe401fd175f0cd15604dcba0f8c157b63b4d49be64b5161b6a97c0a6ae16fe82080368ec6eb64cd71300d056bea
+EBUILD spirv-tools-1.2.198.ebuild 1216 BLAKE2B 65b62a3fbb727069a61c9dd0950212ffe83fa53ad8f9151cdc5fc1cf64444735619a356d6e834bc9c47027bd37042b174123ea1c62fe2d13fbe10f02518d362f SHA512 74133e42d3156bfeb81a51b379af4dbed8e639bee301c1d08a79ed345d85678f9788ba88469388a5c2dd68c465117083d65c51792a688de304d0d60f1424f6ae
 EBUILD spirv-tools-2021.1.ebuild 1254 BLAKE2B f59d178590ac5c0985abb3698c6a2b7618e6f199fbc5018cac01b2e9f63b73ed87e6f1d05bd5bbfaf6edc929e9ab119e46bfae51573b621c7a7f6a694634b9bc SHA512 6a47a37de6a9b741e37c279f8cd910486b1978ab3e94bb89013d7d30b648e511e90559d1798d95b8a9d1816c18509668e5182125b8e7f790c02a53c99c4f434d
-EBUILD spirv-tools-20210825.ebuild 1247 BLAKE2B cdbbdb116752e61e848273ff41e40fe650dec9488bce72956efe67e0c4154f06e825a1ab9614ef62645e8547a9eaee24bbab8f0d6fbdbe3e90be4b3822fbc222 SHA512 e37e252fc8f08f8fe99653fac92b2fdd0942985a60aa182a784ecbc787c4b2f31357ce3dad5e6d3bb0e810c2c1db7720be1b71c8e5cfae97aea486810e770def
-EBUILD spirv-tools-99999999.ebuild 1249 BLAKE2B fff6ed718fed7223911810ad47847230aa3f77c08925893e63e04cd55d4c3486b4e653d26e638a44bce7d9cdce178dff9a01e8b5d99777b245eac9b8563453b3 SHA512 0081fdbc259e420597b3efcd1985cc4e30a963bbc08e49701fb1b7218b092d2af373d510cc484a2e8a1de8e9032f91d0d49272e09f9a5645042bebd9cf278dd1
+EBUILD spirv-tools-20210825.ebuild 1243 BLAKE2B 6297ea80ec80d6c8937180c5f07b89d31252b8146b78954f217913e56e34f245dd555e59c91ae4130948c6bb442a90601830317aeef4f34b69e87a5f43c43320 SHA512 647cda9e042ac9fa45163749c00c508ffa7910b09e4c68ff260517b18bb08f1ec21f1329c9c2bd774d4639852d8b1541be6c4e57502d7d2efa455ed5c680c6f4
+EBUILD spirv-tools-99999999.ebuild 1236 BLAKE2B a48bfa290b84b80eaf471796e046dff72aa7568ae8757b6d6d4e784eedd2778c64f5d6aa51a56d393ca9cf09fb2cf3ff9352181f8dafe2d64cf9a3b5db646b4d SHA512 803b1a6bf9411a579423c0cb6ecdc85adda5b33f17fee3a0c61c71726821423bc7780616732a64c8ea96f0bef73bbeef3b9ba238500d5148239478e06a922b4a
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild b/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
new file mode 100644
index 000000000000..535410ee3e23
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=SPIRV-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="sdk-${PV}.0"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+COMMON_DEPEND="~dev-util/spirv-headers-${PV}"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
+		"-DSPIRV_WERROR=OFF"
+		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
+		"-DBUILD_SHARED_LIBS=ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/spirv-tools/spirv-tools-20210825.ebuild b/dev-util/spirv-tools/spirv-tools-20210825.ebuild
index 6a16265502a1..e4d910deee02 100644
--- a/dev-util/spirv-tools/spirv-tools-20210825.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-20210825.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="1fbed83c8aab8517d821fcb4164c08567951938f"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/spirv-tools/spirv-tools-99999999.ebuild b/dev-util/spirv-tools/spirv-tools-99999999.ebuild
index fa22fe6b2b6d..1a401b8cc38d 100644
--- a/dev-util/spirv-tools/spirv-tools-99999999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-99999999.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
 # Tests fail upon finding symbols that do not match a regular expression
 # in the generated library. Easily hit with non-standard compiler flags
 RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.2_pre20210526"
+COMMON_DEPEND="~dev-util/spirv-headers-1.2.198"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}