Make java-pkg-2.eclass die on pkg_setup if FEATURES has test, IUSE has test and use...

diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index 357cc9090bc6987754461788dce6a3b7183ede19..9dc79201933152d7dd50e72597f72da9aacd6a86 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.4 2006/12/03 13:05:06 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.5 2006/12/08 12:12:04 betelgeuse Exp $
 
 inherit java-utils-2
 
@@ -42,6 +42,7 @@ EXPORT_FUNCTIONS pkg_setup
 # ------------------------------------------------------------------------------
 java-pkg-2_pkg_setup() {
        java-pkg_init
+       java-pkg_ensure-test
 }
 
 # ------------------------------------------------------------------------------

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 6f22c923f209080495c76b72f27f2467a54d451c..b398db6130e37886b4cd5fc629960a966cf2d797 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.33 2006/12/07 02:27:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.34 2006/12/08 12:12:04 betelgeuse Exp $
 
 
 # -----------------------------------------------------------------------------
@@ -264,7 +264,6 @@ java-pkg_regjar() {
        java-pkg_do_write_
 }
 
-
 # ------------------------------------------------------------------------------
 # @ebuild-function java-pkg_newjar
 #
@@ -1294,7 +1293,9 @@ java-pkg_ensure-gcj() {
 }
 
 java-pkg_ensure-test() {
-       if hasq test ${FEATURES} && ! hasq -test ${FEATURES} && ! use test; then
+       if hasq test ${FEATURES} && ! hasq -test ${FEATURES} \
+               && hasq test ${IUSE} && ! use test;
+       then
                eerror "You specified FEATURES=test, but USE=test is needed"
                eerror "to pull in the additional dependencies for testing"
                die "Need USE=test enabled"