[gentoo-commits] repo/gentoo:master commit in: dev-libs/tree-sitter/files/, dev-libs/tree-sitter/

2024-04-14 Thread Matthew Smith 
commit: 8316761e4d24174ccec27a2ac34f4b4c5e950dd9
Author: Matthew Smith  gentoo  org>
AuthorDate: Sun Apr 14 15:18:12 2024 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sun Apr 14 15:18:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8316761e

dev-libs/tree-sitter: drop 0.20.8, 0.20.8-r1

Signed-off-by: Matthew Smith  gentoo.org>

 dev-libs/tree-sitter/Manifest  |  1 -
 .../tree-sitter-0.20.8-no-parser-header.patch  | 23 --
 .../files/tree-sitter-No-static-libs-gentoo.patch  | 21 -
 dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild  | 53 --
 dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild | 51 -
 5 files changed, 149 deletions(-)

diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 552b42894fd7..5cf69b64952b 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,4 +1,3 @@
-DIST tree-sitter-0.20.8.tar.gz 2941223 BLAKE2B 
158820a88b20cc96252f8bfdd257e910ca4dc79174bb45ee52623c923b8a634714c65be8f9534411865fb03aaf84bf16bf659567a74cd58141ea687fa89601e5
 SHA512 
30fa3f97e1a24d469a7565dc91db629accdfbe081b43d951e9751059a0c7f763d727e95efce5806cd9b1689650773bee1106f4f91ba001da57df3b0d83dda967
 DIST tree-sitter-0.20.9.tar.gz 3041304 BLAKE2B 
a6cf6606f75918eeab7dab0d2758cdba0922b5677cd4c8755982c077ee0a734090c8a87f7dd1fd56525b5864f94f5f19c3fd04e43773877e13968855f976d0c0
 SHA512 
6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a
 DIST tree-sitter-0.22.1.tar.gz 3038644 BLAKE2B 
f4a2cae41e6ec327c8a77380fcf531b00a4fcd75997872c73371886379f35e31431da1e175e41b3c6bee9fdad46015d29bec93a103ea1ff36a1d365dc9a04d40
 SHA512 
fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7
 DIST tree-sitter-0.22.2.tar.gz 3040339 BLAKE2B 
c18a79b4fdf553c50b4dd4c67c92d02fd341c5266c4658eb226d9ea455f23d2d22fe4ed4ca48811da2c8a59c403d8eff53dd9257468df7a9cfa640652c485c95
 SHA512 
a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856

diff --git 
a/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch 
b/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch
deleted file mode 100644
index 1e055a69e00d..
--- a/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/tree-sitter/tree-sitter-bash/issues/199
-https://github.com/tree-sitter/tree-sitter/pull/2573
-https://github.com/tree-sitter/tree-sitter/pull/2574
-
-From 05b18c2cda9b391efffb4986bf46fa56333d801b Mon Sep 17 00:00:00 2001
-From: Andrew Hlynskyi 
-Date: Sat, 26 Aug 2023 20:50:23 +0300
-Subject: [PATCH] fix: makefile should install only  header
-
 a/Makefile
