Version bump to bugfix releases 0.8.11 and 9.12. Drop some overshadowed versions. Update slot on 10 series.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x8EEE3BE8

11 files changed, 49 insertions, 1270 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 3d77c8ad09f9..1d4758054c14 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,17 @@
 # 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.178 2014/02/20 08:57:24 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.179 2014/03/14 12:26:01 scarabeus Exp $
+
+*libav-9.12 (14 Mar 2014)
+*libav-0.8.11 (14 Mar 2014)
+
+  14 Mar 2014; Tomáš Chvátal <scarabeus@gentoo.org> +libav-0.8.11.ebuild,
+  +libav-9.12.ebuild, -libav-0.8.10.ebuild, -libav-0.8.8.ebuild,
+  -libav-0.8.9.ebuild, -libav-10_alpha1.ebuild, -libav-9.10.ebuild,
+  -libav-9.11.ebuild, libav-10_alpha1-r1.ebuild, libav-10_beta1.ebuild,
+  libav-9999.ebuild:
+  Version bump to bugfix releases 0.8.11 and 9.12. Drop some overshadowed
+  versions. Update slot on 10 series.
 
 *libav-10_beta1 (20 Feb 2014)
 
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index b15f2a0d5114..362fe6a973ab 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,28 +1,43 @@
+-----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.10.tar.xz 3767776 SHA256 4cb640950851361956311d1235b1aa581f670df1f47cd9f6f3928ea63191b56b SHA512 b9fb6f68f8e196311e581495d074a6b4cdf0b7820c2e4300780b9dbf1f760b23ac385ff0a1e114ebc8d6b9f3bc8e7b5ad171cb34470675e29a22db1bf640809e WHIRLPOOL 02488c024cd79e136a99e97b3a911b4340b0bbabac27509dbab4cc1077895f165738cfa0c3f0518cb662343966964bd39fe7d1bbd6bfed4146449c0918d71860
+DIST libav-0.8.11.tar.xz 3768252 SHA256 5934e4f0dbf6e0fc4987de86cdd079f1d11a1410ae275e9f46472af17f05155a SHA512 b469cacc57949dae60f12fa5bf21fcb5ca8c724deed7327c2e7a516f97a127eb05e4557ef659da28ae184b6b8e2ee1d93ee70151adf64b0fe345b054bf231b37 WHIRLPOOL 735c36eb60656e4fcc00accc4c8aa3fa9489a066f3f6a9940101e92e3d380c7ee9dde06b76ba464ff7e9671cef74ef790c3bf5618accdb58d051610cec4d33b7
 DIST libav-0.8.7.tar.xz 3763180 SHA256 8be6cbee4066ea031110d0f1cf8f9fecda8bc36d868aafdc7e0d34b59e6d5f3d SHA512 34b23bc61b4755b7d9aa078b77571641a167da0fb356c549ee48fa61fcedd4e9dcd7965ac65487606ef18edb3512f08a565de901f1927f11a18c1864da4ec83a WHIRLPOOL 3896adac36dc789a74e3839061e466f6277d225ecc13e9f6f96953b353fe6e15cd76b0464704240eb97c4c0fec230b21d7e4aa684869e367bb489ddee938bada
