Fix maintainer mode, thanks Francois Bissey, bug #343331. Remove old.

Package-Manager: portage-2.1.9.40/cvs/Linux x86_64

14 files changed, 25 insertions, 965 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index a00300cd2fed..498e7c494bba 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.85 2011/01/17 18:05:03 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.86 2011/02/17 17:37:56 bicatali Exp $
+
+  17 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> -maxima-5.19.2.ebuild,
+  -maxima-5.20.1-r2.ebuild, -files/maxima-5.20.1-ecl-10.4.1.patch,
+  -files/maxima-5.20.1-emacs-version.patch, -maxima-5.21.1-r1.ebuild,
+  -files/maxima-5.21.1-emacs-version.patch, -files/maxima-5.21.1.patch,
+  -maxima-5.22.1.ebuild, -files/maxima-5.22.1-emacs-version.patch,
+  -files/maxima-5.22.1.patch, maxima-5.23.2.ebuild,
+  -files/maxima-clozurecl.patch:
+  Fix maintainer mode, thanks Francois Bissey, bug #343331. Remove old.
 
 *maxima-5.23.2 (17 Jan 2011)
 
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 73d5f2c70284..e9ae759ee737 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,31 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50maxima-gentoo.el 439 RMD160 bdddca04f2232ad764dc6093ba4d0a1b71862879 SHA1 8e4394313e0f2a36b8d57b0eac1feb0d7853cee9 SHA256 134313e42f134e51283764e44c9a174a4010b319ac9c31822c2e7051d186de49
 AUX maxima-5.19.1-no-init-files.patch 2805 RMD160 c5932e0da4dcf07510fc98239137e73fab753546 SHA1 82b7069e9362798a6ff5acc7d7875f9aebf9a2c7 SHA256 bb46f6049c34b32c905761b113bc8a99ec7e157bb6730bb0535d8858caba400b
-AUX maxima-5.20.1-ecl-10.4.1.patch 3097 RMD160 695749a1b4f7ac4ca16ad5bc107faec23d614978 SHA1 d0e41205a5e06555f512a58e127ab23f13456359 SHA256 29fbd32e277c626805813f2e432cd6401d597c34bbf72f0c201b9622058a4c3d
-AUX maxima-5.20.1-emacs-version.patch 377 RMD160 36b54a1bac70989c02baa98dd25c6d674882c3cb SHA1 51e9f41225a54e87a5d827afa3f82a95ec7ae251 SHA256 57841a01de59f736515b38f110dbb0d0c451c30f9e0770c246e5ec1c555f2080
-AUX maxima-5.21.1-emacs-version.patch 377 RMD160 36b54a1bac70989c02baa98dd25c6d674882c3cb SHA1 51e9f41225a54e87a5d827afa3f82a95ec7ae251 SHA256 57841a01de59f736515b38f110dbb0d0c451c30f9e0770c246e5ec1c555f2080
-AUX maxima-5.21.1.patch 3399 RMD160 861577bbd3e66c8079cd7084b38d64c123a4c493 SHA1 9c3979c21f350e46631a992a518c2381849d4a35 SHA256 5517fa77ee5430398a54387723a3eeb8226f7c73573dac6ce3fe4e8ccd56b127
-AUX maxima-5.22.1-emacs-version.patch 377 RMD160 36b54a1bac70989c02baa98dd25c6d674882c3cb SHA1 51e9f41225a54e87a5d827afa3f82a95ec7ae251 SHA256 57841a01de59f736515b38f110dbb0d0c451c30f9e0770c246e5ec1c555f2080
-AUX maxima-5.22.1.patch 2910 RMD160 ac7cce89a6e92e5bd269e196b93801742b602114 SHA1 40ab9415a418e72c3cc99e230744952386e5ac81 SHA256 678fe8b4ca2ccef59c33396994922bbdaf93cc05476edc3d3edde1cb10f19e08
 AUX maxima-5.23.2-emacs-version.patch 402 RMD160 b4152ba4f8014106f11365440d14901bc0bba0f4 SHA1 34e8feee04d83619eed298760747966471b205fe SHA256 b6fcdae390a44aafbdf0c64539aacbe38e9b48463c1bc9063a705770ea66d981
 AUX maxima-5.23.2-wish.patch 946 RMD160 d19db10a629a9a9f1fa0799b0be403c8aee090fe SHA1 56f2ad96baed63b27d7c37cfccaf27806a06f20e SHA256 dd535626d5d2d16f249e2c41157f5bbfb030236651d9b0404cc1a69c5fec9e0c
 AUX maxima-5.23.2.patch 3263 RMD160 a3fb37685b9481ed1c17a53f027429656371c586 SHA1 774178e2e3cd265d3f0474b0c38fa1230c583619 SHA256 dd7d02c0eaac5a0763363ed46c207bfb40e55b8470dc3b7c2892753b466a2ea0
