Sort IUSE to not contain dupes. Expand tools with all the available binaries. Restrict test on live due to fate req rather than providing ewarn. Sort deps alphabetically. Drop dirac that is no longer in configure. Drop sse test that is handled by configure. Quote configure params.

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

3 files changed, 84 insertions, 50 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index a57b1befee79..1103d66e2884 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,12 @@
 # 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.85 2012/05/15 06:10:50 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.86 2012/05/15 08:12:11 scarabeus Exp $
+
+  15 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild:
+  Sort IUSE to not contain dupes. Expand tools with all the available binaries.
+  Restrict test on live due to fate req rather than providing ewarn. Sort deps
+  alphabetically. Drop dirac that is no longer in configure. Drop sse test that
+  is handled by configure. Quote configure params.
 
 *libav-0.8.2-r2 (15 May 2012)
 
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 4c49f67a2ae5..a0ac40b8cd00 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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-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 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
+EBUILD libav-9999.ebuild 8903 RMD160 6fd4f1842ddf0eeb21f5cb431ab7ea633faa2b03 SHA1 b9a46cb3424fe552b4f707f676bb975fd1a8c95e SHA256 8fc020dc55f06b296a7812df8335f1ed57789a3ea0a994df1ead559b2881148d
+MISC ChangeLog 13774 RMD160 f15d6f343cf18cff991661d4064e4cc373732d12 SHA1 c0b5f5a66651e9da67c03c03cada80e0a5372338 SHA256 6bd4bc35f9959eb7a546deba22bffd558c152cec1f14d4e1333fd9c66a6baca6
 MISC metadata.xml 2956 RMD160 b0091da3f452f2fd28859ce2e54ce0800269d154 SHA1 7392af83e5480254d3bc33026fac0b8cf2cbd00b SHA256 c7b04d7524f77f7116e95a33c7cb58e898defc88458d62b44d8975af61974675
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+x85gACgkQcXOrnRGRc45irQD/Xw/F+wwGZ+p0RPNQrUh7HoWB
-vBZYRqcLQLs9l0NzZqcA/2GtyTPXZMt3VBQfkWYG2SVUqd9LS9WNEFRT/2vcXCMT
-=KG2X
+iQIcBAEBAgAGBQJPsg/pAAoJEOSiRoyO7jvoOj8P+wdWkf7V2D/w2KzZTbBVOg/N
+mdp+7+QEfIXyWF53YSshUjbAf3vfSgQCxglZ5Bi7sTWma+6SqX7R0HHL3nh0+39l
+oGPB+TYU+L6HUhx37+KMS1Iw80nRcRfLoooJeyJguxg9BJ5guitTHNcILHROlUrD
+mk/gNLqWUuUp+tIMW+hbnHDJJs5U6f00ljmGtrtHGBu+W25fFNCcGoHiL+m6wDbW
+sbd39Ty3DObUM5jyMVjEfBmq0p8mhEz2Cujf73rm5CZ8gZt36NzUYdAYA9+gcH/p
+WDVPOlwqrwLqwgtPbzXCZkzI+9vHH5Yr2zxBpr1CI25I513nJlWFnrtCwFhWp7fK
+f/9duxURiSPcM2dTgJEspth+0mcFq6CMIz/i0BMAIjSQwS9sIeFCdfd67QCrAdgb
+npbsATiXvltqBLgbSsd8Fkj1XSkxtlobWr9EJGIglFxP+FQM4P3ThSd79c3mA/22
+LKUSU2tdwxJ3ZGfkKk8AixujmwQDeIEtA+2QP8wF5WewdI75LsCydv5PYdWBlLH5
+FWj4Cq4mMQqyGi6m+gbqP0mz7ZBDvVj/8e3lxyIySUeCQZ0JZ1GYzBKoW2cWGTSz
+nvxbP06ViIn2FowmiOhpGmu2gnbuQDCFJR8fSKatFLLhGDsBGF7KQQ6o4lWM4Enk
+arGfwpY15Muj5Ed4wYHx
+=rV2e
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 89900cda7b5d..f296214eb3b0 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.45 2012/05/15 06:10:50 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.46 2012/05/15 08:12:11 scarabeus Exp $
 
 EAPI=4
 
