Move the src_prepare export from java-utils-2 to java-pkg-2 and java-pkg-opt-2 (where it's now called only if USE=java).

3 files changed, 24 insertions, 5 deletions

diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index 967936b5b17d..36c68d0c5e3f 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -5,7 +5,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.29 2008/07/18 22:53:20 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.30 2008/10/11 21:07:13 caster Exp $
 
 inherit java-utils-2
 
@@ -50,6 +50,7 @@ if [[ ${CATEGORY} = dev-java && ${PN} = commons-* ]]; then
 fi
 
 EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst
+[[ "${EAPI:-0}" == "2" ]] && EXPORT_FUNCTIONS src_prepare
 
 # ------------------------------------------------------------------------------
 # @eclass-pkg_setup
@@ -62,6 +63,15 @@ java-pkg-2_pkg_setup() {
 }
 
 # ------------------------------------------------------------------------------
+# @eclass-src_prepare
+#
+# wrapper for java-utils-2_src_prepare
+# ------------------------------------------------------------------------------
+java-pkg-2_src_prepare() {
+	java-utils-2_src_prepare
+}
+
+# ------------------------------------------------------------------------------
 # @eclass-src_compile
 #
 # Default src_compile for java packages
diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass
index 496ecd082cce..b27f30543c28 100644
--- a/eclass/java-pkg-opt-2.eclass
+++ b/eclass/java-pkg-opt-2.eclass
@@ -10,7 +10,7 @@
 #       Removed phase hooks because Portage does proper env saving now.
 #       <betelgeuse@gentoo.org>
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.9 2008/01/06 19:30:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.10 2008/10/11 21:07:13 caster Exp $
 
 inherit java-utils-2
 
@@ -37,9 +37,19 @@ RDEPEND="${DEPEND}"
 IUSE="${JAVA_PKG_IUSE} ${JAVA_PKG_OPT_USE}"
 
 EXPORT_FUNCTIONS pkg_setup
+[[ "${EAPI:-0}" == "2" ]] && EXPORT_FUNCTIONS src_prepare
 
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 java-pkg-opt-2_pkg_setup() {
 	use ${JAVA_PKG_OPT_USE} && java-pkg_init
 }
+
+# ------------------------------------------------------------------------------
+# @eclass-src_prepare
+#
+# wrapper for java-utils-2_src_prepare
+# ------------------------------------------------------------------------------
+java-pkg-opt-2_src_prepare() {
+	use ${JAVA_PKG_OPT_USE} && java-utils-2_src_prepare
+}
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 8385fc67c585..204ac6e29ed6 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -6,7 +6,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.116 2008/10/10 20:11:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.117 2008/10/11 21:07:13 caster Exp $
 
 # -----------------------------------------------------------------------------
 # @eclass-begin
@@ -37,8 +37,6 @@ IUSE="elibc_FreeBSD"
 # Make sure we use java-config-2
 export WANT_JAVA_CONFIG="2"
 
-[[ "${EAPI:-0}" == "2" ]] && EXPORT_FUNCTIONS src_prepare
-
 # -----------------------------------------------------------------------------
 # @variable-external WANT_ANT_TASKS
 # @variable-default ""
@@ -1808,6 +1806,7 @@ ejunit() {
 # @eclass-src_prepare
 #
 # src_prepare Searches for bundled jars
+# Don't call directly, but via java-pkg-2_src_prepare!
 # ------------------------------------------------------------------------------
 
 java-utils-2_src_prepare() {