bump for the 1.2 branch

Package-Manager: portage-2.2.17/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 0e3db93b8643..ba12f9d472c0 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.826 2015/02/11 13:45:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.827 2015/02/14 20:50:06 aballier Exp $
+
+*ffmpeg-1.2.12 (14 Feb 2015)
+
+  14 Feb 2015; Alexis Ballier <aballier@gentoo.org> +ffmpeg-1.2.12.ebuild:
+  bump for the 1.2 branch
 
   11 Feb 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-2.2.12.ebuild:
   forward port keywords after masking optional useflags, bug #510340
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index bfc7699648b0..3203c7761c0f 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,23 +9,25 @@ AUX ladspadl.patch 723 SHA256 b660bef2bdd4ecba5c3ec04fccee16f4ed3eab0dc7f125f19a
 DIST ffmpeg-0.10.15.tar.bz2 5785998 SHA256 8b6dbf73c192d2217e6ded8e0dd560c678f362e373d87c28ed9fc8eb52293d5d SHA512 0fb719847bfdc16d17c64b1be607427557c63cdf7a8a637231b1dbaac38bfc3dc3ff8f69d51a6c0305d05b2b186ecfcf5e6d2a5f3192f015be9751e0481e429e WHIRLPOOL 69798dcdc0a37d837840bfc2e5cb37177f8ddaf47153c25a5c24726723fa6ca7b39e0940eb2133ee4715e855d7dd08f05dd7252f94a48424909ac799d1900cdb
 DIST ffmpeg-1.0.10.tar.bz2 6443581 SHA256 1dbde434c3b5c573d3b2ffc1babe3814f781c10c4bc66193a4132a44c9715176 SHA512 0fcc0541db6cdbf044dbb000a214194b0bfc67f4ac3e5c6efb2207c84bb11f6c6c3cf245ea67e1912256d1e1a98cf336a6f548d154393c36e266d92093006ff7 WHIRLPOOL 50c75a41747394aa2629cdfc6bd631e0207194c87ecdda120032f42e0d04327443fb13ea2b00ed52212da30992b01318846da0a0a594bac7d5757bccb525f32c
 DIST ffmpeg-1.2.11.tar.bz2 5971961 SHA256 6b69b5675dd80c37a6dbe2df51f1820edf915cce5291a76a3c7dba339e23b507 SHA512 75451852672bcd3873a90161150670a6e0d32801d34e94fcf85088d5e6ddb4cd15ee54df75f688ffd2512e784e0de9695a4087ad3950a908ca57dfc2b0b2042d WHIRLPOOL 5e2f49d87794425e6cbe0f052c251febc4be05e4b821b5d9539fcbdda4b94852285528b9ec344d79a8a51a9d123f9f42a872f81e25360f1b32a01d0ab2aed495
