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

Package-Manager: portage-2.1.3.19

3 files changed, 30 insertions, 16 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/Manifest b/sci-visualization/gnuplot/Manifest
index bb1729cdec84..998f4b31f706 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnuplot-4.0-filled-arrow.patch 1349 RMD160 99c620fda889773a4814726e339e51095924a38b SHA1 8a32dfc108e1a82fd013899a194f9a31e1e0ac0a SHA256 aa3adb859e5ed943d948e8817e24b9f3e391411684ca4bdea5485374d976e652
 MD5 7af7e5f057531526e6c3447bf18c2ed8 files/gnuplot-4.0-filled-arrow.patch 1349
 RMD160 99c620fda889773a4814726e339e51095924a38b files/gnuplot-4.0-filled-arrow.patch 1349
@@ -28,18 +31,18 @@ EBUILD gnuplot-4.0-r2.ebuild 4095 RMD160 43c417c795b8862c94078876c194f3ad401f2ab
 MD5 f5e9609e7d10edcb2e3e9941557a9dfd gnuplot-4.0-r2.ebuild 4095
 RMD160 43c417c795b8862c94078876c194f3ad401f2ab3 gnuplot-4.0-r2.ebuild 4095
 SHA256 b67fef14ee8158edc9af2bccac7c43875b4c3fd1462b54ebf139b0fe5034072f gnuplot-4.0-r2.ebuild 4095
-EBUILD gnuplot-4.2.2-r1.ebuild 5194 RMD160 378aeab98cefb6113f44ef6b76dd397c8fa7e184 SHA1 bd4e4185a8d5f38534cebae110fdd7d8b8c86725 SHA256 fe93618dd8a8fc8b460686bb9212ed59b824284ad5d2c1e5f18bf2064d64548f
-MD5 9106afb697bbe661f0c2c76c2acc24cd gnuplot-4.2.2-r1.ebuild 5194
-RMD160 378aeab98cefb6113f44ef6b76dd397c8fa7e184 gnuplot-4.2.2-r1.ebuild 5194
-SHA256 fe93618dd8a8fc8b460686bb9212ed59b824284ad5d2c1e5f18bf2064d64548f gnuplot-4.2.2-r1.ebuild 5194
+EBUILD gnuplot-4.2.2-r1.ebuild 5227 RMD160 86072edd5e9780f7cd3521bd6e66aa2952029010 SHA1 e12e9d571af6328eaf554d5cbbf4d434c20e061b SHA256 4bddcba192dfe41b2c381ab07e4a6fd81532427e85f58b7e75dd78edb2f13a16
+MD5 e0c2490a9c803c4e142bdd65af44fede gnuplot-4.2.2-r1.ebuild 5227
+RMD160 86072edd5e9780f7cd3521bd6e66aa2952029010 gnuplot-4.2.2-r1.ebuild 5227
+SHA256 4bddcba192dfe41b2c381ab07e4a6fd81532427e85f58b7e75dd78edb2f13a16 gnuplot-4.2.2-r1.ebuild 5227
 EBUILD gnuplot-4.2.2.ebuild 5258 RMD160 3c232dca60fa5de13f7af8bb0cef7862e3c8e9ea SHA1 730d56a94913709790d30fbda125ec70f0f484d2 SHA256 896c71b483f3aca5752e9e9d24ed10e0f9bee98d392376f1b14fbc05da6a24dd
 MD5 5b57267407ab2ad70759f445d1c5d8fc gnuplot-4.2.2.ebuild 5258
 RMD160 3c232dca60fa5de13f7af8bb0cef7862e3c8e9ea gnuplot-4.2.2.ebuild 5258
 SHA256 896c71b483f3aca5752e9e9d24ed10e0f9bee98d392376f1b14fbc05da6a24dd gnuplot-4.2.2.ebuild 5258
-MISC ChangeLog 14757 RMD160 8ab9cd80a59258187945c6da39dbc0f7166a4c74 SHA1 c79810a5df307bc3d841fb152c163f70e5cce8c3 SHA256 e6c346572d422ecb3081b7f6b44009e394e85d0ad0c0f3f0d8e75b977c4c9b9d
-MD5 a0925d73115da054ace2b8b2df50a319 ChangeLog 14757
-RMD160 8ab9cd80a59258187945c6da39dbc0f7166a4c74 ChangeLog 14757
-SHA256 e6c346572d422ecb3081b7f6b44009e394e85d0ad0c0f3f0d8e75b977c4c9b9d ChangeLog 14757
+MISC ChangeLog 14912 RMD160 b686e488c739ff2c8d5e39e813dbf260ddb8bbb9 SHA1 292e55f930e9ce81fda86ac81f7fc83b907fdc87 SHA256 08d69c3d66253d6430a330d609e6afb0e02d73ff43fa7f3df13f66b8bd6a5530
+MD5 8387484d10c325cd37b07692327cda0d ChangeLog 14912
+RMD160 b686e488c739ff2c8d5e39e813dbf260ddb8bbb9 ChangeLog 14912
+SHA256 08d69c3d66253d6430a330d609e6afb0e02d73ff43fa7f3df13f66b8bd6a5530 ChangeLog 14912
 MISC metadata.xml 217 RMD160 638a2f8a6696aef0ba64892bf3cd428a888546a3 SHA1 695d81d47b7947c020b99d5df45ad09930645c0a SHA256 28facc7a36b103a2edeb955f3dde1230ae5d5c8d02b786e1b39141b8c7341d9e
 MD5 1ffd0cc3bc54695ef54f05ac7ed4efef metadata.xml 217
 RMD160 638a2f8a6696aef0ba64892bf3cd428a888546a3 metadata.xml 217
@@ -53,3 +56,10 @@ SHA256 ab25cb4ca0103199010d2d93c5b0744047b8e1616674b0c2087246949b59ad2c files/di
 MD5 e5c3d8415e0636858d249fde0731f3f0 files/digest-gnuplot-4.2.2-r1 244
 RMD160 3f2e986756041f0a37c0864b14d0cc41388135c5 files/digest-gnuplot-4.2.2-r1 244
 SHA256 ab25cb4ca0103199010d2d93c5b0744047b8e1616674b0c2087246949b59ad2c files/digest-gnuplot-4.2.2-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHNcATNQqtfCuFneMRAsBpAJ49yny5xD+A6JK6xr/FmIgQLNRraACfZlZd
+/Hsttkk1ho221XIuIbECeAk=
+=2IxO
+-----END PGP SIGNATURE-----
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
 }