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 6ee6d098e650637bff09b91c14a096e3871343fa..531392083dfb000d0595b1bed3d79c3c6f3716aa 100644 (file)
--- 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 6ee6d098e650637bff09b91c14a096e3871343fa..531392083dfb000d0595b1bed3d79c3c6f3716aa 100644 (file)
--- 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