Version bump

Package-Manager: portage-2.1.3_rc6

5 files changed, 176 insertions, 8 deletions

diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index 2bc952f1c6ec..0336c6dbf34b 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.5 2007/05/20 23:46:31 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.6 2007/06/29 22:33:34 nyhm Exp $
+
+*warsow-0.3.1 (29 Jun 2007)
+
+  29 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/warsow-0.3.1-build.patch, +warsow-0.3.1.ebuild:
+  Version bump
 
   20 May 2007; Tristan Heaven <nyhm@gentoo.org> warsow-0.3.ebuild:
   Fix for missing sound modules, bug #179281
diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest
index 421d9eaf1e96..b0f377d3fa87 100644
--- a/games-fps/warsow/Manifest
+++ b/games-fps/warsow/Manifest
@@ -5,17 +5,27 @@ AUX warsow-0.3-build.patch 1275 RMD160 f50e15de989d282f8f5af7f09ec744c04e4cdea9
 MD5 6dcb38f8214396e512768f6a28b5c839 files/warsow-0.3-build.patch 1275
 RMD160 f50e15de989d282f8f5af7f09ec744c04e4cdea9 files/warsow-0.3-build.patch 1275
 SHA256 da80078e281429c9ccfb7560104f8f1b51dbf4271f6ac88b2bbeae1df3ff5c6e files/warsow-0.3-build.patch 1275
+AUX warsow-0.3.1-build.patch 1275 RMD160 f50e15de989d282f8f5af7f09ec744c04e4cdea9 SHA1 bb865fd1c6e542ec01d068e617d7fe81c5eee94b SHA256 da80078e281429c9ccfb7560104f8f1b51dbf4271f6ac88b2bbeae1df3ff5c6e
+MD5 6dcb38f8214396e512768f6a28b5c839 files/warsow-0.3.1-build.patch 1275
+RMD160 f50e15de989d282f8f5af7f09ec744c04e4cdea9 files/warsow-0.3.1-build.patch 1275
+SHA256 da80078e281429c9ccfb7560104f8f1b51dbf4271f6ac88b2bbeae1df3ff5c6e files/warsow-0.3.1-build.patch 1275
 DIST warsow.png 1692 RMD160 098a1505a74a20eb4bdfeda4cf2c537a9524ce23 SHA1 73f0a742940861724bec445a1a582f89d9517dcf SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954
+DIST warsow_0.31_linux.tar.gz 92611004 RMD160 fa1dfab5797e25cf52821491858cf3d62e98e013 SHA1 0e4cc49255bb33ae5a07a79662d2ca350f8ca18e SHA256 69c4a6464c3132240d50f9ad39a7521ebadee0c113b5f09fc3a4ace1a048e5eb
+DIST warsow_0.31_sdk.zip 17903715 RMD160 8187d62ca7b581ef71e0d5f27194058e58aa71ed SHA1 27175a12f8b88f3a2c7ef998a551c10fae54e94d SHA256 83df0b458cabebc742de042b8649a695d23b07a611a8215cbca907d6eae64db0
 DIST warsow_0.3_linux.tar.gz 82709062 RMD160 001e715c0d338525b14d9f87fd205652f8491e9d SHA1 eeb4b3c91e9d086cd9ccb04214f4ad29e7bedff5 SHA256 170ebe80dba2065bd18047146aa98ef4bc7194b3d94a4064f6f66f7c95a1b671
 DIST warsow_0.3_sdk.zip 11273935 RMD160 17e7f244170c0daf8f9c2797a3ceb8a168adac7c SHA1 04e0d9cde1b4d4479eea3d27376faa74a49c1281 SHA256 8ee39f81894df0db00d70801f675b7ab906857bda9a58fcb3841e8f3b604347f
+EBUILD warsow-0.3.1.ebuild 2522 RMD160 14ff730ed8b44818324500645e2aad4d603d2c56 SHA1 f461b977b20797670eaf8163ae93e64a02ad1e91 SHA256 d1b83edd19dfc762aedb04d296a849d8e29e5629349001195cdfbe09cfc4a0d5
+MD5 d9550f1b6e7abc03d49f8e27170fedb6 warsow-0.3.1.ebuild 2522
+RMD160 14ff730ed8b44818324500645e2aad4d603d2c56 warsow-0.3.1.ebuild 2522
+SHA256 d1b83edd19dfc762aedb04d296a849d8e29e5629349001195cdfbe09cfc4a0d5 warsow-0.3.1.ebuild 2522
 EBUILD warsow-0.3.ebuild 2469 RMD160 f7b1a50038b433982d0913ddf768c6900e0de894 SHA1 224ca794d54a20c9152e1fced75b358649e66f2d SHA256 5de373f4ed807cff487c028357a962dcd4011c663456ab9acae6d924dfc76a54
 MD5 41f49e4366c701b08681e3c68f1a719a warsow-0.3.ebuild 2469
 RMD160 f7b1a50038b433982d0913ddf768c6900e0de894 warsow-0.3.ebuild 2469
 SHA256 5de373f4ed807cff487c028357a962dcd4011c663456ab9acae6d924dfc76a54 warsow-0.3.ebuild 2469
