Cleanup: merge back into single SLOT; remove old versions; move patch files for new version in tarball; avoid using -g0/-w; respect CC/CXX; use pkg_pretend; make sure that there is enough space if building apidocs; fix bug #426692; fix bug #426594; fix bug #426576; make bug #409673 obsolete; add debug USE flag (instead of checking for -g); avoid messing with jobs.

Package-Manager: portage-2.2.0_alpha117/cvs/Linux x86_64
author: Diego Elio Pettenò <flameeyes@gentoo.org> 2012-07-16 00:53:16 +0000
committer: Diego Elio Pettenò <flameeyes@gentoo.org> 2012-07-16 00:53:16 +0000
commit: cb350fbecbabb7d4b508f5705c4d1565f275e119 (patch)
tree: 94289b337c40ad1e8fff60724fb32a898dc66811 /media-gfx/blender
parent: Version bump with patches from upstream. Attempted to cleanup the ebuild and ... (diff)
download: historical-cb350fbecbabb7d4b508f5705c4d1565f275e119.tar.gz
historical-cb350fbecbabb7d4b508f5705c4d1565f275e119.tar.bz2
historical-cb350fbecbabb7d4b508f5705c4d1565f275e119.zip
47 files changed, 132 insertions, 5045 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 8203ef2f10c4..4107fd8646f0 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.227 2012/07/13 23:56:11 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.228 2012/07/16 00:53:16 flameeyes Exp $
+
+*blender-2.63a-r1 (16 Jul 2012)
+
+  16 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> +blender-2.63a-r1.ebuild,
+  -blender-2.48a-r3.ebuild, -blender-2.49a.ebuild, -blender-2.57-r1.ebuild,
+  -blender-2.60a.ebuild, -blender-2.63a.ebuild,
+  -files/blender-2.46-cve-2008-1103-1.patch, -files/blender-2.46-ffmpeg.patch,
+  -files/blender-2.48-ffmpeg-20081014.patch, -files/blender-2.49a-bake.patch,
+  -files/blender-2.49b-CVE-2009-3850-v3.patch,
+  -files/blender-2.57-CVE-2009-3850-v1.patch,
+  -files/blender-2.57-CVE-2009-3850-v2.patch, -files/blender-2.57-bmake.patch,
+  -files/blender-2.57-desktop.patch, -files/blender-2.57-doxygen.patch,
+  -files/blender-2.57-eigen.patch, -files/blender-2.57-enable_site_module.patch,
+  -files/blender-2.57-glew.patch, -files/blender-2.57-insecure.desktop,
+  -files/blender-2.57-libav-0.7.patch, -files/blender-2.57-linux-3.patch,
+  -files/blender-2.60-bmake.patch, -files/blender-2.60-doxyfile.patch,
+  -files/blender-2.60-eigen.patch, -files/blender-2.60-glew.patch,
+  -files/blender-2.60-openjpeg.patch,
+  -files/blender-2.60a-CVE-2009-3850-v3.patch,
+  -files/blender-2.60a-collada.patch, -files/blender-2.60a-desktop.patch,
+  -files/blender-2.60a-enable_site_module.patch,
+  -files/blender-2.60a-insecure.desktop, -files/blender-2.60a-libav-0.7.patch,
+  -files/blender-2.60a-linux-3.patch,
+  -files/blender-2.61-opencollada-debug.patch,
+  -files/blender-2.63-CVE-2009-3850-v5.patch,
+  -files/blender-2.63-doxyfile.patch,
+  -files/blender-2.63-enable_site_module.patch, -files/blender-2.63-glew.patch,
+  -files/blender-2.63-opencollada-debug.patch,
+  -files/blender-2.63a-bullet.patch, -files/blender-2.63a-colamd.patch,
+  -files/blender-2.63a-desktop.patch, -files/blender-2.63a-eigen.patch,
+  -files/blender-2.63a-insecure.desktop, -files/blender-2.63a-libav-0.8.patch:
+  Cleanup: merge back into single SLOT; remove old versions; move patch files
+  for new version in tarball; avoid using -g0/-w; respect CC/CXX; use
+  pkg_pretend; make sure that there is enough space if building apidocs; fix bug
+  #426692; fix bug #426594; fix bug #426576; make bug #409673 obsolete; add
+  debug USE flag (instead of checking for -g); avoid messing with jobs.
 
 *blender-2.63a (13 Jul 2012)
 
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index d447c81265e6..cab3d7ff035a 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -3,72 +3,28 @@ Hash: SHA256
 
 AUX blender-2.37-dirs.patch 727 SHA256 beb5e5835cde71a00712ddf600278ca0bbdb6020123faeb6ea7a53e8f6812e5e SHA512 1917da0d774082e22d1ed82803708b1aa32a3372fb35d14852198d49eada82a5f3755b3e6249ba2c17546e766f0e15a472e9d599718173e3c5ae85ef8c52ec82 WHIRLPOOL b2b23f455239ddbb29fc531e2533877d98ffd9d1d72cdb645ac25455cff15dd8afb2e307bbd5e5e9283b7f7e00dc20a4addf3ead295ca12fc9c22d9f3fbda720
 AUX blender-2.44-scriptsdir.patch 2586 SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4 SHA512 d41e9acca544d35d6e193905443ae7a3c242e8fcd19a50cd23696369036a5682a92bc250c2728859d6215087633ea8eb1d86f21b72d35e4678f4d32249bd3066 WHIRLPOOL 5431e5db75a276b6d4b4c811c8d0f9b8c740b86c8869b669808f5c7b4d9a67c11f2743c603e0ae532f5798aae2cd2fe7b9e8ea70c5a6faf28d90518dfc054aa5
-AUX blender-2.46-cve-2008-1103-1.patch 636 SHA256 a0dd64fb749a9577d84e22896872dc2956a8530700308d0aadad588191356b96 SHA512 0eda18756b9622c043c4995c085b5d19ad4cb500bc859dbc66ff349267bf0c48538cc01637942cc5cf20819fd99d0c8fa557af71ec7f029c92ae3e847d626548 WHIRLPOOL 78cdd41739ec0021ec23ffd2cbcc27faa8ef74c189e669fa9e29827598e8c7a7055e31e67f01e6cccd5aa44d44de14f282de7136e882390092c7b637134a2ba8
-AUX blender-2.46-ffmpeg.patch 3823 SHA256 ad75babcc08ae41f2a7c71bc457bd56a0ef39b5ae1e92ede2cdb0a34d7cbcc85 SHA512 e0fa835a47d89f9cbb7f61d02640cb7f30d5dfdbc7ae4480b58d19904e848032502562536bdf053f2b8024de5ca64dd16a1033633300f62553424fedebb5a68d WHIRLPOOL 7809e79f2c670e4cfef26db7204720f0bb932eb4378dda08d6bc09d52fec25793cde70db2c63a94c2b53daf1f6aa5bebee1b534537d4718d3dbab13d48233e60
-AUX blender-2.48-ffmpeg-20081014.patch 839 SHA256 d6114d2647758e39608fcfdb05da00811f062ea3fc4c41cef3a6e2977bc5b0c4 SHA512 b37a393a132b137a8aaaab268a06e2203f6f12b9c0c69f7fa92f2bc2b26e43ae06e56ac093b4bf2ecd86b8c64637471985b1d6b1cef2e06ae6d6835312581c18 WHIRLPOOL 03d6e81381db09e19ee963bb8d13752fea9fa1df6f86297ae7def15faf3629fb2df242494a14c902a91444597ede302250f65eb099817ec7cb9909bd162184c9
 AUX blender-2.48a-CVE-2008-4863.patch 696 SHA256 fee1896c791a623181ebf681f4ad67c610677e82575a95a46e896b747f980418 SHA512 9b466f00e548f135fd5013dc5b756556c7f4a2288916822110639c5a1cb8932b6f828edaf4731414670b415649cb06131fd9b488f82aae5ed8ecd40f8eb4ff1b WHIRLPOOL bcdd881c60ebd6325e0461cd9ee6f00f9bceb0fd34252e1819b166bce08105c2e0fce205ce272e9a26897ebf34f60a7f742d94b3dcb50a1698b27d408ac32ee2
-AUX blender-2.49a-bake.patch 669 SHA256 dcaaaba19ad57b6d054df830dfa303c4656303622e1e7ef15817d304958d8f3c SHA512 1670feb04854587826d431e66d6f92e63bc49445ac2f3648f2513c3b7403469028e76d90f0958f276ffcf76df0abe50badeedc428481097c149715886fba4e35 WHIRLPOOL 82be10f3ff0499e44155a805be919a915c59998a15e3d6524feb22b255a73708e6165f89df4a6c0d4a3f1a47a7a61364384a61ee16a316549eedb7c043884c4c
 AUX blender-2.49a-sys-openjpeg.patch 452 SHA256 437f016b9f7c48281015838a22203c4db9ef6b62dac01aa86faa1c9793bff182 SHA512 ae30c35622908bf633af7f0491af716ed838a830214e7b6f9c6c014187984673e43de19c0d96a1395aa7902813fee2cdab209615f5210fbd70aff7a8a31370b4 WHIRLPOOL ab4b50c5a35d6d9e1d01f28000f349e5c452592aecc5e8d3194d04456abf4be2f32b13dffb7d1e325e0bdf1ff4ac8238c609c19a1b017c729c5bd1c9da193f49
-AUX blender-2.49b-CVE-2009-3850-v3.patch 3891 SHA256 5dc289f00ab59b13b7f1d3e8b4a77b8c9930460f8ee575b38a60da3577e2b1ba SHA512 586da7b9d5f44255a39f8724884df1037a26b7d7b866313edd6330031aa3d87e1f26417783e01d4be80a291110f88fcbb3e207636d2323cbc2df0c9bda4de805 WHIRLPOOL f916110fa1059609fc0a4f97fb0d9d46fa8e1f369866e37bd4a9e7967162f1979cf9205d7f8a433118405ec1eb9af4c2d506320e4739033765f18d3dd17ce1fb
 AUX blender-2.49b-CVE-2009-3850-v4.patch 5222 SHA256 0707904cd3b627cfeac19d4d775ee4a019ba395251c9318dbb356e3b8de19124 SHA512 83d639ab73c579dd7e202139696b9a9dd12cc1824218d04c5259dbb73fbc8b73dcc72d2a8032c2b954a10d3c4dd363ce15a10dec1017fcebc76237aa0e1984aa WHIRLPOOL a70a87aae3cd453e0b483f3dd6185a3391b6badd9810108ab9ab599e55b3dd0d10387d2174105249381e4b57e538748c05c9672abe13ea8646fab66a210f382e
 AUX blender-2.49b-insecure.desktop 223 SHA256 dfd0a438ebf792071fc9f12036f07b0f14277b2bf34050bf4d57ffceeff55555 SHA512 aa93dc9777ca08df7b44d6b637b5aa0514e5133bb330e245a8d975e31534a83ba5e991ad7e5b8122d163d0ac2416706a84acbbf8d60dfd84c589b0880b4a8e89 WHIRLPOOL b30b9a1de44c29b1fb244a2d5333f058f409f0db8d7f1af2935e07d6f02490ab149f34a75afdb504c1e896692ebd0e6dd4db7551e8d23ca7f818e5246f0b1422
 AUX blender-2.49b-libav-0.7.patch 15251 SHA256 636244001abc882887b7c72f665c751a86a96f355ec196a49390b8d13180cec5 SHA512 a1dfab93b6dab0424002fc9ed49de990d2ecb0814ed4c44b26484dfd3f3b3987cd2dae2514e6a68db6fec91f74924428ef79fd7514572e285caef03c0e5aeb06 WHIRLPOOL 6e126329a3ffd1f438853e1f9d5ef5c2684c667f4a9c19f49c2908492e05ec9802b6996972837ffac91c6690bc9ebfcb1dbc23c9dd048434c18d285fea6d7c1a
 AUX blender-2.49b-subversion-1.7.patch 477 SHA256 744c7af5f0fdc24c84262748991c397b171c33246bb319ba5d3a54a4eda5da2a SHA512 d145e2c0a8c6d92c834ce11061dcce613f3e4c284038fc3d208621ca6c0cacfacfb35f6d61bc2e6e20896a571e3224bbf1f16f0d07ada1fa009f4a4c0018d3bb WHIRLPOOL d196325348926ad6e73e4935e32c1ad0689d829fa4a75ef60da09c65bf3f5e6fcb876b7db9b1d67b1c036891dd78b8c2ed5e3944a679d655f3a26e7fb3f779e8
-AUX blender-2.57-CVE-2009-3850-v1.patch 4894 SHA256 d64afd9ddef2fc3796c0e0398bf8fecc96a18176945642b2ae3445da2de69a26 SHA512 d5dea7df5d1df289528f67af04527bb336cfaf6377adffdc6e7f58fbb220cd4256d717b003dc734ce8f5f816912240466bcaed8fa7a244e587dfbec7f6001ae0 WHIRLPOOL d5b4e6af0d3df9302ca20174c54d8c393787374421662f4a840cf60840386e5cdfecd7afbee1b030da811523779e78071b5d79cf5f4c1270319b7ee33c856607
-AUX blender-2.57-CVE-2009-3850-v2.patch 8435 SHA256 a3d6d884d487604bdf9fc3ee78c8cf1fb10921ac0ec12ebd9d6e590093d9e98c SHA512 4c4c654676395fe3cc47f329840f307b1ddacc5fda24689abc78f69abde53d8a32d4b2bfc474d0ae332acb36cb06fa0c7b2392ad95192b4ff101c6afb632f234 WHIRLPOOL 3665402c5a9e83aaa2e9e1240f66e0ba18433a3a93b0d667437b6b307e356fa04cdf4f69c668978073b8c6d3a0349363f24cda1b6b143a897368adac17228032
-AUX blender-2.57-bmake.patch 422 SHA256 a9282a6746062824ccdc12f5a6055aa4c71feba269fafebb8e83916fc2e61245 SHA512 5c73ea5e06cd5e10f7dc032c57c5f7fe0b7ced7cac86149fa0d96da401e5b0fc0032efc4e16b73e2047b1ca593e951673565583a133a1067fa32b65f85db652f WHIRLPOOL 9f2271e24dcdc46082a0ebd48a2034864de6c8f41b485501c331866b353b5fecf3af040eb6c9e0094f1acece527022b91f301737e6fe724eec49714313e564bc
-AUX blender-2.57-desktop.patch 640 SHA256 0ddb29736fae671c5ce2b6ab719fb7c15d39f0f2ba2bf513674c6ea9711497fb SHA512 307813e6126676048519448404a5b6f6756432dd65d4e706c54973c8c16881ca97b1ec3952e039bfd9bf6ebe3a6a8e00cca440466a87aa7361d925c97d9479d3 WHIRLPOOL 79297e72f314d626b82c94932a9dfb5ac52eacffea346952cf050cc215f6c4c7d8d7875cb3d8536308dcb67963d0dc43635be23f1e95137a661b745b3a6531b0
-AUX blender-2.57-doxygen.patch 1316 SHA256 6c5ad9e44bfe768efe69e208fdfd22a4ac87af8b1bdce816ac07a81eb4df6848 SHA512 326843fc14570b2a1723ecc0b0916e6b5479344956f1d65a5ed548aba318f44fb00cbe63b87729d6944ec42644aa8a131eb8fcb7d8b245a4af63ceedf83ffef4 WHIRLPOOL e33df4b0b74a962b7a36d334a20cb28d387f69164502cf5c0d23cf1ec7dc94f518d6d4eab4febfdc172690b303da3fba7aeba2638e0dde6a2db52cb3092247c8
-AUX blender-2.57-eigen.patch 940 SHA256 a5bb17c7bd2f68dd44d439c0a72302654b204a8d3da9a4a6365a85396c4bc3ea SHA512 219d9781a2e530943be8eec0a6bffd95541fef6d4722e513618326bb2144623e6834428a57ef44e8b6d5e846f881d51cf41ac3c7abf57343df2b7440b5fe2d47 WHIRLPOOL 8bfccdf546d0167f62d7e2d61ec50aa64c57f60ead950ef81617ff6456f40f20da883945b17349ab1350e7b8d6b9304d89a4848a851078f7bdb3398f1b988db9
-AUX blender-2.57-enable_site_module.patch 939 SHA256 9e74736321ef56ee23432cb47a0f85bd2c4891c5682ed0858a2d2e776ee36b40 SHA512 b12d55ce876d6ed883d7be351e739e1a36ad25f90d080ccfc15934ffb2afcc5542639a5e21c758ca6585d68ab5c88ee2004e84925b370d9c553ebfb4b7cfe742 WHIRLPOOL 8027adae2eb65bfcb15f0d7f240b4b72572f5f8f2c1350ce148cbaa14101f9a1490027aea2d9f0ee865b191c39b8a67bf6ee48379f8e3ce886fa09c9d056ec42
-AUX blender-2.57-glew.patch 443 SHA256 002e144e516d7532f450565a176af736146d74d7de1ab18b1ad4796c12f26a0f SHA512 c41bb7ac94ab6fdfe77c38db8120f0c9137eca078266f636fbff9673286c822585bd89d24f8547d09fbc494dac59a56d0167fd3e2d490e7838c53563850444fd WHIRLPOOL fe1e196ebdba9c34ff689de9de73b16c96f5993b2bde357f5ba481d777275f7514c2d83d61d0dfe92845faa42000ccb19c9cbeac736b6a8bc9acc40e7cb2ac46
-AUX blender-2.57-insecure.desktop 595 SHA256 2b09e8898d4b2280967224a3c3592dbc74170726f56d269a6df0b0985a3691be SHA512 d345dc52fc026f9f2b7b0bb8b9e25ebdab8cee98fbad7201bb5decfbe1932148f59e3db9a17cd1161e877d0fe53d28ce3045f7a1badbb529fabf740314f90ea1 WHIRLPOOL 0ebeb7bd87872aab387ef096f846365f956ef7fbe1e699a0cd69087bfe0aaa4be433be1363ae549bceb7369931bf748da2f424fa13bd61d1b968a215df913437
-AUX blender-2.57-libav-0.7.patch 10964 SHA256 5b8da8d015d8e3ca63e1842ff5e1326b4d6788dfb9d024dfa9ab3f15898925df SHA512 c0552ff08eab463f975c6e78da3fa4112dc03b1335ec87e447c1cb95fb0c12f331cd59c42cfe0b7fd39347f6c19f7836e300a190ee992673f6a146e2b6f59c34 WHIRLPOOL b0f5a3f9b23bd49f857e5c354c94827e8f19755d6b5614bb15b620934b397111117f41e9fc35188c1d3eaa7d4fecf1130783939508a4309df1a9c9ad94cd1255
-AUX blender-2.57-linux-3.patch 414 SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa5903fa325e4d4db21efd540d732 SHA512 2dc9b6e8599254e88aa1fa529c30a38247551c67ac6b393071e5226b6f3495d4a4a696f39741a23c75746132f8c012247cf434cf0d9ff546207c98b74ef4f3f8 WHIRLPOOL 8be68aff5a7e801eb4871ff5e62481bff18b92372268730fcc4236ff32a5795fcc699ae52262c09f196b30eeef85b4374416bd957fe589ebb925c16558db1353
-AUX blender-2.60-bmake.patch 3429 SHA256 3432df1f780503ad34a96c83d3faea9fabe2fa58f1bcdf6a52a2d7ae33874f16 SHA512 b09969e427210989226abb985b1074e9312d552e32bdf2c1312f2433f85f8020e308068a8fe8b6465c201cd07afc17fdef16c651d54477a0b18133fbc27a16fc WHIRLPOOL bd0700e43784473f9d58701d02ac60a252c8fb6fe3c131f6edf0292853a927876d20ec5d7bf6f2a27a9201f732dd556e7a7a086a7f120420cd63c6fc7aba7868
-AUX blender-2.60-doxyfile.patch 595 SHA256 d267e0fab4ecb9be78b9238a9c2af60ac9d5ddb7b42f73f479b9266704605883 SHA512 a2cbdaeb0df9d8a61b4f0dbb29181ef9f454f69c6221482163bdc7aea1bded56110a8b27ad12708eed6d64641ee1ed95cf9aac1fe9b1b78653ba7812fa8e4212 WHIRLPOOL 82870b92e15ed150dcad2253720d88853fa74fd6f061f890cf305b9a557ffdb790198ef015b49a73f08784e7be06d50aa931f6ae57800108ed5d342611c724a7
-AUX blender-2.60-eigen.patch 13804 SHA256 b973b07db667ab84eebae24c47805772f6f2694bb77cb8846431d502c56b54d8 SHA512 9f48b4a45338bcda407599e93ae9e4e83c47dd4db066a38e7596ce1725ceccdab419f1aed8164f1b32d1ee14b10fb39e8db269f80e1de6615ccd35281563db5d WHIRLPOOL 9d138f9be1b2e1a0e3af9dba22cb4eb6d65ae2c908f5ec3be99c6b1023bb35cb9a16db89d335cb9bc7c8907aa2b1c49ae155ff68906b937f4015201f83cd10b0
-AUX blender-2.60-glew.patch 1128 SHA256 a43f0a0ac2a0cc5096e8488c926e7a32933a5910300440590a1cac5e1bb73f20 SHA512 60c402ac3215792704d6ca76b58073171971b4bbc0a8915c45c25044448607ff542f0ec7baca5b4fe7b1769f6fa7d24191ce7c89d7ade8932fe3f2301040e4ea WHIRLPOOL 59ae9f5b62ff7f1b0d71c3d853f87fa6e276537d1cd1f884b10686adf4fb3d290fd350213f5e0303c3db1050d6d67eb5d7afdafdd16f15b4934619a6bc04d577
-AUX blender-2.60-openjpeg.patch 1731 SHA256 3a684711e40ba365152593a6c90bbf38b190c84132e288c3dd3c7409dc6f9a62 SHA512 448c97bca9678e626d253ead2bc6b04ff0c1633ddc5a12757f9ffc8ff9d73251d4756cf245a1a5c3bf1ed48f9f7a363ca03833f2de4cbf3f06b8e3703187b815 WHIRLPOOL eb595c11657ee4d30528fe8f2aa1d9e47d6c6b5475600c16ddf6f48e8218460cc2b90465b8b755bf50742be924af2c399a32722d91844b65d8ca113b806dedf9
-AUX blender-2.60a-CVE-2009-3850-v3.patch 7787 SHA256 1aebbdd475ccdb1d4e77c4c1ae4c3205e76a1a06f7dcd5e70624c141f42d204b SHA512 8b1fc7ca84bd46c99e713f09b4c26dfff118314cb83d1c4bb1dd412733c19bf7e17fa331f5f2ebb7808e8b6e2cdba280c2542d228e397dbb0281b55018a309c4 WHIRLPOOL 999d13d286e9894897e1666f6bc2f379b50784140862c52061cfe72240aecbac44b3b93b71cc6c80617123e35948f8095398ae0085ce36c3e6b0806f910fad37
-AUX blender-2.60a-collada.patch 1402 SHA256 0b5d31b31e113053a998a8c16244b2d5801a8dac0f63fbd5905a51308981b4af SHA512 f3051bb0892939dd2905700f7b852121a40c8e2c261b24a75417af3c96e8fbf618562a3343e717eecf57a8e5789674d7e0254ec156406491e5a1b66003c533a8 WHIRLPOOL b6fa6e116f70b6a5182c0ae37de8a8b50a47cad1b2ff32eb161ef81fdf258caf16123c1f4642222d9abb65db89f8799950cfa8983fc8268b6f1bbd5bb42914f4
-AUX blender-2.60a-desktop.patch 643 SHA256 8f2a7619d82a7ea64ade59aa067f2e6469129fe682b88f7c3ac6975650947ec1 SHA512 2d583a8732da488f69ad5b6481441834f6e114e016d7e220507e0abb75dec06d63a8e9c7a6dc6c6318942fe15bde0155f216db71f9b1a4f8b6ae23a7b1a399e6 WHIRLPOOL 6c5d90e8b127cc7b7d62bcb5d24d519642e235638b42daa1f3b271de9aae20a4f76660a2732f1f1160b1869c5737cefd990f00928fec1acded68ad785956231e
-AUX blender-2.60a-enable_site_module.patch 974 SHA256 dfafc00a08504c0c3259083d01e535e00f9a952db4a551dbacf0a62ad1a5c768 SHA512 1930266661c5212e8cd1f68322399aba24e9527a70e4eb1b1e7bc831df96b4b2a04d75deefdebfd54fc52e89df38ebf784a016d8d18b144d397c785c52d37f59 WHIRLPOOL d134a749bd20676741a6fc366598ef8f38bcf972734bd07631d094b28604d508500b9dcafefeb2953bacd6da5646497bb5133ea42406dc435d6a93691f6da2f4
-AUX blender-2.60a-insecure.desktop 594 SHA256 2b7920c517c93d4f1430dc7ee70a414d32c1b17648a0e8395bbd900d1be8dd84 SHA512 ddf79dcfdcd6c17c1cd090d05eae9e774f07e582a834907bc5345cf67d016269bb6683546dd5ef68f43fd972c9d1a505dc385243cf6072f9ad9f3f51840a6238 WHIRLPOOL ea9d4a00c7f93b52bc8c1a300dc3d90e8e1155547480ca638a06e5fd291d8085c863c01d231b252f5deba1696ecee05f17b8c2a9c823d1248d23a57f590e6160
-AUX blender-2.60a-libav-0.7.patch 1181 SHA256 d8e7a08b042ce8311bd71e2edec7457ddf8fe8b64243f30f179d391ea170ab50 SHA512 c6ffc8e15a53b97bc04936499b6f553d8a37d78ad8ce2413d8c5b320449dd2f17048cb6dd24f683580f7f576e5e15da837b64e56900e4b307369076d9f774849 WHIRLPOOL c18fe07788941061430a395702cba5544738b939a776998d434bbf2e42b43db4da46b179c602a93329a9cca40eab0eccc1ee1af4205a31e2b8f1216ba7f90101
-AUX blender-2.60a-linux-3.patch 414 SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa5903fa325e4d4db21efd540d732 SHA512 2dc9b6e8599254e88aa1fa529c30a38247551c67ac6b393071e5226b6f3495d4a4a696f39741a23c75746132f8c012247cf434cf0d9ff546207c98b74ef4f3f8 WHIRLPOOL 8be68aff5a7e801eb4871ff5e62481bff18b92372268730fcc4236ff32a5795fcc699ae52262c09f196b30eeef85b4374416bd957fe589ebb925c16558db1353
-AUX blender-2.61-opencollada-debug.patch 846 SHA256 c2861bca33a9a72dc5f45dfe15e5b552fe93843ee9d6e10e594baec62ecb206b SHA512 f75a693aaf8a26eb334cda8dbbad55a20d405bcec6cff346faa82c88d192568d4ba8a0b18adcef3677653c258e8bd27a99ebcccfed89cd1039b12a39544597a2 WHIRLPOOL f68b555a07844208448c725aa4043a66852b5dc26c8b8027f02804b76c382def7993950a5de7bddc8bb7969fc26524681ace226eca425e942535753a5cc8442b
-AUX blender-2.63-CVE-2009-3850-v5.patch 9062 SHA256 8ce1e9d5b836df94bd7d4203db53434e33ac174533b6a7a06a2bc40ba75da633 SHA512 fab6b01c018f56d1020188a94d09bea06e57ce0ef671c63dd9b65deeb7771ad22a79d7c979c32d679ccda4674f0aaa82fe0be47e3588a90f3caa680de4f002a8 WHIRLPOOL 481011a78f9857a36afe101772d6c44af8e2935be39a1c46c46c265df5dc49bc16ca4d024504f254fd0d1d8f1860a39c180cbc94c3a11d1fde82431ffe73bf58
-AUX blender-2.63-doxyfile.patch 591 SHA256 f9ae6bb3fee939a66a191dbad319f9c958862ce6b4de2011a0b85bee431d491a SHA512 ab9062d302716eeac621d4055e4371681117731e1399d2e00e15e76d0a24db398a98ae7d126788eec95587a2ba211cab047a423146dc3acbf63b58e7c2b03580 WHIRLPOOL df39614f191e4ea4213a1202ef537eb07df158b42163b283bba9e9ceac5bda095923919a82713c583e70865900f6cdf73845d8352246e87a62889d8796cad851
-AUX blender-2.63-enable_site_module.patch 1560 SHA256 805e3994a0ed3a96232e4d61beaf20bba9d2b2814f7f600a346f20e7f62c568a SHA512 489d874370e530dee3de3db11abd61797191cfe97250ad1f1d1adfda297f35aa30e21c878777edc66754b5aefd57343c220189d31568d0c2aeb25e0c155e7269 WHIRLPOOL b4a8ee8e89f422c36496f764f99fec31aad957e212eddc89dbdca9b45f82b77985b862dd83f65d5083674dd4034658df72b28d8928f7810535c8e830cc8fbe86
-AUX blender-2.63-glew.patch 2057 SHA256 3265078bf60e417f0ef342f23415f56c106d75191660bd2a614e88856b8ee1b0 SHA512 b9e98b6f68112e964215398493e6e47560ebc0433c21792d4878f305379ff8395340a8c0a6c6241754993438d53162b1dbb4eb36238b2db099f492248e1e313d WHIRLPOOL 878e28d7ca012cdc471f06581331eb6d4735510cd9c94bee27f1c2aae9be54e86203fc0950655cc35b0a87b4fd8d616332a063bb0b75f113baaac7a9d1f7f1e2
-AUX blender-2.63-opencollada-debug.patch 876 SHA256 c91893010b20705718ee86592cc2bf798ea3b56e26852ccaca5ea97944539d68 SHA512 54348cad096016aefbec69b3a159ba58fb12a5a1accffc468de1ca2a66500f03646194ea43b5492debd412d9cde05af5330c4c72a1cd3afa0bb7e5591ea3a8b4 WHIRLPOOL 720912488c2903784693ebc11234758bde46a6f57bd137d997ca97e2632ed2de874aaefc3685237ae03b08b65956fd87ec8f5dda0fa907a8da9d17f543262bf2
-AUX blender-2.63a-bullet.patch 7565 SHA256 7598931287b867a879a647eeff6eab2d128ca994bfde0321d726a952d38c437c SHA512 0ac119a37d4d36df78c616ce21a416edc360087a9a69e7fb60a3a16065a776d7b9253aff23a3b42fa032efcfcd3621ea4c4e04499fe643040915d9c01f8888a6 WHIRLPOOL 9ec3b514224beaf5fbc81bdc744ff94b042bc940d7841f91a656e43b47c4a955db8fdca6b827e7a629925ee721168f54c31f24902cfd8ee22b5966d92dcd437f
-AUX blender-2.63a-colamd.patch 8148 SHA256 b852e3fcbcd334a8fe7c70d56b8880f229a64a35337c84b86f19f8c6fd304593 SHA512 00a40707b39382a410725aff173175549e15dc3d46c57efd117f52c1ff0c0b438e9512186ff84c755c0362eca15c13fe0b2aa24e871511ffa82d441a41ddcdab WHIRLPOOL e891feaad1409c34a3a6dde0bec772ecffce2021f1ee3166e102aed646ee4db8a04b085e08bbfe538b6df953f174e63204344e28b84877802915ba144e8fdd4b
-AUX blender-2.63a-desktop.patch 672 SHA256 7a9a8f31ff69239bba99200640c84f0276cf60f441ca36788015161b90f6b598 SHA512 bb620a48ff30a95cf74521dee12a861ddf3a92a298619d9c0e2d1ba990d728ef8f78478e6ea33db41dd3c72fcd25ba450c1825b3002d5ee4cb2533ce0ae518a6 WHIRLPOOL 2accf102f17cb60cad2d26a27575aafc597c74d0b770d16ff97baf7400ab796d3d09f56302bbdd932780dfde1eedfed6a322ed5442338be7eb3119c401c0817d
-AUX blender-2.63a-eigen.patch 27674 SHA256 257132a9a7e67dfc6f7149326c83b29a0b74b6da1d11c448dc19be9d86ce4dbb SHA512 03fb2533b61c88fffb9ddbdf28aa301c5942ab3cc31f4282eeef23e4da5e881b3dbad37a034413062f7772f8da4fff1bea5630138ffcc2566086f5f9ad6b00d7 WHIRLPOOL bdc025f441ca4f91e3d22be21b46d3d9ddfff14f1b35af14fb1ec8c255e81523f426f85fed684e72a2db6320e114df45956b446af48441eeb0eb99f1769d458d
-AUX blender-2.63a-insecure.desktop 730 SHA256 6cef8bdf24782af99f682b5c244d693d6fa2952ca32408f51c7f2890323bc69a SHA512 0a090684b6a0523a922608dda6d71f8cfb2ecef6226bb87d19c9be647507efaf04848a0608167bce236626d9b1193a87d74f2a365cddecb16eda5fd32dd7bc79 WHIRLPOOL 2f1ff8684a49d492b1cdba4dd71bf5718a7ddb1afb54cff696c722b34eb662f009935d9064829da41abb6782db52cac6cf3e2fc04c6783ca718c5cd056d54458
-AUX blender-2.63a-libav-0.8.patch 17834 SHA256 71bc27a272115f625380f8217778a523e71ea3e43162a421b5febe8314ae24b9 SHA512 1088a31db77d08cb31685ebd192c839299487163531e1558157eee67e28dec388dccc99196bd77e81a314f0cc3a64065b683e32c78571d4c4596e1194606c647 WHIRLPOOL bfaa8033e86649585d651b1eed159af8f927844a2ad788f1671bfd7fc1a6f794d04a389d36ae2b8e32a3b52ec78fba660c1addbb3ab521c5ddaecc3c8182d50d
 AUX blender.desktop 199 SHA256 3fbab5be3f52ce56f285e422c856aecd15627cffeadcb07af313e0d64c4803ad SHA512 f5674f4a9ebe70170e8bcde1fd31cd5bd569ca0f66866a23c5239ae97e9d4d7de083c835e166085848b7420d6778a0469e6868628ff5020b44faac6582ac77d0 WHIRLPOOL b259746b3c412a1101a5bec84eac411dc34dc104053a7e6f09351c4b03b3202a74f1eb5fae9b2d87aa0a91f9ddc6ea274ad2a9ae14da817d30c8dc60d4516747
