version bump

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

4 files changed, 192 insertions, 9 deletions

diff --git a/games-fps/urbanterror/ChangeLog b/games-fps/urbanterror/ChangeLog
index 7d108f75b118..4103ca22dcc1 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.9 2012/10/26 20:45:41 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.10 2012/11/01 21:43:39 hasufell Exp $
+
+*urbanterror-4.2.004 (01 Nov 2012)
+
+  01 Nov 2012; Julian Ospald <hasufell@gentoo.org> +urbanterror-4.2.004.ebuild,
+  +files/urbanterror-4.2.004-build.patch:
+  version bump
 
 *urbanterror-4.2.003 (26 Oct 2012)
 
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 390df20b1d4b..a42e03d1b62e 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -4,24 +4,27 @@ 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.003-build.patch 1486 SHA256 99566ad0f5a5eed7e985aaac19a1b9a806728fd84e1cbb216f7fc1825457334d SHA512 a60067feb38db33ddefceee84ee68753196b6ea7c48fdfe0e57c150b36bb0a0661ea09e54b0ae0c857389d7d0b0279fdfd1ac73af4f67129cdf60979f58dcd9d WHIRLPOOL ae8e3c081d3267f297c7761400521b35f4e74a84eede5984de676fe4757de60cb23e0ad943d8aa6c33d6bdfcdc3fcff6970413a8dc34644768ffc4af0f49fa3c
+AUX urbanterror-4.2.004-build.patch 1486 SHA256 99566ad0f5a5eed7e985aaac19a1b9a806728fd84e1cbb216f7fc1825457334d SHA512 a60067feb38db33ddefceee84ee68753196b6ea7c48fdfe0e57c150b36bb0a0661ea09e54b0ae0c857389d7d0b0279fdfd1ac73af4f67129cdf60979f58dcd9d WHIRLPOOL ae8e3c081d3267f297c7761400521b35f4e74a84eede5984de676fe4757de60cb23e0ad943d8aa6c33d6bdfcdc3fcff6970413a8dc34644768ffc4af0f49fa3c
 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 urbanterror-4.2.003-to-4.2.004-update.tar 40075264 SHA256 b207221db1b75c8f053a9ee0db328245992918d5cd2fac2f4c85c9c6dd0fbdc7 SHA512 0d319f2dbb0143b4fc85d9562a688720a875415bd55e381a25b45deb6215ab26c1ffd5eb00e09bee874c00f1a68d6993f6d5ace84af7483117c5f53d64a715e4 WHIRLPOOL 6a95ea9a32c72cc63389d0b97b45f924bb15192b8301d5d963623ff5fea0dde36eed84789116e693d4ac1c5768426af5d34113299d16ae7e794f69355b8bfcc7
 DIST urbanterror-4.2.003.tar.xz 1261543556 SHA256 4eef34227d1dc06b6d1b70af2603e5286dc130e9e65aececc8c9d4d1614a4d4a SHA512 f9b541027f39a1cc7cfafc931bf9dba1d3eb0acba9d241dae3e970a183a917a8797dc5e63d1d4dc0719461509d56734178eebcd2ef10f34327253408b6ab6ef7 WHIRLPOOL 532c589c5ed9c1c3b701cc47a87c437b93d76925fdd9e83b43c5fb431dd95becdbfabc1338089086f964263ae09d37403d003560a91d2579fadb28251d555867
 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.003.ebuild 3128 SHA256 bf59bffe912feee5d58ddfb04dc2a6a0bb17c067621a805e7d2ff94d84e0d1af SHA512 4a54279467d63a1d50cb0647b041f23fac9b1048123b4e19a35191f2112123c910f930376c635ae569fbb47e8b8f1ae477b810c5ecbf3424e64683d52ceb5cc6 WHIRLPOOL 1bb42bbcebca48a4af6e4b715b9cf2801bfd6033bc4927d4981c3e2e2d3df27c8b9efff12d1e7066d2db5b226855895ddcbf58def643520c4cbdea8712d672b0
