Version bump, added clozurecl as a supported lisp

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

5 files changed, 210 insertions, 3 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index d328d99a3b56..06588263a2c9 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.71 2009/10/07 16:22:36 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.72 2009/12/17 12:24:57 grozin Exp $
+
+*maxima-5.20.1 (17 Dec 2009)
+
+  17 Dec 2009; Andrey Grozin <grozin@gentoo.org> +maxima-5.20.1.ebuild,
+  +files/maxima-clozurecl.patch, metadata.xml:
+  Version bump, added clozurecl as a supported lisp
 
   07 Oct 2009; nixnut <nixnut@gentoo.org> maxima-5.18.1.ebuild:
   ppc stable #264649
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index a8f24216b060..42e04a6f94fa 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,14 +1,17 @@
 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-clozurecl.patch 344 RMD160 721bc62c071025b3d70ea75c0fd78da4845739bf SHA1 c9d881b5bcf335b078fa47cab23bd6bfb230f1f0 SHA256 0565ba0fe102b6f7e835d2543d8e2f4a5580d588f5864918889e62bacfc8c143
 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.14.0.tar.gz 19349615 RMD160 237f0b103b04f5b663c86a4fcbf2f8c618da45ef SHA1 39a6cbcaae4779d542361224b5139d2ae4773b7a SHA256 0fd0d7af675bafd9ffb31566e837061da47b07fd83e7fe978ac5ce79b2a307a8
 DIST maxima-5.17.1.tar.gz 20080768 RMD160 0738ddd1f8247ae0300b5810fa21db1fbfc608c3 SHA1 0f87f2fbf3c91cd54528cfc355ddf5ed30ee66ac SHA256 52c7b26c49488b7e774a2ef20684810e1d1609f48e341850054b8669ea3c96ab
 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
 EBUILD maxima-5.14.0.ebuild 5729 RMD160 cc32eb6786e3d6c20a6943c4d72a482b8debc4ff SHA1 a32aa0b5fe09ffdb325657aa1ace05104cef1bbc SHA256 6a875834bb96b8f6c7c5851eb2e1d157f98ac7ea845e21e5fd38a5bf49e6960c
 EBUILD maxima-5.17.1-r1.ebuild 4734 RMD160 92676b37f68de603f819f21ee91404238012501b SHA1 2a6020f35c664c64a81968e7a0c7127a17dc7450 SHA256 62d32b3f30be93caf040bc2ff12531552f1189e1940d7ab169d0e58754f5306e
 EBUILD maxima-5.18.1.ebuild 4204 RMD160 34850f20558db4f93a6a8824654797b0ccd566b4 SHA1 a22c93708afe692ee53484f9d1abe192029d6791 SHA256 9923d293cbc740bda917a3d6e628d1326ae16541fb6a9a63e5f69fe7891138fa
 EBUILD maxima-5.19.2.ebuild 4352 RMD160 5c59ff05e7f66f5f57473f23dd8b0dc0af6183cb SHA1 5f4defba336f045ae6b0f0073f5c279d1fc4f067 SHA256 2478bf2da9e6d4226d1459beacbd44eb8994e3db44a6013de0b3fe117e894941
-MISC ChangeLog 16223 RMD160 8684941b610cf12ae0b6ee36b286fdb35acdf174 SHA1 72470feeb292843ddb01084b616e9e995f0032ca SHA256 3c93bf5fa4492d1be460a779b52a7185d1d1f4427744881a72d0008f5dbd168e
-MISC metadata.xml 1187 RMD160 605711817b1fe7bb34451eb608dc9f09e6fa8e00 SHA1 58cc5e038824d0ced8f925340dbd37ccf92ca42c SHA256 620a99d54cef43bf29dfb1851c8c95e6dc0ff7ba10f04b36a5e441b28b1e2eb6
+EBUILD maxima-5.20.1.ebuild 4469 RMD160 111ba2b82db0b1a537e21ddfb6ee671d7fc53d4d SHA1 04ba0f114dd3fc48abaf7cfd2104a8e31423b5b0 SHA256 dd1a81837ad3337dfd37162e2b23b90a3dfd6f866064fa69b51dea4315dd0c72
+MISC ChangeLog 16425 RMD160 75ff320263e7b91d39aa663191dc4278411427fc SHA1 26ae4c4f496d953aa9c71700ef3c32a2a9182efe SHA256 713ea4aae6f8d18165a1b7229a45a29cb8fbe1b4c69266ed4e13f8444cd4d0f6
+MISC metadata.xml 1305 RMD160 f122993d0ee80a6dfdab27259d69301c609aaba0 SHA1 a647a1d994e0f0e54459c13a254d1be27eebffda SHA256 b82b31cf0892ff000778cb002578d135f119a14024ee0b4c5d206381ca3e796a
diff --git a/sci-mathematics/maxima/files/maxima-clozurecl.patch b/sci-mathematics/maxima/files/maxima-clozurecl.patch
new file mode 100644
index 000000000000..79cdb7a82d33
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-clozurecl.patch
@@ -0,0 +1,8 @@
+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.20.1.ebuild b/sci-mathematics/maxima/maxima-5.20.1.ebuild
new file mode 100644
index 000000000000..df57e1078495
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.20.1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2009 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.ebuild,v 1.1 2009/12/17 12:24:57 grozin 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 AECA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# 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-9.8.3 )"
+	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=/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
+
+	# 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}
+}
+
+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
+}
+
+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 2cde5ed3993c..3d6382d82cb7 100644
--- a/sci-mathematics/maxima/metadata.xml
+++ b/sci-mathematics/maxima/metadata.xml
@@ -23,5 +23,7 @@
     (<pkg>dev-lisp/sbcl</pkg>)</flag>
   <flag name='ecl'>Add support for Embeddable Common Lisp
     (<pkg>dev-lisp/ecls</pkg>)</flag>
+  <flag name='openmcl'>Add support for Clozure Common Lisp
+    (former OpenMCL, <pkg>dev-lisp/closurecl</pkg>)</flag>
 </use>
 </pkgmetadata>