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: Sun, 19 Mar 2023 23:58:59
Message-Id: 1679270321.efd98b3e7696c08aec3e8f5441a0e392b4026864.sam@gentoo
1 commit: efd98b3e7696c08aec3e8f5441a0e392b4026864
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 19 23:58:35 2023 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 19 23:58:41 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd98b3e
7
8 sys-apps/grep: drop 3.9_p20230318
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-apps/grep/Manifest | 2 -
13 sys-apps/grep/grep-3.9_p20230318.ebuild | 115 --------------------------------
14 2 files changed, 117 deletions(-)
15
16 diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
17 index a7a44e273c53..d1a05497f036 100644
18 --- a/sys-apps/grep/Manifest
19 +++ b/sys-apps/grep/Manifest
20 @@ -2,8 +2,6 @@ DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f
21 DIST grep-3.7.tar.xz.sig 833 BLAKE2B 02a2850e22e8054dcfd02b6f08747a97d43dae9adb908516bdaed35750aa7f773832ad1b0b4c53d7b0ebc8f1fe2979e7938bbbeeb09ea00c11b4a0d5846c7b9c SHA512 9db28883b696fbbb0fad32f4ecd168954dc475d5f0a8f2b4f960ff615ef7dd8348a7caaee85a96287824472a29485ff921af121c582083ca5ad5c30960f99cf4
22 DIST grep-3.8.tar.xz 1709536 BLAKE2B 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 SHA512 2014519a80c6dcd799837e1bd7d9d5ebe8729ec54b0dc76981dac4755a9a8a9f200470cdcc911e2825bed8162e61da39e3dd60289f7393b48bf67314077d0c79
23 DIST grep-3.8.tar.xz.sig 833 BLAKE2B 40f472389705375611015ba0eb85eb32643304b1a324877a75821d086a128a20d00df3d7cd960ec45709f40f21488bbcf993c6fe667ef23663688b33296e650b SHA512 8266b58485f225c2189814e3898c72e59d251b729e0c302d31f57abdb7ac2e6e28dde2c5c8095673b6f007b2a3ebc26db1dca910a7771aba80dad4b3c6761ee4
24 -DIST grep-3.9.4-c83f.tar.xz 1684888 BLAKE2B b50d526c2552bc59807cc4ea2ed8ccbac3a93726c4b1c6e5cb6bd51a875aa0fc20d5642cc449593a3223c8838bd24f21efdf495509cacfec6dfc7092b2bcd169 SHA512 1c7062ec1c39904e84a092b512ddcb2fd97320cf9dff9f6dcd01f3cd5edcf52a4752cc68de26fc7f5016b0d08b40333916f1ba607a5c54a1b175e780bb9c7892
25 -DIST grep-3.9.4-c83f.tar.xz.sig 833 BLAKE2B d785c4dd27c735d89471979971d59428ccf2cd2141001e3a7b9edf18d4ccd3d6af7ffbf0f251ba042737222f0dd0b590a867d8142802ce30b1e7d6cab6b2fbe1 SHA512 c09e1835bd0f117249152637d408e816652a49373edb4822a1f95c33786a859d88e9a4be76671a35f74e9d9673a4741e5757f087aa82b4002c8bcf578a085137
26 DIST grep-3.9.8-026c.tar.xz 1685328 BLAKE2B 1505fabf4614ba270cc7bc2c71152aa611050f0431687894e187ec93d069ed6d9b8a888406ea7461216fb9d8d42fa5ad293161c2535121875a8b21eb64b5fc9e SHA512 b11ff829590a875b7d53bb3f7e8c46f01b5dc89133eacb4a55941a1906ca1d2b99eeaef1fd0d07b9b265b972bc782ac311b5e5f0e43f8ef51c5c944b1e22317b
27 DIST grep-3.9.8-026c.tar.xz.sig 833 BLAKE2B 84c2aff801eaf075be6fcf985ffb4ea144c2c07d43b9df71e123b9b87b504ab3065e84ae1ee4a18c902215afbef4ecdc772bbede857cce74188099f6222be60e SHA512 6274b204156eb91dbcc65e279f808e8f865220ff10550c468d44823e65ae0e1d7da51d8468315fff326bfc4f13f9edbdc873799ed4cfbce388bd1a76781e675b
28 DIST grep-3.9.tar.xz 1680380 BLAKE2B 33fefce2a831ad6f00f2eb1d8a063cf280635f2d9c481c98981f7a2ff143c846ab570a448c9c02c3ba08cf2c98612cb364d2d033baf92d62c4515315453cc6f9 SHA512 38aaa28bded9f6d1d527356e9e63bb1dafb4ec8f09e83f2d3bc86c1d6af1a5a8cb9895067375b5b8929ec2cba6ab71c369ed4c6e2a0f7a01dec3c11a6f4c1836
29
30 diff --git a/sys-apps/grep/grep-3.9_p20230318.ebuild b/sys-apps/grep/grep-3.9_p20230318.ebuild
31 deleted file mode 100644
32 index f699fa5744b4..000000000000
33 --- a/sys-apps/grep/grep-3.9_p20230318.ebuild
34 +++ /dev/null
35 @@ -1,115 +0,0 @@
36 -# Copyright 1999-2023 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=8
40 -
41 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
42 -inherit flag-o-matic verify-sig
43 -
44 -DESCRIPTION="GNU regular expression matcher"
45 -HOMEPAGE="https://www.gnu.org/software/grep/"
46 -
47 -if [[ ${PV} == *_p* ]] ; then
48 - # Subscribe to the 'platform-testers' ML to find these.
49 - # Useful to test on our especially more niche arches and report issues upstream.
50 - MY_COMMIT="4-c83f"
51 - MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
52 - SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz"
53 - SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )"
54 - S="${WORKDIR}"/${MY_P}
55 -else
56 - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
57 - SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
58 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
59 -fi
60 -
61 -LICENSE="GPL-3+"
62 -SLOT="0"
63 -IUSE="+egrep-fgrep nls pcre static"
64 -
65 -# We lack dev-libs/libsigsegv[static-libs] for now
66 -REQUIRED_USE="static? ( !sparc )"
67 -
68 -LIB_DEPEND="
69 - pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] )
70 - sparc? ( dev-libs/libsigsegv )
71 -"
72 -RDEPEND="
73 - !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
74 - nls? ( virtual/libintl )
75 - virtual/libiconv
76 -"
77 -DEPEND="
78 - ${RDEPEND}
79 - static? ( ${LIB_DEPEND} )
80 -"
81 -BDEPEND="
82 - virtual/pkgconfig
83 - nls? ( sys-devel/gettext )
84 - verify-sig? ( sec-keys/openpgp-keys-grep )
85 -"
86 -
87 -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
88 -
89 -QA_CONFIG_IMPL_DECL_SKIP=(
90 - # Either gnulib FPs or fixed in newer autoconf, not worth autoreconf here for now?
91 - MIN
92 - alignof
93 - static_assert
94 -)
95 -
96 -src_prepare() {
97 - default
98 -
99 - # bug #523898
100 - sed -i \
101 - -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
102 - -e "s:@grep@:${EPREFIX}/bin/grep:" \
103 - src/egrep.sh || die
104 -}
105 -
106 -src_configure() {
107 - use static && append-ldflags -static
108 -
109 - # We used to turn this off unconditionally (bug #673524) but we now
110 - # allow it for cases where libsigsegv is better for userspace handling
111 - # of stack overflows.
112 - # In particular, it's necessary for sparc: bug #768135
113 - export ac_cv_libsigsegv=$(usex sparc)
114 -
115 - local myeconfargs=(
116 - --bindir="${EPREFIX}"/bin
117 - $(use_enable nls)
118 - $(use_enable pcre perl-regexp)
119 - )
120 -
121 - econf "${myeconfargs[@]}"
122 -}
123 -
124 -src_install() {
125 - default
126 -
127 - if use egrep-fgrep ; then
128 - # Delete the upstream wrapper variants which warn on egrep+fgrep use
129 - rm "${ED}"/bin/{egrep,fgrep} || die
130 -
131 - into /
132 - # Install egrep, fgrep which don't warn.
133 - #
134 - # We do this by default to avoid breakage in old scripts
135 - # and such which don't expect unexpected output on stderr,
136 - # we've had examples of builds failing because foo-config
137 - # starts returning a warning.
138 - #
139 - # https://lists.gnu.org/archive/html/bug-grep/2022-10/msg00000.html
140 - newbin - egrep <<-EOF
141 - #!/usr/bin/env sh
142 - exec "${EPREFIX}/bin/grep" -E "\$@"
143 - EOF
144 -
145 - newbin - fgrep <<-EOF
146 - #!/usr/bin/env sh
147 - exec "${EPREFIX}/bin/grep" -F "\$@"
148 - EOF
149 - fi
150 -}