Version bump

Package-Manager: portage-2.2.0_alpha15/cvs/Linux i686

6 files changed, 272 insertions, 3 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index bc47830db8c5..d54c7d838008 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.83 2010/10/31 19:17:41 grobian Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.84 2011/01/16 15:48:46 grozin Exp $
+
+*maxima-5.23.1 (16 Jan 2011)
+
+  16 Jan 2011; Andrey Grozin <grozin@gentoo.org> +maxima-5.23.1.ebuild,
+  +files/maxima-5.23.1-emacs-version.patch, +files/maxima-5.23.1-wish.patch,
+  +files/maxima-5.23.1.patch:
+  Version bump
 
   31 Oct 2010; Fabian Groffen <grobian@gentoo.org> maxima-5.20.1-r2.ebuild:
   Backport Prefix changes to 5.20.1-r2, keyworded appropriately, bug #341987
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 7200ed4ea1e3..bd1d283236d1 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -6,6 +6,9 @@ AUX maxima-5.21.1-emacs-version.patch 377 RMD160 36b54a1bac70989c02baa98dd25c6d6
 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-5.23.1-emacs-version.patch 402 RMD160 b4152ba4f8014106f11365440d14901bc0bba0f4 SHA1 34e8feee04d83619eed298760747966471b205fe SHA256 b6fcdae390a44aafbdf0c64539aacbe38e9b48463c1bc9063a705770ea66d981
+AUX maxima-5.23.1-wish.patch 946 RMD160 d19db10a629a9a9f1fa0799b0be403c8aee090fe SHA1 56f2ad96baed63b27d7c37cfccaf27806a06f20e SHA256 dd535626d5d2d16f249e2c41157f5bbfb030236651d9b0404cc1a69c5fec9e0c
+AUX maxima-5.23.1.patch 3263 RMD160 a3fb37685b9481ed1c17a53f027429656371c586 SHA1 774178e2e3cd265d3f0474b0c38fa1230c583619 SHA256 dd7d02c0eaac5a0763363ed46c207bfb40e55b8470dc3b7c2892753b466a2ea0
 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
@@ -17,10 +20,12 @@ DIST maxima-5.19.2.tar.gz 20572069 RMD160 648ac2033f8e7c64671d95cb0ff5f0a73c9c11
 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
+DIST maxima-5.23.1.tar.gz 21951139 RMD160 c20a3eb1a6b1e62d5b5e0e06d93539fecf615ef4 SHA1 a6ae35c070b27f51ff57c3762363c43b5fabe082 SHA256 5047fe4bd3e64bd3e7797c4a3c7bc870691177a17f33de174a6b656969a2b7b0
 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 4730 RMD160 85168a03f6717b98799f76478ffffcd015826c38 SHA1 ad2b45df1183f5f158c9495963b0a7f04a966d4f SHA256 9d06ee18e55d627c78d02ecd524d5d0168f203b1db32b7762dca4c6362b8311c
 EBUILD maxima-5.21.1-r1.ebuild 4666 RMD160 ced13c6036484ca4f585bf7f8bfd3efef349f940 SHA1 d8cb40a71c16577bc6873ab9fe875142a886d381 SHA256 e2082903828a0160eebc40128565d7e379992f57d3d32b2bd9c93c8c8eab6e2c
 EBUILD maxima-5.22.1.ebuild 4432 RMD160 7fbcf425929fd0743cd98d1c5f82cd0f087ca759 SHA1 2384678d94d4358de4053e795aff6f37632fdb25 SHA256 60be686ea30d3bc1c07b124d2e4506d1307d4a0eedebb3706c870d0f35618ae2
