3 files changed, 12 insertions, 190 deletions

diff --git a/net-ftp/gftp/ChangeLog b/net-ftp/gftp/ChangeLog
index 31272a210c9c..67919878555e 100644
--- a/net-ftp/gftp/ChangeLog
+++ b/net-ftp/gftp/ChangeLog
@@ -1,180 +1,6 @@
 # ChangeLog for net-ftp/gftp
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.47 2005/11/06 05:57:10 obz Exp $
-
-*gftp-2.0.18-r3 (06 Nov 2005)
-
-  06 Nov 2005; Mike Gardiner <obz@gentoo.org>
-  +files/gftp-2.0.18-ssh2-read.patch, +gftp-2.0.18-r3.ebuild:
-  Added revision -r3 with a fix for downloading files over ssh2 that are
-  read-only (non-writable). See bug #91269 and the upstream link.
-
-*gftp-2.0.18-r2 (14 Oct 2005)
-
-  14 Oct 2005; John N. Laliberte <allanonjl@gentoo.org> -gftp-2.0.14.ebuild,
-  -gftp-2.0.15.ebuild, -gftp-2.0.16-r1.ebuild, -gftp-2.0.17.ebuild,
-  +gftp-2.0.18-r2.ebuild:
-  get rid of gtk2 useflag, clean up old ebuilds, fixes #108555
-
-  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> gftp-2.0.18-r1.ebuild:
-  Mark 2.0.18-r1 stable on alpha
-
-  07 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> gftp-2.0.18-r1.ebuild:
-  ~alpha keyword, bug 87365.
-
-  19 Feb 2005; Joseph Jezak <josejx@gentoo.org> gftp-2.0.18-r1.ebuild:
-  Marked ppc stable for bug #81994.
-
-  14 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> gftp-2.0.18-r1.ebuild:
-  Stable on sparc wrt #81994
-
-  14 Feb 2005; Markus Rothe <corsair@gentoo.org> gftp-2.0.18-r1.ebuild:
-  Stable on ppc64; bug #81994
-
-  14 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> gftp-2.0.18-r1.ebuild:
-  stable on amd64, see #81994
-
-*gftp-2.0.18-r1 (14 Feb 2005)
-
-  14 Feb 2005; foser <foser@gentoo.org> gftp-2.0.18-r1.ebuild :
-  Add patch to fix buildtime issue (#80845)
-
-  14 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> gftp-2.0.18.ebuild:
-  stable on amd64. see #81994
-
-  04 Feb 2005; Simon Stelling <blubb@gentoo.org> gftp-2.0.18.ebuild:
-  testing on amd64
-
-*gftp-2.0.18 (04 Feb 2005)
-
-  04 Feb 2005; Joe McCann <joem@gentoo.org> +gftp-2.0.18.ebuild:
-  new version with several bug fixes that should solve some amd64 issues.
-  Closes bug 80753
-
-  02 Nov 2004; Markus Rothe <corsair@gentoo.org> gftp-2.0.17.ebuild:
-  Stable on ppc64
-
-  04 Aug 2004; Travis Tilley <lv@gentoo.org> gftp-2.0.15.ebuild,
-  gftp-2.0.16-r1.ebuild, gftp-2.0.17.ebuild:
-  gftp 2.0.16 and up dont work on amd64 yet, marking -amd64
-
-  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gftp-2.0.17.ebuild:
-  Stable amd64.
-
-  12 Jul 2004; Tom Gall <tgall@gentoo.org> gftp-2.0.17.ebuild:
-  add ~ppc64 bug #55069
-
-  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> gftp-2.0.14.ebuild,
-  gftp-2.0.15.ebuild, gftp-2.0.16-r1.ebuild, gftp-2.0.17.ebuild:
-  Fix use invocation
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gftp-2.0.15.ebuild,
-  gftp-2.0.16-r1.ebuild:
-  Add inherit eutils
-
-*gftp-2.0.17 (01 Apr 2004)
-
-  01 Apr 2004; Travis Tilley <lv@gentoo.org> :
-  version bumped and ~amd64 keyword added due to recent 64 bit cleanups upstream
-
-  25 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> gftp-2.0.15.ebuild,
-  gftp-2.0.16-r1.ebuild:
-  don't use deprecated ? : use syntax
-
-  25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> gftp-2.0.15.ebuild:
-  Adding patch from Ryan C. Gordon <ryan@epicgames.com> to fix segfaults on
-  amd64. Closing #34440.
-
-  06 Feb 2004; <gustavoz@gentoo.org> gftp-2.0.16-r1.ebuild:
-  stable on sparc
-
-  04 Feb 2004; Alastair Tse <liquidx@gentoo.org> gftp-2.0.16-r1.ebuild:
-  stable bump, should solve (#39289)
-
-  07 Jan 2004; Jason Wever <weeve@gentoo.org> gftp-2.0.15.ebuild:
-  Marked stable on sparc.
-
-*gftp-2.0.16-r1 (27 Nov 2003)
-
-  27 Nov 2003; foser <foser@gentoo.org> gftp-2.0.16-r1.ebuild :
-  Added patch fixing issues with ipv4/ipv6 servers
-  reported in #34475 by Mats Huttunen <sumc@bredband.net>
-
-*gftp-2.0.16 (09 Nov 2003)
-
-  10 Nov 2003; foser <foser@gentoo.org> gftp-2.0.{15,16}.ebuild :
-  Fixed !gtk -> !gtk?
-
-  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
-
-*gftp-2.0.15 (22 Aug 2003)
-
-  22 Aug 2003; <spider@gentoo.org> gftp-2.0.15.ebuild :
-  Versionbump. Revamped the dependencies completely. USE="ssl" support
-  USE="-gtk" dependencies added. Now handles gtk and gtk2 dependencies in a
-  nested fashion, disablig gtk gives text frontend Fixed up the deps for
-  textmode. (readline,ncurses and glib-1.2)
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*gftp-2.0.14 (06 Dec 2002)
-
-  04 Apr 2003; Jason Wever <weeve@gentoo.org> gftp-2.0.14.ebuild:
-  Changed ~sparc keyword to sparc.
-
-  23 Mar 2003; Graham Forest <vladimir@gentoo.org> gftp-2.0.14.ebuild:
-  set ppc in keywords
-
-  06 Dec 2002; foser <foser@gentoo.org> gftp-2.0.14.ebuild :
-  New version
-
-*gftp-2.0.14_rc1 (29 Nov 2002)
-
-  29 Nov 2002; foser <foser@gentoo.org> gftp-2.0.14_rc1.ebuild :
-  New version
-
-*gftp-2.0.13 (23 Jul 2002)
-
-  13 Apr 2003; Alastair Tse <liquidx@gentoo.org> gftp-2.0.13.ebuild,
-  files/gftp-2.0.13-gtk2.2.patch:
-  fix compile problems with gtk2.2
-
-  20 Aug 2002; Mark Guertin <gerk@gentoo.org> gftp-2.0.13.ebuild :
-  Added ppc to keywords
-
-  23 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> gftp-2.0.13.ebuild :
-
-  Version bump.
-
-*gftp-2.0.12-r3 (18 Jul 2002)
-
-  18 Jul 2002; Seemant Kulleen <seemant@gentoo.org> gftp-2.0.12-r3.ebuild
-  files/digest-gftp-2.0.12-r3 :
-
-  Sandbox violation fixed. Closes bug # 5217 by yariv@vipe.technion.ac.il
-  (Yariv Ido)
-
-*gftp-2.0.12-r2 (06 Jul 2002)
-  06 Jul 2002; Spider <spider@gentoo.org> gftp-2.0.12-r2.ebuild :
-  using the gtk2 USE flag and fixed it up to pass lintool checks
-
-*gftp-2.0.12-r1 (27 May 2002)
-  27 May 2002; Spider <spider@gentoo.org> gftp-2.0.12-r1.ebuild :
-  Updating the ebuild with a check for gtk+-2.0 and enabling that if
-  found, also changed the dependencies on gtk+ and glib
-
-*gftp-2.0.12 (24 May 2002)
-
-  24 May 2002; Ryan Phillips <rphillips@gentoo.org> gftp-2.0.12.ebuild :
-
-  Updated version
-
-  
-  11 Apr 2002; Spider <spider@gentoo.org>
-  Update all glib dependencies to use glib-1.2*  in preparation of unmasking the glib-2.0.1 packages
-
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
 
 *gftp-2.0.11 (1 Feb 2002)
 
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index b13f1e20ae10..a855b64b690e 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1,12 +1,8 @@
-MD5 3dc5b204d92c6517b6de1856b330b040 ChangeLog 6383
-MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18-r1 65
-MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18-r2 65
-MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18-r3 65
-MD5 ce3187f3e4f80bfb35cf8bef798eb40d files/gftp-2.0.15-64bit_fixes.patch 16360
-MD5 23e7696a3f6f2c368d11ca9aaadb7797 files/gftp-2.0.16-ipv6_fix.patch 3279
-MD5 81d77310a3638462af932e435590ab5d files/gftp-2.0.18-fix_gtk1.patch 1095
-MD5 327a4df792013f011340fe5f90dbb6c1 files/gftp-2.0.18-ssh2-read.patch 326
-MD5 3a75b54355e3e9dab04a8612c5044c27 gftp-2.0.18-r1.ebuild 1468
-MD5 54961e8083c43a825eeb545ad2b43d4c gftp-2.0.18-r2.ebuild 1137
-MD5 324a95e081b2b7b1cd591fde3cf6b11c gftp-2.0.18-r3.ebuild 1272
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 9470bf52f8a653dd4a26f1a71a604292 ChangeLog 2386
+MD5 799ae8f467b0fc4c5086c7b09fedeb8b gftp-2.0.13.ebuild 1032
+MD5 cb97912c4eeeabec9fe34baf6fc5fdfa gftp-2.0.14.ebuild 997
+MD5 80be8d608e0679dd6a92c30e3c7369f7 gftp-2.0.14_rc1.ebuild 1022
+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 ad3e717963c174555b2afb27f7c2a61e files/gftp-2.0.13-gtk2.2.patch 1013
diff --git a/net-ftp/gftp/gftp-2.0.18-r1.ebuild b/net-ftp/gftp/gftp-2.0.18-r1.ebuild
index f5f5ed1aab05..9e21d36415ec 100644
--- a/net-ftp/gftp/gftp-2.0.18-r1.ebuild
+++ b/net-ftp/gftp/gftp-2.0.18-r1.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/net-ftp/gftp/gftp-2.0.18-r1.ebuild,v 1.8 2005/09/15 23:19:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.18-r1.ebuild,v 1.1 2005/02/14 16:05:42 foser Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gftp.org"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
 IUSE="nls gtk gtk2 ssl"
 
 DEPEND="virtual/x11