[gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-headers/

[Nick Sarnie]

commit:     26871dd47a92e0468cd80f04c78aab7e47cb13dd
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 11:11:17 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 11:34:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26871dd4

dev-util/vulkan-headers: Support install target, resnapshot, drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/vulkan-headers/Manifest                              |  2 +-
 ...s-0_p20180526.ebuild => vulkan-headers-0_p20180601.ebuild} | 11 +++--------
 dev-util/vulkan-headers/vulkan-headers-9999.ebuild            | 11 +++--------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 15c4e47500f..889ce1c830f 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1 +1 @@
-DIST vulkan-headers-0_p20180526.tar.gz 451276 BLAKE2B 
7090189d4620c32f80ee9ca2e515f3e563c5ab32d695d8a6f34396071fa54989e6048f42de54c32f28fe0a2ba5d18c2028be35793153acadaaa1377b8172787c
 SHA512 
a6af6dbfcc5512b7a303dad3e9e31a0eb09559da94b71dfb0dc21494e66ac973f5349abdfde1e6ed5d02445f32e5d251070ce45bc73964bec51cb0ffc3930d55
+DIST vulkan-headers-0_p20180601.tar.gz 451276 BLAKE2B 
7090189d4620c32f80ee9ca2e515f3e563c5ab32d695d8a6f34396071fa54989e6048f42de54c32f28fe0a2ba5d18c2028be35793153acadaaa1377b8172787c
 SHA512 
a6af6dbfcc5512b7a303dad3e9e31a0eb09559da94b71dfb0dc21494e66ac973f5349abdfde1e6ed5d02445f32e5d251070ce45bc73964bec51cb0ffc3930d55

diff --git a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild 
b/dev-util/vulkan-headers/vulkan-headers-0_p20180601.ebuild
similarity index 75%
rename from dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild
rename to dev-util/vulkan-headers/vulkan-headers-0_p20180601.ebuild
index 531392083df..d6e2cd6c487 100644
--- a/dev-util/vulkan-headers/vulkan-headers-0_p20180526.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-0_p20180601.ebuild
@@ -3,11 +3,13 @@
 
 EAPI=6
 
+inherit cmake-utils
+
 if [[ "${PV}" == "9999" ]]; then
        EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git";
        inherit git-r3
 else
-       EGIT_COMMIT="a901a3edf256c1a1441433e77feac919fb8e5ed6"
+       EGIT_COMMIT="afd12b7bdcd63bf4d8d669d6e06a368a0954b6e3"
        KEYWORDS="~amd64"
        
SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
        S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
@@ -21,10 +23,3 @@ 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
-       insinto /usr/include/vulkan
-       doins -r include/vulkan/*
-}

diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild 
b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
index 531392083df..d6e2cd6c487 100644
--- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
@@ -3,11 +3,13 @@
 
 EAPI=6
 
+inherit cmake-utils
+
 if [[ "${PV}" == "9999" ]]; then
        EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git";
        inherit git-r3
 else
-       EGIT_COMMIT="a901a3edf256c1a1441433e77feac919fb8e5ed6"
+       EGIT_COMMIT="afd12b7bdcd63bf4d8d669d6e06a368a0954b6e3"
        KEYWORDS="~amd64"
        
SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
        S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
@@ -21,10 +23,3 @@ 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
-       insinto /usr/include/vulkan
-       doins -r include/vulkan/*
-}