gentoo auto-resync : 31:12:2022 - 02:18:46

2 files changed, 103 insertions, 0 deletions

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 4ec5e1703e94..4d733966e96e 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -2,8 +2,11 @@ AUX loong-fix-build.patch 859 BLAKE2B 1c37ecbf8f7c0148e1634691b36c5e526e1111c851
 AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e
 DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f3b0e2be484e8abdd06d1fbdbb396f3d73dadadf9618aad2f02cf6416094bad64d5f2f15eab6b6b3adfeda SHA512 e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82
 DIST grep-3.7.tar.xz.sig 833 BLAKE2B 02a2850e22e8054dcfd02b6f08747a97d43dae9adb908516bdaed35750aa7f773832ad1b0b4c53d7b0ebc8f1fe2979e7938bbbeeb09ea00c11b4a0d5846c7b9c SHA512 9db28883b696fbbb0fad32f4ecd168954dc475d5f0a8f2b4f960ff615ef7dd8348a7caaee85a96287824472a29485ff921af121c582083ca5ad5c30960f99cf4
+DIST grep-3.8.11-908f.tar.xz 1658032 BLAKE2B d217a3b15f2597e2ffd54b941aae179c038697e4b620f09a61fe3655c1ae0777186311ec2cccdbf1266b0182eede232778e19e1f9dc87d7c5621e624e3857052 SHA512 a065c0e13c3c1cf87eb7011d1dd55f6b3386e9fd21dad9262fbe6ec7e830f3955c563050ef27a485b612f620285bbe4729e326e9f2ca24e42011a1040bec3d78
+DIST grep-3.8.11-908f.tar.xz.sig 833 BLAKE2B 460e7eb98f803995de43e919cae2d01e261380fde100c4570c50304035585573c358d0154e98102aafbfdd23ce726c15a59adbdfa3922408a4dada4095be13e4 SHA512 b4d9d517746633ee1fbbd8277fb22499634163b77e320be0721d1e48c4d8f1fbc4ec63177698cdac3f7d411403f51afbf7b7e302b78ccd7cf581361eb3963277
 DIST grep-3.8.tar.xz 1709536 BLAKE2B 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 SHA512 2014519a80c6dcd799837e1bd7d9d5ebe8729ec54b0dc76981dac4755a9a8a9f200470cdcc911e2825bed8162e61da39e3dd60289f7393b48bf67314077d0c79
 DIST grep-3.8.tar.xz.sig 833 BLAKE2B 40f472389705375611015ba0eb85eb32643304b1a324877a75821d086a128a20d00df3d7cd960ec45709f40f21488bbcf993c6fe667ef23663688b33296e650b SHA512 8266b58485f225c2189814e3898c72e59d251b729e0c302d31f57abdb7ac2e6e28dde2c5c8095673b6f007b2a3ebc26db1dca910a7771aba80dad4b3c6761ee4
 EBUILD grep-3.7.ebuild 2274 BLAKE2B b847a17bfe835e573a6406c728e99c1af5687bc2e83bdb4c1b6103790f587210c5bd3f4121c7fb83d8c96805a6a7fc636f06050df1f8f591d95e931f2cfecbc9 SHA512 dace79b242b68187cf8d756b4c91a7873eb8c1b1a3f631b67bb07192a95c4c4af521db19e6a943ae03f1d885317c0d6f497e129c7644e36d5dc97963415396ee
 EBUILD grep-3.8-r1.ebuild 2870 BLAKE2B ef19db94761e3e8fcfd6bdd03429bdd16501cf4724597f0aabff96f4f1d1712a3307ee6b87e9888e0f73de1f2d1ba31769211412aeb42687f24bd3fd8474861d SHA512 3e63dc69b45d4903241cc54ea5efbad05db1d6f7874671c803007e728932aa18472bb777be830ddba4ee5e47ef60f0f01972f2339fb89136f90960d118b39158
+EBUILD grep-3.8_p20221230.ebuild 2870 BLAKE2B 95027ad8262acaf8a2771f3ea0644cbc65380d511e3a00015b1f026747a3926812cf55000c30e6ab7f3a55d5ba6ae4cb88da66456cd88575fe8f58e8b35625cd SHA512 5bd00afd540781a082c77bf8758a3a5ec6a98fc6dead8bc062257955e3df4b2dd8ec85d5a8e6d6b1530b0dc821e331463079245411b97e06f06b1579bbec54a5
 MISC metadata.xml 666 BLAKE2B 0c90e38d5363234474093ece5c9e0cbb99c01731a80c52869d700b7367fd74eec23f355653174b315f91ca7b41b4c5c9f5645ffaba043b3918c3c22c2c817ea4 SHA512 8e46c5c28b55063a7c74dfc637eb59785dc35651027e144acf4aea7f0ad7a4e43a3692946252acdf0d4a66ff8bdcfa89664fdf8bae71f1db688c06014c2a6a0f
diff --git a/sys-apps/grep/grep-3.8_p20221230.ebuild b/sys-apps/grep/grep-3.8_p20221230.ebuild
new file mode 100644
index 000000000000..2b397f18b09b
--- /dev/null
+++ b/sys-apps/grep/grep-3.8_p20221230.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 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="11-908f"
+	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 ~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 )
+
+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
+}