version bump, rm old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

6 files changed, 41 insertions, 257 deletions

diff --git a/games-fps/urbanterror/ChangeLog b/games-fps/urbanterror/ChangeLog
index 7d8b178a63a4..01447e219515 100644
--- a/games-fps/urbanterror/ChangeLog
+++ b/games-fps/urbanterror/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-fps/urbanterror
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.49 2014/10/10 15:23:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.50 2014/11/20 20:13:51 hasufell Exp $
+
+*urbanterror-4.2.021 (20 Nov 2014)
+
+  20 Nov 2014; Julian Ospald <hasufell@gentoo.org> -urbanterror-4.2.018.ebuild,
+  -urbanterror-4.2.019.ebuild, +urbanterror-4.2.021.ebuild,
+  -files/urbanterror-4.2.017-build.patch,
+  -files/urbanterror-4.2.019-build.patch,
+  +files/urbanterror-4.2.021-build.patch:
+  version bump, rm old
 
   10 Oct 2014; Agostino Sarubbo <ago@gentoo.org> urbanterror-4.2.018-r1.ebuild:
   Stable for amd64, wrt bug #518236
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 646003c1034f..a97c4d78af1b 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -3,39 +3,40 @@ 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.017-build.patch 2186 SHA256 2c430b077978c7289c2515dab5cd898b3ab0de32aa99be426047b7461ff196f9 SHA512 1c93d6e7365b77d39014af7a6e15e934cfbaf544ef688e8c84fefaca63ee8e68733ca3115611464fc097b8c9171c00df13976472976c510433dc35ac3855a2b3 WHIRLPOOL a3cefa6451b88d2a1537b711d32dea2fd253ca92a794896ec842b069189eb519fdd59b829573966d024e7a19bc3355d7d7d41028718a2b3c1bf65c8de2b89b8c
 AUX urbanterror-4.2.018-build.patch 2186 SHA256 2c430b077978c7289c2515dab5cd898b3ab0de32aa99be426047b7461ff196f9 SHA512 1c93d6e7365b77d39014af7a6e15e934cfbaf544ef688e8c84fefaca63ee8e68733ca3115611464fc097b8c9171c00df13976472976c510433dc35ac3855a2b3 WHIRLPOOL a3cefa6451b88d2a1537b711d32dea2fd253ca92a794896ec842b069189eb519fdd59b829573966d024e7a19bc3355d7d7d41028718a2b3c1bf65c8de2b89b8c
-AUX urbanterror-4.2.019-build.patch 2186 SHA256 2c430b077978c7289c2515dab5cd898b3ab0de32aa99be426047b7461ff196f9 SHA512 1c93d6e7365b77d39014af7a6e15e934cfbaf544ef688e8c84fefaca63ee8e68733ca3115611464fc097b8c9171c00df13976472976c510433dc35ac3855a2b3 WHIRLPOOL a3cefa6451b88d2a1537b711d32dea2fd253ca92a794896ec842b069189eb519fdd59b829573966d024e7a19bc3355d7d7d41028718a2b3c1bf65c8de2b89b8c
+AUX urbanterror-4.2.021-build.patch 2186 SHA256 2c430b077978c7289c2515dab5cd898b3ab0de32aa99be426047b7461ff196f9 SHA512 1c93d6e7365b77d39014af7a6e15e934cfbaf544ef688e8c84fefaca63ee8e68733ca3115611464fc097b8c9171c00df13976472976c510433dc35ac3855a2b3 WHIRLPOOL a3cefa6451b88d2a1537b711d32dea2fd253ca92a794896ec842b069189eb519fdd59b829573966d024e7a19bc3355d7d7d41028718a2b3c1bf65c8de2b89b8c
 DIST UrbanTerror-4.2.017-to-4.2.018.zip 9485349 SHA256 9d8a4cb258a60b2f464daaa998d9d26244f339fac562fb0c3cb4e00683968163 SHA512 a64e996a8538219ecc4300e25a31c14471593588e236ce4585c65d97b7306db7208f31549c08636657f1bd52142d7ba3aa2e72ab60a375d7a46949b6c18dac48 WHIRLPOOL 239595f7f75cc4fb9976c817a08eaa77e9413a913106b581459c84438babfe68c62ebb9775359c3dad460aeea48afaacd136d318ce9d0aa4abc0bd25ab92736c
 DIST UrbanTerror-4.2.018-to-4.2.019.zip 220929569 SHA256 79f1bd49cc7c84fc7d24d7219a1057ecca932de2f583b310f40af1052b494ab1 SHA512 1ad7dd8e35daf1688f2c2919108946ae19d59c4d1e267b7186287cd9c01b373db8d4a71fa44d9bede7f964badef904ed3947ff0ab66e858d8b8c1bee6db609e0 WHIRLPOOL 85e005c52821a45f4d89acc5649de2377c6b7979fe2467b77300f6fe8f5ce190132dd723b50c4e7c6ff4a3ab0daee0eba1dbf88c2afd846159a4a6ace778c544
