--- mplayer-1.0_rc2_pre20070321-r4.ebuild.old	2007-03-29 00:55:04.000000000 +0400
+++ mplayer-1.0_rc2_pre20070321-r4.ebuild.old	2007-03-29 00:56:58.000000000 +0400
@@ -11,7 +11,8 @@ 
 jpeg libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 musepack nas
 unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl
 speex srt sse sse2 svga tga theora tivo truetype v4l v4l2 vidix win32codecs X
-x264 xanim xinerama xv xvid xvmc zoran"
+x264 xanim xinerama xv xvid xvmc zoran
+encode-aac encode-mp3"
 
 VIDEO_CARDS="s3virge mga tdfx vesa"
 
@@ -62,9 +63,9 @@ 
 	dvb? ( media-tv/linuxtv-dvb-headers )
 	dvd? ( dvdnav? ( media-libs/libdvdnav ) )
 	encode? (
-		aac? ( media-libs/faac )
+		encode-aac? ( media-libs/faac )
 		mp2? ( media-sound/twolame )
-		mp3? ( media-sound/lame )
+		encode-mp3? ( media-sound/lame )
 		)
 	esd? ( media-sound/esound )
 	enca? ( app-i18n/enca )
@@ -260,7 +261,7 @@ 
 	fi
 
 	if use encode; then
-		use aac || myconf="${myconf} --disable-faac"
+		use encode-aac || myconf="${myconf} --disable-faac"
 		use dv || myconf="${myconf} --disable-libdv"
 		use x264 || myconf="${myconf} --disable-x264"
 	else