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