Remove amrnb, amrwb support wrt #252140. Remove arts support wrt #270575. Remove libmpcdec support wrt #279069.

Package-Manager: portage-2.2_rc44/cvs/Linux x86_64

3 files changed, 17 insertions, 14 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index dc31253d9f3f..e52ec61ee46f 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.681 2009/09/26 21:57:17 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.682 2009/10/11 09:15:44 ssuominen Exp $
+
+  11 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  mplayer-1.0_rc2_p20090322.ebuild:
+  Remove amrnb, amrwb support wrt #252140. Remove arts support wrt #270575.
+  Remove libmpcdec support wrt #279069.
 
   25 Sep 2009; Mounir Lamouri <volkmar@gentoo.org>
   mplayer-1.0_rc4_p20090919-r2.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index d0d0a1fee341..5bc49d1cc4cc 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -9,10 +9,10 @@ DIST mplayer-1.0_rc2_p20090322.tar.bz2 8155369 RMD160 1bd036722eb5363df7fcf66c4e
 DIST mplayer-1.0_rc2_p20090731.tar.bz2 8240152 RMD160 365036583cd4e37f6f77a3e56d0b5e1294bda51d SHA1 bd20abf93f3c4198024b6690a53d79236389b600 SHA256 a77da3b956bb442f1600cd7f14860407d671ef114c5f8310c36c825136a4129b
 DIST mplayer-1.0_rc4_p20090919.tar.bz2 15132906 RMD160 e9f061363a043389848a6c1bf0d8f6e22eb09ffb SHA1 cc67e513faa2cc7c0aa6f55b0e918eee8bacc287 SHA256 dd5f61494442a795f47e2db3d877da96bce6db0219feeb9ac05f27065600e06a
 DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938
-EBUILD mplayer-1.0_rc2_p20090322.ebuild 19438 RMD160 1d62d123f9f290239c013618af8518eaac4116b3 SHA1 651460991a16b05802b184c8d64af2a4775dd051 SHA256 51eed17bc8c82f38a4169c5428fd38e6ca81dc495549c3bd9f5dfefd394b9f80
+EBUILD mplayer-1.0_rc2_p20090322.ebuild 19317 RMD160 89bfea83ffb7f073efa40b9e98ddf4477243cbd7 SHA1 9775e3f31a3f3167059057bdb0dd3329183ee9a4 SHA256 a8e89b46c944c3c5acf1c3a06c6f1d0d2e985f82fc4613d93dab01f5b0e07bbf
 EBUILD mplayer-1.0_rc2_p20090731-r1.ebuild 18929 RMD160 e09c9707855e6a7b034e6ca42296569e624272c8 SHA1 9eba91571125c7d4a4fff28d6190b73786748550 SHA256 0f7cd619a9a3829b4d53398c719a200c809cc546bede97575d1f6fcc5f923076
 EBUILD mplayer-1.0_rc2_p20090731.ebuild 18809 RMD160 b8f5753922f99883774185c92e4acfd07af6b8a0 SHA1 454e7e433b3241bc91168687401f1722370429db SHA256 cafcb42cdf20360b6f9ee338263f8692f5158c28c69551f309173fcdff1303dc
 EBUILD mplayer-1.0_rc4_p20090919-r2.ebuild 19053 RMD160 2ca6a88542f0bb937b8e24041bc9f5e30d825ccb SHA1 6859be53b0596d2b69879fa5d1857c873a7bab1b SHA256 53ac23aeafe6804f1502dabceab542991808f8cea6774ec3be6c3c190acc80e7
 EBUILD mplayer-9999.ebuild 20148 RMD160 8240f26bb00fc3f7ed9c04d85e01b21d31de886f SHA1 5c59663a78044798ee791b687a1ee9fe2263ab9b SHA256 3ac96f9b00c2377178afe0bd1f46961a37767e273176b89623d6ad410f7a4f40
