new 0.60.3-r2, bumped for sparc only, fixes cmdedit lag

5 files changed, 80 insertions, 4 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 7ac6cb7700ea..a9b1f480cebe 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.21 2004/02/05 15:10:30 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.22 2004/02/14 13:58:51 gustavoz Exp $
+
+*busybox-0.60.3-r2 (14 Feb 2004)
+
+  14 Feb 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  busybox-0.60.3-r2.ebuild, files/busybox-cmdedit-sparc.diff:
+  new 0.60.3-r2, bumped for sparc only, fixes cmdedit lag
 
 *busybox-1.00_pre7 (06 Feb 2004)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index f214962624ad..54f8d84e0e22 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,4 +1,4 @@
-MD5 2f4f25409a3446999f2d8295c285b58c ChangeLog 4906
+MD5 23a1b08979577f034f669e33545e2d14 ChangeLog 5115
 MD5 6cdc2c55c81d469d6c659b78aeaab6fa busybox-0.50.ebuild 1021
 MD5 afce61e411b071fc0cb5721e03e67270 busybox-0.60.2.ebuild 1239
 MD5 468aac724f34f9d41d0ad79934ceea60 busybox-0.60.3-r1.ebuild 1100
@@ -7,8 +7,9 @@ MD5 d3043ed4947d95bdc6d851104d264b08 busybox-0.60.5-r1.ebuild 1430
 MD5 b2aea7596915e98b9fdca4327e253c59 busybox-0.60.5-r2.ebuild 2147
 MD5 dbe32c7e55c8da606a4e1081f3f55f71 busybox-0.60.5.ebuild 1040
 MD5 69837430060f0ab0c3f2d4ee893d0d02 busybox-1.00_pre5.ebuild 4461
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 a4751ddd67251dc33465a54a898f433c busybox-1.00_pre7.ebuild 5135
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 dae21d32232c78ac7d7d99cf4a45b1f3 busybox-0.60.3-r2.ebuild 1170
 MD5 9ce965b12114a360496fe06e952139a8 files/Config.h 11695
 MD5 24ec3839ecb3e429bf29a819398b7753 files/Config.h-0.60.2-cd 13772
 MD5 af127cfced92352c0a43cbf63cde52bd files/Config.h-0.60.3-cd 14319
@@ -23,6 +24,8 @@ MD5 eed3465a5e0e5ddae7dac2c1c1f879ef files/digest-busybox-0.60.5 66
 MD5 eed3465a5e0e5ddae7dac2c1c1f879ef files/digest-busybox-0.60.5-r1 66
 MD5 eed3465a5e0e5ddae7dac2c1c1f879ef files/digest-busybox-0.60.5-r2 66
 MD5 347b6eb9800123daef3dbc8b97bf6d37 files/digest-busybox-1.00_pre5 70
+MD5 704f416234f8fbc811d4313a29dd7007 files/digest-busybox-1.00_pre7 70
 MD5 9750d4004e6507d35f9aa67d2785fdd3 files/dodeps 2015
 MD5 3a4b93f7ec6f3aaade20029a81562b88 files/msh.diff 433
-MD5 704f416234f8fbc811d4313a29dd7007 files/digest-busybox-1.00_pre7 70
+MD5 4e80b04a6c57cb7341be774b55b7229c files/busybox-cmdedit-sparc.diff 568
+MD5 61ecae720ff226b1e543f7c1d0900043 files/digest-busybox-0.60.3-r2 66
diff --git a/sys-apps/busybox/busybox-0.60.3-r2.ebuild b/sys-apps/busybox/busybox-0.60.3-r2.ebuild
new file mode 100644
index 000000000000..4322ce288f67
--- /dev/null
+++ b/sys-apps/busybox/busybox-0.60.3-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r2.ebuild,v 1.1 2004/02/14 13:58:51 gustavoz Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Utilities for rescue and embedded systems"
+SRC_URI="http://www.busybox.net/downloads/${P}.tar.gz"
+HOMEPAGE="http://www.busybox.net"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* sparc"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cp ${FILESDIR}/Config.h-${PV}-cd ${S}/Config.h
+	# fix for sparc lag/flush in ash
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-cmdedit-sparc.diff
+	# I did not include the msh patch since I don't know if it will
+	# break stuff, I compile ash anyway, and it's in CVS
+}
+
+src_compile() {
+	local myconf
+	use static && myconf="${myconf} DOSTATIC=true"
+	emake ${myconf} || die
+}
+
+src_install() {
+	into /
+	dobin busybox
+	into /usr
+	dodoc AUTHORS Changelog* INSTALL LICENSE README TODO
+
+	docinto scripts
+	dodoc busybox.links
+
+	cd docs
+	doman *.1
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	dohtml *.html
+	dohtml *.sgml
+
+	cd ../scripts
+	docinto scripts
+	dodoc inittab
+	dodoc depmod.pl
+}
diff --git a/sys-apps/busybox/files/busybox-cmdedit-sparc.diff b/sys-apps/busybox/files/busybox-cmdedit-sparc.diff
new file mode 100644
index 000000000000..299161cf179f
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-cmdedit-sparc.diff
@@ -0,0 +1,12 @@
+diff -Nru busybox-0.60.5-orig/cmdedit.c busybox-0.60.5/cmdedit.c
+--- busybox-0.60.5-orig/cmdedit.c	Thu Apr 25 01:07:03 2002
++++ busybox-0.60.5/cmdedit.c	Fri Apr  4 19:55:30 2003
+@@ -1177,7 +1177,7 @@
+ 	new_settings.c_lflag &= ~ICANON;        /* unbuffered input */
+ 	/* Turn off echoing and CTRL-C, so we can trap it */
+ 	new_settings.c_lflag &= ~(ECHO | ECHONL | ISIG);
+-#ifndef linux
++#if (defined(__sparc__) && defined(linux)) || ! defined(linux)
+ 	/* Hmm, in linux c_cc[] not parsed if set ~ICANON */
+ 	new_settings.c_cc[VMIN] = 1;
+ 	new_settings.c_cc[VTIME] = 0;
diff --git a/sys-apps/busybox/files/digest-busybox-0.60.3-r2 b/sys-apps/busybox/files/digest-busybox-0.60.3-r2
new file mode 100644
index 000000000000..392d227dbcac
--- /dev/null
+++ b/sys-apps/busybox/files/digest-busybox-0.60.3-r2
@@ -0,0 +1 @@
+MD5 a202031d77cfd2515dfac0b163b47b1b busybox-0.60.3.tar.gz 770870