Patch from Debian for bug #208329

Package-Manager: portage-2.1.5_rc10

4 files changed, 90 insertions, 2 deletions

diff --git a/games-puzzle/monsterz/ChangeLog b/games-puzzle/monsterz/ChangeLog
index 70ec7e54218d..5fb1160d6116 100644
--- a/games-puzzle/monsterz/ChangeLog
+++ b/games-puzzle/monsterz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-puzzle/monsterz
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/monsterz/ChangeLog,v 1.15 2008/03/15 03:53:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/monsterz/ChangeLog,v 1.16 2008/05/14 21:56:51 nyhm Exp $
+
+*monsterz-0.7.1-r1 (14 May 2008)
+
+  14 May 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/monsterz-0.7.1-64bit.patch, +monsterz-0.7.1-r1.ebuild:
+  Patch from Debian for bug #208329
 
 *monsterz-0.7.1 (15 Mar 2008)
 
diff --git a/games-puzzle/monsterz/Manifest b/games-puzzle/monsterz/Manifest
index 987aa7a1f37b..e034039650ab 100644
--- a/games-puzzle/monsterz/Manifest
+++ b/games-puzzle/monsterz/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX monsterz-0.7.0-gentoo.patch 1366 RMD160 52fbfef6b10adf93fa2b8a3c21caf957157476e5 SHA1 4269d6dae640d99b3592d2b6111a2a0c3015f7ea SHA256 f2eac0cbba236af6acd36b673e47e014e6f589b7840ae0d12b42391eb6036456
+AUX monsterz-0.7.1-64bit.patch 1093 RMD160 b1c027c2a40c2ff7de2823d9466a91dba31fa506 SHA1 efdf59ba9be1d9938f50479362fa22d2cef86688 SHA256 36a9a26de082b5a182a40cfc9af2a4e270ca335971896c51578b0e7887011661
 AUX monsterz-0.7.1-gentoo.patch 966 RMD160 526247e4a9a7e0a68f3e2855cc8b5056bf29c30a SHA1 f97eb2d59bdf29fe9ac12bb83630692c37a8f2c6 SHA256 76186ed8433d817de4876cb62da3e67bf8e18f2eeefcd68e427ae2254af37a1e
 DIST monsterz-0.7.0.tar.gz 1881420 RMD160 10aa3dd2471ac24b765f5d289a54b703f41bc084 SHA1 c00beb53af57c858179225d69b8c3e0408184f91 SHA256 f529af194d1bc522c4fb9959607f668183f7a08b4465fbc167871ec828bc1ee0
 DIST monsterz-0.7.1.tar.gz 1879537 RMD160 6497b3c561f4a7c31b903a380d916778e44de5b8 SHA1 8fb1933b7141a058e7b55f85537873e65568cb00 SHA256 50828b8fa26d107bcc2bd134328f83c905b9f5e124846bdf239daf0eed34973d
 EBUILD monsterz-0.7.0.ebuild 1177 RMD160 2c80aedfb5f82078f775bbea783dc2e170844e59 SHA1 959ec9f0f934119a229e416bb738450e1debee04 SHA256 d493b77c55101557afe2e8f1984d1aedbdc62886b3b67210b938ff7dfbf54d5f
+EBUILD monsterz-0.7.1-r1.ebuild 1205 RMD160 ffcf5d2bb793c4f7af023c3a1020fb57a40aee49 SHA1 02c4143287697a4b6bec27df39001e2df836fdc4 SHA256 44c303990ed7d597dff836e9d041e05cfc54a493c4a7fe321fd2d93367d177d8
 EBUILD monsterz-0.7.1.ebuild 1186 RMD160 ac4763fadce630a088519b4d20a6875f334f0bd8 SHA1 e75dd07c7e6a396d4f23fb157b99725cadd73369 SHA256 13592ac72ace0f88b67b998fd92f55bf2a3d66cff1ab1acb177ff220d50ff3e0
-MISC ChangeLog 2257 RMD160 6f096e612ad81e71b040c073c7f9340d635c7bbd SHA1 e3e69875c9abb833ac57605368e55ba577bd8740 SHA256 3396a6f59b8709802a52db0678f957b03939a4f325520d4e5637bd6462c43766
+MISC ChangeLog 2435 RMD160 dfbabd3091361ae9d428d2a540768117395ee083 SHA1 be3c322815e47d1d517aa8dc08268cb3274ae8b7 SHA256 85879aa06bf1ea9cf179141c6544508d04df2750eb5b3b29769ab7f8aed8eab2
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgrYCkACgkQdz7hIScOURGUegCfZrqDw3/4WZqBKrcBTxxL+zbd
+S40AoMgQ+bZnba2xagJh7IKckDs6Zm0M
+=l3q9
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch
new file mode 100644
index 000000000000..64d6527768f8
--- /dev/null
+++ b/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch
@@ -0,0 +1,26 @@
+Index: monsterz-0.7.1/monsterz.py
+===================================================================
+--- monsterz-0.7.1.orig/monsterz.py	2008-05-09 16:35:25.000000000 +0000
++++ monsterz-0.7.1/monsterz.py	2008-05-09 16:35:33.000000000 +0000
+@@ -108,7 +108,9 @@
+                 M = int(max(r, g, b))
+                 m = int(min(r, g, b))
+                 val = (2 * M + r + g + b) / 5
+-                p[:] = (val + r) / 2, (val + g) / 2, (val + b) / 2
++                p[0] = (val + r) / 2
++                p[1] = (val + g) / 2
++                p[2] = (val + b) / 2
+                 if alpha[y][x] >= 250:
+                     alpha[y][x] = 255 - (M - m) * 3 / 4
+         del pixels
+@@ -129,7 +131,9 @@
+                 r, g, b = p
+                 M = int(max(r, g, b))
+                 m = int(min(r, g, b))
+-                p[:] = (m + r) / 2, (m + g) / 2, (m + b) / 2
++                p[0] = (m + r) / 2
++                p[1] = (m + g) / 2
++                p[2] = (m + b) / 2
+                 if alpha[y][x] >= 250:
+                     alpha[y][x] = 255 - M * 2 / 3
+         del pixels
diff --git a/games-puzzle/monsterz/monsterz-0.7.1-r1.ebuild b/games-puzzle/monsterz/monsterz-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..0534b222f90d
--- /dev/null
+++ b/games-puzzle/monsterz/monsterz-0.7.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/monsterz/monsterz-0.7.1-r1.ebuild,v 1.1 2008/05/14 21:56:51 nyhm Exp $
+
+inherit eutils games
+
+DESCRIPTION="a little puzzle game, similar to the famous Bejeweled or Zookeeper"
+HOMEPAGE="http://sam.zoy.org/projects/monsterz/"
+SRC_URI="http://sam.zoy.org/projects/monsterz/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-python/pygame"
+
+pkg_setup() {
+	if ! built_with_use media-libs/sdl-mixer mikmod ; then
+		die "${PN} requires that media-libs/sdl-mixer be built with USE=mikmod"
+	fi
+	games_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-64bit.patch
+	sed -i \
+		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
+		monsterz.py || die "sed failed"
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r graphics sound || die "doins failed"
+	newgamesbin monsterz.py ${PN} || die "newgamesbin failed"
+	newicon graphics/icon.png ${PN}.png
+	make_desktop_entry ${PN} Monsterz
+	dodoc README AUTHORS TODO
+	prepgamesdirs
+}