sed needs sed no more ! 40786

4 files changed, 41 insertions, 9 deletions

diff --git a/sys-apps/sed/ChangeLog b/sys-apps/sed/ChangeLog
index 22f2e4e23caa..b4a9af09a4bf 100644
--- a/sys-apps/sed/ChangeLog
+++ b/sys-apps/sed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/sed
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.58 2004/09/22 03:42:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.59 2004/10/03 08:58:00 vapier Exp $
+
+  03 Oct 2004; Mike Frysinger <vapier@gentoo.org> sed-4.0.9.ebuild,
+  sed-4.1.2.ebuild:
+  Make sure sed can compile even if system sed is broken #40786 by Brian Harring.
 
 *sed-4.1.2 (21 Sep 2004)
 
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index a2adb1778ff6..aaeeb544ae87 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b8b6b7b21fcd4814274b88b7716ee511 ChangeLog 7909
+MD5 a061972319122050e43c6e3c6db88a8b ChangeLog 8080
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 d47c40fa7ae5acb297bc354eafdffa25 sed-4.1.2.ebuild 1418
-MD5 98adabcf4aa25ca0086c1cfa980ccafa sed-4.0.9.ebuild 1413
+MD5 11b9dac1f90431c0db3e5f7e14142d7b sed-4.1.2.ebuild 1785
+MD5 6b14f29466c165bd9d04b763f1753d30 sed-4.0.9.ebuild 1780
 MD5 da2101c043ce802aabb650bea031a52d files/digest-sed-4.1.2 61
 MD5 1f789b81b2d7992345e1490c68ad5477 files/dos2unix 59
 MD5 2502535e2cc93fa49d1c2fdc31eff1b2 files/unix2dos 56
@@ -12,7 +12,7 @@ MD5 a244109e1adcbd40a02446fb23df33c1 files/digest-sed-4.0.9 61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBX6yHHTu7gpaalycRAukjAKCvqQXjNIuvxSts+2Qaao2TWivzhgCdF/ra
-DfYHTvdJ4C5Vix28lnnJscA=
-=vEj8
+iD8DBQFBX78fHTu7gpaalycRAofOAJ40VDvx/KAmkLsSVRabDswYFe0H0wCeMTIs
+G7QqBu1aw0BOiFKcnRbX7cM=
+=KmCh
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sed/sed-4.0.9.ebuild b/sys-apps/sed/sed-4.0.9.ebuild
index bbbaca120b29..44cd8f84c623 100644
--- a/sys-apps/sed/sed-4.0.9.ebuild
+++ b/sys-apps/sed/sed-4.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.0.9.ebuild,v 1.24 2004/10/03 07:38:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.0.9.ebuild,v 1.25 2004/10/03 08:58:00 vapier Exp $
 
 inherit gnuconfig flag-o-matic
 
@@ -24,6 +24,15 @@ src_unpack() {
 }
 
 src_compile() {
+	# make sure system-sed works #40786
+	export NO_SYS_SED=""
+	if ! which sed >& /dev/null ; then
+		NO_SYS_SED="!!!"
+		./bootstrap.sh || die "couldnt bootstrap"
+		cp sed/sed ${T}/ || die "couldnt copy"
+		export PATH="${PATH}:${T}"
+	fi
+
 	local myconf=""
 	if use macos || use ppc-macos ; then
 		myconf="--program-prefix=g"
@@ -32,12 +41,17 @@ src_compile() {
 		$(use_enable nls) \
 		${myconf} \
 		|| die "Configure failed"
+	if [ ! -z "${NO_SYS_SED}" ] ; then 
+		make clean || die "couldnt clean"
+	fi
 
 	use static && append-ldflags -static
 	emake LDFLAGS="${LDFLAGS}" || die "build failed"
 }
 
 src_install() {
+	[ ! -z "${NO_SYS_SED}" ] && export PATH="${PATH}:${T}"
+
 	into /
 	dobin sed/sed || die "dobin"
 	if ! use build
diff --git a/sys-apps/sed/sed-4.1.2.ebuild b/sys-apps/sed/sed-4.1.2.ebuild
index 17e8b3a901ff..884a5870f9b6 100644
--- a/sys-apps/sed/sed-4.1.2.ebuild
+++ b/sys-apps/sed/sed-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.2.ebuild,v 1.3 2004/10/03 07:38:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.2.ebuild,v 1.4 2004/10/03 08:58:00 vapier Exp $
 
 inherit gnuconfig flag-o-matic
 
@@ -24,6 +24,15 @@ src_unpack() {
 }
 
 src_compile() {
+	# make sure system-sed works #40786
+	export NO_SYS_SED=""
+	if ! which sed >& /dev/null ; then
+		NO_SYS_SED="!!!"
+		./bootstrap.sh || die "couldnt bootstrap"
+		cp sed/sed ${T}/ || die "couldnt copy"
+		export PATH="${PATH}:${T}"
+	fi
+
 	local myconf=""
 	if use macos || use ppc-macos ; then
 		myconf="--program-prefix=g"
@@ -32,12 +41,17 @@ src_compile() {
 		$(use_enable nls) \
 		${myconf} \
 		|| die "Configure failed"
+	if [ ! -z "${NO_SYS_SED}" ] ; then 
+		make clean || die "couldnt clean"
+	fi
 
 	use static && append-ldflags -static
 	emake LDFLAGS="${LDFLAGS}" || die "build failed"
 }
 
 src_install() {
+	[ ! -z "${NO_SYS_SED}" ] && export PATH="${PATH}:${T}"
+
 	into /
 	dobin sed/sed || die "dobin"
 	if ! use build