Version bumped and added Editor's Choice Edition Bonus Pack.

5 files changed, 44 insertions, 19 deletions

diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog
index 76fd9e51e885..cfe0d5ed60ff 100644
--- a/games-fps/ut2004/ChangeLog
+++ b/games-fps/ut2004/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2004/11/17 18:59:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.20 2004/11/24 13:21:35 wolf31o2 Exp $
+
+*ut2004-3339 (24 Nov 2004)
+
+  24 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> -ut2004-3323.ebuild,
+  +ut2004-3339.ebuild:
+  Version bumped and added Editor's Choice Edition Bonus Pack.
 
   17 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> ut2004-3323.ebuild:
   Removed calls to specific 3dgamers mirrors and changed to use
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
index 522d5dda464f..0030190bfe15 100644
--- a/games-fps/ut2004/Manifest
+++ b/games-fps/ut2004/Manifest
@@ -1,5 +1,5 @@
-MD5 15705a2de87c28882dd07a77eee55113 ChangeLog 3306
+MD5 ad0129fd9ba14a65662dafbb0070c9a7 ChangeLog 3496
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
-MD5 0d60860bdfde55bf182773d591e9f119 ut2004-3323.ebuild 7615
-MD5 9f55559631b9bec6cc55c239fdb77721 files/digest-ut2004-3323 74
+MD5 90ec0d2065c38ea3d96c13e24e30bad0 ut2004-3339.ebuild 8070
 MD5 e199cda0f458ab3a4b3ca2e482451c8f files/ut2004.xml 358
+MD5 9bdfe6ef27f3b41665b5545c4d03c767 files/digest-ut2004-3339 148
diff --git a/games-fps/ut2004/files/digest-ut2004-3323 b/games-fps/ut2004/files/digest-ut2004-3323
deleted file mode 100644
index b325846656c1..000000000000
--- a/games-fps/ut2004/files/digest-ut2004-3323
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c2953a0dca0b3ae157149df6ce46297d ut2004-lnxpatch3323.tar.bz2 19747344
diff --git a/games-fps/ut2004/files/digest-ut2004-3339 b/games-fps/ut2004/files/digest-ut2004-3339
new file mode 100644
index 000000000000..eef4f1beb270
--- /dev/null
+++ b/games-fps/ut2004/files/digest-ut2004-3339
@@ -0,0 +1,2 @@
+MD5 09b9b1c5909a99466ead94b6832193f0 ut2004-lnxpatch3339.tar.bz2 17069626
+MD5 b687d747d199c6c70bb38fceaa8f666c ut2004-ecebonuspack.tar.bz2 77120293
diff --git a/games-fps/ut2004/ut2004-3323.ebuild b/games-fps/ut2004/ut2004-3339.ebuild
index 02e527a3cfec..9903753c8792 100644
--- a/games-fps/ut2004/ut2004-3323.ebuild
+++ b/games-fps/ut2004/ut2004-3339.ebuild
@@ -1,21 +1,25 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3323.ebuild,v 1.3 2004/11/17 18:59:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3339.ebuild,v 1.1 2004/11/24 13:21:35 wolf31o2 Exp $
 
 inherit games
 
 MY_P="${PN}-lnxpatch${PV}.tar.bz2"
-DESCRIPTION="Unreal Tournament 2004 - follow-up to the 2003  multi-player first-person shooter"
+MY_BP="${PN}-ecebonuspack.tar.bz2"
+DESCRIPTION="Unreal Tournament 2004 - Editor's Choice Edition"
 HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="mirror://3dgamers/pub/3dgamers5/games/unrealtourn2k4/${MY_P}
+SRC_URI="mirror://3dgamers/pub/3dgamers7/games/unrealtourn2k4/${MY_P}
+	mirror://3dgamers/pub/3dgamers7/games/unrealtourn2k4/Missions/${MY_BP}
 	mirror://3dgamers/pub/3dgamers/games/unrealtourn2k4/${MY_P}
