Added patch for ecl-10.4.1

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 95 insertions, 15 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 8b34c4951b63..6850a2f0522c 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.76 2010/03/06 08:49:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.77 2010/04/12 11:58:46 grozin Exp $
+
+*maxima-5.20.1-r2 (12 Apr 2010)
+
+  12 Apr 2010; Andrey Grozin <grozin@gentoo.org> -maxima-5.20.1-r1.ebuild,
+  +maxima-5.20.1-r2.ebuild, +files/maxima-5.20.1-ecl-10.4.1.patch:
+  Added patch for ecl-10.4.1
 
 *maxima-5.20.1-r1 (06 Mar 2010)
 
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index a13bfa4bdd79..124fec3416e7 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50maxima-gentoo.el 439 RMD160 bdddca04f2232ad764dc6093ba4d0a1b71862879 SHA1 8e4394313e0f2a36b8d57b0eac1feb0d7853cee9 SHA256 134313e42f134e51283764e44c9a174a4010b319ac9c31822c2e7051d186de49
 AUX maxima-5.19.1-no-init-files.patch 2805 RMD160 c5932e0da4dcf07510fc98239137e73fab753546 SHA1 82b7069e9362798a6ff5acc7d7875f9aebf9a2c7 SHA256 bb46f6049c34b32c905761b113bc8a99ec7e157bb6730bb0535d8858caba400b
+AUX maxima-5.20.1-ecl-10.4.1.patch 3097 RMD160 695749a1b4f7ac4ca16ad5bc107faec23d614978 SHA1 d0e41205a5e06555f512a58e127ab23f13456359 SHA256 29fbd32e277c626805813f2e432cd6401d597c34bbf72f0c201b9622058a4c3d
 AUX maxima-5.20.1-emacs-version.patch 377 RMD160 36b54a1bac70989c02baa98dd25c6d674882c3cb SHA1 51e9f41225a54e87a5d827afa3f82a95ec7ae251 SHA256 57841a01de59f736515b38f110dbb0d0c451c30f9e0770c246e5ec1c555f2080
 AUX maxima-clozurecl.patch 344 RMD160 721bc62c071025b3d70ea75c0fd78da4845739bf SHA1 c9d881b5bcf335b078fa47cab23bd6bfb230f1f0 SHA256 0565ba0fe102b6f7e835d2543d8e2f4a5580d588f5864918889e62bacfc8c143
 AUX maxima-no-init-files.patch 2626 RMD160 ffc34cc7e1d6ade44b100252233e83aa7e383744 SHA1 97497929054fcf6924ac56006c9c4ad28c7b443d SHA256 58b82fa1cdcc2eafc0f912541b350ae7aec8c492be5f6b0ce2174ae01f399d88
@@ -12,13 +10,6 @@ DIST maxima-5.19.2.tar.gz 20572069 RMD160 648ac2033f8e7c64671d95cb0ff5f0a73c9c11
 DIST maxima-5.20.1.tar.gz 20655669 RMD160 eb4a277f9fdc889132292ef8daf7b7b58143152c SHA1 2e4f1de880dbbaf6f7bf01f807269951a1a3ff49 SHA256 cc2430ad6b895fb730ee2a7b8df4852c2b6d09a5a8bb715bdba783982c470bd9
 EBUILD maxima-5.18.1.ebuild 4200 RMD160 bb72c55e6752c9df03441e315d02fa6c23507347 SHA1 43ebda024310395ebb10e6da8329610cc964a5e2 SHA256 3d326b70d8951163b70c7129c1ec3dbb8af67f1b0d3718662a8d6f723fe361f1
 EBUILD maxima-5.19.2.ebuild 4349 RMD160 1d5d96b26d80aa86f46a22b41967a3b0faa6d7e0 SHA1 91a37a8c838c74fcea8175de71ee53f393f56546 SHA256 7d636ec1966a99b319c42122781dcc37ddbc3d46735dcf7183a1b940fe621237
