Version bump

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

5 files changed, 239 insertions, 2 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 6850a2f0522c..8995c86c639b 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,13 @@
 # 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.77 2010/04/12 11:58:46 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.78 2010/04/24 21:23:45 grozin Exp $
+
+*maxima-5.21.1 (24 Apr 2010)
+
+  24 Apr 2010; Andrey Grozin <grozin@gentoo.org> +maxima-5.21.1.ebuild,
+  +files/maxima-5.21.1-clozurecl-1.5.patch,
+  +files/maxima-5.21.1-emacs-version.patch:
+  Version bump
 
 *maxima-5.20.1-r2 (12 Apr 2010)
 
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 124fec3416e7..6d0a6d02294c 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -2,14 +2,18 @@ AUX 50maxima-gentoo.el 439 RMD160 bdddca04f2232ad764dc6093ba4d0a1b71862879 SHA1
 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-clozurecl-1.5.patch 1065 RMD160 25d42199cdd5d40f31e86323689c2a389665d45f SHA1 38d12f9143e45d65e235800f0ae59d7f8c370369 SHA256 af4bb1f280524dee8fe367dfe18a97f2f68e8740329f6efbc39b8b7c263e7270
+AUX maxima-5.21.1-emacs-version.patch 377 RMD160 36b54a1bac70989c02baa98dd25c6d674882c3cb SHA1 51e9f41225a54e87a5d827afa3f82a95ec7ae251 SHA256 57841a01de59f736515b38f110dbb0d0c451c30f9e0770c246e5ec1c555f2080
 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.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
 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
-MISC ChangeLog 17273 RMD160 4df1eccd037e5b88dc990dcf59e5fb521d6698e8 SHA1 acc6e425be1e96232546127317f8b3dbbc125e55 SHA256 a2712009883e0716f98cbc8cae9372bd7fffe8c63bea52b1f78b6330ab0ad528
+EBUILD maxima-5.21.1.ebuild 4619 RMD160 2fd7f939704254ed8673e856e7da828f3c4eb5dc SHA1 3f13e4e4c3228477610e0c4d3da98d862c7d2438 SHA256 a8d25886fb03ce6fa74fb234c6324657e3de95d5e68d35e45248eb85f758cb8e
+MISC ChangeLog 17479 RMD160 ffb82043b11e226f66a95dc227e057e13f7cab36 SHA1 3c37e5505707fcd136cfad04051049a014440184 SHA256 7a0286e97215b93336e854f8cb5956a9e62d07fff5e80d505fd09d3e49cad913
 MISC metadata.xml 1305 RMD160 f122993d0ee80a6dfdab27259d69301c609aaba0 SHA1 a647a1d994e0f0e54459c13a254d1be27eebffda SHA256 b82b31cf0892ff000778cb002578d135f119a14024ee0b4c5d206381ca3e796a
diff --git a/sci-mathematics/maxima/files/maxima-5.21.1-clozurecl-1.5.patch b/sci-mathematics/maxima/files/maxima-5.21.1-clozurecl-1.5.patch
new file mode 100644
index 000000000000..ed64d5f67d6b
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.21.1-clozurecl-1.5.patch
@@ -0,0 +1,22 @@
+diff -r -U2 maxima-5.20.1.orig/configure maxima-5.20.1/configure
+--- maxima-5.20.1.orig/configure	2009-12-14 04:20:43.000000000 +0100
++++ maxima-5.20.1/configure	2010-04-24 21:59:24.000000000 +0200
+@@ -2559,5 +2559,5 @@
+ fi
+ 
+-openmcl_default_name=openmcl
++openmcl_default_name=ccl
+ # Check whether --enable-openmcl or --disable-openmcl was given.
+ if test "${enable_openmcl+set}" = set; then
+diff -r -U2 maxima-5.20.1.orig/src/maxima-build.lisp maxima-5.20.1/src/maxima-build.lisp
+--- maxima-5.20.1.orig/src/maxima-build.lisp	2008-12-30 02:32:33.000000000 +0100
++++ maxima-5.20.1/src/maxima-build.lisp	2010-04-24 21:54:19.000000000 +0200
+@@ -36,5 +36,5 @@
+   #+allegro (excl:dumplisp :name "binary-acl/maxima.dxl")
+   #+lispworks (hcl:save-image "binary-lispworks/maxima" :restart-function 'cl-user::run)
+-  #+ccl (ccl:save-application "binary-openmcl/maxima" :toplevel-function 'cl-user::run))
+-
+-
++  #+ccl (ccl:save-application "binary-openmcl/maxima" :toplevel-function
++   (lambda () (let* ((*read-default-float-format* 'double-float))
++     (cl-user::run))))
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
new file mode 100644
index 000000000000..d0ab0a5e768d
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.21.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/maxima-5.21.1.ebuild b/sci-mathematics/maxima/maxima-5.21.1.ebuild
new file mode 100644
index 000000000000..302b74f837c2
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.21.1.ebuild
@@ -0,0 +1,192 @@
+# 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.ebuild,v 1.1 2010/04/24 21:23:45 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"
+SLOT="0"
+KEYWORDS="~amd64  ~ppc ~sparc ~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-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=/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
+	# *read-default-float-format* is now bound per-thread
+	# and isn't saved in a heap image
+	epatch "${FILESDIR}"/${P}-clozurecl-1.5.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}
+}
+
+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
+}