Fix use invocation

6 files changed, 125 insertions, 112 deletions

diff --git a/games-emulation/xmess/ChangeLog b/games-emulation/xmess/ChangeLog
index 379afef83e4a..7112b050ee4f 100644
--- a/games-emulation/xmess/ChangeLog
+++ b/games-emulation/xmess/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/xmess
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/ChangeLog,v 1.15 2004/06/07 03:17:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/ChangeLog,v 1.16 2004/06/09 14:03:59 agriffis Exp $
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> xmess-0.77.1.ebuild,
+  xmess-0.78.1.ebuild, xmess-0.80.1.ebuild, xmess-0.81.1.ebuild,
+  xmess-0.82.1.ebuild:
+  Fix use invocation
 
   06 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> xmess-0.82.1.ebuild:
   use flag fixing
diff --git a/games-emulation/xmess/xmess-0.77.1.ebuild b/games-emulation/xmess/xmess-0.77.1.ebuild
index 6b2f538a5345..b4e7ee1d5771 100644
--- a/games-emulation/xmess/xmess-0.77.1.ebuild
+++ b/games-emulation/xmess/xmess-0.77.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/xmess/xmess-0.77.1.ebuild,v 1.6 2004/02/16 19:09:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/xmess-0.77.1.ebuild,v 1.7 2004/06/09 14:03:59 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"
@@ -69,54 +69,54 @@ src_unpack() {
 		;;
 	esac
 
-	if [ `use net` ] ; then
+	if use net ; then
 		sed -i \
 			-e '/XMAME_NET/s:#::' Makefile \
 			|| die "sed Makefile (net) failed"
-		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"
@@ -142,23 +142,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
 }
@@ -175,23 +175,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
 
@@ -200,15 +200,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
@@ -217,9 +217,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 useq X || useq dga || useq xv; then
+		einfo " ${TARGET}.x11"
+	fi
+	useq sdl    && einfo " ${TARGET}.SDL"
+	useq ggi    && einfo " ${TARGET}.ggi"
+	useq svga   && einfo " ${TARGET}.svgalib"
+	useq opengl && einfo " ${TARGET}.xgl"
 }
diff --git a/games-emulation/xmess/xmess-0.78.1.ebuild b/games-emulation/xmess/xmess-0.78.1.ebuild
index 302d7e9b4272..03ce520441cd 100644
--- a/games-emulation/xmess/xmess-0.78.1.ebuild
+++ b/games-emulation/xmess/xmess-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/xmess/xmess-0.78.1.ebuild,v 1.3 2004/02/16 19:09:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/xmess-0.78.1.ebuild,v 1.4 2004/06/09 14:03:59 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"
@@ -69,54 +69,54 @@ src_unpack() {
 		;;
 	esac
 
-	if [ `use net` ] ; then
+	if use net ; then
 		sed -i \
 			-e '/XMAME_NET/s:#::' Makefile \
 			|| die "sed Makefile (net) failed"
-		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"
@@ -142,23 +142,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
 }
@@ -175,23 +175,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
 
@@ -200,15 +200,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
@@ -217,9 +217,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 useq X || useq dga || useq xv; then
+		einfo " ${TARGET}.x11"
+	fi
+	useq sdl    && einfo " ${TARGET}.SDL"
+	useq ggi    && einfo " ${TARGET}.ggi"
+	useq svga   && einfo " ${TARGET}.svgalib"
+	useq opengl && einfo " ${TARGET}.xgl"
 }
diff --git a/games-emulation/xmess/xmess-0.80.1.ebuild b/games-emulation/xmess/xmess-0.80.1.ebuild
index 08e47f0811d6..f1ea8ae18626 100644
--- a/games-emulation/xmess/xmess-0.80.1.ebuild
+++ b/games-emulation/xmess/xmess-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/xmess/xmess-0.80.1.ebuild,v 1.1 2004/03/19 15:03:05 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/xmess-0.80.1.ebuild,v 1.2 2004/06/09 14:03:59 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"
@@ -69,54 +69,54 @@ src_unpack() {
 		;;
 	esac
 
-	if [ `use net` ] ; then
+	if use net ; then
 		sed -i \
 			-e '/XMAME_NET/s:#::' Makefile \
 			|| die "sed Makefile (net) failed"
-		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"
@@ -142,23 +142,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
 }
@@ -175,23 +175,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
 
@@ -200,15 +200,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
@@ -217,9 +217,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 useq X || useq dga || useq xv; then
+		einfo " ${TARGET}.x11"
+	fi
+	useq sdl    && einfo " ${TARGET}.SDL"
+	useq ggi    && einfo " ${TARGET}.ggi"
+	useq svga   && einfo " ${TARGET}.svgalib"
+	useq opengl && einfo " ${TARGET}.xgl"
 }
diff --git a/games-emulation/xmess/xmess-0.81.1.ebuild b/games-emulation/xmess/xmess-0.81.1.ebuild
index 5036a8e5dc4b..565c06db9163 100644
--- a/games-emulation/xmess/xmess-0.81.1.ebuild
+++ b/games-emulation/xmess/xmess-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/xmess/xmess-0.81.1.ebuild,v 1.2 2004/04/21 22:21:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/xmess-0.81.1.ebuild,v 1.3 2004/06/09 14:03:59 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,9 +235,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 > /dev/null                 && einfo " ${TARGET}.SDL"
-	use ggi > /dev/null                 && einfo " ${TARGET}.ggi"
-	use svga > /dev/null                && einfo " ${TARGET}.svgalib"
-	use opengl > /dev/null              && einfo " ${TARGET}.xgl"
+	if useq X || useq dga || useq xv; then
+		einfo " ${TARGET}.x11"
+	fi
+	useq sdl    && einfo " ${TARGET}.SDL"
+	useq ggi    && einfo " ${TARGET}.ggi"
+	useq svga   && einfo " ${TARGET}.svgalib"
+	useq opengl && einfo " ${TARGET}.xgl"
 }
diff --git a/games-emulation/xmess/xmess-0.82.1.ebuild b/games-emulation/xmess/xmess-0.82.1.ebuild
index 36e775190eae..4334730ad9c5 100644
--- a/games-emulation/xmess/xmess-0.82.1.ebuild
+++ b/games-emulation/xmess/xmess-0.82.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/xmess/xmess-0.82.1.ebuild,v 1.2 2004/06/07 03:17:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/xmess-0.82.1.ebuild,v 1.3 2004/06/09 14:03:59 agriffis Exp $
 
 inherit flag-o-matic gcc eutils games
 
@@ -235,11 +235,11 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 	einfo "Your available MAME binaries are: ${TARGET}"
-	if use X || use dga || use xv ; then
+	if useq X || useq dga || useq 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"
-	use opengl > /dev/null              && einfo " ${TARGET}.xgl"
+	useq sdl    && einfo " ${TARGET}.SDL"
+	useq ggi    && einfo " ${TARGET}.ggi"
+	useq svga   && einfo " ${TARGET}.svgalib"
+	useq opengl && einfo " ${TARGET}.xgl"
 }