--- /usr/portage/www-client/chromium/chromium-6.0.472.0.ebuild	2010-07-22 02:14:21.000000000 +0200
+++ chromium-6.0.472.0.ebuild	2010-07-23 21:24:08.000000000 +0200
@@ -13,7 +13,7 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups gnome sse2"
+IUSE="cups gnome sse2 vpx"
 
 RDEPEND="app-arch/bzip2
 	>=dev-libs/libevent-1.4.13
@@ -23,7 +23,8 @@
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
-	media-video/ffmpeg[threads]
+	vpx? ( >=media-video/ffmpeg-0.6[threads,vpx] )
+	!vpx? ( media-video/ffmpeg[threads] )
 	cups? ( >=net-print/cups-1.4.4 )
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
@@ -61,7 +62,7 @@
 
 src_prepare() {
 	# Disable VP8 until we have a recent enough system-provided ffmpeg.
-	epatch "${FILESDIR}"/${PN}-disable-vp8-r1.patch
+	use vpx || epatch "${FILESDIR}"/${PN}-disable-vp8-r1.patch
 
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/libevent"