Version bump

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 150 insertions, 7 deletions

diff --git a/games-fps/alienarena/ChangeLog b/games-fps/alienarena/ChangeLog
index a6165ae94213..8375ccacdb45 100644
--- a/games-fps/alienarena/ChangeLog
+++ b/games-fps/alienarena/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/alienarena
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.12 2008/12/22 17:20:30 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.13 2009/06/21 09:29:31 nyhm Exp $
+
+*alienarena-20090616 (21 Jun 2009)
+
+  21 Jun 2009; Tristan Heaven <nyhm@gentoo.org> +alienarena-20090616.ebuild,
+  +files/alienarena-20090616-path-overflows.patch:
+  Version bump
 
 *alienarena-20081016 (22 Dec 2008)
 
diff --git a/games-fps/alienarena/Manifest b/games-fps/alienarena/Manifest
index 641ab25a46a1..c8058fa8304c 100644
--- a/games-fps/alienarena/Manifest
+++ b/games-fps/alienarena/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX alienarena-20090616-path-overflows.patch 1169 RMD160 6fed6af2125c61ba2c89db391bee1a39e5fa5eb6 SHA1 da22480ae66f5a31acf041e518d5237aedf1d27d SHA256 dc2b94b866d368db9422686419eda1a5a9aed1c046eb68cffc14f7b60ae2f6fe
 DIST alienarena2008-linux20080603.zip 254018226 RMD160 adbe89706a74af7aa3484b9abecf9f50e179cece SHA1 ba81c19b7262fa36f51be86db7c0df50bd9d529a SHA256 d26c5b3a68a0975a3adf43cfa297a684121ca382057efc601411f53303972f39
 DIST alienarena2008-linux20081016.zip 269084804 RMD160 65111ab6ac2a82efb045b39425cbf8a7eab1c1e2 SHA1 16cc5e40a0966489e902c53d7f779df04d670017 SHA256 50d69489495d561f7f15754b6cd6cdf3037521d11c21bb851be8c4d5132c3f26
+DIST alienarena2009-linux20090616.zip 285213913 RMD160 c2d23bfe52cdecbcd9c8ae253570418490b5f62b SHA1 e3ec358f1e2eac4662bfe7524c53a0e023388816 SHA256 b8f70a9da31fe7fa30d8d571bb9f60b210f0691ae2e27439c1ae89da71ed8d28
 EBUILD alienarena-20080603.ebuild 2429 RMD160 733fcd7bcbd4d870d83603bca57694f36fa8d3eb SHA1 e55c8f48b697cf1c09f47e9fd462eba72bfb76c5 SHA256 ca7f7d8c05c4e93fc17a09bdb695dc670623e4ae9b1914cc1fe42e8f6abe1591
 EBUILD alienarena-20081016.ebuild 2398 RMD160 b4712fb0646c059c673aab881ded4822b3dad9c9 SHA1 7198fc6bcf48050256d788e4e781967e6fe2b3bc SHA256 b34fd6fb5af9000fe902674399ed82619064c7338a59df63bcd87c5f3e7546bf
-MISC ChangeLog 2253 RMD160 018a7522f7d5a2c77919668c9b7666fda356f93f SHA1 0fb4374ec11ee8ebe04be240b44013be2c6c87ac SHA256 a9749825e66e5b1da498fadf32f07b4c27e4927bedc8a32e549f09c5e973f1d6
+EBUILD alienarena-20090616.ebuild 2184 RMD160 138d082ad52834a5b538e7ffe9d9243bf861ab89 SHA1 f538c01535d55a39fc1796649bbf01428756f35f SHA256 c61de0ddbfdd02f133e5b22f3837f0fd6e46d5d6ccca9f33f0492aca21e07e5f
+MISC ChangeLog 2433 RMD160 fb467a441778a87bd64d30cbfc9c4ea079f3692b SHA1 f029e8ed40a1806559331432d7c3644739d70432 SHA256 cc68774c1c3e7646d00d809671cf34f01a28337fcd214145777c6b34f29485b3
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAklPzpgACgkQdz7hIScOUREa9wCeINVVeAfL/dl43Ptf80+4+wwg
-G6kAn0hk3SEuiVSFDJcDy+BQ7YSH+NFF
-=Ffy2
+iEYEARECAAYFAko9/ZwACgkQdz7hIScOURF4HgCg6IcSmzPVkE3M2k2j4vQPO711
+K34An3C/IHSrypAOaIUgQgmdf7udzRRU
+=Phom
 -----END PGP SIGNATURE-----
