Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-headers/
Date: Sat, 02 Jun 2018 11:35:01
Message-Id: 1527939277.26871dd47a92e0468cd80f04c78aab7e47cb13dd.sarnex@gentoo
1 commit: 26871dd47a92e0468cd80f04c78aab7e47cb13dd
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 2 11:11:17 2018 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 2 11:34:37 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26871dd4
7
8 dev-util/vulkan-headers: Support install target, resnapshot, drop old
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 dev-util/vulkan-headers/Manifest | 2 +-
13 ...s-0_p20180526.ebuild => vulkan-headers-0_p20180601.ebuild} | 11 +++--------
14 dev-util/vulkan-headers/vulkan-headers-9999.ebuild | 11 +++--------
15 3 files changed, 7 insertions(+), 17 deletions(-)
16
17 diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
18 index 15c4e47500f..889ce1c830f 100644
19 --- a/dev-util/vulkan-headers/Manifest
20 +++ b/dev-util/vulkan-headers/Manifest
21 @@ -1 +1 @@
22 -DIST vulkan-headers-0_p20180526.tar.gz 451276 BLAKE2B 7090189d4620c32f80ee9ca2e515f3e563c5ab32d695d8a6f34396071fa54989e6048f42de54c32f28fe0a2ba5d18c2028be35793153acadaaa1377b8172787c SHA512 a6af6dbfcc5512b7a303dad3e9e31a0eb09559da94b71dfb0dc21494e66ac973f5349abdfde1e6ed5d02445f32e5d251070ce45bc73964bec51cb0ffc3930d55
23 +DIST vulkan-headers-0_p20180601.tar.gz 451276 BLAKE2B 7090189d4620c32f80ee9ca2e515f3e563c5ab32d695d8a6f34396071fa54989e6048f42de54c32f28fe0a2ba5d18c2028be35793153acadaaa1377b8172787c SHA512 a6af6dbfcc5512b7a303dad3e9e31a0eb09559da94b71dfb0dc21494e66ac973f5349abdfde1e6ed5d02445f32e5d251070ce45bc73964bec51cb0ffc3930d55
24
25 diff --git a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild b/dev-util/vulkan-headers/vulkan-headers-0_p20180601.ebuild
26 similarity index 75%
27 rename from dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild
28 rename to dev-util/vulkan-headers/vulkan-headers-0_p20180601.ebuild
29 index 531392083df..d6e2cd6c487 100644
30 --- a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild
31 +++ b/dev-util/vulkan-headers/vulkan-headers-0_p20180601.ebuild
32 @@ -3,11 +3,13 @@
33
34 EAPI=6
35
36 +inherit cmake-utils
37 +
38 if [[ "${PV}" == "9999" ]]; then
39 EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
40 inherit git-r3
41 else
42 - EGIT_COMMIT="a901a3edf256c1a1441433e77feac919fb8e5ed6"
43 + EGIT_COMMIT="afd12b7bdcd63bf4d8d669d6e06a368a0954b6e3"
44 KEYWORDS="~amd64"
45 SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
46 S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
47 @@ -21,10 +23,3 @@ SLOT="0"
48
49 # Old packaging will cause file collisions
50 RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
51 -
52 -src_install() {
53 - mkdir "include/vulkan/registry" || die
54 - mv "registry/" "include/vulkan/" || die
55 - insinto /usr/include/vulkan
56 - doins -r include/vulkan/*
57 -}
58
59 diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
60 index 531392083df..d6e2cd6c487 100644
61 --- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
62 +++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
63 @@ -3,11 +3,13 @@
64
65 EAPI=6
66
67 +inherit cmake-utils
68 +
69 if [[ "${PV}" == "9999" ]]; then
70 EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
71 inherit git-r3
72 else
73 - EGIT_COMMIT="a901a3edf256c1a1441433e77feac919fb8e5ed6"
74 + EGIT_COMMIT="afd12b7bdcd63bf4d8d669d6e06a368a0954b6e3"
75 KEYWORDS="~amd64"
76 SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
77 S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
78 @@ -21,10 +23,3 @@ SLOT="0"
79
80 # Old packaging will cause file collisions
81 RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
82 -
83 -src_install() {
84 - mkdir "include/vulkan/registry" || die
85 - mv "registry/" "include/vulkan/" || die
86 - insinto /usr/include/vulkan
87 - doins -r include/vulkan/*
88 -}