add particle patch from Albert Zeyer (bug #236469)

Package-Manager: portage-2.1.4.4

4 files changed, 47 insertions, 9 deletions

diff --git a/games-arcade/xtux/ChangeLog b/games-arcade/xtux/ChangeLog
index c0bdfe406952..0bcfc7da0a39 100644
--- a/games-arcade/xtux/ChangeLog
+++ b/games-arcade/xtux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/xtux
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/ChangeLog,v 1.10 2006/12/01 20:38:49 wolf31o2 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/ChangeLog,v 1.11 2008/09/03 02:10:03 mr_bones_ Exp $
+
+  03 Sep 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/xtux-20030306-particles.patch, xtux-20030306.ebuild:
+  add particle patch from Albert Zeyer (bug #236469)
 
   01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> xtux-20030306.ebuild:
   Removing old virtual/x11 dependency.
diff --git a/games-arcade/xtux/Manifest b/games-arcade/xtux/Manifest
index 9d2895f3ba67..0b21d374ce4b 100644
--- a/games-arcade/xtux/Manifest
+++ b/games-arcade/xtux/Manifest
@@ -1,4 +1,5 @@
+AUX xtux-20030306-particles.patch 1411 RMD160 7e5e73e6a594f5863ee0be3bc93f8cf34c47ba2f SHA1 0f8d6f1f8036edd5fc239534e050f12a63f452d1 SHA256 eecd3464ed508a9eb72432591cf89a5b53ae6a383322128567581e19ff95c3a3
 DIST xtux-src-20030306.tar.gz 1640928 RMD160 0535e37d7bc94e5e7a103d8ae2482200cc18ea24 SHA1 8db4f42c382ccf52eae7077e9e834f5bc00c54bf SHA256 3ef2c3d7615d05b1d6efa6a99358aa907c5cf635ffb017f5cad59c8d91c47670
-EBUILD xtux-20030306.ebuild 1045 RMD160 ad22378b41526091fb455d4968dcc8bd5b8fb4d7 SHA1 0db32bd852f44adf9cbbe523bfe545fd053aef1e SHA256 c634420084b3522ee9a9f99473c6d8b91c03e56e4db88256218d5d6a51f15ef2
-MISC ChangeLog 1421 RMD160 777d4e7f5658b256eafb1b51790ff05d91ffc8c3 SHA1 9ef721e31d2ddba224630f7abbec2ff5c0986e25 SHA256 0026fc0911bd8beb85578dd9b7f1d123c6343815323fed3a77bda46f2de027f6
+EBUILD xtux-20030306.ebuild 1174 RMD160 479cc3b939c9559976e0d1cc87402515c99f2b40 SHA1 b1308cd856e7bb47d67e2629d792704c425044b7 SHA256 8c05e9e1b7b69477f58694e56169a996488364a854a6813b098e3209be9dd056
+MISC ChangeLog 1593 RMD160 34caa10057ee704eee91532d55975ab9da664395 SHA1 1ddc2a52f81eb5db56657e7dbdd2710956de9b37 SHA256 ef4f9cf421860e31065ba17b1406c5bc5187fb08b7a431dc21f0bb9ae35970fa
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/xtux/files/xtux-20030306-particles.patch b/games-arcade/xtux/files/xtux-20030306-particles.patch
new file mode 100644
index 000000000000..9a340821dd6e
--- /dev/null
+++ b/games-arcade/xtux/files/xtux-20030306-particles.patch
@@ -0,0 +1,30 @@
+diff -u -r xtux.old/src/client/particle.c xtux/src/client/particle.c
+--- xtux.old/src/client/particle.c	2008-09-02 20:34:24.000000000 +0200
++++ xtux/src/client/particle.c	2008-09-02 20:35:40.000000000 +0200
+@@ -340,11 +340,11 @@
+ 	ptl->pos[i].y = src_y;
+ 	d = dir + 128;
+ 	d += i%SHARD_ANGLE - SHARD_ANGLE/2;
+-	ptl->vel[i].x = sin_lookup[dir + 64 + rand()%64] * SHARD_EXP_VEL;
+-	ptl->vel[i].y = -cos_lookup[dir + 64 + rand()%64] * SHARD_EXP_VEL;
++	ptl->vel[i].x = sin_lookup[(dir + 64 + rand()%64) % DEGREES] * SHARD_EXP_VEL;
++	ptl->vel[i].y = -cos_lookup[(dir + 64 + rand()%64) % DEGREES] * SHARD_EXP_VEL;
+ 	vel = SHARD_MIN_VEL + (SHARD_MAX_VEL*rand()/(RAND_MAX+SHARD_MIN_VEL));
+-	ptl->vel[i].x += vel * sin_lookup[d] * 10;
+-	ptl->vel[i].y += vel * -cos_lookup[d] * 10;
++	ptl->vel[i].x += vel * sin_lookup[d % DEGREES] * 10;
++	ptl->vel[i].y += vel * -cos_lookup[d % DEGREES] * 10;
+     }
+ 
+     ptl = particles_new(color2, PTL_TOP, num_sh2);
+@@ -357,8 +357,8 @@
+ 	ptl->vel[i].x = sin_lookup[rand()%256] * SHARD_EXP_VEL;
+ 	ptl->vel[i].y = -cos_lookup[rand()%256] * SHARD_EXP_VEL;
+ 	vel = SHARD_MIN_VEL + (SHARD_MAX_VEL*rand()/(RAND_MAX+SHARD_MIN_VEL));
+-	ptl->vel[i].x += vel * sin_lookup[d] * 20;
+-	ptl->vel[i].y += vel * -cos_lookup[d] * 20;
++	ptl->vel[i].x += vel * sin_lookup[d % DEGREES] * 20;
++	ptl->vel[i].y += vel * -cos_lookup[d % DEGREES] * 20;
+     }
+ 
+     /* "Extra" particles (ie bullet holes) */
diff --git a/games-arcade/xtux/xtux-20030306.ebuild b/games-arcade/xtux/xtux-20030306.ebuild
index ead482809a98..a25f581f5121 100644
--- a/games-arcade/xtux/xtux-20030306.ebuild
+++ b/games-arcade/xtux/xtux-20030306.ebuild
@@ -1,8 +1,8 @@
-# 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-arcade/xtux/xtux-20030306.ebuild,v 1.12 2006/12/01 20:38:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/xtux-20030306.ebuild,v 1.13 2008/09/03 02:10:03 mr_bones_ Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="Multiplayer Gauntlet-style arcade game"
 HOMEPAGE="http://xtux.sourceforge.net/"
@@ -28,6 +28,7 @@ src_unpack() {
 		-e "s:./tux_serv:tux_serv:" \
 		src/client/menu.c \
 		|| die "sed failed"
+	epatch "${FILESDIR}/${P}-particles.patch"
 }
 
 src_compile() {
@@ -36,8 +37,10 @@ src_compile() {
 
 src_install () {
 	dogamesbin xtux tux_serv || die "dogamesbin failed"
-	dodir "${GAMES_DATADIR}/xtux"
-	cp -r data "${D}/${GAMES_DATADIR}/xtux/" || die "cp failed"
+	insinto "${GAMES_DATADIR}/xtux"
+	doins -r data/ || die "doins failed"
 	dodoc AUTHORS CHANGELOG README README.GGZ doc/*
+	newicon data/images/icon.xpm ${PN}.xpm
+	make_desktop_entry xtux "Xtux" /usr/share/icons/${PN}.xpm
 	prepgamesdirs
 }