diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-02-01 09:38:44 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-02-01 09:38:44 +0000 |
| commit | 20cf0ad092e4f403460b1b541b0cfe6a20a3ede7 (patch) | |
| tree | 3f9ae45a6c98e2154139e3a927a79abcdf0e906d /eclass | |
| parent | Version bump and restore USE musepack since it's been ported to SV8 API. (diff) | |
| download | gentoo-2-20cf0ad092e4f403460b1b541b0cfe6a20a3ede7.tar.gz gentoo-2-20cf0ad092e4f403460b1b541b0cfe6a20a3ede7.tar.bz2 gentoo-2-20cf0ad092e4f403460b1b541b0cfe6a20a3ede7.zip | |
Add EAPI=3 support for java eclasses. Bug #303061 and patch thanks to Ulrich Müller <ulm@gentoo.org>.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-ant-2.eclass | 7 | ||||
| -rw-r--r-- | eclass/java-pkg-2.eclass | 8 | ||||
| -rw-r--r-- | eclass/java-pkg-opt-2.eclass | 8 |
3 files changed, 15 insertions, 8 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 124fc201788a..a3d1902eb002 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -14,7 +14,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.46 2009/11/08 20:39:30 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.47 2010/02/01 09:38:44 caster Exp $ inherit java-utils-2 @@ -132,7 +132,10 @@ JAVA_ANT_CLASSPATH_TAGS="javac xjavac" # default: off # ------------------------------------------------------------------------------ -[[ "${EAPI:-0}" = "2" ]] && EXPORT_FUNCTIONS src_configure +case "${EAPI:-0}" in + 0|1) : ;; + *) EXPORT_FUNCTIONS src_configure ;; +esac # ------------------------------------------------------------------------------ # @eclass-src_configure diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index 151bc20984ce..e2732e62a539 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.34 2009/09/02 21:41:29 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.35 2010/02/01 09:38:44 caster Exp $ inherit java-utils-2 @@ -49,8 +49,10 @@ if [[ ${CATEGORY} = dev-java && ${PN} = commons-* ]]; then SRC_URI="mirror://apache/${PN/-///}/source/${P}-src.tar.gz" fi -EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst -[[ "${EAPI:-0}" == "2" ]] && EXPORT_FUNCTIONS src_prepare +case "${EAPI:-0}" in + 0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst ;; + *) EXPORT_FUNCTIONS pkg_setup src_prepare src_compile pkg_preinst ;; +esac # ------------------------------------------------------------------------------ # @eclass-pkg_setup diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass index 99642a79a6e5..055466f2dc2e 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.13 2009/02/25 17:41:16 serkan Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-opt-2.eclass,v 1.14 2010/02/01 09:38:44 caster Exp $ inherit java-utils-2 @@ -36,8 +36,10 @@ RDEPEND="${DEPEND}" # See java-pkg-2.eclass for JAVA_PKG_IUSE documentation IUSE="${JAVA_PKG_IUSE} ${JAVA_PKG_OPT_USE}" -EXPORT_FUNCTIONS pkg_setup pkg_preinst -[[ "${EAPI:-0}" == "2" ]] && EXPORT_FUNCTIONS src_prepare +case "${EAPI:-0}" in + 0|1) EXPORT_FUNCTIONS pkg_setup pkg_preinst ;; + *) EXPORT_FUNCTIONS pkg_setup src_prepare pkg_preinst ;; +esac # ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------ |