Do not load host lisp init files, see bug #203748. Join xdg patches.

(Portage version: 2.1.4.1)

7 files changed, 86 insertions, 73 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 5a0d7dcedcc5..d0980a5014c6 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.48 2008/02/02 15:39:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.49 2008/02/07 13:22:45 bicatali Exp $
+
+  07 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/maxima-5.13.0-xdg-utils.patch,
+  -files/maxima-5.14.0-xdg-utils.patch, +files/maxima-no-init-files.patch,
+  +files/maxima-xdg-utils.patch, maxima-5.13.0-r1.ebuild,
+  maxima-5.14.0.ebuild:
+  Do not load host lisp init files, see bug #203748. Join xdg patches.
 
   02 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org> maxima-5.14.0.ebuild:
   Fixed default lisp dependency (bug #208515)
diff --git a/sci-mathematics/maxima/files/maxima-5.13.0-xdg-utils.patch b/sci-mathematics/maxima/files/maxima-5.13.0-xdg-utils.patch
deleted file mode 100644
index daeb2b7e78dc..000000000000
--- a/sci-mathematics/maxima/files/maxima-5.13.0-xdg-utils.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -U2 --recursive maxima-5.13.0.orig/interfaces/emacs/misc/bookmode.el maxima-5.13.0/interfaces/emacs/misc/bookmode.el
---- maxima-5.13.0.orig/interfaces/emacs/misc/bookmode.el	2000-05-08 13:09:44.000000000 +0700
-+++ maxima-5.13.0/interfaces/emacs/misc/bookmode.el	2007-08-28 22:45:07.000000000 +0700
-@@ -681,5 +681,5 @@
- 		  (and tem
- 		       (list (concat "View "(nth 1 tem))
--			     'call-process  "ghostview" nil nil nil
-+			     'call-process  "xdg-open" nil nil nil
- 			     (expand-file-name(nth 1 tem))
- 			     ))
-@@ -706,5 +706,5 @@
- 			  (cond ((looking-at "%PS") "")
- 				(t "gzip -dc | "))
--			  "ghostview -")
-+			  "xdg-open -")
- 			 
- 	)))
-diff -U2 --recursive maxima-5.13.0.orig/interfaces/xmaxima/Tkmaxima/Constants.tcl maxima-5.13.0/interfaces/xmaxima/Tkmaxima/Constants.tcl
---- maxima-5.13.0.orig/interfaces/xmaxima/Tkmaxima/Constants.tcl	2006-10-02 05:42:48.000000000 +0700
-+++ maxima-5.13.0/interfaces/xmaxima/Tkmaxima/Constants.tcl	2007-08-28 22:46:44.000000000 +0700
-@@ -144,7 +144,7 @@
-     image/png  netmath
-     image/jpeg netmath
--    application/postscript "ghostview -safer %s"
--    application/pdf "acroread %s"
--    application/x-dvi "xdvi %s"
-+    application/postscript "xdg-open -safer %s"
-+    application/pdf "xdg-open %s"
-+    application/x-dvi "xdg-open %s"
- }
- set maxima_priv(imagecounter) 0
diff --git a/sci-mathematics/maxima/files/maxima-5.14.0-xdg-utils.patch b/sci-mathematics/maxima/files/maxima-5.14.0-xdg-utils.patch
deleted file mode 100644
index 318d60812deb..000000000000
--- a/sci-mathematics/maxima/files/maxima-5.14.0-xdg-utils.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -U2 --recursive maxima-5.14.0.orig/interfaces/emacs/misc/bookmode.el maxima-5.14.0/interfaces/emacs/misc/bookmode.el
---- maxima-5.14.0.orig/interfaces/emacs/misc/bookmode.el	2000-05-08 13:09:44.000000000 +0700
-+++ maxima-5.14.0/interfaces/emacs/misc/bookmode.el	2008-01-07 22:47:57.000000000 +0600
-@@ -681,5 +681,5 @@
- 		  (and tem
- 		       (list (concat "View "(nth 1 tem))
--			     'call-process  "ghostview" nil nil nil
-+			     'call-process  "xdg-open" nil nil nil
- 			     (expand-file-name(nth 1 tem))
- 			     ))
-@@ -706,5 +706,5 @@
- 			  (cond ((looking-at "%PS") "")
- 				(t "gzip -dc | "))
--			  "ghostview -")
-+			  "xdg-open -")
- 			 
- 	)))
-diff -U2 --recursive maxima-5.14.0.orig/interfaces/xmaxima/Tkmaxima/Constants.tcl maxima-5.14.0/interfaces/xmaxima/Tkmaxima/Constants.tcl
---- maxima-5.14.0.orig/interfaces/xmaxima/Tkmaxima/Constants.tcl	2006-10-02 05:42:48.000000000 +0700
-+++ maxima-5.14.0/interfaces/xmaxima/Tkmaxima/Constants.tcl	2008-01-07 22:49:43.000000000 +0600
-@@ -144,7 +144,7 @@
-     image/png  netmath
-     image/jpeg netmath
--    application/postscript "ghostview -safer %s"
--    application/pdf "acroread %s"
--    application/x-dvi "xdvi %s"
-+    application/postscript "xdg-open -safer %s"
-+    application/pdf "xdg-open %s"
-+    application/x-dvi "xdg-open %s"
- }
- set maxima_priv(imagecounter) 0
diff --git a/sci-mathematics/maxima/files/maxima-no-init-files.patch b/sci-mathematics/maxima/files/maxima-no-init-files.patch
new file mode 100644
index 000000000000..2e49a2bad895
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-no-init-files.patch
@@ -0,0 +1,31 @@
+--- src/maxima.in.orig	2008-02-07 11:53:43.006379528 +0000
++++ src/maxima.in	2008-02-07 11:55:02.278897011 +0000
+@@ -111,15 +111,15 @@
+ fi
+ if [ "$MAXIMA_LISP" = "clisp" ]; then
+     if [ "$layout_autotools" = "true" ]; then
+-	exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++	exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+     else
+-	exec "@CLISP_NAME@" -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++	exec "@CLISP_NAME@" -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+     fi
+ elif [ "$MAXIMA_LISP" = "cmucl" ]; then
+     if [ "$layout_autotools" = "true" ]; then
+-	exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" -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@" -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@" -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++	exec "@CMUCL_NAME@" -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+     fi
+ elif [ "$MAXIMA_LISP" = "scl" ]; then
+     if [ "$layout_autotools" = "true" ]; then
+@@ -138,7 +138,7 @@
+ #        in the function get-application-args in command-line.lisp
+     exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ elif [ "$MAXIMA_LISP" = "sbcl" ]; then
+-    exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform --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 --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ else
+     echo "$0: lisp=\"$MAXIMA_LISP\" not known. Use --list-avail to see possible options." >&2
+     exit 1
diff --git a/sci-mathematics/maxima/files/maxima-xdg-utils.patch b/sci-mathematics/maxima/files/maxima-xdg-utils.patch
new file mode 100644
index 000000000000..876fe6fcd469
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-xdg-utils.patch
@@ -0,0 +1,35 @@
+--- interfaces/emacs/misc/bookmode.el.orig	2008-02-07 12:42:18.008472937 +0000
++++ interfaces/emacs/misc/bookmode.el	2008-02-07 12:43:02.531010132 +0000
+@@ -680,7 +680,7 @@
+ 		
+ 		  (and tem
+ 		       (list (concat "View "(nth 1 tem))
+-			     'call-process  "ghostview" nil nil nil
++			     'call-process  "xdg-open" nil nil nil
+ 			     (expand-file-name(nth 1 tem))
+ 			     ))
+ 		  (list "Cancel")
+@@ -705,7 +705,7 @@
+ 			 (concat
+ 			  (cond ((looking-at "%PS") "")
+ 				(t "gzip -dc | "))
+-			  "ghostview -")
++			  "xdg-open -")
+ 			 
+ 	)))
+ 	 
+--- interfaces/xmaxima/Tkmaxima/Constants.tcl.orig	2008-02-07 12:42:47.294141832 +0000
++++ interfaces/xmaxima/Tkmaxima/Constants.tcl	2008-02-07 12:43:02.539010587 +0000
+@@ -143,9 +143,9 @@
+     image/gif  netmath
+     image/png  netmath
+     image/jpeg netmath
+-    application/postscript "ghostview -safer %s"
+-    application/pdf "acroread %s"
+-    application/x-dvi "xdvi %s"
++    application/postscript "xdg-open -safer %s"
++    application/pdf "xdg-open %s"
++    application/x-dvi "xdg-open %s"
+ }
+ set maxima_priv(imagecounter) 0
+ 
diff --git a/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild b/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild
index 2dabc398249c..1b11a929c72a 100644
--- a/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild,v 1.10 2008/01/29 16:50:38 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild,v 1.11 2008/02/07 13:22:45 bicatali Exp $
 
 inherit eutils elisp-common
 
