version bump for the 1.2 branch

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 354 insertions, 5 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index cc0674d767bb..82f556133993 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.796 2014/10/07 10:01:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.797 2014/10/08 08:04:11 aballier Exp $
+
+*ffmpeg-1.2.9 (08 Oct 2014)
+
+  08 Oct 2014; Alexis Ballier <aballier@gentoo.org> +ffmpeg-1.2.9.ebuild:
+  version bump for the 1.2 branch
 
 *ffmpeg-2.4.2 (07 Oct 2014)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index aaf99abf9f85..7df253cbcae1 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-1.2.8.tar.bz2 5970565 SHA256 429b5904abca0bc443bcc06358988aab9169683021aac21a306de28f329d2e59 SHA512 caa13a44d25c9d51f96c33b0e920a42fe899736cedf89c13513850fc1d0d81a6f67ce7391f98480e9283c8ca01be01e8fc43243a5a49519873df8a06d6083d8c WHIRLPOOL 23ca014f5f13060c220ce61b4e22a6207c4194607763ed2e77071bec8617644e4065cb8e42ba8b05a8b4802ccd5a9a3ed8510791c7eb09a57bec60f1ec360ab6
+DIST ffmpeg-1.2.9.tar.bz2 5973148 SHA256 5cdd912e13c8fe302937db811f63616193a046538bace1389a4989d423b59a0b SHA512 83e06514a4c27a0a5850da9af42b403ccadfefcf734b7492b563b6040c9176d4635536173c45458335b1e694bb427389054dd48e1f7a428824e8a5eb54eece0b WHIRLPOOL 8f04005d43a654d38477fca7f9d7abb42e4c0b83d86d8051495946d5ede02c3d3ef3f9c7fdf815843e5f1414e2619ccbd4faaf3f64b3622842a5997d6a41f3a0
 DIST ffmpeg-2.2.7.tar.bz2 7027327 SHA256 e01dc650bf85f05d8ec08021b281dc7b80f02c794edce49d2b95d9dace8ed8a7 SHA512 622b436dbd03deb68ec8f31e288605534b8288719d14e5baf5c8a59b7913d3f48580416064a64029735e000153197ac5a4dac654fdb9c404d4e13c73e44ffdf9 WHIRLPOOL 51cb74026cb13c6b947a7beb21be028ffc41c903a87ece72ce16d2ac361010cda547efbdeae5f525565a6a20ea5d7578f1689faac5e38da48fc56ec085e41be5
 DIST ffmpeg-2.2.8.tar.bz2 7026357 SHA256 f85425ce3eb544b6e9580c2defdba48b109329b74236b722f26dac975bfa389b SHA512 c00d1321d66d9079b6972b894d575a0cd509a99cf09d3308924ad3fff0d02976022a9645126732c8d201f3c45624a1bfec074b1b7bfa413fa0f1e2e916d9e63f WHIRLPOOL 73561e84f015da7e6899e7e8aa40e8c4dd00b987f7f78f30e9f76c22427f0d4119b94c629a181d974264f56edfc4979fe8cc98999c8533c21b46e0b9a95b0dec
 DIST ffmpeg-2.2.9.tar.bz2 7030449 SHA256 3e8912d81d78097490e22112fd8367d0d828b147ea36b2b3f36629abfdd77239 SHA512 04881e6e0be7f590fa0cf2384521a6c0c2eb7c0f7cbc58ea81448fa68d82410797a588bde420ea35e472e0d0bf3fddb3287dab64071ae9d9b749cffd7d3128ac WHIRLPOOL 48ae704e2944e50b4312ad7431d365e7f01331b97a100642a63274f60a865cc79b079771d970bd754b6279938c1232b11965fe4ac5511f1e97f129977ba7573a
@@ -29,6 +30,7 @@ EBUILD ffmpeg-1.2.6-r1.ebuild 10969 SHA256 c3b81ec05ad4bb6269cd09450445a38569397
 EBUILD ffmpeg-1.2.6.ebuild 8997 SHA256 04e7bc631ea399188fd9bed00c2d6c78e0113b1b197f55c31a1da002f92275de SHA512 3347cf697f21917b4bb4b669bc7da888d1e1d2207192e8a692d6f13eed2d091a6da85c44ef15592e12a3dbced218c5269bc8058da44c7b872882b21a71f3919f WHIRLPOOL 957a847757ca8fc032236fb5a97769a0a0aa2ed55a62913098fd8a915426ddf87fd4850d5c716222923d3f6564a0833f079de7e36faa4fdbfb9f0f7801476b0e
 EBUILD ffmpeg-1.2.7.ebuild 10927 SHA256 f93cbe16de7d436740fa321a3fb0522a3f0253aa55b14e520b40649da4120a93 SHA512 51bee7cb143fc16ab8bc5ddd7c0654db6d4de2831ac1c72ab816bc065e7f2768e162768c12ef78431534f97e0ab8687fe3225f288ada28ff530b3c9701adc922 WHIRLPOOL 4c4cfe485e234675b1dcb6dbfffff00f6c0016284b31d5d028ba44320819e75f0c9526cb17f38570bf638f72f8ad4a34c2a145df00692794497f91ddb3619cf1
 EBUILD ffmpeg-1.2.8.ebuild 10929 SHA256 349849634886a90212e6cb2aa92652e71d3b4b9e88498d90bebfb37154105d09 SHA512 553c2803497f3f4f8083def6710c4d05ce4b90ad6d6fd15f3b67c9adce8df443c6f2be065926339a199e06449fb0ddca3392a60c55ba615efb54a4f813250b64 WHIRLPOOL 932d3f426af62b5bf2a6ae4ab20e6cdb59a8c6230d61f397033e1fc0e11adce380d47328d1142c2ce7f28f50f58ec5d8f818ea51bafedaa179ad7d00e1afd13a
