Remove old versions.

(Portage version: 2.1_rc3)
 (Signed Manifest commit)

14 files changed, 9 insertions, 1269 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index c20647e79de9..4aa2c483f12c 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -5,14 +5,6 @@ AUX 0.4.8-gcc3.4-magicF2W.patch 994 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8
 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a files/0.4.8-gcc3.4-magicF2W.patch 994
 SHA256 3d359f8483903dcc876be0ee4ff511d63a8cf57fade26d58f72e4a3ec0694226 files/0.4.8-gcc3.4-magicF2W.patch 994
-AUX ffmpeg-0.4.9_p20050226-gcc4.patch 2319 RMD160 e9b87f2fc0f1f1b1847df573f3098af331056a0b SHA1 3ec1a996538dbb2f537b0cd5d14516ea503dd965 SHA256 ee18f6a837fd5724f08720b9785f0603f85db97b22120f33586b8a9811c5efef
-MD5 20274823abfde904ae73478349585dd0 files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
-RMD160 e9b87f2fc0f1f1b1847df573f3098af331056a0b files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
-SHA256 ee18f6a837fd5724f08720b9785f0603f85db97b22120f33586b8a9811c5efef files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
-AUX ffmpeg-0.4.9_p20050906-osx.patch 11103 RMD160 b479f18da37fdb088abc85e63ef998186cb45bf8 SHA1 5d4a16f331a66cc040261fb754633e17d3a5e872 SHA256 e687fd7008c401c54e31552b15b56a5590b85d7ac8b2c39b906acca82a09b5c8
-MD5 7ff9e08e701f8a8a860c09bd9259843f files/ffmpeg-0.4.9_p20050906-osx.patch 11103
-RMD160 b479f18da37fdb088abc85e63ef998186cb45bf8 files/ffmpeg-0.4.9_p20050906-osx.patch 11103
-SHA256 e687fd7008c401c54e31552b15b56a5590b85d7ac8b2c39b906acca82a09b5c8 files/ffmpeg-0.4.9_p20050906-osx.patch 11103
 AUX ffmpeg-0.4.9_p20051216-asneeded-configure.patch 559 RMD160 b59933fab102460b62b092799c27a7811748f76a SHA1 5cf05f5a79ea6807e78642910188b6e1d16d5198 SHA256 b7c7fbbe39e8ceabccabc1935cb4fa91b7287bc72eca323b21b25f0e9e08f13f
 MD5 033883c60f131664912970ffb6042612 files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch 559
 RMD160 b59933fab102460b62b092799c27a7811748f76a files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch 559
@@ -25,14 +17,6 @@ AUX ffmpeg-0.4.9_p20060302-fbsd-flags.patch 366 RMD160 ae6a9b23e3a5cc018563a9f02
 MD5 270ce6c29f270b7fc4e6129f45c35720 files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch 366
 RMD160 ae6a9b23e3a5cc018563a9f023273be821bab44a files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch 366
 SHA256 0af48d342f5001d856ba850b7c8ecc8e46ff809b765b28adbb1c0674b4c2c414 files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch 366
-AUX ffmpeg-a52.patch 1111 RMD160 193d2d855f2c613531f1b880a194c5be55ccab5c SHA1 d3b051bfd1655d0f378ba17d487c188d94f308f7 SHA256 350bdb742f2cf65ca1fcde2b3252887962c951071fa41e6550f207e4534b4071
-MD5 e592f1aa79ce0d709ac4980404956e87 files/ffmpeg-a52.patch 1111
-RMD160 193d2d855f2c613531f1b880a194c5be55ccab5c files/ffmpeg-a52.patch 1111
-SHA256 350bdb742f2cf65ca1fcde2b3252887962c951071fa41e6550f207e4534b4071 files/ffmpeg-a52.patch 1111
-AUX ffmpeg-configure.patch 585 RMD160 dcabb17bd6eddc8dc5e329c17a53933cb076e55c SHA1 2705beabd64bdcd9e392a1b2b224ab7ec448d00b SHA256 577aab4740f0d3569f41666915190c64de8cbde1faf27260ddba67f99bce0d2d
-MD5 96c7f1f67e0299ad71b9c0fad55c3960 files/ffmpeg-configure.patch 585
-RMD160 dcabb17bd6eddc8dc5e329c17a53933cb076e55c files/ffmpeg-configure.patch 585
-SHA256 577aab4740f0d3569f41666915190c64de8cbde1faf27260ddba67f99bce0d2d files/ffmpeg-configure.patch 585
 AUX ffmpeg-libdir-pic.patch 6027 RMD160 f66a87d1ea3662c7ab0b9010e0f19af49638161a SHA1 43be5652bf5dc70d46697e3ff6b1b3f30a02d501 SHA256 30b404aaf936f3ed6fe0a1f94d7f03982fef3524c94e4ca2b98d97133347ecc8
 MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
 RMD160 f66a87d1ea3662c7ab0b9010e0f19af49638161a files/ffmpeg-libdir-pic.patch 6027
@@ -41,14 +25,6 @@ AUX ffmpeg-libdir.patch 922 RMD160 4317ede46b7807b89220f971bf25b226b1189a6a SHA1
 MD5 2084a12d9b8ab0307cd010a3bd3185df files/ffmpeg-libdir.patch 922
 RMD160 4317ede46b7807b89220f971bf25b226b1189a6a files/ffmpeg-libdir.patch 922
 SHA256 f660ea6abb0402cb21070d4adf42589c952e41e96654257be40683d4744b4365 files/ffmpeg-libdir.patch 922
-AUX ffmpeg-missing_links.patch 1199 RMD160 c92d8269c9d60661c57185c2aa6a8544d3d56e40 SHA1 d6fabc88ec1cc2d2423f9558f34d00cf4e7f5ede SHA256 99aefb6d85efae932c639e530fbfd5f634df780ef57f9a5bfdd734dc758762b8
-MD5 1a8c0be3a5a5ba1d929b7773265943b7 files/ffmpeg-missing_links.patch 1199
-RMD160 c92d8269c9d60661c57185c2aa6a8544d3d56e40 files/ffmpeg-missing_links.patch 1199
-SHA256 99aefb6d85efae932c639e530fbfd5f634df780ef57f9a5bfdd734dc758762b8 files/ffmpeg-missing_links.patch 1199
-AUX ffmpeg-osx.patch 5940 RMD160 2cc2716ee5cf953a5a701815d850aa9530d3154d SHA1 ad36ebf210a97f3f7b68a7edf05b1a0883aa339e SHA256 d0048b2556bbcab2b60e1692b353a83ced6db31ce03bf2cdeccfe1615b02fb49
-MD5 b4ecc62e882107f766cf621bfc6c7e20 files/ffmpeg-osx.patch 5940
-RMD160 2cc2716ee5cf953a5a701815d850aa9530d3154d files/ffmpeg-osx.patch 5940
-SHA256 d0048b2556bbcab2b60e1692b353a83ced6db31ce03bf2cdeccfe1615b02fb49 files/ffmpeg-osx.patch 5940
 AUX ffmpeg-shared-gcc4.1.patch 1667 RMD160 cf0318bcb812ad701e8cd55f10f59ca71933cf6c SHA1 0fd4d860efd8a0240fa66443429d8404d28a27dd SHA256 0bd67ed0cc1ea47c36756f5a66e504af4de85ce072c4b92083fb44065b5a3671
 MD5 d970f65795ef8b8ce839c01020b0e707 files/ffmpeg-shared-gcc4.1.patch 1667
 RMD160 cf0318bcb812ad701e8cd55f10f59ca71933cf6c files/ffmpeg-shared-gcc4.1.patch 1667
@@ -65,15 +41,9 @@ AUX ffmpeg-unknown-options.patch 414 RMD160 46f7d8e81ab42368dabb6e29dec29a02d780
 MD5 02a1298f3a982efa3dc25f1746e3dccc files/ffmpeg-unknown-options.patch 414
 RMD160 46f7d8e81ab42368dabb6e29dec29a02d780055b files/ffmpeg-unknown-options.patch 414
 SHA256 eb6f32617a42a9f55408ac64afd62c938aadb40bcf72c060a24ef5c426b4981b files/ffmpeg-unknown-options.patch 414