+DIST ffmpeg-1.2.12.tar.bz2 5974419 SHA256 913ac95c7fad92c2a4ebcfd11850904f531845c75d45c3e4e4a693990fe2497d SHA512 87d9ab11713b0fd41e3092272dd64f76fe25af8837d9e1c8162df9747f9b7ab6ea26bb201de7820e57de3103e8723019981b5d8c1d5db13ab39131f618c30da2 WHIRLPOOL 09bef9469276726b887d67e97dc5a178c37feb1d31d61b36daf50c2b518105025973ff1abfc557a1d06305cffe31e56387700a05ef2886be294e6a68a53aac1b
 DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
 DIST ffmpeg-2.2.12.tar.bz2 7032267 SHA256 93755c8dc7058907b0a82d5b44714ae53755681fb0c6451732942476368833a8 SHA512 42c23a2a11bb176a77bfac4b1341d829983c7662a38e0c17fe42203b497867ee6ab2bdf4bd46472d6a96205e11135d2946ca2772c5bfc850a3d614a7f2fe4c27 WHIRLPOOL 6eac0b5e275e22f28ede6561147a024062f30174a37e9d7346a6860350392b4734ea7841f3646c0ce82f7c495c4add7ee218803bca480ed19430e77646685450
 DIST ffmpeg-2.5.3.tar.bz2 7678005 SHA256 9d383d7ef9dffe6980849a93accfef848e197fdac9b1fbd02fca2798f863411a SHA512 3293bc12e1516d5856244bc57702d8a759b5becd40d4786162dd9812cb57618ee6a8d177604925019fb631afc9ee4ccfe55b148fca7389444858c2bf77499c2c WHIRLPOOL a2592a432ebcf55df7c41a76629db23449b3c2fc946acaf8aac30ef407f9fd3b46c0bb9dce59c81b63109a16a1326a9b8a84344a0caa4a370592aa2989457f7b
 EBUILD ffmpeg-0.10.15.ebuild 10048 SHA256 8d7f4df870bff974ede8e658da688bcdc23b1a9440efc03bdf2f5c6fc34a23a0 SHA512 0cce69d78c2f5ada02d334bc13dab58a3a49c69ede3d278302715be9226bcd83bfbdcb56a55f9f6ed83019c9249839e8c065a8c4beb3c18f49115519e8693f49 WHIRLPOOL 3afff3ea5f1048fc303336bc395b52ec2a8240912c0e0f8128281786615d762af4955aaf6226db0e600ed362924ed5f61cdf2f1f4d50005e98d5e877ffc2ab26
 EBUILD ffmpeg-1.0.10.ebuild 9780 SHA256 3241f382715ea0e014e8b60de9f0f4fc9a5a8df4eabc1dd3927f194b6b92842e SHA512 851c95e17a6053550bcbb11b09950237f0631d61c99c8cd7834e4a7f15f4741b00da4b42c7479037c71817dc653de22cd5f2621727001c14f425c0500c10eb8d WHIRLPOOL d8fb36784db5b7188c38c6f8eb5d406515cdba9c36fdec6f9d34ce57eff85b64ef3fa40cf71af7e6bbcc59a32acfad9ed49da11c7fceb7b193d5204ed683ad45
 EBUILD ffmpeg-1.2.11.ebuild 11047 SHA256 e54132d922bccc0ad5d347495e0dbc47b734aff3fa5c0bf5158eda5e6199ca87 SHA512 1f8bbdcaf16abbb551df5996b569bfeab3ba1c9faf99de3d712b21fbfa0761671c1527a0097c0be12cd59eb8b03563f8214ba0afbd949f18bd64a74e7dfe3190 WHIRLPOOL 9416427f4ab8da4a04d682185d65a78a78140e81035268ab42b7bfc65ced1e191109e28b2037d8e67f1b015da077cb5501febde187cf2f9a43bbcf230d5f3f7a
+EBUILD ffmpeg-1.2.12.ebuild 11049 SHA256 06b8120bf7d642b9c3a93b7c7c3febd9147cc08e47ec471bf5fd2e115a235798 SHA512 a2b57ce8161332880a5e5a084d0a2857daedaefba7d8e8abb95ef2f5437b91df2426547e5cdbcec4d30d85c9f188669d0dd3b0b6331332ab16472923d788ff81 WHIRLPOOL d9f5d15379055971b26279fa6c44cfd76709f3a253a2612cc5887c824ce7c41486c5965d331ab0c03f8af727602dc08091ace8ae18f05f240a1940d28016b3e9
 EBUILD ffmpeg-1.2.6-r1.ebuild 11090 SHA256 04e0bd9aac8037358acbcbdfde2f50ec13a3dde1f76c62c1fd0f5703ff095b31 SHA512 7fbcada3fcbefeaee4603b874087b4ace395e0a28f51e8e3a73a0105bf79b8872f02636dc82cd10f9f68f0203aa6adfdc0c4071a89140df23092e4581dec2baa WHIRLPOOL f7b7c3725e8d61f1076c3dc4afbefbda7d72d626b23d75b95ff4924e3c9b448d06e711c42bad65ec0410c3267f5051e4212de4aa50cb5660a435a9ca98436b95
 EBUILD ffmpeg-2.2.12.ebuild 12745 SHA256 b50acebb37c7d031c4b089a5321dd8b2a8e8bab93a7066bf10145b2e0aaf247a SHA512 2b421d0c856c6fcefc5b5be0ec68cc3ea32fb3d85ec1582d047a8a027bd71d903ca689f419e97e42002f8516f97b0c036212a8de18b7cf0c83884a3a2ccbf603 WHIRLPOOL edc9c1f64789606ab09c0e59bcae412568317704c2eb60e60be38eec5f011cb3bbb69849237e5979bc2fd6e30e8646feb76cafde3f0a8daf0ebe8c8c4bd06e97
 EBUILD ffmpeg-2.5.3.ebuild 13170 SHA256 2a15f3059c17573de22426f05d4ac92816f74b58609c015bbe048713bc554a3c SHA512 e2942192a9fc9d9f56f7ee67140b68443fce54897b2a9803953d0754d186a4c743151a9dc6fca2dc829e471061caa6ecd56636e5a104399a327b054e983eef1e WHIRLPOOL b04fcb70986854c6f96c4cef296d207f49a8019c88ab5186db9ea25604c109acc0b3e565adc81a15eac7a0e9c840b15c53fca15709f0ca9991af1b20f379f22e
 EBUILD ffmpeg-9999.ebuild 13171 SHA256 0af0581c0e5195302d04f2bd81598af17d5a7d54dc7e7b37b27e73f4066dc069 SHA512 1c52624c4aca012b8ddaf4e4f74d5b460251837ccd72ad270962db007c732175bdd1e7a8e0c946e576d7d602449e02c031616624c254c4703b01c9f4fbcdbf67 WHIRLPOOL b2d7c11475f4394bc0049a197ce973d779829b798873ca4484bc1e3f34dc220ac8a400c0d80604fcec73cb1203b500508ea292e4c8a9cf64fa4ec23f2a529114
