New point releases and Libav 11 preparation

Package-Manager: portage-2.2.8-prefix/cvs/Darwin i386
RepoMan-Options: --force

5 files changed, 648 insertions, 16 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 2c053b17ab08..9d97cb29ac0f 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.215 2014/08/10 21:00:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.216 2014/08/17 12:55:32 lu_zero Exp $
+
+*libav-9.16 (17 Aug 2014)
+*libav-0.8.15 (17 Aug 2014)
+
+  17 Aug 2014; Luca Barbato <lu_zero@gentoo.org> +libav-0.8.15.ebuild,
+  +libav-9.16.ebuild, libav-9999.ebuild:
+  New point releases
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> libav-0.8.11.ebuild,
   libav-0.8.13.ebuild, libav-0.8.7.ebuild, libav-0.8.9999.ebuild,
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 4fcec0becf83..15f4d2cbac4b 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX libav-0.8.5-support-libcdio-paranoia.patch 1477 SHA256 2e3490bba021c512828f12dfc5e6be39a5f3c53e16b2ceb99e6f6c4e71139803 SHA512 2a9847a435a32fac0b9bd904b932d20f26a6c7b0d086cda42c45f9099d87dbd4e637c7a52e5c29ad0df69a95ffed91bad2673d773c3045f03baf736796ab8332 WHIRLPOOL 77152717b72d245e4bfd5ac0cc1ed4ac3a512086be248515bc7d0c73d4840cfae7ba3bb7a668ee354803b6fba6ad90b992f80f2c335b5173741498a968b3eca2
 DIST fate-0.8.2.tar.xz 443503168 SHA256 4c16212e4d99194e670227ccf93d54c9bb4b6f27c515626a536b87deb610d850 SHA512 eca7783af7afc567ed226942b1318b1874b2487c7dc65406fe2097cf2318d722bb4c45ed14363bc3653f948f7cdac5967162e1f4fbd5cbec1adc244886800bb1 WHIRLPOOL abe5faa67444c3edaf5ae9a57a701ba0fccd3e313941d0f7662b8dc2b3a8886578d7bcbd6ed4abfc62abe3b7a36ea216529710e28d1c9cff8f3bb2b9804707bf
 DIST fate-10.tar.xz 558524508 SHA256 65779319ff75a5d93f20132a7c348db2ff6f0f0275fb64a23f81fbda6e44c1cb SHA512 5e569b899961d82c579d974eb13b8a5263ae7a83dc788119d6abf923c9c133029fd861960a85c316e0b0a0bd61722cc3bcb393a65d9d2c551084c0b1103cc582 WHIRLPOOL d9e0bb01ae809ca57a566ae804b9e30ff0239e43047a7f93d07ab0d31e95c7f06cadd651dd3badc2b906f34ffa12669cff87910ffe115f34c3279615f8afaddb
 DIST fate-9.tar.xz 467671500 SHA256 27d10fd49267452ac787c3f43501a4a21d0ccaccc5ddd6d79d8a6150ee276532 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202 WHIRLPOOL d280ac32c6d84f121be8d733774e72a4df3f2e84d71051aea509ef5ca3289c94fd548bf03ff12215e045bf20c83426c547e6b5eb446429d167f38af7c7aa9803
 DIST libav-0.8.11.tar.xz 3768252 SHA256 5934e4f0dbf6e0fc4987de86cdd079f1d11a1410ae275e9f46472af17f05155a SHA512 b469cacc57949dae60f12fa5bf21fcb5ca8c724deed7327c2e7a516f97a127eb05e4557ef659da28ae184b6b8e2ee1d93ee70151adf64b0fe345b054bf231b37 WHIRLPOOL 735c36eb60656e4fcc00accc4c8aa3fa9489a066f3f6a9940101e92e3d380c7ee9dde06b76ba464ff7e9671cef74ef790c3bf5618accdb58d051610cec4d33b7
 DIST libav-0.8.13.tar.xz 3769728 SHA256 05997d4c1689a7e52d38f6e5e2600a17b3371486a96a061465a1d23cfdcf23bb SHA512 1230cbd88089ec2c294a4d9e79c8e7f953927de34d80a7b7fe32b1e896a5d4bb7c5e34822650b51adc7977d382bc584e373e3c496b65827834ae0ff6f0f94711 WHIRLPOOL 3c547fc96b14eea37376533dfc49df50f4650c3c630947d51047b9cdde5317ebdbfb01b6a142d6bffe695e068aa2755e0e38c767ed4289e594b15130622fef17
