version bump for 2.2 branch

Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 384 insertions, 5 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index b28233f9fe0c..2eb6ed9889ae 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.867 2015/06/22 08:08:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.868 2015/06/22 08:15:39 aballier Exp $
+
+*ffmpeg-2.2.16 (22 Jun 2015)
+
+  22 Jun 2015; Alexis Ballier <aballier@gentoo.org> +ffmpeg-2.2.16.ebuild:
+  version bump for 2.2 branch
 
 *ffmpeg-2.7.1 (22 Jun 2015)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 29d77061a6b0..6581a4e05528 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -12,6 +12,7 @@ DIST ffmpeg-1.2.12.tar.bz2 5974419 SHA256 913ac95c7fad92c2a4ebcfd11850904f531845
 DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
 DIST ffmpeg-2.2.14.tar.bz2 7033140 SHA256 c7e34ad8b9b12b07b469b7c0b64aad72edc70e72d924d4a04b943b3ad80ca053 SHA512 c22aa4bdaf3819c1b3210fc99e6fbcbc3b91eb77f3aeadf05a4a0b86ba6d08c40e7b7a56d3dce02ca90bfc269fa6ca89dcf748cf2693f04aa4ee72fdff43c3fe WHIRLPOOL 3c376ead8aa23ff3b43f75bd22e6798d5e1c9b42e914012fe41294b3dfdd1d1ecdbdfd8052241252b6b4f77fce624f574d20ac62cde5cd33ef18017eb4719a5f
 DIST ffmpeg-2.2.15.tar.bz2 7035820 SHA256 24db9c496fa9167c8c5252e7109deec4a0387b10b97170d7dc46f2bd697055e8 SHA512 622b34c1cd250f3abba34fd722815ec5f44de9a2f7aad6cbea99240b69a7d9f149bc4921b06270febeb837de527e9180bcf21371d81cdc19be6f451d3c8c48c8 WHIRLPOOL 52c2142a2a5cf449a07d3da0f538770a0081488d1c07c870adf14e2ffa7570b553be185e8967322a01821e39909a253987e727386590121dde3480a779d76081
+DIST ffmpeg-2.2.16.tar.bz2 7038198 SHA256 7b3dcae60dd23f5db3250cea97d1505f4fcd9efe3bb22960bd38b5f043977988 SHA512 61469e4f91747893ce340b6e44294e9b90d20d295fbebdbd5e0c5bcf1fc326b3056ae608795ca3208ed1a4fb52b8d0225f26f0e16303c2dbd7fd3abf74c7142c WHIRLPOOL 1c847cbd5298139bc89b22d0e805a6c3aff71089beea56c10ae0585d4cf1c7f49697b42eb91c09776de054d69832a9768a420bfcd55ac8f7908c1fccb572e96c
 DIST ffmpeg-2.6.3.tar.bz2 7803314 SHA256 59eb98c1b5896ac29abc0385f7c875d1b4942d695818818d418ee71eea1e0cfb SHA512 0998fa0cc2711b556fc28ce498e986f8f0b3ba7a30394c6b6cd494a542917eafb3d4d758f75e33fb39db4a631eca40515aa36c8b278fa3ffc9be006995d31029 WHIRLPOOL bfd074cf0b7a315d42c3559f4edeb46fc693918c9958e8e8b19d08f2e8c2765cf26f0ca9007d34a5dd07b69775cf06ab517c2a56926c46ade8bb7a782f492512
 DIST ffmpeg-2.7.1.tar.bz2 8152634 SHA256 7e07b97d2415feeae9c9b5595e35e7b7aab33207e81bf9f8c0d1eece43f7f720 SHA512 7c85366fcc1214fdad07b4151bb4e4123fc2f8355e7207a67755053f3ef5b8fff10931cf85d8cbef39576178dc7987bd1d658d6cfee392046b0a3eed7df75014 WHIRLPOOL 26f43b5abb5c4646624e4d1d59705054d54b76c01959d80966105fc8a45ee151f2325a3131c61f2d76363b4c1ab32849c7c86b8cd467ce15d7b1d7348cb17ed3
 DIST ffmpeg-2.7.tar.bz2 8149595 SHA256 a8bbc9ca0ad89a404e0b37cd32735c8d7f0421b8bd1715fd580d8835cc1a844a SHA512 ccef7df1983efb7df3e99c29570cb53a425a56989208adf349808a2cf45552e6a61378a28908d0aed24a636ed57e71de13c6a05299cf00417aea989992f388af WHIRLPOOL f7fc6dd1bace98c9aa7a36ce3079779d1fa3f9df5e2a2e399ef895784bc391a35b9abfdf233fa161d56280e0f7e743e3c8dfe8f95be975d3e519fd4cb8e80f9c
