From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D10BB1382C5 for ; Sun, 11 Mar 2018 22:38:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07CB9E08CA; Sun, 11 Mar 2018 22:38:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CF03AE08CA for ; Sun, 11 Mar 2018 22:37:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08206335C31 for ; Sun, 11 Mar 2018 22:37:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49153232 for ; Sun, 11 Mar 2018 22:37:56 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1520807787.a64fc681cba91934c0ebb96fc7c2312fbcb5cef4.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sed/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/sed/sed-4.2.2.ebuild sys-apps/sed/sed-4.3-r1.ebuild sys-apps/sed/sed-4.4-r1.ebuild sys-apps/sed/sed-4.4.ebuild X-VCS-Directories: sys-apps/sed/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: a64fc681cba91934c0ebb96fc7c2312fbcb5cef4 X-VCS-Branch: master Date: Sun, 11 Mar 2018 22:37:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 404850e9-e4b3-40cd-a3a4-1d0a4607f7d6 X-Archives-Hash: 77be6416a1d43f4d53d5b0011be053c8 commit: a64fc681cba91934c0ebb96fc7c2312fbcb5cef4 Author: Mike Frysinger gentoo org> AuthorDate: Sun Mar 11 22:24:58 2018 +0000 Commit: Mike Frysinger gentoo 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 }