--- /usr/portage/dev-java/jibx/jibx-1.1.5-r1.ebuild	2009-07-19 07:54:52.000000000 -0600
+++ jibx-1.1.5-r1.ebuild	2012-09-19 21:15:30.000000000 -0600
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/jibx/jibx-1.1.5-r1.ebuild,v 1.4 2009/07/19 13:54:52 nixnut Exp $
 
-EAPI="2"
+EAPI="4"
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 versionator
@@ -15,7 +15,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 COMMON_DEP="dev-java/dom4j:1
@@ -44,13 +44,13 @@
 src_install() {
 	java-pkg_dojar "${S}"/lib/${PN}*.jar
 
-	dodoc changes.txt docs/binding.dtd docs/binding.xsd || die
-	dohtml readme.html || die
+	dodoc changes.txt docs/binding.dtd docs/binding.xsd
+	dohtml readme.html
 
 	use doc && {
 		java-pkg_dohtml -r docs/*
-		cp -R starter "${D}/usr/share/doc/${PF}"
-		cp -R tutorial "${D}/usr/share/doc/${PF}"
+		cp -R starter "${ED}/usr/share/doc/${PF}"
+		cp -R tutorial "${ED}/usr/share/doc/${PF}"
 	}
 
 	use source && java-pkg_dosrc build/src/* build/extras/*