summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2008-02-07 13:22:45 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2008-02-07 13:22:45 +0000
commit41ca3596d2b87b5c62358a294eed40508b384140 (patch)
treef060653c38381cec5a29af521b3e90e2266e5ca1 /sci-mathematics
parentremove old josm ebuilds (diff)
downloadhistorical-41ca3596d2b87b5c62358a294eed40508b384140.tar.gz
historical-41ca3596d2b87b5c62358a294eed40508b384140.tar.bz2
historical-41ca3596d2b87b5c62358a294eed40508b384140.zip
Do not load host lisp init files, see bug #203748. Join xdg patches.
Package-Manager: portage-2.1.4.1
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/maxima/ChangeLog9
-rw-r--r--sci-mathematics/maxima/Manifest16
-rw-r--r--sci-mathematics/maxima/files/maxima-5.13.0-xdg-utils.patch31
-rw-r--r--sci-mathematics/maxima/files/maxima-5.14.0-xdg-utils.patch31
-rw-r--r--sci-mathematics/maxima/files/maxima-no-init-files.patch31
-rw-r--r--sci-mathematics/maxima/files/maxima-xdg-utils.patch35
-rw-r--r--sci-mathematics/maxima/maxima-5.13.0-r1.ebuild13
-rw-r--r--sci-mathematics/maxima/maxima-5.14.0.ebuild9
8 files changed, 94 insertions, 81 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/Manifest b/sci-mathematics/maxima/Manifest
index 7abc59503df9..8e94f7438b8d 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -2,18 +2,18 @@
Hash: SHA1
AUX 50maxima-gentoo.el 600 RMD160 c45cc012987d2a74670ad9aac2b019a1233bd151 SHA1 f05c4ce4f51f2e3d0399fa04de9d8fc8b0296386 SHA256 32cd4c9e958c96e93bb74ee324196efa8f88a90e4508c4c67733c691d6969dfe
-AUX maxima-5.13.0-xdg-utils.patch 1338 RMD160 17ef40d37ff6cc4e0073ef55b8df8c23d6990949 SHA1 660da49ca61fdc7b84339094985f70bb1e5f7001 SHA256 77bd288ebb496689b97955431317ba23d8dc67f6655330194974c0efbba087a0
-AUX maxima-5.14.0-xdg-utils.patch 1338 RMD160 370acd7c49f7470577e842842f343f7f8516eb39 SHA1 7ddf9ecf69103d376410967a0b9c4989426352bf SHA256 8b07245258fd3f3745baecf68555fd03194f7b199754693c55275375cff13160
+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
DIST maxima-5.13.0.tar.gz 19216173 RMD160 2ec91678f8c6a6f863d6ba448f299793e52c822a SHA1 caac53226fa251a22b577c2f76dc171913e71323 SHA256 9625e09785f88f738faf40ad64889acd17328e043c39ef5ad56f3172d76af187
DIST maxima-5.14.0.tar.gz 19349615 RMD160 237f0b103b04f5b663c86a4fcbf2f8c618da45ef SHA1 39a6cbcaae4779d542361224b5139d2ae4773b7a SHA256 0fd0d7af675bafd9ffb31566e837061da47b07fd83e7fe978ac5ce79b2a307a8
-EBUILD maxima-5.13.0-r1.ebuild 5539 RMD160 505d049a96d174479eb9d93cec26171060ec91fb SHA1 28537acd062fcf3db33d485128d12736e6b39be3 SHA256 567a4fd1586bdcee2a2b3af97b3a11e544966b94fda7f22ea3a94a3a4594f832
-EBUILD maxima-5.14.0.ebuild 5912 RMD160 f3ab7063fe162849e45cf2b85a696d8ad7074592 SHA1 00fa3a1f8fb70fccb17879a6193070d12e1a2db3 SHA256 c5ce7f446b69789737324743d6aca69ea39fd9aa079537b0169d6f33b09b6470
-MISC ChangeLog 12506 RMD160 f646b0d129a742bfb1ab7524160ebba0489c8486 SHA1 06bb42240ae1638bc02a303ccf8f73ef9398a3c9 SHA256 6f4fa5363b56cfe7befc0343dd7fd6e97322c6bd04be908da8cd782bce162a09
+EBUILD maxima-5.13.0-r1.ebuild 5628 RMD160 664e1cfca8c9b114d96fa7e107c2e8b678b3c7af SHA1 b67cc267dc60c02ba0f6d95640b8d1a821407e66 SHA256 2e7ea0a784d3f125f40b8029bc63356741e4e231718ade3af8d4ba76ff9c998e
+EBUILD maxima-5.14.0.ebuild 5859 RMD160 ddf933dcc22b03070c6516f8fc8f80d7f9ae4662 SHA1 1bbfb0728cf2ca739cee8a161dcff27b490ee42d SHA256 66d81029653d5f4ffb3d6e063cfc231fe98db28090a23ad20a9ea6c84f4598de
+MISC ChangeLog 12830 RMD160 d1f0ab2af6dcac48f1ada65597fd4db045637233 SHA1 c306f5c69bb2b1eb480bf462a58233103eaec4f2 SHA256 bb8eae2dd7db5a5b5ddab20a7902fdbf79748707866e93bda07241131bec2b67
MISC metadata.xml 737 RMD160 6f833e02ea5b87a66064c32e7c35889c63c96649 SHA1 bff378e387662ce5e4c4168c74ee7ff1493c41a4 SHA256 9deb0b30538b6d35c0877384b97620eda2dde0bf3b4c702ccdadb007e868daef
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFHpI7B1ycZbhPLE2ARAvjKAJ45qDJr5ArsSWQqn7w3UmbJ6SNlwwCcC1W/
-ANlx1BVUHEyxCtqWjNvMu7Q=
-=Kubn
+iD8DBQFHqwYu1ycZbhPLE2ARAj/yAJ9rmbo5ISoxS3CGVtVVX8vHHqnNXACgp4T3
+svA2mQjoqai0I/pqbp6slB4=
+=ZNd0
-----END PGP SIGNATURE-----
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 \