[gentoo-commits] repo/gentoo:master commit in: sys-apps/grep/

["Sam James" <sam@gentoo.org>]

commit:     6e7a0b5b4fdc2dae03949282202f51ad57a549f5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 10 17:46:15 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 10 17:50:20 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e7a0b5b

sys-apps/grep: add 3.12, drop 3.11_p20250405, drop 3.11_p20250407

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/grep/Manifest                             |   6 +-
 sys-apps/grep/grep-3.11_p20250405.ebuild           | 118 ---------------------
 ...grep-3.11_p20250407.ebuild => grep-3.12.ebuild} |   0
 3 files changed, 2 insertions(+), 122 deletions(-)

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 7ba806bc61a0..c7ad266e6b69 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,6 +1,4 @@
-DIST grep-3.11.68-05f8.tar.xz 1917200 BLAKE2B 9e2f71c716410afa66d94e90dd2efc0a0666495b0bd4c0e0e29f7ef13aaf815e24901d74d9608b8fae3cba8487121946d2aec36a37513e65dc66080951a2855f SHA512 c449cd9ecf2fd35ede9521d707bfb9be13bad8368244c277dde9ae1ad39205eb4445e726b0775d60d9c56ad3d0af2d3136869d6199a71aec7486c40df34f30e6
-DIST grep-3.11.68-05f8.tar.xz.sig 833 BLAKE2B 75ac09556bfbf3d102c648331f2b2ec9854df6ffc4dbb677856d2b915db2357039ee13bc9fdd5e330183148695e4a3f20ef92c1712308861af189d281268be64 SHA512 fa6773f4088c6523fd697fdfa001c47e0b8d3b4d3f1ba23a8213cf15b9aa9aa928c09755aa6269bc8121c567f57fe9f6d823714f479b99882c0e7075b479ef18
-DIST grep-3.11.69-a4628.tar.xz 1917544 BLAKE2B 575ea74c3a84f75c17b5dd39e0ada56cd559ca09f566c3d5163aec31d5b70720569b739251c8b7ce5b813819893b4bfb170dc70a93b7abab7a4c5648e179cff9 SHA512 280804275b4aacf72a6d50894d0024d1455375d2bb0550ce20211f9d66da6b0e942ea6186447e38b27fc5861e177b86f657c24477fce4a4a797e2b0dcf34e9f9
-DIST grep-3.11.69-a4628.tar.xz.sig 833 BLAKE2B f9fe9425ea8d5e304678618d3d9668ee21f5ef159714e4b35b486d2420b33480b55bdae779504bd3103f27957ffceaa0e8f109f5c779608ab59da57c68a8f6dd SHA512 45db55b8f172d672513d8703ad5ff777818ba71e216ce018aa86aa4059aaf2450cb26ae8144039c39e3fa41563d7b0707a77a3344feadf369d648f244c048ca2
 DIST grep-3.11.tar.xz 1703776 BLAKE2B e21785bca20b5a090d32bb5dc525fb298af30165106ed4c289b1518ea3d2acdcacfd6309b12f13be29a4b958f19588546119c695deb2b7500d49dcff86357bdc SHA512 f254a1905a08c8173e12fbdd4fd8baed9a200217fba9d7641f0d78e4e002c1f2a621152d67027d9b25f0bb2430898f5233dc70909d8464fd13d7dd9298e65c42
 DIST grep-3.11.tar.xz.sig 833 BLAKE2B 5edfba20e3a9f54d25ae63cf04985382bf6afb0ca643979561321090614e68b5d234767b07e48211888722c52c441233093735e183ff69432d5ee2e6a4f53aea SHA512 487aba063373ca0594c519991f19b2a6a33b3da0d74735c890f3828fd0880e7e6f64495d2c8f9efa5da53d1eb2d446609bab2399a4b89dcb4510a632e31ffb54
+DIST grep-3.12.tar.xz 1918448 BLAKE2B 93d06bce04793f4b4c94d92febc6092f669e50e1bfc1bef3c911a2ca322560bdab8619e88a05a4d6ea4908b2d01da1926a99a22eecc513bd48b8957984bdfa12 SHA512 c54b4db5a8b9afe098c088decd94977746305284d716666a60bac82b4edc0fae4acf828970b5b6fc7d58ecd549f638e17e6958f33a71fedcc7d7415b9228b161
+DIST grep-3.12.tar.xz.sig 833 BLAKE2B f9b3b4f89e15b8b66f91d89fc25322bd9f4a9207fbff5e5e35dd7a0edf84c48a555ed3d1f8f53dd996c347e784b4fe9366bdc47e74cf445cbe7e4430b2bd2524 SHA512 333755fd9e5879436789a19e9593667d6fb96c2d1b876a1c391eb9cd75d10bb7fbc10215db9838280e6006790c818ef4583b1ae22318a833a5b69264ca15dbf1

diff --git a/sys-apps/grep/grep-3.11_p20250405.ebuild b/sys-apps/grep/grep-3.11_p20250405.ebuild
deleted file mode 100644
index 27efce25ffaa..000000000000
--- a/sys-apps/grep/grep-3.11_p20250405.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/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="68-05f8"
-	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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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-10.42-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
-
-	# Drop when grep-3.11-100k-files-dir.patch is gone
-	#touch aclocal.m4 config.hin configure {,doc/,gnulib-tests/,lib/,src/,tests/}Makefile.in || 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
-}

diff --git a/sys-apps/grep/grep-3.11_p20250407.ebuild b/sys-apps/grep/grep-3.12.ebuild
similarity index 100%
rename from sys-apps/grep/grep-3.11_p20250407.ebuild
rename to sys-apps/grep/grep-3.12.ebuild