version bump

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

4 files changed, 220 insertions, 9 deletions

diff --git a/games-fps/urbanterror/ChangeLog b/games-fps/urbanterror/ChangeLog
index aaa4cffce78e..a102df69b204 100644
--- a/games-fps/urbanterror/ChangeLog
+++ b/games-fps/urbanterror/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/urbanterror
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.13 2012/11/10 12:05:30 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.14 2012/11/18 01:04:08 hasufell Exp $
+
+*urbanterror-4.2.007 (18 Nov 2012)
+
+  18 Nov 2012; Julian Ospald <hasufell@gentoo.org> +urbanterror-4.2.007.ebuild,
+  +files/urbanterror-4.2.007-build.patch:
+  version bump
 
 *urbanterror-4.2.006 (10 Nov 2012)
 
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index b1b358846b15..8af739f88b83 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -4,24 +4,28 @@ 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.006-build.patch 2157 SHA256 b946620e2e4ddb43207b7af292084ff3cb28e759b07f2f50acf042b08a3f62b1 SHA512 447291e21c305cbf5ac7ae89053f19d2f295f99aa22f5ee6ab77547b5af2e12e30eac9df5339b8d9706fbb2ae31fb2de03de9b42d5a975e695f483693a84f595 WHIRLPOOL 70238230575069e8ef699c4e508945626e1b69ef5c9c73220c0f3aefe922459f424dc28c4dddaea857962d8a593a64ae22beecb473d9a5b55545caa5c114f689
+AUX urbanterror-4.2.007-build.patch 2157 SHA256 b946620e2e4ddb43207b7af292084ff3cb28e759b07f2f50acf042b08a3f62b1 SHA512 447291e21c305cbf5ac7ae89053f19d2f295f99aa22f5ee6ab77547b5af2e12e30eac9df5339b8d9706fbb2ae31fb2de03de9b42d5a975e695f483693a84f595 WHIRLPOOL 70238230575069e8ef699c4e508945626e1b69ef5c9c73220c0f3aefe922459f424dc28c4dddaea857962d8a593a64ae22beecb473d9a5b55545caa5c114f689
 DIST UrbanTerror42_full_006.zip 1274689000 SHA256 12895a047cdf36aa50a04d808971320c3fccc243de3f73b8fd3540f05030aeee SHA512 99aef3c6d3521091fbb2772cd947e0d437c0ba6018f0a344432feef7494fda9beb27af6ed7c49b8cac12ee2106aa16faa1ccbe1ee9c40a7c6f087a4146a62b11 WHIRLPOOL cd6140d01c1375f4c3ca5edf40b6471c13f4569cb6a1900e366fce01597ecd0e36909f372bb622e6e3baa00154e6959029315d46cfa07ec030a539802fa813b3
+DIST UrbanTerror42_full_007.zip 1276681432 SHA256 f4133771b035e753a6103ed9abaf6c3fd29d5b69233ba078a99b70cdf1cca4b3 SHA512 50f4eb0b0cb95acd5f5399560def1b9fa5b29b818920a124e4294a8db303c3c421598d6f2b7bbbf90aaf6d51e4fb409ab912ee701f070db32c48144f541b0b67 WHIRLPOOL 16de23bc795cdb01ac839333ff8c147a252bec726baab645dd799d8279b6f600153ed401e5eb5734e92c626d70c05e85e5f6d0feb65594ff96a23c0243c4c85a
 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 ioq3-for-UrbanTerror-4.2.002.tar.xz 14879152 SHA256 72238ca9de878a5f11f100683e60953520cdc73d74bcefd42c48f399e49be76c SHA512 cea6c4e486a6d9211a66dc6c56292594775990c83db542961b018a8ce36ce04489fdbc77e0f34f2dc0db69ac320c7cd1d7bbe34e674f1bf7dca8cf907e515b08 WHIRLPOOL dbe1b41b40cc18aea6d81cf228ac545e30fbab49652bdb472f9b9b82015152a945a8a9759a44c3c433200d36faf374fcd505f5785bd64f0ad92a22c3625420d5
 DIST ioquake3-1807.tar.bz2 7054317 SHA256 10d3fcee3cf41a063e686048740417c8d58496f3dff5745f897a8803318850c2 SHA512 5fe54b628c66bd8becab259d133825e762a0814c7060c8d1f48e2b662f07f80e50fba8c7ae0677b02e231eae59eba65e143eb802baa79a7de89a7a612ae9682d WHIRLPOOL 03ed102b386b33ceff1588966409f1d4c6be1d980b40cac0eda1d2a7e763e45b3cd21a9817f77d60157cf741f4d7479926aac118f5972bb7d5fd6bc72517faa8
