Version bump to latest releases. Drop older masked version.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 342 insertions, 5 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 6cd471f43350..a24759006681 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.149 2013/04/22 20:42:24 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.150 2013/05/20 10:47:56 scarabeus Exp $
+
+*libav-9.6 (20 May 2013)
+*libav-0.8.7 (20 May 2013)
+
+  20 May 2013; Tomáš Chvátal <scarabeus@gentoo.org> +libav-0.8.7.ebuild,
+  +libav-9.6.ebuild, -libav-9.5.ebuild:
+  Version bump to latest releases. Drop older masked version.
 
 *libav-9.5 (22 Apr 2013)
 
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index d3faf7814bae..9bd9fb8969ab 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,14 +1,36 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libav-0.8.5-support-libcdio-paranoia.patch 1477 SHA256 2e3490bba021c512828f12dfc5e6be39a5f3c53e16b2ceb99e6f6c4e71139803 SHA512 2a9847a435a32fac0b9bd904b932d20f26a6c7b0d086cda42c45f9099d87dbd4e637c7a52e5c29ad0df69a95ffed91bad2673d773c3045f03baf736796ab8332 WHIRLPOOL 77152717b72d245e4bfd5ac0cc1ed4ac3a512086be248515bc7d0c73d4840cfae7ba3bb7a668ee354803b6fba6ad90b992f80f2c335b5173741498a968b3eca2
 DIST fate-0.8.2.tar.xz 443503168 SHA256 4c16212e4d99194e670227ccf93d54c9bb4b6f27c515626a536b87deb610d850 SHA512 eca7783af7afc567ed226942b1318b1874b2487c7dc65406fe2097cf2318d722bb4c45ed14363bc3653f948f7cdac5967162e1f4fbd5cbec1adc244886800bb1 WHIRLPOOL abe5faa67444c3edaf5ae9a57a701ba0fccd3e313941d0f7662b8dc2b3a8886578d7bcbd6ed4abfc62abe3b7a36ea216529710e28d1c9cff8f3bb2b9804707bf
 DIST fate-9.tar.xz 467671500 SHA256 27d10fd49267452ac787c3f43501a4a21d0ccaccc5ddd6d79d8a6150ee276532 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202 WHIRLPOOL d280ac32c6d84f121be8d733774e72a4df3f2e84d71051aea509ef5ca3289c94fd548bf03ff12215e045bf20c83426c547e6b5eb446429d167f38af7c7aa9803
 DIST libav-0.8.5.tar.xz 3761376 SHA256 d82cfbbca9825d8cf6cff4d830a57d094d359d23da7179a2d2811300cdcac57f SHA512 88e28b27f4a1f5dd856210b32527bc6c631e3c8470eedcdf303368cb2ff848407d6eb4359279eb8bf6d21375c0e5ac6860db8e1e96c4030990a643f9a365061c WHIRLPOOL a4ba175d9b40c5c1969be74fdae31c1bc67abf308e38c2baf429aecd16f5f7cd34df33e4f18661b5214d4c768011b2b742dc646ef5ceed51278b4ee04736546e
 DIST libav-0.8.6.tar.xz 3761040 SHA256 6144b78975210b9c4974e80bddbd5feb3bafe5e3a9c004a9c36a92ebe9da7cb4 SHA512 23bc6ffca8a9ce0963da6dbedfb110fe794eead713afda8514213e0e8f341b7256768f71ca16452056134a18049e5022973191a521d28dd888a15240db3fe48a WHIRLPOOL 217640b1f7793355b4660c07b514976d2f88b2220336ae20d5cf37fdec0b26218621626e1681f865d481eef613de9401770901e0b0d6e7d36082c81a5988d69a
