Version bump, bug #206738

Package-Manager: portage-2.1.4

5 files changed, 196 insertions, 5 deletions

diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index a515eeb22c5e..06df8c469e3e 100644
--- a/games-fps/warsow/ChangeLog
+++ b/games-fps/warsow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/warsow
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.13 2008/01/18 03:09:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.14 2008/01/21 15:27:28 nyhm Exp $
+
+*warsow-0.4 (21 Jan 2008)
+
+  21 Jan 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/warsow-0.4-build.patch, +warsow-0.4.ebuild:
+  Version bump, bug #206738
 
   18 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org>
   warsow-0.3.2-r1.ebuild:
diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest
index 116d1444690f..f72c4352392b 100644
--- a/games-fps/warsow/Manifest
+++ b/games-fps/warsow/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX warsow-0.3.2-build.patch 1275 RMD160 f50e15de989d282f8f5af7f09ec744c04e4cdea9 SHA1 bb865fd1c6e542ec01d068e617d7fe81c5eee94b SHA256 da80078e281429c9ccfb7560104f8f1b51dbf4271f6ac88b2bbeae1df3ff5c6e
 MD5 6dcb38f8214396e512768f6a28b5c839 files/warsow-0.3.2-build.patch 1275
 RMD160 f50e15de989d282f8f5af7f09ec744c04e4cdea9 files/warsow-0.3.2-build.patch 1275
@@ -6,17 +9,27 @@ AUX warsow-0.3.2-mapdl.patch 485 RMD160 e5bd4614ff3b71183ba0e8cac0d9631f1e0c2d45
 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
+AUX warsow-0.4-build.patch 1720 RMD160 9a6181acfea494fab37eefaf31a8d19197f88591 SHA1 82555ec5d7f7217f6dc92da7e0d681414c9f00a2 SHA256 4212b21cc58adc3af57c8cfc63313df19c901f760d88a303a7b042975e2a3fa6
+MD5 916ee8175a395e3dcabde26c61ecb93b files/warsow-0.4-build.patch 1720
+RMD160 9a6181acfea494fab37eefaf31a8d19197f88591 files/warsow-0.4-build.patch 1720
+SHA256 4212b21cc58adc3af57c8cfc63313df19c901f760d88a303a7b042975e2a3fa6 files/warsow-0.4-build.patch 1720
 DIST warsow.png 1692 RMD160 098a1505a74a20eb4bdfeda4cf2c537a9524ce23 SHA1 73f0a742940861724bec445a1a582f89d9517dcf SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954
 DIST warsow_0.32_linux.tar.gz 98620461 RMD160 45977b8e2dbfa9c6ed1ee2a7345fb8c5a5ecbbee SHA1 05691ca3aea23de5280b88004a05491339a6eee6 SHA256 e74fe6b66bbb64c43109526f5a30c5488ca020e6caba588e3e40b96e6a4579c3
 DIST warsow_0.32_sdk.zip 19271033 RMD160 a7df07cf92ad8fcc12adeb22346f29df9b3b9e38 SHA1 09a9cb1d231dfdf62dc6249f9faba7760cde2e0f SHA256 0cfb8456d36fee68ce7a0be399219a9ba5dcf65e254d86da308ab05b42dd3f4a
+DIST warsow_0.4_sdk.zip 10844992 RMD160 abe428d0ebc59c2181e7ab557ead95228cf05e85 SHA1 38c266405ec773b18eba431287334047412fdad1 SHA256 76b7e3a3410774c24ed8f78b55fe426e56fff94bef855b788dd2fd73abec6ce2
+DIST warsow_0.4_unified.zip 176202685 RMD160 d9376fbd94efce2d57dced777f541663bbfc29f0 SHA1 ccfa3c8ba20e76837b12c6c6a1e9530c9b587706 SHA256 706d127e7b1a2965ba87a43253cdd085775798b0c32d2814de0405a8f5bf19f3
 EBUILD warsow-0.3.2-r1.ebuild 2621 RMD160 37b05f25dcce62961afbc9c5f704516b74fd2dca SHA1 ee69a2fd7c2155361f02e48c43db3eb51df50f76 SHA256 36ede28c87cb38d2879082b584a99c970f13498c18484b3f37350b1367c924d6
 MD5 6d79906ce1fda0826b165a69c1794ef2 warsow-0.3.2-r1.ebuild 2621
 RMD160 37b05f25dcce62961afbc9c5f704516b74fd2dca warsow-0.3.2-r1.ebuild 2621
 SHA256 36ede28c87cb38d2879082b584a99c970f13498c18484b3f37350b1367c924d6 warsow-0.3.2-r1.ebuild 2621
