From 2c9d7649cb6cbea6555929319b093a525ed183ca Mon Sep 17 00:00:00 2001
From: Steve Dibb <beandog@gentoo.org>
Date: Wed, 28 Mar 2007 13:44:18 +0000
Subject: [PATCH] Fix tga use flag, bug 172372, Make mp2 use flag dependent on
 encode, make dv and x264 use flags independent, bug 172232 Package-Manager:
 portage-2.1.2.2

---
 media-video/mplayer/ChangeLog                 |   9 +-
 media-video/mplayer/Manifest                  |  31 +-
 .../digest-mplayer-1.0_rc2_pre20070321-r3     |  24 -
 .../mplayer/mplayer-1.0_pre8-r1.ebuild        |   4 +-
 .../mplayer-1.0_rc2_pre20070321-r3.ebuild     | 582 ------------------
 .../mplayer-1.0_rc2_pre20070321-r4.ebuild     |  31 +-
 6 files changed, 36 insertions(+), 645 deletions(-)
 delete mode 100644 media-video/mplayer/files/digest-mplayer-1.0_rc2_pre20070321-r3
 delete mode 100644 media-video/mplayer/mplayer-1.0_rc2_pre20070321-r3.ebuild

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index aa6941e15398..00ad8ac270b9 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,13 @@
 # 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.467 2007/03/25 18:33:49 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.468 2007/03/28 13:44:18 beandog Exp $
+
+  28 Mar 2007; Steve Dibb <beandog@gentoo.org>
+  -mplayer-1.0_rc2_pre20070321-r3.ebuild,
+  mplayer-1.0_rc2_pre20070321-r4.ebuild:
+  - Fix tga use flag, bug 172372
+  - Make mp2 use flag dependent on encode, make dv and x264 use flags
+  independent, bug 172232
 
   25 Mar 2007; Steve Dibb <beandog@gentoo.org>
   mplayer-1.0_rc2_pre20070321-r3.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index da87db16e2c3..6b94ef77ebd8 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -29,10 +29,10 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e
 DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
 DIST mplayer-1.0_rc2_pre20070321.tar.bz2 12985979 RMD160 13715eb72303756c7aa2115daecde3570bcf13f5 SHA1 2923d642ddec14d99a3fbab0eebf85adcfb9a46c SHA256 98fe5747f5a5688243d9bc038aff9449dd6cb0c1bbacfe0d0ff0fc9d5a794c51
 DIST svgalib_helper-1.9.17-mplayer.tar.bz2 7234 RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 SHA1 d2d596f1ddd283188b2990417d22903c0b466d25 SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5
-EBUILD mplayer-1.0_pre8-r1.ebuild 15254 RMD160 9d3f17e0418eb180842e545b765c17cfe4c9c5f5 SHA1 80d984e23b8c35f325c4b91588ae3c85dd11c267 SHA256 15ebdbbdca29ef6ae211d08837f25c84774f5b242a30efa27e0e3e872ac3fc20
-MD5 429b86376a1bdb9ae07793a78306ab47 mplayer-1.0_pre8-r1.ebuild 15254
-RMD160 9d3f17e0418eb180842e545b765c17cfe4c9c5f5 mplayer-1.0_pre8-r1.ebuild 15254
-SHA256 15ebdbbdca29ef6ae211d08837f25c84774f5b242a30efa27e0e3e872ac3fc20 mplayer-1.0_pre8-r1.ebuild 15254
+EBUILD mplayer-1.0_pre8-r1.ebuild 15253 RMD160 a6dc36d624bd17c32860fad2c24cd348382090cc SHA1 8a83d919dacc763b62b36e1cc64302d9884c0d79 SHA256 8312359333d113d828f3c5d2dab799655876b576d23bb394296810cff2fa90f2
+MD5 fe153a240cc58465e95b9979f1e5b131 mplayer-1.0_pre8-r1.ebuild 15253
+RMD160 a6dc36d624bd17c32860fad2c24cd348382090cc mplayer-1.0_pre8-r1.ebuild 15253
+SHA256 8312359333d113d828f3c5d2dab799655876b576d23bb394296810cff2fa90f2 mplayer-1.0_pre8-r1.ebuild 15253
 EBUILD mplayer-1.0_rc1-r1.ebuild 16371 RMD160 56b3bded2bd3befc12217e10f7206579164d8530 SHA1 335c35c8026d4eff1cfeced8dfa882d11673f4a9 SHA256 ee82ada04b8833d922c7b2f5d9dec44e079405f2f3cc1c8f27451a12c82e384b
 MD5 382390159d7046d162b6efb9e7ee86dc mplayer-1.0_rc1-r1.ebuild 16371
 RMD160 56b3bded2bd3befc12217e10f7206579164d8530 mplayer-1.0_rc1-r1.ebuild 16371
