version bump wrt #349349

Package-Manager: portage-2.2.0_alpha103/cvs/Linux x86_64

4 files changed, 673 insertions, 2 deletions

diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index 423d73a04ba0..7c78f1610132 100644
--- a/games-fps/warsow/ChangeLog
+++ b/games-fps/warsow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/warsow
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.30 2012/05/03 03:23:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.31 2012/05/11 16:46:51 hasufell Exp $
+
+*warsow-0.62 (11 May 2012)
+
+  11 May 2012; Julian Ospald <hasufell@gentoo.org> +warsow-0.62.ebuild,
+  +files/warsow-0.62-build.patch:
+  version bump wrt #349349
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> warsow-0.5-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest
index 67e8fa310462..451cef02d57e 100644
--- a/games-fps/warsow/Manifest
+++ b/games-fps/warsow/Manifest
@@ -1,9 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX warsow-0.5-build.patch 2995 RMD160 18edaf6577496dc6a843fa92c249a78b25d50b93 SHA1 1a0c7a720c617b0b6bea76231440e63b94895139 SHA256 cbd7ddbfa45e12644f33a910dc453ff3b7d60a5e9e1dc14b71fb818e8bbd0e8c
 AUX warsow-0.5-openal.patch 304 RMD160 58055a1197ce0569e7ece3bdaa671928421e0fe1 SHA1 ed06409b5b6bf48ab63f23ce2ac031f7e7123d70 SHA256 6eb943201d4c5d6b8a902cda4efc75ea6ce6c8849d5ea10b39e12650c810d4df
 AUX warsow-0.5-pic.patch 377 RMD160 e10f5d8c31859f229de3bb96765df5f609f55ebc SHA1 fc11b52f092ae34da859823ea1d064969d9b97a2 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5b76e1e8e0b75f5ece3782
+AUX warsow-0.62-build.patch 13571 RMD160 e4719e22c6cd7d2c09bfda7649ce830276340e64 SHA1 4ae012a4c42e18a3e7ad6edc821af310e0d1756c SHA256 91fbc52cb1a4827631663a12d8e7f67bfb811bbee82b8970a4be85a6f97429cb
 DIST warsow.png 1692 RMD160 098a1505a74a20eb4bdfeda4cf2c537a9524ce23 SHA1 73f0a742940861724bec445a1a582f89d9517dcf SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954
 DIST warsow_0.5_sdk.zip 34213675 RMD160 eb92f0e9e83f3ff1a8bdd44c7648bb4bebb26756 SHA1 faa58805b0aedfb5b44e35cd21384088314d2be3 SHA256 35cc937b4b38659df803d84f6b3fd6e9d5a5480ecadb4b642d991b99e3401f05
 DIST warsow_0.5_unified.zip 256768515 RMD160 eb93e0c2b08465b98fcd27ac309a1575476ad875 SHA1 71b9b9b43578ad2ccc9b73fe5435dd018faf7772 SHA256 66ac784277def8d90a8368d44e7ca72cd1d3a50b63cee4ad7c3e102cf16f5100
+DIST warsow_0.61_unified.zip 473053649 RMD160 0b9b6e4da4da3d0c9a73d1f6ceb6226ed3e5a364 SHA1 d694c188c730e10a1c1f4528ab4098587e571d00 SHA256 fbabfd3e531ce5371fb5e8cd5113ed7606d5c89e6c52ec083bf178aa1bd9abac
+DIST warsow_0.62_sdk.zip 36600605 RMD160 76234125c349e22e5c21b03a38a0e369b4f85702 SHA1 c3f71e75a325cf7cb5047797365ff4ff228403af SHA256 e1a86c355307539b8f427a76fc54e7279f39567a9eb570accd8ad74f4bf96159
+DIST warsow_0.62_update.zip 11553787 RMD160 b7948747123e3ca1025b07e7e04ba4cbf488e717 SHA1 9eeb0ea853e63daf45ae35af8e8937d4e610ae7f SHA256 d16309bfc39929a47efe71d5dd28a790c16a7de07232f68fc9672407bebda278
 EBUILD warsow-0.5-r1.ebuild 3292 RMD160 7bf2f998f866971d6dc631bb4ede2eee6415e443 SHA1 07b43658a3fcb3ba1c7ebb097a284ac13a14b3b8 SHA256 dbe7d8fc4b921c5d8bdb50d8b1c93fcb5c849a49ce098ebaa57a7ae43ca1ea70
