gentoo auto-resync : 10:04:2023 - 11:36:36

2 files changed, 118 insertions, 0 deletions

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index d91b4ac60842..133eb94cfbbf 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,5 +1,7 @@
 AUX loong-fix-build.patch 859 BLAKE2B 1c37ecbf8f7c0148e1634691b36c5e526e1111c851bb34059cbc03b902e45f066b976899e8c155db0d8358f9f45ef39d8bd6a87616c885d9ceafaaa24905d39c SHA512 f97ea8dcd28957c58d4b08f91b3274ebcba9bef9fb93ea91576925d8cbb516781524c172f35dcfb2be4be17cb446ec6b8366d04d485eb5ec012b126be02b9c82
 AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e
+DIST grep-3.10.7-e498.tar.xz 1700076 BLAKE2B e50b2799ad43461441e82eb88e050e1aa1ac223e02b1c77f52657195ebbaf336795156cd26d4fb11734b1f3c6616ea60ac432f71faf263d32d3e9e196a9587b5 SHA512 671e06c3189cfa52614fddf42b85b907b0be5325e0ece418db39c3bfb5ae9998f171f225bb3fddc36f0669bcd32f0cffe6a7bca63920b400e7fcafefe72550de
+DIST grep-3.10.7-e498.tar.xz.sig 833 BLAKE2B 82b914943cf6c79f343321adde11ad1c0751819aed61f713e12be4a300879aee8dc35da08c8bad2ca5b9bbf50d9f495ef44dd98677a47574dc71918733a3b23d SHA512 5d11c04f42730852063211904cd95b83555f1b1aed985ce8ef0f17e0c4755d799cd60eb7986c002b54c56b1083538ae6b51c25ebd55db07273a6819b80512c6b
 DIST grep-3.10.tar.xz 1687464 BLAKE2B 5ff169a4ed39e8af1e6729fd2e1bafd39036a4f56cf831f990d58bf9e76bc7d8b055254ae7f60509be4e8bf2f3737edb15431a8ecfc7fc058578d2abea3d73b9 SHA512 865e8f3fd7afc68f1a52f5e1e1ee05fb9c6d6182201efb0dbdf6075347b0b1d2bf0784537a8f8dd4fb050d523f7a1d2fb5b9c3e3245087d0e6cc12d6e9d3961b
 DIST grep-3.10.tar.xz.sig 833 BLAKE2B 0b13c8c8955b4e38889cf79b426618e006b05bc3b224e0705b2cb592b1520a7fc751d5cc386371707a53c8b6888c4e1f9dd31c3ea2ef5cbf4c97ddef3ba7d037 SHA512 02224ff2d6b3a9a50d0e15f7a9b3c264aa717602d133ac32b36a7315bf29ec3b94ef7ec31ee979b199264d10003dc502e20f9bf932bb32b4abe4426ea564d4be
 DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f3b0e2be484e8abdd06d1fbdbb396f3d73dadadf9618aad2f02cf6416094bad64d5f2f15eab6b6b3adfeda SHA512 e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82
@@ -9,6 +11,7 @@ DIST grep-3.8.tar.xz.sig 833 BLAKE2B 40f472389705375611015ba0eb85eb32643304b1a32
 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.10.ebuild 3037 BLAKE2B d0942ea0641425a97b7380b4c688e20e2b0604552906dab23f24b7326274991341d52f7a7044f1df96e3cf6f43f1315bb75d8b9a8413fdb8a63a17b5b680c612 SHA512 d663b6bba3ea52ceff3c3be07a47a2f0589b48c27b216c6b66bf22f55a134a464a25c016692de698fd2d495905175037f93fcc3e689d2c8c5ef0fd0ac0b873a8
+EBUILD grep-3.10_p20230410.ebuild 3037 BLAKE2B 482f1c5a8d1379aa2f6ac94ac97f65e7ac608c90fcddacdaffaf2e536d877a6f047d78ecdfa31d18e98260970567dc83d177af70b45d7d3577988f98e07431e6 SHA512 a5560f766bdc0d8b66b8883f7bfd56671cdc6c770a27ebf13a658ef848a1030f9cd6d95aae5ba2d15310e7161406f611e604c198226aa49f4d632c0e7b506bde
 EBUILD grep-3.7.ebuild 2287 BLAKE2B f8d7f163f327da9d4b933db81d759660b23b5c774acb690e2552ff28214a9d0b1c7aea0bf7bc571d0d5de807aa7f56721a311e8c2a71a906f39f30798fa97b9a SHA512 91a4e5d3aed32ed19bf8ad5996349073ff743bc31e73c2ee8b2e3714bac150da26202a840a4acad823d977071ac5d65e101e61327a2776725ce1db021a9f49a5
 EBUILD grep-3.8-r1.ebuild 2875 BLAKE2B 07987a3cf83f86c6b3e58db2cdd3172aaab160dd6d49c614b477c2dee85c7095efcdea376e4d1252cc22205191c54a00a4f84f22aab63d3bd5dbbf47884dace7 SHA512 ca969d02cd68d6cd7165c3cf8e6c79e9f61d4bed857871349160603fdfe6267ca198fe96da134160f51d153122626184b0d23b59729bddba2fdab7c6a75b1745
 EBUILD grep-3.9.ebuild 3038 BLAKE2B 28e3a9d0245f300357aa6dccf44f18eff1bc6faac6046841a242245de37ecb0041a5f0573f33f9475dba6cb8c59f050cc64f8c8cf6edc05e4608d0d938da5b82 SHA512 6c6ba3eff140c5c1e8d3e755198d4ce6c68350052e8fdcf7b83b2e9d5c5e4f6c877377b455bf739e8ecc05d1b3c5af0432f5d2342f561a90685e56ccaf794000
diff --git a/sys-apps/grep/grep-3.10_p20230410.ebuild b/sys-apps/grep/grep-3.10_p20230410.ebuild
new file mode 100644
index 000000000000..1dbbfb2df67f
--- /dev/null
+++ b/sys-apps/grep/grep-3.10_p20230410.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="7-e498"
+	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
+}