-DIST libav-0.8.8.tar.xz 3762556 SHA256 e95cf618eb6239177a62c46f15e840c37e02e8308baf94912fc5910ff4aacbf2 SHA512 6164310abfef3d7d921374f038cec7933c929ba7a628dd087e9ba3be416ecdade973ee0ef304e580488ecf5594819a1168bc31ef0fc26baff6018adf10187ca5 WHIRLPOOL f713ee72dbf38f62f5515dd19fad3e5c7a50f096c047144c0492cd092cf521301707c006d4ce7aff442840cb5bf2ee66ddadfdb098b019851181d3b13c0e102a
 DIST libav-0.8.9.tar.xz 3765764 SHA256 4f5181164e4007d5b0013bb3cc5e3b7393ab71ac286319c714b7697e2784f77f SHA512 92dccdad6d2c2c5d2e9493ce4fc866ac1f12aa010ab29339cc057bad15b8ac553969b028c75c531037bb52d90fe5acbfd21c79a7c56d2932e576ef80a199fd03 WHIRLPOOL 319d2f6655014b8a24e65b46ad92ee84de5f1461ba0dd39ccd10e4940d817817bbcaff28024eb0b1be761cb4310dfd7bfe095bfbb4ce479fc4c86ce4baecc106
 DIST libav-10_alpha1.tar.xz 4559072 SHA256 9253dcff6ccccb43477ab0181ea670b1c29e41842edb7c2bdedfc510533115b6 SHA512 a13d5260ffcf21607b23e682401aafb893a79a3bd39fd5aba73d3f7a790640e80932e189a983a0102481a1dbcd3c1e1011bd335bcd0fbd6df883d93449a5156b WHIRLPOOL 7fbf518c6a2738faf5500f18a776d8ba866f263b92b188e7e76aac9639a6014382f6303d47b4252be6a5b900a3634895bef8ee2d8e01bdf3ab3a5db6932bb220
 DIST libav-10_beta1.tar.xz 4635736 SHA256 8180f499ea4f3f350dcdd9ab4bbb16d2a3b8744a582736aff9abfbf4636e3806 SHA512 c2a33b1134d701ed9e3f72ab19865373f6bb7371a93d7ae26410d0dc740c8cf872190ec54f67435c95211cc1edf42d42d0396405f6620e0b4646ac872ee4dc56 WHIRLPOOL 3f2900fd511e333bd70d146054fc0f4c9f4d51a0d6bf17eb38259c39329a0834b7cd76dcb3d0455b4cd54cee0dd913f11250a72ea28a6757f60139315d46b97b
 DIST libav-9.10.tar.xz 4074176 SHA256 83dbe640779da1c1e8d8836c99575f57f749d18407494ebca451578afee9300d SHA512 ba43d999237bd656169e320df87827d08444297010b3448dfa20eaa47d51b8736f8cd7c650a3327f4c68c34b06813700afabb3f68e2f799004ddfa5556fc3561 WHIRLPOOL 6fbd67a024e723d93208c42f3b4f1f85bb7b2e9532c15952a076b82cb1be0c17870da87cb6a83b9d83d3874280158b8e60eccd7dcc4927c389a8241ccde0582d
-DIST libav-9.11.tar.xz 4075860 SHA256 433110e89a581715317cf0de85a0998f4afd2cf8ce04f6ace10d7170bbdfa7a9 SHA512 9aedac420196b7ed21fff6469dab7177fdf58e5b5d4f9325473969e13c77e65f4cbb79bdb6349b479c2c3befec746f82089793e95a3c59f25817d6e8cc794499 WHIRLPOOL 54b8919209fcb3b860b00c93464d2036af1fbd3fc6ad50b419916722a9b84c3cbdefe5e2d9d6a4dcc1995f6556a2240aa2d26d88dedbf800fa8236f6c4999a55
-EBUILD libav-0.8.10.ebuild 9177 SHA256 7b7dc8e668eaad3ce7f58dd380a47d3ed769d0c6cfdc2b8cfbfac164b2124543 SHA512 a4f6ff90412dcff1e27a4dc02bd588fbcabf370eea586ad54fce3fba9713ceaaccbed00b57a205d2a879484e963efa0c854ef1fe261a8e0934721195f4e8a07f WHIRLPOOL 9f3f942d229a93fb2a2f28df5aef7662676abee413516e6352dbef3baf5aacb118a6aa10c98fa7912aa21545fc9473c1eea5a5259ecdf1920d1931ed8a3a2b95
+DIST libav-9.12.tar.xz 4074572 SHA256 60fef8947d375579211635b13fc8bc79c6bb760d074a523c1ae1062682b3a0f2 SHA512 71f2d38885860bc48f961a42cc74ae11807dc0c869c7ba8c22388d47de7d62f69e6e49cd18b4591c0a62d1da84bdba8d4cd08bc7cf498117ac48c7263190a1cd WHIRLPOOL 1a8652e3e4603b845111897da48c01709426a1c227c47dd2429b766e99a7ae86d008d6434db9a1b1538984271682dd2783a5a805a042e23efcf282b0901114bb
+EBUILD libav-0.8.11.ebuild 9179 SHA256 10c9137aced421c6a291e47e80fc238ac108638e269f6b0d10fcce4135b861c9 SHA512 0f61a91bbd4f178de3761be50a6af7f402bde4f8fc662911c3fde79d91551f03756e8fa932bc265d556aa84374f54f6d4a3b55a69017d2571da1ccc512688ad6 WHIRLPOOL 5f5cc486b56d8ce0dc33ca3648db2b1fefffa6279d4bdac418aa15f8e74b20012088c54baca1dac052e178698c225cc3a2bb84bae62e42b4fd1868d8050cd03c
 EBUILD libav-0.8.7.ebuild 9168 SHA256 58b259056ccf271211dd136d3ae7077672b8c24f4ff1e4531ccbce32a97ebea6 SHA512 668fa6a10ab9db53749246a1ade7ad92e0c7c8c3acbb4dcde35cf9d1f56750eaa6810c584021e8c2f412146df8700c77389787c058be01a884b167c2951acd2c WHIRLPOOL f8732807af38d35123709a1c61690104b7654f96efcc057d3524ac52af5dbb0a4d5ad2ef45eecd890c5de8bbbae92f8047c5a37696ed250f94bc770dab740516
