version bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 393 insertions, 15 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 6eaeb0a7f51c..462201cbd0de 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.774 2014/07/28 13:48:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.775 2014/07/31 20:46:13 aballier Exp $
+
+*ffmpeg-2.3.1 (31 Jul 2014)
+
+  31 Jul 2014; Alexis Ballier <aballier@gentoo.org> +ffmpeg-2.3.1.ebuild:
+  version bump
 
   28 Jul 2014; Agostino Sarubbo <ago@gentoo.org> ffmpeg-1.2.6-r1.ebuild:
   Stable for ppc, wrt bug #512012
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 891312830101..7b046feb439f 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -14,6 +14,7 @@ DIST ffmpeg-1.0.9.tar.bz2 6449857 SHA256 98b3c35bcc602ab1e236fa64da8ead3deae7a5f
 DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
 DIST ffmpeg-1.2.7.tar.bz2 5969563 SHA256 669b59483773b5b58d63b65e12749d68428729eaa6978c5acc6c82a60a2ed28e SHA512 b23800b1f7de5ab3ee473931f4d8791e4927b8d248df66c36ade54001365438eb7424ec2ee9e018ab37b76a9551457efdec019ea8356f8e59f1055fe1096f88b WHIRLPOOL d28a3c4bd7c67847d21c71f33b7fce0760136881ca2228c18ae41d5dc6ead2a50d9cbcf3d6593a82e51e666428389fce0c546f711b13bae530c464de2ac3101d
 DIST ffmpeg-2.2.5.tar.bz2 7024774 SHA256 c8587a1ac91599dd87fcfb53de6e32b9ab81449e7f22ff55044faf7815a68633 SHA512 cf350638e0b9987988bf4feebb44072fd14df6a3c49b1de9830a9126f1bbd6d11a21e84b9ded751849400ca11348b1952cb361099fa8a5ea737468a799f40cd3 WHIRLPOOL 32d98787d6d1c4e9fdb7261931f29f11aa3647ab7e4850fa4606336bf9da43be2fe07e05f1263f0ae03b666fe1ced57f27e5b8395b738425fd7c7c8bcee35c84
+DIST ffmpeg-2.3.1.tar.bz2 7446524 SHA256 ee6a2f4c11424698537615443b2f4e1ef853bffd239f93295654e2c40ad78183 SHA512 5786be8389b4532eb7ffa439426dce7312df6c9572df3574444e84036ccebc414f0473d918096ff65e5de55a551cbc6fa96970a6cc490aa08bd4c18782267559 WHIRLPOOL f9477ae894338e1f70da6c2b69b9bb0f1a836b527e7711da243eeb2a4316eb7f9f556ebed7bf419762b017daa4a25524b7bd331b2b079bcb85b878b28816e4b1
 DIST ffmpeg-2.3.tar.bz2 7443666 SHA256 6b3dbb64e20951480bfd64bcbe305f6ee9031e5fccfd3b3e94cc5055525f809e SHA512 82bbe5109e426cbd3063f8b2edb3e2daa7f237c4fc46ca37907ab316351978b689f2e0c4d88645b2eb19582765072702f3a19a17c6b02dd11bccac3b41d27a03 WHIRLPOOL a6f16226e07f17c6fb66e58154035f0ae65d52bb113db7afb1ac234d467ce53a58a044cd262fa98a11a7e83faeadc0c16b2e9d3115f83d3e39c76f00d43db3a3
 EBUILD ffmpeg-0.10.14.ebuild 9939 SHA256 289e85620575a1047e1c9d1a67d3701ff8e6182e35bcc5adca2c89bebdb19633 SHA512 58b1c056dda8081d188c48ca78421ffca69a7f9d871688898891394713a0bd95c311b406692f42b8a4c1c26780691918977a564232f4e84c19ad1c0af024de29 WHIRLPOOL 8e5957761593a7d54ba856be18e860ffc1e1d55fa08b0e6cbe9344fa2064955acacda44b44f3ffe4b869a3baa1e67529b93989b99299407970eb0ce9bbe1cdba
 EBUILD ffmpeg-1.0.10.ebuild 9664 SHA256 b52713e12a8feb8f5ee867fc8cf5351e37bdfcc1f062ba1aaee51c60487f3419 SHA512 8be8ea9d842040c056e88d67debbb0b539e14e13a0deac369469a3fa265c4b9ca71369ecd4fe23d1e4fc6c16c9581c2d4deae41d4c09acc91f207fd1e5e958ac WHIRLPOOL c7c6b5c7e1ef974a4dd40e51ddd8ca53d4df2633f335d996f99c836c1798119d62ce99e8359d39a5c2fdacf06b2c8708f70fd12723ab74f6f15032092a7778c2
