use flag fixing

3 files changed, 16 insertions, 11 deletions

diff --git a/games-emulation/xmame/Manifest b/games-emulation/xmame/Manifest
index fbae739065da..c1243aa2d1e2 100644
--- a/games-emulation/xmame/Manifest
+++ b/games-emulation/xmame/Manifest
@@ -4,7 +4,7 @@ MD5 dff94c6ca4e9d37395677d8d6701341e xmame-0.78.1.ebuild 6232
 MD5 292d0da4c6620f35a0e7ac862894d3bb xmame-0.79.1.ebuild 6575
 MD5 0f37473c837794387aabfa2fa0fc2c48 xmame-0.80.1.ebuild 6592
 MD5 0234d9024c471faf92bb1219242614ef metadata.xml 1566
-MD5 3dbfb8036aea99667085bef7bb0f79b4 xmame-0.82.1.ebuild 6444
+MD5 fc84cea3a8050aa0c157e97c12d61ca9 xmame-0.82.1.ebuild 6446
 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
diff --git a/games-emulation/xmess/ChangeLog b/games-emulation/xmess/ChangeLog
index 49216bf906c0..379afef83e4a 100644
--- a/games-emulation/xmess/ChangeLog
+++ b/games-emulation/xmess/ChangeLog
@@ -1,6 +1,9 @@
 # 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.14 2004/06/06 22:31:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/ChangeLog,v 1.15 2004/06/07 03:17:13 mr_bones_ Exp $
+
+  06 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> xmess-0.82.1.ebuild:
+  use flag fixing
 
 *xmess-0.82.1 (06 Jun 2004)
 
diff --git a/games-emulation/xmess/xmess-0.82.1.ebuild b/games-emulation/xmess/xmess-0.82.1.ebuild
index d43e42402687..36e775190eae 100644
--- a/games-emulation/xmess/xmess-0.82.1.ebuild
+++ b/games-emulation/xmess/xmess-0.82.1.ebuild
@@ -1,8 +1,8 @@
 # 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.1 2004/06/06 22:31:36 mr_bones_ Exp $
+# $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 $
 
-inherit flag-o-matic eutils gcc games
+inherit flag-o-matic gcc eutils games
 
 TARGET="${PN}"
 
@@ -39,7 +39,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PV}-glx-fix.patch"
 	sed -i \
 		-e 's:JOY_BUTTONS 16:JOY_BUTTONS 32:' src/unix/devices.h \
-		|| die "setting joybuttons failed" #36818
+			|| die "setting joybuttons failed" #36818
 
 	case "${ARCH}" in
 	x86)
@@ -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
 }
@@ -183,14 +183,14 @@ src_install() {
 	sed -i \
 		-e "s:Xmame:${TARGET}:g" \
 		-e "s:xmame:${TARGET}:g" doc/*.6 \
-			|| die "sed man pages failed"
+		|| die "sed man pages failed"
 	sed -i \
 		-e "s:^PREFIX.*:PREFIX=${D}/usr:" \
 		-e "s:^BINDIR.*:BINDIR=${D}/${GAMES_BINDIR}:" \
 		-e "s:^MANDIR.*:MANDIR=${D}/usr/share/man/man6:" \
 		-e "s:^XMAMEROOT.*:XMAMEROOT=${D}/${GAMES_DATADIR}/${TARGET}:" \
 			Makefile \
-				|| die "sed Makefile failed"
+			|| die "sed Makefile failed"
 
 	if use sdl ; then
 		make DISPLAY_METHOD=SDL install || die "install failed (sdl)"
@@ -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"