From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Fri, 15 Feb 2008 01:24:16 +0000 (+0000)
Subject: Fix quoting.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=08deb688423826ed2e07f25f76b27ad4bd4e762e;p=gentoo.git

Fix quoting.
Package-Manager: portage-2.1.4.4
---

diff --git a/games-fps/enemy-territory/ChangeLog b/games-fps/enemy-territory/ChangeLog
index 007164eb2bbf..0aab808e7730 100644
--- a/games-fps/enemy-territory/ChangeLog
+++ b/games-fps/enemy-territory/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/enemy-territory
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.41 2007/11/06 21:03:23 wolf31o2 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.42 2008/02/15 01:01:55 wolf31o2 Exp $
+
+  15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  enemy-territory-2.60b.ebuild:
+  Fix quoting.
 
   06 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   enemy-territory-2.60b.ebuild:
diff --git a/games-fps/enemy-territory/enemy-territory-2.60b.ebuild b/games-fps/enemy-territory/enemy-territory-2.60b.ebuild
index 4c3378c89e92..8f2d0b1956c7 100644
--- a/games-fps/enemy-territory/enemy-territory-2.60b.ebuild
+++ b/games-fps/enemy-territory/enemy-territory-2.60b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.60b.ebuild,v 1.10 2007/11/06 21:03:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.60b.ebuild,v 1.11 2008/02/15 01:01:55 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -69,11 +69,11 @@ src_install() {
 	if use dedicated ; then
 		doexe "Enemy Territory 2.60b"/linux/etded.x86 || die "doexe failed"
 		games_make_wrapper et-ded ./etded.x86 ${dir}
-		newinitd ${S}/et-ded.rc et-ded || die "newinitd failed"
+		newinitd "${S}"/et-ded.rc et-ded || die "newinitd failed"
 		dosed "s:GAMES_USER_DED:${GAMES_USER_DED}:" /etc/init.d/et-ded
 		dosed "s:GENTOO_DIR:${GAMES_BINDIR}:" /etc/init.d/et-ded
-		newconfd ${S}/et-ded.conf.d et-ded || die "newconfd failed"
-#		newenvd ${S}/et-ded.env.d et-ded || die "newenvd failed"
+		newconfd "${S}"/et-ded.conf.d et-ded || die "newconfd failed"
+#		newenvd "${S}"/et-ded.env.d et-ded || die "newenvd failed"
 		# TODO: move this to /var/ perhaps ?
 		dodir "${dir}/etwolf-homedir"
 		keepdir "${dir}/etwolf-homedir"
diff --git a/games-fps/lsdldoom/ChangeLog b/games-fps/lsdldoom/ChangeLog
index 31571c8d2810..fea229599628 100644
--- a/games-fps/lsdldoom/ChangeLog
+++ b/games-fps/lsdldoom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/lsdldoom
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/ChangeLog,v 1.12 2007/08/14 19:50:14 nyhm Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/ChangeLog,v 1.13 2008/02/15 01:04:11 wolf31o2 Exp $
+
+  15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  lsdldoom-1.4.4.4.ebuild:
+  Fix quoting.
 
 *lsdldoom-1.4.4.4-r1 (14 Aug 2007)
 
diff --git a/games-fps/lsdldoom/lsdldoom-1.4.4.4.ebuild b/games-fps/lsdldoom/lsdldoom-1.4.4.4.ebuild
index 89b20c3e9149..91dc87b9043b 100644
--- a/games-fps/lsdldoom/lsdldoom-1.4.4.4.ebuild
+++ b/games-fps/lsdldoom/lsdldoom-1.4.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/lsdldoom-1.4.4.4.ebuild,v 1.14 2007/01/27 00:50:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/lsdldoom-1.4.4.4.ebuild,v 1.15 2008/02/15 01:04:11 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -20,8 +20,8 @@ DEPEND="media-libs/libsdl
 
 src_unpack() {
 	unpack ${A}
-	cp -r ${S}{,.orig}
-	cd ${S}
+	cp -r "${S}"{,.orig}
+	cd "${S}"
 	epatch "${FILESDIR}"/${PV}-gentoo-paths.patch \
 		"${FILESDIR}/${P}"-gcc41.patch
 	epatch "${FILESDIR}"/${PV}-gcc34.patch #77846
diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog
index cc9b381d15ea..5a4d83d82083 100644
--- a/games-fps/quake2-icculus/ChangeLog
+++ b/games-fps/quake2-icculus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake2-icculus
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.28 2008/01/28 01:22:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.29 2008/02/15 01:06:36 wolf31o2 Exp $
+
+  15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake2-icculus-0.16.1.ebuild, quake2-icculus-0.16.1-r1.ebuild:
+  Fix quoting.
 
   28 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org>
   quake2-icculus-0.16.1-r1.ebuild:
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index 24088c985a50..42ba607cde79 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.8 2008/01/28 01:22:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.9 2008/02/15 01:06:36 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -80,7 +80,7 @@ src_unpack() {
 			-e 's:^read ans:ans=yes :' ${shar} \
 			|| die "sed ${shar} failed"
 		echo ">>> Unpacking ${shar} to ${PWD}"
-		env PATH=${T}:${PATH} unshar ${shar} || die "unpacking ${shar} failed"
+		env PATH="${T}:${PATH}" unshar ${shar} || die "unpacking ${shar} failed"
 		rm ${shar}
 	done
 	if use xatrix ; then
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild
index 374883e72d7e..7586d4ede1ee 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild,v 1.20 2007/11/20 02:17:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild,v 1.21 2008/02/15 01:06:36 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -59,7 +59,7 @@ src_unpack() {
 			-e 's:^read ans:ans=yes :' ${shar} \
 			|| die "sed ${shar} failed"
 		echo ">>> Unpacking ${shar} to ${PWD}"
-		env PATH=${T}:${PATH} unshar ${shar} || die "unpacking ${shar} failed"
+		env PATH="${T}:${PATH}" unshar ${shar} || die "unpacking ${shar} failed"
 		rm ${shar}
 	done
 	if use xatrix ; then
diff --git a/games-fps/quake3-demo/ChangeLog b/games-fps/quake3-demo/ChangeLog
index 0ace9fd15d0d..1a03379de3a4 100644
--- a/games-fps/quake3-demo/ChangeLog
+++ b/games-fps/quake3-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake3-demo
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/ChangeLog,v 1.19 2007/07/31 14:36:24 cardoe Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/ChangeLog,v 1.20 2008/02/15 01:09:40 wolf31o2 Exp $
+
+  15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake3-demo-1.11.ebuild:
+  Fix quoting.
 
   31 Jul 2007; Doug Goldstein <cardoe@gentoo.org> quake3-demo-1.11.ebuild:
   nvidia-legacy-drivers has merged with nvidia-drivers
diff --git a/games-fps/quake3-demo/quake3-demo-1.11.ebuild b/games-fps/quake3-demo/quake3-demo-1.11.ebuild
index 4a2c59a3b6d5..a7f4e432a5f1 100644
--- a/games-fps/quake3-demo/quake3-demo-1.11.ebuild
+++ b/games-fps/quake3-demo/quake3-demo-1.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/quake3-demo-1.11.ebuild,v 1.23 2007/07/31 14:36:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/quake3-demo-1.11.ebuild,v 1.24 2008/02/15 01:09:40 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -36,6 +36,9 @@ RDEPEND="sys-libs/glibc
 
 S=${WORKDIR}
 
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
 GAMES_CHECK_LICENSE="yes"
 
 src_unpack() {
@@ -43,26 +46,25 @@ src_unpack() {
 }
 
 src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-	dodir ${dir}
+	dodir "${dir}"
 
-	cp -rf Help ${D}/${dir}/
-	cp -rf demoq3 ${D}/${dir}/
+	cp -rf Help "${Ddir}"
+	cp -rf demoq3 "${Ddir}"
 
-	exeinto ${dir}
+	exeinto "${dir}"
 	newexe bin/x86/glibc-2.0/q3ded q3ded.x86
 	newexe bin/x86/glibc-2.0/q3demo q3demo.x86
 	use 3dfx && doexe bin/x86/glibc-2.0/libMesaVoodooGL.so*
-	#use opengl && dosym /usr/lib/libGL.so ${dir}/libGL.so
+	#use opengl && dosym /usr/lib/libGL.so "${dir}"/libGL.so
 
-	doexe ${FILESDIR}/{q3demo,q3demo-ded}
-	dodir ${GAMES_BINDIR}
-	dosym ${dir}/q3demo ${GAMES_BINDIR}/q3demo
-	dosym ${dir}/q3demo-ded ${GAMES_BINDIR}/q3demo-ded
-	dosed "s:GENTOO_DIR:${dir}:" ${dir}/q3demo
-	dosed "s:GENTOO_DIR:${dir}:" ${dir}/q3demo-ded
+	doexe "${FILESDIR}"/{q3demo,q3demo-ded}
+	dodir "${GAMES_BINDIR}"
+	dosym "${dir}"/q3demo "${GAMES_BINDIR}"/q3demo
+	dosym "${dir}"/q3demo-ded "${GAMES_BINDIR}"/q3demo-ded
+	dosed "s:GENTOO_DIR:${dir}:" "${dir}"/q3demo
+	dosed "s:GENTOO_DIR:${dir}:" "${dir}"/q3demo-ded
 
-	insinto ${dir}
+	insinto "${dir}"
 	doins README icon.*
 
 	make_desktop_entry q3demo "Quake III (Demo)"
diff --git a/games-fps/quake3-matrix/ChangeLog b/games-fps/quake3-matrix/ChangeLog
index 2572b6044d0f..b829775eb8e4 100644
--- a/games-fps/quake3-matrix/ChangeLog
+++ b/games-fps/quake3-matrix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake3-matrix
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-matrix/ChangeLog,v 1.3 2006/10/23 22:58:23 wolf31o2 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-matrix/ChangeLog,v 1.4 2008/02/15 01:11:05 wolf31o2 Exp $
+
+  15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake3-matrix-2.4_beta-r1.ebuild:
+  Fix quoting.
 
 *quake3-matrix-2.4_beta-r1 (23 Oct 2006)
 
diff --git a/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild b/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
index 27789e6d0196..c760eb5efa21 100644
--- a/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
+++ b/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild,v 1.1 2006/10/23 22:58:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild,v 1.2 2008/02/15 01:11:05 wolf31o2 Exp $
 
 MOD_DESC="Matrix conversion mod"
 MOD_NAME="matrix"
@@ -32,6 +32,6 @@ pkg_nofetch() {
 
 src_unpack() {
 	games-mods_src_unpack
-	mkdir -p ${S}/matrix
+	mkdir -p "${S}"/matrix
 	mv *.pk3 *.txt matrix
 }
diff --git a/games-fps/quakeforge/ChangeLog b/games-fps/quakeforge/ChangeLog
index 3f642c17f1a4..39a84c78e0a7 100644
--- a/games-fps/quakeforge/ChangeLog
+++ b/games-fps/quakeforge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quakeforge
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.18 2007/10/14 21:08:56 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.19 2008/02/15 01:12:38 wolf31o2 Exp $
+
+  15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  quakeforge-0.5.5.ebuild:
+  Fix quoting.
 
   14 Oct 2007; Mike Frysinger <vapier@gentoo.org>
   +files/quakeforge-0.5.5-no-page-size.patch, quakeforge-0.5.5-r2.ebuild:
diff --git a/games-fps/quakeforge/quakeforge-0.5.5.ebuild b/games-fps/quakeforge/quakeforge-0.5.5.ebuild
index fe9ebcdb5f68..0d19c8f88c0e 100644
--- a/games-fps/quakeforge/quakeforge-0.5.5.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.18 2007/04/09 18:10:52 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.19 2008/02/15 01:12:38 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -105,8 +105,8 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	mv ${D}/${GAMES_PREFIX}/include ${D}/usr/
+	make DESTDIR="${D}" install || die "install failed"
+	mv "${D}/${GAMES_PREFIX}/include" "${D}/usr/"
 	dodoc ChangeLog NEWS TODO doc/*
 	prepgamesdirs
 }
diff --git a/games-fps/soldieroffortune/ChangeLog b/games-fps/soldieroffortune/ChangeLog
index c2722516a991..5a9e4eb2a5b2 100644
--- a/games-fps/soldieroffortune/ChangeLog
+++ b/games-fps/soldieroffortune/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/soldieroffortune
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.21 2007/03/12 15:19:54 genone Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.22 2008/02/15 01:15:31 wolf31o2 Exp $
+
+  15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  soldieroffortune-1.06a.ebuild:
+  Fix quoting.
 
   12 Mar 2007; Marius Mauch <genone@gentoo.org>
   soldieroffortune-1.06a.ebuild:
diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild
index 605e9d1216b2..5e82cb22b4ec 100644
--- a/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild
+++ b/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild,v 1.22 2007/03/12 15:19:54 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild,v 1.23 2008/02/15 01:15:31 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -45,33 +45,32 @@ pkg_setup() {
 src_unpack() {
 	cdrom_get_cds sof.xpm
 	unpack_makeself
-	tar xzf ${CDROM_ROOT}/paks.tar.gz -C ${T} \
+	tar xzf "${CDROM_ROOT}"/paks.tar.gz -C "${T}" \
 		|| die "uncompressing data"
-	tar xzf ${CDROM_ROOT}/binaries.tar.gz -C ${T} \
+	tar xzf "${CDROM_ROOT}"/binaries.tar.gz -C "${T}" \
 		|| die "uncompressing binaries"
 }
 
 src_install() {
-	dodir ${dir}
 	einfo "Copying files... this may take a while..."
-	exeinto ${dir}
-	doexe ${CDROM_ROOT}/bin/x86/glibc-2.1/sof || die "doexe"
-	insinto ${dir}
-	doins -r ${T}/* || die "doins data"
-	doins ${CDROM_ROOT}/{README,kver.pub,sof.xpm} || die "doins"
+	exeinto "${dir}"
+	doexe "${CDROM_ROOT}"/bin/x86/glibc-2.1/sof || die "doexe"
+	insinto "${dir}"
+	doins -r "${T}"/* || die "doins data"
+	doins "${CDROM_ROOT}"/{README,kver.pub,sof.xpm} || die "doins"
 
-	cd ${S}
+	cd "${S}"
 	export _POSIX2_VERSION=199209
 	loki_patch --verify patch.dat
-	loki_patch patch.dat ${Ddir} >& /dev/null || die "patching"
+	loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching"
 
 	# now, since these files are coming off a cd, the times/sizes/md5sums wont
 	# be different ... that means portage will try to unmerge some files (!)
 	# we run touch on ${D} so as to make sure portage doesnt do any such thing
-	find ${Ddir} -exec touch '{}' \;
+	find "${Ddir}" -exec touch '{}' \;
 
 	games_make_wrapper sof ./sof "${dir}" "${dir}"
-	doicon ${CDROM_ROOT}/sof.xpm
+	doicon "${CDROM_ROOT}"/sof.xpm
 	make_desktop_entry sof "Soldier of Fortune" sof.xpm
 
 	prepgamesdirs
diff --git a/games-fps/ut2003-bonuspack-cm/ChangeLog b/games-fps/ut2003-bonuspack-cm/ChangeLog
index cea5e8cbd717..fe17df861626 100644
--- a/games-fps/ut2003-bonuspack-cm/ChangeLog
+++ b/games-fps/ut2003-bonuspack-cm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/ut2003-bonuspack-cm
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-bonuspack-cm/ChangeLog,v 1.6 2007/02/22 00:42:53 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-bonuspack-cm/ChangeLog,v 1.7 2008/02/15 01:20:41 wolf31o2 Exp $
+
+  15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  ut2003-bonuspack-cm-1.ebuild:
+  Fix quoting.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild b/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
index 7956ef5ade48..904f56bb3675 100644
--- a/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
+++ b/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild,v 1.3 2006/03/31 21:22:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild,v 1.4 2008/02/15 01:20:41 wolf31o2 Exp $
 
 inherit games
 
@@ -25,13 +25,15 @@ dir=${GAMES_PREFIX_OPT}/ut2003
 Ddir=${D}/${dir}
 
 src_unpack() {
-	unzip ${DISTDIR}/${A} || die "unpacking"
+	unzip -qq "${DISTDIR}"/${A} || die "unpacking"
 }
 
 src_install() {
-	mkdir -p ${Ddir}/System ${Ddir}/Maps ${Ddir}/StaticMeshes ${Ddir}/Textures \
-		${Ddir}/Music ${Ddir}/Help ${Ddir}/Animations
+	for i in Animations Help Music Maps StaticMeshes Textures System
+	do
+		mkdir -p "${Ddir}"/${i}
+	done
 	games_umod_unpack CBP2003.ut2mod
-	rm ${Ddir}/Readme.txt "${Ddir}/cbp installer logo1.bmp"
+	rm "${Ddir}/Readme.txt" "${Ddir}/cbp installer logo1.bmp"
 	prepgamesdirs
 }
diff --git a/games-fps/ut2003-bonuspack-de/ChangeLog b/games-fps/ut2003-bonuspack-de/ChangeLog
index 9c905991335c..315d3443f3f5 100644
--- a/games-fps/ut2003-bonuspack-de/ChangeLog
+++ b/games-fps/ut2003-bonuspack-de/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/ut2003-bonuspack-de
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-bonuspack-de/ChangeLog,v 1.6 2007/02/22 00:47:23 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-bonuspack-de/ChangeLog,v 1.7 2008/02/15 01:21:48 wolf31o2 Exp $
+
+  15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  ut2003-bonuspack-de-1.ebuild:
+  Fix quoting.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild b/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
index fba2f10fef78..d58ffaecc264 100644
--- a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
+++ b/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild,v 1.6 2006/03/31 21:22:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild,v 1.7 2008/02/15 01:21:48 wolf31o2 Exp $
 
 inherit games
 
@@ -19,17 +19,17 @@ RESTRICT="mirror strip"
 DEPEND="app-arch/unzip"
 RDEPEND="games-fps/ut2003"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
-dir="${GAMES_PREFIX_OPT}/ut2003"
-Ddir="${D}/${dir}"
+dir=${GAMES_PREFIX_OPT}/ut2003
+Ddir=${D}/${dir}
 
 src_unpack() {
-	unzip ${DISTDIR}/${A} || die "unpacking"
+	unzip -qq "${DISTDIR}"/${A} || die "unpacking"
 }
 
 src_install() {
-	mkdir -p ${Ddir}/{System,Maps,StaticMeshes,Textures,Music,Help}
+	mkdir -p "${Ddir}"/{System,Maps,StaticMeshes,Textures,Music,Help}
 	games_umod_unpack DEBonus.ut2mod
 	prepgamesdirs
 }
diff --git a/games-fps/ut2003-bonuspack-epic/ChangeLog b/games-fps/ut2003-bonuspack-epic/ChangeLog
index 3f1803b1206a..f4a08d0e9e5f 100644
--- a/games-fps/ut2003-bonuspack-epic/ChangeLog
+++ b/games-fps/ut2003-bonuspack-epic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/ut2003-bonuspack-epic
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-bonuspack-epic/ChangeLog,v 1.16 2007/03/12 15:30:37 genone Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-bonuspack-epic/ChangeLog,v 1.17 2008/02/15 01:24:16 wolf31o2 Exp $
+
+  15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  ut2003-bonuspack-epic-1.ebuild:
+  Fix quoting.
 
   12 Mar 2007; Marius Mauch <genone@gentoo.org>
   ut2003-bonuspack-epic-1.ebuild:
diff --git a/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild b/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild
index ae2fef02d15e..75cde69fd1fc 100644
--- a/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild
+++ b/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild,v 1.14 2007/03/12 15:30:37 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild,v 1.15 2008/02/15 01:24:16 wolf31o2 Exp $
 
 inherit games
 
@@ -25,25 +25,24 @@ dir=${GAMES_PREFIX_OPT}/ut2003
 Ddir=${D}/${dir}
 
 src_unpack() {
-	unzip ${DISTDIR}/${A} || die "unpacking"
+	unzip -qq "${DISTDIR}"/${A} || die "unpacking"
 	# This is done since the files are the same
-	rm ${S}/Textures/LastManStanding.utx
+	rm -f "${S}"/Textures/LastManStanding.utx
 }
 
 src_install() {
-	dodir ${dir}
-	insinto ${dir}/Help
-	newins ${S}/Help/BonusPackReadme.txt EpicBonusPack.README || die "README"
+	insinto "${dir}"/Help
+	newins "${S}"/Help/BonusPackReadme.txt EpicBonusPack.README || die "README"
 
-	exeinto ${dir}
-	doexe ${FILESDIR}/epic-installer
-	dodir ${dir}/System
+	exeinto "${dir}"
+	doexe "${FILESDIR}"/epic-installer
+	dodir "${dir}"/System
 
-	cp -r ${S}/{Maps,Sounds,StaticMeshes,Textures} ${Ddir} \
+	cp -r "${S}"/{Maps,Sounds,StaticMeshes,Textures} "${Ddir}" \
 		|| die "Copying Maps/Sounds/Textures"
-	cp ${S}/System/{*.{det,est,frt,int,itt,kot,tmt,u},User.ini} ${Ddir}/System \
-		|| die "Copying System files"
-	cp -v ${S}/System/Manifest.ini ${Ddir}/System/Manifest.ini.epic \
+	cp "${S}"/System/{*.{det,est,frt,int,itt,kot,tmt,u},User.ini} \
+		"${Ddir}"/System || die "Copying System files"
+	cp -v "${S}"/System/Manifest.ini "${Ddir}"/System/Manifest.ini.epic \
 		|| die "Copying Manifest"
 
 	prepgamesdirs
diff --git a/games-fps/ut2003/ChangeLog b/games-fps/ut2003/ChangeLog
index 33e32e5dbf0b..3c1b43416b98 100644
--- a/games-fps/ut2003/ChangeLog
+++ b/games-fps/ut2003/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/ut2003
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ChangeLog,v 1.44 2007/03/12 15:28:47 genone Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ChangeLog,v 1.45 2008/02/15 01:17:36 wolf31o2 Exp $
+
+  15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> ut2003-2225-r4.ebuild:
+  Fix quoting.
 
   12 Mar 2007; Marius Mauch <genone@gentoo.org> ut2003-2225-r4.ebuild:
   Replacing einfo with elog
diff --git a/games-fps/ut2003/ut2003-2225-r4.ebuild b/games-fps/ut2003/ut2003-2225-r4.ebuild
index 5ee893f9d90c..0a2da02e16c5 100644
--- a/games-fps/ut2003/ut2003-2225-r4.ebuild
+++ b/games-fps/ut2003/ut2003-2225-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ut2003-2225-r4.ebuild,v 1.12 2007/03/12 15:28:47 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ut2003-2225-r4.ebuild,v 1.13 2008/02/15 01:17:36 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -32,13 +32,14 @@ src_unpack() {
 }
 
 src_install() {
-	insinto ${dir}
+	insinto "${dir}"
 
 	games_make_wrapper ut2003 ./ut2003 "${dir}" "${dir}"
 	make_desktop_entry ut2003 "Unreal Tournament 2003" ut2003.xpm
 
+	# TODO: change this to use doexe/doins
 	# this brings our install up to the newest version
-	cp -r ${S}/ut2003-lnx-2225/* ${Ddir} || die
+	cp -r "${S}"/ut2003-lnx-2225/* "${Ddir}" || die
 
 	prepgamesdirs
 }
@@ -48,7 +49,7 @@ pkg_postinst() {
 
 	# here is where we check for the existence of a cdkey...
 	# if we don't find one, we ask the user for it
-	if [[ -f ${dir}/System/cdkey ]] ; then
+	if [[ -f "${dir}"/System/cdkey ]] ; then
 		elog "A cdkey file is already present in ${dir}/System"
 	else
 		ewarn "You MUST run this before playing the game:"
@@ -88,7 +89,7 @@ pkg_config() {
 			if [[ "${CDKEY1}" == "${CDKEY2}" ]] ; then
 				echo "${CDKEY1}" | tr a-z A-Z > ${dir}/System/cdkey
 				einfo "Thank you!"
-				chown games:games ${dir}/System/cdkey
+				chown games:games "${dir}"/System/cdkey
 				break
 			else
 				eerror "Your CD key entries do not match.  Try again."