-DIST blender-2.48a.png.bz2 2509 SHA256 aea439e0504c5e9eed16e062694636d523b28674c594077c0fafe29b4d775515
-DIST blender-2.48a.tar.gz 21502247 SHA256 781d4d9e2332f4f3887af1d66fb70c4c6dd0b89166391403ee4853108abf4e46
-DIST blender-2.49a.tar.gz 23039535 SHA256 b206b878a6f96d1e8561ee62a58fba1af4141579c27f51ec795f08f4129eb1fc
-DIST blender-2.49b.tar.gz 22918377 SHA256 23554db4aa10b00e0e760a8bf9c4a9f749670d815c8bc874a04746adc4752488
-DIST blender-2.57.tar.gz 16806453 SHA256 8bd1812166f2dd96e158c1898a666adc1f9f109765d5cd7ff3a8adeae60794b8
-DIST blender-2.60a.tar.gz 25679123 SHA256 7d788599ab46dac37f630dec026d06f7e3d73508f243eeb4ade8bcdcb661f124
+DIST blender-2.49b.tar.gz 22918377 SHA256 23554db4aa10b00e0e760a8bf9c4a9f749670d815c8bc874a04746adc4752488 SHA512 0e83388849898a61a308584be05307697ef8d0e67c5f161eea0d11f75a29d14c26547aa7b20f356065e70db823082e11a39dc06e59d3d73ef8c87738d2f88460 WHIRLPOOL d8b54b39eb47841c7e93157726f55c855d0930b89e4cbe8f093dcd7110978ed267ca96517281861bd6d62c1108a8068c5a863452d3208b1f4ad3d374f1e74f7d
+DIST blender-2.63a-patches-1.tar.bz2 14394 SHA256 a63bd7b0950eac7d78249c97297fa123926946746bc9ce580f66e19b114dcce9 SHA512 12c71b878ec66e49f14b392133467e55ec4a1d454175e62065b63fc87e8efa12101a94262b1e5af032798131a3a9840ed90037cd74655b2e0544f7e1ec376a52 WHIRLPOOL 996d7e9d77987c7fc0f2a6d06a0d661b325248344b4186978f4bd474a1c609f6945ba49adaf7ff7a538f51f9e80d96a5492cd88ad1e8d67bb1dc5b2fe40b2199
 DIST blender-2.63a.tar.gz 26759658 SHA256 c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a SHA512 86abf813153da2b0c9974d35bb794ea6df4f933559abf99ffefcffce429d2304c0e04ce91f576f0c8b3394fd4bed05d465602b39f2b0081c62b5ba4e7073b297 WHIRLPOOL 08f26def3c4ede3c50c71c59bccae0ab2fef91e123e31acddb7f2ee42ffed7a6e4c6ac96ad8f66f6e57720c49d35d0ec6d4534bbe486449d1c39eb5eaa379ec2
-EBUILD blender-2.48a-r3.ebuild 4121 SHA256 1effa801ae75047486f27b6948f80345e28bdb1773fd0ee6f153bd249cb2f5f3 SHA512 0459b15c8db18b8d94032a5112bb39bd5eda4112ea4d585be9b31147e96ad1dbbf82ae3fe5c43b2b54a068c72c02d5b6a2bdb179053139e42c6fb3e7d873c77a WHIRLPOOL 569975d0d81f9af3fa29071772726b8c3fe066bd7a77a46ef866119433040da2651a011eea7087d66e2e3c33bb4481c9cbeebc3e55756b361268d05636676d98
-EBUILD blender-2.49a.ebuild 5066 SHA256 64cca831b882fd527b53de22bfa137a859c6a5d89f6615b5e075aa916f0c43f0 SHA512 9a25050ba0a047caa263c180879ac3b87d12cb6846922d85c3c93a3b7feafb08ec8a28a9e195741535dbbfb3e6d924b711778e9cfaf2b1757583455d4eaa8abe WHIRLPOOL 1ba37ca35b822cdfc9b9d0db0823fef7ba762df1b3882895b95d40cfdb170ccb831159a2c9e6503a5d9bb7e742ebf2a4ab119338f181aac7d153256cd3a0aadf
 EBUILD blender-2.49b-r2.ebuild 5295 SHA256 fd61820a492e3e32875e998d9e310d3431e380d7ec88c9d20ac13adb48d66554 SHA512 ed5e69f8ee020b15772583900e134fe275657e742dc11f82278d6daaaeb8190a790e726deb0e09943e0ac3e0b09d82ebcb7e5a75bef40a8a43b16d7eec70123c WHIRLPOOL 1c2bc098a3f35eb265f91507835c167a6c42c49b12362dc771477111a70d7b28a14d25d87f20ba31f293b6a402fbdc89daffa835ed53c2be43e3913ea438a912
