respect CFLAGS in linking command, don't mix up CFLAGS and CXXFLAGS, improve verbosity handling

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 151 insertions, 103 deletions

diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index 55bc7015c189..77658703bbf1 100644
--- a/games-fps/warsow/ChangeLog
+++ b/games-fps/warsow/ChangeLog
@@ -1,6 +1,11 @@
 # 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.46 2012/11/22 14:30:11 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.47 2012/12/27 02:24:48 hasufell Exp $
+
+  27 Dec 2012; Julian Ospald <hasufell@gentoo.org> warsow-1.02.ebuild,
+  files/warsow-1.02-build.patch:
+  respect CFLAGS in linking command, don't mix up CFLAGS and CXXFLAGS, improve
+  verbosity handling
 
   22 Nov 2012; Julian Ospald <hasufell@gentoo.org> warsow-1.0.ebuild,
   +files/warsow-1.0-pic.patch, warsow-1.02.ebuild,
diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest
index 122932a274fe..ed083d8316d8 100644
--- a/games-fps/warsow/Manifest
+++ b/games-fps/warsow/Manifest
@@ -3,7 +3,7 @@ Hash: SHA256
 
 AUX warsow-1.0-build.patch 16346 SHA256 626f23dc9c99eec2d1e1760e9247eb81079569ea139c165cb3ec908235e3aee7 SHA512 50131166cbd4ea39e9d77936d47ee9ca602f78f37f4f0351c188528deaebee1312b757ec4703b20a104cd23dbb5b68a948af774d67da07d1dac671c752bee4cf WHIRLPOOL 866797b10d0513269e72d2e71cda2d4860c8ca90322a426232dbcbd00cde68350a56ac484dacf350de11263ef329c5632dab5f8d0d8b08795191d6ac671ebe51
 AUX warsow-1.0-pic.patch 377 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5b76e1e8e0b75f5ece3782 SHA512 1f712dbf83c3bca6a2f0424f2250133a23903da86c9045d0917ef5a18b311f6485af6cd5afc1bbcc8b47ff0e0f880154fc17f978c2e7400b6edb4b2ba33b2e18 WHIRLPOOL 536ddb836e09c15d0a3e5645066042164a556d608022c9892a82cd56552a489d6d424909878fe89ddf035a1a604d9ba4a73eabe563c6de51f44ccec1f9b7d854
-AUX warsow-1.02-build.patch 15562 SHA256 5f85026c8ceeadc8de10797f6eaabce1f485a2846aec4a2f05e1f117234f55c1 SHA512 cf77b79142cd2ac6082781e8c6186fa3b23357703396cc65e975834877d7798600729652c7aa4ec53dbce64c40b0c2bcffa70d5455a2257b6ecadb6b985560ac WHIRLPOOL 9b32dcc602cbe49d3bad0b2523a784f6c755d8d9a744669597ce3c934f5cf21f239f43290a9b716010b1f67d0c049cb2ebc4607d92699b3911f0d6778483c398
+AUX warsow-1.02-build.patch 17194 SHA256 e7d7beb3cc375538619290e6abeea26966eafff1eb06458464a87ca63c26b28c SHA512 483a99d76c74561e056334e95ef70b210912fff06da508de422b003c6bffdb0decb68a2f25a5e0ca5ca492bb5ac229b84a33ab6e4ca2dcb87cef0304b7859b1a WHIRLPOOL 5941cd2e9085f62d29c25b4dd55e1f9b6679c13e8e7e7119011ef6d9426405da19c0c95d93805cc934d85aaed9fbf65cf2758676a7d9d4db9001e66cc8660c50
 AUX warsow-1.02-pic.patch 377 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5b76e1e8e0b75f5ece3782 SHA512 1f712dbf83c3bca6a2f0424f2250133a23903da86c9045d0917ef5a18b311f6485af6cd5afc1bbcc8b47ff0e0f880154fc17f978c2e7400b6edb4b2ba33b2e18 WHIRLPOOL 536ddb836e09c15d0a3e5645066042164a556d608022c9892a82cd56552a489d6d424909878fe89ddf035a1a604d9ba4a73eabe563c6de51f44ccec1f9b7d854
 DIST warsow.png 1692 SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954 SHA512 76476fd6f624b4043405fbddeaa0fa46338b96bf46a9b64434940d9a84738a20c25243ef1316048159698b6a70b3e0f26218da3332203a93944312e77ba22c8f WHIRLPOOL 94b7c77641d5a8f581de4eb0e4e91b71f25347248a6aa6c1160e8fefda92951daa3fbbf04aee4920fc9b53fb07872d3fb7d870d4207d13844e07afa51c93e85b
 DIST warsow_1.02_sdk.tar.gz 56541955 SHA256 bec1f0ec26c39defad393578b28eb955504f054599142b096773c28889cabb2c SHA512 d62399baa13341bc87863d123a9d852ec688d0aa279eb626b8c95bda28b7ac1d602c7571e02dfda7dd8ea83a231cd8c3310a0126c1235968291e9e700679fbca WHIRLPOOL 7c44fb252b95b400e829c752c58a4d715b695d56f7e9b35504be9c1e1566c513f101090f7bbe0eabba5aef11ff3f320106fe7ce1d4b7b17e7368979b0b193621