diff --git a/games-fps/alienarena/alienarena-20090616.ebuild b/games-fps/alienarena/alienarena-20090616.ebuild
new file mode 100644
index 000000000000..696d7ceaff79
--- /dev/null
+++ b/games-fps/alienarena/alienarena-20090616.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20090616.ebuild,v 1.1 2009/06/21 09:29:31 nyhm Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs games
+
+MY_PN=${PN}${PV:0:4}
+DESCRIPTION="Fast-paced multiplayer deathmatch game"
+HOMEPAGE="http://red.planetarena.org/"
+SRC_URI="http://icculus.org/${PN}/Files/${MY_PN}-linux${PV}.zip"
+
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="" # ~amd64 ~x86
+IUSE="dedicated opengl"
+
+UIRDEPEND="media-libs/jpeg
+	media-libs/openal
+	media-libs/libvorbis
+	virtual/glu
+	virtual/opengl
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm"
+RDEPEND="opengl? ( ${UIRDEPEND} )
+	!opengl? ( !dedicated? ( ${UIRDEPEND} ) )
+	net-misc/curl"
+UIDEPEND="x11-proto/xf86dgaproto
+	x11-proto/xf86vidmodeproto"
+DEPEND="${RDEPEND}
+	opengl? ( ${UIDEPEND} )
+	!opengl? ( !dedicated? ( ${UIDEPEND} ) )
+	dev-util/pkgconfig
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_PN}/source
+
+src_prepare() {
+	rm -f ../*/*.so
+	epatch "${FILESDIR}"/${P}-path-overflows.patch
+}
+
+src_compile() {
+	emake \
+		ARCH="unknown" \
+		OSTYPE="linux" \
+		CC="$(tc-getCC)" \
+		OPTIMIZED_CFLAGS=no \
+		WITH_DATADIR=yes \
+		WITH_LIBDIR=yes \
+		DATADIR="${GAMES_DATADIR}"/${PN} \
+		LIBDIR="$(games_get_libdir)"/${PN} \
+		$(use opengl && ! use dedicated && echo BUILD=CLIENT) \
+		$(! use opengl && use dedicated && echo BUILD=DEDICATED) \
+		$(use opengl && use dedicated && echo BUILD=ALL) \
+		$(use opengl || use dedicated || echo BUILD=CLIENT) \
+		|| die "emake failed"
+}
+
+src_install() {
+	cd release
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe game.so || die "doexe failed"
+	dosym . "$(games_get_libdir)"/${PN}/arena
+	dosym . "$(games_get_libdir)"/${PN}/data1
+
+	if use opengl || ! use dedicated ; then
+		newgamesbin crx ${PN} || die "newgamesbin crx failed"
+		make_desktop_entry ${PN} "Alien Arena"
+	fi
+
+	if use dedicated ; then
+		newgamesbin crded ${PN}-ded || die "newgamesbin crded failed"
+	fi
+
+	cd "${WORKDIR}"/${MY_PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r arena botinfo data1 || die "doins failed"
+	newicon aa.png ${PN}.png || die "newicon failed"
+	dodoc docs/README.txt
+
+	prepgamesdirs
+}
diff --git a/games-fps/alienarena/files/alienarena-20090616-path-overflows.patch b/games-fps/alienarena/files/alienarena-20090616-path-overflows.patch
new file mode 100644
index 000000000000..3d8aba46c3cb
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-20090616-path-overflows.patch
@@ -0,0 +1,51 @@
+--- source/game/acesrc/acebot_nodes.c
++++ source/game/acesrc/acebot_nodes.c
+@@ -719,7 +719,7 @@
+ void ACEND_SaveNodes()
+ {
+ 	FILE *pOut;
+-	char filename[60];
++	char filename[MAX_OSPATH];
+ 	int i,j;
+ 	int version = 1;
+ 	
+@@ -760,7 +760,7 @@
+ {
+ 	FILE *pIn;
+ 	int i,j;
+-	char filename[60];
++	char filename[MAX_OSPATH];
+ 	int version;
+ 
+ 	strcpy(filename,BOTDIR"/botinfo/nav/");
+--- source/game/acesrc/acebot_spawn.c
++++ source/game/acesrc/acebot_spawn.c
+@@ -119,7 +119,7 @@
+ 	int i, j, count, spawnkicknum;

+ 	char *info;

+ 	char *skin;

+-	char bot_filename[128];

++	char bot_filename[MAX_OSPATH];

+ 	int found;

+ 	int real_players, total_players;

+ 	edict_t *cl_ent;

+@@ -226,7 +226,7 @@
+ {

+     FILE *pIn;

+ 	int count;

+-	char bot_filename[128];

++	char bot_filename[MAX_OSPATH];

+ 

+ 	//bots and configurations are loaded level specific

+ 	if (((int)(dmflags->value) & DF_SKINTEAMS) || ctf->value || tca->value || cp->value)

+--- source/ref_gl/r_model.c
++++ source/ref_gl/r_model.c
+@@ -1689,7 +1689,7 @@
+ 

+ void R_BeginRegistration (char *model)

+ {

+-	char	fullname[MAX_QPATH];

++	char	fullname[MAX_OSPATH];

+  	char    *path;

+ 	cvar_t	*flushmap;

+ 	FILE	*file;