gentoo resync : 05.12.2021

4 files changed, 39 insertions, 5 deletions

diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 240568f9ddb0..26afafe19b00 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,10 +1,12 @@
+DIST glslang-1.2.198.tar.gz 3427490 BLAKE2B 0a9b116665e12aaff61b3c9628bba2b6ad6fe0ca7fa9954f568a3a1a0d4cbc41975446fc6760eef09bdea6a5d4aa746957b54972a0556f04c8ac39ba3e6241f9 SHA512 99cb60b01dd017533bcfd3fb258f1cad8c8fc90bc90efe346460e10f7887d7dc16468c93a5ae3bacc7579a31f58c2efc34c7e473515f07d03d2308894778bab5
 DIST glslang-10.11.0.0_pre20201216.tar.gz 3290064 BLAKE2B 46ce951ab6c69eb25dc2490e3eb817c5cc0e2bf2416f29842b45bb1efb83ea439d72c823c981e2f37803e203077ea01d1c84c28391fb78288c107510a47d2241 SHA512 4b9e300152dc2ec3b14657b3a745d5b26b5da49e5ff3da0d75680f84126237ec6af0f7cee5aaa74b2d4a123a386522cd7342b5f25e4c01f114da3d5d92057128
 DIST glslang-11.2.0.tar.gz 3295235 BLAKE2B 42417f3be070a57f0c71f5a0c81ffcf4938044c74fd59435fad6889b74c077032fda18e73971db41b180341c1eb6bcdc24081d5ff57fb9baf36c32fbfac9e67a SHA512 0d6cd866c4e28069dbc2c5f0ceba2acab73356751499f8fe81177357c61b2bdae92d2502c47889687d57094dd9fd59b78a06234de1d9c4989a204f9ce3c73751
 DIST glslang-11.4.0.tar.gz 3342311 BLAKE2B 880f2c5bc2afe5c28b4c9246faed5a12492e24d1f3d75a0df036457ed7767541a18757d368e2298dd7e8e4f8ca9a2a168973274ea6364453130b2928bce4d991 SHA512 e507ff5420a192133dd25b3f1d18dfa4a20c7fff9908e58bad5a7ddf8119989977c2a180575cc24b3434cab4a7cc7559a3254676f6298c0fa3b82dc9e802e1f5
 DIST glslang-11.6.0.tar.gz 3419655 BLAKE2B fb510b0e6e5986da117fb3d1ea7f1c543c5ace7053693b813c16c038c980f1123bdc6936dce67e313a401012753cbb900b8760282b80e9257d981f7325ec3d91 SHA512 f7c1affdb4923758f9ff5cae894c40ca86e723850a6265d9c13f996311451bd84c70a178d8d6c0961dcee39c19d724f02d19a21ee6f67f1bb4cdbc618fdc12cf
+EBUILD glslang-1.2.198.ebuild 867 BLAKE2B f8b8c799fbaaf24f50814d4db0ca6f0b62cb84ea6f2077d4dc85ed6d2b01eb95545f3df99319df95897018cde5fc5a2addb47e0ecd57178c3982ec2200c46b55 SHA512 7635edd8c0b92a1370b88c38ac9ddaae253467935b9425dfeac3c07c121508b83440aee64939ec53b62c5c11d8a6572ca485e4df6288952e183385eeebec5288
 EBUILD glslang-10.11.0.0_pre20201216.ebuild 890 BLAKE2B d2ae97e1228f30154c2e0674284aeee59943c6b97c619a594106e0765353c14a58e5a03ab03a024a934ccd6b6d66091764af9ad181dc79f577a495037415ef77 SHA512 889bd334d5a13e3ad22e97de659687bdcdc575f30cb45e21a4c253e469181008a5fdb05ef6ca5a21dc03ae22ef3ebbcf88ac8d09941c1d7ce0442942d826f5a0
 EBUILD glslang-11.2.0.ebuild 855 BLAKE2B 76f4c363a7ef228854cd948e1017f92c5cda2bca6240a4e011745775981a35266e06a84d9aa77092d111b4685218027facdf7390a020f1bfb074598ce5529ea7 SHA512 c6032b4b76e3cdcb80ff17e7c6dacc1df7930fc58869a6a48df3132665f4ad6661cf3b726f70ad2b5ee660331f90daa1607285aec6dbabcaa063e3b41d963f5f
 EBUILD glslang-11.4.0.ebuild 855 BLAKE2B 76f4c363a7ef228854cd948e1017f92c5cda2bca6240a4e011745775981a35266e06a84d9aa77092d111b4685218027facdf7390a020f1bfb074598ce5529ea7 SHA512 c6032b4b76e3cdcb80ff17e7c6dacc1df7930fc58869a6a48df3132665f4ad6661cf3b726f70ad2b5ee660331f90daa1607285aec6dbabcaa063e3b41d963f5f
