5 files changed, 214 insertions, 4 deletions
diff --git a/games-action/xshipwars/ChangeLog b/games-action/xshipwars/ChangeLog
index c98b04133901..1a5a237adcbb 100644
--- a/games-action/xshipwars/ChangeLog
+++ b/games-action/xshipwars/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/xshipwars
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/ChangeLog,v 1.11 2006/01/28 21:19:10 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/ChangeLog,v 1.12 2006/03/22 21:53:03 tupone Exp $
+
+*xshipwars-2.5.4 (22 Mar 2006)
+
+  22 Mar 2006; <Tupone@gentoo.org> +files/xshipwars-2.5.4-build.patch,
+  +xshipwars-2.5.4.ebuild:
+  Version bump, bug #125277 by Toffanin [WiredTEK]
 
   28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   xshipwars-1.34.0.ebuild, xshipwars-2.4.7.ebuild:
diff --git a/games-action/xshipwars/Manifest b/games-action/xshipwars/Manifest
index e136b8b73cfb..5175a22f60bb 100644
--- a/games-action/xshipwars/Manifest
+++ b/games-action/xshipwars/Manifest
@@ -1,12 +1,18 @@
-MD5 d84163ce822ba6b2928a3ea4cfe00b6b ChangeLog 1978
-RMD160 d654f714750219b054abacd48d0a1d83bf5c599e ChangeLog 1978
-SHA256 811ce4655ba80f587a17a2be431eafe0b99b5c47b0234fdc95782383b68af3c3 ChangeLog 1978
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 16fb3e51d376ca633ffa534b4c9ebd47 ChangeLog 2153
+RMD160 c0673adc611d4c207a5c27d406a8050a510dc955 ChangeLog 2153
+SHA256 be8c38fa2a77f5b693047eeeb4cd8cfe88a387f77b417f3bbaab11576a2bebe3 ChangeLog 2153
 MD5 825e4e161401b86551eb3985d7fdc357 files/digest-xshipwars-1.34.0 327
 RMD160 ff9e6332a9ff3d972dd8b0676e33ee7fbdd885f8 files/digest-xshipwars-1.34.0 327
 SHA256 e69a82590e58d84f390dae093afeec957419e96e71506871e7ec3f4387e7903f files/digest-xshipwars-1.34.0 327
 MD5 79fbba0e261f275b54cb1eed3bcf7ec8 files/digest-xshipwars-2.4.7 266
 RMD160 c12c67c034985b22ad6b7e8edc32454a8e3d5b05 files/digest-xshipwars-2.4.7 266
 SHA256 6e5042b3a3d1680a953039e9bdae8c9a04cbbd70ac0196464761bf5a84edb228 files/digest-xshipwars-2.4.7 266
+MD5 3438c195fde7a2e9d5e671e51a056350 files/digest-xshipwars-2.5.4 982
+RMD160 71a1d49eb12c7330c8278be4cf973c36ce3996c3 files/digest-xshipwars-2.5.4 982
+SHA256 9b0dc6ebfb4f58f92fae66e147e3857d2eb7c44362c8e18e441a7dc9d10401ab files/digest-xshipwars-2.5.4 982
 MD5 810c3eb40cc4e406109ac3f0e33b3fa9 files/xshipwars-1.34.0-gcc3.patch 1338
 RMD160 4a45e47d1baba133b3056d152283a9a5858ca5cc files/xshipwars-1.34.0-gcc3.patch 1338
 SHA256 60cf88c546e092ca40719f20888f9deed780b2f3db3b73f003dd77827adfa0b9 files/xshipwars-1.34.0-gcc3.patch 1338
