version bump

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

4 files changed, 220 insertions, 16 deletions

diff --git a/games-fps/urbanterror/ChangeLog b/games-fps/urbanterror/ChangeLog
index 383a71960ad8..8ac1e292935f 100644
--- a/games-fps/urbanterror/ChangeLog
+++ b/games-fps/urbanterror/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/urbanterror
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.25 2013/06/25 12:58:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.26 2013/07/04 13:54:46 hasufell Exp $
+
+*urbanterror-4.2.013 (04 Jul 2013)
+
+  04 Jul 2013; Julian Ospald <hasufell@gentoo.org> +urbanterror-4.2.013.ebuild,
+  +files/urbanterror-4.2.013-build.patch:
+  version bump
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> urbanterror-4.2.012.ebuild:
   Stable for amd64, wrt bug #474448
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index aa3dfb9b656d..4308750a606c 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,10 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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.009-build.patch 2157 SHA256 b946620e2e4ddb43207b7af292084ff3cb28e759b07f2f50acf042b08a3f62b1 SHA512 447291e21c305cbf5ac7ae89053f19d2f295f99aa22f5ee6ab77547b5af2e12e30eac9df5339b8d9706fbb2ae31fb2de03de9b42d5a975e695f483693a84f595 WHIRLPOOL 70238230575069e8ef699c4e508945626e1b69ef5c9c73220c0f3aefe922459f424dc28c4dddaea857962d8a593a64ae22beecb473d9a5b55545caa5c114f689
 AUX urbanterror-4.2.012-build.patch 2157 SHA256 d1a447c0ab0c67c5ab6775e234fddbbde897b953c4a36877b2756259e66e6264 SHA512 802ba7934c70f5aa60f2bcb483f3af515dafdc75be9417a59b09da1ce9de6388e0d3c5a9f903295758a453c5ef76f0ec1af5ce194d11b45eba951bf0dde95427 WHIRLPOOL 0f8ab58158c37e6ad7ae358a4ba910d13d51f05da628d7e3994b0d543449e928d299fde81f089221b618d45b2811907d1aed679f0f1b5bba70eebd0e3f0a4c89
+AUX urbanterror-4.2.013-build.patch 2157 SHA256 d1a447c0ab0c67c5ab6775e234fddbbde897b953c4a36877b2756259e66e6264 SHA512 802ba7934c70f5aa60f2bcb483f3af515dafdc75be9417a59b09da1ce9de6388e0d3c5a9f903295758a453c5ef76f0ec1af5ce194d11b45eba951bf0dde95427 WHIRLPOOL 0f8ab58158c37e6ad7ae358a4ba910d13d51f05da628d7e3994b0d543449e928d299fde81f089221b618d45b2811907d1aed679f0f1b5bba70eebd0e3f0a4c89
+DIST UrbanTerror-4.2.012-to-4.2.013.zip 103786786 SHA256 ea88a4fcba89bff56caaa982884bbd10977902a71f61c29a36ce50024cdbe017 SHA512 3c9d256df659888c94c4174e923c5dc331d6a4f19845c954b454e04eb42e6a690fb4cd5c71597659f6cae113c2a301483220fd65efc7d2d82122a8a50634a2e9 WHIRLPOOL bd03ea14e00eb65de61cbb0d33636855330f2bc941c3ade2cb95ca6e59e6f675bf98e84eba6ccf80234a191c960ab3f26c8c4a4a32c997efb4536725f540b781
 DIST UrbanTerror42_full012.zip 1529738026 SHA256 5b66e623ae5d065f8fb265e581c3640d3010af30457344874f4970d2d9092e6a SHA512 23d8ac966f6f0fbd52b633b31fc0f333151be0e64b8698b424e9f7a3524034339dd66e95c33ed1e1f451e22baa2522d30fdbc83091a3340b2ed42a55908f31ee WHIRLPOOL b438efe82d621b1800445e30c5eae5df4cfbe8ee02f1c8f58a5e33f0cf3d8261628f2100bb0e7d2782bdba0f578dcd6e626e1d3c775124d304c1c22246bad77a
 DIST UrbanTerror42_full_009.zip 1316330716 SHA256 7090820ad72cbeb556402da637a770943e64523a0eb30a3d78c8f25ed9c7025f SHA512 95241facd437224541dc0d1af5c4412b7e3ebb49a1f75f4ef7c9c779fb8ef57f8e0d9e58b71f927c9a6125a6dfbb01bcad79706cf8b84e659bd90c8e514dd1f6 WHIRLPOOL 595a9ece67a0cc7f9718f2329c50daef055e7c9794ad709186e7ab94a4cbbbfc704cbc44801c7bfa7127aad7396001beb1afcb6bc077bb64336223df3f04d95c
 DIST UrbanTerror_41_FULL.zip 754307397 SHA256 5706957783d0e4e77fcc4bbbc2df83aefc0f9a6388f6a63b60947e84f9ed265f SHA512 4ff729df5472b9bd3138e62fe2e03c794dd9293ba08106c026a120d6c9971ea2420c3e81abb99e2b2ae8a082a07e96468154958b36a770cce0e931f9a499e623 WHIRLPOOL 4752ff4455d2c69fcc732ee4035b097aed852e55bf1077c59e650297f69b87ea59ff53573b653f22843ffe7fe35e524eb66f1033049dcc364ca554bf875dad18
