--- /usr/portage/dev-java/log4j/log4j-1.2.16.ebuild	2012-04-15 13:01:07.000000000 -0600
+++ log4j-1.2.16.ebuild	2012-09-19 21:25:43.000000000 -0600
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.16.ebuild,v 1.8 2012/04/15 18:40:55 vapier Exp $
 
-EAPI=2
+EAPI=4
 JAVA_PKG_IUSE="doc javamail jms jmx source"
 
 inherit java-pkg-2 java-ant-2
@@ -63,7 +63,7 @@
 
 	if use doc ; then
 		java-pkg_dohtml -r site/*
-		rm -fr "${D}/usr/share/doc/${PF}/html/apidocs"
+		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
 		java-pkg_dojavadoc --symlink apidocs site/apidocs
 	fi
 	use source && java-pkg_dosrc src/main/java/*