-MISC ChangeLog 2030 RMD160 6c393ce143e1f40496b8b7938f91e453fa1b8c1e SHA1 75fcc064e8b114e16ae4fe78650f78bf8aac7868 SHA256 6c2ded27e882b41b04168bb5f2c99ae2f45d23c575b29d02bb9c3a64fae11005
-MD5 0208fad64a9a4d07076d1a209c7d4abf ChangeLog 2030
-RMD160 6c393ce143e1f40496b8b7938f91e453fa1b8c1e ChangeLog 2030
-SHA256 6c2ded27e882b41b04168bb5f2c99ae2f45d23c575b29d02bb9c3a64fae11005 ChangeLog 2030
+EBUILD warsow-0.4.ebuild 2771 RMD160 18fe49304800c0a5cc3ce5c8e3a394f9fee75e19 SHA1 6ff10acf826fa060dd53f9925f1a1ed38789221d SHA256 dda6ac13b2b512b118ec970b15efb7e66870fc3f5c691b842a435528ad176145
+MD5 d9783043e3f7a42ba2a2a1cb04f17e5f warsow-0.4.ebuild 2771
+RMD160 18fe49304800c0a5cc3ce5c8e3a394f9fee75e19 warsow-0.4.ebuild 2771
+SHA256 dda6ac13b2b512b118ec970b15efb7e66870fc3f5c691b842a435528ad176145 warsow-0.4.ebuild 2771
+MISC ChangeLog 2182 RMD160 2a9ee38ca446aadc10ce775b308d06b4e6b63b35 SHA1 d232563111ca6a8eb57d96f99d6742da57e18994 SHA256 32135762f2c9313723d4e11aff356133f03b94bcdbd4aed838e6c06c3c84382a
+MD5 16ca77ab1ab910359173fac04d14fe70 ChangeLog 2182
+RMD160 2a9ee38ca446aadc10ce775b308d06b4e6b63b35 ChangeLog 2182
+SHA256 32135762f2c9313723d4e11aff356133f03b94bcdbd4aed838e6c06c3c84382a ChangeLog 2182
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -24,3 +37,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 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
+MD5 a36cf59b94860042f5b29a6278674840 files/digest-warsow-0.4 702
+RMD160 f959bb0250c37bd05b1b3cff1f84b60835dd8ee1 files/digest-warsow-0.4 702
+SHA256 1a00441a9009ee452033e5176ae3e0bc54ecee8854ea8290a6afcd89d81befcf files/digest-warsow-0.4 702
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHlLn0dz7hIScOURERAkquAKC7NBRjL1JsmqbbtzQ8o4vnWg/YMgCfYa0m
+UJYCgFhGoBRex4fmHn7SpEI=
+=i2k2
+-----END PGP SIGNATURE-----
diff --git a/games-fps/warsow/files/digest-warsow-0.4 b/games-fps/warsow/files/digest-warsow-0.4
new file mode 100644
index 000000000000..ed1c623146f4
--- /dev/null
+++ b/games-fps/warsow/files/digest-warsow-0.4
@@ -0,0 +1,9 @@
+MD5 d5eac4a33b3543dbc40d984b84e657f8 warsow.png 1692
+RMD160 098a1505a74a20eb4bdfeda4cf2c537a9524ce23 warsow.png 1692
+SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954 warsow.png 1692
+MD5 f4c9dd0683374c6b12b61723b4f7e647 warsow_0.4_sdk.zip 10844992
+RMD160 abe428d0ebc59c2181e7ab557ead95228cf05e85 warsow_0.4_sdk.zip 10844992
+SHA256 76b7e3a3410774c24ed8f78b55fe426e56fff94bef855b788dd2fd73abec6ce2 warsow_0.4_sdk.zip 10844992
+MD5 fcf88aeada971a108895eb5480005c49 warsow_0.4_unified.zip 176202685
+RMD160 d9376fbd94efce2d57dced777f541663bbfc29f0 warsow_0.4_unified.zip 176202685
+SHA256 706d127e7b1a2965ba87a43253cdd085775798b0c32d2814de0405a8f5bf19f3 warsow_0.4_unified.zip 176202685
diff --git a/games-fps/warsow/files/warsow-0.4-build.patch b/games-fps/warsow/files/warsow-0.4-build.patch
new file mode 100644
index 000000000000..4ccbd31c68d3
--- /dev/null
+++ b/games-fps/warsow/files/warsow-0.4-build.patch
@@ -0,0 +1,43 @@
+--- Makefile
++++ Makefile
+@@ -108,9 +108,9 @@
+ LOCALBASE?=/usr/local
+ X11BASE?=/usr/X11R6
+ 
+-CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall
+-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
+-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
++CFLAGS_COMMON=$(CFLAGS) -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -fno-strict-aliasing
++CFLAGS_RELEASE=-DNDEBUG
++CFLAGS_DEBUG=-D_DEBUG
+ ifeq ($(DEBUG_BUILD),YES)
+ CFLAGS_COMMON+=$(CFLAGS_DEBUG)
+ else
+@@ -125,7 +125,7 @@
+ ifeq ($(OS),FreeBSD)
+ LDFLAGS_COMMON=-L/usr/local/lib -lm
+ else
+-LDFLAGS_COMMON=-L/usr/local/lib -ldl -lm
++LDFLAGS_COMMON=$(LDFLAGS) -ldl -lm
+ endif
+ 
+ ifeq ($(ARCH),x86_64)
+@@ -353,15 +353,15 @@
+ 
+ all: client openal qf ded cgame game ui irc tv_server
+ 
+-client: $(BUILDDIRS) message-client compile-client link-client start-script-client
++client: $(BUILDDIRS) message-client compile-client link-client
+ openal: $(BUILDDIRS) message-openal compile-openal link-openal
+ qf: $(BUILDDIRS) message-qf compile-qf link-qf
+-ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded
++ded: $(BUILDDIRS) message-ded compile-ded link-ded
+ cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame
+ game: $(BUILDDIRS) message-game compile-game link-game
+ ui: $(BUILDDIRS) message-ui compile-ui link-ui
+ irc: $(BUILDDIRS) message-irc compile-irc link-irc
+-tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server start-script-tv_server
++tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server
+ 
+ clean: clean-msg clean-depend clean-client clean-openal clean-qf clean-ded clean-cgame clean-game clean-ui clean-irc clean-tv_server
+ 
diff --git a/games-fps/warsow/warsow-0.4.ebuild b/games-fps/warsow/warsow-0.4.ebuild
new file mode 100644
index 000000000000..55673dfbfc2d
--- /dev/null
+++ b/games-fps/warsow/warsow-0.4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.4.ebuild,v 1.1 2008/01/21 15:27:28 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://qc-net.com/wsw/${MY_P}_unified.zip
+	http://qc-net.com/wsw/${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} ) )"
+UIDEPEND="x11-proto/xineramaproto
+	x11-proto/xf86dgaproto
+	x11-proto/xf86vidmodeproto"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	x11-misc/makedepend
+	opengl? ( ${UIDEPEND} )
+	!opengl? ( !dedicated? ( ${UIDEPEND} ) )"
+
+S=${WORKDIR}/${MY_P}_src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \
+		qcommon/files.c \
+		|| die "sed files.c failed"
+
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	yesno() { use ${1} && echo YES || echo NO ; }
+
+	local client="NO" irc="NO" openal="NO"
+	if use opengl || ! use dedicated ; then
+		client="YES"
+		use irc && irc="YES"
+		use openal && openal="YES"
+	fi
+
+	emake \
+		BUILD_CLIENT=${client} \
+		BUILD_SERVER=$(yesno dedicated) \
+		BUILD_TV_SERVER=$(yesno dedicated) \
+		BUILD_IRC=${irc} \
+		BUILD_SND_OPENAL=${openal} \
+		BUILD_SND_QF=${client} \
+		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"
+		newgamesbin wswtv_server.* ${PN}-tv || die "newgamesbin ${PN}-tv failed"
+	fi
+
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe */*.so || die "doexe failed"
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r "${WORKDIR}"/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}"/docs/*
+	prepgamesdirs
+}