-DIST libav-9.5.tar.xz 4069028 SHA256 cf86a1533f3c28b8a78455f3a8d91fc2892526bbf17b73b308717001710624ff SHA512 2682b62a16e8afc6ca2320ab4c37755c8d20b7f81130d728ebcb317ab709297115ef09b729b263b4578644d9c62c805023458f7772be133ec5089e4dc9b1e461 WHIRLPOOL 1483f209bbf0385fec930f32fe8ac512326fd449c29d9cf7b3b4805543acd9b16cd56cd5d4806121fcaf42cdedcab70f64df1c13f2c9cb7c405161c2999f05ff
+DIST libav-0.8.7.tar.xz 3763180 SHA256 8be6cbee4066ea031110d0f1cf8f9fecda8bc36d868aafdc7e0d34b59e6d5f3d SHA512 34b23bc61b4755b7d9aa078b77571641a167da0fb356c549ee48fa61fcedd4e9dcd7965ac65487606ef18edb3512f08a565de901f1927f11a18c1864da4ec83a WHIRLPOOL 3896adac36dc789a74e3839061e466f6277d225ecc13e9f6f96953b353fe6e15cd76b0464704240eb97c4c0fec230b21d7e4aa684869e367bb489ddee938bada
+DIST libav-9.6.tar.xz 4068704 SHA256 03541b5c277ef7f199a440f1aedee040b94a95185aefd2bf3f0552112eea1c85 SHA512 38b873193e86dc3f1b14f2116328908bcf3e28b802b773a19f1a06eebaa2cff0bd5b571dfbe6600eb0183c8ea2b6f42b87e07eb62dc1a498d4bba9c69c68ee1b WHIRLPOOL 51847b10ba4194c4449be9cdddf9cde82c5aa528ff4dad29ba261ededc52e0d8b54282788ff637703edb6a6cdac7720a5eca89a6ad83eeca6c897e0e12c2984d
 EBUILD libav-0.8.5.ebuild 9150 SHA256 9da77bb30ebd50fef110b3c3024a09c81a28ced9daaf6576e02d0d3741451674 SHA512 10b04e57ad78906773e98748b78b12643167655fd6d81069ed9c93c9d4164a2979b9007922f1e54fbe442f1f6d0525194aa18128da63f396a7e5103670ba5c8f WHIRLPOOL f554fcd8653ad28dfeffed25a3525e4f776061d42dccec61a6b49055451f107a6651a1c13daee1101f97565c9796b2ce3b5767ca59131a011372fbd496b58a0b
 EBUILD libav-0.8.6.ebuild 9171 SHA256 14c6d38c6db77f992d35bcfeffc25ae689a7f5fff8b8ee5d7e0db7a7be7d96e5 SHA512 fa7dbed3045bcaed6daec76c8b20ca8720b3e2cea1d66ad20df918ae55cd51b3fb617f03c2e6d5d750915c03bc8e522b24e955a37c9e0a4a44b55df7851bb8f3 WHIRLPOOL f2a938dc8b02d47df1662bc4135d2e4282e555407a7820afd187d55bbb871d714a635d4a0ec3e53ab25234817e96b6b6148cd08c7ed4ff754105f2f81650bf87
+EBUILD libav-0.8.7.ebuild 9106 SHA256 2c2739a6d32ee444b93d71209f9a609a58070fd960406a577d76ecdaaef960c2 SHA512 630b3124b8f0bdbc3c9243f13a36ba7ec5144c57ca08a7cd06f82c3ca45fdf32645539a20032416cc16d8edc4f85a6e4db9edf590615777e2fa4d37eba084e4e WHIRLPOOL 0eadbba1607c90569b2c12d45462062c7cdb70758dd869ebbcf9311ebb57688840acd2b0d44be016c2c1abe4c86253c777fa99dcc68ab8ba011954a93ed6e417
 EBUILD libav-0.8.9999.ebuild 9110 SHA256 596fc2c01d57af2f3af6af4b45139eb766b9d43503f8874ed82bbff6a099d0e1 SHA512 1717f9cf91ab218e302c685e7f3ab0231ce731fc79c45fb5b797ce7243125317d51fd788d151742407164b49f54528408382f9672e053a09438de44132bc7ef0 WHIRLPOOL a1c93c43997b327982e24dea09a4c64189133e270528a499e8cfb9ce64dd7c86598ef212264d6f52e30dcaa1ee3ce8f60725e225aaa8f9eedc0f34832f3a4d1b
-EBUILD libav-9.5.ebuild 8874 SHA256 bce8587e226eb50aa5d30c82c12f032b29898ed5a0c6b76d3c0943cd9a352112 SHA512 4cb00160fdbf5bc774c09688a7a7840086efbd268430b353c4a679cd6d7b7c2c6dc8f8abb7737537a271fbd996fc9a9a15cf9e99cfdd6f586c9cf6136a8026ae WHIRLPOOL 2e226684e8bce099742f52a0f0901473c9f946eb021c4e552c49362f178b991ec846b409d07ccd759264d7560eea28f3fe082c8d069cb8bc1860d0744771dab0
+EBUILD libav-9.6.ebuild 8876 SHA256 4eb5ab51f09bc6d28f43196acda49db992cda4ea5b07cebfd897c1b7106b6788 SHA512 b4c33200bb2b7e2edb003c955f6fa2526207525cd3f2dd99937a1008e0c8cc6dc653e742297252ad8236269dce2ce710c43c947e172faef075d9f90e641bb793 WHIRLPOOL 57b353ef40bc7415d969136a7b84228b51748adeaf88d2ec742595503edc91b4854e91b0f93ac44dabb73f75d775c20b7cd4ad715d8f44b2d38bcc7542a6f5ba
 EBUILD libav-9.9999.ebuild 8877 SHA256 783078761281e8c167c1417176854cab77612400f963235cc1b4c736351fe68a SHA512 0df6ac5afd05c0066fed08c78a88098761764bcc591b7f2b0065599b0ce455055e8d37de8e5a4588505695959fc603f46b7da875f34bfb3862fd0b33b7168f7e WHIRLPOOL 1674dc351e6b04bd276396be3f060466f2a3e6e628b862e099b4fddbca5b632e69128bdb53d1831ddcd8e5843b7ad3cf08fc41f0c8cbb330842353c06b613358
 EBUILD libav-9999.ebuild 8754 SHA256 912c110b9824153d511e1503e3405b8d486e47a732cf3c9c07c24072c186f1a4 SHA512 61675c1a70f1a6c5da363e407fe860a1a3b7cd379fb68e756b07bd15c3e4f0ad706cfd77618f72c20675ef49f2264e7a01cc2adbacda8a20086e420b443e288a WHIRLPOOL 5648de61cb35cf98f7e1a35fc5234070e14d107ad255282062db8245dafd3af198ca8abbc5ad2ad3e0de9597a96db5d734802b0c6ef7b9bba19f4eb0999d4bfc
