IUSE; error check; tidy

40 files changed, 173 insertions, 146 deletions

diff --git a/games-puzzle/4stattack/4stattack-2.1.4.ebuild b/games-puzzle/4stattack/4stattack-2.1.4.ebuild
index 2a5644696030..75d0d8f31fc4 100644
--- a/games-puzzle/4stattack/4stattack-2.1.4.ebuild
+++ b/games-puzzle/4stattack/4stattack-2.1.4.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-puzzle/4stattack/4stattack-2.1.4.ebuild,v 1.2 2004/01/29 08:55:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/4stattack/4stattack-2.1.4.ebuild,v 1.3 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games eutils
 
@@ -11,10 +11,11 @@ SRC_URI="mirror://sourceforge/forcedattack/4stAttack-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 hppa"
+IUSE=""
 
 DEPEND=">=dev-python/pygame-1.5"
 
-S=${WORKDIR}/4stAttack-${PV}
+S="${WORKDIR}/4stAttack-${PV}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-puzzle/atomix/atomix-1.0.1.ebuild b/games-puzzle/atomix/atomix-1.0.1.ebuild
index 8b10e5d1402c..839708541430 100644
--- a/games-puzzle/atomix/atomix-1.0.1.ebuild
+++ b/games-puzzle/atomix/atomix-1.0.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-puzzle/atomix/atomix-1.0.1.ebuild,v 1.2 2004/01/02 18:36:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/atomix/atomix-1.0.1.ebuild,v 1.3 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit gnome2
 
@@ -8,9 +8,10 @@ DESCRIPTION="a little mind game for GNOME2"
 HOMEPAGE="http://triq.net/~pearl/atomix.php"
 SRC_URI="http://triq.net/~pearl/download/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc"
+IUSE=""
 
 RDEPEND=">=x11-libs/pango-1.0.3
 	>=x11-libs/gtk+-2.0.5
diff --git a/games-puzzle/codebreaker/codebreaker-1.2.1-r1.ebuild b/games-puzzle/codebreaker/codebreaker-1.2.1-r1.ebuild
index 75aaafc8dd9e..5f2d38649121 100644
--- a/games-puzzle/codebreaker/codebreaker-1.2.1-r1.ebuild
+++ b/games-puzzle/codebreaker/codebreaker-1.2.1-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-puzzle/codebreaker/codebreaker-1.2.1-r1.ebuild,v 1.2 2004/02/20 06:53:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/codebreaker/codebreaker-1.2.1-r1.ebuild,v 1.3 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -11,11 +11,12 @@ SRC_URI="mirror://debian/pool/main/c/codebreaker/${PN}_${PV}.orig.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
+IUSE=""
 
 DEPEND="virtual/x11
 	>=x11-libs/gtk+-1.2.0"
 
-S=${WORKDIR}/${P}.orig
+S="${WORKDIR}/${P}.orig"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-puzzle/concentration/concentration-1.0.1.ebuild b/games-puzzle/concentration/concentration-1.0.1.ebuild
index b38623155400..46da207158e7 100644
--- a/games-puzzle/concentration/concentration-1.0.1.ebuild
+++ b/games-puzzle/concentration/concentration-1.0.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-puzzle/concentration/concentration-1.0.1.ebuild,v 1.1 2004/02/26 08:55:14 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/concentration/concentration-1.0.1.ebuild,v 1.2 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -8,9 +8,9 @@ DESCRIPTION="The classic memory game with some new life"
 HOMEPAGE="http://www.shiftygames.com/concentration/concentration.html"
 SRC_URI="http://www.shiftygames.com/concentration/${P}.tar.gz"
 
-KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsdl-1.2
diff --git a/games-puzzle/concentration/concentration-1.1.ebuild b/games-puzzle/concentration/concentration-1.1.ebuild
index c4a222ca76a5..3494c29e0082 100644
--- a/games-puzzle/concentration/concentration-1.1.ebuild
+++ b/games-puzzle/concentration/concentration-1.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-puzzle/concentration/concentration-1.1.ebuild,v 1.2 2004/03/21 15:28:06 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/concentration/concentration-1.1.ebuild,v 1.3 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -8,9 +8,9 @@ DESCRIPTION="The classic memory game with some new life"
 HOMEPAGE="http://www.shiftygames.com/concentration/concentration.html"
 SRC_URI="http://www.shiftygames.com/concentration/${P}.tar.gz"
 
-KEYWORDS="x86 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 RDEPEND=">=media-libs/libsdl-1.2
diff --git a/games-puzzle/construo/construo-0.2.2.ebuild b/games-puzzle/construo/construo-0.2.2.ebuild
index db72e0ce01e0..263f8ea14528 100644
--- a/games-puzzle/construo/construo-0.2.2.ebuild
+++ b/games-puzzle/construo/construo-0.2.2.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/construo/construo-0.2.2.ebuild,v 1.2 2004/02/20 06:53:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/construo/construo-0.2.2.ebuild,v 1.3 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
 DESCRIPTION="2d construction toy with objects that react on physical forces"
 HOMEPAGE="http://www.nongnu.org/construo/"
 SRC_URI="http://freesoftware.fsf.org/download/construo/construo.pkg/${PV}/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="virtual/x11
@@ -17,12 +18,15 @@ DEPEND="virtual/x11
 	virtual/glut"
 
 src_compile() {
-	egamesconf --datadir=${GAMES_DATADIR_BASE}
+	egamesconf --datadir="${GAMES_DATADIR_BASE}" || die
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} bindir=/usr/games/bin install || die "make install failed"
+	make \
+		DESTDIR="${D}" \
+		bindir="${GAMES_BINDIR}" install \
+		|| die "make install failed"
 	dodoc AUTHORS INSTALL INSTALL.configure NEWS README TODO
 	prepgamesdirs
 }
