Fix use invocation

16 files changed, 99 insertions, 86 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"
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index a92d86451e18..9f56170a08c9 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.144 2004/06/08 05:50:35 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.145 2004/06/09 17:05:36 agriffis Exp $
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> mplayer-0.92-r1.ebuild,
+  mplayer-1.0_pre2-r1.ebuild, mplayer-1.0_pre3-r3.ebuild,
+  mplayer-1.0_pre3-r4.ebuild, mplayer-1.0_pre3-r5.ebuild,
+  mplayer-1.0_pre4-r1.ebuild, mplayer-1.0_pre4-r2.ebuild,
+  mplayer-1.0_pre4-r3.ebuild, mplayer-1.0_pre4-r4.ebuild,
+  mplayer-1.0_pre4.ebuild:
+  Fix use invocation
 
   08 Jun 2004; Patrick Kursawe <phosphan@gentoo.org>
   mplayer-1.0_pre4-r3.ebuild, mplayer-1.0_pre4-r4.ebuild:
diff --git a/media-video/mplayer/mplayer-0.92-r1.ebuild b/media-video/mplayer/mplayer-0.92-r1.ebuild
index f511693f8181..c559371bcdd2 100644
--- a/media-video/mplayer/mplayer-0.92-r1.ebuild
+++ b/media-video/mplayer/mplayer-0.92-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/mplayer/mplayer-0.92-r1.ebuild,v 1.3 2004/05/12 12:46:33 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.92-r1.ebuild,v 1.4 2004/06/09 17:05:36 agriffis Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc"
 
