Dont use sed until we have bootstrapped ourselves #152638 by Andrea Carpani.

(Portage version: 2.1.2_pre3-r7)

2 files changed, 14 insertions, 15 deletions

diff --git a/sys-apps/sed/ChangeLog b/sys-apps/sed/ChangeLog
index b4c0251fa07a..95997db712e9 100644
--- a/sys-apps/sed/ChangeLog
+++ b/sys-apps/sed/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/sed
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.81 2006/10/18 11:29:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.82 2006/10/24 18:44:58 vapier Exp $
+
+  24 Oct 2006; Mike Frysinger <vapier@gentoo.org> sed-4.1.5.ebuild:
+  Dont use sed until we have bootstrapped ourselves #152638 by Andrea Carpani.
 
   18 Oct 2006; Roy Marples <uberlord@gentoo.org> sed-4.1.5.ebuild:
   Add ~sparc-fbsd keyword.
diff --git a/sys-apps/sed/sed-4.1.5.ebuild b/sys-apps/sed/sed-4.1.5.ebuild
index 2c77166a58ad..5b0f596416f0 100644
--- a/sys-apps/sed/sed-4.1.5.ebuild
+++ b/sys-apps/sed/sed-4.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.5.ebuild,v 1.14 2006/10/18 11:29:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.5.ebuild,v 1.15 2006/10/24 18:44:58 vapier Exp $
 
 inherit flag-o-matic
 
@@ -23,12 +23,8 @@ src_bootstrap_sed() {
 	if ! type -p sed ; then
 		NO_SYS_SED="!!!"
 		./bootstrap.sh || die "couldnt bootstrap"
-		cp sed/sed ${T}/ || die "couldnt copy"
+		cp sed/sed "${T}"/ || die "couldnt copy"
 		export PATH="${PATH}:${T}"
-	fi
-}
-src_bootstrap_cleanup() {
-	if [[ -n ${NO_SYS_SED} ]] ; then
 		make clean || die "couldnt clean"
 	fi
 }
@@ -38,31 +34,31 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-4.1.4-makeinfo-c-locale.patch
 	epatch "${FILESDIR}"/${P}-alloca.patch
-	sed -i \
-		-e "/docdir =/s:/doc:/doc/${PF}/html:" \
-		doc/Makefile.in || die "sed html doc"
+	# don't use sed here if we have to recover a broken host sed
 }
 
 src_compile() {
 	src_bootstrap_sed
+	# make sure all sed operations here are repeatable
+	sed -i \
+		-e '/docdir =/s:=.*/doc:= $(datadir)/doc/'${PF}'/html:' \
+		doc/Makefile.in || die "sed html doc"
 
 	local myconf=""
 	if ! use userland_GNU ; then
 		myconf="--program-prefix=g"
 	fi
+	use static && append-ldflags -static
 	econf \
 		--bindir=/bin \
 		$(use_enable nls) \
 		${myconf} \
 		|| die "Configure failed"
-
-	src_bootstrap_cleanup
-	use static && append-ldflags -static
-	emake LDFLAGS="${LDFLAGS}" || die "build failed"
+	emake || die "build failed"
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "Install failed"
+	emake install DESTDIR="${D}" || die "Install failed"
 	dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog
 	docinto examples
 	dodoc "${FILESDIR}"/{dos2unix,unix2dos}