gentoo auto-resync : 18:06:2024 - 00:10:02

3 files changed, 123 insertions, 0 deletions

diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index 55195f2a3127..b4e2ebc8960c 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,5 +1,7 @@
+AUX 0001-bash-completion-port-to-v2-API.patch 1299 BLAKE2B 75881c7a6092cfa26ae188a7773a8d2745336c0859f762abb799a3ab3efed1ef67591bc5c560d7dd3040f7a51bd272675ce48251f4191969874e9921e196940b SHA512 452cf11f32e28e2851bc3d2c8a72ff42f6df17f03c9da1692d83cfceeea7e1e29c1443483fb0daac90ae620959b380d4421185c7d97347513569f678bd164d0c
 AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c318e1acba7c701880c441e2701146bf289872c353308d791e7f36a85106a901c416725d108e6c9012bd5c0e77adde00dd831df97c SHA512 51067853b604d7f2eb5272dbb960888d70002d58a61dff5c4748031d92a61b6b06aa02b09e29babac47e7fff872bb51fbe8929ac2d3fdef0a6ddbb29ffb18052
 AUX the_silver_searcher-2.2.0-no_lfs64.patch 1319 BLAKE2B dbddd84fe6a2c0a29b3d585cc93892806808b0c3684213f43c0b32646a450bf40c56e1eaa2a0c40a651f1a82c2b773184792b558eeefed728d379fba711e1483 SHA512 0a2417467c221192f27e0ecd34dbc3d7ebe0f2e95613e978ee5c2fa49c85a2ebaf19e2bc0adcaaa0e1add415ed65156e6de437152c3d31cbb377e316f0b44639
 DIST the_silver_searcher-2.2.0_p20201217.tar.gz 165236 BLAKE2B eaf5e657b33d463048a83e08a90588448cb2fcd481b1f7f869e82c5e1ae1168a10dacb0d549dcc4acafb4323c96a9b67ff9e58de85f80bd2bd7e209ddc5ca6fa SHA512 96bc8da8ba10034bbb646bac71d479a21a68793e8af5377481da72c8dfa49ac99a1540c2b4193c4a95167127f1caa48fbd611ba367b8279bd2115549b6d8d126
 EBUILD the_silver_searcher-2.2.0_p20201217-r2.ebuild 1248 BLAKE2B 9478a97970b5fc43ef375e2ff6d31221d9cd88e01c68cd658d4d5bf933cc93489f87508b018573ebeaf49971fc8cf96fad2d1ff23926982bf56e98ab546b484f SHA512 33110751afa88d6ffa5005dac1c74d0149f589ccd9be55e91978a9e770c40aea964e095b1ddc82c6c148d4b85ff89b93f27c5ef13096dd060e393d9deaebaa17
+EBUILD the_silver_searcher-2.2.0_p20201217-r3.ebuild 1417 BLAKE2B ebcff15b708f6a4f132e80e34f4244fb17a1e0376531f265a3b80dd71a132a558b2f333052f9b74446fa0a24e335a0bbf866aa9d46ec4c9e7b12111dc9876eb9 SHA512 ebf346101bfe02b65cd144bd17223531edfb8e57a22e1f8386732b64b9b2ad18d60ec424bd9be88c489096c58c2766e01064de3b423b776003437a396f87a303
 MISC metadata.xml 337 BLAKE2B ebc0a9cb5b553e57b6b4fedd0c0838256ed348c1f313576eb58accf4a8a1ab73d8065daaadbf4fed612ee6311b114cfd2330b62840c7238c77832f4122739bdf SHA512 40d62335cc5c9f9857b635f7fd15daadd9f7b3b733ac64c39d7078dec27e742763232316aac45f88967f9b95bf8068e509492fa8c17cf43fde9e46f640065105
diff --git a/sys-apps/the_silver_searcher/files/0001-bash-completion-port-to-v2-API.patch b/sys-apps/the_silver_searcher/files/0001-bash-completion-port-to-v2-API.patch
new file mode 100644
index 000000000000..151e8a1274b4
--- /dev/null
+++ b/sys-apps/the_silver_searcher/files/0001-bash-completion-port-to-v2-API.patch
@@ -0,0 +1,58 @@
+From eca81ee573f30f8eb790d33db1c86d2970f7fc4a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 16 Jun 2024 15:35:30 -0400
+Subject: [PATCH] bash-completion: port to v2 API
+
+Fixes: #1537
+Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
+---
+ ag.bashcomp.sh | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/ag.bashcomp.sh b/ag.bashcomp.sh
+index 5637ce4..e03f580 100644
+--- a/ag.bashcomp.sh
++++ b/ag.bashcomp.sh
+@@ -1,11 +1,9 @@
+ _ag() {
+-  local lngopt shtopt split=false
+-  local cur prev
++  local cur prev words cword split
++  local lngopt shtopt
+ 
+   COMPREPLY=()
+-  cur=$(_get_cword "=")
+-  prev="${COMP_WORDS[COMP_CWORD-1]}"
+-
++  _init_completion -s || return 0
+   _expand || return 0
+ 
+   lngopt='
+@@ -96,12 +94,10 @@ _ag() {
+   types=$(ag --list-file-types |grep -- '--')
+ 
+   # these options require an argument
+-  if [[ "${prev}" == -[ABCGgm] ]] ; then
++  if [[ "${prev}" = -[ABCGgm] ]] ; then
+     return 0
+   fi
+ 
+-  _split_longopt && split=true
+-
+   case "${prev}" in
+     --ignore-dir) # directory completion
+               _filedir -d
+@@ -117,7 +113,9 @@ _ag() {
+               return 0;;
+   esac
+ 
+-  $split && return 0
++  if [[ ${split} = true ]]; then
++      return 0
++  fi
+ 
+   case "${cur}" in
+     -*)
+-- 
+2.44.2
+
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r3.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r3.ebuild
new file mode 100644
index 000000000000..93ac9f8cc8f8
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1 flag-o-matic vcs-snapshot
+
+COMMIT="a61f1780b64266587e7bc30f0f5f71c6cca97c0f"
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher"
+SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+IUSE="lzma test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libpcre
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? (
+		dev-util/cram
+		dev-vcs/git
+	)"
+
+DOCS="README.md"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-lzma.patch
+	"${FILESDIR}"/${PN}-2.2.0-no_lfs64.patch
+	# https://github.com/ggreer/the_silver_searcher/issues/1537
+	# broken with >=app-shells/bash-completion-2.12
+	"${FILESDIR}"/0001-bash-completion-port-to-v2-API.patch
+)
+
+src_prepare() {
+	sed '/^dist_bashcomp/d' -i Makefile.am || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# false positive TEXTRELs on riscv
+	# https://bugs.gentoo.org/797355
+	append-flags -fPIC
+
+	econf \
+		$(use_enable lzma) \
+		$(use_enable zlib)
+}
+
+src_test() {
+	cram -v tests/*.t || die "tests failed"
+}
+
+src_install() {
+	default
+	newbashcomp ag.bashcomp.sh ag
+}