8 files changed, 32 insertions, 88 deletions
diff --git a/net-ftp/gftp/ChangeLog b/net-ftp/gftp/ChangeLog
index 7ebdd22e7628..bfef2a9c5e96 100644
--- a/net-ftp/gftp/ChangeLog
+++ b/net-ftp/gftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/gftp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.17 2003/08/22 03:28:45 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.18 2003/11/09 21:53:45 liquidx Exp $
+
+*gftp-2.0.16 (09 Nov 2003)
+
+  09 Nov 2003; Alastair Tse <liquidx@gentoo.org> gftp-2.0.13.ebuild,
+  gftp-2.0.14_rc1.ebuild, gftp-2.0.16.ebuild, files/gftp-2.0.13-gtk2.2.patch:
+  version bump and cleanup
 
   22 Aug 2003; <spider@gentoo.org> gftp-2.0.15.ebuild :
   Versionbump. Revamped the dependencies completely. USE="ssl" support
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index 0c38e94380e6..18719e5f4eff 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1,13 +1,8 @@
-MD5 b038747197b5d117b75c612c39bedc6e ChangeLog 2706
-MD5 7a090ef24255a6303cbff1cc07e98631 gftp-2.0.13.ebuild 1032
+MD5 9c69fe046c07a1422c2ceda8078010ee ChangeLog 2910
 MD5 4965cb3d7d47ce48a9fa674ae66c4b86 gftp-2.0.14.ebuild 998
-MD5 6c4d39e5837686aeebc007e8b9494d58 gftp-2.0.14_rc1.ebuild 1022
 MD5 848a8b8a59ff350a8028e8012a54b46a gftp-2.0.15.ebuild 1336
-MD5 848a8b8a59ff350a8028e8012a54b46a gftp-2.0.16.ebuild 1336
+MD5 a27c70e2a9310b457cc36c4c1b01eb36 gftp-2.0.16.ebuild 1335
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 8e7b5678687f0a6685df59ecfc697c86 files/digest-gftp-2.0.13 63
 MD5 4a567cc97f7b5318979193135b98eafd files/digest-gftp-2.0.14 64
-MD5 35ad6821c6e09d90227714f8b087f565 files/digest-gftp-2.0.14_rc1 67
 MD5 f016b30f08a26f30a03721cff7a19ac9 files/digest-gftp-2.0.15 65
 MD5 77ce85d4218034ac35a17bf59af5b790 files/digest-gftp-2.0.16 65
