QA cleanup: Fix quoting.
authorChris Gianelloni <wolf31o2@gentoo.org>
Fri, 7 Mar 2008 20:19:39 +0000 (20:19 +0000)
committerChris Gianelloni <wolf31o2@gentoo.org>
Fri, 7 Mar 2008 20:19:39 +0000 (20:19 +0000)
Package-Manager: portage-2.1.4.4

14 files changed:
games-roguelike/falconseye/ChangeLog
games-roguelike/falconseye/falconseye-1.9.3-r1.ebuild [deleted file]
games-roguelike/falconseye/falconseye-1.9.4a.ebuild
games-roguelike/falconseye/files/1.9.3-gzip.diff [deleted file]
games-roguelike/falconseye/files/1.9.3-midiplayer.diff [deleted file]
games-roguelike/falconseye/files/1.9.3-musicsavefix.diff [deleted file]
games-roguelike/nethack/ChangeLog
games-roguelike/nethack/nethack-3.4.3-r1.ebuild
games-roguelike/noegnud-data/ChangeLog
games-roguelike/noegnud-data/noegnud-data-0.8.0.ebuild
games-roguelike/slashem/ChangeLog
games-roguelike/slashem/slashem-0.0.772.ebuild
games-roguelike/zangband/ChangeLog
games-roguelike/zangband/zangband-2.7.4b.ebuild

index 78cb2ea4ef78572212f7fc046088b4126135b14b..8b0a8785fbcdd285d6fddc1cfd6fa0b19869fd1c 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for games-roguelike/falconseye
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/falconseye/ChangeLog,v 1.10 2007/03/12 17:15:10 genone Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/falconseye/ChangeLog,v 1.11 2008/03/07 20:13:41 wolf31o2 Exp $
+
+  07 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  -files/1.9.3-gzip.diff, -files/1.9.3-musicsavefix.diff,
+  -files/1.9.3-midiplayer.diff, -falconseye-1.9.3-r1.ebuild,
+  falconseye-1.9.4a.ebuild:
+  QA cleanup: Fix quoting.
 
   12 Mar 2007; Marius Mauch <genone@gentoo.org> falconseye-1.9.3-r1.ebuild:
   Replacing einfo with elog
diff --git a/games-roguelike/falconseye/falconseye-1.9.3-r1.ebuild b/games-roguelike/falconseye/falconseye-1.9.3-r1.ebuild
deleted file mode 100644 (file)
index 0ad7ab7..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/falconseye/falconseye-1.9.3-r1.ebuild,v 1.7 2007/03/12 17:15:10 genone Exp $
-
-DESCRIPTION="A graphical version of nethack"
-SRC_URI="mirror://sourceforge/falconseye/nethack_source_331_jtp_193.zip"
-HOMEPAGE="http://falconseye.sourceforge.net/"
-
-KEYWORDS="x86 ppc"
-IUSE=""
-LICENSE="nethack"
-SLOT="0"
-
-DEPEND="media-libs/libsdl
-       dev-util/yacc
-       app-arch/unzip"
-RDEPEND="media-libs/libsdl
-       app-arch/gzip
-       media-sound/timidity++"
-
-src_unpack() {
-       unpack ${A}
-       patch -p1 < ${FILESDIR}/${PV}-gzip.diff || die
-       patch -p1 < ${FILESDIR}/${PV}-midiplayer.diff || die
-       patch -p1 < ${FILESDIR}/${PV}-musicsavefix.diff || die
-}
-
-src_compile() {
-       cd ${WORKDIR}/sys/unix
-       source setup.sh
-       cd ../../
-       make PREFIX=/usr GAME=falconseye GAMEDIR=/usr/share/falconseye SHELLDIR=/usr/bin || die
-       cd doc
-       make || die
-}
-
-src_install() {
-       cd ${WORKDIR}
-       make PREFIX=${D}/usr GAME=falconseye GAMEDIR=${D}/usr/share/falconseye SHELLDIR=${D}/usr/bin install
-       # Have to remake the shell script with real path information
-       sed -e 's;/usr/games/lib/nethackdir;/usr/share/falconseye;' \
-               -e 's;HACKDIR/nethack;HACKDIR/falconseye;' \
-               -e '7a\
-       if [[ -f ${HOME}/.falconseyerc ]] ; then\
-       export NETHACKOPTIONS=${HOME}/.falconseyerc;\
-       else\
-       echo 'OPTIONS=noautopickup,toptenwin,showexp,rest_on_space' > ${HOME}/.falconseyerc;\
-       export NETHACKOPTIONS=${HOME}/.falconseyerc;\
-       fi' \
-               < ${WORKDIR}/sys/unix/nethack.sh \
-               > ${D}/usr/bin/falconseye
-       cd doc
-       doman *.6
-}
-
-pkg_postinst() {
-       elog "Falconseye now supports a ~/.falconseyerc file to set options."
-       elog "Click ? then 'List of game options' in falconseye for more info."
-}
index ca3b1465334fae74c56376c70116e1de31366b6c..096feed1cb1ef5e560dfb828fdcf27d06492c60a 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/falconseye/falconseye-1.9.4a.ebuild,v 1.7 2004/06/24 23:12:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/falconseye/falconseye-1.9.4a.ebuild,v 1.8 2008/03/07 20:13:41 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -24,12 +24,12 @@ S=${WORKDIR}/nethack-341-jtp-194a
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
+       cd "${S}"
        source sys/unix/setup.sh
        cd ../../
 
