Push to stable. Only run make the autoconf stuff when cross-compiling #76038.

6 files changed, 26 insertions, 89 deletions

diff --git a/sys-apps/ed/ChangeLog b/sys-apps/ed/ChangeLog
index 21ad6600c9c6..cf4d15b45d80 100644
--- a/sys-apps/ed/ChangeLog
+++ b/sys-apps/ed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/ed
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ChangeLog,v 1.21 2005/01/09 10:48:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ChangeLog,v 1.22 2005/01/09 20:32:14 vapier Exp $
+
+  09 Jan 2005; Mike Frysinger <vapier@gentoo.org> files/0.2-mkstemp.patch,
+  -files/0.2-r5-mkstemp.patch, -ed-0.2-r4.ebuild, ed-0.2-r5.ebuild:
+  Push to stable.  Only run make the autoconf stuff when cross-compiling #76038.
 
 *ed-0.2-r5 (09 Jan 2005)
 
diff --git a/sys-apps/ed/ed-0.2-r4.ebuild b/sys-apps/ed/ed-0.2-r4.ebuild
deleted file mode 100644
index bf5d623e190e..000000000000
--- a/sys-apps/ed/ed-0.2-r4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-0.2-r4.ebuild,v 1.13 2005/01/02 23:14:21 ciaranm Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Your basic line editor"
-HOMEPAGE="http://www.gnu.org/software/ed/"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/ed/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	sys-apps/texinfo"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-info-dir.patch
-	epatch ${FILESDIR}/${PV}-mkstemp.patch
-	chmod 755 configure #73575
-	WANT_AUTOCONF=2.1 autoconf || die "autoconf failed"
-}
-
-src_compile() {
-	export CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
-	# very old configure script ... econf wont work
-	local myconf="--prefix=/ --host=${CHOST}"
-	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
-	[[ -n ${CTARGET} ]] && myconf="${myconf} --target=${CTARGET}"
-	myconf="${myconf} ${EXTRA_ECONF}"
-	echo "./configure ${myconf}"
-	./configure ${myconf} || die
-	emake AR="$(tc-getAR)" || die
-}
-
-src_install() {
-	chmod 0644 ${S}/ed.info
-	make \
-		prefix=${D}/ \
-		mandir=${D}/usr/share/man/man1 \
-		infodir=${D}/usr/share/info \
-		install || die
-	dodoc ChangeLog NEWS POSIX README THANKS TODO
-}
diff --git a/sys-apps/ed/ed-0.2-r5.ebuild b/sys-apps/ed/ed-0.2-r5.ebuild
index eb43f8f52c98..22b97a586ea6 100644
--- a/sys-apps/ed/ed-0.2-r5.ebuild
+++ b/sys-apps/ed/ed-0.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-0.2-r5.ebuild,v 1.1 2005/01/09 10:48:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-0.2-r5.ebuild,v 1.2 2005/01/09 20:32:14 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gnu.org/pub/gnu/ed/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc
@@ -20,13 +20,20 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-info-dir.patch
-	epatch ${FILESDIR}/${PV}-r5-mkstemp.patch
-	chmod 755 configure #73575
-	WANT_AUTOCONF=2.1 autoconf || die "autoconf failed"
+	epatch ${FILESDIR}/${PV}-mkstemp.patch
+
+	# This little autoconf line isn't critical.
+	# It's only needed when you want to cross-compile.
+	# Since ed is a system package, we don't want to 
+	# force an autoconf DEPEND.
+	if [[ ${CBUILD:-${CHOST}} != ${CHOST} ]] ; then
+		chmod 755 configure #73575
+		WANT_AUTOCONF=2.1 autoconf || die "autoconf failed"
+	fi
 }
 
 src_compile() {
-	export CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
+	tc-export CC RANLIB
 	# very old configure script ... econf wont work
 	local myconf="--prefix=/ --host=${CHOST}"
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
diff --git a/sys-apps/ed/files/0.2-mkstemp.patch b/sys-apps/ed/files/0.2-mkstemp.patch
index 6103a2d088dd..4223f85a4fc2 100644
--- a/sys-apps/ed/files/0.2-mkstemp.patch
+++ b/sys-apps/ed/files/0.2-mkstemp.patch
@@ -1,8 +1,15 @@
+This is based on the following:
+===
 Submitted By: LFS Book <lfs-book@linuxfromscratch.org>
 Date: 2003-10-05
 Initial Package Version: 0.2
 Origin: Slackware Source
 Description: Use mkstemp instead of mktemp.
+===
+However the original patch contained an error.
+mkstemp returns a file description, so when fopen ran, the file was opened twice.
+The correct change is to use fdopen with mkstemp.
+See gentoo bug #73858.
 diff -Naur ed-0.2/buf.c ed-0.2-2/buf.c
 --- ed-0.2/buf.c	Sat Nov 19 04:37:59 1994
 +++ ed-0.2-2/buf.c	Tue May 28 18:38:23 2002
@@ -19,7 +26,7 @@ diff -Naur ed-0.2/buf.c ed-0.2-2/buf.c
    strcpy (sfn, "/tmp/ed.XXXXXX");
 -  if (mktemp (sfn) == NULL || (sfp = fopen (sfn, "w+")) == NULL)
 +  sfd = mkstemp(sfn);
-+    if ((sfd == -1) || (sfp = fopen (sfn, "w+")) == NULL)
++    if ((sfd == -1) || (sfp = fdopen (sfn, "w+")) == NULL)
      {
        fprintf (stderr, "%s: %s\n", sfn, strerror (errno));
        sprintf (errmsg, "Cannot open temp file");
diff --git a/sys-apps/ed/files/0.2-r5-mkstemp.patch b/sys-apps/ed/files/0.2-r5-mkstemp.patch
deleted file mode 100644
index 4223f85a4fc2..000000000000
--- a/sys-apps/ed/files/0.2-r5-mkstemp.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This is based on the following:
-===
-Submitted By: LFS Book <lfs-book@linuxfromscratch.org>
-Date: 2003-10-05
-Initial Package Version: 0.2
-Origin: Slackware Source
-Description: Use mkstemp instead of mktemp.
-===
-However the original patch contained an error.
-mkstemp returns a file description, so when fopen ran, the file was opened twice.
-The correct change is to use fdopen with mkstemp.
-See gentoo bug #73858.
-diff -Naur ed-0.2/buf.c ed-0.2-2/buf.c
---- ed-0.2/buf.c	Sat Nov 19 04:37:59 1994
-+++ ed-0.2-2/buf.c	Tue May 28 18:38:23 2002
-@@ -200,13 +200,13 @@
- int
- open_sbuf ()
- {
--  char *mktemp ();
--  int u;
-+  int u, sfd;
- 
-   isbinary = newline_added = 0;
-   u = umask(077);
-   strcpy (sfn, "/tmp/ed.XXXXXX");
--  if (mktemp (sfn) == NULL || (sfp = fopen (sfn, "w+")) == NULL)
-+  sfd = mkstemp(sfn);
-+    if ((sfd == -1) || (sfp = fdopen (sfn, "w+")) == NULL)
-     {
-       fprintf (stderr, "%s: %s\n", sfn, strerror (errno));
-       sprintf (errmsg, "Cannot open temp file");
diff --git a/sys-apps/ed/files/digest-ed-0.2-r4 b/sys-apps/ed/files/digest-ed-0.2-r4
deleted file mode 100644
index 05d2a7c084db..000000000000
--- a/sys-apps/ed/files/digest-ed-0.2-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ddd57463774cae9b50e70cd51221281b ed-0.2.tar.gz 185913