Moved cdrom_get_cds to src_unpack since binary packages don't require the original media to install.

Package-Manager: portage-2.1.2_pre3-r5

30 files changed, 105 insertions, 90 deletions

diff --git a/games-fps/doom3-roe/ChangeLog b/games-fps/doom3-roe/ChangeLog
index e83b3166f7ce..78bbc3087778 100644
--- a/games-fps/doom3-roe/ChangeLog
+++ b/games-fps/doom3-roe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/doom3-roe
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-roe/ChangeLog,v 1.6 2006/10/05 12:05:53 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-roe/ChangeLog,v 1.7 2006/10/24 22:48:24 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> doom3-roe-1.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
   05 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> doom3-roe-1.ebuild:
   Stable on amd64/x86.
diff --git a/games-fps/doom3-roe/doom3-roe-1.ebuild b/games-fps/doom3-roe/doom3-roe-1.ebuild
index 57f0d47df513..cb2a41dd510b 100644
--- a/games-fps/doom3-roe/doom3-roe-1.ebuild
+++ b/games-fps/doom3-roe/doom3-roe-1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-roe/doom3-roe-1.ebuild,v 1.6 2006/10/05 12:05:53 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-roe/doom3-roe-1.ebuild,v 1.7 2006/10/24 22:48:24 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -22,12 +22,8 @@ GAMES_CHECK_LICENSE="yes"
 dir=${GAMES_PREFIX_OPT}/doom3
 Ddir=${D}/${dir}
 
-pkg_setup() {
-	games_pkg_setup
-	cdrom_get_cds Setup/Data/d3xp/pak000.pk4
-}
-
 src_unpack() {
+	cdrom_get_cds Setup/Data/d3xp/pak000.pk4
 	# Change from showing "d3xp" in the "mods" menu within Doom 3
 	# The ^1 changes the text to red
 	echo '^1Resurrection of Evil' > description.txt
diff --git a/games-fps/doom3-roe/files/digest-doom3-roe-1 b/games-fps/doom3-roe/files/digest-doom3-roe-1
index 8b137891791f..e69de29bb2d1 100644
--- a/games-fps/doom3-roe/files/digest-doom3-roe-1
+++ b/games-fps/doom3-roe/files/digest-doom3-roe-1
@@ -1 +0,0 @@
-
diff --git a/games-fps/postal2/ChangeLog b/games-fps/postal2/ChangeLog
index 683478b94b5d..c1f5ee5a3f14 100644
--- a/games-fps/postal2/ChangeLog
+++ b/games-fps/postal2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/postal2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2/ChangeLog,v 1.1 2006/10/03 14:59:06 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2/ChangeLog,v 1.2 2006/10/24 22:49:02 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> postal2-1409.2.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
 *postal2-1409.2 (03 Oct 2006)
 
diff --git a/games-fps/postal2/postal2-1409.2.ebuild b/games-fps/postal2/postal2-1409.2.ebuild
index 2de86f5ccf77..56d36464acb5 100644
--- a/games-fps/postal2/postal2-1409.2.ebuild
+++ b/games-fps/postal2/postal2-1409.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2/postal2-1409.2.ebuild,v 1.1 2006/10/03 14:59:06 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2/postal2-1409.2.ebuild,v 1.2 2006/10/24 22:49:02 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -22,20 +22,14 @@ RDEPEND="x11-libs/libXext
 		app-emulation/emul-linux-x86-xlibs
 		app-emulation/emul-linux-x86-soundlibs
 		app-emulation/emul-linux-x86-sdl
-		app-emulation/emul-linux-x86-compat
-	)"
+		app-emulation/emul-linux-x86-compat )"
 
 S=${WORKDIR}
 
 GAMES_CHECK_LICENSE="yes"
 
