From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3DDCC138350 for ; Sun, 15 Mar 2020 21:29:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DC29E113F; Sun, 15 Mar 2020 21:29:01 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1DD99E113B for ; Sun, 15 Mar 2020 21:29:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A36734F19B for ; Sun, 15 Mar 2020 21:29:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B33AF189 for ; Sun, 15 Mar 2020 21:28:56 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1584307683.984453799aed4f177fe0a681d2f52dd07a6e609a.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/vulkan-headers/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/vulkan-headers/vulkan-headers-9999.ebuild X-VCS-Directories: dev-util/vulkan-headers/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 984453799aed4f177fe0a681d2f52dd07a6e609a X-VCS-Branch: master Date: Sun, 15 Mar 2020 21:28:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 627dbe98-e2cc-45ab-a39a-219d1bb42e5b X-Archives-Hash: 1a4b1ee959f3d65c0b5bb3e64cfc33aa commit: 984453799aed4f177fe0a681d2f52dd07a6e609a Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Mar 11 18:48:58 2020 +0000 Commit: Matt Turner gentoo 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 gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/14927 Signed-off-by: Matt Turner 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="!