gentoo auto-resync : 27:08:2023 - 22:00:51

10 files changed, 95 insertions, 64 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d6ef2ed5d839..1beaca73ed7d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libjodycode/Manifest b/dev-libs/libjodycode/Manifest
index 9f29cecc88b5..a1595fde21cd 100644
--- a/dev-libs/libjodycode/Manifest
+++ b/dev-libs/libjodycode/Manifest
@@ -1,8 +1,4 @@
 AUX libjodycode-3.0.1-static-lib.patch 730 BLAKE2B 5d7c50b75401471282ebef0c482485d68a132bd22110f2905768abe20d3ef9aa3ca2ff4784cdd891d543c883210fe5b2423a073ce3f1eca11c005dd1c2355b2f SHA512 bdc2d6409ef550d688a3feb9374d63986e51621b4d5a3f92d8dc6cede76b27f77acd26ac3daddba9d0ef848c5ef1486feb8b5c13963580a3540fd04cb0415f9e
-DIST libjodycode-2.0.1.tar.gz 22186 BLAKE2B 1a1d88a3cebc2adf4a9a067c00e8c543e01dc9f5a34ea2ab6c3e5239b2627c7f737f4a467dfd03b8ba7a38c6764227f009e5c0c7af6b5086652183bbd052ae1a SHA512 eba59bc2a792e129e8d397c8fdb9d6dc09b6af87828e18c530e8613c425ed8b404b8cc586aea490fe9f1791630c12c879c2f97f52740dc0e31b5feff9ccd95b1
-DIST libjodycode-3.0.1.tar.gz 25929 BLAKE2B a55e7a2f2ab829dfadc4ecf296e56d38341acd8fde44bc84bdb821d485546b4c4e31fe40a729cfc940b0499d7d1a83e549ddd93abab709be463fd4050d7d45c7 SHA512 cbcc85ce2f321a01762966100ba73b7ddadd2f5bbbd6ec2ddc99624a54505ec6fc8d2be2b3cb520312b5c82599401141409018c58e68a2f17c044c69da6caa75
 DIST libjodycode-3.1.tar.gz 27340 BLAKE2B c084c75a241737c63f33a9a21ea2dc5303d6811fd94db9bd62162eb1ed3fa6e43edbbc1cbfa079f60f8f11a76c052cd825250b2ca34594889da46cbdda1c5248 SHA512 980f1797084594f710cae92b26d10c46a73415d11e89af608c8a87730ea39f497fec0889f9bd88af7c23aa0067dd6642758edc2b2756d9eba6e6a4a50c583751
-EBUILD libjodycode-2.0.1.ebuild 592 BLAKE2B b38c96308d19283b172994c2455b0a4b48a147799f3b11b9b143214fbfe1fe1fbd476f510c02e50005db17ca84b8bd0f54e398e7fe8a15b89bcd5d6b6687bd91 SHA512 4bd445a5a75f20c2be4af5f2999a6a72d4374ed1b7a51a70b990da1a61b3a15f79717e323e17647a94ba50b24c21d2d26c546c6b116d773f2de022796dbd6d6f
-EBUILD libjodycode-3.0.1.ebuild 679 BLAKE2B 75c9179a280ec0d1d5a96338054a752739b93594e045307a52f9447d6ad3dcf48a6938a774722460e1b37d6e4b168c5ee5c3e237a841260ef9d154f740896262 SHA512 e19f4b6a34517dc957d7161b9f05c3b134f8b0b1a9f283f1eb7d3c9bb9314f9daca71dfc9ff5142b1d3458447e52f83ae9a23853e1317b2c930204c920b81fe8
-EBUILD libjodycode-3.1.ebuild 686 BLAKE2B 5989737640c9d6a5e1174f591c11b384cd2a442f0396908c4f7621849d890ad74f0b20a3a32ad2b6bfb7edfe92904f8b5cc9c4f03a85b6f506fe33b702f9c9b7 SHA512 0364f48d3ccc7d7accc224108d551cbc11dbee6a00633c13894bc62e84cf7482b9abaf18f22441f908d7de0ae9865dcd866583324c4f52642d2aea0d50cab733
+EBUILD libjodycode-3.1.ebuild 685 BLAKE2B 54d2e739ec3f0300e6bdbfdde79baa013418ada7138a732b39ad6b0f3355100ab19aa13d0e88a1b2b29ccf1a0b87156302d9d96f92fc72014e86d748fee76980 SHA512 fb56e6589533b73cbe20610ce3a2de49fd1a0385f5427abbdafc145fe3ced98c924755e3d90508c961d040f5253891efbfa3b92fe25be6e9dcda880c0e552547
 MISC metadata.xml 477 BLAKE2B 82b4ea94d7f806431a7069d90213b60af563a1f25b018a257de4e29eae399df2b774152e1bf0c8eae03bc58de28a39cd26acd5003bb986238715bc5e29a0a4b4 SHA512 1f2f424c4f67b5e1335ce4bf7b81c10cce492a527305683d9c9aeacab9a8c5cf8166c31dd9cec57955d3e26f6759d4f678957bd4f5cb544582e67294d989a8a4
