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

Package-Manager: portage-2.1.4_rc14

6 files changed, 30 insertions, 142 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/Manifest b/sci-mathematics/maxima/Manifest
index 3d5d9c6d4104..bc16f38c2c78 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50maxima-gentoo.el 600 RMD160 c45cc012987d2a74670ad9aac2b019a1233bd151 SHA1 f05c4ce4f51f2e3d0399fa04de9d8fc8b0296386 SHA256 32cd4c9e958c96e93bb74ee324196efa8f88a90e4508c4c67733c691d6969dfe
 MD5 95fb9c201700548f3d70d62eed081a98 files/50maxima-gentoo.el 600
 RMD160 c45cc012987d2a74670ad9aac2b019a1233bd151 files/50maxima-gentoo.el 600
@@ -6,24 +9,15 @@ AUX maxima-5.13.0-xdg-utils.patch 1338 RMD160 17ef40d37ff6cc4e0073ef55b8df8c23d6
 MD5 8ca529e492f36715ca281a1a6df75849 files/maxima-5.13.0-xdg-utils.patch 1338
 RMD160 17ef40d37ff6cc4e0073ef55b8df8c23d6990949 files/maxima-5.13.0-xdg-utils.patch 1338
 SHA256 77bd288ebb496689b97955431317ba23d8dc67f6655330194974c0efbba087a0 files/maxima-5.13.0-xdg-utils.patch 1338
-AUX maxima-emacs.patch 826 RMD160 e6030b78934ace0c31b1cddf108e3e885cee7abf SHA1 cda574027e3a00a51638866454e8b4dc178420bf SHA256 eb28871fb0019c92961a96f27380400379798eac7b884943a3c75ba9832acce4
-MD5 55d928e715074355a442baf0934487de files/maxima-emacs.patch 826
-RMD160 e6030b78934ace0c31b1cddf108e3e885cee7abf files/maxima-emacs.patch 826
-SHA256 eb28871fb0019c92961a96f27380400379798eac7b884943a3c75ba9832acce4 files/maxima-emacs.patch 826
 DIST maxima-5.13.0.tar.gz 19216173 RMD160 2ec91678f8c6a6f863d6ba448f299793e52c822a SHA1 caac53226fa251a22b577c2f76dc171913e71323 SHA256 9625e09785f88f738faf40ad64889acd17328e043c39ef5ad56f3172d76af187