-EBUILD maxima-5.20.1-r1.ebuild 4525 RMD160 0fa306f56369474b486a8bfc24d4f3f08ada56a0 SHA1 91c7f3494930b4106be443ea73fb7b96b61a27c0 SHA256 c77b639de8424a75d74c35cc92bf0596537681c4e23e313b3ea5327920373e0d
-MISC ChangeLog 17065 RMD160 dc6defe85889cfeba5485d318f99500499acc631 SHA1 d1dfeabdc9cb4e68125745f033880596e7a09adf SHA256 dd6d4e193650c9092b39ca0573d407ae90f5a85311d08226b2d290dd9adb9624
+EBUILD maxima-5.20.1-r2.ebuild 4634 RMD160 f67e491c8580d8a76c071b739ae3513aac6a5468 SHA1 bf319fec2ecc2f56e88a1a0790b8267e71c0598a SHA256 bfb9e1f31426f32bfefecbef9a0e2a2777a5afb7031a9e02777c1244e034d178
+MISC ChangeLog 17273 RMD160 4df1eccd037e5b88dc990dcf59e5fb521d6698e8 SHA1 acc6e425be1e96232546127317f8b3dbbc125e55 SHA256 a2712009883e0716f98cbc8cae9372bd7fffe8c63bea52b1f78b6330ab0ad528
 MISC metadata.xml 1305 RMD160 f122993d0ee80a6dfdab27259d69301c609aaba0 SHA1 a647a1d994e0f0e54459c13a254d1be27eebffda SHA256 b82b31cf0892ff000778cb002578d135f119a14024ee0b4c5d206381ca3e796a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iEYEARECAAYFAkuSF0AACgkQOeoy/oIi7uw+2QCgjtri0r5r/Wniprwu5GMK/mBP
