--- /usr/portage/media-video/totem/totem-2.18.1-r1.ebuild	2007-05-02 10:01:01.000000000 -0500
+++ ../gentoo/media-video/totem/totem-2.18.1-r1.ebuild	2007-06-09 09:50:10.279617841 -0500
@@ -14,7 +14,7 @@
 # No 0.10.0 release for gst-plugins-pitdfdll yet
 # IUSE="win32codecs"
 
-IUSE="a52 debug dvd ffmpeg flac gnome hal lirc mad mpeg nsplugin nvtv ogg seamonkey theora vorbis xulrunner xv"
+IUSE="a52 debug dvd ffmpeg flac gnome hal lirc mad mpeg nsplugin nvtv ogg seamonkey theora vorbis xulrunner xv xine"
 
 RDEPEND=">=dev-libs/glib-2.12
 	 >=x11-libs/gtk+-2.10
@@ -29,19 +29,10 @@
 			>=dev-libs/dbus-glib-0.71
 			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
 		)
-
-	 >=media-libs/gstreamer-0.10.6
-	 >=media-libs/gst-plugins-good-0.10
-	 >=media-libs/gst-plugins-base-0.10.7
-	 >=media-plugins/gst-plugins-pango-0.10
-	 >=media-plugins/gst-plugins-gconf-0.10
-	 >=media-plugins/gst-plugins-gnomevfs-0.10
-
 	 x11-libs/libX11
 	 x11-libs/libXtst
 	 >=x11-libs/libXrandr-1.1.1
 	 >=x11-libs/libXxf86vm-1.0.1
-
 	 gnome? (
 				>=gnome-base/libgnome-2.4
 				>=gnome-base/libgnomeui-2.4
@@ -59,30 +50,40 @@
 				>=x11-misc/shared-mime-info-0.17
 				>=x11-libs/startup-notification-0.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 )"
+	xine? ( >=media-libs/xine-lib-1.1.2 )
+	!xine?	(
+				>=media-libs/gstreamer-0.10.1
+				>=media-libs/gst-plugins-base-0.10.7
+				>=media-libs/gst-plugins-good-0.10
+				>=media-plugins/gst-plugins-pango-0.10
+				>=media-plugins/gst-plugins-gconf-0.10
+				!sparc? ( ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 ) )
+				>=media-plugins/gst-plugins-gnomevfs-0.10
+				a52? ( >=media-plugins/gst-plugins-a52dec-0.10 )
+				!sparc?	(
+							dvd?
+								(
+									>=media-plugins/gst-plugins-a52dec-0.10
+									>=media-plugins/gst-plugins-mpeg2dec-0.10
+									>=media-libs/gst-plugins-ugly-0.10
+									>=media-plugins/gst-plugins-dvdread-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 )
@@ -98,7 +99,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"
@@ -108,7 +109,7 @@
 	# use global mozilla plugin dir
 	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser"
 
-	G2CONF="${G2CONF} --disable-vanity --enable-gstreamer --with-dbus"
+	G2CONF="${G2CONF} --disable-vanity --with-dbus"
 
 	if use gnome ; then
 	    G2CONF="--disable-gtk --enable-nautilus"
@@ -129,6 +130,12 @@
 	    G2CONF="${G2CONF} --disable-browser-plugins"
 	fi
 
+	if use xine; then
+		G2CONF="${G2CONF} --enable-xine --disable-gstreamer"
+	else
+		G2CONF="${G2CONF} --disable-xine --enable-gstreamer"
+	fi
+
 	G2CONF="${G2CONF} \
 		$(use_enable debug) \
 		$(use_with hal) \