Include fix for GCC4 compilation; Resolves Bug #137179; Thanks to Hanno Meyer-Thurow for tracking the patch down.

(Portage version: 2.1)

4 files changed, 109 insertions, 2 deletions

diff --git a/dev-lisp/lush/ChangeLog b/dev-lisp/lush/ChangeLog
index 9f44d6befbff..b438ef6eb890 100644
--- a/dev-lisp/lush/ChangeLog
+++ b/dev-lisp/lush/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/lush
 # Copyright 2000-2006 Gentoo Foundation and Matthew Kennedy <mkennedy@gentoo.org>; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/lush/ChangeLog,v 1.7 2006/02/13 22:12:44 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/lush/ChangeLog,v 1.8 2006/06/20 16:16:10 mkennedy Exp $
+
+  20 Jun 2006; Matthew Kennedy <mkennedy@gentoo.org> +files/1.1-gcc4.patch,
+  lush-1.1.ebuild:
+  Include fix for GCC4 compilation; Resolves Bug #137179; Thanks to Hanno
+  Meyer-Thurow for tracking the patch down.
 
   13 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org> lush-1.0.ebuild,
   lush-1.1.ebuild:
diff --git a/dev-lisp/lush/files/1.1-gcc4.patch b/dev-lisp/lush/files/1.1-gcc4.patch
new file mode 100644
index 000000000000..d9bc27cb5a60
--- /dev/null
+++ b/dev-lisp/lush/files/1.1-gcc4.patch
@@ -0,0 +1,93 @@
+--- lush-1.1/include/header.h.orig	2006-06-20 00:18:29.000000000 +0200
++++ lush-1.1/include/header.h	2006-06-20 00:18:41.000000000 +0200
+@@ -805,7 +805,6 @@
+ #define DATE_MINUTE     4
+ #define DATE_SECOND     5
+ 
+-extern char *ansidatenames[];
+ extern class date_class;
+ 
+ TLAPI char *str_date( at *p, int *pfrom, int *pto );
+--- lush-1.1/src/date.c.orig	2006-06-20 00:16:58.000000000 +0200
++++ lush-1.1/src/date.c	2006-06-20 00:24:17.000000000 +0200
+@@ -311,10 +311,11 @@
+   return string_buffer;
+ }
+ 
++static at *make_date(struct date *d);
++
+ static void
+ date_serialize(at **pp, int code)
+ {
+-  static at *make_date(struct date *d);
+   void *p;
+ 
+   if (code == SRZ_READ)
+--- lush-1.1/src/index.c.orig	2006-06-20 00:25:41.000000000 +0200
++++ lush-1.1/src/index.c	2006-06-20 00:26:17.000000000 +0200
+@@ -141,6 +141,8 @@
+   return string_buffer;
+ }
+ 
++static at *index_set(struct index*,at**,at*,int);
++static at *index_ref(struct index*,at**);
+ 
+ static at *
+ index_listeval(at *p, at *q)
+@@ -150,9 +152,6 @@
+   register at *qsav;
+   at *myp[MAXDIMS];
+ 
+-  static at *index_set(struct index*,at**,at*,int);
+-  static at *index_ref(struct index*,at**);
+-
+   ind = p->Object;
+ 
+   if (ind->flags & IDF_UNSIZED)
+--- lush-1.1/src/string.c.orig	2006-06-20 00:30:02.000000000 +0200
++++ lush-1.1/src/string.c	2006-06-20 00:30:07.000000000 +0200
+@@ -1041,13 +1041,13 @@
+     return NIL;
+ #if HAVE_WCHAR_T
+   {
+-    int n = strlen(s);
++    int n = strlen((char*)s);
+     mbstate_t ps;
+     memset(&ps, 0, sizeof(mbstate_t));
+     while(n > 0)
+       {
+ 	wchar_t wc = 0;
+-	int m = (int)mbrtowc(&wc, s, n, &ps);
++	int m = (int)mbrtowc(&wc, (char*)s, n, &ps);
+ 	if (m == 0)
+ 	  break;
+ 	if (m < 0)
+--- lush-1.1/src/unix.c.orig	2006-06-20 00:31:25.000000000 +0200
++++ lush-1.1/src/unix.c	2006-06-20 00:31:32.000000000 +0200
+@@ -1487,7 +1487,7 @@
+       for (i=0; i<kidpidsize; i++)
+         if (kidpid[i])
+           close(i);
+-      execl("/bin/sh", "sh", "-c", cmd, 0);
++      execl("/bin/sh", "sh", "-c", cmd, NULL);
+       _exit(127);
+     }
+   /* Parent process */
+@@ -1594,7 +1594,7 @@
+         if (kidpid[i])
+           close(i);
+ #endif
+-      execl("/bin/sh", "sh", "-c", string_buffer, 0);
++      execl("/bin/sh", "sh", "-c", string_buffer, NULL);
+       _exit(127);
+     }
+   /* Parent process */ 
+@@ -1688,7 +1688,7 @@
+         if (kidpid[i])
+           close(i);
+ # endif
+-      execl("/bin/sh", "sh", "-c", string_buffer, 0);
++      execl("/bin/sh", "sh", "-c", string_buffer, NULL);
+       _exit(127);
+     }
+   /* Parent process */ 
diff --git a/dev-lisp/lush/files/digest-lush-1.1 b/dev-lisp/lush/files/digest-lush-1.1
index 29449e0312b9..6baad7013314 100644
--- a/dev-lisp/lush/files/digest-lush-1.1
+++ b/dev-lisp/lush/files/digest-lush-1.1
@@ -1 +1,3 @@
 MD5 8a108ebe840539a2e4e63317dd5ae53d lush-1.1.tar.gz 4385751
+RMD160 3e32242a8a9391e4077144bbda10a013f4791d48 lush-1.1.tar.gz 4385751
+SHA256 38fc6296af992dd7f20ddb8e64e0c39789bed9c90dd30ea1ab2268f6dc536fcb lush-1.1.tar.gz 4385751
diff --git a/dev-lisp/lush/lush-1.1.ebuild b/dev-lisp/lush/lush-1.1.ebuild
index ef15b1828c3d..c552e03813ed 100644
--- a/dev-lisp/lush/lush-1.1.ebuild
+++ b/dev-lisp/lush/lush-1.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation and Matthew Kennedy <mkennedy@gentoo.org>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/lush/lush-1.1.ebuild,v 1.2 2006/02/13 22:12:44 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/lush/lush-1.1.ebuild,v 1.3 2006/06/20 16:16:10 mkennedy Exp $
+
+inherit eutils
 
 DESCRIPTION="Lush is the Lisp User Shell"
 HOMEPAGE="http://lush.sourceforge.net/"
@@ -12,6 +14,11 @@ IUSE="X"
 
 DEPEND="X? ( || ( ( x11-libs/libX11 x11-libs/libICE x11-libs/libSM ) virtual/x11 ) )"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-gcc4.patch
+}
+
 src_compile() {
 	econf `use_with X X` || die "./configure failed"
 	emake -j1 || die