gentoo auto-resync : 19:03:2023 - 06:33:49

2 files changed, 118 insertions, 0 deletions

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index c721cdc1f118..d35a59260a47 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -4,9 +4,12 @@ DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f
 DIST grep-3.7.tar.xz.sig 833 BLAKE2B 02a2850e22e8054dcfd02b6f08747a97d43dae9adb908516bdaed35750aa7f773832ad1b0b4c53d7b0ebc8f1fe2979e7938bbbeeb09ea00c11b4a0d5846c7b9c SHA512 9db28883b696fbbb0fad32f4ecd168954dc475d5f0a8f2b4f960ff615ef7dd8348a7caaee85a96287824472a29485ff921af121c582083ca5ad5c30960f99cf4
 DIST grep-3.8.tar.xz 1709536 BLAKE2B 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 SHA512 2014519a80c6dcd799837e1bd7d9d5ebe8729ec54b0dc76981dac4755a9a8a9f200470cdcc911e2825bed8162e61da39e3dd60289f7393b48bf67314077d0c79
 DIST grep-3.8.tar.xz.sig 833 BLAKE2B 40f472389705375611015ba0eb85eb32643304b1a324877a75821d086a128a20d00df3d7cd960ec45709f40f21488bbcf993c6fe667ef23663688b33296e650b SHA512 8266b58485f225c2189814e3898c72e59d251b729e0c302d31f57abdb7ac2e6e28dde2c5c8095673b6f007b2a3ebc26db1dca910a7771aba80dad4b3c6761ee4
+DIST grep-3.9.4-c83f.tar.xz 1684888 BLAKE2B b50d526c2552bc59807cc4ea2ed8ccbac3a93726c4b1c6e5cb6bd51a875aa0fc20d5642cc449593a3223c8838bd24f21efdf495509cacfec6dfc7092b2bcd169 SHA512 1c7062ec1c39904e84a092b512ddcb2fd97320cf9dff9f6dcd01f3cd5edcf52a4752cc68de26fc7f5016b0d08b40333916f1ba607a5c54a1b175e780bb9c7892
+DIST grep-3.9.4-c83f.tar.xz.sig 833 BLAKE2B d785c4dd27c735d89471979971d59428ccf2cd2141001e3a7b9edf18d4ccd3d6af7ffbf0f251ba042737222f0dd0b590a867d8142802ce30b1e7d6cab6b2fbe1 SHA512 c09e1835bd0f117249152637d408e816652a49373edb4822a1f95c33786a859d88e9a4be76671a35f74e9d9673a4741e5757f087aa82b4002c8bcf578a085137
 DIST grep-3.9.tar.xz 1680380 BLAKE2B 33fefce2a831ad6f00f2eb1d8a063cf280635f2d9c481c98981f7a2ff143c846ab570a448c9c02c3ba08cf2c98612cb364d2d033baf92d62c4515315453cc6f9 SHA512 38aaa28bded9f6d1d527356e9e63bb1dafb4ec8f09e83f2d3bc86c1d6af1a5a8cb9895067375b5b8929ec2cba6ab71c369ed4c6e2a0f7a01dec3c11a6f4c1836
 DIST grep-3.9.tar.xz.sig 833 BLAKE2B bbb8a07986368755276c6648378afdbec44da2873574ebb0dce634b0e90da2cb6fd0eaf64969843e2fe65ae5e83aba6b1fea9fde9b246fbedf982393cf54b715 SHA512 d50e11d0d333c09a6afcae511c93cfb54d9dd0a6600f271abf5e103cbf8bdcf9b8606924d7c71770e20c35df5d5468dc339cea1f05d257776734e17f8378d891
 EBUILD grep-3.7.ebuild 2287 BLAKE2B f8d7f163f327da9d4b933db81d759660b23b5c774acb690e2552ff28214a9d0b1c7aea0bf7bc571d0d5de807aa7f56721a311e8c2a71a906f39f30798fa97b9a SHA512 91a4e5d3aed32ed19bf8ad5996349073ff743bc31e73c2ee8b2e3714bac150da26202a840a4acad823d977071ac5d65e101e61327a2776725ce1db021a9f49a5
 EBUILD grep-3.8-r1.ebuild 2876 BLAKE2B 56615ffb9e6d0091bf29d4d419d13a15e73f51a9295cabc4996a314404b5fbad9e04a6a57e66728cf5cecb1cc14a17b18a67ed4c5980ad8110130520ab1ff972 SHA512 d765489a66eb7e3b54c8f993f133794120b469838c56a9e9409a6f9f5587466e14e97c285bcb9ad4bf38b001695c7ad1c543d4feceb5b930bdf3e92e1a633791
 EBUILD grep-3.9.ebuild 3038 BLAKE2B 28e3a9d0245f300357aa6dccf44f18eff1bc6faac6046841a242245de37ecb0041a5f0573f33f9475dba6cb8c59f050cc64f8c8cf6edc05e4608d0d938da5b82 SHA512 6c6ba3eff140c5c1e8d3e755198d4ce6c68350052e8fdcf7b83b2e9d5c5e4f6c877377b455bf739e8ecc05d1b3c5af0432f5d2342f561a90685e56ccaf794000
