remove old (keep 4.1.1 since some servers still use it)

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

6 files changed, 15 insertions, 418 deletions

diff --git a/games-fps/urbanterror/ChangeLog b/games-fps/urbanterror/ChangeLog
index a2826474ba7b..0304154e2134 100644
--- a/games-fps/urbanterror/ChangeLog
+++ b/games-fps/urbanterror/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/urbanterror
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.34 2013/09/01 21:16:44 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.35 2013/09/27 23:54:41 hasufell Exp $
+
+  27 Sep 2013; Julian Ospald <hasufell@gentoo.org>
+  -files/urbanterror-4.2.012-build.patch,
+  -files/urbanterror-4.2.013-build.patch, -urbanterror-4.2.012.ebuild,
+  -urbanterror-4.2.013-r1.ebuild:
+  remove old (keep 4.1.1 since some servers still use it)
 
   01 Sep 2013; Julian Ospald <hasufell@gentoo.org> urbanterror-4.1.1.ebuild:
   update license information
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index e86e8931a907..6c5c67bc0e96 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -3,8 +3,6 @@ Hash: SHA256
 
 AUX urbanterror-4.1.1-build.patch 970 SHA256 686f183961c0ec1690696a64785bba7dbf38f7f8cf78d4cc6f8b403698342542 SHA512 8c2a5c6ca3046d5f93f7db4c1ca5d1e7f36114f0cd8cdca1d7d4cf22f4a6915463d09adc4b7d9783d91dce6232164af26ba2532b7bc9878c5e1bbfdf0154683e WHIRLPOOL 9b0ed6c6939af2d7dcc54a110752396bb29fc13238677ff35057dd3a8ab1786820e859b0962595dfe5ebac2c210f1c2e42e1356dd5c01f409bab329633e744e3
 AUX urbanterror-4.1.1-minizip.patch 773 SHA256 0e6a1144bbc47c1dfcad6565c9bb7eb07b843992a0da673644d25cc08b32df9b SHA512 3c6e6f87c7db42d5d33ec93b012c08b0cf95b403dab31367a661197b5de1e29585fc4118e8d094aec1e1f4f4ec6c899c5feb6dc5b8ac2a1c4622cf599a49cc50 WHIRLPOOL 97c042f54d6bfadcf14528505078d7f77f4f97ef9f4ec9e1f5c2bf784852645531472962fdbd1cc809ba96fb5a580249a04372559972680137caa47a92bb91b1
-AUX urbanterror-4.2.012-build.patch 2157 SHA256 d1a447c0ab0c67c5ab6775e234fddbbde897b953c4a36877b2756259e66e6264 SHA512 802ba7934c70f5aa60f2bcb483f3af515dafdc75be9417a59b09da1ce9de6388e0d3c5a9f903295758a453c5ef76f0ec1af5ce194d11b45eba951bf0dde95427 WHIRLPOOL 0f8ab58158c37e6ad7ae358a4ba910d13d51f05da628d7e3994b0d543449e928d299fde81f089221b618d45b2811907d1aed679f0f1b5bba70eebd0e3f0a4c89
-AUX urbanterror-4.2.013-build.patch 2437 SHA256 32af51b12f11d0f6b1bc13cc45653c1f3401fab7543da20dd37c0664055cf2e1 SHA512 746517bb43934ca7893845180d95726c08a0a679d960963a61012aa5a263911b5656b9d12d84ad9df79c35ca7c0e40bf17a76b3dff89b13566476f922520ff17 WHIRLPOOL 531ed9ef7eead6560b5b139b62b90d7517415a1761175d73780e86b68d857c44bb499845dfa860f4e4e3ef2919cd4cfe88e01ec32cf1fe1c46010ade8a48af9a
 AUX urbanterror-4.2.014-build.patch 2437 SHA256 32af51b12f11d0f6b1bc13cc45653c1f3401fab7543da20dd37c0664055cf2e1 SHA512 746517bb43934ca7893845180d95726c08a0a679d960963a61012aa5a263911b5656b9d12d84ad9df79c35ca7c0e40bf17a76b3dff89b13566476f922520ff17 WHIRLPOOL 531ed9ef7eead6560b5b139b62b90d7517415a1761175d73780e86b68d857c44bb499845dfa860f4e4e3ef2919cd4cfe88e01ec32cf1fe1c46010ade8a48af9a
 DIST UrbanTerror-4.2.012-to-4.2.013.zip 103786786 SHA256 ea88a4fcba89bff56caaa982884bbd10977902a71f61c29a36ce50024cdbe017 SHA512 3c9d256df659888c94c4174e923c5dc331d6a4f19845c954b454e04eb42e6a690fb4cd5c71597659f6cae113c2a301483220fd65efc7d2d82122a8a50634a2e9 WHIRLPOOL bd03ea14e00eb65de61cbb0d33636855330f2bc941c3ade2cb95ca6e59e6f675bf98e84eba6ccf80234a191c960ab3f26c8c4a4a32c997efb4536725f540b781
 DIST UrbanTerror-4.2.013-to-4.2.014.zip 21228975 SHA256 a389bbd14f3d11f294b7f3af6d543cf7d9001983ea7b71c167e6b5b7954b1db6 SHA512 f31fd4ae95f6270d7400a3e3bbdbf2fcdfb8e61016a1854d598c3d248208dc6a67bb2df8b5e1cc5461fe30caace1a827062030ce4d3e86af7035098590b9664e WHIRLPOOL 919fd5d8884b59398971ead09b60624cbcf73d85c3fe8b3860b12c36ac790ba3e475613b2e9878fc5349ea0a8274ae6554522a43dad20bda69dcb1b87a6b7a07
