Version bump; added ecl as a supported lisp

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

5 files changed, 223 insertions, 14 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 08b4359f6037..509f6b39ab78 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.68 2009/08/03 21:38:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.69 2009/08/22 07:45:28 grozin Exp $
+
+*maxima-5.19.1 (22 Aug 2009)
+
+  22 Aug 2009; Andrey Grozin <grozin@gentoo.org> +maxima-5.19.1.ebuild,
+  +files/maxima-5.19.1-no-init-files.patch:
+  Version bump; added ecl as a supported lisp
 
   03 Aug 2009; Markus Meier <maekke@gentoo.org> maxima-5.18.1.ebuild:
   amd64 stable, bug #264649
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index d2a111258490..b84d1a0fe6b5 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,21 +1,14 @@
------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-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.1.tar.gz 20573490 RMD160 139052f808c83b9e588b8d8856beaa45d73daa2f SHA1 335165a5ce21ad199264281fda82ed74c816e0af SHA256 a2183b1db5ec9cc5f40d052beb38f0868c66e0ed8fd7ef221c9fd974f30d0bb5
 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 4205 RMD160 56c0a287209d362a8138f49aa3bc9fed7ea86ff2 SHA1 6b38456c2697dbfc8dcd7aea96488d99dae4a171 SHA256 7a1267ff2f8615c418f2796392c3aae306db817136be02eed0f7eac568c83653
-MISC ChangeLog 15801 RMD160 b7109105b4afaaf2c9e25f32ab251e5a887ab43a SHA1 5a07e3e5eaec7092dde35c202e8e77167cff64ca SHA256 fe2bc3259d34a11976795edbfcbb114f31d156ce168781bbac1a519152f865fb
-MISC metadata.xml 1102 RMD160 db38575a64fb0b629771fa31b16e8336ea372b07 SHA1 099738161c9f0cfb1892f8ff71ec793fde02fd7a SHA256 2e07710f3f4295b77b6ac15d1e8edb48753c9f1aa3fd43662ec34db10e956b41
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkp3WPEACgkQkKaRLQcq0GJVuACfUY5R+PpvoLUdZXPORKoiIXKJ
-5CEAnjpzDEQNZM6LMz3atknAnh+Z3Wqb
-=mAq9
------END PGP SIGNATURE-----
+EBUILD maxima-5.19.1.ebuild 4352 RMD160 ec9c82e5705401e9ee360816dedffce3d21b9811 SHA1 b9e8fb654b9cdafd0f94e5ae53644d5fdffab882 SHA256 94e141a9c34adf8a139757de044e7a3138f74d390c88ebcbbd969da0ee95a98e
+MISC ChangeLog 15994 RMD160 6fc4968b3adada046c53434a0ad983e64817d138 SHA1 3353f6c36e081d80c38a40aea589162615755f23 SHA256 d69242d4ebcedb8a50a6bef30e10aa05eccd4c4823d9f4cfe9fdd93b81f00de5
+MISC metadata.xml 1187 RMD160 605711817b1fe7bb34451eb608dc9f09e6fa8e00 SHA1 58cc5e038824d0ced8f925340dbd37ccf92ca42c SHA256 620a99d54cef43bf29dfb1851c8c95e6dc0ff7ba10f04b36a5e441b28b1e2eb6
diff --git a/sci-mathematics/maxima/files/maxima-5.19.1-no-init-files.patch b/sci-mathematics/maxima/files/maxima-5.19.1-no-init-files.patch
new file mode 100644
index 000000000000..7141d81e91c2
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.19.1-no-init-files.patch
@@ -0,0 +1,28 @@
+diff -r -U2 maxima-5.19.1.orig/src/maxima.in maxima-5.19.1/src/maxima.in
+--- maxima-5.19.1.orig/src/maxima.in	2009-07-13 17:25:25.000000000 +0200
++++ maxima-5.19.1/src/maxima.in	2009-08-20 14:43:49.000000000 +0200
+@@ -130,13 +130,13 @@
+ if [ "$MAXIMA_LISP" = "clisp" ]; then
+     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
+ elif [ "$MAXIMA_LISP" = "cmucl" ]; then
+     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
+ elif [ "$MAXIMA_LISP" = "scl" ]; then
+@@ -159,5 +159,5 @@
+     exec "$maxima_image_base"  $MAXIMA_LISP_OPTIONS -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ 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
+     echo "$0: lisp=\"$MAXIMA_LISP\" not known. Use --list-avail to see possible options." >&2
diff --git a/sci-mathematics/maxima/maxima-5.19.1.ebuild b/sci-mathematics/maxima/maxima-5.19.1.ebuild
new file mode 100644
index 000000000000..62de0f0680f4
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.19.1.ebuild
@@ -0,0 +1,180 @@
+# 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.19.1.ebuild,v 1.1 2009/08/22 07:45:28 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 ~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/metadata.xml b/sci-mathematics/maxima/metadata.xml
index a2363e0a621d..2cde5ed3993c 100644
--- a/sci-mathematics/maxima/metadata.xml
+++ b/sci-mathematics/maxima/metadata.xml
@@ -13,7 +13,7 @@
   and can plot functions and data in two and three dimensions.
 </longdescription>
 <use>
-  <flag name='clisp'>Add support for GNU ANSI Common Lisp
+  <flag name='clisp'>Add support for GNU CLISP
     (<pkg>dev-lisp/clisp</pkg>)</flag>
   <flag name='cmucl'>Add support for CMU Common Lisp
     (<pkg>dev-lisp/cmucl</pkg>)</flag>
@@ -21,5 +21,7 @@
     (<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
+    (<pkg>dev-lisp/ecls</pkg>)</flag>
 </use>
 </pkgmetadata>