@@ -21,17 +22,18 @@ EBUILD ffmpeg-1.2.12.ebuild 11006 SHA256 13469cba576174cfb78737018e18444f9b5ffb5
 EBUILD ffmpeg-1.2.6-r1.ebuild 11049 SHA256 88d7665d4e89c851182da15a4b4345ff2b037fd26dad1b2e8b18795cc2a5dd02 SHA512 81aa531007bc9d981b32337a25db8b76770a415347b42885e88e6c330c089f2de84cc671783542a8d1c2b4cf59f3a4bf4520a7a0b2ed9c96528a5ea36fc80aeb WHIRLPOOL 830702c5a1f586a7cf655a0e804d4b60375a8bd41048a7dd0b05657459c66f5e2711fc1e6c712e16cdf073a4a5026a74776014e17d61fdf4ded7c22d98b5f0e3
 EBUILD ffmpeg-2.2.14.ebuild 12619 SHA256 bf55e742a2b499c3c3adc76608e3f160637336832b1049e199a8d45fe0ea9142 SHA512 fb81e35120fc054ce5a167cf0e6adc4d05605b56ebc439185702bf43a24dd468fe2c0d0e740d34de4bebad55e10850f31cdd073af0760c22043b0f0ee7dc4e89 WHIRLPOOL 1c49b7fa34e74c7a595c2bdbbf620ccec287e8e41100cd1ffe97173951e84fe84fdf2a70b38b41a6b0205b775059d3e0bc92171c22fa0c9dcc53aa724a6ad66a
 EBUILD ffmpeg-2.2.15.ebuild 12628 SHA256 204b477a335bb17077ab5752a688b800fa32e743a0a19a4cb4ce9d7ac423fc14 SHA512 d102a27975ccb25f8dcd3883ed4aaa4ffae8b8e675778d3686e38942bd6041f114bbcfa23d24f21c691d5c5f317d4f20c75312fa34eff254f68668995c1a2756 WHIRLPOOL b10837556abead054fbd5dfad7db4c3da54a85c34f2bf713ada6ca59ed20998e9670f2769b8fe1b244daf460fc1277ae69e465c11b79c753925706df8ec8801c
+EBUILD ffmpeg-2.2.16.ebuild 12628 SHA256 77129da0598427e897792f3848903b617ee10b665816aa89ca322e1c87122778 SHA512 ca4b4435f2bcb0eaec217a1ccef6f8dac1c58251248f329d146bd0d06b7b3ae4bb1dfdf434077fd4946e454ac5cdcb3c135d38fb49ef5ebe69bdc2bf493e1a09 WHIRLPOOL 021cbb56f7031024e5f8eb4b5a1545402ebfd671b3d428f64149bc6c02a6abfea5ce26b8ecedd9ded0574296c1c5e039618e236269841a0dffb8f02e925c6ecb
 EBUILD ffmpeg-2.6.3.ebuild 14572 SHA256 303da00fc96069726e0f5fa0c4d8bceab0c230e494c80d997ec8e52fad5d56d2 SHA512 1b7026d9e0924d1da935d0a28ed6860411443174d922cea88941f92617eb1a0471da391f471c8d6db269f71c52e29e9688e84620cebcc9eac82c72224c4d003e WHIRLPOOL ece481b8a2eb175a0d148db3cbb43a6a5524b48a7d6a7f09aaf5be66af8944b96fda6ec4452b259602d5855e7b44b7163c712990166fddb9b13694ebccd394b5
 EBUILD ffmpeg-2.7.1.ebuild 14576 SHA256 bf87d04cf6b6ed30f8875014e586eac1ebe1e53abf61030a56d2413220563bb2 SHA512 48b4e241987f3e0924fb54106f2d412a3d5ca9949bb87e2cd4f007eac912eacdb2fff26edd55b6733142915b6641a9150894da4dbfca48bc3df54eb39f315d75 WHIRLPOOL e3a79c4d1fdde58811f50ad808b888298e73784ec03c3162d864c118ce650ba0feff0932874f8e0e2a8db5396886ba30d74c8b8896f952555c429b4fbfaad6d4
 EBUILD ffmpeg-2.7.ebuild 14574 SHA256 bc4f825042dbe4d6ac40e8e41417d2431170b9f27ce00a761f53484ee44c189d SHA512 ecfeb9b86b83a5698819d6fd24306f0c61b966a53dfd3846e13dacad85f43f17b9f5e29e500f65dbb2feba2e8416406d1640675eed20502dfd46961c5a8b5464 WHIRLPOOL b9ccc4d985c01c32abaa9521734a86cd43563db47600b5b457cf50f9920c7f7d1c2616214e8f5de6f1c6df4f050138b4b644da8624282fb3f2efb583bb3c4fb6
 EBUILD ffmpeg-9999.ebuild 14577 SHA256 098f11afd7a5288ffaba31ecaa28ff95cd932bb04e73185a097a4ea3e96b0762 SHA512 9b4aaf44568cfd5a9b089f3278b6f0071b47c6dc22f15f6d508fa2455d3381596e11dc902f7ec0c5ccd03b6b6b6d473dce27fb3bc202a1af635a8fd409c415a7 WHIRLPOOL d5e75d333cdc00671c6e0d7b62c575421a18c9fb3376f20491caefc1bb59626076da7a417717d5308e1739299207f9358e1157fa5070653fef073b839c58e4f5
