version bump

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

3 files changed, 389 insertions, 15 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 33d2a9980acf..37dd461f478b 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.760 2014/07/23 15:23:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.761 2014/07/27 07:53:08 aballier Exp $
+
+*ffmpeg-2.2.5 (27 Jul 2014)
+
+  27 Jul 2014; Alexis Ballier <aballier@gentoo.org> +ffmpeg-2.2.5.ebuild:
+  version bump
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> ffmpeg-1.2.6-r1.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 4ede3f253956..31e4e68a9228 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -17,6 +17,7 @@ DIST ffmpeg-1.2.7.tar.bz2 5969563 SHA256 669b59483773b5b58d63b65e12749d68428729e
 DIST ffmpeg-2.2.2.tar.bz2 7026587 SHA256 a42b97add671a0b40126261174397b5918e7ec219d8ec6b8e62e86aa0fb15218 SHA512 431e55fce3fdde6b56b82d90b9b9afac71225212234553e82c3f4c5b1408edd1f0ef06f8f098a5a863c6767c1f7c8cdfd41cea6fdf35aad000f8fbefe76ae454 WHIRLPOOL 6677346f3039cf7c6b560d7cc72a67f4c10f6baef64f973a84680da3fe45773a3384ffd9ce5f8f761b7cd5804cab902f61f9fe39453cb36131b5474398676e6f
 DIST ffmpeg-2.2.3.tar.bz2 7025230 SHA256 670dd41511be0ebd0e5d1706b92da0b69abaa4df8ece3ed90ebc78acf199d2b8 SHA512 cd07480760455cd4b2173a5630abfedcb939eea0c169c98ed42ef04b93644406bc7599933e593af53fc8fb7ba536ca526a59fef25e301ef839d62aecfbb41348 WHIRLPOOL ca06f44dd5450829c9ff499436ac8df7ae77dea28c542d443a26fd3cfbc43470c106f8e0f27b71838c5b1dec9669d7c53a7845254b4f9d67f2d4c8bc786c10b5
 DIST ffmpeg-2.2.4.tar.bz2 7023865 SHA256 ff18e584d5daca2291f598389c990a0f4ec31c74647d923e73839c336b80b73f SHA512 650fe1dbe0b6ef285ebee4f9f2df9afb22e9f10d00fc600c72b80b9585707c256cae51b21d68943bed10bf9f997169e148757c1f6db1564956e1431f7372d7cd WHIRLPOOL d0d30ba6c94485f7a80c871e7790b62a96d9b614233c0046621d7156e47ea717ba08cff1dbfe5a1a45d1446278cca6d9ac39a11dfbec7e9449767b9efb04e552
+DIST ffmpeg-2.2.5.tar.bz2 7024774 SHA256 c8587a1ac91599dd87fcfb53de6e32b9ab81449e7f22ff55044faf7815a68633 SHA512 cf350638e0b9987988bf4feebb44072fd14df6a3c49b1de9830a9126f1bbd6d11a21e84b9ded751849400ca11348b1952cb361099fa8a5ea737468a799f40cd3 WHIRLPOOL 32d98787d6d1c4e9fdb7261931f29f11aa3647ab7e4850fa4606336bf9da43be2fe07e05f1263f0ae03b666fe1ced57f27e5b8395b738425fd7c7c8bcee35c84
 EBUILD ffmpeg-0.10.12.ebuild 9992 SHA256 75c9b0c1e74311cc0b245578549737148c906254a0c0a69661c0b9bcc1006fb1 SHA512 f003c10242a04d25e12f3289d7a6696fcc7b3ad1e7b8f7322f3758b2f6aecdb1390a040fcd4ea203bba9b1fcd1f2e29d3af5c14782ff3f936e1d57c90d5ebaed WHIRLPOOL b466fca6c8d8749cf87c54e8b395482dc88f353624f78b7cf18dca7f9035dfa5f49ebc99e959a473b69286977285d1a91bfb4e5c74f946e5e97793566b9ce98e
 EBUILD ffmpeg-0.10.13.ebuild 9937 SHA256 baac0fd18c473d797ecedf02c98d16af1696ae8db777a04654c22e1252ac5500 SHA512 107fa3d782f4c4b407be21e6fda9710e7fb1b641db4a56b1a57696cecf6062115927ad6c51ec04b575d1f16389bc45eac029c53c11f21a0e31bb0c148ba87603 WHIRLPOOL 54163803c29729fedda2ead058dc5e991779c85311cd42bf36afb23da19d8225900b1c93f8ddd36e160474b4878341d0e70019065448dbaa248e32f361ac1ab7
 EBUILD ffmpeg-0.10.14.ebuild 9939 SHA256 289e85620575a1047e1c9d1a67d3701ff8e6182e35bcc5adca2c89bebdb19633 SHA512 58b1c056dda8081d188c48ca78421ffca69a7f9d871688898891394713a0bd95c311b406692f42b8a4c1c26780691918977a564232f4e84c19ad1c0af024de29 WHIRLPOOL 8e5957761593a7d54ba856be18e860ffc1e1d55fa08b0e6cbe9344fa2064955acacda44b44f3ffe4b869a3baa1e67529b93989b99299407970eb0ce9bbe1cdba
