--- /usr/portage/dev-java/jaxp/jaxp-1.4-r1.ebuild	2012-03-06 14:31:07.000000000 -0700
+++ jaxp-1.4-r1.ebuild	2012-09-19 21:02:14.000000000 -0600
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/jaxp-1.4-r1.ebuild,v 1.5 2012/03/06 21:12:16 ranger Exp $
 
+EAPI=4
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
@@ -12,14 +13,13 @@
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	cp -i "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die "cp failed"
 }
 
@@ -31,10 +31,10 @@
 	use source && java-pkg_dosrc jaxp-1_4-api/src/{javax,org}
 	dohtml \
 		docs/JAXP-Compatibility.html \
-		docs/ReleaseNotes.html || die
+		docs/ReleaseNotes.html
 	use doc && java-pkg_dojavadoc docs/api
 
-	cd "${D}/usr/share/${PN}/lib/"
+	cd "${ED}/usr/share/${PN}/lib/"
 	ln -s jaxp-ri.jar jaxp.jar || die
 	java-pkg_regjar /usr/share/${PN}/lib/jaxp.jar
 }