-MISC ChangeLog 4438 RMD160 a0c2facbff960d6c20871e28c10f3877f9609a4b SHA1 abe60792345aaf5b7723a032166f36d67aa0e722 SHA256 a8ae9a0784ec66bf194c20d564bc162fd08d4494bbb2b4d3faaf7801aaaee1df
+EBUILD warsow-0.62.ebuild 3444 RMD160 0b557a81b584fa98986ce8a17f739bf034be26f6 SHA1 a246466ba69878d5ad0dfa5b9ed112c08a73d666 SHA256 641c556c6a4816d11bb513744527a4899e507d97bbc10947ae8c97bcc3b58595
+MISC ChangeLog 4602 RMD160 1a7914531ffad6244e157628c21066b6c117891f SHA1 5e9bbd41403de0b7e3aac56218f38d770ddabe36 SHA256 176989c0d7728a3b62c4d768e2006e9bd9f57bb4c651cfadcc3c8eb5e3eceebf
 MISC metadata.xml 287 RMD160 78042c7cef987a054185106e0d002716402ec9e0 SHA1 ab38f2b4bec87f92ab5465438f029b6ba4e03c3a SHA256 f48eacb17b39a68ff1f05cd10b43aa703b9b9f0edc1fc67848f7918ecce3876d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPrUIIAAoJEFpvPKfnPDWz0/0IAK5V+nk+6rwnc1rrvvzVWPSR