-MISC ChangeLog 22049 SHA256 9afa55c09903b6287cef7b5b5f31dde51a4a774bcdcd5d40b8f9558992d43aed SHA512 43d725d1ad718dcaf0822f9c6751e00d5f19562b91a0f4711e7923ab1a4a791d4e9466e491b4949024d882ee21dbff6df3f0398b2e7feb1fecb3aae8a0a8a948 WHIRLPOOL 99252385017d916b62f95aabd50a61f979352b7cd33b30745d0524eb76c70481767c5ef080870d86fe54f0e6609e2f48f90f77c827cb92f80b88674b59ef38ee
+MISC ChangeLog 22283 SHA256 75cde0ca79f9265a69004e2445b9a8c6fbde00dff946d2792bf2ada280fddc15 SHA512 f45d18276ad7c312d602313a4c24220380b844e8c3fd14775e9a3990e99040c17a94f8bfc4f1b073e2e79b1837ca495b2691b5e94ee70fcfd40d0905e7b9da8a WHIRLPOOL d22658430998bb6fb851976baabdff351313f71d6545394069dca5e4e0c461b48269f70680fbd9b1b6f02718c3a0ce48e366dc05f506f95158072bae52b6aa7e
 MISC metadata.xml 3106 SHA256 968ffe2f92f6e2ae9963fe0005e78fc205ebca769d48eedd578472cef8c8cfcc SHA512 f10f99a54e1806b17d0923429c2df151e470edceefd854e63c0411b2be6fbbaf829e441dd318ff0e87d5f2d6985c52673646c20c971fba9c0d44d67edc3bb5c8 WHIRLPOOL 9004c95991227752427cf62491949845931683a9a45a7a555b98b1bf92cf7d2efad0e2c912b4a069e58e31f41062d0025b8e3a082e0cc37c5d13484969058a47
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRmf+BAAoJEOSiRoyO7jvo8EEP/02ibcTmSS/by9T+66Q8SDSG
+HdZAA0zOZDwZXCL4pMh7lLJot2jjZW4Oa7EN3IIZSSUVItAJhVavw29Pi1d6DzfE
+G+fcCjJBwdzHONq8hESbd0aJKHxdUJhLe7oixfcKrMpcwB/hVjR+RpinmKpEM1hC
+T02NdDIBbxKVR8XnUTeF184TGm/ZLCuu2ZhPy6rHdnQcVw7k/8o+arcBHTtDNBCh
+UhqgQNoyV58lJo+j8gNjKwmMbmdcd9PbK4Trp0PsxpximvEyV51gtGjmpLQHk/uS
+N2Mb1YndtoquzHdbhHy22OnBIB9A47fSBrK6DnSoc9nLS7JDUJcbR2KM9GyL1ADH
+sbXQinQ/zgOILAT8piNhF3AF+tugaVw/tOh6ldvlfkshpjluktS5MNaTLiRMbX+2
+Z0ZYUoRhaC1w/Atmu5FSTYAOiHNLoIKdCtHFGZC58dHazQx8RtPd6STrlB0Uvbd8
+eM5oYRSXsti5Fr5BWFDTPBdM8P6K3ldZdVNrSi+8tme8n5CqshKc0A3dHlnhtA2F
+JNK1bcTRaYKH78fsWdm/sehp9bZH8CIPGS48TezeixTFPZfio9M1et8ml4FIT1Gs
+6Gy2xHhYZDvmJqO5PGCxFKKfYiXZ4B35ORugplBMg0/BC7+yA07fZgZa3p6x8HXy
+P6wz9ujYhI3QfvnDFtcT
+=ImBy
+-----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-0.8.7.ebuild b/media-video/libav/libav-0.8.7.ebuild
new file mode 100644
index 000000000000..2223f23779d3
--- /dev/null
+++ b/media-video/libav/libav-0.8.7.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.7.ebuild,v 1.1 2013/05/20 10:47:56 scarabeus Exp $
+
+EAPI=5
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://git.libav.org/libav.git"
+	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video."
+HOMEPAGE="http://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
+fi
+
+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/0.8"
+[[ ${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 +qt-faststart rtmp schroedinger sdl speex ssl +ssse3
+	  static-libs test theora threads 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+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	bzip2? ( app-arch/bzip2 )
+	cdio? (
+		|| (
+			dev-libs/libcdio-paranoia
+			<dev-libs/libcdio-0.90[-minimal]
+		)
+	)
+	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 )
+		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 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+	pulseaudio? ( media-sound/pulseaudio )
+	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 )
+	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 )
+	zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	dirac? ( virtual/pkgconfig )
+	doc? ( app-text/texi2html )
+	mmx? ( dev-lang/yasm )
+	rtmp? ( virtual/pkgconfig )
+	schroedinger? ( virtual/pkgconfig )
+	truetype? ( virtual/pkgconfig )
+	test? ( net-misc/wget )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# 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 ) cdio? ( gpl )
+			  test? ( encode )"
+
+src_prepare() {
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+}
+
+src_configure() {
+	local myconf="${EXTRA_LIBAV_CONF}"
+	local uses i
+
+	myconf+="
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-avfilter
+	"
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use bzip2 || myconf+=" --disable-bzlib"
+	use sdl || myconf+=" --disable-avplay"
+
+	if use ssl; then
+		use openssl && myconf+=" --enable-openssl --enable-nonfree" \
+					|| 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 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"
+		for i in ${uses}; do
+			use ${i} && myconf+=" --enable-lib${i}"
+		done
+	else
+		myconf+=" --disable-encoders"
+	fi
+
+	# libavdevice options
+	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"
+	use v4l || myconf+=" --disable-indev=v4l2"
+	for i in alsa oss jack; do
+		use ${i} || myconf+=" --disable-indev=${i}"
+	done
+	use X && myconf+=" --enable-x11grab"
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=" --disable-outdev=${i}"
+	done
+	# libavfilter options
+	use frei0r && myconf+=" --enable-frei0r"
+	use truetype &&  myconf+=" --enable-libfreetype"
+
+	# 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="gsm dirac rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=" --enable-lib${i}"
+	done
+	use jpeg2k && myconf+=" --enable-libopenjpeg"
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=" --disable-${i#*:}"
+	done
+
+	# pass the right -mfpu as extra
+	use neon && myconf+=" --extra-cflags=-mfpu=neon"
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && use x86 ; then
+		myconf+=" --disable-mmx --disable-mmx2"
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=" --enable-pic"
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# 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
+		myconf+=" --cpu=${i}"
+		break
+	done
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=" --target-os=freebsd"
+				;;
+			mingw32*)
+				myconf+=" --target-os=mingw32"
+				;;
+			*linux*)
+				myconf+=" --target-os=linux"
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=" --enable-hardcoded-tables"
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ $(tc-arch) == "x86" ]]; then
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	cd "${S}"
+	./configure \
+		--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)" \
+		$(use_enable static-libs static) \
+		${myconf} || die
+
+	MAKEOPTS+=" V=1"
+}
+
+src_compile() {
+	emake
+
+	if use qt-faststart; then
+		tc-export CC
+		emake tools/qt-faststart
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-man
+
+	dodoc Changelog README INSTALL doc/*.txt
+	use doc && dodoc doc/*.html
+
+	use qt-faststart && dobin tools/qt-faststart
+
+	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
+		dosym  ${i} /usr/bin/${i/av/ff}
+	done
+}
+
+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 thus"
+	elog "the legacy ffmpeg is provided for compatibility with older scripts"
+	elog "but will be removed in the next version"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/libavcore:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+		emake fate SAMPLES="${WORKDIR}/fate"
+}
diff --git a/media-video/libav/libav-9.5.ebuild b/media-video/libav/libav-9.6.ebuild
index 60f2e5c5f041..de5069f1c431 100644
--- a/media-video/libav/libav-9.5.ebuild
+++ b/media-video/libav/libav-9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.5.ebuild,v 1.1 2013/04/22 20:42:24 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.6.ebuild,v 1.1 2013/05/20 10:47:56 scarabeus Exp $
 
 EAPI=5