+DIST release-4.2.006.tar.gz 26641871 SHA256 eff58e9a8cf394fa9dbbf15318f6946e976afdc8af824ee83fbb3489deaf849f SHA512 745c6090843ac690d45dcd0996e9bcf9945946a86ab7ea0dbb5df8bf3e398b89c4e480da9d9e40337b53e14894c826656eff60b0e7e2e812031365a7b3092cfb WHIRLPOOL 48e703387f0c1821919fb4fb74c0c7f01f275cf885a37793a826c8e7b93a79cabdf79c515c5bbfb48ec09e8db41b6433d4f44d68799cd5d88813954e45879941
 DIST urbanterror.svg 1592 SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98 WHIRLPOOL 281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c
 EBUILD urbanterror-4.1.1.ebuild 3496 SHA256 7b36c1c3042a68297172cb3c8234f14b06534dd4f597681b20c3d261fa60e699 SHA512 9eff1c92c34e35eaafd608a17aeedf02750ac95f8e30f13105767b902ee12c8e220eab8ad337504c652947a8f0ce30d3d621f7e62fde739824c73a57846e1e53 WHIRLPOOL f62bc3f94e3b7db3e71a096643f956babf2626bde449ffa357b1c73a411d28926a020d8d1c136c1135a02cdc3214a365f3977eeaabd881f0a406307423307231
 EBUILD urbanterror-4.2.006.ebuild 3196 SHA256 f11a22ae5e7e4dc5b5247833a29df54428dfe78168d89806a1011942790d8a71 SHA512 23da1e60f3c5d3deef94f14aafb9737b9f27315cd80dc8f10c855112c6ac7fbf7e69c3456a41361d8f63fe6b00c193028950d7bcc22dfff381d99288a56d55e6 WHIRLPOOL 1f6465113ad3c1f5a7883071c6465db038eb589ec2c899b4a659ff04bb2ff1639cde74c88698a0aa09e996bebe3b5276684e17f43860afa4d138e98f364689ae
