Include imaxima, and blocks old imaxima, thanks Andrey Grozin.

Package-Manager: portage-2.1.5_rc6

4 files changed, 248 insertions, 6 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index cdaaefaba02a..9f55706b9640 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.53 2008/04/29 08:54:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.54 2008/04/30 11:00:50 bicatali Exp $
+
+*maxima-5.15.0-r1 (30 Apr 2008)
+
+  30 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/50maxima-gentoo.el, +maxima-5.15.0-r1.ebuild:
+  Include imaxima, and blocks old imaxima, thanks Andrey Grozin.
 
 *maxima-5.15.0 (29 Apr 2008)
 
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index a925c5615aeb..9a0d8d4944eb 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 50maxima-gentoo.el 600 RMD160 c45cc012987d2a74670ad9aac2b019a1233bd151 SHA1 f05c4ce4f51f2e3d0399fa04de9d8fc8b0296386 SHA256 32cd4c9e958c96e93bb74ee324196efa8f88a90e4508c4c67733c691d6969dfe
+AUX 50maxima-gentoo.el 736 RMD160 b63c5645b35a206d72eac803f0c52db729b70d55 SHA1 2540fb77c42d4dea1fb0e0fb4eafd9ad1c95f95b SHA256 f9148a04432c81999378a69d910f2ab2b22355f5d8d2c78442cc76d2586585f4
 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.13.0.tar.gz 19216173 RMD160 2ec91678f8c6a6f863d6ba448f299793e52c822a SHA1 caac53226fa251a22b577c2f76dc171913e71323 SHA256 9625e09785f88f738faf40ad64889acd17328e043c39ef5ad56f3172d76af187
@@ -9,13 +9,14 @@ DIST maxima-5.14.0.tar.gz 19349615 RMD160 237f0b103b04f5b663c86a4fcbf2f8c618da45
 DIST maxima-5.15.0.tar.gz 19851523 RMD160 037e2341d130d78e1ff2f067916caae1a13d80f9 SHA1 8487d120471e97f24014889f6f13dfa9fb651293 SHA256 e2229ae88fa34b93d47c9df3deaa54307859326ede21826da509238e6bff5a14
 EBUILD maxima-5.13.0-r1.ebuild 5628 RMD160 664e1cfca8c9b114d96fa7e107c2e8b678b3c7af SHA1 b67cc267dc60c02ba0f6d95640b8d1a821407e66 SHA256 2e7ea0a784d3f125f40b8029bc63356741e4e231718ade3af8d4ba76ff9c998e
 EBUILD maxima-5.14.0.ebuild 5853 RMD160 2f1ad119fa8c6022613f24163cf44d8c88ea98d6 SHA1 80b71b8ec69905bedb885c55ddedfca6cf758846 SHA256 a03e7d10b5aed6e0747b8cdd5efa804e4940b1872c363dd1c09dc2b2cd45982e
+EBUILD maxima-5.15.0-r1.ebuild 6415 RMD160 797401f12c125991eb00caa0a7910cfed22adb0d SHA1 fc54f9d0fba8ab303e88d41905105b09b4ed68ab SHA256 2fbc432d0fef5488a4b14a1bf8b28b4adbe3424bd59eb903a5ab48554dbe265d
 EBUILD maxima-5.15.0.ebuild 5859 RMD160 098d20b4c0d2c6840abfc65658f9b66742526316 SHA1 0d955b002027507c3bef86687390a896f40eae9d SHA256 3f3250a411d01010b35950bd9bfdfde49ab183e0a6c56cc6389c3e46326d1231
-MISC ChangeLog 13254 RMD160 2f2d88f62a0ee20fae9dc7049c2bf7f8b56e6e84 SHA1 ea7f35b0eec378b100fc922fa46d2a4648a393d8 SHA256 b8bd42836c42e54b21cdf74e9cb205f68c93244cca54f5404c22a5eb73d8a337
+MISC ChangeLog 13462 RMD160 32e7790263bdb1c0ee6127896bd631bf6b8521a5 SHA1 fb3eb2b585220259d05ec14fb0525cbfbee72ecc SHA256 68f9e7077ad27d4c6c460478a59750e44bd8294bd981bd48c0ac16cc0dd4c8b0
 MISC metadata.xml 737 RMD160 6f833e02ea5b87a66064c32e7c35889c63c96649 SHA1 bff378e387662ce5e4c4168c74ee7ff1493c41a4 SHA256 9deb0b30538b6d35c0877384b97620eda2dde0bf3b4c702ccdadb007e868daef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIFuJK1ycZbhPLE2ARAkMYAKCuzKcb5iSX6ipSvXj5t8OF3rfKmgCffXF4