diff --git a/games-puzzle/cuyo/cuyo-1.8.1.ebuild b/games-puzzle/cuyo/cuyo-1.8.1.ebuild
index d116e6417c02..f54459115900 100644
--- a/games-puzzle/cuyo/cuyo-1.8.1.ebuild
+++ b/games-puzzle/cuyo/cuyo-1.8.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-puzzle/cuyo/cuyo-1.8.1.ebuild,v 1.4 2004/02/22 10:01:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/cuyo/cuyo-1.8.1.ebuild,v 1.5 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -11,17 +11,20 @@ SRC_URI="http://savannah.nongnu.org/download/cuyo/${P//_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
+IUSE=""
 
 DEPEND="virtual/glibc
 	virtual/x11
 	x11-libs/qt"
 
-S=${WORKDIR}/${P/_}
+S="${WORKDIR}/${P/_}"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i 's:-O2:@CXXFLAGS@ -Wno-long-long:' src/Makefile.in
+	sed -i \
+		-e 's:-O2:@CXXFLAGS@ -Wno-long-long:' src/Makefile.in \
+		|| die "sed src/Makefile.in failed"
 }
 
 src_compile() {
@@ -34,11 +37,11 @@ src_compile() {
 
 src_install() {
 	sed -i \
-		's: $(pkgdatadir: $(DESTDIR)$(pkgdatadir:' \
-		data/Makefile
-	make install DESTDIR=${D} || die
-	dogamesbin ${D}/${GAMES_PREFIX}/games/cuyo
-	rm -rf ${D}/${GAMES_PREFIX}/games
+		-e 's: $(pkgdatadir: $(DESTDIR)$(pkgdatadir:' data/Makefile \
+		|| die "sed data/Makefile failed"
+	make install DESTDIR=${D} || die "make install failed"
+	dogamesbin "${D}/${GAMES_PREFIX}/games/cuyo"
+	rm -rf "${D}/${GAMES_PREFIX}/games"
 	dodoc AUTHORS INSTALL NEWS README TODO ChangeLog
 	prepgamesdirs
 }
diff --git a/games-puzzle/drod-bin/drod-bin-1.6.3.ebuild b/games-puzzle/drod-bin/drod-bin-1.6.3.ebuild
index 3b882e3da564..4e99762f71b6 100644
--- a/games-puzzle/drod-bin/drod-bin-1.6.3.ebuild
+++ b/games-puzzle/drod-bin/drod-bin-1.6.3.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-puzzle/drod-bin/drod-bin-1.6.3.ebuild,v 1.4 2004/02/20 06:53:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/drod-bin/drod-bin-1.6.3.ebuild,v 1.5 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games eutils
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://sourceforge/drod/CDROD-${PV}-setup.sh.bin"
 LICENSE="MPL-1.1"
 SLOT="0"
 KEYWORDS="-* x86"
+IUSE=""
 
 RDEPEND="virtual/x11
 	dev-libs/expat
diff --git a/games-puzzle/drod-bin/drod-bin-1.6.5.ebuild b/games-puzzle/drod-bin/drod-bin-1.6.5.ebuild
index 884fcbcf22a9..2e2af45a9b4a 100644
--- a/games-puzzle/drod-bin/drod-bin-1.6.5.ebuild
+++ b/games-puzzle/drod-bin/drod-bin-1.6.5.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-puzzle/drod-bin/drod-bin-1.6.5.ebuild,v 1.3 2004/02/26 07:24:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/drod-bin/drod-bin-1.6.5.ebuild,v 1.4 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games eutils
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://sourceforge/drod/CDROD-${PV}-setup.sh.bin"
 LICENSE="MPL-1.1"
 SLOT="0"
 KEYWORDS="-* x86"
+IUSE=""
 
 RDEPEND="virtual/x11
 	dev-libs/expat
@@ -18,7 +19,7 @@ RDEPEND="virtual/x11
 	media-libs/libsdl
 	>=media-libs/sdl-ttf-2.0.6"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_unpack() {
 	unpack_makeself ${A}
diff --git a/games-puzzle/easysok/easysok-0.3.3.ebuild b/games-puzzle/easysok/easysok-0.3.3.ebuild
index d39ec5d1b4d6..469a6634784d 100644
--- a/games-puzzle/easysok/easysok-0.3.3.ebuild
+++ b/games-puzzle/easysok/easysok-0.3.3.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-puzzle/easysok/easysok-0.3.3.ebuild,v 1.1 2004/01/24 03:33:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/easysok/easysok-0.3.3.ebuild,v 1.2 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit kde
 need-kde 3
@@ -11,3 +11,4 @@ SRC_URI="mirror://sourceforge/easysok/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86"
+IUSE=""
diff --git a/games-puzzle/enigma/enigma-0.81.ebuild b/games-puzzle/enigma/enigma-0.81.ebuild
index fc0342c2dc8f..2069530b8866 100644
--- a/games-puzzle/enigma/enigma-0.81.ebuild
+++ b/games-puzzle/enigma/enigma-0.81.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-puzzle/enigma/enigma-0.81.ebuild,v 1.9 2004/03/30 00:59:24 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-0.81.ebuild,v 1.10 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -11,6 +11,7 @@ SRC_URI="http://savannah.nongnu.org/download/enigma/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~amd64 ~sparc"
+IUSE=""
 
 RDEPEND="virtual/glibc
 	sys-libs/zlib
diff --git a/games-puzzle/fbg/fbg-0.9-r1.ebuild b/games-puzzle/fbg/fbg-0.9-r1.ebuild
index 869234828bb4..7eade1c46954 100644
--- a/games-puzzle/fbg/fbg-0.9-r1.ebuild
+++ b/games-puzzle/fbg/fbg-0.9-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-puzzle/fbg/fbg-0.9-r1.ebuild,v 1.4 2004/03/07 21:33:45 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fbg/fbg-0.9-r1.ebuild,v 1.5 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://sourceforge/fbg/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc amd64"
+IUSE=""
 
 DEPEND="virtual/x11
 	virtual/opengl
@@ -22,16 +23,18 @@ DEPEND="virtual/x11
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i "/FBGDATADIR=/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" configure
+	sed -i \
+		-e "/FBGDATADIR=/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" configure \
+			|| die "sed configure failed"
 }
 
 src_compile() {
 	egamesconf --disable-fbglaunch || die
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "make install failed"
 	dodoc README TODO AUTHORS
 
 	# now clean up the install
diff --git a/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild b/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild
index fdccfc91eed1..74ace849dfd4 100644
--- a/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild
+++ b/games-puzzle/gemdropx/gemdropx-0.9-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-puzzle/gemdropx/gemdropx-0.9-r1.ebuild,v 1.3 2004/03/07 21:42:43 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild,v 1.4 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -11,6 +11,7 @@ SRC_URI="ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc amd64"
+IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2.3-r1
 	>=media-libs/sdl-mixer-1.2.1
@@ -18,15 +19,15 @@ DEPEND=">=media-libs/libsdl-1.2.3-r1
 
 src_compile() {
 	emake \
-		DATA_PREFIX=${GAMES_DATADIR}/${PN} \
+		DATA_PREFIX="${GAMES_DATADIR}/${PN}" \
 		XTRA_FLAGS="${CFLAGS}" \
-		|| die
+		|| die "emake failed"
 }
 
 src_install() {
-	dogamesbin gemdropx
-	dodir ${GAMES_DATADIR}/${PN}
-	cp -r data/* ${D}/${GAMES_DATADIR}/${PN}/
+	dogamesbin gemdropx || die "dogamesbin failed"
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -r data/* "${D}/${GAMES_DATADIR}/${PN}/"
 	dodoc AUTHORS.txt CHANGES.txt ICON.txt README.txt TODO.txt
 	prepgamesdirs
 }
diff --git a/games-puzzle/gemhun/gemhun-20031016.ebuild b/games-puzzle/gemhun/gemhun-20031016.ebuild
index ca25fa08892c..68faaefc0a65 100644
--- a/games-puzzle/gemhun/gemhun-20031016.ebuild
+++ b/games-puzzle/gemhun/gemhun-20031016.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-puzzle/gemhun/gemhun-20031016.ebuild,v 1.3 2004/03/31 19:04:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gemhun/gemhun-20031016.ebuild,v 1.4 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit eutils flag-o-matic games
 
@@ -9,9 +9,9 @@ DESCRIPTION="A puzzle game about grouping gems of a chosen amount together"
 HOMEPAGE="http://gemhun.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gemhun/GemHunters-src-${PV}.tar.gz"
 
-KEYWORDS="x86 ppc"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ppc"
 IUSE=""
 
 RDEPEND="dev-games/kyra
diff --git a/games-puzzle/glickomania/glickomania-1.0.ebuild b/games-puzzle/glickomania/glickomania-1.0.ebuild
index af290d840bb3..367bf12d55b0 100644
--- a/games-puzzle/glickomania/glickomania-1.0.ebuild
+++ b/games-puzzle/glickomania/glickomania-1.0.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-puzzle/glickomania/glickomania-1.0.ebuild,v 1.3 2004/03/07 21:46:25 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/glickomania/glickomania-1.0.ebuild,v 1.4 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -8,16 +8,16 @@ DESCRIPTION="An addictive variation of same game"
 HOMEPAGE="http://hibase.cs.hut.fi/~cessu/glickomania/"
 SRC_URI="http://hibase.cs.hut.fi/~cessu/glickomania/${P}.tar.gz"
 
-KEYWORDS="x86 amd64"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 amd64"
 IUSE=""
 
 DEPEND="=x11-libs/gtk+-1.2*
-		virtual/x11"
+	virtual/x11"
 
 src_install() {
 	dogamesbin src/glickomania || die "dogamesbin failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO || die "dodoc failed"
+	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
 	prepgamesdirs
 }
diff --git a/games-puzzle/greedy/greedy-0.2.0-r1.ebuild b/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
index 414389ac43fb..c6248bf84797 100644
--- a/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
+++ b/games-puzzle/greedy/greedy-0.2.0-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-puzzle/greedy/greedy-0.2.0-r1.ebuild,v 1.3 2004/03/07 21:50:39 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/greedy/greedy-0.2.0-r1.ebuild,v 1.4 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -8,9 +8,10 @@ DESCRIPTION="fun little ncurses puzzle game"
 HOMEPAGE="http://www.kotinet.com/juhamattin/linux/index.html"
 SRC_URI="http://www.kotinet.com/juhamattin/linux/download/${P}.tar.gz"
 
-KEYWORDS="x86 ppc amd64"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ppc amd64"
+IUSE=""
 
 DEPEND="virtual/glibc
 	sys-libs/ncurses"
@@ -22,13 +23,13 @@ src_compile() {
 src_install() {
 	# It wants a scores file.  We need to touch one and install it.
 	touch greedy.scores
-	insinto ${GAMES_STATEDIR}
+	insinto "${GAMES_STATEDIR}"
 	doins greedy.scores || die "doins failed"
 
 	dogamesbin greedy || die "dogamesbin failed"
-	dodoc CHANGES README TODO || die "dodoc failed"
+	dodoc CHANGES README TODO
 
 	prepgamesdirs
 	# We need to set the permissions correctly
-	chmod 664 ${D}/${GAMES_STATEDIR}/greedy.scores || die "chmod failed"
+	chmod 664 "${D}/${GAMES_STATEDIR}/greedy.scores" || die "chmod failed"
 }
diff --git a/games-puzzle/groundhog/groundhog-1.4.ebuild b/games-puzzle/groundhog/groundhog-1.4.ebuild
index d4e65356011b..a162033a1511 100644
--- a/games-puzzle/groundhog/groundhog-1.4.ebuild
+++ b/games-puzzle/groundhog/groundhog-1.4.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-puzzle/groundhog/groundhog-1.4.ebuild,v 1.4 2004/02/03 21:29:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/groundhog/groundhog-1.4.ebuild,v 1.5 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -20,16 +20,16 @@ DEPEND="virtual/x11
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-gcc3.patch
+	epatch "${FILESDIR}/${PV}-gcc3.patch"
 }
 
 src_compile() {
-	egamesconf `use_enable nls` || die
-	emake CXXFLAGS="${CXXFLAGS}" || die
+	egamesconf $(use_enable nls) || die
+	emake CXXFLAGS="${CXXFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make install DESTDIR="${D}" || die "make install failed"
 	dodoc README NEWS AUTHORS TODO Changelog
 	prepgamesdirs
 }
diff --git a/games-puzzle/gtetrinet/gtetrinet-0.7.4.ebuild b/games-puzzle/gtetrinet/gtetrinet-0.7.4.ebuild
index d2154e5bd033..8f4334d3b03b 100644
--- a/games-puzzle/gtetrinet/gtetrinet-0.7.4.ebuild
+++ b/games-puzzle/gtetrinet/gtetrinet-0.7.4.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-puzzle/gtetrinet/gtetrinet-0.7.4.ebuild,v 1.3 2004/02/20 06:53:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/gtetrinet-0.7.4.ebuild,v 1.4 2004/05/12 09:02:45 mr_bones_ Exp $
 
 # games after gnome2 so games' functions will override gnome2's
 inherit gnome2 games
@@ -31,7 +31,7 @@ src_compile() {
 			{.,icons,src}/Makefile.in || \
 				die "sed Makefile.in failed"
 	egamesconf \
-		`use_enable ipv6` \
+		$(use_enable ipv6) \
 		--sysconfdir=/etc \
 		|| die
 	emake || die "emake failed"
diff --git a/games-puzzle/gtetrinet/gtetrinet-0.7.5.ebuild b/games-puzzle/gtetrinet/gtetrinet-0.7.5.ebuild
index 87da37d26fd7..0b0e301cd707 100644
--- a/games-puzzle/gtetrinet/gtetrinet-0.7.5.ebuild
+++ b/games-puzzle/gtetrinet/gtetrinet-0.7.5.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-puzzle/gtetrinet/gtetrinet-0.7.5.ebuild,v 1.5 2004/04/04 09:21:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/gtetrinet-0.7.5.ebuild,v 1.6 2004/05/12 09:02:45 mr_bones_ Exp $
 
 # games after gnome2 so games' functions will override gnome2's
 inherit gnome2 games
@@ -37,7 +37,7 @@ src_unpack() {
 
 src_compile() {
 	egamesconf \
-		`use_enable ipv6` \
+		$(use_enable ipv6) \
 		--sysconfdir=/etc \
 		|| die
 	emake || die "emake failed"
diff --git a/games-puzzle/gtkballs/gtkballs-3.0.1.ebuild b/games-puzzle/gtkballs/gtkballs-3.0.1.ebuild
index cdd46d252410..2548818d64d0 100644
--- a/games-puzzle/gtkballs/gtkballs-3.0.1.ebuild
+++ b/games-puzzle/gtkballs/gtkballs-3.0.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-puzzle/gtkballs/gtkballs-3.0.1.ebuild,v 1.3 2004/01/23 01:22:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtkballs/gtkballs-3.0.1.ebuild,v 1.4 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -8,9 +8,10 @@ DESCRIPTION="An entertaining game based on the old DOS game lines"
 SRC_URI="http://gtkballs.antex.ru/dist/${P}.tar.gz"
 HOMEPAGE="http://gtkballs.antex.ru/"
 
-KEYWORDS="x86 ppc"
 LICENSE="GPL-2"
 SLOT="3"
+KEYWORDS="x86 ppc"
+IUSE=""
 
 RDEPEND="=x11-libs/gtk+-2*
 	nls? ( >=sys-devel/gettext-0.10.38 ) "
@@ -22,14 +23,16 @@ IUSE="nls"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i 's:touch Makefile\.in::' configure
 	sed -i \
-		's/__func__/__FUNCTION__/g' src/themerc.c \
+		-e 's:touch Makefile\.in::' configure \
+		|| die "sed configure failed"
+	sed -i \
+		-e 's/__func__/__FUNCTION__/g' src/themerc.c \
 		|| die "sed src/themerc.c failed"
 }
 
 src_compile() {
-	egamesconf `use_enable nls` || die
+	egamesconf $(use_enable nls) || die
 	emake || die "emake failed"
 }
 
diff --git a/games-puzzle/gtkballs/gtkballs-3.1.0.ebuild b/games-puzzle/gtkballs/gtkballs-3.1.0.ebuild
index c7530621cd67..1131bbacb63d 100644
--- a/games-puzzle/gtkballs/gtkballs-3.1.0.ebuild
+++ b/games-puzzle/gtkballs/gtkballs-3.1.0.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-puzzle/gtkballs/gtkballs-3.1.0.ebuild,v 1.2 2004/03/07 22:37:38 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtkballs/gtkballs-3.1.0.ebuild,v 1.3 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -8,19 +8,18 @@ DESCRIPTION="An entertaining game based on the old DOS game lines"
 HOMEPAGE="http://gtkballs.antex.ru/"
 SRC_URI="http://gtkballs.antex.ru/dist/${P}.tar.gz"
 
-KEYWORDS="x86 ppc amd64"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ppc amd64"
+IUSE="nls"
 
 RDEPEND="=x11-libs/gtk+-2*
 	nls? ( >=sys-devel/gettext-0.10.38 ) "
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
-IUSE="nls"
-
 src_compile() {
-	egamesconf `use_enable nls` || die
+	egamesconf $(use_enable nls) || die
 	emake || die "emake failed"
 }
 
diff --git a/games-puzzle/gweled/gweled-0.4.ebuild b/games-puzzle/gweled/gweled-0.4.ebuild
index 9ce0293ceaf5..75b60b64b9a0 100644
--- a/games-puzzle/gweled/gweled-0.4.ebuild
+++ b/games-puzzle/gweled/gweled-0.4.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-puzzle/gweled/gweled-0.4.ebuild,v 1.3 2004/03/07 21:04:41 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gweled/gweled-0.4.ebuild,v 1.4 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit flag-o-matic
 
@@ -11,6 +11,7 @@ SRC_URI="http://sebdelestaing.free.fr/gweled/Release/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64"
+IUSE=""
 
 DEPEND=">=x11-libs/gtk+-2
 	>=gnome-base/librsvg-2
@@ -23,6 +24,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS NEWS
 }
diff --git a/games-puzzle/hangman/hangman-0.9.2.ebuild b/games-puzzle/hangman/hangman-0.9.2.ebuild
index c3487349cdde..c457be4cc4f8 100644
--- a/games-puzzle/hangman/hangman-0.9.2.ebuild
+++ b/games-puzzle/hangman/hangman-0.9.2.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-puzzle/hangman/hangman-0.9.2.ebuild,v 1.2 2004/05/11 04:55:54 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/hangman/hangman-0.9.2.ebuild,v 1.3 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -8,9 +8,9 @@ DESCRIPTION="The classic word guessing game"
 HOMEPAGE="http://www.shiftygames.com/hangman/hangman.html"
 SRC_URI="http://www.shiftygames.com/hangman/${P}.tar.gz"
 
-KEYWORDS="x86 ~sparc"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ~sparc"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2.4
diff --git a/games-puzzle/hangman/hangman-0.9.ebuild b/games-puzzle/hangman/hangman-0.9.ebuild
index 5a51542eff7f..51a6bd6b06c1 100644
--- a/games-puzzle/hangman/hangman-0.9.ebuild
+++ b/games-puzzle/hangman/hangman-0.9.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-puzzle/hangman/hangman-0.9.ebuild,v 1.1 2004/03/05 10:05:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/hangman/hangman-0.9.ebuild,v 1.2 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -8,9 +8,9 @@ DESCRIPTION="The classic word guessing game"
 HOMEPAGE="http://www.shiftygames.com/hangman/hangman.html"
 SRC_URI="http://www.shiftygames.com/hangman/${P}.tar.gz"
 
-KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 src_compile() {
 	egamesconf \
 		--disable-dependency-tracking \
-		--datadir=${GAMES_DATADIR_BASE} \
+		--datadir="${GAMES_DATADIR_BASE}" \
 		|| die
 	emake || die "emake faile"
 }
diff --git a/games-puzzle/hoh-bin/hoh-bin-1.0.ebuild b/games-puzzle/hoh-bin/hoh-bin-1.0.ebuild
index 7993074fe364..086ec8f32d90 100644
--- a/games-puzzle/hoh-bin/hoh-bin-1.0.ebuild
+++ b/games-puzzle/hoh-bin/hoh-bin-1.0.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-puzzle/hoh-bin/hoh-bin-1.0.ebuild,v 1.1 2004/01/05 07:51:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/hoh-bin/hoh-bin-1.0.ebuild,v 1.2 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -10,9 +10,9 @@ HOMEPAGE="http://retrospec.sgn.net/games/hoh/"
 SRC_URI="http://retrospec.sgn.net/download.php?id=63\&path=games/hoh/bin/hohlin-${PV/./}.tar.bz2"
 
 RESTRICT="nostrip"
-KEYWORDS="x86"
 LICENSE="free-noncomm"
 SLOT="0"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="virtual/x11"
diff --git a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild b/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
index 7a40d988e7ac..24c4bb8546d5 100644
--- a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
+++ b/games-puzzle/hoh-bin/hoh-bin-1.01.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-puzzle/hoh-bin/hoh-bin-1.01.ebuild,v 1.1 2004/01/13 21:46:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild,v 1.2 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -10,9 +10,9 @@ HOMEPAGE="http://retrospec.sgn.net/games/hoh/"
 SRC_URI="http://retrospec.sgn.net/download.php?id=63\&path=games/hoh/bin/hohlin-${PV/./}.tar.bz2"
 
 RESTRICT="nostrip"
-KEYWORDS="x86"
 LICENSE="free-noncomm"
 SLOT="0"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="virtual/x11"
diff --git a/games-puzzle/icebreaker/icebreaker-1.9.5.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.5.ebuild
index 5bafc870892b..07034f3ce03d 100644
--- a/games-puzzle/icebreaker/icebreaker-1.9.5.ebuild
+++ b/games-puzzle/icebreaker/icebreaker-1.9.5.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-puzzle/icebreaker/icebreaker-1.9.5.ebuild,v 1.3 2004/02/20 06:53:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/icebreaker/icebreaker-1.9.5.ebuild,v 1.4 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -11,6 +11,7 @@ SRC_URI="http://www.mattdm.org/icebreaker/1.9.x/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
+IUSE=""
 
 DEPEND="virtual/x11
 	media-libs/libsdl
@@ -19,18 +20,18 @@ DEPEND="virtual/x11
 src_compile() {
 	emake \
 		prefix=/usr \
-		bindir=${GAMES_BINDIR} \
-		datadir=${GAMES_DATADIR} \
-		highscoredir=${GAMES_STATEDIR} || \
-			die "emake failed"
+		bindir="${GAMES_BINDIR}" \
+		datadir="${GAMES_DATADIR}" \
+		highscoredir="${GAMES_STATEDIR}" \
+		|| die "emake failed"
 }
 
 src_install() {
 	einstall \
-		prefix=${D}/usr \
-		bindir=${D}${GAMES_BINDIR} \
-		datadir=${D}${GAMES_DATADIR} \
-		highscoredir=${D}${GAMES_STATEDIR} || die
+		prefix="${D}/usr" \
+		bindir="${D}${GAMES_BINDIR}" \
+		datadir="${D}${GAMES_DATADIR}" \
+		highscoredir="${D}${GAMES_STATEDIR}" || die
 
 	dodoc ChangeLog INSTALL README* TODO
 	prepgamesdirs
diff --git a/games-puzzle/kiki/kiki-0.9.0.ebuild b/games-puzzle/kiki/kiki-0.9.0.ebuild
index c46c97b0c7e6..78d1dc575930 100644
--- a/games-puzzle/kiki/kiki-0.9.0.ebuild
+++ b/games-puzzle/kiki/kiki-0.9.0.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-puzzle/kiki/kiki-0.9.0.ebuild,v 1.3 2004/04/21 19:03:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/kiki-0.9.0.ebuild,v 1.4 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -11,8 +11,8 @@ HOMEPAGE="http://kiki.sourceforge.net/"
 SRC_URI="mirror://sourceforge/kiki/${PN}-src-${PV}.tgz"
 
 LICENSE="public-domain"
-KEYWORDS="x86"
 SLOT="0"
+KEYWORDS="x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsdl-1.2
@@ -29,8 +29,8 @@ src_unpack() {
 
 	cd ${S}
 	# There are CVS directories in the tgz file
-	rm -rf `find -name CVS -type d`
-	rm -rf `find -name .cvsignore`
+	rm -rf $(find -name CVS -type d)
+	rm -rf $(find -name .cvsignore)
 	chmod a-x kiki_src/kiki/sounds/*.*
 
 	# Change the hard-coded data dir for sounds, etc...
diff --git a/games-puzzle/lpairs/lpairs-1.0.1.ebuild b/games-puzzle/lpairs/lpairs-1.0.1.ebuild
index 6557cda98b2d..d868f3c201a1 100644
--- a/games-puzzle/lpairs/lpairs-1.0.1.ebuild
+++ b/games-puzzle/lpairs/lpairs-1.0.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-puzzle/lpairs/lpairs-1.0.1.ebuild,v 1.2 2004/02/20 06:53:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/lpairs/lpairs-1.0.1.ebuild,v 1.3 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -8,22 +8,23 @@ DESCRIPTION="Kids card/puzzle game"
 SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
 HOMEPAGE="http://lgames.sourceforge.net/index.php?project=LPairs"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND="virtual/x11
 	media-libs/libsdl"
 
 src_compile() {
 	egamesconf \
-		--datadir=${GAMES_DATADIR_BASE} \
+		--datadir="${GAMES_DATADIR_BASE}" \
 		|| die
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make install DESTDIR="${D}" || die
 	dodoc README AUTHORS TODO ChangeLog
 	prepgamesdirs
 }
diff --git a/games-puzzle/ltris/ltris-1.0.5-r1.ebuild b/games-puzzle/ltris/ltris-1.0.5-r1.ebuild
index e99c58339774..d947665168ab 100644
--- a/games-puzzle/ltris/ltris-1.0.5-r1.ebuild
+++ b/games-puzzle/ltris/ltris-1.0.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-puzzle/ltris/ltris-1.0.5-r1.ebuild,v 1.2 2004/02/09 12:19:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ltris/ltris-1.0.5-r1.ebuild,v 1.3 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.1.5
 	media-libs/sdl-mixer"
diff --git a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild b/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
index f4314e13e289..a62ac8a52588 100644
--- a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
+++ b/games-puzzle/magiccube4d/magiccube4d-2.2.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-puzzle/magiccube4d/magiccube4d-2.2.ebuild,v 1.2 2004/02/20 06:53:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild,v 1.3 2004/05/12 09:02:45 mr_bones_ Exp $
 
 inherit games
 
@@ -15,17 +15,16 @@ KEYWORDS="x86"
 IUSE=""
 
 DEPEND="virtual/x11"
-#RDEPEND=""
 
-S=${WORKDIR}/${PN}-src-${MY_PV}
+S="${WORKDIR}/${PN}-src-${MY_PV}"
 
 src_compile() {
 	egamesconf || die
-	emake DFLAGS="${CFLAGS}" || die
+	emake DFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dogamesbin magiccube4d
+	dogamesbin magiccube4d || die "dogamesbin failed"
 	dodoc ChangeLog MagicCube4D-unix.txt readme-unix.txt Intro.txt
 	prepgamesdirs
 }
diff --git a/games-puzzle/marbles/marbles-1.0.5-r1.ebuild b/games-puzzle/marbles/marbles-1.0.5-r1.ebuild
index ef389eacb520..986b21540f59 100644
--- a/games-puzzle/marbles/marbles-1.0.5-r1.ebuild
+++ b/games-puzzle/marbles/marbles-1.0.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-puzzle/marbles/marbles-1.0.5-r1.ebuild,v 1.3 2004/02/29 21:02:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/marbles/marbles-1.0.5-r1.ebuild,v 1.4 2004/05/12 09:02:46 mr_bones_ Exp $
 
 inherit games
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc amd64"
+IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2.4
 	>=media-libs/sdl-mixer-1.2.3"
@@ -21,7 +22,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog INSTALL README TODO
 	prepgamesdirs
 }
diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild
index 4d9ae802746c..e63a7f07ccfd 100644
--- a/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild
+++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2.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-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild,v 1.4 2004/05/02 05:20:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild,v 1.5 2004/05/12 09:02:46 mr_bones_ Exp $
 
 inherit flag-o-matic games
 
@@ -25,7 +25,7 @@ src_compile() {
 	replace-flags -march=k6 -march=i586
 
 	local makeopts="X11_PATH=/usr/X11R6 RO_GAME_DIR=${GAMES_DATADIR}/${PN} RW_GAME_DIR=${GAMES_STATEDIR}/${PN}"
-	if use X || [ -z "`use X``use sdl`" ] ; then
+	if use X || [ -z "$(use X)$(use sdl)" ] ; then
 		make clean || die
 		make ${makeopts} OPTIONS="${CFLAGS}" x11 || die
 		mv mirrormagic{,.x11}
diff --git a/games-puzzle/pathological/pathological-1.1.3.ebuild b/games-puzzle/pathological/pathological-1.1.3.ebuild
index cd94b6c3292b..718cfc64a572 100644
--- a/games-puzzle/pathological/pathological-1.1.3.ebuild
+++ b/games-puzzle/pathological/pathological-1.1.3.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-puzzle/pathological/pathological-1.1.3.ebuild,v 1.2 2004/02/20 06:53:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pathological/pathological-1.1.3.ebuild,v 1.3 2004/05/12 09:02:46 mr_bones_ Exp $
 
 inherit games
 
@@ -23,11 +23,11 @@ src_unpack() {
 
 	use doc && {
 		sed -i \
-			-e '5,$ s/=/ /g' makehtml || \
-				die "sed makehtml failed"
+			-e '5,$ s/=/ /g' makehtml \
+			|| die "sed makehtml failed"
 	} || {
-		echo "#!/bin/sh" > makehtml || \
-			die "clearing makehtml failed"
+		echo "#!/bin/sh" > makehtml \
+		|| die "clearing makehtml failed"
 	}
 
 	sed -i \
@@ -41,24 +41,25 @@ src_unpack() {
 
 src_install() {
 	# executables
-	dogamesbin pathological
-	insinto ${GAMES_DATADIR}/${PN}
+	dogamesbin pathological || die "dogamesbin failed"
+	insinto "${GAMES_DATADIR}/${PN}"
 	insopts -m0750
-	doins pathological.py
-	exeinto ${GAMES_LIBDIR}/${PN}
-	doexe write-highscores
+	doins pathological.py || die "doins failed"
+	exeinto "${GAMES_LIBDIR}/${PN}"
+	doexe write-highscores || die "doexe failed"
 
 	# removed some unneeded resource files
 	rm -f graphics/*.xcf
 	rm -f sounds/*.orig
 	# "install" resource files
 	# Use cp, not mv so install can be done multiple times (for ebuild devel).
-	cp -R circuits graphics music sounds ${D}/${GAMES_DATADIR}/${PN}
+	cp -R circuits graphics music sounds "${D}/${GAMES_DATADIR}/${PN}" \
+		|| die "cp failed"
 
 	# setup high score file
-	insinto ${GAMES_STATEDIR}
+	insinto "${GAMES_STATEDIR}"
 	insopts -m0664
-	doins pathological_scores
+	doins pathological_scores || die "doins failed (pathological_scores)"
 
 	# documentation
 	dodoc README TODO
diff --git a/games-puzzle/pingus/pingus-0.6.0-r1.ebuild b/games-puzzle/pingus/pingus-0.6.0-r1.ebuild
index 77d5981f39ce..a76cdb38352e 100644
--- a/games-puzzle/pingus/pingus-0.6.0-r1.ebuild
+++ b/games-puzzle/pingus/pingus-0.6.0-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-puzzle/pingus/pingus-0.6.0-r1.ebuild,v 1.3 2004/02/03 20:51:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.6.0-r1.ebuild,v 1.4 2004/05/12 09:02:46 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -24,14 +24,14 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-gcc3.patch
+	epatch "${FILESDIR}/${PV}-gcc3.patch"
 }
 
 src_compile() {
 	egamesconf \
-		--with-bindir=${GAMES_BINDIR} \
-		--with-datadir=${GAMES_DATADIR_BASE} \
-		`use_with opengl clanGL` \
+		--with-bindir="${GAMES_BINDIR}" \
+		--with-datadir="${GAMES_DATADIR_BASE}" \
+		$(use_with opengl clanGL) \
 		|| die
 	emake || die "emake failed"
 }
diff --git a/games-puzzle/quadra/quadra-1.1.8.ebuild b/games-puzzle/quadra/quadra-1.1.8.ebuild
index 821e74d8b3ad..e35f1e00b983 100644
--- a/games-puzzle/quadra/quadra-1.1.8.ebuild
+++ b/games-puzzle/quadra/quadra-1.1.8.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-puzzle/quadra/quadra-1.1.8.ebuild,v 1.5 2004/04/19 11:46:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.6 2004/05/12 09:02:46 mr_bones_ Exp $
 
 inherit eutils gcc games
 
@@ -35,7 +35,7 @@ src_unpack() {
 }
 
 src_compile() {
-	egamesconf `use_with svga svgalib` || die
+	egamesconf $(use_with svga svgalib) || die
 	emake || die "emake failed"
 }
 
diff --git a/games-puzzle/quintalign/quintalign-1.0.ebuild b/games-puzzle/quintalign/quintalign-1.0.ebuild
index 7eb12180afab..f9dd9361b9be 100644
--- a/games-puzzle/quintalign/quintalign-1.0.ebuild
+++ b/games-puzzle/quintalign/quintalign-1.0.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-puzzle/quintalign/quintalign-1.0.ebuild,v 1.2 2004/02/20 06:53:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quintalign/quintalign-1.0.ebuild,v 1.3 2004/05/12 09:02:46 mr_bones_ Exp $
 
 inherit kde
 need-kde 3
@@ -9,6 +9,7 @@ DESCRIPTION="A one player boardgame - similar to Tetris"
 HOMEPAGE="http://www.heni-online.de/linux/"
 SRC_URI="http://www.heni-online.de/files/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
+IUSE=""
diff --git a/games-puzzle/tetrinet/tetrinet-0.11.ebuild b/games-puzzle/tetrinet/tetrinet-0.11.ebuild
index 2ae111048460..37de29841559 100644
--- a/games-puzzle/tetrinet/tetrinet-0.11.ebuild
+++ b/games-puzzle/tetrinet/tetrinet-0.11.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-puzzle/tetrinet/tetrinet-0.11.ebuild,v 1.4 2004/02/20 06:53:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/tetrinet-0.11.ebuild,v 1.5 2004/05/12 09:02:46 mr_bones_ Exp $
 
 inherit games flag-o-matic
 
@@ -23,15 +23,15 @@ src_unpack() {
 	cd ${S}
 
 	# for now, make sure IPv6 is always on #32860
-	[ `use ipv6` ] && append-flags -DHAVE_IPV6
+	use ipv6 && append-flags -DHAVE_IPV6
 	sed -i \
 		-e 's/-DHAVE_IPV6//' \
-		-e "s:-O2:${CFLAGS}:" Makefile || \
-			die "sed Makefile failed"
+		-e "s:-O2:${CFLAGS}:" Makefile \
+		|| die "sed Makefile failed"
 }
 
 src_install() {
 	dogamesbin tetrinet tetrinet-server || die "dogamesbin failed"
-	dodoc README TODO tetrinet.txt      || die "dodoc failed"
+	dodoc README TODO tetrinet.txt
 	prepgamesdirs
 }
diff --git a/games-puzzle/xblockout/xblockout-1.1.2.ebuild b/games-puzzle/xblockout/xblockout-1.1.2.ebuild
index f5eb4328beaf..d248fc03d00e 100644
--- a/games-puzzle/xblockout/xblockout-1.1.2.ebuild
+++ b/games-puzzle/xblockout/xblockout-1.1.2.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-puzzle/xblockout/xblockout-1.1.2.ebuild,v 1.3 2004/03/24 05:00:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xblockout/xblockout-1.1.2.ebuild,v 1.4 2004/05/12 09:02:46 mr_bones_ Exp $
 
 inherit games
 
@@ -30,10 +30,10 @@ src_unpack() {
 src_compile() {
 	egamesconf || die
 	emake \
-		SCOREDIR=${GAMES_STATEDIR}/${PN} \
-		GROUP_GID=`id -g ${GAMES_GROUP}` \
-		RESOURCEDIR=${GAMES_DATADIR}/${PN} \
-			|| die "emake failed"
+		SCOREDIR="${GAMES_STATEDIR}/${PN}" \
+		GROUP_GID=$(id -g ${GAMES_GROUP}) \
+		RESOURCEDIR="${GAMES_DATADIR}/${PN}" \
+		|| die "emake failed"
 }
 
 src_install() {
diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
index 9a23bef61770..eb5d1eba9b77 100644
--- a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
+++ b/games-puzzle/xwelltris/xwelltris-1.0.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-puzzle/xwelltris/xwelltris-1.0.1.ebuild,v 1.4 2004/03/07 20:51:56 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild,v 1.5 2004/05/12 09:02:46 mr_bones_ Exp $
 
 inherit games
 
@@ -22,21 +22,21 @@ DEPEND="${RDEPEND}
 
 src_compile() {
 	# configure/build process is pretty messed up
-	egamesconf `use_with sdl` || die
+	egamesconf $(use_with sdl) || die
 	sed -i \
 		-e "/GLOBAL_SEARCH/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" \
-			src/include/globals.h || \
-				die "sed src/include/globals.h failed"
+			src/include/globals.h \
+			|| die "sed src/include/globals.h failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	dodir ${GAMES_BINDIR} ${GAMES_DATADIR}/${PN} /usr/share/man
+	dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" /usr/share/man
 	make install \
-		INSTDIR=${D}/${GAMES_BINDIR} \
-		INSTLIB=${D}/${GAMES_DATADIR}/${PN} \
+		INSTDIR="${D}/${GAMES_BINDIR}" \
+		INSTLIB="${D}/${GAMES_DATADIR}/${PN}" \
 		INSTMAN=/usr/share/man \
 		|| die "make install failed"
-	dodoc AUTHORS Changelog README* || die "dodoc failed"
+	dodoc AUTHORS Changelog README*
 	prepgamesdirs
 }