version bump and fix build with clang wrt #448714

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

8 files changed, 992 insertions, 17 deletions

diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index 3e55f869fdfc..ba0aa5e41f39 100644
--- a/games-fps/warsow/ChangeLog
+++ b/games-fps/warsow/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-fps/warsow
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.54 2013/07/03 10:06:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.55 2013/11/09 12:44:30 hasufell Exp $
+
+*warsow-1.03 (09 Nov 2013)
+
+  09 Nov 2013; Julian Ospald <hasufell@gentoo.org> +warsow-1.03.ebuild,
+  +files/warsow-1.03-build.patch, +files/01-warsow-1.03-clang.patch,
+  +files/02-warsow-1.03-clang.patch, +files/03-warsow-1.03-clang.patch,
+  +files/warsow-1.03-pic.patch:
+  version bump and fix build with clang wrt #448714
 
   03 Jul 2013; Agostino Sarubbo <ago@gentoo.org> warsow-1.02-r1.ebuild:
   Stable for x86, wrt bug #474440
diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest
index 8cc20afe7927..1884e90e730f 100644
--- a/games-fps/warsow/Manifest
+++ b/games-fps/warsow/Manifest
@@ -1,33 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX 01-warsow-1.03-clang.patch 582 SHA256 d03a7208415801413971c33ef4debccae7c34835ae829dc3678f5bd5929299db SHA512 e4f2878a079a1b0f18fbb7472972a9291b0783c06ec3a91c359e1a1c7ccd325dcf8a9fc51481b44fdb7273d2fb6d2379bf7828dc57a5fe5f93d30eb62ec04ac2 WHIRLPOOL fcf63d620e84a840a3a5f73f5e308ea55957f1e19948ae371475a0f53a79cb62a8c1e3c51650acc15410aa98447a47a51b83790a16559ad98ea4e2be4ee919e8
+AUX 02-warsow-1.03-clang.patch 2352 SHA256 92fe8ddcd38dcc057337b81c604aa16bf7c0cfb5200c6a74f57ccc5673ac9a32 SHA512 d9d6249ad46a75c22869852afb2a97d67e83c7c9f11b127af1462c38a332c837d25d6aa380afd9ac7d12969e4d0f5a66a1df5f86add1a97480cd1690e71efa8f WHIRLPOOL 0e4db3859dfafa422cce4b55e51189c1fa4d782822b54f5c9f54952a41174ea7bcf628ad3a136af428a025a6a8535047ec98a622f59cf8f20cac019084062943
+AUX 03-warsow-1.03-clang.patch 1014 SHA256 3ee6895dd952d72d5d6a00180efc1b3cbd22fe351e49a5fc4f268216894dcce2 SHA512 1ff3955ece7d25925290319676b4019c290dae4edd5c38182d3d28f5c3800f2875f04075315fd57acbba8af9798cc7a5ce8dd6de6e92a580771db470eac34088 WHIRLPOOL c8937a6f31dbdcade23a7e06277145a1bf456cb0b269cf8670c47db32b15bbbc45b1ff7e61f586fab7aa4075d6e72561f6589a2996970b7fb4a4fb4f27a5657d
 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 18235 SHA256 2651eac7e51e8fabe2782870ab9126f7767e16627c43a5f610d88be714298629 SHA512 85ccd72d70106ec086c5ac84377d1b7c5026b1b98487c104fa88e5a4d5fdbd0b851b98c9c936f925f22e63ce726a453fecd3368946437dbba3623e2f36388c22 WHIRLPOOL 648fbeb9fdef1c37e7bd5cd71c36d82e6243fa7bd9c54ac4c7dc3b98514eb997b97c4103a47d8d4ac32120487d41e69c4e34a830b860600f07ce34d30ea8d61b
 AUX warsow-1.02-pic.patch 377 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5b76e1e8e0b75f5ece3782 SHA512 1f712dbf83c3bca6a2f0424f2250133a23903da86c9045d0917ef5a18b311f6485af6cd5afc1bbcc8b47ff0e0f880154fc17f978c2e7400b6edb4b2ba33b2e18 WHIRLPOOL 536ddb836e09c15d0a3e5645066042164a556d608022c9892a82cd56552a489d6d424909878fe89ddf035a1a604d9ba4a73eabe563c6de51f44ccec1f9b7d854
