Fixed #357315, thanks to Francois Bissey <fbissey@slingshot.co.nz> for cherry-pick the patches

Package-Manager: portage-2.2.0_alpha26/cvs/Linux i686

4 files changed, 50 insertions, 4 deletions

diff --git a/dev-lisp/ecls/ChangeLog b/dev-lisp/ecls/ChangeLog
index c9fbc16f1be9..1f696224185e 100644
--- a/dev-lisp/ecls/ChangeLog
+++ b/dev-lisp/ecls/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lisp/ecls
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ChangeLog,v 1.38 2011/01/17 15:53:31 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ChangeLog,v 1.39 2011/03/04 20:55:03 grozin Exp $
+
+*ecls-11.1.1-r1 (04 Mar 2011)
+
+  04 Mar 2011; Andrey Grozin <grozin@gentoo.org> +files/11.1.1-cmploc.patch,
+  -ecls-11.1.1.ebuild, +ecls-11.1.1-r1.ebuild:
+  Fixed #357315, thanks to Francois Bissey <fbissey@slingshot.co.nz> for
+  cherry-pick the patches
 
 *ecls-11.1.1 (17 Jan 2011)
 
diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest
index 61ba9f3ed178..1e747c042e6a 100644
--- a/dev-lisp/ecls/Manifest
+++ b/dev-lisp/ecls/Manifest
@@ -1,5 +1,6 @@
 AUX 10.2.1-headers-gentoo.patch 462 RMD160 f3efa92b71b5d0cbe64ff6b835a5faa7ecf2db5a SHA1 7f6a9601cd8341d33c01d27d37732890f0027d40 SHA256 8c1ae8770665f6c1b2b2e46fa0b4ad382d403b5dc04760b80a43ab033d3b5d28
 AUX 10.4.1-headers-gentoo.patch 462 RMD160 f3efa92b71b5d0cbe64ff6b835a5faa7ecf2db5a SHA1 7f6a9601cd8341d33c01d27d37732890f0027d40 SHA256 8c1ae8770665f6c1b2b2e46fa0b4ad382d403b5dc04760b80a43ab033d3b5d28
+AUX 11.1.1-cmploc.patch 1152 RMD160 c5b73155a4c7a5424d7cf77cb8d9e09ac4c7ec07 SHA1 526657c7f34e4ba85cc1faed7b649831968c3d59 SHA256 8c08e741f521af4fce2cf325f97574f4fde56f69d289c4674712fdf06cb6f90e
 AUX 11.1.1-headers-gentoo.patch 462 RMD160 f3efa92b71b5d0cbe64ff6b835a5faa7ecf2db5a SHA1 7f6a9601cd8341d33c01d27d37732890f0027d40 SHA256 8c1ae8770665f6c1b2b2e46fa0b4ad382d403b5dc04760b80a43ab033d3b5d28
 AUX 9.12.3-headers-gentoo.patch 462 RMD160 f3efa92b71b5d0cbe64ff6b835a5faa7ecf2db5a SHA1 7f6a9601cd8341d33c01d27d37732890f0027d40 SHA256 8c1ae8770665f6c1b2b2e46fa0b4ad382d403b5dc04760b80a43ab033d3b5d28
 AUX README.Gentoo 692 RMD160 c21a2c1f512d38e8d8f589343724b8281cf1dfb7 SHA1 42bb864ddcf6401993d7d22a5c14bedc665089db SHA256 3b9490c43a5e8affe71ba793e1a6b85c4a4ec81fa9e384d376fc5dca413cf0e6
@@ -9,7 +10,7 @@ DIST ecl-11.1.1.tar.gz 5898523 RMD160 e15dd8cf02cd6ad78ef35293df014363615fd4ad S
 DIST ecl-9.12.3.tgz 5758828 RMD160 10deb139394edffce8f1f7f4b1c682b9a86f93d9 SHA1 cf293b029f33b0b0f9539e9163618a9d31df6f30 SHA256 f4f2e9d584130db9bb61bd09a676ad67c5d0f1ca8096ed781b50a2ae99c5e682
 EBUILD ecls-10.2.1.ebuild 1530 RMD160 9560be0a9d88abf4e99c501c262b68653c9d7eaa SHA1 6a803b0975f4e6e3bf444ceeb24c68b547f3f206 SHA256 9e68c63b06361a552e4d621d4d641eb45efffbee70a4bf2a538288a44258312a
 EBUILD ecls-10.4.1.ebuild 1557 RMD160 9222662839b57fb884c98225b37f7e746a578d13 SHA1 81a7d598083107a496421236e28e1b7b7ac0c962 SHA256 7727ff29ad68c2609647e729622a46040c14093231708edef604bacf8b9340cc
