From: Alexis Ballier <aballier@gentoo.org>
Date: Fri, 18 Jun 2010 06:47:20 +0000 (+0000)
Subject: Sort IUSE and make zlib enabled by default, by Nikoli <nikoli@lavabit.com>, bug ... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c4517b853fbdcbad461e9ce0ff7f5cc4876f570;p=gentoo.git

Sort IUSE and make zlib enabled by default, by Nikoli <nikoli@lavabit.com>, bug #324453
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 2e0baae2e0a0..839ab46174fe 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.356 2010/06/16 10:10:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.357 2010/06/18 06:47:20 aballier Exp $
+
+  18 Jun 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  Sort IUSE and make zlib enabled by default, by Nikoli
+  <nikoli@lavabit.com>, bug #324453
 
 *ffmpeg-0.6 (16 Jun 2010)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 336e651c79f5..ff238d0cc1a5 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -7,13 +7,13 @@ DIST ffmpeg-0.6.tar.bz2 3720372 RMD160 1ff6a8f419239a03d84f67cc954f60f73632432a
 EBUILD ffmpeg-0.5_p20373.ebuild 7761 RMD160 872bb18a1eabab4c81cea1d4cf4f1283b14f4c34 SHA1 270130d83e1a5230102e2add113b9f3bbfe7a564 SHA256 81f73aa9857663d18734f0881bd5d8b648f9228dcec10a2dfb08bef262a1c1e9
 EBUILD ffmpeg-0.5_p22846.ebuild 7608 RMD160 d4a4c505829c6fd6c93e1e6ec465028a0997989e SHA1 46e7764045594b636d0eb6179f464e3f378b4895 SHA256 227cbee58e559eab07d0d97dbccbd2212b56be6c60cc7a57436894ac3b10e63d
 EBUILD ffmpeg-0.6.ebuild 7808 RMD160 0b39b664e9bb620b87865541b4e3c698c86da286 SHA1 7723509cc581138f302be0ca4409327bf35c3aa2 SHA256 c9ae2bc6a3b87cf761e7a7503674f642bebd8394e0e4effd3ffc895bd04e563f
-EBUILD ffmpeg-9999-r1.ebuild 7862 RMD160 7fffcf250e53a78ba1bbe7d028de46791fb0720e SHA1 bb0cf574c11d0ceccb1ad599d3e965a4d47eec23 SHA256 8d90a2fe85d705291711dcf7aa5c109ca2895e361b320345eb5ee39f1dfd76cc
-MISC ChangeLog 53398 RMD160 60d604f4f6adc066945a650f53d5d4dd34615fbc SHA1 16a74fe4457061e35c71edc12a8513ae3ab8a4f2 SHA256 c9a6a368319bfe66076eff58e794bf4be66002958cbffa4eda968cd00863d719
+EBUILD ffmpeg-9999-r1.ebuild 7851 RMD160 0f8cb1cd359bc95967012e6f563873b0621ede11 SHA1 75e08f4da86587e58ecff8855c9e3859543f58cf SHA256 1cb8ee6d6ef52edad88c07f6ced70f2597b60cc5e48a28348fa3733c7b0e04e4
+MISC ChangeLog 53566 RMD160 bf3bbe8093e793e907513b568359ed26bcdd4038 SHA1 756ba2a242f78853706236fcefd9467cf15b89ad SHA256 e78f2743e3c05110460cf9b5da3f008265e2995d329153cbcd1e1063053524dd
 MISC metadata.xml 1973 RMD160 b94286038640659efda908f1141ebd49dd5fb19a SHA1 80ecb91c771d75606ba135b5f9447649461ca8c9 SHA256 831b6526385ea8e4877d47748f0a27e6983bb42ac879ed7a177104aec0189e95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwbFRcACgkQvFcC4BYPU0oHxACdHKxqS4RbCt2DIRygjxvDTpKW
-m0MAn3T5ieeaFlz5S8MT+HoqkDQYjY5H
-=bGsl
+iEYEARECAAYFAkwbFn4ACgkQvFcC4BYPU0rafwCgrfqM/O/sSXY7B99hIbGnxEiP
+9VwAn1S3wklaZajvm/KYQnZMwnwhLeCD
+=XGnv
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 46a2cdcef56b..7ab3891596e8 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.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/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.39 2010/06/18 06:41:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.40 2010/06/18 06:47:20 aballier Exp $
 
 EAPI="2"
 
@@ -30,11 +30,10 @@ if [[ ${PV} == *9999* ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
-	  doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test
-	  theora threads x264 xvid network zlib sdl X mp3 amr
-	  oss pic rtmp schroedinger +hardcoded-tables bindist v4l v4l2
-	  speex +ssse3 jpeg2k vaapi vdpau vpx"
+IUSE="+3dnow +3dnowext alsa altivec amr bindist cpudetection custom-cflags
+debug dirac doc +encode faac faad gsm +hardcoded-tables ieee1394 jack jpeg2k
++mmx +mmxext mp3 network oss pic rtmp schroedinger sdl speex +ssse3 test theora
+threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"