gentoo resync : 16.06.2019

3 files changed, 20 insertions, 12 deletions

diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 3b55385f025e..c20d16861303 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,9 +1,8 @@
 AUX spirv-tools-2019.1-Fix-vertex-instrumentation.patch 4948 BLAKE2B 72df8f60ee84d3b129803e1ac2c2befa59392bd9cde51070155798f12e3d72bb5de0bfb93117599f315e6f106c6f9852dbad4d1ce0d9b4f3831a5af3844ef0c6 SHA512 9f1fe685e9205e848cc931802c003529b885c1f409a12e6bf118269a3073be8535ab3431cfcea9d89e8d78b55205795861d47e94f9728153541efe9354564003
-DIST spirv-tools-2018.4.tar.gz 1327904 BLAKE2B 1ed01edf0dd5e8c3ac0d1a866d27f2e2ef377e9c082579291f8e755592ff3ea4f44a597e3e7694977500b9434889b0f741e03d566e777bb0f9af5e2e59374d61 SHA512 6b982efb30529e7f7776d7702f563bb4f874b9be3a7b0d838d77a15813f4177da99c152f40f11854fc3d60791ecf4026e006ff25a216bb44194dfd921c50920d
 DIST spirv-tools-2018.5.tar.gz 1354299 BLAKE2B a2f74ac52cbcb3881009274c41cf8be48ae91d2d62d9e687d28719e65bb7cd5c0a5104a967e995fc5da066c1e6a278df4bf285fa9bf617660072bd0ee535b9bb SHA512 068a39e15111f24ad2a6b27e7ada786b3124b239aa8b13e187a4d512044db57a8e6a0fccadd0451155e1f57c96c8dec91a2338996c59fc883007cf7be07f2cad
 DIST spirv-tools-2019.1.tar.gz 1493682 BLAKE2B 823b6435fd59a732075073bcecfbfa3081248a2fff21a1375502b812b30a1f988bb32afc41d2f6a6244b4bf37aa9fee2fab710f2cf6d051170e3622d8adf632f SHA512 c528046e1495d58ff0aca773b3b8fa091f943414853cf0344d8e690d868e0df5b1aa66bddbab245c5e52cc2fbaf0a2032a3be518fb8ada7f89b8023fa89776b4
-EBUILD spirv-tools-2018.4.ebuild 1034 BLAKE2B 891188fa617878fd86b7847dc32cefeb69801fa89594763b212891018bd0e251fb64401fed9a4520ab82685843916f3b1f4f94017937fc1adaad4bf8bd847bc5 SHA512 78784487fe26c9a5562d8d7aff69b45e40c13b3850319b1f45b48ab84bfdb1ce90ebab3edcc112935bc3a64b63603e8505c2fc3ee7393d5541c2bc2587c51b0d
 EBUILD spirv-tools-2018.5.ebuild 1033 BLAKE2B 43041e0dcf349d1626cf0e247d9078870291527663cf5a689e2a77cf0b5d1b02007534a1a56f7d13fcb39c11c81ad10b92aac7e69db0105f85fae9675c316219 SHA512 06c008fcaf213eddabcd0a507a97219a711c2cc9d0c0b6994a2b8f096894266229732c18625b8d14e5b3f885b5078a1348f496321d08faccfc7ee1cfb3929344
 EBUILD spirv-tools-2019.1-r1.ebuild 1105 BLAKE2B 295eb615075c5e39aee4e1f79f31c0b2fadadcfae8457631f4898bdb05d3ba7d262043f61e4af45d6c928d5a20347b8f7b21a33a2cac2ea34cf2b3e3b7266ea7 SHA512 ef2ba43840d3d171075621724565e90e6883e29cd0f98ffb40eccb97426b806694d95260bdd6d082ada3aa69c4c44f90217cbaea268ec7b0d1b31bb4d9eedacb
-EBUILD spirv-tools-9999.ebuild 989 BLAKE2B 339235087f10627cde2be63c6183ccd4c8466f495f2027e84be6970a88356aa9da65276969abf792d1adfc201935542e6d96a73dbaefc0e07f190ccd1ad2d00b SHA512 9e54b8ddf9a38a6e5dc6d5250be45cd5fedd80c3035cc71cbbd07d26bf737a36128eadbd644bb6e7bf8331e1ad73b9e6adf5b56cc6702138c8e6bbff8ce47356
+EBUILD spirv-tools-2019.1-r2.ebuild 1231 BLAKE2B 585217f738232ee88447426e44a254f2e782b95749ac026289ff8927a3cb0fb6925dd0a8a631326435dac1b1203e09b2c73a472442db27239b78dd445364f3eb SHA512 2d8f7b0a37f075a658de172c17bf88d05d53ca275b8b67b28556a2a616dc2c4d2c614116577b6e2a1ecdf0a7fa0104a56d721aee91b0665bcb48f8faf53ac276
+EBUILD spirv-tools-9999.ebuild 1112 BLAKE2B bf643168106b1edc414cf82e947322025da786b51599c06be58a1cbba958225f406d9da9a5a10cd770ad735ef2e751293e24a5cf0e12a0e3ce44731ad7d0e6b3 SHA512 6219dce97fca8bc0529aa6d45133d7b1bb0400ffce6fee2b7cb5ff727c49a07966275f512af99c92357bfeea0983dc91bf020244074272a8e29cc5c6c1484460
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2018.4.ebuild b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
index f8f03ba31210..3288e3612782 100644
--- a/dev-util/spirv-tools/spirv-tools-2018.4.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit cmake-multilib cmake-utils
+inherit cmake-multilib cmake-utils python-any-r1
 
 DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
 HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
@@ -16,10 +17,15 @@ KEYWORDS="~amd64 ~x86"
 # in the generated library. Easily hit with non-standard compiler flags
 RESTRICT="test"
 
+COMMON_DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
-DEPEND=">=dev-util/spirv-headers-1.3.1_pre20180710"
-EGIT_COMMIT="f508896d6487d09f5c9a2a3835595446fec0791a"
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
+
+EGIT_COMMIT="2297d4a3dfcbfd2a8b4312fab055ae26e3289fd3"
 S="${WORKDIR}/SPIRV-Tools-${PV}"
+PATCHES=( "${FILESDIR}"/${PN}-2019.1-Fix-vertex-instrumentation.patch )
 
 multilib_src_configure() {
 	local mycmakeargs=(
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 1df290d2083c..a30f91104a17 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit cmake-multilib cmake-utils git-r3
+inherit cmake-multilib cmake-utils git-r3 python-any-r1
 
 DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
 HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
@@ -15,9 +16,11 @@ 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.3.4_pre20190302"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
-DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302"
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
 
 multilib_src_configure() {
 	local mycmakeargs=(