-EBUILD ecls-11.1.1.ebuild 1560 RMD160 8d6628782717aecefa433962bfe6228a70e03b0b SHA1 fd03157b562fbcd978241b2d71a58ffcd4aafa69 SHA256 22e0ac64a1a6eb28eb6fc68badc405b8906618617e1e2319725524f99cb9b6cf
+EBUILD ecls-11.1.1-r1.ebuild 1620 RMD160 c4bd4e05ffda944ddb713bbc4caaba4927139f9e SHA1 2e9ea92084779bc68305459b0b9ab6c79c92f39a SHA256 533422c789dae0f6287c039e89ab08cd16c4310cf789630f89eabbabacdd3258
 EBUILD ecls-9.12.3.ebuild 1417 RMD160 ac43111b6751ef4eb1da7e493bc4eae515738c57 SHA1 ecd212847cca49307ce0d15311f14381a74fe854 SHA256 3922f70b7669b43079c2592adc4abe46c98e40a2ac255f99d382cde984319ca6
-MISC ChangeLog 7029 RMD160 965467ddb4952c0f6dce4aa25d6df0100bda8c79 SHA1 21fa5cfc8391224dda882d6538191b89d11f5fe2 SHA256 4db275e40810a7768a9ee4ee5031d4b6c3e882e1da9b3a405d831413bcf244c0
+MISC ChangeLog 7284 RMD160 14ec7651c7cec394aaa803bebb9cc82300a3db63 SHA1 c7d1b1b8debded7b2efaf1b87f49eeedd386a88b SHA256 8ebe6af8a0d32f905d31cb0a8679010e0ebb1fe76b41ce5feb1613025a541496
 MISC metadata.xml 641 RMD160 12f32c9795dde1148d89adc2028f94c62ea1b723 SHA1 fe78bf04617672a4a5086e7dbaddf9f0cbc11df3 SHA256 5bcc4a83d062e0d767483ae7d60dee4e846854011ca95610eca7a0142decfd4e
diff --git a/dev-lisp/ecls/ecls-11.1.1.ebuild b/dev-lisp/ecls/ecls-11.1.1-r1.ebuild
index fe78469addb8..4be4d07e6606 100644
--- a/dev-lisp/ecls/ecls-11.1.1.ebuild
+++ b/dev-lisp/ecls/ecls-11.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-11.1.1.ebuild,v 1.1 2011/01/17 15:53:31 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-11.1.1-r1.ebuild,v 1.1 2011/03/04 20:55:03 grozin Exp $
 
 EAPI=3
 inherit eutils multilib
@@ -34,6 +34,9 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
+
+	# bug #357315
+	epatch "${FILESDIR}"/${PV}-cmploc.patch
 }
 
 src_configure() {
diff --git a/dev-lisp/ecls/files/11.1.1-cmploc.patch b/dev-lisp/ecls/files/11.1.1-cmploc.patch
new file mode 100644
index 000000000000..0f15bc6e14e2
--- /dev/null
+++ b/dev-lisp/ecls/files/11.1.1-cmploc.patch
@@ -0,0 +1,35 @@
+diff --git a/src/cmp/cmploc.lsp b/src/cmp/cmploc.lsp
+index ca6a93d..87e6232 100644
+--- src/cmp/cmploc.lsp
++++ src/cmp/cmploc.lsp
+@@ -98,7 +98,7 @@
+            (and (eq (car loc) 'C-INLINE)
+                 (eq (sixth loc) 'VALUES)))))
+ 
+-(defun loc-immediate-value-p (loc &aux head)
++(defun loc-immediate-value-p (loc)
+   (cond ((eq loc t)
+          (values t t))
+         ((eq loc nil)
+@@ -112,9 +112,9 @@
+                (values t value))))
+         ((atom loc)
+          (values nil nil))
+-
+-        ((member head '(fixnum-value character-value long-float-value
+-                        double-float-value single-float-value))
++        ((member (first loc)
++                 '(fixnum-value character-value long-float-value
++                   double-float-value single-float-value))
+          (values t (second loc)))
+         (t
+          (values nil nil))))
+@@ -123,7 +123,7 @@
+   (baboon :format-control "Unknown location found in ~A~%~S"
+           :format-arguments (list where loc)))
+ 
+-(defun wt-loc (loc &aux fd)
++(defun wt-loc (loc)
+   (cond ((consp loc)
+          (let ((fd (gethash (car loc) *wt-loc-dispatch-table*)))
+            (if fd