From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 21 Jun 2020 17:50:24 +0100
Subject: gentoo resync : 21.06.2020

---
 dev-util/glslang/Manifest                          |  8 +++---
 .../glslang/glslang-8.13.3560_pre20200404.ebuild   |  4 +--
 dev-util/glslang/glslang-8.13.3743-r1.ebuild       | 30 ++++++++++++++++++++++
 dev-util/glslang/glslang-8.13.3743.ebuild          | 30 ----------------------
 dev-util/glslang/glslang-9999.ebuild               |  2 +-
 dev-util/glslang/metadata.xml                      |  4 ---
 6 files changed, 37 insertions(+), 41 deletions(-)
 create mode 100644 dev-util/glslang/glslang-8.13.3743-r1.ebuild
 delete mode 100644 dev-util/glslang/glslang-8.13.3743.ebuild

(limited to 'dev-util/glslang')

diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 89c04930a9e7..d7832b2c907d 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -6,7 +6,7 @@ DIST glslang-8.13.3560_pre20200404.tar.gz 3185684 BLAKE2B fac831212b46b22f10657e
 DIST glslang-8.13.3743.tar.gz 3183453 BLAKE2B 2e8fc3693477be8bd6f8000a0eb032b314f5903991dc5a73dbd913a92aa0d6878e45f29f0a01ca5e8453b566d8a503a3cf4256def7f90a4cb561391b047c2a1d SHA512 19169c4ffa511113978af8e8efc57b290d4aa962a4c2429dbea1af72204787c6ce20ffbbb452dc04bef5416e00510819d84463a2e76295b9a59b409e12af6792
 EBUILD glslang-7.12.3353_pre20191027-r2.ebuild 848 BLAKE2B c21ffc390e783a2abae679b7c10b20b0f6b2c7c0240638a54b2717c0e65289006b367ddc96115f6234a3c999515314736011649283c14ec73aec8c37abd26710 SHA512 d6b739906ffc084106aa5dcd0182980c91a0874b1425f1eaa2b05e206597e2f7c807f87c02c8fca0db5c1f9860a378579cbfb4646f429bca72de672c151e87ee
 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-8.13.3743.ebuild 849 BLAKE2B 74e7eb4b4ce2b001829b8c5f4056a37781be2497d9bfe4ffcd217e369e3bf0543fd93bed9c52c4141ddd769b682a5a3b649dd6c5ef45c1b5dc3a318d6ec63077 SHA512 31a3b832468a9145df12525d531107cf1583b9982ed05dbe53ec6b83d015e4231412f9cd0d9c2bf7891c2288f94e910c4befa33238f377439a9c3560943bf3bc
-EBUILD glslang-9999.ebuild 770 BLAKE2B ea332118b323713227c3cf942ced066a9a787a989787051e92b330adf1c64285e3b2fdd7a78757c7128898131c5421403a5493aab30c4bec0b96b076b3696d31 SHA512 9adedff6a45bfada507ac9b09ee8d23d05cc6e957842273b11d88129a4c93c236ed6c4d65a20efaf7c42d19c073dd8733fbf70448bc3f2c7c9e434adc923d88d
-MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
+EBUILD glslang-8.13.3560_pre20200404.ebuild 870 BLAKE2B a79d014151d18393e8fc95cd4bf3ca7eb859ba7250665ea97d3f77c60973dd496c0ca82a1c0f90d5870bcb6b2e87d5fb29ee9bc968b70b9df6900cdc90827f6b SHA512 47ad53da564d55ab780b5a69abcc232798f2c48b9babf9391416abf34a8f7871ffbb27d6893cf98caf56cf079b3885f06e8b6e60a3407a5e051938beef7b8cd7
+EBUILD glslang-8.13.3743-r1.ebuild 835 BLAKE2B d23510edf3f2238c6a720c5c8a8eb0a2c296c2afa04201cfee0ae04f154602e2c3db5226a428b7aff1b167ba2c2ddd05587e589c11ce733da2436b8b67f9f724 SHA512 dc922535ee006ae074b42bdd462fe552575fb922c0faa886db3d960e768f19baf680860e4eb4b545f6f5156cc5343e59c660a2f4ee93b7aa550e630372fb2f00
+EBUILD glslang-9999.ebuild 758 BLAKE2B f4f9a1e734aff4245c035d872d6c3a04abebf472730398d666bddab58cda002843b4dd9f06eac7d652c4db176cc9333e025ad27ddd1752a509786e12e341f9d1 SHA512 dc7eed08504ce61a142ad4ab3e6a9cdef360163dc5deb29dc61823ddf25f4915abfc0e127900c0acaeea3173e46c2fc152eaff41bdb6313861b04c052c57925f
+MISC metadata.xml 330 BLAKE2B fd98c615a1b5c3364e122b66d18e9667ff1bae51218e2474862a0376f352421cfbe7aa3b4f9751ff8e8f24510f4a6e3f0e1977ca759b566b54f48fa45243980c SHA512 9658890a6aa3ae0c91e71416c3996d9c8064bb970521b5c444d617fc4a51ef2edb62aa7d44b25ef96768417de0c5478999e74405c6d9ff847816311990c945ee
diff --git a/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild b/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
index 4279ffe872c9..b39594040ce6 100644
--- a/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
+++ b/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="b5757b95005bbf6b0287096c5b708c5e25645311"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https:/
 LICENSE="BSD"
 SLOT="0"
 
-RDEPEND="!<media-libs/shaderc-2020.4_pre20200405"
+RDEPEND="!<media-libs/shaderc-2020.1"
 BDEPEND="${PYTHON_DEPS}"
 
 # Bug 698850
diff --git a/dev-util/glslang/glslang-8.13.3743-r1.ebuild b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
new file mode 100644
index 000000000000..c6ed470a423f
--- /dev/null
+++ b/dev-util/glslang/glslang-8.13.3743-r1.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="${PV}"
+	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.1"
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/glslang/glslang-8.13.3743.ebuild b/dev-util/glslang/glslang-8.13.3743.ebuild
deleted file mode 100644
index a899b7455579..000000000000
--- a/dev-util/glslang/glslang-8.13.3743.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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="${PV}"
-	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 3d445bb75ed1..169c585773e9 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https:/
 LICENSE="BSD"
 SLOT="0"
 
-RDEPEND="!<media-libs/shaderc-2020.4_pre20200405"
+RDEPEND="!<media-libs/shaderc-2020.1"
 BDEPEND="${PYTHON_DEPS}"
 
 # Bug 698850
diff --git a/dev-util/glslang/metadata.xml b/dev-util/glslang/metadata.xml
index 241e7de59999..c277a8030673 100644
--- a/dev-util/glslang/metadata.xml
+++ b/dev-util/glslang/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
-- 
cgit v1.2.3