version bump

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

4 files changed, 213 insertions, 9 deletions

diff --git a/games-fps/urbanterror/ChangeLog b/games-fps/urbanterror/ChangeLog
index 21616741f2b2..0491438ac3c1 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.16 2012/12/05 20:41:41 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.17 2012/12/23 16:13:44 hasufell Exp $
+
+*urbanterror-4.2.009 (23 Dec 2012)
+
+  23 Dec 2012; Julian Ospald <hasufell@gentoo.org> +urbanterror-4.2.009.ebuild,
+  +files/urbanterror-4.2.009-build.patch:
+  version bump
 
   05 Dec 2012; Julian Ospald <hasufell@gentoo.org> urbanterror-4.2.008.ebuild:
   update SRC_URI wrt #446148
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index fbb652d4eb8c..22632ee1bf2e 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -4,7 +4,9 @@ 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.008-build.patch 2157 SHA256 b946620e2e4ddb43207b7af292084ff3cb28e759b07f2f50acf042b08a3f62b1 SHA512 447291e21c305cbf5ac7ae89053f19d2f295f99aa22f5ee6ab77547b5af2e12e30eac9df5339b8d9706fbb2ae31fb2de03de9b42d5a975e695f483693a84f595 WHIRLPOOL 70238230575069e8ef699c4e508945626e1b69ef5c9c73220c0f3aefe922459f424dc28c4dddaea857962d8a593a64ae22beecb473d9a5b55545caa5c114f689
+AUX urbanterror-4.2.009-build.patch 2157 SHA256 b946620e2e4ddb43207b7af292084ff3cb28e759b07f2f50acf042b08a3f62b1 SHA512 447291e21c305cbf5ac7ae89053f19d2f295f99aa22f5ee6ab77547b5af2e12e30eac9df5339b8d9706fbb2ae31fb2de03de9b42d5a975e695f483693a84f595 WHIRLPOOL 70238230575069e8ef699c4e508945626e1b69ef5c9c73220c0f3aefe922459f424dc28c4dddaea857962d8a593a64ae22beecb473d9a5b55545caa5c114f689
 DIST UrbanTerror42_full_008.zip 1307943759 SHA256 f3e97c0c92001890df07ce3e8b1b345d35cc53e61ce9fab83e9bbcb5b062fe79 SHA512 a2fdde319ada4bb407e62dfcc15f5a1a846bc60c9820c42c0953fd748bc99ebd7ebf035f871b9ded859ca6d221ef479295ccc4ee682ba042d259cc5e5a9e8255 WHIRLPOOL 73aefa66441adc95879998ef663bb7d13b37120e0c7b85bbe1f5ee2e4068d9d52b402c8bbca4840a6e4f88849c4e87abd03ce7ecb4dfa57862f37b17e4d4290c
+DIST UrbanTerror42_full_009.zip 1316330716 SHA256 7090820ad72cbeb556402da637a770943e64523a0eb30a3d78c8f25ed9c7025f SHA512 95241facd437224541dc0d1af5c4412b7e3ebb49a1f75f4ef7c9c779fb8ef57f8e0d9e58b71f927c9a6125a6dfbb01bcad79706cf8b84e659bd90c8e514dd1f6 WHIRLPOOL 595a9ece67a0cc7f9718f2329c50daef055e7c9794ad709186e7ab94a4cbbbfc704cbc44801c7bfa7127aad7396001beb1afcb6bc077bb64336223df3f04d95c
 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
@@ -12,16 +14,17 @@ DIST release-4.2.007.tar.gz 26640879 SHA256 96f39ad2b952b38d1fc53dd04198352fe0b3
 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.008.ebuild 3234 SHA256 aaaf8d01bca0c399add6653a1da98f3abd00533cd3d95e5576040490688477de SHA512 8bfcdabb9b9ed98ba37946bc5860981f4e92b43873f484f59b5f75be0b6f70c6a7bb6dc6c5cb62a1d2e70e944d82a9d766967837f4340cea9ccf345671a56da8 WHIRLPOOL e92e6d34d6dee158f0ab67272e62e45607e1e2b7f34d0a049b497777df0390419b7fa8ffbea8001a3f29fe28234b68c45e2a3b3f0510100fce749c23da38aad1