-AUX gentoo-ffmpeg001.patch 752 RMD160 78820d5af06e0419b31ad4ab4d6526b237e9d80f SHA1 d9b8818abfa18c69150290be968de7efaa3f2b7f SHA256 65a9dcc2191708ec64a82616dad202d80465b30a696386ec30bd1b459d4a3d83
-MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
-RMD160 78820d5af06e0419b31ad4ab4d6526b237e9d80f files/gentoo-ffmpeg001.patch 752
-SHA256 65a9dcc2191708ec64a82616dad202d80465b30a696386ec30bd1b459d4a3d83 files/gentoo-ffmpeg001.patch 752
-DIST 26104-510.zip 291836 RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46
-DIST 26204-510.zip 246663 RMD160 1b68232bc40d84298b134c57697e29a842e63ffd SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991
+DIST 26104-510.zip 291836 RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca SHA1 b22dbe895991c23fad446c3c4ff7b6db12673778 SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46
+DIST 26204-510.zip 246663 RMD160 1b68232bc40d84298b134c57697e29a842e63ffd SHA1 9ca910295c2888fba95a98da83762a22aaf34651 SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991
 DIST ffmpeg-0.4.9-p20050226.tbz2 1501308
-DIST ffmpeg-0.4.9-p20050906.tbz2 1671242
-DIST ffmpeg-0.4.9-p20051120.tar.bz2 1698488
 DIST ffmpeg-0.4.9-p20051216.tar.bz2 1719827
 DIST ffmpeg-0.4.9-p20060302.tar.bz2 1759647 RMD160 e1e2c826c95d2eddd06d91b7df8fba1a3dc277bd SHA1 c679e2fd24737179b4009e59396d647c22adaac1 SHA256 17bd539cc1244a00e0de1d0d4ae3ea731553a8405be616bfc79858496633391d
 DIST ffmpeg-0.4.9-p20060517.tar.bz2 1811524 RMD160 d4455eb1d3d93dfedc52a513aee736d4f101ddf1 SHA1 506764b1c128b392161b80d146609a2abc2baf1c SHA256 ae150f82f2aaa0f414c1f9f2cfc5e07604bb169ce923a6961a9546a1387625cc
@@ -81,18 +51,6 @@ EBUILD ffmpeg-0.4.9_p20050226-r3.ebuild 4388 RMD160 bb6e81aff569ad13e7bf13aa09f7
 MD5 da4fb7c75a6d011f4d7e0d337d449129 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
 RMD160 bb6e81aff569ad13e7bf13aa09f76602e4f2a590 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
 SHA256 5135d135bcdd29a9e5f4dcd2e1d4b75bc851a465de513531537af6bf4684a7a5 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
-EBUILD ffmpeg-0.4.9_p20050226-r5.ebuild 4543 RMD160 d153ce0b9da74209ec9f0324e258dffdaf5785b8 SHA1 ab01928d7e87a24e5d6a95b9c8a5b202cb4ebd80 SHA256 04a327cf69d6a1bdc381b6515f509b37733354385caadbaea0208fd673e24698
-MD5 ff615b7d4ca2c8355c1d0a358271e2d8 ffmpeg-0.4.9_p20050226-r5.ebuild 4543
-RMD160 d153ce0b9da74209ec9f0324e258dffdaf5785b8 ffmpeg-0.4.9_p20050226-r5.ebuild 4543
-SHA256 04a327cf69d6a1bdc381b6515f509b37733354385caadbaea0208fd673e24698 ffmpeg-0.4.9_p20050226-r5.ebuild 4543
-EBUILD ffmpeg-0.4.9_p20050906.ebuild 4781 RMD160 5aa902e61f0ea1db96e65de8e97a038d41839a61 SHA1 780e1f095ae3e3a62823ada148e1696b3048d207 SHA256 2892dbbab75019068039d6e90916687d408f99e430828eefc76c98d944bd6095
-MD5 e4e188b8783b45bbc9c454b9f4de3aad ffmpeg-0.4.9_p20050906.ebuild 4781
-RMD160 5aa902e61f0ea1db96e65de8e97a038d41839a61 ffmpeg-0.4.9_p20050906.ebuild 4781
-SHA256 2892dbbab75019068039d6e90916687d408f99e430828eefc76c98d944bd6095 ffmpeg-0.4.9_p20050906.ebuild 4781
-EBUILD ffmpeg-0.4.9_p20051120.ebuild 4707 RMD160 780c136f2421f22a874dbb389b9d0770922229e6 SHA1 27b1717a6572b12a8b60265930ead6a41e3b1aed SHA256 c0407f86a50fd884266d46a607e16d7917d65f0a87c9e7baee4718dc401b14a2
-MD5 faab330a828982afbde572059cedc47f ffmpeg-0.4.9_p20051120.ebuild 4707
-RMD160 780c136f2421f22a874dbb389b9d0770922229e6 ffmpeg-0.4.9_p20051120.ebuild 4707
-SHA256 c0407f86a50fd884266d46a607e16d7917d65f0a87c9e7baee4718dc401b14a2 ffmpeg-0.4.9_p20051120.ebuild 4707
 EBUILD ffmpeg-0.4.9_p20051216.ebuild 5792 RMD160 a9c7ea9d50e9d86a76bc8024e808884db7ebf71f SHA1 da686ec061b5825291ff3e2a9238cfa5f103597d SHA256 ac025d3a396f68a30490eb333c1c061bf4a6a315bb66e67011f5c1b71e809da6
 MD5 77bf2e5e661831311253e8558432768f ffmpeg-0.4.9_p20051216.ebuild 5792
 RMD160 a9c7ea9d50e9d86a76bc8024e808884db7ebf71f ffmpeg-0.4.9_p20051216.ebuild 5792
@@ -105,10 +63,10 @@ EBUILD ffmpeg-0.4.9_p20060517.ebuild 7718 RMD160 94f1ed3aaa88d7595b36c1265862bb5
 MD5 587e561ad1ae6e62cc1453690819d25c ffmpeg-0.4.9_p20060517.ebuild 7718
 RMD160 94f1ed3aaa88d7595b36c1265862bb5cb469f166 ffmpeg-0.4.9_p20060517.ebuild 7718
 SHA256 c6b9c00d45c4c630e7ad9c9f909ca29afe2065b382b43a5c580111d24fa97dab ffmpeg-0.4.9_p20060517.ebuild 7718
-MISC ChangeLog 21049 RMD160 d33ceaeadf8038abd04e9c4040b3ef30f659ea71 SHA1 c2e57d58cea73767c34634844eebcb77eb75e5a0 SHA256 8df5f7a5a5b4b47c01d513750fb3e1337c81f07c040f014fb9456df9eebd2140
-MD5 7e3f6d66c4f606abbe37dd61e21126fb ChangeLog 21049
-RMD160 d33ceaeadf8038abd04e9c4040b3ef30f659ea71 ChangeLog 21049
-SHA256 8df5f7a5a5b4b47c01d513750fb3e1337c81f07c040f014fb9456df9eebd2140 ChangeLog 21049
+MISC ChangeLog 21467 RMD160 92f496ab1d464e5a5382df626e92cf04e2d3ab19 SHA1 dc8f8ebb891fe167d0335e72145c892878f998e3 SHA256 4f6025bf392c0ebd8536b362a145a37d18417cea4601aef7714432348f53a415
+MD5 68d918bdf3b54cf8bf21b5ab2bb74826 ChangeLog 21467
+RMD160 92f496ab1d464e5a5382df626e92cf04e2d3ab19 ChangeLog 21467
+SHA256 4f6025bf392c0ebd8536b362a145a37d18417cea4601aef7714432348f53a415 ChangeLog 21467
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -116,15 +74,6 @@ SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 metadata
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r3 73
 RMD160 e14f7f51254a902bb6fe34a7949da49de95daa2e files/digest-ffmpeg-0.4.9_p20050226-r3 73
 SHA256 460237af1ea0f9de66f0b5648f27ae4e48d7fc2dcb0078a50738db5151a8c1c4 files/digest-ffmpeg-0.4.9_p20050226-r3 73
-MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r5 73
-RMD160 e14f7f51254a902bb6fe34a7949da49de95daa2e files/digest-ffmpeg-0.4.9_p20050226-r5 73
-SHA256 460237af1ea0f9de66f0b5648f27ae4e48d7fc2dcb0078a50738db5151a8c1c4 files/digest-ffmpeg-0.4.9_p20050226-r5 73
-MD5 39cf7a98d0f59cfde5b82ab7fedf19d0 files/digest-ffmpeg-0.4.9_p20050906 73
-RMD160 cfa0a33966f1d3cec98f1f9a138e46bad84b4a59 files/digest-ffmpeg-0.4.9_p20050906 73
-SHA256 1a3efb79c9a1069492f640b27e3c1fd9dd57e09ad69bb04984c5cf571d78a7b4 files/digest-ffmpeg-0.4.9_p20050906 73
-MD5 e7fdab307678c48f460afd6a50358fd2 files/digest-ffmpeg-0.4.9_p20051120 76
-RMD160 26ceab1db8565cb3e01a9d0dfc477f9b5b3e9cda files/digest-ffmpeg-0.4.9_p20051120 76
-SHA256 33cdf4a536d64f29d47f5712a2bf9a63a6a07e87a69ae8b235168a838d1f375d files/digest-ffmpeg-0.4.9_p20051120 76
 MD5 901fef6a53861dbe2d583688478546ac files/digest-ffmpeg-0.4.9_p20051216 76
 RMD160 b2fa9ae9699ba46efeef82025bac9d493f8bf45f files/digest-ffmpeg-0.4.9_p20051216 76
 SHA256 61b82cac8ca3bda3af573eef3b528771d181495e46e8fab0f859d6e05394c05e files/digest-ffmpeg-0.4.9_p20051216 76
