Added -r2 which includes DEPENDs and logic to fix ALSA and VoIP under the game. THIS NEEDS TESTING. It worked for me under both x86 and AMD64, so I am including it ~arch on both. This package is hard masked at the moment since it needs more testing.

5 files changed, 107 insertions, 8 deletions

diff --git a/games-fps/ut2004-demo/ChangeLog b/games-fps/ut2004-demo/ChangeLog
index 95f6d330dbad..cbd609046f66 100644
--- a/games-fps/ut2004-demo/ChangeLog
+++ b/games-fps/ut2004-demo/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-fps/ut2004-demo
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ChangeLog,v 1.7 2004/02/24 07:18:44 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ChangeLog,v 1.8 2004/02/24 21:41:30 wolf31o2 Exp $
+
+*ut2004-demo-3120-r2 (24 Feb 2004)
+
+  24 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  ut2004-demo-3120-r2.ebuild:
+  Added -r2 which includes DEPENDs and logic to fix ALSA and VoIP under the
+  game. THIS NEEDS TESTING. It worked for me under both x86 and AMD64, so I am
+  including it ~arch on both. This package is hard masked at the moment since it
+  needs more testing.
 
   24 Feb 2004; root <root@gentoo.org> ut2004-demo-3120-r1.ebuild:
   Added install of README-tts.txt and tts-festival.pl. Also added einfos on how
@@ -9,6 +18,8 @@
   24 Feb 2004; <augustus@gentoo.org> ut2004-demo-3120-r1.ebuild:
   Added AMD64 ping and tts patch.
 
+*ut2004-demo-3120-r2 (21 Feb 2004)
+
   21 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org>
   ut2004-demo-3120-r1.ebuild:
   Fixing ping patch lines and closing bug #42096.
diff --git a/games-fps/ut2004-demo/Manifest b/games-fps/ut2004-demo/Manifest
index fb344c7a805f..620656abafa3 100644
--- a/games-fps/ut2004-demo/Manifest
+++ b/games-fps/ut2004-demo/Manifest
@@ -1,6 +1,8 @@
-MD5 e1408884bad176bea4e0eac761213a4e ChangeLog 1507
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 eecc810f8d360918a5ae968bd1b17cd9 ut2004-demo-3120-r1.ebuild 2067
 MD5 c572356d6f4b188703fd57cc099ff23c ut2004-demo-3120.ebuild 1243
-MD5 60847139e60f6e8684262e26aa33d19c files/digest-ut2004-demo-3120 237
+MD5 0f761eeefb266e166521fdeedd62415c ut2004-demo-3120-r2.ebuild 2455
+MD5 4736b2b34aa175b60f2d9d42c4b3d761 ChangeLog 1922
+MD5 d0154b0c2457c8dd011d6449062e61cc ut2004-demo-3120-r1.ebuild 2061
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 60847139e60f6e8684262e26aa33d19c files/digest-ut2004-demo-3120-r1 237
+MD5 60847139e60f6e8684262e26aa33d19c files/digest-ut2004-demo-3120-r2 237
+MD5 60847139e60f6e8684262e26aa33d19c files/digest-ut2004-demo-3120 237
diff --git a/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r2 b/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r2
new file mode 100644
index 000000000000..2ac87366e7da
--- /dev/null
+++ b/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r2
@@ -0,0 +1,3 @@
+MD5 da200b043add9d083f6aa7581e6829f0 ut2004-lnx-demo-3120.run.bz2 208802492
+MD5 aa44626fddafe4643e03cd777452d853 ut2004-demo-lnx-tts-pingpatch.tar.bz2 3294460
+MD5 3636e4c7ecadfccc152c7a7b456dc8ab ut2004-lnx64-demo-3120.run.bz2 211220807
diff --git a/games-fps/ut2004-demo/ut2004-demo-3120-r1.ebuild b/games-fps/ut2004-demo/ut2004-demo-3120-r1.ebuild
index ee9e097eb191..dad555fea2e0 100644
--- a/games-fps/ut2004-demo/ut2004-demo-3120-r1.ebuild
+++ b/games-fps/ut2004-demo/ut2004-demo-3120-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ut2004-demo-3120-r1.ebuild,v 1.4 2004/02/24 07:18:44 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ut2004-demo-3120-r1.ebuild,v 1.5 2004/02/24 21:41:30 wolf31o2 Exp $
 
 inherit games eutils
 
@@ -54,7 +54,7 @@ src_install() {
 }
 
 pkg_postinst() {
-    einfo ""
+	einfo ""
 	einfo "For Text To Speech:"
 	einfo "   1) emerge festival speech"
 	einfo "   2) Edit your ~/.ut2004demo/System/UT2004.ini file."
@@ -68,5 +68,5 @@ pkg_postinst() {
 	einfo "   TTS this is a test."
 	einfo ""
 	einfo "You should hear something that sounds like 'This is a test.'"
-    einfo ""
+	einfo ""
 }
diff --git a/games-fps/ut2004-demo/ut2004-demo-3120-r2.ebuild b/games-fps/ut2004-demo/ut2004-demo-3120-r2.ebuild
new file mode 100644
index 000000000000..b8027b08ebb6
--- /dev/null
+++ b/games-fps/ut2004-demo/ut2004-demo-3120-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/02/24 21:41:30 wolf31o2 Exp $
+
+inherit games eutils
+
+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-pingpatch.tar.bz2 )"
+
+IUSE="alsa"
+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 ) "
+
+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 speech"
+	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
+}