--- /usr/portage/media-gfx/graphviz/graphviz-2.24.0.ebuild	2009-07-05 12:11:54.000000000 +0200
+++ graphviz-2.24.0.ebuild	2009-07-08 02:11:03.000000000 +0200
@@ -13,7 +13,7 @@
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="cairo doc examples gtk java jpeg lasi nls perl png python ruby tcl"
+IUSE="X cairo doc examples gtk java jpeg lasi nls perl png python ruby tcl"
 
 # Requires ksh
 RESTRICT="test"
@@ -28,13 +28,13 @@
 	>=media-libs/libpng-1.2.10
 	virtual/libiconv
 	cairo?	(
-		x11-libs/libXaw
+		X? ( x11-libs/libXaw )
 		>=x11-libs/pango-1.12
 		>=x11-libs/cairo-1.1.10[svg]
 	)
 	gtk?	(
 		>=x11-libs/gtk+-2
-		x11-libs/libXaw
+		X? ( x11-libs/libXaw )
 		>=x11-libs/pango-1.12
 		>=x11-libs/cairo-1.1.10
 	)