From: Nick Sarnie <sarnex@gentoo.org>
Date: Sun, 16 Jun 2019 00:08:17 +0000 (-0400)
Subject: dev-util/spirv-tools: Fix spirv-headers dependency
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ddc2c0ab491c99ea9299ce7e198b73e2beffdfb9;p=gentoo.git

dev-util/spirv-tools: Fix spirv-headers dependency

Just shoot me

Bug: https://bugs.gentoo.org/show_bug.cgi?id=688136
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
---

diff --git a/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
index 57c340b2d99f..3288e3612782 100644
--- a/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
@@ -17,10 +17,11 @@ KEYWORDS="~amd64 ~x86"
 # in the generated library. Easily hit with non-standard compiler flags
 RESTRICT="test"
 
-DEPEND=""
+COMMON_DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}
-	>=dev-util/spirv-headers-1.3.4_pre20190302"
+	${COMMON_DEPEND}"
 
 EGIT_COMMIT="2297d4a3dfcbfd2a8b4312fab055ae26e3289fd3"
 S="${WORKDIR}/SPIRV-Tools-${PV}"
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 07ff87f02689..416dca93c58c 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -16,11 +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"
-
-DEPEND=""
+COMMON_DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}
-	>=dev-util/spirv-headers-1.3.4_pre20190302"
+	${COMMON_DEPEND}"
 
 multilib_src_configure() {
 	local mycmakeargs=(