@@ -27,63 +27,77 @@ 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="+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"
-
-for i in ${CPU_FEATURES}; do
+IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
+	+encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
+	network openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools 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
 
+TOOLS="aviocat graph2dot ismindex pktdumper qt-faststart trasher"
+
 RDEPEND="
 	!media-video/ffmpeg
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
 	bzip2? ( app-arch/bzip2 )
 	cdio? ( dev-libs/libcdio )
-	dirac? ( media-video/dirac )
 	encode? (
 		aac? ( media-libs/vo-aacenc )
 		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 )
-	rtmp? ( >=media-video/rtmpdump-2.4 )
 	pulseaudio? ( media-sound/pulseaudio )
-	ssl? ( openssl? ( dev-libs/openssl )
-		   !openssl? ( net-libs/gnutls ) )
+	rtmp? ( >=media-video/rtmpdump-2.2f )
+	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 )
+	ieee1394? ( virtual/pkgconfig )
 	mmx? ( dev-lang/yasm )
 	rtmp? ( virtual/pkgconfig )
 	schroedinger? ( virtual/pkgconfig )
+	ssl? ( virtual/pkgconfig )
 	truetype? ( virtual/pkgconfig )
 	v4l? ( sys-kernel/linux-headers )
 "
@@ -94,9 +108,12 @@ DEPEND="${RDEPEND}
 # amr and aac require at least lgpl3
 # x264 requires gpl2
 REQUIRED_USE="bindist? ( !faac !openssl )
-			  rtmp? ( network )
-			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )"
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
+	test? ( encode zlib )
+"
 
+# Test on live ebuild are not possible as they require trunk fate
 RESTRICT="test"
 
 src_prepare() {
@@ -106,20 +123,18 @@ src_prepare() {
 	fi
 }
 
-TOOLS="aviocat graph2dot ismindex qt-faststart"
-
 src_configure() {
 	local myconf="${EXTRA_LIBAV_CONF}"
 	local uses i
 
+	use zlib && TOOLS+=" cws2fws"
+
 	myconf+="
 		$(use_enable gpl)
 		$(use_enable gpl version3)
 		--enable-avfilter
 	"
 
-	use zlib && TOOLS+=" cws2fws"
-
 	# enabled by default
 	uses="debug doc network zlib"
 	for i in ${uses}; do
@@ -130,27 +145,23 @@ 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 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="theora vorbis x264 xvid"
+		uses="faac theora vorbis x264 xvid"
 		for i in ${uses}; do
 			use ${i} && myconf+=" --enable-lib${i}"
 		done
@@ -162,6 +173,7 @@ 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"
@@ -183,7 +195,7 @@ src_configure() {
 
 	# Decoders
 	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
-	uses="gsm dirac rtmp schroedinger speex vpx"
+	uses="gsm rtmp schroedinger speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=" --enable-lib${i}"
 	done
@@ -212,8 +224,7 @@ 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} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
+		[[ "${i}" == "native" ]] && i="host" # bug #273421
 		myconf+=" --cpu=${i}"
 		break
 	done
@@ -254,22 +265,27 @@ 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
 
 	if use tools; then
 		tc-export CC
-		local i
+
 		for i in ${TOOLS}; do
 			emake tools/${i}
 		done
@@ -278,6 +294,7 @@ src_compile() {
 
 src_install() {
 	local i
+
 	emake DESTDIR="${D}" install install-man
 
 	dodoc Changelog README INSTALL
@@ -303,5 +320,6 @@ pkg_postinst() {
 }
 
 src_test() {
-	ewarn "Live ebuild needs the current fate repository. Skipping for now"
+	LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+		emake V=1 -j1 fate
 }