+DIST libav-0.8.15.tar.xz 3771432 SHA256 495789ec547e93632937f0f36b06f4dd3180bc61518181f124af6746c6218710 SHA512 47e4a51d016c9a48a1e3d5e03729dd9e1f513ba8c2e4084fad7e6c198e3a3d4c76ffc585cf4ac556062a71cbb11c67181c06481df829b953e6eb1c470a6f03c9 WHIRLPOOL 216eed4162c03324df5c950c843ad798ecde863876062a4bee6839b9bd512b78e5404793584a5e4508bd7018507d704590a24343a1ec239ee541994f7c684ce3
 DIST libav-0.8.7.tar.xz 3763180 SHA256 8be6cbee4066ea031110d0f1cf8f9fecda8bc36d868aafdc7e0d34b59e6d5f3d SHA512 34b23bc61b4755b7d9aa078b77571641a167da0fb356c549ee48fa61fcedd4e9dcd7965ac65487606ef18edb3512f08a565de901f1927f11a18c1864da4ec83a WHIRLPOOL 3896adac36dc789a74e3839061e466f6277d225ecc13e9f6f96953b353fe6e15cd76b0464704240eb97c4c0fec230b21d7e4aa684869e367bb489ddee938bada
 DIST libav-10.1.tar.xz 4646616 SHA256 d5e04dc9adf43a467aa628f622425697d587a29cb0b997b45459f59cb00f9e15 SHA512 1601935d33bd591a9aaf08284cc903d693ceb3002cc95fa402ffe1f1ed96ef67d432485e8fbfd56f8fa872673fb77221a187c09791be1e33692f05445ef0a771 WHIRLPOOL 8e2177e7d8d086676ea699cb224b1716c8b25fcf4313ce9e91ad08cf4ea0d9a7f54bd2786ff880c17892d7e7c68de05876a57f8149bde7aa01b2c4d9193a9c39
 DIST libav-10.2.tar.xz 4649332 SHA256 49f000f6fbfc73c6070aa84b93412b5912b53548ec297ccc309c52cb42999b1b SHA512 fe9b303759f4ef6ce188d252558ea91c3388989edb96db18b5ad0b43e7152ae3eebddcf1d7471ee6a3d5becd477846d7f7f9c12bcac83c12dd100600a042dd62 WHIRLPOOL 8a950048730e3eddc60953d0b583322b6420f67953afa29231f60dc0b50119f85256826af7e1b24a774110a3eb4d08e8f94df57c13f2ff246e73b9abcc677e1b
@@ -15,8 +13,10 @@ DIST libav-10.tar.xz 4646864 SHA256 69ce0756ad5916fb1cf47d198d7b6232d2aed42c39e3
 DIST libav-9.12.tar.xz 4074572 SHA256 60fef8947d375579211635b13fc8bc79c6bb760d074a523c1ae1062682b3a0f2 SHA512 71f2d38885860bc48f961a42cc74ae11807dc0c869c7ba8c22388d47de7d62f69e6e49cd18b4591c0a62d1da84bdba8d4cd08bc7cf498117ac48c7263190a1cd WHIRLPOOL 1a8652e3e4603b845111897da48c01709426a1c227c47dd2429b766e99a7ae86d008d6434db9a1b1538984271682dd2783a5a805a042e23efcf282b0901114bb
 DIST libav-9.13.tar.xz 4077808 SHA256 2ff05df6cd2259b3bb277eb16c234214f8e0530700d0c774d033eba23edde6ca SHA512 5bbdaafe32a13f323ac2fa1acaf7d87cbaf09c87bae82e3c216a91f013ac30bef58f894ed32488546006945dc3612dad657cb1c24f5861ba051aec94be728b07 WHIRLPOOL e900cefe1b6655687c228bf6fb4f81c75d3ecf04e9d8e5558f11590087e13bdf988e6e100a56b9b11b0bdb4b13f4213ba7dd9fb932d5a4ac9e2d846064ff1ae8
 DIST libav-9.14.tar.xz 4077424 SHA256 e4baf0c2adbd941a827854794dd6af9c29cd2042b23501c5828e9b8e1725f61d SHA512 fa8e83cb92a5a565cd23c63467c64972a69a4cbd652b946c7891b73180b609890f67a6f89f009ed263fb9e2c769236f3a8f7f70b0fce4c4373fa93a49470c04d WHIRLPOOL 178ba6c6ad0ecd8ad59eb3bf7a0d4289a3c253d82981cf3ad454e3b222848ae4f875e37cfd280be43faa25a9614c445106555c9f3b5ee4497aec9d71f39ac1af