-MISC ChangeLog 1570 SHA256 daf6f9d45d3e128583f36b85c8d662dd24eaf4b8e9cd9ec6270f7de6f2123df8 SHA512 a892160467e2b95fa9ad6e0b7c5814ec6abdc96c6c19086d0c73cfcdc3c5e8cb2483568acbc3b55028963182454242d1dcbf479afc4fbb9ddbd09e83f458b76f WHIRLPOOL 7734e421df62c994b8ed62269bdb541fabdcc598c78fef8c92ce243adcca1586978992546fc3ae7726364093d4de349763d8cb8393918e388315d0ff456b007e
+EBUILD urbanterror-4.2.004.ebuild 3278 SHA256 117e4217a338f661c00f585918fc1be0bde81d92e672c83d60d1d03026590e36 SHA512 1e5f7b322f72dc9b3acd8b032fb8585a35293e5044f7157e0df63878ddf9fc7747228251aea6701d53c8491e8e41977f7104f3d4993e8072f5960ba01c161809 WHIRLPOOL f200d2b03cda2b6f7df12602bfe69650207d823a206edef8922a5efb5638928d886b949efdd568b271af82469842e019802e88cd5fbe0d9fb473986a566500a0
+MISC ChangeLog 1745 SHA256 83899355b5b1613620001fb3609789df77957dba9457b64e5decb63f8339bed4 SHA512 128c99d9e3b45cecad1affa944fd34ecb774d8d6d2ccc058a31374ac676cec3e9df62d517af6f0513de352db2df78bf959229ac18e32d45036250603c5274f83 WHIRLPOOL b833b6e3429ff6a0f4ee3526194126d3abe90bb6fed36f88e501d1ede89a3e89312da2ea529d4ba4ac9097b2f1a1524c2cdd0cdaedf220d89f41a2fad83e1ad3
 MISC metadata.xml 318 SHA256 b92be79db64aa9495fc0540dcb2e8744d440938bc3fdf7a20fcc7ad2d45b084c SHA512 9d6b6289f12ca8bcc33bba5aa2ac1d6e8a256b8e7edff6e1a48326c7987656474cf355e86dbfd2ca85669757d129486db1f3cdf77180118c2136ae6995616866 WHIRLPOOL 302711496eef59814d2298bea053aecc6383dc149efedc8f07e270b3f0882a67843848e7528ac89e2502f3a64414dc9c44b9db09a9378284c57617d1eba1ba41
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQivZ6AAoJEFpvPKfnPDWzzEEIAJa3rvHb2QskBlxM9FQImICP
-4/OPjQ27PZq2fnc1dYCTtIPDb/0RedBQEcGR+KsppMMlR0ZBkp8Maw7ErRlzMKYF
-Hda6DUdhKgjVAMR8y4E4a5R4DjG90I39SxVjkYlEnjByOp1ZxXrf7GobypYvI105
-ujA091K5D3JwCTAJYIycQfHj0L+eSg4pP9MSaYpa5KuQ8tJAd4iX4/QscDzgSB/q
-wI56eRyc1WRfUq1iAC3HJazI/YtcF3p48r6EYvbBtMdC0Du1/tLsGBpZaOqo4nx7
-OLbUCG8x9B6TUoLNF+KhXlePYPFZJevlCVjF2aNgNySOjj6S6lJTvd5QUwaPmEQ=
-=b18Q
+iQEcBAEBCAAGBQJQku0QAAoJEFpvPKfnPDWzPWoIAIkd+DkqVMNajNwIf5OLsxLq
+R3D+oeS6DvjSSkmbRYI0MZQqGkLA0DaBcK2YT0oyJnkLdyKT737vdqnacv36cNZP
+LCjHJclVhaP0vWCCUraONtrvspBbJFVtTI1IDWB0y47xS5rXBr4PRtswPpoTBaro
+06UCtdZ0hA4+UKtj1kuXoWfUXndPy5VuSPcc9kZFreKkm012En/XKmYRMXPNKSct
+O9PoltlllfJGbVW3+s4CHdAeRu0FbNqvSAqxwNEECVxMytTH7NrHEo+kheqnA70+
+VaAlgO4pXY5Edj2kv2lWi/p1LDnUP0ryu5x5kUgiWFfNveIaSwHs5Dqh4pwywCY=
+=GCZ4
 -----END PGP SIGNATURE-----
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.004-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.004-build.patch
new file mode 100644
index 000000000000..7cc4623f9bd4
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.2.004-build.patch
@@ -0,0 +1,52 @@
+--- 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)
diff --git a/games-fps/urbanterror/urbanterror-4.2.004.ebuild b/games-fps/urbanterror/urbanterror-4.2.004.ebuild
new file mode 100644
index 000000000000..d2eb635998cf
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.2.004.ebuild
@@ -0,0 +1,122 @@
+# 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.004.ebuild,v 1.1 2012/11/01 21:43:39 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://178.63.102.135/svens_stuff/UrbanTerror42.tar.xz -> ${PN}-4.2.003.tar.xz
+	http://dev.gentoo.org/~hasufell/distfiles/ioq3-for-UrbanTerror-4.2.002.tar.xz
+	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg
+	mirror://gentoo/urbanterror-4.2.003-to-4.2.004-update.tar"
+
+LICENSE="GPL-2 Q3AEULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl debug dedicated openal +sdl server smp vorbis"
+
+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}
+	dedicated? ( curl? ( net-misc/curl ) )"
+
+S=${WORKDIR}/ioq3-for-UrbanTerror-4.2.002
+S_DATA=${WORKDIR}/UrbanTerror42
+S_UPDATE=${WORKDIR}/urbanterror-4.2.003-to-4.2.004-update
+
+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_CURL=$(buildit curl) \
+		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}"/q3ut4/readme42.txt
+	insinto "${GAMES_DATADIR}"/${PN}/q3ut4
+	doins "${S_DATA}"/q3ut4/*.pk3
+	doins "${S_UPDATE}"/*.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
+}