Move inherit java-ant-2 check to eant itself from the generic src_compile in java...

diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index 79c1af5c82497d0e34ca9e06d3b5c0f06dceb232..c8590ab12ddbcf6c6868a023dae541c1857f8185 100644 (file)
--- 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.18 2007/01/28 19:53:17 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.19 2007/01/28 20:04:59 betelgeuse Exp $
 
 inherit java-utils-2
 
@@ -74,11 +74,6 @@ java-pkg-2_pkg_setup() {
 # ------------------------------------------------------------------------------
 java-pkg-2_src_compile() {
        if [[ -e "${EANT_BUILD_XML:=build.xml}" ]]; then
-               if ! hasq java-ant-2 ${INHERITED}; then
-                       msg="You should inherit java-ant-2 always when using eant"
-                       ewarn ${msg}
-                       is-java-strict && die ${msg}
-               fi
                [[ "${EANT_FILTER_COMPILER}" ]] && \
                        java-pkg_filter-compiler ${EANT_FILTER_COMPILER}
 

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 7f954c11ab2d958b3d39f690411e9ed02d2236fa..dbacd83db3dd673dc1983fe023b5c67919d68efc 100644 (file)
--- 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.50 2007/01/26 20:24:23 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.51 2007/01/28 20:04:59 betelgeuse Exp $
 
 
 # -----------------------------------------------------------------------------
@@ -1541,6 +1541,12 @@ eant() {
 #                      "Using eant, but not depending on dev-java/ant or dev-java/ant-core"
 #      fi
 
+       if ! hasq java-ant-2 ${INHERITED} && is-java-strict; then
+               msg="You should inherit java-ant-2 when using eant"
+               java-pkg_announce-qa-violation ${msg}
+               die ${msg}
+       fi
+
        local antflags="-Dnoget=true -Dmaven.mode.offline=true"
        java-pkg_init-compiler_
        local compiler="${GENTOO_COMPILER}"