gentoo resync : 25.11.2020

4 files changed, 56 insertions, 7 deletions

diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 7c2090faa334..7ff432dc59c5 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-tools-2020.3.tar.gz 2170858 BLAKE2B c9fdc6bbf6edbb6e3e5aba1fff9bd179b7b435ecb4ebbe29db38ce0c71166269484f8c3798a69a0fe5d936392b07fc6ccd5f058945aa70330612a6ef8fafe12f SHA512 8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f
-EBUILD spirv-tools-2020.3.ebuild 1091 BLAKE2B d9e28703c0dcabdcfdd2ab913f096d7780a58a4d5a85e1e952781d25a97da39d6e8045df522e7e6df4b9fb8f347dbeb3026f8dcdb9cf805994442f7aa6f17711 SHA512 9d092a46dc4a6daeddb3d50864e62abdc7b27d7ff041ed538989d7a58d01808f3656c57a9f8128a23506c5ec6f73768c65daab86f199da964cca429958150aa1
-EBUILD spirv-tools-9999.ebuild 1076 BLAKE2B f2b331dad1276fcdb1ae4029c75bca06be7136fe8f543053d8a7c0bd025d383132c756397cdab4f6c4cbebddd54f82d8a469802e66cd5906867768a952974256 SHA512 32b887f0b40bb37b1c6d63f93eb787c8982996ca94e293e531904870484ad811ea36f4c124101c6cbf33e95d3984f44fd6d013c3043632d75716356a3f5e0faf
+DIST spirv-tools-2020.5_pre20201107.tar.gz 2583541 BLAKE2B f234e34142af47a98268d85fa12861b9c66c78d74af7e44d4aa9150ad5cfce8e65780d89344ec947b4866de9811a8198e174480c23c30f690193feca7cc136a6 SHA512 a65174e5f1b7cad3be80e0df0d46e8fbfbb62f397fe98eb1b2c37bb85cf8f92d7b4c9103b5e9e8181240bcf97e5a7e3f09323f78159d4b25f7f02176e982f542
+EBUILD spirv-tools-2020.3.ebuild 1088 BLAKE2B 9576a7b33287e9139790225411a344c0a2eb17459140d6c165791195bc6e265be3038e269c7de85ca54405e4030f80d3d3e863ff832ca59772bbf0a9027774f9 SHA512 947a778123f62fd3901d017dfaf9743c50cb75d2014c2e85289b9709958d21462371bdfc926c3e6b5cbc5e2e6a4a86481552b45f062810c04007b09fac529b64
+EBUILD spirv-tools-2020.5_pre20201107.ebuild 1228 BLAKE2B 93c5fb104f3264f14e1ac18a0d7954dfb166e2add2ba2d79b6bab09e89e7e7605e9baa53824f919c8e825f354f719b226bfa647d814b5be45d9861dcfaeccb99 SHA512 54e65f2212524e7a11d5d73bf0368151048a4efcfdcf9636cb42a7da890a97f5e4aad6b9b53a035ec94e78608bc6d488627d50f46905a8986108e4e255f3d85d
+EBUILD spirv-tools-9999.ebuild 1228 BLAKE2B 93c5fb104f3264f14e1ac18a0d7954dfb166e2add2ba2d79b6bab09e89e7e7605e9baa53824f919c8e825f354f719b226bfa647d814b5be45d9861dcfaeccb99 SHA512 54e65f2212524e7a11d5d73bf0368151048a4efcfdcf9636cb42a7da890a97f5e4aad6b9b53a035ec94e78608bc6d488627d50f46905a8986108e4e255f3d85d
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild b/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
index 8cf8dca6539c..16c82fcd1bd9 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
new file mode 100644
index 000000000000..d1cdb00c129a
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 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_{6,7,8} )
+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="a61d07a72763c1eb200de0a2c316703643a0d1d9"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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"
+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 97f9e9c25627..d1cdb00c129a 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -12,9 +12,10 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
+	EGIT_COMMIT="a61d07a72763c1eb200de0a2c316703643a0d1d9"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
 DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
@@ -25,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.3"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}
@@ -35,6 +36,8 @@ 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