Version bump. Ebuild re-written in a more table-driven fashion, for easier maintainance. Improvements by François Bissey <f.r.bissey@massey.ac.nz> imported from the science overlay, thus fixing #255673, many thanks.

Package-Manager: portage-2.2_rc82/cvs/Linux i686

9 files changed, 318 insertions, 21 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 446e78023b17..c40cd3ce8096 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.81 2010/09/14 17:26:32 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.82 2010/09/17 11:23:55 grozin Exp $
+
+*maxima-5.22.1 (17 Sep 2010)
+
+  17 Sep 2010; Andrey Grozin <grozin@gentoo.org> +maxima-5.22.1.ebuild,
+  +files/maxima-5.22.1-emacs-version.patch, +files/maxima-5.22.1.patch,
+  +files/maxima-imaxima.patch, +files/maxima-rmaxima.patch,
+  +files/maxima-wish.patch, metadata.xml:
+  Version bump. Ebuild re-written in a more table-driven fashion, for easier
+  maintainance. Improvements by François Bissey <f.r.bissey@massey.ac.nz>
+  imported from the science overlay, thus fixing #255673, many thanks.
 
   14 Sep 2010; Sébastien Fabbro <bicatali@gentoo.org>
   maxima-5.21.1-r1.ebuild:
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index baab7b131111..acf2464df1e6 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,29 +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-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
 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 4634 RMD160 f67e491c8580d8a76c071b739ae3513aac6a5468 SHA1 bf319fec2ecc2f56e88a1a0790b8267e71c0598a SHA256 bfb9e1f31426f32bfefecbef9a0e2a2777a5afb7031a9e02777c1244e034d178
 EBUILD maxima-5.21.1-r1.ebuild 4666 RMD160 ced13c6036484ca4f585bf7f8bfd3efef349f940 SHA1 d8cb40a71c16577bc6873ab9fe875142a886d381 SHA256 e2082903828a0160eebc40128565d7e379992f57d3d32b2bd9c93c8c8eab6e2c
