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

Package-Manager: portage-2.1.2_pre3-r5

5 files changed, 16 insertions, 15 deletions

diff --git a/games-fps/doom3-data/ChangeLog b/games-fps/doom3-data/ChangeLog
index 9296174bc86b..2db094f330dd 100644
--- a/games-fps/doom3-data/ChangeLog
+++ b/games-fps/doom3-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/doom3-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-data/ChangeLog,v 1.7 2006/03/31 20:43:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-data/ChangeLog,v 1.8 2006/10/24 23:05:57 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  doom3-data-1.1.1282-r1.ebuild:
+  Moved cdrom_get_cds to src_install since binary packages don't require the
+  original media to install.
 
   31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   -doom3-data-1.1.1282.ebuild, doom3-data-1.1.1282-r1.ebuild:
diff --git a/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild b/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild
index 45b1ee7e3d6c..449724ef7155 100644
--- a/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild
+++ b/games-fps/doom3-data/doom3-data-1.1.1282-r1.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-data/doom3-data-1.1.1282-r1.ebuild,v 1.2 2006/03/31 20:43:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild,v 1.3 2006/10/24 23:05:57 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -24,14 +24,10 @@ GAMES_CHECK_LICENSE="yes"
 dir=${GAMES_PREFIX_OPT}/doom3
 Ddir=${D}/${dir}
 
-pkg_setup() {
-	games_pkg_setup
+src_install() {
 	cdrom_get_cds Setup/Data/base/pak002.pk4 \
 		Setup/Data/base/pak000.pk4 \
 		Setup/Data/base/pak003.pk4
-}
-
-src_install() {
 	insinto "${dir}"/base
 
 	einfo "Copying files from Disk 1..."
diff --git a/games-fps/quake4-data/ChangeLog b/games-fps/quake4-data/ChangeLog
index eaa320145ae2..e0cea4bea38e 100644
--- a/games-fps/quake4-data/ChangeLog
+++ b/games-fps/quake4-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake4-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-data/ChangeLog,v 1.6 2006/09/27 22:24:34 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-data/ChangeLog,v 1.7 2006/10/24 23:03:20 wolf31o2 Exp $
+
+  24 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake4-data-1.0.2147.12.ebuild:
+  Moved cdrom_get_cds to src_install since binary packages don't require the
+  original media to install.
 
   27 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   quake4-data-1.0.2147.12.ebuild:
diff --git a/games-fps/quake4-data/files/digest-quake4-data-1.0.2147.12 b/games-fps/quake4-data/files/digest-quake4-data-1.0.2147.12
index 8b137891791f..e69de29bb2d1 100644
--- a/games-fps/quake4-data/files/digest-quake4-data-1.0.2147.12
+++ b/games-fps/quake4-data/files/digest-quake4-data-1.0.2147.12
@@ -1 +0,0 @@
-
diff --git a/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild b/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild
index 926a6635b908..9c18cdf715d9 100644
--- a/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild
+++ b/games-fps/quake4-data/quake4-data-1.0.2147.12.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/quake4-data/quake4-data-1.0.2147.12.ebuild,v 1.7 2006/09/27 22:24:34 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild,v 1.8 2006/10/24 23:03:20 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -25,15 +25,11 @@ GAMES_CHECK_LICENSE="yes"
 dir=${GAMES_PREFIX_OPT}/quake4
 Ddir=${D}/${dir}
 
-pkg_setup() {
-	games_pkg_setup
+src_install() {
 	cdrom_get_cds Setup/Data/q4base/pak012.pk4 \
 		Setup/Data/q4base/pak001.pk4 \
 		Setup/Data/q4base/pak004.pk4 \
 		Setup/Data/q4base/pak007.pk4
-}
-
-src_install() {
 	insinto "${dir}"/q4base
 	einfo "Copying files from Disk 1..."
 	doins ${CDROM_ROOT}/Setup/Data/q4base/pak01{0,1,2}.pk4 \