Moved games_pkg_setup to the beginning of pkg_setup.

Package-Manager: portage-2.1_pre7-r5

12 files changed, 45 insertions, 25 deletions

diff --git a/games-fps/quake1-data/ChangeLog b/games-fps/quake1-data/ChangeLog
index d14924edbf52..49c7932c7e27 100644
--- a/games-fps/quake1-data/ChangeLog
+++ b/games-fps/quake1-data/ChangeLog
@@ -1,6 +1,10 @@
 # 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.3 2006/01/04 13:58:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/ChangeLog,v 1.4 2006/04/13 21:05:45 wolf31o2 Exp $
+
+  13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake1-data-2.40.ebuild:
+  Moved games_pkg_setup to the beginning of pkg_setup.
 
   04 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   quake1-data-2.40.ebuild:
diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40.ebuild
index d3ed1f47d15c..800790d58b02 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.6 2006/01/04 13:58:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/quake1-data-2.40.ebuild,v 1.7 2006/04/13 21:05:47 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -19,8 +19,8 @@ RDEPEND=""
 S=${WORKDIR}
 
 pkg_setup() {
-	export CDROM_SET_NAMES=("Existing Install" "Quake CD" "Ultimate Quake Collection")
 	games_pkg_setup
+	export CDROM_SET_NAMES=("Existing Install" "Quake CD" "Ultimate Quake Collection")
 	cdrom_get_cds id1:q101_int.1:Setup/ID1
 }
 
diff --git a/games-fps/quake2-data/ChangeLog b/games-fps/quake2-data/ChangeLog
index 0e61115da5e0..e19567c4e1de 100644
--- a/games-fps/quake2-data/ChangeLog
+++ b/games-fps/quake2-data/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2006/03/15 22:33:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/ChangeLog,v 1.9 2006/04/13 21:06:48 wolf31o2 Exp $
+
+  13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake2-data-3.20.ebuild:
+  Moved games_pkg_setup to the beginning of pkg_setup.
 
   15 Mar 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 396b2904d8e6..91195437ed3c 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.17 2006/03/15 22:33:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/quake2-data-3.20.ebuild,v 1.18 2006/04/13 21:06:48 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -19,9 +19,9 @@ RDEPEND=""
 S=${WORKDIR}
 
 pkg_setup() {
+	games_pkg_setup
 	export CDROM_SET_NAMES=("Existing Install" "Ultimate Quake Edition" "Quake2 CD" "Quake4 Bonus DVD")
 	cdrom_get_cds baseq2:Install/patch:Install:Movies
-	games_pkg_setup
 }
 
 src_unpack() {
diff --git a/games-fps/quake3-bin/ChangeLog b/games-fps/quake3-bin/ChangeLog
index fa250ac6d072..eeee4ee65252 100644
--- a/games-fps/quake3-bin/ChangeLog
+++ b/games-fps/quake3-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake3-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.13 2006/03/31 21:06:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.14 2006/04/13 21:09:21 wolf31o2 Exp $
+
+  13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake3-bin-1.31.ebuild:
+  Moved games_pkg_setup to the beginning of pkg_setup.
 
   31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   quake3-bin-1.31.ebuild, quake3-bin-1.32b-r4.ebuild,
diff --git a/games-fps/quake3-bin/quake3-bin-1.31.ebuild b/games-fps/quake3-bin/quake3-bin-1.31.ebuild
index 18ca5d3363e3..1e3bc77993ee 100644
--- a/games-fps/quake3-bin/quake3-bin-1.31.ebuild
+++ b/games-fps/quake3-bin/quake3-bin-1.31.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-bin/quake3-bin-1.31.ebuild,v 1.7 2006/03/31 21:06:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.31.ebuild,v 1.8 2006/04/13 21:09:21 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -35,14 +35,11 @@ RDEPEND="sys-libs/glibc
 			>=x11-drivers/ati-drivers-8.8.25-r1 ) ) )"
 
 S=${WORKDIR}
+
+GAMES_CHECK_LICENSE="yes"
 dir=${GAMES_PREFIX_OPT}/quake3
 Ddir=${D}/${dir}
 
-pkg_setup() {
-	check_license Q3AEULA
-	games_pkg_setup
-}
-
 src_unpack() {
 	unpack_makeself
 }