+DIST UrbanTerror-4.2.019-to-4.2.020.zip 11159789 SHA256 fef6c8d096912d79aee4bf8fb5d68db0c7a39c97df112190aa68e8f0ce8c5e27 SHA512 59efb23b92926b5649c324d2b4a203b4caf1b77e4d40816a49abcbc9ae92d0206123034676470bc0eab1bea62e7d384dfa566b699e9e9ffacedad0fd3900e4e8 WHIRLPOOL f7b679fca1ed15628f1cdf9d3632ffb8f37b09f1b3e095598ee3d49e119964157836650c9eaacbae7b9bc95e570556a983efee180172a1e714c9121579ccbc11
+DIST UrbanTerror-4.2.020-to-4.2.021.zip 11984899 SHA256 054437b0da8e71bbaa2d964627dd41837add365116708a29a1ae481284df17f7 SHA512 9c8774d7e6e0317f8381130870a69aecefcd9d929525d0029ed9c5dc93d19fe3f85857d0c7bc9be64e936a061b2f30a242b685df27961175670eb29a0b3b6370 WHIRLPOOL a9fee3c0fda7f688c8c5664c82e6e2a4542d1496c72ff8cd572d238fa0af63fc398b9005de54093e07781abacc678c3df4cf725b348d01d1fca59fdb4f0fcb58
 DIST UrbanTerror42_full017.zip 1701599483 SHA256 d7849509c91c11e986ef6d47f51e7711ec53100ff42bef44095c32d91c65d7c2 SHA512 5363a21d6e21090a823eb21b82ac089640602151292f2985b6d26fc061e891e3bcadc5b0d4751f829cf6b9fe664bc619706e0e008210734bc1ef6afea3d46f96 WHIRLPOOL ee7553949f882c795eadc36dba57c923d3c49bc768aac128bfaae999bf9466c551df71946a9e8856210e5dea42c32887cb96d30f1339bba117bf9ee0c35c7edd
 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.017.tar.gz 10752638 SHA256 a847428923df26ce39604fc0fc4f30639e471c21fccc55eac1cf1cdfbb25125b SHA512 f4962294e6dd6ee9b9d95c526d5a77ff7f1e17f37ba72f907578f2dedd10eb8090ae9b48d7c07213f283f2bdb8cf235ec8d749d165c157ec90733477db038c3c WHIRLPOOL 366ddd149080f22f644349786e6fc81d232812f601ea9bcda3af1865589454083a54acd815388e9b8c2f9e4a3f4f028a639e9235ccfb5fca7f9b0ff728494456
 DIST urbanterror-4.2.018.tar.gz 10752968 SHA256 c1fb3eb3a1e526247352b1c6abb5432b8a9b8730731ef917e4e5d21a152fb494 SHA512 b6d306cbfeedefcc85e70a50c04e92cb509fb7e0d9b9c32dd77e287c916daa686eae3a6da8e4a9b9ad1b65b5268799ef8beb4f987b687bb5fcc05ef348872dfb WHIRLPOOL 3635c54c0e7a401d1685e6b65b2fd5afa00f3bdc86fc587b25b78be72715a318d2d2f28fe6e92b67f98b352296f5c5f79cc54688e5fd17d0ff0e3efb3f685cd0
