--- mayavi-1.4.ebuild	2006-08-30 19:37:41.000000000 -0700
+++ mayavi-1.5.ebuild	2006-08-31 14:57:52.000000000 -0700
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="Scientific data visualizer"
 HOMEPAGE="http://mayavi.sourceforge.net"
@@ -11,25 +11,37 @@
 SLOT="0"
 KEYWORDS="~x86"
 
-IUSE="tcltk"
+IUSE="doc"
 
 DEPEND=">=dev-lang/python-2.0
 		>=dev-lang/tcl-8.2.3"
 	
-RDEPEND="dev-libs/vtk"
+RDEPEND="sci-libs/vtk"
 
-SRC_URI="http://download.sourceforge.net/mayavi/MayaVi-1.4.tar.gz"
+SRC_URI="http://download.sourceforge.net/mayavi/MayaVi-${PV}.tar.gz"
 
-S=${WORKDIR}/MayaVi-1.4
+S=${WORKDIR}/MayaVi-${PV}
 
-src_compile() {
-    if use tcltk; then
-		cd ${WORKDIR}/MayaVi-1.4
-		distutils_src_compile || die "src compile failed"
-	else
-		eerror "Use flag tcltk not enabled"
-		die "Recompile python with tcltk"
+pkg_setup() {
+	if ! built_with_use dev-lang/python tk ; then
+		eerror "python is missing tk support."
+		eerror "Please add 'tk' to your USE flags, and re-emerge python."
+		die "python needs tk support"
 	fi
+	echo ${PV}
+	# does vtk have to be compiled with tcl and tk as well?  What about
+	# patented?
+	#if ! built_with_use sci-libs/vtk tcl tk patented ; then
+	#	eerror "vtk is missing tcl, tk or patented support."
+	#	eerror "Please ensure you have the 'tcl', 'tk' and 'patented' USE flags"
+	#   error  "enabled for vtk and then re-emerge vtk."
+	#	die "vtk needs tcl, tk and patented USE flags"
+	#fi
+}
+
+src_compile() {
+	cd {S}
+	distutils_src_compile || die "src compile failed"
 }
 
 src_install() {
@@ -37,9 +49,10 @@
 	distutils_src_install
 	cd doc
 	dodoc *.txt
-	dohtml -r guide/*
-	dodir /usr/share/doc/${PF}/examples/
-	cp -r ${S}/examples/* ${D}/usr/share/doc/${PF}/examples/
-	
+	if use doc; then
+		dohtml -r guide/*
+		dodir /usr/share/doc/${PF}/examples/
+		cp -r ${S}/examples/* ${D}/usr/share/doc/${PF}/examples/
+	fi
 }