Cleanup ebuilds, enable fate for 0.8

Package-Manager: portage-2.2.0_alpha103/cvs/Linux x86_64

6 files changed, 158 insertions, 238 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index ab53c52588e6..a57b1befee79 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.84 2012/05/14 18:29:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.85 2012/05/15 06:10:50 lu_zero Exp $
+
+*libav-0.8.2-r2 (15 May 2012)
+
+  15 May 2012; Luca Barbato <lu_zero@gentoo.org> -libav-0.8.2-r1.ebuild,
+  +libav-0.8.2-r2.ebuild, libav-0.8.9999.ebuild, libav-9999.ebuild,
+  metadata.xml:
+  Cleanup ebuilds, enable fate for 0.8
 
   14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.8.2-r1.ebuild,
   libav-0.8.9999.ebuild, libav-9999.ebuild:
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 6220e8d903a7..4c49f67a2ae5 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,27 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+DIST fate-0.8.2.tar.xz 443503168 RMD160 24fd9c0d30a8a6c20bfcc1a5402208cf8c64fec2 SHA1 49e54a76180a4343bb66442cf57dfd8017ba412c SHA256 4c16212e4d99194e670227ccf93d54c9bb4b6f27c515626a536b87deb610d850
 DIST libav-0.8.2.tar.xz 3807340 RMD160 599d8c385bf0ca25a053188fed4488508b501e50 SHA1 99e10a7132636652cf45ee3fc85ce36ff5818ce5 SHA256 96df20327396937add9df2693bba8ec109ef3eda7251065ddcaa86a8d9f3a7df
-EBUILD libav-0.8.2-r1.ebuild 9382 RMD160 f75c3691321fc1cf2471d9acb90187a5a5cb0931 SHA1 43789e951596710e7c849087ead2d332cba6ff4c SHA256 82c1ec3745ed37155cd9c9ecd51aff162bcc7c8a82dfe8434c5b23caed061341
+EBUILD libav-0.8.2-r2.ebuild 8998 RMD160 8591681921129ddf5904671f2608f42529e0c5a6 SHA1 f9216abe92a0d8e1234707ca7a1ef539dd7c45fc SHA256 33d7838ad6ad9660b31ff94d113da94e99a41aaa08ea78e504c3d7b57d0dfd8c
 EBUILD libav-0.8.2.ebuild 8958 RMD160 1a6eb0f5e18c5cf1d8618a9f392503b388419eb2 SHA1 1b8f17204a79c951468c614110917d9483762738 SHA256 60080ac8b61e776e1cec27a28b3e9768d3817511581c3dbe4bb38badde059206
