Fixing error on starting server, bug #131905

(Portage version: 2.1_pre10-r2)

5 files changed, 108 insertions, 1 deletions

diff --git a/games-action/xpilot-ng/ChangeLog b/games-action/xpilot-ng/ChangeLog
index d96bafb768e1..91fc75a0c838 100644
--- a/games-action/xpilot-ng/ChangeLog
+++ b/games-action/xpilot-ng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-action/xpilot-ng
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/ChangeLog,v 1.6 2006/04/23 10:32:43 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/ChangeLog,v 1.7 2006/05/01 19:12:10 tupone Exp $
+
+*xpilot-ng-4.7.2-r1 (01 May 2006)
+
+  01 May 2006; <Tupone@gentoo.org> +files/xpilot-ng-4.7.2-xpngcc.patch,
+  -xpilot-ng-4.7.2.ebuild, +xpilot-ng-4.7.2-r1.ebuild:
+  Fixing error on starting server, bug #131905 by Alastair Mailer
+  Adding patch to select wxpython version, bug #108235 by Ben Urban
 
   23 Apr 2006; <Tupone@gentoo.org> xpilot-ng-4.7.2.ebuild:
   Missing dependency on wxpython
diff --git a/games-action/xpilot-ng/files/digest-xpilot-ng-4.6.6 b/games-action/xpilot-ng/files/digest-xpilot-ng-4.6.6
index 052b530d127d..16f46eca16f0 100644
--- a/games-action/xpilot-ng/files/digest-xpilot-ng-4.6.6
+++ b/games-action/xpilot-ng/files/digest-xpilot-ng-4.6.6
@@ -1 +1,3 @@
 MD5 785278551aa85356b44f907be1052bc3 xpilot-ng-4.6.6.tar.gz 2231395
+RMD160 f9465cbdc190f12f16e9eaa91c7d36ef7f04a7ed xpilot-ng-4.6.6.tar.gz 2231395
+SHA256 7c46776aa6a84639959fb15b8be79e42989bb8a8bb8988ce861d892a2665ef93 xpilot-ng-4.6.6.tar.gz 2231395
diff --git a/games-action/xpilot-ng/files/digest-xpilot-ng-4.7.2-r1 b/games-action/xpilot-ng/files/digest-xpilot-ng-4.7.2-r1
new file mode 100644
index 000000000000..05c4083bd2b7
--- /dev/null
+++ b/games-action/xpilot-ng/files/digest-xpilot-ng-4.7.2-r1
@@ -0,0 +1,3 @@
+MD5 b922251ab9c69f87567c9606304ee589 xpilot-ng-4.7.2.tar.gz 2807988
+RMD160 acc4266fd14467168cf3412ed747c5377b34ed41 xpilot-ng-4.7.2.tar.gz 2807988
+SHA256 31ef0f6b40779dd0ac5eb1bd17dd0908174e52991413fe25d623b6336d480fc0 xpilot-ng-4.7.2.tar.gz 2807988
diff --git a/games-action/xpilot-ng/files/xpilot-ng-4.7.2-xpngcc.patch b/games-action/xpilot-ng/files/xpilot-ng-4.7.2-xpngcc.patch
new file mode 100644
index 000000000000..2b6a111628dd
--- /dev/null
+++ b/games-action/xpilot-ng/files/xpilot-ng-4.7.2-xpngcc.patch
@@ -0,0 +1,21 @@
+--- contrib/xpngcc/xpngcc.py	2005-09-15 18:27:44.000000000 -0400
++++ contrib/xpngcc/xpngcc.py	2005-10-05 00:32:51.221341928 -0400
+@@ -1,5 +1,8 @@
+ #!/usr/bin/env python
+ 
++import wxversion
++wxversion.select('2.6')
++
+ import os
+ import wx
+ import urllib
+--- contrib/xpngcc/config.py.old	2006-05-01 20:43:31.000000000 +0200
++++ contrib/xpngcc/config.py	2006-05-01 20:44:26.000000000 +0200
+@@ -36,6 +36,6 @@
+ if (sys.platform == "win32"):

+ 	mapdir = 'C:\\Progra~1\\XPilotNG-SDL\\lib\\maps'

+ else:

+-	mapdir = '/usr/local/share/xpilot-ng/maps'

++	mapdir = '@GENTOO_DATADIR@/xpilot-ng/maps'

+ png_path = os.path.dirname(os.path.abspath(__file__))

+ 

diff --git a/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild b/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild
new file mode 100644
index 000000000000..3258fabf04df
--- /dev/null
+++ b/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild,v 1.1 2006/05/01 19:12:10 tupone Exp $
+
+inherit python games
+
+DESCRIPTION="Improvement of the multiplayer space game XPilot"
+HOMEPAGE="http://xpilot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xpilot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="openal sdl"
+
+RDEPEND="|| (
+	(
+		x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libSM )
+	virtual/x11 )
+	>=dev-libs/expat-1.1
+	>=sys-libs/zlib-1.1.3
+	openal? ( media-libs/openal )
+	dev-python/wxpython
+	sdl? (
+		virtual/opengl
+		>=media-libs/libsdl-1.2.0
+		>=media-libs/sdl-image-1.0
+		>=media-libs/sdl-ttf-2.0 )"
+DEPEND="${RDEPEND}
+	|| (
+		(
+			x11-proto/xextproto
+			x11-proto/xproto
+			x11-libs/libXt )
+		virtual/x11 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-xpngcc.patch
+
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
+		contrib/xpngcc/config.py
+}
+
+src_compile() {
+	egamesconf \
+		--disable-dependency-tracking \
+		$(use_enable sdl sdl-client) \
+		$(use_enable sdl sdl-gameloop) \
+		$(use_enable openal sound) \
+		|| die
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+	python_version
+	insinto ${GAMES_DATADIR}/${PN}/xpngcc
+	doins contrib/xpngcc/*.py contrib/xpngcc/*.png
+	exeinto ${GAMES_DATADIR}/${PN}/xpngcc
+	doexe contrib/xpngcc/xpngcc.py
+	dodir /usr/$(get_libdir)/python${PYVER}/site-packages
+	dosym ${GAMES_DATADIR}/${PN}/xpngcc /usr/$(get_libdir)/python${PYVER}/site-packages/xpngcc
+	dosym ${GAMES_DATADIR}/${PN}/xpngcc/xpngcc.py ${GAMES_BINDIR}/xpilot-ng
+	doicon ${FILESDIR}/${PN}.png
+	make_desktop_entry ${PN} "XPilot NG" ${PN}.png
+	prepgamesdirs
+}