-DIST urbanterror-4.2.019.tar.gz 10588156 SHA256 536ed6dfaec926f0a556951c96908e8611509ba8ef6c600557ced08e02e57c6e SHA512 c8ca725771523e862fb076df2f669ac511f1aa354e9507a96fe823ab7a109c0be95492394d519fb152f479842f1fbcd3af6a5ffe2a46d64a0ebfc1c882ebf48b WHIRLPOOL 67acd97df8dd4467b0c4f47a054b321a855ca1183d0c31be3efbc53d2f380470611bb4a245ab744ac571260cb933a22556c62cf87dba5726ec9e8dd7d61a5989
+DIST urbanterror-4.2.021.tar.gz 12634447 SHA256 47f37bd6c98b1771be204484a93705f22e3f085aa81c63f6269953d092b88236 SHA512 914cd7020b8914ca8b62a9d121dd7895dfaa733ff6acdca93f0737a2c8e1ddb73f9ac47935af67416e32ad9ca68095819b9d84e1a6014abc7331e85c99dc79ed WHIRLPOOL 2c465c676c2c10019468cee75b7cd69803c9b1dbbabe186f762d3471f3d3d4c31d43fd1ff4e30214a8dd4044f339727222af04ab0b8d811f2c5af52cbf6f029c
 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.018-r1.ebuild 4111 SHA256 a5a1cc573a2140964b149c8e7d28a29c671c1327d9f15deb530b64c5779b57e8 SHA512 b64b55bb53852c7df17e237ff5654d0e4bbfa6bb965305a60067a48b476df65b2ca69f37f5e650feb5a1f7e43373dd72acb9c51e8e3021eb8ea287b676afda7c WHIRLPOOL c2d1f3da425a6b1a697e03da7b1c3b30ef8f192e472095dabef3ca266d004ae20ede1ae76c7a390aab57b00b6e5cb3fb8ed5d97ada74d0bf3891fdd7b542ad67
