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

(Portage version: 2.1.10.44/cvs/Linux i686)

4 files changed, 128 insertions, 1 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/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
+}