@@ -12,24 +10,20 @@ DIST UrbanTerror42_full012.zip 1529738026 SHA256 5b66e623ae5d065f8fb265e581c3640
 DIST UrbanTerror_41_FULL.zip 754307397 SHA256 5706957783d0e4e77fcc4bbbc2df83aefc0f9a6388f6a63b60947e84f9ed265f SHA512 4ff729df5472b9bd3138e62fe2e03c794dd9293ba08106c026a120d6c9971ea2420c3e81abb99e2b2ae8a082a07e96468154958b36a770cce0e931f9a499e623 WHIRLPOOL 4752ff4455d2c69fcc732ee4035b097aed852e55bf1077c59e650297f69b87ea59ff53573b653f22843ffe7fe35e524eb66f1033049dcc364ca554bf875dad18
 DIST ioq3-1807-urt-251210-git-nobumpy.tar.xz 276824 SHA256 9f14d629f2a9c8fe0a593b5a08d1ceadec6a22c387806d9e5f50e22a537c2b74 SHA512 e190f60d9c3275d285c75ba2947734cf9f555d373618a37f3b38464d10fa85a4af6460918676b18a96885fe7280c856f6c9877175dbbe82929f5f7c1704fc6a3 WHIRLPOOL 104960ca4066726cdd5dbd0d4d93998e6fc648c4e969109b3a1634232f6d4e3556c3107dd0f78860444ed3635bd3f4a979cb67d90a650b1dd8f51175b9b8e10d
 DIST ioquake3-1807.tar.bz2 7054317 SHA256 10d3fcee3cf41a063e686048740417c8d58496f3dff5745f897a8803318850c2 SHA512 5fe54b628c66bd8becab259d133825e762a0814c7060c8d1f48e2b662f07f80e50fba8c7ae0677b02e231eae59eba65e143eb802baa79a7de89a7a612ae9682d WHIRLPOOL 03ed102b386b33ceff1588966409f1d4c6be1d980b40cac0eda1d2a7e763e45b3cd21a9817f77d60157cf741f4d7479926aac118f5972bb7d5fd6bc72517faa8
