Revision bump with upstream patch

(Portage version: 2.1.2-r11)

6 files changed, 45 insertions, 176 deletions

diff --git a/games-fps/alienarena/ChangeLog b/games-fps/alienarena/ChangeLog
index 3a6fa0fad3ed..8024b6d41997 100644
--- a/games-fps/alienarena/ChangeLog
+++ b/games-fps/alienarena/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/alienarena
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.1 2007/02/25 10:15:30 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.2 2007/02/26 07:06:24 nyhm Exp $
+
+*alienarena-20070224-r1 (26 Feb 2007)
+
+  26 Feb 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/alienarena-20070224-gamedir.patch, +alienarena-20070224-r1.ebuild:
+  Revision bump with upstream patch
 
 *alienarena-20070224 (25 Feb 2007)
 
diff --git a/games-fps/alienarena/alienarena-20070224.ebuild b/games-fps/alienarena/alienarena-20070224-r1.ebuild
index 05d4951dea77..f9c61c27acbb 100644
--- a/games-fps/alienarena/alienarena-20070224.ebuild
+++ b/games-fps/alienarena/alienarena-20070224-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20070224.ebuild,v 1.2 2007/02/25 18:35:14 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20070224-r1.ebuild,v 1.1 2007/02/26 07:06:24 nyhm Exp $
 
 inherit eutils flag-o-matic toolchain-funcs games
 
