From 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:52:04 +0100 Subject: gentoo resync : 14.07.2018 --- sys-apps/sed/Manifest | 5 +-- sys-apps/sed/files/sed-4.1.5-alloca.patch | 14 ------- sys-apps/sed/sed-4.2.2.ebuild | 61 ------------------------------- sys-apps/sed/sed-4.5.ebuild | 2 +- 4 files changed, 2 insertions(+), 80 deletions(-) delete mode 100644 sys-apps/sed/files/sed-4.1.5-alloca.patch delete mode 100644 sys-apps/sed/sed-4.2.2.ebuild (limited to 'sys-apps/sed') diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest index ef9512987e21..fe5d1b202627 100644 --- a/sys-apps/sed/Manifest +++ b/sys-apps/sed/Manifest @@ -1,6 +1,3 @@ -AUX sed-4.1.5-alloca.patch 413 BLAKE2B ace3926149e5190bb800a1e1871d70613fee6ef5ef6fee2fca27f5f572adfab36864f4032a9a8c86d77f21672050ed77ca3665ee96a43329a81128d3512956c0 SHA512 dccdad774cbf1eb71744b9d1a49ce45e6c6197ffed66448b6de9302dc88d46246b52a6cbed95a5b86511f19a735a710af177003732d54ca01baa84ef21734d29 -DIST sed-4.2.2.tar.bz2 1059414 BLAKE2B aebe0bf90e9f9c7907e0baa8a4d1a16e59a5893198382fb9fe08ed66cab670921c0db1e07f668bf3db8dfe9bb4f0e68b9c34fd7228c70df24be043d3e7ea8d92 SHA512 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573 DIST sed-4.5.tar.xz 1274252 BLAKE2B 08525659e0e01ec50e736c1665634f3816f57c48aeefa7f6bc7a152cd6c171bb4e96e5c215429fc5edbe6e1de6cc3efe4f2f3bf6865933a30dd1700e921d5b3f SHA512 f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196 -EBUILD sed-4.2.2.ebuild 1680 BLAKE2B 5091750a04cdaa6b5c340cfe27c74a3b620d21b3be451755104d93774f73060d92a70c367ce4107407dbfc3a4edb8fefbcbeef3876e3bc9707e481f5b20cb3eb SHA512 331c709e673cd26b2c3b5a48094ce5e2cb4d486b5eca2ac6733fc8e39fd525342be2494384922da920075f94fe2ab81a625795ea094769ab71548acb93089d99 -EBUILD sed-4.5.ebuild 1776 BLAKE2B df963a59bce049101826f79df324566bc8554c714ff03357edcdbd81b763e5f4de7e7c54d2c78fd49efc64b33e25cd0111f23f9e647a7772830268ecf5099fa8 SHA512 3e57199639a6e3aed9ddf9b29c1552845983d5c7df86fca0050fa6361471ff793d93289f325693977bcfd91781ba179c17cc753a2ba16bfd8198d4ca59869535 +EBUILD sed-4.5.ebuild 1772 BLAKE2B c37f0dce76f72965fea3842bb71c67ec085136ae2b887c7de08575dad80ee01f2f4059de9a30c4d46f9a738c5608a55bc00caf6544da8b6420228c8ad7852d8d SHA512 ad512028213e8149960346b3493cb173ea989986c52946a6c2a8d65bc7127a00f7f0f61ab611979ec00b4f08766812dc1bbab42f9be83d67c839fd63f8454c1b MISC metadata.xml 599 BLAKE2B 1e3e9343805c40b2f8ba3be494c1280395ce8edfb85d93b53e136269c774312b5b27d63cd628eb1ca57faa2c1a3849a7b361c9fa68850f47d70d618995b57667 SHA512 6aa22a76f9ec43142548e347dcea74b4c0b02bf0f8ccaff581265ba4b97fc16fca5d01bc3884e27523d138eec3b809bae6b379c7c0d38b344db2f7175e5565d5 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 89679c5362e3..000000000000 --- 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 -+#endif - - #ifndef _LIBC - # if HAVE_ALLOCA 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 b6da5a256ce2..000000000000 --- a/sys-apps/sed/sed-4.2.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -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="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -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 - if ! type -p sed > /dev/null ; 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() { - epatch "${FILESDIR}"/${PN}-4.1.5-alloca.patch - - # don't use sed before bootstrap if we have to recover a broken host sed - 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" -} - -src_configure() { - local myconf=() - if use userland_GNU; then - myconf+=( --exec-prefix="${EPREFIX}" ) - else - myconf+=( --program-prefix=g ) - 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 \ - $(use_enable acl) \ - $(use_enable nls) \ - "${myconf[@]}" -} diff --git a/sys-apps/sed/sed-4.5.ebuild b/sys-apps/sed/sed-4.5.ebuild index ec5f65f082e8..948e57a8ad83 100644 --- a/sys-apps/sed/sed-4.5.ebuild +++ b/sys-apps/sed/sed-4.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="acl forced-sandbox nls selinux static" RDEPEND="acl? ( virtual/acl ) -- cgit v1.2.3