From: Nick Sarnie Date: Sun, 27 May 2018 01:53:00 +0000 (-0400) Subject: dev-util/vulkan-headers: Block against old vulkan-loader packaging X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7e6676a6b59fa281f7e2ddf4d16f67b33250f92b;p=gentoo.git dev-util/vulkan-headers: Block against old vulkan-loader packaging Reported-by: [Arfrever] on IRC Package-Manager: Portage-2.3.40, Repoman-2.3.9 --- diff --git a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild b/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild index 6ee6d098e650..531392083dfb 100644 --- a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild +++ b/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild @@ -19,6 +19,9 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers" LICENSE="Apache-2.0" SLOT="0" +# Old packaging will cause file collisions +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" + src_install() { mkdir "include/vulkan/registry" || die mv "registry/" "include/vulkan/" || die diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild index 6ee6d098e650..531392083dfb 100644 --- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild +++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild @@ -19,6 +19,9 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers" LICENSE="Apache-2.0" SLOT="0" +# Old packaging will cause file collisions +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" + src_install() { mkdir "include/vulkan/registry" || die mv "registry/" "include/vulkan/" || die