@@ -11,17 +11,17 @@ DIST warsow_1.02_update.zip 20582996 SHA256 23efd46590be99140b836125335dc973f606
 DIST warsow_1.0_sdk.tar.gz 56525636 SHA256 2e394b5c50ad206723a59636ab93448f69d8602e710ab334451badf746870e22 SHA512 dee6591fb5ed7150e3e18db20b18366777dbacd4a465074eb3c978a04b7df5140e8a7817a5248542af06d2a6eb972ad986690f16e57ac08f753cccb2470d7bfe WHIRLPOOL e30772b49f37dede19d54e129cc1ca05bf9f01c9a10f372c9c420ceba25514c6a928c12ba61e140efc5ea8d46cbd6db403ca03aee215964173662127b9dbfd59
 DIST warsow_1.0_unified.tar.gz 518459004 SHA256 f933d251de4c92b6107d4db1eef5326baf4873d32a6e2f1c3daae14bc92e85ec SHA512 78706093fb4b8684893d9b497fd10f1ce3ef096b68bbf7d36ed2bc775fa649738f0153a723b2788ef6a54d30826ec96bc36899d2e5c230bf09022b98cc105aad WHIRLPOOL efdffd7f358c704a6c08eb1d8c91543db3b76805edba775f88570debfa1b4a9ac64772958831fff7d0be4d72f2d29abbb7610d115e92cdb0fd897a8e31b1059c
 EBUILD warsow-1.0.ebuild 3376 SHA256 aa2331fdad71c190d031933e36b6e8c2f20ec9b546d56dfafce8f20449f1633f SHA512 7e06adc5c0159468726b395d3254104df630226dae37a67b3705629b874c6e934649fad096be036fee1735a9521ce891fe9bce91ba22b66f96bcf67aa31e8248 WHIRLPOOL 154a349864122c0122c0f4ea124c9a23f75d5d1e45678c704d7b8c766426de139ffce509d278e898cbff3a4b629165c89ee3f88ef91f2e0f0955b782d5fccefe
