From b448e9d8d8a7fa8333d04f16429862b99f61e912 Mon Sep 17 00:00:00 2001
From: Marek Szuba <marecki@gentoo.org>
Date: Fri, 5 Apr 2024 23:26:19 +0100
Subject: sys-apps/the_silver_searcher: fix the no-LFS64 patch

According to the documentation glibc still defaults to 32-bit file
offsets on 32-bit arches, therefore tell autoconf to check if it needs
to explicitly set this to 64.

Straight-to-stable revbump on the off chance someone has emerged the
ebuild using the previous version of the patch on a 32-bit system. And
that's enough of messing with this without the usual ~arch revisions.

Signed-off-by: Marek Szuba <marecki@gentoo.org>
---
 .../files/the_silver_searcher-2.2.0-no_lfs64.patch | 11 ++++
 .../the_silver_searcher-2.2.0_p20201217-r1.ebuild  | 60 ----------------------
 .../the_silver_searcher-2.2.0_p20201217-r2.ebuild  | 60 ++++++++++++++++++++++
 3 files changed, 71 insertions(+), 60 deletions(-)
 delete mode 100644 sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
 create mode 100644 sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r2.ebuild

(limited to 'sys-apps')

diff --git a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch
index 62925a7fb1f0..7468a47a0568 100644
--- a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch
+++ b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch
@@ -1,6 +1,17 @@
 LFS64 interfaces are now generally considered deprecated, and are no longer
 available in MUSL since version 1.2.4.
 
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,6 +12,8 @@
+ AC_PREREQ([2.59])
+ AC_PROG_GREP
+ 
++AC_SYS_LARGEFILE
++
+ m4_ifdef(
+     [AM_SILENT_RULES],
+     [AM_SILENT_RULES([yes])])
 --- a/src/zfile.c
 +++ b/src/zfile.c
 @@ -4,7 +4,7 @@
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
deleted file mode 100644
index 1b9f8c8a60bb..000000000000
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
-)
-
-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
-}
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r2.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r2.ebuild
new file mode 100644
index 000000000000..1b9f8c8a60bb
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r2.ebuild
@@ -0,0 +1,60 @@
+# 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
+)
+
+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
+}
-- 
cgit v1.2.3-65-gdbad