--- games-strategy/freeciv/freeciv-2.0.7.ebuild	2005-11-07 10:11:35.000000000 +0100
+++ games-strategy/freeciv/freeciv-2.0.7.ebuild	2006-01-20 21:44:08.000000000 +0100
@@ -22,7 +22,6 @@
 RDEPEND="sys-libs/zlib
 	readline? ( sys-libs/readline )
 	!dedicated? (
-		virtual/x11
 		gtk? (
 			>=x11-libs/gtk+-2.0.0
 			>=dev-libs/glib-2.0.0
@@ -31,6 +30,17 @@
 		)
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
+			|| ( (
+					x11-libs/libX11
+					x11-libs/libICE
+					x11-libs/libSM
+					x11-libs/libXt
+					x11-libs/libXext
+					x11-libs/libXmu
+					x11-libs/libXpm
+				)
+				virtual/x11
+			)
 		)
 		alsa? (
 			>=media-libs/alsa-lib-1.0
@@ -43,7 +53,8 @@
 		)
 	)"
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	|| ( x11-libs/libXaw virtual/x11 ) "
 
 S=${WORKDIR}/${MY_P}