--- plplot-5.3.1.ebuild	2005-01-09 12:46:07.000000000 -0800
+++ plplot-5.3.1-r1.ebuild	2005-01-09 12:45:40.000000000 -0800
@@ -28,7 +28,7 @@
 	python? ( dev-python/numeric )
 	java? ( virtual/jre )
 	tetex? ( app-text/jadetex )
-	octave? ( app-sci/octave )
+	octave? ( sci-mathematics/octave )
 	external-gd? ( media-libs/libgd )
 	truetype? ( media-libs/freetype )
 	X? ( virtual/x11
@@ -136,10 +136,10 @@
 		rm -r ${D}/usr/lib/java
 	fi
 	if use octave; then
-		mv ${D}/usr/share/plplot_octave ${D}/usr/share/plplot/octave
-		mv ${D}/usr/PLplot ${D}/usr/share/${PN}/octave/PLplot
-		cd ${D}/usr/share/${PN}/octave/PLplot
-		sed -ie 's:/usr/share/plplot_octave:/usr/share/plplot/octave:' plplot_octave_path.m
+		# fix the path to plplot's .m files
+		mv ${D}/usr/share/plplot_octave ${D}/usr/share/plplot/octave || die
+		sed -ie 's:/usr/share/plplot_octave:/usr/share/plplot/octave:' \
+			${D}/usr/share/octave/site/m/PLplot/plplot_octave_path.m
 	fi
 
 	# Gzip the basic documentation.