Added amd64 patch from icculus and closing bug #94397.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 129 insertions, 4 deletions

diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog
index 6fbf1eeeaba6..ebf52e02d841 100644
--- a/games-fps/ut2004/ChangeLog
+++ b/games-fps/ut2004/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/ut2004
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.23 2005/05/16 16:09:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.24 2005/06/16 21:36:27 wolf31o2 Exp $
+
+*ut2004-3355-r1 (16 Jun 2005)
+
+  16 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +ut2004-3355-r1.ebuild:
+  Added amd64 patch from icculus and closing bug #94397.
 
   16 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> -ut2004-3339.ebuild,
   ut2004-3355.ebuild:
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
index 881d107bf81e..2a582559829a 100644
--- a/games-fps/ut2004/Manifest
+++ b/games-fps/ut2004/Manifest
@@ -1,5 +1,7 @@
-MD5 072ff8cd5c9bbf3951842ed77c245c5b ut2004-3355.ebuild 3095
-MD5 cd97e90559ff9ec562b60071819f2b77 ChangeLog 3900
+MD5 e62071d7430024c5a061d9e1797fd4c0 ChangeLog 4069
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
-MD5 e199cda0f458ab3a4b3ca2e482451c8f files/ut2004.xml 358
+MD5 072ff8cd5c9bbf3951842ed77c245c5b ut2004-3355.ebuild 3095
+MD5 ff269f02598985af472a3ab1cae7bdfd ut2004-3355-r1.ebuild 3254
 MD5 8301dab70fc9c57363f99591c5944b63 files/digest-ut2004-3355 74
+MD5 e199cda0f458ab3a4b3ca2e482451c8f files/ut2004.xml 358
+MD5 3953d9c3f549c05431bb62a8df17a787 files/digest-ut2004-3355-r1 153
diff --git a/games-fps/ut2004/files/digest-ut2004-3355-r1 b/games-fps/ut2004/files/digest-ut2004-3355-r1
new file mode 100644
index 000000000000..04a31380f08e
--- /dev/null
+++ b/games-fps/ut2004/files/digest-ut2004-3355-r1
@@ -0,0 +1,2 @@
+MD5 379198183e16cefeb585a1c3252e63dd ut2004-lnxpatch3355.tar.bz2 20655315
+MD5 4c69c1a636f08a2e9a6d29944c02f79f ut2004-lnx-amd64-05282005.tar.bz2 4823490
diff --git a/games-fps/ut2004/ut2004-3355-r1.ebuild b/games-fps/ut2004/ut2004-3355-r1.ebuild
new file mode 100644
index 000000000000..4adae27f1894
--- /dev/null
+++ b/games-fps/ut2004/ut2004-3355-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3355-r1.ebuild,v 1.1 2005/06/16 21:36:27 wolf31o2 Exp $
+
+inherit games
+
+MY_P="${PN}-lnxpatch${PV}.tar.bz2"
+DESCRIPTION="Unreal Tournament 2004 - Editor's Choice Edition"
+HOMEPAGE="http://www.unrealtournament2004.com/"
+SRC_URI="mirror://3dgamers/pub/3dgamers/games/unrealtourn2k4/${MY_P}
+	http://speculum.twistedgamer.com/pub/0day.icculus.org/${PN}/${MY_P}
+	http://icculus.org/~icculus/tmp/${PN}-lnx-amd64-05282005.tar.bz2"
+
+LICENSE="ut2003"
+SLOT="0"
+KEYWORDS="amd64"
+RESTRICT="nostrip nomirror"
+IUSE="opengl dedicated"
+
+RDEPEND="games-fps/ut2004-data
+	games-fps/ut2004-bonuspack-ece
+	opengl? ( virtual/opengl )
+	dedicated? ( app-misc/screen )"
+
+S=${WORKDIR}/UT2004-Patch
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+pkg_setup() {
+	check_license || die "License check failed"
+
+	games_pkg_setup
+}
+
+src_install() {
+	# moving patched binary into proper location
+	mv -f ${S}/ut2004-bin-linux-amd64 ${S}/System
+
+	# Installing patch files
+	for p in {Animations,Help,Speech,System,Textures,Web}
+	do
+		dodir ${dir}/${p}
+		cp -r ${S}/${p}/* ${Ddir}/${p} \
+			|| die "copying ${p} from patch"
+	done
+
+	use amd64 && rm ${Ddir}/System/u{cc,t2004}-bin \
+		&& mv ${Ddir}/System/ucc-bin-linux-amd64 ${Ddir}/System/ucc-bin \
+		&& mv ${Ddir}/System/ut2004-bin-linux-amd64 ${Ddir}/System/ut2004-bin \
+		&& chmod ug+x ${Ddir}/System/ucc-bin ${Ddir}/System/ut2004-bin
+	use x86 && rm ${Ddir}/System/ucc-bin-linux-amd64 \
+		${Ddir}/System/ut2004-bin-linux-amd64
+
+	# creating .manifest files
+	insinto ${dir}/.manifest
+	doins ${FILESDIR}/${PN}.xml
+
+	# creating .loki/installed links
+	mkdir -p ${D}/root/.loki/installed
+	dosym ${dir}/.manifest/${PN}.xml ${ROOT}/root/.loki/installed/${PN}.xml
+
+	games_make_wrapper ut2004 ./ut2004 ${dir}
+
+	prepgamesdirs
+	make_desktop_entry ut2004 "Unreal Tournament 2004" ut2004.xpm
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	# here is where we check for the existence of a cdkey...
+	# if we don't find one, we ask the user for it
+	if [ -f ${dir}/System/cdkey ]; then
+		einfo "A cdkey file is already present in ${dir}/System"
+	else
+		ewarn "You MUST run this before playing the game:"
+		ewarn "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+		ewarn "That way you can [re]enter your cdkey."
+	fi
+	echo
+	einfo "To play the game run:"
+	einfo " ut2004"
+	echo
+}
+
+pkg_postrm() {
+	ewarn "This package leaves a cdkey file in ${dir}/System that you need"
+	ewarn "to remove to completely get rid of this game's files."
+}
+
+pkg_config() {
+	ewarn "Your CD key is NOT checked for validity here."
+	ewarn "  Make sure you type it in correctly."
+	eerror "If you CTRL+C out of this, the game will not run!"
+	echo
+	einfo "CD key format is: XXXXX-XXXXX-XXXXX-XXXXX"
+	while true ; do
+		einfo "Please enter your CD key:"
+		read CDKEY1
+		einfo "Please re-enter your CD key:"
+		read CDKEY2
+		if [ "$CDKEY1" == "" ] ; then
+			echo "You entered a blank CD key.  Try again."
+		else
+			if [ "$CDKEY1" == "$CDKEY2" ] ; then
+				echo "$CDKEY1" | tr a-z A-Z > ${dir}/System/cdkey
+				einfo "Thank you!"
+				break
+			else
+				eerror "Your CD key entries do not match.  Try again."
+			fi
+		fi
+	done
+}