-pkg_setup() {
-	games_pkg_setup
-
-	cdrom_get_cds postal2_eula.txt
-}
-
 src_unpack() {
+	cdrom_get_cds postal2_eula.txt
 	mkdir ${A}
 
 	local f
diff --git a/games-fps/quake1-data/ChangeLog b/games-fps/quake1-data/ChangeLog
index b252c9b5aab0..e5943104e14a 100644
--- a/games-fps/quake1-data/ChangeLog
+++ b/games-fps/quake1-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake1-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/ChangeLog,v 1.6 2006/08/11 02:38:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/ChangeLog,v 1.7 2006/10/24 22:46:08 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake1-data-2.40.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
   11 Aug 2006; Mike Frysinger <vapier@gentoo.org> quake1-data-2.40.ebuild:
   Add support for newer Quake cds #142207 by Joe Quanaim.
diff --git a/games-fps/quake1-data/files/digest-quake1-data-2.40 b/games-fps/quake1-data/files/digest-quake1-data-2.40
index 8b137891791f..e69de29bb2d1 100644
--- a/games-fps/quake1-data/files/digest-quake1-data-2.40
+++ b/games-fps/quake1-data/files/digest-quake1-data-2.40
@@ -1 +0,0 @@
-
diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40.ebuild
index d3a7d2b6b042..0cd1f8d21884 100644
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild
+++ b/games-fps/quake1-data/quake1-data-2.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/quake1-data-2.40.ebuild,v 1.12 2006/08/19 22:21:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/quake1-data-2.40.ebuild,v 1.13 2006/10/24 22:46:08 wolf31o2 Exp $
 
 # TODO: if installing off of the 1.01 cd, need to fetch the
 #       quake shareware and use that pak0
@@ -31,12 +31,11 @@ pkg_setup() {
 		eerror "The symlink for the demo data conflicts with the cdinstall data"
 		die "Unmerge games-fps/quake1-demodata to remove the conflict"
 	fi
-
-	export CDROM_NAME_SET=("Existing Install" "Quake CD (1.01)" "Ultimate Quake Collection" "Quake CD (newer)")
-	cdrom_get_cds id1:q101_int.1:Setup/ID1:resource.1
 }
 
 src_unpack() {
+	export CDROM_NAME_SET=("Existing Install" "Quake CD (1.01)" "Ultimate Quake Collection" "Quake CD (newer)")
+	cdrom_get_cds id1:q101_int.1:Setup/ID1:resource.1
 	if [[ ${CDROM_SET} == "1" ]] ; then
 		echo ">>> Unpacking q101_int.lha to ${PWD}"
 		cat "${CDROM_ROOT}"/q101_int.1 "${CDROM_ROOT}"/q101_int.2 > \
diff --git a/games-fps/quake2-data/ChangeLog b/games-fps/quake2-data/ChangeLog
index 661f85894119..ae51172ace89 100644
--- a/games-fps/quake2-data/ChangeLog
+++ b/games-fps/quake2-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake2-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/ChangeLog,v 1.11 2006/06/27 21:08:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/ChangeLog,v 1.12 2006/10/24 22:47:29 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake2-data-3.20.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
   27 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   quake2-data-3.20.ebuild:
diff --git a/games-fps/quake2-data/quake2-data-3.20.ebuild b/games-fps/quake2-data/quake2-data-3.20.ebuild
index 49b4b452b833..bcff40970934 100644
--- a/games-fps/quake2-data/quake2-data-3.20.ebuild
+++ b/games-fps/quake2-data/quake2-data-3.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/quake2-data-3.20.ebuild,v 1.22 2006/08/05 22:54:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/quake2-data-3.20.ebuild,v 1.23 2006/10/24 22:47:29 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -20,18 +20,16 @@ S=${WORKDIR}
 
 pkg_setup() {
 	games_pkg_setup
-
 	if has_version games-fps/quake2-demodata && \
 	   built_with_use "games-fps/quake2-demodata" symlink ; then
 		eerror "The symlink for the demo data conflicts with the cdinstall data"
 		die "Unmerge games-fps/quake2-demodata to remove the conflict"
 	fi
-
-	export CDROM_NAME_SET=("Existing Install" "Ultimate Quake Edition" "Quake2 CD" "Quake4 Bonus DVD")
-	cdrom_get_cds baseq2:Install/patch:Install:Movies
 }
 
 src_unpack() {
+	export CDROM_NAME_SET=("Existing Install" "Ultimate Quake Edition" "Quake2 CD" "Quake4 Bonus DVD")
+	cdrom_get_cds baseq2:Install/patch:Install:Movies
 	# The .exe is just a self-extracting .zip
 	echo ">>> Unpacking ${A} to ${PWD}"
 	unzip -qo "${DISTDIR}/${A}" || die "Failed to unpack ${A}"
diff --git a/games-fps/quake3-data/ChangeLog b/games-fps/quake3-data/ChangeLog
index ed144ec72c44..37b5dd92f8dc 100644
--- a/games-fps/quake3-data/ChangeLog
+++ b/games-fps/quake3-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake3-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-data/ChangeLog,v 1.7 2006/05/24 23:26:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-data/ChangeLog,v 1.8 2006/10/24 23:03:58 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake3-data-1.32b.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
   24 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   quake3-data-1.32b.ebuild:
diff --git a/games-fps/quake3-data/quake3-data-1.32b.ebuild b/games-fps/quake3-data/quake3-data-1.32b.ebuild
index 388b5825452b..b8b25c2bcbf8 100644
--- a/games-fps/quake3-data/quake3-data-1.32b.ebuild
+++ b/games-fps/quake3-data/quake3-data-1.32b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-data/quake3-data-1.32b.ebuild,v 1.10 2006/05/24 23:26:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-data/quake3-data-1.32b.ebuild,v 1.11 2006/10/24 23:03:58 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -18,12 +18,8 @@ RDEPEND=""
 S=${WORKDIR}
 dir=${GAMES_DATADIR}/quake3
 
-pkg_setup() {
-	games_pkg_setup
-	use cdinstall && cdrom_get_cds baseq3/pak0.pk3:Quake3/baseq3/pak0.pk3
-}
-
 src_unpack() {
+	use cdinstall && cdrom_get_cds baseq3/pak0.pk3:Quake3/baseq3/pak0.pk3
 	unpack_makeself
 }
 
diff --git a/games-fps/quake3-teamarena/ChangeLog b/games-fps/quake3-teamarena/ChangeLog
index aaf6fc384569..fc5913252894 100644
--- a/games-fps/quake3-teamarena/ChangeLog
+++ b/games-fps/quake3-teamarena/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake3-teamarena
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-teamarena/ChangeLog,v 1.4 2006/05/24 23:25:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-teamarena/ChangeLog,v 1.5 2006/10/24 22:52:46 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake3-teamarena-1.32b.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
   24 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   quake3-teamarena-1.32b.ebuild:
diff --git a/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild b/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild
index 7afcb6d825f6..508b3ecd13d4 100644
--- a/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild
+++ b/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild,v 1.4 2006/05/24 23:25:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild,v 1.5 2006/10/24 22:52:46 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -19,12 +19,8 @@ RDEPEND="|| (
 
 S=${WORKDIR}
 
-pkg_setup() {
-	games_pkg_setup
-	use cdinstall && cdrom_get_cds Setup/missionpack/PAK0.PK3
-}
-
 src_unpack() {
+	use cdinstall && cdrom_get_cds Setup/missionpack/PAK0.PK3
 	unpack_makeself
 }
 
diff --git a/games-fps/soldieroffortune/ChangeLog b/games-fps/soldieroffortune/ChangeLog
index 5db8627caf4b..dce02305dd06 100644
--- a/games-fps/soldieroffortune/ChangeLog
+++ b/games-fps/soldieroffortune/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/soldieroffortune
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.17 2006/10/07 13:02:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.18 2006/10/24 22:53:31 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  soldieroffortune-1.06a.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
   07 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   soldieroffortune-1.06a.ebuild:
diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild
index dcc75a88b724..5bb6ae8fa56d 100644
--- a/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild
+++ b/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild,v 1.18 2006/10/07 13:02:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild,v 1.19 2006/10/24 22:53:31 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -43,10 +43,10 @@ Ddir=${D}/${dir}
 pkg_setup() {
 	games_pkg_setup
 	ewarn "The installed game takes about 725MB of space!"
-	cdrom_get_cds sof.xpm
 }
 
 src_unpack() {
+	cdrom_get_cds sof.xpm
 	unpack_makeself
 	tar xzf ${CDROM_ROOT}/paks.tar.gz -C ${T} \
 		|| die "uncompressing data"
diff --git a/games-fps/unreal-tournament-goty/ChangeLog b/games-fps/unreal-tournament-goty/ChangeLog
index eb48a978f2c0..ab6132b0a13c 100644
--- a/games-fps/unreal-tournament-goty/ChangeLog
+++ b/games-fps/unreal-tournament-goty/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/unreal-tournament-goty
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/ChangeLog,v 1.10 2006/04/14 11:49:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/ChangeLog,v 1.11 2006/10/24 22:58:44 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  unreal-tournament-goty-436.ebuild, unreal-tournament-goty-451.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
   14 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   unreal-tournament-goty-436.ebuild, unreal-tournament-goty-451.ebuild:
diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
index f7999e8ce88e..427f9e0cd400 100644
--- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
+++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild,v 1.10 2006/04/14 11:49:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild,v 1.11 2006/10/24 22:58:44 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -27,12 +27,8 @@ RDEPEND="opengl? ( virtual/opengl )
 
 S=${WORKDIR}
 
-pkg_setup() {
-	games_pkg_setup
-	cdrom_get_cds System/ Help/chaosut
-}
-
 src_unpack() {
+	cdrom_get_cds System/ Help/chaosut
 	unpack_makeself ut-install-${PV}-GOTY.run
 	unpack IpDrv-${PV}-Linux-08-20-02.zip
 }
diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
index 3a9bfc2d2e36..d20bc43a3424 100644
--- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
+++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild,v 1.13 2006/04/14 11:49:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild,v 1.14 2006/10/24 22:58:44 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -33,12 +33,8 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}
 
-pkg_setup() {
-	games_pkg_setup
-	cdrom_get_cds System/ Help/chaosut
-}
-
 src_unpack() {
+	cdrom_get_cds System/ Help/chaosut
 	unpack_makeself ut-install-436-GOTY.run
 	mkdir UTPG && cd UTPG
 	unpack UTPGPatch${PV}.tar.bz2
diff --git a/games-fps/unreal-tournament/ChangeLog b/games-fps/unreal-tournament/ChangeLog
index 42b461efa1fd..1ebfc7b729a8 100644
--- a/games-fps/unreal-tournament/ChangeLog
+++ b/games-fps/unreal-tournament/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/unreal-tournament
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/ChangeLog,v 1.14 2006/04/14 11:50:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/ChangeLog,v 1.15 2006/10/24 22:59:23 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  unreal-tournament-436.ebuild, unreal-tournament-451.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
   14 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   unreal-tournament-436.ebuild, unreal-tournament-451.ebuild:
diff --git a/games-fps/unreal-tournament/unreal-tournament-436.ebuild b/games-fps/unreal-tournament/unreal-tournament-436.ebuild
index f609030eb6df..d3f65f4bd1d6 100644
--- a/games-fps/unreal-tournament/unreal-tournament-436.ebuild
+++ b/games-fps/unreal-tournament/unreal-tournament-436.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-436.ebuild,v 1.13 2006/04/14 11:50:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-436.ebuild,v 1.14 2006/10/24 22:59:23 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -26,12 +26,8 @@ RDEPEND="|| (
 
 S=${WORKDIR}
 
-pkg_setup() {
-	games_pkg_setup
-	cdrom_get_cds System/
-}
-
 src_unpack() {
+	cdrom_get_cds System/
 	unpack_makeself ut-install-${PV}.run
 	unpack IpDrv-${PV}-Linux-08-20-02.zip
 }
diff --git a/games-fps/unreal-tournament/unreal-tournament-451.ebuild b/games-fps/unreal-tournament/unreal-tournament-451.ebuild
index 6330e7d1da00..8bc7ecc270ae 100644
--- a/games-fps/unreal-tournament/unreal-tournament-451.ebuild
+++ b/games-fps/unreal-tournament/unreal-tournament-451.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-451.ebuild,v 1.20 2006/04/14 11:50:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal-tournament/unreal-tournament-451.ebuild,v 1.21 2006/10/24 22:59:23 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -33,12 +33,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"
 
-pkg_setup() {
-	games_pkg_setup
-	cdrom_get_cds System/
-}
-
 src_unpack() {
+	cdrom_get_cds System/
 	unpack_makeself ut-install-436.run
 	mkdir UTPG && cd UTPG
 	unpack UTPGPatch${PV}.tar.bz2
diff --git a/games-fps/unreal/ChangeLog b/games-fps/unreal/ChangeLog
index dc85f740af86..a57ac79af855 100644
--- a/games-fps/unreal/ChangeLog
+++ b/games-fps/unreal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/unreal
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal/ChangeLog,v 1.10 2006/10/09 23:31:49 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal/ChangeLog,v 1.11 2006/10/24 23:00:00 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> unreal-226.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
   14 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> unreal-226.ebuild:
   Moved games_pkg_setup to beginning of pkg_setup and ported to modular X.
diff --git a/games-fps/unreal/unreal-226.ebuild b/games-fps/unreal/unreal-226.ebuild
index 63ac001e4ed7..c0892f4b6dbb 100644
--- a/games-fps/unreal/unreal-226.ebuild
+++ b/games-fps/unreal/unreal-226.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal/unreal-226.ebuild,v 1.13 2006/04/14 11:57:46 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/unreal/unreal-226.ebuild,v 1.14 2006/10/24 23:00:00 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -33,14 +33,10 @@ RDEPEND="!amd64? (
 
 S="${WORKDIR}"
 
-pkg_setup() {
-	games_pkg_setup
+src_unpack() {
 	export CDROM_NAME_1="Unreal CD"
 	export CDROM_NAME_2="Unreal Tournament CD"
 	cdrom_get_cds System/Unreal.ini System/UnrealTournament.ini
-}
-
-src_unpack() {
 	unpack_makeself unreali-install.run
 	mkdir ut
 	cd ut
diff --git a/games-fps/ut2003-data/ChangeLog b/games-fps/ut2003-data/ChangeLog
index cec45b6a9fde..7929cd9a477f 100644
--- a/games-fps/ut2003-data/ChangeLog
+++ b/games-fps/ut2003-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/ut2003-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-data/ChangeLog,v 1.6 2006/03/31 21:24:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-data/ChangeLog,v 1.7 2006/10/24 23:04:38 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  ut2003-data-2107.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
   31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   ut2003-data-2107.ebuild:
diff --git a/games-fps/ut2003-data/files/digest-ut2003-data-2107 b/games-fps/ut2003-data/files/digest-ut2003-data-2107
index 33c21d1aca37..bbca8e642b9d 100644
--- a/games-fps/ut2003-data/files/digest-ut2003-data-2107
+++ b/games-fps/ut2003-data/files/digest-ut2003-data-2107
@@ -1 +1,3 @@
 MD5 bba41d9a1c552ae1664c7521798324cd UT2003CrashFix.zip 2764
+RMD160 647c14d1b6574e4c117426a1a21e1f0e3d846160 UT2003CrashFix.zip 2764
+SHA256 df1a6fdf81f388486b20abf301ef86fb72b0b12d96bec789d7cb7103da579813 UT2003CrashFix.zip 2764
diff --git a/games-fps/ut2003-data/ut2003-data-2107.ebuild b/games-fps/ut2003-data/ut2003-data-2107.ebuild
index 2ca48428f7b0..cf758f681053 100644
--- a/games-fps/ut2003-data/ut2003-data-2107.ebuild
+++ b/games-fps/ut2003-data/ut2003-data-2107.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-data/ut2003-data-2107.ebuild,v 1.6 2006/03/31 21:24:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-data/ut2003-data-2107.ebuild,v 1.7 2006/10/24 23:04:38 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -27,11 +27,11 @@ Ddir="${D}/${dir}"
 pkg_setup() {
 	games_pkg_setup
 	ewarn "The installed game takes about 2.7GB of space!"
-	cdrom_get_cds System/Packages.md5 StaticMeshes/AWHardware.usx.uz2 \
-		Extras/MayaPLE/Maya4PersonalLearningEditionEpic.exe
 }
 
 src_unpack() {
+	cdrom_get_cds System/Packages.md5 StaticMeshes/AWHardware.usx.uz2 \
+		Extras/MayaPLE/Maya4PersonalLearningEditionEpic.exe
 	unzip ${DISTDIR}/UT2003CrashFix.zip \
 		|| die "unpacking crash-fix"
 }
diff --git a/games-fps/ut2004-data/ChangeLog b/games-fps/ut2004-data/ChangeLog
index 44a392c1e3fb..b9b8b095e85f 100644
--- a/games-fps/ut2004-data/ChangeLog
+++ b/games-fps/ut2004-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/ut2004-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v 1.18 2006/09/27 22:26:34 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v 1.19 2006/10/24 22:54:40 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  ut2004-data-3186-r3.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
   27 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   ut2004-data-3186-r3.ebuild:
diff --git a/games-fps/ut2004-data/files/digest-ut2004-data-3186-r3 b/games-fps/ut2004-data/files/digest-ut2004-data-3186-r3
index 8b137891791f..e69de29bb2d1 100644
--- a/games-fps/ut2004-data/files/digest-ut2004-data-3186-r3
+++ b/games-fps/ut2004-data/files/digest-ut2004-data-3186-r3
@@ -1 +0,0 @@
-
diff --git a/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild b/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild
index 0a58a06bb626..a2cc4c25f03d 100644
--- a/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild
+++ b/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild,v 1.9 2006/09/28 21:23:28 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild,v 1.10 2006/10/24 22:54:40 wolf31o2 Exp $
 
 inherit eutils games games-ut2k4mod
 
@@ -42,6 +42,9 @@ pkg_setup() {
 	ewarn "This is a huge package.  If you do not have at least 7GB of free"
 	ewarn "disk space in ${PORTAGE_TMPDIR} and also in ${GAMES_PREFIX_OPT} then"
 	ewarn "you should abort this installation now and free up some space."
+}
+
+src_unpack() {
 	check_dvd
 
 	if [[ "${USE_DVD}" -eq 1 ]]
@@ -76,9 +79,6 @@ pkg_setup() {
 			Speech/ons.xml \
 			Sounds/TauntPack.det_uax.uz2
 	fi
-}
-
-src_unpack() {
 	unpack_makeself "${CDROM_ROOT}"/linux-installer.sh \
 		|| die "unpacking linux installer"
 	use x86 && unpack ./linux-x86.tar