Fixed emacs load path, thanks to ulm (bug #195043). Removed old versions.

(Portage version: 2.1.3.9)

7 files changed, 7 insertions, 420 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 45c16572087e..ec7f6266f17a 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.37 2007/10/06 14:02:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.38 2007/10/08 10:13:29 bicatali Exp $
+
+  08 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/maxima-5.11.0-diff_form.patch,
+  -files/maxima-5.11.0-xdg-utils.patch, -maxima-5.11.0-r2.ebuild,
+  -maxima-5.13.0.ebuild:
+  Fixed emacs load path, thanks to ulm (bug #195043). Removed old versions.
 
 *maxima-5.13.0-r1 (06 Oct 2007)
 
diff --git a/sci-mathematics/maxima/files/digest-maxima-5.11.0-r2 b/sci-mathematics/maxima/files/digest-maxima-5.11.0-r2
deleted file mode 100644
index 706606789654..000000000000
--- a/sci-mathematics/maxima/files/digest-maxima-5.11.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d9ae353e8eba9b9d5686e119e59ab88c maxima-5.11.0.tar.gz 13924132
-RMD160 8f7fb1b8bc7438ffdc393a0eb0f86b5efa79ef3e maxima-5.11.0.tar.gz 13924132
-SHA256 7a7259123bd81a7de3609c7e59b561d49e2710a8f7117c42f373afdd6a6786ac maxima-5.11.0.tar.gz 13924132
diff --git a/sci-mathematics/maxima/files/digest-maxima-5.13.0 b/sci-mathematics/maxima/files/digest-maxima-5.13.0
deleted file mode 100644
index a744fcabcc6f..000000000000
--- a/sci-mathematics/maxima/files/digest-maxima-5.13.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7317ba22fc485554b15aceb6bc22542b maxima-5.13.0.tar.gz 19216173
-RMD160 2ec91678f8c6a6f863d6ba448f299793e52c822a maxima-5.13.0.tar.gz 19216173
-SHA256 9625e09785f88f738faf40ad64889acd17328e043c39ef5ad56f3172d76af187 maxima-5.13.0.tar.gz 19216173
diff --git a/sci-mathematics/maxima/files/maxima-5.11.0-diff_form.patch b/sci-mathematics/maxima/files/maxima-5.11.0-diff_form.patch
deleted file mode 100644
index 8bf1f5c8e239..000000000000
--- a/sci-mathematics/maxima/files/maxima-5.11.0-diff_form.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -U2 --recursive maxima-5.11.0-orig/src/init-cl.lisp maxima-5.11.0/src/init-cl.lisp
---- maxima-5.11.0-orig/src/init-cl.lisp	2006-12-09 22:50:19.000000000 +0100
-+++ maxima-5.11.0/src/init-cl.lisp	2006-12-27 00:11:06.000000000 +0100
-@@ -326,4 +326,5 @@
-          "contrib/unit"
-          "contrib/Zeilberger"
-+         "diff_form"
-          "diffequations"
-          "lbfgs"
diff --git a/sci-mathematics/maxima/files/maxima-5.11.0-xdg-utils.patch b/sci-mathematics/maxima/files/maxima-5.11.0-xdg-utils.patch
deleted file mode 100644
index eb0cb91ce007..000000000000
--- a/sci-mathematics/maxima/files/maxima-5.11.0-xdg-utils.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- maxima-5.11.0/interfaces/emacs/misc/bookmode.el.xdg_utils	2000-05-08 01:09:44.000000000 -0500
-+++ maxima-5.11.0/interfaces/emacs/misc/bookmode.el	2006-12-27 13:07:51.000000000 -0600
-@@ -680,7 +680,7 @@
- 		
- 		  (and tem
- 		       (list (concat "View "(nth 1 tem))
--			     'call-process  "ghostview" nil nil nil
-+			     'call-process  "xdg-open" nil nil nil
- 			     (expand-file-name(nth 1 tem))
- 			     ))
- 		  (list "Cancel")
-@@ -705,7 +705,7 @@
- 			 (concat
- 			  (cond ((looking-at "%PS") "")
- 				(t "gzip -dc | "))
--			  "ghostview -")
-+			  "xdg-open -")
- 			 
- 	)))
- 	 
---- maxima-5.11.0/interfaces/xmaxima/Tkmaxima/Menu.tcl.xdg_utils	2006-12-09 13:52:11.000000000 -0600
-+++ maxima-5.11.0/interfaces/xmaxima/Tkmaxima/Menu.tcl	2006-12-27 13:00:45.000000000 -0600
-@@ -245,9 +245,9 @@
- 	}
-     } else {
- 	
--	set selectedbrowser mozilla
-+	set selectedbrowser xdg-open 
- 
--	foreach b { firefox mozilla konqueror epiphany galeon amaya netscape } {
-+	foreach b { xdg-open htmlview firefox mozilla konqueror epiphany galeon amaya netscape } {
- 	    if { ! [catch {exec which $b} ] } {
- 		set selectedbrowser $b
- 		break } }
---- maxima-5.11.0/interfaces/xmaxima/Tkmaxima/Constants.tcl.xdg_utils	2006-10-01 17:42:48.000000000 -0500
-+++ maxima-5.11.0/interfaces/xmaxima/Tkmaxima/Constants.tcl	2006-12-27 13:01:52.000000000 -0600
-@@ -143,9 +143,9 @@
-     image/gif  netmath
-     image/png  netmath
-     image/jpeg netmath
--    application/postscript "ghostview -safer %s"
--    application/pdf "acroread %s"
--    application/x-dvi "xdvi %s"
-+    application/postscript "xdg-open %s"
-+    application/pdf "xdg-open %s"
-+    application/x-dvi "xdg-open %s"
- }
- set maxima_priv(imagecounter) 0
- 
diff --git a/sci-mathematics/maxima/maxima-5.11.0-r2.ebuild b/sci-mathematics/maxima/maxima-5.11.0-r2.ebuild
deleted file mode 100644
index c919f8b0163c..000000000000
--- a/sci-mathematics/maxima/maxima-5.11.0-r2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.11.0-r2.ebuild,v 1.4 2007/09/13 14:08:30 bicatali Exp $
-
-inherit eutils elisp-common autotools fdo-mime
-
-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"
-IUSE="cmucl clisp sbcl gcl tetex emacs tk nls unicode"
-
-# rlwrap is recommended for cmucl and sbcl
-RDEPEND=">=sci-visualization/gnuplot-4.0
-	x11-misc/xdg-utils
-	tetex? ( virtual/tetex )
-	emacs? ( virtual/emacs
-		 tetex? ( || ( app-emacs/auctex app-xemacs/auctex ) ) )
-	clisp? ( >=dev-lisp/clisp-2.33.2-r1 )
-	gcl?   ( >=dev-lisp/gcl-2.6.7 )
-	sbcl?  ( >=dev-lisp/sbcl-0.9.4 app-misc/rlwrap )
-	cmucl? ( >=dev-lisp/cmucl-19a app-misc/rlwrap )
-	!clisp? ( !sbcl? ( !cmucl? ( >=dev-lisp/gcl-2.6.7 ) ) )
-	tk? ( >=dev-lang/tk-8.3.3 )"
-
-DEPEND="${RDEPEND} >=sys-apps/texinfo-4.3"
-# the make install already strips maxima exec.
-RESTRICT="strip"
-
-for lang in es pt; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-pkg_setup() {
-# Don't install in the main tree, as this may cause file collisions
-	if use tetex; 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 ! built_with_use -a sci-visualization/gnuplot gd; then
-		elog "To benefit full plotting capability of maxima,"
-		elog "enable the png and gd USE flags enabled for"
-		elog "both sci-visualization/gnuplot and media-libs/gd"
-		elog "Then re-emerge maxima"
-		epause 5
-	fi
-
-	# enable gcl if no other lisp selected
-	if use gcl || (! use cmucl && ! use clisp && ! use sbcl ); then
-		if ! built_with_use dev-lisp/gcl ansi; then
-			eerror "GCL must be installed with ANSI."
-			eerror "Try USE=\"ansi\" emerge gcl"
-			die "This package needs gcl with USE=ansi"
-		fi
-		enablegcl="--enable-gcl"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# use xdg-open to view html, ps, pdf
-	epatch "${FILESDIR}/${P}-xdg-utils.patch"
-	# diff_form autoloading
-	epatch "${FILESDIR}/${P}-diff_form.patch"
-}
-
-src_compile() {
-	# automake version mismatch otherwise (sbcl only)
-	use sbcl && eautoreconf
-
-	# remove rmaxima if neither cmucl nor sbcl
-	if ! use sbcl && ! use cmucl ; then
-		sed -i -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' src/Makefile.in
-	fi
-
-	# remove xmaxima if no tk
-	local myconf="${enablegcl}"
-	if use tk; then
-		myconf="${myconf} --with-wish=wish"
-	else
-		myconf="${myconf} --with-wish=none"
-		sed -i -e '/^SUBDIRS/s/xmaxima//' interfaces/Makefile.in
-	fi
-
-	# enable existing translated doc
-	if use nls; then
-		for lang in es pt; do
-			if use linguas_${lang}; then
-				myconf="${myconf} --enable-lang-${lang}"
-				use unicode && myconf="${myconf} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	econf \
-		$(use_enable cmucl) \
-		$(use_enable clisp) \
-		$(use_enable sbcl) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use tk && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
-		"Science;Math;Education"
-
-	use emacs && \
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el
-
-	if use tetex; then
-		insinto "${MAXIMA_TEXMFDIR}/tex/latex/emaxima"
-		doins interfaces/emacs/emaxima/emaxima.sty
-	fi
-
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS ChangeLog COPYING NEWS README*
-	dodir /usr/share/doc
-	dosym /usr/share/${PN}/${PV}/doc /usr/share/doc/${PF}
-}
-
-pkg_preinst() {
-	# some lisp do not gunzip info files on the fly
-	if use cmucl || use clisp || use sbcl; then
-		for infofile in $(ls ${D}/usr/share/info/*.gz); do
-			gunzip ${infofile}
-		done
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use tetex && mktexlsr
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-mathematics/maxima/maxima-5.13.0.ebuild b/sci-mathematics/maxima/maxima-5.13.0.ebuild
deleted file mode 100644
index 794e4a616c82..000000000000
--- a/sci-mathematics/maxima/maxima-5.13.0.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0.ebuild,v 1.7 2007/09/23 11:46:13 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"
-IUSE="cmucl clisp sbcl gcl tetex emacs tk nls unicode"
-
-# rlwrap is recommended for cmucl and sbcl
-RDEPEND=">=sci-visualization/gnuplot-4.0
-	x11-misc/xdg-utils
-	tetex? ( virtual/tetex )
-	emacs? ( virtual/emacs
-		 tetex? ( || ( app-emacs/auctex app-xemacs/auctex ) ) )
-	clisp? ( !sbcl? ( dev-lisp/clisp ) )
-	gcl?   ( !sbcl? ( !clisp? ( !cmucl? ( dev-lisp/gcl ) ) ) )
-	sbcl?  ( dev-lisp/sbcl app-misc/rlwrap )
-	cmucl? ( !sbcl? ( !clisp? ( >=dev-lisp/cmucl-19a app-misc/rlwrap ) ) )
-	!clisp? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) )
-	tk? ( dev-lang/tk )"
-
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-LANGS="es pt pt_BR"
-for lang in ${LANGS}; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-RESTRICT="clisp? ( strip )"
-
-pkg_setup() {
-	# Don't install in the main tree, as this may cause file collisions
-	if use tetex; 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 ! built_with_use sci-visualization/gnuplot gd; then
-		elog "To benefit full plotting capability of maxima,"
-		elog "enable the gd USE flag enabled for sci-visualization/gnuplot"
-		elog "Then re-emerge maxima"
-		epause 5
-	fi
-
-	# lisp priorities
-	MAXIMA_LISP="sbcl"
-	if use clisp && ! use sbcl; then
-		MAXIMA_LISP=clisp
-	elif use cmucl && ! use clisp && ! use sbcl; then
-		MAXIMA_LISP=cmucl
-	elif use gcl && ! use cmucl && ! use clisp && ! use sbcl; then
-		MAXIMA_LISP=gcl
-	fi
-	einfo "Selected lisp: ${MAXIMA_LISP}"
-
-	if [[ ${MAXIMA_LISP} == gcl ]]; then
-		ewarn "Using gcl: if it breaks, recompile with another lisp or use default (sbcl)."
-		if ! built_with_use dev-lisp/gcl ansi; then
-			eerror "GCL must be installed with ANSI."
-			eerror "Try USE=\"ansi\" emerge gcl"
-			die "This package needs gcl with USE=ansi"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# use xdg-open to view ps, pdf
-	epatch "${FILESDIR}"/${P}-xdg-utils.patch
-	# remove rmaxima if neither cmucl nor sbcl
-	if [[ ${MAXIMA_LISP} != cmucl ]] || [[ ${MAXIMA_LISP} != sbcl ]]; then
-		sed -i \
-			-e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \
-			"${S}"/src/Makefile.in \
-			|| die "sed for rmaxima failed"
-	fi
-}
-
-src_compile() {
-	local myconf="--enable-${MAXIMA_LISP}"
-	# 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 || die "einstall failed"
-
-	use tk && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
-		"Science;Math;Education"
-
-	use emacs && \
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el
-
-	if use tetex; 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
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS COPYING ChangeLog-${PV} README README.lisps
-	dodir /usr/share/doc
-	dosym /usr/share/${PN}/${PV}/doc /usr/share/doc/${PF}
-}
-
-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 tetex && mktexlsr
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}