@@ -45,18 +45,14 @@ EBUILD mplayer-1.0_rc1.ebuild 16252 RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54
 MD5 3499ce30257f8bb8cc53c5c91ec31025 mplayer-1.0_rc1.ebuild 16252
 RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54a58 mplayer-1.0_rc1.ebuild 16252
 SHA256 87528c199a11b40baff5e75d6fba5a83499c4bcb7e781fba3910db5423fb3e13 mplayer-1.0_rc1.ebuild 16252
-EBUILD mplayer-1.0_rc2_pre20070321-r3.ebuild 17481 RMD160 1dbd6621dc50e4e1df2b97c3765db00c31beb671 SHA1 10f0a975e251db30a13553843451119c30123100 SHA256 966100f7f2cb1eb3562d88ad561d3fc13146d6a4f5cbac9a363ae7428fc61415
-MD5 583bfa671e1e28b4136e0b378e8e2c53 mplayer-1.0_rc2_pre20070321-r3.ebuild 17481
-RMD160 1dbd6621dc50e4e1df2b97c3765db00c31beb671 mplayer-1.0_rc2_pre20070321-r3.ebuild 17481
-SHA256 966100f7f2cb1eb3562d88ad561d3fc13146d6a4f5cbac9a363ae7428fc61415 mplayer-1.0_rc2_pre20070321-r3.ebuild 17481
-EBUILD mplayer-1.0_rc2_pre20070321-r4.ebuild 17814 RMD160 c896fa651eb29a5e615f6e3d7ecbb6c7d73c034b SHA1 d4a7a43377e314daffa9b2e3ec5095fa12eecadd SHA256 766b2fb682293a302713dfb3666524e2d53448189816e0f1ddd1ad8510852d44
-MD5 857d6190bf74e54d7bf5ef6f9bdc0571 mplayer-1.0_rc2_pre20070321-r4.ebuild 17814
-RMD160 c896fa651eb29a5e615f6e3d7ecbb6c7d73c034b mplayer-1.0_rc2_pre20070321-r4.ebuild 17814
-SHA256 766b2fb682293a302713dfb3666524e2d53448189816e0f1ddd1ad8510852d44 mplayer-1.0_rc2_pre20070321-r4.ebuild 17814
-MISC ChangeLog 83940 RMD160 9ac1068dd490c7ab5304a44e73485df7a7fb9ee4 SHA1 471d8a9f16a0baab8a1b9938079f0a49074382fc SHA256 fc367577c88f4a71b0d381ad908c182fce16e349d28b0aa70b4b77723e3e7d67
-MD5 0c221c82c5bb9fd8c32897bc9924be2e ChangeLog 83940
-RMD160 9ac1068dd490c7ab5304a44e73485df7a7fb9ee4 ChangeLog 83940
-SHA256 fc367577c88f4a71b0d381ad908c182fce16e349d28b0aa70b4b77723e3e7d67 ChangeLog 83940
+EBUILD mplayer-1.0_rc2_pre20070321-r4.ebuild 17673 RMD160 d58abb9175a42a04668520327838be48d79dc840 SHA1 3b14b897a0b49aea5ba60bc5458902c521ae1e4d SHA256 3af0a00762697e27d627d669ed9bae5009014d7c5d29163e9edb327721ed7b1c
+MD5 d1a0c6fa7dfb1407752edbf404b666dc mplayer-1.0_rc2_pre20070321-r4.ebuild 17673
+RMD160 d58abb9175a42a04668520327838be48d79dc840 mplayer-1.0_rc2_pre20070321-r4.ebuild 17673
+SHA256 3af0a00762697e27d627d669ed9bae5009014d7c5d29163e9edb327721ed7b1c mplayer-1.0_rc2_pre20070321-r4.ebuild 17673
+MISC ChangeLog 84200 RMD160 c3d966e1afcd92ff9dd64774d5f56d63a73e8c68 SHA1 e1da3fbe3bc1d1fcdd23edd98f121833e0acb8c0 SHA256 72d4d1c36e8af2fd4f87d3a9ed306a746a5e58ee0137ac63131b41c0346a8102
+MD5 827a15768a636f819c9b33af7b44dd54 ChangeLog 84200
+RMD160 c3d966e1afcd92ff9dd64774d5f56d63a73e8c68 ChangeLog 84200
+SHA256 72d4d1c36e8af2fd4f87d3a9ed306a746a5e58ee0137ac63131b41c0346a8102 ChangeLog 84200
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -73,9 +69,6 @@ SHA256 b0f6ba62381548cffb2eb17179cdb5927605e273c5d5b834b225cff495e9136a files/di
 MD5 d7bbbcb7a88505edca78e82546995d4f files/digest-mplayer-1.0_rc1-r2 1997
 RMD160 95a72a90b4c19fc9063c6fab3bdb9647c6c5686f files/digest-mplayer-1.0_rc1-r2 1997
 SHA256 b0f6ba62381548cffb2eb17179cdb5927605e273c5d5b834b225cff495e9136a files/digest-mplayer-1.0_rc1-r2 1997
