commit:     202575d39c8966645763ea81c5b8b01e98444172
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 11:56:29 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat May 18 12:11:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=202575d3

dev-util/pkgcheck: add version cap on tree-sitter

Closes: https://bugs.gentoo.org/932093
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../{pkgcheck-0.10.27-r2.ebuild => pkgcheck-0.10.27-r3.ebuild}        | 1 +
 .../{pkgcheck-0.10.28-r1.ebuild => pkgcheck-0.10.28-r2.ebuild}        | 1 +
 .../pkgcheck/{pkgcheck-0.10.29.ebuild => pkgcheck-0.10.29-r1.ebuild}  | 1 +
 profiles/package.mask                                                 | 4 ----
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-util/pkgcheck/pkgcheck-0.10.27-r2.ebuild 
b/dev-util/pkgcheck/pkgcheck-0.10.27-r3.ebuild
similarity index 97%
rename from dev-util/pkgcheck/pkgcheck-0.10.27-r2.ebuild
rename to dev-util/pkgcheck/pkgcheck-0.10.27-r3.ebuild
index a79aef63b1dc..458ca1eade32 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.27-r2.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.27-r3.ebuild
@@ -44,6 +44,7 @@ RDEPEND+="
        dev-python/lxml[${PYTHON_USEDEP}]
        dev-python/pathspec[${PYTHON_USEDEP}]
        >=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+       <dev-python/tree-sitter-0.22.0[${PYTHON_USEDEP}]
        emacs? (
                >=app-editors/emacs-24.1:*
                app-emacs/ebuild-mode

diff --git a/dev-util/pkgcheck/pkgcheck-0.10.28-r1.ebuild 
b/dev-util/pkgcheck/pkgcheck-0.10.28-r2.ebuild
similarity index 97%
rename from dev-util/pkgcheck/pkgcheck-0.10.28-r1.ebuild
rename to dev-util/pkgcheck/pkgcheck-0.10.28-r2.ebuild
index 469b16aee6a7..ae9618919930 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.28-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.28-r2.ebuild
@@ -40,6 +40,7 @@ RDEPEND+="
        dev-python/lxml[${PYTHON_USEDEP}]
        dev-python/pathspec[${PYTHON_USEDEP}]
        >=dev-python/tree-sitter-0.20.4[${PYTHON_USEDEP}]
+       <dev-python/tree-sitter-0.22.0[${PYTHON_USEDEP}]
        emacs? (
                >=app-editors/emacs-24.1:*
                app-emacs/ebuild-mode

diff --git a/dev-util/pkgcheck/pkgcheck-0.10.29.ebuild 
b/dev-util/pkgcheck/pkgcheck-0.10.29-r1.ebuild
similarity index 97%
rename from dev-util/pkgcheck/pkgcheck-0.10.29.ebuild
rename to dev-util/pkgcheck/pkgcheck-0.10.29-r1.ebuild
index b3dcde472fc6..17cf742ce7ef 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.29.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.29-r1.ebuild
@@ -39,6 +39,7 @@ RDEPEND+="
        dev-python/lxml[${PYTHON_USEDEP}]
        dev-python/pathspec[${PYTHON_USEDEP}]
        >=dev-python/tree-sitter-0.21.0[${PYTHON_USEDEP}]
+       <dev-python/tree-sitter-0.22.0[${PYTHON_USEDEP}]
        emacs? (
                >=app-editors/emacs-24.1:*
                app-emacs/ebuild-mode

diff --git a/profiles/package.mask b/profiles/package.mask
index 676d88d6ebe4..6cd0c41590dd 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -54,10 +54,6 @@ x11-plugins/pidgintex
 # Removal on 2024-06-16.  Bugs #932095, #768072, #777747.
 app-forensics/air
 
-# Sam James <s...@gentoo.org> (2024-05-17)
-# Breaks dev-util/pkgcheck at least, masked pending investigation (bug #932093)
-=dev-python/tree-sitter-0.22.2
-
 # Sam James <s...@gentoo.org> (2024-05-17)
 # Needs adaptation to new build system (bug #932092).
 =net-libs/libupnpp-0.26.4

Reply via email to