disable faac with use bindist, by Nikoli <nikoli@lavabit.com>, bug #323353

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

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 17c32d8ac998e9b58ec5e6875380a439d58ac033..7988161640ea276a8548012e5d22dc08c6229635 100644 (file)
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # 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.748 2010/06/13 10:07:24 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.749 2010/06/25 11:51:10 aballier Exp $
+
+  25 Jun 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  disable faac with use bindist, by Nikoli <nikoli@lavabit.com>, bug #323353
 
   13 Jun 2010; Dror Levin <spatz@gentoo.org>
   mplayer-1.0_rc4_p20100612.ebuild:

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 06e2c5af8e47ea593f1130d20636388522860dc8..94373a61ea76ed36ef6853c311b917a90f822d1c 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX mplayer-1.0_rc4_p20091026-arm_neon.patch 591 RMD160 339c545419fd815a4b2aa1db9214620ce1b90f85 SHA1 219300d43e567fb3a0df9388798015bef09ddc01 SHA256 71d95820bc0d61a16469e42fa2fe42d4c46ca5339876f926259ed390cbbc899c
 DIST Blue-1.7.tar.bz2 222567 RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb SHA1 45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9 SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8
@@ -13,17 +13,13 @@ DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e4820
 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18927 RMD160 c7309c7c6ede6bac97c11cad1cc7b0e22aefbd51 SHA1 c86f4c9aaa6988514567767bc956e13990604bce SHA256 33f3781cb30c8fa255720858dca723597a4e58aef5fa2ab61c22dcc295b9b070
 EBUILD mplayer-1.0_rc4_p20100506.ebuild 20207 RMD160 1eb6056f90a443eaca390be0b38f7174ed9137b0 SHA1 e599d0d08f1789dfdcbd6b2b0f694ab14670404d SHA256 7d0a6d38e771f3dd58b93269f6b305712362339afd49ae25a0efbac61e53146e
 EBUILD mplayer-1.0_rc4_p20100612.ebuild 20133 RMD160 a7cdd66754ee60da24c014e0468158a40410f6e3 SHA1 c4a2a304ec9142bb6342e6eb0a541416eace8c21 SHA256 3101b28a0d21c33049071e477ac320394dc58bbbcd36235ee0e70ac5b6ee3650
-EBUILD mplayer-9999.ebuild 20174 RMD160 55c5bcd0effcede1a4d37aa5843be4444bfd80af SHA1 b0ca95dd02fa3f600b915ffe9fa86216f5f87432 SHA256 2240e8d39a6901f361a32f1b4ef1f651eb56e891b55563012a67a9c158f1fc6f
-MISC ChangeLog 131941 RMD160 32fdfddc761688b9a2867edb5863a39423aa19bd SHA1 671e244dcf614cf9b9b689b1f01c7d6b977e38a7 SHA256 c7f1eafc972c238150b0890d6dc3b398035fcc038a6f940f19c97095d0e55b19
+EBUILD mplayer-9999.ebuild 20359 RMD160 37d984500b66ec7ab6cafc8cbef203da35317f22 SHA1 b806a7709f6c8808ce552a3bdc9ab7eabd1fa572 SHA256 3c1e1e1c6d447a63f81590dab3511670334d29309db9ee413c91096d8d35bee9
+MISC ChangeLog 132095 RMD160 16a6952088d36a2cc694451bd66f4f6ac2e69c74 SHA1 16dc7b9f72a04f638f7b695822659fdfaaab7224 SHA256 de5bbfceea19cdf78f5cc0039ab184f5b737cf1c3a297c856208ceca33c3ccd4
 MISC metadata.xml 3650 RMD160 c3598892a1a7d707670114f5308ba6e0b9099de4 SHA1 e6a81d9be804eb7998c5986c989fdf4af3456be5 SHA256 918d8349f1b79921e6640d28de306ee6f930d95aca93f88f8686dee8d4722967
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iQEcBAEBCgAGBQJMFK3nAAoJEAWF714uGAc6/cEH+wYNHGXAlnnpeTqGpl9YMfBn
-Ezx8RcEL4MC+aHTZs+y429QQnL+JHd6xp4MmBnWHXR+jHDPiPTrUUVF6maN48WOP
-sAAni2Kbfj4wKK01n4JPHwe6C9o1xEYCY+vIV4KEZci/k2Vwc0OnL/7XjL5DH0On
-mEZv1NHTAl0/IESMKrotoJSu2787OqG7De76N0u+5bcVZYHd0SDw24efSHAM3vcx
-83Jmm09riUvR4Q3qcIu7b9zw7KqTe0SQ0tUrz2+y1h9X0Khlo5FhdqvmvM2QfQBY
-7qQCWipflLO0Vo9oT2sc/RL8MXSr2RSD23ksRGUBQshO332sSb/C5ZJ1hL89wD8=
-=jIkT
+iEYEARECAAYFAkwkmDQACgkQvFcC4BYPU0oYUwCfUvJ7QdVPgfvUlTvGzUj1rhvz
+9tAAnRx2SFfRJU2vZs/5we+FBXFbv5Tx
+=9WBc
 -----END PGP SIGNATURE-----

diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 7e4fd01b6cf40f5a9b83ba4c3ef4c485603e1d99..3c0e8905f081305056797b6353d28120043b59eb 100644 (file)
--- 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.65 2010/06/12 18:14:40 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.66 2010/06/25 11:51:10 aballier Exp $
 
 EAPI="2"
 
@@ -107,7 +107,7 @@ RDEPEND+="
        encode? (
                !twolame? ( toolame? ( media-sound/toolame ) )
                twolame? ( media-sound/twolame )
-               faac? ( media-libs/faac )
+               faac? ( !bindist? ( media-libs/faac ) )
                mp3? ( media-sound/lame )
                x264? ( >=media-libs/x264-0.0.20100423 )
                xvid? ( media-libs/xvid )
@@ -450,6 +450,11 @@ src_configure() {
                        use ${i} || myconf+=" --disable-${i}"
                done
                use faac || myconf+=" --disable-faac-lavc"
+               if use bindist
+               then
+                       use faac && ewarn "faac is nonfree and cannot be distributed; disabling faac support."
+                       myconf+=" --disable-faac --disable-faac-lavc"
+               fi
        else
                myconf+=" --disable-mencoder"
                myconf+=" --disable-faac-lavc"