From e40061ca66b81af3d8dd89fcfb4d6956c070f87e Mon Sep 17 00:00:00 2001
From: Arthur Zamarin <arthurzam@gentoo.org>
Date: Mon, 18 Mar 2024 22:39:26 +0200
Subject: [PATCH] dev-libs/tree-sitter-*: fix S= after eclass changes

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
---
 dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild   | 3 +--
 .../tree-sitter-cpp/tree-sitter-cpp-0.20.0_p20230410.ebuild   | 4 ++--
 dev-libs/tree-sitter-gleam/tree-sitter-gleam-0.33.0.ebuild    | 3 +--
 dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild       | 1 -
 .../tree-sitter-javascript-0.20.1-r1.ebuild                   | 1 -
 dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild    | 4 ++--
 dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild    | 4 ++--
 dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.4.ebuild    | 2 +-
 .../tree-sitter-ruby-0.20.0_pre20221101.ebuild                | 2 +-
 .../tree-sitter-typescript-0.20.1.ebuild                      | 4 ++--
 .../tree-sitter-typescript-0.20.2.ebuild                      | 4 ++--
 .../tree-sitter-typescript-0.20.3.ebuild                      | 2 +-
 .../tree-sitter-typescript-0.20.5.ebuild                      | 2 +-
 13 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild
index c4ca2d385d57f..8d2e42a385d43 100644
--- a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild
+++ b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,4 +15,3 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc
 # Override eclass SRC_URI as 0.20.4 was bumped incorrectly.
 SRC_URI="https://github.com/tree-sitter/${PN}/archive/v${PV}.tar.gz
 	-> ${P}-2.tar.gz"
-S="${WORKDIR}"/${PN}-${PV}/src
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0_p20230410.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0_p20230410.ebuild
index 7b755f216577a..7d19114868690 100644
--- a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0_p20230410.ebuild
+++ b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.0_p20230410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ GIT_COMMIT="0b6d0eb9abdf7cea31961cd903eeed5bbd0aae74"
 DESCRIPTION="C++ grammar for Tree-sitter"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp"
 SRC_URI="https://github.com/tree-sitter/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${GIT_COMMIT}/src
+S="${WORKDIR}"/${PN}-${GIT_COMMIT}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/tree-sitter-gleam/tree-sitter-gleam-0.33.0.ebuild b/dev-libs/tree-sitter-gleam/tree-sitter-gleam-0.33.0.ebuild
index a42d41fcbbc13..3db768bc2df67 100644
--- a/dev-libs/tree-sitter-gleam/tree-sitter-gleam-0.33.0.ebuild
+++ b/dev-libs/tree-sitter-gleam/tree-sitter-gleam-0.33.0.ebuild
@@ -8,7 +8,6 @@ inherit tree-sitter-grammar
 DESCRIPTION="Gleam grammar for Tree-sitter"
 HOMEPAGE="https://github.com/gleam-lang/tree-sitter-gleam"
 SRC_URI="https://github.com/gleam-lang/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P}/src
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -18,5 +17,5 @@ src_install() {
 	tree-sitter-grammar_src_install
 
 	docinto queries
-	dodoc ../queries/{highlights,locals,tags}.scm
+	dodoc queries/{highlights,locals,tags}.scm
 }
diff --git a/dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild b/dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild
index d1e163716e363..1d5e61986362f 100644
--- a/dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild
+++ b/dev-libs/tree-sitter-go/tree-sitter-go-0.20.0-r1.ebuild
@@ -15,4 +15,3 @@ KEYWORDS="amd64 ~arm64"
 # Override eclass SRC_URI as 0.20.0 was bumped incorrectly.
 SRC_URI="https://github.com/tree-sitter/${PN}/archive/v${PV}.tar.gz
 	-> ${P}-2.tar.gz"
-S="${WORKDIR}"/${PN}-${PV}/src
diff --git a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-r1.ebuild b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-r1.ebuild
index b1b7e3a5cc959..e1d5ee9003fe3 100644
--- a/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-r1.ebuild
+++ b/dev-libs/tree-sitter-javascript/tree-sitter-javascript-0.20.1-r1.ebuild
@@ -15,4 +15,3 @@ KEYWORDS="amd64"
 # Override eclass SRC_URI as 0.20.1 was bumped incorrectly.
 SRC_URI="https://github.com/tree-sitter/${PN}/archive/v${PV}.tar.gz
 	-> ${P}-2.tar.gz"
-S="${WORKDIR}"/${PN}-${PV}/src
diff --git a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild
index 41143977b4626..afc9708cb318b 100644
--- a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild
+++ b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,4 +12,4 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64"
 
-S="${WORKDIR}/${P}/ocaml/src"
+S="${WORKDIR}/${P}/ocaml"
diff --git a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild
index a22d049de4cd1..afc9708cb318b 100644
--- a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild
+++ b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,4 +12,4 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64"
 
-S="${WORKDIR}/${P}/ocaml/src"
+S="${WORKDIR}/${P}/ocaml"
diff --git a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.4.ebuild b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.4.ebuild
index 263b5edbc8961..afc9708cb318b 100644
--- a/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.4.ebuild
+++ b/dev-libs/tree-sitter-ocaml/tree-sitter-ocaml-0.20.4.ebuild
@@ -12,4 +12,4 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64"
 
-S="${WORKDIR}/${P}/ocaml/src"
+S="${WORKDIR}/${P}/ocaml"
diff --git a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild
index 0dcbd7dc9e457..c0e7e24609c70 100644
--- a/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild
+++ b/dev-libs/tree-sitter-ruby/tree-sitter-ruby-0.20.0_pre20221101.ebuild
@@ -11,7 +11,7 @@ inherit tree-sitter-grammar
 DESCRIPTION="Ruby grammar for Tree-sitter"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter-ruby"
 SRC_URI="https://github.com/tree-sitter/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_COMMIT}/src
+S="${WORKDIR}"/${PN}-${MY_COMMIT}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild
index 91c68ef697e00..3826613aff5de 100644
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild
+++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit tree-sitter-grammar
 
 DESCRIPTION="TypeScript grammar for Tree-sitter"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-S="${WORKDIR}"/${PN}-${PV}/typescript/src
+S="${WORKDIR}"/${P}/typescript
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.2.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.2.ebuild
index 5186725e58e9b..3826613aff5de 100644
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.2.ebuild
+++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit tree-sitter-grammar
 
 DESCRIPTION="TypeScript grammar for Tree-sitter"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-S="${WORKDIR}"/${PN}-${PV}/typescript/src
+S="${WORKDIR}"/${P}/typescript
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.ebuild
index 72a2b3dd5f814..3826613aff5de 100644
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.ebuild
+++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.3.ebuild
@@ -7,7 +7,7 @@ inherit tree-sitter-grammar
 
 DESCRIPTION="TypeScript grammar for Tree-sitter"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-S="${WORKDIR}"/${PN}-${PV}/typescript/src
+S="${WORKDIR}"/${P}/typescript
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.5.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.5.ebuild
index da5d17a90d8a5..3ab5b3028d0d1 100644
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.5.ebuild
+++ b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.5.ebuild
@@ -7,7 +7,7 @@ inherit tree-sitter-grammar
 
 DESCRIPTION="TypeScript grammar for Tree-sitter"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-S="${WORKDIR}"/${P}/typescript/src
+S="${WORKDIR}"/${P}/typescript
 
 LICENSE="MIT"
 SLOT="0"