projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d88c0e6)
media-libs/vulkan-tools: Block against old vulkan-loader packaging
authorNick Sarnie <sarnex@gentoo.org>
Sun, 27 May 2018 01:57:59 +0000 (21:57 -0400)
committerNick Sarnie <sarnex@gentoo.org>
Sun, 27 May 2018 02:01:29 +0000 (22:01 -0400)
Reported-by: [Arfrever] on IRC
Package-Manager: Portage-2.3.40, Repoman-2.3.9

media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild patch | blob | history
media-libs/vulkan-tools/vulkan-tools-9999.ebuild patch | blob | history

diff --git a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild b/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild
index 97eb0ccd27b29e1e79d83fbc600bac91f9ecd67b..143583c65a595713c126957dab773a142f809068 100644 (file)
--- 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 97eb0ccd27b29e1e79d83fbc600bac91f9ecd67b..143583c65a595713c126957dab773a142f809068 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.