From a87296ad796f00f3bba27339f6efe11b9a384e23 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 27 Feb 2023 22:02:09 +0000 Subject: gentoo auto-resync : 27:02:2023 - 22:02:09 --- sys-apps/grep/Manifest | 6 +- sys-apps/grep/grep-3.8_p20221230.ebuild | 100 -------------------------------- sys-apps/grep/grep-3.8_p20230227.ebuild | 100 ++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 sys-apps/grep/grep-3.8_p20221230.ebuild create mode 100644 sys-apps/grep/grep-3.8_p20230227.ebuild (limited to 'sys-apps/grep') diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index 8e3fd1342965..6766cabd42cf 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -2,11 +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.35-c860.tar.xz 1678936 BLAKE2B ad22efff54d8ee68ae8107728e35c7201c0ebffffb34c46a3234838f3d3f7858701b4f5bde737a670034a3fc0870a4232dcc025f460493bf115eebce80394ec2 SHA512 8b220d02c5cad352d1f5da14df81de98e6f6e60b7127b42308a92d78955bd49fba22f1f198b50de3c719539b482e0c927f903065b11af4eb82061df54e1cb671 +DIST grep-3.8.35-c860.tar.xz.sig 833 BLAKE2B 611424a4e4b66cdc5230b3de8bef406262f724b9a962f73f267208bc5f9f24c62b4e9060f0d0846a37e7bad2a9e6c6d6beb77c90ad97104fd7a87e2d0ebb11f2 SHA512 21a8a2beeb3dfdddf4d4bde7ee9add5af619b817bf35210c8f6f87a19755b9fb981d3dc796e2435ed2e27a835a29f73ae5a8fbe10d567efd6760a9ebc4180ea4 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 2287 BLAKE2B f8d7f163f327da9d4b933db81d759660b23b5c774acb690e2552ff28214a9d0b1c7aea0bf7bc571d0d5de807aa7f56721a311e8c2a71a906f39f30798fa97b9a SHA512 91a4e5d3aed32ed19bf8ad5996349073ff743bc31e73c2ee8b2e3714bac150da26202a840a4acad823d977071ac5d65e101e61327a2776725ce1db021a9f49a5 EBUILD grep-3.8-r1.ebuild 2876 BLAKE2B 56615ffb9e6d0091bf29d4d419d13a15e73f51a9295cabc4996a314404b5fbad9e04a6a57e66728cf5cecb1cc14a17b18a67ed4c5980ad8110130520ab1ff972 SHA512 d765489a66eb7e3b54c8f993f133794120b469838c56a9e9409a6f9f5587466e14e97c285bcb9ad4bf38b001695c7ad1c543d4feceb5b930bdf3e92e1a633791 -EBUILD grep-3.8_p20221230.ebuild 2883 BLAKE2B bb797866333a82dbcd2dfeadc07d378db8285f90feea131b6962275977c81b3f63a92e7d1b1fa315f2f39259172499c159ad25ac1fa649cba80b9b24906ee6c9 SHA512 07975975af07741f4679012540d89aa93cd085a1c3597ef15b1e9a8a6709c9c9b0e234f52baa85d98787eea873d3940e0a3192804428c18699746a41ecae15a5 +EBUILD grep-3.8_p20230227.ebuild 2883 BLAKE2B 5fcb6ca062688471c40a7b092cbfc8764acf4d64a578de7b34e890b828559448cf3d725abd299d348623f34ce2288df234140239aa0a76ec192eb7138e9bd685 SHA512 6ad799752b57238aa51460ac59c5dcc0b79d5a296ff83e94e8907d5b4f1977fcdda0acc8e85894ed0a0f9752d194e02a350ece675be15e849e7d39134fc35957 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 deleted file mode 100644 index 8324903211cd..000000000000 --- a/sys-apps/grep/grep-3.8_p20221230.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="${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 ~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 ) - -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 -} diff --git a/sys-apps/grep/grep-3.8_p20230227.ebuild b/sys-apps/grep/grep-3.8_p20230227.ebuild new file mode 100644 index 000000000000..f5ffdbfa43fd --- /dev/null +++ b/sys-apps/grep/grep-3.8_p20230227.ebuild @@ -0,0 +1,100 @@ +# 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="35-c860" + 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 ) + +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 +} -- cgit v1.2.3