Version bumped to 3334 and closing bug #65232.

6 files changed, 85 insertions, 100 deletions

diff --git a/games-fps/ut2004-demo/ChangeLog b/games-fps/ut2004-demo/ChangeLog
index 69eb6405931c..2377f30fd1f7 100644
--- a/games-fps/ut2004-demo/ChangeLog
+++ b/games-fps/ut2004-demo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.27 2004/07/20 00:36:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ChangeLog,v 1.28 2004/10/11 18:48:39 wolf31o2 Exp $
+
+*ut2004-demo-3334 (07 Oct 2004)
+
+  07 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  -ut2004-demo-3120-r4.ebuild, +ut2004-demo-3334.ebuild:
+  Version bumped to 3334 and closing bug #65232.
 
   19 Jul 2004; Chris Gianelloni <wolf31o2@gentoo.org>
   ut2004-demo-3120-r4.ebuild:
diff --git a/games-fps/ut2004-demo/Manifest b/games-fps/ut2004-demo/Manifest
index 4f55b21e8667..700273447853 100644
--- a/games-fps/ut2004-demo/Manifest
+++ b/games-fps/ut2004-demo/Manifest
@@ -1,4 +1,4 @@
-MD5 4438ffbff2233960f19d72a3ca1e70fc ut2004-demo-3120-r4.ebuild 2788
-MD5 f77373f3b6355c230a87e6515b448580 ChangeLog 2365
+MD5 3ac86de9d37ac331f81c73a3cc135623 ChangeLog 2559
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 887c32cc7a2c343ecf404ffc9fda011f files/digest-ut2004-demo-3120-r4 401
+MD5 df40dafe52806af07361bbea3f1e53d6 ut2004-demo-3334.ebuild 1954
+MD5 7339313ef9ff4f1f6da1972ab63a2c2e files/digest-ut2004-demo-3334 71
diff --git a/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r4 b/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r4
deleted file mode 100644
index 0e354f9f56d8..000000000000
--- a/games-fps/ut2004-demo/files/digest-ut2004-demo-3120-r4
+++ /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 22c1ad484d43922d08b1f2f00cca0e58 ut2004-demo-lnx64-tts-pingpatch2.tar.bz2 4114928
diff --git a/games-fps/ut2004-demo/files/digest-ut2004-demo-3334 b/games-fps/ut2004-demo/files/digest-ut2004-demo-3334
new file mode 100644
index 000000000000..9e2c281fb1f1
--- /dev/null
+++ b/games-fps/ut2004-demo/files/digest-ut2004-demo-3334
@@ -0,0 +1 @@
+MD5 bf9f483902c6006b94c327fb7b585086 ut2004-lnx-demo3334.run 288950743
diff --git a/games-fps/ut2004-demo/ut2004-demo-3120-r4.ebuild b/games-fps/ut2004-demo/ut2004-demo-3120-r4.ebuild
deleted file mode 100644
index a6cb0f02b87d..000000000000
--- a/games-fps/ut2004-demo/ut2004-demo-3120-r4.ebuild
+++ /dev/null
@@ -1,91 +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-r4.ebuild,v 1.2 2004/07/20 00:36:32 wolf31o2 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
-	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-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}
-	# We unpack this one again so the right files are in the right places
-	unpack 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
-
-	# 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"
-		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-3334.ebuild b/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
new file mode 100644
index 000000000000..7984973904a0
--- /dev/null
+++ b/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
@@ -0,0 +1,74 @@
+# 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-3334.ebuild,v 1.1 2004/10/11 18:48:39 wolf31o2 Exp $
+
+inherit games eutils
+
+MY_P="ut2004-lnx-demo${PV}.run"
+DESCRIPTION="Unreal Tournament 2004 Demo"
+HOMEPAGE="http://www.unrealtournament.com/"
+
+SRC_URI="mirror://3dgamers/pub/3dgamers6/games/unrealtourn2k4/${MY_P}
+	mirror://3dgamers/pub/3dgamers/games/unrealtourn2k4/${MY_P}"
+
+IUSE=""
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="-* x86 amd64"
+
+DEPEND="!dedicated? ( virtual/opengl )"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+src_unpack() {
+	unpack_makeself
+	tar zxf setupstuff.tar.gz || die "unpacking setupstuff"
+}
+
+src_install() {
+	dodir ${dir}
+
+	tar xjf ut2004demo.tar.bz2 -C ${Ddir} || die "unpacking ut2004 failed"
+
+	use x86 && tar xjf linux-x86.tar.bz2 #|| die "unpacking exe"
+	use amd64 && tar xjf linux-amd64.tar.bz2 #|| die "unpacking exe"
+
+	insinto ${dir}
+	doins README.linux ut2004.xpm
+	insinto /usr/share/pixmaps
+	doins ut2004.xpm
+
+	exeinto ${dir}
+	doexe bin/ut2004-demo
+
+	exeinto ${dir}/System
+	doexe System/{libSDL-1.2.so.0,openal.so,ucc-bin,ut2004-bin}
+
+	dodir
+	games_make_wrapper ut2004-demo ./ut2004-demo ${dir}
+
+	prepgamesdirs
+	make_desktop_entry ut2004-demo "UT2004 Demo" ut2004.xpm
+}
+
+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
+}