-EBUILD warsow-1.02.ebuild 3708 SHA256 8066f1623d7ace6d36b23882acdd4bb523a40a9e550f5960e15e3e87bc1d2032 SHA512 cd22ea60fb713cd600770088b906c2827dace1c4456b99a8afc24efc62b3c5df334cd5570afc885273d7c85429de410fd432a6ee505d46e2c9039f8ef5d9eb7c WHIRLPOOL ef3f524543fcb769a15e031943c990d6e5252037a6d3aac2fc9749a6c5a19f887cdd84ff670f4a42b0670bdbbecd1474b874aaa7a3b952dbefb573e29510eae3
-MISC ChangeLog 6648 SHA256 6d2d81b5562db60cde6bfb7da475ae94917d913592c2108aab536054012ec946 SHA512 72ff4a4d7a1725a75b4a7899542c207a505c74ff83571feb21990dcb339db3e3393f8531aff2808752424a7321c7963ea2b4491a32578aacb00ace03e32941e5 WHIRLPOOL c3e11da4cd74881c4b79daaf184b6970bb9e84e48eba128d5893d717d75dfccb4229ff69bea5b61b643e21f784d332d1c0f8b4113dee9991fb67fdbf6b327226
+EBUILD warsow-1.02.ebuild 3718 SHA256 d7fdb02d5c5c0d7f875dcac52f05da2155631263bf3ac1163110e52ca6251465 SHA512 c72410e495e4fbef639b5c1ce757e600bed80f64b86b5054aebf29de2f99ee671b91f5fa0589c7c3549c62c8ba31793c5cd384170ae9d482428a5435f699bf84 WHIRLPOOL ad6f43f9968a8a9600edcbb08bb4e162a13a706c003c9fe8a44229f5fafc5108ef8d74b7317fd8b834de5895c34daa9798b93c6ad156eda798745f9e21e893c5
+MISC ChangeLog 6853 SHA256 93d2ad491b7179c031c1f033603918f74a8cea49334f94a12788d9fbdddaa828 SHA512 eb30648874ab6a097090dce1896e3d6a367716fa6b3dbfec295528ddd9f868fde6bdbc8c0fe4c94abb163bb407f9131bdf885cde245735e5c1f6b421272d7ec0 WHIRLPOOL 69985bcfd5a2e247df75ee827089ffe5812158da8593f2f4ee6c91d5e43c1f676afdb13aefd8297c8170bb9d9117410c6baa60a5eab9b3b190d416fc59b511f5
 MISC metadata.xml 347 SHA256 016dbabb997c28f241f054760d9b81b1c43f5161de6d53936a2ebeb78bccdbea SHA512 34e3d6eae3b4665eac573b096d83a2841aee4488cc1a237e54e6e12c0c7ad8caefbbde6b563d1421c9d68cf7fb2b6c2446dfeddb1390971a7630b5efa494cb77 WHIRLPOOL 9d4cbde23eacc798cb4f1ac0c504963d349619229a5c2e926d8fc1348b1fefc53e999cc21e0be0cdca58affd1bfd4a275ae633709af78ca3dc808431fa365db3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQrjb1AAoJEFpvPKfnPDWzZsgIAIuN6XK/O+9FiTHQMM8cdDXo
-Vr7ONd/g8idxDdnkgFe62VK2SrqzsOK9RRrTP7/946vOpc70ayB2+ZoLKiro1SZY
-SWKpX+7QNystGpr4JtCa9M6Wcfam559CTY+Jckk6XvTntmG6dAw2K2OdKDzckaxA
-l8ubJwkUIPC76ivdVQ3pZYnuhgYMyvk+MlBPgHJdJW1LlpLhMhm5aCCbhwTgizAc
-mosxPtztZJ3Gl7VoXZZyAyBTZPwvXyh3hb4j3pYGCbZ7dz5MQzUKDKqbfo0ZIx/f
-KG/wzLsCbtVGvMKieYa4za2At9DVH/FwKcjgJx5qGQ2OoIc07CQFMSZZ761GJC8=
-=N84q
+iQEcBAEBCAAGBQJQ27F0AAoJEFpvPKfnPDWzMMAH/361S97pmLN0H/SyfifrDs97
+TgPT4JAdzofWIy6OCI2LpQAIeVL8wPjBPOrSeCkXXqYzmX4wHRiwJGTXQk5XdISB
+VF4bwMsjtf6C4VNFMwaiGdRdffFqn5uVvzXmEnEYuTid/aoAo2VhegLPk95V5u2y
+J6qUvFHtZoh1iZmRxMFtp62LY/J9LWjomaETWRbk1Q/b6mShRCzPNmkTODX8mggF
+FRAwhQ9HjEssNnS1G9FG7RsmmRCvw/MWPDUWG2kqo6YtpYS/LgfGdxjZvIRutBg4
+bPDA8pQP84XAvbfNO/qu9XI95sDJNJa/0U2mrX3mdHYUuaIdu0PAi8g3gy7Krcw=
+=XG6z
 -----END PGP SIGNATURE-----