-EBUILD libav-0.8.8.ebuild 9178 SHA256 53730d20f61e9d7cd77a72126a65b6745f2685596593be49836aa4a5ec1ddd82 SHA512 365e8aa0d28e6a5fe88341c90286b3acdf21ce8575ac5d6d5a62a16cd3fefcfe2112416533bfe4cd6a7417c2862341aa7fe62b7346ea122668f1234e1c0fdfcb WHIRLPOOL 37138705b0f4add4a29e4b2bc2e28e2aaad73c4329542d35974febde08cfb3759a60d05608a6d7d395545c04bdc28f2f3d17cdd2b27f096895817016fbd04e83
 EBUILD libav-0.8.9-r1.ebuild 10311 SHA256 c898ef539f9bc77108e6c8337df1c1cbb06737cd2952d33273271e6919c3d91e SHA512 16ce58363a6f4dc05dca28bcfb2a34d9bc2b08ab76f37c971737a75cd1db0d3d390efc4167478ba1cce1573099ebad7ea34aae7dfc618075e032f22f1dc20a51 WHIRLPOOL af425db7125cd45c0fca71582c33d3c87b1a3c523c61da51d2b4c1621b9fc58ce8ebff5681fb3191c0430672108fbfcf3cf7ee6ff02aa873d229b611da5d5d09
-EBUILD libav-0.8.9.ebuild 9176 SHA256 6f685b0e8d2119e441942a6fcc1a04c4d7a18a0ae4ace60f69bf9947e8194399 SHA512 2c88f238b1c8fc46c769fc0b09c1902d41311355faaf67855e7fe6df163f8dbc14d3e858396763eca83665900e59852506d0c7ae2dff970c8c8d268ae67c50c2 WHIRLPOOL 93a7fc711c8b06c25d9bfc1b83e63d2dc11ee90fb8c4ac04a9298cc3f459371696c4d20fcb7a8b2d5f8e40af17a981e3d39bfe0aaf2b90faad71bbae7f21e3b5
 EBUILD libav-0.8.9999.ebuild 9177 SHA256 b1d7a8c2404d3d6470aaafdf1326690dd3434c9ce6f02ccd1d0d5bccea429f27 SHA512 1f121daf174be6f1d97eb6cebd80faf11018514be19232c491fa5bcb0bd108668bcb23c3e14e6a49474fcc406a8a36a942214377c4cd8f24c52a7c4f7bf68522 WHIRLPOOL e483bff65b252eb1b47869d478328eb611cbb4a8ec0a0086118bc0134b920d7ae9d8566eb63390e0588cdb8cac7f1405b4a61a2f822e5b5216f1068a1fc1d2bb
