tetex version dependency should now be more than 3 (bug #203558)

(Portage version: 2.1.4_rc14)

5 files changed, 12 insertions, 122 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 724c604c6330..f524a32e9e52 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,10 @@
 # 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.45 2007/12/22 13:13:28 nixnut Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.46 2008/01/08 01:23:19 bicatali Exp $
+
+  08 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/maxima-emacs.patch, -maxima-5.9.1.ebuild, maxima-5.13.0-r1.ebuild:
+  tetex version dependency should now be more than 3 (bug #203558)
 
   22 Dec 2007; nixnut <nixnut@gentoo.org> maxima-5.13.0-r1.ebuild:
   Stable on ppc wrt bug 201216
diff --git a/sci-mathematics/maxima/files/digest-maxima-5.9.1 b/sci-mathematics/maxima/files/digest-maxima-5.9.1
deleted file mode 100644
index dc43049bb73d..000000000000
--- a/sci-mathematics/maxima/files/digest-maxima-5.9.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 659acfad1f61444cf5b38f6c28279d40 maxima-5.9.1.tar.gz 8093534
-RMD160 26940d11d6cba4125319a3c83234964af81e4603 maxima-5.9.1.tar.gz 8093534
-SHA256 fd402f2d13f6e03ac30c59e333aeb6f4993fa43fbf44cb1b36deba447d5cb2a4 maxima-5.9.1.tar.gz 8093534
diff --git a/sci-mathematics/maxima/files/maxima-emacs.patch b/sci-mathematics/maxima/files/maxima-emacs.patch
deleted file mode 100644
index 1775d82dcf31..000000000000
--- a/sci-mathematics/maxima/files/maxima-emacs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- maxima.el~	2004-07-20 19:18:05.000000000 +0200
-+++ maxima.el	2004-08-03 18:17:47.559653376 +0200
-@@ -50,7 +50,7 @@
- ;; Some variables that may have to be set in order to use the maxima help:
- ;;  maxima-info-dir
- ;;         This should be the directory where the maxima info files are kept.
--;;         By default, it is "/usr/local/info/"
-+;;         By default, it is "/usr/share/info/"
- ;;  maxima-info-index-file
- ;;         This should be the name of the maxima info file that contains
- ;;         the index, by default, it is "maxima.info-15"
-@@ -213,7 +213,7 @@
- (defvar maxima-newline-style nil
-   "For compatability.")
-
--(defcustom maxima-info-dir "/usr/local/info/"
-+(defcustom maxima-info-dir "/usr/share/info/"
-   "*The directory where the maxima info files are kept."
-   :group 'maxima
-   :type '(directory))
diff --git a/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild b/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild
index 3a6f961a5e72..c987cf4f88fc 100644
--- a/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.13.0-r1.ebuild,v 1.8 2007/12/22 13:13:28 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.13.0-r1.ebuild,v 1.9 2008/01/08 01:23:19 bicatali Exp $
 
 inherit eutils elisp-common
 
@@ -14,9 +14,12 @@ KEYWORDS="amd64 ppc sparc x86"
 IUSE="cmucl clisp sbcl gcl latex emacs tk nls unicode"
 
 # rlwrap is recommended for cmucl and sbcl
+# tetex>=3, so no use of virtual/latex-base (bug #203558)
 RDEPEND=">=sci-visualization/gnuplot-4.0
 	x11-misc/xdg-utils
-	latex? ( virtual/latex-base )
+	latex? ( || ( dev-texlive/texlive-latexrecommended
+				>=app-text/tetex-3
+				app-text/ptex ) )
 	emacs? ( virtual/emacs
 		 latex? ( || ( app-emacs/auctex app-xemacs/auctex ) ) )
 	sbcl? ( dev-lisp/sbcl app-misc/rlwrap )
diff --git a/sci-mathematics/maxima/maxima-5.9.1.ebuild b/sci-mathematics/maxima/maxima-5.9.1.ebuild
deleted file mode 100644
index fcf7316d03a9..000000000000
--- a/sci-mathematics/maxima/maxima-5.9.1.ebuild
+++ /dev/null
@@ -1,94 +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.9.1.ebuild,v 1.6 2007/11/20 15:03:57 markusle Exp $
-
-inherit eutils
-
-DESCRIPTION="Free computer algebra environment, based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/maxima/${P}.tar.gz"
-
-LICENSE="GPL-2 AECA"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE="cmucl clisp gcl latex emacs auctex"
-
-DEPEND="latex? ( virtual/latex-base )
-	emacs? ( virtual/emacs )
-	auctex? ( app-emacs/auctex )
-	>=sys-apps/texinfo-4.3
-	x86? ( !clisp?	( !gcl? ( !cmucl? ( dev-lisp/cmucl ) ) ) )
-	clisp? ( dev-lisp/clisp )
-	x86? ( cmucl? ( dev-lisp/cmucl ) )
-	x86? ( gcl?   ( dev-lisp/gcl ) )"
-RDEPEND=">=dev-lang/tk-8.3.3
-	>=sci-visualization/gnuplot-4.0-r1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/interfaces/emacs/emaxima
-	epatch "${FILESDIR}"/maxima-emacs.patch
-}
-
-src_compile() {
-	local myconf=""
-	if use cmucl || use clisp || use gcl; then
-		if use cmucl; then
-			myconf="${myconf} --enable-cmucl"
-		fi
-		if use clisp; then
-			myconf="${myconf} --enable-clisp"
-		fi
-		if use gcl; then
-			myconf="${myconf} --enable-gcl"
-		fi
-	else
-		myconf="${myconf} --enable-cmucl"
-	fi
-
-	./configure --prefix=/usr ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	if use emacs
-	then
-		elisp-install "${S}"/interfaces/emacs/emaxima *.el *.elc
-		insinto /usr/share/emacs/site-lisp
-		doins "${S}"/interfaces/emacs/emaxima/emaxima.lisp
-	fi
-	if use latex
-	then
-		insinto /usr/share/texmf/tex/latex/emaxima
-		doins "${S}"/interfaces/emacs/emaxima/emaxima.sty
-	fi
-	#move docs to the appropriate place
-	dodoc AUTHORS ChangeLog NEWS README*
-	mv "${D}"/usr/share/${PN}/${PV}/doc/* "${D}"/usr/share/doc/${PF}/
-	dosym /usr/share/doc/${PF} /usr/share/${PN}/${PV}/doc
-}
-
-pkg_postinst() {
-	if use emacs
-	then
-		einfo "Running elisp-site-regen...."
-		elisp-site-regen
-	fi
-	if use latex
-	then
-		einfo "Running mktexlsr to rebuild ls-R database...."
-		mktexlsr
-	fi
-	if use emacs
-	then
-		einfo "In order to use Maxima with emacs, add the following to your"
-		einfo ".emacs file:"
-		einfo '(setq load-path (cons "/usr/share/maxima/5.9.0/emacs" load-path))'
-		einfo "(autoload 'maxima-mode \"maxima\" \"Maxima mode\" t)"
-		einfo "(autoload 'maxima \"maxima\" \"Maxima interactive\" t)"
-		einfo "(setq auto-mode-alist (cons '(\"\\\\.max\" . maxima-mode) auto-mode-alist))"
-		einfo "(autoload 'emaxima-mode \"emaxima\" \"EMaxima\" t)"
-		einfo "(add-hook 'emaxima-mode-hook 'emaxima-mark-file-as-emaxima)"
-	fi
-}