@@ -29,23 +30,14 @@ EBUILD ffmpeg-2.2.2.ebuild 10320 SHA256 a8cdda51c59f5f7c3ed15b721f98961428c35532
 EBUILD ffmpeg-2.2.3-r1.ebuild 12545 SHA256 4951e5a540396ee89f5a75b91f13ff9edbe418558d62ae58ddb989d7c25ce46a SHA512 cd53668f18c3f4d48818624af655bb28c7059e856de6333faafdff48a6318cea30344f6010ba89a7c67e1f44af57c17613cb11779e8c787e5e98350d786f7265 WHIRLPOOL 422bf8d88db1d4299b87e0214f6bac1f5d34a2de35e3b4c61cc4a81cc8c2fd37688206463f79910ca6a6828bf62c3cb329e0d6e36881f0c26d3e79724f452fc3
 EBUILD ffmpeg-2.2.3.ebuild 10320 SHA256 7c05919c00fced9813d272c31af2e29f4fa6a089676925c91d5289e15652c8d7 SHA512 2d16862f5a504b13ba24b86096d60b7bbef1ea27f59cbdb1463181cd428c2f29a52a79a536da0342bd5ad76ddbceeadca7814f70c582a65e68ee63fc8f3e28de WHIRLPOOL 48c7c5486c43bdef447f9ec2697b65c4b606336cc9429c97a46560d47db3ec56672ece9a46ec389045e11825e0c219fd064d0fb096cd36d081cbd26cb4aa789c
 EBUILD ffmpeg-2.2.4.ebuild 12542 SHA256 500101be2b4f73c08dceed0a48c3832393816697c978a4860aa7de524c7c3506 SHA512 9e16cac59358afcf2c6ce386c1a88a809b0b7591feda4c1d31cd70ad0bacd4bc3f230b68291ab37dc97c75e5e19a23b3d5ca7efdb788f1b8848670eab5fcbea2 WHIRLPOOL de1be4c7ceeaaec90d04a47355ce61079ca2144bef8aa204b813a5bd9aff0d2ae6385c490d887a015df5cf397c14c4e8921d0e7c9ea04f929b9badfd2e0c2445
+EBUILD ffmpeg-2.2.5.ebuild 12544 SHA256 b9437983f6eea175538e94a3e5417f4eaa73897ca5803305b1b4ff6c927e2b45 SHA512 0587223cc3a37e5e720fcf3e9dd6a9751dcc462686e216d1bef899e2523485962af6a3b9954c0f26f3888811d1a2ddb49fc86de6680ea2e79733cdf2b5935258 WHIRLPOOL 5974af7a051c794aef79a7dec4e489e6541d1d8ea85df47d8169a8cca4df9130de6cfff376989f9f328364591d7d7dd98e200c92dc8295b82c61548562dc58fa
 EBUILD ffmpeg-9999.ebuild 12547 SHA256 e53776ad09663531b41892def6293a5db97422c0a0deb4a0dc4dc6ba2fd3534a SHA512 ff2de1fa83030c596fde32eab3472b180efb200f4778e5238a008a8a2625d0442a8f88bad497ad75dbc5c1f98419b1d87efbe13284672b1f79d901660cfc059d WHIRLPOOL cbf003f6f9bbad48fd46b8af9f8435d325aceb76136c88962290e3fa3dea96548d7488929b1d1836ed276a4ec032f8f992613ad2919ba3634631ccd820d13d7e
