Fix use invocation

6 files changed, 132 insertions, 120 deletions

diff --git a/games-emulation/xmame/ChangeLog b/games-emulation/xmame/ChangeLog
index 77291fd70040..c11ffc59bc0e 100644
--- a/games-emulation/xmame/ChangeLog
+++ b/games-emulation/xmame/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/xmame
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/ChangeLog,v 1.18 2004/04/21 06:02:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/ChangeLog,v 1.19 2004/06/06 23:21:50 agriffis Exp $
+
+  06 Jun 2004; Aron Griffis <agriffis@gentoo.org> xmame-0.78.1.ebuild,
+  xmame-0.79.1.ebuild, xmame-0.80.1.ebuild, xmame-0.81.1.ebuild:
+  Fix use invocation
 
   20 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> xmame-0.81.1.ebuild,
   files/0.81.1-glx-fix.patch:
diff --git a/games-emulation/xmame/Manifest b/games-emulation/xmame/Manifest
index db6b9259f507..a11eaae7d86c 100644
--- a/games-emulation/xmame/Manifest
+++ b/games-emulation/xmame/Manifest
@@ -1,21 +1,21 @@
-MD5 87c39e61487c3ee789d7723430cec7c0 ChangeLog 5815
-MD5 ffea799fa442b38b02185d50ceb59a42 xmame-0.81.1.ebuild 6484
-MD5 9f4c00afb295a5316c4049f8775d3d79 xmame-0.78.1.ebuild 6412
-MD5 9baf5167bac7708cc8844d9a73344e2b xmame-0.79.1.ebuild 6768
-MD5 9b2a69b3aa38e43d7daa86d868406523 xmame-0.80.1.ebuild 6784
+MD5 292d0da4c6620f35a0e7ac862894d3bb xmame-0.79.1.ebuild 6575
+MD5 b50bec423e48ef8b2f052a70d582e809 xmame-0.80.1.ebuild 6593
+MD5 32834765905ef33bb80c8db0357693e8 ChangeLog 5971
 MD5 0234d9024c471faf92bb1219242614ef metadata.xml 1566
+MD5 ba41bbae4e88815ebae46fb90b9e6c12 xmame-0.81.1.ebuild 6463
+MD5 dff94c6ca4e9d37395677d8d6701341e xmame-0.78.1.ebuild 6232
+MD5 240bd404f0deb6cd68bf6a98a5fb76db files/0.81.1-glx-fix.patch 386
 MD5 93b9c4a740015eb7262b223c7b8b7bbf files/0.77.1-icc.patch 584
-MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.77.1-glx-fix.patch 597
-MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.78.1-glx-fix.patch 597
+MD5 97e593e1ae9774f4ef817e90f8b05d35 files/digest-xmame-0.78.1 67
 MD5 87e241d808f5d518c86399c657f40c2c files/digest-xmame-0.79.1 67
+MD5 e6d34df3a2c4a7f74b4853084f9b363e files/digest-xmame-0.80.1 67
+MD5 9890e1cb0e82b29fde141274f5ce5eec files/digest-xmame-0.81.1 67
+MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.79.1-glx-fix.patch 597
+MD5 0f77c568ca5f6a46b543e899c910d38a files/0.78.1-osd_die.patch 521
 MD5 9bbbd2de60f0c41f643674a694cd2c90 files/0.77.1-alsa-1.0.0.patch 438
 MD5 93b9c4a740015eb7262b223c7b8b7bbf files/0.78.1-icc.patch 584
-MD5 97e593e1ae9774f4ef817e90f8b05d35 files/digest-xmame-0.78.1 67
-MD5 0f77c568ca5f6a46b543e899c910d38a files/0.78.1-osd_die.patch 521
+MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.77.1-glx-fix.patch 597
 MD5 96b4074a6c4b94b57fb7c6258a36ef20 files/0.78.1-big_endian.patch 2969
-MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.79.1-glx-fix.patch 597
-MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.80.1-glx-fix.patch 597
 MD5 a956d1afa6724941d56732f2b91f42eb files/0.80.1-make.patch 1243
