Switched tetex useflag and dependency to latex and latex-base, respectively (see bug #196745).

(Portage version: 2.1.3.19)

8 files changed, 36 insertions, 29 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 66f235100d45..dff1b00cbe5a 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.48 2007/10/15 14:49:46 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.49 2007/11/20 14:46:56 markusle Exp $
+
+  20 Nov 2007; Markus Dittrich <markusle@gentoo.org>
+  octave-2.1.57-r1.ebuild, octave-2.1.69.ebuild, octave-2.1.71-r2.ebuild,
+  octave-2.1.72.ebuild, octave-2.1.73.ebuild, octave-2.1.73-r1.ebuild,
+  octave-2.1.73-r2.ebuild:
+  Switched tetex useflag and dependency to latex and latex-base,
+  respectively (see bug #196745).
 
   15 Oct 2007; Markus Rothe <corsair@gentoo.org> octave-2.1.73-r1.ebuild:
   Stable on ppc64
diff --git a/sci-mathematics/octave/octave-2.1.57-r1.ebuild b/sci-mathematics/octave/octave-2.1.57-r1.ebuild
index 8f00ed1b7c89..436607f1c5ee 100644
--- a/sci-mathematics/octave/octave-2.1.57-r1.ebuild
+++ b/sci-mathematics/octave/octave-2.1.57-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.57-r1.ebuild,v 1.9 2007/03/16 22:38:28 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.57-r1.ebuild,v 1.10 2007/11/20 14:46:56 markusle Exp $
 
 inherit flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.octave.org/pub/octave/bleeding-edge/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc alpha ~sparc amd64"
-IUSE="emacs static readline zlib tetex hdf5 mpi ifc blas"
+IUSE="emacs static readline zlib latex hdf5 mpi ifc blas"
 
 DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2-r3
@@ -21,7 +21,7 @@ DEPEND="virtual/libc
 	>=dev-util/gperf-2.7.2
 	zlib? ( sys-libs/zlib )
 	hdf5? ( sci-libs/hdf5 )
-	tetex? ( virtual/tetex )
+	latex? ( virtual/latex-base )
 	x86? ( ifc? ( dev-lang/ifc ) )
 	blas? ( virtual/blas )"
 
@@ -76,7 +76,7 @@ src_install() {
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
 		install || die "make install failed"
-	use tetex && octave-install-doc
+	use latex && octave-install-doc
 	if use emacs; then
 		cd emacs
 		exeinto /usr/bin
@@ -89,7 +89,7 @@ src_install() {
 		cd ..
 	fi
 	dodir /etc/env.d
-	echo "LDPATH=/usr/lib/octave-${PV}" > ${D}/etc/env.d/99octave
+	echo "LDPATH=/usr/lib/octave-${PV}" > "${D}"/etc/env.d/99octave
 }
 
 pkg_postinst() {
diff --git a/sci-mathematics/octave/octave-2.1.69.ebuild b/sci-mathematics/octave/octave-2.1.69.ebuild
index cfabbd998e18..0ddfbf53910f 100644
--- a/sci-mathematics/octave/octave-2.1.69.ebuild
+++ b/sci-mathematics/octave/octave-2.1.69.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.69.ebuild,v 1.10 2007/03/16 22:38:28 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.69.ebuild,v 1.11 2007/11/20 14:46:56 markusle Exp $
 
 inherit flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.octave.org/pub/octave/bleeding-edge/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc ~sparc x86"
-IUSE="emacs static readline zlib tetex hdf5 mpi ifc blas"
+IUSE="emacs static readline zlib latex hdf5 mpi ifc blas"
 
 DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2-r3
@@ -21,7 +21,7 @@ DEPEND="virtual/libc
 	>=dev-util/gperf-2.7.2
 	zlib? ( sys-libs/zlib )
 	hdf5? ( sci-libs/hdf5 )
-	tetex? ( virtual/tetex )
+	latex? ( virtual/latex-base )
 	x86? ( ifc? ( dev-lang/ifc ) )
 	blas? ( virtual/blas )
 	mpi? ( sys-cluster/lam-mpi )
@@ -68,8 +68,8 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "make install failed"
-	use tetex && octave-install-doc
+	make install DESTDIR="${D}" || die "make install failed"
+	use latex && octave-install-doc
 	if use emacs; then
 		cd emacs
 		exeinto /usr/bin
@@ -82,11 +82,11 @@ src_install() {
 		cd ..
 	fi
 	dodir /etc/env.d
-	echo "LDPATH=/usr/lib/octave-${PV}" > ${D}/etc/env.d/99octave
+	echo "LDPATH=/usr/lib/octave-${PV}" > "${D}"/etc/env.d/99octave
 
 	# Fixes ls-R files to remove /var/tmp/portage references.
-	sed -i -e "s:${D}::g" ${D}/usr/libexec/${PN}/ls-R || die
-	sed -i -e "s:${D}::g" ${D}/usr/share/${PN}/ls-R || die
+	sed -i -e "s:${D}::g" "${D}"/usr/libexec/${PN}/ls-R || die
+	sed -i -e "s:${D}::g" "${D}"/usr/share/${PN}/ls-R || die
 }
 
 pkg_postinst() {
diff --git a/sci-mathematics/octave/octave-2.1.71-r2.ebuild b/sci-mathematics/octave/octave-2.1.71-r2.ebuild
index fb81ab7e6575..c6018f1ab208 100644
--- a/sci-mathematics/octave/octave-2.1.71-r2.ebuild
+++ b/sci-mathematics/octave/octave-2.1.71-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.71-r2.ebuild,v 1.4 2007/07/13 05:28:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.71-r2.ebuild,v 1.5 2007/11/20 14:46:56 markusle Exp $
 
 inherit flag-o-matic fortran
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.octave.org/pub/octave/bleeding-edge/${P}.tar.bz2
 		ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/${P}.tar.bz2"
 
 SLOT="0"
-IUSE="emacs static readline zlib tetex hdf5 mpi blas"
+IUSE="emacs static readline zlib latex hdf5 mpi blas"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="virtual/libc
@@ -21,7 +21,7 @@ DEPEND="virtual/libc
 	>=dev-util/gperf-2.7.2
 	zlib? ( sys-libs/zlib )
 	hdf5? ( sci-libs/hdf5 )
-	tetex? ( virtual/tetex )
+	latex? ( virtual/latex-base )
 	blas? ( virtual/blas )
 	mpi? ( virtual/mpi )
 	!=app-text/texi2html-1.70"
@@ -69,7 +69,7 @@ src_compile() {
 
 src_install() {
 	make install DESTDIR="${D}" || die "make install failed"
-	if use tetex; then
+	if use latex; then
 		octave-install-doc || die "Octave doc install failed"
 	fi
 	if use emacs; then
diff --git a/sci-mathematics/octave/octave-2.1.72.ebuild b/sci-mathematics/octave/octave-2.1.72.ebuild
index bcb7945c423b..7d45db868158 100644
--- a/sci-mathematics/octave/octave-2.1.72.ebuild
+++ b/sci-mathematics/octave/octave-2.1.72.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.72.ebuild,v 1.11 2007/07/13 05:28:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.72.ebuild,v 1.12 2007/11/20 14:46:56 markusle Exp $
 
 inherit flag-o-matic fortran
 
@@ -21,7 +21,7 @@ DEPEND="virtual/libc
 	>=dev-util/gperf-2.7.2
 	zlib? ( sys-libs/zlib )
 	hdf5? ( sci-libs/hdf5 )
-	doc? ( virtual/tetex )
+	doc? ( virtual/latex-base )
 	blas? ( virtual/blas )
 	mpi? ( virtual/mpi )
 	!=app-text/texi2html-1.70"
diff --git a/sci-mathematics/octave/octave-2.1.73-r1.ebuild b/sci-mathematics/octave/octave-2.1.73-r1.ebuild
index 169cd0845219..568d09144b25 100644
--- a/sci-mathematics/octave/octave-2.1.73-r1.ebuild
+++ b/sci-mathematics/octave/octave-2.1.73-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.5 2007/10/15 14:49:46 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.6 2007/11/20 14:46:56 markusle Exp $
 
 inherit flag-o-matic fortran autotools
 
@@ -22,7 +22,7 @@ DEPEND="virtual/libc
 	>=dev-util/gperf-2.7.2
 	zlib? ( sys-libs/zlib )
 	hdf5? ( sci-libs/hdf5 )
-	doc? ( virtual/tetex )
+	doc? ( virtual/latex-base )
 	blas? ( virtual/blas )
 	mpi? ( virtual/mpi )
 	!=app-text/texi2html-1.70"
diff --git a/sci-mathematics/octave/octave-2.1.73-r2.ebuild b/sci-mathematics/octave/octave-2.1.73-r2.ebuild
index d31ea2316b93..2bd51ecea313 100644
--- a/sci-mathematics/octave/octave-2.1.73-r2.ebuild
+++ b/sci-mathematics/octave/octave-2.1.73-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild,v 1.2 2007/07/13 05:28:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild,v 1.3 2007/11/20 14:46:56 markusle Exp $
 
 inherit flag-o-matic fortran autotools
 
@@ -24,7 +24,7 @@ DEPEND="virtual/libc
 	virtual/lapack
 	zlib? ( sys-libs/zlib )
 	hdf5? ( sci-libs/hdf5 )
-	doc? ( virtual/tetex )
+	doc? ( virtual/latex-base )
 	mpi? ( virtual/mpi )
 	!=app-text/texi2html-1.70"
 
diff --git a/sci-mathematics/octave/octave-2.1.73.ebuild b/sci-mathematics/octave/octave-2.1.73.ebuild
index c4c1f1fd9eb8..247bf1836f8c 100644
--- a/sci-mathematics/octave/octave-2.1.73.ebuild
+++ b/sci-mathematics/octave/octave-2.1.73.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73.ebuild,v 1.7 2007/07/13 05:28:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73.ebuild,v 1.8 2007/11/20 14:46:56 markusle Exp $
 
 inherit flag-o-matic fortran
 
@@ -21,7 +21,7 @@ DEPEND="virtual/libc
 	>=dev-util/gperf-2.7.2
 	zlib? ( sys-libs/zlib )
 	hdf5? ( sci-libs/hdf5 )
-	doc? ( virtual/tetex )
+	doc? ( virtual/latex-base )
 	blas? ( virtual/blas )
 	mpi? ( virtual/mpi )
 	!=app-text/texi2html-1.70"