-MD5 6a0015f92b25db7a057386ae370908a6 files/digest-mplayer-1.0_rc2_pre20070321-r3 2039
-RMD160 c342ef1a6c1999ec11f6b693724fb0de62a4dcd3 files/digest-mplayer-1.0_rc2_pre20070321-r3 2039
-SHA256 a2ed6418258faf594cb47552c3544d04d114eab1e982be07e44a06ca8e27a4d7 files/digest-mplayer-1.0_rc2_pre20070321-r3 2039
 MD5 6a0015f92b25db7a057386ae370908a6 files/digest-mplayer-1.0_rc2_pre20070321-r4 2039
 RMD160 c342ef1a6c1999ec11f6b693724fb0de62a4dcd3 files/digest-mplayer-1.0_rc2_pre20070321-r4 2039
 SHA256 a2ed6418258faf594cb47552c3544d04d114eab1e982be07e44a06ca8e27a4d7 files/digest-mplayer-1.0_rc2_pre20070321-r4 2039
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_rc2_pre20070321-r3 b/media-video/mplayer/files/digest-mplayer-1.0_rc2_pre20070321-r3
deleted file mode 100644
index 8cac4a7078e1..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_rc2_pre20070321-r3
+++ /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/mplayer-1.0_pre8-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild
index 6de1f1c8a363..c21efcf27c75 100644
--- a/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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_pre8-r1.ebuild,v 1.17 2006/12/21 18:42:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild,v 1.18 2007/03/28 13:44:18 beandog Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r3.ebuild b/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r3.ebuild
deleted file mode 100644
index 667ca8b73b5c..000000000000
--- a/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r3.ebuild
+++ /dev/null
@@ -1,582 +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_rc2_pre20070321-r3.ebuild,v 1.2 2007/03/25 18:33:49 beandog Exp $
-
-inherit eutils flag-o-matic multilib
-
-RESTRICT="nostrip"
-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 theora tivo truetype v4l v4l2 vidix win32codecs X x264
-xanim xinerama xv xvid xvmc zoran"
-
-LANGS="bg cs da de el es fr hu it ja ko mk nb no pl ro ru sk sv tr uk pt_BR zh_CN zh_TW"
-
-VIDEO_CARDS="s3virge mga tdfx tga vesa"
-
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-for X in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${X}"
-done
-
-BLUV=1.7
-SVGV=1.9.17
-
-S="${WORKDIR}/${PN}"
-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 )
-	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 ) )
-		)
-	)
-	x86? ( mp2? ( media-sound/twolame ) )
-	amd64? ( mp2? ( media-sound/twolame ) )
-	a52? ( media-libs/a52dec )
-	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 )
-	dvb? ( media-tv/linuxtv-dvb-headers )
-	dvd? ( dvdnav? ( media-libs/libdvdnav ) )
-	encode? (
-		aac? ( media-libs/faac )
-		dv? ( media-libs/libdv )
-		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 )
-	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 )
-	video_cards_tdfx? ( x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-drivers/xf86-video-tdfx )
-	theora? ( media-libs/libtheora )
-	live? ( >=media-plugins/live-2007.02.20 )
-	truetype? ( >=media-libs/freetype-2.1
-		media-libs/fontconfig )
-	video_cards_mga? ( x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-drivers/xf86-video-mga )
-	video_cards_s3virge? ( x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-drivers/xf86-video-s3virge )
-	video_cards_tga? ( x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-drivers/xf86-video-tga )
-	video_cards_vesa? ( x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-drivers/xf86-video-vesa )
-	vidix? ( x11-libs/libXxf86vm
-		x11-libs/libXext )
-	xinerama? ( x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/libXext )
-	xanim? ( media-video/xanim )
-	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 )
-	)"
-
-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 )
-	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"
-
-src_unpack() {
-
-	unpack ${P}.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"
-
-	# have fun with LINGUAS variable
-	[[ -n $LINGUAS ]] && LINGUAS=${LINGUAS/da/dk}
-	local myconf_linguas="--language="
-	for x in ${LANGS}; do
-		if use linguas_${x}; then
-			myconf_linguas="${myconf_linguas},${x}"
-		fi
-	done
-	# Add on English as well
-	use linguas_en || myconf_linguas="${myconf_linguas},en"
-	myconf="${myconf} ${myconf_linguas}"
-
-	################
-	#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 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 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_tga || myconf="${myconf} --disable-tga"
-	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
-	for x in 3dnow 3dnowext mmx mmxext sse sse2; do
-		use ${x} || myconf="${myconf} --disable-${x}"
-	done
-	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=/usr/share/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
-	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 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
-	newins ${S}/etc/example.conf mplayer.conf
-
-	if use srt || use truetype;	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
-	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_rc2_pre20070321-r4.ebuild b/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild
index 83e59f79b987..2cbf90b415c3 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild
@@ -1,6 +1,6 @@
 # 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_rc2_pre20070321-r4.ebuild,v 1.1 2007/03/25 15:06:01 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_pre20070321-r4.ebuild,v 1.2 2007/03/28 13:44:18 beandog Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -10,10 +10,10 @@ 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 theora tivo truetype v4l v4l2 vidix win32codecs X x264
-xanim xinerama xv xvid xvmc zoran"
+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 tga vesa"
+VIDEO_CARDS="s3virge mga tdfx vesa"
 
 for X in ${VIDEO_CARDS}; do
 	IUSE="${IUSE} video_cards_${X}"
@@ -50,8 +50,6 @@ RDEPEND="sys-libs/ncurses
 			amd64? ( real? ( media-libs/amd64codecs ) )
 		)
 	)
