fix the configure options building with mencoder disabled, bug #323097

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

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 4f5132d545910f9eb2f315ece0280cc843f768d2..b1c02e32094b9dee7919ee5ce78273885a04d797 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.744 2010/06/02 16:25:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.745 2010/06/11 13:59:49 aballier Exp $
+
+  11 Jun 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+  fix the configure options building with mencoder disabled, bug #323097
 
   02 Jun 2010; Luca Barbato <lu_zero@gentoo.org> mplayer-9999.ebuild:
   Ebuild improvements from Nikoli <nikoli@lavabit.com> see bug #322377

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 50e1484de9e49170fca072aa670aec514c47b2ee..f1e90d558232b112af9cf4e3838b3916cbc5d7ff 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
@@ -8,6 +11,13 @@ DIST mplayer-1.0_rc4_p20100506.tar.bz2 8966725 RMD160 3355600313ac6e6e661acfcdec
 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_p20100506.ebuild 20207 RMD160 1eb6056f90a443eaca390be0b38f7174ed9137b0 SHA1 e599d0d08f1789dfdcbd6b2b0f694ab14670404d SHA256 7d0a6d38e771f3dd58b93269f6b305712362339afd49ae25a0efbac61e53146e
-EBUILD mplayer-9999.ebuild 20100 RMD160 f1edf31552ffbefae7bd21a373c640a27f694c44 SHA1 09c4a9ddc2920c095fcc4b1f78ef3b65d40b8163 SHA256 fdec4541c21eff60367f8c75de25f6c13f1fcfa685135113063e45df6340c8a5
-MISC ChangeLog 131354 RMD160 01085d22b366bfbd3013ccabe1628ed9eb57def5 SHA1 d24c661d4eca9b07a58331abe0837b5d16c5eb4c SHA256 a3092825ab109603e28998c2f7faefb124713ec7789e77f21a78316187e9d065
+EBUILD mplayer-9999.ebuild 20100 RMD160 1b513a68246c6aa1cf68d04ce8baa6b0b8e72763 SHA1 0681d4c14c5ac9b8a6e51a739d992cae524c1683 SHA256 6f38052be4f8bcb6099b385c6723162190e76edf9192b2dcb9c55d030f47b7ee
+MISC ChangeLog 131502 RMD160 725d2955885b4065d52f1ba7ad2f63bbd0a229b9 SHA1 165fdf685954ea7abbd06670fdae326cb84d4b54 SHA256 7723ef97563b463d6febe1d131790da3281f917aa0715d090e4c1cc0a7660d10
 MISC metadata.xml 3586 RMD160 b9cb0e6ff486e5d3cc87e4d23bf0facb1bfa9b5b SHA1 9e082b1c3ff16683a7f7a3b0fd57eaad70673f24 SHA256 5a31e1c7c36addd4653af26afeacdf5cf527c03c55b1636fe0d9aad19215766e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwSQVsACgkQvFcC4BYPU0ogFACeLRY5Kg+itgdIKKHp/fY2CmdD
+WuAAnRGIrQ/eVRUogZ/cG9FdFrkmQqWq
+=o8qG
+-----END PGP SIGNATURE-----

diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index eb05b9328f39dd07ba5e64ca25a50ebd87f0befa..9bdf84e38994e3478577ee0433b1c5ac2af1997f 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.63 2010/06/06 21:27:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.64 2010/06/11 13:59:50 aballier Exp $
 
 EAPI="2"
 
@@ -450,7 +450,7 @@ src_configure() {
                use faac || myconf+=" --disable-faac-lavc"
        else
                myconf+=" --disable-mencoder"
-               myconf+="--disable-faac-lavc"
+               myconf+=" --disable-faac-lavc"
                for i in ${uses}; do
                        myconf+=" --disable-${i}"
                        use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work."