remove aac useflag: let faad and faac useflags handle it; otherwise there is support in ffmpeg; always use system libfaad

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

3 files changed, 16 insertions, 12 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 6e90e956662d..167b8e770528 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.726 2010/04/24 13:03:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.727 2010/04/24 13:24:32 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  remove aac useflag: let faad and faac useflags handle it; otherwise there
+  is support in ffmpeg; always use system libfaad
 
   24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   Disable opencore-amr support with bindist, Apache-2.0 vs GPL-2 issues,
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index a56333566d1b..dcc74cac5f7d 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -15,13 +15,13 @@ DIST mplayer-1.0_rc4_p20100213.tbz2 8811960 RMD160 b6991ef2dde9497bcffa32687f484
 DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938
 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18927 RMD160 c7309c7c6ede6bac97c11cad1cc7b0e22aefbd51 SHA1 c86f4c9aaa6988514567767bc956e13990604bce SHA256 33f3781cb30c8fa255720858dca723597a4e58aef5fa2ab61c22dcc295b9b070
 EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 19858 RMD160 5f77503100806ab35de8133fa488d965438b73f6 SHA1 2d24955936312f05e7c21e0121ca0140d2fc2f0e SHA256 1655621f8bd99ed913f5e3b3104645c2c4fb6644a0de4dcc26b28c71ef1b5fd8
-EBUILD mplayer-9999.ebuild 19968 RMD160 4bd97af50947fb4a17b3199204b8ac0f80d11c4a SHA1 eaa21997f495ab40b604338fdcf51e293d816238 SHA256 73972868765ea72c9611c78abcfbf3e30d4ee0c45a07e371ae06e2ad7d8d4b3e
-MISC ChangeLog 128323 RMD160 80a4fcd0f83356cce2414ad0909ca04306959028 SHA1 2859a464fd484447c4d298d67f564280e16f84e5 SHA256 42c1cf92dedf7de450614b968a018aee910df89aaabcf75b2f09ed8be2619015
+EBUILD mplayer-9999.ebuild 19976 RMD160 a7d01780fe3f311f1171f64065bab72231df7f83 SHA1 08e26b7199781d1ec6969c171ed2a7cc03f77a68 SHA256 06969a2d2097d7e3e8267d3de07ac1d1d1fbb6a4f66d72cf67f2caa7e99796a2
+MISC ChangeLog 128523 RMD160 5d4052c0507b13edbbb1027d10848edd34eeac1c SHA1 f9d458eca95b4d6822348757df02bf21fb7ed70f SHA256 d66df831f4240f9efd2f8853718df760260073ac63af78313dc49ed4bc8c41ac
 MISC metadata.xml 3586 RMD160 b9cb0e6ff486e5d3cc87e4d23bf0facb1bfa9b5b SHA1 9e082b1c3ff16683a7f7a3b0fd57eaad70673f24 SHA256 5a31e1c7c36addd4653af26afeacdf5cf527c03c55b1636fe0d9aad19215766e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvS7S8ACgkQvFcC4BYPU0q46QCguKTzBj+b6/pWqhtUP6f1xBQZ
-hpMAoIQRm8kt+qBG6Uu9V0WpNb/t0gvm
-=2ON+
+iEYEARECAAYFAkvS8RYACgkQvFcC4BYPU0rvHACgpHvIzeMWBIjTp9yccJ/Tauek
+6J0An3YFniwAWtZ16NJ3KIGLkgSo2VaC
+=A4zx
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 4dee71972b99..3253e5b8180c 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.43 2010/04/24 13:07:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.44 2010/04/24 13:24:32 aballier Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ inherit eutils flag-o-matic multilib base ${SVN_ECLASS}
 
 [[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r30554
 
-IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass bidi bindist bl bs2b
+IUSE="3dnow 3dnowext +a52 aalib +alsa altivec +ass bidi bindist bl bs2b
 +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb
 doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
 gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
@@ -112,7 +112,7 @@ RDEPEND+="
 	)
 	esd? ( media-sound/esound )
 	enca? ( app-i18n/enca )
-	faad? ( !aac? ( media-libs/faad2 ) )
+	faad? ( media-libs/faad2 )
 	gif? ( media-libs/giflib )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg? ( media-libs/jpeg )
@@ -403,7 +403,7 @@ src_configure() {
 	# Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-musepack"
 
-	use aac || myconf+=" --disable-faad-internal"
+	myconf+=" --disable-faad-internal" # always use system media-libs/faad2
 	use dirac || myconf+=" --disable-libdirac-lavc"
 	use dts || myconf+=" --disable-libdca"
 	use dv || myconf+=" --disable-libdv"
@@ -446,7 +446,7 @@ src_configure() {
 		for i in ${uses}; do
 			use ${i} || myconf+=" --disable-${i}"
 		done
-		use aac || myconf+=" --disable-faac-lavc"
+		use faac || myconf+=" --disable-faac-lavc"
 	else
 		myconf+="
 			--disable-faac-lavc
@@ -458,7 +458,7 @@ src_configure() {
 			--disable-twolame
 			--disable-toolame
 		"
-		uses="aac faac x264 xvid toolame twolame"
+		uses="faac x264 xvid toolame twolame"
 		for i in ${uses}; do
 			use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work."
 		done