-AUX maxima-clozurecl.patch 344 RMD160 721bc62c071025b3d70ea75c0fd78da4845739bf SHA1 c9d881b5bcf335b078fa47cab23bd6bfb230f1f0 SHA256 0565ba0fe102b6f7e835d2543d8e2f4a5580d588f5864918889e62bacfc8c143
 AUX maxima-imaxima.patch 211 RMD160 24e2b10e59ee1fd5f9307dc8e336fa32beeb6de3 SHA1 f77dceec2dcb4503d1ec86cff7ef4d7d65a0c20f SHA256 b1d07af716f477dedfb011cb8c4fdf154d146db5172664865efc1ec025bfa2ce
 AUX maxima-no-init-files.patch 2626 RMD160 ffc34cc7e1d6ade44b100252233e83aa7e383744 SHA1 97497929054fcf6924ac56006c9c4ad28c7b443d SHA256 58b82fa1cdcc2eafc0f912541b350ae7aec8c492be5f6b0ce2174ae01f399d88
 AUX maxima-rmaxima.patch 481 RMD160 b81cf0f5878a1bcb9c12682db8949c2ac8105022 SHA1 a20356e335950d62ba77da4fd4053f43ffef2ecf SHA256 e918a1e2aa01f44518829013b0b6bafb276f7752503bfe43f21dcefadca1f3d6
 AUX maxima-wish.patch 973 RMD160 59ab1be2a73bd8c5eaf096f9de2999c6f10a3206 SHA1 8643be339bf34b70f351f290b21b70f5e77fe497 SHA256 a1a51511f5605aa644f18bc25162acb88211dffb07fca7fe8b7c52d7942960f3
 AUX maxima-xdg-utils.patch 1090 RMD160 964f5d858b7521b5a3794705999a7fcbddd937e2 SHA1 576ff7b80737a60f71d3e5df0c2cf84161c63627 SHA256 99c600c4c7e813305da375a4afa4a5e7ea6aa4ec9f1ecc051b9c913281af53ea
 DIST maxima-5.18.1.tar.gz 20440947 RMD160 a1c0f0978ed85ba79ed9ab4e8bf50cf268f46ebf SHA1 3ed2f97d509a9a407563c097943413cf4df09ed5 SHA256 eef1f70503755ec8fb311a13731044e6fff17e6fd9534eb6bea68a12964d94bf
-DIST maxima-5.19.2.tar.gz 20572069 RMD160 648ac2033f8e7c64671d95cb0ff5f0a73c9c11bb SHA1 10b821d936fc22c16de7933d2b390adbd5e0a001 SHA256 4b9d592cb5c5b49acf10c894aa4e899bd47f079b315ee22542122a2e64589072
-DIST maxima-5.20.1.tar.gz 20655669 RMD160 eb4a277f9fdc889132292ef8daf7b7b58143152c SHA1 2e4f1de880dbbaf6f7bf01f807269951a1a3ff49 SHA256 cc2430ad6b895fb730ee2a7b8df4852c2b6d09a5a8bb715bdba783982c470bd9
-DIST maxima-5.21.1.tar.gz 21371967 RMD160 8892d142fd59aa756ba77d124340f075a1785bac SHA1 f62e0eadfe71f8dcbe2cb717da2baedafe442559 SHA256 1dae887e1787871437d699a6b1acc1c1f7428729487492a07c6a31e26bf53a1b
-DIST maxima-5.22.1.tar.gz 21468277 RMD160 fdadee41f26fbed4d760386752002513059f8485 SHA1 a547321221a37a1a83cb53ed607d3397e7f0722e SHA256 981ae0b0e8b729e649082b1fe99d5a9ee07cfa68962e8d15f5431a95e9d8b969
 DIST maxima-5.23.2.tar.gz 21963705 RMD160 1b5cd22d1dc3dfb72663fe22704e9c006ba9ce9b SHA1 f7300058faf730ce6cf63c18e59ec068df01b4a6 SHA256 7bea62518135caf9ee9afccc1fb9fbc525c9b6bfb8d0614b5bbe4a51e9a1ce74
 EBUILD maxima-5.18.1.ebuild 4200 RMD160 bb72c55e6752c9df03441e315d02fa6c23507347 SHA1 43ebda024310395ebb10e6da8329610cc964a5e2 SHA256 3d326b70d8951163b70c7129c1ec3dbb8af67f1b0d3718662a8d6f723fe361f1
-EBUILD maxima-5.19.2.ebuild 4349 RMD160 1d5d96b26d80aa86f46a22b41967a3b0faa6d7e0 SHA1 91a37a8c838c74fcea8175de71ee53f393f56546 SHA256 7d636ec1966a99b319c42122781dcc37ddbc3d46735dcf7183a1b940fe621237
-EBUILD maxima-5.20.1-r2.ebuild 4730 RMD160 85168a03f6717b98799f76478ffffcd015826c38 SHA1 ad2b45df1183f5f158c9495963b0a7f04a966d4f SHA256 9d06ee18e55d627c78d02ecd524d5d0168f203b1db32b7762dca4c6362b8311c
-EBUILD maxima-5.21.1-r1.ebuild 4666 RMD160 ced13c6036484ca4f585bf7f8bfd3efef349f940 SHA1 d8cb40a71c16577bc6873ab9fe875142a886d381 SHA256 e2082903828a0160eebc40128565d7e379992f57d3d32b2bd9c93c8c8eab6e2c
-EBUILD maxima-5.22.1.ebuild 4432 RMD160 7fbcf425929fd0743cd98d1c5f82cd0f087ca759 SHA1 2384678d94d4358de4053e795aff6f37632fdb25 SHA256 60be686ea30d3bc1c07b124d2e4506d1307d4a0eedebb3706c870d0f35618ae2
-EBUILD maxima-5.23.2.ebuild 4431 RMD160 eb5e94b976b48f3bae8c2cb330e2b6383abeed84 SHA1 7fcdb2179949504f7cd4c9edd7864a072747452d SHA256 acba17f295fc07f598eb2261d9a12ac6e27998a431a6cfe58ff14733a29bcf26
-MISC ChangeLog 19216 RMD160 659d90cc14f877c6cb971715e46596a350499992 SHA1 23e83d473c1eca4ed3029928a8dd455ada947803 SHA256 4d7766f9927300749cb1cf79b1264328f4814c605054b397038ea5167bcc180a
+EBUILD maxima-5.23.2.ebuild 4476 RMD160 6c0a53b9a8c5fab36c236a2ae2567d1c848bad7d SHA1 4b16a15a71a0336b449570edf076d89067041579 SHA256 ce7d21d33d9ab3eb4375480763ab9662777b6ef18bded9b353fcd8d45cef5635
+MISC ChangeLog 19730 RMD160 872f31c438c3e91d7bbb7f963749a1a9a4a789d9 SHA1 3b589bb111745645e99c6d6625d3108569b664b9 SHA256 f610887c677a3f9b3a700b1c493791b4e839fa5e214bd5e95b37e829c0bc82fe
 MISC metadata.xml 1538 RMD160 d8fdc903bc508232d729789ccfb5068b82bebc12 SHA1 1e54225d047c1e0b45df832e37fe5342a8eee70a SHA256 282f77d990621305ef1c88510b0c2a26dfd39806207179e59bab2bdae06eed5c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1dXQQACgkQ1ycZbhPLE2BvcACffs8Nw+P0VdbodIQuRsEzE104
