diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-01-28 21:45:38 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-01-28 21:45:38 +0000 |
| commit | b12ff6e0b11f88228e8d2416ed8b532120fd7eb3 (patch) | |
| tree | f2d9de56c4aa323233d26956d89f8c6b9a364ded /eclass/java-ant-2.eclass | |
| parent | Use WANT_ANT_TASKS if EANT_ANT_TASKS is not defined. Fixes bug #164315. (diff) | |
| download | historical-b12ff6e0b11f88228e8d2416ed8b532120fd7eb3.tar.gz historical-b12ff6e0b11f88228e8d2416ed8b532120fd7eb3.tar.bz2 historical-b12ff6e0b11f88228e8d2416ed8b532120fd7eb3.zip | |
Undo last commit because we need to check java-pkg-opt-2 and java-ant-2 usage before adding the automatic dep on ant-core.
Diffstat (limited to 'eclass/java-ant-2.eclass')
| -rw-r--r-- | eclass/java-ant-2.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 8f78577e2aaa..e198e672292e 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -10,7 +10,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.15 2007/01/28 21:42:24 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.16 2007/01/28 21:45:38 betelgeuse Exp $ inherit java-utils-2 @@ -29,7 +29,7 @@ inherit java-utils-2 DEPEND=">=dev-java/javatoolkit-0.1.5 ${JAVA_PKG_PORTAGE_DEP}" # add ant-core into DEPEND, unless disabled -[[ "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]] || DEPEND="${DEPEND} dev-java/ant-core" +[[ "${JAVA_ANT_DISABLE_ANT_CORE_DEP:-true}" ]] || DEPEND="${DEPEND} dev-java/ant-core" # add ant tasks specified in WANT_ANT_TASKS to DEPEND local ANT_TASKS_DEPEND; |