gentoo Easter resync : 12.04.2020

4 files changed, 76 insertions, 11 deletions

diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index b12804b02bce..bd5c8958fe3d 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,6 +1,10 @@
 AUX glslang-7.12.3353_pre20191027-fix-relative-includes.patch 663 BLAKE2B 4d0e8efd9152610b16813d45251a83b8b685c07d3491c6bc1a1c2656ecabde2eed8840a53712bfd9aa9e6f047f332f56ead1e3c0d8185a81c4de0eb286f5d048 SHA512 db8bf5424aca0eb215db3059665eb7e6ffbbab029979de9f5b574e577274f6d0ca8a27acde10bd53769561eaae2996ec6da1a4916b2c39e82f343c33b120915f
 AUX glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch 4974 BLAKE2B 9bb7807618a2dd6c322244557bf93809c21631be064bde4fc659724c45cb27d3e615fecde8692658edc1e3d229b4daadfa2b51732ebddb5d49f85abdb3af5399 SHA512 a07654d40172d6669d3ee3c3685463dbd58cc163ce726a20db18237ab710044b011e511defc8828f7ccd8b4fc128bb38f75669686085f7572ce8cc98887266d3
 DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7
+DIST glslang-8.13.3559.tar.gz 3122936 BLAKE2B 856e6068a06407195f97478b3e6bd91aa619213d8468a8c9ff7ee8e7a36a904e4896e34e021e8e4e047fab6ea406d89206849058a659de8075c52a06118b0e7b SHA512 d2f09888dd1b6edb4f324502627aeca0c78411f61ab50e672fa2a6d9ae46611849e1d13b9c6069b77f31092d843abcf3d74ed7cfc3c9144ced80e65876f4b781
+DIST glslang-8.13.3560_pre20200404.tar.gz 3185684 BLAKE2B fac831212b46b22f10657ee44afc788d174779dd36e9d5f045f8e84ab3cca448aee89aab13771a29598b242653d6a29e4eb8fd8965e1c03ceec599e7ab1fafa9 SHA512 ec5b89d918cf55bb0a166f59eeea3662d54f29a986f979a9b04ab35bc8e02e5b01d13c24f336666669115f90d3d97eb91abe7ba4b9108590ec9b8a78e976223f
 EBUILD glslang-7.12.3353_pre20191027-r2.ebuild 848 BLAKE2B c21ffc390e783a2abae679b7c10b20b0f6b2c7c0240638a54b2717c0e65289006b367ddc96115f6234a3c999515314736011649283c14ec73aec8c37abd26710 SHA512 d6b739906ffc084106aa5dcd0182980c91a0874b1425f1eaa2b05e206597e2f7c807f87c02c8fca0db5c1f9860a378579cbfb4646f429bca72de672c151e87ee
-EBUILD glslang-9999.ebuild 617 BLAKE2B 30fd7c4245a34d125051b5f41cfe2aa37ba9fa3c921b464f5a6dca09af90a6dfffd13c0dc1551c0da2c56875842c08a2189243e4bd8009ec032d7b5d690d05fc SHA512 6b36df67fd05adc8e89af5da2775ccdd69b6c999b9c9f65808e3660e6d2eb089e52a841bf522d3647aeba7b617af0fcd08cc76b9c53f6d00e6de7e597f9fde9e
+EBUILD glslang-8.13.3559.ebuild 759 BLAKE2B 64a7cb4e904a835110d41ce432dbb04a2e60efd884daa5daea7f36eaa6356126793239889b0b69ce87ebdcaea2987550b84405c58553dd87276a579a61b788f2 SHA512 0a362fa37d32551a976a8ced67b9dee1556b3c8f5c90cdb7446643c4ea4f07e388bfc9594e9de9ad3daa5f8c638db3373ef6592566ed72349dd892c5a24777b6
+EBUILD glslang-8.13.3560_pre20200404.ebuild 884 BLAKE2B 126abfde9be25dbbbd33e08f45d8462f49e36fa617534f1307bcc9f0a8be8214c5fa7aa360fceb5987aa5a96aef13711533c7ab1a91dbafd5499864822eef1e4 SHA512 ffe09ee75aa4fcf0553d7304a9d326b36db517173b19d32f2e768ae74372216b396dac4180ee479ea8a6c1c5d339671b35293f0f9d6d2c77853389fe930ac188
+EBUILD glslang-9999.ebuild 770 BLAKE2B ea332118b323713227c3cf942ced066a9a787a989787051e92b330adf1c64285e3b2fdd7a78757c7128898131c5421403a5493aab30c4bec0b96b076b3696d31 SHA512 9adedff6a45bfada507ac9b09ee8d23d05cc6e957842273b11d88129a4c93c236ed6c4d65a20efaf7c42d19c073dd8733fbf70448bc3f2c7c9e434adc923d88d
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/glslang-8.13.3559.ebuild b/dev-util/glslang/glslang-8.13.3559.ebuild
new file mode 100644
index 000000000000..7ce2721cbd0d
--- /dev/null
+++ b/dev-util/glslang/glslang-8.13.3559.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+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-2019-r1"
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild b/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
new file mode 100644
index 000000000000..4279ffe872c9
--- /dev/null
+++ b/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/${PN}.git"
+	inherit git-r3
+else
+	SNAPSHOT_COMMIT="b5757b95005bbf6b0287096c5b708c5e25645311"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~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.4_pre20200405"
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index bbdb6606eab1..3d445bb75ed1 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -1,24 +1,27 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python{3_6,3_7})
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
 
-inherit cmake-multilib cmake-utils python-any-r1 git-r3
-
-EGIT_REPO_URI="https://github.com/KhronosGroup/glslang.git"
-SRC_URI=""
+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"
+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/"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
 
 LICENSE="BSD"
 SLOT="0"
 
-PATCHES=( "${FILESDIR}/${P}-fix-relative-includes.patch" )
-
-RDEPEND="!<media-libs/shaderc-2019-r1"
+RDEPEND="!<media-libs/shaderc-2020.4_pre20200405"
 BDEPEND="${PYTHON_DEPS}"
 
 # Bug 698850