-EBUILD libav-10_alpha1-r1.ebuild 9604 SHA256 5ab28023c771f42a24fcd90b4e9c0e69daffe1c2963f03ba236b2c34c2fe12d4 SHA512 a69a93f1c02581e8b8936ee330510366c3856c252de1fade6231a6555c1dea1ee8f93e48be345b030110b83d501e91965892445354cef853d41f5fac9fa04d45 WHIRLPOOL 344efc863d534767c9ebd165949d5f3efc7d350d2fbbb2e260da7e7e2ee8c58cf7bd3a81c4a5806f9517b31b6be6da769864628a639ff6da932d6bfb3215e1b4
-EBUILD libav-10_alpha1.ebuild 8379 SHA256 0c0fb4224ea63649d3ebfc2a33c3342dab61096ef47d0005b557c815a42f74e6 SHA512 3be8783e0612bd4bcf9a31c190a1a17d5d531f4de839e786128c4f384788a9adc29be2c70b0663a394e474f1012971c4d146e9ab9c9768bc2bc20d26d8e794b0 WHIRLPOOL 1e8f5e086c49a5c96104ad4a408c7c04300ce6f3ec571f9e513a11c6a6330b6159fe2d14f10aabc42c6b0d1def194254b454fa3cd7c27c5c4f32870d7a0ebd00
-EBUILD libav-10_beta1.ebuild 8378 SHA256 8a2bc1ef25fb9d6fdbe762096677dd25e91887377e944c53c6632d3379f642c4 SHA512 4873a2880e6c1fc8d23ad6cc7a072f8b58d4bbc238584a68b463c276a8c81d96a3379f0502a245be257d31c3334a83cb923132aa16302116de045807bba5cf72 WHIRLPOOL 6e3489be0ae0cab61ec997b4c1da3b56e0c61948610c5154591e207eeb8266db79e1c6e92e6fee27150d1bd1f0ca4593b727590ad378f534d707efc011f4bf1d
+EBUILD libav-10_alpha1-r1.ebuild 9611 SHA256 53fca78d9848b3087ffc724b86b5fe3bb0d6684fbe9d6dd5aaddcca160beb198 SHA512 03a7cad9fef7555c017cd758a118759f8d975ea29cf47836d7a6b71df9fee1ada56b2c03cece6fcbc3a00b1f0f953ebb8415559f9636088f758fb5152bbfe54f WHIRLPOOL 473c1600a99d0455bdf56142cdeeeef78130bdcee7303e4ec5cada684f6ddec8bb680e6535c3b22e9aaee8bfcc6f87b8df11d677e11c4744e81547e1071c71ab
+EBUILD libav-10_beta1.ebuild 8381 SHA256 8e88c77d809d76b2556df8d4b9b613fb112552b85d83affd7bd878153565f5ca SHA512 60ebddd8c5db87749518b91d239ad79bdd78415aa178e781e43bdb2f3557beba003dfeb357069859983d68bfb5700ee8e227cb878bca63731b990ed1d71fa357 WHIRLPOOL 99be6972ff373540b5ab0c5377531e2c52bd76c9484de390f5f202aec23b60baa57d110413ce1108fd4905c3d4855efc1fad9fb5c5c03088f854c213a8c920d7
 EBUILD libav-9.10-r1.ebuild 9650 SHA256 f3c4aebd03a20f8ab2b08d37f49a41dee1e02a785bcb05099e4f20f5f9a3e9f4 SHA512 3c46cdc733082dbcea72cd7b2d27c04631814163dae8c22a8773e16d48d54104125e6ee9377f7e4f8eea97bd6a6ebf288b913e3b1f38acb497244f37df37a146 WHIRLPOOL d22f13662bcf8988d44dbabe67949158681fba1d2374da19662303639e86abbc90d871254dbd9511352b91702f0fc23345f58d992b95f727c9e054e8f2249edc
-EBUILD libav-9.10.ebuild 8506 SHA256 bd357a6da5d94ddb14f04ef1c0010afaab257360b86a6568da41912196800a23 SHA512 851ab77b93229ba56aff529c5e2c17c9ecd6752ecc73bf0b206504997ab72e54580e363b2359b5c826b670fc07150e6af95c78fc4a0f324dbcba957da986aca4 WHIRLPOOL 04a0191df2adfe69401dad1a1bb77d866f93678ff12e24a9865d4fc60a16b9ab01dc8fba2cea122463f4f88ddeb017a7c2315fff938cc9f420a0855d93bc3cdb
-EBUILD libav-9.11.ebuild 8504 SHA256 c17a9a94ff505ac7f879d358dc7ef97d7e49c2eaf402359b199cdca0f1bc6cab SHA512 41e7cbac37346f59985c44a918a62597bd4fe67c24809256649ab150d24888063a1b7995c096e49dd62ed45b67bdf29d596b6d08f7a0928d0a065c2c2b77d195 WHIRLPOOL c72575909ac73bcb557a280af8a284e689b5616cd422ee570273e921e43b91fd3950e4f681b8332b80c5e564c0b7b9a14a8bcb90b748576af071a06a466e8f36
+EBUILD libav-9.12.ebuild 8506 SHA256 cb3086b848060a5e256470cf64c283329f0eeaf925f0d5f21604a77f73bab517 SHA512 97947b1dbb68eb0a1c6336a39a065032b98978f66f093cfa576e0895e6cf72e40ad14bc94e7fdf12c5b002db04752faf1de4d88ae229ec5773a3a90d15da4abd WHIRLPOOL cc0df519092eef30611809e15256a88f0f2b64779446d9c5b5b526d58f543d88b99bfea2fa87956b23c8ffb9ab4e104eebbbb7ebdc7d34350ddd758653455447
 EBUILD libav-9.9999.ebuild 8507 SHA256 ff306a60436ff6b98217b10d1a8065e57997e7ea4c10423b1440a0414e3bc24b SHA512 f8cf2aed28891d4dc22fd58f0a869b94a7b85690ef150db4ee14e7d824c00458d3b7d48e51e2e5b6eb9894cef29336f20dead25d67c7066f8d1d00f8071a51d4 WHIRLPOOL 471c6fdaf9b5708819ba6383b014d78814d2f1baad10e9b4f0fbaaf68c2069e0ead8bdb10a0ead8f414025c934d8791c4a8affb11138dcfd301885dee47fcc20
