Fix use invocation

5 files changed, 30 insertions, 25 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 08f5fb69608e..694b3c406368 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.63 2004/05/17 09:27:13 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.64 2004/06/09 17:09:41 agriffis Exp $
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> mjpegtools-1.6.0-r7.ebuild,
+  mjpegtools-1.6.1.90-r2.ebuild, mjpegtools-1.6.2-r1.ebuild,
+  mjpegtools-1.6.2-r2.ebuild:
+  Fix use invocation
 
 *mjpegtools-1.6.2-r2 (17 May 2004)
 
diff --git a/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild b/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild
index c0822c2cb47f..2c91fd394b2e 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild,v 1.20 2004/03/30 04:44:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild,v 1.21 2004/06/09 17:09:41 agriffis Exp $
 
 inherit eutils gcc libtool flag-o-matic base
 
@@ -49,7 +49,7 @@ src_unpack() {
 		sed -i "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" libmjpeg.h
 		sed -i "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" jpeg_old.h
 
-		if [ "`gcc-major-version`" -eq "3" ] ; then
+		if [ $(gcc-major-version) -eq 3 ] ; then
 		# Don't remove this - contact phoen][x <phoenix@gentoo.org> if you have problems with it.
 		cd ${S}/lavtools
 		sed -i "s/dv_decoder_new(0,0,0)\;/dv_decoder_new()\;/" lav_common.c
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild
index 4f282ff3920d..229e880a3449 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild,v 1.6 2004/05/12 12:40:14 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild,v 1.7 2004/06/09 17:09:41 agriffis Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -37,19 +37,19 @@ src_compile() {
 
 	filter-flags -fPIC
 
-	[ `use x86` ] && [ `gcc-major-version` -eq 3 ] && append-flags -mno-sse2
+	use x86 && [ $(gcc-major-version) -eq 3 ] && append-flags -mno-sse2
 
-	myconf="${myconf} `use_with X x`"
-	myconf="${myconf} `use_with quicktime`"
-	myconf="${myconf} `use_enable x86 cmov-extensions`"
+	myconf="${myconf} $(use_with X x)"
+	myconf="${myconf} $(use_with quicktime)"
+	myconf="${myconf} $(use_enable x86 cmov-extensions)"
 
-	if [ "`use dv`" ] ; then
+	if use dv ; then
 		myconf="${myconf} --with-dv=/usr"
 	fi
-	if [ "`use mmx`" -o "`use 3dnow`" -o "`use sse`" ] ; then
+	if use mmx || use 3dnow || use sse; then
 		myconf="${myconf} --enable-simd-accel"
 	fi
-	if [ "`use mmx`" ] ; then
+	if use mmx ; then
 		myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
 	fi
 
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild
index fb7983134e7b..d7b92029ae36 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild,v 1.8 2004/05/12 13:46:27 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild,v 1.9 2004/06/09 17:09:41 agriffis Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -43,24 +43,24 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	[ `gcc-major-version` -eq 3 ] && [ "${ARCH}" == "x86" ] && append-flags -mno-sse2
+	[ $(gcc-major-version) -eq 3 ] && [ "${ARCH}" == "x86" ] && append-flags -mno-sse2
 
-	myconf="${myconf} `use_with X x`"
-	myconf="${myconf} `use_with quicktime`"
-	myconf="${myconf} `use_enable x86 cmov-extensions`"
+	myconf="${myconf} $(use_with X x)"
+	myconf="${myconf} $(use_with quicktime)"
+	myconf="${myconf} $(use_enable x86 cmov-extensions)"
 
 	# Fix for Via C3-1, see #30345
 	grep -q cmov /proc/cpuinfo || myconf="${myconf} --enable-cmov-extension=no"
 
-	if [ "`use dv`" ] ; then
+	if use dv ; then
 		myconf="${myconf} --with-dv=/usr"
 	fi
 
-	if [ "`use x86`" ]; then
-		if [ "`use mmx`" -o "`use 3dnow`" -o "`use sse`" ] ; then
+	if use x86; then
+		if use mmx || use 3dnow || use sse; then
 			myconf="${myconf} --enable-simd-accel"
 		fi
-		if [ "`use mmx`" ] ; then
+		if use mmx ; then
 			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
 		fi
 	fi
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild
index c4bb4ad311ba..8404b5db5b16 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild,v 1.1 2004/05/17 09:27:13 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild,v 1.2 2004/06/09 17:09:42 agriffis Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -43,11 +43,11 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	[ `gcc-major-version` -eq 3 ] && [ "${ARCH}" == "x86" ] && append-flags -mno-sse2
+	[ $(gcc-major-version) -eq 3 ] && [ "${ARCH}" == "x86" ] && append-flags -mno-sse2
 
-	myconf="${myconf} `use_with X x`"
-	myconf="${myconf} `use_with quicktime`"
-	myconf="${myconf} `use_enable x86 cmov-extensions`"
+	myconf="${myconf} $(use_with X x)"
+	myconf="${myconf} $(use_with quicktime)"
+	myconf="${myconf} $(use_enable x86 cmov-extensions)"
 
 	# Fix for Via C3-1, see #30345
 	grep -q cmov /proc/cpuinfo || myconf="${myconf} --enable-cmov-extension=no"