commit: f6180a024263a7bb62d31874b19445c89fc9ae45 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Tue Dec 22 21:12:05 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Tue Dec 22 21:12:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f6180a02
sys-apps/sed: drop ~ppc-aix Bug: https://bugs.gentoo.org/760057 Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> sys-apps/sed/Manifest | 2 - sys-apps/sed/files/dos2unix | 2 - sys-apps/sed/files/sed-4.1.4-aix-malloc.patch | 12 ---- .../files/sed-4.1.4-fix-invalid-ref-error.patch | 21 ------ .../sed/files/sed-4.1.4-makeinfo-c-locale.patch | 18 ----- sys-apps/sed/files/sed-4.1.5-alloca.patch | 14 ---- sys-apps/sed/files/sed-4.1.5-irix.patch | 36 ---------- sys-apps/sed/files/sed-4.1.5-regex-nobool.patch | 17 ----- sys-apps/sed/files/sed-4.2.1-espipe.patch | 20 ------ ...omplete-sequences-as-if-they-were-invalid.patch | 45 ------------- sys-apps/sed/files/unix2dos | 2 - sys-apps/sed/sed-4.2.2.ebuild | 72 -------------------- sys-apps/sed/sed-4.5.ebuild | 77 ---------------------- sys-apps/sed/sed-4.8.ebuild | 2 +- 14 files changed, 1 insertion(+), 339 deletions(-) diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest index d3aa8dd8fe..526fe0062a 100644 --- a/sys-apps/sed/Manifest +++ b/sys-apps/sed/Manifest @@ -1,3 +1 @@ -DIST sed-4.2.2.tar.bz2 1059414 BLAKE2B aebe0bf90e9f9c7907e0baa8a4d1a16e59a5893198382fb9fe08ed66cab670921c0db1e07f668bf3db8dfe9bb4f0e68b9c34fd7228c70df24be043d3e7ea8d92 SHA512 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573 -DIST sed-4.5.tar.xz 1274252 BLAKE2B 08525659e0e01ec50e736c1665634f3816f57c48aeefa7f6bc7a152cd6c171bb4e96e5c215429fc5edbe6e1de6cc3efe4f2f3bf6865933a30dd1700e921d5b3f SHA512 f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196 DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8 diff --git a/sys-apps/sed/files/dos2unix b/sys-apps/sed/files/dos2unix deleted file mode 100755 index b046880dd1..0000000000 --- a/sys-apps/sed/files/dos2unix +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec sed -e 's/\x0D$//' "$@" diff --git a/sys-apps/sed/files/sed-4.1.4-aix-malloc.patch b/sys-apps/sed/files/sed-4.1.4-aix-malloc.patch deleted file mode 100644 index bbe2fbbd49..0000000000 --- a/sys-apps/sed/files/sed-4.1.4-aix-malloc.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- sed-4.1.4/lib/regex_internal.c -+++ sed-4.1.4/lib/regex_internal.c -@@ -883,6 +883,9 @@ - re_node_set *set; - int size; - { -+ if ( size == 0 ) -+ return REG_NOERROR; -+ - set->alloc = size; - set->nelem = 0; - set->elems = re_malloc (int, size); diff --git a/sys-apps/sed/files/sed-4.1.4-fix-invalid-ref-error.patch b/sys-apps/sed/files/sed-4.1.4-fix-invalid-ref-error.patch deleted file mode 100644 index 3605e0bb0d..0000000000 --- a/sys-apps/sed/files/sed-4.1.4-fix-invalid-ref-error.patch +++ /dev/null @@ -1,21 +0,0 @@ -Grab fix from upstream for incorrect error msg display. - -http://bugs.gentoo.org/96009 - -Index: regexp.c -=================================================================== -RCS file: /cvsroot/sed/sed/sed/regexp.c,v -retrieving revision 1.3 -retrieving revision 1.4 -diff -u -r1.3 -r1.4 ---- sed/regexp.c 27 Jan 2005 08:04:30 -0000 1.3 -+++ sed/regexp.c 10 Feb 2005 09:54:50 -0000 1.4 -@@ -113,7 +113,7 @@ - { - char buf[200]; - sprintf(buf, _("invalid reference \\%d on `s' command's RHS"), -- needed_sub); -+ needed_sub - 1); - bad_prog(buf); - } - } diff --git a/sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch b/sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch deleted file mode 100644 index ede6dc8e30..0000000000 --- a/sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch +++ /dev/null @@ -1,18 +0,0 @@ -Running makeinfo on sed.texi in some locales can cause -problems (probably due to range matching not being the -same). So we force the C locale and just take the lazy -way out. - -http://bugs.gentoo.org/show_bug.cgi?id=83984 - ---- doc/Makefile.in -+++ doc/Makefile.in -@@ -615,7 +615,7 @@ - - @makeinfo_html_t...@sed.html: sed.texi sed.info - @MAKEINFO_HTML_TRUE@ builddir=`pwd` && cd $(srcdir) && \ --@MAKEINFO_HTML_TRUE@ $(MAKEINFO) --html --no-split -o $$builddir/sed.html sed.texi -+@MAKEINFO_HTML_TRUE@ LC_ALL="C" $(MAKEINFO) --html --no-split -o $$builddir/sed.html sed.texi - - @MAKEINFO_HTML_TRUE@html: sed.html - diff --git a/sys-apps/sed/files/sed-4.1.5-alloca.patch b/sys-apps/sed/files/sed-4.1.5-alloca.patch deleted file mode 100644 index 89679c5362..0000000000 --- a/sys-apps/sed/files/sed-4.1.5-alloca.patch +++ /dev/null @@ -1,14 +0,0 @@ -fix building on BSD systems which often do not have alloca.h - ---- sed-4.1.5/lib/regex_internal.h -+++ sed-4.1.5/lib/regex_internal.h -@@ -410,7 +410,9 @@ static unsigned int re_string_context_at - #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx)) - #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx)) - -+#ifdef HAVE_ALLOCA_H - #include <alloca.h> -+#endif - - #ifndef _LIBC - # if HAVE_ALLOCA diff --git a/sys-apps/sed/files/sed-4.1.5-irix.patch b/sys-apps/sed/files/sed-4.1.5-irix.patch deleted file mode 100644 index 34b3fa11f6..0000000000 --- a/sys-apps/sed/files/sed-4.1.5-irix.patch +++ /dev/null @@ -1,36 +0,0 @@ -* see http://bugs.gentoo.org/show_bug.cgi?id=209135 - ---- lib/regcomp.c -+++ lib/regcomp.c -@@ -558,7 +558,18 @@ - static const bitset_t utf8_sb_map = - { - /* Set the first 128 bits. */ -- [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX -+ /* [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX */ -+#if BITSET_WORD_MAX == 0xffffffffULL -+ [0] = BITSET_WORD_MAX, -+ [1] = BITSET_WORD_MAX, -+ [2] = BITSET_WORD_MAX, -+ [3] = BITSET_WORD_MAX -+#elif BITSET_WORD_MAX == 0xffffffffffffffffULL -+ [0] = BITSET_WORD_MAX, -+ [1] = BITSET_WORD_MAX -+#else -+# error "Unknown value for BITSET_WORD_MAX" -+#endif - }; - #endif - ---- lib/regexec.c -+++ lib/regexec.c -@@ -2894,7 +2894,8 @@ - sizeof (re_dfastate_t *) * (path->alloc - old_alloc)); - } - -- str_idx = path->next_idx ?: top_str; -+ /* str_idx = path->next_idx ?: top_str; */ -+ str_idx = path->next_idx ? path->next_idx : top_str; - - /* Temporary modify MCTX. */ - backup_state_log = mctx->state_log; diff --git a/sys-apps/sed/files/sed-4.1.5-regex-nobool.patch b/sys-apps/sed/files/sed-4.1.5-regex-nobool.patch deleted file mode 100644 index 8338d84c38..0000000000 --- a/sys-apps/sed/files/sed-4.1.5-regex-nobool.patch +++ /dev/null @@ -1,17 +0,0 @@ -* Most platforms don't define bool, true and false by default - ---- lib/regexec.c -+++ lib/regexec.c -@@ -3289,6 +3289,12 @@ - /* Build transition table for the state. - Return 1 if succeeded, otherwise return NULL. */ - -+#ifndef bool -+# define bool int -+# define false 0 -+# define true 1 -+#endif -+ - static int - internal_function - build_trtable (const re_dfa_t *dfa, re_dfastate_t *state) diff --git a/sys-apps/sed/files/sed-4.2.1-espipe.patch b/sys-apps/sed/files/sed-4.2.1-espipe.patch deleted file mode 100644 index be624bedab..0000000000 --- a/sys-apps/sed/files/sed-4.2.1-espipe.patch +++ /dev/null @@ -1,20 +0,0 @@ -reported upstream on 20101019 15:39 at sed-users mailing list (yahoo group). -http://tech.groups.yahoo.com/group/sed-users/message/8675 - -diff -ru sed-4.2.1.orig/sed/utils.c sed-4.2.1/sed/utils.c ---- sed-4.2.1.orig/sed/utils.c 2010-10-19 14:18:44 +0200 -+++ sed-4.2.1/sed/utils.c 2010-10-19 15:12:58 +0200 -@@ -284,7 +284,12 @@ - FILE *stream; - { - clearerr(stream); -- if (fflush(stream) == EOF && errno != EBADF) -+ if (fflush(stream) == EOF -+ && errno != EBADF -+#ifdef ESPIPE -+ && errno != ESPIPE -+#endif -+ ) - panic("couldn't flush %s: %s", utils_fp_name(stream), strerror(errno)); - } - diff --git a/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch b/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch deleted file mode 100644 index dfd9206d3b..0000000000 --- a/sys-apps/sed/files/sed-4.2.1-handle-incomplete-sequences-as-if-they-were-invalid.patch +++ /dev/null @@ -1,45 +0,0 @@ -http://bugs.gentoo.org/284403 - -From 20f68fb1abe862a98bc0378e5bb54d94bb98b8fe Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini <bonz...@gnu.org> -Date: Thu, 15 Oct 2009 19:56:12 +0200 -Subject: [PATCH] handle incomplete sequences as if they were invalid - -2009-10-15 Paolo Bonzini <bonz...@gnu.org> - WANG Yunfeng <uhu...@gmail.com> - - * sed/execute.c (str_append, str_append_modified): Handle incomplete - sequences as if they were invalid. ---- - ChangeLog | 6 ++++++ - NEWS | 4 +++- - sed/execute.c | 6 +++--- - 3 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/sed/execute.c b/sed/execute.c -index 66cb809..d5903be 100644 ---- a/sed/execute.c -+++ b/sed/execute.c -@@ -254,8 +254,8 @@ str_append(to, string, length) - { - size_t n = MBRLEN (string, length, &to->mbstate); - -- /* An invalid sequence is treated like a singlebyte character. */ -- if (n == (size_t) -1) -+ /* An invalid or imcomplete sequence is treated like a singlebyte character. */ -+ if (n == (size_t) -1 || n == (size_t) -2) - { - memset (&to->mbstate, 0, sizeof (to->mbstate)); - n = 1; -@@ -341,7 +341,7 @@ str_append_modified(to, string, length, type) - /* Copy the new wide character to the end of the string. */ - n = WCRTOMB (to->active + to->length, wc, &to->mbstate); - to->length += n; -- if (n == -1) -+ if (n == -1 || n == -2) - { - fprintf (stderr, "Case conversion produced an invalid character!"); - abort (); --- -1.7.3.1 - diff --git a/sys-apps/sed/files/unix2dos b/sys-apps/sed/files/unix2dos deleted file mode 100755 index 4902a7c162..0000000000 --- a/sys-apps/sed/files/unix2dos +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec sed -e 's/$//' "$@" diff --git a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild deleted file mode 100644 index 1b1ded7f80..0000000000 --- a/sys-apps/sed/sed-4.2.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.2.2.ebuild,v 1.5 2014/02/08 13:24:00 vapier Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="Super-useful stream editor" -HOMEPAGE="http://sed.sourceforge.net/"; -SRC_URI="mirror://gnu/sed/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl nls selinux static" - -RDEPEND="acl? ( virtual/acl ) - nls? ( virtual/libintl ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_bootstrap_sed() { - # make sure system-sed works #40786 - export NO_SYS_SED="" - if ! type -p sed > /dev/null ; then - NO_SYS_SED="!!!" - ./bootstrap.sh || die "couldnt bootstrap" - cp sed/sed "${T}"/ || die "couldnt copy" - export PATH="${PATH}:${T}" - make clean || die "couldnt clean" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-4.1.5-alloca.patch - epatch "${FILESDIR}"/${PN}-4.1.4-aix-malloc.patch - epatch "${FILESDIR}"/${PN}-4.2.1-espipe.patch - # don't use sed here if we have to recover a broken host sed -} - -src_compile() { - src_bootstrap_sed - # this has to be after the bootstrap portion - sed -i \ - -e '/docdir =/s:=.*/doc:= $(datadir)/doc/'${PF}'/html:' \ - doc/Makefile.in || die "sed html doc" - - local myconf= bindir="${EPREFIX}"/bin - if ! use userland_GNU ; then - myconf="--program-prefix=g" - bindir="${EPREFIX}"/usr/bin - fi - - # Should be able to drop this hack in next release. #333887 - tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes - export ac_cv_search_setfilecon=$(usex selinux -lselinux) - export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux) - use static && append-ldflags -static - econf \ - --bindir="${bindir}" \ - $(use_enable acl) \ - $(use_enable nls) \ - ${myconf} - emake || die "build failed" -} - -src_install() { - emake install DESTDIR="${D}" || die "Install failed" - dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog -} diff --git a/sys-apps/sed/sed-4.5.ebuild b/sys-apps/sed/sed-4.5.ebuild deleted file mode 100644 index 593258ac36..0000000000 --- a/sys-apps/sed/sed-4.5.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Super-useful stream editor" -HOMEPAGE="http://sed.sourceforge.net/"; -SRC_URI="mirror://gnu/sed/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl forced-sandbox nls selinux static" - -RDEPEND="acl? ( virtual/acl ) - nls? ( virtual/libintl ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.1.4-aix-malloc.patch - "${FILESDIR}"/${PN}-4.2.1-espipe.patch -) - -src_bootstrap_sed() { - # make sure system-sed works #40786 #650052 - if ! type -p sed > /dev/null || has_version 'sys-apps/sed[forced-sandbox]' ; then - mkdir -p "${T}/bootstrap" - printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die - chmod a+rx "${T}/bootstrap/sed" - PATH="${T}/bootstrap:${PATH}" - fi -} - -src_prepare() { - # Don't use sed before bootstrap if we have to recover a broken host sed. - src_bootstrap_sed - - default - - if use forced-sandbox ; then - # Upstream doesn't want to add a configure flag for this. - # https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html - sed -i \ - -e '/^bool sandbox = false;/s:false:true:' \ - sed/sed.c || die - # Make sure the sed took. - grep -q '^bool sandbox = true;' sed/sed.c || die "forcing sandbox failed" - fi -} - -src_configure() { - local myconf=() - if use userland_GNU; then - myconf+=( --exec-prefix="${EPREFIX}" ) - else - myconf+=( --program-prefix=g ) - fi - - export ac_cv_search_setfilecon=$(usex selinux -lselinux) - export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux) - use static && append-ldflags -static - myconf+=( - $(use_enable acl) - $(use_enable nls) - ) - econf "${myconf[@]}" -} - -src_install() { - default - # don't want charset.alias, installed by libiconv - rm -f "${ED}"/lib/charset.alias -} diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild index d889186d10..bb43fd5b3e 100644 --- a/sys-apps/sed/sed-4.8.ebuild +++ b/sys-apps/sed/sed-4.8.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="acl forced-sandbox nls selinux static" RDEPEND="
