Removing gtk2 flag from IUSE

(Portage version: 2.1_pre3-r1)

4 files changed, 14 insertions, 25 deletions

diff --git a/net-p2p/gtk-gnutella/ChangeLog b/net-p2p/gtk-gnutella/ChangeLog
index 0d28533ef243..79dc88077679 100644
--- a/net-p2p/gtk-gnutella/ChangeLog
+++ b/net-p2p/gtk-gnutella/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/gtk-gnutella
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.53 2005/12/29 11:26:56 eldad Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.54 2006/01/23 17:22:01 mkay Exp $
+
+*gtk-gnutella-0.96b-r1 (23 Jan 2006)
+
+  23 Jan 2006; Marcin Kryczek <mkay@gentoo.org> -gtk-gnutella-0.96b.ebuild,
+  +gtk-gnutella-0.96b-r1.ebuild:
+  Removing gtk2 flag from IUSE
 
 *gtk-gnutella-0.96b (29 Dec 2005)
 
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 55bd59a6f715..4a53c9a38488 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1ef581ddf2a606c8b4bb157553a7085e ChangeLog 9180
 MD5 ae9bb9e16331554a4cb95a17526ae2e5 files/0.95-gtk2.6.patch 1475
 MD5 4fe4d39aa46ee9377a21fd889a537111 files/digest-gtk-gnutella-0.95 71
@@ -8,19 +5,12 @@ MD5 4fe4d39aa46ee9377a21fd889a537111 files/digest-gtk-gnutella-0.95-r1 71
 MD5 4fe4d39aa46ee9377a21fd889a537111 files/digest-gtk-gnutella-0.95-r2 71
 MD5 e689dedf277485b89ebda8f977041c72 files/digest-gtk-gnutella-0.95.4 73
 MD5 e689dedf277485b89ebda8f977041c72 files/digest-gtk-gnutella-0.95.4-r1 73
-MD5 c853cca1cdb98ecc95612841790820ac files/digest-gtk-gnutella-0.96b 72
+MD5 c853cca1cdb98ecc95612841790820ac files/digest-gtk-gnutella-0.96b-r1 72
 MD5 1edaa8e1c79da47114bd08eeec6f50c3 files/gtk-gnutella.desktop 186
 MD5 cb48051df9336ec980daefd330832201 gtk-gnutella-0.95-r1.ebuild 2276
 MD5 24e2ea86d85eb6fbaeb4fd1cd1738e15 gtk-gnutella-0.95-r2.ebuild 1805
 MD5 bfb377df07375b3a2cf8ef09ee6868a2 gtk-gnutella-0.95.4-r1.ebuild 1259
 MD5 c1bff3b2d62c830ca26aa580dcee277b gtk-gnutella-0.95.4.ebuild 1385
 MD5 7501dfee4eca51d7affba43b576a6156 gtk-gnutella-0.95.ebuild 2177
-MD5 5d7a8d8c17a7ddafdd775d8894339897 gtk-gnutella-0.96b.ebuild 1471
+MD5 0ec445781978051f7b099976d079ac0d gtk-gnutella-0.96b-r1.ebuild 1304
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDs8gxT+MN7JbqCpMRAtviAJsEy+wp/FLPcCGrY154FqgHKsVDAgCeLe0Z
-0jKMs3px/U/wN2ZNkjaLPIE=
-=EEHB
------END PGP SIGNATURE-----
diff --git a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.96b b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.96b-r1
index 5e08521745bf..5e08521745bf 100644
--- a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.96b
+++ b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.96b-r1
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.96b.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.96b-r1.ebuild
index c9b11f4b6372..537848e776d2 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.96b.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.96b-r1.ebuild
@@ -1,10 +1,10 @@
-# 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/net-p2p/gtk-gnutella/gtk-gnutella-0.96b.ebuild,v 1.1 2005/12/29 11:26:56 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.96b-r1.ebuild,v 1.1 2006/01/23 17:22:01 mkay Exp $
 
 inherit eutils
 
-IUSE="gnome gtk2 nls dbus"
+IUSE="gnome nls dbus"
 
 DESCRIPTION="A GTK+ Gnutella client"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -16,8 +16,6 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="dev-libs/libxml2
-	gtk2? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
-	!gtk2? ( =dev-libs/glib-1.2* =x11-libs/gtk+-1.2* )
 	dev-util/yacc
 	dbus? ( sys-apps/dbus )
 	nls? ( >=sys-devel/gettext-0.11.5 )"
@@ -25,12 +23,6 @@ DEPEND="dev-libs/libxml2
 src_compile() {
 	local myconf
 
-	if use gtk2; then
-		myconf="-Dgtkversion=2"
-	else
-		myconf="-Dgtkversion=1"
-	fi
-
 	if use nls; then
 		myconf="${myconf} -Dd_enablenls -Dgmsgfmt=\"/usr/bin/msgfmt\" -Dmsgfmt=\"/usr/bin/msgfmt\""
 	else
@@ -47,6 +39,7 @@ src_compile() {
 		-Dprefix="/usr" \
 		-Dprivlib="/usr/share/gtk-gnutella" \
 		-Dccflags="${CFLAGS}" \
+		-Dgtkversion=2 \
 		${myconf} \
 		-Doptimize=" " \
 		-Dofficial="true" || die "Configure failed"