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

Package-Manager: portage-2.1.2_pre3-r7

3 files changed, 32 insertions, 23 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/Manifest b/sys-apps/sed/Manifest
index d4c077c3b820..8bee452f8d06 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dos2unix 59 RMD160 0368c209fca1c4d15d755843d7a65088b6b4a374 SHA1 68f658288d08c0768d675e5e1601d5024778d043 SHA256 77f34331117af2a0756d9db39f956b74897e2e427f331dfe3bd40a64c5a06b33
 MD5 1f789b81b2d7992345e1490c68ad5477 files/dos2unix 59
 RMD160 0368c209fca1c4d15d755843d7a65088b6b4a374 files/dos2unix 59
@@ -24,14 +27,14 @@ EBUILD sed-4.1.4-r1.ebuild 1817 RMD160 51ce8e9b3357caebc178d36003f3a7c401e586ce
 MD5 541fd293f30dc6580c8a9f2c76d8aa81 sed-4.1.4-r1.ebuild 1817
 RMD160 51ce8e9b3357caebc178d36003f3a7c401e586ce sed-4.1.4-r1.ebuild 1817
 SHA256 e4371efe96d6922b3115dcc3a27917db36336a8b687e36e6d31a58fce7db3b00 sed-4.1.4-r1.ebuild 1817
-EBUILD sed-4.1.5.ebuild 1751 RMD160 1498295758f38c436ac6ca097ec6db79c522202f SHA1 cdddf1d7929e6913eed6812c509636b792770431 SHA256 8afa7bcb14e9a0032332c544cbddb720784ff5a8f0a23da78cd185d854bf86f8
-MD5 6ef92057130b41eddeb346e6b212a42b sed-4.1.5.ebuild 1751
-RMD160 1498295758f38c436ac6ca097ec6db79c522202f sed-4.1.5.ebuild 1751
-SHA256 8afa7bcb14e9a0032332c544cbddb720784ff5a8f0a23da78cd185d854bf86f8 sed-4.1.5.ebuild 1751
-MISC ChangeLog 10751 RMD160 3f89648e8bf567773d7ddc2fa60ff899b72666c3 SHA1 726dc5b3d98c6d59f7261beddd1c027077775137 SHA256 998650e574a8e1e64d4099302a766d843da007f8734da39c593e5538f57baf7c
-MD5 faf70cc18f6f4a00ac7996051f8f0f69 ChangeLog 10751
-RMD160 3f89648e8bf567773d7ddc2fa60ff899b72666c3 ChangeLog 10751
-SHA256 998650e574a8e1e64d4099302a766d843da007f8734da39c593e5538f57baf7c ChangeLog 10751
+EBUILD sed-4.1.5.ebuild 1772 RMD160 8c64559d860b11a9271d07e8bdbd5ec93df20c51 SHA1 03b3ebf307e339076a6600700b0fd3f2262b39e3 SHA256 b45ec1d472d45b49faaa3f08d0c2f5bc7995571d8bd75b2bdb616b93e8a8c75b
+MD5 495ddde198fc09a00640a7ee9fbe132a sed-4.1.5.ebuild 1772
+RMD160 8c64559d860b11a9271d07e8bdbd5ec93df20c51 sed-4.1.5.ebuild 1772
+SHA256 b45ec1d472d45b49faaa3f08d0c2f5bc7995571d8bd75b2bdb616b93e8a8c75b sed-4.1.5.ebuild 1772
+MISC ChangeLog 10897 RMD160 075ff4ce9966181631c2d3ff2453569a6235f05b SHA1 edc547b0da0149d4a28ff52214a0fd32df42bd06 SHA256 997e982ad6bb62ac4c2b78ea36285c323456251bf54d71eaeec032ce2a89f8e2
+MD5 8f48c3a27413407030bf6eebfba58566 ChangeLog 10897
+RMD160 075ff4ce9966181631c2d3ff2453569a6235f05b ChangeLog 10897
+SHA256 997e982ad6bb62ac4c2b78ea36285c323456251bf54d71eaeec032ce2a89f8e2 ChangeLog 10897
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -42,3 +45,10 @@ SHA256 0dbf753832dccf12b68830e0549fca64e20c89fa7aba9e1224abb7e146706bd0 files/di
 MD5 d830c9b91707f87d92c8c97fe4deee55 files/digest-sed-4.1.5 229
 RMD160 e62a89e0fb3237843b43bb5b265639f4d903ad02 files/digest-sed-4.1.5 229
 SHA256 fc27a6c7e4ea15ccadc1700d6e950a14125370ea6eb28e3c8d188ac9c91bf98c files/digest-sed-4.1.5 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFPl9famhnQswr0vIRAtMKAKCpnvyq26T63v3nId23NjLz66MxgQCguKea
+x4kIVfodPS+eeNWoeo0Q+5w=
+=u/20
+-----END PGP SIGNATURE-----
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}