Some minor code cleanups and changing the text on the desktop icon.

Package-Manager: portage-2.1.2_pre1-r4

4 files changed, 41 insertions, 38 deletions

diff --git a/games-fps/ut2004-demo/ChangeLog b/games-fps/ut2004-demo/ChangeLog
index b977880225ab..14e4fc97116d 100644
--- a/games-fps/ut2004-demo/ChangeLog
+++ b/games-fps/ut2004-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/ut2004-demo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ChangeLog,v 1.39 2006/09/19 19:48:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ChangeLog,v 1.40 2006/10/02 15:31:42 wolf31o2 Exp $
+
+  02 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  ut2004-demo-3334.ebuild:
+  Some minor code cleanups and changing the text on the desktop icon.
 
   19 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   ut2004-demo-3334.ebuild:
diff --git a/games-fps/ut2004-demo/Manifest b/games-fps/ut2004-demo/Manifest
index 611519f200a0..fcca101ce1cd 100644
--- a/games-fps/ut2004-demo/Manifest
+++ b/games-fps/ut2004-demo/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ut2004-lnx-demo3334.run 288950743
-EBUILD ut2004-demo-3334.ebuild 2059 RMD160 5e52a3595e13a379775bf7d8afb2f88e9bbd6125 SHA1 60736f2387f003adc217b32a96c87dcb0f1f3198 SHA256 3e4fd966bc3a1d487c4cbf5fb5ec2d928ac2c8fb2e8bf5d02dd5169d733fa5e2
-MD5 bcba3a6c0c781a14c4dfd1c78b535915 ut2004-demo-3334.ebuild 2059
-RMD160 5e52a3595e13a379775bf7d8afb2f88e9bbd6125 ut2004-demo-3334.ebuild 2059
-SHA256 3e4fd966bc3a1d487c4cbf5fb5ec2d928ac2c8fb2e8bf5d02dd5169d733fa5e2 ut2004-demo-3334.ebuild 2059
-MISC ChangeLog 4139 RMD160 645b5a2e94b3f278c3bb9e7517a1dcc592b4be08 SHA1 aca38944abe42c1410e3ed13f78e6b2dbd4a617c SHA256 6d86cee96cffd6e3025d7d6e8a3f2fa4ed9c3c50567c0909710ad54454f89d04
-MD5 7e3dffe927021424b9169d50c6bf8dad ChangeLog 4139
-RMD160 645b5a2e94b3f278c3bb9e7517a1dcc592b4be08 ChangeLog 4139
-SHA256 6d86cee96cffd6e3025d7d6e8a3f2fa4ed9c3c50567c0909710ad54454f89d04 ChangeLog 4139
+DIST ut2004-lnx-demo3334.run 288950743 RMD160 6663cd9225a111390f98dc618b6df57c5fb16932 SHA1 cd756da0281c8b378b07edce1d196f8f807d31fa SHA256 c7065a758e91fdf5cf79cb8f9646e4360928ba9de4460ab7011c08e22a240cf3
+EBUILD ut2004-demo-3334.ebuild 2025 RMD160 e949e86a43eac2f9c8221ba6c8a662114c3f59ad SHA1 660d58f67f83b97a9dffa62142f1186eb8d817c5 SHA256 1f2c747f376643a582fd3ee1f0778ba62dc6606444bf914052b5110b6ccbb9f3
+MD5 b57ef6ea4bdea674487d21fd239f0045 ut2004-demo-3334.ebuild 2025
+RMD160 e949e86a43eac2f9c8221ba6c8a662114c3f59ad ut2004-demo-3334.ebuild 2025
+SHA256 1f2c747f376643a582fd3ee1f0778ba62dc6606444bf914052b5110b6ccbb9f3 ut2004-demo-3334.ebuild 2025
+MISC ChangeLog 4291 RMD160 7f495fe1b5aa4e11fbf5a1854c09b0fea5113096 SHA1 ae25346eb80c2a27a3f2bdb4b2bed26dc66e9ada SHA256 538ecf75e20bbe71910e9f9eee942215180e93dc6ad0594d262cc5eb335c55cc
+MD5 13d455cf127a7bcf001329ba3beefe80 ChangeLog 4291
+RMD160 7f495fe1b5aa4e11fbf5a1854c09b0fea5113096 ChangeLog 4291
+SHA256 538ecf75e20bbe71910e9f9eee942215180e93dc6ad0594d262cc5eb335c55cc ChangeLog 4291
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 7339313ef9ff4f1f6da1972ab63a2c2e files/digest-ut2004-demo-3334 71
-RMD160 bdea69cf3981f357f8b9bba22cd03bf8b380aedf files/digest-ut2004-demo-3334 71
-SHA256 050afa62ac5419fc0523850234f28d5cece99f7f9b2196bbd84910022d1b354f files/digest-ut2004-demo-3334 71
+MD5 f0f4e12546b6bc199f3d8e9111ef75cc files/digest-ut2004-demo-3334 259
+RMD160 ef3d8bad71fbf7c4b68b697e75def59e53c02130 files/digest-ut2004-demo-3334 259
+SHA256 0e75451df668e9e9d863c7c57c3c101b9f905eef581a8f15f777ffa4349503a1 files/digest-ut2004-demo-3334 259
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFEEmhkT4lNIS36YERAtvfAJ99CAhMZVfvi6lzyrVZLUnMx04SNwCfZI7T
-ARdQgiCN9S7PnVJ6j0LZQWQ=
-=3pFK
+iD8DBQFFITEHkT4lNIS36YERAnDqAJ9WZij79mhI+ZewkvfSdmU2kUOOKgCgmFwk
+RbVDbiVuo9QymsULbHyeUJg=
+=Yxjb
 -----END PGP SIGNATURE-----