-EBUILD urbanterror-4.2.018.ebuild 4074 SHA256 97a8b47d8b1f0180190ef4d92c7ed3eb13d4faa80fd814e28814300decc0eba2 SHA512 f652c4eeeee98c2ac33fa208f30436cec48927f14f54a71ada6bb2d15d3ad24f85eef8347a5f096a02bad5bfbbb59db7d8ebd363b1f6459283b84ee94d4094cb WHIRLPOOL b7d75ac4fd4f3bf4819ccf10593e4372072a2f020a2aefcc6990efc3e64312dac2784e1f729f184e09a93170197a26e4d1ab28431e5770750a29a3e9fd5c1132
-EBUILD urbanterror-4.2.019.ebuild 4162 SHA256 b31c02c3f60dacadc96fca13d9e1b459e1cf5b2e4866e888366907b60dfc4cb9 SHA512 c13303f91d418ab412154b677232c09045e9e5deb45e9c963f7307521c2fbf9bcf311c31730f82f5d159c3c341b341ed17f1b9a1cd3824730b9f10bbfdb48c08 WHIRLPOOL daec23bfc9fd03496fc89956c398a3d1632cd5c32cd38eb2b11b863d2a55a2f7b2ef9a0b8d3ffad1764617ea1c71d895a7718aa8571a4a2adc25e9cf1edc3447
-MISC ChangeLog 8325 SHA256 7594085cd6c2458ef7f3d8844cfae658613b8845e077399d38a8f63411e3285d SHA512 b8415e661f02d969af7e2d3232f9816b565412c095856e9e41fc3a5c29b71282adb54a5e8a70ebd2c8f4d9bbc46c13a2ae75a38c0620fbc2b72ee0cb9c7127bd WHIRLPOOL 2e36387fe5250dacca90bf849b0439d50f0c5c453e67cf9995eed14040e9dfd12a42eb5fa92be1bde5b355a1fc7904542fe5e8a8ac799da462d7539582ab58a0
+EBUILD urbanterror-4.2.021.ebuild 4133 SHA256 2722db6f5b6d7c4b351b81d055430b4d4159ff6cbf90b9d7e7047c6f20686ca6 SHA512 57187a38ad2ce6069ae6ff408636f31a926306c297a81fb19a5f8c9d1fc79ed88b261b1abc4715db6b09371dbf4853ee9516fc2778dd482fccee56bc3883845d WHIRLPOOL 27da47dcf078fd058c879916b215a3e71c4b9089ea3ecced4353deac94624d0dacced55bca5bc55aed840a0a536c7ee8c388628ef32987ee105158dd99f5735b
+MISC ChangeLog 8656 SHA256 c42637499ab0e7203207101e3ba0aa08c894c3de4403936349e07dc1b9af66f8 SHA512 32de1eaf3afaa8a26040b2459837a2b230e411e0dce23cdd68e5063b755aadf1700417928332d5167d4d03f853d26ec0dbcb897089b943641dbd2acb77cd8c5c WHIRLPOOL 9c8b476e573a45e0c5d4c72e3a870cdfe763b61ed8146e27d99c5349e2014c2694de6133ce8bce61a218929e853b08165b213ecafc5e299dc246e2d5a39ebfbc
 MISC metadata.xml 388 SHA256 cbcc13623b7e28357aad96c40b247caa5d5c9f43483c58487914db5cbec6fe6d SHA512 a0213af228c69101e9eacffe9986d12ae2d71c85f80210ba9002f7bdfa184ef0535efe77e80525c26d3ba4bf2382ba15b590754aefd6d225f6cf6e1364a8f2a5 WHIRLPOOL cf9476efaeddde34ba9801a02e5585a77eb0e0ccc024b211f65d31d75b93387f29b89172af5caf155268cd71fb7e1bb4effa3588b08d6dc50beb2dfb996fa6ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUN/oHAAoJELp701BxlEWf/v0P/0HAQaFZ17mBTuNUqVY86iYF
