--- /usr/portage/net-ftp/gftp/gftp-2.0.18-r1.ebuild	2005-09-15 17:35:50.000000000 -0600
+++ gftp-2.0.18-r1.ebuild	2005-10-08 18:56:19.000000000 -0600
@@ -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/net-ftp/gftp/gftp-2.0.18-r1.ebuild,v 1.8 2005/09/15 23:19:03 agriffis Exp $
+# $Header: $
 
 inherit eutils
 
@@ -10,14 +10,12 @@
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="nls gtk gtk2 ssl"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls gtk ssl"
 
 DEPEND="virtual/x11
 	ssl? ( dev-libs/openssl )
-	gtk? (
-		gtk2? ( >=x11-libs/gtk+-2 )
-		!gtk2? ( =x11-libs/gtk+-1.2* ) )
+	gtk? ( >=x11-libs/gtk+-2 )
 	!gtk? ( sys-libs/readline
 		sys-libs/ncurses
 		=dev-libs/glib-1.2* )"
@@ -29,8 +27,6 @@
 	unpack ${A}
 
 	cd ${S}
-	# fix building gtk1 backend (#80845)
-	epatch ${FILESDIR}/${P}-fix_gtk1.patch
 
 }
 
@@ -38,28 +34,22 @@
 
 	local myconf
 
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
 	# do not use enable-{gtk20,gtkport} they are not recognized
 	# and will disable building the gtkport alltogether
 	if use gtk
 	then
 		einfo "gtk+ enabled"
-		use gtk2 \
-			&& einfo "gtk2 enabled" \
-			|| myconf="${myconf} --disable-gtk20"
 	else
-		einfo "gtk+ and gtk2 disabled"
+		einfo "gtk+ disabled"
 		myconf="${myconf} --disable-gtkport --disable-gtk20"
 	fi
 
-	use ssl \
-		&& myconf="${myconf}" \
-		|| myconf="${myconf} --disable-ssl"
-
-	econf ${myconf} || die
+	econf \
+		$(use_enable nls) \
+		$(use_enable ssl) \
+		${myconf} \
+		|| die
+		
 	emake || die
 
 }