Fix typo (bug #55843); no backquotes

3 files changed, 36 insertions, 29 deletions

diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog
index dd58d91aaabf..f14c5dad6926 100644
--- a/games-fps/quake2-icculus/ChangeLog
+++ b/games-fps/quake2-icculus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake2-icculus
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.7 2004/06/28 22:19:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.8 2004/07/02 01:50:42 mr_bones_ Exp $
+
+  01 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  quake2-icculus-0.15-r1.ebuild:
+  Fix typo (bug #55843); no backquotes
 
   28 Jun 2004; Aron Griffis <agriffis@gentoo.org>
   quake2-icculus-0.15-r1.ebuild:
diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 66c8bd2438e3..95d8da426e9d 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -1,12 +1,12 @@
-MD5 f2c94aba7ef8dcf14354b5625307dd60 quake2-icculus-0.15-r1.ebuild 4374
-MD5 9f24a1f1aaf6d1675c6e2b327c294703 ChangeLog 1309
+MD5 dcbaa0ab50c92845f72d808657f1c9a3 ChangeLog 1438
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 ad5de2e8c5c06b69b3b5a2dd926a758f files/0.15-Makefile-optflags.patch 260
+MD5 287c0dae768b3e3e05797e80e308bc4d quake2-icculus-0.15-r1.ebuild 4406
 MD5 2219e82edb75f4e2a9fa232afc365c5d files/0.15-Makefile-gcc3.patch 787
-MD5 b4df11798b5b2777a1097c4d9a61c0df files/sdlquake2.start 46
-MD5 2baa3c18b4ee41b7174014771b692f80 files/quake2.start 43
+MD5 ad5de2e8c5c06b69b3b5a2dd926a758f files/0.15-Makefile-optflags.patch 260
 MD5 fa58facee98afc741e1928b77be65065 files/README-postinstall 2695
-MD5 d767ab81dded19a075fc660fdd3f83fd files/0.15-Makefile-noopts.patch 766
 MD5 da3eb5b7690c63cbf1f2796f2e3aa969 files/q2ded.start 42
-MD5 c95a6c91b14235134b9ac58fdee7c5eb files/digest-quake2-icculus-0.15-r1 248
+MD5 2baa3c18b4ee41b7174014771b692f80 files/quake2.start 43
+MD5 b4df11798b5b2777a1097c4d9a61c0df files/sdlquake2.start 46
+MD5 d767ab81dded19a075fc660fdd3f83fd files/0.15-Makefile-noopts.patch 766
 MD5 4247988d46cf59b63b9e668fa1045492 files/0.15-gentoo-path.patch 1693
+MD5 c95a6c91b14235134b9ac58fdee7c5eb files/digest-quake2-icculus-0.15-r1 248
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.15-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.15-r1.ebuild
index 84e28d885ccc..46af350a9c89 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.15-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.15-r1.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2004 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.15-r1.ebuild,v 1.8 2004/06/28 22:19:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.15-r1.ebuild,v 1.9 2004/07/02 01:50:42 mr_bones_ Exp $
 
 inherit eutils gcc games
 
 MY_P="quake2-r${PV}"
-S="${WORKDIR}/${MY_P}"
-
 DESCRIPTION="The icculus.org linux port of iD's quake2 engine"
 HOMEPAGE="http://icculus.org/quake2/"
 SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
@@ -32,19 +30,21 @@ DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
 	app-arch/sharutils"
 
+S="${WORKDIR}/${MY_P}"
+
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-Makefile-noopts.patch
-	epatch ${FILESDIR}/${PV}-Makefile-optflags.patch
-	epatch ${FILESDIR}/${PV}-gentoo-path.patch
+	epatch "${FILESDIR}/${PV}-Makefile-noopts.patch"
+	epatch "${FILESDIR}/${PV}-Makefile-optflags.patch"
+	epatch "${FILESDIR}/${PV}-gentoo-path.patch"
 	sed -i \
 		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/quake2-data:" \
 		src/qcommon/files.c \
 		|| die "sed src/qcommon/files.c failed"
 
-	ln -s `which echo` ${T}/more
-	for g in $(useq rogue && echo rogue) $(useq xatrix && echo matrix); do
+	ln -s $(which echo) ${T}/more
+	for g in $(useq rogue && echo rogue) $(useq xatrix && echo xatrix); do
 		mkdir -p ${S}/src/${g}
 		cd ${S}/src/${g}
 		unpack ${g}src320.shar.Z
@@ -63,14 +63,17 @@ src_unpack() {
 
 yesno() {
 	for f in $@ ; do
-		useq $f || { echo NO ; return 1 ; }
+		if ! useq $f ; then
+			echo NO
+			return 1
+		fi
 	done
 	echo YES
 	return 0
 }
 
 src_compile() {
-	BUILD_X11=`yesno X`
+	BUILD_X11=$(yesno X)
 	use sdl || use X || use svga || use aalib || BUILD_X11=YES
 
 	# xatrix fails to build
@@ -82,26 +85,26 @@ src_compile() {
 			|| echo "#define GENTOO_LIBDIR \"${GAMES_LIBDIR}/${PN}\"" > src/linux/gentoo-libdir.h
 		make clean || die "cleaning failed"
 		make build_release \
-			BUILD_SDLQUAKE2=`yesno sdl` \
-			BUILD_SVGA=`yesno svga` \
+			BUILD_SDLQUAKE2=$(yesno sdl) \
+			BUILD_SVGA=$(yesno svga) \
 			BUILD_X11=${BUILD_X11} \
-			BUILD_GLX=`yesno opengl X` \
-			BUILD_SDL=`yesno sdl` \
-			BUILD_SDLGL=`yesno sdl opengl` \
+			BUILD_GLX=$(yesno opengl X) \
+			BUILD_SDL=$(yesno sdl) \
+			BUILD_SDLGL=$(yesno sdl opengl) \
 			BUILD_CTFDLL=YES \
-			BUILD_XATRIX=`yesno xatrix` \
-			BUILD_ROGUE=`yesno rogue` \
-			BUILD_JOYSTICK=`yesno joystick` \
+			BUILD_XATRIX=$(yesno xatrix) \
+			BUILD_ROGUE=$(yesno rogue) \
+			BUILD_JOYSTICK=$(yesno joystick) \
 			BUILD_DEDICATED=YES \
-			BUILD_AA=`yesno aalib` \
+			BUILD_AA=$(yesno aalib) \
 			BUILD_QMAX=${BUILD_QMAX} \
 			HAVE_IPV6=NO \
 			BUILD_ARTS=NO \
 			SDLDIR=/usr/lib \
-			BUILD_ARTS=`yesno arts` \
+			BUILD_ARTS=$(yesno arts) \
 			OPTCFLAGS="${CFLAGS}" \
 			|| die "make failed"
-			#HAVE_IPV6=`yesno ipv6` \
+			#HAVE_IPV6=$(yesno ipv6) \
 		# now we save the build dir ... except for the object files ...
 		rm release*/*/*.o
 		mv release* my-rel-${BUILD_QMAX}