@@ -19,6 +25,9 @@ SHA256 ead8d779c75e0b5c4ca326d74c8114142b55628512533f19cb3560a23582acdc files/xs
 MD5 83d712c227f57834b2d4dc250ba60d41 files/xshipwars-2.4.7-build.patch 3279
 RMD160 3a37627936fce0e20f95119f3883033e382b1c01 files/xshipwars-2.4.7-build.patch 3279
 SHA256 ecf4e849f2bf80906c94dd4c513a099c36a4bcf339f8267d4eb9643ce8a47473 files/xshipwars-2.4.7-build.patch 3279
+MD5 5c95ec222a201817ff3b6ced0d51cba0 files/xshipwars-2.5.4-build.patch 2263
+RMD160 4ee14a7f9419f528f36cd0905d21e82cf04dec2a files/xshipwars-2.5.4-build.patch 2263
+SHA256 3a188378c9afb51ba6dd660f19e483861ab417a709847978a71500fc98f13bdf files/xshipwars-2.5.4-build.patch 2263
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
@@ -28,3 +37,13 @@ SHA256 3ba7cd1cc27acc0b238cd542ca808c7b3126b593b87b627b93739f599ff6efa4 xshipwar
 MD5 e7d694e96802d3a14ff8b3b390afe295 xshipwars-2.4.7.ebuild 2762
 RMD160 8e6386aca0274159ec5d2d778f520eecaf7f2041 xshipwars-2.4.7.ebuild 2762
 SHA256 85469feead02b14cb17ba0868fec71687f17e494f28e42825c9801be191b01d7 xshipwars-2.4.7.ebuild 2762
