--- /usr/portage/media-tv/mythtv/mythtv-0.21_p17100.ebuild	2008-04-24 02:12:45.000000000 +0930
+++ /usr/local/portage/media-tv/mythtv/mythtv-0.21_p17100.ebuild	2008-05-26 22:11:11.000000000 +0930
@@ -9,9 +9,9 @@
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via"
+IUSE_VIDEO_CARDS="video_cards_nvidia"
 IUSE="aac alsa altivec autostart debug directv dvb dvd \
-ieee1394 jack lcd lirc mmx opengl opengl-video opengl-xvmc \
+ieee1394 jack lcd lirc mmx opengl opengl-video \
 perl python xvmc ${IUSE_VIDEO_CARDS}"
 
 RDEPEND=">=media-libs/freetype-2.0
@@ -43,7 +43,6 @@
 	lirc? ( app-misc/lirc )
 	perl? ( dev-perl/DBD-mysql )
 	python? ( dev-python/mysql-python )
-	opengl-xvmc? ( >=x11-drivers/nvidia-drivers-100 )
 	xvmc? ( x11-libs/libXvMC
 		app-admin/eselect-xvmc )"
 
@@ -75,17 +74,15 @@
 	einfo "package building."
 	echo
 
-	if use xvmc && use opengl-xvmc ; then
-		einfo "Enabling USE=opengl-xvmc results in an experimental OpenGL"
-		einfo "& XvMC renderer that only works on NVIDIA GeForce 4,5,6, & 7"
-		einfo "series of cards. It is typically slower then stock XVideo"
-		einfo "support that is the default in MythTV."
+	if use video_cards_nvidia && use xvmc ; then
+		einfo "For NVIDIA based cards, the XvMC renderer only works on"
+		einfo "the NVIDIA GeForce 4,5,6, & 7 series of cards."
 		echo
 	fi
 
 	if use opengl-video ; then
 		einfo "Enabling USE=opengl-video results in an experimental OpenGL"
-		einfo "renderer that is typically slower then the default XVideo"
+		einfo "renderer that is typically slower than the default XVideo"
 		einfo "renderer. Enable at your own risk."
 		echo
 	fi
@@ -117,12 +114,23 @@
 	use altivec || myconf="${myconf} --disable-altivec"
 	use jack || myconf="${myconf} --disable-audio-jack"
 	use opengl-video && myconf="${myconf} --enable-opengl-video"
-	use xvmc && ! use video_cards_via && ! use opengl-xvmc && \
-		myconf="${myconf} --enable-xvmc"
-	use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc \
-		--enable-xvmc-pro --disable-xvmcw"
-	use xvmc && use video_cards_nvidia && use opengl-xvmc && \
-		myconf="${myconf} --enable-xvmc --enable-xvmc-opengl --disable-xvmcw"
+
+	# Default all XvMC to use the XmVC Wrapper (libXvMCW)
+	# This lets 'eselect-xvmc' do it's stuff and handle which XvMC implementation
+	# gets used by way of /etc/X11/XvMCConfig at runtime
+	use xvmc && myconf="${myconf} --enable-xvmcw --disable-xvmc-vld"
+
+	# Check to see if we have an XvMC library selected
+	if [[ ! -f /etc/X11/XvMCConfig ]] || [[ -z `cat /etc/X11/XvMCConfig` ]]; then
+		echo
+		eerror "No XvMC implementation has been selected yet"
+		eerror "Use 'eselect xvmc list' for a list of available choices"
+		eerror "Then use 'eselect xvmc set <choice>' to choose"
+		eerror "'eselect xvmc set nvidia' for example"
+		echo
+		die "No XvMC implementation has been selected yet"
+	fi
+
 	# nvidia-drivers-71 don't support GLX 1.4
 	use video_cards_nvidia && has_version =x11-drivers/nvidia-drivers-71* \
 		&& myconf="${myconf} --enable-glx-procaddrarb"
@@ -289,11 +297,6 @@
 	ewarn "Your recordings folder must be owned by the user 'mythtv' now"
 	ewarn "chown -R mythtv /path/to/store"
 
-	if use xvmc; then
-		echo
-		elog "Please set the proper XvMC provider with eselect xvmc"
-	fi
-
 	if use autostart; then
 		echo
 		elog "Please add the following to your /etc/inittab file at the end of"