--- /usr/portage/dev-java/javacc/javacc-5.0.ebuild	2012-04-13 12:31:07.000000000 -0600
+++ javacc-5.0.ebuild	2012-09-18 21:58:48.000000000 -0600
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild,v 1.3 2012/04/13 18:13:08 ulm Exp $
 
-EAPI="2"
+EAPI="4"
 JAVA_PKG_IUSE="doc examples source test"
 
 inherit java-pkg-2 java-ant-2 eutils
@@ -13,7 +13,7 @@
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 DEPEND=">=virtual/jdk-1.5
 	dev-java/junit:0
 	test? (	dev-java/ant-junit )"
@@ -44,7 +44,7 @@
 src_install() {
 	java-pkg_dojar bin/lib/${PN}.jar
 
-	dodoc README || die
+	dodoc README
 
 	if use doc; then
 		java-pkg_dohtml -r www/*
@@ -52,11 +52,11 @@
 	fi
 	if use examples; then
 		dodir /usr/share/doc/${PF}/examples
-		cp -R examples/* "${D}"/usr/share/doc/${PF}/examples
+		cp -R examples/* "${ED}"/usr/share/doc/${PF}/examples
 	fi
 	use source && java-pkg_dosrc src/*
 
-	echo "JAVACC_HOME=/usr/share/javacc/" > "${T}"/22javacc
+	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc
 	doenvd "${T}"/22javacc
 
 	echo "export VERSION=${PV}" > "${T}"/pre