--- plplot-5.3.0.ebuild	2004-11-14 23:56:17.640982400 +0000
+++ plplot-5.3.1.ebuild	2004-11-14 23:59:29.364835944 +0000
@@ -12,7 +12,7 @@
 LICENSE="LGPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="debug doc f77 gd-external gnome ifc java jpeg png python tcltk tetex truetype X itcl octave"
 
 DEPEND="${RDEPEND}
@@ -57,7 +57,10 @@
 src_compile() {
 	# Doesn't compile with j > 1.
 	MAKEOPTS="${MAKEOPTS} -e -j1"

+	# Export DATA_DIR so that configure uses correct install path
+	export DATA_DIR="/usr/share/${PN}"
+
 	local EXTRA_CONF
 
 	# Compilation options (debug, documentation).
@@ -128,7 +131,6 @@
 
 	# To match the Gentoo FSH.
 	mv ${D}/usr/share/doc/${PN} ${D}/usr/share/doc/${PF}
-	mv ${D}/usr/share/${PN}${PV} ${D}/usr/share/${PN}
 	if use java; then
 		mv ${D}/usr/lib/java/plplot ${D}/usr/share/${PN}/lib
 		rm -r ${D}/usr/lib/java