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

Package-Manager: portage-2.1

diff --git a/dev-lisp/lush/ChangeLog b/dev-lisp/lush/ChangeLog
index 9f44d6befbff7e21ebebb378de9397bfd885cce3..b438ef6eb8906f2595ef4d967ae9415bf2bcdf3c 100644 (file)
--- 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/Manifest b/dev-lisp/lush/Manifest
index 52364be2e207b0bc2703f4e713faee0d3ff815ff..8ea1d996d9ad418165787ed82d41e3f5c084f6fd 100644 (file)
--- a/dev-lisp/lush/Manifest
+++ b/dev-lisp/lush/Manifest
@@ -1,28 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7239207ef82a1902ef66dbcfa95a35d6 ChangeLog 1048
-RMD160 536e750da9cb2275945ed09cc7ea0ca99b49b185 ChangeLog 1048
-SHA256 9933eb1581491ea4a4b44eaac4542c14e566dd81a47ff965f7a41dc6b6acb073 ChangeLog 1048
-MD5 f250ed08cbd854b1dbf0966f5d074f33 files/digest-lush-1.0 61
-RMD160 8e8d05b8377ecc0af6646286e34c27e534b8c187 files/digest-lush-1.0 61
-SHA256 daaa56d1aab0cc9f35b00561dae16957a13ec8d4baa1f2118c24f50c7b169e5c files/digest-lush-1.0 61
-MD5 1045be9f93a0457210753c8cb03e0810 files/digest-lush-1.1 61
-RMD160 3d10162bad98d785bc4c909fb7c07277a181feab files/digest-lush-1.1 61
-SHA256 0e297742adf31f4ab833a866fcfe9b00a2c28e111c51a70007e44feff12d6e01 files/digest-lush-1.1 61
+AUX 1.1-gcc4.patch 2538 RMD160 83109221ebb78d9f4d12f442671172777b871685 SHA1 e8adbf19ce1ed29b7c31b3e549f0f7fc483332bf SHA256 94db2e5fa364c2ab20199505efcdcd6764ffb3e406e86a0391b5d8c73dc01d0b
+MD5 fc95799c7314b04d3fd8136fd7093e67 files/1.1-gcc4.patch 2538
+RMD160 83109221ebb78d9f4d12f442671172777b871685 files/1.1-gcc4.patch 2538
+SHA256 94db2e5fa364c2ab20199505efcdcd6764ffb3e406e86a0391b5d8c73dc01d0b files/1.1-gcc4.patch 2538
+DIST lush-1.0.tar.gz 4155938
+DIST lush-1.1.tar.gz 4385751 RMD160 3e32242a8a9391e4077144bbda10a013f4791d48 SHA1 89d83c88d968f5216c59ce0d7a249e992f6aea41 SHA256 38fc6296af992dd7f20ddb8e64e0c39789bed9c90dd30ea1ab2268f6dc536fcb
+EBUILD lush-1.0.ebuild 770 RMD160 30bc22f78836c44f9239de1903f0ca5d56657a4f SHA1 89a59ced7de0dd919d1f77e151b361195f66e608 SHA256 5741a27e8d6e36516fd4b030dc8d30ded4ea945d4768957c45eb4bf27ba085f2
 MD5 ccefcf160aaf880afd805da6bf044ba6 lush-1.0.ebuild 770
 RMD160 30bc22f78836c44f9239de1903f0ca5d56657a4f lush-1.0.ebuild 770
 SHA256 5741a27e8d6e36516fd4b030dc8d30ded4ea945d4768957c45eb4bf27ba085f2 lush-1.0.ebuild 770