-MISC ChangeLog 3052 SHA256 e4dd3e87907ec57153c6976631c1f87e5b7cfbb58792c0dd57bb0d4c953b3c45 SHA512 218173102f1f2679e2cf7bf1947a7015d629a33ceab13f66d8c9ed310651ee64d85df1e591b8acaf8b2ed6710cfec1f054761dbcee57bede3729b9fa38524cc1 WHIRLPOOL 5896a9ff7849f50a33a44db2a9721a7db4b72e5cc65d5f02fa7804b01f4bb89eaf410237d8b7e3a18c821efe62e86f90d49313b2122e46a1b50e51def3d61bd6
+EBUILD urbanterror-4.2.009.ebuild 3302 SHA256 93db905e9480210b542ce575454d2133284b095447ae23fbbc167c2de1ef32d7 SHA512 aebd4b9463629f5a475d5891de550f08d64d6da74135275081438aec46e59e38e5ae3cd2a20e607b7282da2c04893fd999c0c033208c45e3d77fa1defa63f64c WHIRLPOOL d180aa761d58d13cdfab83241e0780c85b9403f489d9e8c1c6de2468dc458b1a6f20b3bd7e5e277f55b640dcc889faf803898e7c9efbbffbbab92412349f0f2f
+MISC ChangeLog 3226 SHA256 323e0dd6c68f4682532fc0b35889265b6b6bc32252102eb6772d0e9ddae45d88 SHA512 1e1acd69d15d99e1da7288b7d634384162fd87a98a46cf28b4bd534f5871dc3e5614942bb3f7f8f55f8741119322e2440503633c0992bd896b9962a082d36ec2 WHIRLPOOL e1912ca9fc8fd138a6081f01d6786b3897a62cda363cd6352ff44f0d7db41fe3819f90ba59eaa4fdf94073dcecae2f53d2188f796e00728ba3335eaa60580849
 MISC metadata.xml 318 SHA256 b92be79db64aa9495fc0540dcb2e8744d440938bc3fdf7a20fcc7ad2d45b084c SHA512 9d6b6289f12ca8bcc33bba5aa2ac1d6e8a256b8e7edff6e1a48326c7987656474cf355e86dbfd2ca85669757d129486db1f3cdf77180118c2136ae6995616866 WHIRLPOOL 302711496eef59814d2298bea053aecc6383dc149efedc8f07e270b3f0882a67843848e7528ac89e2502f3a64414dc9c44b9db09a9378284c57617d1eba1ba41
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQv7GJAAoJEFpvPKfnPDWzDs4H/30m1ZE9y4tJYl+1FcNYWpcK
-sk+WDcvt/ENlI2PIc1xY6NPLrbj4+oI2ahrDa1EJ2dLTc1Y3iZhZMVDJJcf2gxBB
-BrPViNc+f8FxQV+/nMJl0Ele7NWa67m8b2174b6RUsJAOctsWlCc7I44UwxrN4DE
-pEl+56K8GYwl3upba+wK3foJ/mWmje+CNWn7z/nYkZ8KEZdCTBbNXsi2zxPLxBRA
-C59w25R/nBIqbARy5cOYuaPevJOT3dMB7iFeMwEhSsHUCCOYLxHTSr15OaevoqzS
-fkkiy6QR1dTmctIP/T0r4KBuXpR4IV+UleCXRC7LpRs6tN9gGhzjc03CO5uecRY=
-=upY5
+iQEcBAEBCAAGBQJQ1y21AAoJEFpvPKfnPDWzcX8H/1k4XPjVUJ3oHCi1mwUHVEep
+vdZIvzGFhEUFW1zT4lsn1lnD9qPHcA4PshBK872Ic/39pB/owutH2iAn9vogvHob
+Zby0JrfAeB6XKUMt6SU1c4pS0oXQMHfGKD7NXK/eKAHdlxNGA19AIUhagoZ5eo7+
+rE0pfSLEQdWn/H+Z+IY/97tpjMXgBoh7omvYasz54r+2/6Wn/xu3xl3ltsVClHVz
+WDJhiHlFz4BDKh9kZ0hnWtS3nrfDY2qF8vG1RI0qK2Tr+WiJYs/dJ86+BO0jgQC/
+oEbM5YoR3EoL+/9X26LbS9cCLPbNEmBmrj508wDeie4n4WMmsBBVCCIVvFt8iNA=
+=Fvxi
 -----END PGP SIGNATURE-----
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.009-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.009-build.patch
new file mode 100644
index 000000000000..9221b671cbed
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.2.009-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.009.ebuild b/games-fps/urbanterror/urbanterror-4.2.009.ebuild
new file mode 100644
index 000000000000..090b106e0f39
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.2.009.ebuild
@@ -0,0 +1,125 @@
+# 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.009.ebuild,v 1.1 2012/12/23 16:13:44 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://download.urbanterror.info/urt/42/zips/UrbanTerror42_full_${PV:4:3}.zip
+	http://www.ftwgl.com/files/mirror/UrbanTerror42_full_${PV:4:3}.zip
+	https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.007.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.007
+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")
+
+	doicon -s scalable "${DISTDIR}"/${PN}.svg
+	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}
+		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.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
+}