+PFEAnj1m1e8Gx2PL8QksjEs5MWL/cM3g
+=TP3N
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/maxima/files/maxima-5.20.1-ecl-10.4.1.patch b/sci-mathematics/maxima/files/maxima-5.20.1-ecl-10.4.1.patch
deleted file mode 100644
index 9f11b2614ad4..000000000000
--- a/sci-mathematics/maxima/files/maxima-5.20.1-ecl-10.4.1.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -u -r maxima-5.20.1/lisp-utils/defsystem.lisp maxima-5.20.1-patched/lisp-utils/defsystem.lisp
---- maxima-5.20.1/lisp-utils/defsystem.lisp	2009-05-13 10:01:40.000000000 +0200
-+++ maxima-5.20.1-patched/lisp-utils/defsystem.lisp	2010-04-04 16:22:53.000000000 +0200
-@@ -871,6 +871,8 @@
-       :cormanlisp
-       :scl
-       :abcl
-+      :ccl
-+      :ecl
-       (and allegro-version>= (version>= 4 1)))
- (eval-when #-(or :lucid)
-            (:compile-toplevel :load-toplevel :execute)
-@@ -993,10 +995,10 @@
- 
- #+abcl (defpackage make (:use "COMMON-LISP") (:nicknames "MK"))
- 
--#+(or clisp cormanlisp ecl (and gcl defpackage) sbcl)
-+#+(or clisp cormanlisp ecl (and gcl defpackage) sbcl ccl)
- (defpackage "MAKE" (:use "COMMON-LISP") (:nicknames "MK"))
- 
--#-(or :sbcl :cltl2 :lispworks :ecl :scl :abcl)
-+#-(or :sbcl :cltl2 :lispworks :ecl :scl :abcl :ccl)
- (in-package :make :nicknames '("MK"))
- 
- ;;; For CLtL2 compatible lisps...
-@@ -1052,7 +1054,7 @@
- (eval-when (compile load eval)
-   (in-package :make))
- 
--#+(or ecl abcl)
-+#+(or ecl abcl ccl)
- (in-package :make)
- 
- ;;; *** Marco Antoniotti <marcoxa@icsi.berkeley.edu> 19970105
-@@ -4127,9 +4129,9 @@
- (unless *old-require*
-   (setf *old-require*
- 	(symbol-function
--	 #-(or (and :excl :allegro-v4.0) :mcl :sbcl :scl :lispworks :abcl) 'lisp:require
-+	 #-(or (and :excl :allegro-v4.0) :ecl :mcl :sbcl :scl :lispworks :abcl  :openmcl) 'lisp:require
- 	 #+(and :excl :allegro-v4.0) 'cltl1:require
--	 #+(or :sbcl :scl) 'cl:require
-+	 #+(or :ecl :sbcl :scl) 'cl:require
- 	 #+(or :lispworks3.1 :abcl) 'common-lisp::require
- 	 #+(and :lispworks (not :lispworks3.1)) 'system::require
- 	 #+:openmcl 'cl:require
-@@ -4139,9 +4141,9 @@
-   (unless *dont-redefine-require*
-     (let (#+(or :mcl (and :CCL (not :lispworks)))
- 	  (ccl:*warn-if-redefine-kernel* nil))
--      #-(or (and allegro-version>= (version>= 4 1)) :lispworks)
-+      #-(or :ecl (and allegro-version>= (version>= 4 1)) :lispworks)
-       (setf (symbol-function
--	     #-(or (and :excl :allegro-v4.0) :mcl :sbcl :scl :lispworks :abcl) 'lisp:require
-+	     #-(or (and :excl :allegro-v4.0) :mcl :sbcl :scl :lispworks :abcl :openmcl) 'lisp:require
- 	     #+(and :excl :allegro-v4.0) 'cltl1:require
- 	     #+(or :lispworks3.1 :abcl) 'common-lisp::require
- 	     #+(or :sbcl :scl) 'cl:require
-@@ -4150,6 +4152,12 @@
- 	     #+(and :mcl (not :openmcl)) 'ccl:require
- 	     )
- 	    (symbol-function 'new-require))
-+      #+:ecl
-+      (progn
-+        (ext:package-lock "CL" nil)
-+        (setf (symbol-function 'lisp:require)
-+              (symbol-function 'new-require))
-+        (ext:package-lock "CL" t))
-       #+:lispworks
-       (let ((warn-packs system::*packages-for-warn-on-redefinition*))
- 	(declare (special system::*packages-for-warn-on-redefinition*))
-diff -u -r maxima-5.20.1/src/ecl-port.lisp maxima-5.20.1-patched/src/ecl-port.lisp
---- maxima-5.20.1/src/ecl-port.lisp	2008-08-10 21:18:07.000000000 +0200
-+++ maxima-5.20.1-patched/src/ecl-port.lisp	2010-04-04 16:23:02.000000000 +0200
-@@ -21,3 +21,5 @@
- 
- (si::trap-fpe 'floating-point-underflow nil)
- 
-+(ext:package-lock "CL" nil)
-+
diff --git a/sci-mathematics/maxima/files/maxima-5.20.1-emacs-version.patch b/sci-mathematics/maxima/files/maxima-5.20.1-emacs-version.patch
deleted file mode 100644
index d0ab0a5e768d..000000000000
--- a/sci-mathematics/maxima/files/maxima-5.20.1-emacs-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/307349
-
---- maxima-5.20.1-orig/interfaces/emacs/emaxima/maxima.el
-+++ maxima-5.20.1/interfaces/emacs/emaxima/maxima.el
-@@ -2109,6 +2109,7 @@
- ;;; The next functions are from comint.el in cvs emacs
- (if (and
-      (not maxima-running-xemacs)
-+     (<= emacs-major-version 21)
-      (or
-       (< emacs-major-version 21)
-       (< emacs-minor-version 3)))
diff --git a/sci-mathematics/maxima/files/maxima-5.21.1-emacs-version.patch b/sci-mathematics/maxima/files/maxima-5.21.1-emacs-version.patch
deleted file mode 100644
index d0ab0a5e768d..000000000000
--- a/sci-mathematics/maxima/files/maxima-5.21.1-emacs-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/307349
-
---- maxima-5.20.1-orig/interfaces/emacs/emaxima/maxima.el
-+++ maxima-5.20.1/interfaces/emacs/emaxima/maxima.el
-@@ -2109,6 +2109,7 @@
- ;;; The next functions are from comint.el in cvs emacs
- (if (and
-      (not maxima-running-xemacs)
-+     (<= emacs-major-version 21)
-      (or
-       (< emacs-major-version 21)
-       (< emacs-minor-version 3)))
diff --git a/sci-mathematics/maxima/files/maxima-5.21.1.patch b/sci-mathematics/maxima/files/maxima-5.21.1.patch
deleted file mode 100644
index 189fbb97ae33..000000000000
--- a/sci-mathematics/maxima/files/maxima-5.21.1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -r -U1 maxima-5.21.1.orig/configure maxima-5.21.1/configure
---- maxima-5.21.1.orig/configure	2010-04-24 18:34:21.000000000 +0200
-+++ maxima-5.21.1/configure	2010-04-27 03:37:50.000000000 +0200
-@@ -2560,3 +2560,3 @@
- 
--openmcl_default_name=openmcl
-+openmcl_default_name=ccl
- # Check whether --enable-openmcl or --disable-openmcl was given.
-diff -r -U1 maxima-5.21.1.orig/src/maxima.in maxima-5.21.1/src/maxima.in
---- maxima-5.21.1.orig/src/maxima.in	2009-07-13 17:25:25.000000000 +0200
-+++ maxima-5.21.1/src/maxima.in	2010-04-27 03:36:24.000000000 +0200
-@@ -131,5 +131,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
-@@ -137,5 +137,5 @@
-     if [ "$layout_autotools" = "true" ]; then
--	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"
-     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
-@@ -156,3 +156,3 @@
- #        in the function get-application-args in command-line.lisp
--    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 -e "(let\* ((\*read-default-float-format\* 'double-float)) (cl-user::run))" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
- elif [ "$MAXIMA_LISP" = "ecl" ]; then
-@@ -160,3 +160,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
-ôÏÌØËÏ × maxima-5.21.1/src: maxima.in.orig
diff --git a/sci-mathematics/maxima/files/maxima-5.22.1-emacs-version.patch b/sci-mathematics/maxima/files/maxima-5.22.1-emacs-version.patch
deleted file mode 100644
index d0ab0a5e768d..000000000000
--- a/sci-mathematics/maxima/files/maxima-5.22.1-emacs-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/307349
-
---- maxima-5.20.1-orig/interfaces/emacs/emaxima/maxima.el
-+++ maxima-5.20.1/interfaces/emacs/emaxima/maxima.el
-@@ -2109,6 +2109,7 @@
- ;;; The next functions are from comint.el in cvs emacs
- (if (and
-      (not maxima-running-xemacs)
-+     (<= emacs-major-version 21)
-      (or
-       (< emacs-major-version 21)
-       (< emacs-minor-version 3)))
diff --git a/sci-mathematics/maxima/files/maxima-5.22.1.patch b/sci-mathematics/maxima/files/maxima-5.22.1.patch
deleted file mode 100644
index 9f6920a0b3b7..000000000000
--- a/sci-mathematics/maxima/files/maxima-5.22.1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -U1 -r maxima-5.22.1.orig//configure.in maxima-5.22.1//configure.in
---- maxima-5.22.1.orig//configure.in	2010-08-12 10:21:49.000000000 +0700
-+++ maxima-5.22.1//configure.in	2010-09-17 23:20:49.000000000 +0700
-@@ -276,3 +276,3 @@
- dnl n.b. openmcl_default_name is hardcoded in "with" message
--openmcl_default_name=openmcl
-+openmcl_default_name=ccl
- AC_ARG_ENABLE(openmcl,[  --enable-openmcl                 Use OpenMCL],
-diff -U1 -r maxima-5.22.1.orig//src/maxima.in maxima-5.22.1//src/maxima.in
---- maxima-5.22.1.orig//src/maxima.in	2010-08-01 23:58:57.000000000 +0700
-+++ maxima-5.22.1//src/maxima.in	2010-09-17 23:10:40.000000000 +0700
-@@ -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
-@@ -143,5 +143,5 @@
-     if [ "$layout_autotools" = "true" ]; then
--	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"
-     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
-@@ -166,3 +166,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
diff --git a/sci-mathematics/maxima/files/maxima-clozurecl.patch b/sci-mathematics/maxima/files/maxima-clozurecl.patch
deleted file mode 100644
index 79cdb7a82d33..000000000000
--- a/sci-mathematics/maxima/files/maxima-clozurecl.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -U1 maxima-5.20.1.orig/configure maxima-5.20.1/configure
---- maxima-5.20.1.orig/configure	2009-12-14 09:20:43.000000000 +0600
-+++ maxima-5.20.1/configure	2009-12-17 23:00:13.000000000 +0600
-@@ -2560,3 +2560,3 @@
- 
--openmcl_default_name=openmcl
-+openmcl_default_name=ccl
- # Check whether --enable-openmcl or --disable-openmcl was given.
diff --git a/sci-mathematics/maxima/maxima-5.19.2.ebuild b/sci-mathematics/maxima/maxima-5.19.2.ebuild
deleted file mode 100644
index 4e8a3790b6da..000000000000
--- a/sci-mathematics/maxima/maxima-5.19.2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.19.2.ebuild,v 1.2 2010/01/14 01:00:04 bicatali Exp $
-EAPI=2
-inherit eutils elisp-common
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-# Supported lisps with readline
-SUPP_RL="gcl clisp"
-# Supported lisps without readline
-SUPP_NORL="cmucl sbcl ecl"
-SUPP_LISPS="${SUPP_RL} ${SUPP_NORL}"
-# Default lisp if none selected
-DEF_LISP="sbcl"
-
-IUSE="latex emacs tk nls unicode xemacs X ${SUPP_LISPS} ${IUSE}"
-
-# Languages
-LANGS="es pt pt_BR"
-for lang in ${LANGS}; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-RDEPEND="X? ( x11-misc/xdg-utils
-		 sci-visualization/gnuplot[gd]
-		 tk? ( dev-lang/tk ) )
-	latex? ( virtual/latex-base )
-	emacs? ( virtual/emacs
-		latex? ( app-emacs/auctex ) )
-	xemacs? ( app-editors/xemacs
-		latex? ( app-emacs/auctex ) )"
-
-PDEPEND="emacs? ( app-emacs/imaxima )"
-
-# create lisp dependencies
-for LISP in ${SUPP_LISPS}; do
-	if [ "${LISP}" = "gcl" ]
-	then
-		RDEPEND="${RDEPEND} gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] )"
-	else if [ "${LISP}" = "ecl" ]
-	then
-		RDEPEND="${RDEPEND} ecl? ( >=dev-lisp/ecls-9.8.3 )"
-	else
-		RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP} )"
-	fi
-	fi
-	DEF_DEP="${DEF_DEP} !${LISP}? ( "
-done
-DEF_DEP="${DEF_DEP} dev-lisp/${DEF_LISP}"
-for LISP in ${SUPP_NORL}; do
-	RDEPEND="${RDEPEND} ${LISP}? ( app-misc/rlwrap )"
-	[[ ${LISP} = ${DEF_LISP} ]] && \
-		DEF_DEP="${DEF_DEP} app-misc/rlwrap"
-done
-for LISP in ${SUPP_LISPS}; do
-	DEF_DEP="${DEF_DEP} )"
-done
-
-RDEPEND="${RDEPEND}
-	${DEF_DEP}"
-
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-TEXMF=/usr/share/texmf-site
-NO_INIT_PATCH_PV="5.19.1"
-
-pkg_setup() {
-	LISPS=""
-
-	for LISP in ${SUPP_LISPS}; do
-		use ${LISP} && LISPS="${LISPS} ${LISP}"
-	done
-
-	RL=""
-
-	for LISP in ${SUPP_NORL}; do
-		use ${LISP} && RL="yes"
-	done
-
-	if [ -z "${LISPS}" ]; then
-		ewarn "No lisp specified in USE flags, choosing ${DEF_LISP} as default"
-		LISPS="${DEF_LISP}"
-		RL="yes"
-	fi
-}
-
-src_prepare() {
-	# use xdg-open to view ps, pdf
-	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
-	epatch "${FILESDIR}"/${PN}-${NO_INIT_PATCH_PV}-no-init-files.patch
-	# remove rmaxima if neither cmucl nor sbcl
-	if [ -z "${RL}" ]; then
-		sed -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \
-			-i "${S}"/src/Makefile.in \
-			|| die "sed for rmaxima failed"
-	fi
-	# don't install imaxima, since we have a separate package for it
-	sed -i -e '/^SUBDIRS/s/imaxima//' interfaces/emacs/Makefile.in \
-		|| die "sed for imaxima failed"
-}
-
-src_configure() {
-	local myconf=""
-	for LISP in ${LISPS}; do
-		myconf="${myconf} --enable-${LISP}"
-	done
-
-	# remove xmaxima if no tk
-	if use tk; then
-		myconf="${myconf} --with-wish=wish"
-	else
-		myconf="${myconf} --with-wish=none"
-		sed -i \
-			-e '/^SUBDIRS/s/xmaxima//' \
-			interfaces/Makefile.in || die "sed for tk failed"
-	fi
-
-	# enable existing translated doc
-	if use nls; then
-		for lang in ${LANGS}; do
-			if use "linguas_${lang}"; then
-				myconf="${myconf} --enable-lang-${lang}"
-				use unicode && myconf="${myconf} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	einstall emacsdir="${D}${SITELISP}/${PN}" || die "einstall failed"
-
-	use tk && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
-		"Science;Math;Education"
-
-	if use latex; then
-		insinto ${TEXMF}/tex/latex/emaxima
-		doins interfaces/emacs/emaxima/emaxima.sty
-	fi
-
-	# do not use dodoc because interfaces can't read compressed files
-	# read COPYING before attempt to remove it from dodoc
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS COPYING README README.lisps || die
-	dodir /usr/share/doc
-	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
-	fi
-}
-
-pkg_preinst() {
-	# some lisps do not read compress info files (bug #176411)
-	for infofile in "${D}"/usr/share/info/*.bz2 ; do
-		bunzip2 "${infofile}"
-	done
-	for infofile in "${D}"/usr/share/info/*.gz ; do
-		gunzip "${infofile}"
-	done
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use latex && mktexlsr
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/maxima/maxima-5.20.1-r2.ebuild b/sci-mathematics/maxima/maxima-5.20.1-r2.ebuild
deleted file mode 100644
index 362c2e7d1f11..000000000000
--- a/sci-mathematics/maxima/maxima-5.20.1-r2.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.20.1-r2.ebuild,v 1.2 2010/10/31 19:17:41 grobian Exp $
-EAPI=3
-inherit eutils elisp-common
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64  ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-# Supported lisps with readline
-SUPP_RL="gcl clisp"
-# Supported lisps without readline
-SUPP_NORL="cmucl sbcl ecl openmcl"
-SUPP_LISPS="${SUPP_RL} ${SUPP_NORL}"
-# Default lisp if none selected
-DEF_LISP="sbcl"
-
-IUSE="latex emacs tk nls unicode xemacs X ${SUPP_LISPS} ${IUSE}"
-
-# Languages
-LANGS="es pt pt_BR"
-for lang in ${LANGS}; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-RDEPEND="X? ( x11-misc/xdg-utils
-		 sci-visualization/gnuplot[gd]
-		 tk? ( dev-lang/tk ) )
-	latex? ( virtual/latex-base )
-	emacs? ( virtual/emacs
-		latex? ( app-emacs/auctex ) )
-	xemacs? ( app-editors/xemacs
-		latex? ( app-emacs/auctex ) )"
-
-PDEPEND="emacs? ( app-emacs/imaxima )"
-
-# create lisp dependencies
-for LISP in ${SUPP_LISPS}; do
-	if [ "${LISP}" = "gcl" ]
-	then
-		RDEPEND="${RDEPEND} gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] )"
-	else if [ "${LISP}" = "ecl" ]
-	then
-		RDEPEND="${RDEPEND} ecl? ( >=dev-lisp/ecls-10.4.1 )"
-	else if [ "${LISP}" = "openmcl" ]
-	then
-		RDEPEND="${RDEPEND} openmcl? ( dev-lisp/clozurecl )"
-	else
-		RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP} )"
-	fi
-	fi
-	fi
-	DEF_DEP="${DEF_DEP} !${LISP}? ( "
-done
-DEF_DEP="${DEF_DEP} dev-lisp/${DEF_LISP}"
-for LISP in ${SUPP_NORL}; do
-	RDEPEND="${RDEPEND} ${LISP}? ( app-misc/rlwrap )"
-	[[ ${LISP} = ${DEF_LISP} ]] && \
-		DEF_DEP="${DEF_DEP} app-misc/rlwrap"
-done
-for LISP in ${SUPP_LISPS}; do
-	DEF_DEP="${DEF_DEP} )"
-done
-
-RDEPEND="${RDEPEND}
-	${DEF_DEP}"
-
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-NO_INIT_PATCH_PV="5.19.1"
-
-pkg_setup() {
-	LISPS=""
-
-	for LISP in ${SUPP_LISPS}; do
-		use ${LISP} && LISPS="${LISPS} ${LISP}"
-	done
-
-	RL=""
-
-	for LISP in ${SUPP_NORL}; do
-		use ${LISP} && RL="yes"
-	done
-
-	if [ -z "${LISPS}" ]; then
-		ewarn "No lisp specified in USE flags, choosing ${DEF_LISP} as default"
-		LISPS="${DEF_LISP}"
-		RL="yes"
-	fi
-}
-
-src_prepare() {
-	# use xdg-open to view ps, pdf
-	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
-
-	epatch "${FILESDIR}"/${PN}-${NO_INIT_PATCH_PV}-no-init-files.patch
-
-	# ClozureCL executable name is now ccl
-	epatch "${FILESDIR}"/${PN}-clozurecl.patch
-
-	# see http://osdir.com/ml/sage-devel/2010-04/msg00077.html
-	epatch "${FILESDIR}"/${P}-ecl-10.4.1.patch
-
-	epatch "${FILESDIR}"/${P}-emacs-version.patch
-
-	# remove rmaxima if not needed
-	if [ -z "${RL}" ]; then
-		sed -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \
-			-i "${S}"/src/Makefile.in \
-			|| die "sed for rmaxima failed"
-	fi
-
-	# don't install imaxima, since we have a separate package for it
-	sed -i -e '/^SUBDIRS/s/imaxima//' interfaces/emacs/Makefile.in \
-		|| die "sed for imaxima failed"
-}
-
-src_configure() {
-	local myconf=""
-	for LISP in ${LISPS}; do
-		myconf="${myconf} --enable-${LISP}"
-	done
-
-	# remove xmaxima if no tk
-	if use tk; then
-		myconf="${myconf} --with-wish=wish"
-	else
-		myconf="${myconf} --with-wish=none"
-		sed -i \
-			-e '/^SUBDIRS/s/xmaxima//' \
-			interfaces/Makefile.in || die "sed for tk failed"
-	fi
-
-	# enable existing translated doc
-	if use nls; then
-		for lang in ${LANGS}; do
-			if use "linguas_${lang}"; then
-				myconf="${myconf} --enable-lang-${lang}"
-				use unicode && myconf="${myconf} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	econf ${myconf} --with-lispdir="${SITELISP}/${PN}"
-}
-
-src_install() {
-	einstall emacsdir="${ED}${SITELISP}/${PN}" || die "einstall failed"
-
-	use tk && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
-		"Science;Math;Education"
-
-	if use latex; then
-		insinto ${TEXMF}/tex/latex/emaxima
-		doins interfaces/emacs/emaxima/emaxima.sty
-	fi
-
-	# do not use dodoc because interfaces can't read compressed files
-	# read COPYING before attempt to remove it from dodoc
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS COPYING README README.lisps || die
-	dodir /usr/share/doc
-	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
-	fi
-}
-
-pkg_preinst() {
-	# some lisps do not read compress info files (bug #176411)
-	for infofile in "${ED}"/usr/share/info/*.bz2 ; do
-		bunzip2 "${infofile}"
-	done
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use latex && mktexlsr
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use latex && mktexlsr
-}
diff --git a/sci-mathematics/maxima/maxima-5.21.1-r1.ebuild b/sci-mathematics/maxima/maxima-5.21.1-r1.ebuild
deleted file mode 100644
index 3ef8dcfb9eff..000000000000
--- a/sci-mathematics/maxima/maxima-5.21.1-r1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.21.1-r1.ebuild,v 1.3 2010/09/14 17:26:32 bicatali Exp $
-
-EAPI=3
-
-inherit eutils elisp-common
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-# Supported lisps with readline
-SUPP_RL="gcl clisp"
-# Supported lisps without readline
-SUPP_NORL="cmucl sbcl ecl openmcl"
-SUPP_LISPS="${SUPP_RL} ${SUPP_NORL}"
-# Default lisp if none selected
-DEF_LISP="sbcl"
-
-IUSE="latex emacs tk nls unicode xemacs X ${SUPP_LISPS} ${IUSE}"
-
-# Languages
-LANGS="es pt pt_BR"
-for lang in ${LANGS}; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-RDEPEND="X? ( x11-misc/xdg-utils
-		 sci-visualization/gnuplot[gd]
-		 tk? ( dev-lang/tk ) )
-	latex? ( virtual/latex-base )
-	emacs? ( virtual/emacs
-		latex? ( app-emacs/auctex ) )
-	xemacs? ( app-editors/xemacs
-		latex? ( app-emacs/auctex ) )"
-
-PDEPEND="emacs? ( app-emacs/imaxima )"
-
-# create lisp dependencies
-for LISP in ${SUPP_LISPS}; do
-	if [ "${LISP}" = "gcl" ]
-	then
-		RDEPEND="${RDEPEND} gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] )"
-	else if [ "${LISP}" = "ecl" ]
-	then
-		RDEPEND="${RDEPEND} ecl? ( >=dev-lisp/ecls-10.4.1 )"
-	else if [ "${LISP}" = "openmcl" ]
-	then
-		RDEPEND="${RDEPEND} openmcl? ( dev-lisp/clozurecl )"
-	else
-		RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP} )"
-	fi
-	fi
-	fi
-	DEF_DEP="${DEF_DEP} !${LISP}? ( "
-done
-DEF_DEP="${DEF_DEP} dev-lisp/${DEF_LISP}"
-for LISP in ${SUPP_NORL}; do
-	RDEPEND="${RDEPEND} ${LISP}? ( app-misc/rlwrap )"
-	[[ ${LISP} = ${DEF_LISP} ]] && \
-		DEF_DEP="${DEF_DEP} app-misc/rlwrap"
-done
-for LISP in ${SUPP_LISPS}; do
-	DEF_DEP="${DEF_DEP} )"
-done
-
-RDEPEND="${RDEPEND}
-	${DEF_DEP}"
-
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-NO_INIT_PATCH_PV="5.19.1"
-
-pkg_setup() {
-	LISPS=""
-
-	for LISP in ${SUPP_LISPS}; do
-		use ${LISP} && LISPS="${LISPS} ${LISP}"
-	done
-
-	RL=""
-
-	for LISP in ${SUPP_NORL}; do
-		use ${LISP} && RL="yes"
-	done
-
-	if [ -z "${LISPS}" ]; then
-		ewarn "No lisp specified in USE flags, choosing ${DEF_LISP} as default"
-		LISPS="${DEF_LISP}"
-		RL="yes"
-	fi
-}
-
-src_prepare() {
-	# use xdg-open to view ps, pdf
-	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
-
-	# Don't use lisp init files
-	# ClozureCL executable name is now ccl
-	# *read-default-float-format* is now bound per-thread
-	# and isn't saved in a heap image
-	epatch "${FILESDIR}"/${P}.patch
-
-	epatch "${FILESDIR}"/${P}-emacs-version.patch
-
-	# remove rmaxima if not needed
-	if [ -z "${RL}" ]; then
-		sed -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \
-			-i "${S}"/src/Makefile.in \
-			|| die "sed for rmaxima failed"
-	fi
-
-	# don't install imaxima, since we have a separate package for it
-	sed -i -e '/^SUBDIRS/s/imaxima//' interfaces/emacs/Makefile.in \
-		|| die "sed for imaxima failed"
-}
-
-src_configure() {
-	local myconf=""
-	for LISP in ${LISPS}; do
-		myconf="${myconf} --enable-${LISP}"
-	done
-
-	# remove xmaxima if no tk
-	if use tk; then
-		myconf="${myconf} --with-wish=wish"
-	else
-		myconf="${myconf} --with-wish=none"
-		sed -i \
-			-e '/^SUBDIRS/s/xmaxima//' \
-			interfaces/Makefile.in || die "sed for tk failed"
-	fi
-
-	# enable existing translated doc
-	if use nls; then
-		for lang in ${LANGS}; do
-			if use "linguas_${lang}"; then
-				myconf="${myconf} --enable-lang-${lang}"
-				use unicode && myconf="${myconf} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	econf ${myconf} --with-lispdir="${SITELISP}/${PN}"
-}
-
-src_install() {
-	einstall emacsdir="${ED}${SITELISP}/${PN}" || die "einstall failed"
-
-	use tk && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
-		"Science;Math;Education"
-
-	if use latex; then
-		insinto ${TEXMF}/tex/latex/emaxima
-		doins interfaces/emacs/emaxima/emaxima.sty
-	fi
-
-	# do not use dodoc because interfaces can't read compressed files
-	# read COPYING before attempt to remove it from dodoc
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS COPYING README README.lisps || die
-	dodir /usr/share/doc
-	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
-	fi
-}
-
-pkg_preinst() {
-	# some lisps do not read compress info files (bug #176411)
-	for infofile in "${ED}"/usr/share/info/*.bz2 ; do
-		bunzip2 "${infofile}"
-	done
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use latex && mktexlsr
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use latex && mktexlsr
-}
diff --git a/sci-mathematics/maxima/maxima-5.22.1.ebuild b/sci-mathematics/maxima/maxima-5.22.1.ebuild
deleted file mode 100644
index a3b564aa36bc..000000000000
--- a/sci-mathematics/maxima/maxima-5.22.1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.22.1.ebuild,v 1.1 2010/09/17 11:23:55 grozin Exp $
-
-EAPI=3
-
-inherit autotools elisp-common
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-# Supported lisps (the first one is the default)
-LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
-# . - just dev-lisp/<lisp>, <version> - >= dev-lisp/<lisp>-<version>
-MIN_VER=(   .    .     2.6.8_pre[ansi] 10   .         .     )
-# <lisp> supports readline: . - no, y - yes
-SUPP_RL=(   .    .     y               .    .         y     )
-# . - just --enable-<lisp>, <flag> - --enable-<flag>
-CONF_FLAG=( .    .     .               ecl  ccl       .     )
-
-IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}"
-
-# Languages
-LANGS="es pt pt_BR"
-for lang in ${LANGS}; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-RDEPEND="X? ( x11-misc/xdg-utils
-		 sci-visualization/gnuplot[gd]
-		 tk? ( dev-lang/tk ) )
-	latex? ( virtual/latex-base )
-	emacs? ( virtual/emacs
-		latex? ( app-emacs/auctex ) )
-	xemacs? ( app-editors/xemacs
-		latex? ( app-emacs/auctex ) )"
-
-PDEPEND="emacs? ( app-emacs/imaxima )"
-
-# generating lisp dependencies
-depends() {
-	local LISP DEP
-	LISP=${LISPS[$1]}
-	DEP=${MIN_VER[$1]}
-	if [ "${DEP}" = "." ]; then
-		DEP="dev-lisp/${LISP}"
-	else
-		DEP=">=dev-lisp/${LISP}-${DEP}"
-	fi
-	if [ "${SUPP_RL[$1]}" = "." ]; then
-		DEP="${DEP} app-misc/rlwrap"
-	fi
-	echo ${DEP}
-}
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
-	LISP=${LISPS[${n}]}
-	RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
-	if (( ${n} > 0 )); then
-		DEF_DEP="${DEF_DEP} !${LISP}? ( "
-	fi
-done
-
-DEF_DEP="${DEF_DEP} `depends 0`"
-
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	DEF_DEP="${DEF_DEP} )"
-done
-
-unset LISP
-
-RDEPEND="${RDEPEND}
-	${DEF_DEP}"
-
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-
-pkg_setup() {
-	local n=${#LISPS[*]}
-
-	for ((n--; n >= 0; n--)); do
-		use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
-	done
-
-	if [ -z "${NLISPS}" ]; then
-		ewarn "No lisp specified in USE flags, choosing ${LISPS[0]} as default"
-		NLISPS=0
-	fi
-}
-
-src_prepare() {
-	# use xdg-open to view ps, pdf
-	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
-
-	# Don't use lisp init files
-	# ClozureCL (former OpenMCL) executable name is ccl
-	epatch "${FILESDIR}"/${P}.patch
-
-	# make xmaxima conditional on tk (wish)
-	epatch "${FILESDIR}"/${PN}-wish.patch
-
-	# don't install imaxima, since we have a separate package for it
-	epatch "${FILESDIR}"/${PN}-imaxima.patch
-
-	# remove rmaxima if not needed
-	epatch "${FILESDIR}/${PN}-rmaxima.patch"
-
-	epatch "${FILESDIR}"/${P}-emacs-version.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local CONFS CONF n lang
-	for n in ${NLISPS}; do
-		CONF=${CONF_FLAG[${n}]}
-		if [ ${CONF} = . ]; then
-			CONF=${LISPS[${n}]}
-		fi
-		CONFS="${CONFS} --enable-${CONF}"
-	done
-
-	# enable existing translated doc
-	if use nls; then
-		for lang in ${LANGS}; do
-			if use "linguas_${lang}"; then
-				CONFS="${CONFS} --enable-lang-${lang}"
-				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	econf ${CONFS} $(use_with tk wish) --with-lispdir="${SITELISP}"/${PN}
-}
-
-src_install() {
-	einstall emacsdir="${ED}${SITELISP}/${PN}" || die "einstall failed"
-
-	use tk && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
-		"Science;Math;Education"
-
-	if use latex; then
-		insinto ${TEXMF}/tex/latex/emaxima
-		doins interfaces/emacs/emaxima/emaxima.sty
-	fi
-
-	# do not use dodoc because interfaces can't read compressed files
-	# read COPYING before attempt to remove it from dodoc
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS COPYING README README.lisps || die
-	dodir /usr/share/doc
-	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
-	fi
-}
-
-pkg_preinst() {
-	# some lisps do not read compress info files (bug #176411)
-	local infofile
-	for infofile in "${ED}"/usr/share/info/*.bz2 ; do
-		bunzip2 "${infofile}"
-	done
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use latex && mktexlsr
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use latex && mktexlsr
-}
diff --git a/sci-mathematics/maxima/maxima-5.23.2.ebuild b/sci-mathematics/maxima/maxima-5.23.2.ebuild
index 81825808c8bc..c7486ca365c1 100644
--- a/sci-mathematics/maxima/maxima-5.23.2.ebuild
+++ b/sci-mathematics/maxima/maxima-5.23.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.23.2.ebuild,v 1.1 2011/01/17 18:05:03 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.23.2.ebuild,v 1.2 2011/02/17 17:37:56 bicatali Exp $
 
 EAPI=3
 
@@ -115,7 +115,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-rmaxima.patch
 
 	epatch "${FILESDIR}"/${P}-emacs-version.patch
-
+	# bug #343331
+	rm share/Makefile.in || die
 	eautoreconf
 }