old

(Portage version: 2.1.10.49/cvs/Linux x86_64)

6 files changed, 8 insertions, 201 deletions

diff --git a/games-sports/xmoto/ChangeLog b/games-sports/xmoto/ChangeLog
index 9f6601f85632..1744f717c7a4 100644
--- a/games-sports/xmoto/ChangeLog
+++ b/games-sports/xmoto/ChangeLog
@@ -1,6 +1,11 @@
 # 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.62 2012/04/22 14:42:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/ChangeLog,v 1.63 2012/05/17 06:20:02 mr_bones_ Exp $
+
+  17 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/0.5.7-libpng.patch, -xmoto-0.5.4.ebuild, -xmoto-0.5.7.ebuild,
+  files/xmoto-0.5.9-libpng.patch, files/xmoto-0.5.9-utf8.patch:
+  old
 
   22 Apr 2012; Markus Meier <maekke@gentoo.org> xmoto-0.5.9.ebuild:
   x86 stable, bug #411779
diff --git a/games-sports/xmoto/files/0.5.7-libpng.patch b/games-sports/xmoto/files/0.5.7-libpng.patch
deleted file mode 100644
index 208046c38221..000000000000
--- a/games-sports/xmoto/files/0.5.7-libpng.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-libpng.patch b/games-sports/xmoto/files/xmoto-0.5.9-libpng.patch
index 208046c38221..8d14cd2bd183 100644
--- a/games-sports/xmoto/files/xmoto-0.5.9-libpng.patch
+++ b/games-sports/xmoto/files/xmoto-0.5.9-libpng.patch
@@ -1,5 +1,3 @@
-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
diff --git a/games-sports/xmoto/files/xmoto-0.5.9-utf8.patch b/games-sports/xmoto/files/xmoto-0.5.9-utf8.patch
index 0b04f0256bc1..5a9c5a499f93 100644
--- a/games-sports/xmoto/files/xmoto-0.5.9-utf8.patch
+++ b/games-sports/xmoto/files/xmoto-0.5.9-utf8.patch
@@ -1,7 +1,7 @@
 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
+--- 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
  =============================================================================*/
diff --git a/games-sports/xmoto/xmoto-0.5.4.ebuild b/games-sports/xmoto/xmoto-0.5.4.ebuild
deleted file mode 100644
index 03a49b0538a1..000000000000
--- a/games-sports/xmoto/xmoto-0.5.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/xmoto-0.5.4.ebuild,v 1.4 2011/03/04 01:35:18 ranger 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/${PN}/${PN}/${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
-	media-libs/libsdl[joystick]
-	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}
-	!=dev-db/sqlite-3.6.2
-	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
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
-		src/image/tim_png.cpp || die
-}
-
-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
-
-	rm -f "${D}${GAMES_DATADIR}/${PN}"/Textures/Fonts/DejaVuSans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}/${PN}"/Textures/Fonts/
-	doicon extra/xmoto.xpm
-	make_desktop_entry ${PN} 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
-}
diff --git a/games-sports/xmoto/xmoto-0.5.7.ebuild b/games-sports/xmoto/xmoto-0.5.7.ebuild
deleted file mode 100644
index 9ab46ed58495..000000000000
--- a/games-sports/xmoto/xmoto-0.5.7.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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.7.ebuild,v 1.3 2012/01/10 20:43:17 ranger 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/${PN}/${PN}/${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
-	media-libs/libsdl[joystick]
-	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}"/${PV}-libpng.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}/${PN}"/Textures/Fonts/DejaVuSans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}/${PN}"/Textures/Fonts/
-	doicon extra/xmoto.xpm
-	make_desktop_entry ${PN} 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
-}