tidy; detangle patch

Package-Manager: portage-2.2.14/cvs/Linux x86_64

4 files changed, 87 insertions, 21 deletions

diff --git a/games-fps/urbanterror/ChangeLog b/games-fps/urbanterror/ChangeLog
index 39b4661e38f2..1cf7b5694b60 100644
--- a/games-fps/urbanterror/ChangeLog
+++ b/games-fps/urbanterror/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/urbanterror
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.54 2015/02/15 01:05:06 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.55 2015/04/06 15:30:10 mr_bones_ Exp $
+
+  06 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/urbanterror-4.2.023-build.patch, files/urbanterror-4.2.018-build.patch,
+  files/urbanterror-4.2.021-build.patch, urbanterror-4.2.023.ebuild:
+  tidy; detangle patch
 
   15 Feb 2015;  <anarchy@gentoo.org> urbanterror-4.2.023.ebuild:
   seed using 4.2.022, missed initial commit update
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 12d6e7521527..2da5872b1e5d 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX urbanterror-4.2.018-build.patch 2186 SHA256 2c430b077978c7289c2515dab5cd898b3ab0de32aa99be426047b7461ff196f9 SHA512 1c93d6e7365b77d39014af7a6e15e934cfbaf544ef688e8c84fefaca63ee8e68733ca3115611464fc097b8c9171c00df13976472976c510433dc35ac3855a2b3 WHIRLPOOL a3cefa6451b88d2a1537b711d32dea2fd253ca92a794896ec842b069189eb519fdd59b829573966d024e7a19bc3355d7d7d41028718a2b3c1bf65c8de2b89b8c
 AUX urbanterror-4.2.021-build.patch 2186 SHA256 2c430b077978c7289c2515dab5cd898b3ab0de32aa99be426047b7461ff196f9 SHA512 1c93d6e7365b77d39014af7a6e15e934cfbaf544ef688e8c84fefaca63ee8e68733ca3115611464fc097b8c9171c00df13976472976c510433dc35ac3855a2b3 WHIRLPOOL a3cefa6451b88d2a1537b711d32dea2fd253ca92a794896ec842b069189eb519fdd59b829573966d024e7a19bc3355d7d7d41028718a2b3c1bf65c8de2b89b8c
+AUX urbanterror-4.2.023-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
@@ -16,17 +14,6 @@ DIST urbanterror-4.2.023.tar.gz 12637911 SHA256 17c79f4ed1adc0859a20f0b19ab75f04
 DIST urbanterror.svg 1592 SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98 WHIRLPOOL 281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c
 EBUILD urbanterror-4.2.018-r1.ebuild 4111 SHA256 a5a1cc573a2140964b149c8e7d28a29c671c1327d9f15deb530b64c5779b57e8 SHA512 b64b55bb53852c7df17e237ff5654d0e4bbfa6bb965305a60067a48b476df65b2ca69f37f5e650feb5a1f7e43373dd72acb9c51e8e3021eb8ea287b676afda7c WHIRLPOOL c2d1f3da425a6b1a697e03da7b1c3b30ef8f192e472095dabef3ca266d004ae20ede1ae76c7a390aab57b00b6e5cb3fb8ed5d97ada74d0bf3891fdd7b542ad67
 EBUILD urbanterror-4.2.021.ebuild 4133 SHA256 2722db6f5b6d7c4b351b81d055430b4d4159ff6cbf90b9d7e7047c6f20686ca6 SHA512 57187a38ad2ce6069ae6ff408636f31a926306c297a81fb19a5f8c9d1fc79ed88b261b1abc4715db6b09371dbf4853ee9516fc2778dd482fccee56bc3883845d WHIRLPOOL 27da47dcf078fd058c879916b215a3e71c4b9089ea3ecced4353deac94624d0dacced55bca5bc55aed840a0a536c7ee8c388628ef32987ee105158dd99f5735b