-yalXvdyDCjVkO6qM3nOhPCFcy9Hdjre5d75P/G7SyD9z/qfaFeqkUM/8KydJl2Fb
-c190fuVsGaXeEX6hptsdMB5LLFI/nxwDVMG4Gwu4LVmo6jcz6c4TFoSbphVMLd+9
-qUv3eyf3aM5yvb1y64e6tGauiL1btf/+dZYSZCiW7u7bjLodddz9wLI3u1W4LB8G
-O6scTxIxzv9TptrTIs6EQKnUfNKDJpxW3/snwHp6kRWnueWpvvs9PahL1IDggAu3
-y+tMlyFu+/XnUGd8xxkEnuKKWF/wVN7HQQc9PgA4E7TxOHaL0NoXw4ADINuuoGzk
-m0JK99UMRgExkujPYPHtFEQCJuKaZBxfpIzjQRJ3t+yxyR7VjwvDY3sc0Utr3yjP
-WmaNK5qLAo6keackQg1G63yrO4/dfMJhbrnvJT4c9LCVPepoWXWBbzy8rqUzLgRK
-pjy/piAX84e2VKIRelLkoDDYMM+sHA2O59DghWKPJitjWgQkNnArmbq/1nGBfPfU
-4ntSBApEMjAjFH3gWMhtyLCnCvd8g0aofU7nF21S2MysVy0VEPVqxpX0QBV1CaJj
-unV4g8vS6W2XVRlCYjUtWzy5uz7o4av8NPd/H+KSV6oSksNemoMvwqN3Pnm6WXBA
-fNo7qgJ/+dTuAo8VowyX
-=/GG5
+iQJ8BAEBCABmBQJUbkuCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgia4QANtpAaVnwt4wTttk+W4GqTO+
+l/Z3ZTVZ5gkMLOyfGQ1GfhNCLt5pKKrnUj0i8ZZOuVAnGXEMk8KEZXEC1Sozvf2v
+YpG5e2tnT+ruS8aJ4BE7lsSuJoK64oxNhK6p5QcfQULOkpIfU0y95ySQ7L1cVO+w
+FBmLhvLbEj2OHn1PGw/ECh9TysfpK6EB9lDkJ7FTyGNAPWIqjlERz7/Tg3ecW9FO
+8dH3noTP5K3oOaJuJwGNFjIFvYEeK34phuBDejE0lL96ukQ5BnY+c/7AgiCls67p
+Cb2bByEQ15Am7omwkp9p+4ZVdz7vRuRCcLK/R54CBzV85vGlJmTKplsvmaokcods
+eCGNEpCCUoFseH/xO56KaQro90Xm1FunsE+MdntTuIaTMWaKBeIdmpEiqJRi87SQ
+ACwp8V/JDq61F6c5kjj+IwIrg7HPadxIktGPVqpW/1ezm8L641OvJVnKcH+GkX9L
+tx5xD0QNzFWxWt5BSf+KouzDD0AwFSiJb30dUpMm3nLz4V+ZhbydZkJiGJOINc20
+tpizamGHiYSAnPNSh4LRAu4DlaoyDuljLXeeGlAaCyM3S89MlJpQVPXrhy/Ul05/
+4gJaN7/bIcFsNnvdht/UgEO3OulTcpr1lWo3RFZP/c7FHVhF2q3opFRQFKCC3F2C
+dDDjlxoJsGrl62R3Yzgr
+=RCWp
 -----END PGP SIGNATURE-----
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.019-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.019-build.patch
deleted file mode 100644
index daa7e324a677..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.2.019-build.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Author: hasufell <hasufell@gentoo.org>
-Date:   Wed Jul 10 01:25:27 2013 +0200
-
-    respect CFLAGS/LDFLAGS
-
---- a/Makefile
-+++ b/Makefile
-@@ -213,7 +213,7 @@
-   endif
-   endif
- 
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
-+  BASE_CFLAGS = -Wall -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 =
- 
-   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 =
-     # 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 =
-     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)
-@@ -1158,13 +1154,13 @@
- 
- $(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/files/urbanterror-4.2.017-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.021-build.patch
index daa7e324a677..daa7e324a677 100644
--- a/games-fps/urbanterror/files/urbanterror-4.2.017-build.patch
+++ b/games-fps/urbanterror/files/urbanterror-4.2.021-build.patch
diff --git a/games-fps/urbanterror/urbanterror-4.2.018.ebuild b/games-fps/urbanterror/urbanterror-4.2.018.ebuild
deleted file mode 100644
index b706d4395726..000000000000
--- a/games-fps/urbanterror/urbanterror-4.2.018.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.018.ebuild,v 1.4 2014/05/15 16:46:58 ulm Exp $
-
-EAPI=5
-
-inherit check-reqs eutils gnome2-utils games
-
-ENGINE_PV=4.2.017
-FULL_P=UrbanTerror42_full017
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://www.urbanterror.info/home/"
-SRC_URI="http://cdn.urbanterror.info/urt/42/zips/${FULL_P}.zip
-	https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${ENGINE_PV}.tar.gz -> ${PN}-${ENGINE_PV}.tar.gz
-	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
-
-# fetch updates
-if [[ ${FULL_P#*full} != ${PV##*.} ]] ; then
-	UPDATE_I=${ENGINE_PV:6:1}
-	while [[ ${UPDATE_I} -lt ${PV:6:1} ]] ; do
-		SRC_URI="${SRC_URI} http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-${PV:0:6}${UPDATE_I}-to-${PV:0:6}$(( ${UPDATE_I} + 1)).zip"
-		UPDATE_I=$(( ${UPDATE_I} + 1))
-	done
-fi
-unset UPDATE_I
-
-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,sound,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-${ENGINE_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() {
-	local UPDATE_I
-	default
-	# apply updates
-	if [[ ${FULL_P#*full} != ${PV##*.} ]] ; then
-		UPDATE_I=${ENGINE_PV:6:1}
-		while [[ ${UPDATE_I} -lt ${PV:6:1} ]] ; do
-			cp -dRpf \
-				"${WORKDIR}"/UrbanTerror-${PV:0:6}${UPDATE_I}-to-${PV:0:6}$((${UPDATE_I} + 1))/* \
-				"${S_DATA}"/ || die
-			UPDATE_I=$(( ${UPDATE_I} + 1))
-		done
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${ENGINE_PV}-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.019.ebuild b/games-fps/urbanterror/urbanterror-4.2.021.ebuild
index fe68fb078298..335ce84f55a6 100644
--- a/games-fps/urbanterror/urbanterror-4.2.019.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.2.021.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.019.ebuild,v 1.1 2014/09/19 13:43:50 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.021.ebuild,v 1.1 2014/11/20 20:13:51 hasufell Exp $
 
 EAPI=5
 
@@ -11,15 +11,15 @@ FULL_P=UrbanTerror42_full017
 UPDATE_PV=${PV:0:3}.${FULL_P#*full}
 DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
 HOMEPAGE="http://www.urbanterror.info/home/"
-SRC_URI="http://cdn.urbanterror.info/urt/42/zips/${FULL_P}.zip
+SRC_URI="http://up.barbatos.fr/urt/${FULL_P}.zip
 	https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${ENGINE_PV}.tar.gz -> ${PN}-${ENGINE_PV}.tar.gz
 	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
 
 # fetch updates
-if [[ ${FULL_P#*full} != ${PV##*.} ]] ; then
-	UPDATE_I=${UPDATE_PV:6:1}
-	while [[ ${UPDATE_I} -lt ${PV:6:1} ]] ; do
-		SRC_URI="${SRC_URI} http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-${PV:0:6}${UPDATE_I}-to-${PV:0:6}$(( ${UPDATE_I} + 1)).zip"
+if [[ ${FULL_P#*full} != ${PV#*.} ]] ; then
+	UPDATE_I=${UPDATE_PV:5:2}
+	while [[ ${UPDATE_I} -lt ${PV:5:2} ]] ; do
+		SRC_URI="${SRC_URI} http://up.barbatos.fr/urt/UrbanTerror-${PV:0:5}${UPDATE_I}-to-${PV:0:5}$(( ${UPDATE_I} + 1)).zip"
 		UPDATE_I=$(( ${UPDATE_I} + 1))
 	done
 fi
@@ -71,10 +71,10 @@ src_unpack() {
 	default
 	# apply updates
 	if [[ ${FULL_P#*full} != ${PV##*.} ]] ; then
-		UPDATE_I=${UPDATE_PV:6:1}
-		while [[ ${UPDATE_I} -lt ${PV:6:1} ]] ; do
+		UPDATE_I=${UPDATE_PV:5:2}
+		while [[ ${UPDATE_I} -lt ${PV:5:2} ]] ; do
 			cp -dRpf \
-				"${WORKDIR}"/UrbanTerror-${PV:0:6}${UPDATE_I}-to-${PV:0:6}$((${UPDATE_I} + 1))/* \
+				"${WORKDIR}"/UrbanTerror-${PV:0:5}${UPDATE_I}-to-${PV:0:5}$((${UPDATE_I} + 1))/* \
 				"${S_DATA}"/ || die
 			UPDATE_I=$(( ${UPDATE_I} + 1))
 		done