-	x86? ( mp2? ( media-sound/twolame ) )
-	amd64? ( mp2? ( media-sound/twolame ) )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
@@ -60,13 +58,13 @@ RDEPEND="sys-libs/ncurses
 	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 )
-		dv? ( media-libs/libdv )
+		mp2? ( media-sound/twolame )
 		mp3? ( media-sound/lame )
-		x264? ( media-libs/x264-svn )
 		)
 	esd? ( media-sound/esound )
 	enca? ( app-i18n/enca )
@@ -93,9 +91,6 @@ RDEPEND="sys-libs/ncurses
 	srt? ( >=media-libs/freetype-2.1
 		media-libs/fontconfig )
 	svga? ( media-libs/svgalib )
-	video_cards_tdfx? ( x11-libs/libXxf86vm
-		x11-libs/libXext
-		x11-drivers/xf86-video-tdfx )
 	theora? ( media-libs/libtheora )
 	live? ( >=media-plugins/live-2007.02.20 )
 	truetype? ( >=media-libs/freetype-2.1
@@ -106,18 +101,19 @@ RDEPEND="sys-libs/ncurses
 	video_cards_s3virge? ( x11-libs/libXxf86vm
 		x11-libs/libXext
 		x11-drivers/xf86-video-s3virge )
-	video_cards_tga? ( x11-libs/libXxf86vm
+	video_cards_tdfx? ( x11-libs/libXxf86vm
 		x11-libs/libXext
-		x11-drivers/xf86-video-tga )
+		x11-drivers/xf86-video-tdfx )
 	video_cards_vesa? ( x11-libs/libXxf86vm
 		x11-libs/libXext
 		x11-drivers/xf86-video-vesa )
 	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 )
-	xanim? ( media-video/xanim )
 	xv? ( x11-libs/libXv
 		x11-libs/libXxf86vm
 		x11-libs/libXext
@@ -147,6 +143,7 @@ DEPEND="${RDEPEND}
 # 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 ) )"
@@ -317,7 +314,7 @@ src_compile() {
 	#########
 	# Codecs #
 	########
-	for x in gif jpeg live mad musepack pnm speex theora xanim xvid; do
+	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"
@@ -325,7 +322,8 @@ src_compile() {
 	use dts || myconf="${myconf} --disable-libdts"
 	! use png && ! use gtk && myconf="${myconf} --disable-png"
 	use lzo || myconf="${myconf} --disable-liblzo"
-	use mp2 || myconf="${myconf} --disable-twolame --disable-toolame"
+	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"
@@ -358,7 +356,6 @@ src_compile() {
 	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_tga || myconf="${myconf} --disable-tga"
 	use video_cards_vesa || myconf="${myconf} --disable-vesa"
 	use vidix || myconf="${myconf} --disable-vidix-internal \
 		--disable-vidix-external"
-- 
2.26.2