diff --git a/games-fps/soldieroffortune/ChangeLog b/games-fps/soldieroffortune/ChangeLog
index a63288e25aab..5c15f0a8d31d 100644
--- a/games-fps/soldieroffortune/ChangeLog
+++ b/games-fps/soldieroffortune/ChangeLog
@@ -1,6 +1,10 @@
 # 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.12 2006/03/31 21:20:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.13 2006/04/13 21:12:52 wolf31o2 Exp $
+
+  13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  soldieroffortune-1.06a.ebuild:
+  Moved games_pkg_setup to the beginning of pkg_setup.
 
   31 Mar 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 0a11388a527b..c73c07d2218d 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.13 2006/03/31 21:20:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild,v 1.14 2006/04/13 21:12:52 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -20,13 +20,14 @@ RDEPEND="virtual/opengl"
 
 S=${WORKDIR}
 
+GAMES_CHECK_LICENSE="yes"
 dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
 
 pkg_setup() {
+	games_pkg_setup
 	ewarn "The installed game takes about 725MB of space!"
 	cdrom_get_cds sof.xpm
-	games_pkg_setup
 }
 
 src_unpack() {
diff --git a/games-fps/tribes2/ChangeLog b/games-fps/tribes2/ChangeLog
index 732a88eb4f91..ae90c614a64e 100644
--- a/games-fps/tribes2/ChangeLog
+++ b/games-fps/tribes2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/tribes2
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tribes2/ChangeLog,v 1.12 2006/03/31 21:21:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tribes2/ChangeLog,v 1.13 2006/04/13 21:13:57 wolf31o2 Exp $
+
+  13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> tribes2-25034.ebuild:
+  Moved games_pkg_setup to the beginning of pkg_setup.
 
   31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> tribes2-25034.ebuild:
   Changed nomirror to mirror and nostrip to strip.
diff --git a/games-fps/tribes2/tribes2-25034.ebuild b/games-fps/tribes2/tribes2-25034.ebuild
index 9cac202f1cdb..cbabac1b785a 100644
--- a/games-fps/tribes2/tribes2-25034.ebuild
+++ b/games-fps/tribes2/tribes2-25034.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/tribes2/tribes2-25034.ebuild,v 1.12 2006/03/31 21:21:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tribes2/tribes2-25034.ebuild,v 1.13 2006/04/13 21:13:57 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -22,14 +22,14 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}
 
+GAMES_CHECK_LICENSE="yes"
 dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
 
 pkg_setup() {
-	check_license LOKI-EULA
+	games_pkg_setup
 	ewarn "The installed game takes about 507MB of space!"
 	cdrom_get_cds README.tribes2d
-	games_pkg_setup
 }
 
 src_unpack() {
diff --git a/games-fps/ttyquake/ChangeLog b/games-fps/ttyquake/ChangeLog
index 77c544dc43a6..4dc2f9bc44a0 100644
--- a/games-fps/ttyquake/ChangeLog
+++ b/games-fps/ttyquake/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/ttyquake
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ttyquake/ChangeLog,v 1.5 2005/10/23 21:29:11 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ttyquake/ChangeLog,v 1.6 2006/04/13 21:14:52 wolf31o2 Exp $
+
+  13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> ttyquake-0.4.2.ebuild:
+  Moved games_pkg_setup to the beginning of pkg_setup.
 
   23 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
   ttyquake-0.4.2.ebuild:
diff --git a/games-fps/ttyquake/ttyquake-0.4.2.ebuild b/games-fps/ttyquake/ttyquake-0.4.2.ebuild
index 12233c9692d7..0ab63c6081f1 100644
--- a/games-fps/ttyquake/ttyquake-0.4.2.ebuild
+++ b/games-fps/ttyquake/ttyquake-0.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ttyquake/ttyquake-0.4.2.ebuild,v 1.7 2005/10/23 21:29:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ttyquake/ttyquake-0.4.2.ebuild,v 1.8 2006/04/13 21:14:52 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -19,9 +19,9 @@ RDEPEND="games-fps/quake1"
 S="${WORKDIR}"
 
 pkg_setup() {
+	games_pkg_setup
 	[ -x "${GAMES_BINDIR}/squake" ] \
 		|| die "You must emerge quake1 with svga in your USE"
-	games_pkg_setup
 }
 
 src_install() {