[gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-tools/

[Nick Sarnie]

commit:     f5da8a19ce91f49996f5b4b13ad6979815ce325a
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 23:15:51 2022 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 23:16:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5da8a19

dev-util/spirv-tools: Require Python with xml support

Closes: https://bugs.gentoo.org/831393
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 dev-util/spirv-tools/spirv-tools-1.2.198.ebuild  | 3 ++-
 dev-util/spirv-tools/spirv-tools-99999999.ebuild | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild b/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
index 2cbe8404537c..ec2ad8d84ae9 100644
--- a/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,6 +6,7 @@ EAPI=7
 MY_PN=SPIRV-Tools
 CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then

diff --git a/dev-util/spirv-tools/spirv-tools-99999999.ebuild b/dev-util/spirv-tools/spirv-tools-99999999.ebuild
index 96183daa2dbb..03af5826bc0b 100644
--- a/dev-util/spirv-tools/spirv-tools-99999999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,15 +6,16 @@ EAPI=7
 MY_PN=SPIRV-Tools
 CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
 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"
+	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"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
@@ -34,7 +35,7 @@ BDEPEND="${PYTHON_DEPS}
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
 		"-DSPIRV_WERROR=OFF"
 		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
 		"-DBUILD_SHARED_LIBS=ON"