commit: c8117a0b3e8f29cc01b63a897e2bae0b84bdc4f8 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Dec 28 04:17:03 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Dec 28 04:17:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8117a0b
sys-apps/grep: drop 3.7, 3.8-r1 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/grep/Manifest | 4 -- sys-apps/grep/files/loong-fix-build.patch | 30 --------- sys-apps/grep/files/ppc-musl.patch | 19 ------ sys-apps/grep/grep-3.7.ebuild | 75 ---------------------- sys-apps/grep/grep-3.8-r1.ebuild | 100 ------------------------------ 5 files changed, 228 deletions(-) diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index 2d2d7f8559b4..0f0873e8b5ee 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -1,6 +1,2 @@ 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.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f3b0e2be484e8abdd06d1fbdbb396f3d73dadadf9618aad2f02cf6416094bad64d5f2f15eab6b6b3adfeda SHA512 e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82 -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 diff --git a/sys-apps/grep/files/loong-fix-build.patch b/sys-apps/grep/files/loong-fix-build.patch deleted file mode 100644 index e3b346dd92d3..000000000000 --- a/sys-apps/grep/files/loong-fix-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -[xen0n: this is https://github.com/sunhaiyong1978/CLFS-for-LoongArch/blob/1.0/patches/stack-direction-add-loongarch.patch with change to generated file added as well.] -From: Sun Haiyong <youb...@sina.com> -Date: Tue, 31 Aug 2021 11:11:52 +0800 -Subject: [PATCH] stack-direction: Add support for loongarch CPU - -* m4/stack-direction.m4 (SV_STACK_DIRECTION): When the CPU is loongarch, -set "sv_cv_stack_direction" to "-1" . ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - i?86 | x86_64 | \ - i860 | \ - ia64 | \ -+ loongarch* | \ - m32r | \ - m68* | \ - m88k | \ ---- a/configure -+++ b/configure -@@ -35668,6 +35668,7 @@ else $as_nop - i?86 | x86_64 | \ - i860 | \ - ia64 | \ -+ loongarch* | \ - m32r | \ - m68* | \ - m88k | \ --- -2.17.2 - diff --git a/sys-apps/grep/files/ppc-musl.patch b/sys-apps/grep/files/ppc-musl.patch deleted file mode 100644 index 4aff0ba1cf5c..000000000000 --- a/sys-apps/grep/files/ppc-musl.patch +++ /dev/null @@ -1,19 +0,0 @@ -Needed to fix build on ppc + musl. Should pop up in next gnulib sync in release (different patch). - -https://www.openwall.com/lists/musl/2017/11/05/2 -https://github.com/void-linux/void-packages/blob/master/srcpkgs/grep/patches/ppc-musl.patch -https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=2d830e4a792fcd9f614ed08a7f18584b8b21d23b ---- a/lib/sigsegv.c -+++ b/lib/sigsegv.c -@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; - /* both should be equivalent */ - # if 0 - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] --# else -+# elif defined(__GLIBC__) - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] -+# else -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1] - # endif - # endif - diff --git a/sys-apps/grep/grep-3.7.ebuild b/sys-apps/grep/grep-3.7.ebuild deleted file mode 100644 index e960d031fe79..000000000000 --- a/sys-apps/grep/grep-3.7.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/grep.asc -inherit flag-o-matic toolchain-funcs verify-sig - -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="https://www.gnu.org/software/grep/"; -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" -SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="nls pcre static" - -# We lack dev-libs/libsigsegv[static-libs] for now -REQUIRED_USE="static? ( !sparc )" - -LIB_DEPEND="pcre? ( >=dev-libs/libpcre-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 )" - -PATCHES=( - "${FILESDIR}/ppc-musl.patch" - "${FILESDIR}/loong-fix-build.patch" -) - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -src_prepare() { - sed -i \ - -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \ - -e "s:@grep@:${EPREFIX}/bin/grep:" \ - src/egrep.sh || die #523898 - - default - - # touch generated files after patching m4, to avoid activating maintainer - # mode - # remove when loong-fix-build.patch is no longer necessary - touch ./aclocal.m4 ./config.hin ./configure || die - find . -name Makefile.in -exec touch {} + || 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) - - # Always use pkg-config to get lib info for pcre. - export ac_cv_search_pcre_compile=$( - usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" '' - ) - local myeconfargs=( - --bindir="${EPREFIX}"/bin - $(use_enable nls) - $(use_enable pcre perl-regexp) - ) - econf "${myeconfargs[@]}" -} diff --git a/sys-apps/grep/grep-3.8-r1.ebuild b/sys-apps/grep/grep-3.8-r1.ebuild deleted file mode 100644 index 1c56d989908a..000000000000 --- a/sys-apps/grep/grep-3.8-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2023 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="98-c9ac" - 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 ~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-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 -}