-DIST maxima-5.9.1.tar.gz 8093534 RMD160 26940d11d6cba4125319a3c83234964af81e4603 SHA1 87dcf337f3f628ae78ef6bfaed694e98ad26f207 SHA256 fd402f2d13f6e03ac30c59e333aeb6f4993fa43fbf44cb1b36deba447d5cb2a4
-EBUILD maxima-5.13.0-r1.ebuild 5396 RMD160 927b93380725a9398f7ec6ff2eb7657c8ef68496 SHA1 60a3ec986cb8f93e2547d3fcdde638cd1ca84bce SHA256 607aad840f65d6c2d538bcf191b46671f5727e3adc6aa775eafdb8b19f9ff37d
-MD5 186d9113d2d40ee47c7372fcba44a16e maxima-5.13.0-r1.ebuild 5396
-RMD160 927b93380725a9398f7ec6ff2eb7657c8ef68496 maxima-5.13.0-r1.ebuild 5396
-SHA256 607aad840f65d6c2d538bcf191b46671f5727e3adc6aa775eafdb8b19f9ff37d maxima-5.13.0-r1.ebuild 5396
-EBUILD maxima-5.9.1.ebuild 2591 RMD160 3807d5f319205e3a364fad7723941fd62faa85b3 SHA1 0fda6e054ffa5c891f26bd592a81d7a3b5ecf116 SHA256 16a245895f801b710aebb6d65cec8bef3431b597b102a37e7e12a1ec8aac6d20
-MD5 c4381a2547c2bc33abbbb2441f36de9e maxima-5.9.1.ebuild 2591
-RMD160 3807d5f319205e3a364fad7723941fd62faa85b3 maxima-5.9.1.ebuild 2591
-SHA256 16a245895f801b710aebb6d65cec8bef3431b597b102a37e7e12a1ec8aac6d20 maxima-5.9.1.ebuild 2591
-MISC ChangeLog 11847 RMD160 3293048b1a522ab52e7ecfc56102483282c859f1 SHA1 523922b7d1e915f956cda789243e8d2f4432ddc1 SHA256 b2a0a2ad227ae640e75dfae93073209169a6cde23666a1a6cfc860a6367d2df7
-MD5 b654c400105807d31b2e138028fb6ea3 ChangeLog 11847
-RMD160 3293048b1a522ab52e7ecfc56102483282c859f1 ChangeLog 11847
-SHA256 b2a0a2ad227ae640e75dfae93073209169a6cde23666a1a6cfc860a6367d2df7 ChangeLog 11847
+EBUILD maxima-5.13.0-r1.ebuild 5522 RMD160 d9f6bee74ea69cc01d4c3cf47800c77919f39b37 SHA1 debc17a57178140d7b31a3193c4fac2d36b57bd4 SHA256 0be180a14134ec37e0d942177ea61d2b11cc21985cd4a64c5313a61a3cdfd80a
+MD5 047f44a35a2194cbf394a0aedcf42b6d maxima-5.13.0-r1.ebuild 5522
+RMD160 d9f6bee74ea69cc01d4c3cf47800c77919f39b37 maxima-5.13.0-r1.ebuild 5522
+SHA256 0be180a14134ec37e0d942177ea61d2b11cc21985cd4a64c5313a61a3cdfd80a maxima-5.13.0-r1.ebuild 5522
+MISC ChangeLog 12048 RMD160 5ddc1bf8b2e3ada4daabb4ba708a471dda8caf44 SHA1 487b727363501aa3850701ceece4f55ca450b2c5 SHA256 89c0c4fbc4e6d723110e9cb134af4bab53c9d7f46252cbb89d7f9c2cbf781abf
+MD5 80dcc092529202718ea7ad71c42a6191 ChangeLog 12048
+RMD160 5ddc1bf8b2e3ada4daabb4ba708a471dda8caf44 ChangeLog 12048
+SHA256 89c0c4fbc4e6d723110e9cb134af4bab53c9d7f46252cbb89d7f9c2cbf781abf ChangeLog 12048
 MISC metadata.xml 737 RMD160 6f833e02ea5b87a66064c32e7c35889c63c96649 SHA1 bff378e387662ce5e4c4168c74ee7ff1493c41a4 SHA256 9deb0b30538b6d35c0877384b97620eda2dde0bf3b4c702ccdadb007e868daef
 MD5 747fd88897ef9ae5002fa891864f42aa metadata.xml 737
 RMD160 6f833e02ea5b87a66064c32e7c35889c63c96649 metadata.xml 737
@@ -31,6 +25,10 @@ SHA256 9deb0b30538b6d35c0877384b97620eda2dde0bf3b4c702ccdadb007e868daef metadata
 MD5 bf375c7552912ceecc1fc46f88666997 files/digest-maxima-5.13.0-r1 247
 RMD160 0524fa00896c54a0665fda0a339f63d586c4f232 files/digest-maxima-5.13.0-r1 247
 SHA256 028f67a7e79b0da58e6801c926a0fddfa674e4ed45300a1a7f9d2eda64c263be files/digest-maxima-5.13.0-r1 247
-MD5 ef493f2f9d7c8570ac06239a94707fae files/digest-maxima-5.9.1 241
-RMD160 ca6bee5d10da060eff2d678ed90099d3f50fa198 files/digest-maxima-5.9.1 241
-SHA256 c9f64acc636ed728a8c03269f4e58f16cb6b335b25c49fc4f7e308d06629d687 files/digest-maxima-5.9.1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHgtCU1ycZbhPLE2ARArOZAJ9C1vkj0oi/mHsMY7phFsXo0oNezgCglw2B
+EtijNBkkzSCnYTilOp1FHzc=
+=QPz1
+-----END PGP SIGNATURE-----
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
-}