A patch to support clozurecl-1.5 added

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

5 files changed, 52 insertions, 30 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 8995c86c639b..22816211d7b8 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,13 @@
 # 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.78 2010/04/24 21:23:45 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.79 2010/05/01 12:18:10 grozin Exp $
+
+*maxima-5.21.1-r1 (01 May 2010)
+
+  01 May 2010; Andrey Grozin <grozin@gentoo.org> -maxima-5.21.1.ebuild,
+  +maxima-5.21.1-r1.ebuild, -files/maxima-5.21.1-clozurecl-1.5.patch,
+  +files/maxima-5.21.1.patch:
+  A patch to support clozurecl-1.5 added
 
 *maxima-5.21.1 (24 Apr 2010)
 
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 6d0a6d02294c..4ac7175861e5 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -2,8 +2,8 @@ AUX 50maxima-gentoo.el 439 RMD160 bdddca04f2232ad764dc6093ba4d0a1b71862879 SHA1
 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-5.21.1-clozurecl-1.5.patch 1065 RMD160 25d42199cdd5d40f31e86323689c2a389665d45f SHA1 38d12f9143e45d65e235800f0ae59d7f8c370369 SHA256 af4bb1f280524dee8fe367dfe18a97f2f68e8740329f6efbc39b8b7c263e7270
 AUX maxima-5.21.1-emacs-version.patch 377 RMD160 36b54a1bac70989c02baa98dd25c6d674882c3cb SHA1 51e9f41225a54e87a5d827afa3f82a95ec7ae251 SHA256 57841a01de59f736515b38f110dbb0d0c451c30f9e0770c246e5ec1c555f2080
+AUX maxima-5.21.1.patch 3399 RMD160 861577bbd3e66c8079cd7084b38d64c123a4c493 SHA1 9c3979c21f350e46631a992a518c2381849d4a35 SHA256 5517fa77ee5430398a54387723a3eeb8226f7c73573dac6ce3fe4e8ccd56b127
 AUX maxima-clozurecl.patch 344 RMD160 721bc62c071025b3d70ea75c0fd78da4845739bf SHA1 c9d881b5bcf335b078fa47cab23bd6bfb230f1f0 SHA256 0565ba0fe102b6f7e835d2543d8e2f4a5580d588f5864918889e62bacfc8c143
 AUX maxima-no-init-files.patch 2626 RMD160 ffc34cc7e1d6ade44b100252233e83aa7e383744 SHA1 97497929054fcf6924ac56006c9c4ad28c7b443d SHA256 58b82fa1cdcc2eafc0f912541b350ae7aec8c492be5f6b0ce2174ae01f399d88
 AUX maxima-xdg-utils.patch 1090 RMD160 964f5d858b7521b5a3794705999a7fcbddd937e2 SHA1 576ff7b80737a60f71d3e5df0c2cf84161c63627 SHA256 99c600c4c7e813305da375a4afa4a5e7ea6aa4ec9f1ecc051b9c913281af53ea
@@ -14,6 +14,6 @@ DIST maxima-5.21.1.tar.gz 21371967 RMD160 8892d142fd59aa756ba77d124340f075a1785b
 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-r2.ebuild 4634 RMD160 f67e491c8580d8a76c071b739ae3513aac6a5468 SHA1 bf319fec2ecc2f56e88a1a0790b8267e71c0598a SHA256 bfb9e1f31426f32bfefecbef9a0e2a2777a5afb7031a9e02777c1244e034d178
-EBUILD maxima-5.21.1.ebuild 4619 RMD160 2fd7f939704254ed8673e856e7da828f3c4eb5dc SHA1 3f13e4e4c3228477610e0c4d3da98d862c7d2438 SHA256 a8d25886fb03ce6fa74fb234c6324657e3de95d5e68d35e45248eb85f758cb8e
-MISC ChangeLog 17479 RMD160 ffb82043b11e226f66a95dc227e057e13f7cab36 SHA1 3c37e5505707fcd136cfad04051049a014440184 SHA256 7a0286e97215b93336e854f8cb5956a9e62d07fff5e80d505fd09d3e49cad913
+EBUILD maxima-5.21.1-r1.ebuild 4568 RMD160 162d31b2bfb5579f044813bc4078177da3523fc4 SHA1 35b11cb007a4ecd53acf97bbea96433947e146c4 SHA256 b7cfa96c9a72090115ae630dbd03c6e770898e0d5f0df9a19dcb6c05a4e3fe0d
+MISC ChangeLog 17726 RMD160 8ededfbf136a8514853c058e1fabe0d76c1bf3b2 SHA1 49c8cad4f8b1e0508f016f86603d9e2b11c2cf18 SHA256 2689066ebfdbe53ec2d2fc6b1eb3d59b4762600b8c983c912302512b165c0524
 MISC metadata.xml 1305 RMD160 f122993d0ee80a6dfdab27259d69301c609aaba0 SHA1 a647a1d994e0f0e54459c13a254d1be27eebffda SHA256 b82b31cf0892ff000778cb002578d135f119a14024ee0b4c5d206381ca3e796a
