removing latex-package.eclass again as it would pull in virtual/tetex unconditionally; introducing own rehash function based on work from latex-package.eclass; thanks to drac for sighting

Package-Manager: portage-2.1.2.12

3 files changed, 29 insertions, 16 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 9a4485553fb2..c2b3ae5b5476 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,11 @@
 # 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.35 2007/09/14 15:42:36 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.36 2007/09/15 09:02:46 opfer Exp $
+
+  15 Sep 2007; Christian Faulhammer <opfer@gentoo.org> gnuplot-4.2.2.ebuild:
+  removing latex-package.eclass again as it would pull in virtual/tetex
+  unconditionally; introducing own rehash function based on work from
+  latex-package.eclass; thanks to drac for sighting
 
   14 Sep 2007; Christian Faulhammer <opfer@gentoo.org> gnuplot-4.2.2.ebuild:
   do a rehash if USE flag tetex is set, see bug 192471by Sebastian Schubert
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 938d70c04518..8ce68372696d 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -44,14 +44,14 @@ EBUILD gnuplot-4.2.0.ebuild 4872 RMD160 6ef6ddd89fc6859a9dada1e7bc35497ad032b027
 MD5 835e17f9207a07b51deab21e7bbc756d gnuplot-4.2.0.ebuild 4872
 RMD160 6ef6ddd89fc6859a9dada1e7bc35497ad032b027 gnuplot-4.2.0.ebuild 4872
 SHA256 4144265d3b9f1cb4feb71bb3a0a5ecd040644ef2bcedec97677f539053191e9f gnuplot-4.2.0.ebuild 4872
-EBUILD gnuplot-4.2.2.ebuild 4976 RMD160 5cd9bcf23c86940bbd3de65be03c8aadac119066 SHA1 a1fbd81c84f46c2a2e581119a34c19f7b385ee8a SHA256 b976a6b3361bd20353a9bb20749644f661ac95d0fb882eb036b9d02317587a3d
-MD5 f3bfc3e8db04bfc8f178b1d8bd823f22 gnuplot-4.2.2.ebuild 4976
-RMD160 5cd9bcf23c86940bbd3de65be03c8aadac119066 gnuplot-4.2.2.ebuild 4976
-SHA256 b976a6b3361bd20353a9bb20749644f661ac95d0fb882eb036b9d02317587a3d gnuplot-4.2.2.ebuild 4976
-MISC ChangeLog 11848 RMD160 8519e53c771d8a9fededfa4ff2da8dde43c24227 SHA1 173bb34abb66cbd24cbf3cb6990fac293261226c SHA256 0dd906d543517bedfdaa52f4a552f0cf0e234e96d29745a329b287b5e57fb2b2
-MD5 08f43a5a378554b5f33c6975206c3ea2 ChangeLog 11848
-RMD160 8519e53c771d8a9fededfa4ff2da8dde43c24227 ChangeLog 11848
-SHA256 0dd906d543517bedfdaa52f4a552f0cf0e234e96d29745a329b287b5e57fb2b2 ChangeLog 11848
+EBUILD gnuplot-4.2.2.ebuild 5093 RMD160 194ac746a5ebb3def33e2bfd375011fe2a4ffd22 SHA1 98d6d2ee4b05cad78b261df840e70937ea53d1fd SHA256 129f9c79a08c63259d24ca055d9ac98d7bee8c9e909e826d68363e71df5eb1fb
+MD5 84aed190bd76d7e201c298031854511e gnuplot-4.2.2.ebuild 5093
+RMD160 194ac746a5ebb3def33e2bfd375011fe2a4ffd22 gnuplot-4.2.2.ebuild 5093
+SHA256 129f9c79a08c63259d24ca055d9ac98d7bee8c9e909e826d68363e71df5eb1fb gnuplot-4.2.2.ebuild 5093
+MISC ChangeLog 12120 RMD160 3ebecf3b777be8bddc6b0ebecbad6192637ff4d5 SHA1 6fe3c4d9dc95732c56b9845c9369b6c7b1a5d15b SHA256 3880742e31ff3bc522e843be1544e8189a43591558f6f233e41bc4d557929ff8
+MD5 64280a3fe61635dd5096ade22371ec99 ChangeLog 12120
+RMD160 3ebecf3b777be8bddc6b0ebecbad6192637ff4d5 ChangeLog 12120
+SHA256 3880742e31ff3bc522e843be1544e8189a43591558f6f233e41bc4d557929ff8 ChangeLog 12120
 MISC metadata.xml 281 RMD160 9578b17bd8b0f05da3044064822e531912d1817c SHA1 709ef0382fe7ec2d3746554f452ebd91bc0014f0 SHA256 702dd681c8877369b1ee1553a05fccbbb8633cb96c893f28a4dbcb5492d74511
 MD5 bd00d3bd41c122c9fc97c6aaaa7e468a metadata.xml 281
 RMD160 9578b17bd8b0f05da3044064822e531912d1817c metadata.xml 281
@@ -77,7 +77,7 @@ SHA256 ab25cb4ca0103199010d2d93c5b0744047b8e1616674b0c2087246949b59ad2c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG6qv0NQqtfCuFneMRAn3KAJwOnjDL0TlijU0nbbD/9eSDsXGSBwCfb8e/
-BL47GvSt/J0DjSzD3ep684k=
-=0J8m
+iD8DBQFG65/ANQqtfCuFneMRAi1aAJ4x98L3Kl8nSeucUyxShPqvzk7orgCePl2Q
+4+vVIupxRDoOAmqZPGGBf+o=
+=JQPV
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild
index 850ef94cf54d..9a5d9397ad72 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild
@@ -1,8 +1,8 @@
 # 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.ebuild,v 1.3 2007/09/14 15:42:36 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild,v 1.4 2007/09/15 09:02:46 opfer Exp $
 
-inherit eutils elisp-common latex-package multilib wxwidgets
+inherit eutils elisp-common multilib wxwidgets
 
 MY_P="${P/_/.}"
 
@@ -38,6 +38,14 @@ 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
+		texmf-update
+	else
+		texconfig rehash
+	fi
+}
+
 pkg_setup() {
 	if use gd && ! built_with_use media-libs/gd png; then
 		eerror "media-libs/gd needs to be built with PNG support"
@@ -161,10 +169,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-package_rehash
+	use tetex && latex_rehash
 }
 
 pkg_postrm() {
 	use emacs && elisp-site-regen
-	use tetex && latex-package_rehash
+	use tetex && latex_rehash
 }