From: Nick Sarnie <sarnex@gentoo.org>
Date: Sun, 27 May 2018 01:56:00 +0000 (-0400)
Subject: media-libs/vulkan-layers: Block against old vulkan-loader packaging
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d88c0e6f257aae9a66f3bb7c0a243f82d43599bd;p=gentoo.git

media-libs/vulkan-layers: Block against old vulkan-loader packaging

Reported-by: [Arfrever] on IRC

Package-Manager: Portage-2.3.40, Repoman-2.3.9
---

diff --git a/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild b/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild
index 3bc4cc8e1751..ca8180bed039 100644
--- a/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild
@@ -24,7 +24,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="X wayland"
 
-RDEPEND=""
+# Old packaging will cause file collisions
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
 DEPEND="${PYTHON_DEPS}
 		dev-util/glslang:=[${MULTILIB_USEDEP}]
 		>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 22742bd21619..ca8180bed039 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="0759b0fd2cd4d1db9b3968cb2684872c1fb11628"
+	EGIT_COMMIT="6a354a5200df761a7a7fabc338e9c1b81961919b"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
@@ -24,7 +24,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="X wayland"
 
-RDEPEND=""
+# Old packaging will cause file collisions
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
 DEPEND="${PYTHON_DEPS}
 		dev-util/glslang:=[${MULTILIB_USEDEP}]
 		>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]