QA cleanup: Fix quoting.

Package-Manager: portage-2.1.4.4

6 files changed, 14 insertions, 156 deletions

diff --git a/games-roguelike/falconseye/ChangeLog b/games-roguelike/falconseye/ChangeLog
index 78cb2ea4ef78..8b0a8785fbcd 100644
--- a/games-roguelike/falconseye/ChangeLog
+++ b/games-roguelike/falconseye/ChangeLog
@@ -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
index 0ad7ab7dfb81..000000000000
--- a/games-roguelike/falconseye/falconseye-1.9.3-r1.ebuild
+++ /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."
-}
diff --git a/games-roguelike/falconseye/falconseye-1.9.4a.ebuild b/games-roguelike/falconseye/falconseye-1.9.4a.ebuild
index ca3b1465334f..096feed1cb1e 100644
--- a/games-roguelike/falconseye/falconseye-1.9.4a.ebuild
+++ b/games-roguelike/falconseye/falconseye-1.9.4a.ebuild
@@ -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
index ad60c987677d..000000000000
--- a/games-roguelike/falconseye/files/1.9.3-gzip.diff
+++ /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
index ddba88cd62e8..000000000000
--- a/games-roguelike/falconseye/files/1.9.3-midiplayer.diff
+++ /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
index 217a99b96682..000000000000
--- a/games-roguelike/falconseye/files/1.9.3-musicsavefix.diff
+++ /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)