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

diff --git a/sys-apps/ed/ChangeLog b/sys-apps/ed/ChangeLog
index 21ad6600c9c6584f7caa40590270f6e2056bb8d4..cf4d15b45d80eee69174b0281270f3f3fab78e88 100644 (file)
--- 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/Manifest b/sys-apps/ed/Manifest
index 8fdaa1ab0ad2341d912862a9dee4740b6e83ac0b..5cf0c775aa5df69453d9046e4d74d3115dfa1890 100644 (file)
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,9 +1,16 @@
-MD5 41da455193ffeb42d4be3e78bb48d087 ed-0.2-r5.ebuild 1347
-MD5 d1b602f11d8b40bf22397ac5863efe8d ed-0.2-r4.ebuild 1333
-MD5 0a2b196776175574986fc5917f1b4fbb ChangeLog 2433
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f65f890bb8e07a77fa27888e6db32139 ChangeLog 2657
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 1b60eebda7e05a6a35164bc4b23ac8ff files/digest-ed-0.2-r4 58
-MD5 1b60eebda7e05a6a35164bc4b23ac8ff files/digest-ed-0.2-r5 58
-MD5 23a8b5483bac37c6fcd9bbb73efaf502 files/0.2-r5-mkstemp.patch 981
-MD5 e7e2248f9baa76de3db8210298e0d79e files/0.2-mkstemp.patch 738
+MD5 90f4a89ff36d4673f28be667a62f381f ed-0.2-r5.ebuild 1535
+MD5 23a8b5483bac37c6fcd9bbb73efaf502 files/0.2-mkstemp.patch 981
 MD5 549e2478edb18002261ae5dd055bcf5b files/0.2-info-dir.patch 373
+MD5 1b60eebda7e05a6a35164bc4b23ac8ff files/digest-ed-0.2-r5 58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.14 (GNU/Linux)
+
+iD8DBQFB4ZToroRuSHgZdywRAqsCAJ9VOf8mCFsBvssMRZMycA/LXIiwzQCfRms0
+jADkSQ5/A6u+xEZkxXmRTH0=
+=0nw0
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/ed/ed-0.2-r4.ebuild b/sys-apps/ed/ed-0.2-r4.ebuild
deleted file mode 100644 (file)
index bf5d623..0000000
--- 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 eb43f8f52c98bd4cbbb0fbed4cb1f57bf9991f85..22b97a586ea65e1c136afa739602c01c2eb6acf0 100644 (file)
--- 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 6103a2d088ddf31b9bd3f66602cd88dfa9d53d88..4223f85a4fc2bd6ce66ce4a8af0393585b7a2bbe 100644 (file)
--- 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 (file)
index 4223f85..0000000
--- 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 (file)
index 05d2a7c..0000000
--- a/sys-apps/ed/files/digest-ed-0.2-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ddd57463774cae9b50e70cd51221281b ed-0.2.tar.gz 185913