diff --git a/games-fps/warsow/files/warsow-1.02-build.patch b/games-fps/warsow/files/warsow-1.02-build.patch
index 003c391f6721..ed73860fd4e9 100644
--- a/games-fps/warsow/files/warsow-1.02-build.patch
+++ b/games-fps/warsow/files/warsow-1.02-build.patch
@@ -13,7 +13,21 @@ g) address parallel make issues
 
 --- source/Makefile
 +++ source/Makefile
-@@ -50,10 +50,10 @@
+@@ -30,6 +30,13 @@
+ # Build Warsow client without server capabilities?
+ BUILD_THIN_CLIENT?=NO
+ 
++# enable verbosity
++V=NO
++
++ifneq ($(V),YES)
++Q=@
++endif
++
+ ###########################################################
+ 
+ ifeq ($(USE_MINGW),YES)
+@@ -50,10 +57,10 @@
  else
  CC?=gcc
  CXX?=g++
@@ -28,7 +42,7 @@ g) address parallel make issues
  
  # 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 @@
+@@ -62,7 +69,7 @@
  ifeq ($(OS),FreeBSD)
  ARCH?=freebsd_$(BASE_ARCH)
  else
@@ -37,7 +51,7 @@ g) address parallel make issues
  endif
  
  SHARED_LIBRARY_EXTENSION=so
-@@ -72,7 +72,7 @@
+@@ -72,7 +79,7 @@
  
  ifeq ($(DEBUG_BUILD), YES)
  BINDIR=debug
@@ -46,18 +60,20 @@ g) address parallel make issues
  else
  BINDIR=release
  endif
-@@ -196,8 +196,8 @@
+@@ -195,9 +202,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_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 -msse2
 -CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
++CFLAGS_COMMON=-I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden
 +CFLAGS_RELEASE=-fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
 +CFLAGS_DEBUG=-D_DEBUG
  ifeq ($(DEBUG_BUILD),YES)
  CFLAGS_COMMON+=$(CFLAGS_DEBUG)
  else
-@@ -209,18 +209,18 @@
+@@ -209,18 +216,18 @@
  CFLAGS_MODULE=-DPIC -fPIC
  CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
  
@@ -81,23 +97,30 @@ g) address parallel make issues
  endif
  
  ifeq ($(ARCH),x86_64)
-@@ -298,12 +298,9 @@
+@@ -298,12 +305,19 @@
  ######################################################################################################
  # Helper functions
  ######################################################################################################
--DO_CC=echo "  > Compiling $<" && \
++ifneq ($(V),YES)
+ DO_CC=echo "  > Compiling $<" && \
 -	$(CC) $(CFLAGS_COMMON) -c $< -o $@
--DO_CXX=echo "  > Compiling (c++) $<" && \
++      $(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@
+ DO_CXX=echo "  > Compiling (c++) $<" && \
 -	$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
--DO_RES=echo "  > Compiling resource $<" && \
++       $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -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 $@
++       $(RES) $(RESFLAGS_COMMON) -i $< -o $@
++else
++DO_CC=$(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@
++DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@
 +DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@
++endif
++
  
  DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
  DO_CC_DED=$(DO_CC) $(CFLAGS_DED)
-@@ -505,17 +502,17 @@
+@@ -505,17 +519,17 @@
  
  all: client openal qf ded cgame game ui irc cin angelwrap tv_server
  
@@ -118,7 +141,7 @@ g) address parallel make issues
  
  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 @@
+@@ -611,13 +625,14 @@
  	@echo "> *********************************************************"
  compile-ui: $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
  link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
@@ -134,7 +157,7 @@ g) address parallel make issues
  	@echo "> * Done building RocketCore library."
  	@echo "> *********************************************************"
  	@echo "> * Continuing ui building..."