-EBUILD libav-0.8.9999.ebuild 9176 RMD160 0cfb94a98d069fec866b718cbc0da18ebb7d428b SHA1 4964532bd5978efbe34edc7ed7e02983d1278796 SHA256 4acdf0d46105eb968d34c54c9cd675c9e851c3413fbc65077f43217fd6bc815f
-EBUILD libav-9999.ebuild 9404 RMD160 82400606da947bfcc8f5f206c01ef18e60d90f7a SHA1 0ff8137dbe1ed2611d46441f9311d65cdd1a1160 SHA256 051f6a0668347fc4516f9db77bd47bb8e7457e6cf0465675e2e5b8d37c7d6d26
-MISC ChangeLog 13181 RMD160 031dd5701ee193dec858d99fdbfbb4fb413209ab SHA1 6bb4f322d671ecc9c4a98bec7b222d17fd651dd3 SHA256 fc243411b26bb901daaf9c25fd8c0dded253c38d6e9bfdf11dac7f25a9f7d770
-MISC metadata.xml 3446 RMD160 043dba56bc894840d2cf09f38b81c6d744dfff93 SHA1 2bd84a3116290c2adf3b325decbb8224e71bb908 SHA256 3a02a24beb66adbaf7d91639fb56ea0bff7253656461d1aa2aeb53cf839272bf
+EBUILD libav-0.8.9999.ebuild 8999 RMD160 bb0e2f046ddb9e03fa1dfdbe77e8cacc3af17b2b SHA1 a76d7e3a06757ccb5a8bcda04fbefc8d67a08977 SHA256 fe0674ad3a335693b22edf95768e434f26ee82209f12c163d78d084028ce7505
+EBUILD libav-9999.ebuild 8782 RMD160 8990ba23a4c06a2f1a002b756228054343533ce4 SHA1 c4dd83aa4524071054496d8929fc48bf96812d9c SHA256 542a5421ecf075db1d6f74c0cac3716eaab5c3b42eb08466903871a3ef9205e2
+MISC ChangeLog 13407 RMD160 d4a69045e0665326d8fb873a73f0f1ac46433207 SHA1 133bcc2e9484e48dd804418d008db7a18aa68333 SHA256 0cef9ae5794610c66ec5dea067b3e2d2bbd36d871a8be4d630d7b63eb8ae9ce4
+MISC metadata.xml 2956 RMD160 b0091da3f452f2fd28859ce2e54ce0800269d154 SHA1 7392af83e5480254d3bc33026fac0b8cf2cbd00b SHA256 c7b04d7524f77f7116e95a33c7cb58e898defc88458d62b44d8975af61974675
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPsU7/AAoJEOSiRoyO7jvohsUQAIcEK+jgMVjWZtKtTY4QHbMA
-fBBOLGE/SI50J9x2YNKOtZ92CkfrqTC1AHZu2s6p8Cin1m4qQFH1zOP38Q74UdXC
-8YlRfj8l9hqdO3e/ALJIGBkRF5ZmUioCaK67w7TyhbcK1f2N2vDCp65x4PfvsQTe
-4+3Dc6ruxQ2j9OER3UGoNyW2MSuAQKGewCqfSiP7y5f6PSJUrjTOkaeYwMR2/CIg
-GWkxWcLBN4Ms0yKyQn82Wv4IAeDP1GviaLV6dJV5jy7TV/4g7TgU4iUis19HKaAn
-wCpA/nTkfb2ZALO/qWaZYTPoWVaxWSuZKa04PmjYYbN1GPgYFo6+dwO3nklBgWzf
-cPvOOpoAEQGx7Q5IFt+3zd7ivomJA+KORejikr1fGoeVi91DySqLKm0p/O2ITm34
-hdP4jwnELC0RVYqRUy1HOkNHc6X1ok7s9y5+rg8Kjyi7TioV3qGO7SVMCoidDy/5
-PJ5w2tzUVquKsogzrH5G7TwhamtQi1uKuH6EuMVFlj9VGsCfcdDQpLelJRBTfEoc
-mtoDBT4PdxBFCPAsF4PMHRKVbMTs0MoQTejfef3GqsyYp0sR6jQqI+9kIAddvQ9h
-nPLr8CUaCHC4xuV8HdWYJQqYX9JvrVSlmtzFrKAPjSmmG6Itlonhg4GUZXo3huu9
-aq5Oz7xIr33cNkkCjoB3
-=6ZQj
+iF4EAREIAAYFAk+x85gACgkQcXOrnRGRc45irQD/Xw/F+wwGZ+p0RPNQrUh7HoWB
+vBZYRqcLQLs9l0NzZqcA/2GtyTPXZMt3VBQfkWYG2SVUqd9LS9WNEFRT/2vcXCMT
+=KG2X
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-0.8.2-r1.ebuild b/media-video/libav/libav-0.8.2-r2.ebuild
index 0e676f39ec69..375bcafc5cd4 100644
--- a/media-video/libav/libav-0.8.2-r1.ebuild
+++ b/media-video/libav/libav-0.8.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.2-r1.ebuild,v 1.5 2012/05/14 18:29:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.2-r2.ebuild,v 1.1 2012/05/15 06:10:50 lu_zero Exp $
 
 EAPI=4
 
@@ -22,21 +22,22 @@ else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
 fi
 
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )"
+
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
 SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE=" aac aacplus alsa ass amr bindist +bzip2 cdio celt cpudetection
-	custom-cflags dirac debug doc +encode faac frei0r +gpl gsm
-	+hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network
-	openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads truetype v4l vaapi vdpau vorbis
-	vpx X x264 xvid +zlib"
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
+	  custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
+	  +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
+	  oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3
+	  static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
+	  +zlib"
 
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 neon ssse3 vis"
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2
+neon ssse3 vis"
 
 for i in ${CPU_FEATURES}; do
 	IUSE+=" ${i%:*}"
