commit:     984453799aed4f177fe0a681d2f52dd07a6e609a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 18:48:58 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 21:28:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98445379

dev-util/vulkan-headers: 9999 cleanup, cmake.eclass, >=cmake-3.10.2

Fix ebuild style (order variables to more resemble skel.ebuild).
Drop SNAPSHOT_COMMIT which looks like a local quirk.

Bug: https://bugs.gentoo.org/712090
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/14927
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/vulkan-headers/vulkan-headers-9999.ebuild | 27 ++++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild 
b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
index 5a328302ddb..0e6fb86ea21 100644
--- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
@@ -3,29 +3,26 @@
 
 EAPI=7
 
-inherit cmake-utils
+MY_PN=Vulkan-Headers
+inherit cmake
 
-if [[ "${PV}" == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git";
+if [[ ${PV} == *9999* ]]; then
+       EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git";
        inherit git-r3
 else
-       if [[ -z ${SNAPSHOT_COMMIT} ]]; then
-               MY_PV=v${PV}
-               MY_P=Vulkan-Headers-${PV}
-       else
-               MY_PV=${SNAPSHOT_COMMIT}
-               MY_P=Vulkan-Headers-${SNAPSHOT_COMMIT}
-       fi
+       SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
        KEYWORDS="~amd64 ~ppc64 ~x86"
-       
SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${MY_PV}.tar.gz 
-> ${P}.tar.gz"
-       S="${WORKDIR}"/${MY_P}
+       S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
-RDEPEND="!<dev-util/vulkan-tools-1.1.124
-        !<media-libs/vulkan-layers-1.1.125"
-
 DESCRIPTION="Vulkan Header files and API registry"
 HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers";
 
 LICENSE="Apache-2.0"
 SLOT="0"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+RDEPEND="
+       !<dev-util/vulkan-tools-1.1.124
+       !<media-libs/vulkan-layers-1.1.125
+"

Reply via email to