Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/grep/
Date: Sat, 03 Sep 2022 19:58:00
Message-Id: 1662235069.909d058c58e8f60397b494cc942bf6a9510de05c.sam@gentoo
1 commit: 909d058c58e8f60397b494cc942bf6a9510de05c
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 3 19:57:45 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 3 19:57:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909d058c
7
8 sys-apps/grep: drop 3.7_p20220425
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-apps/grep/Manifest | 2 -
13 sys-apps/grep/grep-3.7_p20220425.ebuild | 72 ---------------------------------
14 2 files changed, 74 deletions(-)
15
16 diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
17 index 48e58b35f33c..65caccff65b5 100644
18 --- a/sys-apps/grep/Manifest
19 +++ b/sys-apps/grep/Manifest
20 @@ -1,5 +1,3 @@
21 -DIST grep-3.7.62-9a668.tar.xz 1687820 BLAKE2B 95f5deccb3b3b223cb429f5c515674bed5209e6ca1d295b5ddfcf09614c6c10f6c6f56df9931a3dc0926b48abced15ab1099d8e84840c74846cb89270e248473 SHA512 b24a11138e683d75e75b4f04a42f4d202526a691aa70c303af4d257e2a395a4266b4bc05afff4fff7ab0efc5564af3efe0f9108cbeddf406d4dc3f171a642f25
22 -DIST grep-3.7.62-9a668.tar.xz.sig 833 BLAKE2B 9be6a33b1d2e29eeaea6bfbcbeade37eb4d7c8b2fdf37ec82376b1cc158f02c6916c87c21378cd099f863787ae46e2bc7dd40df77b263fe971f50b7bbe67cced SHA512 5245b7af4202bd49ef8937eda3ad91949e6bd9e16e217c0a326e8d6abc17d8f47e068197cb5df16829298912eed0d811164da4d1d7bd3ce3ff679a87a281f33b
23 DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f3b0e2be484e8abdd06d1fbdbb396f3d73dadadf9618aad2f02cf6416094bad64d5f2f15eab6b6b3adfeda SHA512 e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82
24 DIST grep-3.7.tar.xz.sig 833 BLAKE2B 02a2850e22e8054dcfd02b6f08747a97d43dae9adb908516bdaed35750aa7f773832ad1b0b4c53d7b0ebc8f1fe2979e7938bbbeeb09ea00c11b4a0d5846c7b9c SHA512 9db28883b696fbbb0fad32f4ecd168954dc475d5f0a8f2b4f960ff615ef7dd8348a7caaee85a96287824472a29485ff921af121c582083ca5ad5c30960f99cf4
25 DIST grep-3.8.tar.xz 1709536 BLAKE2B 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 SHA512 2014519a80c6dcd799837e1bd7d9d5ebe8729ec54b0dc76981dac4755a9a8a9f200470cdcc911e2825bed8162e61da39e3dd60289f7393b48bf67314077d0c79
26
27 diff --git a/sys-apps/grep/grep-3.7_p20220425.ebuild b/sys-apps/grep/grep-3.7_p20220425.ebuild
28 deleted file mode 100644
29 index 342f35aa3dbb..000000000000
30 --- a/sys-apps/grep/grep-3.7_p20220425.ebuild
31 +++ /dev/null
32 @@ -1,72 +0,0 @@
33 -# Copyright 1999-2022 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
39 -inherit flag-o-matic verify-sig
40 -
41 -DESCRIPTION="GNU regular expression matcher"
42 -HOMEPAGE="https://www.gnu.org/software/grep/"
43 -
44 -if [[ ${PV} == *_p* ]] ; then
45 - # Subscribe to the 'platform-testers' ML to find these.
46 - # Useful to test on our especially more niche arches and report issues upstream.
47 - MY_COMMIT="62-9a668"
48 - MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
49 - SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz"
50 - SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )"
51 - S="${WORKDIR}"/${MY_P}
52 -else
53 - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
54 - SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
55 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
56 -fi
57 -
58 -LICENSE="GPL-3+"
59 -SLOT="0"
60 -IUSE="nls pcre static"
61 -
62 -# We lack dev-libs/libsigsegv[static-libs] for now
63 -REQUIRED_USE="static? ( !sparc )"
64 -
65 -LIB_DEPEND="pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] )
66 - sparc? ( dev-libs/libsigsegv )"
67 -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
68 - nls? ( virtual/libintl )
69 - virtual/libiconv"
70 -DEPEND="${RDEPEND}
71 - static? ( ${LIB_DEPEND} )"
72 -BDEPEND="virtual/pkgconfig
73 - nls? ( sys-devel/gettext )
74 - verify-sig? ( sec-keys/openpgp-keys-grep )"
75 -
76 -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
77 -
78 -src_prepare() {
79 - default
80 -
81 - # bug #523898
82 - sed -i \
83 - -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
84 - -e "s:@grep@:${EPREFIX}/bin/grep:" \
85 - src/egrep.sh || die
86 -}
87 -
88 -src_configure() {
89 - use static && append-ldflags -static
90 -
91 - # We used to turn this off unconditionally (bug #673524) but we now
92 - # allow it for cases where libsigsegv is better for userspace handling
93 - # of stack overflows.
94 - # In particular, it's necessary for sparc: bug #768135
95 - export ac_cv_libsigsegv=$(usex sparc)
96 -
97 - local myeconfargs=(
98 - --bindir="${EPREFIX}"/bin
99 - $(use_enable nls)
100 - $(use_enable pcre perl-regexp)
101 - )
102 -
103 - econf "${myeconfargs[@]}"
104 -}