@@ -46,53 +47,36 @@ RDEPEND="
 	!media-video/ffmpeg
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
-	ass? ( media-libs/libass )
 	bzip2? ( app-arch/bzip2 )
 	cdio? ( dev-libs/libcdio )
-	celt? ( >=media-libs/celt-0.11.1 )
 	dirac? ( media-video/dirac )
 	encode? (
 		aac? ( media-libs/vo-aacenc )
-		aacplus? ( media-libs/libaacplus )
 		amr? ( media-libs/vo-amrwbenc )
 		faac? ( media-libs/faac )
 		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode]
-			media-libs/libogg
-		)
+		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
 		x264? ( >=media-libs/x264-0.0.20111017 )
 		xvid? ( >=media-libs/xvid-1.1.0 )
 	)
+	truetype? ( media-libs/freetype:2 )
 	frei0r? ( media-plugins/frei0r-plugins )
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	ieee1394? (
-		media-libs/libdc1394
-		sys-libs/libraw1394
-	)
+	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	libv4l? ( media-libs/libv4l )
-	modplug? ( media-libs/libmodplug )
 	pulseaudio? ( media-sound/pulseaudio )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
-	ssl? (
-		openssl? ( dev-libs/openssl )
-		!openssl? ( net-libs/gnutls )
-	)
+	ssl? ( openssl? ( dev-libs/openssl )
+		   !openssl? ( net-libs/gnutls ) )
 	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 )
 	vdpau? ( x11-libs/libvdpau )
 	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-	)
+	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
 	zlib? ( sys-libs/zlib )
 "
 
@@ -100,14 +84,11 @@ DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
 	dirac? ( virtual/pkgconfig )
 	doc? ( app-text/texi2html )
-	ieee1394? ( virtual/pkgconfig )
-	libv4l? ( virtual/pkgconfig )
 	mmx? ( dev-lang/yasm )
 	rtmp? ( virtual/pkgconfig )
 	schroedinger? ( virtual/pkgconfig )
-	ssl? ( virtual/pkgconfig )
-	test? ( net-misc/wget )
 	truetype? ( virtual/pkgconfig )
+	test? ( net-misc/wget )
 	v4l? ( sys-kernel/linux-headers )
 "
 
