--- gromacs-4.0.7.ebuild	2009-12-08 17:37:11.000000000 +0200
+++ gromacs-4.0.7.ebuild	2010-01-22 17:41:06.000000000 +0200
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~x86-linux"
 IUSE="X blas dmalloc doc -double-precision +fftw fkernels +gsl lapack mpi +single-precision static test +xml zsh-completion"
 
 DEPEND="app-shells/tcsh
@@ -44,7 +44,7 @@
 		|| die "Failed to fixup demo script."
 
 	# Fix a sandbox violation that occurs when re-emerging with mpi.
-	sed "/libdir=\"\$(libdir)\"/ a\	temp_libdir=\"${D}usr/$( get_libdir )\" ; \\\\" \
+	sed "/libdir=\"\$(libdir)\"/ a\	temp_libdir=\"${ED}usr/$( get_libdir )\" ; \\\\" \
 	-i src/tools/Makefile.am \
 	|| die "sed tools/Makefile.am failed"
 
@@ -52,7 +52,7 @@
 	-i src/tools/Makefile.am \
 	|| die "sed tools/Makefile.am failed"
 
-	sed "/libdir=\"\$(libdir)\"/ a\ temp_libdir=\"${D}usr/$( get_libdir )\" ; \\\\" \
+	sed "/libdir=\"\$(libdir)\"/ a\ temp_libdir=\"${ED}usr/$( get_libdir )\" ; \\\\" \
 	-i src/tools/Makefile.am \
 	|| die "sed tools/Makefile.am failed"
 
@@ -129,10 +129,10 @@
 		myconf="${myconf} --enable-shared"
 	fi
 
-	myconf="--datadir=/usr/share \
-			--bindir=/usr/bin \
-			--libdir=/usr/$(get_libdir) \
-			--docdir=/usr/share/doc/"${PF}" \
+	myconf="--datadir=${EPREFIX}/usr/share \
+			--bindir=${EPREFIX}/usr/bin \
+			--libdir=${EPREFIX}/usr/$(get_libdir) \
+			--docdir=${EPREFIX}/usr/share/doc/"${PF}" \
 			$(use_with dmalloc) \
 			$(use_with fftw fft fftw3) \
 			$(use_with gsl) \
@@ -211,16 +211,16 @@
 		emake DESTDIR="${D}" install-mdrun || die "emake install-mdrun for ${x} failed"
 	done
 
-	sed -n -e '/^GMXBIN/,/^GMXDATA/p' "${D}"/usr/bin/GMXRC.bash > "${T}/80gromacs"
+	sed -n -e '/^GMXBIN/,/^GMXDATA/p' "${ED}"/usr/bin/GMXRC.bash > "${T}/80gromacs"
 	doenvd "${T}/80gromacs"
-	rm -f "${D}"/usr/bin/GMXRC*
+	rm -f "${ED}"/usr/bin/GMXRC*
 
-	dobashcompletion "${D}"/usr/bin/completion.bash ${PN}
+	dobashcompletion "${ED}"/usr/bin/completion.bash ${PN}
 	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins "${D}"/usr/bin/completion.zsh _${PN}
+		insinto "${EPREFIX}"/usr/share/zsh/site-functions
+		newins "${ED}"/usr/bin/completion.zsh _${PN}
 	fi
-	rm -r "${D}"/usr/bin/completion.*
+	rm -r "${ED}"/usr/bin/completion.*
 
 	cd "${S}"
 	dodoc AUTHORS INSTALL README