remove gtk2 use flag

(Portage version: 2.0.51.22-r2)

4 files changed, 17 insertions, 37 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 7d8536a58ba9..23f772b77653 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.26 2005/09/17 21:42:16 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.27 2005/09/20 15:38:23 mr_bones_ Exp $
+
+  20 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  scorched3d-38.1.ebuild, scorched3d-39.ebuild, scorched3d-39.1.ebuild:
+  remove gtk2 use flag
 
   17 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
   scorched3d-39.1.ebuild:
diff --git a/games-strategy/scorched3d/scorched3d-38.1.ebuild b/games-strategy/scorched3d/scorched3d-38.1.ebuild
index fe1200e868ec..fd4df673e29e 100644
--- a/games-strategy/scorched3d/scorched3d-38.1.ebuild
+++ b/games-strategy/scorched3d/scorched3d-38.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-38.1.ebuild,v 1.3 2005/03/18 16:29:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-38.1.ebuild,v 1.4 2005/09/20 15:38:23 mr_bones_ Exp $
 
 inherit wxwidgets games
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE="gtk2 mysql"
+IUSE="mysql"
 
 DEPEND="virtual/opengl
 	>=media-libs/libsdl-1.2.4
@@ -25,20 +25,12 @@ DEPEND="virtual/opengl
 S=${WORKDIR}/scorched
 
 pkg_setup() {
-	if use gtk2; then
-		need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
-	else
-		need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
-	fi
+	need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
 	games_pkg_setup
 }
 
 src_compile() {
-	if use gtk2; then
-		need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
-	else
-		need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
-	fi
+	need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
 	egamesconf \
 		--disable-dependency-tracking \
 		--exec_prefix="${GAMES_PREFIX}" \
diff --git a/games-strategy/scorched3d/scorched3d-39.1.ebuild b/games-strategy/scorched3d/scorched3d-39.1.ebuild
index dab9fb447ef3..70cf25593e42 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
 # 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.2 2005/09/17 21:42:16 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-39.1.ebuild,v 1.3 2005/09/20 15:38:23 mr_bones_ Exp $
 
 inherit wxwidgets games
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE="gtk2 mysql"
+IUSE="mysql"
 
 DEPEND="virtual/opengl
 	>=media-libs/openal-20050504
@@ -24,21 +24,13 @@ DEPEND="virtual/opengl
 S=${WORKDIR}/scorched
 
 pkg_setup() {
-	if use gtk2; then
-		need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
-	else
-		need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
-	fi
+	need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
 	games_pkg_setup
 }
 
 src_compile() {
 	# work around portage bug: described in bug #73527
-	if use gtk2; then
-		need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
-	else
-		need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
-	fi
+	need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
 	egamesconf \
 		--disable-dependency-tracking \
 		--exec_prefix="${GAMES_PREFIX}" \
diff --git a/games-strategy/scorched3d/scorched3d-39.ebuild b/games-strategy/scorched3d/scorched3d-39.ebuild
index eb2e4351f0d0..6c307ff1456c 100644
--- a/games-strategy/scorched3d/scorched3d-39.ebuild
+++ b/games-strategy/scorched3d/scorched3d-39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-39.ebuild,v 1.4 2005/08/17 19:18:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-39.ebuild,v 1.5 2005/09/20 15:38:23 mr_bones_ Exp $
 
 inherit wxwidgets games
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE="gtk2 mysql"
+IUSE="mysql"
 
 DEPEND="virtual/opengl
 	>=media-libs/openal-20050504
@@ -24,11 +24,7 @@ DEPEND="virtual/opengl
 S=${WORKDIR}/scorched
 
 pkg_setup() {
-	if use gtk2; then
-		need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
-	else
-		need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
-	fi
+	need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
 	games_pkg_setup
 }
 
@@ -44,11 +40,7 @@ src_unpack() {
 
 src_compile() {
 	# work around portage bug: described in bug #73527
-	if use gtk2; then
-		need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
-	else
-		need-wxwidgets gtk || die "No gtk1 version of x11-libs/wxGTK found"
-	fi
+	need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='gtk2'"
 	egamesconf \
 		--disable-dependency-tracking \
 		--exec_prefix="${GAMES_PREFIX}" \