+EBUILD grep-3.9_p20230318.ebuild 3037 BLAKE2B 12feda567539db63525c6c2d9ea40181886390e4371024feb5384c8672a066242a4f5ec4bf1c4bd2999606e476fba493f9ca4429d9cb276b2481366e72bb0c34 SHA512 5b052bb2274502d8b653780880e1b0a79eeb39fd8d101963c5d0941310533f555f30a67fa6fec777a48b68045f82d4f6a9914fccede6d2e6a7313973013756d5
 MISC metadata.xml 666 BLAKE2B 0c90e38d5363234474093ece5c9e0cbb99c01731a80c52869d700b7367fd74eec23f355653174b315f91ca7b41b4c5c9f5645ffaba043b3918c3c22c2c817ea4 SHA512 8e46c5c28b55063a7c74dfc637eb59785dc35651027e144acf4aea7f0ad7a4e43a3692946252acdf0d4a66ff8bdcfa89664fdf8bae71f1db688c06014c2a6a0f
diff --git a/sys-apps/grep/grep-3.9_p20230318.ebuild b/sys-apps/grep/grep-3.9_p20230318.ebuild
new file mode 100644
index 000000000000..f699fa5744b4
--- /dev/null
+++ b/sys-apps/grep/grep-3.9_p20230318.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="https://www.gnu.org/software/grep/"
+
+if [[ ${PV} == *_p* ]] ; then
+	# Subscribe to the 'platform-testers' ML to find these.
+	# Useful to test on our especially more niche arches and report issues upstream.
+	MY_COMMIT="4-c83f"
+	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
+	SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )"
+	S="${WORKDIR}"/${MY_P}
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+	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"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+egrep-fgrep nls pcre static"
+
+# We lack dev-libs/libsigsegv[static-libs] for now
+REQUIRED_USE="static? ( !sparc )"
+
+LIB_DEPEND="
+	pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] )
+	sparc? ( dev-libs/libsigsegv )
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	nls? ( virtual/libintl )
+	virtual/libiconv
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-grep )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# Either gnulib FPs or fixed in newer autoconf, not worth autoreconf here for now?
+	MIN
+	alignof
+	static_assert
+)
+
+src_prepare() {
+	default
+
+	# bug #523898
+	sed -i \
+		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
+		-e "s:@grep@:${EPREFIX}/bin/grep:" \
+		src/egrep.sh || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# We used to turn this off unconditionally (bug #673524) but we now
+	# allow it for cases where libsigsegv is better for userspace handling
+	# of stack overflows.
+	# In particular, it's necessary for sparc: bug #768135
+	export ac_cv_libsigsegv=$(usex sparc)
+
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		$(use_enable nls)
+		$(use_enable pcre perl-regexp)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use egrep-fgrep ; then
+		# Delete the upstream wrapper variants which warn on egrep+fgrep use
+		rm "${ED}"/bin/{egrep,fgrep} || die
+
+		into /
+		# Install egrep, fgrep which don't warn.
+		#
+		# We do this by default to avoid breakage in old scripts
+		# and such which don't expect unexpected output on stderr,
+		# we've had examples of builds failing because foo-config
+		# starts returning a warning.
+		#
+		# https://lists.gnu.org/archive/html/bug-grep/2022-10/msg00000.html
+		newbin - egrep <<-EOF
+		#!/usr/bin/env sh
+		exec "${EPREFIX}/bin/grep" -E "\$@"
+		EOF
+
+		newbin - fgrep <<-EOF
+		#!/usr/bin/env sh
+		exec "${EPREFIX}/bin/grep" -F "\$@"
+		EOF
+	fi
+}