--- /usr/local/portage/media-video/ogmrip/ogmrip-0.12.2.ebuild	2008-09-28 20:15:41.000000000 +0200
+++ ogmrip-0.12.2.ebuild	2008-09-30 05:21:27.000000000 +0200
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
+
 inherit gnome2 eutils
 
 DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
@@ -16,14 +18,15 @@
 RDEPEND=">=dev-libs/glib-2.6
 	>=app-i18n/enca-1.0
 	>=media-libs/libdvdread-0.9.7
-	>=media-video/mplayer-1.0_pre4
+	>=media-video/mplayer-1.0_pre4[dvd,encode,xvid?,dts?,x264?]
 	virtual/eject
 	aac? ( >=media-libs/faac-1.24 )
 	gtk? ( >=x11-libs/gtk+-2.6
 		>=gnome-base/gconf-2.6
 		>=gnome-base/libglade-2.5
 		libnotify? ( >=x11-libs/gtk+-2.10
-			>=x11-libs/libnotify-0.4.3 ) )
+			>=x11-libs/libnotify-0.4.3 )
+		media-video/mplayer[jpeg] )
 	hal? ( >=sys-apps/hal-0.4.2 )
 	matroska? ( >=media-video/mkvtoolnix-0.9 )
 	mp3? ( >=media-sound/lame-3.96 )
@@ -46,8 +49,6 @@
 DOCS="AUTHORS ChangeLog README NEWS TODO"
 
 pkg_setup() {
-	local letsfail=0
-
 	G2CONF="${G2CONF}
 		$(use_enable aac aac-support)
 		$(use_enable debug maintainer-mode)
@@ -63,32 +64,5 @@
 		$(use_enable vorbis vorbis-support)
 		$(use_enable x264 x264-support)
 		$(use_enable xvid xvid-support)"
-
-	if ! built_with_use -a media-video/mplayer dvd encode; then
-		eerror "Please check that your USE flags contain 'dvd' and 'encode'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-	if use xvid && ! built_with_use -a media-video/mplayer xvid; then
-		eerror "Please check that your USE flags contain 'xvid'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-	if use dts && ! built_with_use -a media-video/mplayer dts; then
-		eerror "Please check that your USE flags contain 'dts'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-	if use x264 && ! built_with_use -a media-video/mplayer x264; then
-		eerror "Please check that your USE flags contain 'x264'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-	if use gtk && ! built_with_use -a media-video/mplayer jpeg; then
-		eerror "Please check that your USE flags contain 'jpeg'"
-		eerror "and emerge mplayer again."
-		((letsfail++))
-	fi
-
-	[[ ${letsfail} != 0 ]] && die "MPlayer is missing required USE flags (see above for details)."
 }
+