diff --git a/games-fps/ut2004-demo/files/digest-ut2004-demo-3334 b/games-fps/ut2004-demo/files/digest-ut2004-demo-3334
index 9e2c281fb1f1..47e3f29129c0 100644
--- a/games-fps/ut2004-demo/files/digest-ut2004-demo-3334
+++ b/games-fps/ut2004-demo/files/digest-ut2004-demo-3334
@@ -1 +1,3 @@
 MD5 bf9f483902c6006b94c327fb7b585086 ut2004-lnx-demo3334.run 288950743
+RMD160 6663cd9225a111390f98dc618b6df57c5fb16932 ut2004-lnx-demo3334.run 288950743
+SHA256 c7065a758e91fdf5cf79cb8f9646e4360928ba9de4460ab7011c08e22a240cf3 ut2004-lnx-demo3334.run 288950743
diff --git a/games-fps/ut2004-demo/ut2004-demo-3334.ebuild b/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
index 65de315f9044..d825f06adde1 100644
--- a/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
+++ b/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ut2004-demo-3334.ebuild,v 1.13 2006/09/19 19:48:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ut2004-demo-3334.ebuild,v 1.14 2006/10/02 15:31:42 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -20,11 +20,8 @@ DEPEND=""
 RDEPEND="virtual/opengl
 	=virtual/libstdc++-3.3
 	x86? (
-		|| (
-			(
-				x11-libs/libX11
-				x11-libs/libXext )
-			virtual/x11 ) )
+		x11-libs/libX11
+		x11-libs/libXext )
 	amd64? (
 		app-emulation/emul-linux-x86-xlibs )"
 
@@ -64,26 +61,26 @@ src_install() {
 
 	dodir
 	games_make_wrapper ut2004-demo ./ut2004-demo "${dir}" "${dir}"
-	make_desktop_entry ut2004-demo "UT2004 (Demo)" ut2004-demo.xpm
+	make_desktop_entry ut2004-demo "Unreal Tournament 2004 (Demo)" ut2004-demo.xpm
 
 	prepgamesdirs
 }
 
 pkg_postinst() {
 	games_pkg_postinst
-	einfo
-	einfo "For Text To Speech:"
-	einfo "   1) emerge festival speechd"
-	einfo "   2) Edit your ~/.ut2004demo/System/UT2004.ini file."
-	einfo "      In the [SDLDrv.SDLClient] section, add:"
-	einfo "         TextToSpeechFile=/dev/speech"
-	einfo "   3) Start speechd."
-	einfo "   4) Start the game.  Be sure to go into the Audio"
-	einfo "      options and enable Text To Speech."
-	einfo
-	einfo "To test, pull down the console (~) and type:"
-	einfo "   TTS this is a test."
-	einfo
-	einfo "You should hear something that sounds like 'This is a test.'"
-	einfo
+	echo
+	elog "For Text To Speech:"
+	elog "   1) emerge festival speechd"
+	elog "   2) Edit your ~/.ut2004demo/System/UT2004.ini file."
+	elog "      In the [SDLDrv.SDLClient] section, add:"
+	elog "         TextToSpeechFile=/dev/speech"
+	elog "   3) Start speechd."
+	elog "   4) Start the game.  Be sure to go into the Audio"
+	elog "      options and enable Text To Speech."
+	echo
+	elog "To test, pull down the console (~) and type:"
+	elog "   TTS this is a test."
+	echo
+	elog "You should hear something that sounds like 'This is a test.'"
+	echo
 }