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

9 files changed, 32 insertions, 30 deletions

diff --git a/games-strategy/darwinia/ChangeLog b/games-strategy/darwinia/ChangeLog
index 1e446b98a847..dff595202ce9 100644
--- a/games-strategy/darwinia/ChangeLog
+++ b/games-strategy/darwinia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/darwinia
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia/ChangeLog,v 1.3 2006/09/30 19:37:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia/ChangeLog,v 1.4 2006/10/24 23:07:19 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> darwinia-1.3.0.ebuild,
+  darwinia-1.4.0_beta9.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
 *darwinia-1.4.0_beta9 (30 Sep 2006)
 
diff --git a/games-strategy/darwinia/darwinia-1.3.0.ebuild b/games-strategy/darwinia/darwinia-1.3.0.ebuild
index d7bcc7d660c9..5173605a9d85 100644
--- a/games-strategy/darwinia/darwinia-1.3.0.ebuild
+++ b/games-strategy/darwinia/darwinia-1.3.0.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-strategy/darwinia/darwinia-1.3.0.ebuild,v 1.4 2006/09/30 19:13:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia/darwinia-1.3.0.ebuild,v 1.5 2006/10/24 23:07:19 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -24,12 +24,8 @@ S=${WORKDIR}
 GAMES_CHECK_LICENSE="yes"
 dir=${GAMES_PREFIX_OPT}/${PN}
 
-pkg_setup() {
-	games_pkg_setup
-	use cdinstall && cdrom_get_cds gamefiles/main.dat
-}
-
 src_unpack() {
+	use cdinstall && cdrom_get_cds gamefiles/main.dat
 	unpack_makeself
 }
 
diff --git a/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild b/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild
index c2d4532aca4a..69f2b527a089 100644
--- a/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild
+++ b/games-strategy/darwinia/darwinia-1.4.0_beta9.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-strategy/darwinia/darwinia-1.4.0_beta9.ebuild,v 1.1 2006/09/30 19:37:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild,v 1.2 2006/10/24 23:07:19 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -25,12 +25,8 @@ S=${WORKDIR}
 GAMES_CHECK_LICENSE="yes"
 dir=${GAMES_PREFIX_OPT}/${PN}
 
-pkg_setup() {
-	games_pkg_setup
-	use cdinstall && cdrom_get_cds gamefiles/main.dat
-}
-
 src_unpack() {
+	use cdinstall && cdrom_get_cds gamefiles/main.dat
 	unpack_makeself
 }
 
diff --git a/games-strategy/heroes3/ChangeLog b/games-strategy/heroes3/ChangeLog
index cf1f54e9ff42..0e12ff0a6266 100644
--- a/games-strategy/heroes3/ChangeLog
+++ b/games-strategy/heroes3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/heroes3
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.12 2006/10/05 22:59:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.13 2006/10/24 23:09:12 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  heroes3-1.3.1a-r2.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
 *heroes3-1.3.1a-r2 (05 Oct 2006)
 
diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
index 47d93574de2e..4abf9b338633 100644
--- a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
+++ b/games-strategy/heroes3/heroes3-1.3.1a-r2.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-strategy/heroes3/heroes3-1.3.1a-r2.ebuild,v 1.1 2006/10/05 22:59:08 wolf31o2 Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild,v 1.2 2006/10/24 23:09:12 wolf31o2 Exp $ 
 
 # 	[x] Base Install Required (+4 MB) 
 #	[x] Scenarios (+7 MB)
@@ -88,10 +88,10 @@ pkg_setup() {
 #			fi
 #		done
 #	fi
-	cdrom_get_cds hiscore.tar.gz
 }
 
 src_unpack() {
+	cdrom_get_cds hiscore.tar.gz
 	use x86 && unpack_makeself ${P}-cdrom-x86.run
 	use ppc && unpack_makeself ${P}-ppc.run
 
diff --git a/games-strategy/smac/ChangeLog b/games-strategy/smac/ChangeLog
index 160b3c728620..d825a23c999c 100644
--- a/games-strategy/smac/ChangeLog
+++ b/games-strategy/smac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/smac
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/ChangeLog,v 1.8 2006/04/17 13:30:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/ChangeLog,v 1.9 2006/10/24 23:08:25 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> smac-6.0a.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
   17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> smac-6.0a.ebuild:
   Moved games_pkg_setup to beginning of pkg_setup.
diff --git a/games-strategy/smac/smac-6.0a.ebuild b/games-strategy/smac/smac-6.0a.ebuild
index d71635f9a763..c9f71dd1ea2e 100644
--- a/games-strategy/smac/smac-6.0a.ebuild
+++ b/games-strategy/smac/smac-6.0a.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-strategy/smac/smac-6.0a.ebuild,v 1.9 2006/04/17 13:30:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/smac-6.0a.ebuild,v 1.10 2006/10/24 23:08:25 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -35,12 +35,8 @@ RDEPEND="sys-libs/glibc
 dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
 
-pkg_setup() {
-	games_pkg_setup
-	cdrom_get_cds Alien_Crossfire_Manual.pdf
-}
-
 src_unpack() {
+	cdrom_get_cds Alien_Crossfire_Manual.pdf
 	mkdir -p ${S}/a
 	cd ${S}/a
 	unpack_makeself ${P}-x86.run
diff --git a/games-strategy/wargus/ChangeLog b/games-strategy/wargus/ChangeLog
index d9a20e55304e..a9bb6ae94592 100644
--- a/games-strategy/wargus/ChangeLog
+++ b/games-strategy/wargus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/wargus
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.4 2006/04/17 13:32:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.5 2006/10/24 23:06:43 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> wargus-2.1-r1.ebuild:
+  Moved cdrom_get_cds to src_unpack since binary packages don't require the
+  original media to install.
 
   17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> wargus-2.1-r1.ebuild:
   Moved games_pkg_setup to beginning of pkg_setup.
diff --git a/games-strategy/wargus/wargus-2.1-r1.ebuild b/games-strategy/wargus/wargus-2.1-r1.ebuild
index 065fe032102e..1f21b90ac79a 100644
--- a/games-strategy/wargus/wargus-2.1-r1.ebuild
+++ b/games-strategy/wargus/wargus-2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2004-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/wargus-2.1-r1.ebuild,v 1.4 2006/04/17 13:32:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/wargus-2.1-r1.ebuild,v 1.5 2006/10/24 23:06:43 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -19,12 +19,8 @@ DEPEND="media-libs/libpng
 	sys-libs/zlib"
 RDEPEND="=games-engines/stratagus-${PV:0:3}*"
 
-pkg_setup() {
-	games_pkg_setup
-	cdrom_get_cds data/rezdat.war
-}
-
 src_unpack() {
+	cdrom_get_cds data/rezdat.war
 	unpack ${A/wargus.png}
 	cd "${S}"
 	epatch "${FILESDIR}"/wargus-2.1-humanbasespell.patch \