QA - fix use invocation

5 files changed, 23 insertions, 17 deletions

diff --git a/games-action/d2x/ChangeLog b/games-action/d2x/ChangeLog
index b33583b38497..93bac7d10689 100644
--- a/games-action/d2x/ChangeLog
+++ b/games-action/d2x/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/d2x
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/ChangeLog,v 1.5 2004/06/26 17:52:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/ChangeLog,v 1.6 2004/06/28 04:25:14 agriffis Exp $
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> d2x-0.2.5-r1.ebuild,
+  d2x-0.2.5.ebuild:
+  QA - fix use invocation
 
 *d2x-0.2.5-r1 (26 Jun 2004)
 
diff --git a/games-action/d2x/d2x-0.2.5-r1.ebuild b/games-action/d2x/d2x-0.2.5-r1.ebuild
index 8a6561a603dc..a86d98243771 100644
--- a/games-action/d2x/d2x-0.2.5-r1.ebuild
+++ b/games-action/d2x/d2x-0.2.5-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/games-action/d2x/d2x-0.2.5-r1.ebuild,v 1.1 2004/06/26 17:52:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/d2x-0.2.5-r1.ebuild,v 1.2 2004/06/28 04:25:14 agriffis Exp $
 
 inherit flag-o-matic eutils games
 
@@ -62,7 +62,9 @@ src_compile() {
 	# in gr, thus when they go to link they cause redefine errors ...
 	# we build each by it self, save the binary file, clean up, and start over
 	mkdir my-bins
-	for ren in sdl $(use opengl) $(use svga) $(use ggi) ; do
+	for ren in sdl $(useq opengl && echo opengl) \
+			$(useq svga && echo svga) $(useq ggi && echo ggi)
+	do
 		[ "${ren}" == "sdl" ] \
 			&& renconf="" \
 			|| renconf="--with-${ren}"
diff --git a/games-action/d2x/d2x-0.2.5.ebuild b/games-action/d2x/d2x-0.2.5.ebuild
index d27205324260..d13679c9bfd6 100644
--- a/games-action/d2x/d2x-0.2.5.ebuild
+++ b/games-action/d2x/d2x-0.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/d2x-0.2.5.ebuild,v 1.6 2004/06/24 21:54:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/d2x-0.2.5.ebuild,v 1.7 2004/06/28 04:25:14 agriffis Exp $
 
 inherit flag-o-matic eutils games
 
@@ -41,7 +41,9 @@ src_compile() {
 	# in gr, thus when they go to link they cause redefine errors ...
 	# we build each by it self, save the binary file, clean up, and start over
 	mkdir my-bins
-	for ren in sdl $(use opengl) $(use svga) $(use ggi) ; do
+	for ren in sdl $(useq opengl && echo opengl) \
+			$(useq svga && echo svga) $(useq ggi && echo ggi)
+	do
 		[ "${ren}" == "sdl" ] \
 			&& renconf="" \
 			|| renconf="--with-${ren}"
diff --git a/games-emulation/generator/ChangeLog b/games-emulation/generator/ChangeLog
index 8f370d9bf0c8..6cc36af2c265 100644
--- a/games-emulation/generator/ChangeLog
+++ b/games-emulation/generator/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/generator
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.7 2004/06/24 22:27:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.8 2004/06/28 04:29:13 agriffis Exp $
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> generator-0.35.ebuild:
+  QA - fix use invocation
 
   30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> generator-0.35.ebuild:
   don't rdepend on nasm; "use arch" instead of "ARCH == "
diff --git a/games-emulation/generator/generator-0.35.ebuild b/games-emulation/generator/generator-0.35.ebuild
index 069940ea4cf0..afa6bd8c4a35 100644
--- a/games-emulation/generator/generator-0.35.ebuild
+++ b/games-emulation/generator/generator-0.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35.ebuild,v 1.9 2004/06/24 22:27:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35.ebuild,v 1.10 2004/06/28 04:29:13 agriffis Exp $
 
 inherit eutils gcc games
 
@@ -47,15 +47,17 @@ src_unpack() {
 
 src_compile() {
 	local myconf="--with-gcc=$(gcc-major-version)"
-	local mygui=
+	local mygui myguis
 
 	use x86 \
 		&& myconf="${myconf} --with-raze" \
 		|| myconf="${myconf} --with-cmz80"
 
-	for mygui in `use gtk` `use svga` ; do
-		[ "${mygui}" == "svga" ] && mygui=svgalib
+	use gtk && myguis="gtk"
+	use svga && myguis="svgalib"
+	[ -n "${myguis}" ] || myguis="gtk"
 
+	for mygui in ${myguis}; do
 		if [ -f Makefile ] ; then
 			make clean
 		fi
@@ -65,13 +67,6 @@ src_compile() {
 		emake -j1 || die "building ${mygui}"
 		mv main/generator-${mygui} my-bins/
 	done
-	if [ -z "`use gtk``use svga`" ] ; then
-		egamesconf \
-			${myconf} \
-			--with-gtk || die
-		emake -j1 || die "building ${mygui}"
-		mv main/generator-gtk my-bins/
-	fi
 }
 
 src_install() {