summaryrefslogtreecommitdiff
path: root/dev-libs/tree-sitter
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/tree-sitter')
-rw-r--r--dev-libs/tree-sitter/Manifest12
-rw-r--r--dev-libs/tree-sitter/files/tree-sitter-0.20.8-no-parser-header.patch23
-rw-r--r--dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch21
-rw-r--r--dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild2
-rw-r--r--dev-libs/tree-sitter/tree-sitter-0.22.4-r1.ebuild (renamed from dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild)30
-rw-r--r--dev-libs/tree-sitter/tree-sitter-0.22.4.ebuild (renamed from dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild)22
-rw-r--r--dev-libs/tree-sitter/tree-sitter-9999.ebuild6
7 files changed, 32 insertions, 84 deletions
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 8b43147ab039..8c4867378694 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,16 +1,14 @@
-AUX tree-sitter-0.20.8-no-parser-header.patch 1007 BLAKE2B f1e088a764629685f84d9526eda219a8e52f4e7e6aefe3cc1f4ef713ffa4b21cd228369f4be6ba082359a1065b73bdcb52f80ba1a1cded2215153e3d59d9097a SHA512 c2a5541fb528ca07daffb80103397226a59d53d4f206282ae43e2deee27220ef9a9d5ade86da7b09130398c8bcd2e809c547c490f8271ae696f097d89a6931e8
AUX tree-sitter-0.20.9-no-static.patch 756 BLAKE2B 26b67c972575d3fce7d9ac841828e66d395c6b4d81b99023332649e72bb2a0a515b9c257a9927dcb654fbdf20c4b538b5ad39c18f063f47f3de171a2258eecc9 SHA512 0d624ae97d7bbde0a035128b372dc175eb9d0a41871270fb43179356632d040d7827d2d6a073a1f7ecff537c1ec1a647df907c5ee39ab6b8840a1827b7f1808d
AUX tree-sitter-0.22.1-no-static.patch 858 BLAKE2B 0f3ea5693f55a80af02597c740beee5371b98cbf3c671c203fb5eb916f0454916c995fd3f53cd64942db2efef500e9473edd4ead7320d082b98f14bbb7fb0bed SHA512 90edc87e5cf6039ef86e7e3e3906acea2fc3066f37fffa026c832904effa7c3df546143b7b2465de0f979b3f8750cbb89778f8780b1cce0b529c542af7202f1a
AUX tree-sitter-0.22.2-no-static.patch 952 BLAKE2B f961ad07850be8c7a7535eac82e234aa236ee7499d2a6e2ea5ee23636bb92f78017b29e74a3ae452f0a4f13611838a5ed4d1b397b1410749264f7e80715d8ac6 SHA512 7d06011b5f5068eb94891d9e116a5d6a3d3023fae999a9766cc19309ae2a4a33d4722074d313efcd87231794ef79d18907e468299da7de4fc4edaacbb9cbc9eb
-AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
-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
-EBUILD tree-sitter-0.20.8-r1.ebuild 1328 BLAKE2B 53e234169c5f1378ed6f67a59a58e40efc186c0354b6b845973ae2e1676accd35f54434ac3a88d34648f27027439b5489a6db10953f9443cdf500e21f914301d SHA512 0ed16e8d4994053a6a08633793a6f3ff37e077e1825d14f6be8cfcff3343042b8b41f12195e987263350acc99a47ae3660f33b5c04c9c574e479dff08636eabe
-EBUILD tree-sitter-0.20.8.ebuild 1277 BLAKE2B fca5db0fb7a996038dd8c65c12b74e038d566b01d68e2a19ea00a56b69d5e17feb1f175ffc7077dde778861fa1a918e3f1d33201f08b3d46ec90cb19e5639acf SHA512 97138d0d18931238eb7359a4f0043c69bb63624785d48326ca127fc166c3cb8c372dabbde1aa787041fe7345aca642b6eafdc2c9907bc75992e771185fcf3933
+DIST tree-sitter-0.22.4.tar.gz 3034955 BLAKE2B 797feb6e2171b0e00b10c67c8b6dcda6cc2ec420ef797991a642524982629496e4b7bcae92a2658ba3adffea75332bcda09ecbced01e73e13ba6f4c39d15e9ea SHA512 7f160e88cdffb47f4ee3f884385ec759fcf88883307221ddadd8bf561d1dfb3659b0c7f4b216286066cf912183cc8234788492d62d1f1ad14fcb39bd3287cf36
EBUILD tree-sitter-0.20.9-r1.ebuild 1328 BLAKE2B e4432d8bb3b9781b1ff1daf21c85899450cabaa22021826758a10a4750bf28af87da4ac0c55e4f63521fa6434bd45ab79bc7470ac0148cf8f10d17ae4c4d255e SHA512 2ecbff6a41cf5549c5dadadcfdeee21e5b488eba99ecde07225aa1a5939b3376d3e744d0d1eb14e2ecb0e1d6b6470a8661d2e2989c6bea49840d985c93f49807
EBUILD tree-sitter-0.22.1.ebuild 1150 BLAKE2B 046ddf28b24a4bf7c4f58e09106dafee717965b7a890ec07124689c3126cecc470b9177c87708d2dadda0998cf17066635f56ba9bca8209205979544727f03ef SHA512 6c03ec0d32279d19198922f8a373f8faf3933c932b372526c1360e4e51d46327ea30e8c647161dcd153b74ec3e6011fc1c6a380d98d4d4b45308e96cdfdbf8bf
-EBUILD tree-sitter-0.22.2.ebuild 1150 BLAKE2B d83d893cf04690c68429b80d7def7ef21f9f32521fa0278e4e5f6323f49b007f05450a77d7fd00e42b4de8453ca51c8ff4f979ebb1122393eb549ff1b93014cf SHA512 edc32600c9c6ab175d51df6956ed4b5f23846419b5a94dc0f10343a89a6815fd56f9331753a90161223490440c0115214532d6c52c3bf5e7aaf573d063d0b829
-EBUILD tree-sitter-9999.ebuild 1025 BLAKE2B 85ec2589b2036eccd8a1e73dbf66b250ac818135bfc771667f9c61f0ee9ad125992a94c01f33f0662d6bd059e1c57eda8616a2c2f0a918461db9ef09601b0834 SHA512 e3141a10101219d2ee2a978277214827b787ab0a9ed67d0532f070805393a05e5ed040c954d7c8ee157c5fb5161126ffb65a12b834122564d913addc9ef451ee
+EBUILD tree-sitter-0.22.2.ebuild 1143 BLAKE2B 25e98788f742fec7dcd30f2a075ea7d46927bbe2c288512c88314b411cae48857f0654ba9a5f41eed70a0ca7b7f775fa7d49fbe086d208f46555c47bcf9dea66 SHA512 5c56d4299dc40d13e56c2f9cf374d0d93ed9d8f83a8d9519c784ebbbff790756bc4ff82c3714046e7ea70e61be9dd4d58a67909fc311a7eff85d768b3bca5afa
+EBUILD tree-sitter-0.22.4-r1.ebuild 1167 BLAKE2B 0c741d26c7ddea422b5a5a5a94606e6b0c6450f1e7b8d3dd59bb8e685f8cc83606969ff519b7668e64f4acb4dee8f33e15b73d4b3cfd98c1d2636372ef77f746 SHA512 21f01d2f7139b5edf50de4c363da3d2943a73abe984daa66833c965b72232d930fde2b07281b7967e07abc8b5f88cad45d8d87b3f303ee312036e2a986158ac9
+EBUILD tree-sitter-0.22.4.ebuild 1103 BLAKE2B 0c53403941f9668490fdd8f6ad06e32a2720ede999659233b781b7f00d0f47b4d0c0ae22f9da8a11bd30b3146e38bcb8bddb8b4b4667277addb3f2b9dedcb664 SHA512 bfff1ce9bb10c5272d3b127fd8dadace79daebc30bf2e8d3b2c7e3642ea58153709bf58ffba7b6a34142418cfcb7f729e82a7d79857b04b474065169e028f9c3
+EBUILD tree-sitter-9999.ebuild 1103 BLAKE2B 0c53403941f9668490fdd8f6ad06e32a2720ede999659233b781b7f00d0f47b4d0c0ae22f9da8a11bd30b3146e38bcb8bddb8b4b4667277addb3f2b9dedcb664 SHA512 bfff1ce9bb10c5272d3b127fd8dadace79daebc30bf2e8d3b2c7e3642ea58153709bf58ffba7b6a34142418cfcb7f729e82a7d79857b04b474065169e028f9c3
MISC metadata.xml 1030 BLAKE2B 378584c9e0ae9c9d988cadd1150bbad84a14e5693120f874247d5ca744cd21d6b60cfdbcce8d028f5e8aefb6aac1ce2e8faebd23e68d86976f6dff333aecd518 SHA512 e97e2bc17d4d79fca8b18bf412250ee6547af95d7700b830b04eadc6cb783bcae618df58eecd7aa8b3209bcb6e2e13f2c92d175c9e75d437b6bac3b6c89a898f
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..000000000000
--- 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 <ahlincq@gmail.com>
-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..000000000000
--- 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.22.2.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild
index d3fc3901eeef..957abaa4ed60 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.22.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
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"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
fi
LICENSE="MIT"
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.4-r1.ebuild
index f44668ee69e9..d9718e3f31d5 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.22.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
@@ -12,21 +12,18 @@ if [[ ${PV} == *9999* ]]; then
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"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
fi
LICENSE="MIT"
-SLOT="0"
+# soname is .0, but abi was broken unexpectedly
+# Bug #930039
+SLOT="0/1"
+RESTRICT="test" # tests are for CLI and not the lib
-PATCHES=( "${FILESDIR}/${PN}-No-static-libs-gentoo.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
+PATCHES=(
+ "${FILESDIR}/${PN}-0.22.2-no-static.patch"
+)
src_prepare() {
default
@@ -36,14 +33,15 @@ src_prepare() {
src_compile() {
emake \
PREFIX="${EPREFIX}/usr" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ STRIP="" # bug 930020
}
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-0.20.8-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.22.4.ebuild
index d521078d2bfc..db60d1726316 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.22.4.ebuild
@@ -12,24 +12,17 @@ if [[ ${PV} == *9999* ]]; then
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"
+ 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}-No-static-libs-gentoo.patch"
- "${FILESDIR}/${PN}-0.20.8-no-parser-header.patch"
+ "${FILESDIR}/${PN}-0.22.2-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.9"
-
src_prepare() {
default
tc-export CC
@@ -38,14 +31,15 @@ src_prepare() {
src_compile() {
emake \
PREFIX="${EPREFIX}/usr" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ STRIP="" # bug 930020
}
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-9999.ebuild b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
index 1725e8da5f49..db60d1726316 100644
--- a/dev-libs/tree-sitter/tree-sitter-9999.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
@@ -17,9 +17,10 @@ fi
LICENSE="MIT"
SLOT="0"
+RESTRICT="test" # tests are for CLI and not the lib
PATCHES=(
- "${FILESDIR}/${PN}-0.20.9-no-static.patch"
+ "${FILESDIR}/${PN}-0.22.2-no-static.patch"
)
src_prepare() {
@@ -30,7 +31,8 @@ src_prepare() {
src_compile() {
emake \
PREFIX="${EPREFIX}/usr" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ STRIP="" # bug 930020
}
src_install() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 13:59:54 +0000