@@ -23,24 +24,15 @@ EBUILD ffmpeg-1.2.6-r1.ebuild 10974 SHA256 990bf09dc49527d3fe2a30634158a534a79d9
 EBUILD ffmpeg-1.2.6.ebuild 8995 SHA256 f4c2793bcf14315fbdb7a210e86cb39747a2211a9d4f8aa97a79d26e4a44ed9e SHA512 9ae6b8785d8f11d0321f6dfb034dc630f23facfca1e96ad8e89d7ea704b3e4151728edef3dc247526697cf8254c75d1860774826440b7781be465d3a970a29ca WHIRLPOOL d0f08e038fef816028792ff064d8196f61fa0a5494bed33c68a6cc33c917ade86d98bacd07c0128cb6d321c6864ba34f8a8e65b633fff396e40b6506c221971d
 EBUILD ffmpeg-1.2.7.ebuild 10928 SHA256 942543b32425110f4c90639bf9a7918207486151472fbf0de3f52761ad9ed139 SHA512 5b6d9b0bc0d7557497999b0d3f4fc1f9c6390d04c77a589aa509852adb046fef740b960eb6a617efc9c9e92596dfa89a197bd323e6cc603b560c45d8058870e0 WHIRLPOOL 1544976d97947819a2b28f06fdda49bfb7b1bf3e612a0c25485d96b386287ab9bb6fd4f7c1dbdc2f49d2fb8b25177a11bf0da0d89231997efb088dd35953bc0b
 EBUILD ffmpeg-2.2.5.ebuild 12547 SHA256 5cc91828467806f187036b745bd032837198035fc4f5848ffd221f1e2ad0202d SHA512 54f020c5bad50d289120ac33f6b7a3d0870b2f8d95e8961f39a52fdfe3da8a74ff046e15f5de04c24865e8937235d46e336a6ba19567a86855d7fc6adef04274 WHIRLPOOL 918efa1c11d3b4bb07f90985283caa783c6b40e9e8272fbcb3a730944d189105438e7c3d03629d0a3ffccb204ec9e78bf71d920e7b8474f3608123731ddb367a
+EBUILD ffmpeg-2.3.1.ebuild 12879 SHA256 82ac9526de46986cc20f717a7aa9edee6cc2c9e8c50d3c401994a497927bdf60 SHA512 0b94b987050d1771956b82fcccd08745b8baeb0c7a3d9822d5832e4b2fea7d395abb9cd214162974bf64901a8ac63a6e5d3f8d5768e2a82d1d9512e7ed598ce3 WHIRLPOOL 63064440f6e0b5c1ef8ac0121d16e2feb2b80f9d9e836e964d15b46f7dd0ab345fce84c2e5fbb15c82647e3cfe9f3d0959bada975c211156bcac3c9f486be527
 EBUILD ffmpeg-2.3.ebuild 12875 SHA256 bc833aded6d21327f7f1671d47d8607fd7dfc5da9bcba11fb51b5a048abb67d8 SHA512 da9c0ceb42af59bf754f6c30c38c2d28c703d92631b6b978fb30f84bd7a3e4ab7a10805412e71f82b1ad6517fbe05f5fba4f8e177a2dd4ae2ac7989ef69078a2 WHIRLPOOL 9a32d91ff329554f154fda69c30b9f07a99ba896f213b82f1455f5e2800e1ff816211cd948b8b4c756038cfcca276017ebdc44b7346d9867c01864cb754e88ab
 EBUILD ffmpeg-9999.ebuild 12925 SHA256 4c79b521d4d52f33357986eda0e2df84d1e1461f6f73bc2f78a2b37a03e205ea SHA512 7ae001294ebbffbcd6bd8f89bbd92a112ce5d0343b769f387859ed3d7692de98bb2fb7de0fd7376da1f9c4374d5b52b2699d40700252199d326db9e3cab2cd95 WHIRLPOOL 025baed390623493ab988952fdabbe6a4b1e70d72c54fbd0d1c2a08f1cdafd27e97eb026114b9ec9fc5280f85a04ed6a0e183e1977b4b507cf25d73ec0220fd5