@@ -113,7 +113,7 @@ src_unpack() {
 		einfo "Old DivX Api found"
 	fi
 
-	if [ "`use svga`" ]
+	if use svga
 	then
 		echo
 		einfo "Enabling vidix non-root mode."
@@ -302,7 +302,7 @@ src_compile() {
 	cd ${S}/postproc.so
 	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		cd ${S}/drivers
 		make all || die "Failed to build matrox driver!"
@@ -349,7 +349,7 @@ src_install() {
 	cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die
 
 	# Install the default Skin and Gnome menu entry
-	if [ -n "`use gtk`" ]
+	if use gtk
 	then
 		dodir /usr/share/mplayer/Skin
 		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
@@ -359,7 +359,7 @@ src_install() {
 		dosym mplayer /usr/bin/gmplayer
 	fi
 
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/pixmaps
 		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
@@ -390,7 +390,7 @@ src_install() {
 	doins ${S}/etc/input.conf
 	doins ${S}/etc/menu.conf
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		check_KV
 		insinto /lib/modules/${KV}/kernel/drivers/char
@@ -408,7 +408,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 
-	if [ -n "`use ppc`" ]
+	if use ppc
 	then
 		echo
 		einfo "When you see only GREEN salad on your G4 while playing"
diff --git a/media-video/mplayer/mplayer-1.0_pre2-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre2-r1.ebuild
index 55692125f463..3505044d9d36 100644
--- a/media-video/mplayer/mplayer-1.0_pre2-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre2-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/mplayer/mplayer-1.0_pre2-r1.ebuild,v 1.3 2004/05/12 12:46:33 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre2-r1.ebuild,v 1.4 2004/06/09 17:05:36 agriffis Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick"
 
@@ -102,7 +102,7 @@ src_unpack() {
 	cd ${S}; epatch ${FILESDIR}/mencoder-segfault.patch
 
 
-	if [ "`use svga`" ]
+	if use svga
 	then
 		echo
 		einfo "Enabling vidix non-root mode."
@@ -302,7 +302,7 @@ src_compile() {
 	cd ${S}/libavcodec/libpostproc
 	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		cd ${S}/drivers
 		make all || die "Failed to build matrox driver!"
@@ -339,7 +339,7 @@ src_install() {
 	cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die
 
 	# Install the default Skin and Gnome menu entry
-	if [ -n "`use gtk`" ]
+	if use gtk
 	then
 		dodir /usr/share/mplayer/Skin
 		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
@@ -349,7 +349,7 @@ src_install() {
 		dosym mplayer /usr/bin/gmplayer
 	fi
 
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/pixmaps
 		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
@@ -380,7 +380,7 @@ src_install() {
 	doins ${S}/etc/input.conf
 	doins ${S}/etc/menu.conf
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		check_KV
 		insinto /lib/modules/${KV}/kernel/drivers/char
@@ -398,7 +398,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 
-	if [ -n "`use ppc`" ]
+	if use ppc
 	then
 		echo
 		einfo "When you see only GREEN salad on your G4 while playing"
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r3.ebuild
index 8b3c8a5db009..f88008878f5c 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r3.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/mplayer/mplayer-1.0_pre3-r3.ebuild,v 1.3 2004/05/12 12:46:33 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r3.ebuild,v 1.4 2004/06/09 17:05:36 agriffis Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick"
 
@@ -104,7 +104,7 @@ src_unpack() {
 	# Fix hppa detection
 	[ "${ARCH}" = "hppa" ] && sed -i -e "s/9000*/parisc*/" "${S}/configure"
 
-	if [ "`use svga`" ]
+	if use svga
 	then
 		echo
 		einfo "Enabling vidix non-root mode."
@@ -304,7 +304,7 @@ src_compile() {
 	cd ${S}/libavcodec/libpostproc
 	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		cd ${S}/drivers
 		make all || die "Failed to build matrox driver!"
@@ -341,7 +341,7 @@ src_install() {
 	cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die
 
 	# Install the default Skin and Gnome menu entry
-	if [ -n "`use gtk`" ]
+	if use gtk
 	then
 		dodir /usr/share/mplayer/Skin
 		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
@@ -351,7 +351,7 @@ src_install() {
 		dosym mplayer /usr/bin/gmplayer
 	fi
 
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/pixmaps
 		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
@@ -382,7 +382,7 @@ src_install() {
 	doins ${S}/etc/input.conf
 	doins ${S}/etc/menu.conf
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		check_KV
 		insinto /lib/modules/${KV}/kernel/drivers/char
@@ -400,7 +400,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 
-	if [ -n "`use ppc`" ]
+	if use ppc
 	then
 		echo
 		einfo "When you see only GREEN salad on your G4 while playing"
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r4.ebuild
index 36770c5576f8..4c4ae07ffead 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r4.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/mplayer/mplayer-1.0_pre3-r4.ebuild,v 1.3 2004/05/12 12:46:33 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r4.ebuild,v 1.4 2004/06/09 17:05:36 agriffis Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick"
 
@@ -111,7 +111,7 @@ src_unpack() {
 	# Fix hppa detection
 	[ "${ARCH}" = "hppa" ] && sed -i -e "s/9000*/parisc*/" "${S}/configure"
 
-	if [ "`use svga`" ]
+	if use svga
 	then
 		echo
 		einfo "Enabling vidix non-root mode."
@@ -311,7 +311,7 @@ src_compile() {
 	cd ${S}/libavcodec/libpostproc
 	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		cd ${S}/drivers
 		make all || die "Failed to build matrox driver!"
@@ -348,7 +348,7 @@ src_install() {
 	cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die
 
 	# Install the default Skin and Gnome menu entry
-	if [ -n "`use gtk`" ]
+	if use gtk
 	then
 		dodir /usr/share/mplayer/Skin
 		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
@@ -358,7 +358,7 @@ src_install() {
 		dosym mplayer /usr/bin/gmplayer
 	fi
 
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/pixmaps
 		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
@@ -389,7 +389,7 @@ src_install() {
 	doins ${S}/etc/input.conf
 	doins ${S}/etc/menu.conf
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		check_KV
 		insinto /lib/modules/${KV}/kernel/drivers/char
@@ -407,7 +407,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 
-	if [ -n "`use ppc`" ]
+	if use ppc
 	then
 		echo
 		einfo "When you see only GREEN salad on your G4 while playing"
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild
index 6a8dffd2d121..81eb93ebcb7f 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r5.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/mplayer/mplayer-1.0_pre3-r5.ebuild,v 1.10 2004/05/12 13:51:58 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild,v 1.11 2004/06/09 17:05:36 agriffis Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick theora ipv6 v4l v4l2"
 
@@ -121,7 +121,7 @@ src_unpack() {
 	# Fix hppa detection
 	[ "${ARCH}" = "hppa" ] && sed -i -e "s/9000*/parisc*/" "${S}/configure"
 
-	if [ "`use svga`" ]
+	if use svga
 	then
 		echo
 		einfo "Enabling vidix non-root mode."
@@ -281,7 +281,7 @@ src_compile() {
 	cd ${S}/libavcodec/libpostproc
 	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		cd ${S}/drivers
 		make all || die "Failed to build matrox driver!"
@@ -318,7 +318,7 @@ src_install() {
 	cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die
 
 	# Install the default Skin and Gnome menu entry
-	if [ -n "`use gtk`" ]
+	if use gtk
 	then
 		dodir /usr/share/mplayer/Skin
 		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
@@ -328,7 +328,7 @@ src_install() {
 		dosym mplayer /usr/bin/gmplayer
 	fi
 
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/pixmaps
 		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
@@ -359,7 +359,7 @@ src_install() {
 	doins ${S}/etc/input.conf
 	doins ${S}/etc/menu.conf
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		check_KV
 		insinto /lib/modules/${KV}/kernel/drivers/char
@@ -377,7 +377,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 
-	if [ -n "`use ppc`" ]
+	if use ppc
 	then
 		echo
 		einfo "When you see only GREEN salad on your G4 while playing"
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild
index 544069c0b26d..d8db1d4ed847 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-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/mplayer/mplayer-1.0_pre4-r1.ebuild,v 1.7 2004/06/02 21:50:53 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild,v 1.8 2004/06/09 17:05:36 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -111,7 +111,7 @@ src_unpack() {
 	# Fix hppa detection
 	[ "${ARCH}" = "hppa" ] && sed -i -e "s/9000*/parisc*/" "${S}/configure"
 
-	if [ "`use svga`" ]
+	if use svga
 	then
 		echo
 		einfo "Enabling vidix non-root mode."
@@ -276,7 +276,7 @@ src_compile() {
 	cd ${S}/libavcodec/libpostproc
 	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		cd ${S}/drivers
 		make all || die "Failed to build matrox driver!"
@@ -313,7 +313,7 @@ src_install() {
 	cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die
 
 	# Install the default Skin and Gnome menu entry
-	if [ -n "`use gtk`" ]
+	if use gtk
 	then
 		dodir /usr/share/mplayer/Skin
 		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
@@ -323,7 +323,7 @@ src_install() {
 		dosym mplayer /usr/bin/gmplayer
 	fi
 
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/pixmaps
 		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
@@ -354,7 +354,7 @@ src_install() {
 	doins ${S}/etc/input.conf
 	doins ${S}/etc/menu.conf
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		check_KV
 		insinto /lib/modules/${KV}/kernel/drivers/char
@@ -372,7 +372,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 
-	if [ -n "`use ppc`" ]
+	if use ppc
 	then
 		echo
 		einfo "When you see only GREEN salad on your G4 while playing"
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild
index dbc5306a2a62..204a3cacec55 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-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/mplayer/mplayer-1.0_pre4-r2.ebuild,v 1.5 2004/06/02 21:50:53 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild,v 1.6 2004/06/09 17:05:36 agriffis Exp $
 
 inherit eutils flag-o-matic check-kernel
 
@@ -120,7 +120,7 @@ src_unpack() {
 	# Fix hppa detection
 	[ "${ARCH}" = "hppa" ] && sed -i -e "s/9000*/parisc*/" "${S}/configure"
 
-	if [ "`use svga`" ]
+	if use svga
 	then
 		echo
 		einfo "Enabling vidix non-root mode."
@@ -275,7 +275,7 @@ src_compile() {
 	cd ${S}/libavcodec/libpostproc
 	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		local oldarch=${ARCH}
 		if [ ${ARCH} = "x86" ]; then
@@ -321,7 +321,7 @@ src_install() {
 	cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die
 
 	# Install the default Skin and Gnome menu entry
-	if [ -n "`use gtk`" ]
+	if use gtk
 	then
 		dodir /usr/share/mplayer/Skin
 		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
@@ -331,7 +331,7 @@ src_install() {
 		dosym mplayer /usr/bin/gmplayer
 	fi
 
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/pixmaps
 		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
@@ -362,7 +362,7 @@ src_install() {
 	doins ${S}/etc/input.conf
 	doins ${S}/etc/menu.conf
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		check_KV
 		insinto /lib/modules/${KV}/kernel/drivers/char
@@ -380,7 +380,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 
-	if [ -n "`use ppc`" ]
+	if use ppc
 	then
 		echo
 		einfo "When you see only GREEN salad on your G4 while playing"
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild
index 260cc7523577..1f82d4e99035 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r3.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/mplayer/mplayer-1.0_pre4-r3.ebuild,v 1.9 2004/06/08 05:50:35 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild,v 1.10 2004/06/09 17:05:36 agriffis Exp $
 
 inherit eutils flag-o-matic kmod
 
@@ -403,7 +403,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 
-	if [ -n "`use ppc`" ]
+	if use ppc
 	then
 		echo
 		einfo "When you see only GREEN salad on your G4 while playing"
diff --git a/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild
index 53639cbf9abc..2bbed899ebc5 100644
--- a/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4-r4.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/mplayer/mplayer-1.0_pre4-r4.ebuild,v 1.8 2004/06/08 05:50:35 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild,v 1.9 2004/06/09 17:05:36 agriffis Exp $
 
 inherit eutils flag-o-matic kmod
 
@@ -415,7 +415,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 
-	if [ -n "`use ppc`" ]
+	if use ppc
 	then
 		echo
 		einfo "When you see only GREEN salad on your G4 while playing"
diff --git a/media-video/mplayer/mplayer-1.0_pre4.ebuild b/media-video/mplayer/mplayer-1.0_pre4.ebuild
index e58d01f94eaf..f8ec8f435581 100644
--- a/media-video/mplayer/mplayer-1.0_pre4.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre4.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/mplayer/mplayer-1.0_pre4.ebuild,v 1.8 2004/06/02 21:50:53 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4.ebuild,v 1.9 2004/06/09 17:05:36 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -114,7 +114,7 @@ src_unpack() {
 	# Fix hppa detection
 	[ "${ARCH}" = "hppa" ] && sed -i -e "s/9000*/parisc*/" "${S}/configure"
 
-	if [ "`use svga`" ]
+	if use svga
 	then
 		echo
 		einfo "Enabling vidix non-root mode."
@@ -269,7 +269,7 @@ src_compile() {
 	cd ${S}/libavcodec/libpostproc
 	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		cd ${S}/drivers
 		make all || die "Failed to build matrox driver!"
@@ -306,7 +306,7 @@ src_install() {
 	cp -r ${S}/TOOLS ${D}/usr/share/doc/${PF} || die
 
 	# Install the default Skin and Gnome menu entry
-	if [ -n "`use gtk`" ]
+	if use gtk
 	then
 		dodir /usr/share/mplayer/Skin
 		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
@@ -316,7 +316,7 @@ src_install() {
 		dosym mplayer /usr/bin/gmplayer
 	fi
 
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		insinto /usr/share/pixmaps
 		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
@@ -347,7 +347,7 @@ src_install() {
 	doins ${S}/etc/input.conf
 	doins ${S}/etc/menu.conf
 
-	if [ -n "`use matrox`" ]
+	if use matrox
 	then
 		check_KV
 		insinto /lib/modules/${KV}/kernel/drivers/char
@@ -365,7 +365,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 
-	if [ -n "`use ppc`" ]
+	if use ppc
 	then
 		echo
 		einfo "When you see only GREEN salad on your G4 while playing"