commit: 7e6676a6b59fa281f7e2ddf4d16f67b33250f92b Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Sun May 27 01:53:00 2018 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Sun May 27 02:01:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e6676a6
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 dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild | 3 +++ dev-util/vulkan-headers/vulkan-headers-9999.ebuild | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild b/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild index 6ee6d098e65..531392083df 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 6ee6d098e65..531392083df 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
