--- eclass/virtualx.eclass	2009/10/19 23:52:39	1.31
+++ eclass/virtualx.eclass	2009/10/21 23:59:51	1.32
@@ -1,14 +1,19 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.31 2009/10/19 23:52:39 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.32 2009/10/21 23:59:51 abcd Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
 # This eclass can be used for packages that needs a working X environment to build
 
 # Is a dependency on xorg-server and xhost needed?
-# Valid values are "always", "tests", and "manual"
-VIRTUALX_REQUIRED="${VIRTUALX_REQUIRED:-tests}"
+# Valid values are "always", "optional", and "manual"
+# "tests" is treated as a synonym for "optional"
+: ${VIRTUALX_REQUIRED:=optional}
+
+# If VIRTUALX_REQUIRED=optional, what use flag should control
+# the dependency? Default is "test"
+: ${VIRTUALX_USE:=test}
 
 # Dep string available for use outside of eclass, in case a more
 # complicated dep is needed
@@ -20,10 +25,10 @@
 		DEPEND="${VIRTUALX_DEPEND}"
 		RDEPEND=""
 		;;
-	tests)
-		DEPEND="test? ( ${VIRTUALX_DEPEND} )"
+	optional|tests)
+		DEPEND="${VIRTUALX_USE}? ( ${VIRTUALX_DEPEND} )"
 		RDEPEND=""
-		IUSE="test"
+		IUSE="${VIRTUALX_USE}"
 		;;
 	manual)
 		;;
@@ -31,7 +36,7 @@
 		eerror "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED"
 		eerror "Valid values are:"
 		eerror "  always"
-		eerror "  tests"
+		eerror "  optional (default if unset)"
 		eerror "  manual"
 		die "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED"
 		;;