commit: a64fc681cba91934c0ebb96fc7c2312fbcb5cef4 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Sun Mar 11 22:24:58 2018 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Sun Mar 11 22:36:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64fc681
sys-apps/sed: update bootstrap logic #650052 The bootstrap.sh logic was deleted upstream a while back. Switch to using busybox's sed as a fallback as needed. This should be good enough for most cases, and we can figure out something more if the need comes up. Bug: https://bugs.gentoo.org/650052 sys-apps/sed/sed-4.2.2.ebuild | 10 ++++------ sys-apps/sed/sed-4.3-r1.ebuild | 10 ++++------ sys-apps/sed/sed-4.4-r1.ebuild | 10 ++++------ sys-apps/sed/sed-4.4.ebuild | 10 ++++------ 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild index ad3f071a2b1..b6da5a256ce 100644 --- a/sys-apps/sed/sed-4.2.2.ebuild +++ b/sys-apps/sed/sed-4.2.2.ebuild @@ -22,13 +22,11 @@ DEPEND="${RDEPEND} 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" + 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 } diff --git a/sys-apps/sed/sed-4.3-r1.ebuild b/sys-apps/sed/sed-4.3-r1.ebuild index b0be9297fb0..e70a4518792 100644 --- a/sys-apps/sed/sed-4.3-r1.ebuild +++ b/sys-apps/sed/sed-4.3-r1.ebuild @@ -26,13 +26,11 @@ PATCHES=( 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" + 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 } diff --git a/sys-apps/sed/sed-4.4-r1.ebuild b/sys-apps/sed/sed-4.4-r1.ebuild index 26c3858da53..194b1b19369 100644 --- a/sys-apps/sed/sed-4.4-r1.ebuild +++ b/sys-apps/sed/sed-4.4-r1.ebuild @@ -22,13 +22,11 @@ DEPEND="${RDEPEND} 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}" - emake clean + 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 } diff --git a/sys-apps/sed/sed-4.4.ebuild b/sys-apps/sed/sed-4.4.ebuild index aa52e2921cd..3bdb8e28ac2 100644 --- a/sys-apps/sed/sed-4.4.ebuild +++ b/sys-apps/sed/sed-4.4.ebuild @@ -25,13 +25,11 @@ DEPEND="${RDEPEND} 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" + 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 }