@@ -22,14 +22,14 @@ RDEPEND=">=sci-visualization/gnuplot-4.0
 				app-text/ptex ) )
 	emacs? ( virtual/emacs
 		 latex? ( || ( app-emacs/auctex app-xemacs/auctex ) ) )
-	sbcl? ( <dev-lisp/sbcl-1.0.12 app-misc/rlwrap )
+	sbcl? ( dev-lisp/sbcl app-misc/rlwrap )
 	!sbcl? (
 		clisp? ( dev-lisp/clisp )
 		!clisp? (
 			cmucl? ( >=dev-lisp/cmucl-19a app-misc/rlwrap )
 			!cmucl? (
 				gcl? ( dev-lisp/gcl )
-				!gcl? ( <dev-lisp/sbcl-1.0.12 app-misc/rlwrap )
+				!gcl? ( dev-lisp/sbcl app-misc/rlwrap )
 			)
 		)
 	)
@@ -112,13 +112,16 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 	# use xdg-open to view ps, pdf
-	epatch "${FILESDIR}"/${P}-xdg-utils.patch
+	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
+	# avoid bugs and warning at init (see bug #203748)
+	epatch "${FILESDIR}"/${PN}-no-init-files.patch
 	# remove rmaxima if neither cmucl nor sbcl
 	if [[ ${MAXIMA_LISP} != cmucl ]] || [[ ${MAXIMA_LISP} != sbcl ]]; then
 		sed -i \
 			-e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \
