9 files changed, 17 insertions, 1100 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 657a0a82caa6..2fac06ff863e 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.551 2008/02/15 17:32:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.552 2008/02/15 18:54:36 drac Exp $
+
+  15 Feb 2008; Samuli Suominen <drac@gentoo.org> -files/mplayer-dpms.patch,
+  -files/mplayer-xshape.patch, -mplayer-1.0_rc1_p20070824.ebuild,
+  mplayer-1.0_rc2_p24929-r1.ebuild, mplayer-1.0_rc2_p24929-r2.ebuild,
+  -mplayer-1.0_rc2_p24929-r3.ebuild, mplayer-1.0_rc2_p25993.ebuild:
+  Remove libdts references, unused ebuilds and patches.
 
   15 Feb 2008; Jeroen Roovers <jer@gentoo.org>
   mplayer-1.0_rc2_p25993.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index b2266127e82b..9b35d5711e21 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,18 +1,13 @@
 AUX mplayer-1.0_rc2_p24929-pulse.patch 1217 RMD160 e6a164ce597e677642ec8f1840e90759deb45eac SHA1 62cae651ec5955db3c41313000a5abfe290eaeb0 SHA256 9f0d13c5cf723be3d9fcc88193b33f0eb2b9f0458c1ed1d8049df3bdecfcd33a
-AUX mplayer-dpms.patch 459 RMD160 81e348e8557b4748a828177d00691e79668ac38e SHA1 973dbe08f19a84519a31d3f53a6810e52e4eb911 SHA256 ff143de7b9bcf65d4b479a84bd8a2b6c9aad362d71c0f8619b449d8e07b214a0
-AUX mplayer-xshape.patch 311 RMD160 376c74fd6fc67668dd5b81af68b1c8f429c88b82 SHA1 a2ab09df589243863646c7215fa80b952b5fa0f1 SHA256 b86f955346d7845985dee43a86b4636770260036db600704c9bc236da01e8968
 DIST Blue-1.7.tar.bz2 222567 RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb SHA1 45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9 SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8
 DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
 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-1.0_rc2_p25993.tar.bz2 7949013 RMD160 47d580a2254d7f149f6d4b1db6f7937dd395380c SHA1 376579bf5413b023452c32722cbe3e15d6e18cad SHA256 ddc10dca3feeb713414f711e2982d6790565206c353c18f4052f39776f980c3a
-DIST mplayer-20070824.tar.bz2 7725133 RMD160 70c63e16098920df5c0f5d44608241dce6f1c820 SHA1 6132cc4fe73944b249342f5d4f00505f64098721 SHA256 2d9b84e30ab4c4650b54fcac230a2061f654c4a6206bff64e0b159c58a7f7cf0
 DIST svgalib_helper-1.9.17-mplayer.tar.bz2 7234 RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 SHA1 d2d596f1ddd283188b2990417d22903c0b466d25 SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5
