Updated to close bug #54726.

5 files changed, 15 insertions, 92 deletions

diff --git a/games-fps/ut2004-demo/ChangeLog b/games-fps/ut2004-demo/ChangeLog
index ddc9e70abf66..973824ba0622 100644
--- a/games-fps/ut2004-demo/ChangeLog
+++ b/games-fps/ut2004-demo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/ut2004-demo
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ChangeLog,v 1.25 2004/06/24 22:50:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ChangeLog,v 1.26 2004/07/08 13:43:31 wolf31o2 Exp $
+
+*ut2004-demo-3120-r4 (08 Jul 2004)
+
+  08 Jul 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  -ut2004-demo-3120-r2.ebuild, -ut2004-demo-3120-r3.ebuild,
+  +ut2004-demo-3120-r4.ebuild:
+  Updated to close bug #54726.
 
   01 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
   ut2004-demo-3120-r2.ebuild, ut2004-demo-3120-r3.ebuild:
diff --git a/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r3 b/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r3
deleted file mode 100644
index bda6e75b1e45..000000000000
--- a/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r3
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 da200b043add9d083f6aa7581e6829f0 ut2004-lnx-demo-3120.run.bz2 208802492
-MD5 aa44626fddafe4643e03cd777452d853 ut2004-demo-lnx-tts-pingpatch.tar.bz2 3294460
-MD5 85e6c39d406a8e2c9549f5aa82db3a49 please_test_with_ut2004-2.tar.bz2 232119
-MD5 3636e4c7ecadfccc152c7a7b456dc8ab ut2004-lnx64-demo-3120.run.bz2 211220807
-MD5 8d1e79896badc3cc538fae612d790db8 ut2004-demo-lnx64-tts-pingpatch.tar.bz2 4114384
diff --git a/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r2 b/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r4
index 0987062f4b52..0e354f9f56d8 100644
--- a/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r2
+++ b/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r4
@@ -1,4 +1,5 @@
 MD5 da200b043add9d083f6aa7581e6829f0 ut2004-lnx-demo-3120.run.bz2 208802492
 MD5 aa44626fddafe4643e03cd777452d853 ut2004-demo-lnx-tts-pingpatch.tar.bz2 3294460
+MD5 85e6c39d406a8e2c9549f5aa82db3a49 please_test_with_ut2004-2.tar.bz2 232119
 MD5 3636e4c7ecadfccc152c7a7b456dc8ab ut2004-lnx64-demo-3120.run.bz2 211220807
 MD5 22c1ad484d43922d08b1f2f00cca0e58 ut2004-demo-lnx64-tts-pingpatch2.tar.bz2 4114928
diff --git a/games-fps/ut2004-demo/ut2004-demo-3120-r2.ebuild b/games-fps/ut2004-demo/ut2004-demo-3120-r2.ebuild
deleted file mode 100644
index 15d5f540faf6..000000000000
--- a/games-fps/ut2004-demo/ut2004-demo-3120-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ut2004-demo-3120-r2.ebuild,v 1.9 2004/06/24 22:50:06 agriffis Exp $
-
-inherit games
-
-DESCRIPTION="Unreal Tournament 2004 Demo"
-HOMEPAGE="http://www.unrealtournament.com/"
-
-SRC_URI="x86? ( ftp://ftp.linuxhardware.org/ut2004/ut2004-lnx-demo-${PV}.run.bz2
-	http://www.lokigames.com/sekrit/ut2004-lnx-demo-${PV}.run.bz2
-	http://pomac.netswarm.net/mirror/games/ut2004/ut2004-lnx-demo-${PV}.run.bz2
-	http://icculus.org/~icculus/tmp/${PN}-lnx-tts-pingpatch.tar.bz2 )
-	amd64? ( mirror://gentoo/ut2004-lnx64-demo-${PV}.run.bz2
-	http://icculus.org/~icculus/tmp/${PN}-lnx64-tts-pingpatch2.tar.bz2 )"
-
-IUSE="alsa dedicated"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="-* x86 amd64"
-
-DEPEND="!dedicated? ( virtual/opengl )
-	alsa? ( >=media-libs/alsa-lib-1.0.2
-			>=media-libs/libsdl-1.2.6-r3
-			>=media-libs/openal-20040218 ) "
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	[ "${ARCH}" = "amd64" ] && RNAME="ut2004-lnx64-demo-${PV}.run"
-	[ "${ARCH}" = "x86" ] && RNAME="ut2004-lnx-demo-${PV}.run"
-	unpack_makeself ${RNAME}
-	rm ${RNAME}
-}
-
-src_install() {
-	local dir=/opt/${PN}
-	dodir ${dir}
-
-	tar -xf ut2004demo.tar -C ${D}/${dir}/ || die "unpacking ut2004 failed"
-
-	insinto ${dir}
-	doins README.linux ut2004demo.xpm
-
-	exeinto ${dir}
-	doexe bin/ut2004demo
-
-	dodir ${GAMES_BINDIR}
-	dosym ${dir}/ut2004demo ${GAMES_BINDIR}/ut2004demo
-
-	# Ping patch
-	exeinto ${dir}/System
-	doexe ut2004-bin
-	doins README-tts.txt tts-festival.pl
-
-	# ALSA and VoIP
-	if use alsa; then
-		rm ${D}/${dir}/System/{libSDL-1.2.so.0,openal.so} || die "removing libs"
-		dosym /usr/lib/libSDL-1.2.so.0 ${dir}/System/libSDL-1.2.so.0 || die "SDL symlink"
-		dosym /usr/lib/libopenal.so.0 ${dir}/System/openal.so || die "OpenAL symlink"
-	fi
-
-	prepgamesdirs
-}
-
-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 ""
-	games_pkg_postinst
-}
diff --git a/games-fps/ut2004-demo/ut2004-demo-3120-r3.ebuild b/games-fps/ut2004-demo/ut2004-demo-3120-r4.ebuild
index fb7e0a2d275d..ca47c53740d5 100644
--- a/games-fps/ut2004-demo/ut2004-demo-3120-r3.ebuild
+++ b/games-fps/ut2004-demo/ut2004-demo-3120-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ut2004-demo-3120-r3.ebuild,v 1.9 2004/06/24 22:50:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ut2004-demo-3120-r4.ebuild,v 1.1 2004/07/08 13:43:31 wolf31o2 Exp $
 
 inherit games
 
@@ -18,7 +18,7 @@ SRC_URI="x86? ( ftp://ftp.linuxhardware.org/ut2004/ut2004-lnx-demo-${PV}.run.bz2
 IUSE="alsa dedicated"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* x86 amd64"
 
 DEPEND="!dedicated? ( virtual/opengl )
 	alsa? ( >=media-libs/alsa-lib-1.0.2 ) "
@@ -55,6 +55,10 @@ src_install() {
 	doexe ut2004-bin
 	doins README-tts.txt tts-festival.pl
 
+	# Here we apply fix for bug #54726
+	dosed "s:UplinkToGamespy=True:UplinkToGamespy=False:" \
+		${dir}/System/Default.ini
+
 	# ALSA and VoIP
 	if use alsa && use amd64 ; then
 		rm ${D}/${dir}/System/{libSDL-1.2.so.0,openal.so} || die "removing libs"