Remove unused versions still depending only libdts because it's getting removed in favour of libdca.

Package-Manager: portage-2.1.4_rc14

6 files changed, 11 insertions, 1166 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 1a738dfa0b45..e90652c508eb 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.540 2008/01/05 16:02:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.541 2008/01/07 13:03:40 drac Exp $
+
+  07 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  -mplayer-1.0_rc1_p20070622-r1.ebuild,
+  -mplayer-1.0_rc1_p20070622-r4.ebuild:
+  Remove unused versions still depending only libdts because it's getting
+  removed in favour of libdca.
 
   05 Jan 2008; Brent Baude <ranger@gentoo.org>
   mplayer-1.0_rc2_p24929-r1.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index a6570707f685..87d741b9e91d 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -20,18 +20,9 @@ DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb
 DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
 DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
 DIST mplayer-1.0_rc2_p24929.tar.bz2 7830452 RMD160 85821348a9049e1d5cbe46ba3eb0bad14bedeeb7 SHA1 b97630d209fc189273ba370c0f3c3783f411edb9 SHA256 2bbd0146ce6f55dc8eeebb4c8a8cedc0c8d38b2e079fdd1aa7909fa77d97ce48
-DIST mplayer-20070622.tar.bz2 7623148 RMD160 637abb1d9bbe1791b29c2abf3b11f10e0729f912 SHA1 88eb9d20796159cb56ae7fc09739c3ec4a745bdb SHA256 982da74bfb397f77f093650efc254c0bc340dd58f34f7f9d8b8c9f9c8ce11e8e
 DIST mplayer-20070824.tar.bz2 7725133 RMD160 70c63e16098920df5c0f5d44608241dce6f1c820 SHA1 6132cc4fe73944b249342f5d4f00505f64098721 SHA256 2d9b84e30ab4c4650b54fcac230a2061f654c4a6206bff64e0b159c58a7f7cf0
 DIST mplayer-20070927.tar.bz2 7742700 RMD160 b19c47e0d3a1e64a8caabca1c6c72a5097946982 SHA1 c76aec776d1cd742840934ea46ad784c4d52eb97 SHA256 c408227d356b433f331db8df97d5f2861a42ad836692b2a9beddb4439c976c44
 DIST svgalib_helper-1.9.17-mplayer.tar.bz2 7234 RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 SHA1 d2d596f1ddd283188b2990417d22903c0b466d25 SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5
-EBUILD mplayer-1.0_rc1_p20070622-r1.ebuild 16794 RMD160 491e3ec6d3aa1b7125518db0315dcb11a2425131 SHA1 ee6b9fec46893680c1c574b888fc54cf633434bb SHA256 9c43b70877e553933363c971024af2e60449a8221ccf45bfb65202a6078a2328
-MD5 59fafdc8c63f74f2788c33f3022f5bbe mplayer-1.0_rc1_p20070622-r1.ebuild 16794
-RMD160 491e3ec6d3aa1b7125518db0315dcb11a2425131 mplayer-1.0_rc1_p20070622-r1.ebuild 16794
-SHA256 9c43b70877e553933363c971024af2e60449a8221ccf45bfb65202a6078a2328 mplayer-1.0_rc1_p20070622-r1.ebuild 16794
-EBUILD mplayer-1.0_rc1_p20070622-r4.ebuild 17008 RMD160 a6c5beb3a84d43862065901c53097fed8932a2dc SHA1 bd4c781993d733c5315034f4a7986989bd3beaf7 SHA256 82b4eb35b20435a15123aad6017af34918c9c78b0d4233e1a52f498b3ffc7e34
-MD5 03d1b0bd37040419006eba0135082993 mplayer-1.0_rc1_p20070622-r4.ebuild 17008
-RMD160 a6c5beb3a84d43862065901c53097fed8932a2dc mplayer-1.0_rc1_p20070622-r4.ebuild 17008
-SHA256 82b4eb35b20435a15123aad6017af34918c9c78b0d4233e1a52f498b3ffc7e34 mplayer-1.0_rc1_p20070622-r4.ebuild 17008
 EBUILD mplayer-1.0_rc1_p20070824.ebuild 16728 RMD160 231c8eb4d3df16539e721ebea78f3d22468a6e38 SHA1 4fcc23124859cfb588d893ae351ae0579e01a26e SHA256 805c9e52d0417d8531ca8eab3fdf553e00359e965b9ebd829732fedd72dbeb79
 MD5 6ab60b0001dfb3389300b1766f60cf5f mplayer-1.0_rc1_p20070824.ebuild 16728
 RMD160 231c8eb4d3df16539e721ebea78f3d22468a6e38 mplayer-1.0_rc1_p20070824.ebuild 16728