-DIST urbanterror-4.2.012.tar.gz 25867411 SHA256 d46a2f9895e196fb64d59c1cd81384a9851e60f1abb7701f2cde50771cbf99d8 SHA512 6f070983ff2b9c2da0764819f09ec4da01f4e9ea7d27a9ad55cd15d8a924c88757b5020fe8b87dc0f162ce485fe22e0fab075a187cb10225efa561e036222983 WHIRLPOOL 082a6a04d30c8ed24a0a82f9b99b500d4224d806962ca73812b653df13a810105920613f7ecfe6ba06cddccfaed057167d46347ba866eef84095ef7ea2943073
-DIST urbanterror-4.2.013.tar.gz 9444597 SHA256 da7ceb860b8c87a776e005b5b26c8cc064cb68ab8a730e6c1fc94bb607cb88a8 SHA512 0a4a38e00b269254df3596f1b224bd18a90429983381d4e48cb4f2fde6ea8a5a60dd74f7ae4de5c36ac83c6a4cb25ad6ce675eee69d4474c6fe52c03e5a8f10b WHIRLPOOL d344040c5be517c59805ea014f04eba133dbaf3358dff0c6f34ff643ff7defa93e5c63aca5462178f3add6189af23d1724562ef6490571f8611cf1709f4e6556
 DIST urbanterror-4.2.014.tar.gz 9466024 SHA256 2f1701f5775a048defc77d5987107d8f532157f47fea3a6193ec20e84ab248d8 SHA512 952ee57c385be3381b6c96cc4ea3233d425529f3d46e5e445c09a172187990ac9303493daaf46c73ec33a555d241f9bae890d8202808dc6dceccfd3e6a374c62 WHIRLPOOL 0a8556b8b1ae724aadeea1cc5f44008b1050863521df4b054d98cc2a187ef0e3c32a1d935c270b6ed14603995f4e69ff63513f1d07869526ecb1c94efd32a6e0
 DIST urbanterror.svg 1592 SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98 WHIRLPOOL 281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c
 EBUILD urbanterror-4.1.1.ebuild 3546 SHA256 37a555af83f0dcbf24c12e3d8aff4bd995820f7f56ff641deaed9123f2438a5f SHA512 d01b9cee32576fe5dfbb40371ed42ae95d6c9835cdc7af5343417dd4b6552cb3cfa98563cb84ead4c797a1b4d624ceb9c87399b5d160ee87704d0388a266125b WHIRLPOOL 6742fd8c66fe99288a7b8169187a078fdf7d0cfe08d931f26aedb9a437af39fb4221d29cd702802ea67291f69e4ee7c7fc23a309fe0ec1b4386eb89723279ce5
-EBUILD urbanterror-4.2.012.ebuild 3335 SHA256 77f6122f0beec799caf8b3d7977c225946220cb66bdc441968558de81e6b4507 SHA512 673ce23b9c6d72e045203a72b7ac48165f6351099467ad66c27ac328cc6c00ce75e2439a2a1777d8b7c96638489a66d92182564627f89252a365f8f737eae149 WHIRLPOOL e1ab574623e8d200526af4a4d743a039f95b10936eb8411cb6ff3ecc24a0ca23a3f1b2dd4372f261c48088190eb7d2ae2ee70bbb25b736fa88b8c1f730b6a136
-EBUILD urbanterror-4.2.013-r1.ebuild 3543 SHA256 737c9e5e6e86e650e5b62a0d613cbe079958f990552196315d042aec5eb9ac46 SHA512 0576b6c192919fe487eec9a8fef6e8d91e8aae55f87606b72cd42aeecf2535e57bbe1412b035e9e030c39a16fe9472b0afb27061d6a45b09642106ae57769dc7 WHIRLPOOL 8abb16df31175869a43ab38b6c1e0c4ba02cdd01b18efe4b53a8326827bb1521c250f6f513cd38c813ceef52b5b137f469ce01106cca378aa5ee3c31ffd52b81
 EBUILD urbanterror-4.2.014.ebuild 3660 SHA256 77826d6b6dcecfed38f047b5f93f69115628a012c202d40a33fe1efda712dd4e SHA512 f45d7ef73f2eb1d7696f0a753527590c2e13ed2b861235644e99eca53ba4e69b3fb1424db342f7e3cb25e5a7e330eedfcaccb4a1cce8573ddc3f93b7adafe287 WHIRLPOOL d676aedeb4c638892050169bf19ea6b35e9df971945475901d8a345b9a1a53603da2742df4ffc59c1b17c27e9c1fe6faba97f543e6c618d5628aa2ab57dc0c7a
