Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.94
diff -u -r1.94 java-utils-2.eclass
--- java-utils-2.eclass	4 Oct 2007 09:59:29 -0000	1.94
+++ java-utils-2.eclass	13 Nov 2007 19:33:35 -0000
@@ -73,6 +73,7 @@
 # so that ebuilds can use new features without depending on specific versions.
 # -----------------------------------------------------------------------------
 JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.33-r1 ${JAVA_PKG_PORTAGE_DEP}"
+hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
 
 # -----------------------------------------------------------------------------
 # @variable-external JAVA_PKG_ALLOW_VM_CHANGE
Index: java-pkg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v
retrieving revision 1.24
diff -u -r1.24 java-pkg-2.eclass
--- java-pkg-2.eclass	5 Aug 2007 08:17:05 -0000	1.24
+++ java-pkg-2.eclass	13 Nov 2007 19:33:35 -0000
@@ -20,8 +20,9 @@
 # ------------------------------------------------------------------------------
 # @IUSE
 #
-# ebuilds using this eclass can set JAVA_PKG_IUSE and then this eclass
-# will automatically add deps for them.
+# Use JAVA_PKG_IUSE instead of IUSE for doc, source and examples so that
+# the eclass can automatically add the needed dependencies for the java-pkg_do*
+# functions.
 #
 # ------------------------------------------------------------------------------
 IUSE="${JAVA_PKG_IUSE}"
@@ -35,8 +36,6 @@
 # ------------------------------------------------------------------------------
 DEPEND="${JAVA_PKG_E_DEPEND}"
 
-hasq source ${JAVA_PKG_IUSE} && DEPEND="${DEPEND} source? ( app-arch/zip )"
-
 # ------------------------------------------------------------------------------
 # @rdepend
 #
Index: java-pkg-opt-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v
retrieving revision 1.7
diff -u -r1.7 java-pkg-opt-2.eclass
--- java-pkg-opt-2.eclass	5 Aug 2007 08:24:30 -0000	1.7
+++ java-pkg-opt-2.eclass	13 Nov 2007 19:33:35 -0000
@@ -33,7 +33,8 @@
 
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
-IUSE="${JAVA_PKG_OPT_USE}"
+# See java-pkg-2.eclass for JAVA_PKG_IUSE documentation
+IUSE="${JAVA_PKG_IUSE} ${JAVA_PKG_OPT_USE}"
 
 EXPORT_FUNCTIONS pkg_setup