-MISC ChangeLog 107347 SHA256 ee1e5c2393814150d52590cab666e35f802b19356600b6f49b7219f2aa371869 SHA512 68a68f53cc0b2d29f1bd412a1b6e887019be0480d2509ed13ed6b534508e7acb5b43fcecc7bf19227f160b0ba6efa060296730ccfa68fd9b916eb7a5c52aaed3 WHIRLPOOL 27a038a511507533cf6edf01a2492125311837aecad09489a333b7f6e60ec10c3bc28bada74d201c949dfe3b8f276fdd20c4089330b921483a13f0499b66042e
+MISC ChangeLog 107471 SHA256 1402b93c23959cfe01d00762ef8389bd2905003a5ceb0551aabedef4ac26a06f SHA512 e7ae8df2c536b5d88a7aa34770c2e1294ba94858031e644286687f72ff0c530c957f84189ede2ec9021a64841715f2c57052dee3eb89c248827690861927f84f WHIRLPOOL d740e4dbf3868ac3e786acb55a04045ad24e8d46535c67b2084e05a75d8a3e849748cb1d6c781aa27e06abfc12a313902c881212ac05d7fc28661ecea7997af3
 MISC metadata.xml 5647 SHA256 359e839a7d9c3c36825bfae0e9217688785d279cebbfc440bd4074f5bc58fb9c SHA512 3efe9374ca61952911a6593417494092d9fd5465745a63e427dc74cbd6aa4af46277ec4865603daf5b27163c8db97823ff2b4eb857e88d73f3278e63a949e372 WHIRLPOOL fc5873ea67edea764b6ffff08862ad850a4bef83daed4a1ac03fc2cd9cfb8cb587561ce8fdee39a79fd6686b4605bebaaa0c00dac6a858e5d6f5ac563751ea20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT1lSzAAoJELp701BxlEWftrcP/jZShNAPki0pp57OD9vL9i0F
