From 9323524b4d44f4ec3dc923bd8e9ea04bdde8a067 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Apr 2024 00:30:33 +0100 Subject: gentoo auto-resync : 06:04:2024 - 00:30:33 --- sys-apps/Manifest.gz | Bin 50840 -> 50841 bytes sys-apps/the_silver_searcher/Manifest | 4 +- .../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 +++++++++++++++++++++ 5 files changed, 73 insertions(+), 62 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/Manifest.gz b/sys-apps/Manifest.gz index e8638fd6ec20..8cdbb93d883b 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest index bf598052a394..55195f2a3127 100644 --- a/sys-apps/the_silver_searcher/Manifest +++ b/sys-apps/the_silver_searcher/Manifest @@ -1,5 +1,5 @@ AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c318e1acba7c701880c441e2701146bf289872c353308d791e7f36a85106a901c416725d108e6c9012bd5c0e77adde00dd831df97c SHA512 51067853b604d7f2eb5272dbb960888d70002d58a61dff5c4748031d92a61b6b06aa02b09e29babac47e7fff872bb51fbe8929ac2d3fdef0a6ddbb29ffb18052 -AUX the_silver_searcher-2.2.0-no_lfs64.patch 1142 BLAKE2B f42b6b96ddd83a0bd3cf6cb0b030a3c4a628f2fc71bbea30261680f68a7351f25453a0898eb877fc2d7ab3c332bea5aec5b4cbf1ad49297a0741d3a2f9c29807 SHA512 9cb5a28fafd89955c4d65c58e0b4951e2a400e80d5608f47869fc5e5e0ee8626897e978e828c3e0aee7d30f7bfd93e63a0d076b3b754db500edcf804cfd721b2 +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-r1.ebuild 1248 BLAKE2B 9478a97970b5fc43ef375e2ff6d31221d9cd88e01c68cd658d4d5bf933cc93489f87508b018573ebeaf49971fc8cf96fad2d1ff23926982bf56e98ab546b484f SHA512 33110751afa88d6ffa5005dac1c74d0149f589ccd9be55e91978a9e770c40aea964e095b1ddc82c6c148d4b85ff89b93f27c5ef13096dd060e393d9deaebaa17 +EBUILD the_silver_searcher-2.2.0_p20201217-r2.ebuild 1248 BLAKE2B 9478a97970b5fc43ef375e2ff6d31221d9cd88e01c68cd658d4d5bf933cc93489f87508b018573ebeaf49971fc8cf96fad2d1ff23926982bf56e98ab546b484f SHA512 33110751afa88d6ffa5005dac1c74d0149f589ccd9be55e91978a9e770c40aea964e095b1ddc82c6c148d4b85ff89b93f27c5ef13096dd060e393d9deaebaa17 MISC metadata.xml 337 BLAKE2B ebc0a9cb5b553e57b6b4fedd0c0838256ed348c1f313576eb58accf4a8a1ab73d8065daaadbf4fed612ee6311b114cfd2330b62840c7238c77832f4122739bdf SHA512 40d62335cc5c9f9857b635f7fd15daadd9f7b3b733ac64c39d7078dec27e742763232316aac45f88967f9b95bf8068e509492fa8c17cf43fde9e46f640065105 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