version bump with patch from Mike Limansky (bug #398701)

Package-Manager: portage-2.1.10.44/cvs/Linux i686

5 files changed, 133 insertions, 2 deletions

diff --git a/games-sports/xmoto/ChangeLog b/games-sports/xmoto/ChangeLog
index 0b37574e722b..24f82435f9db 100644
--- a/games-sports/xmoto/ChangeLog
+++ b/games-sports/xmoto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-sports/xmoto
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/ChangeLog,v 1.58 2012/01/10 20:43:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/ChangeLog,v 1.59 2012/03/13 00:52:34 mr_bones_ Exp $
+
+*xmoto-0.5.9 (13 Mar 2012)
+
+  13 Mar 2012; Michael Sterrett <mr_bones_@gentoo.org> +xmoto-0.5.9.ebuild,
+  +files/xmoto-0.5.9-libpng.patch, +files/xmoto-0.5.9-utf8.patch:
+  version bump with patch from Mike Limansky (bug #398701)
 
   10 Jan 2012; Brent Baude <ranger@gentoo.org> xmoto-0.5.7.ebuild:
   Marking xmoto-0.5.7 ppc for bug 375687
diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest
index 1b6b18f81bbc..201c64fe72e1 100644
--- a/games-sports/xmoto/Manifest
+++ b/games-sports/xmoto/Manifest
@@ -1,8 +1,12 @@
 AUX 0.5.7-libpng.patch 460 RMD160 2b5f5c54299e1b855f0199f0b0796afd4af7d237 SHA1 8d006a3a34a179bef46d79d39f3d5845a34e3eaa SHA256 57905d720c8414d352489b2ad1b6fc3886e81bda57530779111943a815f0644a
+AUX xmoto-0.5.9-libpng.patch 460 RMD160 2b5f5c54299e1b855f0199f0b0796afd4af7d237 SHA1 8d006a3a34a179bef46d79d39f3d5845a34e3eaa SHA256 57905d720c8414d352489b2ad1b6fc3886e81bda57530779111943a815f0644a
+AUX xmoto-0.5.9-utf8.patch 497 RMD160 75af5fa2aa2cc1700fc5340ade1a04f2c9b46c0c SHA1 263b35327c39c5484e4536e27bad87632dabd54b SHA256 5b251695b24abfe746903e5c9c699cd347c62937aa3e08ae596b0777eed82a60
 DIST inksmoto-0.7.0.tar.gz 2628941 RMD160 af6eb2c6698bae394c5a7a664d8d61920a4a9391 SHA1 ab47beb5f41706d355ddab6a7365cc24706fb893 SHA256 60bd1369d4c347e127886a5813af13daf39b56ce818c9f8b2fc7d4bba0af7e11
 DIST xmoto-0.5.4-src.tar.gz 52472497 RMD160 00a2159d24c8870250a516aa893f2f1d2ddffc46 SHA1 971ffd9abac28ae00b9c26f036636532f5adc753 SHA256 05e259216e6805c692ef45ea3d0cd09a42d9f9ea7e850656a1b8637f3a44a4e4
 DIST xmoto-0.5.7-src.tar.gz 40395855 RMD160 7815a44f2015d1d54570bb9d1dc0e33041ad2434 SHA1 e781b42480a96187b5aca4126d17ecf0610ca5ac SHA256 7ad631de830a762f495d9273a65bd42fb4331868197d3d5e8d624bb59fecfca6
+DIST xmoto-0.5.9-src.tar.gz 40385328 RMD160 34fdbd3e7b26c678eb4c0e5a477b45de02167786 SHA1 07757accce78151dc8873bef8270df0e56196772 SHA256 74d7574476ad321c43db6c0df6d378954068e2514e3f4acae1cc322df8a033e4
 EBUILD xmoto-0.5.4.ebuild 2550 RMD160 a60c97f4072d05121c805668d4353f30910cf745 SHA1 737ce92f13c2f83ae87165da116c3995e4b12580 SHA256 93ebb99bd95a0f3afdb9ea4f4a17408f9178f1c729c5f09b76f5c8f7f36a2a6a
 EBUILD xmoto-0.5.7.ebuild 2472 RMD160 23502813b980d1473a9f039d75d67c1d6397a180 SHA1 09a4d2eb8dac6d848e129088a0594e25577b5a81 SHA256 e1ccdc3d099c823da8e7ead93ec43c05bf57b2dcbb5a98ab1df031152646345f
-MISC ChangeLog 7883 RMD160 a0199a93f7b1334da23239b749f7598e1b60e7e7 SHA1 8ef5ab81fd5271ed613b19e9f647930a76dd4e46 SHA256 a2fe905bcc3c3cd4063e7a27c761f9ed9a608d14b6289d3e70114172db6dcd2c
+EBUILD xmoto-0.5.9.ebuild 2554 RMD160 2a3f2cddcd32bf181faf191eb0dc4753134cd956 SHA1 fdc53f0a1e37b38fafd08ded084241dee4a1fd15 SHA256 fc0d0866678aa579923fad5eef302f980569dc56bb73915479e293eafceb9c7c
+MISC ChangeLog 8116 RMD160 3409cd1226753fadc26bdf3a428b6abf7e8e7c35 SHA1 6cad12f301ae7bad15ac67d15511599ffa61e885 SHA256 ba4bcd71c3c3fa1d2b496e1890ce183a44f7d8f78c0ddfd01dd2650c3bf80093
 MISC metadata.xml 270 RMD160 c447b9b1cea1f49ca7c00bab1f8aa6cdeb395afb SHA1 d0119628b902f2d7d0c56e532122df260eede5bf SHA256 43229adb28ae299ec42c09c8e7dc0f10eceba4af19d5094741471070094f5c57
diff --git a/games-sports/xmoto/files/xmoto-0.5.9-libpng.patch b/games-sports/xmoto/files/xmoto-0.5.9-libpng.patch
new file mode 100644
index 000000000000..208046c38221
--- /dev/null
+++ b/games-sports/xmoto/files/xmoto-0.5.9-libpng.patch
@@ -0,0 +1,12 @@
+diff --git a/xmoto-0.5.7.old/src/image/tim_png.cpp b/xmoto-0.5.7/src/image/tim_png.cpp
+index 75fd545..e4073dc 100644
+--- a/xmoto-0.5.7.old/src/image/tim_png.cpp
++++ b/xmoto-0.5.7/src/image/tim_png.cpp
+@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ #include <string.h>
+ #include "tim.h"
+ #include "png.h"
++#include "zlib.h"
+ 
+ /*==============================================================================
+ Types
diff --git a/games-sports/xmoto/files/xmoto-0.5.9-utf8.patch b/games-sports/xmoto/files/xmoto-0.5.9-utf8.patch
new file mode 100644
index 000000000000..0b04f0256bc1
--- /dev/null
+++ b/games-sports/xmoto/files/xmoto-0.5.9-utf8.patch
@@ -0,0 +1,15 @@
+http://todo.xmoto.tuxfamily.org/index.php?do=details&task_id=778
+
+--- src/helpers/utf8.h.orig	2011-10-12 00:18:14.000000000 +0400
++++ src/helpers/utf8.h	2012-01-13 11:58:33.000000000 +0400
+@@ -18,8 +18,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ =============================================================================*/
+ 
+-#ifndef __UTF8_H__
+-#define __UTF8_H__
++#ifndef __XMOTO_UTF8_H__
++#define __XMOTO_UTF8_H__
+ 
+ #include <vector>
+ #include <string>
diff --git a/games-sports/xmoto/xmoto-0.5.9.ebuild b/games-sports/xmoto/xmoto-0.5.9.ebuild
new file mode 100644
index 000000000000..f100820b6920
--- /dev/null
+++ b/games-sports/xmoto/xmoto-0.5.9.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/xmoto-0.5.9.ebuild,v 1.1 2012/03/13 00:52:34 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils flag-o-matic games
+
+LVL_PV="0.7.0" #they unfortunately don't release both at the same time, why ~ as separator :(
+LVL="inksmoto-${LVL_PV}"
+DESCRIPTION="A challenging 2D motocross platform game"
+HOMEPAGE="http://xmoto.tuxfamily.org"
+SRC_URI="http://download.tuxfamily.org/xmoto/xmoto/${PV}/${P}-src.tar.gz
+	editor? ( http://download.tuxfamily.org/xmoto/svg2lvl/${LVL_PV}/${LVL}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="editor nls"
+
+RDEPEND="
+	dev-libs/libxdg-basedir
+	dev-db/sqlite:3
+	dev-games/ode
+	dev-lang/lua[deprecated]
+	virtual/jpeg
+	media-libs/libpng
+	dev-libs/libxml2
+	media-libs/libsdl[joystick,opengl]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-ttf
+	media-libs/sdl-net
+	net-misc/curl
+	app-arch/bzip2
+	virtual/opengl
+	virtual/glu
+	media-fonts/dejavu
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	editor? ( media-gfx/inkscape )"
+
+src_prepare() {
+	use editor && rm -vf "${WORKDIR}"/extensions/{bezmisc,inkex}.py
+	sed -i \
+		-e '/^gettextsrcdir/s:=.*:= @localedir@/gettext/po:' \
+		po/Makefile.in.in || die
+
+	epatch \
+		"${FILESDIR}"/${P}-libpng.patch \
+		"${FILESDIR}"/${P}-utf8.patch
+}
+
+src_configure() {
+	# bug #289792
+	filter-flags -DdDOUBLE
+	has_version 'dev-games/ode[double-precision]' && append-flags -DdDOUBLE
+
+	egamesconf \
+		--disable-dependency-tracking \
+		--enable-threads=posix \
+		$(use_enable nls) \
+		--localedir=/usr/share/locale \
+		--with-localesdir=/usr/share/locale \
+		--with-renderer-sdlGfx=0 \
+		--with-renderer-openGl=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README TODO NEWS ChangeLog || die
+
+	rm -f "${D}${GAMES_DATADIR}/xmoto"/Textures/Fonts/DejaVuSans.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}/xmoto"/Textures/Fonts/DejaVuSans.ttf
+	doicon extra/xmoto.xpm
+	make_desktop_entry xmoto Xmoto
+
+	prepgamesdirs
+
+	if use editor; then
+		insinto /usr/share/inkscape/
+		doins -r "${WORKDIR}"/extensions/ || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	if use editor; then
+		elog "If you want to know how to create Xmoto levels"
+		elog "have a look at this Tutorial:"
+		elog "    http://wiki.xmoto.tuxfamily.org/index.php?title=Inksmoto-${LVL_PV}"
+		elog "You can share your levels on the Xmoto homepage."
+	fi
+}