--- /usr/portage/games-emulation/gnuboy/gnuboy-1.0.3.ebuild	2006-01-10 00:35:39.000000000 +0100
+++ gnuboy-1.0.3-r1.ebuild	2006-02-04 12:51:36.000000000 +0100
@@ -13,10 +13,15 @@
 KEYWORDS="amd64 ppc x86"
 IUSE="X fbcon sdl svga"
 
-DEPEND="X? ( virtual/x11 )
-	sdl? ( media-libs/libsdl )
+RDEPEND="sdl? ( media-libs/libsdl )
+	     !X? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) )
+		 X? ( || ( x11-libs/libXext
+		 		   virtual/x11 ) )"
+DEPEND="${RDEPEND}
 	svga? ( media-libs/svgalib )
-	!X? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) )"
+	X? ( || ( ( x11-proto/xextproto
+		      	x11-proto/xproto )
+			  virtual/x11 ) )"
 
 src_compile() {
 	local myconf