+DIST libav-9.16.tar.xz 4079520 SHA256 ca846473b0b8ed8e3404c52e5e92df6d35cb5fa487eec498525de3ffda4367a0 SHA512 b77385db20d2160aa31a47bfb2073853175b3b1def350d28616f8bd83926d795b66b4c5b349f7af47ecc3a29195505f747b7397e1a0699ebce9ae4089cd992b9 WHIRLPOOL 14b59cdeab9dcf8b56e2b3c62e3314218edf402e7e976f588cda2beee6f244e9ab1485115cd6f9e175e086a9e32162ebaa6bda0469c7957f11d9be2ca396cdb7
 EBUILD libav-0.8.11.ebuild 9168 SHA256 26e66208173faa6a874aaa438bdbe4d6e4eca213f3640dab1de769c28e205ed7 SHA512 8ee582d101e2ea6cd106b7936d9a59a5e36a10055d3662dc7154df8e506101876a765a894f94e50050e95c28debd3f73881b4bcdfa7cedc33ed190ec461959db WHIRLPOOL d6431b7371ed00b2a304f5b16e74b89f85fa1a89c6b10682af5e11d0c8fd679d1331be816367c82a34c048346a6633fc53311870c722a44c2908bc57665bdaba
 EBUILD libav-0.8.13.ebuild 9176 SHA256 886c23adb1212ec4272a042bd4bcd8f4d61de18d7fb4e18df01ab2f3e0b3069c SHA512 683b8b3c0cdc271959828ec70b3757e85798983cf5ea220de8051be4a02cdc58125b130fe94722a17f76ad3d6a1563e52fe485f7a6f6373649758666193e22ce WHIRLPOOL 0737f11fc097fd98a8ac439fd9ab9bdf2057de6b92d7cbfe6d8d8e8786e092e45555c6fb77ddd7146277409a39e57be9d962ab3af7ff961650083aaaaeb4c9cb
+EBUILD libav-0.8.15.ebuild 9177 SHA256 8f9dec60a3a9070521e7ac07f850aae58d9fbe6fd9b3b1c99ef9a412bc23f00c SHA512 a41a1517e2c2f5d93ccf69f73666f48594dcfb8e62fa78e1758b40b731b93f88300a60bfffee1cea704ffcc20a2213a5f301ff42166a3fddf5be90c0c9532f3e WHIRLPOOL ed2a2b65f9f32b84fe7525bedb3525cf5369e91b6e3c1446c0b36ae96d9e5484e77c517a86c13068c0d62076ac9317b95e71ef65095d33980614003f54a43229
 EBUILD libav-0.8.7.ebuild 9167 SHA256 e6284745802207763a9c43d5285f15098475359f42f964a8c1f3bd039d642a35 SHA512 566ceb60b22ffb2e9dc017948c60a349cc383bddfa57c4e194477fa3d0e6179783e3256d93e0939da6b830ef58d33700f6dca7c5fd71a539f7084fb7ee321d86 WHIRLPOOL 1d1f787bf647acefb4f75204722acdc2c258cc876ea35864208e57cca051980ab2e5a78987025b73efe15e4cf26bcbb462438a22ff02948f7ae3902fcea72523
 EBUILD libav-0.8.9999.ebuild 9176 SHA256 f1d490f5c2d07f463241942ff75329306bdd8f75f4d01ac00c691b8253e33677 SHA512 75731b4e1032340111ca69bfee04a3b33546b590b2875d6c079b3dc77aac0c00684fde6a6d93053a5f2fd9dc6686b309a03f110ebe600fce81fe44734d9f278c WHIRLPOOL 68884613f8006d7ad23439b31bf752a0eb3fb1fc42461ca893be5465d3cb71e4df3717c4c8d0ff609036b8da22614a5f59d9ee368fb0c493cea38f3320b3eda7
 EBUILD libav-10.1-r1.ebuild 10141 SHA256 5dd529a0c63879a970d0954251036c3cfc73ee9e9b4d499a2f5f6138edf705e9 SHA512 c87c7ca2aea92b92cc4b7bb1f17c36d7fa260f9a78cb5f5826245899b24b8dc2f05be529a12daa2ff568f1f827e22da66d5962f83595d967769c039c4384e6e7 WHIRLPOOL b488a93d303a38d3dae600d6af7127083cf249b5c956c8cce1130faa5268e2d468f8e79793e2ac44dc14fa1cc416008e7844b7155571fa127b35a4b4941dc576
