Patch from Torben Hohn to fix map downloading, bug #193963

Package-Manager: portage-2.1.3.11

5 files changed, 151 insertions, 9 deletions

diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index 2355870e7dc4..32910264ba23 100644
--- a/games-fps/warsow/ChangeLog
+++ b/games-fps/warsow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/warsow
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.9 2007/09/06 12:53:44 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.10 2007/10/02 12:58:24 nyhm Exp $
+
+*warsow-0.3.2-r1 (02 Oct 2007)
+
+  02 Oct 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/warsow-0.3.2-mapdl.patch, +warsow-0.3.2-r1.ebuild:
+  Patch from Torben Hohn to fix map downloading, bug #193963
 
   06 Sep 2007; Tristan Heaven <nyhm@gentoo.org>
   +files/warsow-0.3.2-build.patch:
diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest
index 2938e589b92b..cb731c1b23d9 100644
--- a/games-fps/warsow/Manifest
+++ b/games-fps/warsow/Manifest
@@ -9,6 +9,10 @@ AUX warsow-0.3.2-build.patch 1275 RMD160 f50e15de989d282f8f5af7f09ec744c04e4cdea
 MD5 6dcb38f8214396e512768f6a28b5c839 files/warsow-0.3.2-build.patch 1275
 RMD160 f50e15de989d282f8f5af7f09ec744c04e4cdea9 files/warsow-0.3.2-build.patch 1275
 SHA256 da80078e281429c9ccfb7560104f8f1b51dbf4271f6ac88b2bbeae1df3ff5c6e files/warsow-0.3.2-build.patch 1275
+AUX warsow-0.3.2-mapdl.patch 485 RMD160 e5bd4614ff3b71183ba0e8cac0d9631f1e0c2d45 SHA1 4cf39f057a64d41afccdb0d23a05c915654b1dc8 SHA256 264983d5d75cbe5fef39481d72b23a7d0fd3d70c599010a29a51b334c15198ae
+MD5 0c128364132994a146e96595da8278de files/warsow-0.3.2-mapdl.patch 485
+RMD160 e5bd4614ff3b71183ba0e8cac0d9631f1e0c2d45 files/warsow-0.3.2-mapdl.patch 485
+SHA256 264983d5d75cbe5fef39481d72b23a7d0fd3d70c599010a29a51b334c15198ae files/warsow-0.3.2-mapdl.patch 485
 DIST BEClient_x64.so 83017 RMD160 284183448dcc17cb9ef93eb88e51bf5e600bd5ec SHA1 69a5056c90fe93028b8bb3ef8306cb00948bbea6 SHA256 72bbfe20a1c60762ab7565cf442e1ebf8e6aa54d143517e3930b4fdd8d6468d6
 DIST BEServer_x64.so 86257 RMD160 22fc6af041ffa05ff9a690d85b4eee0577acf0f4 SHA1 b1c8dd867ca2fcc201f8b4a58429b5d3b6e73195 SHA256 f4a6e63b74e822c1e624dd42ca9ef889012216b40c50ed77e05616823e5e4048
 DIST warsow.png 1692 RMD160 098a1505a74a20eb4bdfeda4cf2c537a9524ce23 SHA1 73f0a742940861724bec445a1a582f89d9517dcf SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954
@@ -20,14 +24,18 @@ EBUILD warsow-0.3.1-r1.ebuild 3200 RMD160 d8a9dd004d7b84a195c20650e2271bc02e5003
 MD5 0a6f9ef807acdc94ee396178de424301 warsow-0.3.1-r1.ebuild 3200
 RMD160 d8a9dd004d7b84a195c20650e2271bc02e5003ed warsow-0.3.1-r1.ebuild 3200
 SHA256 16e5dbe4aca3e5d3abfb064e43a1a01e6a3248fd30d2ccdc13ce7f2f743d3658 warsow-0.3.1-r1.ebuild 3200
+EBUILD warsow-0.3.2-r1.ebuild 2594 RMD160 dc52595fba873304667afa0db7a7a4450769cb7d SHA1 62855cdb5770b071010d50bc7dd8f24465168d8a SHA256 d095f7c5b0ab9e4413146c2d98c1874e3c4d0595a7fe24c96d011ceb9e739077
+MD5 1b20e0faa9870b673b2c238efc42674e warsow-0.3.2-r1.ebuild 2594
+RMD160 dc52595fba873304667afa0db7a7a4450769cb7d warsow-0.3.2-r1.ebuild 2594
+SHA256 d095f7c5b0ab9e4413146c2d98c1874e3c4d0595a7fe24c96d011ceb9e739077 warsow-0.3.2-r1.ebuild 2594
 EBUILD warsow-0.3.2.ebuild 2552 RMD160 e5b953640fc4415819ca55ed369211e476606d60 SHA1 71122f8da7a34d55717b5409d88147b068bb0354 SHA256 297aeb5fe006691e16178a3a90ad222c535ffc77407db8a8ea9ee70478abe063
 MD5 811de204ad7a4a66e068f18e6097be9c warsow-0.3.2.ebuild 2552
 RMD160 e5b953640fc4415819ca55ed369211e476606d60 warsow-0.3.2.ebuild 2552
 SHA256 297aeb5fe006691e16178a3a90ad222c535ffc77407db8a8ea9ee70478abe063 warsow-0.3.2.ebuild 2552
