From 149480f9f5548b5a0fdb457abd473f8d10f60f51 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 May 2023 05:18:52 +0100 Subject: gentoo auto-resync : 01:05:2023 - 05:18:52 --- sys-apps/grep/Manifest | 6 +- sys-apps/grep/grep-3.10_p20230421.ebuild | 115 ------------------------------- sys-apps/grep/grep-3.10_p20230430.ebuild | 115 +++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 118 deletions(-) delete mode 100644 sys-apps/grep/grep-3.10_p20230421.ebuild create mode 100644 sys-apps/grep/grep-3.10_p20230430.ebuild (limited to 'sys-apps/grep') diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index b2327c8b5eb4..e4da1fcba15b 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -1,7 +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.12-0f2c.tar.xz 1706376 BLAKE2B 7e0dd6727effbe1829a4fd47bf133340bc4748b5de48c7aa3ffa81815433d410d7133a9c67a69eccda745d1044152742ff1c9a70021ac3a5925fc526e43a311e SHA512 861f4ed6edd1370885f0f4539711ffc94c437aac90baea123a101163e5c09d5c8410fb4dbfc1a9e6683ece3ea0f3f72711453f7ed414fdce0cf3a4516545a39e -DIST grep-3.10.12-0f2c.tar.xz.sig 833 BLAKE2B 83efe45b044ac8a39021315dfa3732decfd881590c13bd123c25022a16c239ad78dd507153001cb131e767d793b00143552e026870f8e78b152396b0fd20661a SHA512 42dc7814d3f43c6961fd74be5de24317ecfa844074bd58361ff2d3147d3feb9f4966014a9b6caccbad7162e9408221abbbd1178087334dd353df3ed7b4ffe7ed +DIST grep-3.10.19-2ea9.tar.xz 1702712 BLAKE2B 93b6d07703039d6ace2a989498eb760d58bb57e01658d371ac4d010af7c6831f3e2908d38c8deaa300ff0d30b69449e975f08863a327acd71f18c5a0cf01b16b SHA512 4048b151a8c9004fc5d4a21f5b40cb5703945ba5635fcf262f847ba95dfa5022c1dae51b8efcb7ab288910623761d3daaa6f2c9352f2db667f288c86e8ee8791 +DIST grep-3.10.19-2ea9.tar.xz.sig 833 BLAKE2B 867c954910e160e271e048aa0476ab552640a8c52b3e018d0482734f79cb3ae20dc5259077fe09e0bb93284c88b8fbfdea19756d966c5df230bfe5df9f6a77f8 SHA512 e37ce1fcd36aafcf9e89c7603ce23b7cde207fc6ab5291140048091dea47c47505a282b4b2c666472ddfcc1fc0212112311f2ab88cff592ed4db31e51db67d83 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 @@ -11,7 +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_p20230421.ebuild 3038 BLAKE2B 33471e9de6e3fdf8b30a3b68e384dbdbd2f2f369d5024b5d74f56ac1b0d978b759b481a28faa3d7629c9a48c0f7275ae797d0344cfb83dd67f562528ebdbc0b3 SHA512 67a7d5915984e07aa60e21d6b5a5412e900241d521c4cdc740dc4bc7d460293a4df75c41b0b19bcee16a3c42b2a15416a75dbcd7bbc2c58b03fa035b1267ee02 +EBUILD grep-3.10_p20230430.ebuild 3040 BLAKE2B 668151586a4415cacf1a49ba8ed177f42246a5d0304ea6a300a81eda32f6d26fbeb95fc309a0665fd4b05382564d473059029451be98ade680fe5543b41e70e5 SHA512 08b968ebc208125fc7b1d95cdbfab0f90d62943e38b9b71eb8dc70a86252b9a2b26295439f334cb3aac454a8c71e0edd8f648e9772d17e1135fb52fdc7111781 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_p20230421.ebuild b/sys-apps/grep/grep-3.10_p20230421.ebuild deleted file mode 100644 index 194b0ee1280d..000000000000 --- a/sys-apps/grep/grep-3.10_p20230421.ebuild +++ /dev/null @@ -1,115 +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="12-0f2c" - 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 -} diff --git a/sys-apps/grep/grep-3.10_p20230430.ebuild b/sys-apps/grep/grep-3.10_p20230430.ebuild new file mode 100644 index 000000000000..05138ad583b9 --- /dev/null +++ b/sys-apps/grep/grep-3.10_p20230430.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="19-2ea9" + 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-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 +} + +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