Fix building with ecls-12.2.1

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

4 files changed, 22 insertions, 6 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 75d95e43ece9..712017e2e1bb 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/maxima
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.94 2011/12/21 07:25:58 grozin Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.95 2012/02/13 13:41:36 grozin Exp $
+
+  13 Feb 2012; Andrey Grozin <grozin@gentoo.org> maxima-5.26.0.ebuild,
+  +files/maxima-5.26.0-ecls-12.2.1.patch:
+  Fix building with ecls-12.2.1
 
 *maxima-5.26.0 (21 Dec 2011)
 
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index a53189e0cf21..da7eb6c8e134 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -6,6 +6,7 @@ AUX maxima-5.24.0-wish.patch 946 RMD160 d19db10a629a9a9f1fa0799b0be403c8aee090fe
 AUX maxima-5.24.0.patch 3263 RMD160 a3fb37685b9481ed1c17a53f027429656371c586 SHA1 774178e2e3cd265d3f0474b0c38fa1230c583619 SHA256 dd7d02c0eaac5a0763363ed46c207bfb40e55b8470dc3b7c2892753b466a2ea0
 AUX maxima-5.25.1-wish.patch 946 RMD160 d19db10a629a9a9f1fa0799b0be403c8aee090fe SHA1 56f2ad96baed63b27d7c37cfccaf27806a06f20e SHA256 dd535626d5d2d16f249e2c41157f5bbfb030236651d9b0404cc1a69c5fec9e0c
 AUX maxima-5.25.1.patch 3263 RMD160 a3fb37685b9481ed1c17a53f027429656371c586 SHA1 774178e2e3cd265d3f0474b0c38fa1230c583619 SHA256 dd7d02c0eaac5a0763363ed46c207bfb40e55b8470dc3b7c2892753b466a2ea0
+AUX maxima-5.26.0-ecls-12.2.1.patch 482 RMD160 9ecb6791a228fe8a8ac507916c03724fbe43671a SHA1 55c65b0537f23120edf3b7cd3387e1a6c75f1bd6 SHA256 6babc828e2157d07267283d6b92800aa7e871871b7d4136f1109bf983e71c618
 AUX maxima-5.26.0-wish.patch 946 RMD160 d19db10a629a9a9f1fa0799b0be403c8aee090fe SHA1 56f2ad96baed63b27d7c37cfccaf27806a06f20e SHA256 dd535626d5d2d16f249e2c41157f5bbfb030236651d9b0404cc1a69c5fec9e0c
 AUX maxima-5.26.0.patch 3263 RMD160 a3fb37685b9481ed1c17a53f027429656371c586 SHA1 774178e2e3cd265d3f0474b0c38fa1230c583619 SHA256 dd7d02c0eaac5a0763363ed46c207bfb40e55b8470dc3b7c2892753b466a2ea0
 AUX maxima-ecl-ldflags.patch 1069 RMD160 96b7fec44be8919f6cac44e50e39cae9eb3c0c88 SHA1 719ea4f9f5a8e9384da01882cd0baacd9573c479 SHA256 e4a12120d30389690d2d5c1ac8ae77713e1818950632c2953ac6ec57a9c11976
@@ -22,6 +23,6 @@ EBUILD maxima-5.18.1.ebuild 4193 RMD160 b439ed7bb29d010d1ad47f36cc91ab4ec7bf1549
 EBUILD maxima-5.23.2.ebuild 4468 RMD160 17cec6829f97c8956181e4fc847c78a3a92cc9f3 SHA1 e389e233abbc407797a602414ccedfa4a2733725 SHA256 0092fd577c3bde28fa54b4a4a63e29db0a87a2cee7a2d324c75d14750a8f5837
 EBUILD maxima-5.24.0-r1.ebuild 4920 RMD160 39f5f3e8ba475dce6de226d45053c22daecff52c SHA1 b94e0189394389d6ce56e41a6d9a8ff7e240c875 SHA256 7c6f312e44ae7be350ff82a8854716e772a8c9b1340965396d1fd7567f9ee4ae
 EBUILD maxima-5.25.1.ebuild 5043 RMD160 c93f38f247b553a1843d5349392ab9541805f10b SHA1 570d4a429b70eeb2153453e11b81ed683938104e SHA256 f6cbdaaebdfd3ba57116ca246ea3432a8de5f2f837400be76ae857e158325c94
