Remove old (some with security bugs) versions of mplayer w/patches, in anticipation of naming scheme reboot

(Portage version: 2.1.2.12)

15 files changed, 10 insertions, 3583 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index bc2fb9b11887..440e60a1beaa 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.512 2007/08/28 14:23:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.513 2007/08/28 15:56:27 beandog Exp $
+
+  28 Aug 2007; Steve Dibb <beandog@gentoo.org>
+  -files/mplayer-1.0_rc1-asmrules.patch,
+  -files/mplayer-undefined-reference-fix.patch, -mplayer-1.0_rc1-r2.ebuild,
+  -mplayer-1.0.20070321.ebuild, -mplayer-1.0.20070321-r1.ebuild,
+  -mplayer-1.0.20070427.ebuild, -mplayer-1.0.20070622-r3.ebuild,
+  -mplayer-1.0.20070814.ebuild:
+  Remove old (some with security bugs) versions of mplayer w/patches, in
+  anticipation of naming scheme reboot
 
   28 Aug 2007; Steve Dibb <beandog@gentoo.org>
   mplayer-1.0.20070622-r4.ebuild:
diff --git a/media-video/mplayer/files/digest-mplayer-1.0.20070321 b/media-video/mplayer/files/digest-mplayer-1.0.20070321
deleted file mode 100644
index 8cac4a7078e1..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0.20070321
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 9b575d01f94f50dd4dcf570cd8a14dda 26104-510.zip 291836
-RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca 26104-510.zip 291836
-SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-510.zip 291836
-MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
-RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
-SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
-MD5 e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 222567
-RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb Blue-1.7.tar.bz2 222567
-SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8 Blue-1.7.tar.bz2 222567
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
-SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-RMD160 666697cd5efd9387057a898c714175e7c2aacbcd font-arial-iso-8859-1.tar.bz2 234242
-SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208
-SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208
-MD5 a589170a414a0daa5cdbef093fea1bd5 mplayer-1.0_rc2_pre20070321.tar.bz2 12985979
-RMD160 13715eb72303756c7aa2115daecde3570bcf13f5 mplayer-1.0_rc2_pre20070321.tar.bz2 12985979
-SHA256 98fe5747f5a5688243d9bc038aff9449dd6cb0c1bbacfe0d0ff0fc9d5a794c51 mplayer-1.0_rc2_pre20070321.tar.bz2 12985979
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/digest-mplayer-1.0.20070321-r1 b/media-video/mplayer/files/digest-mplayer-1.0.20070321-r1
deleted file mode 100644
index 83ecd2163c92..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0.20070321-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 9b575d01f94f50dd4dcf570cd8a14dda 26104-510.zip 291836
-RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca 26104-510.zip 291836
-SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-510.zip 291836
-MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
-RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
-SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
-MD5 e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 222567
-RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb Blue-1.7.tar.bz2 222567
-SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8 Blue-1.7.tar.bz2 222567
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
-SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-RMD160 666697cd5efd9387057a898c714175e7c2aacbcd font-arial-iso-8859-1.tar.bz2 234242
-SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208
-SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208
-MD5 3cd8cf7528e26a4cd66b5924c532c155 mplayer-20070321.tar.bz2 7416501
-RMD160 e85f22c6a90adddf93b2031fe57acb62c7865800 mplayer-20070321.tar.bz2 7416501
-SHA256 daadb6b5670e301601a74d3418f0e57195f4051fe4d9b78fdb73d148aa3c78cf mplayer-20070321.tar.bz2 7416501
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/digest-mplayer-1.0.20070427 b/media-video/mplayer/files/digest-mplayer-1.0.20070427
deleted file mode 100644
index 8db34aa4e897..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0.20070427
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 9b575d01f94f50dd4dcf570cd8a14dda 26104-510.zip 291836
-RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca 26104-510.zip 291836
-SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-510.zip 291836
-MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
-RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
-SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
-MD5 e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 222567
-RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb Blue-1.7.tar.bz2 222567
-SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8 Blue-1.7.tar.bz2 222567
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
-SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-RMD160 666697cd5efd9387057a898c714175e7c2aacbcd font-arial-iso-8859-1.tar.bz2 234242
-SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208
-SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208
-MD5 69e11fe679e32e2048ae9540b4299359 mplayer-20070427.tar.bz2 7480751
-RMD160 b9e96d8a55e3b73b443eeb9cd71979456e46938f mplayer-20070427.tar.bz2 7480751
-SHA256 481db033239063ea3bb5c6a5b7174e9b9c0da428cfdcb3bcecf18e35c4ef22e7 mplayer-20070427.tar.bz2 7480751
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/digest-mplayer-1.0.20070622-r3 b/media-video/mplayer/files/digest-mplayer-1.0.20070622-r3
deleted file mode 100644
index 0ce1a6e14aac..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0.20070622-r3
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 222567
-RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb Blue-1.7.tar.bz2 222567
-SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8 Blue-1.7.tar.bz2 222567
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
-SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-RMD160 666697cd5efd9387057a898c714175e7c2aacbcd font-arial-iso-8859-1.tar.bz2 234242
-SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208
-SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208
-MD5 a43c125563b07210e65c244af6c16604 mplayer-20070622.tar.bz2 7623148
-RMD160 637abb1d9bbe1791b29c2abf3b11f10e0729f912 mplayer-20070622.tar.bz2 7623148
-SHA256 982da74bfb397f77f093650efc254c0bc340dd58f34f7f9d8b8c9f9c8ce11e8e mplayer-20070622.tar.bz2 7623148
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/digest-mplayer-1.0.20070814 b/media-video/mplayer/files/digest-mplayer-1.0.20070814
deleted file mode 100644
index 32706886adf4..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0.20070814
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 222567
-RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb Blue-1.7.tar.bz2 222567
-SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8 Blue-1.7.tar.bz2 222567
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
-SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-RMD160 666697cd5efd9387057a898c714175e7c2aacbcd font-arial-iso-8859-1.tar.bz2 234242
-SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208
-SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208
-MD5 16b9ed4161bd2bdd0ea3e7f3abf16ad0 mplayer-20070814.tar.bz2 7702851
-RMD160 46555f1aca1a4ba5b75e154b68b62b01a439af1d mplayer-20070814.tar.bz2 7702851
-SHA256 fa892bfe5a303aed066616c344b926546a85d5e87e96bdccb3ff83225da50708 mplayer-20070814.tar.bz2 7702851
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_rc1-r2 b/media-video/mplayer/files/digest-mplayer-1.0_rc1-r2
deleted file mode 100644
index d6cc6192bc71..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_rc1-r2
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 9b575d01f94f50dd4dcf570cd8a14dda 26104-510.zip 291836
-RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca 26104-510.zip 291836
-SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-510.zip 291836
-MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
-RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
-SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
-MD5 e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 222567
-RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb Blue-1.7.tar.bz2 222567
-SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8 Blue-1.7.tar.bz2 222567
-MD5 18c05d88e22c3b815a43ca8d7152ccdc MPlayer-1.0rc1.tar.bz2 8414213
-RMD160 8cea02e832aec5d9e090829d61d0f131dcc177a2 MPlayer-1.0rc1.tar.bz2 8414213
-SHA256 8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063 MPlayer-1.0rc1.tar.bz2 8414213
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
-SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-RMD160 666697cd5efd9387057a898c714175e7c2aacbcd font-arial-iso-8859-1.tar.bz2 234242
-SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208
-SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/mplayer-1.0_rc1-asmrules.patch b/media-video/mplayer/files/mplayer-1.0_rc1-asmrules.patch
deleted file mode 100644
index 87bab25ce131..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_rc1-asmrules.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: stream/realrtsp/asmrp.c
-===================================================================
---- stream/realrtsp/asmrp.c	(revision 20381)
-+++ stream/realrtsp/asmrp.c	(working copy)
-@@ -40,6 +40,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include "asmrp.h"
- 
- /*
- #define LOG
-@@ -645,8 +646,10 @@
- #ifdef LOG
-       printf ("rule #%d is true\n", rule_num);
- #endif
--      matches[num_matches] = rule_num;
--      num_matches++;
-+      if(num_matches < MAX_RULEMATCHES - 1)
-+        matches[num_matches++] = rule_num;
-+      else
-+        printf("Ignoring matched asm rule %d, too many matched rules.\n", rule_num);
-     }
- 
-     rule_num++;
-Index: stream/realrtsp/real.c
-===================================================================
---- stream/realrtsp/real.c	(revision 20381)
-+++ stream/realrtsp/real.c	(working copy)
-@@ -271,7 +271,7 @@
-     int j=0;
-     int n;
-     char b[64];
--    int rulematches[16];
-+    int rulematches[MAX_RULEMATCHES];
- 
- #ifdef LOG
-     printf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth);
-Index: stream/realrtsp/asmrp.h
-===================================================================
---- stream/realrtsp/asmrp.h	(revision 20381)
-+++ stream/realrtsp/asmrp.h	(working copy)
-@@ -40,6 +40,8 @@
- #ifndef HAVE_ASMRP_H
- #define HAVE_ASMRP_H
- 
-+#define MAX_RULEMATCHES 16
-+
- int asmrp_match (const char *rules, int bandwidth, int *matches) ;
- 
- #endif
diff --git a/media-video/mplayer/files/mplayer-undefined-reference-fix.patch b/media-video/mplayer/files/mplayer-undefined-reference-fix.patch
deleted file mode 100644
index aaa866b26065..000000000000
--- a/media-video/mplayer/files/mplayer-undefined-reference-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mplayer/libvo/vo_yuv4mpeg.c.orig	2006-10-07 10:22:45.000000000 +0000
-+++ mplayer/libvo/vo_yuv4mpeg.c	2006-10-20 14:51:37.464890580 +0000
-@@ -41,6 +41,7 @@
- #include "fastmemcpy.h"
- #include "libswscale/swscale.h"
- #include "libmpcodecs/vf_scale.h"
-+#include "libswscale/rgb2rgb.h"
- 
- static vo_info_t info = 
- {
diff --git a/media-video/mplayer/mplayer-1.0.20070321-r1.ebuild b/media-video/mplayer/mplayer-1.0.20070321-r1.ebuild
deleted file mode 100644
index 0e17811a437d..000000000000
--- a/media-video/mplayer/mplayer-1.0.20070321-r1.ebuild
+++ /dev/null
@@ -1,572 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20070321-r1.ebuild,v 1.3 2007/07/12 02:40:43 mr_bones_ Exp $
-
-inherit eutils flag-o-matic multilib
-
-RESTRICT="strip"
-IUSE="3dnow 3dnowext a52 aac aalib alsa altivec amr arts bidi bl bindist cddb
-cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dvdnav
-dv dvdread enca encode esd fbcon ftp gif ggi gtk iconv ipv6 ivtv jack joystick
-jpeg libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 musepack nas
-unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl
-speex srt sse sse2 svga tga theora tivo truetype v4l v4l2 vidix win32codecs X
-x264 xanim xinerama xv xvid xvmc zoran"
-
-VIDEO_CARDS="s3virge mga tdfx vesa"
-
-for X in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${X}"
-done
-
-BLUV=1.7
-SVGV=1.9.17
-MY_PV="20070321"
-S="${WORKDIR}/${PN}-${MY_PV}"
-AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
-SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.bz2
-	!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-				 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-				 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	!iconv? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-			  mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-			  mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
-	amr? ( ${AMR_URI}/26_series/26.104/26104-510.zip
-		   ${AMR_URI}/26_series/26.204/26204-510.zip )"
-
-DESCRIPTION="Media Player for Linux "
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-RDEPEND="sys-libs/ncurses
-	!livecd? (
-		!bindist? (
-			x86? (
-				win32codecs? ( media-libs/win32codecs )
-				real? ( media-libs/win32codecs
-					media-video/realplayer )
-				)
-			amd64? ( real? ( media-libs/amd64codecs ) )
-		)
-	)
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	openal? ( media-libs/openal )
-	bidi? ( dev-libs/fribidi )
-	cdparanoia? ( media-sound/cdparanoia )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdts )
-	dv? ( media-libs/libdv )
-	dvb? ( media-tv/linuxtv-dvb-headers )
-	dvd? ( dvdnav? ( media-libs/libdvdnav ) )
-	encode? (
-		aac? ( media-libs/faac )
-		mp2? ( media-sound/twolame )
-		mp3? ( media-sound/lame )
-		)
-	esd? ( media-sound/esound )
-	enca? ( app-i18n/enca )
-	gif? ( media-libs/giflib )
-	ggi? ( media-libs/libggi )
-	gtk? ( media-libs/libpng
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-libs/libXi
-		=x11-libs/gtk+-2* )
-	jpeg? ( media-libs/jpeg )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-libs/libmpcdec-1.2.2 )
-	nas? ( media-libs/nas )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	pnm? ( media-libs/netpbm )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( >=media-libs/speex-1.1.7 )
-	srt? ( >=media-libs/freetype-2.1
-		media-libs/fontconfig )
-	svga? ( media-libs/svgalib )
-	theora? ( media-libs/libtheora )
-	live? ( >=media-plugins/live-2007.02.20 )
-	truetype? ( >=media-libs/freetype-2.1
-		media-libs/fontconfig )
-	vidix? ( x11-libs/libXxf86vm
-			 x11-libs/libXext )
-	x264? ( media-libs/x264-svn )
-	xanim? ( media-video/xanim )
-	xinerama? ( x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/libXext )
-	xv? ( x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		xvmc? ( x11-libs/libXvMC ) )
-	xvid? ( media-libs/xvid )
-	X? ( x11-libs/libXxf86vm
-		x11-libs/libXext
-		joystick? ( x11-drivers/xf86-input-joystick )
-	)"
-#	video_cards_vesa? ( sys-apps/vbetool ) restrict on x86 first
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( >=app-text/docbook-sgml-dtd-4.1.2
-		app-text/docbook-xml-dtd
-		>=app-text/docbook-xml-simple-dtd-1.50.0
-		dev-libs/libxslt
-	)
-	dga? ( x11-proto/xf86dgaproto )
-	xinerama? ( x11-proto/xineramaproto )
-	xv? ( x11-proto/videoproto
-		  x11-proto/xf86vidmodeproto )
-	gtk? ( x11-proto/xextproto
-		   x11-proto/xf86vidmodeproto )
-	X? ( x11-proto/xextproto
-		 x11-proto/xf86vidmodeproto )
-	iconv? ( virtual/libiconv )"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )
-	mp2? ( >=sys-apps/portage-2.1.2 )
-	ivtv? ( !x86-fbsd? ( <sys-kernel/linux-headers-2.6.20
-		media-tv/ivtv
-		>=sys-apps/portage-2.1.2 ) )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-pkg_setup() {
-
-	if [[ -n ${LINGUAS} ]]; then
-		elog "For MPlayer's language support, the configuration will"
-		elog "use your LINGUAS variable from /etc/make.conf.  If you have more"
-		elog "than one language enabled, then the first one in the list will"
-		elog "be used to output the messages, if a translation is available."
-		elog "man pages will be created for all languages where translations"
-		elog "are also available."
-	fi
-
-}
-
-src_unpack() {
-
-	unpack ${PN}-${MY_PV}.tar.bz2
-
-	if ! use truetype ; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-
-	use gtk && unpack Blue-${BLUV}.tar.bz2
-
-	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
-
-	use amr && unpack 26104-510.zip && unpack 26204-510.zip
-
-	# amr (float) support
-	if use amr; then
-		einfo "Including amr wide and narrow band (float) support ... "
-
-		# narrow band codec
-		mkdir ${S}/libavcodec/amr_float
-		cd ${S}/libavcodec/amr_float
-		unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
-		# wide band codec
-		mkdir ${S}/libavcodec/amrwb_float
-		cd ${S}/libavcodec/amrwb_float
-		unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
-	fi
-
-	cd ${S}
-
-	# Fix hppa compilation
-	use hppa && sed -i -e "s/-O4/-O1/" "${S}/configure"
-
-	if use svga; then
-		echo
-		einfo "Enabling vidix non-root mode."
-		einfo "(You need a proper svgalib_helper.o module for your kernel"
-		einfo " to actually use this)"
-		echo
-
-		mv ${WORKDIR}/svgalib_helper ${S}/libdha
-	fi
-
-	# Remove kernel-2.6 workaround as the problem it works around is
-	# fixed, and the workaround breaks sparc
-	# use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
-
-	# minor fix
-	# sed -i -e "s:-O4:-O4 -D__STDC_LIMIT_MACROS:" configure
-
-	# Fix XShape detection
-	epatch ${FILESDIR}/${PN}-xshape.patch
-
-}
-
-src_compile() {
-
-	local myconf=" --disable-tv-bsdbt848 \
-		--disable-faad-external \
-		--disable-libcdio"
-
-	# MPlayer reads in the LINGUAS variable from make.conf, and sets
-	# the languages accordingly.  Some will have to be altered to match
-	# upstream's naming scheme.
-	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS/da/dk}
-
-	################
-	#Optional features#
-	###############
-	use bidi || myconf="${myconf} --disable-fribidi"
-	use bl && myconf="${myconf} --enable-bl"
-	use cddb || myconf="${myconf} --disable-cddb"
-	use cdparanoia || myconf="${myconf} --disable-cdparanoia"
-	use enca || myconf="${myconf} --disable-enca"
-	use ftp || myconf="${myconf} --disable-ftp"
-	use tivo || myconf="${myconf} --disable-vstream"
-
-	# DVD support
-	# dvdread and libdvdcss are internal libs
-	# http://www.mplayerhq.hu/DOCS/HTML/en/dvd.html
-	# You can optionally use external dvdread support, but against
-	# upstream's suggestion.  We don't.
-	# dvdnav support is known to be buggy, but it is the only option
-	# for accessing some DVDs.
-	if use dvd; then
-		use dvdread || myconf="${myconf} --disable-dvdread"
-		use dvdnav || myconf="${myconf} --disable-dvdnav"
-	else
-		myconf="${myconf} --disable-dvdnav --disable-dvdread"
-	fi
-
-	if use encode; then
-		use aac || myconf="${myconf} --disable-faac"
-		use dv || myconf="${myconf} --disable-libdv"
-		use x264 || myconf="${myconf} --disable-x264"
-	else
-		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264 \
-			--disable-faac"
-	fi
-
-	# SRT (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	if ! use srt; then
-		myconf="${myconf} --disable-ass"
-		if ! use truetype; then
-			myconf="${myconf} --disable-freetype"
-			if ! use iconv; then
-				myconf="${myconf} --disable-iconv --charset=noconv"
-			fi
-		fi
-	fi
-	use iconv && use unicode && myconf="${myconf} --charset=UTF-8"
-
-	use lirc || myconf="${myconf} --disable-lirc --disable-lircc"
-	myconf="${myconf} $(use_enable joystick)"
-	use ipv6 || myconf="${myconf} --disable-inet6"
-	use rar || myconf="${myconf} --disable-unrarlib"
-	use rtc || myconf="${myconf} --disable-rtc"
-	use samba || myconf="${myconf} --disable-smb"
-
-	# DVB / Video4Linux / Radio support
-	if ( use dvb || use v4l || use v4l2 || use radio ); then
-		use dvb || myconf="${myconf} --disable-dvb --disable-dvbhead"
-		use v4l	|| myconf="${myconf} --disable-tv-v4l1"
-		use v4l2 || myconf="${myconf} --disable-tv-v4l2"
-		if ( use dvb || use v4l || use v4l2 ) && use radio; then
-			myconf="${myconf} --enable-radio $(use_enable encode radio-capture)"
-		else
-			myconf="${myconf} --disable-radio-v4l2 --disable-radio-bsdbt848"
-		fi
-	else
-		myconf="${myconf} --disable-tv --disable-tv-v4l1 --disable-tv-v4l2 \
-			--disable-radio --disable-radio-v4l2 --disable-radio-bsdbt848 \
-			--disable-dvb --disable-dvbhead"
-	fi
-
-	# disable PVR support
-	# The build will break if you have media-tv/ivtv installed and
-	# linux-headers != 2.6.18, which is currently not keyworded
-	# See also, bug 164748
-	myconf="${myconf} --disable-pvr"
-
-	#########
-	# Codecs #
-	########
-	for x in gif jpeg live mad musepack pnm speex tga theora xanim xvid; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	use aac || myconf="${myconf} --disable-faad-internal"
-	use a52 || myconf="${myconf} --disable-liba52"
-	use dts || myconf="${myconf} --disable-libdts"
-	! use png && ! use gtk && myconf="${myconf} --disable-png"
-	use lzo || myconf="${myconf} --disable-liblzo"
-	use encode && use mp2 || myconf="${myconf} --disable-twolame \
-		--disable-toolame"
-	use mp3 || myconf="${myconf} --disable-mp3lib"
-	use quicktime || myconf="${myconf} --disable-qtx"
-	use vorbis || myconf="${myconf} --disable-libvorbis"
-	use xanim && myconf="${myconf} --xanimcodecsdir=/usr/lib/xanim/mods"
-	if use x86 || use amd64; then
-		# Real codec support, only available on x86, amd64
-		if use real && use x86; then
-			myconf="${myconf} --realcodecsdir=/opt/RealPlayer/codecs"
-		elif use real && use amd64; then
-			myconf="${myconf} --realcodecsdir=/usr/$(get_libdir)/codecs"
-		else
-			myconf="${myconf} --disable-real"
-		fi
-		if ! use livecd && ! use bindist && ! use real; then
-			myconf="${myconf} $(use_enable win32codecs win32dll)"
-		fi
-	fi
-
-	#############
-	# Video Output #
-	#############
-
-	for x in directfb ivtv ggi md5sum sdl xinerama; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	use aalib || myconf="${myconf} --disable-aa"
-	use fbcon || myconf="${myconf} --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf="${myconf} --enable-s3fb"
-	use libcaca || myconf="${myconf} --disable-caca"
-	use opengl || myconf="${myconf} --disable-gl"
-	use video_cards_mga || myconf="${myconf} --disable-mga"
-	( use X && use video_cards_mga ) || myconf="${myconf} --disable-xmga"
-	use video_cards_vesa || myconf="${myconf} --disable-vesa"
-	use vidix || myconf="${myconf} --disable-vidix-internal \
-		--disable-vidix-external"
-	use zoran || myconf="${myconf} --disable-zr"
-
-	# GTK gmplayer gui
-	myconf="${myconf} $(use_enable gtk gui)"
-
-	if use xv; then
-		if use xvmc; then
-			myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCW"
-		else
-			myconf="${myconf} --disable-xvmc"
-		fi
-	else
-		myconf="${myconf} --disable-xv --disable-xvmc"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf="${myconf} $(use_enable video_cards_tdfx tdfxvid) \
-			$(use_enable fbcon tdfxfb)"
-	else
-		myconf="${myconf} --disable-3dfx --disable-tdfxvid --disable-tdfxfb"
-	fi
-
-	#############
-	# Audio Output #
-	#############
-	for x in alsa arts esd jack nas openal; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	if ! use radio; then
-		use oss || myconf="${myconf} --disable-ossaudio"
-	fi
-
-	#################
-	# Advanced Options #
-	#################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	if use x86 || use amd64 || use ppc; then
-		if use cpudetection || use livecd || use bindist; then
-			myconf="${myconf} --enable-runtime-cpudetection"
-		fi
-	fi
-	if use mmx; then
-		for x in 3dnow 3dnowext mmxext sse sse2; do
-			use ${x} || myconf="${myconf} --disable-${x}"
-		done
-	else
-		myconf="${myconf} --disable-mmx --disable-mmxext --disable-sse \
-		--disable-sse2 --disable-3dnow --disable-3dnowext"
-	fi
-	use debug && myconf="${myconf} --enable-debug=3"
-
-	if use ppc64 && use altivec; then
-		myconf="${myconf} --enable-altivec"
-		append-flags -maltivec -mabi=altivec
-	else
-		myconf="${myconf} --disable-altivec"
-	fi
-
-	if [ -e /dev/.devfsd ]; then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	#leave this in place till the configure/compilation borkage is completely corrected back to pre4-r4 levels.
-	# it's intended for debugging so we can get the options we configure mplayer w/, rather then hunt about.
-	# it *will* be removed asap; in the meantime, doesn't hurt anything.
-	echo "${myconf}" > ${T}/configure-options
-
-	if use custom-cflags; then
-		# let's play the filtration game!  MPlayer hates on all!
-		strip-flags
-		# ugly optimizations cause MPlayer to cry on x86 systems!
-			if use x86 ; then
-				replace-flags -O* -O2
-				filter-flags -fPIC -fPIE
-				use debug || append-flags -fomit-frame-pointer
-			fi
-		append-flags -D__STDC_LIMIT_MACROS
-	else
-		unset CFLAGS CXXFLAGS
-	fi
-
-	myconf="--cc=$(tc-getCC) \
-		--host-cc=$(tc-getBUILD_CC) \
-		--prefix=/usr \
-		--confdir=/etc/mplayer \
-		--datadir=/usr/share/mplayer \
-		--libdir=/usr/$(get_libdir) \
-		--enable-largefiles \
-		--enable-menu \
-		--enable-network \
-		${myconf}"
-	einfo "Running ./configure"
-	echo "CFLAGS=\"${CFLAGS}\" ./configure ${myconf}"
-	CFLAGS="${CFLAGS}" ./configure ${myconf} || die
-
-	# we run into problems if -jN > -j1
-	# see #86245
-	# This should have long ago been fixed, commenting out
-	#MAKEOPTS="${MAKEOPTS} -j1"
-
-	einfo "Make"
-	emake || die "Failed to build MPlayer!"
-	use doc && make -C DOCS/xml html-chunked
-	einfo "Make completed"
-}
-
-src_install() {
-
-	einfo "Make install"
-	make prefix=${D}/usr \
-		 BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/$(get_libdir) \
-		 CONFDIR=${D}/etc/mplayer \
-		 DATADIR=${D}/usr/share/mplayer \
-		 MANDIR=${D}/usr/share/man \
-		 install || die "Failed to install MPlayer!"
-	einfo "Make install completed"
-
-	dodoc AUTHORS Changelog README
-	# Install the documentation; DOCS is all mixed up not just html
-	if use doc ; then
-		find "${S}/DOCS" -type d | xargs -- chmod 0755
-		find "${S}/DOCS" -type f | xargs -- chmod 0644
-		cp -r "${S}/DOCS" "${D}/usr/share/doc/${PF}/" || die
-	fi
-
-	# Copy misc tools to documentation path, as they're not installed directly
-	# and yes, we are nuking the +x bit.
-	find "${S}/TOOLS" -type d | xargs -- chmod 0755
-	find "${S}/TOOLS" -type f | xargs -- chmod 0644
-	cp -r "${S}/TOOLS" "${D}/usr/share/doc/${PF}/" || die
-
-	# Install the default Skin and Gnome menu entry
-	if use gtk; then
-		dodir /usr/share/mplayer/skins
-		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/skins/default || die
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym mplayer /usr/bin/gmplayer
-
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/applications
-		doins ${FILESDIR}/mplayer.desktop
-	fi
-
-	if ! use srt && ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		local x=
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for x in $(find ${WORKDIR}/ -type d -name 'font-arial-*')
-		do
-			cp -pPR ${x} ${D}/usr/share/mplayer/fonts
-		done
-		# Fix the font symlink ...
-		rm -rf ${D}/usr/share/mplayer/font
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins ${S}/etc/example.conf mplayer.conf
-
-	if use srt || use truetype;	then
-		cat >> ${D}/etc/mplayer/mplayer.conf << EOT
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-EOT
-	fi
-
-	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	#mv the midentify script to /usr/bin for emovix.
-	#cp ${D}/usr/share/doc/${PF}/TOOLS/midentify ${D}/usr/bin
-	#chmod a+x ${D}/usr/bin/midentify
-	dobin ${D}/usr/share/doc/${PF}/TOOLS/midentify
-
-	insinto /usr/share/mplayer
-	doins ${S}/etc/input.conf
-	doins ${S}/etc/menu.conf
-}
-
-pkg_preinst() {
-
-	if [ -d "${ROOT}/usr/share/mplayer/Skin/default" ]
-	then
-		rm -rf ${ROOT}/usr/share/mplayer/Skin/default
-	fi
-}
-
-pkg_postinst() {
-
-	if use video_cards_mga; then
-		depmod -a &>/dev/null || :
-	fi
-
-	if use dvdnav && use dvd; then
-		ewarn "'dvdnav' support in MPlayer is known to be buggy, and will"
-		ewarn "break if you are using it in GUI mode.  It is only"
-		ewarn "included because some DVDs will only play with this feature."
-		ewarn "If using it for playback only (and not menu navigation),"
-		ewarn "specify the track # with your options."
-		ewarn "mplayer dvdnav://1"
-	fi
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a \
-		 ! -e ${ROOT}/usr/share/mplayer/font ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
-		 ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}
diff --git a/media-video/mplayer/mplayer-1.0.20070321.ebuild b/media-video/mplayer/mplayer-1.0.20070321.ebuild
deleted file mode 100644
index c13b87e60fb3..000000000000
--- a/media-video/mplayer/mplayer-1.0.20070321.ebuild
+++ /dev/null
@@ -1,572 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20070321.ebuild,v 1.11 2007/07/12 02:40:43 mr_bones_ Exp $
-
-inherit eutils flag-o-matic multilib
-
-RESTRICT="strip"
-IUSE="3dnow 3dnowext a52 aac aalib alsa altivec amr arts bidi bl bindist cddb
-cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dvdnav
-dv dvdread enca encode esd fbcon ftp gif ggi gtk iconv ipv6 ivtv jack joystick
-jpeg libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 musepack nas
-unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl
-speex srt sse sse2 svga tga theora tivo truetype v4l v4l2 vidix win32codecs X
-x264 xanim xinerama xv xvid xvmc zoran"
-
-VIDEO_CARDS="s3virge mga tdfx vesa"
-
-for X in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${X}"
-done
-
-BLUV=1.7
-SVGV=1.9.17
-MY_PV="1.0_rc2_pre20070321"
-S="${WORKDIR}/${PN}"
-AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
-SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.bz2
-	!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-				 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-				 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	!iconv? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-			  mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-			  mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
-	amr? ( ${AMR_URI}/26_series/26.104/26104-510.zip
-		   ${AMR_URI}/26_series/26.204/26204-510.zip )"
-
-DESCRIPTION="Media Player for Linux "
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-RDEPEND="sys-libs/ncurses
-	!livecd? (
-		!bindist? (
-			x86? (
-				win32codecs? ( media-libs/win32codecs )
-				real? ( media-libs/win32codecs
-					media-video/realplayer )
-				)
-			amd64? ( real? ( media-libs/amd64codecs ) )
-		)
-	)
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	openal? ( media-libs/openal )
-	bidi? ( dev-libs/fribidi )
-	cdparanoia? ( media-sound/cdparanoia )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdts )
-	dv? ( media-libs/libdv )
-	dvb? ( media-tv/linuxtv-dvb-headers )
-	dvd? ( dvdnav? ( media-libs/libdvdnav ) )
-	encode? (
-		aac? ( media-libs/faac )
-		mp2? ( media-sound/twolame )
-		mp3? ( media-sound/lame )
-		)
-	esd? ( media-sound/esound )
-	enca? ( app-i18n/enca )
-	gif? ( media-libs/giflib )
-	ggi? ( media-libs/libggi )
-	gtk? ( media-libs/libpng
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-libs/libXi
-		=x11-libs/gtk+-2* )
-	jpeg? ( media-libs/jpeg )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-libs/libmpcdec-1.2.2 )
-	nas? ( media-libs/nas )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	pnm? ( media-libs/netpbm )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( >=media-libs/speex-1.1.7 )
-	srt? ( >=media-libs/freetype-2.1
-		media-libs/fontconfig )
-	svga? ( media-libs/svgalib )
-	theora? ( media-libs/libtheora )
-	live? ( >=media-plugins/live-2007.02.20 )
-	truetype? ( >=media-libs/freetype-2.1
-		media-libs/fontconfig )
-	vidix? ( x11-libs/libXxf86vm
-			 x11-libs/libXext )
-	x264? ( media-libs/x264-svn )
-	xanim? ( media-video/xanim )
-	xinerama? ( x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/libXext )
-	xv? ( x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		xvmc? ( x11-libs/libXvMC ) )
-	xvid? ( media-libs/xvid )
-	X? ( x11-libs/libXxf86vm
-		x11-libs/libXext
-		joystick? ( x11-drivers/xf86-input-joystick )
-	)"
-#	video_cards_vesa? ( sys-apps/vbetool ) restrict on x86 first
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( >=app-text/docbook-sgml-dtd-4.1.2
-		app-text/docbook-xml-dtd
-		>=app-text/docbook-xml-simple-dtd-1.50.0
-		dev-libs/libxslt
-	)
-	dga? ( x11-proto/xf86dgaproto )
-	xinerama? ( x11-proto/xineramaproto )
-	xv? ( x11-proto/videoproto
-		  x11-proto/xf86vidmodeproto )
-	gtk? ( x11-proto/xextproto
-		   x11-proto/xf86vidmodeproto )
-	X? ( x11-proto/xextproto
-		 x11-proto/xf86vidmodeproto )
-	iconv? ( virtual/libiconv )"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )
-	mp2? ( >=sys-apps/portage-2.1.2 )
-	ivtv? ( !x86-fbsd? ( <sys-kernel/linux-headers-2.6.20
-		media-tv/ivtv
-		>=sys-apps/portage-2.1.2 ) )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-pkg_setup() {
-
-	if [[ -n ${LINGUAS} ]]; then
-		elog "For MPlayer's language support, the configuration will"
-		elog "use your LINGUAS variable from /etc/make.conf.  If you have more"
-		elog "than one language enabled, then the first one in the list will"
-		elog "be used to output the messages, if a translation is available."
-		elog "man pages will be created for all languages where translations"
-		elog "are also available."
-	fi
-
-}
-
-src_unpack() {
-
-	unpack ${PN}-${MY_PV}.tar.bz2
-
-	if ! use truetype ; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-
-	use gtk && unpack Blue-${BLUV}.tar.bz2
-
-	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
-
-	use amr && unpack 26104-510.zip && unpack 26204-510.zip
-
-	# amr (float) support
-	if use amr; then
-		einfo "Including amr wide and narrow band (float) support ... "
-
-		# narrow band codec
-		mkdir ${S}/libavcodec/amr_float
-		cd ${S}/libavcodec/amr_float
-		unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
-		# wide band codec
-		mkdir ${S}/libavcodec/amrwb_float
-		cd ${S}/libavcodec/amrwb_float
-		unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
-	fi
-
-	cd ${S}
-
-	# Fix hppa compilation
-	use hppa && sed -i -e "s/-O4/-O1/" "${S}/configure"
-
-	if use svga; then
-		echo
-		einfo "Enabling vidix non-root mode."
-		einfo "(You need a proper svgalib_helper.o module for your kernel"
-		einfo " to actually use this)"
-		echo
-
-		mv ${WORKDIR}/svgalib_helper ${S}/libdha
-	fi
-
-	# Remove kernel-2.6 workaround as the problem it works around is
-	# fixed, and the workaround breaks sparc
-	# use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
-
-	# minor fix
-	# sed -i -e "s:-O4:-O4 -D__STDC_LIMIT_MACROS:" configure
-
-	# Fix XShape detection
-	epatch ${FILESDIR}/${PN}-xshape.patch
-
-}
-
-src_compile() {
-
-	local myconf=" --disable-tv-bsdbt848 \
-		--disable-faad-external \
-		--disable-libcdio"
-
-	# MPlayer reads in the LINGUAS variable from make.conf, and sets
-	# the languages accordingly.  Some will have to be altered to match
-	# upstream's naming scheme.
-	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS/da/dk}
-
-	################
-	#Optional features#
-	###############
-	use bidi || myconf="${myconf} --disable-fribidi"
-	use bl && myconf="${myconf} --enable-bl"
-	use cddb || myconf="${myconf} --disable-cddb"
-	use cdparanoia || myconf="${myconf} --disable-cdparanoia"
-	use enca || myconf="${myconf} --disable-enca"
-	use ftp || myconf="${myconf} --disable-ftp"
-	use tivo || myconf="${myconf} --disable-vstream"
-
-	# DVD support
-	# dvdread and libdvdcss are internal libs
-	# http://www.mplayerhq.hu/DOCS/HTML/en/dvd.html
-	# You can optionally use external dvdread support, but against
-	# upstream's suggestion.  We don't.
-	# dvdnav support is known to be buggy, but it is the only option
-	# for accessing some DVDs.
-	if use dvd; then
-		use dvdread || myconf="${myconf} --disable-dvdread"
-		use dvdnav || myconf="${myconf} --disable-dvdnav"
-	else
-		myconf="${myconf} --disable-dvdnav --disable-dvdread"
-	fi
-
-	if use encode; then
-		use aac || myconf="${myconf} --disable-faac"
-		use dv || myconf="${myconf} --disable-libdv"
-		use x264 || myconf="${myconf} --disable-x264"
-	else
-		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264 \
-			--disable-faac"
-	fi
-
-	# SRT (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	if ! use srt; then
-		myconf="${myconf} --disable-ass"
-		if ! use truetype; then
-			myconf="${myconf} --disable-freetype"
-			if ! use iconv; then
-				myconf="${myconf} --disable-iconv --charset=noconv"
-			fi
-		fi
-	fi
-	use iconv && use unicode && myconf="${myconf} --charset=UTF-8"
-
-	use lirc || myconf="${myconf} --disable-lirc --disable-lircc"
-	myconf="${myconf} $(use_enable joystick)"
-	use ipv6 || myconf="${myconf} --disable-inet6"
-	use rar || myconf="${myconf} --disable-unrarlib"
-	use rtc || myconf="${myconf} --disable-rtc"
-	use samba || myconf="${myconf} --disable-smb"
-
-	# DVB / Video4Linux / Radio support
-	if ( use dvb || use v4l || use v4l2 || use radio ); then
-		use dvb || myconf="${myconf} --disable-dvb --disable-dvbhead"
-		use v4l	|| myconf="${myconf} --disable-tv-v4l1"
-		use v4l2 || myconf="${myconf} --disable-tv-v4l2"
-		if ( use dvb || use v4l || use v4l2 ) && use radio; then
-			myconf="${myconf} --enable-radio $(use_enable encode radio-capture)"
-		else
-			myconf="${myconf} --disable-radio-v4l2 --disable-radio-bsdbt848"
-		fi
-	else
-		myconf="${myconf} --disable-tv --disable-tv-v4l1 --disable-tv-v4l2 \
-			--disable-radio --disable-radio-v4l2 --disable-radio-bsdbt848 \
-			--disable-dvb --disable-dvbhead"
-	fi
-
-	# disable PVR support
-	# The build will break if you have media-tv/ivtv installed and
-	# linux-headers != 2.6.18, which is currently not keyworded
-	# See also, bug 164748
-	myconf="${myconf} --disable-pvr"
-
-	#########
-	# Codecs #
-	########
-	for x in gif jpeg live mad musepack pnm speex tga theora xanim xvid; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	use aac || myconf="${myconf} --disable-faad-internal"
-	use a52 || myconf="${myconf} --disable-liba52"
-	use dts || myconf="${myconf} --disable-libdts"
-	! use png && ! use gtk && myconf="${myconf} --disable-png"
-	use lzo || myconf="${myconf} --disable-liblzo"
-	use encode && use mp2 || myconf="${myconf} --disable-twolame \
-		--disable-toolame"
-	use mp3 || myconf="${myconf} --disable-mp3lib"
-	use quicktime || myconf="${myconf} --disable-qtx"
-	use vorbis || myconf="${myconf} --disable-libvorbis"
-	use xanim && myconf="${myconf} --xanimcodecsdir=/usr/lib/xanim/mods"
-	if use x86 || use amd64; then
-		# Real codec support, only available on x86, amd64
-		if use real && use x86; then
-			myconf="${myconf} --realcodecsdir=/opt/RealPlayer/codecs"
-		elif use real && use amd64; then
-			myconf="${myconf} --realcodecsdir=/usr/$(get_libdir)/codecs"
-		else
-			myconf="${myconf} --disable-real"
-		fi
-		if ! use livecd && ! use bindist && ! use real; then
-			myconf="${myconf} $(use_enable win32codecs win32dll)"
-		fi
-	fi
-
-	#############
-	# Video Output #
-	#############
-
-	for x in directfb ivtv ggi md5sum sdl xinerama; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	use aalib || myconf="${myconf} --disable-aa"
-	use fbcon || myconf="${myconf} --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf="${myconf} --enable-s3fb"
-	use libcaca || myconf="${myconf} --disable-caca"
-	use opengl || myconf="${myconf} --disable-gl"
-	use video_cards_mga || myconf="${myconf} --disable-mga"
-	( use X && use video_cards_mga ) || myconf="${myconf} --disable-xmga"
-	use video_cards_vesa || myconf="${myconf} --disable-vesa"
-	use vidix || myconf="${myconf} --disable-vidix-internal \
-		--disable-vidix-external"
-	use zoran || myconf="${myconf} --disable-zr"
-
-	# GTK gmplayer gui
-	myconf="${myconf} $(use_enable gtk gui)"
-
-	if use xv; then
-		if use xvmc; then
-			myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCW"
-		else
-			myconf="${myconf} --disable-xvmc"
-		fi
-	else
-		myconf="${myconf} --disable-xv --disable-xvmc"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf="${myconf} $(use_enable video_cards_tdfx tdfxvid) \
-			$(use_enable fbcon tdfxfb)"
-	else
-		myconf="${myconf} --disable-3dfx --disable-tdfxvid --disable-tdfxfb"
-	fi
-
-	#############
-	# Audio Output #
-	#############
-	for x in alsa arts esd jack nas openal; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	if ! use radio; then
-		use oss || myconf="${myconf} --disable-ossaudio"
-	fi
-
-	#################
-	# Advanced Options #
-	#################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	if use x86 || use amd64 || use ppc; then
-		if use cpudetection || use livecd || use bindist; then
-			myconf="${myconf} --enable-runtime-cpudetection"
-		fi
-	fi
-	if use mmx; then
-		for x in 3dnow 3dnowext mmxext sse sse2; do
-			use ${x} || myconf="${myconf} --disable-${x}"
-		done
-	else
-		myconf="${myconf} --disable-mmx --disable-mmxext --disable-sse \
-		--disable-sse2 --disable-3dnow --disable-3dnowext"
-	fi
-	use debug && myconf="${myconf} --enable-debug=3"
-
-	if use ppc64 && use altivec; then
-		myconf="${myconf} --enable-altivec"
-		append-flags -maltivec -mabi=altivec
-	else
-		myconf="${myconf} --disable-altivec"
-	fi
-
-	if [ -e /dev/.devfsd ]; then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	#leave this in place till the configure/compilation borkage is completely corrected back to pre4-r4 levels.
-	# it's intended for debugging so we can get the options we configure mplayer w/, rather then hunt about.
-	# it *will* be removed asap; in the meantime, doesn't hurt anything.
-	echo "${myconf}" > ${T}/configure-options
-
-	if use custom-cflags; then
-		# let's play the filtration game!  MPlayer hates on all!
-		strip-flags
-		# ugly optimizations cause MPlayer to cry on x86 systems!
-			if use x86 ; then
-				replace-flags -O* -O2
-				filter-flags -fPIC -fPIE
-				use debug || append-flags -fomit-frame-pointer
-			fi
-		append-flags -D__STDC_LIMIT_MACROS
-	else
-		unset CFLAGS CXXFLAGS
-	fi
-
-	myconf="--cc=$(tc-getCC) \
-		--host-cc=$(tc-getBUILD_CC) \
-		--prefix=/usr \
-		--confdir=/etc/mplayer \
-		--datadir=/usr/share/mplayer \
-		--libdir=/usr/$(get_libdir) \
-		--enable-largefiles \
-		--enable-menu \
-		--enable-network \
-		${myconf}"
-	einfo "Running ./configure"
-	echo "CFLAGS=\"${CFLAGS}\" ./configure ${myconf}"
-	CFLAGS="${CFLAGS}" ./configure ${myconf} || die
-
-	# we run into problems if -jN > -j1
-	# see #86245
-	# This should have long ago been fixed, commenting out
-	#MAKEOPTS="${MAKEOPTS} -j1"
-
-	einfo "Make"
-	emake || die "Failed to build MPlayer!"
-	use doc && make -C DOCS/xml html-chunked
-	einfo "Make completed"
-}
-
-src_install() {
-
-	einfo "Make install"
-	make prefix=${D}/usr \
-		 BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/$(get_libdir) \
-		 CONFDIR=${D}/etc/mplayer \
-		 DATADIR=${D}/usr/share/mplayer \
-		 MANDIR=${D}/usr/share/man \
-		 install || die "Failed to install MPlayer!"
-	einfo "Make install completed"
-
-	dodoc AUTHORS Changelog README
-	# Install the documentation; DOCS is all mixed up not just html
-	if use doc ; then
-		find "${S}/DOCS" -type d | xargs -- chmod 0755
-		find "${S}/DOCS" -type f | xargs -- chmod 0644
-		cp -r "${S}/DOCS" "${D}/usr/share/doc/${PF}/" || die
-	fi
-
-	# Copy misc tools to documentation path, as they're not installed directly
-	# and yes, we are nuking the +x bit.
-	find "${S}/TOOLS" -type d | xargs -- chmod 0755
-	find "${S}/TOOLS" -type f | xargs -- chmod 0644
-	cp -r "${S}/TOOLS" "${D}/usr/share/doc/${PF}/" || die
-
-	# Install the default Skin and Gnome menu entry
-	if use gtk; then
-		dodir /usr/share/mplayer/skins
-		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/skins/default || die
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym mplayer /usr/bin/gmplayer
-
-		insinto /usr/share/pixmaps
-		newins ${D}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/applications
-		doins ${FILESDIR}/mplayer.desktop
-	fi
-
-	if ! use srt && ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		local x=
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for x in $(find ${WORKDIR}/ -type d -name 'font-arial-*')
-		do
-			cp -pPR ${x} ${D}/usr/share/mplayer/fonts
-		done
-		# Fix the font symlink ...
-		rm -rf ${D}/usr/share/mplayer/font
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins ${S}/etc/example.conf mplayer.conf
-
-	if use srt || use truetype;	then
-		cat >> ${D}/etc/mplayer/mplayer.conf << EOT
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-EOT
-	fi
-
-	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	#mv the midentify script to /usr/bin for emovix.
-	#cp ${D}/usr/share/doc/${PF}/TOOLS/midentify ${D}/usr/bin
-	#chmod a+x ${D}/usr/bin/midentify
-	dobin ${D}/usr/share/doc/${PF}/TOOLS/midentify
-
-	insinto /usr/share/mplayer
-	doins ${S}/etc/input.conf
-	doins ${S}/etc/menu.conf
-}
-
-pkg_preinst() {
-
-	if [ -d "${ROOT}/usr/share/mplayer/Skin/default" ]
-	then
-		rm -rf ${ROOT}/usr/share/mplayer/Skin/default
-	fi
-}
-
-pkg_postinst() {
-
-	if use video_cards_mga; then
-		depmod -a &>/dev/null || :
-	fi
-
-	if use dvdnav && use dvd; then
-		ewarn "'dvdnav' support in MPlayer is known to be buggy, and will"
-		ewarn "break if you are using it in GUI mode.  It is only"
-		ewarn "included because some DVDs will only play with this feature."
-		ewarn "If using it for playback only (and not menu navigation),"
-		ewarn "specify the track # with your options."
-		ewarn "mplayer dvdnav://1"
-	fi
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a \
-		 ! -e ${ROOT}/usr/share/mplayer/font ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
-		 ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}
diff --git a/media-video/mplayer/mplayer-1.0.20070427.ebuild b/media-video/mplayer/mplayer-1.0.20070427.ebuild
deleted file mode 100644
index 09efbcde3bb8..000000000000
--- a/media-video/mplayer/mplayer-1.0.20070427.ebuild
+++ /dev/null
@@ -1,571 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20070427.ebuild,v 1.5 2007/07/12 02:40:43 mr_bones_ Exp $
-
-inherit eutils flag-o-matic multilib
-
-RESTRICT="strip"
-IUSE="3dnow 3dnowext a52 aac aalib alsa altivec amr arts bidi bl bindist cddb
-cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dvdnav
-dv dvdread enca encode esd fbcon ftp gif ggi gtk iconv ipv6 ivtv jack joystick
-jpeg libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 musepack nas
-unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl
-speex srt sse sse2 svga tga theora tivo truetype v4l v4l2 vidix win32codecs X
-x264 xanim xinerama xv xvid xvmc zoran"
-
-VIDEO_CARDS="s3virge mga tdfx vesa"
-
-for X in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${X}"
-done
-
-BLUV=1.7
-SVGV=1.9.17
-MY_PV="20070427"
-S="${WORKDIR}/${PN}-${MY_PV}"
-AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
-SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.bz2
-	!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-				 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-				 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	!iconv? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-			  mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-			  mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
-	amr? ( ${AMR_URI}/26_series/26.104/26104-510.zip
-		   ${AMR_URI}/26_series/26.204/26204-510.zip )"
-
-DESCRIPTION="Media Player for Linux "
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-RDEPEND="sys-libs/ncurses
-	!livecd? (
-		!bindist? (
-			x86? (
-				win32codecs? ( media-libs/win32codecs )
-				real? ( media-libs/win32codecs
-					media-video/realplayer )
-				)
-			amd64? ( real? ( media-libs/amd64codecs ) )
-		)
-	)
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	openal? ( media-libs/openal )
-	bidi? ( dev-libs/fribidi )
-	cdparanoia? ( media-sound/cdparanoia )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdts )
-	dv? ( media-libs/libdv )
-	dvb? ( media-tv/linuxtv-dvb-headers )
-	dvd? ( dvdnav? ( media-libs/libdvdnav ) )
-	encode? (
-		aac? ( media-libs/faac )
-		mp2? ( media-sound/twolame )
-		mp3? ( media-sound/lame )
-		)
-	esd? ( media-sound/esound )
-	enca? ( app-i18n/enca )
-	gif? ( media-libs/giflib )
-	ggi? ( media-libs/libggi )
-	gtk? ( media-libs/libpng
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-libs/libXi
-		=x11-libs/gtk+-2* )
-	jpeg? ( media-libs/jpeg )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-libs/libmpcdec-1.2.2 )
-	nas? ( media-libs/nas )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	pnm? ( media-libs/netpbm )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( >=media-libs/speex-1.1.7 )
-	srt? ( >=media-libs/freetype-2.1
-		media-libs/fontconfig )
-	svga? ( media-libs/svgalib )
-	theora? ( media-libs/libtheora )
-	live? ( >=media-plugins/live-2007.02.20 )
-	truetype? ( >=media-libs/freetype-2.1
-		media-libs/fontconfig )
-	vidix? ( x11-libs/libXxf86vm
-			 x11-libs/libXext )
-	x264? ( media-libs/x264-svn )
-	xanim? ( media-video/xanim )
-	xinerama? ( x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/libXext )
-	xv? ( x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		xvmc? ( x11-libs/libXvMC ) )
-	xvid? ( media-libs/xvid )
-	X? ( x11-libs/libXxf86vm
-		x11-libs/libXext
-		joystick? ( x11-drivers/xf86-input-joystick )
-	)"
-#	video_cards_vesa? ( sys-apps/vbetool ) restrict on x86 first
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( >=app-text/docbook-sgml-dtd-4.1.2
-		app-text/docbook-xml-dtd
-		>=app-text/docbook-xml-simple-dtd-1.50.0
-		dev-libs/libxslt
-	)
-	dga? ( x11-proto/xf86dgaproto )
-	xinerama? ( x11-proto/xineramaproto )
-	xv? ( x11-proto/videoproto
-		  x11-proto/xf86vidmodeproto )
-	gtk? ( x11-proto/xextproto
-		   x11-proto/xf86vidmodeproto )
-	X? ( x11-proto/xextproto
-		 x11-proto/xf86vidmodeproto )
-	iconv? ( virtual/libiconv )"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )
-	mp2? ( >=sys-apps/portage-2.1.2 )
-	ivtv? ( !x86-fbsd? ( <sys-kernel/linux-headers-2.6.20
-		media-tv/ivtv
-		>=sys-apps/portage-2.1.2 ) )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-pkg_setup() {
-
-	if [[ -n ${LINGUAS} ]]; then
-		elog "For MPlayer's language support, the configuration will"
-		elog "use your LINGUAS variable from /etc/make.conf.  If you have more"
-		elog "than one language enabled, then the first one in the list will"
-		elog "be used to output the messages, if a translation is available."
-		elog "man pages will be created for all languages where translations"
-		elog "are also available."
-	fi
-
-}
-
-src_unpack() {
-
-	unpack ${PN}-${MY_PV}.tar.bz2
-
-	if ! use truetype ; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-
-	use gtk && unpack Blue-${BLUV}.tar.bz2
-
-	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
-
-	use amr && unpack 26104-510.zip && unpack 26204-510.zip
-
-	# amr (float) support
-	if use amr; then
-		einfo "Including amr wide and narrow band (float) support ... "
-
-		# narrow band codec
-		mkdir ${S}/libavcodec/amr_float
-		cd ${S}/libavcodec/amr_float
-		unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
-		# wide band codec
-		mkdir ${S}/libavcodec/amrwb_float
-		cd ${S}/libavcodec/amrwb_float
-		unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
-	fi
-
-	cd ${S}
-
-	# Fix hppa compilation
-	use hppa && sed -i -e "s/-O4/-O1/" "${S}/configure"
-
-	if use svga; then
-		echo
-		einfo "Enabling vidix non-root mode."
-		einfo "(You need a proper svgalib_helper.o module for your kernel"
-		einfo " to actually use this)"
-		echo
-
-		mv ${WORKDIR}/svgalib_helper ${S}/libdha
-	fi
-
-	# Remove kernel-2.6 workaround as the problem it works around is
-	# fixed, and the workaround breaks sparc
-	# use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
-
-	# minor fix
-	# sed -i -e "s:-O4:-O4 -D__STDC_LIMIT_MACROS:" configure
-
-	# Fix XShape detection
-	epatch ${FILESDIR}/${PN}-xshape.patch
-
-}
-
-src_compile() {
-
-	local myconf=" --disable-tv-bsdbt848 \
-		--disable-faad-external \
-		--disable-libcdio"
-
-	# MPlayer reads in the LINGUAS variable from make.conf, and sets
-	# the languages accordingly.  Some will have to be altered to match
-	# upstream's naming scheme.
-	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS/da/dk}
-
-	################
-	#Optional features#
-	###############
-	use bidi || myconf="${myconf} --disable-fribidi"
-	use bl && myconf="${myconf} --enable-bl"
-	use cddb || myconf="${myconf} --disable-cddb"
-	use cdparanoia || myconf="${myconf} --disable-cdparanoia"
-	use enca || myconf="${myconf} --disable-enca"
-	use ftp || myconf="${myconf} --disable-ftp"
-	use tivo || myconf="${myconf} --disable-vstream"
-
-	# DVD support
-	# dvdread and libdvdcss are internal libs
-	# http://www.mplayerhq.hu/DOCS/HTML/en/dvd.html
-	# You can optionally use external dvdread support, but against
-	# upstream's suggestion.  We don't.
-	# dvdnav support is known to be buggy, but it is the only option
-	# for accessing some DVDs.
-	if use dvd; then
-		use dvdread || myconf="${myconf} --disable-dvdread"
-		use dvdnav || myconf="${myconf} --disable-dvdnav"
-	else
-		myconf="${myconf} --disable-dvdnav --disable-dvdread"
-	fi
-
-	if use encode; then
-		use aac || myconf="${myconf} --disable-faac"
-		use dv || myconf="${myconf} --disable-libdv"
-		use x264 || myconf="${myconf} --disable-x264"
-	else
-		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264 \
-			--disable-faac"
-	fi
-
-	# SRT (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	if ! use srt; then
-		myconf="${myconf} --disable-ass"
-		if ! use truetype; then
-			myconf="${myconf} --disable-freetype"
-			if ! use iconv; then
-				myconf="${myconf} --disable-iconv --charset=noconv"
-			fi
-		fi
-	fi
-	use iconv && use unicode && myconf="${myconf} --charset=UTF-8"
-
-	use lirc || myconf="${myconf} --disable-lirc --disable-lircc"
-	myconf="${myconf} $(use_enable joystick)"
-	use ipv6 || myconf="${myconf} --disable-inet6"
-	use rar || myconf="${myconf} --disable-unrarlib"
-	use rtc || myconf="${myconf} --disable-rtc"
-	use samba || myconf="${myconf} --disable-smb"
-
-	# DVB / Video4Linux / Radio support
-	if ( use dvb || use v4l || use v4l2 || use radio ); then
-		use dvb || myconf="${myconf} --disable-dvb --disable-dvbhead"
-		use v4l	|| myconf="${myconf} --disable-tv-v4l1"
-		use v4l2 || myconf="${myconf} --disable-tv-v4l2"
-		if ( use dvb || use v4l || use v4l2 ) && use radio; then
-			myconf="${myconf} --enable-radio $(use_enable encode radio-capture)"
-		else
-			myconf="${myconf} --disable-radio-v4l2 --disable-radio-bsdbt848"
-		fi
-	else
-		myconf="${myconf} --disable-tv --disable-tv-v4l1 --disable-tv-v4l2 \
-			--disable-radio --disable-radio-v4l2 --disable-radio-bsdbt848 \
-			--disable-dvb --disable-dvbhead"
-	fi
-
-	# disable PVR support
-	# The build will break if you have media-tv/ivtv installed and
-	# linux-headers != 2.6.18, which is currently not keyworded
-	# See also, bug 164748
-	myconf="${myconf} --disable-pvr"
-
-	#########
-	# Codecs #
-	########
-	for x in gif jpeg live mad musepack pnm speex tga theora xanim xvid; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	use aac || myconf="${myconf} --disable-faad-internal"
-	use a52 || myconf="${myconf} --disable-liba52"
-	use dts || myconf="${myconf} --disable-libdts"
-	! use png && ! use gtk && myconf="${myconf} --disable-png"
-	use lzo || myconf="${myconf} --disable-liblzo"
-	use encode && use mp2 || myconf="${myconf} --disable-twolame \
-		--disable-toolame"
-	use mp3 || myconf="${myconf} --disable-mp3lib"
-	use quicktime || myconf="${myconf} --disable-qtx"
-	use vorbis || myconf="${myconf} --disable-libvorbis"
-	use xanim && myconf="${myconf} --xanimcodecsdir=/usr/lib/xanim/mods"
-	if use x86 || use amd64; then
-		# Real codec support, only available on x86, amd64
-		if use real && use x86; then
-			myconf="${myconf} --realcodecsdir=/opt/RealPlayer/codecs"
-		elif use real && use amd64; then
-			myconf="${myconf} --realcodecsdir=/usr/$(get_libdir)/codecs"
-		else
-			myconf="${myconf} --disable-real"
-		fi
-		if ! use livecd && ! use bindist && ! use real; then
-			myconf="${myconf} $(use_enable win32codecs win32dll)"
-		fi
-	fi
-
-	#############
-	# Video Output #
-	#############
-
-	for x in directfb ivtv ggi md5sum sdl xinerama; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	use aalib || myconf="${myconf} --disable-aa"
-	use fbcon || myconf="${myconf} --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf="${myconf} --enable-s3fb"
-	use libcaca || myconf="${myconf} --disable-caca"
-	use opengl || myconf="${myconf} --disable-gl"
-	use video_cards_mga || myconf="${myconf} --disable-mga"
-	( use X && use video_cards_mga ) || myconf="${myconf} --disable-xmga"
-	use video_cards_vesa || myconf="${myconf} --disable-vesa"
-	use vidix || myconf="${myconf} --disable-vidix-internal \
-		--disable-vidix-external"
-	use zoran || myconf="${myconf} --disable-zr"
-
-	# GTK gmplayer gui
-	myconf="${myconf} $(use_enable gtk gui)"
-
-	if use xv; then
-		if use xvmc; then
-			myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCW"
-		else
-			myconf="${myconf} --disable-xvmc"
-		fi
-	else
-		myconf="${myconf} --disable-xv --disable-xvmc"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf="${myconf} $(use_enable video_cards_tdfx tdfxvid) \
-			$(use_enable fbcon tdfxfb)"
-	else
-		myconf="${myconf} --disable-3dfx --disable-tdfxvid --disable-tdfxfb"
-	fi
-
-	#############
-	# Audio Output #
-	#############
-	for x in alsa arts esd jack nas openal; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	if ! use radio; then
-		use oss || myconf="${myconf} --disable-ossaudio"
-	fi
-
-	#################
-	# Advanced Options #
-	#################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	if use x86 || use amd64 || use ppc; then
-		if use cpudetection || use livecd || use bindist; then
-			myconf="${myconf} --enable-runtime-cpudetection"
-		fi
-	fi
-	if use mmx; then
-		for x in 3dnow 3dnowext mmxext sse sse2; do
-			use ${x} || myconf="${myconf} --disable-${x}"
-		done
-	else
-		myconf="${myconf} --disable-mmx --disable-mmxext --disable-sse \
-		--disable-sse2 --disable-3dnow --disable-3dnowext"
-	fi
-	use debug && myconf="${myconf} --enable-debug=3"
-
-	if use altivec; then
-		myconf="${myconf} --enable-altivec"
-	else
-		myconf="${myconf} --disable-altivec"
-	fi
-
-	if [ -e /dev/.devfsd ]; then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	#leave this in place till the configure/compilation borkage is completely corrected back to pre4-r4 levels.
-	# it's intended for debugging so we can get the options we configure mplayer w/, rather then hunt about.
-	# it *will* be removed asap; in the meantime, doesn't hurt anything.
-	echo "${myconf}" > ${T}/configure-options
-
-	if use custom-cflags; then
-		# let's play the filtration game!  MPlayer hates on all!
-		strip-flags
-		# ugly optimizations cause MPlayer to cry on x86 systems!
-			if use x86 ; then
-				replace-flags -O* -O2
-				filter-flags -fPIC -fPIE
-				use debug || append-flags -fomit-frame-pointer
-			fi
-		append-flags -D__STDC_LIMIT_MACROS
-	else
-		unset CFLAGS CXXFLAGS
-	fi
-
-	myconf="--cc=$(tc-getCC) \
-		--host-cc=$(tc-getBUILD_CC) \
-		--prefix=/usr \
-		--confdir=/etc/mplayer \
-		--datadir=/usr/share/mplayer \
-		--libdir=/usr/$(get_libdir) \
-		--enable-largefiles \
-		--enable-menu \
-		--enable-network \
-		${myconf}"
-	einfo "Running ./configure"
-	echo "CFLAGS=\"${CFLAGS}\" ./configure ${myconf}"
-	CFLAGS="${CFLAGS}" ./configure ${myconf} || die
-
-	# we run into problems if -jN > -j1
-	# see #86245
-	# This should have long ago been fixed, commenting out
-	#MAKEOPTS="${MAKEOPTS} -j1"
-
-	einfo "Make"
-	emake || die "Failed to build MPlayer!"
-	use doc && make -C DOCS/xml html-chunked
-	einfo "Make completed"
-}
-
-src_install() {
-
-	einfo "Make install"
-	make prefix=${D}/usr \
-		 BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/$(get_libdir) \
-		 CONFDIR=${D}/etc/mplayer \
-		 DATADIR=${D}/usr/share/mplayer \
-		 MANDIR=${D}/usr/share/man \
-		 install || die "Failed to install MPlayer!"
-	einfo "Make install completed"
-
-	dodoc AUTHORS Changelog README
-	# Install the documentation; DOCS is all mixed up not just html
-	if use doc ; then
-		find "${S}/DOCS" -type d | xargs -- chmod 0755
-		find "${S}/DOCS" -type f | xargs -- chmod 0644
-		cp -r "${S}/DOCS" "${D}/usr/share/doc/${PF}/" || die
-	fi
-
-	# Copy misc tools to documentation path, as they're not installed directly
-	# and yes, we are nuking the +x bit.
-	find "${S}/TOOLS" -type d | xargs -- chmod 0755
-	find "${S}/TOOLS" -type f | xargs -- chmod 0644
-	cp -r "${S}/TOOLS" "${D}/usr/share/doc/${PF}/" || die
-
-	# Install the default Skin and Gnome menu entry
-	if use gtk; then
-		dodir /usr/share/mplayer/skins
-		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/skins/default || die
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym mplayer /usr/bin/gmplayer
-
-		insinto /usr/share/pixmaps
-		newins ${D}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/applications
-		doins ${FILESDIR}/mplayer.desktop
-	fi
-
-	if ! use srt && ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		local x=
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for x in $(find ${WORKDIR}/ -type d -name 'font-arial-*')
-		do
-			cp -pPR ${x} ${D}/usr/share/mplayer/fonts
-		done
-		# Fix the font symlink ...
-		rm -rf ${D}/usr/share/mplayer/font
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins ${S}/etc/example.conf mplayer.conf
-
-	if use srt || use truetype;	then
-		cat >> ${D}/etc/mplayer/mplayer.conf << EOT
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-EOT
-	fi
-
-	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	#mv the midentify script to /usr/bin for emovix.
-	#cp ${D}/usr/share/doc/${PF}/TOOLS/midentify ${D}/usr/bin
-	#chmod a+x ${D}/usr/bin/midentify
-	dobin ${D}/usr/share/doc/${PF}/TOOLS/midentify
-
-	insinto /usr/share/mplayer
-	doins ${S}/etc/input.conf
-	doins ${S}/etc/menu.conf
-}
-
-pkg_preinst() {
-
-	if [ -d "${ROOT}/usr/share/mplayer/Skin/default" ]
-	then
-		rm -rf ${ROOT}/usr/share/mplayer/Skin/default
-	fi
-}
-
-pkg_postinst() {
-
-	if use video_cards_mga; then
-		depmod -a &>/dev/null || :
-	fi
-
-	if use dvdnav && use dvd; then
-		ewarn "'dvdnav' support in MPlayer is known to be buggy, and will"
-		ewarn "break if you are using it in GUI mode.  It is only"
-		ewarn "included because some DVDs will only play with this feature."
-		ewarn "If using it for playback only (and not menu navigation),"
-		ewarn "specify the track # with your options."
-		ewarn "mplayer dvdnav://1"
-	fi
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a \
-		 ! -e ${ROOT}/usr/share/mplayer/font ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
-		 ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}
diff --git a/media-video/mplayer/mplayer-1.0.20070622-r3.ebuild b/media-video/mplayer/mplayer-1.0.20070622-r3.ebuild
deleted file mode 100644
index d0643df50f7c..000000000000
--- a/media-video/mplayer/mplayer-1.0.20070622-r3.ebuild
+++ /dev/null
@@ -1,555 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20070622-r3.ebuild,v 1.2 2007/08/12 18:04:15 drac Exp $
-
-inherit eutils flag-o-matic multilib
-
-RESTRICT="strip"
-IUSE="3dnow 3dnowext a52 aac aalib alsa altivec amrnb amrwb arts bidi bl bindist
-cddb cpudetection custom-cflags dga doc dts dvb cdparanoia directfb dvd
-dvdnav dv enca encode esd fbcon ftp gif ggi gtk iconv ipv6 ivtv jack joystick
-jpeg libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 musepack nas
-unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl speex srt sse sse2 ssse3 svga tga theora tivo truetype v4l v4l2 vidix win32codecs X x264 xanim xinerama xv xvid xvmc zoran"
-
-VIDEO_CARDS="s3virge mga tdfx vesa"
-
-for X in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${X}"
-done
-
-BLUV=1.7
-SVGV=1.9.17
-MY_PV="20070622"
-S="${WORKDIR}/${PN}-${MY_PV}"
-AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
-SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.bz2
-	!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-				 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-				 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	!iconv? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-			  mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-			  mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )"
-
-DESCRIPTION="Media Player for Linux "
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-RDEPEND="sys-libs/ncurses
-	!livecd? (
-		!bindist? (
-			x86? (
-				win32codecs? ( media-libs/win32codecs )
-				real? ( media-libs/win32codecs
-					media-video/realplayer )
-				)
-			amd64? ( real? ( media-libs/amd64codecs ) )
-		)
-	)
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	amrnb? ( media-libs/amrnb )
-	amrwb? ( media-libs/amrwb )
-	arts? ( kde-base/arts )
-	openal? ( media-libs/openal )
-	bidi? ( dev-libs/fribidi )
-	cdparanoia? ( media-sound/cdparanoia )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdts )
-	dv? ( media-libs/libdv )
-	dvb? ( media-tv/linuxtv-dvb-headers )
-	dvd? ( dvdnav? ( media-libs/libdvdnav ) )
-	encode? (
-		aac? ( media-libs/faac )
-		mp2? ( media-sound/twolame )
-		mp3? ( media-sound/lame )
-		)
-	esd? ( media-sound/esound )
-	enca? ( app-i18n/enca )
-	gif? ( media-libs/giflib )
-	ggi? ( media-libs/libggi )
-	gtk? ( media-libs/libpng
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-libs/libXi
-		=x11-libs/gtk+-2* )
-	jpeg? ( media-libs/jpeg )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-libs/libmpcdec-1.2.2 )
-	nas? ( media-libs/nas )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	pnm? ( media-libs/netpbm )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( >=media-libs/speex-1.1.7 )
-	srt? ( >=media-libs/freetype-2.1
-		media-libs/fontconfig )
-	svga? ( media-libs/svgalib )
-	theora? ( media-libs/libtheora )
-	live? ( >=media-plugins/live-2007.02.20 )
-	truetype? ( >=media-libs/freetype-2.1
-		media-libs/fontconfig )
-	vidix? ( x11-libs/libXxf86vm
-			 x11-libs/libXext )
-	x264? ( media-libs/x264-svn )
-	xanim? ( media-video/xanim )
-	xinerama? ( x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/libXext )
-	xv? ( x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		xvmc? ( x11-libs/libXvMC ) )
-	xvid? ( media-libs/xvid )
-	X? ( x11-libs/libXxf86vm
-		x11-libs/libXext
-	)"
-#	video_cards_vesa? ( sys-apps/vbetool ) restrict on x86 first
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( >=app-text/docbook-sgml-dtd-4.1.2
-		app-text/docbook-xml-dtd
-		>=app-text/docbook-xml-simple-dtd-1.50.0
-		dev-libs/libxslt
-	)
-	dga? ( x11-proto/xf86dgaproto )
-	xinerama? ( x11-proto/xineramaproto )
-	xv? ( x11-proto/videoproto
-		  x11-proto/xf86vidmodeproto )
-	gtk? ( x11-proto/xextproto
-		   x11-proto/xf86vidmodeproto )
-	X? ( x11-proto/xextproto
-		 x11-proto/xf86vidmodeproto )
-	iconv? ( virtual/libiconv )"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )
-	mp2? ( >=sys-apps/portage-2.1.2 )
-	ivtv? ( !x86-fbsd? ( <sys-kernel/linux-headers-2.6.20
-		media-tv/ivtv
-		>=sys-apps/portage-2.1.2 ) )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-pkg_setup() {
-
-	if [[ -n ${LINGUAS} ]]; then
-		elog "For MPlayer's language support, the configuration will"
-		elog "use your LINGUAS variable from /etc/make.conf.  If you have more"
-		elog "than one language enabled, then the first one in the list will"
-		elog "be used to output the messages, if a translation is available."
-		elog "man pages will be created for all languages where translations"
-		elog "are also available."
-	fi
-
-}
-
-src_unpack() {
-
-	unpack ${PN}-${MY_PV}.tar.bz2
-
-	if ! use truetype ; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-
-	use gtk && unpack Blue-${BLUV}.tar.bz2
-
-	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
-
-	cd ${S}
-
-	# Fix hppa compilation
-	use hppa && sed -i -e "s/-O4/-O1/" "${S}/configure"
-
-	if use svga; then
-		echo
-		einfo "Enabling vidix non-root mode."
-		einfo "(You need a proper svgalib_helper.o module for your kernel"
-		einfo " to actually use this)"
-		echo
-
-		mv ${WORKDIR}/svgalib_helper ${S}/libdha
-	fi
-
-	# Remove kernel-2.6 workaround as the problem it works around is
-	# fixed, and the workaround breaks sparc
-	# use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
-
-	# minor fix
-	# sed -i -e "s:-O4:-O4 -D__STDC_LIMIT_MACROS:" configure
-
-	# Fix XShape detection
-	epatch ${FILESDIR}/${PN}-xshape.patch
-	epatch ${FILESDIR}/${PN}-dpms.patch
-}
-
-src_compile() {
-
-	local myconf=" --disable-tv-bsdbt848 \
-		--disable-faad-external \
-		--disable-libcdio"
-
-	# MPlayer reads in the LINGUAS variable from make.conf, and sets
-	# the languages accordingly.  Some will have to be altered to match
-	# upstream's naming scheme.
-	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS/da/dk}
-
-	################
-	#Optional features#
-	###############
-	use bidi || myconf="${myconf} --disable-fribidi"
-	use bl && myconf="${myconf} --enable-bl"
-	use cddb || myconf="${myconf} --disable-cddb"
-	use cdparanoia || myconf="${myconf} --disable-cdparanoia"
-	use enca || myconf="${myconf} --disable-enca"
-	use ftp || myconf="${myconf} --disable-ftp"
-	use tivo || myconf="${myconf} --disable-vstream"
-
-	# DVD support
-	# dvdread and libdvdcss are internal libs
-	# http://www.mplayerhq.hu/DOCS/HTML/en/dvd.html
-	# You can optionally use external dvdread support, but against
-	# upstream's suggestion.  We don't.
-	# dvdnav support is known to be buggy, but it is the only option
-	# for accessing some DVDs.
-	if use dvd; then
-		use dvdnav || myconf="${myconf} --disable-dvdnav"
-	else
-		myconf="${myconf} --disable-dvdnav --disable-dvdread"
-
-		# Don't disable a52 support since it's native to libavcodec, and is
-		# going to be needed on most DVDs.
-		use a52 || myconf="${myconf} --disable-liba52"
-	fi
-
-	if use encode; then
-		use aac || myconf="${myconf} --disable-faac"
-		use dv || myconf="${myconf} --disable-libdv"
-		use x264 || myconf="${myconf} --disable-x264"
-	else
-		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264 \
-			--disable-faac"
-	fi
-
-	# SRT (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	if ! use srt; then
-		myconf="${myconf} --disable-ass"
-		if ! use truetype; then
-			myconf="${myconf} --disable-freetype"
-			if ! use iconv; then
-				myconf="${myconf} --disable-iconv --charset=noconv"
-			fi
-		fi
-	fi
-	use iconv && use unicode && myconf="${myconf} --charset=UTF-8"
-
-	use lirc || myconf="${myconf} --disable-lirc --disable-lircc"
-	myconf="${myconf} $(use_enable joystick)"
-	use ipv6 || myconf="${myconf} --disable-inet6"
-	use rar || myconf="${myconf} --disable-unrarlib"
-	use rtc || myconf="${myconf} --disable-rtc"
-	use samba || myconf="${myconf} --disable-smb"
-
-	# DVB / Video4Linux / Radio support
-	if ( use dvb || use v4l || use v4l2 || use radio ); then
-		use dvb || myconf="${myconf} --disable-dvb --disable-dvbhead"
-		use v4l	|| myconf="${myconf} --disable-tv-v4l1"
-		use v4l2 || myconf="${myconf} --disable-tv-v4l2"
-		if ( use dvb || use v4l || use v4l2 ) && use radio; then
-			myconf="${myconf} --enable-radio $(use_enable encode radio-capture)"
-		else
-			myconf="${myconf} --disable-radio-v4l2 --disable-radio-bsdbt848"
-		fi
-	else
-		myconf="${myconf} --disable-tv --disable-tv-v4l1 --disable-tv-v4l2 \
-			--disable-radio --disable-radio-v4l2 --disable-radio-bsdbt848 \
-			--disable-dvb --disable-dvbhead"
-	fi
-
-	# disable PVR support
-	# The build will break if you have media-tv/ivtv installed and
-	# linux-headers != 2.6.18, which is currently not keyworded
-	# See also, bug 164748
-	myconf="${myconf} --disable-pvr"
-
-	#########
-	# Codecs #
-	########
-	for x in gif jpeg live mad musepack pnm speex tga theora xanim xvid; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	use aac || myconf="${myconf} --disable-faad-internal"
-	use amrnb || myconf="${myconf} --disable-libamr_nb"
-	use amrwb || myconf="${myconf} --disable-libamr_wb"
-	! use png && ! use gtk && myconf="${myconf} --disable-png"
-	use lzo || myconf="${myconf} --disable-liblzo"
-	use encode && use mp2 || myconf="${myconf} --disable-twolame \
-		--disable-toolame"
-	use mp3 || myconf="${myconf} --disable-mp3lib"
-	use quicktime || myconf="${myconf} --disable-qtx"
-	use vorbis || myconf="${myconf} --disable-libvorbis"
-	use xanim && myconf="${myconf} --xanimcodecsdir=/usr/lib/xanim/mods"
-	if use x86 || use amd64; then
-		# Real codec support, only available on x86, amd64
-		if use real && use x86; then
-			myconf="${myconf} --realcodecsdir=/opt/RealPlayer/codecs"
-		elif use real && use amd64; then
-			myconf="${myconf} --realcodecsdir=/usr/$(get_libdir)/codecs"
-		else
-			myconf="${myconf} --disable-real"
-		fi
-		if ! use livecd && ! use bindist && ! use real; then
-			myconf="${myconf} $(use_enable win32codecs win32dll)"
-		fi
-	fi
-
-	#############
-	# Video Output #
-	#############
-
-	for x in directfb ivtv ggi md5sum sdl xinerama; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	use aalib || myconf="${myconf} --disable-aa"
-	use fbcon || myconf="${myconf} --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf="${myconf} --enable-s3fb"
-	use libcaca || myconf="${myconf} --disable-caca"
-	use opengl || myconf="${myconf} --disable-gl"
-	use video_cards_mga || myconf="${myconf} --disable-mga"
-	( use X && use video_cards_mga ) || myconf="${myconf} --disable-xmga"
-	use video_cards_vesa || myconf="${myconf} --disable-vesa"
-	use vidix || myconf="${myconf} --disable-vidix-internal \
-		--disable-vidix-external"
-	use zoran || myconf="${myconf} --disable-zr"
-
-	# GTK gmplayer gui
-	myconf="${myconf} $(use_enable gtk gui)"
-
-	if use xv; then
-		if use xvmc; then
-			myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCW"
-		else
-			myconf="${myconf} --disable-xvmc"
-		fi
-	else
-		myconf="${myconf} --disable-xv --disable-xvmc"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf="${myconf} $(use_enable video_cards_tdfx tdfxvid) \
-			$(use_enable fbcon tdfxfb)"
-	else
-		myconf="${myconf} --disable-3dfx --disable-tdfxvid --disable-tdfxfb"
-	fi
-
-	#############
-	# Audio Output #
-	#############
-	for x in alsa arts esd jack nas openal; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	if ! use radio; then
-		use oss || myconf="${myconf} --disable-ossaudio"
-	fi
-	#################
-	# Advanced Options #
-	#################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	if use x86 || use amd64 || use ppc; then
-		if use cpudetection || use livecd || use bindist; then
-			myconf="${myconf} --enable-runtime-cpudetection"
-		fi
-	fi
-	if use mmx; then
-		for x in 3dnow 3dnowext mmxext sse sse2 ssse3; do
-			use ${x} || myconf="${myconf} --disable-${x}"
-		done
-	else
-		myconf="${myconf} --disable-mmx --disable-mmxext --disable-sse \
-		--disable-sse2 --disable-ssse3 --disable-3dnow \
-		--disable-3dnowext"
-	fi
-
-	# debug broken in this release
-	# use debug && myconf="${myconf} --enable-debug=3"
-
-	if use altivec; then
-		myconf="${myconf} --enable-altivec"
-	else
-		myconf="${myconf} --disable-altivec"
-	fi
-
-	if [ -e /dev/.devfsd ]; then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	#leave this in place till the configure/compilation borkage is completely corrected back to pre4-r4 levels.
-	# it's intended for debugging so we can get the options we configure mplayer w/, rather then hunt about.
-	# it *will* be removed asap; in the meantime, doesn't hurt anything.
-	echo "${myconf}" > ${T}/configure-options
-
-	if use custom-cflags; then
-		# let's play the filtration game!  MPlayer hates on all!
-		strip-flags
-		# ugly optimizations cause MPlayer to cry on x86 systems!
-			if use x86 ; then
-				replace-flags -O* -O2
-				filter-flags -fPIC -fPIE
-
-				# debug broken in this release
-				# use debug || append-flags -fomit-frame-pointer
-				append-flags -fomit-frame-pointer
-			fi
-		append-flags -D__STDC_LIMIT_MACROS
-	else
-		unset CFLAGS CXXFLAGS
-	fi
-
-	myconf="--cc=$(tc-getCC) \
-		--host-cc=$(tc-getBUILD_CC) \
-		--prefix=/usr \
-		--confdir=/etc/mplayer \
-		--datadir=/usr/share/mplayer \
-		--libdir=/usr/$(get_libdir) \
-		--enable-largefiles \
-		--enable-menu \
-		--enable-network \
-		${myconf}"
-	einfo "Running ./configure"
-	echo "CFLAGS=\"${CFLAGS}\" ./configure ${myconf}"
-	CFLAGS="${CFLAGS}" ./configure ${myconf} || die
-
-	# we run into problems if -jN > -j1
-	# see #86245
-	# This should have long ago been fixed, commenting out
-	#MAKEOPTS="${MAKEOPTS} -j1"
-
-	einfo "Make"
-	emake || die "Failed to build MPlayer!"
-	use doc && make -C DOCS/xml html-chunked
-	einfo "Make completed"
-}
-
-src_install() {
-
-	einfo "Make install"
-	make prefix=${D}/usr \
-		 BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/$(get_libdir) \
-		 CONFDIR=${D}/etc/mplayer \
-		 DATADIR=${D}/usr/share/mplayer \
-		 MANDIR=${D}/usr/share/man \
-		 install || die "Failed to install MPlayer!"
-	einfo "Make install completed"
-
-	dodoc AUTHORS Changelog README
-	# Install the documentation; DOCS is all mixed up not just html
-	if use doc ; then
-		find "${S}/DOCS" -type d | xargs -- chmod 0755
-		find "${S}/DOCS" -type f | xargs -- chmod 0644
-		cp -r "${S}/DOCS" "${D}/usr/share/doc/${PF}/" || die
-	fi
-
-	# Copy misc tools to documentation path, as they're not installed directly
-	# and yes, we are nuking the +x bit.
-	find "${S}/TOOLS" -type d | xargs -- chmod 0755
-	find "${S}/TOOLS" -type f | xargs -- chmod 0644
-	cp -r "${S}/TOOLS" "${D}/usr/share/doc/${PF}/" || die
-
-	# Install the default Skin and Gnome menu entry
-	if use gtk; then
-		dodir /usr/share/mplayer/skins
-		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/skins/default || die
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym mplayer /usr/bin/gmplayer
-	fi
-
-	if ! use srt && ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		local x=
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for x in $(find ${WORKDIR}/ -type d -name 'font-arial-*')
-		do
-			cp -pPR ${x} ${D}/usr/share/mplayer/fonts
-		done
-		# Fix the font symlink ...
-		rm -rf ${D}/usr/share/mplayer/font
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins ${S}/etc/example.conf mplayer.conf
-
-	if use srt || use truetype;	then
-		cat >> ${D}/etc/mplayer/mplayer.conf << EOT
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-EOT
-	fi
-
-	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	#mv the midentify script to /usr/bin for emovix.
-	#cp ${D}/usr/share/doc/${PF}/TOOLS/midentify ${D}/usr/bin
-	#chmod a+x ${D}/usr/bin/midentify
-	dobin ${D}/usr/share/doc/${PF}/TOOLS/midentify
-
-	insinto /usr/share/mplayer
-	doins ${S}/etc/input.conf
-	doins ${S}/etc/menu.conf
-}
-
-pkg_preinst() {
-
-	if [ -d "${ROOT}/usr/share/mplayer/Skin/default" ]
-	then
-		rm -rf ${ROOT}/usr/share/mplayer/Skin/default
-	fi
-}
-
-pkg_postinst() {
-
-	if use video_cards_mga; then
-		depmod -a &>/dev/null || :
-	fi
-
-	if use dvdnav && use dvd; then
-		ewarn "'dvdnav' support in MPlayer is known to be buggy, and will"
-		ewarn "break if you are using it in GUI mode.  It is only"
-		ewarn "included because some DVDs will only play with this feature."
-		ewarn "If using it for playback only (and not menu navigation),"
-		ewarn "specify the track # with your options."
-		ewarn "mplayer dvdnav://1"
-	fi
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a \
-		 ! -e ${ROOT}/usr/share/mplayer/font ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
-		 ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}
diff --git a/media-video/mplayer/mplayer-1.0.20070814.ebuild b/media-video/mplayer/mplayer-1.0.20070814.ebuild
deleted file mode 100644
index 153af6ce3c2a..000000000000
--- a/media-video/mplayer/mplayer-1.0.20070814.ebuild
+++ /dev/null
@@ -1,548 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20070814.ebuild,v 1.4 2007/08/17 00:35:02 mr_bones_ Exp $
-
-inherit eutils flag-o-matic multilib
-
-RESTRICT="strip"
-IUSE="3dnow 3dnowext a52 aac aalib alsa altivec amrnb amrwb arts bidi bl bindist
-cddb cdio cdparanoia cpudetection custom-cflags dga doc dts dvb directfb dvd
-dv enca encode esd fbcon ftp gif ggi gtk iconv ipv6 ivtv jack joystick
-jpeg libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3 musepack nas pvr unicode vorbis opengl openal oss png pnm quicktime radio rar real rtc samba sdl
-speex srt sse sse2 ssse3 svga teletext tga theora tivo truetype v4l v4l2 vidix win32codecs X x264 xanim xinerama xv xvid xvmc zoran"
-
-VIDEO_CARDS="i810 nvidia s3virge mga tdfx vesa"
-
-for X in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${X}"
-done
-
-BLUV=1.7
-SVGV=1.9.17
-MY_PV="20070814"
-S="${WORKDIR}/${PN}-${MY_PV}"
-AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
-SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.bz2
-	!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-				 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-				 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	!iconv? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-			  mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-			  mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-RDEPEND="sys-libs/ncurses
-	!livecd? (
-		!bindist? (
-			x86? (
-				win32codecs? ( media-libs/win32codecs )
-				real? ( media-libs/win32codecs
-					media-video/realplayer )
-				)
-			amd64? ( real? ( media-libs/amd64codecs ) )
-		)
-	)
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	amrnb? ( media-libs/amrnb )
-	amrwb? ( media-libs/amrwb )
-	arts? ( kde-base/arts )
-	openal? ( media-libs/openal )
-	bidi? ( dev-libs/fribidi )
-	cdio? ( dev-libs/libcdio )
-	cdparanoia? ( media-sound/cdparanoia )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( || ( media-libs/libdca media-libs/libdts ) )
-	dv? ( media-libs/libdv )
-	dvb? ( media-tv/linuxtv-dvb-headers )
-	encode? (
-		aac? ( media-libs/faac )
-		mp2? ( media-sound/twolame )
-		mp3? ( media-sound/lame )
-		)
-	esd? ( media-sound/esound )
-	enca? ( app-i18n/enca )
-	gif? ( media-libs/giflib )
-	ggi? ( media-libs/libggi )
-	gtk? ( media-libs/libpng
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-libs/libXi
-		=x11-libs/gtk+-2* )
-	jpeg? ( media-libs/jpeg )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	lzo? ( >=dev-libs/lzo-2 )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-libs/libmpcdec-1.2.2 )
-	nas? ( media-libs/nas )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	pnm? ( media-libs/netpbm )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? ( >=media-libs/speex-1.1.7 )
-	srt? ( >=media-libs/freetype-2.1
-		media-libs/fontconfig )
-	svga? ( media-libs/svgalib )
-	theora? ( media-libs/libtheora )
-	live? ( >=media-plugins/live-2007.02.20 )
-	truetype? ( >=media-libs/freetype-2.1
-		media-libs/fontconfig )
-	vidix? ( x11-libs/libXxf86vm
-			 x11-libs/libXext )
-	x264? ( media-libs/x264-svn )
-	xanim? ( media-video/xanim )
-	xinerama? ( x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/libXext )
-	xv? ( x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		xvmc? ( x11-libs/libXvMC ) )
-	xvid? ( media-libs/xvid )
-	X? ( x11-libs/libXxf86vm
-		x11-libs/libXext
-	)"
-#	video_cards_vesa? ( sys-apps/vbetool ) restrict on x86 first
-
-DEPEND="${RDEPEND}
-	doc? ( >=app-text/docbook-sgml-dtd-4.1.2
-		app-text/docbook-xml-dtd
-		>=app-text/docbook-xml-simple-dtd-1.50.0
-		dev-libs/libxslt
-	)
-	dga? ( x11-proto/xf86dgaproto )
-	xinerama? ( x11-proto/xineramaproto )
-	xv? ( x11-proto/videoproto
-		  x11-proto/xf86vidmodeproto )
-	gtk? ( x11-proto/xextproto
-		   x11-proto/xf86vidmodeproto )
-	X? ( x11-proto/xextproto
-		 x11-proto/xf86vidmodeproto )
-	iconv? ( virtual/libiconv )"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )
-	mp2? ( >=sys-apps/portage-2.1.2 )
-	ivtv? ( media-tv/ivtv
-		>=sys-apps/portage-2.1.2 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-pkg_setup() {
-
-	if [[ -n ${LINGUAS} ]]; then
-		elog "For MPlayer's language support, the configuration will"
-		elog "use your LINGUAS variable from /etc/make.conf.  If you have more"
-		elog "than one language enabled, then the first one in the list will"
-		elog "be used to output the messages, if a translation is available."
-		elog "man pages will be created for all languages where translations"
-		elog "are also available."
-	fi
-
-	if use dvd && ! use a52; then
-		ewarn "You have DVD support enabled (dvd use flag), but a52 support"
-		ewarn "is disabled.  You probably want to enable this, or the audio"
-		ewarn "on some discs will not work."
-	fi
-
-}
-
-src_unpack() {
-
-	unpack ${PN}-${MY_PV}.tar.bz2
-
-	if ! use truetype ; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			font-arial-iso-8859-2.tar.bz2 \
-			font-arial-cp1250.tar.bz2
-	fi
-
-	use gtk && unpack Blue-${BLUV}.tar.bz2
-
-	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
-
-	cd ${S}
-
-	# Fix hppa compilation
-	use hppa && sed -i -e "s/-O4/-O1/" "${S}/configure"
-
-	if use svga; then
-		echo
-		einfo "Enabling vidix non-root mode."
-		einfo "(You need a proper svgalib_helper.o module for your kernel"
-		einfo " to actually use this)"
-		echo
-
-		mv ${WORKDIR}/svgalib_helper ${S}/libdha
-	fi
-
-	# Remove kernel-2.6 workaround as the problem it works around is
-	# fixed, and the workaround breaks sparc
-	# use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
-
-	# minor fix
-	# sed -i -e "s:-O4:-O4 -D__STDC_LIMIT_MACROS:" configure
-
-	# Fix XShape detection
-	epatch ${FILESDIR}/${PN}-xshape.patch
-	epatch ${FILESDIR}/${PN}-dpms.patch
-}
-
-src_compile() {
-
-	local myconf=" --disable-tv-bsdbt848 \
-		--disable-faad-external"
-
-	# MPlayer reads in the LINGUAS variable from make.conf, and sets
-	# the languages accordingly.  Some will have to be altered to match
-	# upstream's naming scheme.
-	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS/da/dk}
-
-	################
-	#Optional features#
-	###############
-	use bidi || myconf="${myconf} --disable-fribidi"
-	use bl && myconf="${myconf} --enable-bl"
-	use enca || myconf="${myconf} --disable-enca"
-	use ftp || myconf="${myconf} --disable-ftp"
-	use tivo || myconf="${myconf} --disable-vstream"
-
-	# libcdio support: prefer libcdio over cdparanoia
-	# don't check for cddb w/cdio
-	if use cdio; then
-		myconf="${myconf} --disable-cdparanoia"
-	else
-		myconf="${myconf} --disable-libcdio"
-		use cdparanoia || myconf="${myconf} --disable-cdparanoia"
-		use cddb || myconf="${myconf} --disable-cddb"
-	fi
-
-	# DVD support
-	# dvdread and libdvdcss are internal libs
-	# http://www.mplayerhq.hu/DOCS/HTML/en/dvd.html
-	# You can optionally use external dvdread support, but against
-	# upstream's suggestion.  We don't.
-	if ! use dvd; then
-		myconf="${myconf} --disable-dvdnav --disable-dvdread"
-	fi
-
-	if use encode; then
-		use aac || myconf="${myconf} --disable-faac"
-		use dv || myconf="${myconf} --disable-libdv"
-		use x264 || myconf="${myconf} --disable-x264"
-	else
-		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264 \
-			--disable-faac"
-	fi
-
-	# SRT (subtitles) requires freetype support
-	# freetype support requires iconv
-	# iconv optionally can use unicode
-	if ! use srt; then
-		myconf="${myconf} --disable-ass"
-		if ! use truetype; then
-			myconf="${myconf} --disable-freetype"
-			if ! use iconv; then
-				myconf="${myconf} --disable-iconv --charset=noconv"
-			fi
-		fi
-	fi
-	use iconv && use unicode && myconf="${myconf} --charset=UTF-8"
-
-	use lirc || myconf="${myconf} --disable-lirc --disable-lircc"
-	myconf="${myconf} $(use_enable joystick)"
-	use ipv6 || myconf="${myconf} --disable-inet6"
-	use rar || myconf="${myconf} --disable-unrarlib"
-	use rtc || myconf="${myconf} --disable-rtc"
-	use samba || myconf="${myconf} --disable-smb"
-
-	# DVB / Video4Linux / Radio support
-	if ( use dvb || use v4l || use v4l2 || use radio ); then
-		use dvb || myconf="${myconf} --disable-dvb --disable-dvbhead"
-		use v4l	|| myconf="${myconf} --disable-tv-v4l1"
-		use v4l2 || myconf="${myconf} --disable-tv-v4l2"
-		use teletext || myconf="${myconf} --disable-tv-teletext"
-		use pvr || myconf="${myconf} --disable-pvr"
-		if ( use dvb || use v4l || use v4l2 ) && use radio; then
-			myconf="${myconf} --enable-radio $(use_enable encode radio-capture)"
-		else
-			myconf="${myconf} --disable-radio-v4l2 --disable-radio-bsdbt848"
-		fi
-	else
-		myconf="${myconf} --disable-tv --disable-tv-v4l1 --disable-tv-v4l2 \
-			--disable-radio --disable-radio-v4l2 --disable-radio-bsdbt848 \
-			--disable-dvb --disable-dvbhead --disable-tv-teletext \
-			--disable-pvr"
-	fi
-
-	#########
-	# Codecs #
-	########
-	for x in gif jpeg live mad musepack pnm speex tga theora xanim xvid; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	use aac || myconf="${myconf} --disable-faad-internal"
-	use a52 || myconf="${myconf} --disable-liba52"
-	use amrnb || myconf="${myconf} --disable-libamr_nb"
-	use amrwb || myconf="${myconf} --disable-libamr_wb"
-	use dts || myconf="${myconf} --disable-libdca"
-	! use png && ! use gtk && myconf="${myconf} --disable-png"
-	use lzo || myconf="${myconf} --disable-liblzo"
-	use encode && use mp2 || myconf="${myconf} --disable-twolame \
-		--disable-toolame"
-	use mp3 || myconf="${myconf} --disable-mp3lib"
-	use quicktime || myconf="${myconf} --disable-qtx"
-	use vorbis || myconf="${myconf} --disable-libvorbis"
-	use xanim && myconf="${myconf} --xanimcodecsdir=/usr/lib/xanim/mods"
-	if use x86 || use amd64; then
-		# Real codec support, only available on x86, amd64
-		if use real && use x86; then
-			myconf="${myconf} --realcodecsdir=/opt/RealPlayer/codecs"
-		elif use real && use amd64; then
-			myconf="${myconf} --realcodecsdir=/usr/$(get_libdir)/codecs"
-		else
-			myconf="${myconf} --disable-real"
-		fi
-		if ! use livecd && ! use bindist && ! use real; then
-			myconf="${myconf} $(use_enable win32codecs win32dll)"
-		fi
-	fi
-
-	#############
-	# Video Output #
-	#############
-
-	for x in directfb ivtv ggi md5sum sdl xinerama; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	use aalib || myconf="${myconf} --disable-aa"
-	use fbcon || myconf="${myconf} --disable-fbdev"
-	use fbcon && use video_cards_s3virge && myconf="${myconf} --enable-s3fb"
-	use libcaca || myconf="${myconf} --disable-caca"
-	use opengl || myconf="${myconf} --disable-gl"
-	use video_cards_mga || myconf="${myconf} --disable-mga"
-	( use X && use video_cards_mga ) || myconf="${myconf} --disable-xmga"
-	use video_cards_vesa || myconf="${myconf} --disable-vesa"
-	use vidix || myconf="${myconf} --disable-vidix-internal \
-		--disable-vidix-external"
-	use zoran || myconf="${myconf} --disable-zr"
-
-	# GTK gmplayer gui
-	myconf="${myconf} $(use_enable gtk gui)"
-
-	if use xv; then
-		if use xvmc; then
-			myconf="${myconf} --enable-xvmc"
-			if use video_cards_nvidia; then
-				myconf="${myconf} --with-xvmclib=XvMCNVIDIA"
-			elif use video_cards_i810; then
-				myconf="${myconf} --with-xvmclib=I810XvMC"
-			else
-				myconf="${myconf} --with-xvmclib=XvMCW"
-			fi
-		else
-			myconf="${myconf} --disable-xvmc"
-		fi
-	else
-		myconf="${myconf} --disable-xv --disable-xvmc"
-	fi
-
-	if use video_cards_tdfx; then
-		myconf="${myconf} $(use_enable video_cards_tdfx tdfxvid) \
-			$(use_enable fbcon tdfxfb)"
-	else
-		myconf="${myconf} --disable-3dfx --disable-tdfxvid --disable-tdfxfb"
-	fi
-
-	#############
-	# Audio Output #
-	#############
-	for x in alsa arts esd jack nas openal; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	if ! use radio; then
-		use oss || myconf="${myconf} --disable-ossaudio"
-	fi
-	#################
-	# Advanced Options #
-	#################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	if use x86 || use amd64 || use ppc; then
-		if use cpudetection || use livecd || use bindist; then
-			myconf="${myconf} --enable-runtime-cpudetection"
-		fi
-	fi
-	if use mmx; then
-		for x in 3dnow 3dnowext mmxext sse sse2 ssse3; do
-			use ${x} || myconf="${myconf} --disable-${x}"
-		done
-	else
-		myconf="${myconf} --disable-mmx --disable-mmxext --disable-sse \
-		--disable-sse2 --disable-ssse3 --disable-3dnow \
-		--disable-3dnowext"
-	fi
-
-	# debug broken in this release
-	# use debug && myconf="${myconf} --enable-debug=3"
-
-	if use altivec; then
-		myconf="${myconf} --enable-altivec"
-	else
-		myconf="${myconf} --disable-altivec"
-	fi
-
-	if [ -e /dev/.devfsd ]; then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	#leave this in place till the configure/compilation borkage is completely corrected back to pre4-r4 levels.
-	# it's intended for debugging so we can get the options we configure mplayer w/, rather then hunt about.
-	# it *will* be removed asap; in the meantime, doesn't hurt anything.
-	echo "${myconf}" > ${T}/configure-options
-
-	if use custom-cflags; then
-		# let's play the filtration game!  MPlayer hates on all!
-		strip-flags
-		# ugly optimizations cause MPlayer to cry on x86 systems!
-			if use x86 ; then
-				replace-flags -O* -O2
-				filter-flags -fPIC -fPIE
-
-				# debug broken in this release
-				# use debug || append-flags -fomit-frame-pointer
-				append-flags -fomit-frame-pointer
-			fi
-		append-flags -D__STDC_LIMIT_MACROS
-	else
-		unset CFLAGS CXXFLAGS
-	fi
-
-	myconf="--cc=$(tc-getCC) \
-		--host-cc=$(tc-getBUILD_CC) \
-		--prefix=/usr \
-		--confdir=/etc/mplayer \
-		--datadir=/usr/share/mplayer \
-		--libdir=/usr/$(get_libdir) \
-		--enable-largefiles \
-		--enable-menu \
-		--enable-network \
-		${myconf}"
-	einfo "Running ./configure"
-	echo "CFLAGS=\"${CFLAGS}\" ./configure ${myconf}"
-	CFLAGS="${CFLAGS}" ./configure ${myconf} || die
-
-	einfo "Make"
-	emake || die "Failed to build MPlayer!"
-	use doc && make -C DOCS/xml html-chunked
-	einfo "Make completed"
-}
-
-src_install() {
-
-	einfo "Make install"
-	make prefix=${D}/usr \
-		 BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/$(get_libdir) \
-		 CONFDIR=${D}/etc/mplayer \
-		 DATADIR=${D}/usr/share/mplayer \
-		 MANDIR=${D}/usr/share/man \
-		 install || die "Failed to install MPlayer!"
-	einfo "Make install completed"
-
-	dodoc AUTHORS Changelog README
-	# Install the documentation; DOCS is all mixed up not just html
-	if use doc ; then
-		find "${S}/DOCS" -type d | xargs -- chmod 0755
-		find "${S}/DOCS" -type f | xargs -- chmod 0644
-		cp -r "${S}/DOCS" "${D}/usr/share/doc/${PF}/" || die
-	fi
-
-	# Copy misc tools to documentation path, as they're not installed directly
-	# and yes, we are nuking the +x bit.
-	find "${S}/TOOLS" -type d | xargs -- chmod 0755
-	find "${S}/TOOLS" -type f | xargs -- chmod 0644
-	cp -r "${S}/TOOLS" "${D}/usr/share/doc/${PF}/" || die
-
-	# Install the default Skin and Gnome menu entry
-	if use gtk; then
-		dodir /usr/share/mplayer/skins
-		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/skins/default || die
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym mplayer /usr/bin/gmplayer
-	fi
-
-	if ! use srt && ! use truetype; then
-		dodir /usr/share/mplayer/fonts
-		local x=
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for x in $(find ${WORKDIR}/ -type d -name 'font-arial-*')
-		do
-			cp -pPR ${x} ${D}/usr/share/mplayer/fonts
-		done
-		# Fix the font symlink ...
-		rm -rf ${D}/usr/share/mplayer/font
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc/mplayer
-	newins ${S}/etc/example.conf mplayer.conf
-
-	if use srt || use truetype;	then
-		cat >> ${D}/etc/mplayer/mplayer.conf << EOT
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-EOT
-	fi
-
-	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	dobin ${D}/usr/share/doc/${PF}/TOOLS/midentify
-
-	insinto /usr/share/mplayer
-	doins ${S}/etc/input.conf
-	doins ${S}/etc/menu.conf
-}
-
-pkg_preinst() {
-
-	if [ -d "${ROOT}/usr/share/mplayer/Skin/default" ]
-	then
-		rm -rf ${ROOT}/usr/share/mplayer/Skin/default
-	fi
-}
-
-pkg_postinst() {
-
-	if use video_cards_mga; then
-		depmod -a &>/dev/null || :
-	fi
-
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a \
-		 ! -e ${ROOT}/usr/share/mplayer/font ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
-		 ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}
diff --git a/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild b/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild
deleted file mode 100644
index 27e29574b972..000000000000
--- a/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild
+++ /dev/null
@@ -1,571 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild,v 1.14 2007/07/12 02:40:43 mr_bones_ Exp $
-
-inherit eutils flag-o-matic multilib
-
-RESTRICT="strip"
-IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec amr arts bidi bl bindist
-cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd
-dv dvdread enca encode esd fbcon gif ggi gtk iconv ipv6 jack joystick jpeg
-libcaca lirc live livecd lzo mad matrox mmx mmxext musepack nas unicode
-vorbis opengl openal oss png real rtc samba sdl speex sse sse2 svga tga
-theora truetype v4l v4l2 win32codecs X x264 xanim xinerama xv xvid xvmc"
-
-LANGS="bg cs de da el en es fr hu ja ko mk nl no pl pt_BR ro ru sk tr uk zh_CN
-zh_TW"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-BLUV=1.7
-SVGV=1.9.17
-
-# Handle PREversions as wel
-MY_P="MPlayer-${PV/_/}"
-S="${WORKDIR}/${MY_P}"
-AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
-SRC_URI="mirror://mplayer/releases/${MY_P}.tar.bz2
-	!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-				 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-				 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	!iconv? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-			  mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-			  mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
-	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
-	amr? ( ${AMR_URI}/26_series/26.104/26104-510.zip
-		   ${AMR_URI}/26_series/26.204/26204-510.zip )"
-
-# Only install Skin if GUI should be build (gtk as USE flag)
-DESCRIPTION="Media Player for Linux "
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-# 'encode' in USE for MEncoder.
-RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
-	win32codecs? (
-		!livecd? (
-			!bindist? ( >=media-libs/win32codecs-20040916 ) ) )
-	x86? ( real? ( >=media-video/realplayer-10.0.3 ) )
-	amd64? ( real? ( !bindist? ( media-libs/amd64codecs ) ) )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	openal? ( media-libs/openal )
-	bidi? ( dev-libs/fribidi )
-	cdparanoia? ( media-sound/cdparanoia )
-	dga? ( x11-libs/libXxf86dga )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdts )
-	dvb? ( media-tv/linuxtv-dvb-headers )
-	dvd? ( dvdread? ( media-libs/libdvdread ) )
-	encode? (
-		media-sound/lame
-		dv? ( >=media-libs/libdv-0.9.5 )
-		x264? ( >=media-libs/x264-svn-20061014 )
-		aac? ( media-libs/faac )
-		)
-	esd? ( media-sound/esound )
-	enca? ( app-i18n/enca )
-	gif? ( media-libs/giflib )
-	ggi? ( media-libs/libggi )
-	gtk? ( media-libs/libpng
-		   x11-libs/libXxf86vm
-		   x11-libs/libXext
-		   x11-libs/libXi
-		   =x11-libs/gtk+-2*
-		   =dev-libs/glib-2* )
-	jpeg? ( media-libs/jpeg )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	lzo? ( =dev-libs/lzo-1* )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-libs/libmpcdec-1.2.2 )
-	nas? ( media-libs/nas )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	samba? ( >=net-fs/samba-2.2.8a )
-	sdl? ( media-libs/libsdl )
-	speex? ( media-libs/speex )
-	svga? ( media-libs/svgalib )
-	theora? ( media-libs/libtheora )
-	live? ( >=media-plugins/live-2004.07.20 )
-	truetype? ( >=media-libs/freetype-2.1
-				media-libs/fontconfig )
-	xinerama? ( x11-libs/libXinerama
-				x11-libs/libXxf86vm
-				x11-libs/libXext )
-	xanim? ( >=media-video/xanim-2.80.1-r4 )
-	sys-libs/ncurses
-	xv? ( x11-libs/libXv
-		  x11-libs/libXxf86vm
-		  x11-libs/libXext
-		  xvmc? ( x11-libs/libXvMC ) )
-	X? ( x11-libs/libXxf86vm
-		 x11-libs/libXext )
-	"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( >=app-text/docbook-sgml-dtd-4.1.2
-		   app-text/docbook-xml-dtd
-		   >=app-text/docbook-xml-simple-dtd-1.50.0
-		   dev-libs/libxslt
-		   )
-	dga? ( x11-proto/xf86dgaproto )
-	xinerama? ( x11-proto/xineramaproto )
-	xv? ( x11-proto/videoproto
-		  x11-proto/xf86vidmodeproto )
-	gtk? ( x11-proto/xextproto
-		   x11-proto/xf86vidmodeproto )
-	X? ( x11-proto/xextproto
-		 x11-proto/xf86vidmodeproto )
-	iconv? ( virtual/libiconv )"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-pkg_setup() {
-	if use real && use x86; then
-		REALLIBDIR="/opt/RealPlayer/codecs"
-	elif use real && use amd64 && ! use bindist ; then
-		REALLIBDIR="/usr/$(get_libdir)/codecs"
-	fi
-
-	if use truetype && ! use iconv ; then
-		ewarn "You enabled the 'truetype' USE flag, but support will be"
-		ewarn "disabled unless you also use 'iconv'."
-	fi
-}
-
-src_unpack() {
-
-	unpack ${MY_P}.tar.bz2
-
-	if ! use truetype || ! use iconv ; then
-		unpack font-arial-iso-8859-1.tar.bz2 \
-			   font-arial-iso-8859-2.tar.bz2 \
-			   font-arial-cp1250.tar.bz2
-	fi
-
-	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
-
-	use gtk && unpack Blue-${BLUV}.tar.bz2
-
-	use amr && unpack 26104-510.zip && unpack 26204-510.zip
-
-	# amr (float) support
-	if use amr; then
-		einfo "Including amr wide and narrow band (float) support ... "
-
-		# narrow band codec
-		mkdir ${S}/libavcodec/amr_float
-		cd ${S}/libavcodec/amr_float
-		unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
-		# wide band codec
-		mkdir ${S}/libavcodec/amrwb_float
-		cd ${S}/libavcodec/amrwb_float
-		unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
-	fi
-
-	cd ${S}
-
-	epatch "${FILESDIR}/mplayer-undefined-reference-fix.patch"
-
-	# DSA 1244-1
-	epatch "${FILESDIR}/${P}-asmrules.patch"
-
-	# Fix hppa compilation
-	[ "${ARCH}" = "hppa" ] && sed -i -e "s/-O4/-O1/" "${S}/configure"
-
-	if use svga
-	then
-		echo
-		einfo "Enabling vidix non-root mode."
-		einfo "(You need a proper svgalib_helper.o module for your kernel"
-		einfo " to actually use this)"
-		echo
-
-		mv ${WORKDIR}/svgalib_helper ${S}/libdha
-	fi
-
-	# Remove kernel-2.6 workaround as the problem it works around is
-	# fixed, and the workaround breaks sparc
-	use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
-
-	# minor fix
-	sed -i -e "s:-O4:-O4 -D__STDC_LIMIT_MACROS:" configure
-
-}
-
-src_compile() {
-
-	# have fun with LINGUAS variable
-	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS//da/dk}
-
-	local myconf=" --disable-tv-bsdbt848 --disable-dvdnav"
-	myconf="${myconf} --disable-vidix-external"
-	################
-	#Optional features#
-	###############
-	if use cpudetection || use livecd || use bindist
-	then
-	myconf="${myconf} --enable-runtime-cpudetection"
-	fi
-
-	myconf="${myconf} $(use_enable bidi fribidi)"
-
-	if use iconv
-	then
-		use unicode && myconf="${myconf} --charset=UTF-8"
-	else
-		myconf="${myconf} --disable-iconv"
-		myconf="${myconf} --charset=noconv"
-	fi
-
-	use enca || myconf="${myconf} --disable-enca"
-
-	use cdparanoia || myconf="${myconf} --disable-cdparanoia"
-
-	if use dvd
-	then
-		use dvdread && myconf="${myconf} --disable-mpdvdkit"
-		use dvdread || myconf="${myconf} --disable-dvdread"
-	else
-		myconf="${myconf} --disable-dvdread --disable-mpdvdkit"
-	fi
-
-	if use encode
-	then
-		myconf="${myconf} --enable-mencoder"
-		use dv || myconf="${myconf} --disable-libdv"
-		use x264 || myconf="${myconf} --disable-x264"
-		use aac || myconf="${myconf} --disable-faac"
-	else
-		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264
-		--disable-faac"
-	fi
-
-	myconf="${myconf} $(use_enable gtk gui)"
-
-	if use !gtk && use !X && use !xv && use !xinerama
-	then
-		myconf="${myconf} --disable-gui --disable-x11 --disable-xv --disable-xmga --disable-xinerama --disable-vm --disable-xvmc"
-	else
-		#note we ain't touching --enable-vm.  That should be locked down in the future.
-		myconf="${myconf} --enable-x11 $(use_enable xinerama) $(use_enable xv) $(use_enable gtk gui)"
-	fi
-
-	# this looks like a hack, but the
-	# --enable-dga needs a paramter, but there's no surefire
-	# way to tell what it is.. so I'm letting MPlayer decide
-	# the enable part
-	if ! use dga && ! use 3dfx
-	then
-		myconf="${myconf} --disable-dga"
-	fi
-	# disable png *only* if gtk && png aren't on
-	if use png || use gtk
-	then
-		myconf="${myconf} --enable-png"
-	else
-		myconf="${myconf} --disable-png"
-	fi
-
-	# disable PVR support
-	# The build will break if you have media-tv/ivtv installed and
-	# linux-headers != 2.6.18, which is currently not keyworded
-	# See also, bug 164748
-	myconf="${myconf} --disable-pvr --disable-ivtv"
-
-	myconf="${myconf} $(use_enable ipv6 inet6)"
-	myconf="${myconf} $(use_enable joystick)"
-	myconf="${myconf} $(use_enable lirc)"
-	myconf="${myconf} $(use_enable rtc)"
-	myconf="${myconf} $(use_enable samba smb)"
-	myconf="${myconf} $(use_enable truetype freetype)"
-	use live || myconf="${myconf} --disable-live"
-	use v4l	 || myconf="${myconf} --disable-tv-v4l1"
-	use v4l2 || myconf="${myconf} --disable-tv-v4l2"
-	use jack || myconf="${myconf} --disable-jack"
-
-	#########
-	# Codecs #
-	########
-	myconf="${myconf} $(use_enable gif)"
-	myconf="${myconf} $(use_enable jpeg)"
-	#myconf="${myconf} $(use_enable ladspa)"
-	myconf="${myconf} $(use_enable dts libdts)"
-	myconf="${myconf} $(use_enable lzo liblzo)"
-	myconf="${myconf} $(use_enable musepack)"
-	myconf="${myconf} $(use_enable aac faad-internal)"
-	use vorbis || myconf="${myconf} --disable-libvorbis"
-	myconf="${myconf} $(use_enable theora)"
-	use speex || myconf="${myconf} --disable-speex"
-	myconf="${myconf} $(use_enable xvid)"
-	use x86 && myconf="${myconf} $(use_enable real)"
-	! use livecd && ! use bindist && \
-		myconf="${myconf} $(use_enable win32codecs win32)"
-
-	#############
-	# Video Output #
-	#############
-	myconf="${myconf} $(use_enable 3dfx)"
-	if use 3dfx
-	then
-		myconf="${myconf} --enable-tdfxvid"
-	else
-		myconf="${myconf} --disable-tdfxvid"
-	fi
-	if use fbcon && use 3dfx
-	then
-		myconf="${myconf} --enable-tdfxfb"
-	else
-		myconf="${myconf} --disable-tdfxfb"
-	fi
-
-	if use dvb
-	then
-		myconf="${myconf} --enable-dvbhead"
-	else
-		myconf="${myconf} --disable-dvbhead"
-	fi
-
-	use aalib || myconf="${myconf} --disable-aa"
-	myconf="${myconf} $(use_enable directfb)"
-	myconf="${myconf} $(use_enable fbcon fbdev)"
-	myconf="${myconf} $(use_enable ggi)"
-	myconf="${myconf} $(use_enable libcaca caca)"
-	if use matrox && use X
-	then
-		myconf="${myconf} $(use_enable matrox xmga)"
-	fi
-	myconf="${myconf} $(use_enable matrox mga)"
-	myconf="${myconf} $(use_enable opengl gl)"
-	myconf="${myconf} $(use_enable sdl)"
-
-	if use svga
-	then
-		myconf="${myconf} --enable-svga"
-	else
-		myconf="${myconf} --disable-svga --disable-vidix-internal"
-	fi
-
-	myconf="${myconf} $(use_enable tga)"
-
-	if use xv && use xvmc
-	then
-		myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCW"
-	else
-		myconf="${myconf} --disable-xvmc"
-	fi
-
-	#############
-	# Audio Output #
-	#############
-	use alsa || myconf="${myconf} --disable-alsa"
-	use arts || myconf="${myconf} --disable-arts"
-	use esd || myconf="${myconf} --disable-esd"
-	use mad || myconf="${myconf} --disable-mad"
-	use nas || myconf="${myconf} --disable-nas"
-	use openal || myconf="${myconf} --disable-openal"
-	use oss || myconf="${myconf} --disable-ossaudio"
-
-	#################
-	# Advanced Options #
-	#################
-	# Platform specific flags, hardcoded on amd64 (see below)
-	myconf="${myconf} $(use_enable 3dnow)"
-	myconf="${myconf} $(use_enable 3dnowext)";
-	myconf="${myconf} $(use_enable sse)"
-	myconf="${myconf} $(use_enable sse2)"
-	myconf="${myconf} $(use_enable mmx)"
-	myconf="${myconf} $(use_enable mmxext)"
-	use debug && myconf="${myconf} --enable-debug=3"
-
-	if use ppc64
-	then
-		myconf="${myconf} --disable-altivec"
-	else
-		myconf="${myconf} $(use_enable altivec)"
-		use altivec && append-flags -maltivec -mabi=altivec
-	fi
-
-	if use xanim
-	then
-		myconf="${myconf} --with-xanimlibdir=/usr/lib/xanim/mods"
-	fi
-
-	if [ -e /dev/.devfsd ]
-	then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	# support for blinkenlights
-	use bl && myconf="${myconf} --enable-bl"
-
-	#leave this in place till the configure/compilation borkage is completely corrected back to pre4-r4 levels.
-	# it's intended for debugging so we can get the options we configure mplayer w/, rather then hunt about.
-	# it *will* be removed asap; in the meantime, doesn't hurt anything.
-	echo "${myconf}" > ${T}/configure-options
-
-	if use custom-cflags
-	then
-	# let's play the filtration game!  MPlayer hates on all!
-	strip-flags
-	# ugly optimizations cause MPlayer to cry on x86 systems!
-		if use x86 ; then
-			replace-flags -O* -O2
-			filter-flags -fPIC -fPIE
-			use debug || append-flags -fomit-frame-pointer
-		fi
-	append-flags -D__STDC_LIMIT_MACROS
-	else
-	unset CFLAGS CXXFLAGS
-	fi
-
-	CFLAGS="$CFLAGS" ./configure \
-		"--cc=$(tc-getCC)" "--host-cc=$(tc-getBUILD_CC)" \
-		--prefix=/usr \
-		--confdir=/usr/share/mplayer \
-		--datadir=/usr/share/mplayer \
-		--enable-largefiles \
-		--enable-menu \
-		--enable-network --enable-ftp \
-		--with-reallibdir=${REALLIBDIR} \
-		--disable-faad-external \
-		${myconf} || die
-
-	# we run into problems if -jN > -j1
-	# see #86245
-	MAKEOPTS="${MAKEOPTS} -j1"
-
-	einfo "Make"
-	emake || die "Failed to build MPlayer!"
-	use doc && make -C DOCS/xml html-chunked
-	einfo "Make completed"
-}
-
-src_install() {
-
-	einfo "Make install"
-	make prefix=${D}/usr \
-		 BINDIR=${D}/usr/bin \
-		 LIBDIR=${D}/usr/$(get_libdir) \
-		 CONFDIR=${D}/usr/share/mplayer \
-		 DATADIR=${D}/usr/share/mplayer \
-		 MANDIR=${D}/usr/share/man \
-		 install || die "Failed to install MPlayer!"
-	einfo "Make install completed"
-
-	dodoc AUTHORS ChangeLog README
-	# Install the documentation; DOCS is all mixed up not just html
-	if use doc ; then
-		find "${S}/DOCS" -type d | xargs -- chmod 0755
-		find "${S}/DOCS" -type f | xargs -- chmod 0644
-		cp -r "${S}/DOCS" "${D}/usr/share/doc/${PF}/" || die
-	fi
-
-	# Copy misc tools to documentation path, as they're not installed directly
-	# and yes, we are nuking the +x bit.
-	find "${S}/TOOLS" -type d | xargs -- chmod 0755
-	find "${S}/TOOLS" -type f | xargs -- chmod 0644
-	cp -r "${S}/TOOLS" "${D}/usr/share/doc/${PF}/" || die
-
-	# Install the default Skin and Gnome menu entry
-	if use gtk; then
-		dodir /usr/share/mplayer/skins
-		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/skins/default || die
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym mplayer /usr/bin/gmplayer
-
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/applications
-		doins ${FILESDIR}/mplayer.desktop
-	fi
-	if ! use truetype || ! use iconv
-	then
-		dodir /usr/share/mplayer/fonts
-		local x=
-		# Do this generic, as the mplayer people like to change the structure
-		# of their zips ...
-		for x in $(find ${WORKDIR}/ -type d -name 'font-arial-*')
-		do
-			cp -pPR ${x} ${D}/usr/share/mplayer/fonts
-		done
-		# Fix the font symlink ...
-		rm -rf ${D}/usr/share/mplayer/font
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-	fi
-
-	insinto /etc
-	newins ${S}/etc/example.conf mplayer.conf
-	dosed -e 's/include =/#include =/' /etc/mplayer.conf
-	dosed -e 's/fs=yes/fs=no/' /etc/mplayer.conf
-	if use truetype && use iconv
-	then
-		cat >> ${D}/etc/mplayer.conf << EOT
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-EOT
-	fi
-	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	#mv the midentify script to /usr/bin for emovix.
-	cp ${D}/usr/share/doc/${PF}/TOOLS/midentify ${D}/usr/bin
-	chmod a+x ${D}/usr/bin/midentify
-
-	insinto /usr/share/mplayer
-	doins ${S}/etc/input.conf
-	doins ${S}/etc/menu.conf
-}
-
-pkg_preinst() {
-
-	if [ -d "${ROOT}/usr/share/mplayer/Skin/default" ]
-	then
-		rm -rf ${ROOT}/usr/share/mplayer/Skin/default
-	fi
-}
-
-pkg_postinst() {
-
-	if use matrox; then
-		depmod -a &>/dev/null || :
-	fi
-
-	if use alsa ; then
-		einfo "For those using alsa, please note the ao driver name is no longer"
-		einfo "alsa9x or alsa1x.  It is now just 'alsa' (omit quotes)."
-		einfo "The syntax for optional drivers has also changed.  For example"
-		einfo "if you use a dmix driver called 'dmixer,' use"
-		einfo "ao=alsa:device=dmixer instead of ao=alsa:dmixer"
-		einfo "Some users may not need to specify the extra driver with the ao="
-		einfo "command."
-	fi
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a \
-		 ! -e ${ROOT}/usr/share/mplayer/font ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
-		 ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}