From: Luca Barbato <lu_zero@gentoo.org>
Date: Sun, 10 Dec 2006 17:07:42 +0000 (+0000)
Subject: fix faac dep
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a081d2b58451981b916a491d94e4ced336ab4e14;p=gentoo.git

fix faac dep
Package-Manager: portage-2.1.2_rc2-r5
---

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 2e5394831a9a..fed647613f0f 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.437 2006/12/01 16:32:04 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.438 2006/12/10 17:07:42 lu_zero Exp $
+
+  10 Dec 2006; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_rc1.ebuild:
+  Fix faac dep
 
   01 Dec 2006; Steve Dibb <beandog@gentoo.org> mplayer-1.0_rc1.ebuild:
   Disable pvr support
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 3d4cb24643ff..859a60fdc32e 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -27,14 +27,14 @@ EBUILD mplayer-1.0_pre8.ebuild 15502 RMD160 f5a95b76f748d84dd3c9f48250abdb371f0c
 MD5 db980765b40b1685613b1c2b3f91ecbc mplayer-1.0_pre8.ebuild 15502
 RMD160 f5a95b76f748d84dd3c9f48250abdb371f0c1143 mplayer-1.0_pre8.ebuild 15502
 SHA256 064f4421b0e091fba4c575b09cedd21cf6c4b8757bdc4608519d63d5b2dd5c9e mplayer-1.0_pre8.ebuild 15502
-EBUILD mplayer-1.0_rc1.ebuild 16130 RMD160 9f6a85548a4121692d2f9510cd513dc0217517f1 SHA1 483a9588a9df81e2dfe684438351703ae23fac2a SHA256 7875d37522025f4db7cd03b3148ed86c99b121f73b6a2f2b7d939663ec4df913
-MD5 f08411b634688e37bc87746251e044e1 mplayer-1.0_rc1.ebuild 16130
-RMD160 9f6a85548a4121692d2f9510cd513dc0217517f1 mplayer-1.0_rc1.ebuild 16130
-SHA256 7875d37522025f4db7cd03b3148ed86c99b121f73b6a2f2b7d939663ec4df913 mplayer-1.0_rc1.ebuild 16130
-MISC ChangeLog 78842 RMD160 02ff1d5f90e593365c353239cc88f1214923b596 SHA1 e80ee263e26a7bec5f985c786e3407c2f4fc489e SHA256 4a47c31332ff4a07ba7cbf364b741a4d2d664e57723f0810233d13c14fdd912f
-MD5 ddc572100616439e422f2cbc5bba633f ChangeLog 78842
-RMD160 02ff1d5f90e593365c353239cc88f1214923b596 ChangeLog 78842
-SHA256 4a47c31332ff4a07ba7cbf364b741a4d2d664e57723f0810233d13c14fdd912f ChangeLog 78842
+EBUILD mplayer-1.0_rc1.ebuild 16221 RMD160 e408fa12fc8f40c2546809bff2c855ce43abd988 SHA1 91ca61a5328018139cbf05775b9a1bb4ce0bdc0f SHA256 ebda9f1b1689ecfe0fc297b760d2fec44b7bae682ca6a703e50892ec469c7d7c
+MD5 6532c07d3e5d2d9798dbfaf89e043319 mplayer-1.0_rc1.ebuild 16221
+RMD160 e408fa12fc8f40c2546809bff2c855ce43abd988 mplayer-1.0_rc1.ebuild 16221
+SHA256 ebda9f1b1689ecfe0fc297b760d2fec44b7bae682ca6a703e50892ec469c7d7c mplayer-1.0_rc1.ebuild 16221
+MISC ChangeLog 78931 RMD160 a651485884506e7656181ecdcf923588eecd9828 SHA1 c0829efc96cd914ff406619353f11d825171f16f SHA256 44fe8159fe93976342cd27221367f29d9435c9aa6b7467fb77d2e17c140fe037
+MD5 7b99c8687f812d8f307ff77a2ddee565 ChangeLog 78931
+RMD160 a651485884506e7656181ecdcf923588eecd9828 ChangeLog 78931
+SHA256 44fe8159fe93976342cd27221367f29d9435c9aa6b7467fb77d2e17c140fe037 ChangeLog 78931
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
diff --git a/media-video/mplayer/mplayer-1.0_rc1.ebuild b/media-video/mplayer/mplayer-1.0_rc1.ebuild
index f5742919cca4..20c6e0fb7b70 100644
--- a/media-video/mplayer/mplayer-1.0_rc1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.ebuild,v 1.15 2006/12/01 16:32:04 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.16 2006/12/10 17:07:42 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
@@ -63,6 +63,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 		media-sound/lame
 		dv? ( >=media-libs/libdv-0.9.5 )
 		x264? ( >=media-libs/x264-svn-20061014 )
+		aac? ( media-libs/faac )
 		)
 	esd? ( media-sound/esound )
 	enca? ( app-i18n/enca )
@@ -235,8 +236,10 @@ src_compile() {
 		myconf="${myconf} --enable-mencoder"
 		use dv || myconf="${myconf} --disable-libdv"
 		use x264 || myconf="${myconf} --disable-x264"
+		use aac || myconf="${myconf} --disable-faac"
 	else
-		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264"
+		myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264
+		--disable-faac"
 	fi
 
 	myconf="${myconf} $(use_enable gtk gui)"