--- ogmrip-0.9.0-r1.ebuild.orig	2006-08-17 22:33:36.000000000 +0200
+++ ogmrip-0.9.0-r1.ebuild	2006-08-17 22:36:22.000000000 +0200
@@ -34,20 +34,13 @@
 
 G2CONF="${G2CONF} $(use_enable gnome gnome-support) $(use_enable debug maintainer-mode) $(use_enable subp enchant-support) $(use_enable hal hal-support)"
 
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
+DOCS="AUTHORS ChangeLog README NEWS TODO"
 
 pkg_setup() {
-	if ! which mencoder > /dev/null 2>&1; then
-		eerror "Unable to find mencoder in the PATH. You need mencoder to use OGMRip."
-		eerror "Please, add encode to your USE flags and emerge mplayer again."
-		die "Unable to find mencoder in the PATH. You need mencoder to use OGMRip."
-	fi
-	if ! mencoder -ovc help 2> /dev/null | grep -q "^ *xvid *- .*$"; then
-		echo
-		eerror "Mplayer is not build with XviD support. OGMRip requires XviD support in mplayer."
-		eerror "Please, add xvid to your USE flags and emerge mplayer again."
-		die "Mplayer is not build with XviD support. OGMRip requires XviD support in mplayer."
-	fi
+	if ! built_with_use -a media-video/mplayer dvd encode xvid; then
+		eerror "Please, check that your USE flags contain 'dvd', 'encode' and 'xvid' and emerge mplayer again."
+		die "Mplayer is not build with dvd, encoding or xvid support. OGMRip requires dvd, encoding and xvid support in mplayer."
+fi
 }
 src_unpack() {
 	unpack ${A}