diff --git a/dev-libs/libjodycode/libjodycode-2.0.1.ebuild b/dev-libs/libjodycode/libjodycode-2.0.1.ebuild
deleted file mode 100644
index 24838eaf1a0b..000000000000
--- a/dev-libs/libjodycode/libjodycode-2.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Shared code used by several utilities written by Jody Bruchon"
-HOMEPAGE="https://github.com/jbruchon/libjodycode"
-SRC_URI="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-# missing test script
-# https://github.com/jbruchon/jdupes/issues/191
-RESTRICT="test"
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIB_DIR="/usr/$(get_libdir)" \
-		PREFIX="${EPREFIX}"/usr \
-		install
-	einstalldocs
-}
diff --git a/dev-libs/libjodycode/libjodycode-3.0.1.ebuild b/dev-libs/libjodycode/libjodycode-3.0.1.ebuild
deleted file mode 100644
index 21fb1968503a..000000000000
--- a/dev-libs/libjodycode/libjodycode-3.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Shared code used by several utilities written by Jody Bruchon"
-HOMEPAGE="https://github.com/jbruchon/libjodycode"
-SRC_URI="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# missing test script
-# https://github.com/jbruchon/jdupes/issues/191
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-static-lib.patch
-)
-
-src_compile() {
-	emake sharedlib
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIB_DIR="/usr/$(get_libdir)" \
-		PREFIX="${EPREFIX}"/usr \
-		install
-	einstalldocs
-}
diff --git a/dev-libs/libjodycode/libjodycode-3.1.ebuild b/dev-libs/libjodycode/libjodycode-3.1.ebuild
index ed722e353ab5..76fa041c7d71 100644
--- a/dev-libs/libjodycode/libjodycode-3.1.ebuild
+++ b/dev-libs/libjodycode/libjodycode-3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jbruchon/libjodycode/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # missing test script
 # https://github.com/jbruchon/jdupes/issues/191
diff --git a/dev-libs/tree-sitter-bash/Manifest b/dev-libs/tree-sitter-bash/Manifest
index 70f73ddc5327..ecc2d2708148 100644
--- a/dev-libs/tree-sitter-bash/Manifest
+++ b/dev-libs/tree-sitter-bash/Manifest
@@ -1,3 +1,5 @@
 DIST tree-sitter-bash-0.19.0.tar.gz 187286 BLAKE2B 8812a593366a65a9cae3eaac5bb81c71e95f4abe8558a01b908333e471f05714b1c768b71e66d3890d1e63202819290813e499a5e8ba49e72bb466b9b0f245f8 SHA512 62bc8bc25c999f9c79632bd6b236edd21ef15b14365dd1a956237b11a32f5e60a2f420ec67b60d46203699b7841d4bc10978fc0307d0c4013b376c6c024d89ae
+DIST tree-sitter-bash-0.20.3.tar.gz 334446 BLAKE2B e33f841e48458a63e6e084f66a251c6847c004140a1b727752452d031d240756068f5188d1bd90c4194aaf51d040187f3995636673210bc5f93f2ed50ff73a97 SHA512 558a8eef4a04e786c43bef0dd24f022619b77faffdd5788ef47ba28f133d5a55df144169503343cdb46ac4ed66deb36ca483b963e3eb686da30c324c65c9eac3
 EBUILD tree-sitter-bash-0.19.0.ebuild 364 BLAKE2B aa9e2ebb88fc9b7cfc560a1363d7f6627f3a15e4be9d050a8c86ce394fb31717cc3bbafa1bd4be4e72d7a1798371743952780f96cab888fe5166312dbe30431e SHA512 08d01e57e92bcf1f0fd0f745b05e547e82655e15aba70a93b43f6893c9f1db4ed0faad844b3ad8d1a9d63eac7124c09237b58a9ec6c02bb0688db57ae2428a75