diff --git a/sci-mathematics/maxima/files/maxima-5.21.1-clozurecl-1.5.patch b/sci-mathematics/maxima/files/maxima-5.21.1-clozurecl-1.5.patch
deleted file mode 100644
index ed64d5f67d6b..000000000000
--- a/sci-mathematics/maxima/files/maxima-5.21.1-clozurecl-1.5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -r -U2 maxima-5.20.1.orig/configure maxima-5.20.1/configure
---- maxima-5.20.1.orig/configure	2009-12-14 04:20:43.000000000 +0100
-+++ maxima-5.20.1/configure	2010-04-24 21:59:24.000000000 +0200
-@@ -2559,5 +2559,5 @@
- fi
- 
--openmcl_default_name=openmcl
-+openmcl_default_name=ccl
- # Check whether --enable-openmcl or --disable-openmcl was given.
- if test "${enable_openmcl+set}" = set; then
-diff -r -U2 maxima-5.20.1.orig/src/maxima-build.lisp maxima-5.20.1/src/maxima-build.lisp
---- maxima-5.20.1.orig/src/maxima-build.lisp	2008-12-30 02:32:33.000000000 +0100
-+++ maxima-5.20.1/src/maxima-build.lisp	2010-04-24 21:54:19.000000000 +0200
-@@ -36,5 +36,5 @@
-   #+allegro (excl:dumplisp :name "binary-acl/maxima.dxl")
-   #+lispworks (hcl:save-image "binary-lispworks/maxima" :restart-function 'cl-user::run)
--  #+ccl (ccl:save-application "binary-openmcl/maxima" :toplevel-function 'cl-user::run))
--
--
-+  #+ccl (ccl:save-application "binary-openmcl/maxima" :toplevel-function
-+   (lambda () (let* ((*read-default-float-format* 'double-float))
-+     (cl-user::run))))
diff --git a/sci-mathematics/maxima/files/maxima-5.21.1.patch b/sci-mathematics/maxima/files/maxima-5.21.1.patch
new file mode 100644
index 000000000000..189fbb97ae33
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.21.1.patch
@@ -0,0 +1,38 @@
+diff -r -U1 maxima-5.21.1.orig/configure maxima-5.21.1/configure
+--- maxima-5.21.1.orig/configure	2010-04-24 18:34:21.000000000 +0200
++++ maxima-5.21.1/configure	2010-04-27 03:37:50.000000000 +0200
+@@ -2560,3 +2560,3 @@
+ 
+-openmcl_default_name=openmcl
++openmcl_default_name=ccl
+ # Check whether --enable-openmcl or --disable-openmcl was given.
+diff -r -U1 maxima-5.21.1.orig/src/maxima.in maxima-5.21.1/src/maxima.in
+--- maxima-5.21.1.orig/src/maxima.in	2009-07-13 17:25:25.000000000 +0200
++++ maxima-5.21.1/src/maxima.in	2010-04-27 03:36:24.000000000 +0200
+@@ -131,5 +131,5 @@
+     if [ "$layout_autotools" = "true" ]; then
+-	exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++	exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+     else
+-	exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++	exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+     fi
+@@ -137,5 +137,5 @@
+     if [ "$layout_autotools" = "true" ]; then
+-	exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++	exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+     else
+-	exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++	exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+     fi
+@@ -156,3 +156,3 @@
+ #        in the function get-application-args in command-line.lisp
+-    exec "@OPENMCL_NAME@" -I "$maxima_image_base.image"  $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++    exec "@OPENMCL_NAME@" -I "$maxima_image_base.image"  $MAXIMA_LISP_OPTIONS -e "(let\* ((\*read-default-float-format\* 'double-float)) (cl-user::run))" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ elif [ "$MAXIMA_LISP" = "ecl" ]; then
+@@ -160,3 +160,3 @@
+ elif [ "$MAXIMA_LISP" = "sbcl" ]; then
+-    exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++    exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ else
+ôÏÌØËÏ × maxima-5.21.1/src: maxima.in.orig
diff --git a/sci-mathematics/maxima/maxima-5.21.1.ebuild b/sci-mathematics/maxima/maxima-5.21.1-r1.ebuild
index 302b74f837c2..45e91bef01d3 100644
--- a/sci-mathematics/maxima/maxima-5.21.1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.21.1-r1.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.21.1.ebuild,v 1.1 2010/04/24 21:23:45 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.21.1-r1.ebuild,v 1.1 2010/05/01 12:18:10 grozin Exp $
 EAPI=2
 inherit eutils elisp-common
 
@@ -100,12 +100,11 @@ src_prepare() {
 	# use xdg-open to view ps, pdf
 	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
 
-	epatch "${FILESDIR}"/${PN}-${NO_INIT_PATCH_PV}-no-init-files.patch
-
+	# Don't use lisp init files
 	# ClozureCL executable name is now ccl
 	# *read-default-float-format* is now bound per-thread
 	# and isn't saved in a heap image
-	epatch "${FILESDIR}"/${P}-clozurecl-1.5.patch
+	epatch "${FILESDIR}"/${P}.patch
 
 	epatch "${FILESDIR}"/${P}-emacs-version.patch