From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 dev-util/spirv-tools/Manifest                      |  4 +-
 .../spirv-tools-2021.0_pre20210327.ebuild          | 44 ++++++++++++++++++++++
 dev-util/spirv-tools/spirv-tools-9999.ebuild       |  8 ++--
 3 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 dev-util/spirv-tools/spirv-tools-2021.0_pre20210327.ebuild

(limited to 'dev-util/spirv-tools')

diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index f9e6dd6605a8..069b47c35292 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2
+DIST spirv-tools-2021.0_pre20210327.tar.gz 2591201 BLAKE2B e850bb2ccdd83bbd618ded22df8553c6e977e65ef623e881ec5b4dc15c3646a2c679dbf2a41166ddc98b75aa73a3404a870cd6fac577197c21623c97e7f07192 SHA512 56c206bf62d45a2341272612f979f9ef9bb933185e2f2852a39367dfb68f6647662d8995dfb9067e71b04cd76d2da0789346335dbabd7258406d96627f689e96
 EBUILD spirv-tools-2020.6.ebuild 1197 BLAKE2B 05ac606f25f2bfd1280ba5c19574628578046b033a9f01b2c939c7e2d1e55d0386ba71db94d988e8689cd8b20bd8f427ccb2f8259f17b7352e770d44aa337238 SHA512 bf598004767b75ee52149e7e2cb90e949c10284e3e0053bfd06de3ad69ad19cfee608f24b11eaf46345ed07d21239cc601f5e6984e82c738de6157a077d15a66
-EBUILD spirv-tools-9999.ebuild 1230 BLAKE2B eba1cacd83dce13d51dd9198ebbd2f0f65fe141ccaf7938bd1ca0f1f78bfa72bc8b759459060eba98ddff7b08a65b18bb1f3f0e916d933779e3130ca494deaa5 SHA512 c3d7bb950afc4ac2ccba4850ad3a843d7e691e78fd581cd8c6007d005e18eac5b67951e3485a8432d628458411180fff4e3d7299b87aa6783f89c08bda3d5412
+EBUILD spirv-tools-2021.0_pre20210327.ebuild 1249 BLAKE2B a1b152db67b48ab095b895cd7171f9eaed714308d7f2dbd34e31a415429f51cc127bd44d31dd261e323556a5a7f7960c3be7ba3b417b8e56b5ba5e9cdc794cef SHA512 7e5d2801912a845a4d076396e2704c05d3b182be2d17c5e40b6b7f9b46cf934fd4b5c22a38c4722d1dd22d27c64b3c19a718dc7303e2e5fc566bbffad0851672
+EBUILD spirv-tools-9999.ebuild 1249 BLAKE2B a1b152db67b48ab095b895cd7171f9eaed714308d7f2dbd34e31a415429f51cc127bd44d31dd261e323556a5a7f7960c3be7ba3b417b8e56b5ba5e9cdc794cef SHA512 7e5d2801912a845a4d076396e2704c05d3b182be2d17c5e40b6b7f9b46cf934fd4b5c22a38c4722d1dd22d27c64b3c19a718dc7303e2e5fc566bbffad0851672
 MISC metadata.xml 428 BLAKE2B e5ec493782c93cb593d56b58a4f1d8b89dad2b0a11cc5eb2faf6b9cdb898e1097440ad446f0c920c69bd0eddfb9225bf8fce8d3749a03f8e6e5c94cdeea5173a SHA512 a5c873d573590a7c538f96d03bbe66b9a42eaabd5b96bafe8642a9cdde2a27bd067e5e46802ceb76e83160af0e4dd052ecc0b6e8c3b6fda3ee15a2eedf1d8b08
diff --git a/dev-util/spirv-tools/spirv-tools-2021.0_pre20210327.ebuild b/dev-util/spirv-tools/spirv-tools-2021.0_pre20210327.ebuild
new file mode 100644
index 000000000000..0f8c9646f36f
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-2021.0_pre20210327.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="1b35745ad1c9a988bc427b976a9a2fe7afd4dada"
+	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-1.5.4.2_pre20210327"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=/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-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 6a788dfb1c2e..0f8c9646f36f 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,9 +12,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="a61d07a72763c1eb200de0a2c316703643a0d1d9"
+	EGIT_COMMIT="1b35745ad1c9a988bc427b976a9a2fe7afd4dada"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
@@ -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.1"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.2_pre20210327"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}
-- 
cgit v1.2.3