-MISC ChangeLog 105593 SHA256 24c3567850182aa78d19f5628439d1549af27cee7a8424abeb62c4dada160fef SHA512 13eba6486bfeaa8a08daa4d8d25c90150a2071167557bc347636a0d2b2c220a5f7db87385fab386c819e9e40e98b5cf1bffe63fd4410736b36765e4dbfdaf43a WHIRLPOOL 893a94ed50920380c3c509f037ff36ea30996c241091224beab363bf277b54c21934e0a7f630abe45fd174d3800e9f82d7d5aaf15eb69f0af09f73a500e318ca
+MISC ChangeLog 105717 SHA256 71c91b231bf7c577d90ff5438818cf41b7106860eab16e01e5c3c97430a19d43 SHA512 0f6128a1dc6fd70bfe6489e7a755e0df484374b9fd551d1d379a32a1c902a51b36bc67841d8377abe331482dad86bc76181c1a0045428189830bcdab7b6ff216 WHIRLPOOL 08963a025fb78b8be3c8478362a08cc56207b092b00ecb9e436f26d973f0110f36304de253086d7e0a685d7a531d0a0cdc6f21270c3d53f378bf45b65f117188
 MISC metadata.xml 5340 SHA256 010fe23d4fce67e3ebfdba2d3d0e4c4ecf7cb12885397c2058096955733f19a3 SHA512 8b1e55fa5896382e700ff61be266b635b2f3873ac7e29f331cc3a31be683cf9b2e24d93b52cd109149dab2d98ae58f5151dccdc8e6f48f2abe56382a11a471db WHIRLPOOL 420bfe98b7d0b58cdc56f76cdcf74fb1fe69df2ec6501d1444202786465ad63d255ca1a63340d52bb4586b19b1f14fb1ca859f8798071644c95f1d200cd281cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9NnAAoJELp701BxlEWfKqoP/1xUovFMFrMBSg/D4L4tZ8IX
-ZvUIoBLsetGneTaJ+DroE9JjQrlFlPHXyLR2Fb5sb/L3eGeFj4bBA0SI/fsis+cQ
-exwyHgktyQgFuHkbk7E3Ej31O1QyKmo/ZyFd09kpMACVCv5CyWx37XJwu14GQS1V
-Cly8aGVXWrDdwHZvYPQKtC/YrJbnXNDMPVcE/bwySBoh0/u5R8BcG3p9/4xnyP3l
-Kz5zpJUIZlhCmXaLpXR0SClm7HCfNfexrOujb2In4izDaM7Tlc5Vkbj/WS00l6nN
-fr9xOrXOPXZ6XrxiwgPqNef+k4D5B+FMn0Yh4v58I+mWTZjghNi1OSxr/tW/JI19
-Jo3bkTPrFJBkbIk8Gsqw5RkYKwnJF3JoP/pEKrHRl1GXsp7jaLEvuSLoCG3CXnEg
-Yw/dBZAwxk1wBvyjuc6bDoUT8c0wbjyWGSggFfHJ2Z4XA2Ug5pxX7jgH0lJPO3TH
-vDETjVpGww4FN7Ggrg8GK9r2t7dtRokF1Jf74wn12Kn9k+Y+VNYG1+/aAhdlHvjR
-wHRtd67frSW95pRXKjxZ/XF0CC9RYdD029JdnznuGj+vFuQPlZgTKGWjIG4V9zhF
-8PbhAvPAM64/fz5inigcSjT3B4TrgZYIkOwct2TG4wt52nRMGTmKwbUn5DsRdlO8
-UI4j90Rzzhz+UxE3I5Zg
-=lMn9
+iEYEAREIAAYFAlPUr+UACgkQvFcC4BYPU0p4PACeLxgVmZpQpYcbySUEuH6NTV6r
+hj4An0ZpvwVOrVsLmmCDLOjXGhHfB/00
+=uYKh
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-2.2.5.ebuild b/media-video/ffmpeg/ffmpeg-2.2.5.ebuild
new file mode 100644
index 000000000000..54307a37d386
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-2.2.5.ebuild
@@ -0,0 +1,377 @@
+# 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.2.5.ebuild,v 1.1 2014/07/27 07:53:08 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 ) )"
+SLOT="0/${FFMPEG_SUBSLOT}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+IUSE="
+	aac aacplus alsa amr amrenc bindist bluray +bzip2 cdio celt
+	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
+	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 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"
+
+# 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}] )
+	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-0.8:=[${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 )
+	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 )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${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 "${FILESDIR}/ladspadl.patch"
+	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 sdl:ffplay vaapi
+		vdpau zlib
+	)
+	use openssl && myconf+=( --enable-nonfree )
+
+	# 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+=( flite:libflite frei0r 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 libquvi; 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 CREDITS doc/*.txt doc/APIchanges doc/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
+}