-       epatch ${FILESDIR}/${PV}-gentoo-paths.patch
-       epatch ${FILESDIR}/${PV}-default-options.patch
+       epatch "${FILESDIR}/${PV}-gentoo-paths.patch"
+       epatch "${FILESDIR}/${PV}-default-options.patch"
        sed -i "s:GENTOO_STATEDIR:${GAMES_STATEDIR}/${PN}:" include/unixconf.h || die "setting statedir"
        sed -i "s:GENTOO_HACKDIR:${GAMES_DATADIR}/${PN}:" include/config.h || die "seting hackdir"
        sed -i 's:/usr/local/bin/timidity:/usr/bin/timidity:' win/jtp/gamedata/config/jtp_opts.txt
@@ -61,5 +61,5 @@ src_install() {
        doman doc/falconseye.6
        dodoc ChangeLog README falcon.txt
        prepgamesdirs
-       chmod -R g+w ${D}/${GAMES_STATEDIR}
+       chmod -R g+w "${D}/${GAMES_STATEDIR}"
 }
diff --git a/games-roguelike/falconseye/files/1.9.3-gzip.diff b/games-roguelike/falconseye/files/1.9.3-gzip.diff
deleted file mode 100644 (file)
index ad60c98..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur falconseye-1.9.3/include/config.h falconseye-1.9.3/include/config.h
---- falconseye-1.9.3/include/config.h  2001-07-03 19:56:52.000000000 -0400
-+++ falconseye-1.9.3/include/config.h  2002-07-01 22:00:21.000000000 -0400
-@@ -187,11 +187,11 @@
- 
- #ifdef UNIX
- /* path and file name extension for compression program */
--#define COMPRESS "/usr/bin/compress"  /* Lempel-Ziv compression */
--#define COMPRESS_EXTENSION ".Z"               /* compress's extension */
-+/* #define COMPRESS "/usr/bin/compress" */    /* Lempel-Ziv compression */
-+/* #define COMPRESS_EXTENSION ".Z" */         /* compress's extension */
- /* An example of one alternative you might want to use: */
--/* #define COMPRESS "/usr/local/bin/gzip" */  /* FSF gzip compression */
--/* #define COMPRESS_EXTENSION ".gz" */                /* normal gzip extension */
-+#define COMPRESS "/bin/gzip"  /* FSF gzip compression */
-+#define COMPRESS_EXTENSION ".gz"              /* normal gzip extension */
- #endif
-
- #ifndef COMPRESS
diff --git a/games-roguelike/falconseye/files/1.9.3-midiplayer.diff b/games-roguelike/falconseye/files/1.9.3-midiplayer.diff
deleted file mode 100644 (file)
index ddba88c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur falconseye-1.9.3/win/jtp/gamedata/config/jtp_opts.txt falconseye-1.9.3/win/jtp/gamedata/config/jtp_opts.txt
---- falconseye-1.9.3/win/jtp/gamedata/config/jtp_opts.txt      2001-06-24 19:57:26.000000000 -0400
-+++ falconseye-1.9.3/win/jtp/gamedata/config/jtp_opts.txt      2002-07-01 22:00:19.000000000 -0400
-@@ -49,7 +49,7 @@
- % files. You can also give your own command; use %s in place of the 
- % filename. Please give the full path to the player binary.
- %
--linux_midi_player=/usr/local/bin/timidity -idqq %s
-+linux_midi_player=/usr/bin/timidity -idqq -A 30 %s
- %linux_midi_player=/usr/bin/playmidi %s
- 
- 
diff --git a/games-roguelike/falconseye/files/1.9.3-musicsavefix.diff b/games-roguelike/falconseye/files/1.9.3-musicsavefix.diff
deleted file mode 100644 (file)
index 217a99b..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur falconseye-1.9.3/win/jtp/jtp_sdl.c falconseye-1.9.3.over/win/jtp/jtp_sdl.c
---- falconseye-1.9.3/win/jtp/jtp_sdl.c 2001-07-02 08:05:50.000000000 -0400
-+++ falconseye-1.9.3.over/win/jtp/jtp_sdl.c    2002-07-01 22:00:19.000000000 -0400
-@@ -131,6 +131,7 @@
-   {
-     if (jtp_sdl_music_player_pid > 0)
-       kill(jtp_sdl_music_player_pid, SIGKILL);
-+    waitpid(jtp_sdl_music_player_pid, NULL, 0);
-     jtp_sdl_music_player_pid = -1;
-   }
- }
-@@ -579,28 +580,32 @@
-     jtp_sdl_audio_wanted.userdata = NULL;
- 
-     /* Open the audio device, forcing the desired format */
-+    /* Make it so if opening audio device fails, just don't play audio. - Jonathan Hseu */
-     if ( SDL_OpenAudio(&jtp_sdl_audio_wanted, NULL) < 0 ) 
-     {
-       jtp_SDLWriteLogMessage(JTP_SDL_LOG_ERROR, "[jtp_sdl.c/jtp_SDLEnterGraphicMode/Check1] ERROR: Could not initialize SDL audio device\n");
-       jtp_SDLWriteLogMessage(JTP_SDL_LOG_ERROR, "[SDL Error] ");
-       jtp_SDLWriteLogMessage(JTP_SDL_LOG_ERROR, SDL_GetError());
-       jtp_SDLWriteLogMessage(JTP_SDL_LOG_ERROR, "\n");
--      exit(1);
--    }
--    jtp_sdl_audio_chunk = (Uint8 *)malloc(JTP_SDL_SOUND_BUFFER_SIZE*sizeof(Uint8));
--    jtp_sdl_audio_len = 30000;
--    jtp_sdl_audio_pos = NULL;
--
--    /* Create the sound cache */
--    jtp_sdl_cached_sounds = (jtp_sdl_cached_sound *)malloc(JTP_SDL_MAX_CACHED_SOUNDS*sizeof(jtp_sdl_cached_sound));
--    for (i = 0; i < JTP_SDL_MAX_CACHED_SOUNDS; i++)
--    {
--      jtp_sdl_cached_sounds[i].length = 0;
--      jtp_sdl_cached_sounds[i].samples = NULL;
--      jtp_sdl_cached_sounds[i].filename = NULL;
-+      jtp_play_effects = 0;
-+//      exit(1);
-     }
--
-+    else
-+    {
-+      jtp_sdl_audio_chunk = (Uint8 *)malloc(JTP_SDL_SOUND_BUFFER_SIZE*sizeof(Uint8));
-+      jtp_sdl_audio_len = 30000;
-+      jtp_sdl_audio_pos = NULL;
-+
-+      /* Create the sound cache */
-+      jtp_sdl_cached_sounds = (jtp_sdl_cached_sound *)malloc(JTP_SDL_MAX_CACHED_SOUNDS*sizeof(jtp_sdl_cached_sound));
-+      for (i = 0; i < JTP_SDL_MAX_CACHED_SOUNDS; i++)
-+      {
-+        jtp_sdl_cached_sounds[i].length = 0;
-+        jtp_sdl_cached_sounds[i].samples = NULL;
-+        jtp_sdl_cached_sounds[i].filename = NULL;
-+      }
-     /* SDL_PauseAudio(0); */ /* Start playing sounds */
-+    }
-   }
- 
-   if (jtp_play_music)
index d37b8569af2da601c91bc179550a48cc7cf42bb8..b418d56101f0ed57265efc68e3d65e21abf74785 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/nethack
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.27 2008/01/14 20:33:41 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.28 2008/03/07 20:15:59 wolf31o2 Exp $
+
+  07 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  nethack-3.4.3-r1.ebuild:
+  QA cleanup: Fix quoting.
 
   14 Jan 2008; Fabian Groffen <grobian@gentoo.org> nethack-3.4.3-r1.ebuild:
   Dropped ppc-macos keyword, see you in prefix