-@@ -656,7 +654,6 @@
+@@ -656,7 +671,6 @@
  	@echo "> *********************************************************"
  	@echo "> * Building angelwrap"
  	@echo "> *********************************************************"
@@ -142,7 +165,7 @@ g) address parallel make issues
  $(ANGELSCRIPT_INC)/angelscript.h:
  	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
  	@echo "!!!"
-@@ -668,7 +665,7 @@
+@@ -668,7 +682,7 @@
  
  $(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h
  	@echo "> * Building Angelscript library first"
@@ -151,13 +174,14 @@ g) address parallel make issues
  	@echo "> * Done building angelscript library."
  	@echo "> *********************************************************"
  	@echo "> * Continuing angelwrap building..."
-@@ -702,69 +699,57 @@
+@@ -702,69 +716,69 @@
  # DED
  ########
  $(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
 -	@echo "  > Linking $@" && \
 -	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
-+	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
  
  #########
  # CLIENT
@@ -166,12 +190,14 @@ g) address parallel make issues
  $(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)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(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)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
  endif
  
  #########
@@ -180,7 +206,8 @@ g) address parallel make issues
  $(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)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
  
  #########
  # QF
@@ -188,7 +215,8 @@ g) address parallel make issues
  $(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)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
  
  ########
  # .SO
@@ -196,32 +224,38 @@ g) address parallel make issues
  $(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME)
 -	@echo "  > Linking $@" && \
 -	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
-+	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(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)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(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)
++	@echo "  > Linking $@"
++	$(Q)$(LXX) $(CXXFLAGS) $(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)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(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)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(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)
++	@echo "  > Linking $@"
++	$(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
  
  ########
  # TV
@@ -229,104 +263,107 @@ g) address parallel make issues
  $(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER)
 -	@echo "  > Linking $@" && \
 -	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
-+	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
  
  ######################################################################################################
  # Meta Rules
-@@ -776,49 +761,48 @@
+@@ -776,229 +790,229 @@
  # CLIENT
  ########
  $(BUILDDIR)/client/%.o: qcommon/%.c
 -	@$(DO_CC_CLIENT)
-+	$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
  
  $(BUILDDIR)/client/%.o: server/%.c
 -	@$(DO_CC_CLIENT)
-+	$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
  
  $(BUILDDIR)/client/%.o: client/%.c
 -	@$(DO_CC_CLIENT)
-+	$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
  
  $(BUILDDIR)/client/%.o: ref_gl/%.c
 -	@$(DO_CC_CLIENT)
-+	$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
  
  $(BUILDDIR)/client/%.o: null/%.c
 -	@$(DO_CC_CLIENT)
-+	$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
  
  $(BUILDDIR)/client/%.o: matchmaker/%.c
 -	@$(DO_CC_CLIENT)
-+	$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
  
  ifeq ($(USE_MINGW),YES)
  $(BUILDDIR)/client/%.o: win32/%.c
 -	@$(DO_CC_CLIENT)
-+	$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
  
  $(BUILDDIR)/client/%.o: win32/%.rc
 -	@$(DO_RES_CLIENT)
-+	$(DO_RES_CLIENT)
++	$(Q)$(DO_RES_CLIENT)
  else
  ifeq ($(OS),Darwin)
  $(BUILDDIR)/client/%.o: mac/%.c
 -	@$(DO_CC_CLIENT)
-+	$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
  $(BUILDDIR)/client/%.o: unix/%.c
 -	@$(DO_CC_CLIENT)
-+	$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
  else
  $(BUILDDIR)/client/%.o: unix/%.c
 -	@$(DO_CC_CLIENT)
-+	$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
  endif
  endif
  
  $(BUILDDIR)/client/%.o: game/%.c
 -	@$(DO_CC_CLIENT)
-+	$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
  
  $(BUILDDIR)/client/%.o: gameshared/%.c
 -	@$(DO_CC_DED)
-+	$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
  
  $(BINDIR)/warsow: unix/start_script.sh
 -	@echo "  > Installing client start script" && \