+EBUILD ffmpeg-1.2.9.ebuild 10929 SHA256 7f8efcf95b404dc68d6e1ca867d2a751d159c6eb225136965497f3dd71f90fef SHA512 586e74091bcf30fc3ccf9b526dcf65cd6971a1bb73e2bdc0db80a6b70f39a3a86d678c923b7c1bf25f9c588d6ac037a41715d94fba23c66a12d92ab93ba156ed WHIRLPOOL b539e057094f9df79b2b10df5af6a513278ca3cd31856080cad433041426f549df96d3fb6d7dcdb97226a91a55e23a85409578a2fe89317d70e19c51c59901c8
 EBUILD ffmpeg-2.2.7.ebuild 12594 SHA256 988cdc1a5d56366ef8a87f133d4e96e4ccb3ec13709159e3fbc10e2302511fda SHA512 2346c5b017f07cf9a36e28f372df9a5454d6d7ab74900d86d69a02244fff9a784f8ed143e830d09cc6c4c88ea24b1ee02afe7cd8e58860fe11e213af4af42708 WHIRLPOOL b90e99becb52c98f30ee29d7bd448a5b396b45834981edd8fd62b91145c7bc4f3e7f217689272a32c28a8a0ac575dff0ef5092c41776ece421f6ba407232b8e0
 EBUILD ffmpeg-2.2.8.ebuild 12594 SHA256 399656fb7535f264427a32485e12b5acb9f5ddee186168bd5bc947915b03892f SHA512 6a63b3d2cdca786e2e0fba7aca68d385e02e7dfed56a922b582e40d3246e0bec07dd4f39434daa646a96d0c6cc01b2db167913b2186a23311be8b1cf8ef1802a WHIRLPOOL 4f423f512b16f07334b2c4f6fc8f348d0cd926d4b51c2142a2a51a4d4ae4284f6e93a0a5e599ae233c8124607818bfe7d8eff835f94ad099a927b6c7b3f4709b
 EBUILD ffmpeg-2.2.9.ebuild 12594 SHA256 07df652de81766fb59bc7f54e932c9bfc8ad13e23baa267c727e02400ef21ce6 SHA512 aee2d895020a5c3431d4cbf22fe7bbe4e01714d241a5081b38b721c147b6bde77f06828a3100d45aeb7d81f772e67ecf06a7dee321e8624bad9f37364c8d37bd WHIRLPOOL ab0b600f7f87f99584c8d0b94852b0503d87da4b27f4241b0bd036eaf8719fc18d061c12f5e52e2aec437a63a5a5888370bc428aebd56925a8de8167bccf2ca8
@@ -37,12 +39,12 @@ EBUILD ffmpeg-2.3.4.ebuild 12854 SHA256 6a88d47b94a025f85cc007f2b07b99f4b4987d53
 EBUILD ffmpeg-2.4.1.ebuild 12968 SHA256 8c6b5bb57fae211e6247f24bf297add8fd59a32fb32bfefa44a2a5f6e6de7f54 SHA512 b6cd190c7967686a0ded66f17d7914632564e24db6dc41f365affa92317172e5557ea6e6d07799e778e42d3abc8438660a3cdf229e2c6e8b353cda3b16d0b2fa WHIRLPOOL 63f1c1643d5830cd1c71663ce7b6718dff31d1546f9e53120efd04d33f4ec47608cf67fdcfbda88b8b082b625d446fc1aaf3c41c84e2cf0b8875beec67d0f66b
 EBUILD ffmpeg-2.4.2.ebuild 12968 SHA256 2bd75fd3f786bcf41bf254583758fce36532f6c46bdfac4a05dcc53184d5fdaa SHA512 463e55cbd3b59196b425ceab6c56e8e1d7f0dfc4b948ef14494a15c35a624c6cc9a3dd98c56fd67193760d5de06cd3bb2f902f5e2e52e2347e1297954c441faa WHIRLPOOL 6680008c6927698de77609084450d8be9f6b3f8e7af5b326cab85f7b100662df8b5dd1582aaa69c8d5dee2ecc795a1a0e33706768163645d56abfce19ff5c91a
 EBUILD ffmpeg-9999.ebuild 12969 SHA256 a0ad3140c19228ee34972389342830e81a2a9d81cda34b780b5db55cf118dc25 SHA512 1638ff3e201110a1ab352353631efab0e8ebc0ee239f8c6fbcc74b591a16dd911ad3cb5f5c64d3fa1266dbfc60dddaeb0ae7b529d93388abd1c63759de7dd766 WHIRLPOOL 3b66e16d2c8772eb5de37dfde832d4e56acd1a53822dc0fbb47b53885f6fd62288b496316e8c10d831a1dba5b6e6da74acd0c8f5aca340a79c3d99c012843955