@@ -137,7 +86,7 @@ SHA256 40809495f2dc849a8a2073aee157d06403a7327a51096ca78d5d8143fef813e4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEdR3yAiZjviIA2XgRAn9tAKDlBoNUtgU2sw7A+kIdWgP13dUuKgCfSKlx
-IW3JE8e5oqqHdiTZwamQTCs=
-=63Jg
+iD8DBQFEegBxAiZjviIA2XgRAtCDAJ9UKB1IN2q46yft97fNCPJSJ0zseACgqdHy
+i2Ya8kwnjPriNTd4kKWC8Nc=
+=GOj4
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r5.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r5.ebuild
deleted file mode 100644
index 0321075831ea..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r5.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r5.ebuild,v 1.15 2005/09/15 20:55:57 agriffis Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
-MY_P=${P/_/-}
-S=${WORKDIR}
-S_BASE=${WORKDIR}/${MY_P}
-S_STATIC=${S_BASE}-static
-S_SHARED=${S_BASE}-shared
-
-SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# ~alpha need to test aac useflag
-# ~ia64 ~arm ~mips ~hppa
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss threads truetype v4l xvid dts network zlib sdl"
-
-# Theora support has switch but there's no oggtheora.c sourcefile...
-
-DEPEND="imlib? ( media-libs/imlib2 )
-	truetype? ( >=media-libs/freetype-2 )
-	sdl? ( >=media-libs/libsdl-1.2.1 )
-	doc? ( app-text/texi2html )
-	encode? ( media-sound/lame )
-	ogg? ( media-libs/libogg )
-	vorbis? ( media-libs/libvorbis )
-	aac? ( media-libs/faad2 media-libs/faac )
-	a52? ( >=media-libs/a52dec-0.7.4-r4 )
-	xvid? ( >=media-libs/xvid-1.0 )
-	zlib? ( sys-libs/zlib )
-	dts? ( media-libs/libdts )
-	ieee1394? ( =media-libs/libdc1394-1*
-	            sys-libs/libraw1394 )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S_BASE}
-
-	#Append -fomit-frame-pointer to avoid some common issues
-	use debug || append-flags "-fomit-frame-pointer"
-
-	# for some reason it tries to #include <X11/Xlib.h>, but doesn't use it
-	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-
-	# Fix building with gcc4
-	epatch ${FILESDIR}/${P}-gcc4.patch
-
-	#ffmpeg doesn'g use libtool, so the condition for PIC code
-	#is __PIC__, not PIC.
-	sed -i -e 's/#\(\(.*def *\)\|\(.*defined *\)\|\(.*defined(*\)\)PIC/#\1__PIC__/' \
-		libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \
-		libavcodec/msmpeg4.c \
-		libavcodec/common.h \
-		|| die "sed failed (__PIC__)"
-
-	epatch ${FILESDIR}/${PN}-libdir-pic.patch
-	epatch ${FILESDIR}/${PN}-a52.patch
-	epatch ${FILESDIR}/${PN}-missing_links.patch
-
-	cd ${S}
-	cp -R ${S_BASE} ${S_STATIC}
-	mv ${S_BASE} ${S_SHARED}
-}
-
-src_compile() {
-	#Note; library makefiles don't propogate flags from config.mak so
-	#use specified CFLAGS are only used in executables
-	filter-flags -fforce-addr -momit-leaf-frame-pointer
-
-	local myconf=""
-
-	#disable mmx accelerated code if not requirested, or if PIC is required
-	# as the provided asm decidedly isn't PIC.
-	if ( ! has_pic && use mmx ) || use amd64; then
-		myconf="${myconf} --enable-mmx"
-	else
-		myconf="${myconf} --disable-mmx"
-	fi
-
-	if use elibc_FreeBSD; then
-		myconf="${myconf} --enable-memalign-hack"
-	fi
-
-	myconf="${myconf}
-		$(use_enable altivec) \
-		$(use_enable debug) \
-		$(use_enable encode mp3lame) \
-		$(use_enable a52) --disable-a52bin \
-		$(use_enable oss audio-oss) \
-		$(use_enable v4l) \
-		$(use_enable ieee1394 dv1394) $(use_enable ieee1394 dc1394) \
-		$(use_enable threads pthreads) \
-		$(use_enable xvid) \
-		$(use_enable ogg) \
-		$(use_enable vorbis) \
-		$(use_enable dts) \
-		$(use_enable network) \
-		$(use_enable zlib) \
-		$(use_enable sdl ffplay) \
-		$(use_enable aac faad) $(use_enable aac faac) --disable-faadbin \
-		--enable-gpl \
-		--enable-pp \
-		--disable-opts"
-
-	cd ${S_STATIC}
-	econf --disable-shared-pp --disable-shared --enable-static ${myconf} || die "Configure failed"
-	emake CC="$(tc-getCC)" || die "static failed"
-
-	cd ${S_SHARED}
-	econf --enable-shared-pp --enable-shared --disable-static ${myconf} || die "Configure failed"
-	emake CC="$(tc-getCC)" || die "shared failed"
-}
-
-src_install() {
-	for d in ${S_STATIC} ${S_SHARED}; do
-		cd ${d}
-
-		use doc && make documentation
-		make DESTDIR=${D} \
-			prefix=${D}/usr \
-			libdir=${D}/usr/$(get_libdir) \
-			mandir=${D}/usr/share/man \
-			infodir=${D}/usr/share/info \
-			bindir=${D}/usr/bin \
-			install installlib || die "Install Failed"
-	done
-
-	cd ${S_SHARED}
-	dodoc ChangeLog README INSTALL
-	dodoc doc/*
-
-	cd ${S_STATIC}/libavcodec/libpostproc
-	make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) \
-		install || die "Failed to install libpostproc.a!"
-
-	cd ${S_SHARED}/libavcodec/libpostproc
-	make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) \
-		SHARED_PP="yes" \
-		install || die "Failed to install libpostproc.so!"
-
-	# Some stuff like transcode can use this one.
-	dolib ${S_STATIC}/libavcodec/libpostproc/libpostproc.a
-
-	preplib /usr
-}
-
-# FEATURES=maketest breakes the compile
-src_test() { :; }
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild
deleted file mode 100644
index 56288bf13c26..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild,v 1.8 2005/10/06 03:41:04 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
-MY_P=${P/_/-}
-S=${WORKDIR}
-S_BASE=${WORKDIR}/${MY_P}
-S_STATIC=${S_BASE}-static
-S_SHARED=${S_BASE}-shared
-
-SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# ~alpha need to test aac useflag
-# ~ia64 ~arm ~mips ~hppa
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss test theora threads truetype v4l xvid dts network zlib sdl"
-
-DEPEND="imlib? ( media-libs/imlib2 )
-	truetype? ( >=media-libs/freetype-2 )
-	sdl? ( >=media-libs/libsdl-1.2.1 )
-	doc? ( app-text/texi2html )
-	encode? ( media-sound/lame )
-	ogg? ( media-libs/libogg )
-	vorbis? ( media-libs/libvorbis )
-	theora? ( media-libs/libtheora )
-	aac? ( media-libs/faad2 media-libs/faac )
-	a52? ( >=media-libs/a52dec-0.7.4-r4 )
-	xvid? ( >=media-libs/xvid-1.0.3 )
-	zlib? ( sys-libs/zlib )
-	dts? ( media-libs/libdts )
-	ieee1394? ( =media-libs/libdc1394-1*
-	            sys-libs/libraw1394 )
-	test? ( net-misc/wget )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S_BASE}
-
-	#Append -fomit-frame-pointer to avoid some common issues
-	use debug || append-flags "-fomit-frame-pointer"
-
-	# for some reason it tries to #include <X11/Xlib.h>, but doesn't use it
-	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-
-	# Fix building with gcc4
-	epatch ${FILESDIR}/${P}-osx.patch
-
-	#ffmpeg doesn'g use libtool, so the condition for PIC code
-	#is __PIC__, not PIC.
-	sed -i -e 's/#\(\(.*def *\)\|\(.*defined *\)\|\(.*defined(*\)\)PIC/#\1__PIC__/' \
-		libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \
-		libavcodec/msmpeg4.c \
-		libavutil/common.h \
-		|| die "sed failed (__PIC__)"
-
-	# epatch ${FILESDIR}/${PN}-libdir-pic.patch
-	# epatch ${FILESDIR}/${PN}-a52.patch
-	# epatch ${FILESDIR}/${PN}-missing_links.patch
-	# To make sure the ffserver test will work 
-	sed -i -e "s:-e debug=off::" tests/server-regression.sh
-	cd ${S}
-	cp -R ${S_BASE} ${S_STATIC}
-	mv ${S_BASE} ${S_SHARED}
-}
-
-src_compile() {
-	#Note; library makefiles don't propogate flags from config.mak so
-	#use specified CFLAGS are only used in executables
-	filter-flags -fforce-addr -momit-leaf-frame-pointer
-
-	local myconf=""
-
-	#disable mmx accelerated code if not requirested, or if PIC is required
-	# as the provided asm decidedly isn't PIC.
-	if ( ! has_pic && use mmx ) || use amd64; then
-		myconf="${myconf} --enable-mmx"
-	else
-		myconf="${myconf} --disable-mmx"
-	fi
-
-	if use elibc_FreeBSD; then
-		myconf="${myconf} --enable-memalign-hack"
-	fi
-
-	myconf="${myconf}
-		$(use_enable altivec) \
-		$(use_enable debug) \
-		$(use_enable encode mp3lame) \
-		$(use_enable a52) --disable-a52bin \
-		$(use_enable oss audio-oss) \
-		$(use_enable v4l) \
-		$(use_enable ieee1394 dv1394) $(use_enable ieee1394 dc1394) \
-		$(use_enable threads pthreads) \
-		$(use_enable xvid) \
-		$(use_enable ogg libogg) \
-		$(use_enable vorbis) \
-		$(use_enable theora) \
-		$(use_enable dts) \
-		$(use_enable network) \
-		$(use_enable zlib) \
-		$(use_enable sdl ffplay) \
-		$(use_enable aac faad) $(use_enable aac faac) --disable-faadbin \
-		--enable-gpl \
-		--enable-pp \
-		--disable-opts"
-
-	cd ${S_STATIC}
-	econf --disable-shared-pp --disable-shared --enable-static ${myconf} || die "Configure failed"
-	emake CC="$(tc-getCC)" || die "static failed"
-
-	cd ${S_SHARED}
-	econf --enable-shared-pp --enable-shared --disable-static ${myconf} || die "Configure failed"
-	emake CC="$(tc-getCC)" || die "shared failed"
-}
-
-src_install() {
-	for d in ${S_STATIC} ${S_SHARED}; do
-		cd ${d}
-
-		use doc && make documentation
-		make DESTDIR=${D} \
-			prefix=${D}/usr \
-			libdir=${D}/usr/$(get_libdir) \
-			mandir=${D}/usr/share/man \
-			infodir=${D}/usr/share/info \
-			bindir=${D}/usr/bin \
-			install installlib || die "Install Failed"
-	done
-
-	cd ${S_SHARED}
-	dodoc ChangeLog README INSTALL
-	dodoc doc/*
-
-	cd ${S_STATIC}/libavcodec/libpostproc
-	make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) \
-		install || die "Failed to install libpostproc.a!"
-
-	cd ${S_SHARED}/libavcodec/libpostproc
-	make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) \
-		SHARED_PP="yes" \
-		install || die "Failed to install libpostproc.so!"
-
-	# Some stuff like transcode can use this one.
-	dolib ${S_STATIC}/libavcodec/libpostproc/libpostproc.a
-
-	preplib /usr
-}
-
-# Never die for now...
-src_test() {
-
-	for d in ${S_STATIC} ${S_SHARED}; do
-		cd ${d}
-		make test || ewarn "Some test failed"
-	done
-}
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20051120.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20051120.ebuild
deleted file mode 100644
index 95a8b196370c..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20051120.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20051120.ebuild,v 1.8 2006/01/13 12:11:26 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
-MY_P=${P/_/-}
-S=${WORKDIR}
-S_BASE=${WORKDIR}/${MY_P}
-S_STATIC=${S_BASE}-static
-S_SHARED=${S_BASE}-shared
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# ~alpha need to test aac useflag
-# ~ia64 ~arm ~mips ~hppa
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-KEYWORDS="-* ~amd64 ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss test theora threads truetype v4l xvid dts network zlib sdl"
-
-DEPEND="imlib? ( media-libs/imlib2 )
-	truetype? ( >=media-libs/freetype-2 )
-	sdl? ( >=media-libs/libsdl-1.2.1 )
-	doc? ( app-text/texi2html )
-	encode? ( media-sound/lame )
-	ogg? ( media-libs/libogg )
-	vorbis? ( media-libs/libvorbis )
-	theora? ( media-libs/libtheora )
-	aac? ( media-libs/faad2 media-libs/faac )
-	a52? ( >=media-libs/a52dec-0.7.4-r4 )
-	xvid? ( >=media-libs/xvid-1.0.3 )
-	zlib? ( sys-libs/zlib )
-	dts? ( media-libs/libdts )
-	ieee1394? ( =media-libs/libdc1394-1*
-	            sys-libs/libraw1394 )
-	test? ( net-misc/wget )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S_BASE}
-
-	#Append -fomit-frame-pointer to avoid some common issues
-	use debug || append-flags "-fomit-frame-pointer"
-
-	# for some reason it tries to #include <X11/Xlib.h>, but doesn't use it
-	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-
-	epatch ${FILESDIR}/ffmpeg-configure.patch
-
-	#ffmpeg doesn'g use libtool, so the condition for PIC code
-	#is __PIC__, not PIC.
-	sed -i -e 's/#\(\(.*def *\)\|\(.*defined *\)\|\(.*defined(*\)\)PIC/#\1__PIC__/' \
-		libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \
-		libavcodec/msmpeg4.c \
-		libavutil/common.h \
-		|| die "sed failed (__PIC__)"
-
-	# To make sure the ffserver test will work
-	sed -i -e "s:-e debug=off::" tests/server-regression.sh
-	cd ${S}
-	cp -R ${S_BASE} ${S_STATIC}
-	mv ${S_BASE} ${S_SHARED}
-}
-
-src_compile() {
-	#Note; library makefiles don't propogate flags from config.mak so
-	#use specified CFLAGS are only used in executables
-	filter-flags -fforce-addr -momit-leaf-frame-pointer
-	replace-flags -O0 -O2
-
-	local myconf=""
-
-	#disable mmx accelerated code if not requirested, or if PIC is required
-	# as the provided asm decidedly isn't PIC.
-	if ( ! has_pic && use mmx ) || use amd64; then
-		myconf="${myconf} --enable-mmx"
-	else
-		myconf="${myconf} --disable-mmx"
-	fi
-
-	if use elibc_FreeBSD; then
-		myconf="${myconf} --enable-memalign-hack"
-	fi
-
-	myconf="${myconf}
-		$(use_enable altivec) \
-		$(use_enable debug) \
-		$(use_enable encode mp3lame) \
-		$(use_enable a52) --disable-a52bin \
-		$(use_enable oss audio-oss) \
-		$(use_enable v4l) \
-		$(use_enable ieee1394 dv1394) $(use_enable ieee1394 dc1394) \
-		$(use_enable threads pthreads) \
-		$(use_enable xvid) \
-		$(use_enable ogg libogg) \
-		$(use_enable vorbis) \
-		$(use_enable theora) \
-		$(use_enable dts) \
-		$(use_enable network) \
-		$(use_enable zlib) \
-		$(use_enable sdl ffplay) \
-		$(use_enable aac faad) $(use_enable aac faac) --disable-faadbin \
-		--enable-gpl \
-		--enable-pp \
-		--disable-opts"
-
-	cd ${S_STATIC}
-	econf --disable-shared-pp --disable-shared --enable-static ${myconf} || die "Configure failed"
-	emake CC="$(tc-getCC)" || die "static failed"
-
-	cd ${S_SHARED}
-	econf --enable-shared-pp --enable-shared --disable-static ${myconf} || die "Configure failed"
-	emake CC="$(tc-getCC)" || die "shared failed"
-}
-
-src_install() {
-	for d in ${S_STATIC} ${S_SHARED}; do
-		cd ${d}
-
-		make DESTDIR=${D} \
-			prefix=${D}/usr \
-			libdir=${D}/usr/$(get_libdir) \
-			mandir=${D}/usr/share/man \
-			infodir=${D}/usr/share/info \
-			bindir=${D}/usr/bin \
-			install installlib || die "Install Failed"
-	done
-
-	cd ${S_SHARED}
-	use doc && make documentation
-	dodoc ChangeLog README INSTALL
-	dodoc doc/*
-
-	cd ${S_STATIC}/libavcodec/libpostproc
-	make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) \
-		install || die "Failed to install libpostproc.a!"
-
-	cd ${S_SHARED}/libavcodec/libpostproc
-	make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) \
-		SHARED_PP="yes" \
-		install || die "Failed to install libpostproc.so!"
-
-	# Some stuff like transcode can use this one.
-	dolib ${S_STATIC}/libavcodec/libpostproc/libpostproc.a
-
-	preplib /usr
-}
-
-# Never die for now...
-src_test() {
-
-	for d in ${S_STATIC} ${S_SHARED}; do
-		cd ${d}
-		make test || ewarn "Some test failed"
-	done
-}
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r5 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r5
deleted file mode 100644
index e182f6a35a7d..000000000000
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4c0a6fb7339f7809424f525fe94570e ffmpeg-0.4.9-p20050226.tbz2 1501308
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050906 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050906
deleted file mode 100644
index 69d53de0bd8a..000000000000
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050906
+++ /dev/null
@@ -1 +0,0 @@
-MD5 677fabc5adf9b812c42924e9fd300a65 ffmpeg-0.4.9-p20050906.tbz2 1671242
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20051120 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20051120
deleted file mode 100644
index f87248452a3a..000000000000
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20051120
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bf08f447f51f12d6d31d46d5ebcac367 ffmpeg-0.4.9-p20051120.tar.bz2 1698488
diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20050226-gcc4.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20050226-gcc4.patch
deleted file mode 100644
index bdc80c371f01..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20050226-gcc4.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- ffmpeg-0.4.9-p20050226/libavcodec/libpostproc/postprocess_template.c	2005-04-25 13:48:06.000000000 +0000
-+++ ffmpeg-0.4.9-p20050226.az/libavcodec/libpostproc/postprocess_template.c	2005-04-25 13:53:55.000000000 +0000
-@@ -611,6 +611,7 @@
- static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext *c)
- {
- #if defined (HAVE_MMX2) || defined (HAVE_3DNOW)
-+	PPContext *ptr_c_pQPb = c->pQPb;
- /*
- 	uint8_t tmp[16];
- 	const int l1= stride;
-@@ -832,7 +833,7 @@
- 		"movq %%mm2, (%0, %1, 4)			\n\t"
- 
- 		:
--		: "r" (src), "r" ((long)stride), "m" (c->pQPb)
-+		: "r" (src), "r" ((long)stride), "m" (ptr_c_pQPb)
- 		: "%"REG_a, "%"REG_c
- 	);
- 
-@@ -2758,6 +2759,7 @@
- 	if(dc_mask & eq_mask){
- 		long offset= -8*step;
- 		int64_t *temp_sums= sums;
-+		int64_t dc_eq_mask = dc_mask & eq_mask;
- 
- 		asm volatile(
- 		"movq %2, %%mm0					\n\t"  // QP,..., QP
-@@ -2930,7 +2932,7 @@
- 		" js 1b						\n\t"
- 
- 		: "+r"(offset), "+r"(temp_sums)
--		: "r" ((long)step), "r"(src - offset), "m"(dc_mask & eq_mask)
-+		: "r" ((long)step), "r"(src - offset), "m"(dc_eq_mask)
- 		);
- 	}else
- 		src+= step; // src points to begin of the 8x8 Block
---- ffmpeg-0.4.9-p20050226/libavcodec/avcodec.h	2005-04-25 21:20:47.000000000 +0000
-+++ ffmpeg-0.4.9-p20050226.az/libavcodec/avcodec.h	2005-04-25 21:21:39.000000000 +0000
-@@ -1816,6 +1816,13 @@
- #define FF_OPT_MAX_DEPTH 10
- } AVOption;
- 
-+#ifdef HAVE_MMX
-+extern const struct AVOption avoptions_common[3 + 5];
-+#else
-+extern const struct AVOption avoptions_common[3];
-+#endif
-+extern const struct AVOption avoptions_workaround_bug[11];
-+
- /**
-  * Parse option(s) and sets fields in passed structure
-  * @param strct	structure where the parsed results will be written
---- ffmpeg-0.4.9-p20050226/libavcodec/common.h	2005-04-25 21:20:54.000000000 +0000
-+++ ffmpeg-0.4.9-p20050226.az/libavcodec/common.h	2005-04-25 21:21:16.000000000 +0000
-@@ -54,14 +54,6 @@
- #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
- #define AVOPTION_END() AVOPTION_SUB(NULL)
- 
--struct AVOption;
--#ifdef HAVE_MMX
--extern const struct AVOption avoptions_common[3 + 5];
--#else
--extern const struct AVOption avoptions_common[3];
--#endif
--extern const struct AVOption avoptions_workaround_bug[11];
--
- #endif /* HAVE_AV_CONFIG_H */
- 
- /* Suppress restrict if it was not defined in config.h.  */
diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20050906-osx.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20050906-osx.patch
deleted file mode 100644
index 7b5174cb9654..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20050906-osx.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-diff -ur ffmpeg-orig/configure ffmpeg/configure
---- ffmpeg-orig/configure	2005-08-21 16:33:00.000000000 -0400
-+++ ffmpeg/configure	2005-09-01 23:38:56.000000000 -0400
-@@ -308,11 +308,12 @@
- audio_oss="no"
- dv1394="no"
- ffserver="no"
--SHFLAGS="-dynamiclib"
-+SHFLAGS="-dynamiclib -Wl,-single_module,-undefined,dynamic_lookup"
- extralibs=""
- darwin="yes"
- strip="strip -x"
--LDFLAGS="-Wl,-search_paths_first"
-+LDFLAGS="-Wl,-dynamic,-search_paths_first"
-+SLIBSUF=".dylib"
- FFSLDFLAGS=-Wl,-bind_at_load
- ;;
- MINGW32*)
-@@ -1424,6 +1425,8 @@
-   if test "$shared_pp" = "yes" ; then
-     echo "#define SHARED_PP 1" >> $TMPH
-     echo "SHARED_PP=yes" >> config.mak
-+	echo "SPPMAJOR=0" >> config.mak
-+	echo "SPPVERSION=0.0.1" >> config.mak
-   fi
- fi
- 
-diff -ur ffmpeg-orig/libavcodec/Makefile ffmpeg/libavcodec/Makefile
---- ffmpeg-orig/libavcodec/Makefile	2005-08-13 09:45:42.000000000 -0400
-+++ ffmpeg/libavcodec/Makefile	2005-09-01 23:38:56.000000000 -0400
-@@ -373,17 +373,22 @@
- CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
- endif
- 
-+# Darwin specific stuff
-+ifeq ($(CONFIG_DARWIN),yes)
-+SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBPREF)avcodec$(SLIBSUF),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
-+endif
-+
- SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
- OBJS := $(OBJS) $(ASM_OBJS)
- 
- LIB= $(LIBPREF)avcodec$(LIBSUF)
- LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
- ifeq ($(BUILD_SHARED),yes)
--SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
-+SLIBNAME= $(SLIBPREF)avcodec$(SLIBSUF)
- endif
- TESTS= imgresample-test dct-test motion-test fft-test
- 
--all: $(LIB) $(SLIB)
-+all: $(LIB) $(SLIBNAME)
- 
- amrlibs:
- 	$(MAKE) -C amr spclib fipoplib
-@@ -395,7 +400,7 @@
- 	$(AR) rc $@ $(OBJS) $(AMREXTRALIBS)
- 	$(RANLIB) $@
- 
--$(SLIB): $(OBJS)
-+$(SLIBNAME): $(OBJS)
- ifeq ($(CONFIG_PP),yes)
- 	$(MAKE) -C libpostproc
- endif
-@@ -403,7 +408,7 @@
- 	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
- 	-lib /machine:i386 /def:$(@:.dll=.def)
- else
--	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
- endif
- 
- dsputil.o: dsputil.c dsputil.h
-@@ -423,7 +428,7 @@
- dep:	depend
- 
- clean: $(CLEANAMR)
--	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \
-+	rm -f *.o *.d *~ .depend $(LIB) $(SLIBNAME) *$(SLIBSUF) i386/*.o i386/*~ \
- 	   armv4l/*.o armv4l/*~ \
- 	   mlib/*.o mlib/*~ \
- 	   alpha/*.o alpha/*~ \
-@@ -472,11 +477,11 @@
- ifeq ($(BUILD_SHARED),yes)
- install: all install-headers
- ifeq ($(CONFIG_WIN32),yes)
--	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
-+	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
- else
- 	install -d $(libdir)
--	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so
--	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so
-+	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavcodec-$(VERSION)$(SLIBSUF)
-+	ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(libdir)/libavcodec$(SLIBSUF)
- 	$(LDCONFIG) || true
- endif
- ifeq ($(CONFIG_PP),yes)
-diff -ur ffmpeg-orig/libavcodec/libpostproc/Makefile ffmpeg/libavcodec/libpostproc/Makefile
---- ffmpeg-orig/libavcodec/libpostproc/Makefile	2005-06-26 20:55:29.000000000 -0400
-+++ ffmpeg/libavcodec/libpostproc/Makefile	2005-09-01 23:38:56.000000000 -0400
-@@ -4,9 +4,16 @@
- VPATH=$(SRC_PATH)/libavcodec/libpostproc
- 
- ifeq ($(SHARED_PP),yes)
--SPPLIB = $(SLIBPREF)postproc$(SLIBSUF)
--SPPMAJOR = 0
--SPPVERSION = $(SPPMAJOR).0.1
-+SPPLIBNAME = $(SLIBPREF)postproc$(SLIBSUF)
-+ifeq ($(CONFIG_DARWIN),yes)
-+SPPLIBMAJOR = $(SLIBPREF)postproc.$(SPPMAJOR)$(SLIBSUF)
-+SPPLIB = $(SLIBPREF)postproc.$(SPPVERSION)$(SLIBSUF)
-+SHFLAGS += -Wl,-install_name,$(libdir)/$(SPPLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
-+else
-+SPPLIBMAJOR = $(SPPLIBNAME).$(SPPMAJOR)
-+SPPLIB = $(SPPLIBNAME).$(SPPVERSION)
-+SHFLAGS = -shared -Wl,-soname,$(SPPLIB)
-+endif
- endif
- PPLIB = $(LIBPREF)postproc$(LIBSUF)
- 
-@@ -23,13 +30,13 @@
- .c.o:
- 	$(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
- 
--all:    $(SWSLIB) $(PPLIB) $(SPPLIB)
-+all:    $(SWSLIB) $(PPLIB) $(SPPLIBNAME)
- 
- clean:
--	rm -f *.o *.a *~ *.so $(PPLIB) $(SPPLIB)
-+	rm -f *.o *.a *~ *$(SLIBSUF) $(PPLIB) $(SPPLIBNAME)
- 
- distclean:
--	rm -f Makefile.bak *.o *.a *~ *.so .depend
-+	rm -f Makefile.bak *.o *.a *~ *$(SLIBSUF) .depend
- 
- dep:    depend
- 
-@@ -40,9 +47,8 @@
- postprocess_pic.o: postprocess.c
- 	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
- 
--$(SPPLIB): $(SPPOBJS)
--	$(CC) -shared -Wl,-soname,$(SPPLIB).$(SPPMAJOR) \
--	-o $(SPPLIB) $(SPPOBJS)
-+$(SPPLIBNAME): $(SPPOBJS)
-+	$(CC) $(SHFLAGS) -o $(SPPLIBNAME) $(SPPOBJS)
- endif
- 
- $(PPLIB): $(PPOBJS)
-@@ -53,12 +59,12 @@
- install: all
- ifeq ($(SHARED_PP),yes)
- ifeq ($(CONFIG_WIN32),yes)
--	install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
-+	install $(INSTALLSTRIP) -m 755 $(SPPLIBNAME) "$(prefix)"
- else
- 	install -d $(libdir)
--	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
--	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
--	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR)
-+	install $(INSTALLSTRIP) -m 755 $(SPPLIBNAME) $(libdir)/$(SPPLIB)
-+	ln -sf $(SPPLIB) $(libdir)/$(SPPLIBNAME)
-+	ln -sf $(SPPLIB) $(libdir)/$(SPPLIBMAJOR)
- 	install -d $(libdir)/pkgconfig
- 	install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
- 	$(LDCONFIG) || true
-diff -ur ffmpeg-orig/libavcodec/ppc/fdct_altivec.c ffmpeg/libavcodec/ppc/fdct_altivec.c
---- ffmpeg-orig/libavcodec/ppc/fdct_altivec.c	2005-08-05 15:15:34.000000000 -0400
-+++ ffmpeg/libavcodec/ppc/fdct_altivec.c	2005-09-01 23:38:56.000000000 -0400
-@@ -18,7 +18,7 @@
-  */
- 
- 
--#include "common.h"
-+#include "../../libavutil/common.h"
- #include "../dsputil.h"
- #include "dsputil_altivec.h"
- #include "gcc_fixes.h"
-diff -ur ffmpeg-orig/libavformat/Makefile ffmpeg/libavformat/Makefile
---- ffmpeg-orig/libavformat/Makefile	2005-08-13 09:45:42.000000000 -0400
-+++ ffmpeg/libavformat/Makefile	2005-09-01 23:38:56.000000000 -0400
-@@ -81,9 +81,11 @@
- 
- LIB= $(LIBPREF)avformat$(LIBSUF)
- ifeq ($(BUILD_SHARED),yes)
--SLIB= $(SLIBPREF)avformat$(SLIBSUF)
--
--AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec
-+SLIBNAME= $(SLIBPREF)avformat$(SLIBSUF)
-+AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil
-+ifeq ($(CONFIG_DARWIN),yes)
-+SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
-+endif
- ifeq ($(CONFIG_MP3LAME),yes)
- AVCLIBS+=-lmp3lame
- endif
-@@ -91,14 +93,14 @@
- 
- SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
- 
--all: $(LIB) $(SLIB)
-+all: $(LIB) $(SLIBNAME)
- 
- $(LIB): $(OBJS) $(PPOBJS)
- 	rm -f $@
- 	$(AR) rc $@ $(OBJS) $(PPOBJS)
- 	$(RANLIB) $@
- 
--$(SLIB): $(OBJS)
-+$(SLIBNAME): $(OBJS)
- ifeq ($(CONFIG_WIN32),yes)
- 	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
- 	-lib /machine:i386 /def:$(@:.dll=.def)
-@@ -112,11 +114,11 @@
- ifeq ($(BUILD_SHARED),yes)
- install: all install-headers
- ifeq ($(CONFIG_WIN32),yes)
--	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
-+	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
- else
- 	install -d $(libdir)
--	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so
--	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
-+	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/$(SLIBPREF)avformat-$(VERSION)$(SLIBSUF)
-+	ln -sf $(SLIBPREF)avformat-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME)
- 	$(LDCONFIG) || true
- endif
- else
-@@ -143,7 +145,7 @@
- 	g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $< 
- 
- distclean clean: 
--	rm -f *.o *.d .depend *~ *.a *.so $(LIB)
-+	rm -f *.o *.d .depend *~ *.a *$(SLIBSUF) $(LIB)
- 
- #
- # include dependency files if they exist
-diff -ur ffmpeg-orig/libavutil/Makefile ffmpeg/libavutil/Makefile
---- ffmpeg-orig/libavutil/Makefile	2005-08-06 06:03:08.000000000 -0400
-+++ ffmpeg/libavutil/Makefile	2005-09-01 23:38:56.000000000 -0400
-@@ -22,22 +22,25 @@
- 
- LIB= $(LIBPREF)avutil$(LIBSUF)
- ifeq ($(BUILD_SHARED),yes)
--SLIB= $(SLIBPREF)avutil$(SLIBSUF)
-+SLIBNAME= $(SLIBPREF)avutil$(SLIBSUF)
-+ifeq ($(CONFIG_DARWIN),yes)
-+SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
-+endif
- endif
- 
--all: $(LIB) $(SLIB)
-+all: $(LIB) $(SLIBNAME)
- 
- $(LIB): $(OBJS)
- 	rm -f $@
- 	$(AR) rc $@ $(OBJS)
- 	$(RANLIB) $@
- 
--$(SLIB): $(OBJS)
-+$(SLIBNAME): $(OBJS)
- ifeq ($(CONFIG_WIN32),yes)
- 	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
- 	-lib /machine:i386 /def:$(@:.dll=.def)
- else
--	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
- endif
- 
- %.o: %.c
-@@ -49,7 +52,7 @@
- dep:	depend
- 
- clean:
--	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so
-+	rm -f *.o *.d *~ .depend $(LIB) $(SLIBNAME) *$(SLIBSUF)
- 
- distclean: clean
- 	rm -f Makefile.bak .depend
-@@ -58,11 +61,11 @@
- ifeq ($(BUILD_SHARED),yes)
- install: all install-headers
- ifeq ($(CONFIG_WIN32),yes)
--	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
-+	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
- else
- 	install -d $(libdir)
--	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavutil-$(VERSION).so
--	ln -sf libavutil-$(VERSION).so $(libdir)/libavutil.so
-+	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavutil-$(VERSION)$(SLIBSUF)
-+	ln -sf libavutil-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME)
- 	$(LDCONFIG) || true
- endif
- else
-diff -ur ffmpeg-orig/vhook/Makefile ffmpeg/vhook/Makefile
---- ffmpeg-orig/vhook/Makefile	2005-08-01 16:07:05.000000000 -0400
-+++ ffmpeg/vhook/Makefile	2005-09-01 23:39:34.000000000 -0400
-@@ -5,22 +5,22 @@
- CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H
- 
- ifeq ($(CONFIG_DARWIN),yes)
--SHFLAGS+=-flat_namespace -undefined suppress
-+	SHFLAGS += -flat_namespace
- endif
--HOOKS=null.so fish.so ppm.so watermark.so
-+HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
- 
- ifeq ($(HAVE_IMLIB2),yes)
--    HOOKS += imlib2.so
-+    HOOKS += imlib2$(SLIBSUF)
- endif    
- 
- ifeq ($(HAVE_FREETYPE2),yes)
--    HOOKS += drawtext.so
-+    HOOKS += drawtext$(SLIBSUF)
-     CFLAGS += `freetype-config --cflags`
- endif    
- 
- all: $(HOOKS) 
- 
--SRCS := $(HOOKS:.so=.c)
-+SRCS := $(HOOKS:$(SLIBSUF)=.c)
- 
- depend: $(SRCS)
- 	$(CC) -MM $(CFLAGS) $^ 1>.depend
-@@ -29,17 +29,21 @@
- 	install -d "$(libdir)/vhook"
- 	install -m 755 $(HOOKS) "$(libdir)/vhook"
- 
--imlib2.so: imlib2.o
-+imlib2$(SLIBSUF): imlib2.o
- 	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -lImlib2
- 
--drawtext.so: drawtext.o
-+drawtext$(SLIBSUF): drawtext.o
- 	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
- 
--%.so: %.o
-+%$(SLIBSUF): %.o
-+ifeq ($(CONFIG_DARWIN),yes)
-+	$(CC) $(LDFLAGS) $(SHFLAGS) -Wl,-install_name,$(libdir)/vhoook/$@ -g -o $@ $<
-+else
- 	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
-+endif
- 
- clean:
--	rm -f *.o *.d .depend *.so *~
-+	rm -f *.o *.d .depend *$(SLIBSUF) *~
- 
- ifneq ($(wildcard .depend),)
- include .depend
diff --git a/media-video/ffmpeg/files/ffmpeg-a52.patch b/media-video/ffmpeg/files/ffmpeg-a52.patch
deleted file mode 100644
index 373f8b14b589..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-a52.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naurp ffmpeg-0.4.9-p20050226.orig/libavcodec/Makefile ffmpeg-0.4.9-p20050226/libavcodec/Makefile
---- ffmpeg-0.4.9-p20050226.orig/libavcodec/Makefile	2005-04-25 17:31:43.000000000 -0700
-+++ ffmpeg-0.4.9-p20050226/libavcodec/Makefile	2005-04-25 17:34:46.000000000 -0700
-@@ -73,8 +73,9 @@ OBJS+= a52dec.o
- 
- # using builtin liba52 or runtime linked liba52.so.0
- ifneq ($(CONFIG_A52BIN),yes)
--OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
--	liba52/imdct.o  liba52/parse.o liba52/crc.o liba52/resample.o
-+#OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
-+#	liba52/imdct.o  liba52/parse.o liba52/crc.o liba52/resample.o
-+EXTRALIBS += -la52
- endif
- endif
- 
-diff -Naurp ffmpeg-0.4.9-p20050226.orig/libavcodec/a52dec.c ffmpeg-0.4.9-p20050226/libavcodec/a52dec.c
---- ffmpeg-0.4.9-p20050226.orig/libavcodec/a52dec.c	2004-05-21 07:37:16.000000000 -0700
-+++ ffmpeg-0.4.9-p20050226/libavcodec/a52dec.c	2005-04-25 17:37:06.000000000 -0700
-@@ -23,7 +23,7 @@
-  */
- 
- #include "avcodec.h"
--#include "liba52/a52.h"
-+#include <a52dec/a52.h>
- 
- #ifdef CONFIG_A52BIN
- #include <dlfcn.h>
diff --git a/media-video/ffmpeg/files/ffmpeg-configure.patch b/media-video/ffmpeg/files/ffmpeg-configure.patch
deleted file mode 100644
index 8bfab44cc523..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-configure.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: configure
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
-retrieving revision 1.215
-diff -u -r1.215 configure
---- configure	22 Oct 2005 19:17:39 -0000	1.215
-+++ configure	20 Nov 2005 17:07:53 -0000
-@@ -215,7 +215,7 @@
- dlfcn="no"
- dlopen="no"
- mpegaudio_hp="yes"
--SHFLAGS=-shared
-+SHFLAGS='-shared -Wl,-soname,$@.0'
- netserver="no"
- need_inet_aton="no"
- ffserver="yes"
-@@ -580,8 +580,6 @@
-   ;;
-   *)
-   echo "Unknown option \"$opt\"."
--  echo "See $0 --help for available options."
--  exit 1
-   ;;
-   esac
- done
diff --git a/media-video/ffmpeg/files/ffmpeg-missing_links.patch b/media-video/ffmpeg/files/ffmpeg-missing_links.patch
deleted file mode 100644
index 0a2a57174a5c..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-missing_links.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naurp ffmpeg-0.4.9-p20050226-shared.orig/libavformat/Makefile ffmpeg-0.4.9-p20050226-shared/libavformat/Makefile
---- ffmpeg-0.4.9-p20050226-shared.orig/libavformat/Makefile	2005-04-25 16:55:04.000000000 -0700
-+++ ffmpeg-0.4.9-p20050226-shared/libavformat/Makefile	2005-04-25 17:12:05.000000000 -0700
-@@ -46,6 +46,7 @@ endif
- 
- ifeq ($(CONFIG_DC1394),yes)
- OBJS+= dc1394.o
-+EXTRALIBS+=-ldc1394_control -lraw1394
- endif
- 
- ifeq ($(CONFIG_AUDIO_OSS),yes)
-@@ -69,6 +70,7 @@ endif
- 
- ifeq ($(CONFIG_LIBOGG),yes)
- OBJS+= ogg.o
-+EXTRALIBS+= -logg
- endif
- 
- ifeq ($(TARGET_ARCH_SPARC64),yes)
-diff -Naurp ffmpeg-0.4.9-p20050226-shared.orig/Makefile ffmpeg-0.4.9-p20050226-shared/Makefile
---- ffmpeg-0.4.9-p20050226-shared.orig/Makefile	2005-02-24 07:18:02.000000000 -0800
-+++ ffmpeg-0.4.9-p20050226-shared/Makefile	2005-04-25 17:54:56.000000000 -0700
-@@ -53,10 +53,18 @@ EXTRALIBS+= -ltheora
- endif
- endif
- 
-+ifeq ($(CONFIG_AC3),yes)
-+ifneq ($(CONFIG_A52BIN),yes)
-+EXTRALIBS += -la52
-+endif
-+endif
-+
-+ifeq ($(CONFIG_DTS),yes)
-+EXTRALIBS += -ldts
-+endif
-+
- ifeq ($(CONFIG_FAAD),yes)
--ifeq ($(CONFIG_FAADBIN),yes)
--# no libs needed
--else
-+ifneq ($(CONFIG_FAADBIN),yes)
- EXTRALIBS += -lfaad
- endif
- endif
diff --git a/media-video/ffmpeg/files/ffmpeg-osx.patch b/media-video/ffmpeg/files/ffmpeg-osx.patch
deleted file mode 100644
index 8125f4fd6d42..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-osx.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/configure ./configure
---- ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/configure	Mon Jul  5 14:06:16 2004
-+++ ./configure	Sun Mar 20 23:48:10 2005
-@@ -240,7 +240,7 @@
- make="gmake"
- ;;
- Darwin)
--cc="cc"
-+cc="gcc"
- v4l="no"
- audio_oss="no"
- dv1394="no"
-@@ -249,7 +249,8 @@
- extralibs=""
- darwin="yes"
- strip="strip -x"
--LDFLAGS="-Wl,-d"
-+LDFLAGS="-Wl,-dynamic"
-+SLIBSUF=".dylib"
- FFSLDFLAGS=-Wl,-bind_at_load
- ;;
- MINGW32*)
-diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavcodec/Makefile ./libavcodec/Makefile
---- ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavcodec/Makefile	Fri Jun 18 09:11:15 2004
-+++ ./libavcodec/Makefile	Sun Mar 20 23:48:10 2005
-@@ -217,7 +217,7 @@
- dep:	depend
- 
- clean: $(CLEANAMR)
--	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \
-+	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.dylib *.so i386/*.o i386/*~ \
- 	   armv4l/*.o armv4l/*~ \
- 	   mlib/*.o mlib/*~ \
- 	   alpha/*.o alpha/*~ \
-@@ -269,8 +269,8 @@
- 	install -s -m 755 $(SLIB) "$(prefix)"
- else
- 	install -d $(prefix)/lib
--	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
--	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
-+	install -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION)$(SLIBSUF)
-+	ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(prefix)/lib/libavcodec$(SLIBSUF)
- 	ldconfig || true
- endif
- else
-diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavcodec/libpostproc/Makefile ./libavcodec/libpostproc/Makefile
---- ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavcodec/libpostproc/Makefile	Sun May 11 07:26:35 2003
-+++ ./libavcodec/libpostproc/Makefile	Sun Mar 20 23:48:11 2005
-@@ -2,7 +2,11 @@
- include ../../config.mak
- 
- ifeq ($(SHARED_PP),yes)
--SPPLIB = libpostproc.so
-+ifeq ($(CONFIG_DARWIN),yes)
-+	SPPLIB = libpostproc
-+else
-+	SPPLIB = libpostproc.so
-+endif
- SPPVERSION = 0.0.1
- endif
- PPLIB = libpostproc.a
-@@ -23,10 +27,10 @@
- all:    $(SWSLIB) $(PPLIB) $(SPPLIB)
- 
- clean:
--	rm -f *.o *.a *~ *.so
-+	rm -f *.o *.a *~ *.so *.dylib
- 
- distclean:
--	rm -f Makefile.bak *.o *.a *~ *.so .depend
-+	rm -f Makefile.bak *.o *.a *~ *.so *.dylib .depend
- 
- dep:    depend
- 
-@@ -38,8 +42,13 @@
- 	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
- 
- $(SPPLIB): $(SPPOBJS)
--	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
--	-o $(SPPLIB) $(SPPOBJS)
-+ifeq ($(CONFIG_DARWIN),yes)
-+	$(CC) -dynamiclib -Wl,-install_name,$(SPPLIB).0.dylib \
-+	-o $(SPPLIB).dylib $(SPPOBJS)
-+else
-+	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
-+	-o $(SPPLIB) $(SPPOBJS)
-+endif
- endif
- 
- $(PPLIB): $(PPOBJS)
-@@ -50,8 +59,13 @@
- install: all
- ifeq ($(SHARED_PP),yes)
- 	install -d $(prefix)/lib
--	install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
--	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
-+ifeq ($(CONFIG_DARWIN),yes)
-+	install -m 755 $(SPPLIB).dylib $(prefix)/lib/$(SPPLIB).$(SPPVERSION).dylib
-+	ln -sf $(SPPLIB).$(SPPVERSION).dylib $(prefix)/lib/$(SPPLIB).dylib
-+else
-+	install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
-+	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
-+endif
- 	ldconfig || true
- 	mkdir -p $(prefix)/include/postproc
- 	install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h
-diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavformat/Makefile ./libavformat/Makefile
---- ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavformat/Makefile	Sat Apr 24 11:16:23 2004
-+++ ./libavformat/Makefile	Sun Mar 20 23:48:11 2005
-@@ -18,6 +18,11 @@
-       nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
-       sierravmd.o matroska.o
- 
-+CPU = $(shell uname)
-+ifeq ($(CPU),Darwin)
-+	OBJS+=../libavcodec/libavcodec.dylib
-+endif
-+
- ifeq ($(CONFIG_RISKY),yes)
- OBJS+= asf.o
- OBJS+= asf-enc.o
-@@ -93,7 +98,7 @@
- 	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
- 	-lib /machine:i386 /def:$(@:.dll=.def)
- else
--	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)
-+	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(LDFLAGS)
- endif
- 
- depend: $(SRCS)
-@@ -105,8 +110,8 @@
- 	install -s -m 755 $(SLIB) "$(prefix)"
- else
- 	install -d $(prefix)/lib
--	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
--	ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
-+	install -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION)$(SLIBSUF)
-+	ln -sf libavformat-$(VERSION)$(SLIBSUF) $(prefix)/lib/libavformat$(SLIBSUF)
- 	ldconfig || true
- endif
- else
-diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/vhook/Makefile ./vhook/Makefile
---- ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/vhook/Makefile	Thu Jul  8 07:02:04 2004
-+++ ./vhook/Makefile	Sun Mar 20 23:48:11 2005
-@@ -5,22 +5,22 @@
- CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H
-
- ifeq ($(CONFIG_DARWIN),yes)
--SHFLAGS+=-flat_namespace -undefined suppress
-+SHFLAGS=-bundle -avoid-version -undefined define_a_way 
- endif
--HOOKS=null.so fish.so ppm.so
-+HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF)
- 
- ifeq ($(HAVE_IMLIB2),yes)
--    HOOKS += imlib2.so
-+    HOOKS += imlib2$(SLIBSUF)
- endif    
- 
- ifeq ($(HAVE_FREETYPE2),yes)
--    HOOKS += drawtext.so
-+    HOOKS += drawtext$(SLIBSUF)
-     CFLAGS += `freetype-config --cflags`
- endif    
- 
- all: $(HOOKS) 
- 
--SRCS := $(HOOKS:.so=.c)
-+SRCS := $(HOOKS:$(SLIBSUF)=.c)
- 
- depend: $(SRCS)
- 	$(CC) -MM $(CFLAGS) $^ 1>.depend
-@@ -29,17 +29,17 @@
- 	install -d "$(prefix)/lib/vhook"
- 	install -m 755 $(HOOKS) "$(prefix)/lib/vhook"
- 
--imlib2.so: imlib2.o
-+imlib2$(SLIBSUF): imlib2.o
- 	$(CC) -g -o $@ $(SHFLAGS) $< -lImlib2
- 
--drawtext.so: drawtext.o
-+drawtext$(SLIBSUF): drawtext.o
- 	$(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
- 
--%.so: %.o
-+%$(SLIBSUF): %.o
- 	$(CC) -g -o $@ $(SHFLAGS) $<
- 
- clean:
--	rm -f *.o *.d .depend *.so *~
-+	rm -f *.o *.d .depend *$(SLIBSUF) *~
- 
- ifneq ($(wildcard .depend),)
- include .depend
diff --git a/media-video/ffmpeg/files/gentoo-ffmpeg001.patch b/media-video/ffmpeg/files/gentoo-ffmpeg001.patch
deleted file mode 100644
index 30cd0edd31a7..000000000000
--- a/media-video/ffmpeg/files/gentoo-ffmpeg001.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libavcodec/a52dec.c.old	2005-02-28 10:23:54.002233360 +0900
-+++ libavcodec/a52dec.c	2005-02-28 10:35:36.910375080 +0900
-@@ -73,7 +73,7 @@
- {
-     void* f = dlsym(handle, symbol);
-     if (!f)
--	fprintf(stderr, "A52 Decoder - function '%s' can't be resolved\n", symbol);
-+	av_log(stderr, "A52 Decoder - function '%s' can't be resolved\n", symbol);
-     return f;
- }
- #endif
-@@ -86,7 +86,7 @@
-     s->handle = dlopen(liba52name, RTLD_LAZY);
-     if (!s->handle)
-     {
--	fprintf(stderr, "A52 library %s could not be opened! \n%s\n", liba52name, dlerror());
-+	av_log(stderr, "A52 library %s could not be opened! \n%s\n", liba52name, dlerror());
-         return -1;
-     }
-     s->a52_init = (a52_state_t* (*)(uint32_t)) dlsymm(s->handle, "a52_init");