@@ -42,15 +42,19 @@ src_unpack() {
 	epatch \
 		"${FILESDIR}"/${P}-build.patch \
 		"${FILESDIR}"/${P}-paths.patch \
-		"${FILESDIR}"/${P}-exec-stack.patch
+		"${FILESDIR}"/${P}-exec-stack.patch \
+		"${FILESDIR}"/${P}-gamedir.patch
+	sed -i \
+		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
+		-e "s:GENTOO_LIBDIR:${GAMES_LIBDIR}/${PN}:" \
+		source/linux/sys_linux.c \
+		|| die "sed failed"
 }
 
 src_compile() {
 	[[ $(gcc-fullversion) == "4.1.1" ]] && replace-flags -O? -O0
 	emake \
 		CC="$(tc-getCC)" \
-		GENTOO_LIBDIR="${GAMES_LIBDIR}"/${PN} \
-		GENTOO_DATADIR="${GAMES_DATADIR}"/${PN} \
 		$(use sdl && echo SDLSOUND=1) \
 		$(use opengl || use sdl && echo BUILD_ARENA=1) \
 		$(use opengl || use sdl || use dedicated || echo BUILD_ARENA=1) \
@@ -59,24 +63,24 @@ src_compile() {
 }
 
 src_install() {
-	cd build
+	cd debug
 	exeinto "${GAMES_LIBDIR}"/${PN}
-	doexe arena/game.so || die "doexe failed"
+	doexe game.so || die "doexe failed"
 
 	if (use opengl || use sdl) || use opengl || use sdl || ! use dedicated ; then
-		newgamesbin crx ${PN}-oss || die "newgamesbin crx failed"
+		newgamesbin crx. ${PN}-oss || die "newgamesbin crx failed"
 		make_desktop_entry ${PN}-oss "Alien Arena (OSS audio)" ${PN}.xpm
 		use sdl || dosym ${PN}-oss "${GAMES_BINDIR}"/${PN}
 	fi
 
 	if use sdl ; then
-		newgamesbin crx.sdl ${PN}-sdl || die "newgamesbin crx.sdl failed"
+		newgamesbin crx.sdl. ${PN}-sdl || die "newgamesbin crx.sdl failed"
 		make_desktop_entry ${PN}-sdl "Alien Arena (SDL audio)" ${PN}.xpm
 		dosym ${PN}-sdl "${GAMES_BINDIR}"/${PN}
 	fi
 
 	if use dedicated ; then
-		newgamesbin crded ${PN}-ded || die "newgamesbin crded failed"
+		newgamesbin crded. ${PN}-ded || die "newgamesbin crded failed"
 	fi
 
 	cd "${WORKDIR}"/${MY_PN}
diff --git a/games-fps/alienarena/files/alienarena-20070224-build.patch b/games-fps/alienarena/files/alienarena-20070224-build.patch
index 6f42ab9028b2..562701922bff 100644
--- a/games-fps/alienarena/files/alienarena-20070224-build.patch
+++ b/games-fps/alienarena/files/alienarena-20070224-build.patch
@@ -1,35 +1,34 @@
 --- source/linux/Makefile
 +++ source/linux/Makefile
-@@ -28,7 +28,8 @@
+@@ -25,6 +25,7 @@
+ endif
+ endif
+ NOARCH=noarch
++ARCH=
  
  MOUNT_DIR=..
  
--BUILD_DEBUG_DIR=debug$(ARCH)
-+BUILDDIR=build
-+BUILD_DEBUG_DIR=$(BUILDDIR)
- BUILD_RELEASE_DIR=release$(ARCH)
- CLIENT_DIR=$(MOUNT_DIR)/client
- SERVER_DIR=$(MOUNT_DIR)/server
 @@ -50,7 +51,7 @@
  _LIB := lib
  endif
  
 -BASE_CFLAGS=-Dstricmp=strcasecmp -D_stricmp=strcasecmp -D__linux__
-+CFLAGS+=-Dstricmp=strcasecmp -D_stricmp=strcasecmp -D__linux__
++BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D__linux__
  
  ifeq ($(ARCH),axp)
  RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
-@@ -79,8 +80,7 @@
+@@ -79,8 +80,8 @@
  
  ARENA_CFLAGS=-DARENA
  
 -DEBUG_CFLAGS=$(BASE_CFLAGS) -g
 -LDFLAGS=-ldl -lm
++DEBUG_CFLAGS=$(BASE_CFLAGS) -fno-strict-aliasing
 +LDFLAGS+=-ldl -lm
  SVGALDFLAGS=-lvga -lm
  XLDFLAGS=-L/usr/X11R6/$(_LIB) -lX11 -lXext -lXxf86dga
  XCFLAGS=
-@@ -120,24 +120,27 @@
+@@ -120,10 +121,13 @@
  	$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
  	$(BUILDDIR)/arena/game$(ARCH).$(SHLIBEXT)
  else
@@ -37,157 +36,13 @@
 -	$(BUILDDIR)/crx.$(ARCH) \
 -	$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
 -	$(BUILDDIR)/arena/game$(ARCH).$(SHLIBEXT)
-+TARGETS=$(BUILDDIR)/arena/game.so
++TARGETS=$(BUILDDIR)/game$(ARCH).$(SHLIBEXT)
 +ifeq ($(BUILD_ARENA),1)
-+TARGETS+=$(BUILDDIR)/crx
++TARGETS+=$(BUILDDIR)/crx.$(ARCH)
 +endif
 +ifeq ($(BUILD_DED),1)
-+TARGETS+=$(BUILDDIR)/crded
++TARGETS+=$(BUILDDIR)/crded.$(ARCH)
 +endif
  endif
  
  ifeq ($(strip $(SDLSOUND)),1)
--	TARGETS+=$(BUILDDIR)/crx.sdl.$(ARCH)
-+	TARGETS+=$(BUILDDIR)/crx.sdl
- endif
- 
--build_debug:
-+targets: mkdirs $(TARGETS)
-+mkdirs:
- 	@-mkdir $(BUILD_DEBUG_DIR) \
- 		$(BUILD_DEBUG_DIR)/client \
- 		$(BUILD_DEBUG_DIR)/ded \
- 		$(BUILD_DEBUG_DIR)/ref_gl \
- 		$(BUILD_DEBUG_DIR)/game \
- 		$(BUILD_DEBUG_DIR)/arena
--	$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)"
- 
- build_release:
- 	@-mkdir $(BUILD_RELEASE_DIR) \
-@@ -150,7 +153,6 @@
- 
- all: build_debug build_release
- 
--targets: $(TARGETS)
- 
- #############################################################################
- # CLIENT/SERVER
-@@ -242,14 +244,14 @@
- endif
- 
- 
--$(BUILDDIR)/crx.$(ARCH) : $(CODERED_OBJS) $(SOUND_OSS_OBJS) $(CODERED_AS_OBJS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
-+$(BUILDDIR)/crx : $(CODERED_OBJS) $(SOUND_OSS_OBJS) $(CODERED_AS_OBJS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
- 	$(CC) $(CFLAGS) -o $@ $(CODERED_OBJS) $(SOUND_OSS_OBJS) $(CODERED_AS_OBJS) $(LDFLAGS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
- 
--$(BUILDDIR)/crx.sdl.$(ARCH) : $(CODERED_OBJS) $(SOUND_SDL_OBJS) $(CODERED_AS_OBJS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
-+$(BUILDDIR)/crx.sdl : $(CODERED_OBJS) $(SOUND_SDL_OBJS) $(CODERED_AS_OBJS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
- 	$(CC) $(CFLAGS) -o $@ $(CODERED_OBJS) $(SOUND_SDL_OBJS) $(CODERED_AS_OBJS) $(LDFLAGS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS) $(SDLLDFLAGS)
- 
- $(BUILDDIR)/client/cl_cin.o :     $(CLIENT_DIR)/cl_cin.c
--	$(DO_CC)
-+	$(DO_CC) -fno-strict-aliasing
- 
- $(BUILDDIR)/client/cl_ents.o :    $(CLIENT_DIR)/cl_ents.c
- 	$(DO_CC)
-@@ -291,13 +293,13 @@
- 	$(DO_CC)
- 
- $(BUILDDIR)/client/menu.o :       $(CLIENT_DIR)/menu.c
--	$(DO_CC)
-+	$(DO_CC) -fno-strict-aliasing
- 
- $(BUILDDIR)/client/snd_dma.o :    $(CLIENT_DIR)/snd_dma.c
- 	$(DO_CC)
- 
- $(BUILDDIR)/client/snd_mem.o :    $(CLIENT_DIR)/snd_mem.c
--	$(DO_CC)
-+	$(DO_CC) -fno-strict-aliasing
- 
- $(BUILDDIR)/client/snd_mix.o :    $(CLIENT_DIR)/snd_mix.c
- 	$(DO_CC)
-@@ -306,10 +308,10 @@
- 	$(DO_CC)
- 
- $(BUILDDIR)/client/cmd.o :        $(COMMON_DIR)/cmd.c
--	$(DO_CC)
-+	$(DO_CC) -fno-strict-aliasing
- 
- $(BUILDDIR)/client/cmodel.o :     $(COMMON_DIR)/cmodel.c
--	$(DO_CC)
-+	$(DO_CC) -fno-strict-aliasing
- 
- $(BUILDDIR)/client/common.o :     $(COMMON_DIR)/common.c
- 	$(DO_CC)
-@@ -354,7 +356,7 @@
- 	$(DO_CC)
- 
- $(BUILDDIR)/client/sv_user.o :    $(SERVER_DIR)/sv_user.c
--	$(DO_CC)
-+	$(DO_CC) -fno-strict-aliasing
- 
- $(BUILDDIR)/client/sv_world.o :   $(SERVER_DIR)/sv_world.c
- 	$(DO_CC)
-@@ -405,7 +407,7 @@
- 	$(DO_GL_SHLIB_CC)
- 
- $(BUILDDIR)/ref_gl/r_script.o :       $(REF_GL_DIR)/r_script.c
--	$(DO_GL_SHLIB_CC)
-+	$(DO_GL_SHLIB_CC) -fno-strict-aliasing
- 
- $(BUILDDIR)/ref_gl/r_surf.o :       $(REF_GL_DIR)/r_surf.c
- 	$(DO_GL_SHLIB_CC)
-@@ -414,7 +416,7 @@
- 	$(DO_GL_SHLIB_CC)
- 
- $(BUILDDIR)/ref_gl/r_image.o :       $(REF_GL_DIR)/r_image.c
--	$(DO_GL_SHLIB_CC)
-+	$(DO_GL_SHLIB_CC) -fno-strict-aliasing
- 
- $(BUILDDIR)/ref_gl/r_mesh.o :        $(REF_GL_DIR)/r_mesh.c
- 	$(DO_GL_SHLIB_CC)
-@@ -478,14 +480,14 @@
- 	$(BUILDDIR)/ded/cl_null.o \
- 	$(BUILDDIR)/ded/cd_null.o
- 
--$(BUILDDIR)/crded.$(ARCH) : $(CRDED_OBJS)
-+$(BUILDDIR)/crded : $(CRDED_OBJS)
- 	$(CC) $(CFLAGS) -o $@ $(CRDED_OBJS) $(LDFLAGS)
- 
- $(BUILDDIR)/ded/cmd.o :        $(COMMON_DIR)/cmd.c
--	$(DO_DED_CC)
-+	$(DO_DED_CC) -fno-strict-aliasing
- 
- $(BUILDDIR)/ded/cmodel.o :     $(COMMON_DIR)/cmodel.c
--	$(DO_DED_CC)
-+	$(DO_DED_CC) -fno-strict-aliasing
- 
- $(BUILDDIR)/ded/common.o :     $(COMMON_DIR)/common.c
- 	$(DO_DED_CC)
-@@ -530,7 +532,7 @@
- 	$(DO_DED_CC)
- 
- $(BUILDDIR)/ded/sv_user.o :    $(SERVER_DIR)/sv_user.c
--	$(DO_DED_CC)
-+	$(DO_DED_CC) -fno-strict-aliasing
- 
- $(BUILDDIR)/ded/sv_world.o :   $(SERVER_DIR)/sv_world.c
- 	$(DO_DED_CC)
-@@ -597,7 +599,7 @@
- 
- 
- 
--$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) : $(GAME_OBJS)
-+$(BUILDDIR)/game.so : $(GAME_OBJS)
- 	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
- 
- 
-@@ -753,7 +755,7 @@
- 	$(BUILDDIR)/arena/p_weapon.o \
- 	$(BUILDDIR)/arena/vehicles.o
- 
--$(BUILDDIR)/arena/game$(ARCH).$(SHLIBEXT) : $(ARENA_OBJS)
-+$(BUILDDIR)/arena/game.so : $(ARENA_OBJS)
- 	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(ARENA_OBJS)
- 
- 
diff --git a/games-fps/alienarena/files/alienarena-20070224-gamedir.patch b/games-fps/alienarena/files/alienarena-20070224-gamedir.patch
new file mode 100644
index 000000000000..97fc8dd0ad1a
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-20070224-gamedir.patch
@@ -0,0 +1,11 @@
+--- source/qcommon/files.c
++++ source/qcommon/files.c
+@@ -1019,6 +1019,8 @@
+ 	fs_gamedirvar = Cvar_Get ("game", "", CVAR_LATCH|CVAR_SERVERINFO);
+ 	if (fs_gamedirvar->string[0])
+ 		FS_SetGamedir (fs_gamedirvar->string);
++	else
++		FS_SetGamedir ("arena");
+ }
+ 
+ 
diff --git a/games-fps/alienarena/files/alienarena-20070224-paths.patch b/games-fps/alienarena/files/alienarena-20070224-paths.patch
index 2acbb2dd5ef2..121c9f39f66c 100644
--- a/games-fps/alienarena/files/alienarena-20070224-paths.patch
+++ b/games-fps/alienarena/files/alienarena-20070224-paths.patch
@@ -1,10 +1,3 @@
---- source/linux/Makefile
-+++ source/linux/Makefile
-@@ -1,3 +1,4 @@
-+CFLAGS+=-DGENTOO_DATADIR=\"$(GENTOO_DATADIR)\" -DGENTOO_LIBDIR=\"$(GENTOO_LIBDIR)\"
- #
- # CodeRED Makefile
- #
 --- source/linux/sys_linux.c
 +++ source/linux/sys_linux.c
 @@ -217,6 +217,8 @@
@@ -29,7 +22,7 @@
  		if (!path)
  			return NULL;		// couldn't find one anywhere
 -		snprintf (name, MAX_OSPATH, "%s/%s", path, gamename);
-+		snprintf (name, MAX_OSPATH, "%s/%s", GENTOO_LIBDIR, gamename);
++		snprintf (name, MAX_OSPATH, "%s/%s", "GENTOO_LIBDIR", gamename);
  
  		/* skip it if it just doesn't exist */
  		fp = fopen(name, "rb");
@@ -37,7 +30,7 @@
  	saved_euid = geteuid();
  	seteuid(getuid());
  
-+	chdir(GENTOO_DATADIR);
++	chdir("GENTOO_DATADIR");
  	Qcommon_Init(argc, argv);
  
  	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
diff --git a/games-fps/alienarena/files/digest-alienarena-20070224 b/games-fps/alienarena/files/digest-alienarena-20070224-r1
index 0c122c10025d..0c122c10025d 100644
--- a/games-fps/alienarena/files/digest-alienarena-20070224
+++ b/games-fps/alienarena/files/digest-alienarena-20070224-r1