11 files changed, 40 insertions, 22 deletions
diff --git a/games-strategy/freecol/ChangeLog b/games-strategy/freecol/ChangeLog
index 342d6b85723f..1042a99c1741 100644
--- a/games-strategy/freecol/ChangeLog
+++ b/games-strategy/freecol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freecol
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.3 2005/06/24 04:21:32 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/ChangeLog,v 1.4 2006/04/17 13:26:28 wolf31o2 Exp $
+
+  17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> freecol-0.3.0.ebuild,
+  freecol-0.4.0.ebuild:
+  Moved games_pkg_setup to beginning of pkg_setup.
 
 *freecol-0.4.0 (24 Jun 2005)
 
diff --git a/games-strategy/freecol/freecol-0.3.0.ebuild b/games-strategy/freecol/freecol-0.3.0.ebuild
index eee7ccd647e7..25c1bf457dbf 100644
--- a/games-strategy/freecol/freecol-0.3.0.ebuild
+++ b/games-strategy/freecol/freecol-0.3.0.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-strategy/freecol/freecol-0.3.0.ebuild,v 1.4 2005/07/09 02:51:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.3.0.ebuild,v 1.5 2006/04/17 13:26:28 wolf31o2 Exp $
 
 inherit games
 
@@ -20,6 +20,7 @@ DEPEND=">=virtual/jdk-1.4
 S="${WORKDIR}/${PN}"
 
 pkg_setup() {
+	games_pkg_setup
 	if [ -z "${JAVA_HOME}" ]; then
 		einfo
 		einfo "\${JAVA_HOME} not set!"
@@ -27,7 +28,6 @@ pkg_setup() {
 		einfo
 		die "\${JAVA_HOME} not set."
 	fi
-	games_pkg_setup
 }
 
 src_unpack() {
diff --git a/games-strategy/freecol/freecol-0.4.0.ebuild b/games-strategy/freecol/freecol-0.4.0.ebuild
index c537501a3e25..12b282c6d052 100644
--- a/games-strategy/freecol/freecol-0.4.0.ebuild
+++ b/games-strategy/freecol/freecol-0.4.0.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-strategy/freecol/freecol-0.4.0.ebuild,v 1.2 2005/07/09 02:51:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.4.0.ebuild,v 1.3 2006/04/17 13:26:28 wolf31o2 Exp $
 
 inherit games
 
@@ -20,6 +20,7 @@ DEPEND=">=virtual/jdk-1.4
 S=${WORKDIR}/${PN}
 
 pkg_setup() {
+	games_pkg_setup
 	if [ -z "${JAVA_HOME}" ]; then
 		einfo
 		einfo "\${JAVA_HOME} not set!"
@@ -27,7 +28,6 @@ pkg_setup() {
 		einfo
 		die "\${JAVA_HOME} not set."
 	fi
-	games_pkg_setup
 }
 
 src_unpack() {
diff --git a/games-strategy/freelords/ChangeLog b/games-strategy/freelords/ChangeLog
index 335b1fb03f66..2740444e2bbb 100644
--- a/games-strategy/freelords/ChangeLog
+++ b/games-strategy/freelords/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freelords
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/ChangeLog,v 1.20 2006/03/29 19:40:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/ChangeLog,v 1.21 2006/04/17 13:27:31 wolf31o2 Exp $
+
+  17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  freelords-0.3.7.ebuild:
+  Moved games_pkg_setup to beginning of pkg_setup.
 
   29 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org>
   freelords-0.3.7.ebuild:
diff --git a/games-strategy/freelords/freelords-0.3.7.ebuild b/games-strategy/freelords/freelords-0.3.7.ebuild
index f8b36a1c2174..687438471f43 100644
--- a/games-strategy/freelords/freelords-0.3.7.ebuild
+++ b/games-strategy/freelords/freelords-0.3.7.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/freelords/freelords-0.3.7.ebuild,v 1.2 2006/03/29 19:40:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.7.ebuild,v 1.3 2006/04/17 13:27:31 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -26,10 +26,10 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 pkg_setup() {
+	games_pkg_setup
 	if ! built_with_use -o media-libs/sdl-mixer vorbis oggvorbis ; then
 		die "Please emerge sdlmixer with USE=vorbis"
 	fi
-	games_pkg_setup
 }
 
 src_unpack() {
diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index a2cb78373726..71b13d82f688 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/scorched3d
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.28 2005/10/28 06:39:19 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.29 2006/04/17 13:30:05 wolf31o2 Exp $
+
+  17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  scorched3d-39.1.ebuild:
+  Moved games_pkg_setup to beginning of pkg_setup.
 
   28 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
   +files/smoke-orange.bmp, scorched3d-39.1.ebuild:
diff --git a/games-strategy/scorched3d/scorched3d-39.1.ebuild b/games-strategy/scorched3d/scorched3d-39.1.ebuild
index 893f2193d71a..1353d3591d16 100644
--- a/games-strategy/scorched3d/scorched3d-39.1.ebuild
+++ b/games-strategy/scorched3d/scorched3d-39.1.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-strategy/scorched3d/scorched3d-39.1.ebuild,v 1.4 2005/10/28 06:39:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-39.1.ebuild,v 1.5 2006/04/17 13:30:05 wolf31o2 Exp $
 
 inherit wxwidgets games
 
@@ -24,8 +24,8 @@ DEPEND="virtual/opengl
 S=${WORKDIR}/scorched
 
 pkg_setup() {
-	need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
 	games_pkg_setup
+	need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
 }
 
 src_compile() {
diff --git a/games-strategy/smac/ChangeLog b/games-strategy/smac/ChangeLog
index 397ce0f1d202..160b3c728620 100644
--- a/games-strategy/smac/ChangeLog
+++ b/games-strategy/smac/ChangeLog
@@ -1,6 +1,9 @@
 # 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.7 2006/03/31 22:12:59 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/ChangeLog,v 1.8 2006/04/17 13:30:57 wolf31o2 Exp $
+
+  17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> smac-6.0a.ebuild:
+  Moved games_pkg_setup to beginning of pkg_setup.
 
   31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> smac-6.0a.ebuild:
   Changed nostrip to strip.
diff --git a/games-strategy/smac/smac-6.0a.ebuild b/games-strategy/smac/smac-6.0a.ebuild
index c1e3d45e5cb7..d71635f9a763 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.8 2006/03/31 22:12:59 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/smac/smac-6.0a.ebuild,v 1.9 2006/04/17 13:30:57 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -36,8 +36,8 @@ dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
 
 pkg_setup() {
-	cdrom_get_cds Alien_Crossfire_Manual.pdf
 	games_pkg_setup
+	cdrom_get_cds Alien_Crossfire_Manual.pdf
 }
 
 src_unpack() {
diff --git a/games-strategy/wargus/ChangeLog b/games-strategy/wargus/ChangeLog
index 57c8457e072b..d9a20e55304e 100644
--- a/games-strategy/wargus/ChangeLog
+++ b/games-strategy/wargus/ChangeLog
@@ -1,6 +1,9 @@
 # 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.3 2006/01/08 15:12:25 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.4 2006/04/17 13:32:08 wolf31o2 Exp $
+
+  17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> wargus-2.1-r1.ebuild:
+  Moved games_pkg_setup to beginning of pkg_setup.
 
   08 Jan 2006; Stefan Schweizer <genstef@gentoo.org>
   -files/wargus-2.1-ai.patch, wargus-2.1-r1.ebuild:
diff --git a/games-strategy/wargus/wargus-2.1-r1.ebuild b/games-strategy/wargus/wargus-2.1-r1.ebuild
index d5b2dd0aff87..065fe032102e 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.3 2006/01/08 15:12:25 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/wargus-2.1-r1.ebuild,v 1.4 2006/04/17 13:32:08 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -20,8 +20,8 @@ DEPEND="media-libs/libpng
 RDEPEND="=games-engines/stratagus-${PV:0:3}*"
 
 pkg_setup() {
-	cdrom_get_cds data/rezdat.war
 	games_pkg_setup
+	cdrom_get_cds data/rezdat.war
 }
 
 src_unpack() {