dev-util/glslang: Add blocker for new shaderc, drop old

Fixes: https://bugs.gentoo.org/698862
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>

diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 28c6d261b56a741baef787c618f01697db2f70a3..4634a6907a369cac67633385c50e2e1e53854e6a 100644 (file)
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,4 +1,3 @@
 DIST glslang-7.11.3114_pre20190415.tar.gz 2841827 BLAKE2B 7d1c46f05d0b5def4d9612f45d3c24b67a4497dc229bbaecdad8d2109ae17e5545a12dac04b42bf8102b8d2b3ca6919168d238da7c496a5713ece83a664101f8 SHA512 d75e5a7ceea305bacf489696c14a17209e9793ebc3efbacda8cc26b23fd7ff6c5d2b1b3348df108be6e9249862454e0584772f09f702d47374923c4cde491192
-DIST glslang-7.12.3352.tar.gz 2841827 BLAKE2B 7d1c46f05d0b5def4d9612f45d3c24b67a4497dc229bbaecdad8d2109ae17e5545a12dac04b42bf8102b8d2b3ca6919168d238da7c496a5713ece83a664101f8 SHA512 d75e5a7ceea305bacf489696c14a17209e9793ebc3efbacda8cc26b23fd7ff6c5d2b1b3348df108be6e9249862454e0584772f09f702d47374923c4cde491192
 DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7
 DIST glslang-7.9.2888.tar.gz 2370459 BLAKE2B 9dc5550dce1fd718a8050cec81ad94195b19cc36cc4321fe5def48051dd66de4f9c651b6c34a7363701b52afba9f8c6cd4c2264f38416bc911fd2dcdf5a88ca4 SHA512 9a067a5006596bf61cd20f09173e2d22db37a10413bba1b1bb6e5ad3ecf46701786977961e2da8bfa32b19ccb2cc0a04d765f65ae01b80148e9b3f52dbfa8737

diff --git a/dev-util/glslang/glslang-7.12.3352.ebuild b/dev-util/glslang/glslang-7.12.3352.ebuild
deleted file mode 100644 (file)
index 1fbfeb5..0000000
--- a/dev-util/glslang/glslang-7.12.3352.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib cmake-utils
-
-SNAPSHOT_COMMIT="0527c9db8148ce37442fa4a9c99a2a23ad50b0b7"
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
-
-LICENSE="BSD"
-SLOT="0"

diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild
index 8c95609eba7c5effdd6f42df432c5900ca662e60..c1e6eeb104d29846dc6b4dc6dfc3e746fbed787e 100644 (file)
--- a/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild
+++ b/dev-util/glslang/glslang-7.12.3353_pre20191027-r1.ebuild
@@ -18,5 +18,7 @@ SLOT="0"
 
 PATCHES=( "${FILESDIR}/${P}-fix-relative-includes.patch" )
 
+RDEPEND="!<media-libs/shaderc-2019-r1"
+
 # Bug 698850
 RESTRICT="test"

diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027.ebuild
deleted file mode 100644 (file)
index 9a66a27..0000000
--- a/dev-util/glslang/glslang-7.12.3353_pre20191027.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib cmake-utils
-
-SNAPSHOT_COMMIT="b131630e7c749a5dc19faa458024260c71fb170f"
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
-
-LICENSE="BSD"
-SLOT="0"