-MISC ChangeLog 922 RMD160 7987402843e575c871d5bd280b3e21c041185296 SHA1 789adfee1e6800851d2ed07f3c79057d2614ae52 SHA256 818aa98e58d22948967b53d993976c58e59b8d6f3118309b260b24fbfead0067
-MD5 c0d2d5d108eb6722e0f57376ef675ad7 ChangeLog 922
-RMD160 7987402843e575c871d5bd280b3e21c041185296 ChangeLog 922
-SHA256 818aa98e58d22948967b53d993976c58e59b8d6f3118309b260b24fbfead0067 ChangeLog 922
+MISC ChangeLog 1072 RMD160 7c7b19d72bfd5b113346630fd3e4f4885f16006b SHA1 3939c9e0d2f5c580642ee4e780147ab7bf25e1ff SHA256 d1de7bad9550fe94000189992a1399360493a0ad9e7d15488e465aea3a2bed48
+MD5 1303e11aaa99b2e5b912350508aa77c7 ChangeLog 1072
+RMD160 7c7b19d72bfd5b113346630fd3e4f4885f16006b ChangeLog 1072
+SHA256 d1de7bad9550fe94000189992a1399360493a0ad9e7d15488e465aea3a2bed48 ChangeLog 1072
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -23,10 +33,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 a37aed05a7825afdd6e752d530f61301 files/digest-warsow-0.3 702
 RMD160 e3158083208e54d0109967ba2911d9b3b09ea87e files/digest-warsow-0.3 702
 SHA256 ca3d0b0d2d25a468fd8e84c3428316fb23ab74ab5c837f7f9c9801aa55dffcb6 files/digest-warsow-0.3 702
+MD5 3a3b38159dc422b473c6a831a0c26d80 files/digest-warsow-0.3.1 708
+RMD160 9cfd3369e8be7cce2128e50573c2d1d035d6d0fc files/digest-warsow-0.3.1 708
+SHA256 5be7cda32290dc9a7f6fb5247f13cdde70498dd69d3af640459b11c8617ff2a6 files/digest-warsow-0.3.1 708
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGUN3kdz7hIScOURERAuxDAKCOYTZXhGkjEZ+ic3xIY0gtl1s12gCgrM+2
-+sYR1wHgv6eqLoe7T9eLU1E=
-=uwxp
+iD8DBQFGhYjTdz7hIScOURERApANAKCy4Rh5NBEjnrOomhV1+/ThkvTwaQCfZnqZ
+nLo04cuRUt682QGIM9k6NSM=
+=pAux
 -----END PGP SIGNATURE-----
diff --git a/games-fps/warsow/files/digest-warsow-0.3.1 b/games-fps/warsow/files/digest-warsow-0.3.1
new file mode 100644
index 000000000000..da9815e2f496
--- /dev/null
+++ b/games-fps/warsow/files/digest-warsow-0.3.1
@@ -0,0 +1,9 @@
+MD5 d5eac4a33b3543dbc40d984b84e657f8 warsow.png 1692
+RMD160 098a1505a74a20eb4bdfeda4cf2c537a9524ce23 warsow.png 1692
+SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954 warsow.png 1692
+MD5 74fc786f3a983d82b6ea37868c76a148 warsow_0.31_linux.tar.gz 92611004
+RMD160 fa1dfab5797e25cf52821491858cf3d62e98e013 warsow_0.31_linux.tar.gz 92611004
+SHA256 69c4a6464c3132240d50f9ad39a7521ebadee0c113b5f09fc3a4ace1a048e5eb warsow_0.31_linux.tar.gz 92611004
+MD5 10b684718f7108e7eca42d5ddde3d5e3 warsow_0.31_sdk.zip 17903715
+RMD160 8187d62ca7b581ef71e0d5f27194058e58aa71ed warsow_0.31_sdk.zip 17903715
+SHA256 83df0b458cabebc742de042b8649a695d23b07a611a8215cbca907d6eae64db0 warsow_0.31_sdk.zip 17903715
diff --git a/games-fps/warsow/files/warsow-0.3.1-build.patch b/games-fps/warsow/files/warsow-0.3.1-build.patch
new file mode 100644
index 000000000000..86510a42de7a
--- /dev/null
+++ b/games-fps/warsow/files/warsow-0.3.1-build.patch
@@ -0,0 +1,37 @@
+--- source/Makefile
++++ source/Makefile
+@@ -100,9 +100,9 @@
+ LOCALBASE?=/usr/local
+ X11BASE?=/usr/X11R6
+ 
+-CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -Wall
+-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
+-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
++CFLAGS_COMMON=$(CFLAGS) -I. -fno-strict-aliasing -Wall
++CFLAGS_RELEASE=-DNDEBUG
++CFLAGS_DEBUG=-D_DEBUG
+ ifeq ($(DEBUG_BUILD),YES)
+ CFLAGS_COMMON+=$(CFLAGS_DEBUG)
+ else
+@@ -116,7 +116,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)
+@@ -287,10 +287,10 @@
+ 
+ all: client openal qf ded cgame game ui irc
+ 
+-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
diff --git a/games-fps/warsow/warsow-0.3.1.ebuild b/games-fps/warsow/warsow-0.3.1.ebuild
new file mode 100644
index 000000000000..317ecfe3219d
--- /dev/null
+++ b/games-fps/warsow/warsow-0.3.1.ebuild
@@ -0,0 +1,103 @@
+# 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.1.ebuild,v 1.1 2007/06/29 22:33:34 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://k3rmit.org/wsw/${MY_P}_linux.tar.gz
+	http://k3rmit.org/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} ) )"
+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
+}
+
+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
+}