Update version

Package-Manager: portage-2.2.17/cvs/Linux x86_64

4 files changed, 14 insertions, 358 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index db7de745c85c..00d09e6a488f 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.240 2015/03/03 09:17:15 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.241 2015/03/14 16:56:02 lu_zero Exp $
+
+*libav-11.3 (14 Mar 2015)
+
+  14 Mar 2015; Luca Barbato <lu_zero@gentoo.org> +libav-11.3.ebuild,
+  -libav-11.1.ebuild, -libav-11.ebuild:
+  Update version
 
   03 Mar 2015; Yixun Lan <dlan@gentoo.org> libav-11.2.ebuild:
   add arm64 support, tested on A53 board
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 1055c8e98617..fc8697c87ab2 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,39 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST fate-10.tar.xz 558524508 SHA256 65779319ff75a5d93f20132a7c348db2ff6f0f0275fb64a23f81fbda6e44c1cb SHA512 5e569b899961d82c579d974eb13b8a5263ae7a83dc788119d6abf923c9c133029fd861960a85c316e0b0a0bd61722cc3bcb393a65d9d2c551084c0b1103cc582 WHIRLPOOL d9e0bb01ae809ca57a566ae804b9e30ff0239e43047a7f93d07ab0d31e95c7f06cadd651dd3badc2b906f34ffa12669cff87910ffe115f34c3279615f8afaddb
+DIST fate-11.tar.xz 691009480 SHA256 4de446ae8c665e9410475c58f6294720f34cfdb1f20d29bbc0ee2576f810d597 SHA512 f9dc152964e3f19cf32d5d4cbc923a2bd05ba3b0f8f3880122df79d32852ee9d4795a0bfd66d7a2925299e9e9533888df6103e212ea3e5cbfe799d17ffa2b433 WHIRLPOOL 11034760105d1028330712f5ead087dffc9edc119945d618f6b02b37f4599db4c575a04c72f77cd5c6f180dc8e8ac2c9c1786d748b759aef2efd38191fcc6361
 DIST fate-9.tar.xz 467671500 SHA256 27d10fd49267452ac787c3f43501a4a21d0ccaccc5ddd6d79d8a6150ee276532 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202 WHIRLPOOL d280ac32c6d84f121be8d733774e72a4df3f2e84d71051aea509ef5ca3289c94fd548bf03ff12215e045bf20c83426c547e6b5eb446429d167f38af7c7aa9803
 DIST libav-10.5.tar.xz 4650900 SHA256 c7a57042a5e4720152d27a0beea961ae52a3ae1d916a88c78c1e192e9e0d5f86 SHA512 fa4837daa3bf40f05902ac2d849179d104b1f9881b63b460363e577849cd55b0795e6e41aadec817eac89d1eaca88ce4a9ad0eb2dbf1dd789496dd9cd2637c59 WHIRLPOOL 03ba4cb4dbe8da4dee4a242dc14333ed6b1a2198783f687d143d65cd9c25a5f05aa7b30e49b784309af04045d4726ee3a702159da72ed00d76eaa1be01b7c4d3
-DIST libav-11.1.tar.xz 4855320 SHA256 4198c657ff4dcb209f6852aa4809a7cfb1eedfec95a4748cbe0b6639443f7000 SHA512 cb1783c98185fd9bbbeff07b72252cb1844b4d717f7beaeaaf78da39dc0175a8e96de572adb5649351f00228761002262019d068ee6952afd45e3026b8f9eb75 WHIRLPOOL 3294852b00fafd9b0a6348537f56f654d13be0c73b4fef66971859f4abf30c57fb89824292a05992cfa5a5bc32ebb81b6f67f232be3d550976a83f6553fc33eb
 DIST libav-11.2.tar.xz 4855224 SHA256 48f4a36cd823f2449d1e45b114371033dc68f0e09ff0f7c841405c09a707682e SHA512 5e50eda5d576b0a3f263a8f7e7680ebdb5147b9755063e6fb4c48b6d16b29ceca6afdeadf9c51c663ee62061775e19cf6dbaca3647a2d57158141e85ccd8ad83 WHIRLPOOL d7f8f8b8e6d1f96cfcd3f56a371371e4d6a56c658b8cdff49ec321273af8c891e0b6c22aaf55c3fa041719b0b8d91eab2e72f957530e57009cb40c90a1fc2b5a
