diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2008-10-11 21:07:13 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2008-10-11 21:07:13 +0000 |
| commit | d3bb9ab0a92f8c27eebe057ca187afb153387290 (patch) | |
| tree | 771106a370dc11885c6c7e25245b1503dcfef180 /eclass/java-pkg-opt-2.eclass | |
| parent | Added viewvc-1.0.6 (#238077). (diff) | |
| download | gentoo-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-pkg-opt-2.eclass')
| -rw-r--r-- | eclass/java-pkg-opt-2.eclass | 12 |
1 files changed, 11 insertions, 1 deletions
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 +} |