-MISC ChangeLog 6767 SHA256 8bd59174f675160748cae3e56bb3ddcc4a73804255cd24d2e1476daaa0b14409 SHA512 15e54f869df33380bb76eaaf84be12aadf7ae74c01c18ccbca9c38192e3fe56991d5ce6c8ca5905bb8f78033fc44c16b5b0e968649f20c4b346501a760647bcc WHIRLPOOL d33eb71db7920b8cdfe09d285192d95eaaacdc39ec4d51c188638eae062d9181805492ad35b3469f4d03f2a0eaacc83544748e863f88c663341ccdc9a99f35e3
+MISC ChangeLog 6903 SHA256 b4916d54254d552676ffa85f8a6466c8b11e1250568b787db669b54ce9284c3e SHA512 dd94faaaaa39516afe9318ea4d3e36e707a6eddced63f3c40d39cb56a48f1800d9327dceaddcac7db05396b0e4451f6b515aa9a1e6bd3a02e49a8ab0cadabdd0 WHIRLPOOL 3075d31c612583eaeaac43061e246084f31db8bb23d7a2c555fd50f04033245f5a40e05ae790526c2cc6e65b5dec1482c22543968909b2ca008f4b78f58984c3
 MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701
 MISC metadata.xml 4332 SHA256 b39edc51a5c5d68aefb52639412045287dbd670ab5b43a45b13c2c99d085f9a4 SHA512 0744c75f388ae01989b62cc34c49a665fc19dd8b0639c846a16c84a8db06a9cc571c2952df63857dac15bffca6975a0c872ea59c4f490639655f4eddd1b04ccb WHIRLPOOL ce3593918d35986256ee057520e69ebde51e4201e1d20e66f0367d7bf45e5a1a7301b5c7fa02ec327273702e426a2876a81e381c4af78251e729b2982abb41ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWHwmUACgkQvFcC4BYPU0o80wCeOfoAGl/6mYCJrLY1jrQWROMt
-yicAn06XCwzvLpfh/2LOUA8AOp8MLVMz
-=nPtg
+iEYEAREIAAYFAlWHxCwACgkQvFcC4BYPU0qvVQCcDBrygcn+UP20nQtZeGyPHix/
+8JsAnimIXw8eddUiY2pWgT5Dhle45E1H
+=Smk7
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-2.2.16.ebuild b/media-video/ffmpeg/ffmpeg-2.2.16.ebuild
new file mode 100644
index 000000000000..af242f476f70
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-2.2.16.ebuild
@@ -0,0 +1,372 @@
+# 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-2.2.16.ebuild,v 1.1 2015/06/22 08:15:39 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="~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 amrenc 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:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1: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[@]/#/cpu_flags_x86_}
+"
+
+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}] )
+	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}]
+		>=x11-libs/libXv-1.0.10[${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}] )
+	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( net-misc/wget sys-devel/bc )
+	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(-)] )"
+
+REQUIRED_USE="
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )"
+# faac is license-incompatible with ffmpeg
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )"
+
+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 mcpu) $(get-flag mtune) $(get-flag march) ; 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=" " \
+		$(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
+}