- 	cp $< $@ && \
+-	cp $< $@ && \
++	@echo "  > Installing client start script"
++	$(Q)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)
++	$(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL)
  
  $(BUILDDIR)/openal/%.o: gameshared/%.c
 -	@$(DO_CC_MODULE)
-+	$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
  
  ########
  # QF
  ########
  $(BUILDDIR)/qf/%.o: snd_qf/%.c
 -	@$(DO_CC_MODULE) $(CFLAGS_QF)
-+	$(DO_CC_MODULE) $(CFLAGS_QF)
++	$(Q)$(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)
++	$(Q)$(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)
++	$(Q)$(DO_CC_MODULE) $(CFLAGS_SDL)
  endif
  
  $(BUILDDIR)/qf/%.o: gameshared/%.c
 -	@$(DO_CC_MODULE)
-+	$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
  
  
  ########
@@ -334,103 +371,105 @@ g) address parallel make issues
  ########
  $(BUILDDIR)/ded/%.o: qcommon/%.c
 -	@$(DO_CC_DED)
-+	$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
  
  $(BUILDDIR)/ded/%.o: server/%.c
 -	@$(DO_CC_DED)
-+	$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
  
  ifeq ($(USE_MINGW),YES)
  $(BUILDDIR)/ded/%.o: win32/%.c
 -	@$(DO_CC_DED)
-+	$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
  else
  $(BUILDDIR)/ded/%.o: unix/%.c
 -	@$(DO_CC_DED)
-+	$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
  endif
  
  $(BUILDDIR)/ded/%.o: null/%.c
 -	@$(DO_CC_DED)
-+	$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
  
  $(BUILDDIR)/ded/%.o: game/%.c
 -	@$(DO_CC_DED)
-+	$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
  
  $(BUILDDIR)/ded/%.o: gameshared/%.c
 -	@$(DO_CC_DED)
-+	$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
  
  $(BUILDDIR)/ded/%.o: matchmaker/%.c
 -	@$(DO_CC_DED)
-+	$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
  
  $(BINDIR)/wsw_server: unix/start_script.sh
 -	@echo "  > Installing dedicated server start script" && \
- 	cp $< $@ && \
+-	cp $< $@ && \
++	@echo "  > Installing dedicated server start script"
++	$(Q)cp $< $@ && \
  	chmod a+x $@
  
-@@ -887,117 +870,116 @@
+ ########
  # CGAME
  ########
  $(BUILDDIR)/cgame/%.o: cgame/%.c
 -	@$(DO_CC_MODULE)
-+	$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
  
  $(BUILDDIR)/cgame/%.o: gameshared/%.c
 -	@$(DO_CC_MODULE)
-+	$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
  
  ########
  # GAME
  ########
  $(BUILDDIR)/game/%.o: game/%.c
 -	@$(DO_CC_MODULE)
-+	$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
  
  $(BUILDDIR)/game/%.o: game/ai/%.c
 -	@$(DO_CC_MODULE)
-+	$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
  
  $(BUILDDIR)/game/%.o: gameshared/%.c
 -	@$(DO_CC_MODULE)
-+	$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
  
  $(BUILDDIR)/game/%.o: matchmaker/%.c
 -	@$(DO_CC_MODULE)
-+	$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
  
  ########
  # UI.ROCKET
  ########
  $(BUILDDIR)/ui/%.o: gameshared/%.c
 -	@$(DO_CC_MODULE)
-+	$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
  
  $(BUILDDIR)/ui/%.o: ui/%.cpp
 -	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
  
  $(BUILDDIR)/ui/%.o: ui/kernel/%.cpp
 -	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
  
  $(BUILDDIR)/ui/%.o: ui/as/%.cpp
 -	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
  
  $(BUILDDIR)/ui/%.o: ui/datasources/%.cpp
 -	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
  
  $(BUILDDIR)/ui/%.o: ui/widgets/%.cpp
 -	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
  
  $(BUILDDIR)/ui/%.o: ui/decorators/%.cpp
 -	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