-MISC ChangeLog 5902 SHA256 ce600eebffb13cbfa2b7aebea944f3a0580bd00baef049b533efc3248bd17831 SHA512 99e69304613ca28d6ce1e6cf7a88711fa3c6341ac80740ab4ffd8212e847aa51722c3dc0fa0e2ecc9249333b0e705503c444ab77b1a9e82a50ed40bdc117e1ba WHIRLPOOL 9ccdd788a1c75d055a4c1c0d357864bea4570c22e32848d8cb2b10a6fe63c81e78b3af89867671d6e4d8347efcbd408d758f711dd4106fb6acd80e6a4ad2e80a
+MISC ChangeLog 6159 SHA256 5a15b1d79547f0951baf957251bc2c43ea3158f3663ce78c51772efce4eb8630 SHA512 51e714b16b1ff36cdfccf4bebac215abe0f98f81c9a1612cf839ef9b070a4760b8625cacd8ee5fbd994e36f169a9b6cb9950237963576297d8a2fb6ba98772dc WHIRLPOOL 3091219808d61ba9335b5efb86ea9adacbbd276dfe32595f4b433a092cf4653b5cdbe0cc14611be12dac116c4ae88c7d811748260aa76daa18c925f727136f31
 MISC metadata.xml 318 SHA256 b92be79db64aa9495fc0540dcb2e8744d440938bc3fdf7a20fcc7ad2d45b084c SHA512 9d6b6289f12ca8bcc33bba5aa2ac1d6e8a256b8e7edff6e1a48326c7987656474cf355e86dbfd2ca85669757d129486db1f3cdf77180118c2136ae6995616866 WHIRLPOOL 302711496eef59814d2298bea053aecc6383dc149efedc8f07e270b3f0882a67843848e7528ac89e2502f3a64414dc9c44b9db09a9378284c57617d1eba1ba41
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSI66/AAoJEFpvPKfnPDWzVOcH/25h81Z+vgK3JZx1N+1Xkhie
-AkW21wqyLw56W6gH7gZADXU/RiF+iJiEraU6RGdcjB1V0FaQA+xZz7DwwYO4RlaQ
-+y20X773T5aoJvLNQWIs9Pxz4Ez+HgJyoKuiA048yQtcVYj4MQ/mgtrIYsmzFurC
-QW0qy4ESP2YA5s/w5ZcpBBvlDQK4ntf8Ts3YWVODDkbMUfAjZlfNjbaLg7V7TeA4
-ig+zmavHURTXNizkR7TKhS/lvFH6g+q8pkkfRDd/xUpB+6spmNON9LicL+YN+rWC
-at22He/Ds77Z4P+6pO1St/fKWj3eftyK32Cj3nvUsNa27XNy2MQly/BWfoTlGfE=
-=2IHe
+iQEcBAEBCAAGBQJSRhrHAAoJEFpvPKfnPDWzO+gH/1DwzMsZsKNYdhNYFdrSO8gh
+H0Dn3pmcIXBjeYHbim3s1e6OD6G2+XkO4iVS1IFh8X/cw+zBuZTEs1iEBdOgxLiG
+hMWSpnUI8YS+OprTxhOBVg8OsMDRB7WSQ6jtLBOac9xdykx9W2bBxvdbqim/jXYf
+m1/IDfz1VDSppmDo1bB3RQr/nAYBsRd/H0CVbk19E9Fxe6YCJSpmE8As/l3OLAah
+68Sf/tG7XLp6zBZTT8Em7hcosxNjcVaWomXNBlnrecMQhGXbqbM3Zugo1Hpi7DCC
+1vkp3VVaP7y7wmMtYYeK5OX++Dna2P+rEdfyUonBaVD2LDFmgkohlpYIIV996zg=
+=OWeD
 -----END PGP SIGNATURE-----
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.012-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.012-build.patch
deleted file mode 100644
index 820bd0872544..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.2.012-build.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -213,7 +213,7 @@
-   endif
-   endif
- 
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
-+  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
- 
-   ifeq ($(USE_OPENAL),1)
-     BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -239,19 +239,15 @@
-     BASE_CFLAGS += -I/usr/X11R6/include
-   endif
- 
--  OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
-+  OPTIMIZE = -ffast-math -funroll-loops
- 
-   ifeq ($(ARCH),x86_64)
--    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
--      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
--      -fstrength-reduce
-+    OPTIMIZE = -ffast-math -funroll-loops
-     # experimental x86_64 jit compiler! you need GNU as
-     HAVE_VM_COMPILED = true
-   else
-   ifeq ($(ARCH),i386)
--    OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
--      -funroll-loops -falign-loops=2 -falign-jumps=2 \
--      -falign-functions=2 -fstrength-reduce
-+    OPTIMIZE = -ffast-math -funroll-loops
-     HAVE_VM_COMPILED=true
-   else
-   ifeq ($(ARCH),ppc)
-@@ -265,7 +261,7 @@
-     BASE_CFLAGS += -DNO_VM_COMPILED
-   endif
- 
--  DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
-+  DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE)
- 
-   RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
- 
-@@ -274,7 +270,7 @@
-   SHLIBLDFLAGS=-shared $(LDFLAGS)
- 
-   THREAD_LDFLAGS=-lpthread
--  LDFLAGS=-ldl -lm
-+  LDFLAGS+=-ldl -lm
- 
-   ifeq ($(USE_SDL),1)
-     CLIENT_LDFLAGS=$(shell sdl-config --libs)
-@@ -1157,13 +1153,13 @@
- 
- $(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
- 	$(echo_cmd) "LD $@"
--	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
--		$(LDFLAGS) $(LIBSDLMAIN)
-+	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) \
-+		$(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
- 
- $(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
- 	$(echo_cmd) "LD $@"
--	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
--		$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
-+	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
-+		$(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
- 
- ifneq ($(strip $(LIBSDLMAIN)),)
- ifneq ($(strip $(LIBSDLMAINSRC)),)
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch
deleted file mode 100644
index 868c3ccad82c..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-commit dc89402ef3305202a2ec51e6c2c073bb1f65fb54
-Author: hasufell <hasufell@gentoo.org>
-Date:   Wed Jul 10 01:25:27 2013 +0200
-
-    respect CFLAGS/LDFLAGS
-
-diff --git a/Makefile b/Makefile
-index 3c134d5..54989f3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -213,7 +213,7 @@ ifeq ($(PLATFORM),linux)
-   endif
-   endif
- 
--  BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -pipe
-+  BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
- 
-   ifeq ($(USE_OPENAL),1)
-     BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -238,18 +238,17 @@ ifeq ($(PLATFORM),linux)
-   else
-     BASE_CFLAGS += -I/usr/X11R6/include
-   endif
-- #Anything more then -O2 and *mmx *msse/2/ causes hitching with urbanterror\
--#also -march is illrelavent unless you know your target cpu
--  OPTIMIZE = -O2 -mmmx -msse -msse2 -msse3
-+ # what an idiotic comment
-+  OPTIMIZE =
- #having x86_x64 implys having full SSE support up to SSE3 so we will use it,\
- #for old cpus we don't care because anything pre Pentium 4/Althlon 1600+ won't run UrbanTerror 
-   ifeq ($(ARCH),x86_64) 
--    OPTIMIZE = -O2 -msse -msse2 -msse3
-+    OPTIMIZE =
-     # experimental x86_64 jit compiler! you need GNU as
-     HAVE_VM_COMPILED = true
-   else
-   ifeq ($(ARCH),i386)
--    OPTIMIZE = -O2 -mmmx 
-+    OPTIMIZE =
- 
-     HAVE_VM_COMPILED=true
-   else
-@@ -264,7 +263,7 @@ ifeq ($(PLATFORM),linux)
-     BASE_CFLAGS += -DNO_VM_COMPILED
-   endif
- 
--  DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 -wall
-+  DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE)
- 
-   RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
- 
-@@ -273,7 +272,7 @@ ifeq ($(PLATFORM),linux)
-   SHLIBLDFLAGS=-shared $(LDFLAGS)
- 
-   THREAD_LDFLAGS=-lpthread
--  LDFLAGS=-ldl -lm
-+  LDFLAGS+=-ldl -lm
- 
-   ifeq ($(USE_SDL),1)
-     CLIENT_LDFLAGS=$(shell sdl-config --libs)
-@@ -1157,13 +1156,13 @@ endif
- 
- $(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
- 	$(echo_cmd) "LD $@"
--	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
--		$(LDFLAGS) $(LIBSDLMAIN)
-+	$(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \
-+		$(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
- 
- $(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
- 	$(echo_cmd) "LD $@"
--	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
--		$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
-+	$(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
-+		$(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
- 
- ifneq ($(strip $(LIBSDLMAIN)),)
- ifneq ($(strip $(LIBSDLMAINSRC)),)
diff --git a/games-fps/urbanterror/urbanterror-4.2.012.ebuild b/games-fps/urbanterror/urbanterror-4.2.012.ebuild
deleted file mode 100644
index ce93d4bffc85..000000000000
--- a/games-fps/urbanterror/urbanterror-4.2.012.ebuild
+++ /dev/null
@@ -1,124 +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/urbanterror/urbanterror-4.2.012.ebuild,v 1.4 2013/09/01 20:27:35 hasufell Exp $
-
-EAPI=5
-
-inherit check-reqs eutils gnome2-utils games
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://www.urbanterror.info/home/"
-SRC_URI="http://cdn.urbanterror.info/urt/42/zips/UrbanTerror42_full${PV:4:3}.zip
-	https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${PV}.tar.gz -> ${P}.tar.gz
-	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
-
-LICENSE="GPL-2 Q3AEULA-20000111 urbanterror-4.2-maps"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+curl debug dedicated openal +sdl server smp vorbis"
-RESTRICT="mirror"
-
-RDEPEND="
-	!dedicated? (
-		virtual/opengl
-		curl? ( net-misc/curl )
-		openal? ( media-libs/openal )
-		sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video] )
-		!sdl? ( x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXxf86dga
-			x11-libs/libXxf86vm )
-		vorbis? ( media-libs/libogg
-			media-libs/libvorbis )
-	)"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dedicated? ( curl? ( net-misc/curl ) )"
-
-S=${WORKDIR}/ioq3-for-UrbanTerror-4-release-${PV}
-S_DATA=${WORKDIR}/UrbanTerror42
-
-CHECKREQS_DISK_BUILD="2700M"
-CHECKREQS_DISK_USR="1300M"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-
-	if ! use dedicated ; then
-		if ! use sdl && ! use openal ; then
-			ewarn
-			ewarn "Sound support disabled. Enable 'sdl' or 'openal' useflag."
-			ewarn
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	buildit() { use $1 && echo 1 || echo 0 ; }
-	nobuildit() { use $1 && echo 0 || echo 1 ; }
-
-	emake \
-		ARCH=$(usex amd64 "x86_64" "i386") \
-		DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
-		BUILD_CLIENT=$(nobuildit dedicated) \
-		BUILD_CLIENT_SMP=$(usex smp "$(nobuildit dedicated)" "0") \
-		BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \
-		USE_SDL=$(buildit sdl) \
-		USE_OPENAL=$(buildit openal) \
-		USE_OPENAL_DLOPEN=0 \
-		USE_CURL=$(buildit curl) \
-		USE_CURL_DLOPEN=0 \
-		USE_CODEC_VORBIS=$(buildit vorbis) \
-		USE_LOCAL_HEADERS=0 \
-		Q="" \
-		$(usex debug "debug" "release")
-}
-
-src_install() {
-	local my_arch=$(usex amd64 "x86_64" "i386")
-
-	dodoc ChangeLog README md4-readme.txt
-	dodoc "${S_DATA}"/q3ut4/readme42.txt
-	insinto "${GAMES_DATADIR}"/${PN}/q3ut4
-	doins "${S_DATA}"/q3ut4/*.pk3
-
-	if use !dedicated ; then
-		newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT$(usex smp "-smp" "").${my_arch} ${PN}
-		doicon -s scalable "${DISTDIR}"/${PN}.svg
-		make_desktop_entry ${PN} "UrbanTerror"
-	fi
-
-	if use dedicated || use server ; then
-		newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-dedicated
-		docinto examples
-		dodoc "${S_DATA}"/q3ut4/{server_example.cfg,mapcycle_example.txt}
-	fi
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	use dedicated || gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	use dedicated || gnome2_icon_cache_update
-
-	if use openal && ! use dedicated ; then
-		einfo
-		elog "You might need to set:"
-		elog "  seta s_useopenal \"1\""
-		elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	use dedicated || gnome2_icon_cache_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.2.013-r1.ebuild b/games-fps/urbanterror/urbanterror-4.2.013-r1.ebuild
deleted file mode 100644
index 5d7bbf98890e..000000000000
--- a/games-fps/urbanterror/urbanterror-4.2.013-r1.ebuild
+++ /dev/null
@@ -1,131 +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/urbanterror/urbanterror-4.2.013-r1.ebuild,v 1.2 2013/09/01 20:27:35 hasufell Exp $
-
-EAPI=5
-
-inherit check-reqs eutils gnome2-utils games
-
-PREV_PV="4.2.012"
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://www.urbanterror.info/home/"
-SRC_URI="http://cdn.urbanterror.info/urt/42/zips/UrbanTerror42_full${PREV_PV:4:3}.zip
-	http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-${PREV_PV}-to-${PV}.zip
-	https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${PV}.tar.gz -> ${P}.tar.gz
-	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
-
-LICENSE="GPL-2 Q3AEULA-20000111 urbanterror-4.2-maps"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl debug dedicated openal +sdl server smp vorbis"
-RESTRICT="mirror"
-
-RDEPEND="
-	!dedicated? (
-		virtual/opengl
-		curl? ( net-misc/curl )
-		openal? ( media-libs/openal )
-		sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video] )
-		!sdl? ( x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXxf86dga
-			x11-libs/libXxf86vm )
-		vorbis? ( media-libs/libogg
-			media-libs/libvorbis )
-	)"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dedicated? ( curl? ( net-misc/curl ) )"
-
-S=${WORKDIR}/ioq3-for-UrbanTerror-4-release-${PV}
-S_DATA=${WORKDIR}/UrbanTerror42
-
-CHECKREQS_DISK_BUILD="3300M"
-CHECKREQS_DISK_USR="1550M"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-
-	if ! use dedicated ; then
-		if ! use sdl && ! use openal ; then
-			ewarn
-			ewarn "Sound support disabled. Enable 'sdl' or 'openal' useflag."
-			ewarn
-		fi
-	fi
-}
-
-src_unpack() {
-	default
-	cp -dRp "${WORKDIR}"/UrbanTerror-${PREV_PV}-to-${PV}/* "${S_DATA}"/ || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	buildit() { use $1 && echo 1 || echo 0 ; }
-	nobuildit() { use $1 && echo 0 || echo 1 ; }
-
-	emake \
-		ARCH=$(usex amd64 "x86_64" "i386") \
-		DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
-		BUILD_CLIENT=$(nobuildit dedicated) \
-		BUILD_CLIENT_SMP=$(usex smp "$(nobuildit dedicated)" "0") \
-		BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \
-		USE_SDL=$(buildit sdl) \
-		USE_OPENAL=$(buildit openal) \
-		USE_OPENAL_DLOPEN=0 \
-		USE_CURL=$(buildit curl) \
-		USE_CURL_DLOPEN=0 \
-		USE_CODEC_VORBIS=$(buildit vorbis) \
-		USE_LOCAL_HEADERS=0 \
-		Q="" \
-		$(usex debug "debug" "release")
-}
-
-src_install() {
-	local my_arch=$(usex amd64 "x86_64" "i386")
-
-	dodoc ChangeLog README md4-readme.txt
-	dodoc "${S_DATA}"/q3ut4/readme42.txt
-	insinto "${GAMES_DATADIR}"/${PN}/q3ut4
-	doins "${S_DATA}"/q3ut4/*.pk3
-
-	if use !dedicated ; then
-		newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT$(usex smp "-smp" "").${my_arch} ${PN}
-		doicon -s scalable "${DISTDIR}"/${PN}.svg
-		make_desktop_entry ${PN} "UrbanTerror"
-	fi
-
-	if use dedicated || use server ; then
-		newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-dedicated
-		docinto examples
-		dodoc "${S_DATA}"/q3ut4/{server_example.cfg,mapcycle_example.txt}
-	fi
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	use dedicated || gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	use dedicated || gnome2_icon_cache_update
-
-	if use openal && ! use dedicated ; then
-		einfo
-		elog "You might need to set:"
-		elog "  seta s_useopenal \"1\""
-		elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	use dedicated || gnome2_icon_cache_update
-}