-	http://iadfillvip.xlontech.net/100083/games/unrealtourn2k4/${MY_P}
-	http://mirror1.icculus.org/${PN}/${MY_P}"
+	mirror://3dgamers/pub/3dgamers/games/unrealtourn2k4/Missions/${MY_BP}
+	http://mirror1.icculus.org/${PN}/${MY_P}
+	http://0day.icculus.org/${PN}/${MY_P}
+	http://speculum.twistedgamer.com/pub/0day.icculus.org/${PN}/${MY_P}"
 
 LICENSE="ut2003"
 SLOT="0"
 KEYWORDS="x86 amd64"
-RESTRICT="nostrip"
+RESTRICT="nostrip nomirror"
 IUSE="opengl dedicated"
 
 DEPEND="virtual/libc
@@ -36,15 +40,18 @@ pkg_setup() {
 	# a DVD or from multiple CDs.  Anyone feel free to submit patches to this
 	# to bugs.gentoo.org as I know it is a very ugly hack.
 	USE_DVD=
-	if [ -n "${CD_ROOT}" ]; then
+	if [ -n "${CD_ROOT}" ]
+	then
 		[ -d "${CD_ROOT}/CD1" ] && USE_DVD=1
 	else
 		local mline=""
-		for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do
+		for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'`
+		do
 			[ -d "${mline}/CD1" ] && USE_DVD=1
 		done
 	fi
-	if [ ${USE_DVD} ]; then
+	if [ ${USE_DVD} ]
+	then
 		DISK1="CD1"
 		DISK2="CD2"
 		DISK3="CD3"
@@ -67,6 +74,7 @@ src_unpack() {
 	use x86 && tar -xf ${S}/linux-x86.tar
 	use amd64 && tar -xf ${S}/linux-amd64.tar
 	unpack ${MY_P}
+	unpack ${MY_BP}
 }
 
 src_install() {
@@ -102,7 +110,7 @@ src_install() {
 
 	#Disk 5
 	einfo "Copying files from Disk 5..."
-	cp -r ${CDROM_ROOT}/${DISK5}/{Music,Sounds} ${Ddir} \
+	cp -r ${CDROM_ROOT}/${DISK5}/{Music,Speech,Sounds} ${Ddir} \
 		|| die "copying files"
 	cdrom_load_next_cd
 
@@ -112,7 +120,8 @@ src_install() {
 		|| die "copying files"
 
 	# create empty files in Benchmark
-	for j in {CSVs,Logs,Results} ; do
+	for j in {CSVs,Logs,Results}
+	do
 		mkdir -p ${Ddir}/Benchmark/${j} || die "creating folders"
 		touch ${Ddir}/Benchmark/${j}/DO_NOT_DELETE.ME || die "creating files"
 	done
@@ -147,15 +156,24 @@ src_install() {
 
 	# uncompressing files
 	einfo "Uncompressing files... this *will* take a while..."
-	for j in {Animations,Maps,Sounds,StaticMeshes,Textures} ; do
+	for j in {Animations,Maps,Sounds,StaticMeshes,Textures}
+	do
 		chmod -R u+w ${Ddir}/${j} || die "chmod in uncompress"
 		games_ut_unpack ${Ddir}/${j} || die "uncompressing files"
 	done
 
+	# Installing Editor's Choice Edition
+	for n in {Animations,Help,Manual,Maps,Sounds,StaticMeshes,System,Textures}
+	do
+		cp -r ${S}/${PN}-ECEBonusPack/${n}/* ${Ddir}/${n} \
+			|| die "copying ${n} from Editor's Choice Edition"
+	done
+
 	# Installing patch files
-	for p in {Animations,Help,System,Textures,Web}; do
+	for p in {Animations,Help,Speech,System,Textures,Web}
+	do
 		cp -r ${S}/UT2004-Patch/${p}/* ${Ddir}/${p} \
-			|| die "copying ${p} from patch."
+			|| die "copying ${p} from patch"
 	done
 
 	use amd64 && rm ${Ddir}/System/u{cc,t2004}-bin \