-+++ b/Makefile
-@@ -57,7 +57,7 @@ install: all
-   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR)
-   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT)
-   install -d '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter
--  install -m644 lib/include/tree_sitter/*.h 
'$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/
-+  install -m644 lib/include/tree_sitter/api.h 
'$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/
-   install -d '$(DESTDIR)$(PCLIBDIR)'
-   sed -e 
's|@LIBDIR@|$(LIBDIR)|;s|@INCLUDEDIR@|$(INCLUDEDIR)|;s|@VERSION@|$(VERSION)|' \
-   -e 's|=$(PREFIX)|=$${prefix}|' \
--- 
-2.42.0
-

diff --git a/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch 
b/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch
deleted file mode 100644
index dd898b059612..
--- a/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 764f411a..86aaefd8 100644
 a/Makefile
-+++ b/Makefile
-@@ -41,7 +41,7 @@ ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
-   PCLIBDIR := $(PREFIX)/libdata/pkgconfig
- endif
- 
--all: libtree-sitter.a libtree-sitter.$(SOEXTVER)
-+all: libtree-sitter.$(SOEXTVER)
- 
- libtree-sitter.a: $(OBJ)
-   $(AR) rcs $@ $^
-@@ -53,7 +53,6 @@ libtree-sitter.$(SOEXTVER): $(OBJ)
- 
- install: all
-   install -d '$(DESTDIR)$(LIBDIR)'
--  install -m755 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a
-   install -m755 libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER)
-   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR)
-   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT)

diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild 
b/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild
deleted file mode 100644
index d521078d2bfc..
---

[gentoo-commits] repo/gentoo:master commit in: dev-libs/tree-sitter/files/, dev-libs/tree-sitter/

2024-03-30 Thread Arthur Zamarin 
commit: e51ad3dcb7cffe4f3c207759c1fea061bc1126e1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 30 16:10:00 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 30 16:27:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e51ad3dc

dev-libs/tree-sitter: add 0.22.2

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/tree-sitter/Manifest  |  1 +
 .../files/tree-sitter-0.22.2-no-static.patch   | 20 +
 dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild | 51 ++
 3 files changed, 72 insertions(+)

diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index ca1e2342ab2e..693a9f4a608a 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,3 +1,4 @@
 DIST tree-sitter-0.20.8.tar.gz 2941223 BLAKE2B 
158820a88b20cc96252f8bfdd257e910ca4dc79174bb45ee52623c923b8a634714c65be8f9534411865fb03aaf84bf16bf659567a74cd58141ea687fa89601e5
 SHA512 
30fa3f97e1a24d469a7565dc91db629accdfbe081b43d951e9751059a0c7f763d727e95efce5806cd9b1689650773bee1106f4f91ba001da57df3b0d83dda967
 DIST tree-sitter-0.20.9.tar.gz 3041304 BLAKE2B 
a6cf6606f75918eeab7dab0d2758cdba0922b5677cd4c8755982c077ee0a734090c8a87f7dd1fd56525b5864f94f5f19c3fd04e43773877e13968855f976d0c0
 SHA512 
6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a
 DIST tree-sitter-0.22.1.tar.gz 3038644 BLAKE2B 
f4a2cae41e6ec327c8a77380fcf531b00a4fcd75997872c73371886379f35e31431da1e175e41b3c6bee9fdad46015d29bec93a103ea1ff36a1d365dc9a04d40
 SHA512 
fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7
+DIST tree-sitter-0.22.2.tar.gz 3040339 BLAKE2B 
c18a79b4fdf553c50b4dd4c67c92d02fd341c5266c4658eb226d9ea455f23d2d22fe4ed4ca48811da2c8a59c403d8eff53dd9257468df7a9cfa640652c485c95
 SHA512 
a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856

diff --git a/dev-libs/tree-sitter/files/tree-sitter-0.22.2-no-static.patch 
b/dev-libs/tree-sitter/files/tree-sitter-0.22.2-no-static.patch
new file mode 100644
index ..47934bbcd359
--- /dev/null
+++ b/dev-libs/tree-sitter/files/tree-sitter-0.22.2-no-static.patch
@@ -0,0 +1,20 @@
+--- a/Makefile
 b/Makefile
+@@ -45,7 +45,7 @@ ifneq ($(filter $(shell uname),FreeBSD NetBSD DragonFly),)
+   PCLIBDIR := $(PREFIX)/libdata/pkgconfig
+ endif
+
+-all: libtree-sitter.a libtree-sitter.$(SOEXT) tree-sitter.pc
++all: libtree-sitter.$(SOEXT) tree-sitter.pc
+
+ libtree-sitter.a: $(OBJ)
+   $(AR) $(ARFLAGS) $@ $^
+@@ -69,7 +69,6 @@ clean:
+ install: all
+   install -d '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter 
'$(DESTDIR)$(PCLIBDIR)' '$(DESTDIR)$(LIBDIR)'
+   install -m644 lib/include/tree_sitter/api.h 
'$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/api.h
+   install -m644 tree-sitter.pc '$(DESTDIR)$(PCLIBDIR)'/tree-sitter.pc
+-  install -m644 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a
+   install -m755 libtree-sitter.$(SOEXT) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER)
+   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR)
+   ln -sf libtree-sitter.$(SOEXTVER_MAJOR) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT)

diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild 
b/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild
new file mode 100644
index ..d3fc3901eeef
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Bump tree-sitter-cli at the same time.
+
+EAPI=8
+
+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;
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test" # tests are for CLI and not the lib
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.22.2-no-static.patch"
+)
+
+src_prepare() {
+   default
+   tc-export CC
+}
+
+src_compile() {
+   emake \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   STRIP="" \
+   CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+   emake DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   install
+}
+
+pkg_postinst() {
+   optfeature "building and testing grammars"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/tree-sitter/files/, dev-libs/tree-sitter/

2024-03-23 Thread Arthur Zamarin 
commit: 2182b4ba4f8f1ea6fe9d92d4ea08591136cc0be1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Mar 11 11:43:34 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 23 08:27:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2182b4ba

dev-libs/tree-sitter: add 0.22.1

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/tree-sitter/Manifest  |  1 +
 .../files/tree-sitter-0.22.1-no-static.patch   | 19 
 dev-libs/tree-sitter/tree-sitter-0.22.1.ebuild | 51 ++
 3 files changed, 71 insertions(+)

diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 3746d0c9031a..ca1e2342ab2e 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,2 +1,3 @@
 DIST tree-sitter-0.20.8.tar.gz 2941223 BLAKE2B 
158820a88b20cc96252f8bfdd257e910ca4dc79174bb45ee52623c923b8a634714c65be8f9534411865fb03aaf84bf16bf659567a74cd58141ea687fa89601e5
 SHA512 
30fa3f97e1a24d469a7565dc91db629accdfbe081b43d951e9751059a0c7f763d727e95efce5806cd9b1689650773bee1106f4f91ba001da57df3b0d83dda967
 DIST tree-sitter-0.20.9.tar.gz 3041304 BLAKE2B 
a6cf6606f75918eeab7dab0d2758cdba0922b5677cd4c8755982c077ee0a734090c8a87f7dd1fd56525b5864f94f5f19c3fd04e43773877e13968855f976d0c0
 SHA512 
6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a
+DIST tree-sitter-0.22.1.tar.gz 3038644 BLAKE2B 
f4a2cae41e6ec327c8a77380fcf531b00a4fcd75997872c73371886379f35e31431da1e175e41b3c6bee9fdad46015d29bec93a103ea1ff36a1d365dc9a04d40
 SHA512 
fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7

diff --git a/dev-libs/tree-sitter/files/tree-sitter-0.22.1-no-static.patch 
b/dev-libs/tree-sitter/files/tree-sitter-0.22.1-no-static.patch
new file mode 100644
index ..c2bcb3cd6fd1
--- /dev/null
+++ b/dev-libs/tree-sitter/files/tree-sitter-0.22.1-no-static.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
 b/Makefile
+@@ -45,7 +45,7 @@ ifneq ($(filter $(shell uname),FreeBSD NetBSD DragonFly),)
+   PCLIBDIR := $(PREFIX)/libdata/pkgconfig
+ endif
+
+-all: libtree-sitter.a libtree-sitter.$(SOEXT) tree-sitter.pc
++all: libtree-sitter.$(SOEXT) tree-sitter.pc
+
+ libtree-sitter.a: $(OBJ)
+   $(AR) $(ARFLAGS) $@ $^
+@@ -69,7 +69,6 @@ clean:
+ install: all
+   install -Dm644 lib/include/tree_sitter/api.h 
'$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/api.h
+   install -Dm644 tree-sitter.pc '$(DESTDIR)$(PCLIBDIR)'/tree-sitter.pc
+-  install -Dm644 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a
+   install -m755 libtree-sitter.$(SOEXT) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER)
+   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR)
+   ln -sf libtree-sitter.$(SOEXTVER_MAJOR) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT)

diff --git a/dev-libs/tree-sitter/tree-sitter-0.22.1.ebuild 
b/dev-libs/tree-sitter/tree-sitter-0.22.1.ebuild
new file mode 100644
index ..05b74b9f9391
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.22.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Bump tree-sitter-cli at the same time.
+
+EAPI=8
+
+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;
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test" # tests are for CLI and not the lib
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.22.1-no-static.patch"
+)
+
+src_prepare() {
+   default
+   tc-export CC
+}
+
+src_compile() {
+   emake \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   STRIP="" \
+   CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+   emake DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   install
+}
+
+pkg_postinst() {
+   optfeature "building and testing grammars" dev-util/tree-sitter-cli
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/tree-sitter/files/, dev-libs/tree-sitter/

2024-01-27 Thread Matthew Smith 
commit: e54c3c8a00fb4ca18ac45da316e1cd95cd1f95cb
Author: Brahmajit Das  gmail  com>
AuthorDate: Sat Jan 27 08:49:13 2024 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sat Jan 27 19:35:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54c3c8a

dev-libs/tree-sitter: Version bump to 0.20.9

Closes: https://bugs.gentoo.org/922963
Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35040
Signed-off-by: Matthew Smith  gentoo.org>

 dev-libs/tree-sitter/Manifest   |  1 +
 .../files/tree-sitter-0.20.9-no-static.patch| 21 +
 ...sitter-.ebuild => tree-sitter-0.20.9.ebuild} | 19 ++-
 dev-libs/tree-sitter/tree-sitter-.ebuild|  6 --
 4 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index ba37153ef228..c960db5475e3 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,3 +1,4 @@
 DIST tree-sitter-0.20.6.tar.gz 2924556 BLAKE2B 
17348717441497ea7fc91419a0e8796d077b9acda2b584e9c3e1ac4a7a3f1fa3f84d5b749f21144d0593aaa7bf2e7ff9665539e91c6e81cda4359850e0fcdb14
 SHA512 
f0fb1e0073867c2a6e69b230e07e5eec32a2b30d3c711ec188526e287d6a1ef06de266d476482f900ec7c9ff6c11909899fd35a802e96f0befc6e99815502377
 DIST tree-sitter-0.20.7.tar.gz 2928761 BLAKE2B 
280083381ce4f5949ab1ca1412026cac79bcf28b488147150d934b70cdc7804466c8032d50254f1ff4457b55a33fe0dceef66fd053cd32bbf844dc8280e896ab
 SHA512 
dd306f7304cb5f87c05eab3bf5c9c4c13bfed7766a164eafe3159adbc6cca4e66fbdb6880f48dfc668408fbefc14b0147aa2231db085a72f526ac51b681b7c26
 DIST tree-sitter-0.20.8.tar.gz 2941223 BLAKE2B 
158820a88b20cc96252f8bfdd257e910ca4dc79174bb45ee52623c923b8a634714c65be8f9534411865fb03aaf84bf16bf659567a74cd58141ea687fa89601e5
 SHA512 
30fa3f97e1a24d469a7565dc91db629accdfbe081b43d951e9751059a0c7f763d727e95efce5806cd9b1689650773bee1106f4f91ba001da57df3b0d83dda967
+DIST tree-sitter-0.20.9.tar.gz 3041304 BLAKE2B 
a6cf6606f75918eeab7dab0d2758cdba0922b5677cd4c8755982c077ee0a734090c8a87f7dd1fd56525b5864f94f5f19c3fd04e43773877e13968855f976d0c0
 SHA512 
6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a

diff --git a/dev-libs/tree-sitter/files/tree-sitter-0.20.9-no-static.patch 
b/dev-libs/tree-sitter/files/tree-sitter-0.20.9-no-static.patch
new file mode 100644
index ..ab0b7ef76fb6
--- /dev/null
+++ b/dev-libs/tree-sitter/files/tree-sitter-0.20.9-no-static.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index 6030852e..ea1c4617 100644
+--- a/Makefile
 b/Makefile
+@@ -41,7 +41,7 @@ ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
+   PCLIBDIR := $(PREFIX)/libdata/pkgconfig
+ endif
+ 
+-all: libtree-sitter.a libtree-sitter.$(SOEXTVER)
++all: libtree-sitter.$(SOEXTVER)
+ 
+ libtree-sitter.a: $(OBJ)
+   $(AR) rcs $@ $^
+@@ -61,7 +61,6 @@ install: all
+   tree-sitter.pc.in > tree-sitter.pc
+ 
+   install -d '$(DESTDIR)$(LIBDIR)'
+-  install -m644 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/
+   install -m755 libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/
+   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR)
+   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT)

diff --git a/dev-libs/tree-sitter/tree-sitter-.ebuild 
b/dev-libs/tree-sitter/tree-sitter-0.20.9.ebuild
similarity index 66%
copy from dev-libs/tree-sitter/tree-sitter-.ebuild
copy to dev-libs/tree-sitter/tree-sitter-0.20.9.ebuild
index 12d922e961da..b2522c4480b3 100644
--- a/dev-libs/tree-sitter/tree-sitter-.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.9.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
@@ -18,7 +18,16 @@ fi
 LICENSE="MIT"
 SLOT="0"
 
-PATCHES=( "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-0.20.9-no-static.patch"
+)
+
+# XXX: Please, don't forget to check this on next version bump.
+# And, maybe remove as non-needed, if version in Makefile will
+# match the release.
+# ref: https://github.com/tree-sitter/tree-sitter/issues/2210
+# see Makefile:1
+QA_PKGCONFIG_VERSION="0.20.10"
 
 src_prepare() {
default
@@ -33,9 +42,9 @@ src_compile() {
 
 src_install() {
emake DESTDIR="${D}" \
- PREFIX="${EPREFIX}/usr" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- install
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   install
 }
 
 pkg_postinst() {

diff --git a/dev-libs/tree-sitter/tree-sitter-.ebuild 
b/dev-libs/tree-sitter/tree-sitter-.ebuild
index 12d922e961da..1725e8da5f49 100644
---

[gentoo-commits] repo/gentoo:master commit in: dev-libs/tree-sitter/files/, dev-libs/tree-sitter/

2023-08-27 Thread Sam James 
commit: f0a16a3f519de9ec5ecef601788219dbba7e1a8f
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 18:02:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 27 20:26:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0a16a3f

dev-libs/tree-sitter: stop installing parser.h

There shouldn't be a system-wide copy of parser.h and upstream plan on
dropping this from dev-libs/tree-sitter as it can cause issues if there's
a mismatch between the version used for the bundled generated parser
vs the header used to build the library.

Backport that change to avoid mismatches.

Bug: https://github.com/tree-sitter/tree-sitter-bash/issues/199
Bug: https://bugs.gentoo.org/912716
Signed-off-by: Sam James  gentoo.org>

 .../tree-sitter-0.20.8-no-parser-header.patch  | 23 +
 dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild  | 54 ++
 2 files changed, 77 insertions(+)

diff --git 
a/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch 
b/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch
new file mode 100644
index ..1e055a69e00d
--- /dev/null
+++ b/dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch
@@ -0,0 +1,23 @@
+https://github.com/tree-sitter/tree-sitter-bash/issues/199
+https://github.com/tree-sitter/tree-sitter/pull/2573
+https://github.com/tree-sitter/tree-sitter/pull/2574
+
+From 05b18c2cda9b391efffb4986bf46fa56333d801b Mon Sep 17 00:00:00 2001
+From: Andrew Hlynskyi 
+Date: Sat, 26 Aug 2023 20:50:23 +0300
+Subject: [PATCH] fix: makefile should install only  header
+
+--- a/Makefile
 b/Makefile
+@@ -57,7 +57,7 @@ install: all
+   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR)
+   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT)
+   install -d '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter
+-  install -m644 lib/include/tree_sitter/*.h 
'$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/
++  install -m644 lib/include/tree_sitter/api.h 
'$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/
+   install -d '$(DESTDIR)$(PCLIBDIR)'
+   sed -e 
's|@LIBDIR@|$(LIBDIR)|;s|@INCLUDEDIR@|$(INCLUDEDIR)|;s|@VERSION@|$(VERSION)|' \
+   -e 's|=$(PREFIX)|=$${prefix}|' \
+-- 
+2.42.0
+

diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild 
b/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild
new file mode 100644
index ..734e7a2a9491
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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;
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
+   "${FILESDIR}/${PN}-0.20.8-no-parser-header.patch"
+)
+
+# see Makefile:1
+QA_PKGCONFIG_VERSION="0.20.9"
+
+# XXX: Please, don't forget to check this on next version bump.
+# And, maybe remove as non-needed, if version in Makefile will
+# match the release.
+# ref: https://github.com/tree-sitter/tree-sitter/issues/2210
+
+src_prepare() {
+   default
+   tc-export CC
+}
+
+src_compile() {
+   emake \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+   emake DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   install
+}
+
+pkg_postinst() {
+   optfeature "building and testing grammars" dev-util/tree-sitter-cli
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/tree-sitter/files/, dev-libs/tree-sitter/

2020-11-21 Thread Nick Sarnie 
commit: 0cebacf7c18a287097492e86daff2665990d988b
Author: Ali Abdel-Qader  protonmail  com>
AuthorDate: Sat Nov 21 22:24:37 2020 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Sat Nov 21 22:28:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cebacf7

dev-libs/tree-sitter: create package

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Ali Abdel-Qader  protonmail.com>
Signed-off-by: Nick Sarnie  gentoo.org>

 dev-libs/tree-sitter/Manifest  |  1 +
 .../files/tree-sitter-No-static-libs-gentoo.patch  | 21 +
 dev-libs/tree-sitter/metadata.xml  | 18 +++
 dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild | 26 ++
 dev-libs/tree-sitter/tree-sitter-.ebuild   | 26 ++
 5 files changed, 92 insertions(+)

diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
new file mode 100644
index 000..2959e6a352c
--- /dev/null
+++ b/dev-libs/tree-sitter/Manifest
@@ -0,0 +1 @@
+DIST tree-sitter-0.17.3.tar.gz 519006 BLAKE2B 
81eb9bdfc9f27e7b172b6c17333eece5515cf292d5b08eb5362f108db483e329ff6d309ccc40ef2de23d1a32c437cdbc1b9cf800146902a3d913feecf8b63269
 SHA512 
48a827d7bea184a84ad9f594bc5dc1869bad9aa2823f83d1ac7d58e6feaa092e7088e7eb0dcc6d3aa3810d25ff9f25ecb531751c77314ff7d07fa05f95b7a013

diff --git a/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch 
b/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch
new file mode 100644
index 000..dd898b05961
--- /dev/null
+++ b/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index 764f411a..86aaefd8 100644
+--- a/Makefile
 b/Makefile
+@@ -41,7 +41,7 @@ ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
+   PCLIBDIR := $(PREFIX)/libdata/pkgconfig
+ endif
+ 
+-all: libtree-sitter.a libtree-sitter.$(SOEXTVER)
++all: libtree-sitter.$(SOEXTVER)
+ 
+ libtree-sitter.a: $(OBJ)
+   $(AR) rcs $@ $^
+@@ -53,7 +53,6 @@ libtree-sitter.$(SOEXTVER): $(OBJ)
+ 
+ install: all
+   install -d '$(DESTDIR)$(LIBDIR)'
+-  install -m755 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a
+   install -m755 libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER)
+   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR)
+   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT)

diff --git a/dev-libs/tree-sitter/metadata.xml 
b/dev-libs/tree-sitter/metadata.xml
new file mode 100644
index 000..dcfdb27e8a9
--- /dev/null
+++ b/dev-libs/tree-sitter/metadata.xml
@@ -0,0 +1,18 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   abdelqader...@protonmail.com
+   Ali Abdel-Qader
+   
+   
+   sar...@gentoo.org
+   Nick Sarnie
+   
+   
+   tree-sitter/tree-sitter
+   
+   
+   Tree-sitter is a parser generator tool and an incremental 
parsing library. It can build a concrete syntax tree for a source file and 
efficiently update the syntax tree as the source file is edited. 
+   
+

diff --git a/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild 
b/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild
new file mode 100644
index 000..b50d6429cd9
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing 
library."
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter;
+
+if [[ ${PV} == ** ]]; 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"
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
+)
+
+src_install() {
+   emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" 
LIBDIR="${EPREFIX}/usr/lib64" install
+}

diff --git a/dev-libs/tree-sitter/tree-sitter-.ebuild 
b/dev-libs/tree-sitter/tree-sitter-.ebuild
new file mode 100644
index 000..b50d6429cd9
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing 
library."
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter;
+
+if [[ ${PV} == ** ]]; 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"
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+