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-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-2.eclass')
| -rw-r--r-- | eclass/java-pkg-2.eclass | 12 |
1 files changed, 11 insertions, 1 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 |