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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0994615808C for ; Sun, 27 Feb 2022 16:47:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D018E086C; Sun, 27 Feb 2022 16:47:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 32A68E086C for ; Sun, 27 Feb 2022 16:47:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16BDA3430B6 for ; Sun, 27 Feb 2022 16:47:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A6110287 for ; Sun, 27 Feb 2022 16:47:06 +0000 (UTC) From: "Matthew Smith" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Smith" Message-ID: <1645980406.2efcfefd9943f41b4d4f7e0d03581c247f80f7c9.matthew@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/tree-sitter/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/tree-sitter/tree-sitter-9999.ebuild X-VCS-Directories: dev-libs/tree-sitter/ X-VCS-Committer: matthew X-VCS-Committer-Name: Matthew Smith X-VCS-Revision: 2efcfefd9943f41b4d4f7e0d03581c247f80f7c9 X-VCS-Branch: master Date: Sun, 27 Feb 2022 16:47:06 +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: 5c2281b1-2d7e-42ce-aee8-6f174cc5f64b X-Archives-Hash: f83ebe262558a713e91cc3c26043d18d commit: 2efcfefd9943f41b4d4f7e0d03581c247f80f7c9 Author: Matthew Smith gentoo org> AuthorDate: Sun Feb 27 16:21:18 2022 +0000 Commit: Matthew Smith gentoo org> CommitDate: Sun Feb 27 16:46:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2efcfefd dev-libs/tree-sitter: remove USE=ts-cli from live ebuild Should have been part of previous commit, 7a89ddd17a5cee5991d3ee6596a0e9720e794750. Signed-off-by: Matthew Smith gentoo.org> dev-libs/tree-sitter/tree-sitter-9999.ebuild | 50 +++++++--------------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/dev-libs/tree-sitter/tree-sitter-9999.ebuild b/dev-libs/tree-sitter/tree-sitter-9999.ebuild index 74713d7aef17..9800235d12bc 100644 --- a/dev-libs/tree-sitter/tree-sitter-9999.ebuild +++ b/dev-libs/tree-sitter/tree-sitter-9999.ebuild @@ -1,11 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 - -CARGO_OPTIONAL=1 - -inherit toolchain-funcs cargo +inherit optfeature toolchain-funcs DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library" HOMEPAGE="https://github.com/tree-sitter/tree-sitter" @@ -14,50 +11,27 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/${PN}/${PN}" else - SRC_URI=" - https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - ts-cli? ( $(cargo_crate_uris) ) - " + SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -LICENSE="MIT ts-cli? ( Apache-2.0 BSD-2 CC0-1.0 ISC MIT )" +LICENSE="MIT" SLOT="0" -IUSE="ts-cli" - -BDEPEND="ts-cli? ( virtual/rust )" - -PATCHES=( - "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" -) - -src_unpack() { - if [[ ${PV} == *9999* ]]; then - git-r3_src_unpack - use ts-cli && cargo_live_src_unpack - else - # behaves as default too, so it is ok to call it unconditonally - cargo_src_unpack - fi -} +PATCHES=( "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" ) src_prepare() { default tc-export CC } -src_configure() { - default - use ts-cli && cargo_src_configure -} - -src_compile() { - default - use ts-cli && cargo_src_compile +src_install() { + emake DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + install } -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install - use ts-cli && cargo_src_install --path "./cli" +pkg_postinst() { + optfeature "building and testing grammars" dev-util/tree-sitter-cli }