-J5Q66D52fFq9Htibsv0r9onQwcQkySYAEadY7hykpx6fBCl3vkgnJmeDOl/84RUO
-+PVJd+EsRHlJrtQdEUVYKtpubS1fbsJvm+HGiJJepb1h8iJ9fBdnINO1D5M5RFzD
-3fgAIHG++Uyrdq4VCA68b6Jy5GfSc0uK+us1CAvu4M1/dr9q8CoK3QKIVvBnQvG3
-hKDESSA3wSvs+Bz3d+ojpA2zL3n5cCHrwZ9VpdxBRvP9RuMrweDJLyVYHY+9jFwJ
-B42O4wy89Jqk10NCYzcou+I0KgpJw6AnT/HCQqMw+UjUHuQ5+ZfH5242gxY8FwLL
-ek7b4MBuWXdWXY+L+Fj6aYy/ZTcVdznx4E+0mjt963GJZEGPBP9/TMSo6KVPW0AW
-UdLKjVz0lHy3E4l3FIyJowUxalX/yL/P4VliOPNF03lYGGYzP4Sz09JKBarwjkM+
-sy+OKUjWU2vBx/obcJQjzno+/dWG4e3FdgXnlyKQsuiECL/a8/207O1MpvrY6Zi7
-UUDblLYpwBU+M1YktHYYx7oM/6Ji8oV4/GLOKtbxFPIXTbWRCJATsH81ZE47DGZ0
-DdovQ585tCaFlOi0+uvZISiXJWWLS5W47GEIrpv1ubu2Zr4GsRNJvIp2KivX/uoY
-7XLORlNUA4z0CflVOOCt
-=L6nQ
+iEYEAREIAAYFAlPaqxYACgkQvFcC4BYPU0plsgCbB8hiDdGay0O3ZXOusRJTY0es
+kIoAn1gakHbs5DiTm4bcrJfkQKIuKoxF
+=RjPD
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-2.3.1.ebuild b/media-video/ffmpeg/ffmpeg-2.3.1.ebuild
new file mode 100644
index 000000000000..464842a4d8be
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-2.3.1.ebuild
@@ -0,0 +1,381 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.3.1.ebuild,v 1.1 2014/07/31 20:46:13 aballier Exp $
+
+EAPI="5"
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=52.55.55
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) ) samba? ( GPL-3 )"
+SLOT="0/${FFMPEG_SUBSLOT}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+IUSE="
+	aac aacplus alsa amr amrenc bindist bluray bs2b +bzip2 cdio celt
+	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
+	fribidi gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack
+	jpeg2k ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal
+	opengl openssl opus oss pic pulseaudio quvi rtmp samba schroedinger sdl
+	speex ssh static-libs test theora threads truetype twolame v4l vaapi vdpau
+	vorbis vpx wavpack webp X x264 x265 xvid +zlib zvbi
+	"
+
+ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
+MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
+PPC_CPU_FEATURES="altivec"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2:sse42 xop"
+
+# 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="
+	${ARM_CPU_FEATURES}
+	${MIPS_CPU_FEATURES}
+	${PPC_CPU_FEATURES}
+	${X86_CPU_FEATURES}
+"
+
+for i in ${CPU_FEATURES}; do
+	IUSE="${IUSE} ${i%:*}"
+done
+
+FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
+
+for i in ${FFTOOLS}; do
+	IUSE="${IUSE} +fftools_$i"
+done
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? (
+		|| (
+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
+			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
+		)
+	)
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	!media-libs/libpostproc
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	mmx? ( >=dev-lang/yasm-1.2 )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( net-misc/wget )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac is license-incompatible with ffmpeg
+REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )"
+
+S=${WORKDIR}/${P/_/-}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	epatch_user
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	# options to use as use_enable in the foo[:bar] form.
+	# This will feed configure with $(use_enable foo bar)
+	# or $(use_enable foo foo) if no :bar is set.
+	local ffuse=(
+		bzip2:bzlib cpudetection:runtime-cpudetect debug doc
+		gnutls hardcoded-tables iconv network openssl samba:libsmbclient
+		sdl:ffplay vaapi vdpau X:xlib zlib
+	)
+	use openssl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode
+	then
+		ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
+		for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
+			ffuse+=( ${i}:lib${i} )
+		done
+
+		# Licensing.
+		if use aac || use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+		if use aacplus || use faac ; then
+			myconf+=( --enable-nonfree )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# libavfilter options
+	ffuse+=( bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype )
+
+	# libswresample options
+	ffuse+=( libsoxr )
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	ffuse+=( threads:pthreads )
+
+	# Decoders
+	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
+	use amr && myconf+=( --enable-version3 )
+	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
+		ffuse+=( ${i}:lib${i} )
+	done
+	use fdk && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# 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
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# Mandatory configuration
+	myconf=(
+		--enable-gpl
+		--enable-postproc
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# 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
+
+	set -- "${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)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in ${FFTOOLS} ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-man
+
+	if multilib_is_native_abi; then
+		for i in ${FFTOOLS} ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+	use doc && dohtml -r doc/*
+	if use examples ; then
+		dodoc -r doc/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}