diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2008-10-05 16:53:38 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-10-05 16:53:38 +0000 |
| commit | f1b6e04de2e9fc1cb94cdc4a58b4a7d761f15978 (patch) | |
| tree | 2972e82c23e7040974d8a66208f2333b63932774 /eclass | |
| parent | Migrate to stax-api virtual. (diff) | |
| download | gentoo-2-f1b6e04de2e9fc1cb94cdc4a58b4a7d761f15978.tar.gz gentoo-2-f1b6e04de2e9fc1cb94cdc4a58b4a7d761f15978.tar.bz2 gentoo-2-f1b6e04de2e9fc1cb94cdc4a58b4a7d761f15978.zip | |
Make EXPORT_FUNCTIONS conditional now that I figured out why it was dying.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-ant-2.eclass | 4 | ||||
| -rw-r--r-- | eclass/java-utils-2.eclass | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 47a960e73905..d135e6ef463e 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.41 2008/10/01 15:43:55 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.42 2008/10/05 16:53:38 betelgeuse Exp $ inherit java-utils-2 @@ -128,7 +128,7 @@ JAVA_ANT_CLASSPATH_TAGS="javac xjavac" # default: off # ------------------------------------------------------------------------------ -EXPORT_FUNCTIONS src_configure +[[ "${EAPI:-0}" = "2" ]] && EXPORT_FUNCTIONS src_configure # ------------------------------------------------------------------------------ # @eclass-src_configure diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index e2a5ea7a1daa..15e07fe4755f 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.114 2008/10/01 15:43:55 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.115 2008/10/05 16:53:38 betelgeuse Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -37,6 +37,8 @@ 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 "" @@ -2731,7 +2733,6 @@ is-java-strict() { return $? } -EXPORT_FUNCTIONS src_prepare # ------------------------------------------------------------------------------ # @eclass-end |