--- darkplaces-20060616_beta1.ebuild-orig	2006-06-20 22:09:18.000000000 +0100
+++ darkplaces-20060616_beta1.ebuild	2006-06-20 22:20:31.000000000 +0100
@@ -42,10 +42,7 @@
 			x11-libs/libXxf86dga
 			x11-libs/libXxf86vm )
 		virtual/x11 )"
-RDEPEND="media-libs/jpeg
-	cdinstall? ( games-fps/quake1-data )
-	demo? ( games-fps/quake1-demodata )
-	textures? ( >=games-fps/quake1-textures-20050820 )
+COMMON="media-libs/jpeg
 	sdl? (
 		media-libs/libsdl
 		${UIDEPEND} )
@@ -56,10 +53,18 @@
 		!sdl? (
 			!opengl? (
 				virtual/opengl
-				${UIDEPEND} ) ) )"
-DEPEND="${RDEPEND}
+				${UIDEPEND} ) ) )"	
+RDEPEND="${COMMON}
+	cdinstall? ( games-fps/quake1-data )
+	demo? ( games-fps/quake1-demodata )
+	textures? ( >=games-fps/quake1-textures-20050820 )"
+DEPEND="${COMMON}
 	dev-util/pkgconfig
-	app-arch/unzip"
+	app-arch/unzip
+	lights? (
+		|| (
+			app-arch/unrar
+			app-arch/rar ) )"		
 
 S=${WORKDIR}/${PN}
 dir=${GAMES_DATADIR}/quake1