--- totem-2.20.1.ebuild	2007-11-25 03:50:53.000000000 +0000
+++ totem-2.20.1.ebuild.new	2007-11-25 03:43:34.000000000 +0000
@@ -14,7 +14,7 @@
 # No 0.10.0 release for gst-plugins-pitdfdll yet
 # IUSE="win32codecs"
 
-IUSE="a52 bluetooth debug dvd ffmpeg flac galago gnome hal lirc mad mpeg nsplugin nvtv ogg python seamonkey theora vorbis xulrunner xv"
+IUSE="a52 bluetooth debug dvd ffmpeg flac galago gnome hal lirc mad mpeg nsplugin nvtv ogg python seamonkey theora vorbis xine xulrunner xv"
 
 RDEPEND=">=dev-libs/glib-2.13.4
 	 >=x11-libs/gtk+-2.12.1
@@ -26,13 +26,37 @@
 	   app-text/iso-codes
 	   dev-libs/libxml2
 	 >=dev-libs/dbus-glib-0.71
-	 >=media-libs/gstreamer-0.10.12
-	 >=media-libs/gst-plugins-good-0.10
-	 >=media-libs/gst-plugins-base-0.10.12
-	 >=media-plugins/gst-plugins-pango-0.10
-	 >=media-plugins/gst-plugins-gconf-0.10
-	 >=media-plugins/gst-plugins-gnomevfs-0.10
-
+	 xine? ( >=media-libs/xine-lib-1.1.7 )
+	 !xine? (
+	 			>=media-libs/gstreamer-0.10.12
+			 	>=media-libs/gst-plugins-good-0.10
+			 	>=media-libs/gst-plugins-base-0.10.12
+			 	>=media-plugins/gst-plugins-pango-0.10
+	 			>=media-plugins/gst-plugins-gconf-0.10
+			 	>=media-plugins/gst-plugins-gnomevfs-0.10
+				a52? ( >=media-plugins/gst-plugins-a52dec-0.10 )
+				!sparc? ( dvd? (
+									>=media-libs/gst-plugins-ugly-0.10
+									>=media-plugins/gst-plugins-a52dec-0.10
+									>=media-plugins/gst-plugins-dvdread-0.10
+									>=media-plugins/gst-plugins-mpeg2dec-0.10
+								)
+						)
+				!sparc? ( ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 ) )
+				flac? ( >=media-plugins/gst-plugins-flac-0.10 )
+				mad? ( >=media-plugins/gst-plugins-mad-0.10 )
+				!sparc? ( mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 ) )
+				ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
+				theora? (
+							>=media-plugins/gst-plugins-ogg-0.10
+							>=media-plugins/gst-plugins-theora-0.10
+						)
+				vorbis? (
+							>=media-plugins/gst-plugins-ogg-0.10
+							>=media-plugins/gst-plugins-vorbis-0.10
+						)
+				xv? ( >=media-plugins/gst-plugins-xvideo-0.10 )
+			)
 	 x11-libs/libX11
 	 x11-libs/libXtst
 	 >=x11-libs/libXrandr-1.1.1
@@ -59,30 +83,7 @@
 				>=x11-libs/startup-notification-0.8
 			)
 	 python? ( >=dev-python/pygtk-2.8 )
-	 nvtv? ( >=media-tv/nvtv-0.4.5 )
-
-	 a52? ( >=media-plugins/gst-plugins-a52dec-0.10 )
-	 !sparc? ( dvd? (
-						>=media-libs/gst-plugins-ugly-0.10
-						>=media-plugins/gst-plugins-a52dec-0.10
-						>=media-plugins/gst-plugins-dvdread-0.10
-						>=media-plugins/gst-plugins-mpeg2dec-0.10
-					)
-			 )
-	 !sparc? ( ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 ) )
-	 flac? ( >=media-plugins/gst-plugins-flac-0.10 )
-	 mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	 !sparc? ( mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 ) )
-	 ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
-	 theora? (
-				>=media-plugins/gst-plugins-ogg-0.10
-				>=media-plugins/gst-plugins-theora-0.10
-			 )
-	 vorbis? (
-				>=media-plugins/gst-plugins-ogg-0.10
-				>=media-plugins/gst-plugins-vorbis-0.10
-			 )
-	 xv? ( >=media-plugins/gst-plugins-xvideo-0.10 )"
+	 nvtv? ( >=media-tv/nvtv-0.4.5 )"
 
 # this belongs above xv? above.
 # win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.10 )
@@ -99,7 +100,7 @@
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 pkg_setup() {
-	if ! built_with_use 'media-libs/gst-plugins-base' 'X' ; then
+	if ! use xine && ! built_with_use 'media-libs/gst-plugins-base' 'X' ; then
 		einfo "Build gst-plugins-base with the X useflag"
 		einfo "echo \"media-libs/gst-plugins-base X\" >> /etc/portage/package.use"
 		einfo "emerge -1 gst-plugins-base"
@@ -109,7 +110,13 @@
 	# use global mozilla plugin dir
 	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins"
 
-	G2CONF="${G2CONF} --disable-vala --disable-vanity --enable-gstreamer --with-dbus"
+	G2CONF="${G2CONF} --disable-vala --disable-vanity --with-dbus"
+
+	if use xine ; then
+		G2CONF="${G2CONF} --enable-xine"
+	else
+		G2CONF="${G2CONF} --enable-gstreamer"
+	fi
 
 	if use gnome ; then
 	    G2CONF="${G2CONF} --disable-gtk --enable-nautilus"