[gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-tools/

[Matt Turner]

commit:     5daea9c2505d4170edd2600a7c2fc63a1aec100a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 20:09:42 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 21:28:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5daea9c2

dev-util/spirv-tools: 9999 cleanup, cmake.eclass

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/spirv-tools/spirv-tools-9999.ebuild | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild 
b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 0d2943714b8..8110b4fa3de 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -2,14 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+MY_PN=SPIRV-Tools
+CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{6,7} )
+inherit cmake-multilib python-any-r1
 
-inherit cmake-multilib cmake-utils git-r3 python-any-r1
+if [[ ${PV} == *9999* ]]; then
+       EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git";
+       inherit git-r3
+else
+       SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+       KEYWORDS="~amd64 ~ppc64 ~x86"
+       S="${WORKDIR}"/${MY_PN}-${PV}
+fi
 
 DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
 HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools";
-EGIT_REPO_URI="https://github.com/KhronosGroup/SPIRV-Tools.git";
-SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -28,13 +37,5 @@ multilib_src_configure() {
                "-DSPIRV_WERROR=OFF"
        )
 
-       cmake-utils_src_configure
-}
-
-multilib_src_install() {
-       cmake-utils_src_install
-
-       # create a header file with the commit hash of the current revision
-       # vulkan-tools needs this to build
-       echo "${EGIT_VERSION}" > "${D}/usr/include/${PN}/${PN}-commit.h" || die
+       cmake_src_configure
 }