@@ -16,22 +18,17 @@ DIST urbanterror.svg 1592 SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec
 EBUILD urbanterror-4.1.1.ebuild 3496 SHA256 7b36c1c3042a68297172cb3c8234f14b06534dd4f597681b20c3d261fa60e699 SHA512 9eff1c92c34e35eaafd608a17aeedf02750ac95f8e30f13105767b902ee12c8e220eab8ad337504c652947a8f0ce30d3d621f7e62fde739824c73a57846e1e53 WHIRLPOOL f62bc3f94e3b7db3e71a096643f956babf2626bde449ffa357b1c73a411d28926a020d8d1c136c1135a02cdc3214a365f3977eeaabd881f0a406307423307231
 EBUILD urbanterror-4.2.009.ebuild 3295 SHA256 b6d0660951e0bdbc76d7f6353b326fba7d70e113ff3b9c0c3561d4ea08e41657 SHA512 396a008224e34b47a93609c4fb899ca12ade6cbf7002b7069c7172af467a26c477374fdaec9f5a33d32516a27127805859c29b9a75b14e5c05802b3cc800a64a WHIRLPOOL 39208881c5d2dbce0d4e67e7ce1d70b34b661cf0b189f508b6a75f3361c9cfb6c9cf0cfbf6e2b7b442f6a1f6748ee7061beb8a9c82eff09d916f96f5deb2b4d1
 EBUILD urbanterror-4.2.012.ebuild 3300 SHA256 f00d3075acd0fb84a27d5197a1e7ce3382123f039f4be33a06af8bfc13d954fa SHA512 2d382fdcfd109580be0246472ceb20c0ba6948a353ca12f9f9a14e97246d7a41d40e5c9416979cd8c1c9f780c74c9484b69607a2bea4d8efd4167378c5156095 WHIRLPOOL 6dc5244d5f7542baff5411522f8193c1ad3f6e5c62893c7716dcc2046228bf1259507950a6397d00f8cf20aaf65a0afd08c14be050e86cb817fef01a5033a41f