-+	$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
  
  #$(BUILDDIR)/ui.as/%.o: matchmaker/%.c
 -#	@$(DO_CC_MODULE)
@@ -441,84 +480,87 @@ g) address parallel make issues
  ########
  $(BUILDDIR)/irc/%.o: gameshared/%.c
 -	@$(DO_CC_MODULE)
-+	$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
  
  $(BUILDDIR)/irc/%.o: irc/%.c
 -	@$(DO_CC_MODULE)
-+	$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
  
  ########
  # CIN
  ########
  $(BUILDDIR)/cin/%.o: gameshared/%.c
 -	@$(DO_CC_MODULE)
-+	$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
  
  $(BUILDDIR)/cin/%.o: cin/%.c
 -	@$(DO_CC_MODULE) $(CFLAGS_CIN)
-+	$(DO_CC_MODULE) $(CFLAGS_CIN)
++	$(Q)$(DO_CC_MODULE) $(CFLAGS_CIN)
  
  ########
  # ANGELWRAP
  ########
  $(BUILDDIR)/angelwrap/%.o: gameshared/%.c
 -	@$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
-+	$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
++	$(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
  
  $(BUILDDIR)/angelwrap/%.o: angelwrap/%.c
 -	@$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
-+	$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
++	$(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
  
  $(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp
 -	@$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-+	$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
  
  $(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.cpp
 -	@$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
-+	$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
  
  ########
  # TV SERVER
  ########
  $(BUILDDIR)/tv_server/%.o: qcommon/%.c
 -	@$(DO_CC_TV_SERVER)
-+	$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
  
  $(BUILDDIR)/tv_server/%.o: client/%.c
 -	@$(DO_CC_TV_SERVER)
-+	$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
  
  $(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c
 -	@$(DO_CC_TV_SERVER)
-+	$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
  
  $(BUILDDIR)/tv_server/%.o: tv_server/%.c
 -	@$(DO_CC_TV_SERVER)
-+	$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
  
  ifeq ($(USE_MINGW),YES)
  $(BUILDDIR)/tv_server/%.o: win32/%.c
 -	@$(DO_CC_TV_SERVER)
-+	$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
  else
  $(BUILDDIR)/tv_server/%.o: unix/%.c
 -	@$(DO_CC_TV_SERVER)
-+	$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
  endif
  
  $(BUILDDIR)/tv_server/%.o: null/%.c
 -	@$(DO_CC_TV_SERVER)
-+	$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
  
  $(BUILDDIR)/tv_server/%.o: gameshared/%.c
 -	@$(DO_CC_TV_SERVER)
-+	$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
  
  $(BINDIR)/wswtv_server: unix/start_script.sh
 -	@echo "  > Installing TV server start script" && \
- 	cp $< $@ && \
+-	cp $< $@ && \
++	@echo "  > Installing TV server start script"
++	$(Q)cp $< $@ && \
  	chmod a+x $@
  
+ ######################################################################################################
 --- libsrcs/libRocket/libRocket/Makefile.warsow
 +++ libsrcs/libRocket/libRocket/Makefile.warsow
 @@ -13,9 +13,9 @@
diff --git a/games-fps/warsow/warsow-1.02.ebuild b/games-fps/warsow/warsow-1.02.ebuild
index b28038994a74..d9d787991fd1 100644
--- a/games-fps/warsow/warsow-1.02.ebuild
+++ b/games-fps/warsow/warsow-1.02.ebuild
@@ -1,6 +1,6 @@
 # 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-1.02.ebuild,v 1.2 2012/11/22 14:30:11 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.02.ebuild,v 1.3 2012/12/27 02:24:48 hasufell Exp $
 
 EAPI=4
 inherit eutils check-reqs gnome2-utils games
@@ -114,6 +114,7 @@ src_compile() {
 	fi
 
 	emake \
+		V=YES \
 		BASE_ARCH=${arch} \
 		BINDIR=lib \
 		BUILD_ANGELWRAP=$(yesno angelscript) \