repo/gentoo:master commit in: sys-apps/gawk/files/, sys-apps/gawk/
"Sam James" <[email protected]>
| Newsgroups | gmane.linux.gentoo.cvs |
|---|---|
| Message-ID | <1786145046.f67dcb1cef0ec454a1e2749ac883123240a86608.sam@gentoo> |
commit: f67dcb1cef0ec454a1e2749ac883123240a86608 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Aug 7 23:24:06 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Aug 7 23:24:06 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f67dcb1c sys-apps/gawk: drop 5.4.0-r2 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/gawk/Manifest | 2 - ...sub-bug-for-use-with-MinRX.-Add-test-case.patch | 20 ---- ...awk-5.4.0-Small-efficiency-fix-in-array.c.patch | 34 ------ .../files/gawk-5.4.0-no-assertions-for-pma.patch | 21 ---- sys-apps/gawk/gawk-5.4.0-r2.ebuild | 125 --------------------- 5 files changed, 202 deletions(-) diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest index 47d2f0dbaaf5..4e1db1a7067f 100644 --- a/sys-apps/gawk/Manifest +++ b/sys-apps/gawk/Manifest @@ -1,6 +1,4 @@ DIST gawk-5.3.2.tar.xz 3749260 BLAKE2B 8536777bb45c63d737ef08b3f1b98285cb29ec54400e35b2139c2bc66b464e3ec4950274614d95d94dc7eae18c57333b7c30a44d993855258155fc82b749042a SHA512 2268150fa35ae049a6ff3d0d0fa110db10477014c25f50e2ab4e3ee5fd60133369d2a994f59db4eb718020a0af5c4003ae7278c63e7fffa72f431ff4a1429e48 DIST gawk-5.3.2.tar.xz.sig 488 BLAKE2B ea843fce8ca2b93a8006260e8022f3426daccc18b93bd75ef1fb18e391ce110a10682e75509d771ba9c419d1e22a584f66ff9a436512b76b039a85afed6c7596 SHA512 490f29271d06f374e25e13724f5944215734d0c6da465da5b2a723e83fa31a03c7a16e5c8853465561bc0676139588b1046c598554ccde4ae24563455ee28b65 -DIST gawk-5.4.0.tar.xz 3803276 BLAKE2B ce326dc386e62d288c4fe1268ba493f9c3a1e8af7dec90f95b2942588370f5a3538837d71dc4208534ace2aa84fce46ab6d5d681451b560fdf884aaf1b89fb11 SHA512 b212c6ffd235d5e7f98f0cae5a4fbe9a7139c420400710a747dc2c33dcbda445adc2f6f8ebab330c52c432da67b92be1806c628d261db826a72c89011b2d9d77 -DIST gawk-5.4.0.tar.xz.sig 488 BLAKE2B 7e2c6e6fadba3fdd758563221c2f45b45512262f5f7ca49b6bf60993fc59825c7be7d526e8f014e0bc0304b74a07182d0701817db6726bafc5106c27f5687d3b SHA512 428a35d7183032fa58eb6edcc8b352c956218086476d42b1f1064cdec58c1e233ec421559e859f4a5df235709c932e88b54303081b549e9ced3a82c4abaaf030 DIST gawk-5.4.1.tar.xz 3838416 BLAKE2B 8bd7913c268a66e3f9eca6bed8d7b8fe23c75148c932d186c5e35429dc12f331f960e0fbb5d62d4675ff47f369f63c92db5b3214303edab3a868f0071dd0c4c1 SHA512 a1e79b71e13ce7d5487f89fb62125ec873dc89e0a3ff37ebdff017fdd6dfd38b1eaa95fedcf773c037ae84c95f0ea0817d53bc1c14b4284568f87606da6aa152 DIST gawk-5.4.1.tar.xz.sig 488 BLAKE2B dd9b14c95b414a1e360f71bed5c419d930a61eed6367c53cf4b8c2a8cdba8470453d30a3821df2bef6ab469ec351a008a059558d6fd52a25fa6f9882017397df SHA512 4aded49d65bb671e56689cf29a4b5478ee88ba127e949699a5432e3d23f2c6d3b56d64af1e14c3b55de5b6a95da520a81e4dad540a973bdcb9f8298eb230e4eb diff --git a/sys-apps/gawk/files/gawk-5.4.0-Fix-gensub-bug-for-use-with-MinRX.-Add-test-case.patch b/sys-apps/gawk/files/gawk-5.4.0-Fix-gensub-bug-for-use-with-MinRX.-Add-test-case.patch deleted file mode 100644 index 9b178f59aed4..000000000000 --- a/sys-apps/gawk/files/gawk-5.4.0-Fix-gensub-bug-for-use-with-MinRX.-Add-test-case.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 00be99d6ceae1439fd73a15f37d20710dd5798a5 Mon Sep 17 00:00:00 2001 -Message-ID: <00be99d6ceae1439fd73a15f37d20710dd5798a5.1772593597.git.sam-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> -In-Reply-To: <32e6f04bf47ea95773ea0d6d876c5fad8bb90834.1772593597.git.sam-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> -References: <32e6f04bf47ea95773ea0d6d876c5fad8bb90834.1772593597.git.sam-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> -From: "Arnold D. Robbins" <[email protected]> -Date: Fri, 27 Feb 2026 11:03:04 +0200 -Subject: [PATCH 4/9] Fix gensub() bug for use with MinRX. Add test case. - ---- a/builtin.c -+++ b/builtin.c -@@ -2116,7 +2116,7 @@ do_sub(int nargs, unsigned int flags) - || ((long) textlen <= 0 && matchstart == matchend) - || research(rp, target->stptr, text - target->stptr, - use_gnu_matchers ? textlen : target->stlen, -- RE_NEED_START) == -1) -+ searchflags) == -1) - break; - - } - diff --git a/sys-apps/gawk/files/gawk-5.4.0-Small-efficiency-fix-in-array.c.patch b/sys-apps/gawk/files/gawk-5.4.0-Small-efficiency-fix-in-array.c.patch deleted file mode 100644 index 35cd4c801833..000000000000 --- a/sys-apps/gawk/files/gawk-5.4.0-Small-efficiency-fix-in-array.c.patch +++ /dev/null @@ -1,34 +0,0 @@ -From de8f760a6bea360dd90c9daafc035999c83a3056 Mon Sep 17 00:00:00 2001 -Message-ID: <de8f760a6bea360dd90c9daafc035999c83a3056.1772593597.git.sam-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> -In-Reply-To: <32e6f04bf47ea95773ea0d6d876c5fad8bb90834.1772593597.git.sam-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> -References: <32e6f04bf47ea95773ea0d6d876c5fad8bb90834.1772593597.git.sam-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> -From: "Arnold D. Robbins" <[email protected]> -Date: Sun, 1 Mar 2026 20:52:16 +0200 -Subject: [PATCH 6/9] Small efficiency fix in array.c. - ---- a/array.c -+++ b/array.c -@@ -210,17 +210,17 @@ make_aname(const NODE *symbol) - slen = strlen(symbol->vname); /* subscript in parent array */ - if (alen + slen + 4 > max_alen) { /* sizeof("[\"\"]") = 4 */ - max_alen = alen + slen + 4 + SLEN; -- erealloc(aname, char *, (max_alen + 1) * sizeof(char *)); -+ erealloc(aname, char *, (max_alen + 1) * sizeof(char)); - } - alen += sprintf(aname + alen, "[\"%s\"]", symbol->vname); - } else { - alen = strlen(symbol->vname); - if (aname == NULL) { - max_alen = alen + SLEN; -- emalloc(aname, char *, (max_alen + 1) * sizeof(char *)); -+ emalloc(aname, char *, (max_alen + 1) * sizeof(char)); - } else if (alen > max_alen) { - max_alen = alen + SLEN; -- erealloc(aname, char *, (max_alen + 1) * sizeof(char *)); -+ erealloc(aname, char *, (max_alen + 1) * sizeof(char)); - } - memcpy(aname, symbol->vname, alen + 1); - } --- -2.53.0 - diff --git a/sys-apps/gawk/files/gawk-5.4.0-no-assertions-for-pma.patch b/sys-apps/gawk/files/gawk-5.4.0-no-assertions-for-pma.patch deleted file mode 100644 index e58bf201eaad..000000000000 --- a/sys-apps/gawk/files/gawk-5.4.0-no-assertions-for-pma.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://cgit.git.savannah.gnu.org/cgit/gawk.git/commit/?id=32e6f04bf47ea95773ea0d6d876c5fad8bb90834 - -From 32e6f04bf47ea95773ea0d6d876c5fad8bb90834 Mon Sep 17 00:00:00 2001 -From: "Arnold D. Robbins" <[email protected]> -Date: Mon, 23 Feb 2026 10:59:41 +0200 -Subject: Disable assertions in support/pma.c. - ---- a/support/pma.c -+++ b/support/pma.c -@@ -27,6 +27,7 @@ - */ - - #define _DEFAULT_SOURCE // for MAP_ANONYMOUS -+#define NDEBUG 1 // disable assertions, it kills performance - #include <assert.h> - #include <errno.h> - #include <fcntl.h> --- -cgit v1.2.3 - - diff --git a/sys-apps/gawk/gawk-5.4.0-r2.ebuild b/sys-apps/gawk/gawk-5.4.0-r2.ebuild deleted file mode 100644 index e015e439214a..000000000000 --- a/sys-apps/gawk/gawk-5.4.0-r2.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -GAWK_IS_BETA=no - -DESCRIPTION="GNU awk pattern-matching language" -HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html" - -if [[ ${GAWK_IS_BETA} == yes || ${PV} == *_beta* ]] ; then - if [[ ${PV} == *_beta* ]] ; then - # Beta versioning is sometimes for the release prior, e.g. - # 5.2.1_beta is labelled upstream as 5.2.0b. - MY_PV=${PV/_beta/b} - MY_PV=$(ver_cut 1-2 ${MY_PV}).$(($(ver_cut 3 ${MY_PV}) - 1))$(ver_cut 4- ${MY_PV}) - MY_P=${PN}-${MY_PV} - - S="${WORKDIR}"/${MY_P} - else - MY_P=${P} - fi - - SRC_URI="https://www.skeeve.com/gawk/${MY_P}.tar.gz" -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gawk.asc - inherit verify-sig flag-o-matic - - SRC_URI="mirror://gnu/gawk/${P}.tar.xz" - SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )" - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-3+ pma? ( AGPL-3+ )" -SLOT="0" -# The gawk docs claim MPFR support is "on parole" and may be removed, -# https://www.gnu.org/software/gawk/manual/html_node/MPFR-On-Parole.html -# however this is somewhat outdated information, see -# https://public-inbox.org/libc-alpha/202412190851.4BJ8psq4404509-OHxTiG4qnN609vOPjlrUmA@public.gmane.org/ -IUSE="+mpfr pma nls readline" - -RDEPEND=" - mpfr? ( - dev-libs/gmp:= - dev-libs/mpfr:= - ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-apps/texinfo-7.1 - >=sys-devel/bison-3.5.4 - nls? ( sys-devel/gettext ) -" - -if [[ ${GAWK_IS_BETA} != yes ]] ; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-gawk )" -fi - -PATCHES=( - "${FILESDIR}"/${P}-no-assertions-for-pma.patch - "${FILESDIR}"/${P}-Fix-gensub-bug-for-use-with-MinRX.-Add-test-case.patch - "${FILESDIR}"/${P}-Small-efficiency-fix-in-array.c.patch -) - -src_prepare() { - default - - use elibc_musl && append-cppflags -D__GNU_LIBRARY__ - - # Use symlinks rather than hardlinks, and disable version links - sed -i \ - -e '/^LN =/s:=.*:= $(LN_S):' \ - -e '/install-exec-hook:/s|$|\nfoo:|' \ - Makefile.in doc/Makefile.in || die - - # bug #413327 - sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die - - # Fix standards conflict on Solaris - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i \ - -e '/\<_XOPEN_SOURCE\>/s/1$/600/' \ - -e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \ - extension/inplace.c || die - fi -} - -src_configure() { - # README says gawk may not work properly if built with non-Bison. - # We already BDEPEND on Bison, so just unset YACC rather than - # guessing if we need to do yacc.bison or bison -y. - unset YACC - - local myeconfargs=( - --cache-file="${S}"/config.cache - --libexec='$(libdir)/misc' - $(use_with mpfr) - $(use_enable nls) - $(use_enable pma) - $(use_with readline) - ) - - econf "${myeconfargs[@]}" -} - -src_test() { - # bug #970495 - local -x PAGER=cat - - emake check -} - -src_install() { - # Automatic dodocs barfs - rm -rf README_d || die - - default - - # Install headers - insinto /usr/include/awk - doins *.h - rm "${ED}"/usr/include/awk/config.h || die -}