-EBUILD libav-9999.ebuild 8384 SHA256 937f1291701e272b2cfb903e608a7d72bedecf4b1fb4bc9895de322f2e8a6150 SHA512 21f8ceed1b8a2f224f10e91b3bff04dad7633c7889c475f47f4da874763e647a496383d73afdeb0edde0f9ef048aa856345100596bbbd94c82cdfe74c27c13a9 WHIRLPOOL 7df52ad4ec21108e344f72e7aec65db6806d0b5bb5356ca3ef0251c6e5ae513b8b38645f1c1c90e2ebdfd333deccc9fd21133aa14ce7b79bf37a07ff7ae34478
-MISC ChangeLog 26543 SHA256 c786f772e1b83206c94dc9651a25b6ea4a250b619f793756eb0f53ded8c2ef35 SHA512 406565813a4600904dbfcd14989a92cd4a7ae838762b327faba4edcba53f351ffd8bed3e05b6e2466b2e310da55220b87ef8c1a68ff9674b8962a353f575c90e WHIRLPOOL 213f26acae5fef53c1dcb0d2b10e4f92c8738f7da55b13b8d80a489d8f6a6345105ff5667c34f4d83f7e67f38a0dfc266430385e13c0e191a1dfa9b9583e2090
+EBUILD libav-9999.ebuild 8386 SHA256 74539b0975500d829418eed4d52ade674498969b78a3f69d0df4470e1eecbdaa SHA512 3b763f090d04e77dfe4a5969ed7baf4a427b03a71f3270aa75f3fe83503d7a28156f61112b71674559aaca2eb579540af3baf9a79f597277b6c97f1428125a34 WHIRLPOOL 47bd43ea3ffe139dd0b524b90340d1152cae8aa1f6b1efded35bce20872614337896c8ce3a995262e59795d9966f1d04cf822bfd2ab080e162f7529387548f27
+MISC ChangeLog 27016 SHA256 af3c23a596f8130da25338c89360f39de6e9a542dbf18fa7b4523808533caad6 SHA512 f79fdd58ab4296c1308c6ad96dc9131f76f7968c23a8af57bb9c34bc1af634d7e3e818d2fb5848aa4acdc9e6206fe23d0d3ea27a513c67c1769d9a41903eef66 WHIRLPOOL a3ae9a3eec2a65bee7364cc8f0f09dffc3bbaa075948f7419192523c5cf88ef8ca19423597e4acc8640713e3c868a9f5df4bf7627bf35eb9f2523bc2098ad1da
 MISC metadata.xml 3106 SHA256 968ffe2f92f6e2ae9963fe0005e78fc205ebca769d48eedd578472cef8c8cfcc SHA512 f10f99a54e1806b17d0923429c2df151e470edceefd854e63c0411b2be6fbbaf829e441dd318ff0e87d5f2d6985c52673646c20c971fba9c0d44d67edc3bb5c8 WHIRLPOOL 9004c95991227752427cf62491949845931683a9a45a7a555b98b1bf92cf7d2efad0e2c912b4a069e58e31f41062d0025b8e3a082e0cc37c5d13484969058a47
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJTIvVfAAoJEOSiRoyO7jvobrEP/1HYJysQ1jLdNP3o9Pi26bCq
++AUV2Bf/HGPNtc9Lm4GMGFUvtRL3krFFoMqUTQIH6ekj91ZncCwqDqfvv5iF5JR1
+rEXf+zReoZZHP+zbAP9ENKWSmafTeKFDNp27cpPrYb3llsZ8RuS8X38pEEpB8BYo
++2OxR1mUw60o95cNJjnWyxbI8a1ix4nIV+A+XOwQZ6paz3/NQSElAOxx9vVUdNud
+ao4Y5jPAvy2UaoamDBSUasAWRMTwSlwzcPPahFuTgCEiNVZ3O8KXw1hMxA4qmYKy
+ScNady7XfYwySNJpxGsIQfEO3sSzLrlUzqwg58wG7SjO0vPS1zwioXdkd4Ce/++b
+rkNf81BvFsR+k2KUf9q4Q3VfVWk/suWGd7FdPNzIvIXi884DiqwsDO2uNns6Zf/I
+gFcj+IZ0kaYYGEMiYm7KtG32F30qCrAeyMsgEgsPli2Aq8255Du6gCc5HzDTWZ8L
+Uef0PitFZudYUDz0cb14SW70Bly9pSW6KvMC/p4KFDT/P+XUG+vw27EKMdd29/vn
+sXFiRAUPv6gFhXt+fssLXUqpsEprYrXTKmUwVPA6KoTSm5QG9QVpyWF/mfDzggBC
+P9PKhdut9jNOuVsUWOdJWKGG9k4sl3kjS4nyrAN32xjyTVl5j4AQjnzxG1Cai3kx
+b3SRDL70b/6xSwqqbPHZ
+=gZ8h
+-----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-0.8.10.ebuild b/media-video/libav/libav-0.8.11.ebuild
index ed3841c063ff..c2ab5a688bc3 100644
--- a/media-video/libav/libav-0.8.10.ebuild
+++ b/media-video/libav/libav-0.8.11.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-0.8.10.ebuild,v 1.1 2014/02/09 22:07:01 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.11.ebuild,v 1.1 2014/03/14 12:26:01 scarabeus Exp $
 
 EAPI=5
 