-MD5 2565ec836d72db1e52a9b5747666ce47 lush-1.1.ebuild 756
-RMD160 14ebf225707dc95e25de8f91e3ba8a0155f86606 lush-1.1.ebuild 756
-SHA256 e5ce2917f629750cda4d7118085152dc835eaa2137c73667d8c3b19f0b833619 lush-1.1.ebuild 756
+EBUILD lush-1.1.ebuild 840 RMD160 6320f9884dcfa47fdd166e2ca5b2c875a11c2500 SHA1 8fb580b8ef7e53144075bdedeefe1c009c63850e SHA256 8b269141f226efd5bef8c94882f8fb204b641d88189b2101caf48d79a049717e
+MD5 51dadde985821bf73447330acb70da2f lush-1.1.ebuild 840
+RMD160 6320f9884dcfa47fdd166e2ca5b2c875a11c2500 lush-1.1.ebuild 840
+SHA256 8b269141f226efd5bef8c94882f8fb204b641d88189b2101caf48d79a049717e lush-1.1.ebuild 840
+MISC ChangeLog 1262 RMD160 81e21146cd63accc24a52f6a8bd10b896b8ff5ac SHA1 ea0921784e7d1d2e0f7271e646061b3eca62d581 SHA256 dfa32fc00aac6b0e37f96ae37f366574468f49532faf4e8113c383e310f43475
+MD5 14cb440d7f823fd9b1b9d54591340ecd ChangeLog 1262
+RMD160 81e21146cd63accc24a52f6a8bd10b896b8ff5ac ChangeLog 1262
+SHA256 dfa32fc00aac6b0e37f96ae37f366574468f49532faf4e8113c383e310f43475 ChangeLog 1262
+MISC metadata.xml 537 RMD160 3457043c7929c6de3e2d3e8ada80cc58819b7fd2 SHA1 957cdc8ffbe99297623a939fc7ccc8094f8df2c3 SHA256 8023472b52c7d3512b1c1b645b797d7081a036c8272f7f78df29245689e4525b
 MD5 fa384f93c4c1dceb916464d4ea982416 metadata.xml 537
 RMD160 3457043c7929c6de3e2d3e8ada80cc58819b7fd2 metadata.xml 537
 SHA256 8023472b52c7d3512b1c1b645b797d7081a036c8272f7f78df29245689e4525b metadata.xml 537
+MD5 f250ed08cbd854b1dbf0966f5d074f33 files/digest-lush-1.0 61
+RMD160 8e8d05b8377ecc0af6646286e34c27e534b8c187 files/digest-lush-1.0 61
+SHA256 daaa56d1aab0cc9f35b00561dae16957a13ec8d4baa1f2118c24f50c7b169e5c files/digest-lush-1.0 61
+MD5 15c8915e49dcc49925737842e3b1cee2 files/digest-lush-1.1 229
+RMD160 2938fa65f4e49ef087864e91d6f01189d14b8835 files/digest-lush-1.1 229
+SHA256 6f3812790ac027b4f9bcc13a20efd5c8105437703bd5df5b39c5e1c3ed513c15 files/digest-lush-1.1 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFD8QRoyiNZaEAZA+ARAqPMAJwL7txFog7AOKP2TH9gVuBYNCCtbACggdJ7
-RKyPbxv7SdLNrmukDHBLcQc=
-=UiY7
+iD8DBQFEmB9TyiNZaEAZA+ARAnLpAJ9MbtuvQOW2WExYkqWCwF1Uqm/K8wCfUYT/
+4jvho1/4p6UyXxXoW4eF2mo=
+=RmaY
 -----END PGP SIGNATURE-----

diff --git a/dev-lisp/lush/files/1.1-gcc4.patch b/dev-lisp/lush/files/1.1-gcc4.patch
new file mode 100644 (file)
index 0000000..d9bc27c
--- /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 29449e0312b9477b19748a52afe9d5a1eeebc554..6baad70133140b3dfbbbb34bdf65a7381797b17a 100644 (file)
--- 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 ef15b1828c3d720863edf6ac39e53c887ef06ab2..c552e03813ed2e60cf3a471ee034b2e7e9754eff 100644 (file)
--- 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