-DIST libav-11.tar.xz 4871572 SHA256 1f920f057f93752f44e8ed3b497129ffca249d462721bed8270726023b6a8835 SHA512 d40d245fbbe19713f75d52da61866cb59de0bd649fd3c91af2e6675efb2c81778240eaeee441fe823c4ffa8ade85dbe74883fec259d8a7d6b260724eedbf055f WHIRLPOOL b907547a9e5e9e03f99352089c5be7889197b4ff4e7e40c151e1be8a3fac056fffbe5e03a498e8f98f459011568c1596bdd8f53afe754e4361cb42d8397df3b5
+DIST libav-11.3.tar.xz 4858864 SHA256 12ae6c051967765ae5faeddf94c4584129ac0b18edb884afffc5fcedcdb5e030 SHA512 f25b9fb7392d5bb4df35937f79beae26bd8f6606f0ad7cdebf16963834eb9b423d882f6a3a44b5120a5d5d853c7c31bb8c3420a427cd2b360f41a48a6d5df284 WHIRLPOOL 721c4cbe7ee3f7307d24c0e4f1cc1f8ab8b0ccd50ddf88b77ecf1cae05f06fc80d7527e9f7a0a098a6d95d0e7fed50082aaffa07935eab6e9131f7c9be6e696c
 DIST libav-9.14.tar.xz 4077424 SHA256 e4baf0c2adbd941a827854794dd6af9c29cd2042b23501c5828e9b8e1725f61d SHA512 fa8e83cb92a5a565cd23c63467c64972a69a4cbd652b946c7891b73180b609890f67a6f89f009ed263fb9e2c769236f3a8f7f70b0fce4c4373fa93a49470c04d WHIRLPOOL 178ba6c6ad0ecd8ad59eb3bf7a0d4289a3c253d82981cf3ad454e3b222848ae4f875e37cfd280be43faa25a9614c445106555c9f3b5ee4497aec9d71f39ac1af
 DIST libav-9.17.tar.xz 4080028 SHA256 e32d5f152bce1de283c002a35eb6e71f265877633dee8a40db4d16381dd5d17c SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a WHIRLPOOL ec07b5dd116e87416a9841044e09a6ef9b124fe4882f53e88711a32813d3d3a1d71f5067854bbd553ecdadec401dbbb8b504bfc1c6966bfd5e2db79459fb9995
 EBUILD libav-10.5.ebuild 10356 SHA256 67e09a1281a571d77cc2e9e7fed26437d3c1fb628b116b31eaa123fbb393ba7e SHA512 219bb9bd193b145f7d4aaf77335860fb0997e89d9c0477e31afcaed942be109521184cc88a6d00de8d9a2b00e0503a21e80e6cdeb2d84fae85692500712ae04e WHIRLPOOL 093cfb317bffaef6fbaaa75d7be3fc0e91c7eed4c548f974f87b45d2b53825926f4252892e10e9b883128ea0acf61acd6a1f39a64518fa3e1dc328a9ccbcbfbe
 EBUILD libav-10.9999.ebuild 10377 SHA256 c2cc8d84fd0ec4f24d0d2a2fe0042760b11150c965bda8fecf37dccae888cb9e SHA512 e232f38cc72551b21c748b15ece1dc4dd6be23b18831ded9f6594ceab801d78aff670b184d979957be63b7bb90af8fc7cca8d57b72090b102109600003a0e76c WHIRLPOOL 2357f6e4773f0ed0e601d372490e0ed0e81fb7f193613ad02027b9eab9e794016714ab950fbacecd40c3a23689664f6df50a8497260a02aa5ddba398afe30df3
-EBUILD libav-11.1.ebuild 10605 SHA256 dfaa423ec9d5aa77e1e9d842f961a79b4bd4dd43b09d61e933b7074a35ce69b5 SHA512 531d53c862f7aec33a6f1df758fce3fb9240d3700919b4311aed120af05b168f073d8fb7fee89cc43fba53b35fdf2c1290cdb11b3336ec2d1f2dccf8126cc16f WHIRLPOOL 311b1138fc10df6baf42272c34c4d70fc511fac2dd7118e1d160e55f84036f9ce4430455e8c632d0b750f070073d33b1affb33531ef18632180b0a2796d64b2b
 EBUILD libav-11.2.ebuild 10605 SHA256 ecd6805a6d8a305a8e7cdc66e423c1e13b73edf3128f8620c1c78515d31f6329 SHA512 871f5ca196a7f662dc08269a893264513148c21369522502dc0cbdfcaf18b9d35d1a0f5c1eba068b163cb6a9529e9df3ebce7ba5dbf12a3af2ae3b43492be4e4 WHIRLPOOL 650c280d3318ab01895f80af9d738131dbbfcd9bbd08225490d52fc083ec9cedf193bf4978e95e1b478c355fef1178812c4ba8c89c3ccdeeab47c48390df3407
