commit: 8316761e4d24174ccec27a2ac34f4b4c5e950dd9 Author: Matthew Smith <matthew <AT> gentoo <DOT> org> AuthorDate: Sun Apr 14 15:18:12 2024 +0000 Commit: Matthew Smith <matthew <AT> gentoo <DOT> org> CommitDate: Sun Apr 14 15:18:58 2024 +0000 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 <matthew <AT> 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..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 <ahli...@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.20.8-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild deleted file mode 100644 index d521078d2bfc..000000000000 --- a/dev-libs/tree-sitter/tree-sitter-0.20.8-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 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 -} diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild deleted file mode 100644 index f44668ee69e9..000000000000 --- a/dev-libs/tree-sitter/tree-sitter-0.20.8.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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" ) - -# 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 -}