+AUX warsow-1.03-build.patch 18235 SHA256 2651eac7e51e8fabe2782870ab9126f7767e16627c43a5f610d88be714298629 SHA512 85ccd72d70106ec086c5ac84377d1b7c5026b1b98487c104fa88e5a4d5fdbd0b851b98c9c936f925f22e63ce726a453fecd3368946437dbba3623e2f36388c22 WHIRLPOOL 648fbeb9fdef1c37e7bd5cd71c36d82e6243fa7bd9c54ac4c7dc3b98514eb997b97c4103a47d8d4ac32120487d41e69c4e34a830b860600f07ce34d30ea8d61b
+AUX warsow-1.03-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
 DIST warsow_1.02_update.zip 20582996 SHA256 23efd46590be99140b836125335dc973f606625785926377b60bd1467e661ac1 SHA512 4f0985c9a17e4562d46d289bfc78bf44fa544bdc30af3b0b670572e819966a2fa8f38902cb6810b09ce38a49f7de956177f31bf2858883ad2b3f27d41e6c2276 WHIRLPOOL 978987c70aa8b82a4252505fab95717056701a599d8e52a308206aee59a4cd36520be4f6b202411733d22dcca82f64919423bbd4bcd227d71b6e59cf6859e5b2
+DIST warsow_1.03_sdk.tar.gz 63908911 SHA256 98cd7aa25707f9baf97a8e1feb78e1874b6b5dd95af759bf5edda10bc62ed97c SHA512 eb88ba3c7ac3c83b264ff5163af690e187ade4035b4f9560e35830a82b0d87f66bff369ada67ebe89390a33a12cf8285faf8986ffd17c6a9fe45d52a89670314 WHIRLPOOL dae624b0913dbaecf06856b1cfe674bd025a6909caa87ea67124adcab3592481a5ef8ca42824ca20a5e352c4435e91de1ee31ca42ca75235b079246b6f2364e0
 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 3438 SHA256 2718ea8e803b16d5ae1d291ada956e5993a17e120b08e651e2e3463fde1f7668 SHA512 9565869cec3087019dcf7a66cc9f19825b1e9f713f1fd8875aab053bbcbf8d4c83e24faac5452ef7c4f6b6a5547a0df8483c84d0b78f80deca587bceb823410e WHIRLPOOL fdbd305c14f3db93ff8200277eac6865bee014c04f2b8a81b1a1df3c699f05c8be889119782adfd7bf5e3c406393946b45d685400c4b7f5f4c02965fbb22a82d
 EBUILD warsow-1.02-r1.ebuild 3805 SHA256 5732403b70af987fdbf756a5631db0cef368ca13c13ed79308b3e4887a129266 SHA512 4bd7ffc596e7edc569513c938ab05b0bd66492a39e6ff6f4347e7754bfbda68272021bf1946aee823dfd8e5e741a6ff7900a632dadd5f9326f67c63b7de37521 WHIRLPOOL 7c8bd180e90588e2b2c123a5f19157b5c2a7cb9d5431c9ddb993627406e8807f42621f9b9e187a9f4ac59b46d17384725cd833133e9e92975e0b9491c62ee28a