-lScAoOSlquo77BeJzeytv/bg/lvhEVvn
-=TpuR
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/maxima/files/maxima-5.20.1-ecl-10.4.1.patch b/sci-mathematics/maxima/files/maxima-5.20.1-ecl-10.4.1.patch
new file mode 100644
index 000000000000..9f11b2614ad4
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.20.1-ecl-10.4.1.patch
@@ -0,0 +1,80 @@
+diff -u -r maxima-5.20.1/lisp-utils/defsystem.lisp maxima-5.20.1-patched/lisp-utils/defsystem.lisp
+--- maxima-5.20.1/lisp-utils/defsystem.lisp	2009-05-13 10:01:40.000000000 +0200
++++ maxima-5.20.1-patched/lisp-utils/defsystem.lisp	2010-04-04 16:22:53.000000000 +0200
+@@ -871,6 +871,8 @@
+       :cormanlisp
+       :scl
+       :abcl
++      :ccl
++      :ecl
+       (and allegro-version>= (version>= 4 1)))
+ (eval-when #-(or :lucid)
+            (:compile-toplevel :load-toplevel :execute)
+@@ -993,10 +995,10 @@
+ 
+ #+abcl (defpackage make (:use "COMMON-LISP") (:nicknames "MK"))
+ 
+-#+(or clisp cormanlisp ecl (and gcl defpackage) sbcl)
++#+(or clisp cormanlisp ecl (and gcl defpackage) sbcl ccl)
+ (defpackage "MAKE" (:use "COMMON-LISP") (:nicknames "MK"))
+ 
+-#-(or :sbcl :cltl2 :lispworks :ecl :scl :abcl)
++#-(or :sbcl :cltl2 :lispworks :ecl :scl :abcl :ccl)
+ (in-package :make :nicknames '("MK"))
+ 
+ ;;; For CLtL2 compatible lisps...
+@@ -1052,7 +1054,7 @@
+ (eval-when (compile load eval)
+   (in-package :make))
+ 
+-#+(or ecl abcl)
++#+(or ecl abcl ccl)
+ (in-package :make)
+ 
+ ;;; *** Marco Antoniotti <marcoxa@icsi.berkeley.edu> 19970105
+@@ -4127,9 +4129,9 @@
+ (unless *old-require*
+   (setf *old-require*
+ 	(symbol-function
+-	 #-(or (and :excl :allegro-v4.0) :mcl :sbcl :scl :lispworks :abcl) 'lisp:require
++	 #-(or (and :excl :allegro-v4.0) :ecl :mcl :sbcl :scl :lispworks :abcl  :openmcl) 'lisp:require
+ 	 #+(and :excl :allegro-v4.0) 'cltl1:require
+-	 #+(or :sbcl :scl) 'cl:require
++	 #+(or :ecl :sbcl :scl) 'cl:require
+ 	 #+(or :lispworks3.1 :abcl) 'common-lisp::require
+ 	 #+(and :lispworks (not :lispworks3.1)) 'system::require
+ 	 #+:openmcl 'cl:require
+@@ -4139,9 +4141,9 @@
+   (unless *dont-redefine-require*
+     (let (#+(or :mcl (and :CCL (not :lispworks)))
+ 	  (ccl:*warn-if-redefine-kernel* nil))
+-      #-(or (and allegro-version>= (version>= 4 1)) :lispworks)
++      #-(or :ecl (and allegro-version>= (version>= 4 1)) :lispworks)
+       (setf (symbol-function
+-	     #-(or (and :excl :allegro-v4.0) :mcl :sbcl :scl :lispworks :abcl) 'lisp:require
++	     #-(or (and :excl :allegro-v4.0) :mcl :sbcl :scl :lispworks :abcl :openmcl) 'lisp:require
+ 	     #+(and :excl :allegro-v4.0) 'cltl1:require
+ 	     #+(or :lispworks3.1 :abcl) 'common-lisp::require
+ 	     #+(or :sbcl :scl) 'cl:require
+@@ -4150,6 +4152,12 @@
+ 	     #+(and :mcl (not :openmcl)) 'ccl:require
+ 	     )
+ 	    (symbol-function 'new-require))
++      #+:ecl
++      (progn
++        (ext:package-lock "CL" nil)
++        (setf (symbol-function 'lisp:require)
++              (symbol-function 'new-require))
++        (ext:package-lock "CL" t))
+       #+:lispworks
+       (let ((warn-packs system::*packages-for-warn-on-redefinition*))
+ 	(declare (special system::*packages-for-warn-on-redefinition*))
+diff -u -r maxima-5.20.1/src/ecl-port.lisp maxima-5.20.1-patched/src/ecl-port.lisp
+--- maxima-5.20.1/src/ecl-port.lisp	2008-08-10 21:18:07.000000000 +0200
++++ maxima-5.20.1-patched/src/ecl-port.lisp	2010-04-04 16:23:02.000000000 +0200
+@@ -21,3 +21,5 @@
+ 
+ (si::trap-fpe 'floating-point-underflow nil)
+ 
++(ext:package-lock "CL" nil)
++
diff --git a/sci-mathematics/maxima/maxima-5.20.1-r1.ebuild b/sci-mathematics/maxima/maxima-5.20.1-r2.ebuild
index 4b8f12657393..d931fbc18c57 100644
--- a/sci-mathematics/maxima/maxima-5.20.1-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.20.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.20.1-r1.ebuild,v 1.1 2010/03/06 08:49:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.20.1-r2.ebuild,v 1.1 2010/04/12 11:58:46 grozin Exp $
 EAPI=2
 inherit eutils elisp-common
 
@@ -46,7 +46,7 @@ for LISP in ${SUPP_LISPS}; do
 		RDEPEND="${RDEPEND} gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] )"
 	else if [ "${LISP}" = "ecl" ]
 	then
-		RDEPEND="${RDEPEND} ecl? ( >=dev-lisp/ecls-9.8.3 )"
+		RDEPEND="${RDEPEND} ecl? ( >=dev-lisp/ecls-10.4.1 )"
 	else if [ "${LISP}" = "openmcl" ]
 	then
 		RDEPEND="${RDEPEND} openmcl? ( dev-lisp/clozurecl )"
@@ -105,6 +105,9 @@ src_prepare() {
 	# ClozureCL executable name is now ccl
 	epatch "${FILESDIR}"/${PN}-clozurecl.patch
 
+	# see http://osdir.com/ml/sage-devel/2010-04/msg00077.html
+	epatch "${FILESDIR}"/${P}-ecl-10.4.1.patch
+
 	epatch "${FILESDIR}"/${P}-emacs-version.patch
 
 	# remove rmaxima if not needed