@@ -52,20 +43,14 @@ EBUILD mplayer-1.0_rc2_p24929-r2.ebuild 15562 RMD160 19dd626959ff56c4664a9c2504d
 MD5 756d801cbe2fbbe1ce72efc9d1986eb2 mplayer-1.0_rc2_p24929-r2.ebuild 15562
 RMD160 19dd626959ff56c4664a9c2504d5b0c8ef740d54 mplayer-1.0_rc2_p24929-r2.ebuild 15562
 SHA256 5b3361dc129609860ea13717bd1aa28c65e0bf5e06a4732135107f2772de5e95 mplayer-1.0_rc2_p24929-r2.ebuild 15562
-MISC ChangeLog 95174 RMD160 32b6d8585dcd38c3b5dcda971825ef9f76991d60 SHA1 2afbf6096c983aa429b07b38c6e3febd021cd14f SHA256 8e4e9b84476edb8a4f371149be0ab95543285a5a68363e750390b6e13a44ea78
-MD5 f8d27e11ee02badf1cbef26a6afd5142 ChangeLog 95174
-RMD160 32b6d8585dcd38c3b5dcda971825ef9f76991d60 ChangeLog 95174
-SHA256 8e4e9b84476edb8a4f371149be0ab95543285a5a68363e750390b6e13a44ea78 ChangeLog 95174
+MISC ChangeLog 95407 RMD160 da6f09b95bd6b525f0779b4271b8521202901286 SHA1 d2f13b81b2342b7fc4be41eba86d198d7be376fe SHA256 0cf140540559f713f3c506dfc8b653e4360d0c7607bc3d21de04af3dc3d7d6ba
+MD5 d01271e3ec83088e7e492878bc950d1d ChangeLog 95407
+RMD160 da6f09b95bd6b525f0779b4271b8521202901286 ChangeLog 95407
+SHA256 0cf140540559f713f3c506dfc8b653e4360d0c7607bc3d21de04af3dc3d7d6ba ChangeLog 95407
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 metadata.xml 223
-MD5 038a8dfb2379f9d8221902da9c5a27c1 files/digest-mplayer-1.0_rc1_p20070622-r1 1563
-RMD160 e03134b892ac8ec4d63f44cfb01439be8dcec089 files/digest-mplayer-1.0_rc1_p20070622-r1 1563
-SHA256 0201774682322220ee404f4c2d31dcedaa258d113f8bf3f638794eb97cdc58d5 files/digest-mplayer-1.0_rc1_p20070622-r1 1563
-MD5 038a8dfb2379f9d8221902da9c5a27c1 files/digest-mplayer-1.0_rc1_p20070622-r4 1563
-RMD160 e03134b892ac8ec4d63f44cfb01439be8dcec089 files/digest-mplayer-1.0_rc1_p20070622-r4 1563
-SHA256 0201774682322220ee404f4c2d31dcedaa258d113f8bf3f638794eb97cdc58d5 files/digest-mplayer-1.0_rc1_p20070622-r4 1563
 MD5 cc7de52088840bfe0ce3fc6490db0f1d files/digest-mplayer-1.0_rc1_p20070824 1563
 RMD160 98297dc0633481b0bf41930aff4c9850bcee77dc files/digest-mplayer-1.0_rc1_p20070824 1563
 SHA256 e5fc6565054d926c04ef720d660da14f288f11ef2d1a6da74ff8d8183aca9524 files/digest-mplayer-1.0_rc1_p20070824 1563
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_rc1_p20070622-r1 b/media-video/mplayer/files/digest-mplayer-1.0_rc1_p20070622-r1
deleted file mode 100644
index 0ce1a6e14aac..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_rc1_p20070622-r1
+++ /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_rc1_p20070622-r4 b/media-video/mplayer/files/digest-mplayer-1.0_rc1_p20070622-r4
deleted file mode 100644
index 0ce1a6e14aac..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_rc1_p20070622-r4
+++ /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/mplayer-1.0_rc1_p20070622-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc1_p20070622-r1.ebuild
deleted file mode 100644
index e41288ced987..000000000000
--- a/media-video/mplayer/mplayer-1.0_rc1_p20070622-r1.ebuild
+++ /dev/null
@@ -1,552 +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_p20070622-r1.ebuild,v 1.1 2007/08/28 16:03:31 beandog 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 debug 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
-
-}
-
-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
-	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
-	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_rc1_p20070622-r4.ebuild b/media-video/mplayer/mplayer-1.0_rc1_p20070622-r4.ebuild
deleted file mode 100644
index cfe0fbb02a01..000000000000
--- a/media-video/mplayer/mplayer-1.0_rc1_p20070622-r4.ebuild
+++ /dev/null
@@ -1,558 +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_p20070622-r4.ebuild,v 1.5 2007/09/08 06:20:18 josejx 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
-
-	# libdvdcss patch, bug 189665
-	epatch ${FILESDIR}/${PN}-libdvdcss.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
-}