[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/

[Nick Sarnie]

commit:     d88c0e6f257aae9a66f3bb7c0a243f82d43599bd
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 01:56:00 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun May 27 02:01:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88c0e6f

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

 media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild | 3 ++-
 media-libs/vulkan-layers/vulkan-layers-9999.ebuild          | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild 
b/media-libs/vulkan-layers/vulkan-layers-0_pre20180526.ebuild
index 3bc4cc8e175..ca8180bed03 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 22742bd2161..ca8180bed03 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}]