diff --git a/media-video/libav/libav-0.8.8.ebuild b/media-video/libav/libav-0.8.8.ebuild
deleted file mode 100644
index e3ed0ef4bd47..000000000000
--- a/media-video/libav/libav-0.8.8.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.8.ebuild,v 1.1 2013/11/02 10:52:37 scarabeus 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[audio,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-0.8.9.ebuild b/media-video/libav/libav-0.8.9.ebuild
deleted file mode 100644
index 5eeef7ba325f..000000000000
--- a/media-video/libav/libav-0.8.9.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9.ebuild,v 1.1 2013/11/03 14:56:42 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[audio,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-10_alpha1-r1.ebuild b/media-video/libav/libav-10_alpha1-r1.ebuild
index d0ed5ee0dc9d..0f8be2228ae2 100644
--- a/media-video/libav/libav-10_alpha1-r1.ebuild
+++ b/media-video/libav/libav-10_alpha1-r1.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-10_alpha1-r1.ebuild,v 1.1 2014/01/29 18:35:18 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10_alpha1-r1.ebuild,v 1.2 2014/03/14 12:26:01 scarabeus Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ fi
 SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-10.tar.xz )"
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/9"
+SLOT="0/10"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == *9999 ]] || \
diff --git a/media-video/libav/libav-10_alpha1.ebuild b/media-video/libav/libav-10_alpha1.ebuild
deleted file mode 100644
index 532a7fa58758..000000000000
--- a/media-video/libav/libav-10_alpha1.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10_alpha1.ebuild,v 1.3 2013/12/20 02:43:08 patrick 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-10.tar.xz )"
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/9"
-[[ ${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
-
-TOOLS="aviocat graph2dot ismindex pktdumper qt-faststart trasher"
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	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]
-		)
-	)
-	encode? (
-		aac? ( media-libs/vo-aacenc )
-		amr? ( media-libs/vo-amrwbenc )
-		faac? ( media-libs/faac )
-		fdk? ( media-libs/fdk-aac )
-		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 )
-	)
-	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 )
-	opus? ( media-libs/opus )
-	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[audio,video] )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	truetype? ( media-libs/freetype:2 )
-	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
-	doc? ( app-text/texi2html )
-	ieee1394? ( virtual/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig )
-	schroedinger? ( virtual/pkgconfig )
-	ssl? ( virtual/pkgconfig )
-	test? ( sys-devel/bc )
-	truetype? ( virtual/pkgconfig )
-	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 !fdk )
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl )
-	test? ( encode zlib )
-"
-
-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
-}
-
-src_configure() {
-	local myconf="${EXTRA_LIBAV_CONF}"
-	local uses i
-
-	use zlib && TOOLS+=" cws2fws"
-
-	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
-	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 && use 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 [[ $(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)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-
-	MAKEOPTS+=" V=1"
-}
-
-src_compile() {
-	local i
-
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		for i in ${TOOLS}; do
-			emake tools/${i}
-		done
-	fi
-}
-
-src_install() {
-	local i
-
-	emake DESTDIR="${D}" install install-man
-
-	dodoc Changelog README INSTALL
-	dodoc doc/*.txt
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		for i in ${TOOLS}; do
-			dobin tools/${i}
-		done
-	fi
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/libavcore:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-		emake -j1 fate
-}
diff --git a/media-video/libav/libav-10_beta1.ebuild b/media-video/libav/libav-10_beta1.ebuild
index 9f660cb29a08..2d5ac0e17470 100644
--- a/media-video/libav/libav-10_beta1.ebuild
+++ b/media-video/libav/libav-10_beta1.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-10_beta1.ebuild,v 1.1 2014/02/20 08:57:24 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10_beta1.ebuild,v 1.2 2014/03/14 12:26:01 scarabeus Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ fi
 SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-10.tar.xz )"
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/9"
+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"
diff --git a/media-video/libav/libav-9.10.ebuild b/media-video/libav/libav-9.10.ebuild
deleted file mode 100644
index ebf0e09f4310..000000000000
--- a/media-video/libav/libav-9.10.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.10.ebuild,v 1.1 2013/10/16 17:38:03 scarabeus 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-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
-
-TOOLS="aviocat graph2dot ismindex pktdumper qt-faststart trasher"
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	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]
-		)
-	)
-	encode? (
-		aac? ( media-libs/vo-aacenc )
-		amr? ( media-libs/vo-amrwbenc )
-		faac? ( media-libs/faac )
-		fdk? ( media-libs/fdk-aac )
-		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 )
-	)
-	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 )
-	opus? ( media-libs/opus )
-	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[audio,video] )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	truetype? ( media-libs/freetype:2 )
-	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
-	doc? ( app-text/texi2html )
-	ieee1394? ( virtual/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig )
-	schroedinger? ( virtual/pkgconfig )
-	ssl? ( virtual/pkgconfig )
-	test? ( sys-devel/bc )
-	truetype? ( virtual/pkgconfig )
-	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 !fdk )
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl )
-	test? ( encode zlib )
-"
-
-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
-}
-
-src_configure() {
-	local myconf="${EXTRA_LIBAV_CONF}"
-	local uses i
-
-	use zlib && TOOLS+=" cws2fws"
-
-	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
-	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 && use 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 [[ $(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)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		${myconf} || die
-
-	MAKEOPTS+=" V=1"
-}
-
-src_compile() {
-	local i
-
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		for i in ${TOOLS}; do
-			emake tools/${i}
-		done
-	fi
-}
-
-src_install() {
-	local i
-
-	emake DESTDIR="${D}" install install-man
-
-	dodoc Changelog README INSTALL
-	dodoc doc/*.txt
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		for i in ${TOOLS}; do
-			dobin tools/${i}
-		done
-	fi
-}
-
-src_test() {
-	echo ${WORKDIR}/fate
-	LD_LIBRARY_PATH="${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavresample:${S}/libavutil" \
-		emake -j1 fate SAMPLES="${WORKDIR}/fate"
-}
diff --git a/media-video/libav/libav-9.11.ebuild b/media-video/libav/libav-9.12.ebuild
index 7ee8cc5cea5b..710c32a7bba4 100644
--- a/media-video/libav/libav-9.11.ebuild
+++ b/media-video/libav/libav-9.12.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-9.11.ebuild,v 1.1 2014/02/09 22:07:01 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.12.ebuild,v 1.1 2014/03/14 12:26:01 scarabeus Exp $
 
 EAPI=5
 
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index a2725dd6149d..7c72cc19d77e 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.62 2013/08/11 23:17:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.63 2014/03/14 12:26:01 scarabeus Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ else # Official release
 fi
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/9"
+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"