-MISC ChangeLog 1475 RMD160 6e41af53ece85c52be234db0e690cd2109b1c090 SHA1 563538ba6ea1cb7ccc9eb6237119a643f7dd3ce3 SHA256 a48ed521b3610f6ad485854d71d0c813509ba093ca929312236a0d3babbdae30
-MD5 eb957a1032d5e7334427596eee5306b8 ChangeLog 1475
-RMD160 6e41af53ece85c52be234db0e690cd2109b1c090 ChangeLog 1475
-SHA256 a48ed521b3610f6ad485854d71d0c813509ba093ca929312236a0d3babbdae30 ChangeLog 1475
+MISC ChangeLog 1678 RMD160 71b91b954376ad00b590cc1785a3c0e56267d130 SHA1 18df2e775659410ab20a1b007b57598a3174d0cf SHA256 f9480734326f09f0783ad29804cfe875310d2e8da05cb119b2b4c29c700b72ee
+MD5 949bb5691e04e9a201864398d8025339 ChangeLog 1678
+RMD160 71b91b954376ad00b590cc1785a3c0e56267d130 ChangeLog 1678
+SHA256 f9480734326f09f0783ad29804cfe875310d2e8da05cb119b2b4c29c700b72ee ChangeLog 1678
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -38,10 +46,13 @@ SHA256 0afa8bfec308e98a1f6344af9f317e8a7b700ff4d242006fce8d90d0eae817bf files/di
 MD5 84084e17c464ed798557a770f8d0d457 files/digest-warsow-0.3.2 708
 RMD160 7dcf3ffcc6444d5c73a976fb3e5b65c92d1e9275 files/digest-warsow-0.3.2 708
 SHA256 b4b110a4aff420911f0acd62735c38bd16a5ee375c4a3cbd119933fdb7015d77 files/digest-warsow-0.3.2 708
+MD5 84084e17c464ed798557a770f8d0d457 files/digest-warsow-0.3.2-r1 708
+RMD160 7dcf3ffcc6444d5c73a976fb3e5b65c92d1e9275 files/digest-warsow-0.3.2-r1 708
+SHA256 b4b110a4aff420911f0acd62735c38bd16a5ee375c4a3cbd119933fdb7015d77 files/digest-warsow-0.3.2-r1 708
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG3/hvdz7hIScOURERAsSvAKDt2Bv84Nj7FjsFnnv+/NPHqPScrQCfWj0c
-PpteKUClukmk4W4Fdb2ztT4=
-=7CKZ
+iD8DBQFHAkB8dz7hIScOURERAr5bAKDF9gZdHXWECVjno3/mDWaErnCpJwCfRwxG
+aaAnmigpigEmwtP53MDgSGg=
+=O3t9
 -----END PGP SIGNATURE-----
diff --git a/games-fps/warsow/files/digest-warsow-0.3.2-r1 b/games-fps/warsow/files/digest-warsow-0.3.2-r1
new file mode 100644
index 000000000000..418d17c9c04f
--- /dev/null
+++ b/games-fps/warsow/files/digest-warsow-0.3.2-r1
@@ -0,0 +1,9 @@
+MD5 d5eac4a33b3543dbc40d984b84e657f8 warsow.png 1692
+RMD160 098a1505a74a20eb4bdfeda4cf2c537a9524ce23 warsow.png 1692
+SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954 warsow.png 1692
+MD5 508fa64b6157b3f5ebed09e9e715ec43 warsow_0.32_linux.tar.gz 98620461
+RMD160 45977b8e2dbfa9c6ed1ee2a7345fb8c5a5ecbbee warsow_0.32_linux.tar.gz 98620461
+SHA256 e74fe6b66bbb64c43109526f5a30c5488ca020e6caba588e3e40b96e6a4579c3 warsow_0.32_linux.tar.gz 98620461
+MD5 551b7a0cebd0c02968ce86fb12cd86b7 warsow_0.32_sdk.zip 19271033
+RMD160 a7df07cf92ad8fcc12adeb22346f29df9b3b9e38 warsow_0.32_sdk.zip 19271033
+SHA256 0cfb8456d36fee68ce7a0be399219a9ba5dcf65e254d86da308ab05b42dd3f4a warsow_0.32_sdk.zip 19271033
diff --git a/games-fps/warsow/files/warsow-0.3.2-mapdl.patch b/games-fps/warsow/files/warsow-0.3.2-mapdl.patch
new file mode 100644
index 000000000000..fcbe76597119
--- /dev/null
+++ b/games-fps/warsow/files/warsow-0.3.2-mapdl.patch
@@ -0,0 +1,11 @@
+--- warsow-0.32/warsow_0.32/source/qcommon/files.c	2007-08-07 17:47:31.000000000 +0200
++++ warsow-0.32.fixed/warsow_0.32/source/qcommon/files.c	2007-09-27 04:42:09.000000000 +0200
+@@ -2277,7 +2277,7 @@
+ 	if( !fullname )