-MISC ChangeLog 2441 SHA256 67b218628b961582651ec158d11cca8f7851fcec44ffaee414f8419840a5fa4d SHA512 43998c7fe2918439663b29dacfb85b2bad884f670d448c27d77db8a604cc23e17f35a24a70bc4646d905e951d36c39b68cf60cce287f5e4de4b03e9cd49d8553 WHIRLPOOL 14f0f85c6c6b2f36440a8a3285bf638a2410da60a141ca2a38de39061eeb4d8ec884166aec66bf2fcbd006fb896f43e4fc74758a998a0def881352b8a489706e
+EBUILD urbanterror-4.2.007.ebuild 3398 SHA256 67df7d86e6dc3b89f03bcf2a4fee0ab64110c9618a833a3db1e3292875f865ab SHA512 4ecbae47aef80683e64dec489a19c1ab804141a0c598bd3b7c4bfc9d2101392923ed0bc32cb43c5a5dcc0aee089436afa09e7b2027feedc8552e9b3cfc186308 WHIRLPOOL ae461bde41785cf7247f0b6bc6e78fd3871e86ab2bd41ce577579ffcbca854c7398e20630981287aafd844b0aa9f6922a03b3f3e8675c58adf137bbb42a8886c
+MISC ChangeLog 2615 SHA256 e29b932675ff2b30170c2bed4e7426774f4283211b2f49fe3eb25232b9ea1599 SHA512 28f05416bdb9c8e3d0cdfe219754b3eef22f3d2ace501dceb44eba92e8d101b1a6aeb375ac6771485c425e679399344fc72343ac77a54f8d437c4dab0ae436f8 WHIRLPOOL e626e500581acd95ea60b648cc49b56bb43cdc9e8bfa9708d4550fd8eaf638e21ae2b807244dd0ed5508b8d8bc7265802b117497b1b86a27b5599e17d65dda77
 MISC metadata.xml 318 SHA256 b92be79db64aa9495fc0540dcb2e8744d440938bc3fdf7a20fcc7ad2d45b084c SHA512 9d6b6289f12ca8bcc33bba5aa2ac1d6e8a256b8e7edff6e1a48326c7987656474cf355e86dbfd2ca85669757d129486db1f3cdf77180118c2136ae6995616866 WHIRLPOOL 302711496eef59814d2298bea053aecc6383dc149efedc8f07e270b3f0882a67843848e7528ac89e2502f3a64414dc9c44b9db09a9378284c57617d1eba1ba41
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQnkMNAAoJEFpvPKfnPDWzZSUIAIlgckqyKCEtiObmeB6P0ddx
-n+0ZugmL0Xwx9yt+B3PDeJ0H5YJVZUo0OUQoA7OpBNLGfDgT5ZPDRQfew+KQNKLG
-IX2vMg4+Ro73dGt8uGT+rCGnlG/5ZsnLeSQN14vUqDpYTn0AQg+eCLHgz+d/Cc5V
-6xtyQc6+ZUIFnLS9/wKvE8tQxlF1iW1fg+Jq23qjLK9izEWOAuWbbxsz5orHEpfu
-5b1nWFLD7cWmB4rU3RzeNte6Xzi4ysumLhiRecBSprQvQs5tb+cgl+yHjA6EiIpQ
-OLTmjksJ0wprg7djlcRfdQy8T+VaVJV1MeHjx33UGbTaKpVi02o8vgzGwhMJwo4=
-=1rm1
+iQEcBAEBCAAGBQJQqDQNAAoJEFpvPKfnPDWzW3UIALWM1lapybGn/kppAHYt2Ibx
+XPNu0QVSeZjqfFcZYg8cAnFLuxlnSPbS3CMwpG7DZMmlMop3TS3zm6XeXRF6YzLE
+vaCror0dLNlxCmFTjX66ZmY8xeLBKiuNxYeBNVGpD1fox5rZpMkQeGUlKdfUIliV
+xPxzFT7ArwCczxco8EYir6/ZJpGHmYkBQBUxX7YZtyoUY/pdnn1v85DZa6AEGhhe
+hO+t4OM7bp9m2A1QP2GA06QoU7A2mW4IQ34+5yDp++zBeWq0kPLSgSyhXLp1K+Kq
+xCnwMiK3qz27nyXclpx/BlXlZqC8dc6E123+FEnC5Oum4xIkhtwF/IXdpqfTu90=
+=hkro
 -----END PGP SIGNATURE-----
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.007-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.007-build.patch
new file mode 100644
index 000000000000..9221b671cbed
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.2.007-build.patch
@@ -0,0 +1,70 @@
+--- 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)
+@@ -1153,13 +1149,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/urbanterror-4.2.007.ebuild b/games-fps/urbanterror/urbanterror-4.2.007.ebuild
new file mode 100644
index 000000000000..296077f3a885
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.2.007.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.007.ebuild,v 1.1 2012/11/18 01:04:09 hasufell Exp $
+
+EAPI=4
+
+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://www.ftwgl.com/files/mirror/UrbanTerror42_full_${PV:4:3}.zip
+	https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.006.tar.gz
+	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
+
+LICENSE="GPL-2 Q3AEULA"
+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-4.2.006
+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_unpack() {
+	# messed up zipball, let's hope they get it right next time
+	unpack release-4.2.006.tar.gz
+	mkdir "${S_DATA}" || die
+	cd "${S_DATA}" || die
+	unpack UrbanTerror42_full_${PV:4:3}.zip
+}
+
+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")
+
+	doicon -s scalable "${DISTDIR}"/${PN}.svg
+	dodoc ChangeLog README md4-readme.txt "${S_DATA}"/readme42.txt
+	insinto "${GAMES_DATADIR}"/${PN}/q3ut4
+	doins "${S_DATA}"/*.pk3
+
+	if use !dedicated ; then
+		newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT$(usex smp "-smp" "").${my_arch} ${PN}
+		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}"/{server.cfg,mapcycle.txt}
+	fi
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	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() {
+	gnome2_icon_cache_update
+}