--- /usr/portage/www-apache/mod_jk/mod_jk-1.2.37.ebuild	2013-03-26 12:01:33.000000000 +0100
+++ mod_jk-1.2.37-r1.ebuild	2013-11-05 12:32:59.257957000 +0100
@@ -4,9 +4,9 @@
 
 EAPI="2"
 
-inherit apache-module java-pkg-2
+inherit apache-module java-pkg-opt-2
 
-MY_P="tomcat-connectors-${PV}-src"
+MY_P="tomcat-connectors-${PV#-*}-src"
 
 KEYWORDS="amd64 ppc x86"
 
@@ -15,7 +15,7 @@
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
+IUSE="java"
 
 S="${WORKDIR}/${MY_P}/native"
 
@@ -26,13 +26,15 @@
 DOCFILES="CHANGES"
 CONF_DIR="${WORKDIR}/${MY_P}/conf"
 
-DEPEND=">=virtual/jdk-1.4"
+DEPEND="java? ( >=virtual/jdk-1.4 )"
 RDEPEND=""
 
 need_apache
 
 pkg_setup() {
-	java-pkg-2_pkg_setup
+	if use java ; then
+		java-pkg-2_pkg_setup
+	fi
 }
 
 src_configure() {