summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2008-10-11 21:07:13 +0000
committerVlastimil Babka <caster@gentoo.org>2008-10-11 21:07:13 +0000
commitd3bb9ab0a92f8c27eebe057ca187afb153387290 (patch)
tree771106a370dc11885c6c7e25245b1503dcfef180 /eclass/java-utils-2.eclass
parentAdded viewvc-1.0.6 (#238077). (diff)
downloadgentoo-2-d3bb9ab0a92f8c27eebe057ca187afb153387290.tar.gz
gentoo-2-d3bb9ab0a92f8c27eebe057ca187afb153387290.tar.bz2
gentoo-2-d3bb9ab0a92f8c27eebe057ca187afb153387290.zip
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).
Diffstat (limited to 'eclass/java-utils-2.eclass')
-rw-r--r--eclass/java-utils-2.eclass5
1 files changed, 2 insertions, 3 deletions
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() {