-			"${S}"/src/Makefile.in \
+			src/Makefile.in \
 			|| die "sed for rmaxima failed"
 	fi
 }
diff --git a/sci-mathematics/maxima/maxima-5.14.0.ebuild b/sci-mathematics/maxima/maxima-5.14.0.ebuild
index 2616fb8e1a2a..305f1ff2d32d 100644
--- a/sci-mathematics/maxima/maxima-5.14.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.14.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.14.0.ebuild,v 1.3 2008/02/02 15:39:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.14.0.ebuild,v 1.4 2008/02/07 13:22:45 bicatali Exp $
 inherit eutils elisp-common
 
 DESCRIPTION="Free computer algebra environment based on Macsyma"
@@ -52,9 +52,6 @@ for LISP in ${SUPP_LISPS}; do
 	DEF_DEP="${DEF_DEP} )"
 done
 
-# nasty hack for sbcl while bug #203748 is not fixed
-RDEPEND="${RDEPEND//dev-lisp\/sbcl/<dev-lisp/sbcl-1.0.12}"
-
 RDEPEND="${RDEPEND}
 	${DEF_DEP}"
 
@@ -133,8 +130,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 	# use xdg-open to view ps, pdf
-	epatch "${FILESDIR}"/${P}-xdg-utils.patch
+	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
+	epatch "${FILESDIR}"/${PN}-no-init-files.patch
 	# remove rmaxima if neither cmucl nor sbcl
 	if [ -z "${RL}" ]; then
 		sed -i \