cosmetics by Nikoli <nikoli@lavabit.com>, bug #324453

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

2 files changed, 14 insertions, 13 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 558eba830e0d..336e651c79f5 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 7810 RMD160 ab00c524f85c490f138a30d109f1af0ed64e09fa SHA1 248a47274f3e446fff7ac00292fb329c43a1259d SHA256 d115fd620530efd98eae4d7cd717e60a9e31d5e3033e79e947b1b0e08be9ab85
+EBUILD ffmpeg-9999-r1.ebuild 7862 RMD160 7fffcf250e53a78ba1bbe7d028de46791fb0720e SHA1 bb0cf574c11d0ceccb1ad599d3e965a4d47eec23 SHA256 8d90a2fe85d705291711dcf7aa5c109ca2895e361b320345eb5ee39f1dfd76cc
 MISC ChangeLog 53398 RMD160 60d604f4f6adc066945a650f53d5d4dd34615fbc SHA1 16a74fe4457061e35c71edc12a8513ae3ab8a4f2 SHA256 c9a6a368319bfe66076eff58e794bf4be66002958cbffa4eda968cd00863d719
 MISC metadata.xml 1973 RMD160 b94286038640659efda908f1141ebd49dd5fb19a SHA1 80ecb91c771d75606ba135b5f9447649461ca8c9 SHA256 831b6526385ea8e4877d47748f0a27e6983bb42ac879ed7a177104aec0189e95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwYozIACgkQvFcC4BYPU0oqUQCeMPyNNSGhltmxS4aC9VBAGVnd
-I1UAoINYNONDE8YAYmKUzi6IpMTG92cN
-=lgaN
+iEYEARECAAYFAkwbFRcACgkQvFcC4BYPU0oHxACdHKxqS4RbCt2DIRygjxvDTpKW
+m0MAn3T5ieeaFlz5S8MT+HoqkDQYjY5H
+=bGsl
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index f3663f3d2d3c..5eb89c647c2f 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,8 +1,9 @@
 # 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.37 2010/06/12 21:54:13 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.38 2010/06/18 06:38:54 aballier Exp $
+
+EAPI="2"
 
-EAPI=2
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SCM=subversion
@@ -125,11 +126,11 @@ src_configure() {
 	use ieee1394 && myconf="${myconf} --enable-libdc1394"
 	# Indevs
 	for i in v4l v4l2 alsa oss jack ; do
-		use $i || myconf="${myconf} --disable-indev=$i"
+		use ${i} || myconf="${myconf} --disable-indev=${i}"
 	done
 	# Outdevs
 	for i in alsa oss ; do
-		use $i || myconf="${myconf} --disable-outdev=$i"
+		use ${i} || myconf="${myconf} --disable-outdev=${i}"
 	done
 	use X && myconf="${myconf} --enable-x11grab"
 
@@ -140,13 +141,13 @@ src_configure() {
 	use amr && myconf="${myconf} --enable-libopencore-amrwb
 		--enable-libopencore-amrnb"
 	for i in gsm faad dirac rtmp schroedinger speex vpx; do
-		use $i && myconf="${myconf} --enable-lib$i"
+		use ${i} && myconf="${myconf} --enable-lib${i}"
 	done
 	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
 
 	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
-	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i"
-	#	use vdpau || myconf="${myconf} --disable-decoder=$i"
+	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
+	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
 	#done
 	use video_cards_nvidia || myconf="${myconf} --disable-vdpau"
 	use vdpau || myconf="${myconf} --disable-vdpau"
@@ -154,7 +155,7 @@ src_configure() {
 
 	# CPU features
 	for i in mmx ssse3 altivec ; do
-		use $i ||  myconf="${myconf} --disable-$i"
+		use ${i} ||  myconf="${myconf} --disable-${i}"
 	done
 	use mmxext || myconf="${myconf} --disable-mmx2"
 	use 3dnow || myconf="${myconf} --disable-amd3dnow"
@@ -176,7 +177,7 @@ src_configure() {
 	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
 		[ "${i}" = "native" ] && i="host" # bug #273421
 		[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
-		myconf="${myconf} --cpu=$i"
+		myconf="${myconf} --cpu=${i}"
 		break
 	done