-EBUILD mplayer-1.0_rc1_p20070824.ebuild 16728 RMD160 231c8eb4d3df16539e721ebea78f3d22468a6e38 SHA1 4fcc23124859cfb588d893ae351ae0579e01a26e SHA256 805c9e52d0417d8531ca8eab3fdf553e00359e965b9ebd829732fedd72dbeb79
-EBUILD mplayer-1.0_rc2_p24929-r1.ebuild 15482 RMD160 3fce80b71d6ec0b2eced3c46266139241c0b8348 SHA1 4a2d62458d20d7306a13ddcb37c0aaaf8e66e140 SHA256 11b47abc005a5aeae02f9551113e53be834064b6178861b1283e10cb4d2bddcf
-EBUILD mplayer-1.0_rc2_p24929-r2.ebuild 15562 RMD160 19dd626959ff56c4664a9c2504d5b0c8ef740d54 SHA1 59ebdfaec9558458d302727ff3faaf7ca40a5a96 SHA256 5b3361dc129609860ea13717bd1aa28c65e0bf5e06a4732135107f2772de5e95
-EBUILD mplayer-1.0_rc2_p24929-r3.ebuild 15591 RMD160 dc371e8c9133b0764a10b94f78703f515a23daad SHA1 f292f92d948c0ea79e49bb072fc82aadd8df214c SHA256 5129693c2e2b106273e63898be75476d0f8b3bb3af9bcb8e140663408b3a923a
-EBUILD mplayer-1.0_rc2_p25993.ebuild 15955 RMD160 6a7c5054f4c11370d048227104ca6e1276264769 SHA1 62edeeba9c98e1658fa52106f8e0bbf8949022f9 SHA256 d20982264346cdab90de1cf3e16fbbb97754991f16252c8606c9643d2645ae3a
-MISC ChangeLog 96809 RMD160 fea97ac00edc4614c5277753b642a509e670fdbd SHA1 8c4f7228eedc3ceb69bb5cf73cb14017c4509a1a SHA256 a113668c97297d686811a234772d574e89f8c436190702e0e2558dbb544534ab
+EBUILD mplayer-1.0_rc2_p24929-r1.ebuild 15454 RMD160 2f0bcc97d572667fd202ca82170752d13a0611ca SHA1 5a3f81a64400883c857b1a2c8b99d47a59ee0ee8 SHA256 c1bbe576a5fd17bf8b145a583dbfe39b3679b8538270b414cb16098dad8fe542
+EBUILD mplayer-1.0_rc2_p24929-r2.ebuild 15534 RMD160 03382c15c954e927f1847b519bc9f153af1a7e3d SHA1 e19e65249d7a2f450d530d2dd95229bd35293444 SHA256 dd6cd6c96b13006a6d2078b3b77eb718649efbecc5fc7d2917eaf5fd7d9f4931
+EBUILD mplayer-1.0_rc2_p25993.ebuild 15931 RMD160 8f074a6237c6a57b88d3a981e1dd6ba5f248f6b0 SHA1 e715effe54709a37fddf23eb2f2d2d55a8bc5fc3 SHA256 9ae25b76f742d2978989befdafdb4591df48843c74aacbabdff9c63a8493b54e
+MISC ChangeLog 97147 RMD160 f1e689552ebf79ae00460f44ffe559363d7924f8 SHA1 b2334cbfa31391fa8ecc0221acade269fe072690 SHA256 da6b7109ae9b3c3a396a5e6f87915b9f04479656112f135c2a8153233d20860d
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-video/mplayer/files/mplayer-dpms.patch b/media-video/mplayer/files/mplayer-dpms.patch
deleted file mode 100644
index 23f3010c36b9..000000000000
--- a/media-video/mplayer/files/mplayer-dpms.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur mplayer-20070622.orig/configure mplayer-20070622/configure
---- mplayer-20070622.orig/configure	2007-06-21 22:01:29.000000000 +0300
-+++ mplayer-20070622/configure	2007-08-12 20:54:51.000000000 +0300
-@@ -3923,7 +3923,7 @@
-   (void) DPMSQueryExtension(0, 0, 0);
- }
- EOF
--  cc_check && _xdpms4=yes
-+  cc_check -lXext && _xdpms4=yes
- fi
- if test "$_xdpms4" = yes ; then
-   _def_xdpms='#define HAVE_XDPMS 1'
-Only in mplayer-20070622.orig: mplayer-20070622
diff --git a/media-video/mplayer/files/mplayer-xshape.patch b/media-video/mplayer/files/mplayer-xshape.patch
deleted file mode 100644
index 1436ccda8b81..000000000000
--- a/media-video/mplayer/files/mplayer-xshape.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig      2006-12-14 09:47:52.000000000 -0500
-+++ configure   2006-12-14 09:48:12.000000000 -0500
-@@ -7011,7 +7011,7 @@
-   return exitvar;
- }
- EOF
--    cc_check && _xshape=yes
-+    cc_check "-lXext" && _xshape=yes
-   fi
-   if test "$_xshape" = yes ; then
-     _def_xshape='#define HAVE_XSHAPE 1'
-
diff --git a/media-video/mplayer/mplayer-1.0_rc1_p20070824.ebuild b/media-video/mplayer/mplayer-1.0_rc1_p20070824.ebuild
deleted file mode 100644
index 249e5c48d724..000000000000
--- a/media-video/mplayer/mplayer-1.0_rc1_p20070824.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_p20070824.ebuild,v 1.10 2007/12/05 17:55:19 cla 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="20070824"
-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 ~mips 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
-
-	# Fix polish spelling errors
-	[[ -n ${LINGUAS} ]] && sed -e 's:Zarządano:Zażądano:' -i help/help_mp-pl.h
-
-}
-
-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} --enable-mga"
-	( use X && use video_cards_mga ) && myconf="${myconf} --enable-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_rc2_p24929-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p24929-r1.ebuild
index c4858f56489a..6b5f01943b7a 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p24929-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p24929-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p24929-r1.ebuild,v 1.7 2008/01/17 12:18:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p24929-r1.ebuild,v 1.8 2008/02/15 18:54:36 drac Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -54,7 +54,7 @@ RDEPEND="sys-libs/ncurses
 	cdio? ( dev-libs/libcdio )
 	cdparanoia? ( media-sound/cdparanoia )
 	directfb? ( dev-libs/DirectFB )
