--- inform-6.31.1.ebuild.orig	2012-09-03 14:01:08.000000000 -0600
+++ inform-6.31.1.ebuild	2012-09-03 14:00:09.000000000 -0600
@@ -2,21 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-lang/inform/inform-6.31.1.ebuild,v 1.4 2009/12/02 10:52:55 maekke Exp $
 
+EAPI=4
+
 DESCRIPTION="design system for interactive fiction"
 HOMEPAGE="http://www.inform-fiction.org/"
 SRC_URI="http://mirror.ifarchive.org/if-archive/infocom/compilers/inform6/source/${P}.tar.gz"
 
 LICENSE="Inform"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="emacs"
 PDEPEND="emacs? ( app-emacs/inform-mode )"
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README VERSION
+	default
+	dodoc VERSION
 	docinto tutorial
 	dodoc tutor/README tutor/*.txt tutor/*.inf
-	mv "${D}"/usr/share/${PN}/manual "${D}"/usr/share/doc/${PF}/html
-	rmdir "${D}"/usr/share/inform/{include,module}
+	mv "${ED}"/usr/share/${PN}/manual "${ED}"/usr/share/doc/${PF}/html
+	rmdir "${ED}"/usr/share/inform/{include,module}
 }