A patch to support clozurecl-1.5 added

(Portage version: 2.2_rc67/cvs/Linux i686)

4 files changed, 49 insertions, 27 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/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