stop xmaxima with clisp from executing 'kill -TERM -1' on exit (Bug #111062)

Package-Manager: portage-2.0.54

5 files changed, 61 insertions, 5 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 9428dc793c07..d78006af7211 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.17 2006/03/15 04:19:34 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.18 2006/04/12 06:16:35 wormo Exp $
+
+  11 Apr 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  maxima-5.9.1-r5.ebuild:
+  stop xmaxima with clisp from executing 'kill -TERM -1' on exit (Bug #111062)
+  and keywording ~ppc (Bug #126254)
 
   15 Mar 2006; Olivier Fisette <ribosome@gentoo.org>
   -maxima-5.9.1-r4.ebuild:
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index d67f2e03f30f..cc05fb07b330 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,9 +1,21 @@
-MD5 0b4c1d7d1db2db9f9c27ed927af1506f ChangeLog 5626
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b81d16cacb806b94d84a2b855f9e85fc ChangeLog 5825
 MD5 6957a9bafd71a24b58e148bb2ee58257 files/50maxima-gentoo.el 346
 MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1 65
 MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1-r5 65
+MD5 801d6f51244585c2fa72877f708e9843 files/maxima-5.9.1-fix-clisp-getpid.patch 473
+MD5 3fdd1a597381634159c90b916ede48ae files/maxima-5.9.1-no-kill-minus-one.patch 871
 MD5 9d2fde2c70ca34c55c220ac2e46fe463 files/maxima-5.9.1-unicode-fix.patch 9157
 MD5 55d928e715074355a442baf0934487de files/maxima-emacs.patch 826
-MD5 65aeae0558c1a592484ff36436d84116 maxima-5.9.1-r5.ebuild 2379
+MD5 f653050981b2fed1501454602f59ad11 maxima-5.9.1-r5.ebuild 2571
 MD5 a5bd93bd68dec962956ea5ed64b5c276 maxima-5.9.1.ebuild 2532
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD4DBQFEPJTP/NoSW7FuNV8RArpGAJQKQ8WjjLNQRPuTC8ubCFhDqiLZAKCTV6wE
+GV5LtW3Po0KRSTIT2TeURQ==
+=tD/L
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/maxima/files/maxima-5.9.1-fix-clisp-getpid.patch b/sci-mathematics/maxima/files/maxima-5.9.1-fix-clisp-getpid.patch
new file mode 100644
index 000000000000..4d4f436215ec
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.9.1-fix-clisp-getpid.patch
@@ -0,0 +1,12 @@
+--- maxima-5.9.1/src/server.lisp.orig	2006-04-06 22:28:19.000000000 -0700
++++ maxima-5.9.1/src/server.lisp	2006-04-06 22:37:00.000000000 -0700
+@@ -70,7 +70,8 @@
+ (deff getpid (symbol-function
+ 	      ;; Decide at load time which function to use.
+ 	      (or (and (memq :unix *features*)
+-		       (find-symbol "PROGRAM-ID" "SYS"))
++           (or (find-symbol "PROCESS-ID" "SYS")
++               (find-symbol "PROGRAM-ID" "SYS")))
+ 		  'getpid-from-environment)))
+ 
+ #+cmu
diff --git a/sci-mathematics/maxima/files/maxima-5.9.1-no-kill-minus-one.patch b/sci-mathematics/maxima/files/maxima-5.9.1-no-kill-minus-one.patch
new file mode 100644
index 000000000000..41cf85598ca3
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.9.1-no-kill-minus-one.patch
@@ -0,0 +1,24 @@
+--- maxima-5.9.1/interfaces/xmaxima/Tkmaxima/RunMaxima.tcl.orig	2004-06-21 15:46:32.000000000 -0700
++++ maxima-5.9.1/interfaces/xmaxima/Tkmaxima/RunMaxima.tcl	2006-04-04 22:33:51.000000000 -0700
+@@ -451,13 +451,18 @@
+ proc CMkill {  signal pid } {
+     global maxima_priv tcl_platform
+ 
+-    # Windows pids can be negative
+     if {[string is int $pid]} {
+-	gui status "Signaling $pid with $signal"
++        # Windows pids can be negative
+ 	if {$tcl_platform(platform) == "windows" } {
++	    gui status "Signaling $pid with $signal"
+ 	    exec $maxima_priv(kill) $signal $pid
+ 	} else {
+-	    exec $maxima_priv(kill) $signal $pid
++            if {$pid > 1} {
++	        gui status "Signaling $pid with $signal"
++		exec $maxima_priv(kill) $signal $pid
++            } else {
++	        gui status "Bad PID $pid!! Refusing to send signal $signal"
++            }
+ 	}
+     }
+ }
diff --git a/sci-mathematics/maxima/maxima-5.9.1-r5.ebuild b/sci-mathematics/maxima/maxima-5.9.1-r5.ebuild
index ce1fd1689754..77e257c0bcb9 100644
--- a/sci-mathematics/maxima/maxima-5.9.1-r5.ebuild
+++ b/sci-mathematics/maxima/maxima-5.9.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.9.1-r5.ebuild,v 1.3 2006/01/29 19:42:31 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.9.1-r5.ebuild,v 1.4 2006/04/12 06:16:35 wormo Exp $
 
 inherit eutils elisp-common
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 AECA"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
 IUSE="cmucl clisp sbcl tetex emacs auctex"
 
 DEPEND="tetex? ( virtual/tetex )
@@ -27,6 +27,9 @@ RDEPEND=">=dev-lang/tk-8.3.3
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}"/maxima-${PV}-unicode-fix.patch
+	# next 2 patches fix xmaxmima-kills-everything problem (Bug #111062)
+	epatch "${FILESDIR}"/maxima-${PV}-fix-clisp-getpid.patch
+	epatch "${FILESDIR}"/maxima-${PV}-no-kill-minus-one.patch
 	cd "${S}"/interfaces/emacs/emaxima
 	epatch "${FILESDIR}"/maxima-emacs.patch
 }