+EBUILD tree-sitter-bash-0.20.3.ebuild 372 BLAKE2B 9925da15a54542a16e264d6f995d1faa5fac6dee839c88f90f24d60909f3a3a668aa5a254223f5cbdd9cb914223564b6795a3dea2918553f16cd9f352882669d SHA512 b3d6d9d03fd45c4c9c8dc4d29e1a882fc1225969d5f66869340fc6190c041c4925cf1bddd83eed900574d4c763be05639e128128ee323aa6ec7bde9af80cbd8a
 MISC metadata.xml 446 BLAKE2B 60052c2b380610a7baea0e630cbe82709976827341183e1a1a7c846913f3fb0ae8ad85c40701ec827685592e326405a9b2cab1674d015c7111c1df90ad8a162f SHA512 e845bf4cd56026aec1b531cd23ea6bf5eed38ac0d3f91dedead87907e4708bac82db87b3c7ccaa1135a4c25911f2b369836c2689faac9ad54782978dd2c8f95b
diff --git a/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.3.ebuild b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.3.ebuild
new file mode 100644
index 000000000000..e85879ef93cb
--- /dev/null
+++ b/dev-libs/tree-sitter-bash/tree-sitter-bash-0.20.3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Bash grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index bdba2a932298..9b995314fb0c 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,9 +1,11 @@
+AUX tree-sitter-0.20.8-no-parser-header.patch 1007 BLAKE2B f1e088a764629685f84d9526eda219a8e52f4e7e6aefe3cc1f4ef713ffa4b21cd228369f4be6ba082359a1065b73bdcb52f80ba1a1cded2215153e3d59d9097a SHA512 c2a5541fb528ca07daffb80103397226a59d53d4f206282ae43e2deee27220ef9a9d5ade86da7b09130398c8bcd2e809c547c490f8271ae696f097d89a6931e8
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
 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
 EBUILD tree-sitter-0.20.6.ebuild 1021 BLAKE2B b36aa0a4a1563751dd8315f27f01203693f543f22513d21e269087050898d5a9cfc67c856147ef407718257634214678e12e820af645217a52deb26229a4ce3c SHA512 c229498f68a38d73b7ed14c3d0ecb8261c789651b858a6c73a70056a6b12b36d1dac69f1af82258052dd309543aa0da2dcff6329b08715bb3c7127732a316f97
 EBUILD tree-sitter-0.20.7.ebuild 1069 BLAKE2B 43e08f495241ef7b83d758766d44ebf1ab94bae8720fc2bf2ebdcfba1d5699b8d7ae0ad80f9525879cb79c0a51dbb8319481adf39f7acd263f5e13bd7c1effcc SHA512 6f9ec44dc47431fc10adf150d27d6824506e35cf1a8b0d78656e4df170a085f70ada39ce1204c2c83df78edd1d62ab1e7d0c6e143b6c8f8cd0da2639f354afbc
+EBUILD tree-sitter-0.20.8-r1.ebuild 1336 BLAKE2B 158b45389c9a4d19a846f3809c062d91041e195dba69969caf2ef2238069a511e1123a4934806ee1f3510959dd36a3a574f4b0f1c33782ee40a1903a4844367a SHA512 a31d13071e72f1640981af304f5c6dc64746ca5b05cbd87966f6c60c982955407cfd1daef94b919581dac27a938c98acef635b06c2ca6ec75c0135aecfd3b6bf
 EBUILD tree-sitter-0.20.8.ebuild 1277 BLAKE2B fca5db0fb7a996038dd8c65c12b74e038d566b01d68e2a19ea00a56b69d5e17feb1f175ffc7077dde778861fa1a918e3f1d33201f08b3d46ec90cb19e5639acf SHA512 97138d0d18931238eb7359a4f0043c69bb63624785d48326ca127fc166c3cb8c372dabbde1aa787041fe7345aca642b6eafdc2c9907bc75992e771185fcf3933
 EBUILD tree-sitter-9999.ebuild 1029 BLAKE2B c335042cf6c9155c2fad5c9c3eb9b508956b077cb22ee9e20f2f612a4afb2e0ec3797b149bb2b085c70e9d9110b6cdcb818aa4b66afff9d8fe54b40a5921699a SHA512 3284675110336a56485f5b4577e5461cbcf2e400deb4a4de5b107b248d8271f5e382dd247d1679c0be70e0ffb5f8820592e54c83f37807ae301b21f63d17b3de
 MISC metadata.xml 927 BLAKE2B 1b94b1e0f323461151d82920b4185cdee4aff41ff751f170d893b80f62423545adfd5efd8cc920c933f599089fbd72423ffdb4e43dc51f975bbc4eebe601abd1 SHA512 88e936a507fbd1154c1c167f6fc343ded2e3e6d2c073d2efce9a2e1c98ac1877e5c1197a903a597b403b444189cf2e4b519c4cf144a8eb1ad050c0a8b07ae101
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 000000000000..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 <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/tree-sitter-0.20.8-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild
new file mode 100644
index 000000000000..862cc9ee3eb6
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild
@@ -0,0 +1,53 @@
+# 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} == *9999* ]]; 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"
+)
+
+# 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
+}
+
+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
+}