version bump - bug #350244 with upstream patches rolled by bugs@m8y.org

(Portage version: 2.1.9.25/cvs/Linux i686)

4 files changed, 188 insertions, 2 deletions

diff --git a/games-strategy/hedgewars/ChangeLog b/games-strategy/hedgewars/ChangeLog
index 5545d4ba84d1..cd432c74e098 100644
--- a/games-strategy/hedgewars/ChangeLog
+++ b/games-strategy/hedgewars/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/hedgewars
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/ChangeLog,v 1.26 2010/11/15 19:56:46 mr_bones_ Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/ChangeLog,v 1.27 2011/01/20 19:01:26 mr_bones_ Exp $
+
+*hedgewars-0.9.15 (20 Jan 2011)
+
+  20 Jan 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +hedgewars-0.9.15.ebuild, +files/hedgewars-0.9.15-fixes.patch,
+  +files/hedgewars-0.9.15-lua.patch:
+  version bump - bug #350244 with upstream patches rolled by bugs@m8y.org
 
 *hedgewars-0.9.14.1 (15 Nov 2010)
 
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.15-fixes.patch b/games-strategy/hedgewars/files/hedgewars-0.9.15-fixes.patch
new file mode 100644
index 000000000000..39ae7294fbb0
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.15-fixes.patch
@@ -0,0 +1,105 @@
+diff -r bd74fd83929a hedgewars/uGears.pas
+--- a/hedgewars/uGears.pas	Tue Dec 28 10:31:48 2010 +0100
++++ b/hedgewars/uGears.pas	Thu Jan 06 10:11:34 2011 -0500
+@@ -1830,7 +1830,7 @@
+     if (x < 4) and (TeamsArray[t] <> nil) then
+         begin
+             // if team matches current hedgehog team, default to current hedgehog
+-            if (i = 0) and (CurrentHedgehog^.Team = TeamsArray[t]) then hh:= CurrentHedgehog
++            if (i = 0) and (CurrentHedgehog <> nil) and (CurrentHedgehog^.Team = TeamsArray[t]) then hh:= CurrentHedgehog
+             else 
+                 begin
+             // otherwise use the first living hog or the hog amongs the remaining ones indicated by i
+@@ -1847,12 +1847,15 @@
+                     inc(j)
+                     end
+                 end;
+-        if hh <> nil then Gear:= AddVisualGear(0, 0, vgtSpeechBubble);
+-        if Gear <> nil then
++        if hh <> nil then
+             begin
+-            Gear^.Hedgehog:= hh;
+-            Gear^.Text:= text;
+-            Gear^.FrameTicks:= x
++            Gear:= AddVisualGear(0, 0, vgtSpeechBubble);
++            if Gear <> nil then
++                begin
++                Gear^.Hedgehog:= hh;
++                Gear^.Text:= text;
++                Gear^.FrameTicks:= x
++                end
+             end
+         //else ParseCommand('say ' + text, true)
+         end
+diff -r bd74fd83929a hedgewars/uGearsRender.pas
+--- a/hedgewars/uGearsRender.pas	Tue Dec 28 10:31:48 2010 +0100
++++ b/hedgewars/uGearsRender.pas	Thu Jan 06 10:11:34 2011 -0500
+@@ -186,7 +186,7 @@
+     if (Gear^.State and gstHHDeath) <> 0 then
+         begin
+         DrawSprite(sprHHDeath, ox - 16, oy - 26, Gear^.Pos);
+-        Tint(HH^.Team^.Clan^.Color);
++        Tint(HH^.Team^.Clan^.Color shl 8 or $FF);
+         DrawSprite(sprHHDeath, ox - 16, oy - 26, Gear^.Pos + 8);
+         Tint($FF, $FF, $FF, $FF);
+         exit
+@@ -353,7 +353,7 @@
+                                 i*DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) + hAngle);
+                             if HatTex^.w > 64 then
+                                 begin
+-                                Tint(HH^.Team^.Clan^.Color);
++                                Tint(HH^.Team^.Clan^.Color shl 8 or $FF);
+                                 DrawRotatedTextureF(HatTex, 1.0, -1.0, -6.0, ox, oy, 32, i, 32, 32,
+                                     i*DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) + hAngle);
+                                 Tint($FF, $FF, $FF, $FF)
+@@ -383,7 +383,7 @@
+                                 32);
+                             if HatTex^.w > 64 then
+                                 begin
+-                                Tint(HH^.Team^.Clan^.Color);
++                                Tint(HH^.Team^.Clan^.Color shl 8 or $FF);
+                                 DrawTextureF(HatTex,
+                                     1,
+                                     sx,
+@@ -705,7 +705,7 @@
+                     32);
+                 if HatTex^.w > 64 then
+                     begin
+-                    Tint(HH^.Team^.Clan^.Color);
++                    Tint(HH^.Team^.Clan^.Color shl 8 or $FF);
+                     DrawTextureF(HatTex,
+                         HatVisibility,
+                         sx,
+@@ -729,7 +729,7 @@
+                     32);
+                 if HatTex^.w > 64 then
+                     begin
+-                    Tint(HH^.Team^.Clan^.Color);
++                    Tint(HH^.Team^.Clan^.Color shl 8 or $FF);
+                     DrawTextureF(HatTex,
+                         HatVisibility,
+                         sx,
+diff -r bd74fd83929a hedgewars/uStore.pas
+--- a/hedgewars/uStore.pas	Tue Dec 28 10:31:48 2010 +0100
++++ b/hedgewars/uStore.pas	Thu Jan 06 10:11:34 2011 -0500
+@@ -274,7 +274,7 @@
+ for ii:= Low(TSprite) to High(TSprite) do
+     with SpritesData[ii] do
+         // FIXME - add a sprite attribute
+-        if ((cReducedQuality and rqNoBackground) = 0) or (not (ii in [sprSky, sprSkyL, sprSkyR, sprHorizont, sprHorizontL, sprHorizontR, sprFlake, sprSplash, sprDroplet])) then // FIXME: hack
++        if ((cReducedQuality and rqNoBackground) = 0) or (not (ii in [sprSky, sprSkyL, sprSkyR, sprHorizont, sprHorizontL, sprHorizontR, sprFlake, sprSplash, sprDroplet]) or (((Theme = 'Snow') or (Theme = 'Christmas')) and (ii = sprFlake))) then // FIXME: hack
+         begin
+             if AltPath = ptNone then
+                 if ii in [sprHorizontL, sprHorizontR, sprSkyL, sprSkyR] then // FIXME: hack
+diff -r bd74fd83929a hedgewars/uWorld.pas
+--- a/hedgewars/uWorld.pas	Tue Dec 28 10:31:48 2010 +0100
++++ b/hedgewars/uWorld.pas	Thu Jan 06 10:11:34 2011 -0500
+@@ -742,7 +742,7 @@
+       highlight:= bShowFinger and (CurrentTeam = TeamsArray[t]) and ((RealTicks mod 1000) < 500);
+ 
+       if highlight then
+-         Tint(Clan^.Color);
++         Tint(Clan^.Color shl 8 or $FF);
+ 
+       // draw name
+       DrawTexture(-NameTagTex^.w - 16, cScreenHeight + DrawHealthY, NameTagTex);
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.15-lua.patch b/games-strategy/hedgewars/files/hedgewars-0.9.15-lua.patch
new file mode 100644
index 000000000000..9451c2b12168
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.15-lua.patch
@@ -0,0 +1,18 @@
+diff -r bd74fd83929a share/hedgewars/Data/Maps/CTF_Blizzard/map.lua
+--- a/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua	Tue Dec 28 10:31:48 2010 +0100
++++ b/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua	Thu Jan 06 10:49:46 2011 -0500
+@@ -153,9 +153,11 @@
+ 	-- steam and smoke and DUST look good, smokering looks trippy 

+ 	-- smoketrace and eviltrace are not effected by wind?

+ 	-- chunk is a LR falling gear

+-			tempE = AddVisualGear(eX, eY, vgtDust, 0, false)		

+-			g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(tempE)

+-			SetVisualGearValues(tempE, eX, eY, g3, g4, g5, g6, g7, g8, g9, fCol[i])

++			tempE = AddVisualGear(eX, eY, vgtDust, 0, false)

++            if tempE ~= 0 then

++			    g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(tempE)

++			    SetVisualGearValues(tempE, eX, eY, g3, g4, g5, g6, g7, g8, g9, fCol[i])

++            end

+ 		end

+ 	end 

+ end

diff --git a/games-strategy/hedgewars/hedgewars-0.9.15.ebuild b/games-strategy/hedgewars/hedgewars-0.9.15.ebuild
new file mode 100644
index 000000000000..041acd03fd49
--- /dev/null
+++ b/games-strategy/hedgewars/hedgewars-0.9.15.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/hedgewars-0.9.15.ebuild,v 1.1 2011/01/20 19:01:26 mr_bones_ Exp $
+
+EAPI=2
+inherit cmake-utils eutils games
+
+MY_P=${PN}-src-${PV}
+DESCRIPTION="Free Worms-like turn based strategy game"
+HOMEPAGE="http://hedgewars.org/"
+SRC_URI="http://hedgewars.org/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 Apache-2.0 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/qt-gui:4
+	media-libs/libsdl[audio,opengl,video]
+	media-libs/sdl-ttf
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-image[png]
+	media-libs/sdl-net
+	dev-lang/lua"
+DEPEND="${RDEPEND}
+	>=dev-lang/fpc-2.4"
+RDEPEND="${RDEPEND}
+	>=media-fonts/dejavu-2.28"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-fixes.patch
+	"${FILESDIR}"/${P}-lua.patch )
+
+src_configure() {
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
+		-DDATA_INSTALL_DIR="${GAMES_DATADIR}"
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE )
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	DOCS="ChangeLog.txt README" cmake-utils_src_install
+	rm -f "${D}"/usr/share/games/hedgewars/Data/Fonts/DejaVuSans-Bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \
+		"${GAMES_DATADIR}"/hedgewars/Data/Fonts/DejaVuSans-Bold.ttf
+	newicon QTfrontend/res/hh25x25.png ${PN}.png
+	make_desktop_entry ${PN} Hedgewars
+	doman man/${PN}.6
+	prepgamesdirs
+}