fix gtk2 USE flag usage (bug 34559)

6 files changed, 29 insertions, 37 deletions

diff --git a/games-board/ggz-gtk-client/ChangeLog b/games-board/ggz-gtk-client/ChangeLog
index 025992ce0dc9..07cac10de87b 100644
--- a/games-board/ggz-gtk-client/ChangeLog
+++ b/games-board/ggz-gtk-client/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/ggz-gtk-client
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-client/ChangeLog,v 1.2 2003/09/10 20:21:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-client/ChangeLog,v 1.3 2003/11/28 00:02:14 mr_bones_ Exp $
+
+  27 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  ggz-gtk-client-0.0.7.ebuild:
+  fix gtk2 USE flag usage (bug 34559)
 
 *ggz-gtk-client-0.0.7 (10 Jul 2003)
 
diff --git a/games-board/ggz-gtk-client/Manifest b/games-board/ggz-gtk-client/Manifest
index 7c94ae63fc0c..dd35fd640407 100644
--- a/games-board/ggz-gtk-client/Manifest
+++ b/games-board/ggz-gtk-client/Manifest
@@ -1,6 +1,6 @@
-MD5 df0b0bfa2281c16d443fc379783c0775 ChangeLog 807
+MD5 bcf01e4243147ad553d7debf6259d143 ChangeLog 935
 MD5 a2bbc78e62caac3ce51f725f8269b722 ggz-gtk-client-0.0.5.ebuild 590
-MD5 872cae20fda5f304d9ea458117a01c09 ggz-gtk-client-0.0.7.ebuild 988
+MD5 81a65e2b98c85c74c13b197f164146a0 ggz-gtk-client-0.0.7.ebuild 861
 MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
 MD5 a70e4f21ed3008a0abfac956e634a71b files/digest-ggz-gtk-client-0.0.5 72
 MD5 1e8c24bd09f29cd29f9179681a676c92 files/digest-ggz-gtk-client-0.0.7 72
diff --git a/games-board/ggz-gtk-client/ggz-gtk-client-0.0.7.ebuild b/games-board/ggz-gtk-client/ggz-gtk-client-0.0.7.ebuild
index dfa69183208d..bb8f6f78efec 100644
--- a/games-board/ggz-gtk-client/ggz-gtk-client-0.0.7.ebuild
+++ b/games-board/ggz-gtk-client/ggz-gtk-client-0.0.7.ebuild
@@ -1,33 +1,25 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-client/ggz-gtk-client-0.0.7.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-client/ggz-gtk-client-0.0.7.ebuild,v 1.2 2003/11/28 00:02:14 mr_bones_ Exp $
 
 DESCRIPTION="The gtk client for GGZ Gaming Zone"
 HOMEPAGE="http://ggz.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ggz/${P}.tar.gz"
 
+KEYWORDS="~x86 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="gtk2 gtk"
+IUSE="gtk2"
 
 DEPEND="=dev-games/ggz-client-libs-0.0.7
 	>=sys-apps/sed-4
-	|| (
-		gtk2? ( =x11-libs/gtk+-2* )
-		gtk? ( =x11-libs/gtk+-1* )
-		=x11-libs/gtk+-2*
-	)"
+	gtk2? ( =x11-libs/gtk+-2* )
+	!gtk2? ( =x11-libs/gtk+-1* )"
 
 src_compile() {
-	local myconf=""
-	if [ `use gtk2` ] ; then
-		myconf="--enable-gtk=gtk2"
-	elif [ `use gtk` ] ; then
-		myconf="--enable-gtk=gtk1"
-	else
-		myconf="--enable-gtk=gtk2"
-	fi
+	local myconf="--enable-gtk=gtk2"
+	use gtk2 || myconf="--enable-gtk"
+
 	econf ${myconf} --disable-debug || die
 	sed -i '/^SUBDIRS/s:po::' Makefile
 	emake || die
diff --git a/games-board/ggz-gtk-games/ChangeLog b/games-board/ggz-gtk-games/ChangeLog
index ef122d34c2e0..ecc567a22148 100644
--- a/games-board/ggz-gtk-games/ChangeLog
+++ b/games-board/ggz-gtk-games/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/ggz-gtk-games
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-games/ChangeLog,v 1.2 2003/09/10 20:21:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-games/ChangeLog,v 1.3 2003/11/28 00:04:21 mr_bones_ Exp $
+
+  27 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  ggz-gtk-games-0.0.7.ebuild:
+  fix gtk2 USE flag usage (bug 34559)
 
 *ggz-gtk-games-0.0.7 (10 Jul 2003)
 
diff --git a/games-board/ggz-gtk-games/Manifest b/games-board/ggz-gtk-games/Manifest
index fc3c69937a2b..470e4ddbba51 100644
--- a/games-board/ggz-gtk-games/Manifest
+++ b/games-board/ggz-gtk-games/Manifest
@@ -1,6 +1,6 @@
-MD5 dc677bedffc9f72a895d09c45bd18215 ChangeLog 812
+MD5 b3321756f387a8fb5ba3a12569135b86 ChangeLog 939
 MD5 9f9aa90eae0f16d7b95871041ea92d14 ggz-gtk-games-0.0.5.ebuild 874
-MD5 679d49aa2e4d2292b459554897a77cac ggz-gtk-games-0.0.7.ebuild 945
+MD5 dade56679650fb6cec37b3caa8e988ff ggz-gtk-games-0.0.7.ebuild 808
 MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
 MD5 21486a6671931be37bdb42fde5c3f4ae files/digest-ggz-gtk-games-0.0.5 72
 MD5 13d4a80e2820e952f10b5b02ac97e93c files/digest-ggz-gtk-games-0.0.7 72
diff --git a/games-board/ggz-gtk-games/ggz-gtk-games-0.0.7.ebuild b/games-board/ggz-gtk-games/ggz-gtk-games-0.0.7.ebuild
index 201109ee50b9..7183715fdebb 100644
--- a/games-board/ggz-gtk-games/ggz-gtk-games-0.0.7.ebuild
+++ b/games-board/ggz-gtk-games/ggz-gtk-games-0.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-games/ggz-gtk-games-0.0.7.ebuild,v 1.2 2003/09/10 18:16:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-games/ggz-gtk-games-0.0.7.ebuild,v 1.3 2003/11/28 00:04:21 mr_bones_ Exp $
 
 DESCRIPTION="These are the gtk versions of the games made by GGZ Gaming Zone"
 HOMEPAGE="http://ggz.sourceforge.net/"
@@ -9,24 +9,16 @@ SRC_URI="mirror://sourceforge/ggz/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-IUSE="gtk gtk2"
+IUSE="gtk2"
 
 DEPEND="=games-board/ggz-gtk-client-0.0.7
-	|| (
-		gtk2? ( =x11-libs/gtk+-2* )
-		gtk? ( =x11-libs/gtk+-1* )
-		=x11-libs/gtk+-2*
-	)"
+	gtk2? ( =x11-libs/gtk+-2* )
+	!gtk2? ( =x11-libs/gtk+-1* )"
 
 src_compile() {
-	local myconf=""
-	if [ `use gtk2` ] ; then
-		myconf="--enable-gtk=gtk2"
-	elif [ `use gtk` ] ; then
-		myconf="--enable-gtk=gtk1"
-	else
-		myconf="--enable-gtk=gtk2"
-	fi
+	myconf="--enable-gtk2"
+	use gtk2 || myconf="--enable-gtk"
+
 	econf ${myconf} || die
 	make || die
 }