Revision bump to test new openal/libsdl from icculus.

4 files changed, 104 insertions, 61 deletions

diff --git a/games-fps/ut2004-demo/ChangeLog b/games-fps/ut2004-demo/ChangeLog
index d97f220a57a1..033a71560abb 100644
--- a/games-fps/ut2004-demo/ChangeLog
+++ b/games-fps/ut2004-demo/ChangeLog
@@ -1,63 +1,12 @@
 # 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.14 2004/02/27 19:10:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ChangeLog,v 1.15 2004/03/03 16:40:07 wolf31o2 Exp $
 
-  27 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org>
-  ut2004-demo-3120-r1.ebuild, ut2004-demo-3120-r2.ebuild,
-  ut2004-demo-3120.ebuild:
-  Removing old version and fixing typo.  Closing bug #43108.
+*ut2004-demo-3120-r3 (03 Mar 2004)
 
-  27 Feb 2004; <augustus@gentoo.org> :
-  Fixed digest-ut2004-demo-3120-r2.
-
-  26 Feb 2004; <augustus@gentoo.org> ut2004-demo-3120-r2.ebuild:
-  Updated to new amd64 ut2004 patch.  Fixes crash at end of Onslaught.
-
-  25 Feb 2004; <augustus@gentoo.org> :
-  Fixed the -r1 digest for amd64.
-
-  24 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org> :
-  Fixing digest for -r2.
-
-  24 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org>
-  ut2004-demo-3120-r2.ebuild:
-  Added openal-20040218 DEPEND.
-
-*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
-  to get TTS working.
-
-  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.
-
-*ut2004-demo-3120-r1 (20 Feb 2004)
-
-  20 Feb 2004; <augustus@gentoo.org> ut2004-demo-3120-r1.ebuild,
-  ut2004-demo-3120.ebuild:
-  Reverted ut2004-demo-3120.ebuild. The patch should have been in a new
-  release so that existing users would get it. I moved the changes to
-  ut2004-demo-3120-r1.ebuild and fixed it for AMD64. Please don't break other
-  ARCH with changes. -r1 is masked for now on AMD64 until icculus releases
-  an AMD64 patch.
-
-  19 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org> ut2004-demo-3120.ebuild:
-  Updated ebuild to include text-to-speech and server browser ping patches from
-  icculus.
+  03 Mar 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  ut2004-demo-3120-r3.ebuild, ut2004-demo-3120.ebuild:
+  Revision bump to test new openal/libsdl from icculus.
 
   15 Feb 2004; Brad House <brad_mssw@gentoo.org> ut2004-demo-3120.ebuild:
   amd64 version has been released, should be on mirrors soon
diff --git a/games-fps/ut2004-demo/Manifest b/games-fps/ut2004-demo/Manifest
index a86a76d9b3f9..fbf1788c3120 100644
--- a/games-fps/ut2004-demo/Manifest
+++ b/games-fps/ut2004-demo/Manifest
@@ -1,6 +1,10 @@
-MD5 266ca0a0e0c705fd145f2aa1bba06731 ut2004-demo-3120-r2.ebuild 2489
-MD5 d7e53681db82d6aee09f73b01d89fa24 ChangeLog 2610
-MD5 91bb560360848d4cc7d43b1fcb47a00e ut2004-demo-3120-r1.ebuild 2062
+MD5 15ed042ba4332a8f912cae9daf7d2ae3 ut2004-demo-3120-r3.ebuild 2490
+MD5 c572356d6f4b188703fd57cc099ff23c ut2004-demo-3120.ebuild 1243
+MD5 9faa6cc5b0d4d633c7b87a3b3287c950 ut2004-demo-3120-r2.ebuild 2487
+MD5 3166d1907f8e34524caf8f1d6f73cab5 ChangeLog 491
+MD5 e6d93d950ba4542e4360dbd52603f6d8 ut2004-demo-3120-r1.ebuild 1400
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 76c558d3c54fbbc8dc477b9580274e94 files/digest-ut2004-demo-3120-r1 322
-MD5 3413943e2277188fdc25b92ee28d68c8 files/digest-ut2004-demo-3120-r2 323
+MD5 60847139e60f6e8684262e26aa33d19c files/digest-ut2004-demo-3120-r1 237
+MD5 76c558d3c54fbbc8dc477b9580274e94 files/digest-ut2004-demo-3120-r2 322
+MD5 59fca12b740d8dd189a159435fc9ad31 files/digest-ut2004-demo-3120-r3 400
+MD5 60847139e60f6e8684262e26aa33d19c files/digest-ut2004-demo-3120 237
diff --git a/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r3 b/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r3
new file mode 100644
index 000000000000..bda6e75b1e45
--- /dev/null
+++ b/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r3
@@ -0,0 +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 8d1e79896badc3cc538fae612d790db8 ut2004-demo-lnx64-tts-pingpatch.tar.bz2 4114384
diff --git a/games-fps/ut2004-demo/ut2004-demo-3120-r3.ebuild b/games-fps/ut2004-demo/ut2004-demo-3120-r3.ebuild
new file mode 100644
index 000000000000..9c0f967a81b2
--- /dev/null
+++ b/games-fps/ut2004-demo/ut2004-demo-3120-r3.ebuild
@@ -0,0 +1,85 @@
+# 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-r3.ebuild,v 1.1 2004/03/03 16:40:07 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
+	http://icculus.org/~icculus/tmp/please_test_with_ut2004-2.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 ) "
+
+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}
+	# We unpack this one again so the right files are in the right places
+	unpack ${DISTDIR}/please_test_with_ut2004-2.tar.bz2
+}
+
+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`" && "`use amd64`" ]; 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
+}