version bump (bug #426216)

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

5 files changed, 137 insertions, 8 deletions

diff --git a/games-sports/xmoto/ChangeLog b/games-sports/xmoto/ChangeLog
index 86f8cedc4360..eb8339ddb9ed 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.64 2012/06/12 18:15:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/ChangeLog,v 1.65 2012/07/16 17:13:05 mr_bones_ Exp $
+
+*xmoto-0.5.10 (16 Jul 2012)
+
+  16 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org> +xmoto-0.5.10.ebuild,
+  +files/xmoto-0.5.10-gcc47.patch, +files/xmoto-0.5.10-utf8.patch:
+  version bump (bug #426216)
 
   12 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org> xmoto-0.5.9.ebuild,
   +files/xmoto-0.5.9-gcc47.patch:
diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest
index f5e1c5b312f9..f8df607033e4 100644
--- a/games-sports/xmoto/Manifest
+++ b/games-sports/xmoto/Manifest
@@ -1,8 +1,12 @@
-AUX xmoto-0.5.9-gcc47.patch 367 RMD160 3b37d81a0bcbd0e32ea08e4721084db033f9fdd2 SHA1 9be78e5dba4569bd122e0569a79776d93288730d SHA256 d0dc02b512b78c1d69ce51ccf528d467da9f36eaab1f89e20605c3a175607c94
-AUX xmoto-0.5.9-libpng.patch 343 RMD160 e5aa739a1b64e207b0696dd9f1a829f6c3f8057d SHA1 5025f379ae672cc5d1ebd47d4565972c1e3998e8 SHA256 fdbbc0aacd03d4bca84d4c85da706cff81350a5f33b793a31c44c5993a76196b
-AUX xmoto-0.5.9-utf8.patch 425 RMD160 dfbb9fca9754bf9e971cbf26cdf88a1d388d9e96 SHA1 15c43a0b798d742d0de9cdbdffa068ecd081082f SHA256 3cda1d96a450159cc0f7cfabb33da47d977b62428bdd8aadff9f5e1b4d1aaadc
+AUX xmoto-0.5.10-gcc47.patch 367 SHA256 d0dc02b512b78c1d69ce51ccf528d467da9f36eaab1f89e20605c3a175607c94 SHA512 843b2dbc52adcb696923b25c543cc02698f1b44f730eb0d2c06c73605ed7d01f2c7da51fee4c2c6b94c4a232f619e66afa516af1c02c873c569138cbee292044 WHIRLPOOL 41dc86ceb572da1ff2e8832761f71309da5fbdf44a329ec44eb1f6e0102a95ef735a7358a66df142a7b8d7bfb6302f747866d4f8feaeb7c5df8dc40cba56a55b
+AUX xmoto-0.5.10-utf8.patch 425 SHA256 3cda1d96a450159cc0f7cfabb33da47d977b62428bdd8aadff9f5e1b4d1aaadc SHA512 53e1663a3027f2bf78c8c9b7f029c023cb4cd8af791e617f0e77e6609d56468662e42b7cfe033b7efaea0007b3b0cfff6e450ebb1cf245772dac03313186eab9 WHIRLPOOL 147db5a2a5e5a4f0491ad41e84dcf142a38c18f8dfe7d21981af981e458492e6b9f3ea92191ba829304ffb71272a0813c432c930f2184f3184c18bbfbcc5c348
+AUX xmoto-0.5.9-gcc47.patch 367 SHA256 d0dc02b512b78c1d69ce51ccf528d467da9f36eaab1f89e20605c3a175607c94 SHA512 843b2dbc52adcb696923b25c543cc02698f1b44f730eb0d2c06c73605ed7d01f2c7da51fee4c2c6b94c4a232f619e66afa516af1c02c873c569138cbee292044 WHIRLPOOL 41dc86ceb572da1ff2e8832761f71309da5fbdf44a329ec44eb1f6e0102a95ef735a7358a66df142a7b8d7bfb6302f747866d4f8feaeb7c5df8dc40cba56a55b
+AUX xmoto-0.5.9-libpng.patch 343 SHA256 fdbbc0aacd03d4bca84d4c85da706cff81350a5f33b793a31c44c5993a76196b SHA512 d92b308713e86481b4877acc6521e77248c9599a8aef318248eec25e46b3adf9b34fb5044e1803c8f79ea981f404531cb777158cb2a105e804d884396db2208e WHIRLPOOL b5056797b4815b6cd5805223b73aa79cd4c03d760fd1b5d1e8cdc44cc7069488486e0721bf6a99b71c76b844bd0c7a2f521e31cca9ea91402cd7bdcd30854b8f
+AUX xmoto-0.5.9-utf8.patch 425 SHA256 3cda1d96a450159cc0f7cfabb33da47d977b62428bdd8aadff9f5e1b4d1aaadc SHA512 53e1663a3027f2bf78c8c9b7f029c023cb4cd8af791e617f0e77e6609d56468662e42b7cfe033b7efaea0007b3b0cfff6e450ebb1cf245772dac03313186eab9 WHIRLPOOL 147db5a2a5e5a4f0491ad41e84dcf142a38c18f8dfe7d21981af981e458492e6b9f3ea92191ba829304ffb71272a0813c432c930f2184f3184c18bbfbcc5c348
 DIST inksmoto-0.7.0.tar.gz 2628941 RMD160 af6eb2c6698bae394c5a7a664d8d61920a4a9391 SHA1 ab47beb5f41706d355ddab6a7365cc24706fb893 SHA256 60bd1369d4c347e127886a5813af13daf39b56ce818c9f8b2fc7d4bba0af7e11
-DIST xmoto-0.5.9-src.tar.gz 40385328 RMD160 34fdbd3e7b26c678eb4c0e5a477b45de02167786 SHA1 07757accce78151dc8873bef8270df0e56196772 SHA256 74d7574476ad321c43db6c0df6d378954068e2514e3f4acae1cc322df8a033e4
-EBUILD xmoto-0.5.9.ebuild 2586 RMD160 9541f5468de9c6b142166d2bf47e46cb61b261df SHA1 efbb03fb6e0eaf95d43d489e3205e76ceb091da6 SHA256 97d3e21bfdbb93dc5e6bcf818f06bf2148c624c393cf57918e840e4d56e16170
-MISC ChangeLog 8813 RMD160 6ab5c9383e69ed46bfc62f2bd133abe0188a5143 SHA1 f481300456e171048c3c51930285acd001e27227 SHA256 90917a627796e90f6fb97c74ed341e5cb840eef41401683c245349fb63080332
-MISC metadata.xml 270 RMD160 c447b9b1cea1f49ca7c00bab1f8aa6cdeb395afb SHA1 d0119628b902f2d7d0c56e532122df260eede5bf SHA256 43229adb28ae299ec42c09c8e7dc0f10eceba4af19d5094741471070094f5c57
+DIST xmoto-0.5.10-src.tar.gz 40766628 SHA256 2d2438e4685aa5fc1aa9f73bfbe26893d7fc97fadd6e1cc9fdb09c8d16df9e1e SHA512 76863ed2ad4a22d6b77f74ebae13657dfbf03c0686b4700402a0086d4d3d38901c01a75df36c1830a53fb1c54e8f2b91f095f6f3830dbe8f9f3cfd8b7e4c4718 WHIRLPOOL c093e71e288e4fb6956a007565036aebba42249ed833a48af7ba7eb9be493f9fbe72153a1d4f68784b1f6ca87129d0c591f26c7388107e1ec25d5dfe1c43b3b7
+DIST xmoto-0.5.9-src.tar.gz 40385328 SHA256 74d7574476ad321c43db6c0df6d378954068e2514e3f4acae1cc322df8a033e4 SHA512 eae2317dbbd6dfbbcbeaba82c3b27e28ad78a8bfff4310fea6dece01ff53ba147993b925fea18e56a8a3eaa6ba87bbab99c47a03b141c9f670dbe6fdd9231201 WHIRLPOOL 848955f6eebe1dafec09eab8ebe2c99623da6a556e6926cc36135ca812c71c81ccedcfc8098e593174dc369a84e4bb504491dd2e13511eb28121229998938f8a
+EBUILD xmoto-0.5.10.ebuild 2554 SHA256 96de31d7703ff18b205b7dab1d6ab88f2fd28bf0293b2071dce74771593e8d97 SHA512 3aad9c1c5c986b212dd60d5b372cbf029a97361edc4b9f459e7e948f8f3c2a734d9b51c260bcee2edfe47db949ade1bb66a21ba8b1370050c55a6e4e1692d1fd WHIRLPOOL 1a35007409b03d7d5056c1db685f5620ddad3c5c5316b86ef7889a0de31794cd28b7bc9b022114afdeddd90b01c1d4dea50c585a6233265c1de924e6a5524174
+EBUILD xmoto-0.5.9.ebuild 2586 SHA256 97d3e21bfdbb93dc5e6bcf818f06bf2148c624c393cf57918e840e4d56e16170 SHA512 08839a51ffc9f039dfdb84c2d93a09af1f0b65d9df4b19e51d8473748b7a44fec14ec83aa833349486993bf96b5af4ff7bdebaa09b29f63b34f24e31748a6778 WHIRLPOOL 1de97abd9d97a12af5903cf06a6a37d3493eb4bc9b51dac505921337699d135e11e8398b4f9fe7eae78344d4f6b3f137f2475c92880ee35ee65703e9a949b2aa
+MISC ChangeLog 9016 SHA256 25da1d0c1be13c37a889d12cdd2282d5fcf1d5a8aa36c90e43914e7a8687f1e3 SHA512 55164cbc3ecacaf33b3c272577d62c46f51297435034783a8f25750b26c6c6b9a189dc69602f2f11c4df9963c39186f7e4b114cda4a42fb82566e28c70402475 WHIRLPOOL 759dacde78baae4acf6c72471780767c073e7885bb0b7df50c8a6aa1bb6833e8c67800ad33c7c02674c87478bee9c81f59e9dc53c6e383663535cfa9412add75
+MISC metadata.xml 270 SHA256 43229adb28ae299ec42c09c8e7dc0f10eceba4af19d5094741471070094f5c57 SHA512 72c041eadf8dde3be8bf5724b1344339f6e38906f4799f67daba00d72fe337d042a903c0db8c75ee14790f46a6933e39da11464a2d0c3e96eb2b63dd4cd999ee WHIRLPOOL db9b56dddd0402c676bd4e3820cc7449104799fadb7f0d39ab233e8577550890470d6a803eae56a5a6102dc00d8481b812d36d179be223ca09a427e9234e79bb
diff --git a/games-sports/xmoto/files/xmoto-0.5.10-gcc47.patch b/games-sports/xmoto/files/xmoto-0.5.10-gcc47.patch
new file mode 100644
index 000000000000..eb0843ef35ba
--- /dev/null
+++ b/games-sports/xmoto/files/xmoto-0.5.10-gcc47.patch
@@ -0,0 +1,10 @@
+--- src/helpers/System.cpp.old	2012-06-12 11:01:24.332083600 +0200
++++ src/helpers/System.cpp	2012-06-12 11:01:35.335083715 +0200
+@@ -24,6 +24,7 @@
+ #include "Log.h"
+ #include "VExcept.h"
+ #include <sstream>
++#include <unistd.h>
+ 
+ std::vector<std::string>* System::getDisplayModes(int windowed) {
+     std::vector<std::string>* modes = new std::vector<std::string>;
diff --git a/games-sports/xmoto/files/xmoto-0.5.10-utf8.patch b/games-sports/xmoto/files/xmoto-0.5.10-utf8.patch
new file mode 100644
index 000000000000..5a9c5a499f93
--- /dev/null
+++ b/games-sports/xmoto/files/xmoto-0.5.10-utf8.patch
@@ -0,0 +1,15 @@
+http://todo.xmoto.tuxfamily.org/index.php?do=details&task_id=778
+
+--- src/helpers/utf8.h.orig
++++ src/helpers/utf8.h
+@@ -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.10.ebuild b/games-sports/xmoto/xmoto-0.5.10.ebuild
new file mode 100644
index 000000000000..5612619221ca
--- /dev/null
+++ b/games-sports/xmoto/xmoto-0.5.10.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.10.ebuild,v 1.1 2012/07/16 17:13:05 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}-utf8.patch \
+		"${FILESDIR}"/${P}-gcc47.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
+}