Fix "music_pending_song is not defined" bug in music handling #109272 by revenger.

Package-Manager: portage-2.0.53_rc5

5 files changed, 120 insertions, 8 deletions

diff --git a/games-puzzle/pathological/ChangeLog b/games-puzzle/pathological/ChangeLog
index 5ed0150b579a..044e57a552e3 100644
--- a/games-puzzle/pathological/ChangeLog
+++ b/games-puzzle/pathological/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-puzzle/pathological
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pathological/ChangeLog,v 1.9 2005/07/11 15:08:46 gustavoz Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pathological/ChangeLog,v 1.10 2005/10/16 05:09:00 vapier Exp $
+
+*pathological-1.1.3-r1 (16 Oct 2005)
+
+  16 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/pathological-1.1.3-music-py.patch, +pathological-1.1.3-r1.ebuild:
+  Fix "music_pending_song is not defined" bug in music handling #109272 by
+  revenger.
 
   11 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   pathological-1.1.3.ebuild:
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
index 4f53da837c30..bf3bc514d7ff 100644
--- a/games-puzzle/pathological/Manifest
+++ b/games-puzzle/pathological/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 8330618d554f975f0cc2d2c8b3bf5826 ChangeLog 1650
+MD5 af2e4c0e952d40232cb322d621f37995 files/digest-pathological-1.1.3 71
+MD5 af2e4c0e952d40232cb322d621f37995 files/digest-pathological-1.1.3-r1 71
+MD5 c817c498f3d5e44ee7bec1c58f1bc643 files/pathological-1.1.3-music-py.patch 475
 MD5 95e2b5bfd7767aeae061c77f7e1a055e metadata.xml 221
+MD5 b999e8a72467bfffaa96cabe9a638d82 pathological-1.1.3-r1.ebuild 2042
 MD5 c98886a366a10da3796adf62fe39a6fd pathological-1.1.3.ebuild 1990
-MD5 f6021f9e14dad9fa7a22755b273556ad ChangeLog 1400
-MD5 af2e4c0e952d40232cb322d621f37995 files/digest-pathological-1.1.3 71
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC0otsKRy60XGEcJIRAhOUAJ9TxMceFhR7B5v7XTRVrHVD0D1ScACfYKvd
-4POCVtiGScETbjQKB6wKc0g=
-=x31j
+iD8DBQFDUeD4gIKl8Uu19MoRAsu9AJwKdinHwdJbD0kYImz/cCN7SM9jHACfcjfr
+3w3NEzV1u9ZAGlvT4043JgY=
+=bTye
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/pathological/files/digest-pathological-1.1.3-r1 b/games-puzzle/pathological/files/digest-pathological-1.1.3-r1
new file mode 100644
index 000000000000..6e8753cc1e88
--- /dev/null
+++ b/games-puzzle/pathological/files/digest-pathological-1.1.3-r1
@@ -0,0 +1 @@
+MD5 76a446080c0fed12baf39354d8e0ce4a pathological-1.1.3.tar.gz 6995274
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch b/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch
new file mode 100644
index 000000000000..9d67085dd13a
--- /dev/null
+++ b/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch
@@ -0,0 +1,23 @@
+Make sure music_pending_song is defined before we try using it
+
+http://bugs.gentoo.org/109272
+
+--- pathological.py
++++ pathological.py
+@@ -28,6 +28,7 @@
+ colorblind = 0
+ sound_on = 1
+ music_on = 1
++music_pending_song = 0
+ for arg in sys.argv[1:]:
+ 	if arg == '-s':
+ 		screenshot = 1
+@@ -194,7 +195,7 @@
+ 	sound_on = sound_on ^ 1
+ 
+ def toggle_music():
+-	global music_on
++	global music_pending_song, music_on
+ 	music_on = music_on ^ 1
+ 	if music_on:
+ 		if music_pending_song:
diff --git a/games-puzzle/pathological/pathological-1.1.3-r1.ebuild b/games-puzzle/pathological/pathological-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..4f4161e0d064
--- /dev/null
+++ b/games-puzzle/pathological/pathological-1.1.3-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pathological/pathological-1.1.3-r1.ebuild,v 1.1 2005/10/16 05:09:00 vapier Exp $
+
+inherit games eutils
+
+DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
+HOMEPAGE="http://pathological.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pathological/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64 ppc sparc"
+IUSE="doc"
+
+DEPEND="doc? ( media-libs/netpbm )
+	>=sys-apps/sed-4"
+RDEPEND=">=dev-python/pygame-1.5.5
+	dev-lang/python"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-music-py.patch
+
+	if use doc ; then
+		sed -i \
+			-e '5,$ s/=/ /g' makehtml \
+			|| die "sed makehtml failed"
+	else
+		echo "#!/bin/sh" > makehtml \
+			|| die "clearing makehtml failed"
+	fi
+
+	sed -i \
+		-e "/^cd / s
/usr/share/pathological
${GAMES_DATADIR}/${PN}
" \
+		pathological || die "sed pathological failed"
+
+	sed -i \
+		-e "/^write_highscores / s
/usr/lib/pathological/bin
${GAMES_LIBDIR}/${PN}
" \
+		pathological.py || die "sed pathological.py failed"
+}
+
+src_install() {
+	# executables
+	dogamesbin pathological || die "dogamesbin failed"
+	insinto "${GAMES_DATADIR}/${PN}"
+	insopts -m0750
+	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}" \
+		|| die "cp failed"
+
+	# setup high score file
+	insinto "${GAMES_STATEDIR}"
+	insopts -m0664
+	doins pathological_scores || die "doins failed (pathological_scores)"
+
+	# documentation
+	dodoc README TODO
+	doman pathological.6.gz
+	use doc && dohtml -r html/
+
+	insinto /usr/share/pixmaps
+	doins pathological.xpm
+
+	make_desktop_entry pathological Pathological pathological.xpm
+
+	prepgamesdirs
+}