-	dts? ( || ( media-libs/libdca media-libs/libdts ) )
+	dts? ( media-libs/libdca )
 	dv? ( media-libs/libdv )
 	dvb? ( media-tv/linuxtv-dvb-headers )
 	encode? (
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p24929-r2.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p24929-r2.ebuild
index 94940f5ef544..728f1be1922a 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p24929-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p24929-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p24929-r2.ebuild,v 1.1 2008/01/05 05:47:28 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p24929-r2.ebuild,v 1.2 2008/02/15 18:54:36 drac Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -54,7 +54,7 @@ RDEPEND="sys-libs/ncurses
 	cdio? ( dev-libs/libcdio )
 	cdparanoia? ( media-sound/cdparanoia )
 	directfb? ( dev-libs/DirectFB )
-	dts? ( || ( media-libs/libdca media-libs/libdts ) )
+	dts? ( media-libs/libdca )
 	dv? ( media-libs/libdv )
 	dvb? ( media-tv/linuxtv-dvb-headers )
 	encode? (
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p24929-r3.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p24929-r3.ebuild
deleted file mode 100644
index 5d423a02b99b..000000000000
--- a/media-video/mplayer/mplayer-1.0_rc2_p24929-r3.ebuild
+++ /dev/null
@@ -1,507 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p24929-r3.ebuild,v 1.2 2008/01/26 18:00:49 aballier 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 debug dga doc dts dvb directfb
-dvd dv enca encode esd fbcon ftp gif ggi gtk iconv ipv6 jack joystick jpeg
-kernel_linux ladspa libcaca lirc live livecd lzo mad md5sum mmx mmxext mp2 mp3
-musepack nas nemesi unicode vorbis opengl openal oss png pnm pulseaudio 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="s3virge mga tdfx vesa"
-
-for x in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${x}"
-done
-
-BLUV="1.7"
-SVGV="1.9.17"
-AMR_URI="http://www.3gpp.org/ftp/Specs/archive"
-SRC_URI="mirror://gentoo/${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 )
-	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 )
-		x264? ( media-libs/x264-svn )
-		)
-	esd? ( media-sound/esound )
-	enca? ( app-i18n/enca )
-	gif? ( media-libs/giflib )
-	ggi? ( media-libs/libggi
-		media-libs/libggiwmh )
-	gtk? ( media-libs/libpng
-		x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-libs/libXi
-		=x11-libs/gtk+-2* )
-	jpeg? ( media-libs/jpeg )
-	ladspa? ( media-libs/ladspa-sdk )
-	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 )
-	pulseaudio? ( media-sound/pulseaudio )
-	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 )
-	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 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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 ${A}
-
-	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
-
-	# Fix polish spelling errors
-	[[ -n ${LINGUAS} ]] && sed -e 's:Zarządano:Zażądano:' -i help/help_mp-pl.h
-
-	# Pulseaudio patch, bug 203430
-	epatch "${FILESDIR}/${P}-pulse.patch"
-}
-
-src_compile() {
-
-	local myconf=" --disable-tv-bsdbt848 \
-		--disable-faad-external"
-
-	# broken upstream, won't work with recent kernels
-	myconf="${myconf} --disable-ivtv --disable-pvr"
-
-	# 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 nemesi || myconf="${myconf} --disable-nemesi"
-	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"
-		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"
-		use teletext || myconf="${myconf} --disable-tv-teletext"
-		if use radio && { use dvb || use v4l || use v4l2; }; 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"
-	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 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 ggi md5sum sdl xinerama; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	use aalib || myconf="${myconf} --disable-aa"
-	use dga || myconf="${myconf} --disable-dga1 --disable-dga2"
-	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_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 kernel_linux && ! use video_cards_mga; then
-		 myconf="${myconf} --disable-mga --disable-xmga"
-	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 ladspa nas openal; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	use pulseaudio || myconf="${myconf} --disable-pulse"
-	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"
-
-	myconf="${myconf} $(use_enable altivec)"
-
-	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 || use x86-fbsd ; 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}"
-	#echo "CFLAGS=\"${CFLAGS}\" ./configure ${myconf}"
-	CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died"
-
-	emake || die "Failed to build MPlayer!"
-	use doc && make -C DOCS/xml html-chunked
-}
-
-src_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!"
-
-	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 "cp docs died"
-	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 "cp docs died"
-
-	# 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 "cp skins died"
-
-		# 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_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_rc2_p25993.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p25993.ebuild
index c1c21d954625..4300838d6486 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p25993.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p25993.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p25993.ebuild,v 1.5 2008/02/15 17:32:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p25993.ebuild,v 1.6 2008/02/15 18:54:36 drac Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -54,7 +54,7 @@ RDEPEND="sys-libs/ncurses
 	cdio? ( dev-libs/libcdio )
 	cdparanoia? ( media-sound/cdparanoia )
 	directfb? ( dev-libs/DirectFB )
-	dts? ( || ( media-libs/libdca media-libs/libdts ) )
+	dts? ( media-libs/libdca )
 	dv? ( media-libs/libdv )
 	dvb? ( media-tv/linuxtv-dvb-headers )
 	encode? (