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 483FC1581C1 for ; Sun, 7 Jul 2024 06:45:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88062E2B8A; Sun, 7 Jul 2024 06:45:17 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 67BF8E2B8A for ; Sun, 7 Jul 2024 06:45:17 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69E1B33FD3F for ; Sun, 7 Jul 2024 06:45:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9087DC4 for ; Sun, 7 Jul 2024 06:45:14 +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: <1720334707.cd426afc7f32ac84206f4156fc8ed0d20bd79246.matthew@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/tree-sitter-grammar.eclass X-VCS-Directories: eclass/ X-VCS-Committer: matthew X-VCS-Committer-Name: Matthew Smith X-VCS-Revision: cd426afc7f32ac84206f4156fc8ed0d20bd79246 X-VCS-Branch: master Date: Sun, 7 Jul 2024 06:45:14 +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: c6f03064-e190-46d8-838b-25514d3ab5c7 X-Archives-Hash: ce0d1447b4d3a3463f325dfb76cac8ad commit: cd426afc7f32ac84206f4156fc8ed0d20bd79246 Author: Matthew Smith gentoo org> AuthorDate: Sun Jul 7 06:42:17 2024 +0000 Commit: Matthew Smith gentoo org> CommitDate: Sun Jul 7 06:45:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd426afc Revert "tree-sitter-grammar.eclass: extended packaging" This reverts commit fbe4bc7b9dc970271127a5f167c95da78e32e282. The previous change does not install the NeoVim symlinks correctly as they point to /usr/lib/tree-sitter/liblang.so instead of /usr/lib/liblang.so. Also the query files are not installed in per-package directories and have common names (e.g. highlight.scm) which is causing file collisions. To be fixed in a follow up commit which will introduce tree-sitter-grammar-r1.eclass, so that ebuilds can be rev-bumped so that users can rebuild and get the changes. Bug: https://bugs.gentoo.org/935631 Bug: https://bugs.gentoo.org/935641 Signed-off-by: Matthew Smith gentoo.org> eclass/tree-sitter-grammar.eclass | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/eclass/tree-sitter-grammar.eclass b/eclass/tree-sitter-grammar.eclass index e5797fca8a16..10f29b8a0835 100644 --- a/eclass/tree-sitter-grammar.eclass +++ b/eclass/tree-sitter-grammar.eclass @@ -207,19 +207,6 @@ tree-sitter-grammar_src_install() { dolib.so "${WORKDIR}/${soname}" dosym "${soname}" /usr/$(get_libdir)/lib${PN}$(get_libname) - # Install symlinks to grammars so that they can be found by NeoVim. - # /usr/$(get_libdir)/tree-sitter gets added to the NeoVim runtimepath. - # See neovim/runtime/doc/treesitter.txt for info. - keepdir /usr/$(get_libdir)/tree-sitter - dosym ../"${soname}" \ - /usr/$(get_libdir)/tree-sitter/parser/${PN##tree-sitter-}$(get_libname) - - # Install queries (e.g. highlight.scm) so that they can be found by NeoVim. - if [[ -d "${S}/../queries" ]]; then - keepdir /usr/share/tree-sitter - insinto /usr/share/tree-sitter - doins -r "${S}/../queries" - fi fi local binding