mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
sys-apps/the_silver_searcher: fix compatibility with bash-completion 2.12
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user