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

[Nick Sarnie]

commit:     6d9abbc186bebdc5c2a00edc01082840bf740ce7
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 01:57:59 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun May 27 02:01:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d9abbc1

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

Reported-by: [Arfrever] on IRC

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild | 3 ++-
 media-libs/vulkan-tools/vulkan-tools-9999.ebuild        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild 
b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
index 97eb0ccd27b..143583c65a5 100644
--- a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
+++ b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.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/vulkan-headers

diff --git a/media-libs/vulkan-tools/vulkan-tools-9999.ebuild 
b/media-libs/vulkan-tools/vulkan-tools-9999.ebuild
index 97eb0ccd27b..143583c65a5 100644
--- a/media-libs/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/media-libs/vulkan-tools/vulkan-tools-9999.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/vulkan-headers