+EBUILD libav-11.3.ebuild 10665 SHA256 dd531625c672af0ce268742d592a7b0efc88ac827b03bdc45fbf278161d04c30 SHA512 4567f42d97f9ed4a3dba1aaffd808caaaaca997e585c103f06a1dd864591629fb1b18d121e163cf0b593fd4aa765931ce0b91f9cd5e86a7e2abef72073f63df9 WHIRLPOOL daa47171cf89964c65d01298213234d72e521f47fc634976f421a306d395f0be37067bcbaaacd778c547bf95167543a5fc9b9969a14aec236ee1e42c45a3e07b
 EBUILD libav-11.9999.ebuild 10608 SHA256 4b1a63c989a382876c85ed4548432d4e31c9c98eb0b59184482623d99a3c6e7d SHA512 359e8c3af6c9f7cc61978bef1a3594086399f6ae8215674eff6dec1f56e5aa5f77530ff62150a4a8a37dafd91168316e82e2959faf5cb825580eb7853a275dd3 WHIRLPOOL 5959e30f2b9e1b180d0c0d64dda513c839a63963131bf7998f7ee76809cb11f114ecd46a05d729fc605201bffb8e78495ba09ee6766c8b56e424561652d0a2d9
-EBUILD libav-11.ebuild 10603 SHA256 2868b1611af70230127b5653514349059e01a25368429eea8d2d8cf62d41bbdd SHA512 2bbce5379059684e492313efd1467098e4af7289a7dcc3f07140f1ebba4cce73845b8d9e541c8dcd9470850489c0d81e212c90425b9396c0b59bb02cc9230c8f WHIRLPOOL 8abe956d10763a5612658b32af8befec30da2046653d6bd5a169c82dfadceb8541e6ef3b77ed2cac85af5951cdf5106bb38b2b503b103e318600c91e06726be7
 EBUILD libav-9.14.ebuild 10276 SHA256 3654539f0b176329b35eea5aa3ab61509c95f7095f9d6a377a1063ccf4c379a3 SHA512 6ee72c171d020adca5d2dd1e92045fd47a1f0c693b522169a33395f4f2f9000fa390427b97a63c9786f771f0f7e5698abc9498f3cd8dd50e2844561f07d244f5 WHIRLPOOL e1aa7b946b876db58776534d979e5c1255bf51e9add860828e3a95141b93fe5e41dbbbfd1a12c6aa3dfa1e7f2dc6e004f7da11bbb09cd425af98a50b479d3c75
 EBUILD libav-9.17.ebuild 10276 SHA256 8a71f05c57cdbc845dfefa562bdfe0c832d9e38589ed26f0c61042750271f375 SHA512 3e396cdc15d60f56562bef3b1fbaa7b3c7c657a3ed237acafe2665ea5b7123dada20e2ea565d7d9a183959238bebb570bc676846edd8961062e2e67ca54863b8 WHIRLPOOL 5dd4bf0fa0bced174da6ce7a386d64e5739ed5cf87822a84ed85e7aa1d8f8befeee41c3f116a57623c977d34c551fa0e3dbad27ff932b22f5a7bf987d00ab966
 EBUILD libav-9999.ebuild 10556 SHA256 d4149e0f9c1db1062b1eb6ff1685791306be770a7e575d373bac76a9d419f879 SHA512 e4abac6b4c71e3c5d56ee676aebda142c007fc98ccd09409f1ffc013c60215aac76a71e005699310e49658f78a4e8c0037a20204fc4160e23001c50aee146ef5 WHIRLPOOL 82405a86b9a0c2346c0e9371e5467c4e8152cc5ff32891eec7654a7f3e56c020d1f5b47ef9568ac213efcb13933fb97da4b39bf8c48c7845e2e669f6a1eeb087
