transition from tetex USE flag to latex; check for app-text/texlive, too

(Portage version: 2.1.3.19)

2 files changed, 12 insertions, 8 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 21e17fe38ae2..c57b70e99ea1 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.54 2007/11/08 17:52:14 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.55 2007/11/10 14:27:58 opfer Exp $
+
+  10 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
+  gnuplot-4.2.2-r1.ebuild:
+  transition from tetex USE flag to latex; check for app-text/texlive, too
 
   08 Nov 2007; Grant Goodyear <g2boojum@gentoo.org> metadata.xml:
   -m removed myself as maintainer
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.2-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.2-r1.ebuild
index fa2b42062216..fc748d001374 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2.2-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2.2-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-visualization/gnuplot/gnuplot-4.2.2-r1.ebuild,v 1.2 2007/10/31 07:00:37 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.2-r1.ebuild,v 1.3 2007/11/10 14:27:58 opfer Exp $
 
 inherit eutils elisp-common multilib wxwidgets
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
 LICENSE="gnuplot"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc emacs gd ggi tetex pdf plotutils readline svga wxwindows X xemacs"
+IUSE="doc emacs gd ggi latex pdf plotutils readline svga wxwindows X xemacs"
 
 RDEPEND="
 	xemacs? ( virtual/xemacs app-xemacs/texinfo app-xemacs/xemacs-base )
@@ -22,7 +22,7 @@ RDEPEND="
 	ggi? ( media-libs/libggi )
 	gd? ( >=media-libs/gd-2 )
 	doc? ( virtual/latex-base )
-	tetex? ( virtual/latex-base )
+	latex? ( virtual/latex-base )
 	X? ( x11-libs/libXaw )
 	svga? ( media-libs/svgalib )
 	readline? ( >=sys-libs/readline-4.2 )
@@ -39,7 +39,7 @@ S=${WORKDIR}/${MY_P}
 E_SITEFILE="50gnuplot-gentoo.el"
 
 latex_rehash() {
-	if has_version '>=app-text/tetex-3' || has_version '>=app-text/ptex-3.1.8' ; then
+	if has_version '>=app-text/tetex-3' || has_version '>=app-text/ptex-3.1.8' || has_version 'app-text/texlive'; then
 		texmf-update
 	else
 		texconfig rehash
@@ -65,7 +65,7 @@ src_unpack() {
 
 src_compile() {
 	# See bug #156427.
-	if use tetex ; then
+	if use latex ; then
 		sed -i \
 			-e 's/TEXMFLOCAL/TEXMFSITE/g' share/LaTeX/Makefile.in || die "sed failed"
 	else
@@ -174,10 +174,10 @@ pkg_postinst() {
 		einfo "this is usually considered to be a security hazard."
 		einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
 	fi
-	use tetex && latex_rehash
+	use latex && latex_rehash
 }
 
 pkg_postrm() {
 	use emacs && elisp-site-regen
-	use tetex && latex_rehash
+	use latex && latex_rehash
 }