-MD5 ad3e717963c174555b2afb27f7c2a61e files/gftp-2.0.13-gtk2.2.patch 1013
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.13 b/net-ftp/gftp/files/digest-gftp-2.0.13
deleted file mode 100644
index 3fb41b2ba58c..000000000000
--- a/net-ftp/gftp/files/digest-gftp-2.0.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5006d3f984b63fe30865fc03e50a6256 gftp-2.0.13.tar.gz 962094
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.14_rc1 b/net-ftp/gftp/files/digest-gftp-2.0.14_rc1
deleted file mode 100644
index a873193622e9..000000000000
--- a/net-ftp/gftp/files/digest-gftp-2.0.14_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bcf8164cd5ff332f648c472b2ebb73bf gftp-2.0.14rc1.tar.bz2 778937
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.16 b/net-ftp/gftp/files/digest-gftp-2.0.16
new file mode 100644
index 000000000000..9ea9117b1698
--- /dev/null
+++ b/net-ftp/gftp/files/digest-gftp-2.0.16
@@ -0,0 +1 @@
+MD5 a51cbe1a9077fba4e12218cd02ebefdf gftp-2.0.16.tar.bz2 1102827
diff --git a/net-ftp/gftp/files/gftp-2.0.13-gtk2.2.patch b/net-ftp/gftp/files/gftp-2.0.13-gtk2.2.patch
deleted file mode 100644
index 5f47249f3817..000000000000
--- a/net-ftp/gftp/files/gftp-2.0.13-gtk2.2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/gtk/gftp-gtk.c	2002-07-17 13:05:33.000000000 +0100
-+++ src/gtk/gftp-gtk.c	2003-04-13 22:53:01.000000000 +0100
-@@ -62,7 +62,7 @@
- GtkWidget * stop_btn, * hostedit, * useredit, * passedit, * portedit, * logwdw,
-           * dlwdw, * protocol_menu, * optionmenu;
- GtkAdjustment * logwdw_vadj;
--#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 0
-+#if GTK_MAJOR_VERSION > 1
- GtkTextMark * logwdw_textmark;
- #endif
- int local_start, remote_start, trans_start, log_start, tools_start;
---- src/gtk/gftp-gtk.h	2002-07-17 11:37:18.000000000 +0100
-+++ src/gtk/gftp-gtk.h	2003-04-13 22:58:46.000000000 +0100
-@@ -102,7 +102,7 @@
- extern GtkWidget * stop_btn, * hostedit, * useredit, * passedit,
-                  * portedit, * logwdw, * dlwdw, * protocol_menu, * optionmenu;
- extern GtkAdjustment * logwdw_vadj;
--#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 0
-+#if GTK_MAJOR_VERSION > 1
- extern GtkTextMark * logwdw_textmark;
- #endif
- extern int local_start, remote_start, trans_start, log_start, tools_start;
diff --git a/net-ftp/gftp/gftp-2.0.13.ebuild b/net-ftp/gftp/gftp-2.0.13.ebuild
deleted file mode 100644
index b7d8a7779fb2..000000000000
--- a/net-ftp/gftp/gftp-2.0.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.13.ebuild,v 1.8 2003/09/07 00:12:23 msterret Exp $
-
-IUSE="nls gtk2"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gnome based FTP Client"
-SRC_URI="http://www.gftp.org/${P}.tar.gz"
-HOMEPAGE="http://www.gftp.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-# very generic depends. it should be that way.
-DEPEND="virtual/x11
-	gtk2? ( >=x11-libs/gtk+-2.0.0 )"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# fix to allow compiling against >=x11-libs/gtk+-2.2
-	# for gftp-2.0.13 only, fixed in 2.0.14
-	patch -p0 < ${FILESDIR}/${P}-gtk2.2.patch || die "died applying patch"
-}
-
-src_compile() {
-	local myconf
-
-	use nls || myconf="--disable-nls"
-	use gtk2 && myconf="${myconf} --enable-gtk20"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-
-	einstall || die
-
-	dodoc COPYING ChangeLog README* THANKS TODO
-	dodoc docs/USERS-GUIDE
-
-}
diff --git a/net-ftp/gftp/gftp-2.0.14_rc1.ebuild b/net-ftp/gftp/gftp-2.0.16.ebuild
index b232fbb7e6ad..9da5129d984e 100644
--- a/net-ftp/gftp/gftp-2.0.14_rc1.ebuild
+++ b/net-ftp/gftp/gftp-2.0.16.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.14_rc1.ebuild,v 1.5 2003/09/07 00:12:23 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.16.ebuild,v 1.1 2003/11/09 21:53:45 liquidx Exp $
 
-IUSE="nls gtk2"
-P=${PN}-${PV/_/}
+IUSE="nls gtk gtk2 ssl"
 S=${WORKDIR}/${P}
 DESCRIPTION="Gnome based FTP Client"
 SRC_URI="http://www.gftp.org/${P}.tar.bz2"
@@ -11,11 +10,15 @@ HOMEPAGE="http://www.gftp.org"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc "
+KEYWORDS="~x86 ~ppc ~sparc"
 
 DEPEND="virtual/x11
-	gtk2? ( >=x11-libs/gtk+-2.0.0 )
-	!gtk2? ( =x11-libs/gtk+-1.2* )"
+	ssl? ( dev-libs/openssl )
+	gtk? (
+		gtk2? ( >=x11-libs/gtk+-2 ) : ( =x11-libs/gtk+-1.2* ) )
+	!gtk ( sys-libs/readline
+		sys-libs/ncurses
+		=dev-libs/glib-1.2* )"
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
@@ -28,16 +31,26 @@ src_compile() {
 
 	# do not use enable-{gtk20,gtkport} they are not recognized
 	# and will disable building the gtkport alltogether
-	use gtk2 \
+	if [ -n "`use gtk`" ]
+	then
+		einfo "gtk+ enabled"
+		use gtk2 \
+			&& einfo "gtk2 enabled" \
+			|| myconf="${myconf} --disable-gtk20"
+	else
+		einfo "gtk+ and gtk2 disabled"
+		myconf="${myconf} --disable-gtkport --disable-gtk20"
+	fi
+
+	use ssl \
 		&& myconf="${myconf}" \
-		|| myconf="${myconf} --disable-gtk20"
+		|| myconf="${myconf} --disable-ssl"
 
 	econf ${myconf} || die
 	emake || die
 }
 
 src_install() {
-
 	einstall || die
 
 	dodoc COPYING ChangeLog AUTHORS README* THANKS \