-MISC ChangeLog 36446 SHA256 cefbede866ac82a8fcabe51e0985a9a4648cf9a43a7042c03695a2a6e3bcfbfd SHA512 4912b7d302e1b657688bf86ad63d24c0d18fcba16cde7986436dabbe6eff706dda2d24b3d47daaf0c4a330b03ba794e308674f6a2245cc32bad18c9a4975c41f WHIRLPOOL 74e36bacf43518e9311ad09ffb094d4a7511b805faacd528d265aa5762ac18330557200f432df32fc603689b37d09997d6d7cde04ae3a0081169df4c99f5beb9
+MISC ChangeLog 36603 SHA256 eb7be2e8af476966177b0966fb165cfe5e76d53ef3b4544d11198d2df6f0c596 SHA512 974377a49e4d4082faa7acf9da78836ed8c255cd198a73ade9457c389a2fce0402c56845caa9beba85bb7653c988e216b5e37bd5765168931a6a5682f55610dd WHIRLPOOL 835680e8e05f93d73bd011d4584ed9675108b03022e3d0d1cb611b695b527f0a45df965e3640e2c6d5df9ab8e8e777a7e280812dd3827645f2e0f627e35a5796
 MISC metadata.xml 2449 SHA256 073a9f3607e777310034e044ea1bd770e6687d45a47e08f90c7bd94becb05f7e SHA512 8c42da6491959f87d5c79f4a6096feda1bb9cbb3d455d13b67ab21b5d2c043d047b230f529c4328a32ca5ff6c28b66831a68a2a162cb373fc3c81a8e520d6947 WHIRLPOOL 62ec23fc29ecc036b9d56b372e2c23b5691fbddd2e5ff6ba9cfd23ad241e5db26f3f13b06ebbdf85d165ebbc35c08e848d17e25490859de142015f4144dc3bb7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJU9QtAAAoJEJIMDbyqvv1VkwwQANANXYIRseCxR2pl+8efdT4z
-vYjAC9RdF21yW5KAiAhLKIklMJ3Yyn17HQNDpGPJ+o+4Czrh5EOH1ka6dDtZ1ogK
-agvCT5SM23A6pNqIRQ8tieJ0GU4RY7R+bZEjiv4HKZWW5fq4V6aniizsXIo7+Ub2
-kLLBg5lEoXEKwKC6Y3/08S2hLh7fBOSXCmHj8d8oJqFJ4f0cw/SYoeuZX54ON8Mo
-VS72s++eORCRPSasp5IgtxGADhNv8hIsr/UWEkdrcKsSkjSS1P2K2c+coIFfSJLt
-M0Msnao+xPlTSPRJuN1Fkl95qsdUxLQlz3LclVRh5VhMx8d+2ZN2faXxQwV00vTv
-CzAB7EPMhMoKH6isHNlozy5OBTWgv5fv8DxrsiIh15n+IJaa4jYS8TgrT+xHqv/U
-TApCTgqIRFWj15CA//p2WdmCPEev3MAWpZ+L8FuQDK2wd9GxqRLjZxBlCD9TcefW
-VH+e2Tef4H2BHDsdP5gN6nJfOQsh+XUDRY+REEGhhGFY/sbnx4JiybcICRF1uw6C
-riOi0Ynh5CCtUSd9J5iNM0ZDMAVjbRNoXZq7caaWPJOdui4eyReNCHfLKgL/n9Jg
-I95Ab81zzCOWEe9aq7Nb/Tgc0kF8W+ZY+o+Wl7r28qjDQWtA/dMo9DWDYAutY7Cc
-6W8wzR3GWfJIjRzdths5
-=eQEY
------END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-11.1.ebuild b/media-video/libav/libav-11.3.ebuild
index 34f30c99224f..275256bc0445 100644
--- a/media-video/libav/libav-11.1.ebuild
+++ b/media-video/libav/libav-11.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.1.ebuild,v 1.2 2015/01/30 16:57:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.3.ebuild,v 1.1 2015/03/14 16:56:02 lu_zero Exp $
 
 EAPI=5
 
@@ -24,6 +24,8 @@ else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
 fi
 
+SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-11.tar.xz )"
+
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
 SLOT="0/10"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
@@ -135,7 +137,6 @@ REQUIRED_USE="bindist? ( !faac !openssl !fdk )
 "
 
 # Test on live ebuild are not possible as they require trunk fate
-RESTRICT="test"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
diff --git a/media-video/libav/libav-11.ebuild b/media-video/libav/libav-11.ebuild
deleted file mode 100644
index fc5b9cc835a5..000000000000
--- a/media-video/libav/libav-11.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.ebuild,v 1.2 2015/01/30 16:57:31 mgorny Exp $
-
-EAPI=5
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="http://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
-	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/10"
-[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
-~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
-	+encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k
-	mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
-	static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 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 neon cpu_flags_x86_ssse3:ssse3 vis cpu_flags_x86_avx2:avx2"
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-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}]
-		)
-	)
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${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[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${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}] )
-	)
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-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}] )
-	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}] )
-	ssl? (
-		openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${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}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${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}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=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}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=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 can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl !fdk )
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-
-# Test on live ebuild are not possible as they require trunk fate
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	epatch_user
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		--enable-avfilter
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-x11grab )
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-	# libavfilter options
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	uses="gsm opus rtmp schroedinger speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && myconf+=( --extra-cflags=-mfpu=neon )
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# 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
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	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)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README INSTALL
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libavcore:${BUILD_DIR}/libswscale:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \
-		emake -j1 fate
-}