1 |
commit: 7e6676a6b59fa281f7e2ddf4d16f67b33250f92b |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 27 01:53:00 2018 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 27 02:01:27 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e6676a6 |
7 |
|
8 |
dev-util/vulkan-headers: Block against old vulkan-loader packaging |
9 |
|
10 |
Reported-by: [Arfrever] on IRC |
11 |
|
12 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
13 |
|
14 |
dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild | 3 +++ |
15 |
dev-util/vulkan-headers/vulkan-headers-9999.ebuild | 3 +++ |
16 |
2 files changed, 6 insertions(+) |
17 |
|
18 |
diff --git a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild b/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild |
19 |
index 6ee6d098e65..531392083df 100644 |
20 |
--- a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild |
21 |
+++ b/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild |
22 |
@@ -19,6 +19,9 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers" |
23 |
LICENSE="Apache-2.0" |
24 |
SLOT="0" |
25 |
|
26 |
+# Old packaging will cause file collisions |
27 |
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" |
28 |
+ |
29 |
src_install() { |
30 |
mkdir "include/vulkan/registry" || die |
31 |
mv "registry/" "include/vulkan/" || die |
32 |
|
33 |
diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild |
34 |
index 6ee6d098e65..531392083df 100644 |
35 |
--- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild |
36 |
+++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild |
37 |
@@ -19,6 +19,9 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers" |
38 |
LICENSE="Apache-2.0" |
39 |
SLOT="0" |
40 |
|
41 |
+# Old packaging will cause file collisions |
42 |
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" |
43 |
+ |
44 |
src_install() { |
45 |
mkdir "include/vulkan/registry" || die |
46 |
mv "registry/" "include/vulkan/" || die |