-MISC ChangeLog 17984 RMD160 97a67480bbe6d679d9ac558be95bb1d170b19748 SHA1 04e51b729e1d475fa7f490ca615575c878cf5aae SHA256 fceec6814d86f15c6d41ce4cf1ea809af3461c9b00480ef4beb6d2362ad7924d
-MISC metadata.xml 1305 RMD160 f122993d0ee80a6dfdab27259d69301c609aaba0 SHA1 a647a1d994e0f0e54459c13a254d1be27eebffda SHA256 b82b31cf0892ff000778cb002578d135f119a14024ee0b4c5d206381ca3e796a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyPsFEACgkQ1ycZbhPLE2C8rwCeNjs7vshQCsZOboyoFCANDC+v
-J4AAoJJYYhjBhOIO/BgbnDl7jPzkZ63T
-=U6n8
------END PGP SIGNATURE-----
+EBUILD maxima-5.22.1.ebuild 4432 RMD160 7fbcf425929fd0743cd98d1c5f82cd0f087ca759 SHA1 2384678d94d4358de4053e795aff6f37632fdb25 SHA256 60be686ea30d3bc1c07b124d2e4506d1307d4a0eedebb3706c870d0f35618ae2
+MISC ChangeLog 18482 RMD160 17f14783260ed2cd978bb166d1aed6332db5f216 SHA1 950d19208e69da0c141ac624cbc5e77dca7450b9 SHA256 039c0cd592db4f240c507c29f049a0986d9875eaabc06ed00b6b82df0471f65b
+MISC metadata.xml 1538 RMD160 d8fdc903bc508232d729789ccfb5068b82bebc12 SHA1 1e54225d047c1e0b45df832e37fe5342a8eee70a SHA256 282f77d990621305ef1c88510b0c2a26dfd39806207179e59bab2bdae06eed5c
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
new file mode 100644
index 000000000000..d0ab0a5e768d
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.22.1-emacs-version.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..9f6920a0b3b7
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.22.1.patch
@@ -0,0 +1,32 @@
+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-imaxima.patch b/sci-mathematics/maxima/files/maxima-imaxima.patch
new file mode 100644
index 000000000000..fe607b240d13
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-imaxima.patch
@@ -0,0 +1,5 @@
+--- interfaces/emacs/Makefile.am.orig	2010-02-01 22:11:44.809941160 +1300
++++ interfaces/emacs/Makefile.am	2010-02-01 22:12:06.608062346 +1300
+@@ -1 +1 @@
+-SUBDIRS = emaxima misc imaxima
++SUBDIRS = emaxima misc
diff --git a/sci-mathematics/maxima/files/maxima-rmaxima.patch b/sci-mathematics/maxima/files/maxima-rmaxima.patch
new file mode 100644
index 000000000000..db8e87380591
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-rmaxima.patch
@@ -0,0 +1,19 @@
+--- src/Makefile.am.orig	2010-02-01 21:58:17.353941395 +1300
++++ src/Makefile.am	2010-02-01 22:09:12.859975783 +1300
+@@ -3,8 +3,16 @@
+ if WIN32
+ bin_SCRIPTS = maxima maxima-command.ico maxima.bat set_lang.vbs
+ else
++if CLISP
++bin_SCRIPTS = maxima
++else
++if GCL
++bin_SCRIPTS = maxima
++else
+ bin_SCRIPTS = maxima rmaxima
+ endif
++endif
++endif
+ 
+ LOADDEFSYSTEM = (load "$(top_srcdir)/lisp-utils/defsystem.lisp")
+ LOADMAKEPROCLAIM = (load "$(top_srcdir)/lisp-utils/make-proclaim.lisp")
diff --git a/sci-mathematics/maxima/files/maxima-wish.patch b/sci-mathematics/maxima/files/maxima-wish.patch
new file mode 100644
index 000000000000..a5d9a2989e42
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-wish.patch
@@ -0,0 +1,33 @@
+--- configure.in.orig	2010-06-28 15:55:47.187614440 +1200
++++ configure.in	2010-06-28 16:08:30.704615168 +1200
+@@ -724,11 +724,17 @@
+ 	[posix_shell_list="/bin/sh /bin/bash /usr/bin/bash /usr/local/bin/bash"])
+ 
+ AC_ARG_WITH(wish,
+-	[  --with-wish=<prog>               Use <prog> for Tk wish shell (default wish)],
+-	[WISH="${withval}"],
+-	[WISH="wish"])
++	[  --with-wish=<prog>  Use <prog> for Tk wish shell (default 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)
+ 
+ AC_MSG_CHECKING(POSIX shell to see that it contains getopts)
+ cat <<EOF > conftest-posix-shell.sh
+--- interfaces/Makefile.am.orig	2010-06-28 16:09:04.235614065 +1200
++++ interfaces/Makefile.am	2010-06-28 16:11:29.590613301 +1200
+@@ -1,2 +1,6 @@
++if WANT_TK
+ SUBDIRS = emacs xmaxima
++else
++SUBDIRS = emacs
++endif
+ EXTRA_DIST = bin/xmaxima.iss
diff --git a/sci-mathematics/maxima/maxima-5.22.1.ebuild b/sci-mathematics/maxima/maxima-5.22.1.ebuild
new file mode 100644
index 000000000000..a3b564aa36bc
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.22.1.ebuild
@@ -0,0 +1,185 @@
+# 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/metadata.xml b/sci-mathematics/maxima/metadata.xml
index 3d6382d82cb7..9fc821b0fc7a 100644
--- a/sci-mathematics/maxima/metadata.xml
+++ b/sci-mathematics/maxima/metadata.xml
@@ -13,17 +13,21 @@
   and can plot functions and data in two and three dimensions.
 </longdescription>
 <use>
-  <flag name='clisp'>Add support for GNU CLISP
+  <flag name='clisp'>Compile maxima with GNU CLISP
     (<pkg>dev-lisp/clisp</pkg>)</flag>
-  <flag name='cmucl'>Add support for CMU Common Lisp
+  <flag name='clozurecl'>Compile maxima with Clozure Common Lisp
+    (<pkg>dev-lisp/clozurecl</pkg>)</flag>
+  <flag name='cmucl'>Compile maxima with CMU Common Lisp
     (<pkg>dev-lisp/cmucl</pkg>)</flag>
-  <flag name='gcl'>Add support for GNU Common Lisp
-    (<pkg>dev-lisp/gcl</pkg>)</flag>
-  <flag name='sbcl'>Add support for Steel Bank Common Lisp
-    (<pkg>dev-lisp/sbcl</pkg>)</flag>
-  <flag name='ecl'>Add support for Embeddable Common Lisp
+  <flag name='ecl'>Compile maxima with Embeddable Common Lisp
+    (<pkg>dev-lisp/ecls</pkg>)</flag>
+  <flag name='ecls'>Compile maxima with Embeddable Common Lisp
     (<pkg>dev-lisp/ecls</pkg>)</flag>
-  <flag name='openmcl'>Add support for Clozure Common Lisp
+  <flag name='gcl'>Compile maxima with GNU Common Lisp
+    (<pkg>dev-lisp/gcl</pkg>)</flag>
+  <flag name='openmcl'>Compile maxima with Clozure Common Lisp
     (former OpenMCL, <pkg>dev-lisp/closurecl</pkg>)</flag>
+  <flag name='sbcl'>Compile maxima with Steel Bank Common Lisp
+    (<pkg>dev-lisp/sbcl</pkg>)</flag>
 </use>
 </pkgmetadata>