-MISC ChangeLog 7666 SHA256 3809813c1b33a4c7f6b944bfa64485babc7d27132fbfe0fd4b603f37461f3eb0 SHA512 16fdc130de2285cb05d6b75f99c1dbb96a1f5ab4e34aa5df4aeddbd039cfbe861ff8ab23c56353e8f6c462b052d1ec303ab60a0f02e719c0ddb1f7d2c078afcf WHIRLPOOL 20e775794e145f7e558bb060bda30c1879765db7d4673ff1fd337f23cf7f613b8cd750453f000413dc6a54552f9f06f8e60f0861c5a2ab4fd75dbd246263f41e
+EBUILD warsow-1.03.ebuild 4329 SHA256 0edb4ccf843e5130f31ede77975a42f3633a504f1d4553f85b79c68e1ece0afc SHA512 20982bb25f77b0a9395960707ebc018b1f45e09a0de561d4ffc7267f50bb541776743e2043450a613b72701ae2b6863a96147c6eb357db9e805d5e4c12bb29be WHIRLPOOL f3dd7c4deb6ce7a5635a31ef60424c1ece839007f2050d8515481ee4866a9f37c4c0f199e0f6507a6fb4bf3f4184757157ce30dc8fea700692c0c4cc92b7793a
+MISC ChangeLog 7997 SHA256 d576e7fa5747f1027ca5074843b2fa66fffbf479b678560b1e5c7e22e0554f0c SHA512 4fabbd0dce3776dc02f4affb4517bdbec013665a51f3c6469bc7dc030bb9eb02358a863b8c0d8ecdc41051321dd1a62f56269e5b6bfb895200884f660c8f9832 WHIRLPOOL 22f82eb20c789487f51c5717d88055626153c612621799e559ae84fb96c336dc488aca4033cbd6e61785c915f4bd5c2d21ec14c6ed93073c400423402c16c07b
 MISC metadata.xml 347 SHA256 016dbabb997c28f241f054760d9b81b1c43f5161de6d53936a2ebeb78bccdbea SHA512 34e3d6eae3b4665eac573b096d83a2841aee4488cc1a237e54e6e12c0c7ad8caefbbde6b563d1421c9d68cf7fb2b6c2446dfeddb1390971a7630b5efa494cb77 WHIRLPOOL 9d4cbde23eacc798cb4f1ac0c504963d349619229a5c2e926d8fc1348b1fefc53e999cc21e0be0cdca58affd1bfd4a275ae633709af78ca3dc808431fa365db3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR0/eXAAoJELp701BxlEWfca8P/iCUWO/OHF3ukQ0gBjjtz4Uo
-aW3AaE8C2eti0fJARY4joIObGfS7V9zPD5l5nvPVM2vufQzCBA9Dqh0oZlMkX5WO
-sFOifv8OBUhsAwF0nb4eQfI4Z2GoMZLY7u9PHWV6XXEAmR5e9P1AycL4mWXOZhph
-eeOAQ8Go0kVa0tIo6+Hoh95/unyW51jsznnlIrLVhZXxnLi3GkQl0rShA5BC0gg7
-04NgtAbKYpziZkEp9KdnZEL6EQmfMlyN7kC+e/LhATVE3Fb5OVMtYTcbnaocPZtL
-lwd8uOFeQPq5W7jsQKnBgC2yZzikAzSjwGIWQmvw3HiWFzkeGpY66HLbtkacB5Hj
-XPQXcNXhLt95eMr4V/EdJ5Q86etVvfxASg/xKkXkc2VU9rt4CWAbruFoGy5YC/Xm
-jNKNq3fWECRoLGpltGtqkptEXbT9jTB7K3gfCKMvrzQMrjaEjPXd+MsBsE9aAkTA
-EBaOkYn73ReB5otPZnyQcFaogLLbu5FnjdkRpTDhyFnrsHu3evdHK42mUPgPCghY
-Onm62nMnLgpPDA/xwZmAHh0vrdD22lpe0i4cEznOJg+oqUkeBmYkfmDMo/SjfMS/
-LvnmccdI/tUtjprMTGSZJweYGtuYBg1H1PYoVxNJpkViqtGjmbkBgGUzNzExD0Wu
-SNZQ0D8UJzmwOEwHEvym
-=YY3A
+iQEcBAEBCAAGBQJSfi4zAAoJEFpvPKfnPDWzRc8H/isvresgOKny7GzE/V/x2iPZ
+BPi9W2Vd9t02ULKWZc85UhG20Dhzbw9lzcTADBApeinuuHciIF/PL6OaGD/wYt+o
+KN9o9vUSvhoV1IyTqtXj7DKgyTP9Y27gJVGNLFzKsXBGN/10izjhR6Fu8jp+3Pmw
+rNUTuNV+CFLspKl2NGxBfgvUWXtdP+9O3uYIhVu8dx2HL6jm2TWxggV5aF3QFRWf
+Dh8SbccfiGZxodmf/aCRvfThb4vS7n6DQ94staTf8NJVtdKLx/u4rW+x2LzEA/DN
+WULZT5WQv5YhWMjdTOQA8oYz5iqC85pM5waNuDbfr1t/DX70vE7a9C55h5hg2bg=
+=a3x+
 -----END PGP SIGNATURE-----