-MISC ChangeLog 110300 SHA256 819818e1ef42d479fcb2e26bac9089c7be08bfbe2785d1d0657f0e7551fcb70b SHA512 2953a2e110b22da7ce508680a2ab348610f6a76300ec503ab7c0e73f900d6b67ec65159b8a93c7b10628c3a68c41471d5946544ab87473287d61e76192da4d51 WHIRLPOOL fda8df226204c76dbeacb6d7b2b2b97dd762de6df3d202fc1dfa9e58c41c1efceb2306bf98704cd731fba389687c05ff2fe8b7f3e1c0049dded667873f996df1
+MISC ChangeLog 110438 SHA256 e4202f6390b9281d5dc8fc4f62da2621fa41361022746d9a93cd127570962432 SHA512 089b4a851cb168a34b515cee199d69cf0bbed8c1c46ffb1463229bf9b6cd748d1492f2533fba937f41792fe40e760b6f3f2752cb55f43ec7e0a39b52cfd5a15d WHIRLPOOL 3943880ee417e4522ab6923af874e201f74c1f18df66363c3dbc98ed3fbaeecb8676ed6588a72341b75e298bd058b34ec3a5cb3fb47ecc9473c3233e0fdef94b
 MISC metadata.xml 5647 SHA256 359e839a7d9c3c36825bfae0e9217688785d279cebbfc440bd4074f5bc58fb9c SHA512 3efe9374ca61952911a6593417494092d9fd5465745a63e427dc74cbd6aa4af46277ec4865603daf5b27163c8db97823ff2b4eb857e88d73f3278e63a949e372 WHIRLPOOL fc5873ea67edea764b6ffff08862ad850a4bef83daed4a1ac03fc2cd9cfb8cb587561ce8fdee39a79fd6686b4605bebaaa0c00dac6a858e5d6f5ac563751ea20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQzuhYACgkQvFcC4BYPU0oITgCgq+hYs5nX3widi/q8++e7s50P
-7joAnRr1kRDju5Qa5kSvpgQWdSA9KLZT
-=MTTh
+iEYEAREIAAYFAlQ07/0ACgkQvFcC4BYPU0qDYACfWB3f3CYglvEz8gnElCS0+NaU
+Rw4An211npEUiL1wA4JJ/aT8PB52UDtr
+=2Odb
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-1.2.9.ebuild b/media-video/ffmpeg/ffmpeg-1.2.9.ebuild
new file mode 100644
index 000000000000..1d30994ac2e5
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-1.2.9.ebuild
@@ -0,0 +1,342 @@
+# 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-1.2.9.ebuild,v 1.1 2014/10/08 08:04:11 aballier Exp $
+
+EAPI="4"
+
+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"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+IUSE="
+	aac aacplus alsa amr bindist bluray +bzip2 cdio celt
+	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
+	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
+	libcaca libsoxr libv4l modplug mp3 +network openal openssl opus oss pic
+	pulseaudio rtmp schroedinger sdl speex static-libs test theora threads
+	truetype twolame 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 ssse3 vis neon"
+
+for i in ${CPU_FEATURES}; do
+	IUSE="${IUSE} ${i%:*}"
+done
+
+FFTOOLS="aviocat cws2fws ffescape ffeval 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}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP},encode]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${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 )
+	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}] )
+	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}] )
+	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}] )
+	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}] )
+	!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}] )
+	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	mmx? ( dev-lang/yasm )
+	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 sdl:ffplay vaapi vdpau zlib
+	)
+	use openssl && myconf+=( --enable-nonfree )
+
+	# Encoders
+	if use encode
+	then
+		ffuse+=( aac:libvo-aacenc amr:libvo-amrwbenc mp3:libmp3lame fdk:libfdk-aac )
+		for i in aacplus faac theora twolame x264 xvid; do
+			ffuse+=( ${i}:lib${i} )
+		done
+
+		# Licensing.
+		if use aac || use amr ; then
+			myconf+=( --enable-version3 )
+		fi
+		if use aacplus || use faac || use fdk ; then
+			myconf+=( --enable-nonfree )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal )
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=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 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 jpeg2k:libopenjpeg )
+	use amr && myconf+=( --enable-version3 )
+	for i in bluray celt gsm modplug opus rtmp schroedinger speex vorbis vpx; do
+		ffuse+=( ${i}:lib${i} )
+	done
+
+	for i in "${ffuse[@]}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		myconf+=( --disable-frei0r )
+	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
+}