+MD5 00667c755105fb7de28ddf56f357451f xshipwars-2.5.4.ebuild 2701
+RMD160 966fc67df1c62ee5973bcfa30fee2f3670347d10 xshipwars-2.5.4.ebuild 2701
+SHA256 b243bc3d93809acf7a63e92ae303f4d877d39fbbab1bb5b8f4e24ba8866164fd xshipwars-2.5.4.ebuild 2701
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFEIcdR2CTtIKiFlQIRAk+BAJwNpZOjoreZWFO9refVil5VhtGOxQCfYf5/
+a82GU1QHdkOr+xtjF+OE51k=
+=YROg
+-----END PGP SIGNATURE-----
diff --git a/games-action/xshipwars/files/digest-xshipwars-2.5.4 b/games-action/xshipwars/files/digest-xshipwars-2.5.4
new file mode 100644
index 000000000000..410e5680bc80
--- /dev/null
+++ b/games-action/xshipwars/files/digest-xshipwars-2.5.4
@@ -0,0 +1,12 @@
+MD5 55acdd97ef4cd56be0b9cfb8c7c1b853 stimages-1.9.7.tar.bz2 9291386
+RMD160 1df05888a5c3bb796add234a2b764f1c9b489fc1 stimages-1.9.7.tar.bz2 9291386
+SHA256 a6c4d7c78b4afc5b1834300aefcf40bc2327b0ba9d977f0d2749d8881c18bada stimages-1.9.7.tar.bz2 9291386
+MD5 8018b651ac3be043e2fca98729a4063f stsounds-1.6.4.tar.bz2 853101
+RMD160 1ab068596d52d9b3a21ad29da0e648cd1b74e3f9 stsounds-1.6.4.tar.bz2 853101
+SHA256 e355ad53103a8094d0a12b5955ef0c70cd181ee740ee8d13e9edf7480594cff4 stsounds-1.6.4.tar.bz2 853101
+MD5 d9bba372fdce5af0914edd07c70105db xsw-2.5.4.tar.bz2 1158008
+RMD160 308f0230322098615a417bcd1340e747743ef1ab xsw-2.5.4.tar.bz2 1158008
+SHA256 6da773bbe37b432445a58de103d65d3c1465367ccfa14e2ebe0c937dbe0f33b3 xsw-2.5.4.tar.bz2 1158008
+MD5 a84943fdced018b5ca17ca5f73be6137 xsw-data-2.5.4.tar.bz2 2639915
+RMD160 c4a43c4da53691898872b6114074bf6c874e2a6f xsw-data-2.5.4.tar.bz2 2639915
+SHA256 ac384b2f1784f9f75ce52269348fd229527c86423ecaaee0b4d72cffe05907cc xsw-data-2.5.4.tar.bz2 2639915
diff --git a/games-action/xshipwars/files/xshipwars-2.5.4-build.patch b/games-action/xshipwars/files/xshipwars-2.5.4-build.patch
new file mode 100644
index 000000000000..99a286848a08
--- /dev/null
+++ b/games-action/xshipwars/files/xshipwars-2.5.4-build.patch
@@ -0,0 +1,80 @@
+--- client/Makefile.install.UNIX
++++ client/Makefile.install.UNIX
+@@ -11,9 +11,9 @@
+ #
+ 
+ INSTALL      = install
+-INSTBINFLAGS = -m 0755 -s
++INSTBINFLAGS = -m 0755
+ INSTUIDFLAGS = -m 4755
+-INSTLIBFLAGS = -m 0755 -s
++INSTLIBFLAGS = -m 0755
+ INSTINCFLAGS = -m 0644
+ INSTMANFLAGS = -m 0644
+ INSTCFGFLAGS = -m 0644
+@@ -26,8 +26,10 @@
+ MKDIRFLAGS = -p
+ 
+ 
+-GAMES_DIR   = $(PREFIX)/games
+-XSW_DIR     = $(PREFIX)/share/games/xshipwars
++BINDIR      = $(PREFIX)/games
++GAMES_DIR   = $(DESTDIR)$(BINDIR)
++DATADIR     = $(PREFIX)/share/games
++XSW_DIR     = $(DESTDIR)$(DATADIR)/xshipwars
+ XSW_ETC_DIR = $(XSW_DIR)/etc
+ 
+ XSW_CFG_FILE   = xsw.ini
+--- monitor/Makefile.install.UNIX
++++ monitor/Makefile.install.UNIX
+@@ -27,8 +27,10 @@
+ MKDIR      = mkdir
+ MKDIRFLAGS = -p
+ 
+-GAMES_DIR          = $(PREFIX)/games
+-XSW_DIR            = $(PREFIX)/share/games/xshipwars
++BINDIR             = $(PREFIX)/games
++GAMES_DIR          = $(DESTDIR)$(BINDIR)
++DATADIR            = $(PREFIX)/share/games
++XSW_DIR            = $(DESTDIR)$(DATADIR)/xshipwars
+ MONITOR_IMAGES_DIR = $(XSW_DIR)/images/monitor
+ 
+ HR = "-------------------------------------------------------------------------"
+--- server/Makefile.install.UNIX
++++ server/Makefile.install.UNIX
+@@ -29,7 +29,7 @@
+ MKDIRFLAGS = -p
+ 
+ 
+-SWSERV_BASE_DIR = $(PREFIX)/swserv
++SWSERV_BASE_DIR = $(DESTDIR)$(PREFIX)/swserv
+ 
+ SWSERV_BIN_DIR  = $(SWSERV_BASE_DIR)/bin
+ SWSERV_DB_DIR   = $(SWSERV_BASE_DIR)/db
+--- unvedit/Makefile.install.UNIX
++++ unvedit/Makefile.install.UNIX
+@@ -26,8 +26,10 @@
+ MKDIR      = mkdir
+ MKDIRFLAGS = -p
+ 
+-GAMES_BIN_DIR      = $(PREFIX)/games
+-XSW_DATA_DIR       = $(PREFIX)/share/games/xshipwars
++BINDIR             = $(PREFIX)/games
++GAMES_BIN_DIR      = $(DESTDIR)$(BINDIR)
++DATADIR            = $(PREFIX)/share/games
++XSW_DATA_DIR       = $(DESTDIR)$(DATADIR)/xshipwars
+ UNVEDIT_IMAGES_DIR = $(XSW_DATA_DIR)/images/unvedit
+ 
+ HR = "-------------------------------------------------------------------------"
+*** unvedit/printdlg.cpp	Fri Dec 30 00:44:01 2005
+--- unvedit/printdlg.cpp	Mon Mar  6 15:19:00 2006
+***************
+*** 1,6 ****
+--- 1,7 ----
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
++ #include <unistd.h>
+  
+  #include "../include/string.h"
+  #include "../include/disk.h"
diff --git a/games-action/xshipwars/xshipwars-2.5.4.ebuild b/games-action/xshipwars/xshipwars-2.5.4.ebuild
new file mode 100644
index 000000000000..d6e6471e5f78
--- /dev/null
+++ b/games-action/xshipwars/xshipwars-2.5.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/xshipwars-2.5.4.ebuild,v 1.1 2006/03/22 21:53:03 tupone Exp $
+
+inherit toolchain-funcs eutils games
+
+MY_P=xsw-${PV}
+DESCRIPTION="massively multi-player, ultra graphical, space-oriented gaming system designed exclusively for network play"
+HOMEPAGE="http://wolfpack.twu.net/ShipWars/XShipWars/"
+SRC_URI="http://wolfpack.twu.net/users/wolfpack/${MY_P}.tar.bz2
+	http://wolfpack.twu.net/users/wolfpack/xsw-data-${PV}.tar.bz2
+	http://wolfpack.twu.net/users/wolfpack/stimages-1.9.7.tar.bz2
+	http://wolfpack.twu.net/users/wolfpack/stsounds-1.6.4.tar.bz2"
+
+LICENSE="GPL-2 xshipwars"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="joystick yiff esd"
+
+RDEPEND="|| ( x11-libs/libXpm virtual/x11 )
+	joystick? ( media-libs/libjsw )
+	yiff? ( media-libs/yiff )
+	esd? ( >=media-sound/esound-0.2.23 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	sed -i \
+		-e "/^BINDIR/s:=.*:=${GAMES_BINDIR}:" \
+		-e "/^DATADIR/s:=.*:=${GAMES_DATADIR}:" \
+		*/Makefile.install.UNIX || die
+}
+
+src_compile() {
+	local myconf=" \
+		--disable-debug \
+		--disable-arch-i486 \
+		--disable-arch-i586 \
+		--disable-arch-i686 \
+		--disable-arch-pentiumpro \
+		$(use_enable joystick libjsw) \
+		--enable=debug \
+		--enable-X11 \
+		--enable-libXpm \
+		$(use_enable yiff Y2) \
+		$(use_enable esd ESounD) \
+	"
+	# xsw uses --{en,dis}able=FEATURE syntax
+	myconf=${myconf//able-/able=}
+
+	local x
+	for x in client monitor unvedit ; do #server
+		./configure.${x} Linux --prefix=${GAMES_PREFIX} ${myconf} || die "configure ${x}"
+		emake -j1 -f Makefile.${x} all || die "build ${x}"
+	done
+}
+
+src_install() {
+	local x
+	for x in client monitor unvedit ; do #server
+		make -f Makefile.${x} DESTDIR="${D}" install || die "install ${x}"
+	done
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r "${WORKDIR}"/{etc,images,sounds} || die "doins data"
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	einfo "Before playing, you should get a copy of the installed "
+	einfo "global XShipWars client configuration file and copy it to "
+	einfo "your home directory: "
+	echo
+	einfo "# mkdir ~/.shipwars/"
+	einfo "# cd /usr/share/games/xshipwars/etc/ "
+	einfo "# cp xsw.ini ~/.shipwars/ "
+	einfo "# cp universes ~/.shipwars/universes "
+	echo
+	einfo "You will probably need to edit the xisw.ini to fit your needs."
+	echo
+	einfo "Then type 'xsw &' to start the game"
+	echo
+	einfo "Type 'monitor &' to start the Universe Monitor"
+	einfo "Type 'unvedit &' to start the Universe Editor"
+}