-MD5 e6d34df3a2c4a7f74b4853084f9b363e files/digest-xmame-0.80.1 67
-MD5 9890e1cb0e82b29fde141274f5ce5eec files/digest-xmame-0.81.1 67
-MD5 240bd404f0deb6cd68bf6a98a5fb76db files/0.81.1-glx-fix.patch 386
+MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.80.1-glx-fix.patch 597
+MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.78.1-glx-fix.patch 597
diff --git a/games-emulation/xmame/xmame-0.78.1.ebuild b/games-emulation/xmame/xmame-0.78.1.ebuild
index 4efd9b8c44f3..1709cb4b9cc4 100644
--- a/games-emulation/xmame/xmame-0.78.1.ebuild
+++ b/games-emulation/xmame/xmame-0.78.1.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/games-emulation/xmame/xmame-0.78.1.ebuild,v 1.5 2004/02/15 11:56:08 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.78.1.ebuild,v 1.6 2004/06/06 23:21:50 agriffis Exp $
 
 inherit games flag-o-matic gcc eutils
 
@@ -46,7 +46,7 @@ src_unpack() {
 			-e '/X86_ASM_68000 =/s:#::' \
 			-e '/X86_MIPS3_DRC =/s:#::' Makefile \
 			|| die "sed Makefile (x86) failed"
-		if  [ `use joystick` ] ; then
+		if  use joystick ; then
 			sed -i \
 				-e '/JOY_I386.*=/s:#::' Makefile \
 				|| die "sed Makefile (joystick) failed"
@@ -72,55 +72,55 @@ src_unpack() {
 		;;
 	esac
 
-	if [ `use net` ] ; then
+	if use net ; then
 		sed -i \
 			-e '/XMAME_NET/s:#::' Makefile \
 			|| die "sed Makefile (net) failed"
 # Icc sucks #41342
-#		if [ `use icc` ] ; then
+#		if use icc ; then
 #			ewarn "Sorry, but net support is not compatible with icc."
 #			ewarn "icc support has been ignored in favor of net support."
 #		fi
 #	else
-#		if [ `use icc` ] ; then
+#		if use icc ; then
 #			epatch ${FILESDIR}/${PV}-icc.patch
 #			sed -i \
 #				-e '/^CC/s:gcc:icc:' Makefile \
 #				|| die "sed Makefile (icc) failed"
 #		fi
 	fi
-	if [ `use esd` ] ; then
+	if use esd ; then
 		sed -i \
 			-e '/SOUND_ESOUND/s:#::' Makefile \
 			|| die "sed Makefile (esd) failed"
 	fi
-	if [ `use alsa` ] ; then
+	if use alsa ; then
 		sed -i \
 			-e '/SOUND_ALSA/s:#::' Makefile \
 			|| die "sed Makefile (alsa) failed"
 	fi
-	if [ `use arts` ] ; then
+	if use arts ; then
 		sed -i \
 			-e '/SOUND_ARTS/s:#::' Makefile \
 			|| die "sed Makefile (arts) failed"
 	fi
-	if [ `use sdl` ] ; then
+	if use sdl ; then
 		sed -i \
 			-e '/SOUND_SDL/s:#::' Makefile \
 			|| die "sed Makefile (sdl) failed"
 	fi
-	if [ `use dga` ] ; then
+	if use dga ; then
 		sed -i \
 			-e '/X11_DGA/s:#::' Makefile \
 			|| die "sed Makefile (dga) failed"
-		if [ `use 3dfx` ] ; then
+		if use 3dfx ; then
 			sed -i \
 				-e '/TDFX_DGA_WORKAROUND/s:#::' Makefile \
 				|| die "sed Makefile (dga) failed"
 		fi
 	fi
 
-	if [ `use xv` ] ; then
+	if use xv ; then
 		sed -i \
 			-e '/X11_XV/s:#::' Makefile \
 			|| die "sed Makefile (xv) failed"
@@ -146,23 +146,23 @@ src_unpack() {
 
 src_compile() {
 	local disp=0
-	if [ `use sdl` ] ; then
+	if use sdl ; then
 		emake -j1 DISPLAY_METHOD=SDL || die "emake failed (SDL)"
 		disp=1
 	fi
-	if [ `use svga` ] ; then
+	if use svga ; then
 		emake -j1 DISPLAY_METHOD=svgalib || die "emake failed (svgalib)"
 		disp=1
 	fi
-	if [ `use ggi` ] ; then
+	if use ggi ; then
 		emake -j1 DISPLAY_METHOD=ggi || die "emake failed (ggi)"
 		disp=1
 	fi
-	if [ `use opengl` ] ; then
+	if use opengl ; then
 		emake -j1 DISPLAY_METHOD=xgl || die "emake failed (xgl)"
 		disp=1
 	fi
-	if [ ! -z "`use X``use dga``use xv`" ] || [ ${disp} -eq 0 ] ; then
+	if [ ${disp} -eq 0 ] || use X || use dga || use xv ; then
 		emake -j1 DISPLAY_METHOD=x11 || die "emake failed (x11)"
 	fi
 }
@@ -179,23 +179,23 @@ src_install() {
 		Makefile
 
 	local disp=0
-	if [ `use sdl` ] ; then
+	if use sdl ; then
 		make DISPLAY_METHOD=SDL install || die "install failed (sdl)"
 		disp=1
 	fi
-	if [ `use svga` ] ; then
+	if use svga ; then
 		make DISPLAY_METHOD=svgalib install || die "install failed (svga)"
 		disp=1
 	fi
-	if [ `use ggi` ] ; then
+	if use ggi ; then
 		make DISPLAY_METHOD=ggi install || die "install failed (ggi)"
 		disp=1
 	fi
-	if [ `use opengl` ] ; then
+	if use opengl ; then
 		make DISPLAY_METHOD=xgl install || die "install failed (xgl)"
 		disp=1
 	fi
-	if [ ! -z "`use X``use dga``use xv`" ] || [ ${disp} -eq 0 ] ; then
+	if [ ${disp} -eq 0 ] || use X || use dga || use xv ; then
 		make DISPLAY_METHOD=x11 install || die "install failed (x11)"
 	fi
 
@@ -204,15 +204,15 @@ src_install() {
 	dodoc doc/{changes.*,*.txt,mame/*,${TARGET}rc.dist} README todo || die "dodoc failed"
 	dohtml -r doc/* || die "dohtml failed"
 
-	if [ `use opengl` ] ; then
+	if use opengl ; then
 		dosym ${TARGET}.xgl ${GAMES_BINDIR}/${TARGET}
-	elif [ ! -z "`use X``use dga``use xv`" -o ${disp} -eq 0 ] ; then
+	elif [ ${disp} -eq 0 ] || use X || use dga || use xv ; then
 		dosym ${TARGET}.x11 ${GAMES_BINDIR}/${TARGET}
-	elif [ `use sdl` ] ; then
+	elif use sdl ; then
 		dosym ${TARGET}.SDL ${GAMES_BINDIR}/${TARGET}
-	elif [ `use svga` ] ; then
+	elif use svga ; then
 		dosym ${TARGET}.svgalib ${GAMES_BINDIR}/${TARGET}
-	elif [ `use ggi` ] ; then
+	elif use ggi ; then
 		dosym ${TARGET}.ggi ${GAMES_BINDIR}/${TARGET}
 	fi
 	prepgamesdirs
@@ -221,9 +221,11 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 	einfo "Your available MAME binaries are: ${TARGET}"
-	[ ! -z "`use X``use dga``use xv`" ] && einfo " ${TARGET}.x11"
-	[ `use sdl` ]                       && einfo " ${TARGET}.SDL"
-	[ `use ggi` ]                       && einfo " ${TARGET}.ggi"
-	[ `use svga` ]                      && einfo " ${TARGET}.svgalib"
-	[ `use opengl` ]                    && einfo " ${TARGET}.xgl"
+	if use X || use dga || use xv; then
+		einfo " ${TARGET}.x11"
+	fi
+	use sdl                       && einfo " ${TARGET}.SDL"
+	use ggi                       && einfo " ${TARGET}.ggi"
+	use svga                      && einfo " ${TARGET}.svgalib"
+	use opengl                    && einfo " ${TARGET}.xgl"
 }
diff --git a/games-emulation/xmame/xmame-0.79.1.ebuild b/games-emulation/xmame/xmame-0.79.1.ebuild
index aad60a927037..00860ec1bd5f 100644
--- a/games-emulation/xmame/xmame-0.79.1.ebuild
+++ b/games-emulation/xmame/xmame-0.79.1.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/games-emulation/xmame/xmame-0.79.1.ebuild,v 1.4 2004/02/23 06:39:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.79.1.ebuild,v 1.5 2004/06/06 23:21:50 agriffis Exp $
 
 inherit games flag-o-matic gcc eutils
 
@@ -45,7 +45,7 @@ src_unpack() {
 			-e '/X86_ASM_68000 =/s:#::' \
 			-e '/X86_MIPS3_DRC =/s:#::' Makefile \
 			|| die "sed Makefile (x86) failed"
-		if  [ `use joystick` ] ; then
+		if  use joystick ; then
 			sed -i \
 				-e '/JOY_I386.*=/s:#::' Makefile \
 				|| die "sed Makefile (joystick) failed"
@@ -55,7 +55,7 @@ src_unpack() {
 		sed -i \
 			-e '/^MY_CPU/s:i386:ia64:' Makefile \
 			|| die "sed Makefile (ia64) failed"
-		if  [ `use joystick` ] ; then
+		if  use joystick ; then
 			sed -i \
 				-e '/JOY_I386.*=/s:#::' Makefile \
 				|| die "sed Makefile (joystick) failed"
@@ -65,7 +65,7 @@ src_unpack() {
 		sed -i \
 			-e '/^MY_CPU/s:i386:amd64:' Makefile \
 			|| die "sed Makefile (amd64) failed"
-		if  [ `use joystick` ] ; then
+		if  use joystick ; then
 			sed -i \
 				-e '/JOY_I386.*=/s:#::' Makefile \
 				|| die "sed Makefile (joystick) failed"
@@ -88,55 +88,55 @@ src_unpack() {
 		;;
 	esac
 
-	if [ `use net` ] ; then
+	if use net ; then
 		sed -i \
 			-e '/XMAME_NET/s:#::' Makefile \
 			|| die "sed Makefile (net) failed"
 # Icc sucks #41342
-#		if [ `use icc` ] ; then
+#		if use icc ; then
 #			ewarn "Sorry, but net support is not compatible with icc."
 #			ewarn "icc support has been ignored in favor of net support."
 #		fi
 #	else
-#		if [ `use icc` ] ; then
+#		if use icc ; then
 #			epatch ${FILESDIR}/${PV}-icc.patch
 #			sed -i \
 #				-e '/^CC/s:gcc:icc:' Makefile \
 #				|| die "sed Makefile (icc) failed"
 #		fi
 	fi
-	if [ `use esd` ] ; then
+	if use esd ; then
 		sed -i \
 			-e '/SOUND_ESOUND/s:#::' Makefile \
 			|| die "sed Makefile (esd) failed"
 	fi
-	if [ `use alsa` ] ; then
+	if use alsa ; then
 		sed -i \
 			-e '/SOUND_ALSA/s:#::' Makefile \
 			|| die "sed Makefile (alsa) failed"
 	fi
-	if [ `use arts` ] ; then
+	if use arts ; then
 		sed -i \
 			-e '/SOUND_ARTS/s:#::' Makefile \
 			|| die "sed Makefile (arts) failed"
 	fi
-	if [ `use sdl` ] ; then
+	if use sdl ; then
 		sed -i \
 			-e '/SOUND_SDL/s:#::' Makefile \
 			|| die "sed Makefile (sdl) failed"
 	fi
-	if [ `use dga` ] ; then
+	if use dga ; then
 		sed -i \
 			-e '/X11_DGA/s:#::' Makefile \
 			|| die "sed Makefile (dga) failed"
-		if [ `use 3dfx` ] ; then
+		if use 3dfx ; then
 			sed -i \
 				-e '/TDFX_DGA_WORKAROUND/s:#::' Makefile \
 				|| die "sed Makefile (dga) failed"
 		fi
 	fi
 
-	if [ `use xv` ] ; then
+	if use xv ; then
 		sed -i \
 			-e '/X11_XV/s:#::' Makefile \
 			|| die "sed Makefile (xv) failed"
@@ -165,23 +165,23 @@ src_unpack() {
 
 src_compile() {
 	local disp=0
-	if [ `use sdl` ] ; then
+	if use sdl ; then
 		emake -j1 DISPLAY_METHOD=SDL || die "emake failed (SDL)"
 		disp=1
 	fi
-	if [ `use svga` ] ; then
+	if use svga ; then
 		emake -j1 DISPLAY_METHOD=svgalib || die "emake failed (svgalib)"
 		disp=1
 	fi
-	if [ `use ggi` ] ; then
+	if use ggi ; then
 		emake -j1 DISPLAY_METHOD=ggi || die "emake failed (ggi)"
 		disp=1
 	fi
-	if [ `use opengl` ] ; then
+	if use opengl ; then
 		emake -j1 DISPLAY_METHOD=xgl || die "emake failed (xgl)"
 		disp=1
 	fi
-	if [ ! -z "`use X``use dga``use xv`" ] || [ ${disp} -eq 0 ] ; then
+	if [ ${disp} -eq 0 ] || use X || use dga || use xv ; then
 		emake -j1 DISPLAY_METHOD=x11 || die "emake failed (x11)"
 	fi
 }
@@ -198,23 +198,23 @@ src_install() {
 		Makefile
 
 	local disp=0
-	if [ `use sdl` ] ; then
+	if use sdl ; then
 		make DISPLAY_METHOD=SDL install || die "install failed (sdl)"
 		disp=1
 	fi
-	if [ `use svga` ] ; then
+	if use svga ; then
 		make DISPLAY_METHOD=svgalib install || die "install failed (svga)"
 		disp=1
 	fi
-	if [ `use ggi` ] ; then
+	if use ggi ; then
 		make DISPLAY_METHOD=ggi install || die "install failed (ggi)"
 		disp=1
 	fi
-	if [ `use opengl` ] ; then
+	if use opengl ; then
 		make DISPLAY_METHOD=xgl install || die "install failed (xgl)"
 		disp=1
 	fi
-	if [ ! -z "`use X``use dga``use xv`" ] || [ ${disp} -eq 0 ] ; then
+	if [ ${disp} -eq 0 ] || use X || use dga || use xv ; then
 		make DISPLAY_METHOD=x11 install || die "install failed (x11)"
 	fi
 
@@ -223,15 +223,15 @@ src_install() {
 	dodoc doc/{changes.*,*.txt,mame/*,${TARGET}rc.dist} README todo || die "dodoc failed"
 	dohtml -r doc/* || die "dohtml failed"
 
-	if [ `use opengl` ] ; then
+	if use opengl ; then
 		dosym ${TARGET}.xgl ${GAMES_BINDIR}/${TARGET}
-	elif [ ! -z "`use X``use dga``use xv`" -o ${disp} -eq 0 ] ; then
+	elif [ ${disp} -eq 0 ] || use X || use dga || use xv ; then
 		dosym ${TARGET}.x11 ${GAMES_BINDIR}/${TARGET}
-	elif [ `use sdl` ] ; then
+	elif use sdl ; then
 		dosym ${TARGET}.SDL ${GAMES_BINDIR}/${TARGET}
-	elif [ `use svga` ] ; then
+	elif use svga ; then
 		dosym ${TARGET}.svgalib ${GAMES_BINDIR}/${TARGET}
-	elif [ `use ggi` ] ; then
+	elif use ggi ; then
 		dosym ${TARGET}.ggi ${GAMES_BINDIR}/${TARGET}
 	fi
 	prepgamesdirs
@@ -240,9 +240,11 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 	einfo "Your available MAME binaries are: ${TARGET}"
-	[ ! -z "`use X``use dga``use xv`" ] && einfo " ${TARGET}.x11"
-	[ `use sdl` ]                       && einfo " ${TARGET}.SDL"
-	[ `use ggi` ]                       && einfo " ${TARGET}.ggi"
-	[ `use svga` ]                      && einfo " ${TARGET}.svgalib"
-	[ `use opengl` ]                    && einfo " ${TARGET}.xgl"
+	if use X || use dga || use xv; then
+		einfo " ${TARGET}.x11"
+	fi
+	use sdl                       && einfo " ${TARGET}.SDL"
+	use ggi                       && einfo " ${TARGET}.ggi"
+	use svga                      && einfo " ${TARGET}.svgalib"
+	use opengl                    && einfo " ${TARGET}.xgl"
 }
diff --git a/games-emulation/xmame/xmame-0.80.1.ebuild b/games-emulation/xmame/xmame-0.80.1.ebuild
index 98e5faa4e8f1..4087ef985150 100644
--- a/games-emulation/xmame/xmame-0.80.1.ebuild
+++ b/games-emulation/xmame/xmame-0.80.1.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/games-emulation/xmame/xmame-0.80.1.ebuild,v 1.1 2004/03/19 14:16:56 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.80.1.ebuild,v 1.2 2004/06/06 23:21:50 agriffis Exp $
 
 inherit games flag-o-matic gcc eutils
 
@@ -46,7 +46,7 @@ src_unpack() {
 			-e '/X86_ASM_68000 =/s:#::' \
 			-e '/X86_MIPS3_DRC =/s:#::' Makefile \
 			|| die "sed Makefile (x86) failed"
-		if  [ `use joystick` ] ; then
+		if  use joystick ; then
 			sed -i \
 				-e '/JOY_I386.*=/s:#::' Makefile \
 				|| die "sed Makefile (joystick) failed"
@@ -56,7 +56,7 @@ src_unpack() {
 		sed -i \
 			-e '/^MY_CPU/s:i386:ia64:' Makefile \
 			|| die "sed Makefile (ia64) failed"
-		if  [ `use joystick` ] ; then
+		if  use joystick ; then
 			sed -i \
 				-e '/JOY_I386.*=/s:#::' Makefile \
 				|| die "sed Makefile (joystick) failed"
@@ -66,7 +66,7 @@ src_unpack() {
 		sed -i \
 			-e '/^MY_CPU/s:i386:amd64:' Makefile \
 			|| die "sed Makefile (amd64) failed"
-		if  [ `use joystick` ] ; then
+		if  use joystick ; then
 			sed -i \
 				-e '/JOY_I386.*=/s:#::' Makefile \
 				|| die "sed Makefile (joystick) failed"
@@ -89,55 +89,55 @@ src_unpack() {
 		;;
 	esac
 
-	if [ `use net` ] ; then
+	if use net ; then
 		sed -i \
 			-e '/XMAME_NET/s:#::' Makefile \
 			|| die "sed Makefile (net) failed"
 # Icc sucks #41342
-#		if [ `use icc` ] ; then
+#		if use icc ; then
 #			ewarn "Sorry, but net support is not compatible with icc."
 #			ewarn "icc support has been ignored in favor of net support."
 #		fi
 #	else
-#		if [ `use icc` ] ; then
+#		if use icc ; then
 #			epatch ${FILESDIR}/${PV}-icc.patch
 #			sed -i \
 #				-e '/^CC/s:gcc:icc:' Makefile \
 #				|| die "sed Makefile (icc) failed"
 #		fi
 	fi
-	if [ `use esd` ] ; then
+	if use esd ; then
 		sed -i \
 			-e '/SOUND_ESOUND/s:#::' Makefile \
 			|| die "sed Makefile (esd) failed"
 	fi
-	if [ `use alsa` ] ; then
+	if use alsa ; then
 		sed -i \
 			-e '/SOUND_ALSA/s:#::' Makefile \
 			|| die "sed Makefile (alsa) failed"
 	fi
-	if [ `use arts` ] ; then
+	if use arts ; then
 		sed -i \
 			-e '/SOUND_ARTS/s:#::' Makefile \
 			|| die "sed Makefile (arts) failed"
 	fi
-	if [ `use sdl` ] ; then
+	if use sdl ; then
 		sed -i \
 			-e '/SOUND_SDL/s:#::' Makefile \
 			|| die "sed Makefile (sdl) failed"
 	fi
-	if [ `use dga` ] ; then
+	if use dga ; then
 		sed -i \
 			-e '/X11_DGA/s:#::' Makefile \
 			|| die "sed Makefile (dga) failed"
-		if [ `use 3dfx` ] ; then
+		if use 3dfx ; then
 			sed -i \
 				-e '/TDFX_DGA_WORKAROUND/s:#::' Makefile \
 				|| die "sed Makefile (dga) failed"
 		fi
 	fi
 
-	if [ `use xv` ] ; then
+	if use xv ; then
 		sed -i \
 			-e '/X11_XV/s:#::' Makefile \
 			|| die "sed Makefile (xv) failed"
@@ -166,23 +166,23 @@ src_unpack() {
 
 src_compile() {
 	local disp=0
-	if [ `use sdl` ] ; then
+	if use sdl ; then
 		emake DISPLAY_METHOD=SDL || die "emake failed (SDL)"
 		disp=1
 	fi
-	if [ `use svga` ] ; then
+	if use svga ; then
 		emake DISPLAY_METHOD=svgalib || die "emake failed (svgalib)"
 		disp=1
 	fi
-	if [ `use ggi` ] ; then
+	if use ggi ; then
 		emake DISPLAY_METHOD=ggi || die "emake failed (ggi)"
 		disp=1
 	fi
-	if [ `use opengl` ] ; then
+	if use opengl ; then
 		emake DISPLAY_METHOD=xgl || die "emake failed (xgl)"
 		disp=1
 	fi
-	if [ ! -z "`use X``use dga``use xv`" ] || [ ${disp} -eq 0 ] ; then
+	if [ ${disp} -eq 0 ] || use X || use dga || use xv ; then
 		emake DISPLAY_METHOD=x11 || die "emake failed (x11)"
 	fi
 }
@@ -199,23 +199,23 @@ src_install() {
 		Makefile
 
 	local disp=0
-	if [ `use sdl` ] ; then
+	if use sdl ; then
 		make DISPLAY_METHOD=SDL install || die "install failed (sdl)"
 		disp=1
 	fi
-	if [ `use svga` ] ; then
+	if use svga ; then
 		make DISPLAY_METHOD=svgalib install || die "install failed (svga)"
 		disp=1
 	fi
-	if [ `use ggi` ] ; then
+	if use ggi ; then
 		make DISPLAY_METHOD=ggi install || die "install failed (ggi)"
 		disp=1
 	fi
-	if [ `use opengl` ] ; then
+	if use opengl ; then
 		make DISPLAY_METHOD=xgl install || die "install failed (xgl)"
 		disp=1
 	fi
-	if [ ! -z "`use X``use dga``use xv`" ] || [ ${disp} -eq 0 ] ; then
+	if [ ${disp} -eq 0 ] || use X || use dga || use xv ; then
 		make DISPLAY_METHOD=x11 install || die "install failed (x11)"
 	fi
 
@@ -224,15 +224,15 @@ src_install() {
 	dodoc doc/{changes.*,*.txt,mame/*,${TARGET}rc.dist} README todo || die "dodoc failed"
 	dohtml -r doc/* || die "dohtml failed"
 
-	if [ `use opengl` ] ; then
+	if use opengl ; then
 		dosym ${TARGET}.xgl ${GAMES_BINDIR}/${TARGET}
-	elif [ ! -z "`use X``use dga``use xv`" -o ${disp} -eq 0 ] ; then
+	elif [ ${disp} -eq 0 ] || use X || use dga || use xv ; then
 		dosym ${TARGET}.x11 ${GAMES_BINDIR}/${TARGET}
-	elif [ `use sdl` ] ; then
+	elif use sdl ; then
 		dosym ${TARGET}.SDL ${GAMES_BINDIR}/${TARGET}
-	elif [ `use svga` ] ; then
+	elif use svga ; then
 		dosym ${TARGET}.svgalib ${GAMES_BINDIR}/${TARGET}
-	elif [ `use ggi` ] ; then
+	elif use ggi ; then
 		dosym ${TARGET}.ggi ${GAMES_BINDIR}/${TARGET}
 	fi
 	prepgamesdirs
@@ -241,9 +241,11 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 	einfo "Your available MAME binaries are: ${TARGET}"
-	[ ! -z "`use X``use dga``use xv`" ] && einfo " ${TARGET}.x11"
-	[ `use sdl` ]                       && einfo " ${TARGET}.SDL"
-	[ `use ggi` ]                       && einfo " ${TARGET}.ggi"
-	[ `use svga` ]                      && einfo " ${TARGET}.svgalib"
-	[ `use opengl` ]                    && einfo " ${TARGET}.xgl"
+	if use X || use dga || use xv; then 
+		einfo " ${TARGET}.x11"
+	fi
+	use sdl                       && einfo " ${TARGET}.SDL"
+	use ggi                       && einfo " ${TARGET}.ggi"
+	use svga                      && einfo " ${TARGET}.svgalib"
+	use opengl                    && einfo " ${TARGET}.xgl"
 }
diff --git a/games-emulation/xmame/xmame-0.81.1.ebuild b/games-emulation/xmame/xmame-0.81.1.ebuild
index ad991b66a7cf..1a00322a1d24 100644
--- a/games-emulation/xmame/xmame-0.81.1.ebuild
+++ b/games-emulation/xmame/xmame-0.81.1.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/games-emulation/xmame/xmame-0.81.1.ebuild,v 1.2 2004/04/21 06:02:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.81.1.ebuild,v 1.3 2004/06/06 23:21:50 agriffis Exp $
 
 inherit flag-o-matic gcc eutils games
 
@@ -172,7 +172,7 @@ src_compile() {
 		emake DISPLAY_METHOD=xgl || die "emake failed (xgl)"
 		disp=1
 	fi
-	if  [ ${disp} -eq 0 ] || [ ! -z "`use X``use dga``use xv`" ] ; then
+	if  [ ${disp} -eq 0 ] || use X || use dga || use xv ; then
 		emake DISPLAY_METHOD=x11 || die "emake failed (x11)"
 	fi
 }
@@ -208,7 +208,7 @@ src_install() {
 		make DISPLAY_METHOD=xgl install || die "install failed (xgl)"
 		disp=1
 	fi
-	if [ ${disp} -eq 0 ] || [ ! -z "`use X``use dga``use xv`" ] ; then
+	if [ ${disp} -eq 0 ] || use X || use dga || use xv ; then
 		make DISPLAY_METHOD=x11 install || die "install failed (x11)"
 	fi
 
@@ -220,7 +220,7 @@ src_install() {
 
 	if use opengl ; then
 		dosym "${TARGET}.xgl" "${GAMES_BINDIR}/${TARGET}"
-	elif [ ! -z "`use X``use dga``use xv`" -o ${disp} -eq 0 ] ; then
+	elif [ ${disp} -eq 0 ] || use X || use dga || use xv ; then
 		dosym "${TARGET}.x11" "${GAMES_BINDIR}/${TARGET}"
 	elif use sdl ; then
 		dosym "${TARGET}.SDL" "${GAMES_BINDIR}/${TARGET}"
@@ -235,7 +235,9 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 	einfo "Your available MAME binaries are: ${TARGET}"
-	[ ! -z "`use X``use dga``use xv`" ] && einfo " ${TARGET}.x11"
+	if use X || use dga || use xv ; then
+		einfo " ${TARGET}.x11"
+	fi
 	use sdl > /dev/null                 && einfo " ${TARGET}.SDL"
 	use ggi > /dev/null                 && einfo " ${TARGET}.ggi"
 	use svga > /dev/null                && einfo " ${TARGET}.svgalib"