From: Petteri Räty Date: Sun, 28 Jan 2007 21:45:38 +0000 (+0000) Subject: Undo last commit because we need to check java-pkg-opt-2 and java-ant-2 usage before... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b12ff6e0b11f88228e8d2416ed8b532120fd7eb3;p=gentoo.git 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. --- 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;