index e76e0d9e96a7f7ca3241ac40279984df5a958ce7..349189e3cb3bc4b1cda7c67c65934f21dcfec3e3 100644 (file)
@@ -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-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.20 2008/01/14 20:33:41 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.21 2008/03/07 20:15:59 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic games
 
@@ -80,7 +80,7 @@ src_compile() {
        has_version =x11-libs/qt-3* \
                && qtver=3 \
                || qtver=2
-       cd ${S}/src
+       cd "${S}"/src
        append-flags -I../include
 
        emake \
@@ -96,7 +96,7 @@ src_compile() {
                CFLAGS="${CFLAGS}" \
                LFLAGS="${lflags}" \
                || die "main build failed"
-       cd ${S}/util
+       cd "${S}"/util
        emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" recover || die "util build failed"
 }
 
@@ -123,7 +123,7 @@ src_install() {
        sed -i \
                -e "s:^\(HACKDIR=\).*:\1${HACKDIR}:" \
                "${D}${GAMES_BINDIR}/nethack" \
-               || die "sed ${D}${GAMES_BINDIR}/nethack failed"
+               || die "sed ${GAMES_BINDIR}/nethack failed"
 
        doman doc/*.6
        dodoc doc/*.txt
@@ -141,7 +141,7 @@ src_install() {
                -e "s:GENTOO_WINDOWTYPES:${windowtypes}:" \
                -e "s:GENTOO_DEFWINDOWTYPE:$1:" \
                "${D}${HACKDIR}/dot.nethackrc" \
-               || die "sed ${D}${HACKDIR}/dot.nethackrc failed"
+               || die "sed ${HACKDIR}/dot.nethackrc failed"
        insinto /etc/skel
        newins "${D}/${HACKDIR}/dot.nethackrc" .nethackrc
 
@@ -153,7 +153,7 @@ src_install() {
                insinto "${HACKDIR}/fonts"
                doins *.pcf
                cd "${D}/${HACKDIR}/fonts"
-               mkfontdir || die "The action mkfontdir ${D}${HACKDIR}/fonts failed"
+               mkfontdir || die "The action mkfontdir ${HACKDIR}/fonts failed"
 
                # copy nethack x application defaults
                cd "${S}/win/X11"
@@ -162,7 +162,7 @@ src_install() {
                sed -i \
                        -e 's:^!\(NetHack.tile_file.*\):\1:' \
                        "${D}/etc/X11/app-defaults/NetHack" \
-                       || die "sed ${D}/etc/X11/app-defaults/NetHack failed"
+                       || die "sed /etc/X11/app-defaults/NetHack failed"
        fi
 
        local statedir="${GAMES_STATEDIR}/${PN}"
index 2c29bda73a4dabe10c1a0a06ca72908b56af8889..b0b5669fdc6e68a48e2fce3e4e0b560569a10d4b 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/noegnud-data
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-data/ChangeLog,v 1.8 2007/02/08 21:23:24 wolf31o2 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-data/ChangeLog,v 1.9 2008/03/07 20:17:00 wolf31o2 Exp $
+
+  07 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  noegnud-data-0.8.0.ebuild:
+  QA cleanup: Fix quoting.
 
   08 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
index fc58165b3f997af8adab669238df6963eade1699..75f3d33a0f56bb3a1c38a5a39290a1d652080823 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-data/noegnud-data-0.8.0.ebuild,v 1.8 2005/09/26 18:16:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-data/noegnud-data-0.8.0.ebuild,v 1.9 2008/03/07 20:17:00 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -24,7 +24,7 @@ IUSE=""
 S=${WORKDIR}/noegnud-${PV}/data
 
 src_install() {
-       dodir ${GAMES_DATADIR}/noegnud_data
-       cp -r * ${D}/${GAMES_DATADIR}/noegnud_data/
+       dodir "${GAMES_DATADIR}/"noegnud_data
+       cp -r * "${D}/${GAMES_DATADIR}"/noegnud_data/
        prepgamesdirs
 }
index 0594cc39a7a804d5a1be1fae13eecc433443a9bf..3c2a78cdf1debcf0ed811ec813b1f4380055beb0 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/slashem
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/slashem/ChangeLog,v 1.16 2007/03/12 17:18:20 genone Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/slashem/ChangeLog,v 1.17 2008/03/07 20:17:48 wolf31o2 Exp $
+
+  07 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  slashem-0.0.772.ebuild:
+  QA cleanup: Fix quoting.
 
   12 Mar 2007; Marius Mauch <genone@gentoo.org> slashem-0.0.760.ebuild,
   slashem-0.0.772.ebuild:
index e2d9f8048e7caf417471d7a9ac646ff7da10e4be..80440e193d9b4654f92da66713c2ef4362cccac3 100644 (file)
@@ -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-roguelike/slashem/slashem-0.0.772.ebuild,v 1.6 2007/06/12 12:59:00 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/slashem/slashem-0.0.772.ebuild,v 1.7 2008/03/07 20:17:48 wolf31o2 Exp $
 
 inherit eutils flag-o-matic games
 
@@ -77,7 +77,7 @@ src_unpack() {
                ./config X11 ../.. || die "X config"
        fi
 
-       cd ${S}
+       cd "${S}"
        sed -i \
                -e "s:^\(\#  define HACKDIR \).*:\1 \"${HACKDIR}\":" \
                include/config.h || die "config.h sed"
@@ -128,7 +128,7 @@ src_install() {
                insinto "${GAMES_DATADIR}"/${PN}/fonts
                doins *.pcf
                cd "${D}${GAMES_DATADIR}"/${PN}/fonts
-               mkfontdir || die "The action mkfontdir ${D}{GAMES_DATADIR}/${PN}/fonts failed"
+               mkfontdir || die "The action mkfontdir ${GAMES_DATADIR}/${PN}/fonts failed"
 
                # copy slashem X application defaults
                cd "${S}"/win/X11
index 67e5f83abf67fd98997088d939a4fcc5261c9be3..7fd229595d90e8fb98b36831b7ac5a8f852df657 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/zangband
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.12 2008/02/02 21:39:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.13 2008/03/07 20:19:39 wolf31o2 Exp $
+
+  07 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  zangband-2.7.4b.ebuild:
+  QA cleanup: Fix quoting.
 
   02 Feb 2008; Michael Sterrett <mr_bones_@gentoo.org>
   zangband-2.7.4c.ebuild:
index 6368412aa11aa121b24d3e0f633f5f1bc9249cf7..c3c3b393cdd0212f04c302e5955dba651d644263 100644 (file)
@@ -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-roguelike/zangband/zangband-2.7.4b.ebuild,v 1.5 2006/12/06 19:43:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4b.ebuild,v 1.6 2008/03/07 20:19:39 wolf31o2 Exp $
 
 inherit games
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://clockwork.dementia.org/angband/Variant/ZAngband/${P}.tar.gz"
 
 LICENSE="Moria"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="ppc x86"
 IUSE="gtk tk"
 
 RDEPEND=">=sys-libs/ncurses-5
@@ -42,9 +42,9 @@ src_install() {
                ${GAMES_DATADIR}/zangband/lib/save
 
        # Install the basic files but remove unneeded crap
-       make DESTDIR=${D}/${GAMES_DATADIR}/zangband/ installbase || \
+       make DESTDIR="${D}/${GAMES_DATADIR}"/zangband/ installbase || \
                die "make installbase failed"
-       rm ${D}${GAMES_DATADIR}/zangband/{angdos.cfg,readme,z_faq.txt,z_update.txt}
+       rm "${D}${GAMES_DATADIR}"/zangband/{angdos.cfg,readme,z_faq.txt,z_update.txt}
 
        # Install everything else and fix the permissions
        dogamesbin zangband                 || die "dogamesbin failed"
@@ -53,5 +53,5 @@ src_install() {
 
        prepgamesdirs
        # All users in the games group need write permissions to some important dirs
-       chmod -R g+w ${D}/${GAMES_DATADIR}/zangband/lib/{apex,save,user}
+       chmod -R g+w "${D}/${GAMES_DATADIR}"/zangband/lib/{apex,save,user}
 }