-EBUILD glslang-11.6.0.ebuild 859 BLAKE2B cab542c2f789c6464b1bdc17eaee365fb5c1e75b3868a316c16c077b7d5be2f1b24c4733f74a1d80e43506c23fd3d2b6b42f377980aaa12a91f09fcec424842d SHA512 34847bce96d7556c4c924aec8d38faf539ff52638e0bc15c99e2d6169048b5d4d23982a5a4aa23d9fd7a3afd47ca130b13bb1d1dac3fafdce087e9135d95789e
-EBUILD glslang-9999.ebuild 758 BLAKE2B 6a3a5b145b048e33843d1db82b7bc94765b793a87c264e45e351a62d1d1162252e1f718fe62f859145a6ab83fb1c286ef9df26e9ed7d80646f5c0e58a541194b SHA512 6d3e6b61e5b5680b37c8cfde18db1de5d28de91211fd1d7d2a2d347ee4e1573ce7d6008d6ced6f76251bf7f629334ea706b281ca4db6d0011054ab4362bc4418
+EBUILD glslang-11.6.0.ebuild 855 BLAKE2B 7d5a61cba5c8c36628699b6f9163e4dff6a130bcf4ec0e41f4d8c55be4b1f6fe9f664bc54cd9fd722ddb7b7a3e6c7ff89bd21748a7b636deb52d63ecff1b9c31 SHA512 b06f1f89d28402281646ab12f7ece620add9b7794281f1d5f7662e645e82371ea87a7a089e1db07a38454d93d7bf3e95931a69cf2f3711ea283490ae5ed1e00d
+EBUILD glslang-9999.ebuild 867 BLAKE2B f8b8c799fbaaf24f50814d4db0ca6f0b62cb84ea6f2077d4dc85ed6d2b01eb95545f3df99319df95897018cde5fc5a2addb47e0ecd57178c3982ec2200c46b55 SHA512 7635edd8c0b92a1370b88c38ac9ddaae253467935b9425dfeac3c07c121508b83440aee64939ec53b62c5c11d8a6572ca485e4df6288952e183385eeebec5288
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/glslang-1.2.198.ebuild b/dev-util/glslang/glslang-1.2.198.ebuild
new file mode 100644
index 000000000000..43b82f26880a
--- /dev/null
+++ b/dev-util/glslang/glslang-1.2.198.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	SNAPSHOT_COMMIT="sdk-${PV}.0"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="!<media-libs/shaderc-2020.1"
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/glslang/glslang-11.6.0.ebuild b/dev-util/glslang/glslang-11.6.0.ebuild
index 1780e47fb90f..70c8c55c9057 100644
--- a/dev-util/glslang/glslang-11.6.0.ebuild
+++ b/dev-util/glslang/glslang-11.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="${PV}"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index bae2c9f13ff2..43b82f26880a 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -11,8 +11,10 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	SNAPSHOT_COMMIT="sdk-${PV}.0"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
 DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"