--- www-client/chromium/chromium-5.0.307.9.ebuild	2010-02-19 16:36:46.000000000 +0100
+++ www-client/chromium/chromiumchromium-5.0.307.9.ebuild	2010-02-26 13:02:11.000000000 +0100
@@ -13,7 +13,7 @@
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+ffmpeg +plugins-symlink"
+IUSE="+html5 +plugins-symlink"
 
 RDEPEND="app-arch/bzip2
 	>=dev-libs/libevent-1.4.13
@@ -24,7 +24,6 @@
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
-	ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
 	x11-libs/libXScrnSaver
@@ -39,6 +38,7 @@
 	>=dev-util/gperf-3.0.3
 	>=dev-util/pkgconfig-0.23
 	sys-devel/flex"
+RDEPEND+= " html5? ( >=media-video/ffmpeg-0.5_p19787 )"
 
 pkg_setup() {
 	# Prevent user problems like bug 299777.
@@ -72,7 +72,7 @@
 	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
 	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
 	# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
-	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
+	use html5 && epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
 	# Prevent the make build from filling entire disk space on some systems,
 	# bug 297273.
 	epatch "${FILESDIR}"/${PN}-fix-make-build.patch
@@ -159,7 +159,7 @@
 	newman out/Release/chrome.1 chrome.1
 	newman out/Release/chrome.1 chromium.1
 
-	if use ffmpeg; then
+	if use html5; then
 		# Chromium looks for these in its folder
 		# See media_posix.cc and base_paths_linux.cc
 		dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}