--- tomcat-7.0.56.ebuild	2014-12-01 13:32:41.966807547 +0100
+++ tomcat-7.0.56-r1.ebuild	2014-12-01 13:32:56.196805852 +0100
@@ -27,14 +27,14 @@
 COMMON_DEP="
 	dev-java/eclipse-ecj:${ECJ_SLOT}
 	~dev-java/tomcat-servlet-api-${PV}
+	doc? ( >=virtual/jre-1.7 )
+	!doc? ( >=virtual/jre-1.6 )
+	websockets? ( >=virtual/jre-1.7 )
+	!websockets? ( >=virtual/jre-1.6 )
 	extra-webapps? ( dev-java/jakarta-jstl:0 )"
 RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
-	websockets? ( >=virtual/jre-1.7 )
-	!websockets? ( >=virtual/jre-1.6 )"
+	!<dev-java/tomcat-native-1.1.24"
 DEPEND="${COMMON_DEP}
-	websockets? ( >=virtual/jre-1.7 )
-	!websockets? ( >=virtual/jre-1.6 )
 	>=dev-java/ant-core-1.8.1:0
 	test? (
 		dev-java/ant-junit:0
@@ -71,6 +71,7 @@
 IM_REV="-r1"
 
 src_compile() {
+	use doc && EANT_EXTRA_ARGS="-Djava.7.home=${JAVA_HOME}"
 	use websockets && EANT_EXTRA_ARGS="-Djava.7.home=${JAVA_HOME}"
 	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
 	java-pkg-2_src_compile