Updated to use newest patch files, compiled with GCC 3.x, rather than GCC 2.x. Also added uz2unpack DEPEND. Should close bug #51644.

5 files changed, 27 insertions, 17 deletions

diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog
index ed7851af33c6..c6d7b06cb49f 100644
--- a/games-fps/ut2004/ChangeLog
+++ b/games-fps/ut2004/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for games-fps/ut2004
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.12 2004/06/24 22:49:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.13 2004/06/26 15:53:04 wolf31o2 Exp $
+
+*ut2004-3236-r1 (26 Jun 2004)
+
+  26 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org> +ut2004-3236-r1.ebuild,
+  -ut2004-3236.ebuild:
+  Updated to use newest patch files, compiled with GCC 3.x, rather than GCC 2.x.
+  Also added uz2unpack DEPEND.  Should close bug #51644.
 
   22 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org> -ut2004-3204.ebuild,
   ut2004-3236.ebuild:
-  Moving 3204 to stable on x86 due to security vulnerability in Unreal Engine.
+  Moving 3236 to stable on x86 due to security vulnerability in Unreal Engine.
   See bug #54726 for more information.
 
 *ut2004-3236 (16 Jun 2004)
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
index d4e5de6e4701..30a191a9ad19 100644
--- a/games-fps/ut2004/Manifest
+++ b/games-fps/ut2004/Manifest
@@ -1,5 +1,5 @@
-MD5 8b36b672bb5053b828b682be621781ba ut2004-3236.ebuild 7752
-MD5 4e0f5401841b11c4bad33287e9d11ff2 ChangeLog 2151
+MD5 6cffb5024d5f58817327a7c2fd3dd272 ut2004-3236-r1.ebuild 7696
+MD5 34413b497db720caf8b63e8e1b27a042 ChangeLog 2422
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 MD5 e199cda0f458ab3a4b3ca2e482451c8f files/ut2004.xml 358
-MD5 dcbc46fef5f54d26e58fd39efb832bf6 files/digest-ut2004-3236 74
+MD5 f4e563d64e87d11adcaee0ce3264850d files/digest-ut2004-3236-r1 76
diff --git a/games-fps/ut2004/files/digest-ut2004-3236 b/games-fps/ut2004/files/digest-ut2004-3236
deleted file mode 100644
index ec5d20867f8f..000000000000
--- a/games-fps/ut2004/files/digest-ut2004-3236
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70a07e3a81a9ac9bed47fe02fe9b3981 ut2004-lnxpatch3236.tar.bz2 19858243
diff --git a/games-fps/ut2004/files/digest-ut2004-3236-r1 b/games-fps/ut2004/files/digest-ut2004-3236-r1
new file mode 100644
index 000000000000..a4edaef408a4
--- /dev/null
+++ b/games-fps/ut2004/files/digest-ut2004-3236-r1
@@ -0,0 +1 @@
+MD5 05bc3d52b47655aa866f6a5640cb9bbc ut2004-lnxpatch3236-1.tar.bz2 19580813
diff --git a/games-fps/ut2004/ut2004-3236.ebuild b/games-fps/ut2004/ut2004-3236-r1.ebuild
index 73c4cf2afec5..ebba4272e174 100644
--- a/games-fps/ut2004/ut2004-3236.ebuild
+++ b/games-fps/ut2004/ut2004-3236-r1.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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/ut2004-3236.ebuild,v 1.3 2004/06/24 22:49:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3236-r1.ebuild,v 1.1 2004/06/26 15:53:04 wolf31o2 Exp $
 
 inherit games
 
+MY_P="${PN}-lnxpatch${PV}-1.tar.bz2"
 DESCRIPTION="Unreal Tournament 2004 - follow-up to the 2003  multi-player first-person shooter"
 HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="http://mirror1.icculus.org/${PN}/${PN}-lnxpatch${PV}.tar.bz2
-	http://ftp4.3dgamers.com/pub/3dgamers/games/unrealtourn2k4/${PN}-lnxpatch${PV}.tar.bz2
-	http://3dgamers.intelenet.net/pub/3dgamers/games/unrealtourn2k4/${PN}-lnxpatch${PV}.tar.bz2
-	ftp://3dgamers.in-span.net/pub/3dgamers5/games/unrealtourn2k4/${PN}-lnxpatch${PV}.tar.bz2
-	http://iadfillvip.xlontech.net/100083/games/unrealtourn2k4/${PN}-lnxpatch${PV}.tar.bz2"
+SRC_URI="http://ftp4.3dgamers.com/pub/3dgamers/games/unrealtourn2k4/${MY_P}
+	http://3dgamers.intelenet.net/pub/3dgamers/games/unrealtourn2k4/${MY_P}
+	ftp://3dgamers.in-span.net/pub/3dgamers5/games/unrealtourn2k4/${MY_P}
+	http://iadfillvip.xlontech.net/100083/games/unrealtourn2k4/${MY_P}
+	http://mirror1.icculus.org/${PN}/${MY_P}"
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="x86 amd64"
 RESTRICT="nostrip"
 IUSE="opengl dedicated"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/glibc
+	games-util/uz2unpack"
 RDEPEND="opengl? ( virtual/opengl )
 	dedicated? ( app-misc/screen )"
 
@@ -65,7 +67,7 @@ src_unpack() {
 		|| die "unpacking linux installer"
 	use x86 && tar -xf ${S}/linux-x86.tar
 	use amd64 && tar -xf ${S}/linux-amd64.tar
-	unpack ${PN}-lnxpatch${PV}.tar.bz2
+	unpack ${MY_P}
 }
 
 src_install() {
@@ -181,7 +183,7 @@ src_install() {
 
 	# creating .loki/installed links
 	mkdir -p ${D}/root/.loki/installed
-	dosym ${dir}/.manifest/${PN}.xml ${D}/root/.loki/installed/${PN}.xml
+	dosym .manifest/${PN}.xml /root/.loki/installed/${PN}.xml
 
 	games_make_wrapper ut2004 ./ut2004 ${dir}
 
@@ -209,6 +211,7 @@ pkg_postinst() {
 	echo
 	einfo "To play the game run:"
 	einfo " ut2004"
+	echo
 }
 
 pkg_postrm() {