-MISC ChangeLog 18637 RMD160 8ce2ac38b7c991131d5b28f0aaff51716f57573e SHA1 bbaa78c72dfb53f24d439f34b0617634a6243c86 SHA256 6aad69f42ae3c7e85ca76d335ff654521cb637e833a091f20049054e17abca4d
+EBUILD maxima-5.23.1.ebuild 4431 RMD160 70ee98445b765e9f145a3bd4044e59b7c1494f8a SHA1 dc1c5545207b9ed79c8f46075180941143be6369 SHA256 1ac6eee5a9cc329ea65202c1bb7880cdff0d849a2f08b8b82000920d7661ad0b
+MISC ChangeLog 18861 RMD160 da977650069ba8d3bf70e9d61f19ab57000600ba SHA1 9e8951dc35a62f21657643758397917f9250404e SHA256 317de65406b33184e22de226e1115a44b743582b685b9face256a27862b2e6b6
 MISC metadata.xml 1538 RMD160 d8fdc903bc508232d729789ccfb5068b82bebc12 SHA1 1e54225d047c1e0b45df832e37fe5342a8eee70a SHA256 282f77d990621305ef1c88510b0c2a26dfd39806207179e59bab2bdae06eed5c
diff --git a/sci-mathematics/maxima/files/maxima-5.23.1-emacs-version.patch b/sci-mathematics/maxima/files/maxima-5.23.1-emacs-version.patch
new file mode 100644
index 000000000000..f31c07efa707
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.23.1-emacs-version.patch
@@ -0,0 +1,7 @@
+diff -r -U1 maxima-5.23.1.orig//interfaces/emacs/emaxima/maxima.el maxima-5.23.1//interfaces/emacs/emaxima/maxima.el
+--- maxima-5.23.1.orig//interfaces/emacs/emaxima/maxima.el	2010-12-05 08:05:58.000000000 +0600
++++ maxima-5.23.1//interfaces/emacs/emaxima/maxima.el	2011-01-16 20:12:16.000000000 +0600
+@@ -2105,2 +2105,3 @@
+      (not maxima-running-xemacs)
++     (<= emacs-major-version 21)
+      (or
diff --git a/sci-mathematics/maxima/files/maxima-5.23.1-wish.patch b/sci-mathematics/maxima/files/maxima-5.23.1-wish.patch
new file mode 100644
index 000000000000..6fcb0d9ec8e9
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.23.1-wish.patch
@@ -0,0 +1,28 @@
+diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
+--- maxima-5.23.1.orig//configure.in	2011-01-15 21:54:46.000000000 +0600
++++ maxima-5.23.1//configure.in	2011-01-16 21:00:16.000000000 +0600
+@@ -777,6 +777,11 @@
+ 	[  --with-wish=<prog>           Use <prog> for Tk wish shell (default wish)],
+-	[WISH="${withval}"],
+-	[WISH="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)
+ 
+diff -r -U1 maxima-5.23.1.orig//interfaces/Makefile.am maxima-5.23.1//interfaces/Makefile.am
+--- maxima-5.23.1.orig//interfaces/Makefile.am	2004-04-28 23:34:59.000000000 +0700
++++ maxima-5.23.1//interfaces/Makefile.am	2011-01-16 20:41:38.000000000 +0600
+@@ -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/files/maxima-5.23.1.patch b/sci-mathematics/maxima/files/maxima-5.23.1.patch
new file mode 100644
index 000000000000..6309653d6e87
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.23.1.patch
@@ -0,0 +1,37 @@
+diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
+--- maxima-5.23.1.orig//configure.in	2011-01-15 21:54:46.000000000 +0600
++++ maxima-5.23.1//configure.in	2011-01-16 19:50:55.000000000 +0600
+@@ -294,3 +294,3 @@
+ dnl n.b. openmcl_default_name is hardcoded in "with" message
+-openmcl_default_name=openmcl
++openmcl_default_name=ccl
+ AC_ARG_ENABLE(openmcl,
+diff -r -U1 maxima-5.23.1.orig//src/maxima.in maxima-5.23.1//src/maxima.in
+--- maxima-5.23.1.orig//src/maxima.in	2010-12-05 08:06:03.000000000 +0600
++++ maxima-5.23.1//src/maxima.in	2011-01-16 20:07:27.000000000 +0600
+@@ -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
+@@ -147,5 +147,5 @@
+ 	if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+-	    exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++	    exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ 	else
+-	    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"
+ 	fi
+@@ -155,3 +155,3 @@
+ 	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
+@@ -177,3 +177,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/maxima-5.23.1.ebuild b/sci-mathematics/maxima/maxima-5.23.1.ebuild
new file mode 100644
index 000000000000..1148086d18a0
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.23.1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.23.1.ebuild,v 1.1 2011/01/16 15:48:46 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}"/${P}-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
+}