Correcting sbcl workaround (#411453); dont load init file in ccl (#432246, thanks to RCV <reich-cv@yandex.ru>)

(Portage version: 2.2.0_alpha122/cvs/Linux i686)

5 files changed, 35 insertions, 19 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 46cf78f697a4..a0a36729816b 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.99 2012/08/15 16:40:41 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.100 2012/08/25 04:10:19 grozin Exp $
+
+  25 Aug 2012; Andrey Grozin <grozin@gentoo.org> maxima-5.28.0.ebuild,
+  files/maxima-5.28.0-sbcl.patch, files/maxima-5.28.0.patch,
+  +files/maxima-ccl.patch:
+  Correcting sbcl workaround (#411453); dont load init file in ccl (#432246,
+  thanks to RCV <reich-cv@yandex.ru>)
 
 *maxima-5.28.0 (15 Aug 2012)
 
diff --git a/sci-mathematics/maxima/files/maxima-5.28.0-sbcl.patch b/sci-mathematics/maxima/files/maxima-5.28.0-sbcl.patch
index ebb094bfb839..66a583e0adba 100644
--- a/sci-mathematics/maxima/files/maxima-5.28.0-sbcl.patch
+++ b/sci-mathematics/maxima/files/maxima-5.28.0-sbcl.patch
@@ -1,8 +1,8 @@
-diff -r -U1 maxima-5.28.0.orig/src/Makefile.in maxima-5.28.0/src/Makefile.in
---- maxima-5.28.0.orig/src/Makefile.in	2012-08-13 04:21:58.000000000 +0700
-+++ maxima-5.28.0/src/Makefile.in	2012-08-15 18:16:12.000000000 +0700
-@@ -235,3 +235,3 @@
- @SBCL_EXEC_TRUE@SBCL_INST_MAXIMA = $(INSTALL_PROGRAM) $(SBCL_MAXIMA) "$(DESTDIR)$(verpkglibdir)/$(SBCL_MAXIMA)"
--@SBCL_TRUE@EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --eval
-+@SBCL_TRUE@EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --sysinit /dev/null --userinit /dev/null --eval
- @GCL_TRUE@EXECUTEGCL = $(GCL_NAME) -batch -eval
+diff -r -U1 maxima-5.28.0.orig/src/Makefile.am maxima-5.28.0/src/Makefile.am
+--- maxima-5.28.0.orig/src/Makefile.am	2012-06-15 12:21:34.000000000 +0700
++++ maxima-5.28.0/src/Makefile.am	2012-08-25 09:32:26.000000000 +0700
+@@ -199,3 +199,3 @@
+ if SBCL
+-EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --eval
++EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --no-sysinit --no-userinit --eval
+ all-local: sharefiles.mk $(SBCL_MAXIMA)
diff --git a/sci-mathematics/maxima/files/maxima-5.28.0.patch b/sci-mathematics/maxima/files/maxima-5.28.0.patch
index ef20b4979cff..c8bd4191dda8 100644
--- a/sci-mathematics/maxima/files/maxima-5.28.0.patch
+++ b/sci-mathematics/maxima/files/maxima-5.28.0.patch
@@ -1,11 +1,3 @@
-diff -r -U1 maxima-5.28.0.orig/configure.in maxima-5.28.0/configure.in
---- maxima-5.28.0.orig/configure.in	2012-08-12 23:17:53.000000000 +0700
-+++ maxima-5.28.0/configure.in	2012-08-15 21:47:42.000000000 +0700
-@@ -350,3 +350,3 @@
- dnl n.b. openmcl_default_name is hardcoded in "with" message
--openmcl_default_name=openmcl
-+openmcl_default_name=ccl
- AC_ARG_ENABLE(openmcl,
 diff -r -U1 maxima-5.28.0.orig/src/maxima.in maxima-5.28.0/src/maxima.in
 --- maxima-5.28.0.orig/src/maxima.in	2012-06-15 12:21:34.000000000 +0700
 +++ maxima-5.28.0/src/maxima.in	2012-08-15 21:46:37.000000000 +0700
@@ -41,6 +33,14 @@ diff -r -U1 maxima-5.28.0.orig/src/maxima.in maxima-5.28.0/src/maxima.in
 -	    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
+@@ -183,5 +183,5 @@
+     if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+-      exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++      exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+     else
+-      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 --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    fi
 @@ -196,5 +196,5 @@
    if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
 -    exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
diff --git a/sci-mathematics/maxima/files/maxima-ccl.patch b/sci-mathematics/maxima/files/maxima-ccl.patch
new file mode 100644
index 000000000000..6e746740b0af
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-ccl.patch
@@ -0,0 +1,8 @@
+diff -r -U1 maxima-5.28.0.orig/configure.in maxima-5.28.0/configure.in
+--- maxima-5.28.0.orig/configure.in	2012-08-12 23:17:53.000000000 +0700
++++ maxima-5.28.0/configure.in	2012-08-15 21:47:42.000000000 +0700
+@@ -350,3 +350,3 @@
+ dnl n.b. openmcl_default_name is hardcoded in "with" message
+-openmcl_default_name=openmcl
++openmcl_default_name=ccl
+ AC_ARG_ENABLE(openmcl,
diff --git a/sci-mathematics/maxima/maxima-5.28.0.ebuild b/sci-mathematics/maxima/maxima-5.28.0.ebuild
index cd8018f07e92..62fe3722dff1 100644
--- a/sci-mathematics/maxima/maxima-5.28.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.28.0.ebuild
@@ -1,6 +1,6 @@
 # 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.28.0.ebuild,v 1.1 2012/08/15 16:40:41 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.28.0.ebuild,v 1.2 2012/08/25 04:10:19 grozin Exp $
 
 EAPI=3
 
@@ -102,9 +102,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
 
 	# Don't use lisp init files
-	# ClozureCL (former OpenMCL) executable name is ccl
 	epatch "${FILESDIR}"/${P}.patch
 
+	# ClozureCL (former OpenMCL) executable name is ccl
+	epatch "${FILESDIR}"/${PN}-ccl.patch
+
 	# make xmaxima conditional on tk (wish)
 	epatch "${FILESDIR}"/${P}-wish.patch