[gentoo-commits] gentoo-x86 commit in sci-mathematics/maxima/files: maxima-5.24.0-wish.patch maxima-5.24.0.patch maxima-5.19.1-no-init-files.patch maxima-wish.patch

[Andrey Grozin (grozin)]

grozin      11/04/28 19:25:45

  Added:                maxima-5.24.0-wish.patch maxima-5.24.0.patch
  Removed:              maxima-5.19.1-no-init-files.patch maxima-wish.patch
  Log:
  Version bump, closing #364005
  
  (Portage version: 2.2.0_alpha30/cvs/Linux i686)

Revision  Changes    Path
1.1                  sci-mathematics/maxima/files/maxima-5.24.0-wish.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/maxima/files/maxima-5.24.0-wish.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/maxima/files/maxima-5.24.0-wish.patch?rev=1.1&content-type=text/plain

Index: maxima-5.24.0-wish.patch
===================================================================
diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
--- maxima-5.23.1.orig//configure.in	2011-01-15 21:54:46.000000000 +0600
+++ maxima-5.23.1//configure.in	2011-01-16 21:00:16.000000000 +0600
@@ -777,6 +777,11 @@
 	[  --with-wish=<prog>           Use <prog> for Tk wish shell (default wish)],
-	[WISH="${withval}"],
-	[WISH="wish"])
+	[],
+	[with_wish="wish"])
+case "${with_wish}" in
+        no) WISH="none" ;;
+        yes) WISH="wish" ;;
+        *) WISH="${with_wish}" ;;
+esac
 AC_SUBST(WISH)
-
+AM_CONDITIONAL(WANT_TK, test x"${with_wish}" != xno)
 
diff -r -U1 maxima-5.23.1.orig//interfaces/Makefile.am maxima-5.23.1//interfaces/Makefile.am
--- maxima-5.23.1.orig//interfaces/Makefile.am	2004-04-28 23:34:59.000000000 +0700
+++ maxima-5.23.1//interfaces/Makefile.am	2011-01-16 20:41:38.000000000 +0600
@@ -1,2 +1,6 @@
+if WANT_TK
 SUBDIRS = emacs xmaxima
+else
+SUBDIRS = emacs
+endif
 EXTRA_DIST = bin/xmaxima.iss



1.1                  sci-mathematics/maxima/files/maxima-5.24.0.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/maxima/files/maxima-5.24.0.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/maxima/files/maxima-5.24.0.patch?rev=1.1&content-type=text/plain

Index: maxima-5.24.0.patch
===================================================================
diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
--- maxima-5.23.1.orig//configure.in	2011-01-15 21:54:46.000000000 +0600
+++ maxima-5.23.1//configure.in	2011-01-16 19:50:55.000000000 +0600
@@ -294,3 +294,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.23.1.orig//src/maxima.in maxima-5.23.1//src/maxima.in
--- maxima-5.23.1.orig//src/maxima.in	2010-12-05 08:06:03.000000000 +0600
+++ maxima-5.23.1//src/maxima.in	2011-01-16 20:07:27.000000000 +0600
@@ -137,5 +137,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
@@ -147,5 +147,5 @@
 	if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
-	    exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+	    exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
 	else
-	    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"
 	fi
@@ -155,3 +155,3 @@
 	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
@@ -177,3 +177,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