@@ -116,11 +97,10 @@ DEPEND="${RDEPEND}
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="bindist? ( !aacplus !faac !openssl )
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
-	test? ( encode zlib )
-"
+REQUIRED_USE="bindist? ( !faac !openssl )
+			  rtmp? ( network )
+			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
+			  test? ( encode )"
 
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
@@ -149,7 +129,7 @@ src_configure() {
 
 	if use ssl; then
 		use openssl && myconf+=" --enable-openssl --enable-nonfree" \
-			|| myconf+=" --enable-gnutls"
+					|| myconf+=" --enable-gnutls"
 	fi
 
 	use custom-cflags && myconf+=" --disable-optimizations"
@@ -165,12 +145,11 @@ src_configure() {
 
 	# Encoders
 	if use encode; then
-		use aacplus && myconf+=" --enable-nonfree"
-		use faac && myconf+=" --enable-nonfree"
 		use mp3 && myconf+=" --enable-libmp3lame"
 		use amr && myconf+=" --enable-libvo-amrwbenc"
+		use faac && myconf+=" --enable-libfaac --enable-nonfree"
 		use aac && myconf+=" --enable-libvo-aacenc"
-		uses="aacplus faac theora vorbis x264 xvid"
+		uses="theora vorbis x264 xvid"
 		for i in ${uses}; do
 			use ${i} && myconf+=" --enable-lib${i}"
 		done
@@ -182,7 +161,6 @@ src_configure() {
 	use cdio && myconf+=" --enable-libcdio"
 	use ieee1394 && myconf+=" --enable-libdc1394"
 	use pulseaudio && myconf+=" --enable-libpulse"
-
 	# Indevs
 	# v4l1 is gone since linux-headers-2.6.38
 	myconf+=" --disable-indev=v4l"
@@ -191,13 +169,11 @@ src_configure() {
 		use ${i} || myconf+=" --disable-indev=${i}"
 	done
 	use X && myconf+=" --enable-x11grab"
-	use libv4l && myconf+=" --enable-libv4l2"
 	# Outdevs
 	for i in alsa oss ; do
 		use ${i} || myconf+=" --disable-outdev=${i}"
 	done
 	# libavfilter options
-	use ass && myconf+=" --enable-libass"
 	use frei0r && myconf+=" --enable-frei0r"
 	use truetype &&  myconf+=" --enable-libfreetype"
 
@@ -206,7 +182,7 @@ src_configure() {
 
 	# Decoders
 	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
-	uses="celt gsm modplug rtmp schroedinger speex vpx"
+	uses="gsm dirac rtmp schroedinger speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=" --enable-lib${i}"
 	done
@@ -235,7 +211,8 @@ src_configure() {
 	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
 	# will just ignore it.
 	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[[ "${i}" == "native" ]] && i="host" # bug #273421
+		[ "${i}" = "native" ] && i="host" # bug #273421
+		[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
 		myconf+=" --cpu=${i}"
 		break
 	done
@@ -283,33 +260,29 @@ src_configure() {
 		--enable-shared \
 		--cc="$(tc-getCC)" \
 		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
 		$(use_enable static-libs static) \
 		${myconf} || die
 }
 
 src_compile() {
-	local i
-
 	emake
 
-	for i in ${FFTOOLS} ; do
-		use fftools_${i} && emake tools/${i}
-		done
+	if use qt-faststart; then
+		tc-export CC
+		emake tools/qt-faststart
+	fi
 }
 
 src_install() {
-	local i
 	emake DESTDIR="${D}" install install-man
 
 	dodoc Changelog README INSTALL
 	dodoc doc/*.txt
 	use doc && dodoc doc/*.html
 
-	for i in ${FFTOOLS} ; do
-		use fftools_${i} && dobin tools/${i}
-		done
+	if use qt-faststart; then
+		dobin tools/qt-faststart
+	fi
 
 	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
 		dosym  ${i} /usr/bin/${i/av/ff}
@@ -320,10 +293,11 @@ pkg_postinst() {
 	elog "Please note that the programs formerly known as ffplay, ffserver"
 	elog "and ffprobe are now called avplay, avserver and avprobe."
 	elog
-	elog "ffmpeg had been replaced by the feature incompatible avconv"
+	elog "ffmpeg had been replaced by the feature incompatible avconv thus"
+	elog "the legacy ffmpeg is provided for compatibility with older scripts"
 }
 
 src_test() {
 	LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-		emake V=1 -j1 fate
+		emake fate SAMPLES="${WORKDIR}/fate"
 }
diff --git a/media-video/libav/libav-0.8.9999.ebuild b/media-video/libav/libav-0.8.9999.ebuild
index 3f4d906e3c33..8232a3273703 100644
--- a/media-video/libav/libav-0.8.9999.ebuild
+++ b/media-video/libav/libav-0.8.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.15 2012/05/14 18:29:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.16 2012/05/15 06:10:50 lu_zero Exp $
 
 EAPI=4
 
@@ -22,21 +22,22 @@ else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
 fi
 
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-0.8.2.tar.xz )"
+
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
 SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE=" aac aacplus alsa ass amr bindist +bzip2 cdio celt cpudetection
-	custom-cflags dirac debug doc +encode faac frei0r +gpl gsm
-	+hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network
-	openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads truetype v4l vaapi vdpau vorbis
-	vpx X x264 xvid +zlib"
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
+	  custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
+	  +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
+	  oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3
+	  static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
+	  +zlib"
 
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 neon ssse3 vis"
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2
+neon ssse3 vis"
 
 for i in ${CPU_FEATURES}; do
 	IUSE+=" ${i%:*}"
@@ -46,53 +47,36 @@ RDEPEND="
 	!media-video/ffmpeg
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
-	ass? ( media-libs/libass )
 	bzip2? ( app-arch/bzip2 )
 	cdio? ( dev-libs/libcdio )
-	celt? ( >=media-libs/celt-0.11.1 )
 	dirac? ( media-video/dirac )
 	encode? (
 		aac? ( media-libs/vo-aacenc )
-		aacplus? ( media-libs/libaacplus )
 		amr? ( media-libs/vo-amrwbenc )
 		faac? ( media-libs/faac )
 		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode]
-			media-libs/libogg
-		)
+		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
 		x264? ( >=media-libs/x264-0.0.20111017 )
 		xvid? ( >=media-libs/xvid-1.1.0 )
 	)
+	truetype? ( media-libs/freetype:2 )
 	frei0r? ( media-plugins/frei0r-plugins )
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	ieee1394? (
-		media-libs/libdc1394
-		sys-libs/libraw1394
-	)
+	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	libv4l? ( media-libs/libv4l )
-	modplug? ( media-libs/libmodplug )
 	pulseaudio? ( media-sound/pulseaudio )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
-	ssl? (
-		openssl? ( dev-libs/openssl )
-		!openssl? ( net-libs/gnutls )
-	)
+	ssl? ( openssl? ( dev-libs/openssl )
+		   !openssl? ( net-libs/gnutls ) )
 	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 )
 	vdpau? ( x11-libs/libvdpau )
 	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-	)
+	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
 	zlib? ( sys-libs/zlib )
 "
 
@@ -100,14 +84,11 @@ DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
 	dirac? ( virtual/pkgconfig )
 	doc? ( app-text/texi2html )
-	ieee1394? ( virtual/pkgconfig )
-	libv4l? ( virtual/pkgconfig )
 	mmx? ( dev-lang/yasm )
 	rtmp? ( virtual/pkgconfig )
 	schroedinger? ( virtual/pkgconfig )
-	ssl? ( virtual/pkgconfig )
-	test? ( net-misc/wget )
 	truetype? ( virtual/pkgconfig )
+	test? ( net-misc/wget )
 	v4l? ( sys-kernel/linux-headers )
 "
 
@@ -116,11 +97,10 @@ DEPEND="${RDEPEND}
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="bindist? ( !aacplus !faac !openssl )
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
-	test? ( encode zlib )
-"
+REQUIRED_USE="bindist? ( !faac !openssl )
+			  rtmp? ( network )
+			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
+			  test? ( encode )"
 
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
@@ -149,24 +129,27 @@ src_configure() {
 
 	if use ssl; then
 		use openssl && myconf+=" --enable-openssl --enable-nonfree" \
-			|| myconf+=" --enable-gnutls"
+					|| myconf+=" --enable-gnutls"
 	fi
 
 	use custom-cflags && myconf+=" --disable-optimizations"
 	use cpudetection && myconf+=" --enable-runtime-cpudetect"
 
+	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
+	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
+	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
+	#done
 	use vdpau || myconf+=" --disable-vdpau"
 
 	use vaapi && myconf+=" --enable-vaapi"
 
 	# Encoders
 	if use encode; then
-		use aacplus && myconf+=" --enable-nonfree"
-		use faac && myconf+=" --enable-nonfree"
 		use mp3 && myconf+=" --enable-libmp3lame"
 		use amr && myconf+=" --enable-libvo-amrwbenc"
+		use faac && myconf+=" --enable-libfaac --enable-nonfree"
 		use aac && myconf+=" --enable-libvo-aacenc"
-		uses="aacplus faac theora vorbis x264 xvid"
+		uses="theora vorbis x264 xvid"
 		for i in ${uses}; do
 			use ${i} && myconf+=" --enable-lib${i}"
 		done
@@ -178,7 +161,6 @@ src_configure() {
 	use cdio && myconf+=" --enable-libcdio"
 	use ieee1394 && myconf+=" --enable-libdc1394"
 	use pulseaudio && myconf+=" --enable-libpulse"
-
 	# Indevs
 	# v4l1 is gone since linux-headers-2.6.38
 	myconf+=" --disable-indev=v4l"
@@ -187,13 +169,11 @@ src_configure() {
 		use ${i} || myconf+=" --disable-indev=${i}"
 	done
 	use X && myconf+=" --enable-x11grab"
-	use libv4l && myconf=" --enable-libv4l2"
 	# Outdevs
 	for i in alsa oss ; do
 		use ${i} || myconf+=" --disable-outdev=${i}"
 	done
 	# libavfilter options
-	use ass && myconf+=" --enable-libass"
 	use frei0r && myconf+=" --enable-frei0r"
 	use truetype &&  myconf+=" --enable-libfreetype"
 
@@ -202,7 +182,7 @@ src_configure() {
 
 	# Decoders
 	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
-	uses="celt gsm modplug rtmp schroedinger speex vpx"
+	uses="gsm dirac rtmp schroedinger speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=" --enable-lib${i}"
 	done
@@ -231,7 +211,8 @@ src_configure() {
 	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
 	# will just ignore it.
 	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[[ "${i}" == "native" ]] && i="host" # bug #273421
+		[ "${i}" = "native" ] && i="host" # bug #273421
+		[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
 		myconf+=" --cpu=${i}"
 		break
 	done
@@ -279,33 +260,29 @@ src_configure() {
 		--enable-shared \
 		--cc="$(tc-getCC)" \
 		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
 		$(use_enable static-libs static) \
 		${myconf} || die
 }
 
 src_compile() {
-	local i
-
 	emake
 
-	for i in ${FFTOOLS} ; do
-		use fftools_${i} && emake tools/${i}
-		done
+	if use qt-faststart; then
+		tc-export CC
+		emake tools/qt-faststart
+	fi
 }
 
 src_install() {
-	local i
 	emake DESTDIR="${D}" install install-man
 
 	dodoc Changelog README INSTALL
 	dodoc doc/*.txt
 	use doc && dodoc doc/*.html
 
-	for i in ${FFTOOLS} ; do
-		use fftools_${i} && dobin tools/${i}
-		done
+	if use qt-faststart; then
+		dobin tools/qt-faststart
+	fi
 
 	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
 		dosym  ${i} /usr/bin/${i/av/ff}
@@ -316,10 +293,11 @@ pkg_postinst() {
 	elog "Please note that the programs formerly known as ffplay, ffserver"
 	elog "and ffprobe are now called avplay, avserver and avprobe."
 	elog
-	elog "ffmpeg had been replaced by the feature incompatible avconv"
+	elog "ffmpeg had been replaced by the feature incompatible avconv thus"
+	elog "the legacy ffmpeg is provided for compatibility with older scripts"
 }
 
 src_test() {
 	LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-		emake V=1 -j1 fate
+		emake fate SAMPLES="${WORKDIR}/fate"
 }
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 7bf614561ea4..89900cda7b5d 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.44 2012/05/14 18:29:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.45 2012/05/15 06:10:50 lu_zero Exp $
 
 EAPI=4
 
@@ -27,90 +27,63 @@ SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="aac aacplus alsa ass amr bindist bluray +bzip2 cdio celt cpudetection
-	custom-cflags debug doc +encode faac fontconfig frei0r +gpl gsm
-	+hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network openssl oss
-	pic pulseaudio rtmp schroedinger sdl speex ssl static-libs test theora threads
-	truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 neon ssse3 vis"
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
+	  custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
+	  +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
+	  oss pic pulseaudio rtmp schroedinger sdl speex ssl +ssse3 static-libs
+	  test theora threads tools v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
+
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2
+neon ssse3 vis"
 
-FFTOOLS="aviocat cws2fws graph2dot ismindex pktdumper qt-faststart trasher"
-for i in ${FFTOOLS} ; do
-	IUSE+=" +fftools_${i}"
+for i in ${CPU_FEATURES}; do
+	IUSE+=" ${i%:*}"
 done
 
 RDEPEND="
 	!media-video/ffmpeg
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
-	ass? ( media-libs/libass )
-	bluray? ( media-libs/libbluray )
 	bzip2? ( app-arch/bzip2 )
 	cdio? ( dev-libs/libcdio )
-	celt? ( >=media-libs/celt-0.11.1 )
+	dirac? ( media-video/dirac )
 	encode? (
 		aac? ( media-libs/vo-aacenc )
-		aacplus? ( media-libs/libaacplus )
 		amr? ( media-libs/vo-amrwbenc )
 		faac? ( media-libs/faac )
 		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode]
-			media-libs/libogg
-		)
+		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
 		x264? ( >=media-libs/x264-0.0.20111017 )
 		xvid? ( >=media-libs/xvid-1.1.0 )
 	)
-	fontconfig? ( media-libs/fontconfig )
+	truetype? ( media-libs/freetype:2 )
 	frei0r? ( media-plugins/frei0r-plugins )
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	ieee1394? (
-		media-libs/libdc1394
-		sys-libs/libraw1394
-	)
+	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	libv4l? ( media-libs/libv4l )
-	modplug? ( media-libs/libmodplug )
+	rtmp? ( >=media-video/rtmpdump-2.4 )
 	pulseaudio? ( media-sound/pulseaudio )
-	rtmp? ( >=media-video/rtmpdump-2.2f )
-	ssl? (
-		openssl? ( dev-libs/openssl )
-		!openssl? ( net-libs/gnutls )
-	)
+	ssl? ( openssl? ( dev-libs/openssl )
+		   !openssl? ( net-libs/gnutls ) )
 	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 )
 	vdpau? ( x11-libs/libvdpau )
 	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-	)
+	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
 	zlib? ( sys-libs/zlib )
 "
 
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
+	dirac? ( virtual/pkgconfig )
 	doc? ( app-text/texi2html )
-	fontconfig? ( virtual/pkgconfig )
-	ieee1394? ( virtual/pkgconfig )
-	libv4l? ( virtual/pkgconfig )
 	mmx? ( dev-lang/yasm )
 	rtmp? ( virtual/pkgconfig )
 	schroedinger? ( virtual/pkgconfig )
-	ssl? ( virtual/pkgconfig )
-	test? ( net-misc/wget )
 	truetype? ( virtual/pkgconfig )
 	v4l? ( sys-kernel/linux-headers )
 "
@@ -120,11 +93,11 @@ DEPEND="${RDEPEND}
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="bindist? ( !aacplus !faac !openssl )
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
-	test? ( encode zlib )
-"
+REQUIRED_USE="bindist? ( !faac !openssl )
+			  rtmp? ( network )
+			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )"
+
+RESTRICT="test"
 
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
@@ -133,6 +106,8 @@ src_prepare() {
 	fi
 }
 
+TOOLS="aviocat graph2dot ismindex qt-faststart"
+
 src_configure() {
 	local myconf="${EXTRA_LIBAV_CONF}"
 	local uses i
@@ -143,6 +118,8 @@ src_configure() {
 		--enable-avfilter
 	"
 
+	use zlib && TOOLS+=" cws2fws"
+
 	# enabled by default
 	uses="debug doc network zlib"
 	for i in ${uses}; do
@@ -153,24 +130,27 @@ src_configure() {
 
 	if use ssl; then
 		use openssl && myconf+=" --enable-openssl --enable-nonfree" \
-			|| myconf+=" --enable-gnutls"
+					|| myconf+=" --enable-gnutls"
 	fi
 
 	use custom-cflags && myconf+=" --disable-optimizations"
 	use cpudetection && myconf+=" --enable-runtime-cpudetect"
 
+	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
+	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
+	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
+	#done
 	use vdpau || myconf+=" --disable-vdpau"
 
 	use vaapi && myconf+=" --enable-vaapi"
 
 	# Encoders
 	if use encode; then
-		use aacplus && myconf+=" --enable-nonfree"
-		use faac && myconf+=" --enable-nonfree"
 		use mp3 && myconf+=" --enable-libmp3lame"
 		use amr && myconf+=" --enable-libvo-amrwbenc"
+		use faac && myconf+=" --enable-libfaac --enable-nonfree"
 		use aac && myconf+=" --enable-libvo-aacenc"
-		uses="aacplus faac theora vorbis x264 xvid"
+		uses="theora vorbis x264 xvid"
 		for i in ${uses}; do
 			use ${i} && myconf+=" --enable-lib${i}"
 		done
@@ -182,7 +162,6 @@ src_configure() {
 	use cdio && myconf+=" --enable-libcdio"
 	use ieee1394 && myconf+=" --enable-libdc1394"
 	use pulseaudio && myconf+=" --enable-libpulse"
-
 	# Indevs
 	# v4l1 is gone since linux-headers-2.6.38
 	myconf+=" --disable-indev=v4l"
@@ -191,24 +170,20 @@ src_configure() {
 		use ${i} || myconf+=" --disable-indev=${i}"
 	done
 	use X && myconf+=" --enable-x11grab"
-	use libv4l && myconf+=" --enable-libv4l2"
 	# Outdevs
 	for i in alsa oss ; do
 		use ${i} || myconf+=" --disable-outdev=${i}"
 	done
 	# libavfilter options
-	use ass && myconf+=" --enable-libass"
+	use frei0r && myconf+=" --enable-frei0r"
 	use truetype &&  myconf+=" --enable-libfreetype"
-	for i in frei0r fontconfig ; do
-		use ${i} && myconf+=" --enable-${i}"
-	done
 
 	# Threads; we only support pthread for now but ffmpeg supports more
 	use threads && myconf+=" --enable-pthreads"
 
 	# Decoders
 	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
-	uses="bluray celt gsm modplug rtmp schroedinger speex vpx"
+	uses="gsm dirac rtmp schroedinger speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=" --enable-lib${i}"
 	done
@@ -237,7 +212,8 @@ src_configure() {
 	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
 	# will just ignore it.
 	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[[ "${i}" == "native" ]] && i="host" # bug #273421
+		[ "${i}" = "native" ] && i="host" # bug #273421
+		[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
 		myconf+=" --cpu=${i}"
 		break
 	done
@@ -278,41 +254,41 @@ src_configure() {
 
 	cd "${S}"
 	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
+		--prefix="$EPREFIX"/usr \
+		--libdir="$EPREFIX"/usr/$(get_libdir) \
+		--shlibdir="$EPREFIX"/usr/$(get_libdir) \
+		--mandir="$EPREFIX"/usr/share/man \
 		--enable-shared \
 		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
 		$(use_enable static-libs static) \
 		${myconf} || die
 }
 
 src_compile() {
-	local i
-
 	emake
 
-	for i in ${FFTOOLS} ; do
-		use fftools_${i} && emake tools/${i}
-	done
+	if use tools; then
+		tc-export CC
+		local i
+		for i in ${TOOLS}; do
+			emake tools/${i}
+		done
+	fi
 }
 
 src_install() {
 	local i
-
 	emake DESTDIR="${D}" install install-man
 
 	dodoc Changelog README INSTALL
 	dodoc doc/*.txt
 	use doc && dodoc doc/*.html
 
-	for i in ${FFTOOLS} ; do
-		use fftools_${i} && dobin tools/${i}
-	done
+	if use tools; then
+		for i in ${TOOLS}; do
+			dobin tools/${i}
+		done
+	fi
 
 	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
 		dosym  ${i} /usr/bin/${i/av/ff}
@@ -327,6 +303,5 @@ pkg_postinst() {
 }
 
 src_test() {
-	LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-		emake V=1 -j1 fate
+	ewarn "Live ebuild needs the current fate repository. Skipping for now"
 }
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index 85b256372e8f..a5f9f996bf68 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -12,20 +12,15 @@
 		3dnowext in /proc/cpuinfo to know whether your CPU supports it).
 	</flag>
 	<flag name="aac">Use external vo-aacenc library for AAC encoding</flag>
-	<flag name="aacplus">AAC+ encoding via <pkg>media-libs/libaacplus</pkg>.</flag>
 	<flag name="amr">Enable Adaptive Multi-Rate Audio support</flag>
-	<flag name="ass">Enables <pkg>media-libs/libass</pkg> based subtitle renderer.</flag>
 	<flag name="avx">Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips)</flag>
-	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
 	<flag name="cdio">Enable audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
-	<flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></flag>
 	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs).</flag>
 	<flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
 	<flag name="faac">Use external faac library for AAC encoding</flag>
 	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
 	<flag name="gpl">Build all GPL licensed code. Without this flag set the package is build under LGPL license.</flag>
 	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
-	<flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
 	<flag name="mmxext">Enable mmx2 support.</flag>
 	<flag name="network">Enable network streaming support.</flag>
 	<flag name="openssl">Prefer <pkg>dev-libs/openssl</pkg> over <pkg>net-libs/gnutls</pkg> to provide SSL/TLS support (notice: the resulting binaries are unredistributable).</flag>