--- /usr/portage/games-fps/quake3/quake3-1.34_rc3.ebuild	2006-11-30 00:39:26.000000000 +0100
+++ /usr/local/portage/games-fps/quake3/quake3-1.34_rc3.ebuild	2007-01-16 21:27:34.243463629 +0100
@@ -39,18 +39,14 @@
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="dedicated opengl teamarena"
 
-UIRDEPEND="virtual/opengl
+COMMONDEPEND="virtual/opengl
 	media-libs/openal
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
 	media-libs/libsdl"
 
-RDEPEND="opengl? (
-	${UIRDEPEND} )
-	!dedicated? (
-		${UIRDEPEND} )
+DEPEND="opengl? ( ${COMMONDEPEND} )
+	!dedicated? ( ${COMMONDEPEND} )"
+
+RDEPEND="${DEPEND}
 	games-fps/quake3-data
 	teamarena? ( games-fps/quake3-teamarena )"