-EBUILD urbanterror-4.2.023.ebuild 4229 SHA256 e819705661845740de2afa20f46299c1043b684d005a600725bbe664e3012e29 SHA512 2f44bef4dfb48ffdac33ae298d09f87ea480b68033cfb2ec466860bf18239b5337f8571834c5dbc640c6411f3db9a8c3b0b2adbd1f66d68f60e18226fff39fc2 WHIRLPOOL 8d699a8b92b973245f282f1fc75d48101bde4101ed657149b69d0302be1da502b82e86465bec6ea255d42be197e6b69f6daf586b0c6fd1d309f1d31acce44735
-MISC ChangeLog 9229 SHA256 eefc7d27d3eee3b784bde38341c5d767447689d9a1f0bfd90e2531e905faa22c SHA512 792bd7183458f57aff22a46ff3d9404a3e85eb325f2a11d8095927ccaa9aa7fe86cb4f45b4824d619b0ac7068c9726909426c6b4fb0a0c292333cb2ed7d75f02 WHIRLPOOL 163c864f7ff1ea5cd0743aab5fdb4d67fa30aac0169e450b1a20d0071c43d6b12908a2d9e67cfc471dd990d5228f7c1bc7da55109d53c95b2ee602efd4b25423
+EBUILD urbanterror-4.2.023.ebuild 4235 SHA256 cac8feba5f14dd537ad887052f99dc8f45f1c13ff5dd5d63f8a25ee660192b9e SHA512 ded2bbf968e5a78e386f2437c968a1aa82e6b5e694a772af7e69106f09b8f3aae34155cc6a20f94f3db8dadff13dd4342776c4b5ccd8958093c40b269b50d703 WHIRLPOOL 59248a83c0ddd0689ac2717ffd699e9bc57a3191f498ee72ddf1176afda5f529ed4a18e9a8f43fa84000858b37bed669047353f79331ad6f4fed979b40e660db
+MISC ChangeLog 9460 SHA256 ddb5ae2cf8ee59c469c5591ab6e2ab75f5cf3889310bb0ff50fb5bab62b5d743 SHA512 ea6e12bf242d1fe2d7fdde03616f3ec7926637d326324ce4f753b63b8dee74436287c7eec7859b8489c7cacfb090189fc5b68cac8f96ac5ae0fd8ec2963751a1 WHIRLPOOL 357f7307650f9f783408074a1904b091d08a6d39490d7f2043259c169e20ad173b3096ac259744817d87a8215b5f367624d7adaaef701fa9c69d9c83c0c5459c
 MISC metadata.xml 363 SHA256 d4e0fbb2e1bcace7113d5e1252be857d25b0bee8648c172da412d8a76617cfd1 SHA512 2f480263dc5a89e06a6cb2c6e98f96322da771431524200b224bb120848507c872fb9770b4b701d0e27564fa3c0083809f96f43bb3460c3d36cdf719651c3eaf WHIRLPOOL fa2507d10e2a419243d184fcda2dca63a714f78d7e7d9a560c912ba3c0764ba801548afcfc91a76c3354a3bfd61b8ff2a43e1cad11d36a46bbac7e8fb639a239
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJU3/BjAAoJEKDMw7q00Ii08F4IAMA3G5a1sjuIv75M6UFnUiKH
-nkq6O+5Zba4QQIGAboY2mjTiUJ88OjpeywBW9dB8dDCx83QHiUbrGe8xagnd0928
-5EV7BeEwfmJV2XNEVHonNRImopLBAPmzTvl2pYIUcLfLDT+z89Y98BNY4Sf9IjBh
-Ti5DKklfvj/SrSVcdVmYboq2ZFEKF61UEjOj+Xly9FLR4Z8EsrJ4X5l1Zk5is1g+
-OIkkH676sOx9+NdZDZTG0zMnVOdAiajV6B/VcoRJrKcy3zQaknzZc6WnusZl3wdz
-oqBTc2BmhJYgnpB+d12aLfwhk9Hnb77K6xtY5T0/wn3cZ6qXsv7SUMeRzM1sZXk=
-=aQN6
------END PGP SIGNATURE-----
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.023-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.023-build.patch
new file mode 100644
index 000000000000..daa7e324a677
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.2.023-build.patch
@@ -0,0 +1,75 @@
+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/urbanterror-4.2.023.ebuild b/games-fps/urbanterror/urbanterror-4.2.023.ebuild
index 5e1f5802b7a1..a913e30e8b67 100644
--- a/games-fps/urbanterror/urbanterror-4.2.023.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.2.023.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.023.ebuild,v 1.2 2015/02/15 01:05:06 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.023.ebuild,v 1.3 2015/04/06 15:30:10 mr_bones_ Exp $
 
 EAPI=5
-
-inherit check-reqs eutils gnome2-utils games pax-utils
+inherit check-reqs eutils gnome2-utils pax-utils games
 
 ENGINE_PV=${PV}
 FULL_P=UrbanTerror42_full022
@@ -82,7 +81,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.021-build.patch
+	epatch "${FILESDIR}"/${PN}-${ENGINE_PV}-build.patch
 }
 
 src_compile() {