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 C93EF138351 for ; Sun, 15 Mar 2020 21:29:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7093E110C; Sun, 15 Mar 2020 21:28:59 +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 945F0E110C for ; Sun, 15 Mar 2020 21:28:59 +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 53BDA34F19C for ; Sun, 15 Mar 2020 21:28:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77AD5186 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: <1584307682.c1d34d8955cd9d7327a56cbe8f8ed895215527be.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/glslang/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/glslang/glslang-9999.ebuild X-VCS-Directories: dev-util/glslang/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: c1d34d8955cd9d7327a56cbe8f8ed895215527be 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: 0131ac03-2c2b-48d5-848e-0f1e521de8b5 X-Archives-Hash: 0c86b1e2c3af295c77b55411ce66a354 commit: c1d34d8955cd9d7327a56cbe8f8ed895215527be Author: Matt Turner gentoo org> AuthorDate: Sun Mar 15 20:42:57 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Mar 15 21:28:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d34d89 dev-util/glslang: 9999 cleanup, cmake.eclass Signed-off-by: Matt Turner gentoo.org> dev-util/glslang/glslang-9999.ebuild | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild index bbdb6606eab..6de396f95da 100644 --- a/dev-util/glslang/glslang-9999.ebuild +++ b/dev-util/glslang/glslang-9999.ebuild @@ -1,23 +1,26 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=(python{3_6,3_7}) +CMAKE_ECLASS="cmake" +PYTHON_COMPAT=( python3_{6,7} ) +inherit cmake-multilib python-any-r1 -inherit cmake-multilib cmake-utils python-any-r1 git-r3 - -EGIT_REPO_URI="https://github.com/KhronosGroup/glslang.git" -SRC_URI="" +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~ppc64 ~x86" +fi DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator" -HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/" +HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang" LICENSE="BSD" SLOT="0" -PATCHES=( "${FILESDIR}/${P}-fix-relative-includes.patch" ) - RDEPEND="!