@@ -29,14 +29,8 @@ EBUILD libav-9.12.ebuild 8503 SHA256 9ed252cf7cb7608068989759aa4c87a0b2b74e420e3
 EBUILD libav-9.13-r1.ebuild 10168 SHA256 5f7e558cd9b6f8a1488b549e5a4eb7e33a8b5819acd980fec77920d2d95f7483 SHA512 84b33877987f76090b5631c9ce4ea5f4c74bc0af178c399b5cf5cde6afd89275bc69d261a4ea17a29d46497e43d6a17ce9e46b95011824cb6469074a14103a55 WHIRLPOOL e07904ad4a5a8200c7c29d4f7db4ddc9cc59800f6c02ea7a7b8a740212ed8ce7e2914e867b7e8b09d452353822fd8279d1946e788c2e4d7b2ab65ad37ed54247
 EBUILD libav-9.13.ebuild 8497 SHA256 97333b2b0271c82fe73ddb3b69ad91a32f962d5f9edc168279dbde0283e642cd SHA512 aaa05ad8b1319ac25e5100103b8d6c50cf4b05f7774221c24cac80dbe8df8755e97ca387d77ab2103c342f3e7760133aaf3c16b5207de76325099183b60da5d2 WHIRLPOOL df891ffee326cc4f0e25e723bf92cbcdb706e1d4d8ba0b27afd5c27d48c4df8922d99123e08811ee13cea5ce01e737205f0aa25b524729d67172dd99010121c9
 EBUILD libav-9.14.ebuild 10157 SHA256 cb77e984a6ebba124a24673ef9948779023e0a1aa0ae618d0184e1ba1c08a6d9 SHA512 8c2bd51379ed4753d82a8cb738c1bbd2eb194218480839f96552666c7ed8a0bd2455f0a751a55fac242ec867c8d80ecba6bc07c935756b372f992f559e2cf07e WHIRLPOOL a92d9c03c8b083c54c2eecf4d9e90aedebb11ff8c82296339d9386384bb8ac66ff671faa2092c007e667aca7c915bf75e5345c5125cca2d6d9aac17b670f5ba6
+EBUILD libav-9.16.ebuild 10166 SHA256 ed6b2744db84c65696888907b064b90c5f5a7aa3566886fd1679f573a73d1cc5 SHA512 26a26f8a47f13837df48ad9da10a7146a53ba10c0a7cc3f391aeab968d554a1de1628581f52cc9afc9797a82b049261dabe97cb16db078bbf05a945edd05f03e WHIRLPOOL 241535e813d3d1c33194fe186a1ca29ff9243a800ce88926fa59fecf706154a827ec7aef77cb80c317663e092197e81030d8977494d8d55a909a5cc7b08a81fc
 EBUILD libav-9.9999.ebuild 10168 SHA256 8e825f17f40724cb919f81e5f07c62bd5ec33069f10e1731d93671e7a2e14a53 SHA512 8276ebb9269043a0dd574916d5de75b405dd46c1e386391b2cae1b842c0b18ef00df7e508250e96a1ec24b3f819b21ec431ab04f67b6327ef350952422dca603 WHIRLPOOL e1f0a9148578e2b87d48711835e0183645dc0338fecbf131eebf597e930ee086f6865c4c6920ffaf66b88c171a487505395a47d6db307c0050eaa17880e5865e
