--- /usr/portage/dev-java/fop/fop-0.95.ebuild	2011-12-31 08:33:32.000000000 -0700
+++ fop-0.95.ebuild	2012-09-17 21:17:09.000000000 -0600
@@ -6,7 +6,7 @@
 #       be built as it needs forrest which we do not have
 # TODO: package and use optional dependency jeuclid
 
-EAPI=2
+EAPI=4
 JAVA_PKG_IUSE="doc examples source"
 WANT_ANT_TASKS="ant-trax"
 
@@ -19,7 +19,7 @@
 SLOT="0"
 # doesn't work with java.awt.headless
 RESTRICT="test"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="hyphenation jai jimi"
 
 COMMON_DEPEND="
@@ -75,7 +75,7 @@
 src_compile() {
 	# because I killed the automagic tests; all our JDK's have JCE
 	local af="-Djdk14.present=true -Djce.present=true"
-	use hyphenation && af="${af} -Duser.hyph.dir=/usr/share/offo-hyphenation/hyph/"
+	use hyphenation && af="${af} -Duser.hyph.dir=${EPREFIX}/usr/share/offo-hyphenation/hyph/"
 	use jai && af="${af} -Djai.present=true"
 	use jimi && af="${af} -Djimi.present=true"
 
@@ -95,13 +95,13 @@
 	if use hyphenation; then
 		java-pkg_dojar build/fop-hyph.jar
 		insinto /usr/share/${PN}/
-		doins -r hyph || die
+		doins -r hyph
 	fi
 
 	# doesn't support everything upstream launcher does...
 	java-pkg_dolauncher ${PN} --main org.apache.fop.cli.Main
 
-	dodoc NOTICE README || die
+	dodoc NOTICE README
 
 	use doc && java-pkg_dojavadoc build/javadocs
 	use examples && java-pkg_doexamples examples/* conf