-MISC ChangeLog 1387 SHA256 2c882876cf92547777098157ccdd2674b9f162c44cb94fa9701351f1e932e58c SHA512 4428c9a97065541abc199568cda303bdf42369cf88cee74d347bd626759b3f45412ef09858e4030c6138829cc47979075f942a0f167d45c583c58580eb1363af WHIRLPOOL ac843a0d37e19b0ab274ec81fa2fb968c509b596431d6eb26d017bbfcd4fd35766c4d6963a0622e14977a41cdf0ff5f847e05500f43d100c37c2da699b6b3967
+MISC ChangeLog 1519 SHA256 38bc5b82cd2c48d0547562ca42a2495c3584bf4162bed9ac843402efe59d5a4a SHA512 b4c5ba5efac50b99ec10ff72d18b4d245faf9762cf3232a2a7278a7e4ff1c401d4f7205e9823ef94bfae45147b33d5f6cfef9d8e976bb784aae9af0c04b89673 WHIRLPOOL 37b45ebc890c76c76cf807c5771c0690790dea56d605150de0dd3baf372c6140c3247c9e9d7dc61aa0ac8c0a1f75e9dad4422d44099ee9b2c543a869d20ca1a7
 MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701
 MISC metadata.xml 4268 SHA256 070123d230f117598324822c8530d41b9f5b03afc711c430b0a11355b47af42f SHA512 ba933d5c0acded55f9ca4f54b617b201ac3659bc7daffe7a069d0418c65b9a2648a393d8fd6cafb41f6a80d55d279e58b025b3c91fda41e8ed96d33319c81ee1 WHIRLPOOL 33d8c62f6fa5f90e7157976fb689833a9019bbcffb1ecda47045b537aaa14235c77d2d107ff4c59497b5e9dd70981e77fa4d6b0a266843ca4d2a877ffd863586
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTbXO4ACgkQvFcC4BYPU0pHNACfcTnUd7qMsJBoQXpNuwCuvmqq
-/nQAnRm56pLomGzx2oJBO/NVYnsrWbjv
-=49Oc
+iEYEAREIAAYFAlTftP8ACgkQvFcC4BYPU0rSCACfUSqMlXVVawpUYO0KbiC2F/B1
+yroAnjpmETTWajf0xiqIfGu4EA93p40u
+=St8u
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-1.2.12.ebuild b/media-video/ffmpeg/ffmpeg-1.2.12.ebuild
new file mode 100644
index 000000000000..8c1ad174bac1
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-1.2.12.ebuild
@@ -0,0 +1,342 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild,v 1.1 2015/02/14 20:50:06 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="cpu_flags_x86_3dnow:amd3dnow cpu_flags_x86_3dnowext:amd3dnowext altivec cpu_flags_x86_avx:avx cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext cpu_flags_x86_ssse3: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}] )
+	cpu_flags_x86_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
+}