-EBUILD libav-9999.ebuild 10227 SHA256 d7dee096f0cb6418c0e19bb1c3f8b9ee3063c9d149ae0f0c3d9ae3ee7819f843 SHA512 c0dbbc5a09355b14bfad400516b9f775fa4cea82d042d33cb9913c12f28a97f38353bbac8c0b36d4aafcd0bf3eb0111583c0b531a8d821b45232db6904ce527c WHIRLPOOL 93ed7a0c13826cc80333f8f7e79e97ea0f763ca119b93847cc9f204f6d046b2b3c5b518f84b6477306b3299b31c130829d36fabae9c5f61eb29caa3bfb8d8def
-MISC ChangeLog 32823 SHA256 f9ab8d06c028e2d4a25703f8a280d3b9a8b922cb59b83049d2395134ac86fc7b SHA512 e2cce7ceabe658bd9b00c8b8e762c6db0da6acc85241cecf5d90fa3d56d1f94044e54cba8bf2b4f4fb0f3b8a301971a3245d0866e5fde214b65752d942471930 WHIRLPOOL dd501274ac56dfac7829fd4e43c53b08f229328e9abff55f41b3f6c518464667ff3ba19396ddec34020b9f1283fdf27e55ae1607da8216332a99b0fd2e07b90a
+EBUILD libav-9999.ebuild 10211 SHA256 c9177bea15c20152b5d296cfbe01cb9cf098215628f7bbc232a07c718ffe5ed0 SHA512 cc42382fcbfbfd0ea56192aa7f76d3acd391637830c7b029252c5f29ba4ebc4ad5ace6a21ee4b9aa421d3b08b2734e3f0fcc4dea956553b027ea719e8d8826f3 WHIRLPOOL 94ff862d44a9a3ca38afc20410a873c91343561e6e0530b858cc93651d20179c8c5dad190f1d620295d8aac82f54a94ccf4f340f6117ce5dcdfb8112d3b3fbeb
+MISC ChangeLog 33013 SHA256 045d3b4092b26928978400f660d55c10958840f24fe34011750592f98f214fbc SHA512 0edfe9024bdf04eacbb9c3f2e8cebdf34f43e4888c63ba680239d0af0ac3e191842f1dbfae6f2a1c768a40a2037ab5f3ca4d8dd2153f9881508ee51df7983bdc WHIRLPOOL ce3faac8d7a25c7bc94220245bbcf2e09de5deef06e05493c4fb16c95879ef7fbc813302312f7abf0b1e8e6801c9f6a4ce9b8701b08e33e6a9d0b76a359af60b
 MISC metadata.xml 3280 SHA256 91988bfa6250520ed3ddd5203b41bb74a022e9ff4c8ab2d6d8592ddf775133d3 SHA512 4079d351459f18a4319c1f0ac423579f25a1f9c780098c30fbd1b95f8974f8efda7edf464d025fae2ee71b41300c506055ff6e48777b8a7f902fd83f5e3545fd WHIRLPOOL b1382e14cad873722ffc9ba436a15eb2cf672a321ed3bdc1e3e5ba4122fa3ba0bfb9930ca38e9982fea757f9c12868917074a478d1aa1d8b49a3bc481ef1e694
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPn3XcACgkQcaHudmEf86qQQACfaqoLqV8OWCLAEduHvHQ/Q62O
-egwAniADf8dODmLaES55BvEg6SOZO5AN
-=jvY2
------END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-0.8.15.ebuild b/media-video/libav/libav-0.8.15.ebuild
new file mode 100644
index 000000000000..cfd3baefead1
--- /dev/null
+++ b/media-video/libav/libav-0.8.15.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.15.ebuild,v 1.1 2014/08/17 12:55:32 lu_zero Exp $
+
+EAPI=5
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://git.libav.org/libav.git"
+	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
+fi
+
+inherit eutils flag-o-matic multilib 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
+
+SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-0.8.2.tar.xz )"
+
+LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
+SLOT="0/0.8"
+[[ ${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="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
+	  custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
+	  +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 +network openssl
+	  oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3
+	  static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
+	  +zlib"
+
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2
+neon ssse3 vis"
+
+for i in ${CPU_FEATURES}; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	bzip2? ( app-arch/bzip2 )
+	cdio? (
+		|| (
+			dev-libs/libcdio-paranoia
+			<dev-libs/libcdio-0.90[-minimal]
+		)
+	)
+	dirac? ( media-video/dirac )
+	encode? (
+		aac? ( media-libs/vo-aacenc )
+		amr? ( media-libs/vo-amrwbenc )
+		faac? ( media-libs/faac )
+		mp3? ( >=media-sound/lame-3.98.3 )
+		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
+		vorbis? ( media-libs/libvorbis media-libs/libogg )
+		x264? ( >=media-libs/x264-0.0.20111017:= )
+		xvid? ( >=media-libs/xvid-1.1.0 )
+	)
+	truetype? ( media-libs/freetype:2 )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.12-r1 )
+	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
+	pulseaudio? ( media-sound/pulseaudio )
+	rtmp? ( >=media-video/rtmpdump-2.2f )
+	ssl? ( openssl? ( dev-libs/openssl )
+		   !openssl? ( net-libs/gnutls ) )
+	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video] )
+	schroedinger? ( media-libs/schroedinger )
+	speex? ( >=media-libs/speex-1.2_beta3 )
+	vaapi? ( x11-libs/libva )
+	vdpau? ( x11-libs/libvdpau )
+	vpx? ( >=media-libs/libvpx-0.9.6 )
+	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
+	zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	dirac? ( virtual/pkgconfig )
+	doc? ( app-text/texi2html )
+	mmx? ( dev-lang/yasm )
+	rtmp? ( virtual/pkgconfig )
+	schroedinger? ( virtual/pkgconfig )
+	truetype? ( virtual/pkgconfig )
+	test? ( net-misc/wget )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+# 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 )
+			  rtmp? ( network )
+			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl )
+			  test? ( encode )"
+
+src_prepare() {
+	# 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
+	epatch "${FILESDIR}/${PN}-0.8.5-support-libcdio-paranoia.patch"
+}
+
+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"
+
+	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
+	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
+	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
+	#done
+	use vdpau || myconf+=" --disable-vdpau"
+
+	use vaapi && myconf+=" --enable-vaapi"
+
+	# Encoders
+	if use encode; then
+		use mp3 && myconf+=" --enable-libmp3lame"
+		use amr && myconf+=" --enable-libvo-amrwbenc"
+		use faac && myconf+=" --enable-libfaac --enable-nonfree"
+		use aac && myconf+=" --enable-libvo-aacenc"
+		uses="theora vorbis x264 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
+	use frei0r && myconf+=" --enable-frei0r"
+	use truetype &&  myconf+=" --enable-libfreetype"
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	use threads && myconf+=" --enable-pthreads"
+
+	# Decoders
+	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
+	uses="gsm dirac 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 && use x86 ; then
+		myconf+=" --disable-mmx --disable-mmx2"
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=" --enable-pic"
+
+	# 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
+		[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
+		myconf+=" --cpu=${i}"
+		break
+	done
+
+	# 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 [[ $(tc-arch) == "x86" ]]; then
+		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
+
+	cd "${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)" \
+		$(use_enable static-libs static) \
+		${myconf} || die
+
+	MAKEOPTS+=" V=1"
+}
+
+src_compile() {
+	emake
+
+	if use qt-faststart; then
+		tc-export CC
+		emake tools/qt-faststart
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-man
+
+	dodoc Changelog README INSTALL doc/*.txt
+	use doc && dodoc doc/*.html
+
+	use qt-faststart && dobin tools/qt-faststart
+
+	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
+		dosym  ${i} /usr/bin/${i/av/ff}
+	done
+}
+
+pkg_postinst() {
+	elog "Please note that the programs formerly known as ffplay, ffserver"
+	elog "and ffprobe are now called avplay, avserver and avprobe."
+	elog
+	elog "ffmpeg had been replaced by the feature incompatible avconv thus"
+	elog "the legacy ffmpeg is provided for compatibility with older scripts"
+	elog "but will be removed in the next version"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/libavcore:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+		emake fate SAMPLES="${WORKDIR}/fate"
+}
diff --git a/media-video/libav/libav-9.16.ebuild b/media-video/libav/libav-9.16.ebuild
new file mode 100644
index 000000000000..349615c3354a
--- /dev/null
+++ b/media-video/libav/libav-9.16.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.16.ebuild,v 1.1 2014/08/17 12:55:32 lu_zero Exp $
+
+EAPI=5
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://git.libav.org/libav.git"
+	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
+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
+
+SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )"
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/9"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${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 +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
+	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 neon ssse3 vis"
+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}]
+		)
+		x264? ( >=media-libs/x264-0.0.20130506:=[${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}] )
+	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}] )
+	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}] )
+	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 )
+	test? ( encode zlib )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+	# 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 x264 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 )
+
+	# 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 multilib_is_native_abi && 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 multilib_is_native_abi && use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README INSTALL
+	dodoc doc/*.txt
+}
+
+multilib_src_test() {
+	echo ${WORKDIR}/fate
+	LD_LIBRARY_PATH="${BUILD_DIR}/libswscale:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavresample:${BUILD_DIR}/libavutil" \
+		emake -j1 fate SAMPLES="${WORKDIR}/fate"
+}
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index c28d75c83684..36b20e97f52c 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.71 2014/08/10 21:00:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.72 2014/08/17 12:55:32 lu_zero Exp $
 
 EAPI=5
 
@@ -305,6 +305,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
 
 	if use tools; then
 		dobin ${TOOLS[@]/#/tools/}
@@ -313,8 +314,6 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	dodoc Changelog README INSTALL
-	dodoc doc/*.txt
-	use doc && dodoc doc/*.html
 }
 
 multilib_src_test() {