+xegZ2fNuERppxu3SdaYFfvZsDM63qMvoM9WERy6ZeoClq6QhAU5LXlbnfIdwmNEo
+ZBpH72rts7QRaMuxEHdegtMHwCEUEntMN9cHv+WnHFutiwMFTwL5WomQ5dmqOAZz
+CO1dhrMu/LFmWOz+jNi3oVuad1XmniQ2qzjjwq4199cdkHPHjfvQzuVHLTRt4wSw
+uMkFlVPTjYi+yHWNrStb0FgOd03sN2KCMMu9ZDbiT2IHdgzetkfSHdwGY3ezahDe
+hchpdp6fbx22GHRLorbnSRTIuPBwgvRe0QgFf9RlaDT3ihS34/2eiGgFxlLfOFg=
+=duwH
+-----END PGP SIGNATURE-----
diff --git a/games-fps/warsow/files/warsow-0.62-build.patch b/games-fps/warsow/files/warsow-0.62-build.patch
new file mode 100644
index 000000000000..8c55d3871d63
--- /dev/null
+++ b/games-fps/warsow/files/warsow-0.62-build.patch
@@ -0,0 +1,504 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri May 11 11:57:40 UTC 2012
+Subject: fix build system
+
+source/Makefile:
+a) respect flags/linker
+b) don't take ARCH from env (we set BASE_ARCH in the ebuild)
+c) split LDFLAGS and LDFLAGS_COMMON as per bug
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650
+d) don't remove angel-lib (compilation fails, why is this?)
+e) make output verbose
+f) remove start-scripts
+
+source/matchmaker/Makefile:
+respect flags/linker
+
+libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile:
+a) add -fno-strict-aliasing
+  see https://bugs.gentoo.org/show_bug.cgi?id=285448
+b) correct CXX
+
+--- source/Makefile
++++ source/Makefile
+@@ -48,9 +48,9 @@
+ else
+ CC?=gcc
+ CXX?=g++
+-LD=gcc
+-AR=ar
+-RANLIB=ranlib
++LD=$(CC)
++AR?=ar
++RANLIB=?ranlib
+ 
+ # this nice line comes from the linux kernel makefile
+ BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
+@@ -59,7 +59,7 @@
+ ifeq ($(OS),FreeBSD)
+ ARCH?=freebsd_$(BASE_ARCH)
+ else
+-ARCH?=$(BASE_ARCH)
++ARCH=$(BASE_ARCH)
+ endif
+ 
+ SHARED_LIBRARY_EXTENSION=so
+@@ -69,7 +69,7 @@
+ 
+ ifeq ($(DEBUG_BUILD), YES)
+ BINDIR=debug
+-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG 
++CFLAGS_DEBUG=-D_DEBUG 
+ else
+ BINDIR=release
+ endif
+@@ -166,9 +166,9 @@
+ LOCALBASE?=/usr/local
+ X11BASE?=/usr/X11R6
+ 
+-CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function
+-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
+-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
++CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function
++CFLAGS_RELEASE=-fno-strict-aliasing -DNDEBUG
++CFLAGS_DEBUG=-D_DEBUG
+ ifeq ($(DEBUG_BUILD),YES)
+ CFLAGS_COMMON+=$(CFLAGS_DEBUG)
+ else
+@@ -180,14 +180,14 @@
+ CFLAGS_MODULE=-DPIC -fPIC
+ CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
+ 
+-LDFLAGS_COMMON=$(LDFLAGS)
++LDFLAGS_COMMON=
+ ifeq ($(OS),FreeBSD)
+ LDFLAGS_COMMON+= -L/usr/local/lib -lm -pthread
+ else
+-LDFLAGS_COMMON+= -L/usr/local/lib -ldl -lm -Wl -O1 --as-needed
++LDFLAGS_COMMON+= -ldl -lm
+ endif
+ ifneq ($(DEBUG_BUILD),YES)
+-LDFLAGS_COMMON+= -s
++LDFLAGS_COMMON+= 
+ endif
+ 
+ ifeq ($(ARCH),x86_64)
+@@ -203,7 +203,7 @@
+ 
+ # openal
+ ifeq ($(BUILD_SND_OPENAL),YES)
+-OPENAL_CONFIG?=pkg-config openal
++OPENAL_CONFIG?=$(shell pkg-config openal)
+ 
+ CFLAGS_OPENAL=$(shell $(OPENAL_CONFIG) --cflags)
+ LDFLAGS_OPENAL=-lvorbisfile
+@@ -252,12 +252,9 @@
+ ######################################################################################################
+ # Helper functions
+ ######################################################################################################
+-DO_CC=echo "  > Compiling $<" && \
+-	$(CC) $(CFLAGS_COMMON) -c $< -o $@
+-DO_CXX=echo "  > Compiling (c++) $<" && \
+-	$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
+-DO_RES=echo "  > Compiling resource $<" && \
+-	$(RES) $(RESFLAGS_COMMON) -i $< -o $@
++DO_CC=$(CC) $(CFLAGS_COMMON) -c $< -o $@
++DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
++DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@
+ 
+ DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
+ DO_CC_DED=$(DO_CC) $(CFLAGS_DED)
+@@ -477,16 +474,16 @@
+ 
+ all: client openal qf ded cgame game ui irc angelwrap 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
+ angelwrap: $(BUILDDIRS) message-angelwrap compile-angelwrap link-angelwrap
+-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-angelwrap clean-tv_server
+ 
+@@ -604,7 +601,6 @@
+ 	@echo "> *********************************************************"
+ 	@echo "> * Building angelwrap"
+ 	@echo "> *********************************************************"
+-	-@rm $(ANGELSCRIPT_LIB)
+ $(ANGELSCRIPT_INC)/angelscript.h:
+ 	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ 	@echo "!!!"
+@@ -650,64 +646,53 @@
+ # DED
+ ########
+ $(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
+ 
+ #########
+ # CLIENT
+ #########
+ ifeq ($(OS),Darwin)
+ $(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
++	$(LD) $(LDFLAGS) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
+ else
+ $(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
++	$(LD) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
+ endif
+ 
+ #########
+ # OPENAL
+ #########
+ $(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL) $(DEF_SND_OPENAL)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL) $(DEF_SND_OPENAL)
+ 
+ #########
+ # QF
+ #########
+ $(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF) $(DEF_SND_QF)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF) $(DEF_SND_QF)
+ 
+ ########
+ # .SO
+ ########
+ $(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_CGAME)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_CGAME)
+ 
+ $(BINDIR)/basewsw/game_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_GAME)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_GAME)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_GAME)
+ 
+ $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_UI)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_UI)
+ 
+ $(BINDIR)/libs/irc_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_IRC)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_IRC)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_IRC)
+ 
+ $(BINDIR)/libs/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP)
+-	@echo "  > Linking $@" && \
+-	$(CXX) -o $@ $^ $(LDFLAGS_ANGELWRAP) $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_ANGELWRAP)
++	$(CXX) $(LDFLAGS) -o $@ $^ $(LDFLAGS_ANGELWRAP) $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(DEF_ANGELWRAP)
+ ########
+ # TV
+ ########
+ $(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
+ 
+ ######################################################################################################
+ # Meta Rules
+@@ -719,49 +704,48 @@
+ # CLIENT
+ ########
+ $(BUILDDIR)/client/%.o: qcommon/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: server/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: client/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: ref_gl/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: null/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: matchmaker/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ ifeq ($(USE_MINGW),YES)
+ $(BUILDDIR)/client/%.o: win32/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: win32/%.rc
+-	@$(DO_RES_CLIENT)
++	$(DO_RES_CLIENT)
+ else
+ ifeq ($(OS),Darwin)
+ $(BUILDDIR)/client/%.o: mac/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ $(BUILDDIR)/client/%.o: unix/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ else
+ $(BUILDDIR)/client/%.o: unix/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ endif
+ endif
+ 
+ $(BUILDDIR)/client/%.o: game/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: gameshared/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 	
+ $(BINDIR)/warsow: unix/start_script.sh
+-	@echo "  > Installing client start script" && \
+ 	cp $< $@ && \
+ 	chmod a+x $@
+ 
+@@ -769,60 +753,59 @@
+ # OPENAL
+ ########
+ $(BUILDDIR)/openal/%.o: snd_openal/%.c
+-	@$(DO_CC_MODULE) $(CFLAGS_OPENAL)
++	$(DO_CC_MODULE) $(CFLAGS_OPENAL)
+ 
+ $(BUILDDIR)/openal/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ ########
+ # QF
+ ########
+ $(BUILDDIR)/qf/%.o: snd_qf/%.c
+-	@$(DO_CC_MODULE) $(CFLAGS_QF)
++	$(DO_CC_MODULE) $(CFLAGS_QF)
+ 
+ ifeq ($(USE_MINGW),YES)
+ $(BUILDDIR)/qf/win_snd.o: win32/win_snd.c
+-	@$(DO_CC_MODULE) $(CFLAGS_DSOUND)
++	$(DO_CC_MODULE) $(CFLAGS_DSOUND)
+ else
+ $(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c
+-	@$(DO_CC_MODULE) $(CFLAGS_SDL)
++	$(DO_CC_MODULE) $(CFLAGS_SDL)
+ endif
+ 
+ $(BUILDDIR)/qf/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ 
+ ########
+ # DED
+ ########
+ $(BUILDDIR)/ded/%.o: qcommon/%.c 
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: server/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ ifeq ($(USE_MINGW),YES)
+ $(BUILDDIR)/ded/%.o: win32/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ else
+ $(BUILDDIR)/ded/%.o: unix/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ endif
+ 
+ $(BUILDDIR)/ded/%.o: null/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: game/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: gameshared/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 	
+ $(BUILDDIR)/ded/%.o: matchmaker/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BINDIR)/wsw_server: unix/start_script.sh
+-	@echo "  > Installing dedicated server start script" && \
+ 	cp $< $@ && \
+ 	chmod a+x $@
+ 
+@@ -830,91 +813,90 @@
+ # CGAME
+ ########
+ $(BUILDDIR)/cgame/%.o: cgame/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/cgame/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ ########
+ # GAME
+ ########
+ $(BUILDDIR)/game/%.o: game/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/game/%.o: game/ai/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/game/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ ########
+ # UI
+ ########
+ $(BUILDDIR)/ui/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/ui/%.o: ui.old/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/ui/%.o: ui.old/%.cpp
+-	@$(DO_CXX_MODULE)
++	$(DO_CXX_MODULE)
+ 
+ $(BUILDDIR)/ui/%.o: matchmaker/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ ########
+ # IRC
+ ########
+ $(BUILDDIR)/irc/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/irc/%.o: irc/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ ########
+ # ANGELWRAP
+ ########
+ $(BUILDDIR)/angelwrap/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
++	$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
+ 
+ $(BUILDDIR)/angelwrap/%.o: angelwrap/%.c
+-	@$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
++	$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
+ 
+ $(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
++	$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
+ 
+ 
+ ########
+ # TV SERVER
+ ########
+ $(BUILDDIR)/tv_server/%.o: qcommon/%.c 
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ 
+ $(BUILDDIR)/tv_server/%.o: client/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ 
+ $(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ 
+ $(BUILDDIR)/tv_server/%.o: tv_server/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ 
+ ifeq ($(USE_MINGW),YES)
+ $(BUILDDIR)/tv_server/%.o: win32/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ else
+ $(BUILDDIR)/tv_server/%.o: unix/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ endif
+ 
+ $(BUILDDIR)/tv_server/%.o: null/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ 
+ $(BUILDDIR)/tv_server/%.o: gameshared/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ 
+ $(BINDIR)/wswtv_server: unix/start_script.sh
+-	@echo "  > Installing TV server start script" && \
+ 	cp $< $@ && \
+ 	chmod a+x $@
+ 
+--- source/matchmaker/Makefile
++++ source/matchmaker/Makefile
+@@ -9,7 +9,7 @@
+ DEBUG_BUILD?=YES
+ 
+ CC?=gcc
+-LD=gcc
++LD=$(CC)
+ RM?=rm
+ 
+ BUILDDIR=build$(ARCH)
+@@ -26,9 +26,9 @@
+ CFLAGS_MM=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall
+ 
+ ifeq ($(DEBUG_BUILD),YES)
+-CFLAGS_MM += -O0 -ggdb -D_DEBUG
++CFLAGS_MM += -D_DEBUG
+ else
+-CFLAGS_MM += -O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
++CFLAGS_MM += -fno-strict-aliasing -DNDEBUG
+ endif
+ 
+ CFLAGS_MM+=-DDEDICATED_ONLY -DMATCHMAKER -DC_ONLY
+--- libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
++++ libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
+@@ -12,10 +12,10 @@
+ INCDIR = ../../include
+ OBJDIR = obj
+ 
+-CXX ?= gcc
++CXX ?= g++
+ AR ?= ar
+ RANLIB ?= ranlib
+-CXXFLAGS_AS = $(CXXFLAGS) -g -Wall -fPIC
++CXXFLAGS_AS = $(CXXFLAGS) -Wall -fPIC -fno-strict-aliasing
+ DELETER = rm -f
+ COPIER = cp
+ 
diff --git a/games-fps/warsow/warsow-0.62.ebuild b/games-fps/warsow/warsow-0.62.ebuild
new file mode 100644
index 000000000000..286c6fa91d95
--- /dev/null
+++ b/games-fps/warsow/warsow-0.62.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.62.ebuild,v 1.1 2012/05/11 16:46:51 hasufell Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs versionator games
+
+MY_P=${PN}_${PV}
+BASE_P=${PN}_0.61
+DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
+HOMEPAGE="http://www.warsow.net/"
+SRC_URI="http://www.zcdn.org/dl/${BASE_P}_unified.zip
+	http://www.zcdn.org/dl/${MY_P}_update.zip
+	http://www.zcdn.org/dl/${MY_P}_sdk.zip
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2 warsow"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+angelscript debug dedicated irc openal opengl"
+
+UIRDEPEND="virtual/jpeg
+	media-libs/libvorbis
+	media-libs/libsdl
+	virtual/opengl
+	x11-libs/libXinerama
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+	openal? ( media-libs/openal )"
+RDEPEND="net-misc/curl
+	opengl? ( ${UIRDEPEND} )
+	!opengl? ( !dedicated? ( ${UIRDEPEND} ) )"
+UIDEPEND="x11-proto/xineramaproto
+	x11-proto/xf86dgaproto
+	x11-proto/xf86vidmodeproto
+	openal? ( virtual/pkgconfig )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	x11-misc/makedepend
+	opengl? ( ${UIDEPEND} )
+	!opengl? ( !dedicated? ( ${UIDEPEND} ) )"
+
+S=${WORKDIR}/source
+
+src_unpack() {
+	unpack ${BASE_P}_unified.zip ${MY_P}_sdk.zip
+	cd ${BASE_P}_unified || die
+	unpack ${MY_P}_update.zip
+}
+
+src_prepare() {
+	sed -i \
+		-e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \
+		qcommon/files.c \
+		|| die "sed files.c failed"
+
+	sed -i \
+		-e "s:jpeg_mem_src:_&:" \
+		ref_gl/r_image.c || die
+
+	cd "${WORKDIR}"
+	rm -rf docs/old
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${PN}-0.5-pic.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
+
+	if use angelscript ; then
+		tc-export AR RANLIB
+		emake \
+			-C ../libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc \
+			|| die "emake angelscript failed"
+	fi
+
+	local arch
+	if use amd64 ; then
+		arch=x86_64
+	elif use x86 ; then
+		arch=i386
+	fi
+
+	emake \
+		BASE_ARCH=${arch} \
+		BINDIR=bin \
+		BUILD_CLIENT=${client} \
+		BUILD_SERVER=$(yesno dedicated) \
+		BUILD_TV_SERVER=$(yesno dedicated) \
+		BUILD_ANGELWRAP=$(yesno angelscript) \
+		BUILD_IRC=${irc} \
+		BUILD_SND_OPENAL=${openal} \
+		BUILD_SND_QF=${client} \
+		DEBUG_BUILD=$(yesno debug) \
+		|| die "emake failed"
+}
+
+src_install() {
+	cd bin
+
+	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}/${BASE_P}_unified"/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
+
+	if [[ -e libs ]] ; then
+		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
+	fi
+
+	dodoc "${WORKDIR}"/docs/*
+	prepgamesdirs
+}