From: Petteri Räty <betelgeuse@gentoo.org>
Date: Sun, 28 Jan 2007 20:04:59 +0000 (+0000)
Subject: Move inherit java-ant-2 check to eant itself from the generic src_compile in java... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc516c6d21dd9770bd841b3158212d23d2900eb0;p=gentoo.git

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

diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index 79c1af5c8249..c8590ab12ddb 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.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 7f954c11ab2d..dbacd83db3dd 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.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}"