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

9 files changed, 134 insertions, 11 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7af8cd3bd6b2..945f3483368b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index 03badc0722a9..9f1d39fd40ad 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -243,6 +243,6 @@ DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d65
 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD bat-0.23.0-r1.ebuild 4668 BLAKE2B 2b99139f4fc0c35a64e1698c3d6e7eb12a02ba83e87d5540e8fceedb0b519ec4f68a0bb3c540622061597bc2df60ef66d2564af5cfc5763d0cd1ec68284d47af SHA512 d95702a46e7cfa3707b712a874cbdfe280f0b793738485abe554d82aeea68df717dbe1c242d54c41e776d30d0c17b96a8cb14d7041593c48244da56c1b3e5f69
-EBUILD bat-0.24.0-r1.ebuild 5149 BLAKE2B a4d7db9789d8af28179e7c46430bdc5ec65514846392ad0f9660e8899999ca424cb73e7b51b8889a5124a331c74446aa6fdcfab888fd93142defd36e231a0b22 SHA512 a589d80b756acd75f0a1024c562ea1a5c4fc569cfb004c50be9552ef898804eedd380fee903b64bef15fd8bc92adba7b3769317d09febcdfda8ebfa564b5a81e
+EBUILD bat-0.23.0-r1.ebuild 4660 BLAKE2B 58e80a4d0dab24c7060a99014bfc0bca04697c8d1fe6902dd2b58cae85bbba477c723ebd81c2db3808fde1aec362215431a76e37409fdb508d5c90692a8ae4a4 SHA512 4e699664e1cd5c562d3b8a638e9f0d7d1188113b2bf60997880c0a02a47992278cf7a79173a193193fc258f106140cc6227913440fe8bcd7292869abeeb77cac
+EBUILD bat-0.24.0-r1.ebuild 5141 BLAKE2B 6a267025e47d0a850e47af0a42475ce63f9281e545ffd19cf3840435cf88a4767b3d5f9984d4a3964c2e422afe5e91e1dae14a8e37ce22ef00adb271152fb487 SHA512 9cbe3b0f2ccc28d30ae697fcb14a3af4ee1a3950f8c51b34e8a711d151ca2e1903eb4034d5fa8178dca697f89688a50bebd726482e30630efd0e804da0b89f8d
 MISC metadata.xml 859 BLAKE2B f9143e9c55aabd2870c65d2750d89a358ad8ec4d10fcf277912946e859c2da22b23a7d9ec50834918afb49c4532e524d0f1d8a4173983b4390321d19d531949f SHA512 91e69a3cf8d4667b7ca5c0145f0c11bf9183f798767bb18d7401b3fe04d0ae074bc0aa575992ab4f928acb8ec0d18f86769e7b519023c4eabc05ea4eaf2b0bec
diff --git a/sys-apps/bat/bat-0.23.0-r1.ebuild b/sys-apps/bat/bat-0.23.0-r1.ebuild
index b0f52777c924..0a4601f4acbf 100644
--- a/sys-apps/bat/bat-0.23.0-r1.ebuild
+++ b/sys-apps/bat/bat-0.23.0-r1.ebuild
@@ -218,8 +218,8 @@ src_install() {
 
 	einstalldocs
 
-	local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
-	cd ${build_dir[0]} || die "Cannot change directory to ${PN} build"
+	local build_dir=( "$(cargo_target_dir)"/build/${PN}-*/out )
+	cd "${build_dir[0]}" || die "Cannot change directory to ${PN} build"
 
 	doman assets/manual/bat.1
 
diff --git a/sys-apps/bat/bat-0.24.0-r1.ebuild b/sys-apps/bat/bat-0.24.0-r1.ebuild
index 0c0d2c793320..ada5fae6a7d5 100644
--- a/sys-apps/bat/bat-0.24.0-r1.ebuild
+++ b/sys-apps/bat/bat-0.24.0-r1.ebuild
@@ -247,8 +247,8 @@ src_install() {
 
 	einstalldocs
 
-	local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
-	cd ${build_dir[0]} || die "Cannot change directory to ${PN} build"
+	local build_dir=( "$(cargo_target_dir)"/build/${PN}-*/out )
+	cd "${build_dir[0]}" || die "Cannot change directory to ${PN} build"
 
 	doman assets/manual/bat.1
 
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index e25ff508d723..5a05129a3d45 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -46,5 +46,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD ripgrep-14.1.0.ebuild 2443 BLAKE2B 590434a8800a6c4fa1e4aa7a1445329e7d2b0977814ddb1956a92245ff9c886fe0cbd3cba449a295cc2591bb4204dbac237180093ba2586fe446192cec09e38a SHA512 befa7ff23fa9cc33e48bb97645d83ccdd5cc832aa7bcc99fc39a7984a843b3813741124558ff87f71e137dae683286d5d188e6624cb0755530b951ee58517af3
+EBUILD ripgrep-14.1.0.ebuild 2383 BLAKE2B eb1a210bccf8b11dd2ba71d8b3ce8147c110598f56acaa85e72569328ecd80d99178e1c3fef3b6ae8fbe6d680dc3ff52f938e5367078e3360e99e209b35dd8b6 SHA512 06f5e95643a17804c71461ce0083e66bf9c6a009f15ad3c611c75c667109bf224f3d57dafbc9a28bf55743a1e900978b906b60fdda5d1fe66a2060ae71713b8c
 MISC metadata.xml 612 BLAKE2B ac80b8ebf9a393ade11852d4ece6cecc2c4851414a5cd559445a7651d25b842e1d7e4920884a71f9cf59f25b5600979b0f8f5a3f4354b6c1f1d930c3adbb6035 SHA512 d8f1754ac2a831a6107c3a6a2812696d1b74dca92ff1c5f42d89c783a0bc5a6018ed9c06bf8c0fc4aa4fbe46ff40ee011bd3e61f0cd256a74895ce3b06bfa226
diff --git a/sys-apps/ripgrep/ripgrep-14.1.0.ebuild b/sys-apps/ripgrep/ripgrep-14.1.0.ebuild
index 97d8367a346e..904eb11c2b63 100644
--- a/sys-apps/ripgrep/ripgrep-14.1.0.ebuild
+++ b/sys-apps/ripgrep/ripgrep-14.1.0.ebuild
@@ -99,21 +99,21 @@ src_install() {
 	cargo_src_install
 
 	newbashcomp - rg <<-EOF
-	$(target/$(usex debug debug release)/rg --generate complete-bash)
+	"$(cargo_target_dir)"/rg --generate complete-bash)
 	EOF
 
 	insinto /usr/share/fish/vendor_completions.d
 	newins - rg.fish <<-EOF
-	$(target/$(usex debug debug release)/rg --generate complete-fish)
+	"$(cargo_target_dir)"/rg --generate complete-fish)
 	EOF
 
 	insinto /usr/share/zsh/site-functions
 	newins - _rg <<-EOF
-	$(target/$(usex debug debug release)/rg --generate complete-zsh)
+	"$(cargo_target_dir)"/rg --generate complete-zsh)
 	EOF
 
 	dodoc CHANGELOG.md FAQ.md GUIDE.md README.md
 	newman - rg.1 <<-EOF
-	$(target/$(usex debug debug release)/rg --generate man)
+	"$(cargo_target_dir)"/rg --generate man)
 	EOF
 }
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
+}