diff --git a/games-fps/warsow/files/01-warsow-1.03-clang.patch b/games-fps/warsow/files/01-warsow-1.03-clang.patch
new file mode 100644
index 000000000000..ee8c4be46c32
--- /dev/null
+++ b/games-fps/warsow/files/01-warsow-1.03-clang.patch
@@ -0,0 +1,27 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Nov  9 11:55:42 UTC 2013
+Subject: fix clang build
+
+based on
+https://github.com/viciious/qfusion/commit/b926e692a00dcdeb25a1075c196d6bbefed34172
+
+--- a/source/unix/unix_glw.c
++++ b/source/unix/unix_glw.c
+@@ -31,17 +31,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ **
+ */
+ 
+-#include <termios.h>
+-#include <sys/ioctl.h>
+-#include <sys/stat.h>
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <unistd.h>
+-#include <signal.h>
+-#include <dlfcn.h>
+-
+ #include "../ref_gl/r_local.h"
+-#include "../client/keys.h"
+ 
+ #include "x11.h"
+ 
diff --git a/games-fps/warsow/files/02-warsow-1.03-clang.patch b/games-fps/warsow/files/02-warsow-1.03-clang.patch
new file mode 100644
index 000000000000..c660efd411cb
--- /dev/null
+++ b/games-fps/warsow/files/02-warsow-1.03-clang.patch
@@ -0,0 +1,67 @@
+From c63672c41ae5332a5d123e3d59abf38417fab961 Mon Sep 17 00:00:00 2001
+From: Victor Luchits <vluchits@gmail.com>
+Date: Sat, 12 Oct 2013 15:04:53 +0400
+Subject: [PATCH] This should fix compilation in clang
+
+ctassert<false> was evaluated in template function (probably due to two-phase name lookup?). Change it to ctassert<sizeof(typename)==0) so evaluation is delayed until actual template function instantiation.
+---
+ source/ui/as/asbind.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/source/ui/as/asbind.h b/source/ui/as/asbind.h
+index 9906859..f78ef42 100644
+--- a/source/ui/as/asbind.h
++++ b/source/ui/as/asbind.h
+@@ -268,7 +268,7 @@ struct ctassert {
+ 	}
+ 
+ 	// throw ?
+-	template<typename T> const char * typestr() { ctassert<false>(); return "ERROR"; }
++	template<typename T> const char * typestr() { ctassert<sizeof(T)==0>(); return "ERROR"; }
+ 
+ 	template<> inline const char *typestr<signed int>() { return "int"; }
+ 	template<> inline const char *typestr<unsigned int>() { return "uint"; }
+@@ -439,7 +439,7 @@ struct __ptr<T*> {
+ struct FunctionStringProxy {
+ 	std::string operator()( const char *s )
+ 	{
+-		ctassert<false>();
++		ctassert<sizeof(R)==0>();
+ 		throw Exception( std::string("FunctionStringProxy base called with " ) + s );
+ 	}
+ };
+@@ -542,7 +542,7 @@ struct FunctionStringProxy<R (*)(A1,A2,A3,A4,A5,A6)> {
+ template<typename T> struct MethodStringProxy {
+ 	std::string operator()( const char *s  )
+ 	{
+-		ctassert<false>();
++		ctassert<sizeof(T)==0>();
+ 		throw Exception( std::string( "MethodStringProxy: base class called in " ) + s );
+ 	}
+ };
+@@ -904,12 +904,12 @@ struct StripThisProxy<R(*)(A1,A2,A3,A4,A5,A6,A7)> {
+ // first define structs to get/set arguments (struct to partial-specialize)
+ template<typename T> struct SetArg {
+ 	void operator()( asIScriptContext *ctx, int idx, T &t ) {
+-		ctassert<false>();
++		ctassert<sizeof(T)==0>();
+ 	}
+ };
+ template<typename T> struct GetArg {
+ 	T operator()() {
+-		ctassert<false>();
++		ctassert<sizeof(T)==0>();
+ 		return T();
+ 	}
+ };
+@@ -1046,7 +1046,7 @@ struct FunctionPtr : FunctionPtrBase {
+ 	FunctionPtr( asIScriptFunction *fptr=NULL ) : FunctionPtrBase( fptr ) {}
+ 	R operator()( void )
+ 	{
+-		ctassert<false>();
++		ctassert<sizeof(R)==0>();
+ 		throw std::runtime_error( "FunctionPtr baseclass called!" );
+ 		return R();
+ 	}
+-- 
+1.8.4
diff --git a/games-fps/warsow/files/03-warsow-1.03-clang.patch b/games-fps/warsow/files/03-warsow-1.03-clang.patch
new file mode 100644
index 000000000000..507de2483df9
--- /dev/null
+++ b/games-fps/warsow/files/03-warsow-1.03-clang.patch
@@ -0,0 +1,39 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Nov  9 12:01:14 UTC 2013
+Subject: fix clang warnings
+
+based on
+https://github.com/viciious/qfusion/commit/792e50cc9b55e0c5e4c954a1c0c4e4a61ad54e2c.patch
+
+--- a/source/cgame/cg_draw.c
++++ b/source/cgame/cg_draw.c
+@@ -309,7 +309,7 @@ void CG_DrawMiniMap( int x, int y, int i
+ 		coords[2] = ( coords[2] + (float)z_lefttop ) / (float)map_z;
+ 
+ 		// is it a player?
+-		if( ( cent->current.type == ET_PLAYER ) )
++		if( cent->current.type == ET_PLAYER )
+ 		{
+ 			int box_size = (int)( 3.0 + coords[2] * 10.0 );
+ 
+--- a/source/cgame/cg_ents.c
++++ b/source/cgame/cg_ents.c
+@@ -376,7 +376,6 @@ static void CG_UpdatePlayerState( void )
+ 	// set up the playerstates
+ 
+ 	// current
+-	index = index;
+ 	CG_SetFramePlayerState( &cg.frame, index );
+ 
+ 	// old
+--- a/source/client/console.c
++++ b/source/client/console.c
+@@ -1343,7 +1343,7 @@ void Con_KeyDown( int key )
+ 		return;
+ 	}
+ 
+-	if( ( key == K_BACKSPACE ) )
++	if( key == K_BACKSPACE )
+ 	{
+ 		if( key_linepos > 1 )
+ 		{
diff --git a/games-fps/warsow/files/warsow-1.03-build.patch b/games-fps/warsow/files/warsow-1.03-build.patch
new file mode 100644
index 000000000000..b08376a8cc44
--- /dev/null
+++ b/games-fps/warsow/files/warsow-1.03-build.patch
@@ -0,0 +1,624 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Oct 11 15:00:18 UTC 2012
+Subject: 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
+@@ -30,6 +30,16 @@
+ # Build Warsow client without server capabilities?
+ BUILD_THIN_CLIENT?=NO
+ 
++# use system libRocket
++SYSTEM_LIBS=NO
++
++# enable verbosity
++V=NO
++
++ifneq ($(V),YES)
++Q=@
++endif
++
+ ###########################################################
+ 
+ ifeq ($(USE_MINGW),YES)
+@@ -50,10 +60,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 +72,7 @@
+ ifeq ($(OS),FreeBSD)
+ ARCH?=freebsd_$(BASE_ARCH)
+ else
+-ARCH?=$(BASE_ARCH)
++ARCH=$(BASE_ARCH)
+ endif
+ 
+ SHARED_LIBRARY_EXTENSION=so
+@@ -72,7 +82,7 @@
+ 
+ ifeq ($(DEBUG_BUILD), YES)
+ BINDIR=debug
+-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
++CFLAGS_DEBUG=-D_DEBUG
+ else
+ BINDIR=release
+ endif
+@@ -118,15 +128,22 @@
+ LIBROCKET_INC=$(LIBROCKET_DIR)/Include
+ LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a
+ 
+-CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC)
++CFLAGS_ROCKET=-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= 
+ # dynamic link to 'official' build
+ # LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/Build -lRocketCore -lRocketControls -lfreetype
+ 
++ifneq ($(SYSTEM_LIBS),YES)
++CFLAGS_ROCKET += -DSTATIC_LIB -I$(LIBROCKET_INC)
++LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
++else
++LDFLAGS_ROCKET = -lRocketCore -lRocketControls
++endif
++
+ ###########################################################
+ 
+ ####################### MINGW ######################
+@@ -195,9 +212,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 -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 +226,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 +315,19 @@
+ ######################################################################################################
+ # Helper functions
+ ######################################################################################################
++ifneq ($(V),YES)
+ DO_CC=echo "  > Compiling $<" && \
+-	$(CC) $(CFLAGS_COMMON) -c $< -o $@
++      $(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@
+ DO_CXX=echo "  > Compiling (c++) $<" && \
+-	$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
++       $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@
+ DO_RES=echo "  > Compiling resource $<" && \
+-	$(RES) $(RESFLAGS_COMMON) -i $< -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 +529,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
+ 
+@@ -609,7 +633,14 @@
+ 	@echo "> *********************************************************"
+ 	@echo "> * Building ui"
+ 	@echo "> *********************************************************"
++
++ifneq ($(SYSTEM_LIBS),YES)
+ compile-ui: $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
++$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB)
++else
++compile-ui: $(OBJS_UI_ROCKET)
++endif
++
+ link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
+ clean-ui:
+ 	@echo "  > Removing ui objects" && \
+@@ -617,7 +648,7 @@
+ 
+ $(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 +687,6 @@
+ 	@echo "> *********************************************************"
+ 	@echo "> * Building angelwrap"
+ 	@echo "> *********************************************************"
+-	-@rm $(ANGELSCRIPT_LIB)
+ $(ANGELSCRIPT_INC)/angelscript.h:
+ 	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ 	@echo "!!!"
+@@ -668,7 +698,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 +732,69 @@
+ # DED
+ ########
+ $(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(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)
++	@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)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(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)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(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)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(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)
++	@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)
++	@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)
++	@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)
++	@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)
++	@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)
++	@echo "  > Linking $@"
++	$(Q)$(LXX) $(CXXFLAGS) $(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)
++	@echo "  > Linking $@"
++	$(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
+ 
+ ######################################################################################################
+ # Meta Rules
+@@ -776,229 +806,229 @@
+ # CLIENT
+ ########
+ $(BUILDDIR)/client/%.o: qcommon/%.c
+-	@$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: server/%.c
+-	@$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: client/%.c
+-	@$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: ref_gl/%.c
+-	@$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: null/%.c
+-	@$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: matchmaker/%.c
+-	@$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
+ 
+ ifeq ($(USE_MINGW),YES)
+ $(BUILDDIR)/client/%.o: win32/%.c
+-	@$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: win32/%.rc
+-	@$(DO_RES_CLIENT)
++	$(Q)$(DO_RES_CLIENT)
+ else
+ ifeq ($(OS),Darwin)
+ $(BUILDDIR)/client/%.o: mac/%.c
+-	@$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
+ $(BUILDDIR)/client/%.o: unix/%.c
+-	@$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
+ else
+ $(BUILDDIR)/client/%.o: unix/%.c
+-	@$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
+ endif
+ endif
+ 
+ $(BUILDDIR)/client/%.o: game/%.c
+-	@$(DO_CC_CLIENT)
++	$(Q)$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: gameshared/%.c
+-	@$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
+ 
+ $(BINDIR)/warsow: unix/start_script.sh
+-	@echo "  > Installing client start script" && \
+-	cp $< $@ && \
++	@echo "  > Installing client start script"
++	$(Q)cp $< $@ && \
+ 	chmod a+x $@
+ 
+ ########
+ # OPENAL
+ ########
+ $(BUILDDIR)/openal/%.o: snd_openal/%.c
+-	@$(DO_CC_MODULE) $(CFLAGS_OPENAL)
++	$(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL)
+ 
+ $(BUILDDIR)/openal/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
+ 
+ ########
+ # QF
+ ########
+ $(BUILDDIR)/qf/%.o: snd_qf/%.c
+-	@$(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)
++	$(Q)$(DO_CC_MODULE) $(CFLAGS_DSOUND)
+ else
+ $(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c
+-	@$(DO_CC_MODULE) $(CFLAGS_SDL)
++	$(Q)$(DO_CC_MODULE) $(CFLAGS_SDL)
+ endif
+ 
+ $(BUILDDIR)/qf/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
+ 
+ 
+ ########
+ # DED
+ ########
+ $(BUILDDIR)/ded/%.o: qcommon/%.c
+-	@$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: server/%.c
+-	@$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
+ 
+ ifeq ($(USE_MINGW),YES)
+ $(BUILDDIR)/ded/%.o: win32/%.c
+-	@$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
+ else
+ $(BUILDDIR)/ded/%.o: unix/%.c
+-	@$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
+ endif
+ 
+ $(BUILDDIR)/ded/%.o: null/%.c
+-	@$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: game/%.c
+-	@$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: gameshared/%.c
+-	@$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: matchmaker/%.c
+-	@$(DO_CC_DED)
++	$(Q)$(DO_CC_DED)
+ 
+ $(BINDIR)/wsw_server: unix/start_script.sh
+-	@echo "  > Installing dedicated server start script" && \
+-	cp $< $@ && \
++	@echo "  > Installing dedicated server start script"
++	$(Q)cp $< $@ && \
+ 	chmod a+x $@
+ 
+ ########
+ # CGAME
+ ########
+ $(BUILDDIR)/cgame/%.o: cgame/%.c
+-	@$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/cgame/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
+ 
+ ########
+ # GAME
+ ########
+ $(BUILDDIR)/game/%.o: game/%.c
+-	@$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/game/%.o: game/ai/%.c
+-	@$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/game/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/game/%.o: matchmaker/%.c
+-	@$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
+ 
+ ########
+ # UI.ROCKET
+ ########
+ $(BUILDDIR)/ui/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/ui/%.o: ui/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
+ 
+ $(BUILDDIR)/ui/%.o: ui/kernel/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
+ 
+ $(BUILDDIR)/ui/%.o: ui/as/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
+ 
+ $(BUILDDIR)/ui/%.o: ui/datasources/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
+ 
+ $(BUILDDIR)/ui/%.o: ui/widgets/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
+ 
+ $(BUILDDIR)/ui/%.o: ui/decorators/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(Q)$(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)
++	$(Q)$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/irc/%.o: irc/%.c
+-	@$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
+ 
+ ########
+ # CIN
+ ########
+ $(BUILDDIR)/cin/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(Q)$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/cin/%.o: cin/%.c
+-	@$(DO_CC_MODULE) $(CFLAGS_CIN)
++	$(Q)$(DO_CC_MODULE) $(CFLAGS_CIN)
+ 
+ ########
+ # ANGELWRAP
+ ########
+ $(BUILDDIR)/angelwrap/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
++	$(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
+ 
+ $(BUILDDIR)/angelwrap/%.o: angelwrap/%.c
+-	@$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
++	$(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
+ 
+ $(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
+ 
+ $(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
++	$(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
+ 
+ ########
+ # TV SERVER
+ ########
+ $(BUILDDIR)/tv_server/%.o: qcommon/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
+ 
+ $(BUILDDIR)/tv_server/%.o: client/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
+ 
+ $(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
+ 
+ $(BUILDDIR)/tv_server/%.o: tv_server/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
+ 
+ ifeq ($(USE_MINGW),YES)
+ $(BUILDDIR)/tv_server/%.o: win32/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
+ else
+ $(BUILDDIR)/tv_server/%.o: unix/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
+ endif
+ 
+ $(BUILDDIR)/tv_server/%.o: null/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
+ 
+ $(BUILDDIR)/tv_server/%.o: gameshared/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(Q)$(DO_CC_TV_SERVER)
+ 
+ $(BINDIR)/wswtv_server: unix/start_script.sh
+-	@echo "  > Installing TV server start script" && \
+-	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 @@
+ 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 += -Wall -fPIC -fno-strict-aliasing
+ endif
+ 
+ AR ?= ar
diff --git a/games-fps/warsow/files/warsow-1.03-pic.patch b/games-fps/warsow/files/warsow-1.03-pic.patch
new file mode 100644
index 000000000000..71c4d8eed690
--- /dev/null
+++ b/games-fps/warsow/files/warsow-1.03-pic.patch
@@ -0,0 +1,11 @@
+--- 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.03.ebuild b/games-fps/warsow/warsow-1.03.ebuild
new file mode 100644
index 000000000000..471d0799c62b
--- /dev/null
+++ b/games-fps/warsow/warsow-1.03.ebuild
@@ -0,0 +1,198 @@
+# 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.03.ebuild,v 1.1 2013/11/09 12:44:30 hasufell Exp $
+
+EAPI=5
+inherit eutils check-reqs gnome2-utils flag-o-matic games
+
+BASE_DATA_PV=1.0
+BASE_DATA_P=${PN}_${BASE_DATA_PV}_unified
+DATA_PV=1.02
+UPDATE_P=${PN}_${DATA_PV}_update
+ENGINE_PV=${PV}
+ENGINE_P=${PN}_${ENGINE_PV}_sdk
+
+DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
+HOMEPAGE="http://www.warsow.net/"
+SRC_URI="http://funpark.warsow-esport.net/~warsow/${BASE_DATA_PV}/${BASE_DATA_P}.tar.gz
+	http://www.warsow.net:1337/~warsow/${PV}/${ENGINE_P}.tar.gz
+	http://funpark.warsow-esport.net/~warsow/${PV}/${UPDATE_P}.zip
+	mirror://gentoo/warsow.png"
+
+# ZLIB: bundled angelscript
+LICENSE="GPL-2 ZLIB warsow"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+angelscript debug dedicated irc openal server"
+
+RDEPEND=">=dev-libs/libRocket-1.2.1_p20130110
+	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}
+	app-arch/unzip
+	x11-misc/makedepend
+	!dedicated? (
+		x11-proto/xineramaproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
+	)
+	openal? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/${ENGINE_P}/source
+S_U=${WORKDIR}/${PN}_${BASE_DATA_PV}
+S_UPDATE=${WORKDIR}/${UPDATE_P}
+
+CHECKREQS_DISK_BUILD="1G"
+CHECKREQS_DISK_USR="500M"
+
+src_unpack() {
+	unpack ${BASE_DATA_P}.tar.gz ${ENGINE_P}.tar.gz
+	mkdir "${S_UPDATE}" || die
+	cd "${S_UPDATE}" || die
+	unpack ${UPDATE_P}.zip
+}
+
+src_prepare() {
+	if [[ $(tc-getCC) =~ clang ]]; then
+		einfo "disabling -ffast-math due to clang bug"
+		einfo "http://llvm.org/bugs/show_bug.cgi?id=13745"
+		append-cflags -fno-fast-math
+		append-cxxflags -fno-fast-math
+	fi
+
+	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
+
+	# edos2unix breaks whitespace files
+	einfo "removing dos line breaks"
+	find . -type f -exec sed -i 's/\r$//' '{}' + || die
+
+	cd "${S}"/.. || die
+	epatch "${FILESDIR}"/${PF}-build.patch \
+		"${FILESDIR}"/${P}-pic.patch \
+		"${FILESDIR}"/{01..03}-${P}-clang.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 \
+		V=YES \
+		SYSTEM_LIBS=YES \
+		BASE_ARCH=${arch} \
+		BINDIR=lib \
+		BUILD_ANGELWRAP=$(yesno angelscript) \
+		DEBUG_BUILD=$(yesno debug) \
+		${myconf[@]}
+}
+
+src_install() {
+	cd lib
+
+	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
+	doins -r "${S_UPDATE}"/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/*
+	dodoc "${S_UPDATE}"/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
+}