+ 		return qfalse;

+ 

+-	pakfile = FS_LoadPK3File( filename, qtrue );

++	pakfile = FS_LoadPK3File( fullname, qtrue );

+ 	if( pakfile ) {		// unlock and free, we don't need this file anyway

+ 		if( pakfile->sysHandle )

+ 			Sys_FS_UnlockFile( pakfile->sysHandle );

diff --git a/games-fps/warsow/warsow-0.3.2-r1.ebuild b/games-fps/warsow/warsow-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..36342789dd7f
--- /dev/null
+++ b/games-fps/warsow/warsow-0.3.2-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.3.2-r1.ebuild,v 1.1 2007/10/02 12:58:24 nyhm Exp $
+
+inherit eutils toolchain-funcs versionator games
+
+MY_P=${PN}_$(delete_version_separator 2)
+DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
+HOMEPAGE="http://www.warsow.net/"
+SRC_URI="http://www.megami.de/warsow/releases/${MY_P}_linux.tar.gz
+	http://www.megami.de/warsow/releases/${MY_P}_sdk.zip
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dedicated irc openal opengl"
+
+UIRDEPEND="media-libs/jpeg
+	media-libs/libvorbis
+	media-libs/libsdl
+	net-misc/curl
+	virtual/opengl
+	x11-libs/libXinerama
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+	openal? ( media-libs/openal )"
+RDEPEND="opengl? ( ${UIRDEPEND} )
+	!opengl? ( !dedicated? ( ${UIRDEPEND} ) )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	x11-misc/makedepend"
+
+S=${WORKDIR}/${MY_P}/source
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -f "${WORKDIR}"/${PN}/docs/gnu.txt
+
+	sed -i \
+		-e '/fs_usehomedir =/ s:0:1:' \
+		-e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \
+		qcommon/files.c \
+		|| die "sed files.c failed"
+
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-mapdl.patch
+}
+
+src_compile() {
+	yesno() { use ${1} && echo YES || echo NO ; }
+
+	if use opengl || ! use dedicated ; then
+		local client="YES"
+	else
+		local client="NO"
+	fi
+
+	emake \
+		BUILD_CLIENT=${client} \
+		BUILD_SERVER=$(yesno dedicated) \
+		BUILD_IRC=$(yesno irc) \
+		BUILD_SND_OPENAL=$(yesno openal) \
+		DEBUG_BUILD=$(yesno debug) \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		|| die "emake failed"
+}
+
+src_install() {
+	cd release
+
+	if use opengl || ! use dedicated ; then
+		newgamesbin ${PN}.* ${PN} || die "newgamesbin ${PN} failed"
+		doicon "${DISTDIR}"/${PN}.png
+		make_desktop_entry ${PN} Warsow
+	fi
+
+	if use dedicated ; then
+		newgamesbin wsw_server.* ${PN}-ded || die "newgamesbin ${PN}-ded failed"
+	fi
+
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe */*.so || die "doexe failed"
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r "${WORKDIR}"/${PN}/basewsw || die "doins failed"
+
+	local so
+	for so in basewsw/*.so ; do
+		dosym "$(games_get_libdir)"/${PN}/${so##*/} \
+			"${GAMES_DATADIR}"/${PN}/${so} || die "dosym ${so} failed"
+	done
+
+	dodir "${GAMES_DATADIR}"/${PN}/libs
+	for so in libs/*.so ; do
+		dosym "$(games_get_libdir)"/${PN}/${so##*/} \
+			"${GAMES_DATADIR}"/${PN}/${so} || die "dosym ${so} failed"
+	done
+
+	dodoc "${WORKDIR}"{/${PN},}/docs/*
+	prepgamesdirs
+}