-EBUILD blender-2.57-r1.ebuild 14179 SHA256 3d479b13ce87170a085dbb46a9884d7e1eaefdc3c20e97efec865e480d555be0 SHA512 aaee06482686094f6fc6671b970eae30e5d2e61b9884d5d642fa6dc3494b66428ba6622fcd3634737c09ab233da813a9cd682a12af2ae638165f65c91f3ff2fc WHIRLPOOL b34f56f9589ebf9fb6f311e58d8acdcfc900400d5e4bb114fe837dd071fad654a2cf39296462460100f2dd1e7037f3bf4dadb2459e44a9420d14e8833653e3ba
-EBUILD blender-2.60a.ebuild 14352 SHA256 b0c053c1fc01fe881b47610b8ce6fa755d524b56d92c812dd41fcf28e1699b11 SHA512 267599db932a7423eddc9bda45da081dbe2e941fcb950634ae5d29230affd74dca2f4a8211cfc9e560ab1928e06dc943676573774ad1cde8a0a934d1dbee60de WHIRLPOOL 4695da28978c875d1e86cb0ec1aa22d1f75e661fe7dc0ad8490d8537e27f2094b05d3c1df16157f8fd0a7704f0c84c816b130794053a1a0648352a0f960b5b4c
-EBUILD blender-2.63a.ebuild 13445 SHA256 96c5be18298f4aad6912d17283128f227767ff5e846edd935ca39f068a486127 SHA512 a9c68af9e144f625a8012ba02423652a13848246a3d2a45cbec991a653d1bff0e3bcd5449bb598a78f253b3d7761080c73fb2f7e9f723263e667a93b8bee4ff1 WHIRLPOOL cd584912f280a4bc8dad2455c9d2ae0e13524d1d3ff7c844d72d2a893cb3ffbcfefb140bdccee05faeab344f39997264eaed33382296e1ccccb819561ca983de
-MISC ChangeLog 36006 SHA256 4a4817c2c4e661117d4356947f4ac21bfaebfc5c4833787c3734d373b258dbcf SHA512 85ed638e4c6a9565dccb1bf4b81d91d0031bb0f529753f2f7825a0e54d48fea78bcd1de3945536907df4e8cdf8d3ff67a45cd2a1e33c5c652233713953d8a72d WHIRLPOOL a8bce71047b12a7584c9b89bc2c9b2717cfd1d8b5afe8066a57aa690040c3d6bcc87c3e4401eae0e29fbf42dc1649b81d72252e785d1fd7956490fd97ba3750f
+EBUILD blender-2.63a-r1.ebuild 10052 SHA256 83e23e5c52334add7fbc3e371e5d47fe0483f57831cfa1c2c040a4e47c2a4633 SHA512 1a07a3348a5a783ca90dcd76e7d6e0cb1b6dc7f719ec16c21bed92d8b83d2f29010ddc6b497890ff4732e8791ba60251b6a9d8829dc1b0ce790cd6882a7e0682 WHIRLPOOL 5df7805cb86ad4168cf32df176806f94e06d1c6c521d21fc9d52934d267063ea1c002a9c1e51a79b03b074ae03c2e862d79e214417a628b7958825cbbae88eac
+MISC ChangeLog 38197 SHA256 3c7b7af8f8552c019679d4cb2e9bb5d6434bc6ccb5e33e5dd9be1f9f4583be87 SHA512 e9c304628ef42fbf986deb2f27442bfb14680aab5e871942e2658470b9b8af60f5b46ae3ef0e01d776a4d858422a17772b60904172c156093926bca8fdcc6983 WHIRLPOOL 64fa4c522153d5f03c9bb282d43b8fc6d716397173af5b2c53c9e4f9bb8caf8e292596b7d29573b295dd109d992657ce631bd03c0a663c229aeecd7f215ed2e7
 MISC metadata.xml 2024 SHA256 5f6d03c152e6f9a0c6db28b4fa50d465ea2f3404c8cafc83cbc1fafbd98e71bd SHA512 d7b6f4c073232e870e7ec8d2d50da6181dc2d3d572f175b9852ae165c889c55eb4ee332d8fac8346ac2b806b4fe91ed19a853b59f7edad8498b55af8bc7b0458 WHIRLPOOL ade3f1e4a2885c501096232226b74c9d993f03af54f287f34a8cfa625fbefd9cb830427b47e9992c58d19513f7d65905b7cd906307df7df02857a4d5037c8130
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAAtegACgkQcXOrnRGRc44/XwEAzqOzqJK0n5IqzKTjKo0OZdaB
-sm+O9wr+oEFosiw0XOIA/1EqOd/Uqmvaqzlb/8+tmHBKwWxLv3VhO8AVSRST6NLB
-=3qA2
+iQEcBAEBCAAGBQJQA2YPAAoJEBzRPIrUMBNCAyMIAKODhZ4xdXcMYJNEq2/SkwhE
+dmps6L+wJXNPKtQ1xKCZ046G6i8bu/QMRMthHcdSxnl6pyr2ppQYu3eXXbLZi2eg
+LnmMVCL0CEZSzm7YRiGFgDID1i83N4OMAHdNER2NcUAtGmOC1BudmWjOTZRE59dJ
+Bn1iyGAUZQCfRdUgkWQoc7PmenfL/R89YeHAviWDaibZ3pNmFPuSLdG8qFN4HsxP
+PusqDHOqdTc6VhSr9kPcofYr+Cv3S3iz22xUyktOZDCVNJbOsXvzIAGi0krLqvMB
+lKpimiq8gp6ofmdrKsxoFc+e7zcmyb79bi1ubFjhobRHNzgdgHKn2d0RzhuFNo4=
+=Wlv/
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.48a-r3.ebuild b/media-gfx/blender/blender-2.48a-r3.ebuild
deleted file mode 100644
index 7ae242821465..000000000000
--- a/media-gfx/blender/blender-2.48a-r3.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.21 2012/06/27 21:25:30 ssuominen Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.6"
-
-inherit scons-utils multilib flag-o-matic eutils python
-
-#IUSE="jpeg mozilla png sdl static truetype"
-IUSE="blender-game ffmpeg jpeg nls openal openexr openmp
-	player png quicktime verse"
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org/"
-SRC_URI="http://download.blender.org/source/${P}.tar.gz
-	http://dev.gentoo.org/~ssuominen/${P}.png.bz2"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND=">=dev-libs/openssl-0.9.6:0
-	ffmpeg? ( virtual/ffmpeg )
-	jpeg? ( virtual/jpeg )
-	media-libs/tiff:0
-	nls? ( >=media-libs/freetype-2.0
-			virtual/libintl
-			>=media-libs/ftgl-2.1 )
-	openal? ( >=media-libs/openal-1.6.372
-		>=media-libs/freealut-1.1.0-r1 )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng:0 )
-	quicktime? ( media-libs/libquicktime )
-	>=media-libs/libsdl-1.2
-	blender-game? ( >=media-libs/libsdl-1.2[joystick] )
-	virtual/opengl"
-
-DEPEND=">=dev-util/scons-0.98
-	x11-libs/libXt
-	x11-proto/inputproto
-	${RDEPEND}"
-
-blend_with() {
-	local UWORD="$2"
-	if [ -z "${UWORD}" ]; then
-		UWORD="$1"
-	fi
-	if use $1; then
-		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
-			>> "${S}"/user-config.py
-	else
-		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
-			>> "${S}"/user-config.py
-	fi
-}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.37-dirs.patch
-	epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch
-	epatch "${FILESDIR}"/${PN}-2.46-ffmpeg.patch
-	epatch "${FILESDIR}"/${PN}-2.46-cve-2008-1103-1.patch
-	epatch "${FILESDIR}"/${PN}-2.48-ffmpeg-20081014.patch
-	epatch "${FILESDIR}"/${P}-CVE-2008-4863.patch
-}
-
-src_configure() {
-	if use ffmpeg ; then
-#		cd "${S}"/extern
-#		rm -rf ffmpeg libmp3lame x264
-		cat <<- EOF >> "${S}"/user-config.py
-		BF_FFMPEG="/usr"
-		BF_FFMPEG_LIB="avformat avcodec swscale avutil"
-		EOF
-	fi
-	# pass compiler flags to the scons build system
-	# and set python version to current version in use
-	cat <<- EOF >> "${S}"/user-config.py
-		CFLAGS += '${CFLAGS}'
-		BF_PYTHON_VERSION="$(python_get_version)"
-		BF_PYTHON_INC="$(python_get_includedir)"
-		BF_PYTHON_BINARY="$(PYTHON -a)"
-		BF_PYTHON_LIB="python$(python_get_version)"
-	EOF
-
-	if use openmp && built_with_use --missing false sys-devel/gcc openmp ; then
-		echo "WITH_BF_OPENMP=1" >> "${S}"/user-config.py
-		elog "enabling openmp"
-	else
-		echo "WITH_BF_OPENMP=0" >> "${S}"/user-config.py
-		elog "disabling openmp"
-	fi
-
-	for arg in \
-			'blender-game gameengine' \
-			'ffmpeg' \
-			'jpeg' \
-			'nls international' \
-			'openal' \
-			'openexr' \
-			'player' \
-			'png' \
-			'verse' ; do
-		blend_with ${arg}
-	done
-}
-
-src_compile() {
-	escons || die \
-	"!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org"
-
-	cd "${WORKDIR}"/install/linux2/plugins
-	chmod 755 bmake
-	emake || die
-}
-
-src_install() {
-	exeinto /usr/bin/
-	doexe "${WORKDIR}"/install/linux2/blender
-	use player && doexe "${WORKDIR}"/install/linux2/blenderplayer
-
-	dodir /usr/share/${PN}
-
-	exeinto /usr/$(get_libdir)/${PN}/textures
-	doexe "${WORKDIR}"/install/linux2/plugins/texture/*.so
-	exeinto /usr/$(get_libdir)/${PN}/sequences
-	doexe "${WORKDIR}"/install/linux2/plugins/sequence/*.so
-	insinto /usr/include/${PN}
-	doins "${WORKDIR}"/install/linux2/plugins/include/*.h
-
-	if use nls ; then
-		mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
-			"${D}"/usr/share/${PN}
-		mv "${WORKDIR}"/install/linux2/.blender/locale \
-			"${D}"/usr/share/locale
-	fi
-
-	mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
-
-	newicon -s 48 "${WORKDIR}"/${P}.png ${PN}.png
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	dodoc INSTALL README
-	dodoc "${WORKDIR}"/install/linux2/BlenderQuickStart.pdf
-}
-
-pkg_preinst(){
-	if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
-	then
-		rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
-	fi
-}
diff --git a/media-gfx/blender/blender-2.49a.ebuild b/media-gfx/blender/blender-2.49a.ebuild
deleted file mode 100644
index 974bd5233acc..000000000000
--- a/media-gfx/blender/blender-2.49a.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.20 2012/06/14 15:18:44 ssuominen Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.6"
-
-inherit scons-utils multilib eutils python
-
-IUSE="blender-game ffmpeg nls ogg openmp verse openal"
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org/"
-SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL BSD )"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg[encode,theora] )
-	>=media-libs/openjpeg-1.5.0
-	media-libs/tiff:0
-	nls? ( >=media-libs/freetype-2.0
-		virtual/libintl
-		>=media-libs/ftgl-2.1 )
-	openal? ( >=media-libs/openal-1.6.372
-		>=media-libs/freealut-1.1.0-r1 )
-	media-libs/openexr
-	media-libs/libpng:0
-	blender-game? ( >=media-libs/libsdl-1.2[joystick] )
-	>=media-libs/libsdl-1.2
-	ogg? ( media-libs/libogg )
-	virtual/jpeg
-	virtual/opengl"
-DEPEND=">=dev-util/scons-0.98
-	sys-devel/gcc[openmp?]
-	x11-base/xorg-server
-	${RDEPEND}"
-
-blend_with() {
-	local UWORD="$2"
-	if [ -z "${UWORD}" ]; then
-		UWORD="$1"
-	fi
-	if use $1; then
-		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
-			>> "${S}"/user-config.py
-	else
-		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
-			>> "${S}"/user-config.py
-	fi
-}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/blender-2.48a-CVE-2008-4863.patch
-	epatch "${FILESDIR}"/${PN}-2.37-dirs.patch
-	epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch
-	epatch "${FILESDIR}"/${PN}-2.49a-sys-openjpeg.patch
-	epatch "${FILESDIR}"/${PN}-2.49a-bake.patch
-	rm -f "${S}/release/scripts/bpymodules/"*.pyc
-
-	# Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
-	sed -i \
-		-e '/parameters.*tile_size_on/s:false:FALSE:' \
-		source/blender/imbuf/intern/jp2.c || die
-}
-
-src_configure() {
-
-	# add ffmpeg info to the scons build info
-	cat <<- EOF >> "${S}"/user-config.py
-		BF_FFMPEG="/usr"
-		BF_FFMPEG_LIB="avdevice avformat avcodec swscale avutil"
-	EOF
-
-	#  set python version to current version in use
-	cat <<- EOF >> "${S}"/user-config.py
-		BF_PYTHON_VERSION="$(python_get_version)"
-		BF_PYTHON_INC="$(python_get_includedir)"
-		BF_PYTHON_BINARY="$(PYTHON -a)"
-		BF_PYTHON_LIB="python$(python_get_version)"
-	EOF
-
-	# add system openjpeg into scons build.
-	cat <<- EOF >> "${S}"/user-config.py
-		BF_OPENJPEG = "/usr"
-		BF_OPENJPEG_INC = "/usr/include"
-		BF_OPENJPEG_LIB = "openjpeg"
-	EOF
-
-	#set CFLAGS used in /etc/make.conf correctly
-
-	echo "CFLAGS= [`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
-		  | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-	echo "CXXFLAGS= [`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`]" \
-		 | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-	# check for blender-game USE flag.
-	# blender-game will merge with blenderplayer.
-
-	for arg in \
-			'openal'\
-			'ffmpeg' \
-			'blender-game player' \
-			'blender-game gameengine' \
-			'nls international' \
-			'ogg' \
-			'openmp' \
-			'verse' ; do
-		blend_with ${arg}
-	done
-}
-
-src_compile() {
-	escons || die \
-	'!!! Please add "${S}/scons.config" when filing bugs reports \
-	to bugs.gentoo.org'
-
-	cd "${WORKDIR}"/install/linux2/plugins
-	chmod 755 bmake
-	emake || die
-}
-
-src_install() {
-	exeinto /usr/bin/
-	doexe "${WORKDIR}"/install/linux2/blender
-	use blender-game && doexe "${WORKDIR}"/install/linux2/blenderplayer
-
-	dodir /usr/share/${PN}
-
-	exeinto /usr/$(get_libdir)/${PN}/textures
-	doexe "${WORKDIR}"/install/linux2/plugins/texture/*.so
-	exeinto /usr/$(get_libdir)/${PN}/sequences
-	doexe "${WORKDIR}"/install/linux2/plugins/sequence/*.so
-	insinto /usr/include/${PN}
-	doins "${WORKDIR}"/install/linux2/plugins/include/*.h
-
-	if use nls ; then
-		mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
-			"${D}"/usr/share/${PN}
-		mv "${WORKDIR}"/install/linux2/.blender/locale \
-			"${D}"/usr/share/locale
-	fi
-
-	mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
-
-	insinto /usr/share/pixmaps
-	doins "${WORKDIR}"/install/linux2/icons/scalable/blender.svg
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
-
-	dodoc INSTALL README
-	dodoc "${WORKDIR}"/install/linux2/BlenderQuickStart.pdf
-
-}
-
-pkg_preinst(){
-	if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
-	then
-		rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
-	fi
-}
-
-pkg_postinst(){
-	elog "blender uses python integration.  As such, may have some"
-	elog "inherit risks with running unknown python scripting."
-	elog " "
-	elog "CVE-2008-1103-1.patch has been removed as it interferes"
-	elog "with autosave undo features. Up stream blender coders"
-	elog "have not addressed the CVE issue as the status is still"
-	elog "a CANDIDATE and not CONFIRMED."
-	elog " "
-	elog "It is recommended to change your blender temp directory"
-	elog "from /tmp to ~tmp or another tmp file under your home"
-	elog "directory. This can be done by starting blender, then"
-	elog "dragging the main menu down do display all paths."
-}
diff --git a/media-gfx/blender/blender-2.57-r1.ebuild b/media-gfx/blender/blender-2.57-r1.ebuild
deleted file mode 100644
index a279c455ed0b..000000000000
--- a/media-gfx/blender/blender-2.57-r1.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.14 2012/04/13 19:28:35 ulm Exp $
-
-EAPI=3
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
-
-IUSE="+game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
-	+dds debug fftw jack apidoc sndfile lcms tweak-mode sdl sse \
-	redcode +zlib iconv contrib verse"
-
-# not complete/working features
-#IUSE="verse collada test"
-
-LANGS="en ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr sv uk zh_CN"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
-	SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.5"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
-	media-libs/libpng:0
-	x11-libs/libXi
-	x11-libs/libX11
-	media-libs/tiff:0
-	media-libs/libsamplerate
-	virtual/opengl
-	>=media-libs/freetype-2.0
-	virtual/libintl
-	media-libs/glew
-	dev-cpp/eigen:2
-	>=sci-physics/bullet-2.76
-	iconv? ( virtual/libiconv )
-	zlib? ( sys-libs/zlib )
-	sdl? ( media-libs/libsdl[audio,joystick] )
-	openexr? ( media-libs/openexr )
-	ffmpeg? (
-		virtual/ffmpeg[x264,mp3,encode,theora]
-		jpeg2k? (
-			!<media-libs/openjpeg-1.5.0
-			virtual/ffmpeg[x264,mp3,encode,theora,jpeg2k]
-		)
-	)
-	openal? ( >=media-libs/openal-1.6.372 )
-	fftw? ( sci-libs/fftw:3.0 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	sndfile? ( media-libs/libsndfile )
-	lcms? ( media-libs/lcms:0 )"
-
-DEPEND=">=dev-util/scons-2.0.1-r1
-	apidoc? (
-		dev-python/sphinx
-		|| ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
-	)
-	x11-base/xorg-server
-	${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
-	DEPEND="${DEPEND}
-		sys-devel/gettext"
-fi
-
-blend_with() {
-	local UWORD="$2"
-	[ -z "${UWORD}" ] && UWORD="$1"
-	if use $1; then
-		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
-			>> "${S}"/user-config.py
-	else
-		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
-			>> "${S}"/user-config.py
-	fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
-	subversion_fetch
-	if use contrib; then
-		S="${S}"/release/scripts/addons_contrib subversion_fetch \
-		"https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
-	fi
-else
-	unpack ${A}
-fi
-}
-
-pkg_setup() {
-	enable_openmp=0
-	if use openmp; then
-		if tc-has-openmp; then
-			enable_openmp=1
-		else
-			ewarn "You are using gcc built without 'openmp' USE."
-			ewarn "Switch CXX to an OpenMP capable compiler."
-			die "Need openmp"
-		fi
-	fi
-	python_set_active_version 3
-}
-
-src_prepare() {
-	#epatch "${FILESDIR}"/${PN}-${SLOT}-CVE-2008-1103.patch
-	#epatch "${FILESDIR}"/${PN}-${SLOT}-CVE-2008-4863.patch
-	#epatch "${FILESDIR}"/${PN}-2.49a-sys-openjpeg.patch
-	epatch "${FILESDIR}"/${P}-bmake.patch
-	epatch "${FILESDIR}"/${P}-doxygen.patch
-	epatch "${FILESDIR}"/${P}-libav-0.7.patch
-	epatch "${FILESDIR}"/${P}-CVE-2009-3850-v2.patch
-	epatch "${FILESDIR}"/${P}-desktop.patch
-	epatch "${FILESDIR}"/${P}-enable_site_module.patch
-
-	# OpenJPEG
-	einfo "Removing bundled OpenJPEG ..."
-	rm -r extern/libopenjpeg
-
-	# Glew
-	einfo "Removing bundled Glew ..."
-	rm -r extern/glew
-	epatch "${FILESDIR}"/${P}-glew.patch
-
-	# binreloc
-#	einfo "Removing bundled binreloc ..."
-#	rm -r extern/binreloc
-#	epatch "${FILESDIR}"/${PN}-${SLOT}-binreloc.patch
-
-	# Eigen2
-	einfo "Removing bundled Eigen2 ..."
-	rm -r extern/Eigen2
-	epatch "${FILESDIR}"/${P}-eigen.patch
-
-	# Bullet
-#	einfo "Removing bundled Bullet2 ..."
-#	rm -r extern/bullet2
-#	epatch "${FILESDIR}"/${PN}-${SLOT}-bullet.patch
-
-	# Linux 3.x (bug #381099)
-	epatch "${FILESDIR}"/${P}-linux-3.patch
-
-	# Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
-	sed -i \
-		-e '/parameters.*tile_size_on/s:false:FALSE:' \
-		source/blender/imbuf/intern/jp2.c || die
-}
-
-src_configure() {
-	# add system openjpeg into Scons build options.
-	cat <<- EOF >> "${S}"/user-config.py
-		BF_OPENJPEG="/usr"
-		BF_OPENJPEG_INC="/usr/include"
-		BF_OPENJPEG_LIB="openjpeg"
-	EOF
-
-	# FIX: littlecms includes path aren't specified
-	if use lcms; then
-		cat <<- EOF >> "${S}"/user-config.py
-			BF_LCMS_INC="/usr/include/"
-			BF_LCMS_LIB="lcms"
-			BF_LCMS_LIBPATH="/usr/lib/"
-		EOF
-	fi
-
-	# add system sci-physic/bullet into Scons build options.
-#	cat <<- EOF >> "${S}"/user-config.py
-#		WITH_BF_BULLET=1
-#		BF_BULLET="/usr/include"
-#		BF_BULLET_INC="/usr/include /usr/include/BulletCollision /usr/include/BulletDynamics /usr/include/LinearMath /usr/include/BulletSoftBody"
-#		BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
-#	EOF
-
-	#add iconv into Scons build options.
-	if use !elibc_glibc && use !elibc_uclibc && use iconv; then
-		cat <<- EOF >> "${S}"/user-config.py
-			WITH_BF_ICONV=1
-			BF_ICONV="/usr"
-		EOF
-	fi
-
-	# configure internationalization only if LINGUAS have more
-	# languages than 'en', otherwise must be disabled
-	[[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
-	# configure Elbeem fluid system
-	use elbeem || echo "BF_NO_ELBEEM=1" >> "${S}"/user-config.py
-
-	# configure Tweak Mode
-	use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
-	# FIX: Game Engine module needs to be active to build the Blender Player
-	if ! use game-engine && use player; then
-		elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
-		echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
-	else
-		blend_with game-engine gameengine
-	fi
-
-	# set CFLAGS used in /etc/make.conf correctly
-	echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
-		| sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-	# set CXXFLAGS used in /etc/make.conf correctly
-	local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
-	echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-	echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-	# reset general options passed to the C/C++ compilers (useless hardcoded flags)
-	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
-	# shadows, see bug #276338 for reference
-	echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
-	# set LDFLAGS used in /etc/make.conf correctly
-	local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
-	echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-	echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-	# reset REL_* variables (useless hardcoded flags)
-	cat <<- EOF >> "${S}"/user-config.py
-		REL_CFLAGS=[]
-		REL_CXXFLAGS=[]
-		REL_CCFLAGS=[]
-	EOF
-
-	# reset warning flags (useless for NON blender developers)
-	cat <<- EOF >> "${S}"/user-config.py
-		C_WARN  =[ '-w', '-g0' ]
-		CC_WARN =[ '-w', '-g0' ]
-		CXX_WARN=[ '-w', '-g0' ]
-	EOF
-
-	# detecting -j value from MAKEOPTS
-	local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
-	[[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
-	# generic settings which differ from the defaults from linux2-config.py
-	cat <<- EOF >> "${S}"/user-config.py
-		BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
-		BF_INSTALLDIR="../install"
-		WITHOUT_BF_PYTHON_INSTALL=1
-		BF_PYTHON="/usr"
-		BF_PYTHON_VERSION="3.2"
-		BF_PYTHON_ABI_FLAGS=""
-		BF_BUILDINFO=0
-		BF_QUIET=1
-		BF_NUMJOBS=${NUMJOBS}
-		BF_LINE_OVERWRITE=0
-		WITH_BF_FHS=1
-		WITH_BF_BINRELOC=0
-		WITH_BF_STATICOPENGL=0
-		WITH_BF_OPENMP=${enable_openmp}
-	EOF
-
-	# configure WITH_BF* Scons build options
-	for arg in \
-		'sdl' \
-		'apidoc docs' \
-		'lcms' \
-		'jack' \
-		'sndfile' \
-		'openexr' \
-		'dds' \
-		'fftw fftw3' \
-		'jpeg2k openjpeg' \
-		'openal'\
-		'ffmpeg' \
-		'ffmpeg ogg' \
-		'player' \
-		'sse rayoptimization' \
-		'redcode' \
-		'zlib' \
-		'verse' ; do
-		blend_with ${arg}
-	done
-
-	# enable debugging/testing support
-	use debug && echo "BF_DEBUG=1" >> "${S}"/user-config.py
-	use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-}
-
-src_compile() {
-	escons || die \
-		'!!! Please add "${S}/scons.config" when filing bugs reports \
-		to bugs.gentoo.org'
-
-	einfo "Building plugins ..."
-	cd "${WORKDIR}"/install/${PV}/plugins/ \
-		|| die "dir ${WORKDIR}/install/plugins/ do not exist"
-	chmod 755 bmake
-
-	# FIX: plugins are built without respecting user's LDFLAGS
-	emake \
-		CFLAGS="${CFLAGS} -fPIC" \
-		LDFLAGS="$(raw-ldflags) -Bshareable" \
-		> /dev/null \
-		|| die "plugins compilation failed"
-
-	# final cleanup
-	rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
-
-}
-
-src_install() {
-	# creating binary wrapper
-	cat <<- EOF >> "${WORKDIR}/install/blender-${SLOT}"
-		#!/bin/sh
-
-		# stop this script if the local blender path is a symlink
-		if [ -L \${HOME}/.blender ]; then
-			echo "Detected a symbolic link for \${HOME}/.blender"
-			echo "Sorry, to avoid dangerous situations, the Blender binary can"
-			echo "not be started until you have removed the symbolic link:"
-			echo "  # rm -i \${HOME}/.blender"
-			exit 1
-		fi
-
-		export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${SLOT}/scripts"
-		export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${SLOT}/datafiles"
-			exec /usr/bin/blender-bin-${SLOT} \$*
-	EOF
-
-	# install binaries
-	exeinto /usr/bin/
-	cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${SLOT}"
-	doexe "${WORKDIR}/install/blender-bin-${SLOT}"
-	doexe "${WORKDIR}/install/blender-${SLOT}"
-	if use player; then
-		cp "${WORKDIR}/install/blenderplayer" \
-			"${WORKDIR}/install/blenderplayer-${SLOT}"
-		doexe "${WORKDIR}/install/blenderplayer-${SLOT}"
-	fi
-	if use verse; then
-		cp "${WORKDIR}"/install/bin/verse_server \
-			"${WORKDIR}/install/bin/verse_server-${SLOT}"
-		doexe "${WORKDIR}"/install/bin/verse_server-${SLOT}
-	fi
-
-	# install plugins
-	exeinto /usr/share/${PN}/${SLOT}/textures
-	doexe "${WORKDIR}"/install/${PV}/plugins/texture/*.so
-	exeinto /usr/share/${PN}/${SLOT}/sequences
-	doexe "${WORKDIR}"/install/${PV}/plugins/sequence/*.so
-	insinto /usr/include/${PN}/${SLOT}
-	doins "${WORKDIR}"/install/${PV}/plugins/include/*.h
-#	rm -r "${WORKDIR}"/install/${PV}/plugins || die
-
-	# install desktop file
-	insinto /usr/share/pixmaps
-	cp release/freedesktop/icons/scalable/blender.svg \
-		release/freedesktop/icons/scalable/blender-${SLOT}.svg
-	doins release/freedesktop/icons/scalable/blender-${SLOT}.svg
-	insinto /usr/share/applications
-	cp release/freedesktop/blender.desktop \
-		release/freedesktop/blender-${SLOT}.desktop
-	doins release/freedesktop/blender-${SLOT}.desktop || die
-	newins "${FILESDIR}"/${P}-insecure.desktop ${PN}-${SLOT}-insecure.desktop || die
-
-	# install docs
-#	use doc && dodoc release/text/BlenderQuickStart.pdf
-	if use apidoc; then
-
-		einfo "Generating (BGE) Blender Game Engine API docs ..."
-		docinto "API/BGE_API"
-		dohtml -r "${WORKDIR}"/blender/doc/*
-#		rm -r "${WORKDIR}"/blender/doc
-
-#		einfo "Generating (BPY) Blender Python API docs ..."
-#		epydoc source/blender/python/doc/*.py -v \
-#			-o doc/BPY_API \
-#			--quiet --quiet --quiet \
-#			--simple-term \
-#			--inheritance=included \
-#			--graph=all \
-#			--dotpath /usr/bin/dot \
-#			|| die "epydoc failed."
-#		docinto "API/python"
-#		dohtml -r doc/BPY_API/*
-
-		einfo "Generating Blender C/C++ API docs ..."
-		pushd "${WORKDIR}"/blender/doc/doxygen > /dev/null
-			doxygen -u Doxyfile
-			doxygen || die "doxygen failed to build API docs."
-			docinto "API/blender"
-			dohtml -r html/*
-		popd > /dev/null
-	fi
-
-	# installing blender
-	insinto /usr/share/${PN}/${SLOT}
-	doins -r "${WORKDIR}"/install/${PV}/*
-#        doins -r "${WORKDIR}"/install/${SLOT}/*
-
-	# FIX: making all python scripts readable only by group 'users',
-	#      so nobody can modify scripts apart root user, but python
-	#      cache (*.pyc) can be written and shared across the users.
-#	chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-#	chmod 750 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-pkg_preinst() {
-	if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
-	then
-		rm -r "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "Blender uses python integration. As such, may have some"
-	elog "inherit risks with running unknown python scripting."
-	elog
-#	elog "CVE-2008-1103-1.patch has been removed as it interferes"
-#	elog "with autosave undo features. Up stream blender coders"
-#	elog "have not addressed the CVE issue as the status is still"
-#	elog "a CANDIDATE and not CONFIRMED."
-#	elog
-#	elog "CVE-2008-4863.patch has been remove as it interferes"
-#	elog "with the load of bpy_ops.py and all the UI python"
-#	elog "scripts."
-#	elog
-	elog "It is recommended to change your blender temp directory"
-	elog "from /tmp to /home/user/tmp or another tmp file under your"
-	elog "home directory. This can be done by starting blender, then"
-	elog "dragging the main menu down do display all paths."
-	elog
-	elog "Blender has its own internal rendering engine but you"
-	elog "can export to external renderers for image computation"
-	elog "like: YafRay[1], sunflow[2], PovRay[3] and luxrender[4]"
-	elog
-	elog "If you need one of them just emerge it:"
-	elog "  [1] emerge -av media-gfx/yafray"
-	elog "  [2] emerge -av media-gfx/sunflow"
-	elog "  [3] emerge -av media-gfx/povray"
-	elog "  [4] emerge -av media-gfx/luxrender"
-	elog
-	elog "When setting the Blender paths with the User Preferences"
-	elog "dialog box, remember to NOT declare your home's paths as:"
-	elog "~/.blender, but as: /home/user/.blender; in other words,"
-	elog "DO NOT USE the tilde inside the paths, as Blender is not"
-	elog "able to handle it, ignoring your customizations."
-}
diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild
deleted file mode 100644
index 98a15a98165a..000000000000
--- a/media-gfx/blender/blender-2.60a.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.12 2012/04/13 19:28:35 ulm Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
-
-IUSE="3dmouse +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
-	+dds debug doc fftw jack apidoc sndfile lcms tweak-mode sdl sse \
-	redcode +zlib iconv contrib collada verse"
-
-LANGS="en ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr sv uk zh_CN"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
-	SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
-	media-libs/libpng:0
-	x11-libs/libXi
-	x11-libs/libX11
-	media-libs/tiff:0
-	media-libs/libsamplerate
-	virtual/opengl
-	>=media-libs/freetype-2.0
-	virtual/libintl
-	media-libs/glew
-	dev-cpp/eigen:2
-	>=sci-physics/bullet-2.76
-	iconv? ( virtual/libiconv )
-	zlib? ( sys-libs/zlib )
-	sdl? ( media-libs/libsdl[audio,joystick] )
-	openexr? ( media-libs/openexr )
-	ffmpeg? (
-		>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
-		jpeg2k? (
-			!<media-libs/openjpeg-1.5.0
-			>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k]
-		)
-	)
-	openal? ( >=media-libs/openal-1.6.372 )
-	fftw? ( sci-libs/fftw:3.0 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	sndfile? ( media-libs/libsndfile )
-	lcms? ( media-libs/lcms:0 )
-	3dmouse? ( dev-libs/libspnav )
-	collada? ( media-libs/opencollada )"
-
-DEPEND="dev-util/scons
-	apidoc? (
-		dev-python/sphinx
-		|| ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
-		game-engine? ( dev-python/epydoc )
-	)
-	${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
-	DEPEND="${DEPEND}
-		sys-devel/gettext"
-fi
-
-blend_with() {
-	local UWORD="$2"
-	[ -z "${UWORD}" ] && UWORD="$1"
-	if use $1; then
-		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
-			>> "${S}"/user-config.py
-	else
-		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
-			>> "${S}"/user-config.py
-	fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
-	subversion_fetch
-	if use contrib; then
-		S="${S}"/release/scripts/addons_contrib subversion_fetch \
-		"https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
-	fi
-else
-	unpack ${A}
-fi
-}
-
-pkg_setup() {
-	enable_openmp=0
-	if use openmp; then
-		if tc-has-openmp; then
-			enable_openmp=1
-		else
-			ewarn "You are using gcc built without 'openmp' USE."
-			ewarn "Switch CXX to an OpenMP capable compiler."
-			die "Need openmp"
-		fi
-	fi
-	python_set_active_version 3
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-desktop.patch
-	epatch "${FILESDIR}"/${P}-collada.patch
-	epatch "${FILESDIR}"/${PN}-2.61-opencollada-debug.patch
-	epatch "${FILESDIR}"/${PN}-${SLOT}-doxyfile.patch
-
-	# TODO: write a proper Makefile to replace the borked bmake script
-	epatch "${FILESDIR}"/${PN}-${SLOT}-bmake.patch
-	chmod 755 "${WORKDIR}"/${P}/release/plugins/bmake
-
-	# OpenJPEG
-	einfo "Removing bundled OpenJPEG ..."
-	rm -r extern/libopenjpeg
-	epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
-	# Glew
-	einfo "Removing bundled Glew ..."
-	rm -r extern/glew
-	epatch "${FILESDIR}"/${PN}-${SLOT}-glew.patch
-
-	# Eigen2
-	einfo "Removing bundled Eigen2 ..."
-	rm -r extern/Eigen2
-	epatch "${FILESDIR}"/${PN}-${SLOT}-eigen.patch
-
-	# Linux 3.x (bug #381099)
-	epatch "${FILESDIR}"/${P}-linux-3.patch
-
-	epatch "${FILESDIR}"/${P}-libav-0.7.patch
-	epatch "${FILESDIR}"/${P}-CVE-2009-3850-v3.patch
-	epatch "${FILESDIR}"/${P}-enable_site_module.patch
-
-	# Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
-	sed -i \
-		-e '/parameters.*tile_size_on/s:false:FALSE:' \
-		source/blender/imbuf/intern/jp2.c || die
-}
-
-src_configure() {
-	# add system openjpeg into Scons build options.
-	cat <<- EOF >> "${S}"/user-config.py
-		BF_OPENJPEG="/usr"
-		BF_OPENJPEG_INC="/usr/include"
-		BF_OPENJPEG_LIB="openjpeg"
-	EOF
-
-	# FIX: littlecms includes path aren't specified
-	if use lcms; then
-		cat <<- EOF >> "${S}"/user-config.py
-			BF_LCMS_INC="/usr/include/"
-			BF_LCMS_LIB="lcms"
-			BF_LCMS_LIBPATH="/usr/lib/"
-		EOF
-	fi
-
-	# add system sci-physic/bullet into Scons build options.
-#	cat <<- EOF >> "${S}"/user-config.py
-#		WITH_BF_BULLET=1
-#		BF_BULLET="/usr/include"
-#		BF_BULLET_INC="/usr/include /usr/include/BulletCollision /usr/include/BulletDynamics /usr/include/LinearMath /usr/include/BulletSoftBody"
-#		BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
-#	EOF
-
-	#add iconv into Scons build options.
-	if use !elibc_glibc && use !elibc_uclibc && use iconv; then
-		cat <<- EOF >> "${S}"/user-config.py
-			WITH_BF_ICONV=1
-			BF_ICONV="/usr"
-		EOF
-	fi
-
-	# configure internationalization only if LINGUAS have more
-	# languages than 'en', otherwise must be disabled
-	[[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
-	# configure Elbeem fluid system
-	use elbeem || echo "BF_NO_ELBEEM=1" >> "${S}"/user-config.py
-
-	# configure Tweak Mode
-	use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
-	# FIX: Game Engine module needs to be active to build the Blender Player
-	if ! use game-engine && use player; then
-		elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
-		echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
-	else
-		blend_with game-engine gameengine
-	fi
-
-	# set CFLAGS used in /etc/make.conf correctly
-	echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
-		| sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-	# set CXXFLAGS used in /etc/make.conf correctly
-	local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
-	echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-	echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-	# reset general options passed to the C/C++ compilers (useless hardcoded flags)
-	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
-	# shadows, see bug #276338 for reference
-	echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
-	# set LDFLAGS used in /etc/make.conf correctly
-	local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
-	echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-	echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
-	# reset REL_* variables (useless hardcoded flags)
-	cat <<- EOF >> "${S}"/user-config.py
-		REL_CFLAGS=[]
-		REL_CXXFLAGS=[]
-		REL_CCFLAGS=[]
-	EOF
-
-	# reset warning flags (useless for NON blender developers)
-	cat <<- EOF >> "${S}"/user-config.py
-		C_WARN  =[ '-w', '-g0' ]
-		CC_WARN =[ '-w', '-g0' ]
-		CXX_WARN=[ '-w', '-g0' ]
-	EOF
-
-	# detecting -j value from MAKEOPTS
-	local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
-	[[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
-	# generic settings which differ from the defaults from linux2-config.py
-	cat <<- EOF >> "${S}"/user-config.py
-		BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
-		BF_INSTALLDIR="../install"
-		WITH_PYTHON_SECURITY=1
-		WITHOUT_BF_PYTHON_INSTALL=1
-		BF_PYTHON="/usr"
-		BF_PYTHON_VERSION="3.2"
-		BF_PYTHON_ABI_FLAGS=""
-		BF_BUILDINFO=0
-		BF_QUIET=1
-		BF_NUMJOBS=${NUMJOBS}
-		BF_LINE_OVERWRITE=0
-		WITH_BF_FHS=1
-		WITH_BF_BINRELOC=0
-		WITH_BF_STATICOPENGL=0
-		WITH_BF_OPENMP=${enable_openmp}
-	EOF
-
-	# configure WITH_BF* Scons build options
-	for arg in \
-		'sdl' \
-		'apidoc docs' \
-		'lcms' \
-		'jack' \
-		'sndfile' \
-		'openexr' \
-		'dds' \
-		'fftw fftw3' \
-		'jpeg2k openjpeg' \
-		'openal'\
-		'ffmpeg' \
-		'ffmpeg ogg' \
-		'player' \
-		'sse rayoptimization' \
-		'redcode' \
-		'zlib' \
-		'collada' \
-		'3dmouse' \
-		'verse' ; do
-		blend_with ${arg}
-	done
-
-	echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
-	echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
-
-	# enable debugging/testing support
-	use debug && echo "BF_DEBUG=1" >> "${S}"/user-config.py
-	use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-}
-
-src_compile() {
-	escons || die \
-		'!!! Please add "${S}/scons.config" when filing bugs reports \
-		to bugs.gentoo.org'
-
-	einfo "Building plugins ..."
-	# FIX: plugins are built without respecting user's LDFLAGS
-	emake \
-		CFLAGS="${CFLAGS} -fPIC" \
-		LDFLAGS="$(raw-ldflags) -Bshareable" \
-		-C release/plugins
-}
-
-src_install() {
-	# creating binary wrapper
-	cat <<- EOF >> "${WORKDIR}/install/blender-${SLOT}"
-		#!/bin/sh
-
-		# stop this script if the local blender path is a symlink
-		if [ -L \${HOME}/.blender ]; then
-			echo "Detected a symbolic link for \${HOME}/.blender"
-			echo "Sorry, to avoid dangerous situations, the Blender binary can"
-			echo "not be started until you have removed the symbolic link:"
-			echo "  # rm -i \${HOME}/.blender"
-			exit 1
-		fi
-
-		export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${SLOT}/scripts"
-		export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${SLOT}/datafiles"
-		export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${SLOT}/plugins"
-			exec /usr/bin/blender-bin-${SLOT} \$*
-	EOF
-
-	# install binaries
-	exeinto /usr/bin/
-	cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${SLOT}"
-	doexe "${WORKDIR}/install/blender-bin-${SLOT}"
-	doexe "${WORKDIR}/install/blender-${SLOT}"
-	if use player; then
-		cp "${WORKDIR}/install/blenderplayer" \
-			"${WORKDIR}/install/blenderplayer-${SLOT}"
-		doexe "${WORKDIR}/install/blenderplayer-${SLOT}"
-	fi
-#	if use verse; then
-#		cp "${WORKDIR}"/install/bin/verse_server \
-#			"${WORKDIR}/install/bin/verse_server-${SLOT}"
-#		doexe "${WORKDIR}"/install/bin/verse_server-${SLOT}
-#	fi
-
-	# install plugins
-	exeinto /usr/$(get_libdir)/${PN}/${SLOT}/plugins/texture
-	doexe "${WORKDIR}"/${P}/release/plugins/texture/*.so
-	exeinto /usr/$(get_libdir)/${PN}/${SLOT}/plugins/sequences
-	doexe "${WORKDIR}"/${P}/release/plugins/sequence/*.so
-	insinto /usr/include/${PN}/${SLOT}
-	doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
-#	rm -r "${WORKDIR}"/${P}/release/plugins
-#	insinto /usr/share/${PN}/${SLOT}
-#	doins "${WORKDIR}"/${P}/release/datafiles
-#	doins "${WORKDIR}"/${P}/release/scripts
-
-	# install desktop file
-	insinto /usr/share/pixmaps
-	cp release/freedesktop/icons/scalable/apps/blender.svg \
-		release/freedesktop/icons/scalable/apps/blender-${SLOT}.svg
-	doins release/freedesktop/icons/scalable/apps/blender-${SLOT}.svg
-	insinto /usr/share/applications
-	cp release/freedesktop/blender.desktop \
-		release/freedesktop/blender-${SLOT}.desktop
-	doins release/freedesktop/blender-${SLOT}.desktop
-	newins "${FILESDIR}"/${P}-insecure.desktop ${PN}-${SLOT}-insecure.desktop
-
-	# install docs
-	doman "${WORKDIR}"/${P}/doc/manpage/blender.1
-	use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
-	if use apidoc; then
-
-		einfo "Generating (BGE) Blender Game Engine API docs ..."
-		epydoc source/gameengine/PyDoc/*.py -v \
-			-o doc/BGE_API \
-			--quiet --quiet --quiet \
-			--simple-term \
-			--url "http://www.blender.org" \
-			--top API_intro \
-			--name "Blender GameEngine" \
-			 --no-private --no-sourcecode \
-			--inheritance=included \
-			--graph=all \
-			--dotpath /usr/bin/dot \
-			|| die "epydoc failed."
-		docinto "API/gameengine"
-		dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
-		#einfo "Generating (BPY) Blender Python API docs ..."
-		"${D}"/usr/bin/blender-bin-2.60 --background --python doc/python_api/sphinx_doc_gen.py || die "blender failed."
-		pushd doc/python_api > /dev/null
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-		popd > /dev/null
-		docinto "API/python"
-		dohtml -r doc/python_api/BPY_API/*
-
-		einfo "Generating Blender C/C++ API docs ..."
-		pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
-			doxygen -u Doxyfile
-			doxygen || die "doxygen failed to build API docs."
-			docinto "API/blender"
-			dohtml -r html/*
-		popd > /dev/null
-	fi
-
-	# final cleanup
-	rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
-
-	# installing blender
-	insinto /usr/share/${PN}/${SLOT}
-	doins -r "${WORKDIR}"/install/${SLOT}/*
-
-	# FIX: making all python scripts readable only by group 'users',
-	#	  so nobody can modify scripts apart root user, but python
-	#	  cache (*.pyc) can be written and shared across the users.
-#	chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-#	chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-#pkg_preinst() {
-#	if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
-#	then
-#		rm -r "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
-#	fi
-#}
-
-pkg_postinst() {
-	echo
-	elog "Blender uses python integration. As such, may have some"
-	elog "inherit risks with running unknown python scripting."
-	elog
-	elog "It is recommended to change your blender temp directory"
-	elog "from /tmp to /home/user/tmp or another tmp file under your"
-	elog "home directory. This can be done by starting blender, then"
-	elog "dragging the main menu down do display all paths."
-	elog
-	elog "Blender has its own internal rendering engine but you"
-	elog "can export to external renderers for image computation"
-	elog "like: YafRay[1], sunflow[2], PovRay[3] and luxrender[4]"
-	elog
-	elog "If you need one of them just emerge it:"
-	elog "  [1] emerge -av media-gfx/yafray"
-	elog "  [2] emerge -av media-gfx/sunflow"
-	elog "  [3] emerge -av media-gfx/povray"
-	elog "  [4] emerge -av media-gfx/luxrender"
-	elog
-	elog "When setting the Blender paths with the User Preferences"
-	elog "dialog box, remember to NOT declare your home's paths as:"
-	elog "~/.blender, but as: /home/user/.blender; in other words,"
-	elog "DO NOT USE the tilde inside the paths, as Blender is not"
-	elog "able to handle it, ignoring your customizations."
-}
diff --git a/media-gfx/blender/blender-2.63a.ebuild b/media-gfx/blender/blender-2.63a-r1.ebuild
index 9204bbf1f27e..6f0276cd1a97 100644
--- a/media-gfx/blender/blender-2.63a.ebuild
+++ b/media-gfx/blender/blender-2.63a-r1.ebuild
@@ -1,38 +1,47 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.63a.ebuild,v 1.1 2012/07/13 23:56:11 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.63a-r1.ebuild,v 1.1 2012/07/16 00:53:16 flameeyes Exp $
 
 EAPI=4
 PYTHON_DEPEND="3:3.2"
 
+PATCHSET="1"
+
 if [[ ${PV} == *9999 ]] ; then
 SCM="subversion"
 ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
 fi
 
-inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils ${SCM}
+inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils check-reqs ${SCM}
 
-IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
-	+dds doc fftw jack apidoc sndfile tweak-mode sdl sse \
-	redcode iconv contrib collada 3dmouse"
+IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal
+	openmp +dds doc fftw jack apidoc sndfile tweak-mode sdl sse redcode
+	iconv collada 3dmouse debug nls"
+REQUIRED_USE=""
 
 LANGS="en ar bg ca cs de el es es_ES fa fi fr hr id it ja ky ne pl pt ru sr sr@latin sv tr uk zh_CN zh_TW"
 for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
+	IUSE+=" linguas_${X}"
+	REQUIRED_USE+=" linguas_${X}? ( nls )"
 done
 
 DESCRIPTION="3D Creation/Animation/Publishing System"
 HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
-	SRC_URI="http://download.blender.org/source/${P}.tar.gz"
+
+case ${PV} in
+	*9999*)
+		SRC_URI="" ;;
+	*_p*)
+		SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;;
+	*)
+		SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;;
+esac
+
+if [[ -n ${PATCHSET} ]]; then
+	SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.bz2"
 fi
 
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
+SLOT="0"
 LICENSE="|| ( GPL-2 BL )"
 KEYWORDS="~amd64 ~x86"
 
@@ -58,8 +67,7 @@ RDEPEND="virtual/jpeg
 	sdl? ( media-libs/libsdl[audio,joystick] )
 	openexr? ( media-libs/openexr )
 	ffmpeg? (
-		>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
-		jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
+		>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k?]
 	)
 	openal? ( >=media-libs/openal-1.6.372 )
 	fftw? ( sci-libs/fftw:3.0 )
@@ -71,18 +79,11 @@ RDEPEND="virtual/jpeg
 DEPEND="dev-util/scons
 	apidoc? (
 		dev-python/sphinx
-		app-doc/doxygen[-nodot]
-		game-engine? ( dev-python/epydoc )
+		app-doc/doxygen[-nodot(-),dot(+)]
 	)
+	nls? ( sys-devel/gettext )
 	${RDEPEND}"
 
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
-	DEPEND="${DEPEND}
-		sys-devel/gettext"
-fi
-
 blend_with() {
 	local UWORD="$2"
 	[ -z "${UWORD}" ] && UWORD="$1"
@@ -95,69 +96,43 @@ blend_with() {
 	fi
 }
 
-src_unpack() {
 if [[ ${PV} == *9999 ]] ; then
-	subversion_fetch
-	if use contrib; then
-		S="${S}"/release/scripts/addons_contrib subversion_fetch \
-		"https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
-	fi
-else
-	unpack ${A}
+	src_unpack() {
+		subversion_fetch
+	}
 fi
+
+pkg_pretend() {
+	if use openmp && ! tc-has-openmp; then
+		eerror "You are using gcc built without 'openmp' USE."
+		eerror "Switch CXX to an OpenMP capable compiler."
+		die "Need openmp"
+	fi
+
+	if use apidoc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
 }
 
 pkg_setup() {
-	enable_openmp=0
-	if use openmp; then
-		if tc-has-openmp; then
-			enable_openmp=1
-		else
-			ewarn "You are using gcc built without 'openmp' USE."
-			ewarn "Switch CXX to an OpenMP capable compiler."
-			die "Need openmp"
-		fi
-	fi
 	python_set_active_version 3
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-desktop.patch
-	epatch "${FILESDIR}"/${PN}-${SLOT}a-collada.patch
-	epatch "${FILESDIR}"/${P/a}-doxyfile.patch
-
-	# OpenJPEG
-	einfo "Removing bundled OpenJPEG ..."
-	rm -r extern/libopenjpeg
-	epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
-	# Glew
-	einfo "Removing bundled Glew ..."
-	rm -r extern/glew
-	epatch "${FILESDIR}"/${P/a}-glew.patch
-
-	# Eigen3
-	einfo "Removing bundled Eigen3 ..."
-	rm -r extern/Eigen3
-	epatch "${FILESDIR}"/${P}-eigen.patch
-
-	# Bullet2
-	einfo "Removing bundled Bullet2 ..."
-	rm -r extern/bullet2
-	epatch "${FILESDIR}"/${P}-bullet.patch
-
-	# Colamd
-	einfo "Removing bundled Colamd ..."
-	rm -r extern/colamd
-	epatch "${FILESDIR}"/${P}-colamd.patch
+	EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/patches" \
+		epatch
+
+	# remove some bundled deps
+	rm -r \
+		extern/libopenjpeg \
+		extern/glew \
+		extern/Eigen3 \
+		extern/bullet2 \
+		extern/colamd \
+		extern/binreloc
 
 	ewarn "$(echo "Remaining bundled dependencies:";
 			find extern -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
-
-	epatch "${FILESDIR}"/${P}-libav-0.8.patch
-	epatch "${FILESDIR}"/${P/a}-CVE-2009-3850-v5.patch
-	epatch "${FILESDIR}"/${P/a}-enable_site_module.patch
-	epatch "${FILESDIR}"/${P/a}-opencollada-debug.patch
 }
 
 src_configure() {
@@ -192,9 +167,8 @@ src_configure() {
 		EOF
 	fi
 
-	# configure internationalization only if LINGUAS have more
-	# languages than 'en', otherwise must be disabled
-	[[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
+	# configure internationalization optionally
+	use nls || echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
 
 	# Ocean sim system needs fftw
 	use fftw || echo "WITH_BF_OCEANSIM=0" >> "${S}"/user-config.py
@@ -229,24 +203,16 @@ src_configure() {
 	echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
 	echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
 
-	# reset REL_* variables (useless hardcoded flags)
+	# reset REL_*/*_WARN variables (useless hardcoded flags)
 	cat <<- EOF >> "${S}"/user-config.py
 		REL_CFLAGS=[]
 		REL_CXXFLAGS=[]
 		REL_CCFLAGS=[]
+		C_WARN=[]
+		CC_WARN=[]
+		CXX_WARN=[]
 	EOF
 
-	# reset warning flags (useless for NON blender developers)
-	cat <<- EOF >> "${S}"/user-config.py
-		C_WARN  =[ '-w', '-g0' ]
-		CC_WARN =[ '-w', '-g0' ]
-		CXX_WARN=[ '-w', '-g0' ]
-	EOF
-
-	# detecting -j value from MAKEOPTS
-	local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
-	[[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
 	# generic settings which differ from the defaults from linux2-config.py
 	cat <<- EOF >> "${S}"/user-config.py
 		BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
@@ -257,13 +223,14 @@ src_configure() {
 		BF_PYTHON_VERSION="3.2"
 		BF_PYTHON_ABI_FLAGS=""
 		BF_BUILDINFO=0
-		BF_QUIET=1
-		BF_NUMJOBS=${NUMJOBS}
+		BF_QUIET=0
 		BF_LINE_OVERWRITE=0
 		WITH_BF_FHS=1
 		WITH_BF_BINRELOC=0
 		WITH_BF_STATICOPENGL=0
-		WITH_BF_OPENMP=${enable_openmp}
+		WITH_BF_OPENMP=$(usex openmp 1 0)
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
 	EOF
 
 	# configure WITH_BF* Scons build options
@@ -293,7 +260,7 @@ src_configure() {
 	echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
 
 	# enable debugging/testing support
-	is-flag "-g*" && echo "BF_DEBUG=1" >> "${S}"/user-config.py
+	use debug && echo "BF_DEBUG=1" >> "${S}"/user-config.py
 	#use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
 
 	# enables Cycles render engine
@@ -313,115 +280,64 @@ src_configure() {
 }
 
 src_compile() {
-	escons || die \
-		'!!! Please add "${S}/scons.config" when filing bugs reports \
-		to bugs.gentoo.org'
+	escons
+
+	einfo "Generating Blender C/C++ API docs ..."
+	cd "${WORKDIR}"/${P}/doc/doxygen
+	doxygen -u Doxyfile
+	doxygen || die "doxygen failed to build API docs."
 }
 
 src_install() {
-	# creating binary wrapper
-	cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
-		#!/bin/sh
-
-		# stop this script if the local blender path is a symlink
-		if [ -L \${HOME}/.blender ]; then
-			echo "Detected a symbolic link for \${HOME}/.blender"
-			echo "Sorry, to avoid dangerous situations, the Blender binary can"
-			echo "not be started until you have removed the symbolic link:"
-			echo "  # rm -i \${HOME}/.blender"
-			exit 1
-		fi
-
-		export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV/a}/scripts"
-		export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV/a}/datafiles"
-		export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV/a}/plugins"
-			exec /usr/bin/blender-bin-${PV} \$*
-	EOF
-
 	# Pax mark blender for hardened support.
 	pax-mark m "${WORKDIR}/install/blender"
 
 	# install binaries
-	exeinto /usr/bin/
-	cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
-	doexe "${WORKDIR}/install/blender-bin-${PV}"
-	doexe "${WORKDIR}/install/blender-${PV}"
-	if use player; then
-		cp "${WORKDIR}/install/blenderplayer" \
-			"${WORKDIR}/install/blenderplayer-${PV}"
-		doexe "${WORKDIR}/install/blenderplayer-${PV}"
-	fi
+	dobin "${WORKDIR}/install/blender"
+	use player && newbin "${WORKDIR}/install/blenderplayer" blenderplayer
 
 	# install plugin headers
-	insinto /usr/include/${PN}/${PV/a}
+	insinto /usr/include/${PN}
 	doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
 
-	# install contrib scripts addons
-	insinto /usr/share/${PN}/${PV/a}/scripts
-	use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
-
 	# install desktop file
 	insinto /usr/share/pixmaps
-	cp release/freedesktop/icons/scalable/apps/blender.svg \
-		release/freedesktop/icons/scalable/apps/blender-${PV}.svg
-	doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
+	doins release/freedesktop/icons/scalable/apps/blender.svg
 	insinto /usr/share/applications
-	cp release/freedesktop/blender.desktop \
-		release/freedesktop/blender-${PV}.desktop
-	doins release/freedesktop/blender-${PV}.desktop
-	newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
+	doins release/freedesktop/blender.desktop
 
 	# install docs
 	doman "${WORKDIR}"/${P}/doc/manpage/blender.1
 	use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
-	if use apidoc; then
-
-		einfo "Generating (BGE) Blender Game Engine API docs ..."
-		epydoc source/gameengine/PyDoc/*.py -v \
-			-o doc/BGE_API \
-			--quiet --quiet --quiet \
-			--simple-term \
-			--url "http://www.blender.org" \
-			--top API_intro \
-			--name "Blender GameEngine" \
-			 --no-private --no-sourcecode \
-			--inheritance=included \
-			--graph=all \
-			--dotpath /usr/bin/dot \
-			|| die "epydoc failed."
-		docinto "API/gameengine"
-		dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
 
+	if use apidoc; then
 		#einfo "Generating (BPY) Blender Python API docs ..."
-		"${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py --noaudio || die "blender failed."
+		"${D}"/usr/bin/blender --background --python doc/python_api/sphinx_doc_gen.py --noaudio || die "blender failed."
+
 		pushd doc/python_api > /dev/null
 		sphinx-build sphinx-in BPY_API || die "sphinx failed."
 		popd > /dev/null
+
 		docinto "API/python"
 		dohtml -r doc/python_api/BPY_API/*
 
-		einfo "Generating Blender C/C++ API docs ..."
-		pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
-			doxygen -u Doxyfile
-			doxygen || die "doxygen failed to build API docs."
-			docinto "API/blender"
-			dohtml -r html/*
-		popd > /dev/null
+		docinto "API/blender"
+		dohtml -r "${WORKDIR}"/${P}/doc/doxygen/html/*
 	fi
 
 	# final cleanup
 	rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
-	if [[ -z ${LINGUAS} || ${LINGUAS} == "en" ]]; then
+	if ! use nls; then
 		rm -r "${WORKDIR}/install/${PV/a}/datafiles/locale"
 	else
 		for x in "${WORKDIR}"/install/${PV/a}/datafiles/locale/* ; do
 			mylang=${x##*/}
-			has ${mylang} ${LINGUAS} || rm -r ${x}
+			use linguas_${mylang} || rm -r ${x}
 		done
 	fi
 
 	# installing blender
-	insinto /usr/share/${PN}/${PV/a}
+	insinto /usr/share/${PN}
 	doins -r "${WORKDIR}"/install/${PV/a}/*
 
 	# FIX: making all python scripts readable only by group 'users',
@@ -432,7 +348,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
+	elog
 	elog "Blender uses python integration. As such, may have some"
 	elog "inherit risks with running unknown python scripting."
 	elog
diff --git a/media-gfx/blender/files/blender-2.46-cve-2008-1103-1.patch b/media-gfx/blender/files/blender-2.46-cve-2008-1103-1.patch
deleted file mode 100644
index c45a811e6283..000000000000
--- a/media-gfx/blender/files/blender-2.46-cve-2008-1103-1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up blender/source/blender/blenkernel/intern/blender.c.cve blender/source/blender/blenkernel/intern/blender.c
---- blender/source/blender/blenkernel/intern/blender.c.cve	2008-05-07 17:37:52.000000000 +0200
-+++ blender/source/blender/blenkernel/intern/blender.c	2008-05-07 17:38:22.000000000 +0200
-@@ -716,7 +716,7 @@ void BKE_undo_save_quit(void)
- 		
- 	BLI_make_file_string("/", str, btempdir, "quit.blend");
- 
--	file = open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC, 0666);
-+	file = open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC+O_EXCL, 0666);
- 	if(file == -1) {
- 		error("Unable to save %s, check you have permissions", str);
- 		return;
diff --git a/media-gfx/blender/files/blender-2.46-ffmpeg.patch b/media-gfx/blender/files/blender-2.46-ffmpeg.patch
deleted file mode 100644
index b06854c7e57f..000000000000
--- a/media-gfx/blender/files/blender-2.46-ffmpeg.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -urN blender-2.46/source/blender/blenkernel/intern/writeffmpeg.c blender-2.46.orig/source/blender/blenkernel/intern/writeffmpeg.c
---- blender-2.46/source/blender/blenkernel/intern/writeffmpeg.c	2008-05-20 12:02:12.000000000 +0200
-+++ blender-2.46.orig/source/blender/blenkernel/intern/writeffmpeg.c	2008-05-19 16:38:16.000000000 +0200
-@@ -29,11 +29,11 @@
- 
- #include <stdlib.h>
- 
-+#include <libavformat/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavutil/rational.h>
-+#include <libswscale/swscale.h>
-+#include <libavcodec/opt.h>
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/rational.h>
--#include <ffmpeg/swscale.h>
--#include <ffmpeg/opt.h>
- 
- #if LIBAVFORMAT_VERSION_INT < (49 << 16)
- #define FFMPEG_OLD_FRAME_RATE 1
-diff -urN blender-2.46/source/blender/imbuf/intern/anim.c blender-2.46.orig/source/blender/imbuf/intern/anim.c
---- blender-2.46/source/blender/imbuf/intern/anim.c	2008-05-20 12:05:41.000000000 +0200
-+++ blender-2.46.orig/source/blender/imbuf/intern/anim.c	2008-05-19 16:38:41.000000000 +0200
-@@ -83,10 +83,10 @@
- #include "IMB_anim5.h"
- 
- #ifdef WITH_FFMPEG
-+#include <libavformat/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavutil/rational.h>
-+#include <libswscale/swscale.h>
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/rational.h>
--#include <ffmpeg/swscale.h>
- 
- #if LIBAVFORMAT_VERSION_INT < (49 << 16)
- #define FFMPEG_OLD_FRAME_RATE 1
-diff -urN blender-2.46/source/blender/imbuf/intern/IMB_anim.h blender-2.46.orig/source/blender/imbuf/intern/IMB_anim.h
---- blender-2.46/source/blender/imbuf/intern/IMB_anim.h	2008-05-20 12:04:33.000000000 +0200
-+++ blender-2.46.orig/source/blender/imbuf/intern/IMB_anim.h	2008-05-19 16:38:41.000000000 +0200
-@@ -76,9 +76,9 @@
- #endif /* WITH_QUICKTIME */
- 
- #ifdef WITH_FFMPEG
-+#include <libavformat/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libswscale/swscale.h>
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/swscale.h>
- #endif
- 
- #include "IMB_imbuf_types.h"
-diff -urN blender-2.46/source/blender/imbuf/intern/util.c blender-2.46.orig/source/blender/imbuf/intern/util.c
---- blender-2.46/source/blender/imbuf/intern/util.c	2008-05-20 12:05:04.000000000 +0200
-+++ blender-2.46.orig/source/blender/imbuf/intern/util.c	2008-05-19 16:38:41.000000000 +0200
-@@ -62,8 +62,8 @@
- #endif
- 
- #ifdef WITH_FFMPEG
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
- 
- #if LIBAVFORMAT_VERSION_INT < (49 << 16)
- #define FFMPEG_OLD_FRAME_RATE 1
-diff -urN blender-2.46/source/blender/src/buttons_scene.c blender-2.46.orig/source/blender/src/buttons_scene.c
---- blender-2.46/source/blender/src/buttons_scene.c	2008-05-20 12:03:50.000000000 +0200
-+++ blender-2.46.orig/source/blender/src/buttons_scene.c	2008-05-19 16:38:39.000000000 +0200
-@@ -108,9 +108,9 @@
- 
- #ifdef WITH_FFMPEG
- 
-+#include <libavcodec/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */
-+#include <libavformat/avformat.h>
-+#include <libavcodec/opt.h>
--#include <ffmpeg/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/opt.h>
- 
- static int ffmpeg_preset_sel = 0;
- 
-diff -urN blender-2.46/source/blender/src/hddaudio.c blender-2.46.orig/source/blender/src/hddaudio.c
---- blender-2.46/source/blender/src/hddaudio.c	2008-05-20 12:02:42.000000000 +0200
-+++ blender-2.46.orig/source/blender/src/hddaudio.c	2008-05-19 16:38:39.000000000 +0200
-@@ -33,9 +33,9 @@
- #endif
- 
- #ifdef WITH_FFMPEG
-+#include <libavformat/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavutil/rational.h>
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/rational.h>
- #if LIBAVFORMAT_VERSION_INT < (49 << 16)
- #define FFMPEG_OLD_FRAME_RATE 1
- #else
diff --git a/media-gfx/blender/files/blender-2.48-ffmpeg-20081014.patch b/media-gfx/blender/files/blender-2.48-ffmpeg-20081014.patch
deleted file mode 100644
index 93ae633d7501..000000000000
--- a/media-gfx/blender/files/blender-2.48-ffmpeg-20081014.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: blender-2.47/source/blender/src/hddaudio.c
-===================================================================
---- blender-2.47.orig/source/blender/src/hddaudio.c
-+++ blender-2.47/source/blender/src/hddaudio.c
-@@ -302,7 +302,8 @@ static void sound_hdaudio_extract_small_
- 				audio_pkt_size = packet.size;
- 
- 				while (audio_pkt_size > 0) {
--					len = avcodec_decode_audio(
-+					data_size= AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+					len = avcodec_decode_audio2(
- 						hdaudio->pCodecCtx, 
- 						hdaudio->decode_cache 
- 						+ decode_pos, 
-@@ -469,7 +470,8 @@ static void sound_hdaudio_extract_small_
- 			}
- 
- 			while (audio_pkt_size > 0) {
--				len = avcodec_decode_audio(
-+				data_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+				len = avcodec_decode_audio2(
- 					hdaudio->pCodecCtx, 
- 					hdaudio->decode_cache 
- 					+ decode_pos, 
-
diff --git a/media-gfx/blender/files/blender-2.49a-bake.patch b/media-gfx/blender/files/blender-2.49a-bake.patch
deleted file mode 100644
index 53674da3f4a2..000000000000
--- a/media-gfx/blender/files/blender-2.49a-bake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: source/blender/render/intern/source/rendercore.c
-===================================================================
---- source/blender/render/intern/source/rendercore.c	(revision 21781)
-+++ source/blender/render/intern/source/rendercore.c	(working copy)
-@@ -2241,7 +2241,7 @@
- 	/* no direction checking for now, doesn't always improve the result
- 	 * (INPR(shi->facenor, bs->dir) > 0.0f); */
- 
--	return (R.objectinstance[ob].obr->ob != bs->actob);
-+	return (R.objectinstance[ob & ~RE_RAY_TRANSFORM_OFFS].obr->ob != bs->actob);
- }
- 
- static int bake_intersect_tree(RayTree* raytree, Isect* isect, float *start, float *dir, float sign, float *hitco, float *dist)
diff --git a/media-gfx/blender/files/blender-2.49b-CVE-2009-3850-v3.patch b/media-gfx/blender/files/blender-2.49b-CVE-2009-3850-v3.patch
deleted file mode 100644
index 9cf17a5b7c2e..000000000000
--- a/media-gfx/blender/files/blender-2.49b-CVE-2009-3850-v3.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 072e11130a2f96642972b0d4ac7ad2a9cd19fbf2 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 20 Apr 2011 16:42:17 +0200
-Subject: [PATCH] Flip default of "Auto Run Python Scripts" to disabled 
- (CVE-2009-3850)
-
-Manual overriding through new parameter -666 is supported
----
- source/blender/blenkernel/intern/blender.c  |   11 ++++++++++-
- source/blender/python/api2_2x/sceneRender.c |    3 ++-
- source/creator/creator.c                    |   14 ++++++++++----
- 3 files changed, 22 insertions(+), 6 deletions(-)
-
-diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
-index bf208c8..029b7cf 100644
---- a/source/blender/blenkernel/intern/blender.c
-+++ b/source/blender/blenkernel/intern/blender.c
-@@ -388,7 +388,16 @@ static void setup_app_data(BlendFileData *bfd, char *filename)
- 	if (G.f & G_DEBUG) bfd->globalf |= G_DEBUG;
- 	else bfd->globalf &= ~G_DEBUG;
- 
--	if ((U.flag & USER_DONT_DOSCRIPTLINKS)) bfd->globalf &= ~G_DOSCRIPTLINKS;
-+	if (G.f & G_DOSCRIPTLINKS) {
-+		/* Blender running in -666 mode */
-+		/* NOTE: In background mode U.flag has not been initialized from ~/.B.blend */
-+		if (! G.background && (U.flag & USER_DONT_DOSCRIPTLINKS))
-+			/* Prefer disabled "Auto Run Python Scripts" over -666 */
-+			bfd->globalf &= ~G_DOSCRIPTLINKS;
-+	} else {
-+		/* Blender NOT running in -666 mode, deny pulling G_DOSCRIPTLINKS in */
-+		bfd->globalf &= ~G_DOSCRIPTLINKS;
-+	}
- 
- 	G.f= bfd->globalf;
- 
-diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c
-index 1bf2b75..e34a361 100644
---- a/source/blender/python/api2_2x/sceneRender.c
-+++ b/source/blender/python/api2_2x/sceneRender.c
-@@ -498,7 +498,8 @@ static PyObject *RenderData_Render( BPy_RenderData * self )
- 
- 		RE_BlenderFrame(re, G.scene, G.scene->r.cfra);
- 
--		BPY_do_all_scripts(SCRIPT_POSTRENDER, 0);
-+		if (G.f & G_DOSCRIPTLINKS)
-+			BPY_do_all_scripts(SCRIPT_POSTRENDER, 0);
- 
- 		set_scene_bg( oldsce );
- 	}
-diff --git a/source/creator/creator.c b/source/creator/creator.c
-index a562fc3..994180d 100644
---- a/source/creator/creator.c
-+++ b/source/creator/creator.c
-@@ -232,7 +232,8 @@ static void print_help(void)
- 	printf ("  -nojoystick\tDisable joystick support\n");
- 	printf ("  -noglsl\tDisable GLSL shading\n");
- 	printf ("  -h\t\tPrint this help text\n");
--	printf ("  -y\t\tDisable automatic python script execution (scriptlinks, pydrivers, pyconstraints, pynodes)\n");
-+	printf ("  -666\t\tEnables automatic python script execution (scriptlinks, pydrivers, pyconstraints, pynodes)\n");
-+	printf ("  -y\t\tDisable automatic python script execution (scriptlinks, pydrivers, pyconstraints, pynodes) (default)\n");
- 	printf ("  -P <filename>\tRun the given Python script (filename or Blender Text)\n");
- #ifdef WIN32
- 	printf ("  -R\t\tRegister .blend extension\n");
-@@ -366,7 +367,7 @@ int main(int argc, char **argv)
- 
- 	/* first test for background */
- 
--	G.f |= G_DOSCRIPTLINKS; /* script links enabled by default */
-+	G.f &= ~G_DOSCRIPTLINKS; /* script links disabled by default */
- 
- 	for(a=1; a<argc; a++) {
- 
-@@ -388,6 +389,10 @@ int main(int argc, char **argv)
- 			exit(0);
- 		}
- 
-+		if (!strcmp(argv[a], "-666")){
-+			G.f |= G_DOSCRIPTLINKS;
-+		}
-+
- 		/* Handle -* switches */
- 		else if(argv[a][0] == '-') {
- 			switch(argv[a][1]) {
-@@ -405,7 +410,7 @@ int main(int argc, char **argv)
- 				a= argc;
- 				break;
- 
--			case 'y':
-+			case 'y':  /* NOTE: -y works the exact opposite way in version 2.57! */
- 				G.f &= ~G_DOSCRIPTLINKS;
- 				break;
- 
-@@ -680,7 +685,8 @@ int main(int argc, char **argv)
- #endif
- 						RE_BlenderAnim(re, G.scene, frame, frame, G.scene->frame_step);
- #ifndef DISABLE_PYTHON
--						BPY_do_all_scripts(SCRIPT_POSTRENDER, 0);
-+						if (G.f & G_DOSCRIPTLINKS)
-+							BPY_do_all_scripts(SCRIPT_POSTRENDER, 0);
- #endif
- 					}
- 				} else {
--- 
-1.7.5.rc1
-
diff --git a/media-gfx/blender/files/blender-2.57-CVE-2009-3850-v1.patch b/media-gfx/blender/files/blender-2.57-CVE-2009-3850-v1.patch
deleted file mode 100644
index 9c0f39fafad6..000000000000
--- a/media-gfx/blender/files/blender-2.57-CVE-2009-3850-v1.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From dfb6ecd9a4a129b976b7a8d2002e32146125340f Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 24 Apr 2011 18:26:47 +0200
-Subject: [PATCH] Disable execution of embedded Python code unless run with
- --enable-autoexec|-y|-666  (CVE-2009-3850)
-
----
- source/blender/blenkernel/intern/blender.c     |    3 ++-
- source/blender/makesrna/intern/rna_userdef.c   |    9 ++++++---
- source/blender/windowmanager/intern/wm_files.c |    3 ++-
- source/creator/creator.c                       |   10 ++++++----
- 4 files changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
-index 5f08505..9c27ac7 100644
---- a/source/blender/blenkernel/intern/blender.c
-+++ b/source/blender/blenkernel/intern/blender.c
-@@ -141,7 +141,8 @@ void initglobals(void)
- 	G.charmin = 0x0000;
- 	G.charmax = 0xffff;
- 	
--	G.f |= G_SCRIPT_AUTOEXEC;
-+	G.f &= ~G_SCRIPT_AUTOEXEC;
-+	G.f |= G_SCRIPT_OVERRIDE_PREF;  /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- }
- 
- /***/
-diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
-index e9a9ddc..a120857 100644
---- a/source/blender/makesrna/intern/rna_userdef.c
-+++ b/source/blender/makesrna/intern/rna_userdef.c
-@@ -99,9 +99,12 @@ static void rna_userdef_show_manipulator_update(Main *bmain, Scene *scene, Point
- 
- static void rna_userdef_script_autoexec_update(Main *bmain, Scene *scene, PointerRNA *ptr)
- {
--	UserDef *userdef = (UserDef*)ptr->data;
--	if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE)	G.f &= ~G_SCRIPT_AUTOEXEC;
--	else												G.f |=  G_SCRIPT_AUTOEXEC;
-+	if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+		/* Blender run with --enable-autoexec */
-+		UserDef *userdef = (UserDef*)ptr->data;
-+		if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE)	G.f &= ~G_SCRIPT_AUTOEXEC;
-+		else												G.f |=  G_SCRIPT_AUTOEXEC;
-+	}
- }
- 
- static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr)
-diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
-index f4f7af0..c1bacc6 100644
---- a/source/blender/windowmanager/intern/wm_files.c
-+++ b/source/blender/windowmanager/intern/wm_files.c
-@@ -270,7 +270,8 @@ static void wm_init_userdef(bContext *C)
- 
- 	/* set the python auto-execute setting from user prefs */
- 	/* enabled by default, unless explicitly enabled in the command line which overrides */
--	if((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+	if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) {
-+		/* Blender run with --enable-autoexec */
- 		if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |=  G_SCRIPT_AUTOEXEC;
- 		else											  G.f &= ~G_SCRIPT_AUTOEXEC;
- 	}
-diff --git a/source/creator/creator.c b/source/creator/creator.c
-index c687cc2..1da282f 100644
---- a/source/creator/creator.c
-+++ b/source/creator/creator.c
-@@ -278,6 +278,7 @@ static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data)
- 
- 	printf("\n");
- 
-+	BLI_argsPrintArgDoc(ba, "-666");
- 	BLI_argsPrintArgDoc(ba, "--enable-autoexec");
- 	BLI_argsPrintArgDoc(ba, "--disable-autoexec");
- 
-@@ -359,14 +360,14 @@ static int end_arguments(int UNUSED(argc), const char **UNUSED(argv), void *UNUS
- static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- 	G.f |= G_SCRIPT_AUTOEXEC;
--	G.f |= G_SCRIPT_OVERRIDE_PREF;
-+	G.f &= ~G_SCRIPT_OVERRIDE_PREF;  /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */
- 	return 0;
- }
- 
- static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- 	G.f &= ~G_SCRIPT_AUTOEXEC;
--	G.f |= G_SCRIPT_OVERRIDE_PREF;
-+	G.f |= G_SCRIPT_OVERRIDE_PREF;  /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- 	return 0;
- }
- 
-@@ -1075,8 +1076,9 @@ static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
- 
- 	BLI_argsAdd(ba, 1, "-v", "--version", "\n\tPrint Blender version and exit", print_version, NULL);
- 
--	BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution (default)", enable_python, NULL);
--	BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)", disable_python, NULL);
-+	BLI_argsAdd(ba, 1, NULL, "-666", "\n\tEnable automatic python script execution (port from CVE-2009-3850 patch to Blender 2.49b)", enable_python, NULL);
-+	BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution", enable_python, NULL);
-+	BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes) (default)", disable_python, NULL);
- 
- 	BLI_argsAdd(ba, 1, "-b", "--background", "<file>\n\tLoad <file> in background (often used for UI-less rendering)", background_mode, NULL);
- 
--- 
-1.7.5.rc1
-
diff --git a/media-gfx/blender/files/blender-2.57-CVE-2009-3850-v2.patch b/media-gfx/blender/files/blender-2.57-CVE-2009-3850-v2.patch
deleted file mode 100644
index 526e0f7f98ae..000000000000
--- a/media-gfx/blender/files/blender-2.57-CVE-2009-3850-v2.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From c4181c5639da5c6a6df31b434498a44d0d680487 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 17 May 2011 17:37:11 +0200
-Subject: [PATCH] Disable execution of embedded Python code unless run with
- --enable-autoexec|-y|-666  (CVE-2009-3850)
-
----
- source/blender/blenkernel/intern/blender.c         |    3 ++-
- source/blender/makesrna/intern/rna_userdef.c       |   16 +++++++++++++---
- source/blender/windowmanager/intern/wm_files.c     |    7 ++++++-
- source/blender/windowmanager/intern/wm_operators.c |   16 ++++++++++++----
- source/creator/creator.c                           |   10 ++++++----
- 5 files changed, 39 insertions(+), 13 deletions(-)
-
-diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
-index 5f08505..9c27ac7 100644
---- a/source/blender/blenkernel/intern/blender.c
-+++ b/source/blender/blenkernel/intern/blender.c
-@@ -141,7 +141,8 @@ void initglobals(void)
- 	G.charmin = 0x0000;
- 	G.charmax = 0xffff;
- 	
--	G.f |= G_SCRIPT_AUTOEXEC;
-+	G.f &= ~G_SCRIPT_AUTOEXEC;
-+	G.f |= G_SCRIPT_OVERRIDE_PREF;  /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- }
- 
- /***/
-diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
-index e9a9ddc..218b50a 100644
---- a/source/blender/makesrna/intern/rna_userdef.c
-+++ b/source/blender/makesrna/intern/rna_userdef.c
-@@ -99,9 +99,17 @@ static void rna_userdef_show_manipulator_update(Main *bmain, Scene *scene, Point
- 
- static void rna_userdef_script_autoexec_update(Main *bmain, Scene *scene, PointerRNA *ptr)
- {
--	UserDef *userdef = (UserDef*)ptr->data;
--	if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE)	G.f &= ~G_SCRIPT_AUTOEXEC;
--	else												G.f |=  G_SCRIPT_AUTOEXEC;
-+	if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+		/* Blender run with --enable-autoexec */
-+		UserDef *userdef = (UserDef*)ptr->data;
-+		if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE)	G.f &= ~G_SCRIPT_AUTOEXEC;
-+		else												G.f |=  G_SCRIPT_AUTOEXEC;
-+	}
-+}
-+
-+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) {
-+	/* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+	return !(G.f & G_SCRIPT_OVERRIDE_PREF);
- }
- 
- static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr)
-@@ -2505,6 +2513,8 @@ static void rna_def_userdef_system(BlenderRNA *brna)
- 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_SCRIPT_AUTOEXEC_DISABLE);
- 	RNA_def_property_ui_text(prop, "Auto Run Python Scripts", "Allow any .blend file to run scripts automatically (unsafe with blend files from an untrusted source)");
- 	RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update");
-+	/* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+	RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable");
- 
- 	prop= RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE);
- 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE);
-diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
-index f4f7af0..37a9664 100644
---- a/source/blender/windowmanager/intern/wm_files.c
-+++ b/source/blender/windowmanager/intern/wm_files.c
-@@ -270,11 +270,16 @@ static void wm_init_userdef(bContext *C)
- 
- 	/* set the python auto-execute setting from user prefs */
- 	/* enabled by default, unless explicitly enabled in the command line which overrides */
--	if((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+	if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) {
-+		/* Blender run with --enable-autoexec */
- 		if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |=  G_SCRIPT_AUTOEXEC;
- 		else											  G.f &= ~G_SCRIPT_AUTOEXEC;
- 	}
- 	if(U.tempdir[0]) BLI_where_is_temp(btempdir, FILE_MAX, 1);
-+
-+	/* Workaround to fix default of "Auto Run Python Scripts" checkbox */
-+	if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC))
-+		U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE;
- }
- 
- void WM_read_file(bContext *C, const char *name, ReportList *reports)
-diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
-index 28df023..a2142a5 100644
---- a/source/blender/windowmanager/intern/wm_operators.c
-+++ b/source/blender/windowmanager/intern/wm_operators.c
-@@ -1471,12 +1471,13 @@ static int wm_open_mainfile_exec(bContext *C, wmOperator *op)
- 		G.fileflags &= ~G_FILE_NO_UI;
- 	else
- 		G.fileflags |= G_FILE_NO_UI;
--		
--	if(RNA_boolean_get(op->ptr, "use_scripts"))
-+
-+	/* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */
-+	if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF)))
- 		G.f |= G_SCRIPT_AUTOEXEC;
- 	else
- 		G.f &= ~G_SCRIPT_AUTOEXEC;
--	
-+
- 	// XXX wm in context is not set correctly after WM_read_file -> crash
- 	// do it before for now, but is this correct with multiple windows?
- 	WM_event_add_notifier(C, NC_WINDOW, NULL);
-@@ -1488,6 +1489,8 @@ static int wm_open_mainfile_exec(bContext *C, wmOperator *op)
- 
- static void WM_OT_open_mainfile(wmOperatorType *ot)
- {
-+	PropertyRNA * use_scripts_checkbox = NULL;
-+
- 	ot->name= "Open Blender File";
- 	ot->idname= "WM_OT_open_mainfile";
- 	ot->description="Open a Blender file";
-@@ -1499,7 +1502,12 @@ static void WM_OT_open_mainfile(wmOperatorType *ot)
- 	WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH);
- 
- 	RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file");
--	RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", "Allow blend file execute scripts automatically, default available from system preferences");
-+	use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts",
-+			!!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source",
-+			"Allow blend file execute scripts automatically, default available from system preferences");
-+	/* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */
-+	if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF))
-+		RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE);
- }
- 
- /* **************** link/append *************** */
-diff --git a/source/creator/creator.c b/source/creator/creator.c
-index c687cc2..1da282f 100644
---- a/source/creator/creator.c
-+++ b/source/creator/creator.c
-@@ -278,6 +278,7 @@ static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data)
- 
- 	printf("\n");
- 
-+	BLI_argsPrintArgDoc(ba, "-666");
- 	BLI_argsPrintArgDoc(ba, "--enable-autoexec");
- 	BLI_argsPrintArgDoc(ba, "--disable-autoexec");
- 
-@@ -359,14 +360,14 @@ static int end_arguments(int UNUSED(argc), const char **UNUSED(argv), void *UNUS
- static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- 	G.f |= G_SCRIPT_AUTOEXEC;
--	G.f |= G_SCRIPT_OVERRIDE_PREF;
-+	G.f &= ~G_SCRIPT_OVERRIDE_PREF;  /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */
- 	return 0;
- }
- 
- static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- 	G.f &= ~G_SCRIPT_AUTOEXEC;
--	G.f |= G_SCRIPT_OVERRIDE_PREF;
-+	G.f |= G_SCRIPT_OVERRIDE_PREF;  /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- 	return 0;
- }
- 
-@@ -1075,8 +1076,9 @@ static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
- 
- 	BLI_argsAdd(ba, 1, "-v", "--version", "\n\tPrint Blender version and exit", print_version, NULL);
- 
--	BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution (default)", enable_python, NULL);
--	BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)", disable_python, NULL);
-+	BLI_argsAdd(ba, 1, NULL, "-666", "\n\tEnable automatic python script execution (port from CVE-2009-3850 patch to Blender 2.49b)", enable_python, NULL);
-+	BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution", enable_python, NULL);
-+	BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes) (default)", disable_python, NULL);
- 
- 	BLI_argsAdd(ba, 1, "-b", "--background", "<file>\n\tLoad <file> in background (often used for UI-less rendering)", background_mode, NULL);
- 
--- 
-1.7.5.rc3
-
diff --git a/media-gfx/blender/files/blender-2.57-bmake.patch b/media-gfx/blender/files/blender-2.57-bmake.patch
deleted file mode 100644
index b78d5a4246ec..000000000000
--- a/media-gfx/blender/files/blender-2.57-bmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- release/plugins/bmake	2010-03-21 17:44:20.500741049 +0100
-+++ release/plugins/bmake	2010-03-21 17:44:33.659740173 +0100
-@@ -57,10 +57,10 @@
- 	LDFLAGS="-Bshareable";
- elif ( test $UNAME = "Linux" ) then
- 	CC="gcc";
--	CFLAGS="-fPIC -funsigned-char -O2";
-+#	CFLAGS="-fPIC -funsigned-char -O2";
- 
- 	LD="ld";
--	LDFLAGS="-Bshareable";
-+#	LDFLAGS="-Bshareable";
- elif ( test $UNAME = "SunOS" ) then
- 	CC="cc";
- 	CFLAGS="-O";
diff --git a/media-gfx/blender/files/blender-2.57-desktop.patch b/media-gfx/blender/files/blender-2.57-desktop.patch
deleted file mode 100644
index 6a40e3b95cb1..000000000000
--- a/media-gfx/blender/files/blender-2.57-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- release/freedesktop/blender.desktop	2010-09-12 00:05:51.000000000 -0700
-+++ release/freedesktop/blender.desktop	2010-09-12 00:07:32.000000000 -0700
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Blender
-+Name=Blender 2.5x
- GenericName=3D modeller
- GenericName[es]=modelador 3D
- GenericName[de]=3D Modellierer
-@@ -7,8 +7,8 @@
- GenericName[ru]=Редактор 3D-моделей
- Comment=3D modeling, animation, rendering and post-production
- Comment[es]=modelado 3D, animación, renderizado y post-producción
--Exec=blender
--Icon=blender
-+Exec=blender-2.5
-+Icon=blender-2.5.svg
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;
diff --git a/media-gfx/blender/files/blender-2.57-doxygen.patch b/media-gfx/blender/files/blender-2.57-doxygen.patch
deleted file mode 100644
index 335b289bfa92..000000000000
--- a/media-gfx/blender/files/blender-2.57-doxygen.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- doc/doxygen/Doxyfile	2011-02-19 18:51:40.216999981 +0100
-+++ doc/doxygen/Doxyfile	2011-02-19 18:57:46.628999965 +0100
-@@ -559,26 +559,26 @@
- # The QUIET tag can be used to turn on/off the messages that are generated 
- # by doxygen. Possible values are YES and NO. If left blank NO is used.
- 
--QUIET                  = NO
-+QUIET                  = YES
- 
- # The WARNINGS tag can be used to turn on/off the warning messages that are 
- # generated by doxygen. Possible values are YES and NO. If left blank 
- # NO is used.
- 
--WARNINGS               = YES
-+WARNINGS               = NO
- 
- # If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
- # for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
- # automatically be disabled.
- 
--WARN_IF_UNDOCUMENTED   = YES
-+WARN_IF_UNDOCUMENTED   = NO
- 
- # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
- # potential errors in the documentation, such as not documenting some 
- # parameters in a documented function, or documenting parameters that 
- # don't exist or using markup commands wrongly.
- 
--WARN_IF_DOC_ERROR      = YES
-+WARN_IF_DOC_ERROR      = NO
- 
- # The WARN_NO_PARAMDOC option can be enabled to get warnings for 
- # functions that are documented, but have no documentation for their parameters 
diff --git a/media-gfx/blender/files/blender-2.57-eigen.patch b/media-gfx/blender/files/blender-2.57-eigen.patch
deleted file mode 100644
index 91d8af4a6ea7..000000000000
--- a/media-gfx/blender/files/blender-2.57-eigen.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- intern/itasc/SConscript	2009-09-26 09:14:02.000000000 +0200
-+++ intern/itasc/SConscript	2009-09-26 09:14:54.000000000 +0200
-@@ -5,7 +5,8 @@
- sources += env.Glob('kdl/*.cpp')
- sources += env.Glob('kdl/utilities/*.cpp')
- 
--incs = '. ../../extern/Eigen2'
-+#incs = '. ../../extern/Eigen2'
-+incs = '. /usr/include/eigen2'
- 
- env.BlenderLib ('bf_ITASC', sources, Split(incs), [], libtype=['intern','player'], priority=[20,100] )
- 
---- source/blender/ikplugin/SConscript
-+++ source/blender/ikplugin/SConscript
-@@ -4,6 +4,6 @@
- sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
- 
- incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
--incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen2'
-+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen2'
- 
- env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), [], libtype=['core','player'], priority=[180, 190] )
diff --git a/media-gfx/blender/files/blender-2.57-enable_site_module.patch b/media-gfx/blender/files/blender-2.57-enable_site_module.patch
deleted file mode 100644
index c38be79bd16f..000000000000
--- a/media-gfx/blender/files/blender-2.57-enable_site_module.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- source/blender/python/intern/bpy_interface.c
-+++ source/blender/python/intern/bpy_interface.c
-@@ -244,11 +244,6 @@
- 
- 	bpy_python_start_path(); /* allow to use our own included python */
- 
--	/* Python 3.2 now looks for '2.57/python/include/python3.2d/pyconfig.h' to parse
--	 * from the 'sysconfig' module which is used by 'site', so for now disable site.
--	 * alternatively we could copy the file. */
--	Py_NoSiteFlag= 1;
--
- 	Py_Initialize();
- 	
- 	// PySys_SetArgv(argc, argv); // broken in py3, not a huge deal
---- source/gameengine/Ketsji/KX_PythonInit.cpp
-+++ source/gameengine/Ketsji/KX_PythonInit.cpp
-@@ -1773,7 +1773,6 @@
- 	STR_String pname = progname;
- 	Py_SetProgramName(pname.Ptr());
- #endif
--	Py_NoSiteFlag=1;
- 	Py_FrozenFlag=1;
- 
- 	/* must run before python initializes */
-@@ -1843,7 +1842,6 @@
- 	STR_String pname = progname;
- 	Py_SetProgramName(pname.Ptr());
- #endif
--	Py_NoSiteFlag=1;
- 	Py_FrozenFlag=1;
- 
- 	initPyTypes();
diff --git a/media-gfx/blender/files/blender-2.57-glew.patch b/media-gfx/blender/files/blender-2.57-glew.patch
deleted file mode 100644
index 5e63c7c54a91..000000000000
--- a/media-gfx/blender/files/blender-2.57-glew.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- extern/SConscript
-+++ extern/SConscript
-@@ -2,8 +2,6 @@
- 
- Import('env')
- 
--SConscript(['glew/SConscript'])
--
- if env['WITH_BF_BULLET']:
-     SConscript(['bullet2/src/SConscript'])
- 
---- source/blender/editors/include/BIF_gl.h
-+++ source/blender/editors/include/BIF_gl.h
-@@ -31,7 +31,7 @@
- #ifndef BIF_GL_H
- #define BIF_GL_H
- 
--#include "GL/glew.h"
-+#include <GL/glew.h>
- 
- 	/*
- 	 * these should be phased out. cpack should be replaced in
diff --git a/media-gfx/blender/files/blender-2.57-insecure.desktop b/media-gfx/blender/files/blender-2.57-insecure.desktop
deleted file mode 100644
index e427957dc414..000000000000
--- a/media-gfx/blender/files/blender-2.57-insecure.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Blender 2.5x (reduced security)
-GenericName=3D modeller (reduced security)
-GenericName[es]=modelador 3D (reduced security)
-GenericName[de]=3D Modellierer (weniger Sicherheit)
-GenericName[fr]=modeleur 3D (reduced security)
-GenericName[ru]=Редактор 3D-моделей (reduced security)
-Comment=3D modeling, animation, rendering and post-production
-Comment[es]=modelado 3D, animación, renderizado y post-producción
-Exec=blender-2.5 --enable-autoexec
-Icon=blender-2.5.svg
-Terminal=false
-Type=Application
-Categories=Graphics;3DGraphics;
-MimeType=application/x-blender;
diff --git a/media-gfx/blender/files/blender-2.57-libav-0.7.patch b/media-gfx/blender/files/blender-2.57-libav-0.7.patch
deleted file mode 100644
index 7b4ca47ed235..000000000000
--- a/media-gfx/blender/files/blender-2.57-libav-0.7.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-diff -burN blender-2.57.orig//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp blender-2.57/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
---- blender-2.57.orig//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2011-04-14 17:06:35.000000000 +0200
-+++ blender-2.57/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2011-05-04 01:44:30.184004582 +0200
-@@ -64,15 +64,10 @@
- 
- 		// read samples from the packet
- 		data_size = buf_size - buf_pos;
--		/*read_length = avcodec_decode_audio3(m_codecCtx,
-+		read_length = avcodec_decode_audio3(m_codecCtx,
- 			(int16_t*)(((data_t*)buffer.getBuffer())+buf_pos),
- 			&data_size,
--			packet);*/
--		read_length = avcodec_decode_audio2(m_codecCtx,
--						(int16_t*)(((data_t*)buffer.getBuffer()) + buf_pos),
--						&data_size,
--						audio_pkg_data,
--						audio_pkg_size);
-+			packet);
- 
- 		// read error, next packet!
- 		if(read_length < 0)
-@@ -112,7 +107,7 @@
- 
- 	for(unsigned int i = 0; i < m_formatCtx->nb_streams; i++)
- 	{
--		if((m_formatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
-+		if((m_formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
- 			&& (m_stream < 0))
- 		{
- 			m_stream=i;
-diff -burN blender-2.57.orig//source/blender/blenkernel/intern/writeffmpeg.c blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c
---- blender-2.57.orig//source/blender/blenkernel/intern/writeffmpeg.c	2011-04-14 17:17:03.000000000 +0200
-+++ blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c	2011-05-04 03:36:08.365219076 +0200
-@@ -163,7 +163,7 @@
- 	}
- 
- 	pkt.stream_index = audio_stream->index;
--	pkt.flags |= PKT_FLAG_KEY;
-+	pkt.flags |= AV_PKT_FLAG_KEY;
- 	if (av_interleaved_write_frame(outfile, &pkt) != 0) {
- 		fprintf(stderr, "Error writing audio packet!\n");
- 		return -1;
-@@ -290,7 +290,7 @@
- 			fprintf(stderr, "Video Frame PTS: not set\n");
- 		}
- 		if (c->coded_frame->key_frame)
--			packet.flags |= PKT_FLAG_KEY;
-+			packet.flags |= AV_PKT_FLAG_KEY;
- 		packet.stream_index = video_stream->index;
- 		packet.data = video_buffer;
- 		packet.size = outsize;
-@@ -396,7 +396,7 @@
- 	switch(prop->type) {
- 	case IDP_STRING:
- 		fprintf(stderr, "%s.\n", IDP_String(prop));
--		rv = av_set_string(c, prop->name, IDP_String(prop));
-+		av_set_string3(c, prop->name, IDP_String(prop), 0, &rv);
- 		break;
- 	case IDP_FLOAT:
- 		fprintf(stderr, "%g.\n", IDP_Float(prop));
-@@ -407,7 +407,7 @@
- 		
- 		if (param) {
- 			if (IDP_Int(prop)) {
--				rv = av_set_string(c, name, param);
-+				av_set_string3(c, name, param, 0, &rv);
- 			} else {
- 				return;
- 			}
-@@ -461,7 +461,7 @@
- 	
- 	c = get_codec_from_stream(st);
- 	c->codec_id = codec_id;
--	c->codec_type = CODEC_TYPE_VIDEO;
-+	c->codec_type = AVMEDIA_TYPE_VIDEO;
- 
- 
- 	/* Get some values from the current render settings */
-@@ -519,7 +519,7 @@
- 		c->pix_fmt = PIX_FMT_YUV422P;
- 	}
- 
--	if (codec_id == CODEC_ID_XVID) {
-+	if (codec_id == CODEC_ID_MPEG4) {
- 		/* arghhhh ... */
- 		c->pix_fmt = PIX_FMT_YUV420P;
- 		c->codec_tag = (('D'<<24) + ('I'<<16) + ('V'<<8) + 'X');
-@@ -588,7 +588,7 @@
- 
- 	c = get_codec_from_stream(st);
- 	c->codec_id = codec_id;
--	c->codec_type = CODEC_TYPE_AUDIO;
-+	c->codec_type = AVMEDIA_TYPE_AUDIO;
- 
- 	c->sample_rate = rd->ffcodecdata.audio_mixrate;
- 	c->bit_rate = ffmpeg_audio_bitrate*1000;
-@@ -666,13 +666,13 @@
- 		BKE_report(reports, RPT_ERROR, "No valid formats found.");
- 		return 0;
- 	}
--	fmt = guess_format(NULL, exts[0], NULL);
-+	fmt = av_guess_format(NULL, exts[0], NULL);
- 	if (!fmt) {
- 		BKE_report(reports, RPT_ERROR, "No valid formats found.");
- 		return 0;
- 	}
- 
--	of = av_alloc_format_context();
-+	of = avformat_alloc_context();
- 	if (!of) {
- 		BKE_report(reports, RPT_ERROR, "Error opening output file");
- 		return 0;
-@@ -713,7 +713,7 @@
- 		fmt->video_codec = CODEC_ID_H264;
- 		break;
- 	case FFMPEG_XVID:
--		fmt->video_codec = CODEC_ID_XVID;
-+		fmt->video_codec = CODEC_ID_MPEG4;
- 		break;
- 	case FFMPEG_FLV:
- 		fmt->video_codec = CODEC_ID_FLV1;
-@@ -834,7 +834,7 @@
- 			fprintf(stderr, "Video Frame PTS: not set\n");
- 		}
- 		if (c->coded_frame->key_frame) {
--			packet.flags |= PKT_FLAG_KEY;
-+			packet.flags |= AV_PKT_FLAG_KEY;
- 		}
- 		packet.stream_index = video_stream->index;
- 		packet.data = video_buffer;
-@@ -1314,7 +1314,7 @@
- 	case FFMPEG_PRESET_XVID:
- 		if(preset == FFMPEG_PRESET_XVID) {
- 			rd->ffcodecdata.type = FFMPEG_AVI;
--			rd->ffcodecdata.codec = CODEC_ID_XVID;
-+			rd->ffcodecdata.codec = CODEC_ID_MPEG4;
- 		}
- 		else if(preset == FFMPEG_PRESET_THEORA) {
- 			rd->ffcodecdata.type = FFMPEG_OGG; // XXX broken
-@@ -1357,7 +1357,7 @@
- 		}
- 	}
- 	else if(rd->imtype == R_XVID) {
--		if(rd->ffcodecdata.codec != CODEC_ID_XVID) {
-+		if(rd->ffcodecdata.codec != CODEC_ID_MPEG4) {
- 			ffmpeg_set_preset(rd, FFMPEG_PRESET_XVID);
- 			audio= 1;
- 		}
-diff -burN blender-2.57.orig//source/blender/imbuf/intern/anim_movie.c blender-2.57/source/blender/imbuf/intern/anim_movie.c
---- blender-2.57.orig//source/blender/imbuf/intern/anim_movie.c	2011-04-14 17:19:18.000000000 +0200
-+++ blender-2.57/source/blender/imbuf/intern/anim_movie.c	2011-05-04 03:33:56.724566283 +0200
-@@ -566,7 +566,7 @@
- 	videoStream=-1;
- 	for(i=0; i<pFormatCtx->nb_streams; i++)
- 		if(get_codec_from_stream(pFormatCtx->streams[i])->codec_type
--		   == CODEC_TYPE_VIDEO)	{
-+		   == AVMEDIA_TYPE_VIDEO)	{
- 			videoStream=i;
- 			break;
- 		}
-@@ -830,10 +830,10 @@
- 			&& position - (anim->curposition + 1) < anim->preseek) {
- 			while(av_read_frame(anim->pFormatCtx, &packet)>=0) {
- 				if (packet.stream_index == anim->videoStream) {
--					avcodec_decode_video(
-+					avcodec_decode_video2(
- 						anim->pCodecCtx, 
- 						anim->pFrame, &frameFinished, 
--						packet.data, packet.size);
-+						&packet);
- 
- 					if (frameFinished) {
- 						anim->curposition++;
-@@ -915,9 +915,9 @@
- 
- 	while(av_read_frame(anim->pFormatCtx, &packet)>=0) {
- 		if(packet.stream_index == anim->videoStream) {
--			avcodec_decode_video(anim->pCodecCtx, 
-+			avcodec_decode_video2(anim->pCodecCtx,
- 						 anim->pFrame, &frameFinished, 
--						 packet.data, packet.size);
-+						 &packet);
- 
- 			if (seek_by_bytes && preseek_count > 0) {
- 				preseek_count--;
-diff -burN blender-2.57.orig//source/blender/imbuf/intern/util.c blender-2.57/source/blender/imbuf/intern/util.c
---- blender-2.57.orig//source/blender/imbuf/intern/util.c	2011-04-14 17:19:18.000000000 +0200
-+++ blender-2.57/source/blender/imbuf/intern/util.c	2011-05-04 02:15:26.369208909 +0200
-@@ -292,7 +292,7 @@
- 	for(i=0; i<pFormatCtx->nb_streams; i++)
- 		if(pFormatCtx->streams[i] &&
- 		   get_codec_from_stream(pFormatCtx->streams[i]) && 
--		  (get_codec_from_stream(pFormatCtx->streams[i])->codec_type==CODEC_TYPE_VIDEO))
-+		  (get_codec_from_stream(pFormatCtx->streams[i])->codec_type==AVMEDIA_TYPE_VIDEO))
- 		{
- 			videoStream=i;
- 			break;
-diff -burN blender-2.57.orig//source/blender/makesrna/intern/rna_scene.c blender-2.57/source/blender/makesrna/intern/rna_scene.c
---- blender-2.57.orig//source/blender/makesrna/intern/rna_scene.c	2011-04-14 17:18:53.000000000 +0200
-+++ blender-2.57/source/blender/makesrna/intern/rna_scene.c	2011-05-04 02:19:10.326319453 +0200
-@@ -2135,7 +2135,7 @@
- 		{CODEC_ID_HUFFYUV, "HUFFYUV", 0, "HuffYUV", ""},
- 		{CODEC_ID_DVVIDEO, "DV", 0, "DV", ""},
- 		{CODEC_ID_H264, "H264", 0, "H.264", ""},
--		{CODEC_ID_XVID, "XVID", 0, "Xvid", ""},
-+		{CODEC_ID_MPEG4, "XVID", 0, "Xvid", ""},
- 		{CODEC_ID_THEORA, "THEORA", 0, "Theora", ""},
- 		{CODEC_ID_FLV1, "FLASH", 0, "Flash Video", ""},
- 		{CODEC_ID_FFV1, "FFV1", 0, "FFmpeg video codec #1", ""},
-diff -burN blender-2.57.orig//source/gameengine/VideoTexture/VideoFFmpeg.cpp blender-2.57/source/gameengine/VideoTexture/VideoFFmpeg.cpp
---- blender-2.57.orig//source/gameengine/VideoTexture/VideoFFmpeg.cpp	2011-04-14 17:13:34.000000000 +0200
-+++ blender-2.57/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2011-05-04 02:49:31.147348425 +0200
-@@ -182,7 +182,7 @@
- 	{
- 		if(formatCtx->streams[i] &&
- 			get_codec_from_stream(formatCtx->streams[i]) && 
--			(get_codec_from_stream(formatCtx->streams[i])->codec_type==CODEC_TYPE_VIDEO))
-+			(get_codec_from_stream(formatCtx->streams[i])->codec_type==AVMEDIA_TYPE_VIDEO))
- 		{
- 			videoStream=i;
- 			break;
-@@ -368,9 +368,9 @@
- 				BLI_remlink(&video->m_packetCacheBase, cachePacket);
- 				// use m_frame because when caching, it is not used in main thread
- 				// we can't use currentFrame directly because we need to convert to RGB first
--				avcodec_decode_video(video->m_codecCtx, 
-+				avcodec_decode_video2(video->m_codecCtx,
- 					video->m_frame, &frameFinished, 
--					cachePacket->packet.data, cachePacket->packet.size);
-+					&cachePacket->packet);
- 				if(frameFinished) 
- 				{
- 					AVFrame * input = video->m_frame;
-@@ -641,7 +641,7 @@
- 	if (m_captRate <= 0.f)
- 		m_captRate = defFrameRate;
- 	sprintf(rateStr, "%f", m_captRate);
--	av_parse_video_frame_rate(&frameRate, rateStr);
-+	av_parse_video_rate(&frameRate, rateStr);
- 	// populate format parameters
- 	// need to specify the time base = inverse of rate
- 	formatParams.time_base.num = frameRate.den;
-@@ -924,10 +924,10 @@
- 			{
- 				if (packet.stream_index == m_videoStream) 
- 				{
--					avcodec_decode_video(
-+					avcodec_decode_video2(
- 						m_codecCtx, 
- 						m_frame, &frameFinished, 
--						packet.data, packet.size);
-+						&packet);
- 					if (frameFinished)
- 					{
- 						m_curPosition = (long)((packet.dts-startTs) * (m_baseFrameRate*timeBase) + 0.5);
-@@ -999,9 +999,9 @@
- 	{
- 		if(packet.stream_index == m_videoStream) 
- 		{
--			avcodec_decode_video(m_codecCtx, 
-+			avcodec_decode_video2(m_codecCtx,
- 				m_frame, &frameFinished, 
--				packet.data, packet.size);
-+				&packet);
- 			// remember dts to compute exact frame number
- 			dts = packet.dts;
- 			if (frameFinished && !posFound) 
-diff -burN blender-2.57.orig//source/gameengine/VideoTexture/VideoFFmpeg.h blender-2.57/source/gameengine/VideoTexture/VideoFFmpeg.h
---- blender-2.57.orig//source/gameengine/VideoTexture/VideoFFmpeg.h	2011-04-14 17:13:34.000000000 +0200
-+++ blender-2.57/source/gameengine/VideoTexture/VideoFFmpeg.h	2011-05-04 03:11:53.106002831 +0200
-@@ -34,6 +34,7 @@
- #include <libavformat/avformat.h>
- #include <libavcodec/avcodec.h>
- #include <libavutil/rational.h>
-+#include <libavutil/parseutils.h>
- #include <libswscale/swscale.h>
- #include "DNA_listBase.h"
- #include "BLI_threads.h"
-diff -burN blender-2.57.orig/source/blender/blenkernel/intern/writeffmpeg.c /var/tmp/portage/media-gfx/blender-2.57-r1/work/blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c
---- blender-2.57.orig/source/blender/blenkernel/intern/writeffmpeg.c	2011-11-07 13:17:59.001736099 -0800
-+++ blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c	2011-11-07 13:18:35.726734562 -0800
-@@ -1101,12 +1101,12 @@
- 	switch (o->type) {
- 	case FF_OPT_TYPE_INT:
- 	case FF_OPT_TYPE_INT64:
--		val.i = o->default_val;
-+		val.i = o->default_val.dbl;
- 		idp_type = IDP_INT;
- 		break;
- 	case FF_OPT_TYPE_DOUBLE:
- 	case FF_OPT_TYPE_FLOAT:
--		val.f = o->default_val;
-+		val.f = o->default_val.dbl;
- 		idp_type = IDP_FLOAT;
- 		break;
- 	case FF_OPT_TYPE_STRING:
diff --git a/media-gfx/blender/files/blender-2.57-linux-3.patch b/media-gfx/blender/files/blender-2.57-linux-3.patch
deleted file mode 100644
index 6a96b49d12ca..000000000000
--- a/media-gfx/blender/files/blender-2.57-linux-3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- SConstruct	2011-10-29 05:18:43.149564401 +0200
-+++ SConstruct	2011-10-29 05:19:37.332887017 +0200
-@@ -165,6 +165,9 @@
- if crossbuild and platform not in ('win32-vc', 'win64-vc'):
-     platform = 'linuxcross'
- 
-+if platform == 'linux3':
-+    platform = 'linux2'  # Workaround for Linux 3.x
-+
- env['OURPLATFORM'] = platform
- 
- configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
diff --git a/media-gfx/blender/files/blender-2.60-bmake.patch b/media-gfx/blender/files/blender-2.60-bmake.patch
deleted file mode 100644
index 0ce8fa72323c..000000000000
--- a/media-gfx/blender/files/blender-2.60-bmake.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -Npur release/plugins.orig/bmake release/plugins/bmake
---- release/plugins.orig/bmake	2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/bmake	2011-11-11 15:01:40.637923565 +0100
-@@ -57,10 +57,10 @@
-	LDFLAGS="-Bshareable";
- elif ( test $UNAME = "Linux" ) then
-	CC="gcc";
--	CFLAGS="-fPIC -funsigned-char -O2";
-+#	CFLAGS="-fPIC -funsigned-char -O2";
-
-	LD="ld";
--	LDFLAGS="-Bshareable";
-+#	LDFLAGS="-Bshareable";
- elif ( test $UNAME = "SunOS" ) then
-	CC="cc";
-	CFLAGS="-O";
-@@ -109,22 +109,20 @@ elif ( test -f "../plugin.h" ) then
- 	INCLUDES=-I..;
- elif ( test -f "../include/plugin.h" ) then
- 	INCLUDES=-I../include
-+elif ( test -f "../../../source/blender/blenpluginapi/plugin.h" ) then
-+	INCLUDES=-I../../../source/blender/blenpluginapi
- else 
- 	echo "Couldn't find plugin.h";
- 	exit;
- fi
- 
- LIBM=`fgrep "#include <math.h>" $CFILE`
--LIBC=`fgrep "#include <std" $CFILE`
- 
--LIBS=
-+LIBS="-lc"
- 
- if ( test -n "$LIBM" ) then
- 	LIBS="$LIBS -lm"; 
- fi
--if ( test -n "$LIBC" ) then 
--	LIBS="$LIBS -lc"; 
--fi
- 
- echo "$CC $CFLAGS -c $CFILE $INCLUDES"
- $CC $CFLAGS -c $CFILE $INCLUDES
-diff -Npur release/plugins.orig/sequence/color-correction-hsv.c release/plugins/sequence/color-correction-hsv.c
---- release/plugins.orig/sequence/color-correction-hsv.c	2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/sequence/color-correction-hsv.c	2011-11-11 15:03:47.233921332 +0100
-@@ -15,7 +15,7 @@
-  *
-  */
- 
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- #include <stdio.h>
- 
-diff -Npur release/plugins.orig/sequence/color-correction-yuv.c release/plugins/sequence/color-correction-yuv.c
---- release/plugins.orig/sequence/color-correction-yuv.c	2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/sequence/color-correction-yuv.c	2011-11-11 15:02:10.446923031 +0100
-@@ -15,7 +15,7 @@
-  *
-  */
- 
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- #include <stdio.h>
- 
-diff -Npur release/plugins.orig/sequence/dnr.c release/plugins/sequence/dnr.c
---- release/plugins.orig/sequence/dnr.c	2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/sequence/dnr.c	2011-11-11 15:03:30.049921648 +0100
-@@ -15,7 +15,7 @@
-  *
-  */
- 
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- #include <stdio.h>
- 
-diff -Npur release/plugins.orig/sequence/gamma.c release/plugins/sequence/gamma.c
---- release/plugins.orig/sequence/gamma.c	2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/sequence/gamma.c	2011-11-11 15:01:58.982923268 +0100
-@@ -15,7 +15,7 @@
-  *
-  */
- 
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- #include "util.h"
- #include <stdio.h>
-diff -Npur release/plugins.orig/texture/clouds2.c release/plugins/texture/clouds2.c
---- release/plugins.orig/texture/clouds2.c	2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/texture/clouds2.c	2011-11-11 15:02:23.104922789 +0100
-@@ -27,7 +27,7 @@
-  * ***** END GPL LICENSE BLOCK *****
-  */
-  
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- 
- /* ******************** GLOBAL VARIABLES ***************** */
-diff -Npur release/plugins.orig/texture/tiles.c release/plugins/texture/tiles.c
---- release/plugins.orig/texture/tiles.c	2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/texture/tiles.c	2011-11-11 15:04:05.749921038 +0100
-@@ -27,7 +27,7 @@
-  * ***** END GPL LICENSE BLOCK *****
-  */
- 
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- 
- /* ******************** GLOBAL VARIABLES ***************** */
diff --git a/media-gfx/blender/files/blender-2.60-doxyfile.patch b/media-gfx/blender/files/blender-2.60-doxyfile.patch
deleted file mode 100644
index aa61c55986cb..000000000000
--- a/media-gfx/blender/files/blender-2.60-doxyfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- blender-2.58a/doc/doxygen/Doxyfile   2011-07-11 23:27:33.975642545 -0300
-+++ blender-2.58a/doc/doxygen/Doxyfile   2011-07-11 23:28:54.913642574 -0300
-@@ -42,7 +42,7 @@
- # exceed 55 pixels and the maximum width should not exceed 200 pixels.
- # Doxygen will copy the logo to the output directory.
- 
--PROJECT_LOGO           = ../../release/freedesktop/icons/48x48/blender.png
-+PROJECT_LOGO           = ../../release/freedesktop/icons/48x48/apps/blender.png
- 
- # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
- # base path where the generated documentation will be put. 
diff --git a/media-gfx/blender/files/blender-2.60-eigen.patch b/media-gfx/blender/files/blender-2.60-eigen.patch
deleted file mode 100644
index 6955ee11c8c8..000000000000
--- a/media-gfx/blender/files/blender-2.60-eigen.patch
+++ /dev/null
@@ -1,293 +0,0 @@
---- intern/itasc/SConscript   2009-09-26 09:14:02.000000000 +0200
-+++ intern/itasc/SConscript   2009-09-26 09:14:54.000000000 +0200
-@@ -5,7 +5,8 @@
- sources += env.Glob('kdl/*.cpp')
- sources += env.Glob('kdl/utilities/*.cpp')
- 
--incs = '. ../../extern/Eigen2'
-+#incs = '. ../../extern/Eigen2'
-+incs = '. /usr/include/eigen2'
- 
- env.BlenderLib ('bf_intern_itasc', sources, Split(incs), [], libtype=['intern','player'], priority=[20,100] )
- 
---- source/blender/ikplugin/SConscript
-+++ source/blender/ikplugin/SConscript
-@@ -4,6 +4,6 @@
- sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
- 
- incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
--incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen2'
-+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen2'
- 
- env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), [], libtype=['core','player'], priority=[180, 190] ) 
---- source/gameengine/Converter/SConscript   2009-09-26 09:14:02.000000000 +0200
-+++ source/gameengine/Converter/SConscript   2009-09-26 09:14:54.000000000 +0200
-@@ -21,7 +21,8 @@
- incs += ' #source/blender/makesrna'
- incs += ' #source/blender/ikplugin'
- incs += ' #extern/recastnavigation/Detour/Include'
--incs += ' #extern/Eigen2'
-+#incs += ' #extern/Eigen2'
-+incs += ' /usr/include/eigen2'
- 
- incs += ' ' + env['BF_BULLET_INC']
- 
---- intern/itasc/CMakeLists.txt	2011-11-10 23:34:31.391907001 +0100
-+++ intern/itasc/CMakeLists.txt	2011-11-10 23:35:17.588906231 +0100
-@@ -25,11 +25,11 @@
- # ***** END GPL LICENSE BLOCK *****
- 
- set(INC
--	../../extern/Eigen2
-+	/usr/include/eigen2
- )
- 
- set(INC_SYS
--	
-+	/usr/include/eigen2
- )
- 
- set(SRC
-@@ -117,113 +117,113 @@ set(SRC
- 	ublas_types.hpp
- 
- 	# until we have another user...
--	../../extern/Eigen2/Eigen/src/Array/BooleanRedux.h
--	../../extern/Eigen2/Eigen/src/Array/CwiseOperators.h
--	../../extern/Eigen2/Eigen/src/Array/Functors.h
--	../../extern/Eigen2/Eigen/src/Array/Norms.h
--	../../extern/Eigen2/Eigen/src/Array/PartialRedux.h
--	../../extern/Eigen2/Eigen/src/Array/Random.h
--	../../extern/Eigen2/Eigen/src/Array/Select.h
--	../../extern/Eigen2/Eigen/src/Cholesky/LDLT.h
--	../../extern/Eigen2/Eigen/src/Cholesky/LLT.h
--	../../extern/Eigen2/Eigen/src/Core/Assign.h
--	../../extern/Eigen2/Eigen/src/Core/Block.h
--	../../extern/Eigen2/Eigen/src/Core/CacheFriendlyProduct.h
--	../../extern/Eigen2/Eigen/src/Core/Coeffs.h
--	../../extern/Eigen2/Eigen/src/Core/CommaInitializer.h
--	../../extern/Eigen2/Eigen/src/Core/Cwise.h
--	../../extern/Eigen2/Eigen/src/Core/CwiseBinaryOp.h
--	../../extern/Eigen2/Eigen/src/Core/CwiseNullaryOp.h
--	../../extern/Eigen2/Eigen/src/Core/CwiseUnaryOp.h
--	../../extern/Eigen2/Eigen/src/Core/DiagonalCoeffs.h
--	../../extern/Eigen2/Eigen/src/Core/DiagonalMatrix.h
--	../../extern/Eigen2/Eigen/src/Core/DiagonalProduct.h
--	../../extern/Eigen2/Eigen/src/Core/Dot.h
--	../../extern/Eigen2/Eigen/src/Core/Flagged.h
--	../../extern/Eigen2/Eigen/src/Core/Functors.h
--	../../extern/Eigen2/Eigen/src/Core/Fuzzy.h
--	../../extern/Eigen2/Eigen/src/Core/GenericPacketMath.h
--	../../extern/Eigen2/Eigen/src/Core/IO.h
--	../../extern/Eigen2/Eigen/src/Core/Map.h
--	../../extern/Eigen2/Eigen/src/Core/MapBase.h
--	../../extern/Eigen2/Eigen/src/Core/MathFunctions.h
--	../../extern/Eigen2/Eigen/src/Core/Matrix.h
--	../../extern/Eigen2/Eigen/src/Core/MatrixBase.h
--	../../extern/Eigen2/Eigen/src/Core/MatrixStorage.h
--	../../extern/Eigen2/Eigen/src/Core/Minor.h
--	../../extern/Eigen2/Eigen/src/Core/NestByValue.h
--	../../extern/Eigen2/Eigen/src/Core/NumTraits.h
--	../../extern/Eigen2/Eigen/src/Core/Part.h
--	../../extern/Eigen2/Eigen/src/Core/Product.h
--	../../extern/Eigen2/Eigen/src/Core/Redux.h
--	../../extern/Eigen2/Eigen/src/Core/SolveTriangular.h
--	../../extern/Eigen2/Eigen/src/Core/Sum.h
--	../../extern/Eigen2/Eigen/src/Core/Swap.h
--	../../extern/Eigen2/Eigen/src/Core/Transpose.h
--	../../extern/Eigen2/Eigen/src/Core/Visitor.h
--	../../extern/Eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h
--	../../extern/Eigen2/Eigen/src/Core/arch/SSE/PacketMath.h
--	../../extern/Eigen2/Eigen/src/Core/util/Constants.h
--	../../extern/Eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h
--	../../extern/Eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h
--	../../extern/Eigen2/Eigen/src/Core/util/ForwardDeclarations.h
--	../../extern/Eigen2/Eigen/src/Core/util/Macros.h
--	../../extern/Eigen2/Eigen/src/Core/util/Memory.h
--	../../extern/Eigen2/Eigen/src/Core/util/Meta.h
--	../../extern/Eigen2/Eigen/src/Core/util/StaticAssert.h
--	../../extern/Eigen2/Eigen/src/Core/util/XprHelper.h
--	../../extern/Eigen2/Eigen/src/Geometry/AlignedBox.h
--	../../extern/Eigen2/Eigen/src/Geometry/AngleAxis.h
--	../../extern/Eigen2/Eigen/src/Geometry/EulerAngles.h
--	../../extern/Eigen2/Eigen/src/Geometry/Hyperplane.h
--	../../extern/Eigen2/Eigen/src/Geometry/OrthoMethods.h
--	../../extern/Eigen2/Eigen/src/Geometry/ParametrizedLine.h
--	../../extern/Eigen2/Eigen/src/Geometry/Quaternion.h
--	../../extern/Eigen2/Eigen/src/Geometry/Rotation2D.h
--	../../extern/Eigen2/Eigen/src/Geometry/RotationBase.h
--	../../extern/Eigen2/Eigen/src/Geometry/Scaling.h
--	../../extern/Eigen2/Eigen/src/Geometry/Transform.h
--	../../extern/Eigen2/Eigen/src/Geometry/Translation.h
--	../../extern/Eigen2/Eigen/src/LU/Determinant.h
--	../../extern/Eigen2/Eigen/src/LU/Inverse.h
--	../../extern/Eigen2/Eigen/src/LU/LU.h
--	../../extern/Eigen2/Eigen/src/LeastSquares/LeastSquares.h
--	../../extern/Eigen2/Eigen/src/QR/EigenSolver.h
--	../../extern/Eigen2/Eigen/src/QR/HessenbergDecomposition.h
--	../../extern/Eigen2/Eigen/src/QR/QR.h
--	../../extern/Eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h
--	../../extern/Eigen2/Eigen/src/QR/Tridiagonalization.h
--	../../extern/Eigen2/Eigen/src/SVD/SVD.h
--	../../extern/Eigen2/Eigen/src/Sparse/AmbiVector.h
--	../../extern/Eigen2/Eigen/src/Sparse/CholmodSupport.h
--	../../extern/Eigen2/Eigen/src/Sparse/CompressedStorage.h
--	../../extern/Eigen2/Eigen/src/Sparse/CoreIterators.h
--	../../extern/Eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
--	../../extern/Eigen2/Eigen/src/Sparse/MappedSparseMatrix.h
--	../../extern/Eigen2/Eigen/src/Sparse/RandomSetter.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseAssign.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseBlock.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseCwise.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseDot.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseFlagged.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseFuzzy.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseLDLT.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseLLT.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseLU.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseMatrix.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseMatrixBase.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseProduct.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseRedux.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseTranspose.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseUtil.h
--	../../extern/Eigen2/Eigen/src/Sparse/SparseVector.h
--	../../extern/Eigen2/Eigen/src/Sparse/SuperLUSupport.h
--	../../extern/Eigen2/Eigen/src/Sparse/TaucsSupport.h
--	../../extern/Eigen2/Eigen/src/Sparse/TriangularSolver.h
--	../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h
-+	/usr/include/eigen2/Eigen/src/Array/BooleanRedux.h
-+	/usr/include/eigen2/Eigen/src/Array/CwiseOperators.h
-+	/usr/include/eigen2/Eigen/src/Array/Functors.h
-+	/usr/include/eigen2/Eigen/src/Array/Norms.h
-+	/usr/include/eigen2/Eigen/src/Array/PartialRedux.h
-+	/usr/include/eigen2/Eigen/src/Array/Random.h
-+	/usr/include/eigen2/Eigen/src/Array/Select.h
-+	/usr/include/eigen2/Eigen/src/Cholesky/LDLT.h
-+	/usr/include/eigen2/Eigen/src/Cholesky/LLT.h
-+	/usr/include/eigen2/Eigen/src/Core/Assign.h
-+	/usr/include/eigen2/Eigen/src/Core/Block.h
-+	/usr/include/eigen2/Eigen/src/Core/CacheFriendlyProduct.h
-+	/usr/include/eigen2/Eigen/src/Core/Coeffs.h
-+	/usr/include/eigen2/Eigen/src/Core/CommaInitializer.h
-+	/usr/include/eigen2/Eigen/src/Core/Cwise.h
-+	/usr/include/eigen2/Eigen/src/Core/CwiseBinaryOp.h
-+	/usr/include/eigen2/Eigen/src/Core/CwiseNullaryOp.h
-+	/usr/include/eigen2/Eigen/src/Core/CwiseUnaryOp.h
-+	/usr/include/eigen2/Eigen/src/Core/DiagonalCoeffs.h
-+	/usr/include/eigen2/Eigen/src/Core/DiagonalMatrix.h
-+	/usr/include/eigen2/Eigen/src/Core/DiagonalProduct.h
-+	/usr/include/eigen2/Eigen/src/Core/Dot.h
-+	/usr/include/eigen2/Eigen/src/Core/Flagged.h
-+	/usr/include/eigen2/Eigen/src/Core/Functors.h
-+	/usr/include/eigen2/Eigen/src/Core/Fuzzy.h
-+	/usr/include/eigen2/Eigen/src/Core/GenericPacketMath.h
-+	/usr/include/eigen2/Eigen/src/Core/IO.h
-+	/usr/include/eigen2/Eigen/src/Core/Map.h
-+	/usr/include/eigen2/Eigen/src/Core/MapBase.h
-+	/usr/include/eigen2/Eigen/src/Core/MathFunctions.h
-+	/usr/include/eigen2/Eigen/src/Core/Matrix.h
-+	/usr/include/eigen2/Eigen/src/Core/MatrixBase.h
-+	/usr/include/eigen2/Eigen/src/Core/MatrixStorage.h
-+	/usr/include/eigen2/Eigen/src/Core/Minor.h
-+	/usr/include/eigen2/Eigen/src/Core/NestByValue.h
-+	/usr/include/eigen2/Eigen/src/Core/NumTraits.h
-+	/usr/include/eigen2/Eigen/src/Core/Part.h
-+	/usr/include/eigen2/Eigen/src/Core/Product.h
-+	/usr/include/eigen2/Eigen/src/Core/Redux.h
-+	/usr/include/eigen2/Eigen/src/Core/SolveTriangular.h
-+	/usr/include/eigen2/Eigen/src/Core/Sum.h
-+	/usr/include/eigen2/Eigen/src/Core/Swap.h
-+	/usr/include/eigen2/Eigen/src/Core/Transpose.h
-+	/usr/include/eigen2/Eigen/src/Core/Visitor.h
-+	/usr/include/eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h
-+	/usr/include/eigen2/Eigen/src/Core/arch/SSE/PacketMath.h
-+	/usr/include/eigen2/Eigen/src/Core/util/Constants.h
-+	/usr/include/eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h
-+	/usr/include/eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h
-+	/usr/include/eigen2/Eigen/src/Core/util/ForwardDeclarations.h
-+	/usr/include/eigen2/Eigen/src/Core/util/Macros.h
-+	/usr/include/eigen2/Eigen/src/Core/util/Memory.h
-+	/usr/include/eigen2/Eigen/src/Core/util/Meta.h
-+	/usr/include/eigen2/Eigen/src/Core/util/StaticAssert.h
-+	/usr/include/eigen2/Eigen/src/Core/util/XprHelper.h
-+	/usr/include/eigen2/Eigen/src/Geometry/AlignedBox.h
-+	/usr/include/eigen2/Eigen/src/Geometry/AngleAxis.h
-+	/usr/include/eigen2/Eigen/src/Geometry/EulerAngles.h
-+	/usr/include/eigen2/Eigen/src/Geometry/Hyperplane.h
-+	/usr/include/eigen2/Eigen/src/Geometry/OrthoMethods.h
-+	/usr/include/eigen2/Eigen/src/Geometry/ParametrizedLine.h
-+	/usr/include/eigen2/Eigen/src/Geometry/Quaternion.h
-+	/usr/include/eigen2/Eigen/src/Geometry/Rotation2D.h
-+	/usr/include/eigen2/Eigen/src/Geometry/RotationBase.h
-+	/usr/include/eigen2/Eigen/src/Geometry/Scaling.h
-+	/usr/include/eigen2/Eigen/src/Geometry/Transform.h
-+	/usr/include/eigen2/Eigen/src/Geometry/Translation.h
-+	/usr/include/eigen2/Eigen/src/LU/Determinant.h
-+	/usr/include/eigen2/Eigen/src/LU/Inverse.h
-+	/usr/include/eigen2/Eigen/src/LU/LU.h
-+	/usr/include/eigen2/Eigen/src/LeastSquares/LeastSquares.h
-+	/usr/include/eigen2/Eigen/src/QR/EigenSolver.h
-+	/usr/include/eigen2/Eigen/src/QR/HessenbergDecomposition.h
-+	/usr/include/eigen2/Eigen/src/QR/QR.h
-+	/usr/include/eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h
-+	/usr/include/eigen2/Eigen/src/QR/Tridiagonalization.h
-+	/usr/include/eigen2/Eigen/src/SVD/SVD.h
-+	/usr/include/eigen2/Eigen/src/Sparse/AmbiVector.h
-+	/usr/include/eigen2/Eigen/src/Sparse/CholmodSupport.h
-+	/usr/include/eigen2/Eigen/src/Sparse/CompressedStorage.h
-+	/usr/include/eigen2/Eigen/src/Sparse/CoreIterators.h
-+	/usr/include/eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
-+	/usr/include/eigen2/Eigen/src/Sparse/MappedSparseMatrix.h
-+	/usr/include/eigen2/Eigen/src/Sparse/RandomSetter.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseAssign.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseBlock.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseCwise.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseDot.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseFlagged.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseFuzzy.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseLDLT.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseLLT.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseLU.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseMatrix.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseMatrixBase.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseProduct.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseRedux.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseTranspose.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseUtil.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SparseVector.h
-+	/usr/include/eigen2/Eigen/src/Sparse/SuperLUSupport.h
-+	/usr/include/eigen2/Eigen/src/Sparse/TaucsSupport.h
-+	/usr/include/eigen2/Eigen/src/Sparse/TriangularSolver.h
-+	/usr/include/eigen2/Eigen/src/Sparse/UmfPackSupport.h
- )
- 
- blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}")
---- source/blender/ikplugin/CMakeLists.txt	2011-11-10 23:34:31.391907001 +0100
-+++ source/blender/ikplugin/CMakeLists.txt	2011-11-10 23:35:17.588906231 +0100
-@@ -50,7 +50,7 @@
- if(WITH_IK_ITASC)
- 	add_definitions(-DWITH_IK_ITASC)
- 	list(APPEND INC
--		../../../extern/Eigen2
-+		/usr/include/eigen2
- 		../../../intern/itasc
- 	)
- 	list(APPEND SRC
---- source/gameengine/Converter/CMakeLists.txt	2011-11-10 23:34:31.391907001 +0100
-+++ source/gameengine/Converter/CMakeLists.txt	2011-11-10 23:35:17.588906231 +0100
-@@ -51,7 +51,7 @@
- 	../../blender/makesrna
- 	../../blender/windowmanager
- 	../../../extern/bullet2/src
--	../../../extern/Eigen2
-+	/usr/include/eigen2
- 	../../../intern/container
- 	../../../intern/guardedalloc
- 	../../../intern/moto/include
diff --git a/media-gfx/blender/files/blender-2.60-glew.patch b/media-gfx/blender/files/blender-2.60-glew.patch
deleted file mode 100644
index edc0c9b62427..000000000000
--- a/media-gfx/blender/files/blender-2.60-glew.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- extern/SConscript
-+++ extern/SConscript
-@@ -2,8 +2,6 @@
- 
- Import('env')
- 
--SConscript(['glew/SConscript'])
--
- if env['WITH_BF_GAMEENGINE']:
-	 SConscript(['recastnavigation/SConscript'])
-
- if env['WITH_BF_ELTOPO']:
-	 SConscript(['eltopo/SConscript'])
-
---- source/blender/editors/include/BIF_gl.h
-+++ source/blender/editors/include/BIF_gl.h
-@@ -35,7 +35,7 @@
- #ifndef BIF_GL_H
- #define BIF_GL_H
- 
--#include "GL/glew.h"
-+#include <GL/glew.h>
- 
-	/*
-	 * these should be phased out. cpack should be replaced in
---- extern/CMakeLists.txt
-+++ extern/CMakeLists.txt
-@@ -39,9 +39,6 @@
-	 add_subdirectory(binreloc)
- endif()
-
--if(WITH_BUILTIN_GLEW)
--	add_subdirectory(glew)
--endif()
-
- if(WITH_GAMEENGINE)
-    add_subdirectory(recastnavigation)
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -150,7 +150,7 @@
-
- if(UNIX AND NOT APPLE)
- 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support)"	ON)
--	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
-+	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" OFF)
- else()
- 	# not an option for other OS's
- 	set(WITH_BUILTIN_GLEW ON)
diff --git a/media-gfx/blender/files/blender-2.60-openjpeg.patch b/media-gfx/blender/files/blender-2.60-openjpeg.patch
deleted file mode 100644
index 74f6441bdfd2..000000000000
--- a/media-gfx/blender/files/blender-2.60-openjpeg.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Npur blender-2.60a.orig/extern/libredcode/SConscript blender-2.60a/extern/libredcode/SConscript
---- blender-2.60a.orig/extern/libredcode/SConscript	2011-11-09 23:05:16.241465491 +0100
-+++ blender-2.60a/extern/libredcode/SConscript	2011-11-09 23:06:24.188464236 +0100
-@@ -7,7 +7,8 @@
- Import('env')
-
- sources = env.Glob('*.c')
--incs = '. ../libopenjpeg'
-+#incs = '. ../libopenjpeg'
-+incs = '. /usr/include'
-
- env.BlenderLib ( libname='extern_redcode', 
-                  sources=sources, includes=Split(incs),
-diff -Npur blender-2.60a.orig/extern/SConscript blender-2.60a/extern/SConscript
---- blender-2.60a.orig/extern/SConscript	2011-11-09 23:05:16.241465491 +0100
-+++ blender-2.60a/extern/SConscript	2011-11-09 23:06:24.188464236 +0100
-@@ -11,8 +11,5 @@
- if env['WITH_BF_BULLET']:
-     SConscript(['bullet2/src/SConscript'])
-
--if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '':
--    SConscript(['libopenjpeg/SConscript'])
--
- if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '':
-     SConscript(['libredcode/SConscript'])
-diff -Npur blender-2.60a.orig/build_files/scons/tools/Blender.py blender-2.60a/build_files/scons/tools/Blender.py
---- blender-2.60a.orig/build_files/scons/tools/Blender.py	2011-11-09 23:05:16.241465491 +0100
-+++ blender-2.60a/build_files/scons/tools/Blender.py	2011-11-09 23:06:24.188464236 +0100
-@@ -246,6 +246,8 @@
-         syslibs += Split(lenv['BF_FFMPEG_LIB'])
-         if lenv['WITH_BF_OGG']:
-             syslibs += Split(lenv['BF_OGG_LIB'])
-+    if lenv['WITH_BF_OPENJPEG']:
-+        syslibs += Split(lenv['BF_OPENJPEG_LIB'])
-     if lenv['WITH_BF_JACK']:
-             syslibs += Split(lenv['BF_JACK_LIB'])
-     if lenv['WITH_BF_SNDFILE'] and not lenv['WITH_BF_STATICSNDFILE']:
diff --git a/media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch b/media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch
deleted file mode 100644
index fc0278d77d8d..000000000000
--- a/media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Npur blender-2.60a.orig/source/blender/blenkernel/intern/blender.c blender-2.60a/source/blender/blenkernel/intern/blender.c
---- blender-2.60a.orig/source/blender/blenkernel/intern/blender.c	2011-11-09 20:56:11.905602401 +0100
-+++ blender-2.60a/source/blender/blenkernel/intern/blender.c	2011-11-09 20:56:42.827601857 +0100
-@@ -145,6 +145,7 @@ void initglobals(void)
- 	G.f |= G_SCRIPT_AUTOEXEC;
- #else
- 	G.f &= ~G_SCRIPT_AUTOEXEC;
-+	G.f |= G_SCRIPT_OVERRIDE_PREF;  /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- #endif
- }
- 
-diff -Npur blender-2.60a.orig/source/blender/makesrna/intern/rna_userdef.c blender-2.60a/source/blender/makesrna/intern/rna_userdef.c
---- blender-2.60a.orig/source/blender/makesrna/intern/rna_userdef.c	2011-11-09 20:56:12.003602399 +0100
-+++ blender-2.60a/source/blender/makesrna/intern/rna_userdef.c	2011-11-09 21:02:43.204595484 +0100
-@@ -116,9 +116,17 @@ static void rna_userdef_show_manipulator
- 
- static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
- {
--	UserDef *userdef = (UserDef*)ptr->data;
--	if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE)	G.f &= ~G_SCRIPT_AUTOEXEC;
--	else												G.f |=  G_SCRIPT_AUTOEXEC;
-+	if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+		/* Blender run with --enable-autoexec */
-+		UserDef *userdef = (UserDef*)ptr->data;
-+		if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE)	G.f &= ~G_SCRIPT_AUTOEXEC;
-+		else												G.f |=  G_SCRIPT_AUTOEXEC;
-+	}
-+}
-+
-+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) {
-+	/* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+	return !(G.f & G_SCRIPT_OVERRIDE_PREF);
- }
- 
- static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr)
-@@ -2630,6 +2638,8 @@ static void rna_def_userdef_system(Blend
- 	                         "Allow any .blend file to run scripts automatically "
- 	                         "(unsafe with blend files from an untrusted source)");
- 	RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update");
-+	/* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+	RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable");
- 
- 	prop= RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE);
- 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE);
-diff -Npur blender-2.60a.orig/source/blender/windowmanager/intern/wm_files.c blender-2.60a/source/blender/windowmanager/intern/wm_files.c
---- blender-2.60a.orig/source/blender/windowmanager/intern/wm_files.c	2011-11-09 20:56:12.458602413 +0100
-+++ blender-2.60a/source/blender/windowmanager/intern/wm_files.c	2011-11-09 21:05:16.768592770 +0100
-@@ -285,12 +285,17 @@ static void wm_init_userdef(bContext *C)
- 
- 	/* set the python auto-execute setting from user prefs */
- 	/* enabled by default, unless explicitly enabled in the command line which overrides */
--	if((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+	if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) {
-+		/* Blender run with --enable-autoexec */
- 		if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |=  G_SCRIPT_AUTOEXEC;
- 		else											  G.f &= ~G_SCRIPT_AUTOEXEC;
- 	}
- 	/* update tempdir from user preferences */
- 	BLI_where_is_temp(btempdir, FILE_MAX, 1);
-+
-+	/* Workaround to fix default of "Auto Run Python Scripts" checkbox */
-+	if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC))
-+		U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE;
- }
- 
- 
-diff -Npur blender-2.60a.orig/source/blender/windowmanager/intern/wm_operators.c blender-2.60a/source/blender/windowmanager/intern/wm_operators.c
---- blender-2.60a.orig/source/blender/windowmanager/intern/wm_operators.c	2011-11-09 20:56:12.458602413 +0100
-+++ blender-2.60a/source/blender/windowmanager/intern/wm_operators.c	2011-11-09 21:07:09.746590772 +0100
-@@ -1583,12 +1583,13 @@ static int wm_open_mainfile_exec(bContex
- 		G.fileflags &= ~G_FILE_NO_UI;
- 	else
- 		G.fileflags |= G_FILE_NO_UI;
--		
--	if(RNA_boolean_get(op->ptr, "use_scripts"))
-+
-+	/* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */
-+	if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF)))
- 		G.f |= G_SCRIPT_AUTOEXEC;
- 	else
- 		G.f &= ~G_SCRIPT_AUTOEXEC;
--	
-+
- 	// XXX wm in context is not set correctly after WM_read_file -> crash
- 	// do it before for now, but is this correct with multiple windows?
- 	WM_event_add_notifier(C, NC_WINDOW, NULL);
-@@ -1600,6 +1601,8 @@ static int wm_open_mainfile_exec(bContex
- 
- static void WM_OT_open_mainfile(wmOperatorType *ot)
- {
-+	PropertyRNA * use_scripts_checkbox = NULL;
-+
- 	ot->name= "Open Blender File";
- 	ot->idname= "WM_OT_open_mainfile";
- 	ot->description="Open a Blender file";
-@@ -1611,7 +1614,12 @@ static void WM_OT_open_mainfile(wmOperat
- 	WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH);
- 
- 	RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file");
--	RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", "Allow blend file execute scripts automatically, default available from system preferences");
-+	use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts",
-+			!!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source",
-+			"Allow blend file execute scripts automatically, default available from system preferences");
-+	/* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */
-+	if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF))
-+		RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE);
- }
- 
- /* **************** link/append *************** */
-diff -Npur blender-2.60a.orig/source/creator/creator.c blender-2.60a/source/creator/creator.c
---- blender-2.60a.orig/source/creator/creator.c	2011-11-09 20:56:11.899602401 +0100
-+++ blender-2.60a/source/creator/creator.c	2011-11-09 21:17:22.278579932 +0100
-@@ -258,6 +258,7 @@ static int print_help(int UNUSED(argc),
- 
- 	printf("\n");
- 
-+	BLI_argsPrintArgDoc(ba, "-666");
- 	BLI_argsPrintArgDoc(ba, "--enable-autoexec");
- 	BLI_argsPrintArgDoc(ba, "--disable-autoexec");
- 
-@@ -326,14 +327,14 @@ static int end_arguments(int UNUSED(argc
- static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- 	G.f |= G_SCRIPT_AUTOEXEC;
--	G.f |= G_SCRIPT_OVERRIDE_PREF;
-+	G.f &= ~G_SCRIPT_OVERRIDE_PREF;  /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */
- 	return 0;
- }
- 
- static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- 	G.f &= ~G_SCRIPT_AUTOEXEC;
--	G.f |= G_SCRIPT_OVERRIDE_PREF;
-+	G.f |= G_SCRIPT_OVERRIDE_PREF;  /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- 	return 0;
- }
- 
-@@ -1055,8 +1056,9 @@ static void setupArguments(bContext *C,
- #  define 	PY_DISABLE_AUTO ", (compiled as non-standard default)"
- #endif
- 
--	BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution" PY_ENABLE_AUTO, enable_python, NULL);
--	BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO, disable_python, NULL);
-+	BLI_argsAdd(ba, 1, NULL, "-666", "\n\tEnable automatic python script execution (port from CVE-2009-3850 patch to Blender 2.60a)" PY_ENABLE_AUTO, enable_python, NULL);
-+	BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution" PY_ENABLE_AUTO, enable_python, NULL);
-+	BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO, disable_python, NULL);
- 
- #undef PY_ENABLE_AUTO
- #undef PY_DISABLE_AUTO
diff --git a/media-gfx/blender/files/blender-2.60a-collada.patch b/media-gfx/blender/files/blender-2.60a-collada.patch
deleted file mode 100644
index 980b6407493f..000000000000
--- a/media-gfx/blender/files/blender-2.60a-collada.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/blender/collada/SConscript	2012-01-16 19:04:02.438027832 +0100
-+++ source/blender/collada/SConscript	2012-01-16 19:03:59.787060970 +0100
-@@ -35,7 +35,7 @@
- if  env['OURPLATFORM']=='darwin':
-     incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
- else:
--    incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
-+    incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
- 
- if env['BF_BUILDINFO']:
-     defs.append('WITH_BUILDINFO')
diff --git a/media-gfx/blender/files/blender-2.60a-desktop.patch b/media-gfx/blender/files/blender-2.60a-desktop.patch
deleted file mode 100644
index c774cbe79a9d..000000000000
--- a/media-gfx/blender/files/blender-2.60a-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- release/freedesktop/blender.desktop   2010-09-12 00:05:51.000000000 -0700
-+++ release/freedesktop/blender.desktop   2010-09-12 00:07:32.000000000 -0700
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Blender
-+Name=Blender-2.60a
- GenericName=3D modeller
- GenericName[es]=modelador 3D
- GenericName[de]=3D Modellierer
-@@ -7,8 +7,8 @@
- GenericName[ru]=Редактор 3D-моделей
- Comment=3D modeling, animation, rendering and post-production
- Comment[es]=modelado 3D, animación, renderizado y post-producción
--Exec=blender
--Icon=blender
-+Exec=blender-2.60
-+Icon=blender-2.60
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;
diff --git a/media-gfx/blender/files/blender-2.60a-enable_site_module.patch b/media-gfx/blender/files/blender-2.60a-enable_site_module.patch
deleted file mode 100644
index 8a44c36014f0..000000000000
--- a/media-gfx/blender/files/blender-2.60a-enable_site_module.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- source/blender/python/intern/bpy_interface.c
-+++ source/blender/python/intern/bpy_interface.c
-@@ -203,11 +203,6 @@
-	/* allow to use our own included python */
-	PyC_SetHomePath(BLI_get_folder(BLENDER_SYSTEM_PYTHON, NULL));
- 
--	/* Python 3.2 now looks for '2.58/python/include/python3.2d/pyconfig.h' to parse
--	 * from the 'sysconfig' module which is used by 'site', so for now disable site.
--	 * alternatively we could copy the file. */
--	Py_NoSiteFlag= 1;
--
- 	Py_Initialize();
- 	
- 	// PySys_SetArgv(argc, argv); // broken in py3, not a huge deal
---- source/gameengine/Ketsji/KX_PythonInit.cpp
-+++ source/gameengine/Ketsji/KX_PythonInit.cpp
-@@ -1825,7 +1825,6 @@
- 	STR_String pname = progname;
- 	Py_SetProgramName(pname.Ptr());
- #endif
--	Py_NoSiteFlag=1;
- 	Py_FrozenFlag=1;
- 
- 	/* must run before python initializes */
-@@ -1898,7 +1897,6 @@
- 	STR_String pname = progname;
- 	Py_SetProgramName(pname.Ptr());
- #endif
--	Py_NoSiteFlag=1;
- 	Py_FrozenFlag=1;
- 
- 	initPyTypes();
diff --git a/media-gfx/blender/files/blender-2.60a-insecure.desktop b/media-gfx/blender/files/blender-2.60a-insecure.desktop
deleted file mode 100644
index d033ae96aebd..000000000000
--- a/media-gfx/blender/files/blender-2.60a-insecure.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Blender-2.60a (reduced security)
-GenericName=3D modeller (reduced security)
-GenericName[es]=modelador 3D (reduced security)
-GenericName[de]=3D Modellierer (weniger Sicherheit)
-GenericName[fr]=modeleur 3D (reduced security)
-GenericName[ru]=Редактор 3D-моделей (reduced security)
-Comment=3D modeling, animation, rendering and post-production
-Comment[es]=modelado 3D, animación, renderizado y post-producción
-Exec=blender-2.60 --enable-autoexec
-Icon=blender-2.60
-Terminal=false
-Type=Application
-Categories=Graphics;3DGraphics;
-MimeType=application/x-blender;
diff --git a/media-gfx/blender/files/blender-2.60a-libav-0.7.patch b/media-gfx/blender/files/blender-2.60a-libav-0.7.patch
deleted file mode 100644
index 3bae020a02ae..000000000000
--- a/media-gfx/blender/files/blender-2.60a-libav-0.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- blender-2.60a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp	2011-10-24 20:09:01.000000000 +0200
-+++ blender-2.60a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp	2011-11-13 12:34:01.000000000 +0100
-@@ -40,6 +40,8 @@
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
-+#include <libavutil/mathematics.h>
-+#include <libavutil/avstring.h>
- #include "ffmpeg_compat.h"
- }
- 
-@@ -57,10 +58,15 @@
- {
- 	static const char* formats[] = { NULL, "ac3", "flac", "matroska", "mp2", "mp3", "ogg", "wav" };
- 
--	if(avformat_alloc_output_context2(&m_formatCtx, NULL, formats[format], filename.c_str()))
--		AUD_THROW(AUD_ERROR_FFMPEG, context_error);
-+	m_formatCtx = avformat_alloc_context();
-+        if (!m_formatCtx) AUD_THROW(AUD_ERROR_FFMPEG, context_error);
- 
--	m_outputFmt = m_formatCtx->oformat;
-+	av_strlcpy(m_formatCtx->filename, filename.c_str(), sizeof(m_formatCtx->filename));
-+	m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], filename.c_str(), NULL);
-+	if (!m_outputFmt) {
-+            avformat_free_context(m_formatCtx);
-+            AUD_THROW(AUD_ERROR_FFMPEG, context_error);
-+        }
- 
- 	switch(codec)
- 	{
diff --git a/media-gfx/blender/files/blender-2.60a-linux-3.patch b/media-gfx/blender/files/blender-2.60a-linux-3.patch
deleted file mode 100644
index 6a96b49d12ca..000000000000
--- a/media-gfx/blender/files/blender-2.60a-linux-3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- SConstruct	2011-10-29 05:18:43.149564401 +0200
-+++ SConstruct	2011-10-29 05:19:37.332887017 +0200
-@@ -165,6 +165,9 @@
- if crossbuild and platform not in ('win32-vc', 'win64-vc'):
-     platform = 'linuxcross'
- 
-+if platform == 'linux3':
-+    platform = 'linux2'  # Workaround for Linux 3.x
-+
- env['OURPLATFORM'] = platform
- 
- configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
diff --git a/media-gfx/blender/files/blender-2.61-opencollada-debug.patch b/media-gfx/blender/files/blender-2.61-opencollada-debug.patch
deleted file mode 100644
index 0310c478736d..000000000000
--- a/media-gfx/blender/files/blender-2.61-opencollada-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Npur blender-2.61.orig/build_files/scons/tools/Blender.py blender-2.61/build_files/scons/tools/Blender.py
---- blender-2.61.orig/build_files/scons/tools/Blender.py	2012-02-08 22:33:29.133700566 +0100
-+++ blender-2.61/build_files/scons/tools/Blender.py	2012-02-08 22:35:13.459698722 +0100
-@@ -276,10 +276,7 @@ def setup_syslibs(lenv):
-         syslibs += Split(lenv['BF_PTHREADS_LIB'])
-     if lenv['WITH_BF_COLLADA']:
-         syslibs.append(lenv['BF_PCRE_LIB'])
--        if lenv['BF_DEBUG']:
--            syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])]
--        else:
--            syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
-+        syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
-         syslibs.append(lenv['BF_EXPAT_LIB'])
-     if lenv['WITH_BF_COLAMD']:
-         syslibs += Split(lenv['BF_COLAMD_LIB'])
diff --git a/media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch b/media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch
deleted file mode 100644
index 671e0377e6d0..000000000000
--- a/media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -Npur blender-2.63.orig/build_files/scons/tools/btools.py blender-2.63/build_files/scons/tools/btools.py
---- blender-2.63.orig/build_files/scons/tools/btools.py	2012-05-08 00:05:06.963498491 +0200
-+++ blender-2.63/build_files/scons/tools/btools.py	2012-05-08 00:06:42.238496807 +0200
-@@ -96,7 +96,7 @@ def print_arguments(args, bc):
- 
- def validate_arguments(args, bc):
-     opts_list = [
--            'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', 
-+            'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', 'WITH_PYTHON_SECURITY',
-             'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
-             'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
-             'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH',
-@@ -261,6 +261,7 @@ def read_opts(env, cfg, args):
-         (BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)),
-         (BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)),
-         ('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),
-+        (BoolVariable('WITH_PYTHON_SECURITY', 'Disables execution of scripts within blend files by default (recommend to leave off)', False)),
- 
-         (BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)),
-         (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)),
-diff -Npur blender-2.63.orig/SConstruct blender-2.63/SConstruct
---- blender-2.63.orig/SConstruct	2012-05-08 00:05:06.933498492 +0200
-+++ blender-2.63/SConstruct	2012-05-08 00:05:45.665497801 +0200
-@@ -349,6 +349,10 @@ if 'blenderplayer' in B.targets:
- if 'blendernogame' in B.targets:
-     env['WITH_BF_GAMEENGINE'] = False
- 
-+# build without python autoexec security?
-+if env['WITH_PYTHON_SECURITY'] == True:
-+    env.Append(CPPFLAGS=['-DWITH_PYTHON_SECURITY'])
-+
- # build without elbeem (fluidsim)?
- if env['WITH_BF_FLUID'] == 1:
-     env['CPPFLAGS'].append('-DWITH_MOD_FLUID')
-diff -Npur blender-2.63.orig/source/blender/blenkernel/intern/blender.c blender-2.63/source/blender/blenkernel/intern/blender.c
---- blender-2.63.orig/source/blender/blenkernel/intern/blender.c	2012-05-08 00:05:06.994498491 +0200
-+++ blender-2.63/source/blender/blenkernel/intern/blender.c	2012-05-08 00:07:04.274496414 +0200
-@@ -145,6 +145,7 @@ void initglobals(void)
- 	G.f |= G_SCRIPT_AUTOEXEC;
- #else
- 	G.f &= ~G_SCRIPT_AUTOEXEC;
-+	G.f |= G_SCRIPT_OVERRIDE_PREF;  /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- #endif
- }
- 
-diff -Npur blender-2.63.orig/source/blender/makesrna/intern/rna_userdef.c blender-2.63/source/blender/makesrna/intern/rna_userdef.c
---- blender-2.63.orig/source/blender/makesrna/intern/rna_userdef.c	2012-05-08 00:05:07.002498491 +0200
-+++ blender-2.63/source/blender/makesrna/intern/rna_userdef.c	2012-05-08 00:08:04.547495355 +0200
-@@ -126,9 +126,17 @@ static void rna_userdef_show_manipulator
- 
- static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
- {
--	UserDef *userdef = (UserDef*)ptr->data;
--	if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE)	G.f &= ~G_SCRIPT_AUTOEXEC;
--	else												G.f |=  G_SCRIPT_AUTOEXEC;
-+	if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+		/* Blender run with --enable-autoexec */
-+		UserDef *userdef = (UserDef*)ptr->data;
-+		if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE)       G.f &= ~G_SCRIPT_AUTOEXEC;
-+		else                                                                                            G.f |=  G_SCRIPT_AUTOEXEC;
-+	}
-+}
-+
-+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) {
-+	/* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+	return !(G.f & G_SCRIPT_OVERRIDE_PREF);
- }
- 
- static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr)
-@@ -2994,6 +3002,8 @@ static void rna_def_userdef_system(Blend
- 	                         "Allow any .blend file to run scripts automatically "
- 	                         "(unsafe with blend files from an untrusted source)");
- 	RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update");
-+	/* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+	RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable");
- 
- 	prop = RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE);
- 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE);
-diff -Npur blender-2.63.orig/source/blender/windowmanager/intern/wm_files.c blender-2.63/source/blender/windowmanager/intern/wm_files.c
---- blender-2.63.orig/source/blender/windowmanager/intern/wm_files.c	2012-05-08 00:05:07.094498489 +0200
-+++ blender-2.63/source/blender/windowmanager/intern/wm_files.c	2012-05-08 00:09:20.964493999 +0200
-@@ -288,13 +288,18 @@ static void wm_init_userdef(bContext *C)
- 
- 	/* set the python auto-execute setting from user prefs */
- 	/* enabled by default, unless explicitly enabled in the command line which overrides */
--	if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+	if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) {
-+		/* Blender run with --enable-autoexec */
- 		if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |=  G_SCRIPT_AUTOEXEC;
- 		else G.f &= ~G_SCRIPT_AUTOEXEC;
- 	}
- 
- 	/* update tempdir from user preferences */
- 	BLI_init_temporary_dir(U.tempdir);
-+
-+	/* Workaround to fix default of "Auto Run Python Scripts" checkbox */
-+	if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC))
-+		U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE;
- }
- 
- 
-diff -Npur blender-2.63.orig/source/blender/windowmanager/intern/wm_operators.c blender-2.63/source/blender/windowmanager/intern/wm_operators.c
---- blender-2.63.orig/source/blender/windowmanager/intern/wm_operators.c	2012-05-08 00:05:07.093498489 +0200
-+++ blender-2.63/source/blender/windowmanager/intern/wm_operators.c	2012-05-08 00:10:59.325492259 +0200
-@@ -1627,12 +1627,13 @@ static int wm_open_mainfile_exec(bContex
- 		G.fileflags &= ~G_FILE_NO_UI;
- 	else
- 		G.fileflags |= G_FILE_NO_UI;
--		
--	if (RNA_boolean_get(op->ptr, "use_scripts"))
-+
-+	/* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */
-+	if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF)))
- 		G.f |= G_SCRIPT_AUTOEXEC;
- 	else
- 		G.f &= ~G_SCRIPT_AUTOEXEC;
--	
-+
- 	// XXX wm in context is not set correctly after WM_read_file -> crash
- 	// do it before for now, but is this correct with multiple windows?
- 	WM_event_add_notifier(C, NC_WINDOW, NULL);
-@@ -1644,6 +1645,8 @@ static int wm_open_mainfile_exec(bContex
- 
- static void WM_OT_open_mainfile(wmOperatorType *ot)
- {
-+	PropertyRNA * use_scripts_checkbox = NULL;
-+
- 	ot->name = "Open Blender File";
- 	ot->idname = "WM_OT_open_mainfile";
- 	ot->description = "Open a Blender file";
-@@ -1656,8 +1659,12 @@ static void WM_OT_open_mainfile(wmOperat
- 	                               WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
- 
- 	RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file");
--	RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source",
-+	use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts",
-+			!!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source",
- 	                "Allow .blend file to execute scripts automatically, default available from system preferences");
-+	/* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */
-+	if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF))
-+	        RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE);
- }
- 
- /* **************** link/append *************** */
-diff -Npur blender-2.63.orig/source/creator/creator.c blender-2.63/source/creator/creator.c
---- blender-2.63.orig/source/creator/creator.c	2012-05-08 00:05:06.987498491 +0200
-+++ blender-2.63/source/creator/creator.c	2012-05-08 00:11:37.213491621 +0200
-@@ -342,14 +342,14 @@ static int end_arguments(int UNUSED(argc
- static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- 	G.f |= G_SCRIPT_AUTOEXEC;
--	G.f |= G_SCRIPT_OVERRIDE_PREF;
-+	G.f &= ~G_SCRIPT_OVERRIDE_PREF;  /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */
- 	return 0;
- }
- 
- static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- 	G.f &= ~G_SCRIPT_AUTOEXEC;
--	G.f |= G_SCRIPT_OVERRIDE_PREF;
-+	G.f |= G_SCRIPT_OVERRIDE_PREF;  /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- 	return 0;
- }
- 
diff --git a/media-gfx/blender/files/blender-2.63-doxyfile.patch b/media-gfx/blender/files/blender-2.63-doxyfile.patch
deleted file mode 100644
index c52c23408e5d..000000000000
--- a/media-gfx/blender/files/blender-2.63-doxyfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- blender-2.60a.orig/work/blender-2.60a/doc/doxygen/Doxyfile	2012-02-12 23:05:35.390883778 +0100
-+++ blender-2.60a/work/blender-2.60a/doc/doxygen/Doxyfile	2012-02-12 23:07:22.539860341 +0100
-@@ -952,7 +952,7 @@
- # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
- # the HTML help compiler on the generated index.hhp.
- 
--HHC_LOCATION           = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe"
-+HHC_LOCATION           = 
- 
- # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
- # controls if a separate .chi index file is generated (YES) or that 
diff --git a/media-gfx/blender/files/blender-2.63-enable_site_module.patch b/media-gfx/blender/files/blender-2.63-enable_site_module.patch
deleted file mode 100644
index 2d6ca00c19cd..000000000000
--- a/media-gfx/blender/files/blender-2.63-enable_site_module.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Npur blender-2.63.orig/source/blender/python/intern/bpy_interface.c blender-2.63/source/blender/python/intern/bpy_interface.c
---- blender-2.63.orig/source/blender/python/intern/bpy_interface.c	2012-05-08 00:14:54.141488111 +0200
-+++ blender-2.63/source/blender/python/intern/bpy_interface.c	2012-05-08 00:15:14.861487739 +0200
-@@ -241,11 +241,6 @@ void BPY_python_start(int argc, const ch
- 	 * blender is utf-8 too - campbell */
- 	BLI_setenv("PYTHONIOENCODING", "utf-8:surrogateescape");
- 
--	/* Python 3.2 now looks for '2.xx/python/include/python3.2d/pyconfig.h' to
--	 * parse from the 'sysconfig' module which is used by 'site',
--	 * so for now disable site. alternatively we could copy the file. */
--	Py_NoSiteFlag = 1;
--
- 	Py_Initialize();
- 
- 	// PySys_SetArgv(argc, argv); // broken in py3, not a huge deal
-diff -Npur blender-2.63.orig/source/gameengine/Ketsji/KX_PythonInit.cpp blender-2.63/source/gameengine/Ketsji/KX_PythonInit.cpp
---- blender-2.63.orig/source/gameengine/Ketsji/KX_PythonInit.cpp	2012-05-08 00:14:54.118488110 +0200
-+++ blender-2.63/source/gameengine/Ketsji/KX_PythonInit.cpp	2012-05-08 00:15:23.305487596 +0200
-@@ -1848,7 +1848,6 @@ PyObject* initGamePlayerPythonScripting(
- 	STR_String pname = progname;
- 	Py_SetProgramName(pname.Ptr());
- #endif
--	Py_NoSiteFlag=1;
- 	Py_FrozenFlag=1;
- 
- 	/* must run before python initializes */
-@@ -1929,7 +1928,6 @@ PyObject* initGamePythonScripting(const
- 	STR_String pname = progname;
- 	Py_SetProgramName(pname.Ptr());
- #endif
--	Py_NoSiteFlag=1;
- 	Py_FrozenFlag=1;
- 
- #ifdef WITH_AUDASPACE
diff --git a/media-gfx/blender/files/blender-2.63-glew.patch b/media-gfx/blender/files/blender-2.63-glew.patch
deleted file mode 100644
index 736bedd8185d..000000000000
--- a/media-gfx/blender/files/blender-2.63-glew.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Npur blender-2.63.orig/CMakeLists.txt blender-2.63/CMakeLists.txt
---- blender-2.63.orig/CMakeLists.txt	2012-05-07 23:02:18.166565118 +0200
-+++ blender-2.63/CMakeLists.txt	2012-05-07 23:02:45.907564652 +0200
-@@ -160,7 +160,7 @@ unset(PLATFORM_DEFAULT)
- if(UNIX AND NOT APPLE)
- 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"	ON)
- 	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"	ON)
--	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
-+	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" OFF)
- 	option(WITH_XDG_USER_DIRS    "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
- 	mark_as_advanced(WITH_XDG_USER_DIRS)
- 
-diff -Npur blender-2.63.orig/extern/CMakeLists.txt blender-2.63/extern/CMakeLists.txt
---- blender-2.63.orig/extern/CMakeLists.txt	2012-05-07 23:02:18.134565119 +0200
-+++ blender-2.63/extern/CMakeLists.txt	2012-05-07 23:02:58.458564406 +0200
-@@ -40,10 +40,6 @@ if(WITH_BINRELOC)
- 	add_subdirectory(binreloc)
- endif()
- 
--if(WITH_BUILTIN_GLEW)
--	add_subdirectory(glew)
--endif()
--
- if(WITH_GAMEENGINE)
- 	add_subdirectory(recastnavigation)
- endif()
-diff -Npur blender-2.63.orig/extern/SConscript blender-2.63/extern/SConscript
---- blender-2.63.orig/extern/SConscript	2012-05-07 23:02:18.132565119 +0200
-+++ blender-2.63/extern/SConscript	2012-05-07 23:03:14.094564130 +0200
-@@ -2,7 +2,6 @@
- 
- Import('env')
- 
--SConscript(['glew/SConscript'])
- SConscript(['colamd/SConscript'])
- 
- if env['WITH_BF_GAMEENGINE']:
-diff -Npur blender-2.63.orig/source/blender/editors/include/BIF_gl.h blender-2.63/source/blender/editors/include/BIF_gl.h
---- blender-2.63.orig/source/blender/editors/include/BIF_gl.h	2012-05-07 23:02:18.433565114 +0200
-+++ blender-2.63/source/blender/editors/include/BIF_gl.h	2012-05-07 23:03:35.555563750 +0200
-@@ -33,7 +33,7 @@
- #ifndef __BIF_GL_H__
- #define __BIF_GL_H__
- 
--#include "GL/glew.h"
-+#include <GL/glew.h>
- 
- 	/*
- 	 * these should be phased out. cpack should be replaced in
diff --git a/media-gfx/blender/files/blender-2.63-opencollada-debug.patch b/media-gfx/blender/files/blender-2.63-opencollada-debug.patch
deleted file mode 100644
index 0798cfde0745..000000000000
--- a/media-gfx/blender/files/blender-2.63-opencollada-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Npur blender-2.63.orig/build_files/scons/tools/Blender.py blender-2.63/build_files/scons/tools/Blender.py
---- blender-2.63.orig/build_files/scons/tools/Blender.py	2012-05-08 00:15:58.091486980 +0200
-+++ blender-2.63/build_files/scons/tools/Blender.py	2012-05-08 00:17:01.805485854 +0200
-@@ -276,10 +276,7 @@ def setup_syslibs(lenv):
-         syslibs += Split(lenv['BF_PTHREADS_LIB'])
-     if lenv['WITH_BF_COLLADA']:
-         syslibs.append(lenv['BF_PCRE_LIB'])
--        if lenv['BF_DEBUG'] and (lenv['OURPLATFORM'] != 'linux'):
--            syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])]
--        else:
--            syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
-+        syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
-         syslibs.append(lenv['BF_EXPAT_LIB'])
-     if lenv['WITH_BF_COLAMD']:
- 	syslibs += Split(lenv['BF_COLAMD_LIB'])
diff --git a/media-gfx/blender/files/blender-2.63a-bullet.patch b/media-gfx/blender/files/blender-2.63a-bullet.patch
deleted file mode 100644
index e8ebd736305d..000000000000
--- a/media-gfx/blender/files/blender-2.63a-bullet.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-diff -Npur blender-2.63a.eigen/build_files/scons/tools/Blender.py blender-2.63a/build_files/scons/tools/Blender.py
---- blender-2.63a.eigen/build_files/scons/tools/Blender.py	2012-05-10 16:53:28.000000000 +0200
-+++ blender-2.63a/build_files/scons/tools/Blender.py	2012-06-03 18:43:16.699242778 +0200
-@@ -268,6 +268,8 @@ def setup_syslibs(lenv):
-         syslibs += Split(lenv['BF_SDL_LIB'])
-     if not lenv['WITH_BF_STATICOPENGL']:
-         syslibs += Split(lenv['BF_OPENGL_LIB'])
-+    if lenv['WITH_BF_BULLET']:
-+	syslibs += Split(lenv['BF_BULLET_LIB'])
-     if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross', 'win64-vc', 'win64-mingw'):
-         syslibs += Split(lenv['BF_PTHREADS_LIB'])
-     if lenv['WITH_BF_COLLADA']:
-diff -Npur blender-2.63a.eigen/doc/doxygen/Doxyfile blender-2.63a/doc/doxygen/Doxyfile
---- blender-2.63a.eigen/doc/doxygen/Doxyfile	2012-05-10 16:53:36.000000000 +0200
-+++ blender-2.63a/doc/doxygen/Doxyfile	2012-06-03 18:43:16.700242905 +0200
-@@ -617,8 +617,7 @@ INPUT                  = doxygen.main \
-                          doxygen.intern \
-                          doxygen.extern \
-                          ../../source \
--                         ../../intern \
--                         ../../extern/bullet2
-+                         ../../intern
- 
- # This tag can be used to specify the character encoding of the source files 
- # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-diff -Npur blender-2.63a.eigen/extern/CMakeLists.txt blender-2.63a/extern/CMakeLists.txt
---- blender-2.63a.eigen/extern/CMakeLists.txt	2012-05-10 16:54:50.000000000 +0200
-+++ blender-2.63a/extern/CMakeLists.txt	2012-06-03 18:43:16.701243032 +0200
-@@ -28,10 +28,6 @@ remove_strict_flags()
- 
- add_subdirectory(colamd)
- 
--if(WITH_BULLET)
--	add_subdirectory(bullet2)
--endif()
--
- if(WITH_MOD_CLOTH_ELTOPO)
- 	add_subdirectory(eltopo)
- endif()
-diff -Npur blender-2.63a.eigen/intern/smoke/CMakeLists.txt blender-2.63a/intern/smoke/CMakeLists.txt
---- blender-2.63a.eigen/intern/smoke/CMakeLists.txt	2012-05-10 16:46:35.000000000 +0200
-+++ blender-2.63a/intern/smoke/CMakeLists.txt	2012-06-03 18:43:16.702243159 +0200
-@@ -26,10 +26,10 @@
- set(INC
- 	intern
- 	../memutil
--	../../extern/bullet2/src
- )
- 
- set(INC_SYS
-+	/usr/include/bullet
- 	${PNG_INCLUDE_DIR}
- 	${ZLIB_INCLUDE_DIRS}
- )
-diff -Npur blender-2.63a.eigen/intern/smoke/SConscript blender-2.63a/intern/smoke/SConscript
---- blender-2.63a.eigen/intern/smoke/SConscript	2012-05-10 16:46:35.000000000 +0200
-+++ blender-2.63a/intern/smoke/SConscript	2012-06-03 18:43:16.702243159 +0200
-@@ -13,7 +13,7 @@ if env['WITH_BF_OPENMP']:
-     defs += ' PARALLEL=1'
- 
- incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] 
--incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc '
-+incs += ' intern /usr/include/bullet ../memutil ../guardealloc '
- 
- if env['WITH_BF_FFTW3']:
-     defs += ' WITH_FFTW3'
-diff -Npur blender-2.63a.eigen/source/blender/blenkernel/CMakeLists.txt blender-2.63a/source/blender/blenkernel/CMakeLists.txt
---- blender-2.63a.eigen/source/blender/blenkernel/CMakeLists.txt	2012-05-10 16:50:24.000000000 +0200
-+++ blender-2.63a/source/blender/blenkernel/CMakeLists.txt	2012-06-03 18:43:16.703243286 +0200
-@@ -241,8 +241,8 @@ if(WITH_AUDASPACE)
- endif()
- 
- if(WITH_BULLET)
--	list(APPEND INC
--		../../../extern/bullet2/src
-+    list(APPEND INC_SYS
-+		/usr/include/bullet
- 	)
- 	add_definitions(-DUSE_BULLET)
- endif()
-diff -Npur blender-2.63a.eigen/source/blender/blenkernel/SConscript blender-2.63a/source/blender/blenkernel/SConscript
---- blender-2.63a.eigen/source/blender/blenkernel/SConscript	2012-05-10 16:50:24.000000000 +0200
-+++ blender-2.63a/source/blender/blenkernel/SConscript	2012-06-03 18:43:16.704243413 +0200
-@@ -9,7 +9,7 @@ incs += ' ../blenlib ../blenfont ../make
- incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna'
- incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers'
- incs += ' #/intern/iksolver/extern ../blenloader'
--incs += ' #/extern/bullet2/src'
-+incs += ' /usr/include/bullet'
- incs += ' #/intern/opennl/extern #/intern/bsp/extern'
- incs += ' ../gpu #/extern/glew/include'
- incs += ' ../bmesh'
-diff -Npur blender-2.63a.eigen/source/gameengine/BlenderRoutines/CMakeLists.txt blender-2.63a/source/gameengine/BlenderRoutines/CMakeLists.txt
---- blender-2.63a.eigen/source/gameengine/BlenderRoutines/CMakeLists.txt	2012-05-10 16:48:35.000000000 +0200
-+++ blender-2.63a/source/gameengine/BlenderRoutines/CMakeLists.txt	2012-06-03 18:43:16.704243413 +0200
-@@ -23,7 +23,6 @@ set(INC
- 	../../blender/makesdna
- 	../../blender/makesrna
- 	../../blender/windowmanager
--	../../../extern/bullet2/src
- 	../../../intern/container
- 	../../../intern/guardedalloc
- 	../../../intern/moto/include
-@@ -33,6 +32,7 @@ set(INC
- 
- set(INC_SYS
- 	${PTHREADS_INCLUDE_DIRS}
-+	/usr/include/bullet
- )
- 
- set(SRC
-diff -Npur blender-2.63a.eigen/source/gameengine/Converter/CMakeLists.txt blender-2.63a/source/gameengine/Converter/CMakeLists.txt
---- blender-2.63a.eigen/source/gameengine/Converter/CMakeLists.txt	2012-06-03 18:42:31.632515028 +0200
-+++ blender-2.63a/source/gameengine/Converter/CMakeLists.txt	2012-06-03 18:43:16.705243540 +0200
-@@ -49,7 +49,6 @@ set(INC
- 	../../blender/makesdna
- 	../../blender/makesrna
- 	../../blender/windowmanager
--	../../../extern/bullet2/src
- 	../../../intern/container
- 	../../../intern/guardedalloc
- 	../../../intern/moto/include
-@@ -60,6 +59,7 @@ set(INC
- set(INC_SYS
- 	${PTHREADS_INCLUDE_DIRS}
- 	/usr/include/eigen3
-+	/usr/include/bullet
- 
- )
- 
-diff -Npur blender-2.63a.eigen/source/gameengine/Ketsji/CMakeLists.txt blender-2.63a/source/gameengine/Ketsji/CMakeLists.txt
---- blender-2.63a.eigen/source/gameengine/Ketsji/CMakeLists.txt	2012-05-10 16:48:58.000000000 +0200
-+++ blender-2.63a/source/gameengine/Ketsji/CMakeLists.txt	2012-06-03 18:43:16.706243667 +0200
-@@ -242,9 +242,11 @@ endif()
- 
- if(WITH_BULLET)
- 	list(APPEND INC
--		../../../extern/bullet2/src
- 		../Physics/Bullet
- 	)
-+	list(APPEND INC_SYS
-+		/usr/include/bullet
-+	)
- 	add_definitions(-DUSE_BULLET)
- endif()
- 
-diff -Npur blender-2.63a.eigen/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp blender-2.63a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
---- blender-2.63a.eigen/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp	2012-05-10 16:48:32.000000000 +0200
-+++ blender-2.63a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp	2012-06-03 18:43:16.708243921 +0200
-@@ -2804,7 +2804,8 @@ float		CcdPhysicsEnvironment::getApplied
- 
- void	CcdPhysicsEnvironment::exportFile(const char* filename)
- {
--	btDefaultSerializer*	serializer = new btDefaultSerializer();
-+	// Workaround bullet-2.77 api change.
-+	btDefaultSerializer*	serializer = new btDefaultSerializer(0);
- 	
- 		
- 	for (int i=0;i<m_dynamicsWorld->getNumCollisionObjects();i++)
-diff -Npur blender-2.63a.eigen/source/gameengine/Physics/Bullet/CMakeLists.txt blender-2.63a/source/gameengine/Physics/Bullet/CMakeLists.txt
---- blender-2.63a.eigen/source/gameengine/Physics/Bullet/CMakeLists.txt	2012-05-10 16:48:32.000000000 +0200
-+++ blender-2.63a/source/gameengine/Physics/Bullet/CMakeLists.txt	2012-06-03 18:43:16.709244048 +0200
-@@ -37,7 +37,6 @@ set(INC
- 	../../../blender/blenkernel
- 	../../../blender/blenlib
- 	../../../blender/makesdna
--	../../../../extern/bullet2/src
- 	../../../../intern/container
- 	../../../../intern/guardedalloc
- 	../../../../intern/moto/include
-@@ -45,6 +44,7 @@ set(INC
- )
- 
- set(INC_SYS
-+	/usr/include/bullet
- 	${GLEW_INCLUDE_PATH}
- 	${PYTHON_INCLUDE_DIRS}
- )
diff --git a/media-gfx/blender/files/blender-2.63a-colamd.patch b/media-gfx/blender/files/blender-2.63a-colamd.patch
deleted file mode 100644
index 80c04e89f996..000000000000
--- a/media-gfx/blender/files/blender-2.63a-colamd.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -Npur blender-2.63a.eigen-bullet/build_files/scons/config/linux-config.py blender-2.63a/build_files/scons/config/linux-config.py
---- blender-2.63a.eigen-bullet/build_files/scons/config/linux-config.py	2012-05-10 16:53:29.000000000 +0200
-+++ blender-2.63a/build_files/scons/config/linux-config.py	2012-06-03 18:43:55.121126001 +0200
-@@ -192,6 +192,11 @@ BF_EXPAT = '/usr'
- BF_EXPAT_LIB = 'expat'
- BF_EXPAT_LIBPATH = '/usr/lib'
- 
-+WITH_BF_COLAMD = True
-+BF_COLAMD = '#extern/colamd'
-+BF_COLAMD_INC = '${BF_COLAMD}/include'
-+BF_COLAMD_LIB = 'extern_colamd'
-+
- WITH_BF_JEMALLOC = False
- WITH_BF_STATICJEMALLOC = False
- BF_JEMALLOC = '/usr'
-diff -Npur blender-2.63a.eigen-bullet/build_files/scons/tools/Blender.py blender-2.63a/build_files/scons/tools/Blender.py
---- blender-2.63a.eigen-bullet/build_files/scons/tools/Blender.py	2012-06-03 18:43:16.699242778 +0200
-+++ blender-2.63a/build_files/scons/tools/Blender.py	2012-06-03 18:43:55.123126255 +0200
-@@ -279,6 +279,8 @@ def setup_syslibs(lenv):
-         else:
-             syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
-         syslibs.append(lenv['BF_EXPAT_LIB'])
-+    if lenv['WITH_BF_COLAMD']:
-+        syslibs += Split(lenv['BF_COLAMD_LIB'])
- 
-     if lenv['WITH_BF_JEMALLOC']:
-         if not lenv['WITH_BF_STATICJEMALLOC']:
-diff -Npur blender-2.63a.eigen-bullet/build_files/scons/tools/btools.py blender-2.63a/build_files/scons/tools/btools.py
---- blender-2.63a.eigen-bullet/build_files/scons/tools/btools.py	2012-05-10 16:53:28.000000000 +0200
-+++ blender-2.63a/build_files/scons/tools/btools.py	2012-06-03 18:43:55.124126382 +0200
-@@ -126,6 +126,7 @@ def validate_arguments(args, bc):
-             'WITH_BF_FFTW3', 'BF_FFTW3', 'BF_FFTW3_INC', 'BF_FFTW3_LIB', 'BF_FFTW3_LIBPATH', 'WITH_BF_STATICFFTW3', 'BF_FFTW3_LIB_STATIC',
-             'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC',
-             'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_INC', 'BF_OPENCOLLADA_LIB', 'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH', 'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH',
-+            'WITH_BF_COLAMD', 'BF_COLAMD', 'BF_COLAMD_INC', 'BF_COLAMD_LIB',
-             'WITH_BF_PLAYER',
-             'WITH_BF_NOBLENDER',
-             'WITH_BF_BINRELOC',
-@@ -455,6 +456,11 @@ def read_opts(env, cfg, args):
-         ('BF_EXPAT_LIB', 'Expat library', ''),
-         ('BF_EXPAT_LIBPATH', 'Expat library path', ''),
-         
-+        (BoolVariable('WITH_BF_COLAMD', 'Use Colamd if true', True)),
-+        ('BF_COLAMD', 'Colamd base dir', ''),
-+        ('BF_COLAMD_INC', 'Colamd include path', ''),
-+        ('BF_COLAMD_LIB', 'Colamd library', ''),
-+
-         (BoolVariable('WITH_BF_JEMALLOC', 'Use jemalloc if true', False)),
-         (BoolVariable('WITH_BF_STATICJEMALLOC', 'Staticly link to jemalloc', False)),
-         ('BF_JEMALLOC', 'jemalloc base path', ''),
-diff -Npur blender-2.63a.eigen-bullet/extern/libmv/bundle.sh blender-2.63a/extern/libmv/bundle.sh
---- blender-2.63a.eigen-bullet/extern/libmv/bundle.sh	2012-06-03 18:42:31.626514266 +0200
-+++ blender-2.63a/extern/libmv/bundle.sh	2012-06-03 18:43:55.125126509 +0200
-@@ -122,13 +122,13 @@ set(INC
- 	.
- 	third_party/ssba
- 	third_party/ldl/Include
--	../colamd/Include
- )
- 
- set(INC_SYS
- 	/usr/include/eigen3
- 	\${PNG_INCLUDE_DIR}
- 	\${ZLIB_INCLUDE_DIRS}
-+	\${COLAMD_INCLUDE_DIRS}
- )
- 
- 
-@@ -247,6 +247,7 @@ $src
- incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-+incs += ' ' + env['BF_COLAMD_INC']
- 
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-     incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
-@@ -276,7 +277,7 @@ else:
-         ccflags_libmv += Split(env['REL_CCFLAGS'])
-         cxxflags_libmv += Split(env['REL_CXXFLAGS'])
- 
--incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
-+incs += ' ./third_party/ssba ./third_party/ldl/Include'
- 
- env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
- EOF
-diff -Npur blender-2.63a.eigen-bullet/extern/libmv/CMakeLists.txt blender-2.63a/extern/libmv/CMakeLists.txt
---- blender-2.63a.eigen-bullet/extern/libmv/CMakeLists.txt	2012-06-03 18:42:31.627514393 +0200
-+++ blender-2.63a/extern/libmv/CMakeLists.txt	2012-06-03 18:43:55.125126509 +0200
-@@ -30,13 +30,13 @@ set(INC
- 	.
- 	third_party/ssba
- 	third_party/ldl/Include
--	../colamd/Include
- )
- 
- set(INC_SYS
- 	/usr/include/eigen3
- 	${PNG_INCLUDE_DIR}
- 	${ZLIB_INCLUDE_DIRS}
-+	${COLAMD_INCLUDE_DIRS}
- )
- 
- 
-diff -Npur blender-2.63a.eigen-bullet/extern/libmv/SConscript blender-2.63a/extern/libmv/SConscript
---- blender-2.63a.eigen-bullet/extern/libmv/SConscript	2012-06-03 18:42:31.627514393 +0200
-+++ blender-2.63a/extern/libmv/SConscript	2012-06-03 18:43:55.127126763 +0200
-@@ -33,6 +33,7 @@ src += env.Glob('third_party/ssba/Math/*
- incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-+incs += ' ' + env['BF_COLAMD_INC']
- 
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-     incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
-@@ -62,6 +63,6 @@ else:
-         ccflags_libmv += Split(env['REL_CCFLAGS'])
-         cxxflags_libmv += Split(env['REL_CXXFLAGS'])
- 
--incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
-+incs += ' ./third_party/ssba ./third_party/ldl/Include'
- 
- env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
-diff -Npur blender-2.63a.eigen-bullet/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp blender-2.63a/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
---- blender-2.63a.eigen-bullet/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp	2012-05-10 16:54:38.000000000 +0200
-+++ blender-2.63a/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp	2012-06-03 18:43:55.128126890 +0200
-@@ -21,7 +21,7 @@ with SSBA. If not, see <http://www.gnu.o
- 
- #if defined(V3DLIB_ENABLE_SUITESPARSE)
- //# include "COLAMD/Include/colamd.h"
--# include "colamd.h"
-+# include <colamd.h>
- extern "C"
- {
- //# include "LDL/Include/ldl.h"
-diff -Npur blender-2.63a.eigen-bullet/intern/opennl/CMakeLists.txt blender-2.63a/intern/opennl/CMakeLists.txt
---- blender-2.63a.eigen-bullet/intern/opennl/CMakeLists.txt	2012-05-10 16:46:04.000000000 +0200
-+++ blender-2.63a/intern/opennl/CMakeLists.txt	2012-06-03 18:43:55.129127017 +0200
-@@ -40,11 +40,10 @@ add_definitions(
- set(INC
- 	extern
- 	superlu
--	../../extern/colamd/Include
- )
- 
- set(INC_SYS
--
-+	/usr/include
- )
- 
- set(SRC
-diff -Npur blender-2.63a.eigen-bullet/intern/opennl/SConscript blender-2.63a/intern/opennl/SConscript
---- blender-2.63a.eigen-bullet/intern/opennl/SConscript	2012-05-10 16:46:04.000000000 +0200
-+++ blender-2.63a/intern/opennl/SConscript	2012-06-03 18:43:55.129127017 +0200
-@@ -3,7 +3,7 @@ Import ('env')
- 
- sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c')
- 
--incs = 'extern superlu ../../extern/colamd/Include'
-+incs = 'extern superlu /usr/include'
- 
- if (env['OURPLATFORM'] in ('win32-mingw', 'win64-mingw')):
-     env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
-diff -Npur blender-2.63a.eigen-bullet/intern/opennl/superlu/get_perm_c.c blender-2.63a/intern/opennl/superlu/get_perm_c.c
---- blender-2.63a.eigen-bullet/intern/opennl/superlu/get_perm_c.c	2012-05-10 16:46:04.000000000 +0200
-+++ blender-2.63a/intern/opennl/superlu/get_perm_c.c	2012-06-03 18:43:55.130127145 +0200
-@@ -10,7 +10,7 @@
-  */
- 
- #include "ssp_defs.h"
--#include "colamd.h"
-+#include <colamd.h>
- 
- extern int  genmmd_(int *, int *, int *, int *, int *, int *, int *, 
- 		    int *, int *, int *, int *, int *);
diff --git a/media-gfx/blender/files/blender-2.63a-desktop.patch b/media-gfx/blender/files/blender-2.63a-desktop.patch
deleted file mode 100644
index 2894ee8616cb..000000000000
--- a/media-gfx/blender/files/blender-2.63a-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- release/freedesktop/blender.desktop-original	2012-04-26 22:43:53.000000000 +0200
-+++ release/freedesktop/blender.desktop	2012-05-04 00:49:30.263479607 +0200
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Blender
-+Name=Blender-2.63a
- GenericName=3D modeller
- GenericName[es]=modelador 3D
- GenericName[de]=3D-Modellierer
-@@ -8,8 +8,8 @@
- Comment=3D modeling, animation, rendering and post-production
- Comment[es]=modelado 3D, animación, renderizado y post-producción
- Comment[de]=3D-Modellierung, Animation, Rendering und Nachbearbeitung
--Exec=blender
--Icon=blender
-+Exec=blender-2.63a %f
-+Icon=blender-2.63a
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;
diff --git a/media-gfx/blender/files/blender-2.63a-eigen.patch b/media-gfx/blender/files/blender-2.63a-eigen.patch
deleted file mode 100644
index 6638cd01ff3c..000000000000
--- a/media-gfx/blender/files/blender-2.63a-eigen.patch
+++ /dev/null
@@ -1,554 +0,0 @@
-diff -Npur blender-2.63a.orig/extern/libmv/bundle.sh blender-2.63a/extern/libmv/bundle.sh
---- blender-2.63a.orig/extern/libmv/bundle.sh	2012-05-10 16:54:39.000000000 +0200
-+++ blender-2.63a/extern/libmv/bundle.sh	2012-06-03 17:08:48.536848484 +0200
-@@ -120,13 +120,13 @@ cat > CMakeLists.txt << EOF
- 
- set(INC
- 	.
--	../Eigen3
- 	third_party/ssba
- 	third_party/ldl/Include
- 	../colamd/Include
- )
- 
- set(INC_SYS
-+	/usr/include/eigen3
- 	\${PNG_INCLUDE_DIR}
- 	\${ZLIB_INCLUDE_DIRS}
- )
-@@ -244,7 +244,7 @@ defs.append('GOOGLE_GLOG_DLL_DECL=')
- src = env.Glob("*.cpp")
- $src
- 
--incs = '. ../Eigen3'
-+incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
- 
-diff -Npur blender-2.63a.orig/extern/libmv/CMakeLists.txt blender-2.63a/extern/libmv/CMakeLists.txt
---- blender-2.63a.orig/extern/libmv/CMakeLists.txt	2012-05-10 16:54:39.000000000 +0200
-+++ blender-2.63a/extern/libmv/CMakeLists.txt	2012-06-03 17:08:48.536848484 +0200
-@@ -28,13 +28,13 @@
- 
- set(INC
- 	.
--	../Eigen3
- 	third_party/ssba
- 	third_party/ldl/Include
- 	../colamd/Include
- )
- 
- set(INC_SYS
-+	/usr/include/eigen3
- 	${PNG_INCLUDE_DIR}
- 	${ZLIB_INCLUDE_DIRS}
- )
-diff -Npur blender-2.63a.orig/extern/libmv/SConscript blender-2.63a/extern/libmv/SConscript
---- blender-2.63a.orig/extern/libmv/SConscript	2012-05-10 16:54:39.000000000 +0200
-+++ blender-2.63a/extern/libmv/SConscript	2012-06-03 17:08:48.553850645 +0200
-@@ -30,7 +30,7 @@ src += env.Glob('third_party/ldl/Source/
- src += env.Glob('third_party/ssba/Geometry/*.cpp')
- src += env.Glob('third_party/ssba/Math/*.cpp')
- 
--incs = '. ../Eigen3'
-+incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
- 
-diff -Npur blender-2.63a.orig/intern/dualcon/SConscript blender-2.63a/intern/dualcon/SConscript
---- blender-2.63a.orig/intern/dualcon/SConscript	2012-05-10 16:44:30.000000000 +0200
-+++ blender-2.63a/intern/dualcon/SConscript	2012-06-03 17:08:48.554850772 +0200
-@@ -3,7 +3,7 @@ Import ('env')
- 
- sources = env.Glob('intern/*.cpp')
- 
--incs = '. ../../extern/Eigen3'
-+incs = '. /usr/include/eigen3'
- defs = ''
- 
- env.BlenderLib ('bf_intern_dualcon', sources, Split(incs), Split(defs), libtype=['intern'], priority=[100] )
-diff -Npur blender-2.63a.orig/intern/itasc/CMakeLists.txt blender-2.63a/intern/itasc/CMakeLists.txt
---- blender-2.63a.orig/intern/itasc/CMakeLists.txt	2012-05-10 16:46:17.000000000 +0200
-+++ blender-2.63a/intern/itasc/CMakeLists.txt	2012-06-03 17:08:48.555850899 +0200
-@@ -24,11 +24,11 @@
- # ***** END GPL LICENSE BLOCK *****
- 
- set(INC
--	../../extern/Eigen3
-+	
- )
- 
- set(INC_SYS
--	
-+	/usr/include/eigen3	
- )
- 
- set(SRC
-@@ -121,201 +121,201 @@ set(SRC
- 	kdl/framevel.inl
- 
- 	# until we have another user...
--	../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
--	../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
--	../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
--	../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h
--	../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
--	../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
--	../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
--	../../extern/Eigen3/Eigen/src/misc/Kernel.h
--	../../extern/Eigen3/Eigen/src/misc/Image.h
--	../../extern/Eigen3/Eigen/src/misc/Solve.h
--	../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h
--	../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
--	../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
--	../../extern/Eigen3/Eigen/src/StlSupport/details.h
--	../../extern/Eigen3/Eigen/src/StlSupport/StdList.h
--	../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
--	../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h
--	../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
--	../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
--	../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
--	../../extern/Eigen3/Eigen/src/Householder/Householder.h
--	../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
--	../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
--	../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h
--	../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
--	../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
--	../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
--	../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
--	../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
--	../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
--	../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
--	../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
--	../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h
--	../../extern/Eigen3/Eigen/src/Geometry/Scaling.h
--	../../extern/Eigen3/Eigen/src/Geometry/Translation.h
--	../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
--	../../extern/Eigen3/Eigen/src/Geometry/Transform.h
--	../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h
--	../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h
--	../../extern/Eigen3/Eigen/src/LU/Determinant.h
--	../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
--	../../extern/Eigen3/Eigen/src/LU/FullPivLU.h
--	../../extern/Eigen3/Eigen/src/LU/Inverse.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseMatrixBase.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseVector.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
--	../../extern/Eigen3/Eigen/src/Sparse/TriangularSolver.h
--	../../extern/Eigen3/Eigen/src/Sparse/AmbiVector.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseDenseProduct.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseBlock.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseTriangularView.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
--	../../extern/Eigen3/Eigen/src/Sparse/CoreIterators.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseMatrix.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseAssign.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseSparseProduct.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseDot.h
--	../../extern/Eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseRedux.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseFuzzy.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseView.h
--	../../extern/Eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseUtil.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseTranspose.h
--	../../extern/Eigen3/Eigen/src/Sparse/SparseProduct.h
--	../../extern/Eigen3/Eigen/src/Sparse/CompressedStorage.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
--	../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
--	../../extern/Eigen3/Eigen/src/Core/MatrixBase.h
--	../../extern/Eigen3/Eigen/src/Core/Swap.h
--	../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
--	../../extern/Eigen3/Eigen/src/Core/DenseBase.h
--	../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
--	../../extern/Eigen3/Eigen/src/Core/ProductBase.h
--	../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
--	../../extern/Eigen3/Eigen/src/Core/Stride.h
--	../../extern/Eigen3/Eigen/src/Core/Matrix.h
--	../../extern/Eigen3/Eigen/src/Core/Visitor.h
--	../../extern/Eigen3/Eigen/src/Core/Array.h
--	../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h
--	../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
--	../../extern/Eigen3/Eigen/src/Core/EigenBase.h
--	../../extern/Eigen3/Eigen/src/Core/Random.h
--	../../extern/Eigen3/Eigen/src/Core/Redux.h
--	../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
--	../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
--	../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
--	../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
--	../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
--	../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
--	../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h
--	../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
--	../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h
--	../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
--	../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
--	../../extern/Eigen3/Eigen/src/Core/util/Memory.h
--	../../extern/Eigen3/Eigen/src/Core/util/Meta.h
--	../../extern/Eigen3/Eigen/src/Core/util/Constants.h
--	../../extern/Eigen3/Eigen/src/Core/util/Macros.h
--	../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
--	../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
--	../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
--	../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h
--	../../extern/Eigen3/Eigen/src/Core/VectorBlock.h
--	../../extern/Eigen3/Eigen/src/Core/Transpositions.h
--	../../extern/Eigen3/Eigen/src/Core/Select.h
--	../../extern/Eigen3/Eigen/src/Core/BandMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
--	../../extern/Eigen3/Eigen/src/Core/Dot.h
--	../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
--	../../extern/Eigen3/Eigen/src/Core/Product.h
--	../../extern/Eigen3/Eigen/src/Core/Transpose.h
--	../../extern/Eigen3/Eigen/src/Core/Block.h
--	../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
--	../../extern/Eigen3/Eigen/src/Core/MapBase.h
--	../../extern/Eigen3/Eigen/src/Core/NoAlias.h
--	../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
--	../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
--	../../extern/Eigen3/Eigen/src/Core/IO.h
--	../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
--	../../extern/Eigen3/Eigen/src/Core/Reverse.h
--	../../extern/Eigen3/Eigen/src/Core/Fuzzy.h
--	../../extern/Eigen3/Eigen/src/Core/DenseStorage.h
--	../../extern/Eigen3/Eigen/src/Core/StableNorm.h
--	../../extern/Eigen3/Eigen/src/Core/NumTraits.h
--	../../extern/Eigen3/Eigen/src/Core/Map.h
--	../../extern/Eigen3/Eigen/src/Core/Functors.h
--	../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/ArrayBase.h
--	../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
--	../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h
--	../../extern/Eigen3/Eigen/src/Core/NestByValue.h
--	../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
--	../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h
--	../../extern/Eigen3/Eigen/src/Core/MathFunctions.h
--	../../extern/Eigen3/Eigen/src/Core/Diagonal.h
--	../../extern/Eigen3/Eigen/src/Core/Replicate.h
--	../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
--	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
--	../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
--	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
--	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
--	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
--	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
--	../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
--	../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
--	../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
--	../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
--	../../extern/Eigen3/Eigen/src/Core/Assign.h
--	../../extern/Eigen3/Eigen/src/Core/Flagged.h
--	../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h
--	../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
-+	/usr/include/eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
-+	/usr/include/eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
-+	/usr/include/eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
-+	/usr/include/eigen3/Eigen/src/plugins/BlockMethods.h
-+	/usr/include/eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
-+	/usr/include/eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
-+	/usr/include/eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
-+	/usr/include/eigen3/Eigen/src/misc/Kernel.h
-+	/usr/include/eigen3/Eigen/src/misc/Image.h
-+	/usr/include/eigen3/Eigen/src/misc/Solve.h
-+	/usr/include/eigen3/Eigen/src/QR/HouseholderQR.h
-+	/usr/include/eigen3/Eigen/src/QR/ColPivHouseholderQR.h
-+	/usr/include/eigen3/Eigen/src/QR/FullPivHouseholderQR.h
-+	/usr/include/eigen3/Eigen/src/StlSupport/details.h
-+	/usr/include/eigen3/Eigen/src/StlSupport/StdList.h
-+	/usr/include/eigen3/Eigen/src/StlSupport/StdDeque.h
-+	/usr/include/eigen3/Eigen/src/StlSupport/StdVector.h
-+	/usr/include/eigen3/Eigen/src/SVD/UpperBidiagonalization.h
-+	/usr/include/eigen3/Eigen/src/SVD/JacobiSVD.h
-+	/usr/include/eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
-+	/usr/include/eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
-+	/usr/include/eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
-+	/usr/include/eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
-+	/usr/include/eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
-+	/usr/include/eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
-+	/usr/include/eigen3/Eigen/src/Eigenvalues/RealSchur.h
-+	/usr/include/eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
-+	/usr/include/eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
-+	/usr/include/eigen3/Eigen/src/Eigenvalues/EigenSolver.h
-+	/usr/include/eigen3/Eigen/src/Jacobi/Jacobi.h
-+	/usr/include/eigen3/Eigen/src/Householder/Householder.h
-+	/usr/include/eigen3/Eigen/src/Householder/BlockHouseholder.h
-+	/usr/include/eigen3/Eigen/src/Householder/HouseholderSequence.h
-+	/usr/include/eigen3/Eigen/src/Geometry/RotationBase.h
-+	/usr/include/eigen3/Eigen/src/Geometry/Rotation2D.h
-+	/usr/include/eigen3/Eigen/src/Geometry/Homogeneous.h
-+	/usr/include/eigen3/Eigen/src/Geometry/Hyperplane.h
-+	/usr/include/eigen3/Eigen/src/Geometry/EulerAngles.h
-+	/usr/include/eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
-+	/usr/include/eigen3/Eigen/src/Geometry/ParametrizedLine.h
-+	/usr/include/eigen3/Eigen/src/Geometry/OrthoMethods.h
-+	/usr/include/eigen3/Eigen/src/Geometry/AngleAxis.h
-+	/usr/include/eigen3/Eigen/src/Geometry/Umeyama.h
-+	/usr/include/eigen3/Eigen/src/Geometry/Scaling.h
-+	/usr/include/eigen3/Eigen/src/Geometry/Translation.h
-+	/usr/include/eigen3/Eigen/src/Geometry/AlignedBox.h
-+	/usr/include/eigen3/Eigen/src/Geometry/Transform.h
-+	/usr/include/eigen3/Eigen/src/Geometry/Quaternion.h
-+	/usr/include/eigen3/Eigen/src/LU/PartialPivLU.h
-+	/usr/include/eigen3/Eigen/src/LU/Determinant.h
-+	/usr/include/eigen3/Eigen/src/LU/arch/Inverse_SSE.h
-+	/usr/include/eigen3/Eigen/src/LU/FullPivLU.h
-+	/usr/include/eigen3/Eigen/src/LU/Inverse.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseMatrixBase.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseVector.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
-+	/usr/include/eigen3/Eigen/src/Sparse/TriangularSolver.h
-+	/usr/include/eigen3/Eigen/src/Sparse/AmbiVector.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseDenseProduct.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseBlock.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseTriangularView.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
-+	/usr/include/eigen3/Eigen/src/Sparse/CoreIterators.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseMatrix.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseAssign.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseSparseProduct.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseDot.h
-+	/usr/include/eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseRedux.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseFuzzy.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseView.h
-+	/usr/include/eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseUtil.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseTranspose.h
-+	/usr/include/eigen3/Eigen/src/Sparse/SparseProduct.h
-+	/usr/include/eigen3/Eigen/src/Sparse/CompressedStorage.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Cwise.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/QR.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Lazy.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Memory.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/SVD.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/VectorBlock.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Meta.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Macros.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/LeastSquares.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/LU.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Block.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/All.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/Minor.h
-+	/usr/include/eigen3/Eigen/src/Eigen2Support/MathFunctions.h
-+	/usr/include/eigen3/Eigen/src/Core/SelfAdjointView.h
-+	/usr/include/eigen3/Eigen/src/Core/MatrixBase.h
-+	/usr/include/eigen3/Eigen/src/Core/Swap.h
-+	/usr/include/eigen3/Eigen/src/Core/DenseCoeffsBase.h
-+	/usr/include/eigen3/Eigen/src/Core/DenseBase.h
-+	/usr/include/eigen3/Eigen/src/Core/GlobalFunctions.h
-+	/usr/include/eigen3/Eigen/src/Core/ProductBase.h
-+	/usr/include/eigen3/Eigen/src/Core/CwiseBinaryOp.h
-+	/usr/include/eigen3/Eigen/src/Core/Stride.h
-+	/usr/include/eigen3/Eigen/src/Core/Matrix.h
-+	/usr/include/eigen3/Eigen/src/Core/Visitor.h
-+	/usr/include/eigen3/Eigen/src/Core/Array.h
-+	/usr/include/eigen3/Eigen/src/Core/ReturnByValue.h
-+	/usr/include/eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
-+	/usr/include/eigen3/Eigen/src/Core/EigenBase.h
-+	/usr/include/eigen3/Eigen/src/Core/Random.h
-+	/usr/include/eigen3/Eigen/src/Core/Redux.h
-+	/usr/include/eigen3/Eigen/src/Core/arch/Default/Settings.h
-+	/usr/include/eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
-+	/usr/include/eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
-+	/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
-+	/usr/include/eigen3/Eigen/src/Core/arch/NEON/Complex.h
-+	/usr/include/eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
-+	/usr/include/eigen3/Eigen/src/Core/arch/SSE/Complex.h
-+	/usr/include/eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
-+	/usr/include/eigen3/Eigen/src/Core/BooleanRedux.h
-+	/usr/include/eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
-+	/usr/include/eigen3/Eigen/src/Core/util/BlasUtil.h
-+	/usr/include/eigen3/Eigen/src/Core/util/Memory.h
-+	/usr/include/eigen3/Eigen/src/Core/util/Meta.h
-+	/usr/include/eigen3/Eigen/src/Core/util/Constants.h
-+	/usr/include/eigen3/Eigen/src/Core/util/Macros.h
-+	/usr/include/eigen3/Eigen/src/Core/util/ForwardDeclarations.h
-+	/usr/include/eigen3/Eigen/src/Core/util/StaticAssert.h
-+	/usr/include/eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
-+	/usr/include/eigen3/Eigen/src/Core/util/XprHelper.h
-+	/usr/include/eigen3/Eigen/src/Core/VectorBlock.h
-+	/usr/include/eigen3/Eigen/src/Core/Transpositions.h
-+	/usr/include/eigen3/Eigen/src/Core/Select.h
-+	/usr/include/eigen3/Eigen/src/Core/BandMatrix.h
-+	/usr/include/eigen3/Eigen/src/Core/CwiseUnaryView.h
-+	/usr/include/eigen3/Eigen/src/Core/Dot.h
-+	/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h
-+	/usr/include/eigen3/Eigen/src/Core/Product.h
-+	/usr/include/eigen3/Eigen/src/Core/Transpose.h
-+	/usr/include/eigen3/Eigen/src/Core/Block.h
-+	/usr/include/eigen3/Eigen/src/Core/ArrayWrapper.h
-+	/usr/include/eigen3/Eigen/src/Core/MapBase.h
-+	/usr/include/eigen3/Eigen/src/Core/NoAlias.h
-+	/usr/include/eigen3/Eigen/src/Core/ForceAlignedAccess.h
-+	/usr/include/eigen3/Eigen/src/Core/PlainObjectBase.h
-+	/usr/include/eigen3/Eigen/src/Core/IO.h
-+	/usr/include/eigen3/Eigen/src/Core/DiagonalMatrix.h
-+	/usr/include/eigen3/Eigen/src/Core/CwiseUnaryOp.h
-+	/usr/include/eigen3/Eigen/src/Core/Reverse.h
-+	/usr/include/eigen3/Eigen/src/Core/Fuzzy.h
-+	/usr/include/eigen3/Eigen/src/Core/DenseStorage.h
-+	/usr/include/eigen3/Eigen/src/Core/StableNorm.h
-+	/usr/include/eigen3/Eigen/src/Core/NumTraits.h
-+	/usr/include/eigen3/Eigen/src/Core/Map.h
-+	/usr/include/eigen3/Eigen/src/Core/Functors.h
-+	/usr/include/eigen3/Eigen/src/Core/PermutationMatrix.h
-+	/usr/include/eigen3/Eigen/src/Core/ArrayBase.h
-+	/usr/include/eigen3/Eigen/src/Core/CwiseNullaryOp.h
-+	/usr/include/eigen3/Eigen/src/Core/SolveTriangular.h
-+	/usr/include/eigen3/Eigen/src/Core/NestByValue.h
-+	/usr/include/eigen3/Eigen/src/Core/DiagonalProduct.h
-+	/usr/include/eigen3/Eigen/src/Core/CommaInitializer.h
-+	/usr/include/eigen3/Eigen/src/Core/MathFunctions.h
-+	/usr/include/eigen3/Eigen/src/Core/Diagonal.h
-+	/usr/include/eigen3/Eigen/src/Core/Replicate.h
-+	/usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
-+	/usr/include/eigen3/Eigen/src/Core/products/SelfadjointProduct.h
-+	/usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
-+	/usr/include/eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
-+	/usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
-+	/usr/include/eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
-+	/usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
-+	/usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
-+	/usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
-+	/usr/include/eigen3/Eigen/src/Core/products/Parallelizer.h
-+	/usr/include/eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
-+	/usr/include/eigen3/Eigen/src/Core/products/TriangularSolverVector.h
-+	/usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
-+	/usr/include/eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
-+	/usr/include/eigen3/Eigen/src/Core/TriangularMatrix.h
-+	/usr/include/eigen3/Eigen/src/Core/VectorwiseOp.h
-+	/usr/include/eigen3/Eigen/src/Core/Assign.h
-+	/usr/include/eigen3/Eigen/src/Core/Flagged.h
-+	/usr/include/eigen3/Eigen/src/Cholesky/LDLT.h
-+	/usr/include/eigen3/Eigen/src/Cholesky/LLT.h
- )
- 
- if(WIN32)
-diff -Npur blender-2.63a.orig/intern/itasc/SConscript blender-2.63a/intern/itasc/SConscript
---- blender-2.63a.orig/intern/itasc/SConscript	2012-05-10 16:46:17.000000000 +0200
-+++ blender-2.63a/intern/itasc/SConscript	2012-06-03 17:08:48.556851026 +0200
-@@ -5,7 +5,7 @@ sources = env.Glob('*.cpp')
- sources += env.Glob('kdl/*.cpp')
- sources += env.Glob('kdl/utilities/*.cpp')
- 
--incs = '. ../../extern/Eigen3'
-+incs = '. /usr/include/eigen3'
- 
- defs = []
- 
-diff -Npur blender-2.63a.orig/source/blender/ikplugin/CMakeLists.txt blender-2.63a/source/blender/ikplugin/CMakeLists.txt
---- blender-2.63a.orig/source/blender/ikplugin/CMakeLists.txt	2012-05-10 16:50:26.000000000 +0200
-+++ blender-2.63a/source/blender/ikplugin/CMakeLists.txt	2012-06-03 17:08:48.578853823 +0200
-@@ -49,9 +49,11 @@ set(SRC
- if(WITH_IK_ITASC)
- 	add_definitions(-DWITH_IK_ITASC)
- 	list(APPEND INC
--		../../../extern/Eigen3
- 		../../../intern/itasc
- 	)
-+	list(APPEND INC_SYS
-+		/usr/include/eigen3
-+	)
- 	list(APPEND SRC
- 		intern/itasc_plugin.cpp
- 	)
-diff -Npur blender-2.63a.orig/source/blender/ikplugin/SConscript blender-2.63a/source/blender/ikplugin/SConscript
---- blender-2.63a.orig/source/blender/ikplugin/SConscript	2012-05-10 16:50:26.000000000 +0200
-+++ blender-2.63a/source/blender/ikplugin/SConscript	2012-06-03 17:08:48.579853950 +0200
-@@ -4,7 +4,7 @@ defs = []
- sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
- 
- incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
--incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3'
-+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen3'
- 
- defs.append('WITH_IK_ITASC')
- 
-diff -Npur blender-2.63a.orig/source/gameengine/Converter/CMakeLists.txt blender-2.63a/source/gameengine/Converter/CMakeLists.txt
---- blender-2.63a.orig/source/gameengine/Converter/CMakeLists.txt	2012-05-10 16:48:47.000000000 +0200
-+++ blender-2.63a/source/gameengine/Converter/CMakeLists.txt	2012-06-03 17:08:48.579853950 +0200
-@@ -50,7 +50,6 @@ set(INC
- 	../../blender/makesrna
- 	../../blender/windowmanager
- 	../../../extern/bullet2/src
--	../../../extern/Eigen3
- 	../../../intern/container
- 	../../../intern/guardedalloc
- 	../../../intern/moto/include
-@@ -60,6 +59,7 @@ set(INC
- 
- set(INC_SYS
- 	${PTHREADS_INCLUDE_DIRS}
-+	/usr/include/eigen3
- 
- )
- 
-diff -Npur blender-2.63a.orig/source/gameengine/Converter/SConscript blender-2.63a/source/gameengine/Converter/SConscript
---- blender-2.63a.orig/source/gameengine/Converter/SConscript	2012-05-10 16:48:47.000000000 +0200
-+++ blender-2.63a/source/gameengine/Converter/SConscript	2012-06-03 17:08:48.579853950 +0200
-@@ -21,7 +21,7 @@ incs += ' #source/blender/windowmanager'
- incs += ' #source/blender/makesrna'
- incs += ' #source/blender/ikplugin'
- incs += ' #extern/recastnavigation/Detour/Include'
--incs += ' #extern/Eigen3'
-+incs += ' /usr/include/eigen3'
- 
- incs += ' ' + env['BF_BULLET_INC']
- 
diff --git a/media-gfx/blender/files/blender-2.63a-insecure.desktop b/media-gfx/blender/files/blender-2.63a-insecure.desktop
deleted file mode 100644
index c4ccb308ca60..000000000000
--- a/media-gfx/blender/files/blender-2.63a-insecure.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Name=Blender-2.63a (reduced security)
-GenericName=3D modeller (reduced security)
-GenericName[es]=modelador 3D (reduced security)
-GenericName[de]=3D Modellierer (weniger Sicherheit)
-GenericName[fr]=modeleur 3D (reduced security)
-GenericName[ru]=Редактор 3D-моделей (reduced security)
-Comment=3D modeling, animation, rendering and post-production
-Comment[es]=modelado 3D, animación, renderizado y post-producción
-Comment[de]=3D-Modellierung, Animation, Rendering und Nachbearbeitung
-Comment[fr]=modeleur 3D, animation, rendu et post-production
-Exec=blender-2.63a --enable-autoexec %f
-Icon=blender-2.63a
-Terminal=false
-Type=Application
-Categories=Graphics;3DGraphics;
-MimeType=application/x-blender;
diff --git a/media-gfx/blender/files/blender-2.63a-libav-0.8.patch b/media-gfx/blender/files/blender-2.63a-libav-0.8.patch
deleted file mode 100644
index e4789d166eaa..000000000000
--- a/media-gfx/blender/files/blender-2.63a-libav-0.8.patch
+++ /dev/null
@@ -1,561 +0,0 @@
-diff -urNb blender-2.63a.old//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp blender-2.63a.new//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
---- blender-2.63a.old//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2012-05-10 16:45:40.000000000 +0200
-+++ blender-2.63a.new//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2012-07-13 22:10:47.615293287 +0200
-@@ -107,7 +107,7 @@
- 	m_position = 0;
- 	m_pkgbuf_left = 0;
- 
--	if(av_find_stream_info(m_formatCtx)<0)
-+	if(avformat_find_stream_info(m_formatCtx, NULL)<0)
- 		AUD_THROW(AUD_ERROR_FFMPEG, streaminfo_error);
- 
- 	// find audio stream and codec
-@@ -133,7 +133,7 @@
- 	if(!aCodec)
- 		AUD_THROW(AUD_ERROR_FFMPEG, nodecoder_error);
- 
--	if(avcodec_open(m_codecCtx, aCodec)<0)
-+	if(avcodec_open2(m_codecCtx, aCodec, NULL)<0)
- 		AUD_THROW(AUD_ERROR_FFMPEG, codecopen_error);
- 
- 	// XXX this prints file information to stdout:
-@@ -143,23 +143,23 @@
- 
- 	switch(m_codecCtx->sample_fmt)
- 	{
--	case SAMPLE_FMT_U8:
-+	case AV_SAMPLE_FMT_U8:
- 		m_convert = AUD_convert_u8_float;
- 		m_specs.format = AUD_FORMAT_U8;
- 		break;
--	case SAMPLE_FMT_S16:
-+	case AV_SAMPLE_FMT_S16:
- 		m_convert = AUD_convert_s16_float;
- 		m_specs.format = AUD_FORMAT_S16;
- 		break;
--	case SAMPLE_FMT_S32:
-+	case AV_SAMPLE_FMT_S32:
- 		m_convert = AUD_convert_s32_float;
- 		m_specs.format = AUD_FORMAT_S32;
- 		break;
--	case SAMPLE_FMT_FLT:
-+	case AV_SAMPLE_FMT_FLT:
- 		m_convert = AUD_convert_copy<float>;
- 		m_specs.format = AUD_FORMAT_FLOAT32;
- 		break;
--	case SAMPLE_FMT_DBL:
-+	case AV_SAMPLE_FMT_DBL:
- 		m_convert = AUD_convert_double_float;
- 		m_specs.format = AUD_FORMAT_FLOAT64;
- 		break;
-@@ -189,7 +189,7 @@
- 	}
- 	catch(AUD_Exception&)
- 	{
--		av_close_input_file(m_formatCtx);
-+		avformat_close_input(&m_formatCtx);
- 		throw;
- 	}
- }
-@@ -227,8 +227,7 @@
- 	}
- 	catch(AUD_Exception&)
- 	{
--		av_close_input_stream(m_formatCtx);
--		av_free(m_aviocontext);
-+		avformat_close_input(&m_formatCtx);
- 		throw;
- 	}
- }
-@@ -237,13 +236,7 @@
- {
- 	avcodec_close(m_codecCtx);
- 
--	if(m_aviocontext)
--	{
--		av_close_input_stream(m_formatCtx);
--		av_free(m_aviocontext);
--	}
--	else
--		av_close_input_file(m_formatCtx);
-+	avformat_close_input(&m_formatCtx);
- }
- 
- int AUD_FFMPEGReader::read_packet(void* opaque, uint8_t* buf, int buf_size)
-diff -urNb blender-2.63a.old//intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp blender-2.63a.new//intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
---- blender-2.63a.old//intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp	2012-05-10 16:45:40.000000000 +0200
-+++ blender-2.63a.new//intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp	2012-07-13 22:11:17.910292184 +0200
-@@ -38,6 +38,8 @@
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
-+#include <libavutil/mathematics.h>
-+#include <libavutil/avstring.h>
- #include "ffmpeg_compat.h"
- }
- 
-@@ -55,10 +57,15 @@
- {
- 	static const char* formats[] = { NULL, "ac3", "flac", "matroska", "mp2", "mp3", "ogg", "wav" };
- 
--	if(avformat_alloc_output_context2(&m_formatCtx, NULL, formats[format], filename.c_str()))
--		AUD_THROW(AUD_ERROR_FFMPEG, context_error);
-+	m_formatCtx = avformat_alloc_context();
-+        if (!m_formatCtx) AUD_THROW(AUD_ERROR_FFMPEG, context_error);
- 
--	m_outputFmt = m_formatCtx->oformat;
-+	av_strlcpy(m_formatCtx->filename, filename.c_str(), sizeof(m_formatCtx->filename));
-+	m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], filename.c_str(), NULL);
-+	if (!m_outputFmt) {
-+            avformat_free_context(m_formatCtx);
-+            AUD_THROW(AUD_ERROR_FFMPEG, context_error);
-+        }
- 
- 	switch(codec)
- 	{
-@@ -116,7 +123,7 @@
- 		if(m_outputFmt->audio_codec == CODEC_ID_NONE)
- 			AUD_THROW(AUD_ERROR_SPECS, codec_error);
- 
--		m_stream = av_new_stream(m_formatCtx, 0);
-+		m_stream = avformat_new_stream(m_formatCtx, NULL);
- 		if(!m_stream)
- 			AUD_THROW(AUD_ERROR_FFMPEG, stream_error);
- 
-@@ -133,23 +140,23 @@
- 		{
- 		case AUD_FORMAT_U8:
- 			m_convert = AUD_convert_float_u8;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_U8;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_U8;
- 			break;
- 		case AUD_FORMAT_S16:
- 			m_convert = AUD_convert_float_s16;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_S16;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S16;
- 			break;
- 		case AUD_FORMAT_S32:
- 			m_convert = AUD_convert_float_s32;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_S32;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S32;
- 			break;
- 		case AUD_FORMAT_FLOAT32:
- 			m_convert = AUD_convert_copy<float>;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_FLT;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_FLT;
- 			break;
- 		case AUD_FORMAT_FLOAT64:
- 			m_convert = AUD_convert_float_double;
--			m_codecCtx->sample_fmt = SAMPLE_FMT_DBL;
-+			m_codecCtx->sample_fmt = AV_SAMPLE_FMT_DBL;
- 			break;
- 		default:
- 			AUD_THROW(AUD_ERROR_FFMPEG, format_error);
-@@ -164,7 +171,7 @@
- 			if(!codec)
- 				AUD_THROW(AUD_ERROR_FFMPEG, codec_error);
- 
--			if(avcodec_open(m_codecCtx, codec))
-+			if(avcodec_open2(m_codecCtx, codec, NULL))
- 				AUD_THROW(AUD_ERROR_FFMPEG, codec_error);
- 
- 			m_output_buffer.resize(FF_MIN_BUFFER_SIZE);
-diff -urNb blender-2.63a.old//intern/ffmpeg/ffmpeg_compat.h blender-2.63a.new//intern/ffmpeg/ffmpeg_compat.h
---- blender-2.63a.old//intern/ffmpeg/ffmpeg_compat.h	2012-05-10 16:46:17.000000000 +0200
-+++ blender-2.63a.new//intern/ffmpeg/ffmpeg_compat.h	2012-07-13 21:22:36.462398523 +0200
-@@ -40,7 +40,6 @@
- #endif
- 
- #include <libswscale/swscale.h>
--#include <libavcodec/opt.h>
- 
- #if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 105))
- #define FFMPEG_HAVE_AVIO 1
-diff -urNb blender-2.63a.old//source/blender/blenkernel/intern/writeffmpeg.c blender-2.63a.new//source/blender/blenkernel/intern/writeffmpeg.c
---- blender-2.63a.old//source/blender/blenkernel/intern/writeffmpeg.c	2012-05-10 16:50:20.000000000 +0200
-+++ blender-2.63a.new//source/blender/blenkernel/intern/writeffmpeg.c	2012-07-13 22:54:42.429197382 +0200
-@@ -37,7 +37,6 @@
- #include <libavcodec/avcodec.h>
- #include <libavutil/rational.h>
- #include <libswscale/swscale.h>
--#include <libavcodec/opt.h>
- 
- #include "MEM_guardedalloc.h"
- 
-@@ -449,7 +448,7 @@
- 	AVStream* st;
- 	AVCodecContext* c;
- 	AVCodec* codec;
--	st = av_new_stream(of, 0);
-+	st = avformat_new_stream(of, NULL);
- 	if (!st) return NULL;
- 
- 	/* Set up the codec context */
-@@ -515,24 +514,11 @@
- 	}
- 	
- 	// Keep lossless encodes in the RGB domain.
--	if (codec_id == CODEC_ID_HUFFYUV) {
-+	if (codec_id == CODEC_ID_HUFFYUV || codec_id == CODEC_ID_FFV1) {
- 		/* HUFFYUV was PIX_FMT_YUV422P before */
- 		c->pix_fmt = PIX_FMT_RGB32;
- 	}
- 
--	if (codec_id == CODEC_ID_FFV1) {
--#ifdef FFMPEG_FFV1_ALPHA_SUPPORTED
--		if (rd->im_format.planes ==  R_IMF_PLANES_RGBA) {
--			c->pix_fmt = PIX_FMT_RGB32;
--		}
--		else {
--			c->pix_fmt = PIX_FMT_BGR0;
--		}
--#else
--		c->pix_fmt = PIX_FMT_RGB32;
--#endif
--	}
--
- 	if (codec_id == CODEC_ID_QTRLE ) {
- 		if (rd->im_format.planes ==  R_IMF_PLANES_RGBA) {
- 			c->pix_fmt = PIX_FMT_ARGB;
-@@ -562,7 +548,7 @@
- 
- 	set_ffmpeg_properties(rd, c, "video");
- 	
--	if (avcodec_open(c, codec) < 0) {
-+	if (avcodec_open2(c, codec, NULL) < 0) {
- 		//
- 		//XXX error("Couldn't initialize codec");
- 		return NULL;
-@@ -603,7 +589,7 @@
- 	AVCodecContext* c;
- 	AVCodec* codec;
- 
--	st = av_new_stream(of, 1);
-+	st = avformat_new_stream(of, NULL);
- 	if (!st) return NULL;
- 
- 	c = st->codec;
-@@ -612,7 +598,7 @@
- 
- 	c->sample_rate = rd->ffcodecdata.audio_mixrate;
- 	c->bit_rate = ffmpeg_audio_bitrate*1000;
--	c->sample_fmt = SAMPLE_FMT_S16;
-+	c->sample_fmt = AV_SAMPLE_FMT_S16;
- 	c->channels = rd->ffcodecdata.audio_channels;
- 	codec = avcodec_find_encoder(c->codec_id);
- 	if (!codec) {
-@@ -622,7 +608,7 @@
- 
- 	set_ffmpeg_properties(rd, c, "audio");
- 
--	if (avcodec_open(c, codec) < 0) {
-+	if (avcodec_open2(c, codec, NULL) < 0) {
- 		//XXX error("Couldn't initialize audio codec");
- 		return NULL;
- 	}
-@@ -704,13 +690,10 @@
- 	of->oformat = fmt;
- 	of->packet_size= rd->ffcodecdata.mux_packet_size;
- 	if (ffmpeg_audio_codec != CODEC_ID_NONE) {
--		of->mux_rate = rd->ffcodecdata.mux_rate;
--	}
--	else {
--		of->mux_rate = 0;
-+		av_opt_set_int(of, "muxrate", rd->ffcodecdata.mux_rate, 0);
- 	}
- 
--	of->preload = (int)(0.5*AV_TIME_BASE);
-+	av_opt_set_int(of, "preload", (int)(0.5*AV_TIME_BASE), 0);
- 	of->max_delay = (int)(0.7*AV_TIME_BASE);
- 
- 	fmt->audio_codec = ffmpeg_audio_codec;
-@@ -793,10 +776,6 @@
- 			return 0;
- 		}
- 	}
--	if (av_set_parameters(of, NULL) < 0) {
--		BKE_report(reports, RPT_ERROR, "Error setting output parameters.");
--		return 0;
--	}
- 	if (!(fmt->flags & AVFMT_NOFILE)) {
- 		if (avio_open(&of->pb, name, AVIO_FLAG_WRITE) < 0) {
- 			BKE_report(reports, RPT_ERROR, "Could not open file for writing.");
-@@ -804,7 +783,7 @@
- 		}
- 	}
- 
--	if (av_write_header(of) < 0) {
-+	if (avformat_write_header(of, NULL) < 0) {
- 		BKE_report(reports, RPT_ERROR, "Could not initialize streams. Probably unsupported codec combination.");
- 		return 0;
- 	}
-@@ -1102,7 +1081,7 @@
- 	
- 	val.i = 0;
- 
--	avcodec_get_context_defaults(&c);
-+	avcodec_get_context_defaults3(&c, NULL);
- 
- 	o = c.av_class->option + opt_index;
- 	parent = c.av_class->option + parent_index;
-@@ -1190,7 +1169,7 @@
- 	char * param;
- 	IDProperty * prop;
- 	
--	avcodec_get_context_defaults(&c);
-+	avcodec_get_context_defaults3(&c, NULL);
- 
- 	strncpy(name_, str, sizeof(name_));
- 
-diff -urNb blender-2.63a.old//source/blender/imbuf/intern/anim_movie.c blender-2.63a.new//source/blender/imbuf/intern/anim_movie.c
---- blender-2.63a.old//source/blender/imbuf/intern/anim_movie.c	2012-05-10 16:50:59.000000000 +0200
-+++ blender-2.63a.new//source/blender/imbuf/intern/anim_movie.c	2012-07-14 00:12:49.157026789 +0200
-@@ -455,12 +455,12 @@
- 
- 	do_init_ffmpeg();
- 
--	if (av_open_input_file(&pFormatCtx, anim->name, NULL, 0, NULL)!=0) {
-+	if (avformat_open_input(&pFormatCtx, anim->name, NULL, NULL)!=0) {
- 		return -1;
- 	}
- 
--	if (av_find_stream_info(pFormatCtx)<0) {
--		av_close_input_file(pFormatCtx);
-+	if (avformat_find_stream_info(pFormatCtx, NULL)<0) {
-+		avformat_close_input(&pFormatCtx);
- 		return -1;
- 	}
- 
-@@ -482,7 +482,7 @@
- 		}
- 
- 	if (videoStream==-1) {
--		av_close_input_file(pFormatCtx);
-+		avformat_close_input(&pFormatCtx);
- 		return -1;
- 	}
- 
-@@ -497,7 +497,7 @@
- 
- 	pCodecCtx->workaround_bugs = 1;
- 
--	if (avcodec_open(pCodecCtx, pCodec) < 0) {
-+	if (avcodec_open2(pCodecCtx, pCodec, NULL) < 0) {
- 		av_close_input_file(pFormatCtx);
- 		return -1;
- 	}
-@@ -990,7 +990,6 @@
- 				ret = av_seek_frame(anim->pFormatCtx, 
- 						    -1,
- 						    pos, AVSEEK_FLAG_BYTE);
--				av_update_cur_dts(anim->pFormatCtx, v_st, dts);
- 			}
- 			else {
- 				av_log(anim->pFormatCtx, AV_LOG_DEBUG, 
-diff -urNb blender-2.63a.old//source/blender/imbuf/intern/indexer.c blender-2.63a.new//source/blender/imbuf/intern/indexer.c
---- blender-2.63a.old//source/blender/imbuf/intern/indexer.c	2012-05-10 16:50:59.000000000 +0200
-+++ blender-2.63a.new//source/blender/imbuf/intern/indexer.c	2012-07-14 00:23:44.775002926 +0200
-@@ -491,7 +491,7 @@
- 
- 	fprintf(stderr, "Starting work on proxy: %s\n", rv->of->filename);
- 
--	rv->st = av_new_stream(rv->of, 0);
-+	rv->st = avformat_new_stream(rv->of, NULL);
- 	rv->c = rv->st->codec;
- 	rv->c->codec_type = AVMEDIA_TYPE_VIDEO;
- 	rv->c->codec_id = CODEC_ID_MJPEG;
-@@ -533,13 +533,6 @@
- 		rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER;
- 	}
- 
--	if (av_set_parameters(rv->of, NULL) < 0) {
--		fprintf(stderr, "Couldn't set output parameters? "
--			"Proxy not built!\n");
--		av_free(rv->of);
--		return 0;
--	}
--
- 	if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) {
- 		fprintf(stderr, "Couldn't open outputfile! "
- 			"Proxy not built!\n");
-@@ -547,7 +540,7 @@
- 		return 0;
- 	}
- 
--	avcodec_open(rv->c, rv->codec);
-+	avcodec_open2(rv->c, rv->codec, NULL);
- 
- 	rv->video_buffersize = 2000000;
- 	rv->video_buffer = (uint8_t*)MEM_mallocN(
-@@ -576,7 +569,7 @@
- 			NULL, NULL, NULL);
- 	}
- 
--	av_write_header(rv->of);
-+	avformat_write_header(rv->of, NULL);
- 
- 	return rv;
- }
-@@ -739,12 +732,12 @@
- 	memset(context->proxy_ctx, 0, sizeof(context->proxy_ctx));
- 	memset(context->indexer, 0, sizeof(context->indexer));
- 
--	if (av_open_input_file(&context->iFormatCtx, anim->name, NULL, 0, NULL) != 0) {
-+	if (avformat_open_input(&context->iFormatCtx, anim->name, NULL, NULL) != 0) {
- 		MEM_freeN(context);
- 		return NULL;
- 	}
- 
--	if (av_find_stream_info(context->iFormatCtx) < 0) {
-+	if (avformat_find_stream_info(context->iFormatCtx, NULL) < 0) {
- 		av_close_input_file(context->iFormatCtx);
- 		MEM_freeN(context);
- 		return NULL;
-@@ -784,7 +777,7 @@
- 
- 	context->iCodecCtx->workaround_bugs = 1;
- 
--	if (avcodec_open(context->iCodecCtx, context->iCodec) < 0) {
-+	if (avcodec_open2(context->iCodecCtx, context->iCodec, NULL) < 0) {
- 		av_close_input_file(context->iFormatCtx);
- 		MEM_freeN(context);
- 		return NULL;
-diff -urNb blender-2.63a.old//source/blender/imbuf/intern/util.c blender-2.63a.new//source/blender/imbuf/intern/util.c
---- blender-2.63a.old//source/blender/imbuf/intern/util.c	2012-05-10 16:50:59.000000000 +0200
-+++ blender-2.63a.new//source/blender/imbuf/intern/util.c	2012-07-14 01:07:31.213907334 +0200
-@@ -261,14 +261,14 @@
- 		BLI_testextensie(filename, ".cin") ||
- 		BLI_testextensie(filename, ".wav")) return 0;
- 
--	if (av_open_input_file(&pFormatCtx, filename, NULL, 0, NULL)!=0) {
-+	if (avformat_open_input(&pFormatCtx, filename, NULL, NULL)!=0) {
- 		if (UTIL_DEBUG) fprintf(stderr, "isffmpeg: av_open_input_file failed\n");
- 		return 0;
- 	}
- 
--	if (av_find_stream_info(pFormatCtx)<0) {
-+	if (avformat_find_stream_info(pFormatCtx, NULL)<0) {
- 		if (UTIL_DEBUG) fprintf(stderr, "isffmpeg: av_find_stream_info failed\n");
--		av_close_input_file(pFormatCtx);
-+		avformat_close_input(&pFormatCtx);
- 		return 0;
- 	}
- 
-@@ -300,7 +300,7 @@
- 		return 0;
- 	}
- 
--	if (avcodec_open(pCodecCtx, pCodec)<0) {
-+	if (avcodec_open2(pCodecCtx, pCodec, NULL)<0) {
- 		av_close_input_file(pFormatCtx);
- 		return 0;
- 	}
-diff -urNb blender-2.63a.old//source/gameengine/VideoTexture/VideoFFmpeg.cpp blender-2.63a.new//source/gameengine/VideoTexture/VideoFFmpeg.cpp
---- blender-2.63a.old//source/gameengine/VideoTexture/VideoFFmpeg.cpp	2012-05-10 16:48:50.000000000 +0200
-+++ blender-2.63a.new//source/gameengine/VideoTexture/VideoFFmpeg.cpp	2012-07-13 21:22:36.464398523 +0200
-@@ -162,19 +162,19 @@
- }
- 
- 
--int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AVFormatParameters *formatParams)
-+int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AVDictionary *opts)
- {
- 	AVFormatContext *formatCtx;
- 	int				i, videoStream;
- 	AVCodec			*codec;
- 	AVCodecContext	*codecCtx;
- 
--	if (av_open_input_file(&formatCtx, filename, inputFormat, 0, formatParams)!=0)
-+	if (avformat_open_input(&formatCtx, filename, inputFormat, &opts)!=0)
- 		return -1;
- 
--	if (av_find_stream_info(formatCtx)<0) 
-+	if (avformat_find_stream_info(formatCtx, &opts)<0)
- 	{
--		av_close_input_file(formatCtx);
-+		avformat_close_input(&formatCtx);
- 		return -1;
- 	}
- 
-@@ -203,13 +203,13 @@
- 	codec=avcodec_find_decoder(codecCtx->codec_id);
- 	if (codec==NULL) 
- 	{
--		av_close_input_file(formatCtx);
-+		avformat_close_input(&formatCtx);
- 		return -1;
- 	}
- 	codecCtx->workaround_bugs = 1;
--	if (avcodec_open(codecCtx, codec)<0) 
-+	if (avcodec_open2(codecCtx, codec, &opts)<0)
- 	{
--		av_close_input_file(formatCtx);
-+		avformat_close_input(&formatCtx);
- 		return -1;
- 	}
- 
-@@ -546,7 +546,7 @@
- 		// It would be good to find this information from the context but there are no simple indication
- 		!strncmp(filename, "http://", 7) ||
- #ifdef FFMPEG_PB_IS_POINTER
--		(m_formatCtx->pb && m_formatCtx->pb->is_streamed)
-+		(m_formatCtx->pb && m_formatCtx->pb->seekable)
- #else
- 		m_formatCtx->pb.is_streamed
- #endif
-@@ -586,13 +586,12 @@
- {
- 	// open camera source
- 	AVInputFormat		*inputFormat;
--	AVFormatParameters	formatParams;
-+	AVDictionary		*opts = NULL;
- 	AVRational			frameRate;
--	char				*p, filename[28], rateStr[20];
-+	char				*p, filename[28], videoStr[20], rateStr[20];
- 
- 	do_init_ffmpeg();
- 
--	memset(&formatParams, 0, sizeof(formatParams));
- #ifdef WIN32
- 	// video capture on windows only through Video For Windows driver
- 	inputFormat = av_find_input_format("vfwcap");
-@@ -637,21 +636,18 @@
- 			*p = 0;
- 	}
- 	if (file && (p = strchr(file, ':')) != NULL)
--		formatParams.standard = p+1;
-+		av_dict_set(&opts, "standard", p+1, 0);
- #endif
- 	//frame rate
- 	if (m_captRate <= 0.f)
- 		m_captRate = defFrameRate;
- 	sprintf(rateStr, "%f", m_captRate);
--	av_parse_video_rate(&frameRate, rateStr);
--	// populate format parameters
--	// need to specify the time base = inverse of rate
--	formatParams.time_base.num = frameRate.den;
--	formatParams.time_base.den = frameRate.num;
--	formatParams.width = m_captWidth;
--	formatParams.height = m_captHeight;
-+	av_dict_set(&opts, "framerate", rateStr, 0);
-+
-+        sprintf(videoStr, "%dx%d", m_captWidth, m_captHeight);
-+        av_dict_set(&opts, "video_size", videoStr, 0);
- 
--	if (openStream(filename, inputFormat, &formatParams) != 0)
-+	if (openStream(filename, inputFormat, opts) != 0)
- 		return;
- 
- 	// for video capture it is important to do non blocking read
-diff -urNb blender-2.63a.old//source/gameengine/VideoTexture/VideoFFmpeg.h blender-2.63a.new//source/gameengine/VideoTexture/VideoFFmpeg.h
---- blender-2.63a.old//source/gameengine/VideoTexture/VideoFFmpeg.h	2012-05-10 16:48:50.000000000 +0200
-+++ blender-2.63a.new//source/gameengine/VideoTexture/VideoFFmpeg.h	2012-07-13 21:22:36.463398523 +0200
-@@ -172,7 +172,7 @@
- 	double actFrameRate (void) { return m_frameRate * m_baseFrameRate; }
- 
- 	/// common function to video file and capture
--	int openStream(const char *filename, AVInputFormat *inputFormat, AVFormatParameters *formatParams);
-+	int openStream(const char *filename, AVInputFormat *inputFormat, AVDictionary *opts);
- 
- 	/// check if a frame is available and load it in pFrame, return true if a frame could be retrieved
- 	AVFrame* grabFrame(long frame);
author	Diego Elio Pettenò <flameeyes@gentoo.org>	2012-07-16 00:53:16 +0000
committer	Diego Elio Pettenò <flameeyes@gentoo.org>	2012-07-16 00:53:16 +0000
commit	cb350fbecbabb7d4b508f5705c4d1565f275e119 (patch)
tree	94289b337c40ad1e8fff60724fb32a898dc66811 /media-gfx/blender
parent	Version bump with patches from upstream. Attempted to cleanup the ebuild and ... (diff)
download	historical-cb350fbecbabb7d4b508f5705c4d1565f275e119.tar.gz historical-cb350fbecbabb7d4b508f5705c4d1565f275e119.tar.bz2 historical-cb350fbecbabb7d4b508f5705c4d1565f275e119.zip