--- orig/ffmpeg-9999.ebuild	2011-03-10 04:01:18.000000000 +0000
+++ ffmpeg-9999.ebuild	2011-03-19 08:17:32.784849413 +0000
@@ -7,7 +7,8 @@ EAPI="2"
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SCM="git"
-	EGIT_REPO_URI="git://git.ffmpeg.org/ffmpeg.git"
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
@@ -28,7 +29,7 @@ SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
+IUSE="+3dnow +3dnowext alsa altivec amr avx bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
 
@@ -58,6 +59,7 @@ RDEPEND="
 	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
+	truetype? ( media-libs/freetype:2 )
 	vaapi? ( x11-libs/libva )
 	video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
 	vpx? ( media-libs/libvpx )
@@ -144,6 +146,7 @@ src_configure() {
 		use ${i} && myconf="${myconf} --enable-lib${i}"
 	done
 	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
+	use truetype && myconf="${myconf} --enable-libfreetype"
 
 	# CPU features
 	for i in mmx ssse3 altivec ; do
@@ -157,6 +160,9 @@ src_configure() {
 	if use pic && use x86 ; then
 		myconf="${myconf} --disable-mmx --disable-mmx2"
 	fi
+	if use x86 || use amd64; then
+		use avx || myconf="${myconf} --disable-avx"
+	fi
 
 	# Option to force building pic
 	use pic && myconf="${myconf} --enable-pic"