-MISC ChangeLog 4493 SHA256 1c534e02289be276d22d1e6b5af69677977548ad12b6338733048df3dafd37f8 SHA512 599ad2b64158d923c0eeee839289ac70e950ca237942e5b21e4280cb6d6771b85f4d51f852d962026545cc1f0bc2953070ae4a8d8bfc634331ae8791546235d7 WHIRLPOOL 6b5b6862e58b8f69264b3a1c646588f55502a89f2e6c0ad74d5d36fc4be67c7cf6935cc11716ea486da7255069cb1077c08f5690335350ac5c36db18fb5f3ebc
+EBUILD urbanterror-4.2.013.ebuild 3532 SHA256 c75b040f3c62523dd861f13c8f4b797347549f4ea8c9fae665e61dab711641a4 SHA512 bae69f2d74e1de360ec1bda3d9c27ad698a5e1b1d46398337998361500f236970c7ae96e807e3d56d0730a923482c0c0ca0f38a4fb28e4e0bf318771e5bc38ac WHIRLPOOL d5f561e507cc62a0d5a0273814a4ec766e15f333576c31d78baecb2ec904be34bf806b33a5787d483472038c9035cc579cd9ff1c94e40dd9611b3759c30b4d7d
+MISC ChangeLog 4672 SHA256 d0967082f538da296a8a1047d4c559585a9d247b9b7ac503daee321b259f5571 SHA512 26304056d860acc4f45bc7de9707f392cb3b67fae513cf5418c43e08f5f1a6e7d894545bd5e035490011d3924cd38609f4c7a9dfe36ba36cabe86d0e356bc5e7 WHIRLPOOL c4a9277ac2b2875e0ab618bd3012beed77c92dbebb616b57424d3d000499bb0e9ba5a752627143f928cd676571803fab21409e091608f9c240e63ff61c74cb3b
 MISC metadata.xml 318 SHA256 b92be79db64aa9495fc0540dcb2e8744d440938bc3fdf7a20fcc7ad2d45b084c SHA512 9d6b6289f12ca8bcc33bba5aa2ac1d6e8a256b8e7edff6e1a48326c7987656474cf355e86dbfd2ca85669757d129486db1f3cdf77180118c2136ae6995616866 WHIRLPOOL 302711496eef59814d2298bea053aecc6383dc149efedc8f07e270b3f0882a67843848e7528ac89e2502f3a64414dc9c44b9db09a9378284c57617d1eba1ba41
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRyZPzAAoJELp701BxlEWfzfMQALiid5vpumWr28eBBGQJyhPr
-SfeqqsMDd+FcO/DNSlhGneziCGEJzGkuP6bk5pICFXDZBpMoblTUMYPWEN9bKgav
-O3stolx4SEICj4Vxbm1B986dodP9AH6slordRdP/Gu2rMdMDtW5ra+gt8fvVcI/k
-8lDqBgqtkc98Umn2Oj0jIRJB/Hy67LUUdtkz4ceWsvzUG/Nax4/Z4MMkMxy3ZuvY
-Yqgr8DkQVVB7y9x0kMXtXTzh4Y6MIxXp4SEKb9pSlx6MPH20edOcVs2KGyW/an2O
-I/MhnUt8mwWRwK0L2srOqoQ6NJ5HQuSh91lA8R+yK6tfWWQCz+sveZFuuqJ3Imiv
-7JLOOZIb4/oTERJmFW+Kpn/7SeS4cULwmkEms6zQV+BmoWy6fPVUZfEeWcODXWGx
-loEUqrIqk6UQ36ncFcD/l9AegGOivfxuKkxPQCFpNXotywmyk3zFV0nh3UCyBKYA
-+QF1qPMWqbQ6GwlKZOCu6+D9ePar9I4IpNIDivzdc9Tvw8sNBSPJJNwOF7yq1XzW
-KkGbi7LMu4S7iEwea5Zz+hhD+R3zRoWXGL4qr1ywXv2GZKmasqNhiKxBAMTlFT89
-subWpg5lOEa0Xj7qW2LUqi+oQK7yBOZuHnYiBIH3FG+6sKcH0vJ6Vu96V3ClrK/r
-C73+hZomNoOuv+yhLyjD
-=0Yur
+iQEcBAEBCAAGBQJR1X6qAAoJEFpvPKfnPDWzWHkH/jhNNjr8gL/W4JlrNexaP76b
+PwdLbIjdgENvqsOzz0wFv0FqP9qkAFePJzDecrXtGOE1Yo58XX/WwclqnvMEcj6c
+qfZJHC3TOo2lcifdbDRY1zXyIAyi2WdHOU+0978KKjSY8sm03BbzlV/lLpsLWU11
++wOl08/YbnqcbbI4xplDMIYyNqGh6OkvRjZzZO2mvLDEV4/I/kg9hcZzrwbIBe9O
+7qlOG7WbCjhgR+KD5eJ7tVHwlROiC4mk3F2MoR/MaN76eN2VJR5lY8UuxfSCAD5B
+51tKw7AxlOnAeq0G/xDCz+YE1lWhVvX7xx1X9y2RHnQEXKhy/CG5A8xvYsFurjY=
+=f99P
 -----END PGP SIGNATURE-----
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch
new file mode 100644
index 000000000000..820bd0872544
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.2.013-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)
+@@ -1157,13 +1153,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.013.ebuild b/games-fps/urbanterror/urbanterror-4.2.013.ebuild
new file mode 100644
index 000000000000..0fb62aeb4ab8
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.2.013.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.013.ebuild,v 1.1 2013/07/04 13:54:46 hasufell Exp $
+
+EAPI=5
+
+inherit check-reqs eutils gnome2-utils games
+
+PREV_PV="4.2.012"
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://www.urbanterror.info/home/"
+SRC_URI="http://cdn.urbanterror.info/urt/42/zips/UrbanTerror42_full${PREV_PV:4:3}.zip
+	http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-${PREV_PV}-to-${PV}.zip
+	https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${PREV_PV}.tar.gz -> ${PN}-${PREV_PV}.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-${PREV_PV}
+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() {
+	default
+	cp -dRp "${WORKDIR}"/UrbanTerror-${PREV_PV}-to-${PV}/* "${S_DATA}"/ || die
+}
+
+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")
+
+	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
+}