-MISC ChangeLog 120871 RMD160 b71ce12f024c0048361cb6fe2780f271fe15f45d SHA1 47d6cf245c8cfa9a4cae3163052af63636512a45 SHA256 8b9c181ffdf28e55704573bc499d4a527e0c54550bc490abc0606c277e117565
+MISC ChangeLog 121080 RMD160 49020cf65b25e3219acfcd6df82060615d06a82b SHA1 3d2b43c23c25470901689305fc5de13e28928074 SHA256 f2ab1c5d6c9c58e925bf7e7987515d37017a187c2c64b8bbbc25dcb2f93b81a1
 MISC metadata.xml 3795 RMD160 7ccde76f30e7bdf191aa2ad2f929856574039774 SHA1 329b521610f9167e2b859daa1d81c2d5c528e0ee SHA256 a6a39dc9cee02fd8b25c40a4ea0337ff85aae26a787d68780151478b975ff0e1
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild
index 02bce5954bc3..f2bdcef18049 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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_p20090322.ebuild,v 1.16 2009/08/03 20:39:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild,v 1.17 2009/10/11 09:15:44 ssuominen Exp $
 
 EAPI="1"
 
@@ -8,12 +8,12 @@ inherit eutils flag-o-matic multilib
 
 MPLAYER_REVISION=29040
 
-IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +amrnb +amrwb arts +ass
+IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass
 bidi bindist bl +cddb +cdio cdparanoia -cpudetection -custom-cflags
 -custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3
 +enca +encode esd +faac +faad fbcon ftp gif ggi -gtk +iconv ipv6 jack
 joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum +mmx
-mmxext mng +mp2 +mp3 musepack nas +nemesi +network openal +opengl oss png pnm
+mmxext mng +mp2 +mp3 nas +nemesi +network openal +opengl oss png pnm
 pulseaudio pvr +quicktime radio +rar +real +rtc -samba
 +schroedinger sdl +speex sse sse2 ssse3 svga teletext tga +theora +tremor
 +truetype +unicode v4l v4l2 vdpau vidix +vorbis -win32codecs +X +x264 xanim
@@ -50,9 +50,6 @@ RDEPEND="sys-libs/ncurses
 	)
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
-	amrnb? ( media-libs/amrnb )
-	amrwb? ( media-libs/amrwb )
-	arts? ( kde-base/arts )
 	ass? ( media-libs/freetype:2
 		media-libs/fontconfig )
 	openal? ( media-libs/openal )
@@ -90,7 +87,6 @@ RDEPEND="sys-libs/ncurses
 	lzo? ( >=dev-libs/lzo-2 )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
-	musepack? ( >=media-libs/libmpcdec-1.2.2 )
 	nas? ( media-libs/nas )
 	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng )
@@ -351,8 +347,9 @@ src_compile() {
 	myconf="${myconf} --disable-liba52"
 
 	use aac || myconf="${myconf} --disable-faad-internal"
-	use amrnb || myconf="${myconf} --disable-libamr_nb"
-	use amrwb || myconf="${myconf} --disable-libamr_wb"
+	myconf="${myconf} --disable-libamr_nb"
+	myconf="${myconf} --disable-libamr_wb"
+	myconf="${myconf} --disable-musepack"
 	use dirac || myconf="${myconf} --disable-libdirac-lavc"
 	use dts || myconf="${myconf} --disable-libdca"
 	use dv || myconf="${myconf} --disable-libdv"
@@ -363,7 +360,7 @@ src_compile() {
 	use schroedinger || myconf="${myconf} --disable-libschroedinger-lavc"
 	use xanim && myconf="${myconf} --xanimcodecsdir=/usr/lib/xanim/mods"
 	! use png && ! use gtk && myconf="${myconf} --disable-png"
-	for x in gif jpeg live mad mng musepack pnm speex tga theora xanim; do
+	for x in gif jpeg live mad mng pnm speex tga theora xanim; do
 		use ${x} || myconf="${myconf} --disable-${x}"
 	done
 	if use vorbis || use tremor; then
@@ -467,7 +464,8 @@ src_compile() {
 	#############
 	# Audio Output #
 	#############
-	for x in alsa arts esd jack ladspa nas openal; do
+	myconf="${myconf} --disable-arts"
+	for x in alsa esd jack ladspa nas openal; do
 		use ${x} || myconf="${myconf} --disable-${x}"
 	done
 	use pulseaudio || myconf="${myconf} --disable-pulse"