-EBUILD maxima-5.26.0.ebuild 5043 RMD160 d845d17e50552f306c5565f84451420dcaeb62d9 SHA1 f60abec15eb4513c5afe184ac360e52ed52bdd98 SHA256 0a22e75d08dd42b75edb64ba9cd365b53a9a71f1ee7e2ef2bced4fa89c57e57a
-MISC ChangeLog 21357 RMD160 57159c9d2fdb019cac5e7ed35a1750bc95742817 SHA1 e36420940ef7faed46a3688bb0aec115373fc0c0 SHA256 244a54652addc58b5355a8162d63ebf73f14c7abb173cb34a10ce8463e120df8
+EBUILD maxima-5.26.0.ebuild 5118 RMD160 84f7d4dbf9587eba40531f98554559ff7a7964ef SHA1 b3d2456fd1fd651ca3f73fcbac5c0e7d13eef741 SHA256 4e6dfe2748070141d2e791932a8c54fa73ff769e6ebd0d202e9adab36b29374b
+MISC ChangeLog 21503 RMD160 d3f39497a3fe12085eb171dab7a48a002c53049f SHA1 80cb97ce18a45497930ec5f68028a184f3563e2b SHA256 6aac5903e4fc91a7ba96f365ff6ddb02a91236b6b1935552bd4b1894eed6fb7b
 MISC metadata.xml 1316 RMD160 f616e4170cfd0f93edd782cef54524e15b6397dc SHA1 bad6f2ef034339d00611162a31dd579e57fbf2b1 SHA256 c5b7768087c365de73e5fe1458c72155134c0db19d6d9e22527e7dc0c5f99f50
diff --git a/sci-mathematics/maxima/files/maxima-5.26.0-ecls-12.2.1.patch b/sci-mathematics/maxima/files/maxima-5.26.0-ecls-12.2.1.patch
new file mode 100644
index 000000000000..4fde880acf03
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.26.0-ecls-12.2.1.patch
@@ -0,0 +1,8 @@
+diff -r -U1 maxima-5.26.0.orig/src/numerical/slatec/xerprn.lisp maxima-5.26.0/src/numerical/slatec/xerprn.lisp
+--- maxima-5.26.0.orig/src/numerical/slatec/xerprn.lisp	2011-08-01 11:39:52.000000000 +0700
++++ maxima-5.26.0/src/numerical/slatec/xerprn.lisp	2012-02-13 18:49:21.000000000 +0700
+@@ -20,3 +20,3 @@
+ (let* ((newlin "$$"))
+-  (declare (type (simple-array character (2)) newlin) (ignorable newlin))
++  (declare (ignorable newlin))
+   (defun xerprn (prefix npref messg nwrap)
diff --git a/sci-mathematics/maxima/maxima-5.26.0.ebuild b/sci-mathematics/maxima/maxima-5.26.0.ebuild
index 0e23aeb88d79..4d5be82648ba 100644
--- a/sci-mathematics/maxima/maxima-5.26.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.26.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.26.0.ebuild,v 1.1 2011/12/21 07:25:58 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.26.0.ebuild,v 1.2 2012/02/13 13:41:36 grozin Exp $
 
 EAPI=3
 
@@ -117,6 +117,9 @@ src_prepare() {
 	# fix LDFLAGS handling in ecl (#378195)
 	epatch "${FILESDIR}"/${PN}-ecl-ldflags.patch
 
+	# fix the ecls-12.2.1 build
+	epatch "${FILESDIR}"/${P}-ecls-12.2.1.patch
+
 	# bug #343331
 	rm share/Makefile.in || die
 	rm src/Makefile.in || die