-zD9bvUqWZEQN7BCuK07ywQE=
-=+KdE
+iD8DBQFIGFFv1ycZbhPLE2ARApONAJ40osM9tArtP0ExnqcvZugDTP3VWwCfRbEq
+W2y/cW57SZCyHuT0mxYeEGI=
+=CFA/
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/maxima/files/50maxima-gentoo.el b/sci-mathematics/maxima/files/50maxima-gentoo.el
index cbba83115f8f..829c705aadcd 100644
--- a/sci-mathematics/maxima/files/50maxima-gentoo.el
+++ b/sci-mathematics/maxima/files/50maxima-gentoo.el
@@ -10,3 +10,7 @@
 ;; emaxima mode
 (autoload 'emaxima-mode "emaxima" "EMaxima" t)
 (add-hook 'emaxima-mode-hook 'emaxima-mark-file-as-emaxima)
+
+;; imaxima
+(autoload 'imaxima "imaxima" "Image support for Maxima." t)
+(autoload 'imath-mode "imath" "Interactive Math minor mode." t)
diff --git a/sci-mathematics/maxima/maxima-5.15.0-r1.ebuild b/sci-mathematics/maxima/maxima-5.15.0-r1.ebuild
new file mode 100644
index 000000000000..da5ba4aac63c
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.15.0-r1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.15.0-r1.ebuild,v 1.1 2008/04/30 11:00:50 bicatali Exp $
+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"
+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
+
+# >=maxima-5.15.0 includes imaxima; it depends on dev-tex/mh
+RDEPEND="!app-emacs/imaxima
+	X? ( x11-misc/xdg-utils
+		 sci-visualization/gnuplot
+		 tk? ( dev-lang/tk ) )
+	latex? ( || ( dev-texlive/texlive-latexrecommended
+				  >=app-text/tetex-3
+				  app-text/ptex ) )
+	emacs? ( virtual/emacs
+		latex? ( app-emacs/auctex
+				|| ( dev-tex/mh dev-texlive/texlive-mathextra ) ) )
+	xemacs? ( virtual/xemacs
+		latex? ( app-emacs/auctex
+				|| ( dev-tex/mh dev-texlive/texlive-mathextra ) ) )"
+
+
+# create lisp dependencies
+for LISP in ${SUPP_LISPS}; do
+	RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP} )"
+	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"
+
+pkg_setup() {
+	LISPS=""
+
+	for LISP in ${SUPP_LISPS}; do
+		use ${LISP} && LISPS="${LISPS} ${LISP}"
+	done
+
+	if [ -z "${LISPS}" ]; then
+		ewarn "No lisp specified in USE flags, choosing ${DEF_LISP} as default"
+		LISPS="${DEF_LISP}"
+	fi
+
+	RL=""
+
+	for LISP in ${SUPP_NORL}; do
+		use ${LISP} && RL="yes"
+	done
+
+	if use gcl; then
+		if ! built_with_use dev-lisp/gcl ansi; then
+			eerror "gcl must be emerged with the USE flag ansi"
+			die "This package needs gcl with USE=ansi"
+		fi
+		# gcl in the main tree is broken (bug #205803)
+		ewarn "Please use gcl from http://repo.or.cz/w/gentoo-lisp-overlay.git"
+	fi
+
+	# Calculating MAXIMA_TEXMFDIR
+	if use latex; then
+		local TEXMFPATH="$(kpsewhich -var-value=TEXMFSITE)"
+		local TEXMFCONFIGFILE="$(kpsewhich texmf.cnf)"
+
+		if [ -z "${TEXMFPATH}" ]; then
+			eerror "You haven't defined the TEXMFSITE variable in your TeX config."
+			eerror "Please do so in the file ${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf}"
+			die "Define TEXMFSITE in TeX configuration!"
+		else
+			# go through the colon separated list of directories
+			# (maybe only one) provided in the variable
+			# TEXMFPATH (generated from TEXMFSITE from TeX's config)
+			# and choose only the first entry.
+			# All entries are separated by colons, even when defined
+			# with semi-colons, kpsewhich changes
+			# the output to a generic format, so IFS has to be redefined.
+			local IFS="${IFS}:"
+
+			for strippedpath in ${TEXMFPATH}; do
+				if [ -d ${strippedpath} ]; then
+					MAXIMA_TEXMFDIR="${strippedpath}"
+					break
+				fi
+			done
+
+			# verify if an existing path was chosen to prevent from
+			# installing into the wrong directory
+			if [ -z ${MAXIMA_TEXMFDIR} ]; then
+				eerror "TEXMFSITE does not contain any existing directory."
+				eerror "Please define an existing directory in your TeX config file"
+				eerror "${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf} or create at least one of the there specified directories"
+				die "TEXMFSITE variable did not contain an existing directory"
+			fi
+		fi
+	fi
+
+	if use X && ! built_with_use sci-visualization/gnuplot gd; then
+		elog "To benefit full plotting capability of maxima,"
+		elog "enable the gd USE flag for sci-visualization/gnuplot"
+		elog "Then re-emerge maxima"
+		epause 5
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# use xdg-open to view ps, pdf
+	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
+	epatch "${FILESDIR}"/${PN}-no-init-files.patch
+	# remove rmaxima if neither cmucl nor sbcl
+	if [ -z "${RL}" ]; then
+		sed -i \
+			-e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \
+			"${S}"/src/Makefile.in \
+			|| die "sed for rmaxima failed"
+	fi
+}
+
+src_compile() {
+	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} || die "econf failed"
+	emake || die "emake failed"
+}
+
+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 "${MAXIMA_TEXMFDIR}"/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}
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el
+		# imaxima docs
+		cd interfaces/emacs/imaxima
+		insinto /usr/share/${PN}/${PV}/doc/imaxima
+		doins ChangeLog NEWS README || die "installing imaxima docs failed"
+		insinto /usr/share/${PN}/${PV}/doc/imaxima/imath-example
+		doins imath-example/*.txt || die "installing imaxima docs failed"
+	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
+}