--- /usr/portage/media-video/mplayer/mplayer-9999.ebuild	2010-07-18 14:06:37.000000000 +0400
+++ mplayer-9999.ebuild	2010-09-06 21:46:25.000000000 +0400
@@ -14,10 +14,10 @@
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec +ass bidi bindist bl bluray bs2b
 +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb
 doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
-gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
+gif ggi -gmplayer gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+libcaca lirc +live lzo mad md5sum +mmx mmxext mng libmpeg2 +mp3 mpg123 nas +network nut openal
 amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
-samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
+rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
 +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis vpx
 win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
 [[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg"
@@ -116,6 +116,7 @@
 	enca? ( app-i18n/enca )
 	faad? ( media-libs/faad2 )
 	gif? ( media-libs/giflib )
+	gsm? ( media-sound/gsm )
 	iconv? ( virtual/libiconv )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg? ( media-libs/jpeg )
@@ -127,6 +128,8 @@
 	lzo? ( >=dev-libs/lzo-2 )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
+	libmpeg2? ( media-libs/libmpeg2 )
+	mpg123? ( media-sound/mpg123 )
 	nas? ( media-libs/nas )
 	nut? ( >=media-libs/libnut-661 )
 	openal? ( media-libs/openal )
@@ -139,6 +142,7 @@
 			app-arch/rar
 		)
 	)
+	rtmp? ( media-video/rtmpdump )
 	samba? ( net-fs/samba )
 	schroedinger? ( media-libs/schroedinger )
 	sdl? ( media-libs/libsdl )
@@ -197,19 +201,19 @@
 	if use gmplayer; then
 		ewarn ""
 		ewarn "GMPlayer is no longer actively developed upstream"
-		ewarn "and is not supported by Gentoo.  There are alternatives"
+		ewarn "and is not supported by Gentoo. There are alternatives"
 		ewarn "for a GUI frontend: smplayer, gnome-mplayer or kmplayer."
 	fi
 
 	if use cpudetection; then
 		ewarn ""
-		ewarn "You've enabled the cpudetection flag.  This feature is"
+		ewarn "You've enabled the cpudetection flag. This feature is"
 		ewarn "included mainly for people who want to use the same"
 		ewarn "binary on another system with a different CPU architecture."
 		ewarn "MPlayer will already detect your CPU settings by default at"
 		ewarn "buildtime; this flag is used for runtime detection."
 		ewarn "You won't need this turned on if you are only building"
-		ewarn "mplayer for this system.  Also, if your compile fails, try"
+		ewarn "mplayer for this system. Also, if your compile fails, try"
 		ewarn "disabling this use flag."
 	fi
 
@@ -221,7 +225,7 @@
 		ewarn ""
 		ewarn "Most desktop users won't need this functionality, but it"
 		ewarn "is included for corner cases like cross-compiling and"
-		ewarn "certain profiles.  If unsure, disable this flag and MPlayer"
+		ewarn "certain profiles. If unsure, disable this flag and MPlayer"
 		ewarn "will automatically detect and use your available CPU"
 		ewarn "optimizations."
 		ewarn ""
@@ -270,7 +274,7 @@
 	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
 
 	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
-	# compilation in almost every situation.  The reason for this is
+	# compilation in almost every situation. The reason for this is
 	# because if --enable is used, it will force the build of that option,
 	# regardless of whether the dependency is available or not.
 
@@ -297,6 +301,7 @@
 	use ipv6 || myconf+=" --disable-inet6"
 	use nut || myconf+=" --disable-libnut"
 	use rar || myconf+=" --disable-unrarexec"
+	use rtmp || myconf+=" --disable-librtmp"
 	use samba || myconf+=" --disable-smb"
 	if ! use lirc; then
 		myconf+="
@@ -367,7 +372,7 @@
 	if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then
 		use dvb || myconf+=" --disable-dvb"
 		use pvr || myconf+=" --disable-pvr"
-		use v4l	|| myconf+=" --disable-tv-v4l1"
+		use v4l || myconf+=" --disable-tv-v4l1"
 		use v4l2 || myconf+=" --disable-tv-v4l2"
 		if use radio && { use dvb || use v4l || use v4l2; }; then
 			myconf+="
@@ -398,8 +403,11 @@
 	##########
 	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-faad-internal" # always use system media-libs/faad2
+	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
 	use dirac || myconf+=" --disable-libdirac-lavc"
 	use dts || myconf+=" --disable-libdca"
+	use libmpeg2 || myconf+=" --disable-libmpeg2"
+	use mpg123 || myconf+=" --disable-mpg123"
 	if ! use mp3; then
 		myconf+="
 			--disable-mp3lame
@@ -407,7 +415,7 @@
 			--disable-mp3lib
 		"
 	fi
-	uses="a52 bs2b dv lzo"
+	uses="a52 bs2b dv gsm lzo"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-lib${i}"
 	done
@@ -536,7 +544,7 @@
 
 	# Turning off CPU optimizations usually will break the build.
 	# However, this use flag, if enabled, will allow users to completely
-	# specify which ones to use.  If disabled, mplayer will automatically
+	# specify which ones to use. If disabled, mplayer will automatically
 	# enable all CPU optimizations that the host build supports.
 	if use custom-cpuopts; then
 		uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
@@ -616,7 +624,7 @@
 		###################
 		# External FFmpeg #
 		###################
-		use external-ffmpeg && myconf+=" --disable-libavutil_a --disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a --disable-libswscale_a"
+		use external-ffmpeg && myconf+=" --enable-system-ffmpeg --disable-libavutil_a --disable-libavcodec_a --disable-libavcore_a --disable-libavformat_a --disable-libpostproc_a --disable-libswscale_a"
 	fi
 
 	myconf="--cc=$(tc-getCC) \