--- mupdf-0.9.ebuild.orig	2012-04-07 11:11:49.169774078 -0400
+++ mupdf-0.9.ebuild	2012-04-07 11:12:06.472718366 -0400
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.9.ebuild,v 1.4 2011/12/18 22:23:40 xmw Exp $
 
-EAPI=2
+EAPI=3
 
 inherit eutils multilib toolchain-funcs
 
@@ -43,7 +43,7 @@
 }
 
 src_install() {
-	emake prefix="${D}usr" LIBDIR="${D}usr/$(get_libdir)" \
+	emake prefix="${ED}usr" LIBDIR="${ED}usr/$(get_libdir)" \
 		build=debug verbose=true ${my_nox11} install || die
 
 	insinto /usr/$(get_libdir)/pkgconfig
@@ -58,7 +58,7 @@
 	dodoc README || die
 
 	# avoid collision with app-text/poppler-utils
-	mv "${D}"usr/bin/pdfinfo "${D}"usr/bin/mupdf_pdfinfo || die
+	mv "${ED}"usr/bin/pdfinfo "${ED}"usr/bin/mupdf_pdfinfo || die
 }
 
 pkg_postinst() {