commit:     5a3b573f1f138940a3ed599d0d22c3f29de72a82
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Mon Aug 11 05:45:06 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep  6 14:32:49 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a3b573f

net-p2p/rtorrent: fix GREP call for stable version

scripts/common.m4 calls $GREP at configure time.
this can cause problems with slibtool and maybe also split-usr env.

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/43457
Closes: https://github.com/gentoo/gentoo/pull/43457
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/rtorrent/files/rtorrent-0.15.5-find_grep.patch | 13 +++++++++++++
 net-p2p/rtorrent/rtorrent-0.15.5.ebuild                |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/net-p2p/rtorrent/files/rtorrent-0.15.5-find_grep.patch 
b/net-p2p/rtorrent/files/rtorrent-0.15.5-find_grep.patch
new file mode 100644
index 000000000000..b7db85747910
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.15.5-find_grep.patch
@@ -0,0 +1,13 @@
+https://github.com/rakshasa/rtorrent/commit/dd8281204f5365f0f6987f989e71208d3c218289
+from upstream
+configure fails with slibtool because it doesn't define GREP
+--- a/scripts/common.m4
++++ b/scripts/common.m4
+@@ -23,6 +23,7 @@ AC_DEFUN([TORRENT_WITH_SYSROOT], [
+ 
+ AC_DEFUN([TORRENT_REMOVE_UNWANTED],
+ [
++  AC_REQUIRE([AC_PROG_GREP])
+   values_to_check=`for i in $2; do echo $i; done`
+   unwanted_values=`for i in $3; do echo $i; done`
+   if test -z "${unwanted_values}"; then

diff --git a/net-p2p/rtorrent/rtorrent-0.15.5.ebuild 
b/net-p2p/rtorrent/rtorrent-0.15.5.ebuild
index e8de0bdccab7..fe08327c47ea 100644
--- a/net-p2p/rtorrent/rtorrent-0.15.5.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.15.5.ebuild
@@ -44,6 +44,8 @@ DOCS=( doc/rtorrent.rc )
 
 PATCHES=(
        "${FILESDIR}"/${PN}-0.15.3-unbundle_json.patch
+       # fix configure w/ slibtool. merged in 0.16.0
+       "${FILESDIR}"/${PN}-0.15.5-find_grep.patch
 )
 
 pkg_setup() {

Reply via email to