summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-04-20 20:04:50 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2015-04-20 20:04:50 +0000
commit11dc12eb11d28f3237cb58d2a10a40503bd35f79 (patch)
treeb793ed45f9716f6140b56298364ebfc1e57b2c55 /games-fps
parentold (diff)
downloadgentoo-2-11dc12eb11d28f3237cb58d2a10a40503bd35f79.tar.gz
gentoo-2-11dc12eb11d28f3237cb58d2a10a40503bd35f79.tar.bz2
gentoo-2-11dc12eb11d28f3237cb58d2a10a40503bd35f79.zip
old
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/warsow/ChangeLog7
-rw-r--r--games-fps/warsow/files/warsow-1.0-build.patch565
-rw-r--r--games-fps/warsow/files/warsow-1.0-pic.patch11
-rw-r--r--games-fps/warsow/warsow-1.0.ebuild166
4 files changed, 6 insertions, 743 deletions
diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index 5e58efce8292..37683e4b5f32 100644
--- a/games-fps/warsow/ChangeLog
+++ b/games-fps/warsow/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-fps/warsow
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.67 2015/03/25 13:53:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.68 2015/04/20 20:04:50 mr_bones_ Exp $
+
+ 20 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
+ -files/warsow-1.0-build.patch, -files/warsow-1.0-pic.patch,
+ -warsow-1.0.ebuild:
+ old
25 Mar 2015; Agostino Sarubbo <ago@gentoo.org> warsow-1.5.1-r1.ebuild:
Stable for x86, wrt bug #544170
diff --git a/games-fps/warsow/files/warsow-1.0-build.patch b/games-fps/warsow/files/warsow-1.0-build.patch
deleted file mode 100644
index f0756d4fa202..000000000000
--- a/games-fps/warsow/files/warsow-1.0-build.patch
+++ /dev/null
@@ -1,565 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Jul 28 20:39:29 UTC 2012
-Subject: fix build system
-
-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
-g) address parallel make issues
-
---- source/Makefile
-+++ source/Makefile
-@@ -50,10 +50,10 @@
- else
- CC?=gcc
- CXX?=g++
--LD=gcc
--LXX?=g++
--AR=ar
--RANLIB=ranlib
-+LD=$(CC)
-+LXX=$(CXX)
-+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/)
-@@ -62,7 +62,7 @@
- ifeq ($(OS),FreeBSD)
- ARCH?=freebsd_$(BASE_ARCH)
- else
--ARCH?=$(BASE_ARCH)
-+ARCH=$(BASE_ARCH)
- endif
-
- SHARED_LIBRARY_EXTENSION=so
-@@ -72,7 +72,7 @@
-
- ifeq ($(DEBUG_BUILD), YES)
- BINDIR=debug
--CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
-+CFLAGS_DEBUG=-D_DEBUG
- else
- BINDIR=release
- endif
-@@ -116,14 +116,14 @@
- LIBROCKET_DIR=../libsrcs/libRocket/libRocket
- LIBROCKET_MAKEFILE=Makefile.warsow
- LIBROCKET_INC=$(LIBROCKET_DIR)/Include
--LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a
-+LIBROCKET_LIB=$(LIBROCKET_DIR)/bin/libRocketWSW.a
-
- CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC)
- # add the base of ui to inclusions
- CFLAGS_ROCKET+=-Iui
-
- # static link to custombuilt lib
--LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
-+LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/bin -lRocketWSW -lfreetype
- # dynamic link to 'official' build
- # LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/Build -lRocketCore -lRocketControls -lfreetype
-
-@@ -195,9 +195,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 -fvisibility=hidden
--CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG -msse3
--CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
-+CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -fvisibility=hidden
-+CFLAGS_RELEASE=-fno-strict-aliasing -DNDEBUG
-+CFLAGS_DEBUG=-D_DEBUG
- ifeq ($(DEBUG_BUILD),YES)
- CFLAGS_COMMON+=$(CFLAGS_DEBUG)
- else
-@@ -209,18 +209,18 @@
- CFLAGS_MODULE=-DPIC -fPIC
- CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
-
--LDFLAGS_COMMON=$(LDFLAGS)
--LXXFLAGS_COMMON=$(LDFLAGS) -lstdc++ -lsupc++
-+LDFLAGS_COMMON=
-+LXXFLAGS_COMMON=-lstdc++ -lsupc++
-
- ifeq ($(OS),FreeBSD)
- LDFLAGS_COMMON+= -L/usr/local/lib -lm -pthread
- else
--LDFLAGS_COMMON+= -L/usr/local/lib -ldl -lm -O1 -Wl,--as-needed
-+LDFLAGS_COMMON+= -ldl -lm
- endif
-
- ifneq ($(DEBUG_BUILD),YES)
--LDFLAGS_COMMON+= -s
--LXXFLAGS_COMMON+= -s
-+LDFLAGS_COMMON+=
-+LXXFLAGS_COMMON+=
- endif
-
- ifeq ($(ARCH),x86_64)
-@@ -298,12 +298,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)
-@@ -505,17 +502,17 @@
-
- all: client openal qf ded cgame game ui irc cin 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
- cin: $(BUILDDIRS) message-cin compile-cin link-cin
- 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-librocket clean-irc clean-cin clean-angelwrap clean-tv_server
-
-@@ -611,13 +608,14 @@
- @echo "> *********************************************************"
- compile-ui: $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
- link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
-+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB)
- clean-ui:
- @echo " > Removing ui objects" && \
- $(RM) $(OBJS_UI_ROCKET)
-
- $(LIBROCKET_LIB):
- @echo "> * Building Rocket library"
-- @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD)
-+ @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD)
- @echo "> * Done building RocketCore library."
- @echo "> *********************************************************"
- @echo "> * Continuing ui building..."
-@@ -656,7 +654,6 @@
- @echo "> *********************************************************"
- @echo "> * Building angelwrap"
- @echo "> *********************************************************"
-- -@rm $(ANGELSCRIPT_LIB)
- $(ANGELSCRIPT_INC)/angelscript.h:
- @echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- @echo "!!!"
-@@ -668,7 +665,7 @@
-
- $(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h
- @echo "> * Building Angelscript library first"
-- @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
-+ @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
- @echo "> * Done building angelscript library."
- @echo "> *********************************************************"
- @echo "> * Continuing angelwrap building..."
-@@ -702,69 +699,57 @@
- # 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)
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
-
- #########
- # QF
- #########
- $(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
-
- ########
- # .SO
- ########
- $(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
-
- $(BINDIR)/basewsw/game_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_GAME)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
-
- $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET)
-- @echo " > Linking $@" && \
-- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
-+ $(LXX) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
-
- $(BINDIR)/libs/irc_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_IRC)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC)
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC)
-
- $(BINDIR)/libs/cin_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CIN)
-- @echo " > Linking $@" && \
-- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN)
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN)
-
- $(BINDIR)/libs/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP)
-- @echo " > Linking $@" && \
-- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
-+ $(LXX) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_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
-@@ -776,49 +761,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 $@
-
-@@ -826,60 +810,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 $@
-
-@@ -887,117 +870,116 @@
- # 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)
-
- $(BUILDDIR)/game/%.o: matchmaker/%.c
-- @$(DO_CC_MODULE)
-+ $(DO_CC_MODULE)
-
- ########
- # UI.ROCKET
- ########
- $(BUILDDIR)/ui/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(DO_CC_MODULE)
-
- $(BUILDDIR)/ui/%.o: ui/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/kernel/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/as/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/datasources/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/widgets/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- $(BUILDDIR)/ui/%.o: ui/decorators/%.cpp
-- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+ $(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-
- #$(BUILDDIR)/ui.as/%.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)
-
- ########
- # CIN
- ########
- $(BUILDDIR)/cin/%.o: gameshared/%.c
-- @$(DO_CC_MODULE)
-+ $(DO_CC_MODULE)
-
- $(BUILDDIR)/cin/%.o: cin/%.c
-- @$(DO_CC_MODULE) $(CFLAGS_CIN)
-+ $(DO_CC_MODULE) $(CFLAGS_CIN)
-
- ########
- # 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)
-
- $(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.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 $@
-
---- libsrcs/libRocket/libRocket/Makefile.warsow
-+++ libsrcs/libRocket/libRocket/Makefile.warsow
-@@ -13,9 +13,9 @@
- endif
-
- ifeq ($(DEBUG_BUILD),YES)
-- CXXFLAGS += -g -DROCKET_DEBUG
-+ CXXFLAGS += -DROCKET_DEBUG
- else
-- CXXFLAGS += -O2
-+ CXXFLAGS +=
- endif
-
- BUILDDIR=Build/obj
---- libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
-+++ libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
-@@ -47,7 +47,7 @@
- CXX ?= gcc
- # On i686 architecture you may need to add -march=i686 if you get
- # an undefined symbol for __sync_sub_and_fetch_4 in as_atomic.cpp.
-- CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
-+ CXXFLAGS += -fPIC -fno-strict-aliasing
- endif
-
- AR ?= ar
diff --git a/games-fps/warsow/files/warsow-1.0-pic.patch b/games-fps/warsow/files/warsow-1.0-pic.patch
deleted file mode 100644
index 71c4d8eed690..000000000000
--- a/games-fps/warsow/files/warsow-1.0-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/snd_qf/snd_mix.c
-+++ source/snd_qf/snd_mix.c
-@@ -27,7 +27,7 @@
- int *snd_p, snd_linear_count, snd_vol, music_vol;
- short *snd_out;
-
--#if !defined ( id386 ) || defined ( __MACOSX__ )
-+#if defined ( PIC ) || !defined ( id386 ) || defined ( __MACOSX__ )
- #ifdef _WIN32
- #pragma warning( push )
- #pragma warning( disable : 4310 ) // cast truncates constant value
diff --git a/games-fps/warsow/warsow-1.0.ebuild b/games-fps/warsow/warsow-1.0.ebuild
deleted file mode 100644
index 38870db5fdb2..000000000000
--- a/games-fps/warsow/warsow-1.0.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.0.ebuild,v 1.7 2013/01/19 13:44:28 hasufell Exp $
-
-EAPI=4
-inherit eutils check-reqs gnome2-utils games
-
-MY_P=${PN}_${PV}
-DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
-HOMEPAGE="http://www.warsow.net/"
-SRC_URI="http://funpark.warsow-esport.net/~${PN}/${PV}/${MY_P}_unified.tar.gz
- http://funpark.warsow-esport.net/~${PN}/${PV}/${MY_P}_sdk.tar.gz
- mirror://gentoo/${PN}.png"
-
-# ZLIB: bundled angelscript
-# MIT: bundled libRocket
-LICENSE="GPL-2 MIT ZLIB warsow"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+angelscript debug dedicated irc openal server"
-
-RDEPEND="media-libs/freetype
- net-misc/curl
- sys-libs/zlib
- !dedicated? (
- media-libs/libpng:0
- media-libs/libsdl
- media-libs/libtheora
- media-libs/libvorbis
- x11-libs/libX11
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXxf86dga
- x11-libs/libXxf86vm
- virtual/jpeg
- virtual/opengl
- openal? ( media-libs/openal )
- )"
-DEPEND="${RDEPEND}
- x11-misc/makedepend
- !dedicated? (
- x11-proto/xineramaproto
- x11-proto/xf86dgaproto
- x11-proto/xf86vidmodeproto
- )
- openal? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}_sdk/source
-S_U=${WORKDIR}/${MY_P}
-
-CHECKREQS_DISK_BUILD="1G"
-CHECKREQS_DISK_USR="500M"
-
-src_prepare() {
- sed -i \
- -e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \
- qcommon/files.c \
- || die "sed files.c failed"
-
- sed -i \
- -e "s:q_jpeg_mem_src:_&:" \
- ref_gl/r_image.c || die "sed r_image.c failed"
-
- rm -r "${S_U}"/docs/old* || die
-
- cd "${WORKDIR}"/${MY_P}_sdk || die
- epatch "${FILESDIR}"/${P}-build.patch \
- "${FILESDIR}"/${P}-pic.patch
- epatch_user
-}
-
-src_compile() {
- yesno() { use ${1} && echo YES || echo NO ; }
-
- use angelscript &&
- emake -C ../libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc
-
- local arch
- if use amd64 ; then
- arch=x86_64
- elif use x86 ; then
- arch=i386
- fi
-
- local myconf
- if use dedicated ; then
- myconf=(
- BUILD_CLIENT=NO
- BUILD_IRC=NO
- BUILD_SND_OPENAL=NO
- BUILD_SND_QF=NO
- BUILD_CIN=NO
- BUILD_SERVER=YES
- BUILD_TV_SERVER=YES
- )
- else
- myconf=(
- BUILD_CLIENT=YES
- BUILD_IRC=$(yesno irc)
- BUILD_SND_OPENAL=$(yesno openal)
- BUILD_SND_QF=YES
- BUILD_CIN=YES
- BUILD_SERVER=$(yesno server)
- BUILD_TV_SERVER=$(yesno server)
- )
- fi
-
- emake \
- BASE_ARCH=${arch} \
- BINDIR=bin \
- BUILD_ANGELWRAP=$(yesno angelscript) \
- DEBUG_BUILD=$(yesno debug) \
- ${myconf[@]}
-}
-
-src_install() {
- cd bin
-
- if ! use dedicated ; then
- newgamesbin ${PN}.* ${PN}
- doicon -s 48 "${DISTDIR}"/${PN}.png
- make_desktop_entry ${PN} Warsow
- fi
-
- if use dedicated || use server ; then
- newgamesbin wsw_server.* ${PN}-ded
- newgamesbin wswtv_server.* ${PN}-tv
- fi
-
- exeinto "$(games_get_libdir)"/${PN}
- doexe */*.so
-
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r "${S_U}"/basewsw
-
- local so
- for so in basewsw/*.so ; do
- dosym "$(games_get_libdir)"/${PN}/${so##*/} \
- "${GAMES_DATADIR}"/${PN}/${so}
- 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}
- done
- fi
-
- dodoc "${S_U}"/docs/*
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}