Revert

Package-Manager: portage-2.1.3.19
RepoMan-Options: --force

6 files changed, 114 insertions, 9 deletions

diff --git a/net-ftp/gftp/ChangeLog b/net-ftp/gftp/ChangeLog
index da8b554bde34..322dadcdde17 100644
--- a/net-ftp/gftp/ChangeLog
+++ b/net-ftp/gftp/ChangeLog
@@ -1,10 +1,6 @@
 # ChangeLog for net-ftp/gftp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.65 2008/01/21 19:29:16 armin76 Exp $
-
-  21 Jan 2008; Raúl Porcel <armin76@gentoo.org> -gftp-2.0.18-r4.ebuild,
-  -gftp-2.0.18-r5.ebuild:
-  old
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.66 2008/01/21 19:33:43 armin76 Exp $
 
   25 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   gftp-2.0.18-r6.ebuild:
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index 3e43302d1fb5..e7b844ecdda7 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -15,18 +15,32 @@ MD5 176e12e22f99ad3696f92dec776530ba files/gftp-2.0.18-ssl-wildcardcert.patch 10
 RMD160 10a192946d56d6c830e7afc1172892f544c44fad files/gftp-2.0.18-ssl-wildcardcert.patch 1004
 SHA256 9f7c483ad83f7e12b492c9227ba548e089a4af455af3e8ea2ceff2b8e515e0c9 files/gftp-2.0.18-ssl-wildcardcert.patch 1004
 DIST gftp-2.0.18.tar.bz2 1374850 RMD160 0e0daea8543ae822b25635647360193362a2648d SHA1 c2468f1ff1fe978a5fab3a198e513558f3b48f5a SHA256 8145e18d1edf13e8cb6cd7a69bb69de5c46307086997755654488fb8282d38a2
+EBUILD gftp-2.0.18-r4.ebuild 1054 RMD160 43b0e0ff3414519aa221bc36ea41229e277dd211 SHA1 51b1b5c46fb281f9cbceb9a322b11b5d072618b9 SHA256 6d649714cfc496c6f795f84a6f597c7169d0aee46d2fb216add993fb0d294ade
+MD5 4b14bad3306297b16c81cf0b8ee9c1e0 gftp-2.0.18-r4.ebuild 1054
+RMD160 43b0e0ff3414519aa221bc36ea41229e277dd211 gftp-2.0.18-r4.ebuild 1054
+SHA256 6d649714cfc496c6f795f84a6f597c7169d0aee46d2fb216add993fb0d294ade gftp-2.0.18-r4.ebuild 1054
+EBUILD gftp-2.0.18-r5.ebuild 1304 RMD160 e784cd2b44e49c3c269c017224bc51483d796409 SHA1 0e1e29e14bdbd2f94df2684224f894dbb3c5e6b6 SHA256 8a56dbd2a4a237d207a150808d79f12ad390ed2074e8240d6af2b860e97e438c
+MD5 bd01db375c9abccd8f79722417fd467c gftp-2.0.18-r5.ebuild 1304
+RMD160 e784cd2b44e49c3c269c017224bc51483d796409 gftp-2.0.18-r5.ebuild 1304
+SHA256 8a56dbd2a4a237d207a150808d79f12ad390ed2074e8240d6af2b860e97e438c gftp-2.0.18-r5.ebuild 1304
 EBUILD gftp-2.0.18-r6.ebuild 1370 RMD160 d208d1e891734ca583c6edb38e5a80bc71b1d8ed SHA1 868ee3d76b5a7f9b2f4ba7e22737040baf936323 SHA256 2df5eb483805e3c76a763e2e4cfd921fdd10c24fead476d90f1a51dd4abd3e9f
 MD5 7be8be5b50a97c831004c722688e39f4 gftp-2.0.18-r6.ebuild 1370
 RMD160 d208d1e891734ca583c6edb38e5a80bc71b1d8ed gftp-2.0.18-r6.ebuild 1370
 SHA256 2df5eb483805e3c76a763e2e4cfd921fdd10c24fead476d90f1a51dd4abd3e9f gftp-2.0.18-r6.ebuild 1370
-MISC ChangeLog 8928 RMD160 8d6f3f08df1b6025306acbd48d6dd9dded0de0cd SHA1 323a776c57b9c7942a94159baca827aeeac71c05 SHA256 9d0627d588bb94cdad32eac549869b64d8bce0d7867029b73d94898a2ea58c4b
-MD5 f80fab864359babb2e31d9068611c6ad ChangeLog 8928
-RMD160 8d6f3f08df1b6025306acbd48d6dd9dded0de0cd ChangeLog 8928
-SHA256 9d0627d588bb94cdad32eac549869b64d8bce0d7867029b73d94898a2ea58c4b ChangeLog 8928
+MISC ChangeLog 8822 RMD160 53c983d0c2622eb04e4e2895dfa9bd598dec7315 SHA1 aeb7f5f5b1cc7fb3ce49539a9b36216e2670217b SHA256 12b555c023be93a09c28f90271a35e949df4fcbb80798f6ebbec94de0bf46d58
+MD5 b21486d51d09c87a05205300ae756afc ChangeLog 8822
+RMD160 53c983d0c2622eb04e4e2895dfa9bd598dec7315 ChangeLog 8822
+SHA256 12b555c023be93a09c28f90271a35e949df4fcbb80798f6ebbec94de0bf46d58 ChangeLog 8822
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
+MD5 4e32cb8ee1e0ef76ba34db43896f5cfc files/digest-gftp-2.0.18-r4 241
+RMD160 a2507ad1c36cd4ac08bbfd6d3ecea87d0f6c2958 files/digest-gftp-2.0.18-r4 241
+SHA256 4e1cf658c5915e1add1219ac8f1c03911008aea592dc06d53cff9ef99239f4dc files/digest-gftp-2.0.18-r4 241
+MD5 4e32cb8ee1e0ef76ba34db43896f5cfc files/digest-gftp-2.0.18-r5 241
+RMD160 a2507ad1c36cd4ac08bbfd6d3ecea87d0f6c2958 files/digest-gftp-2.0.18-r5 241
+SHA256 4e1cf658c5915e1add1219ac8f1c03911008aea592dc06d53cff9ef99239f4dc files/digest-gftp-2.0.18-r5 241
 MD5 4e32cb8ee1e0ef76ba34db43896f5cfc files/digest-gftp-2.0.18-r6 241
 RMD160 a2507ad1c36cd4ac08bbfd6d3ecea87d0f6c2958 files/digest-gftp-2.0.18-r6 241
 SHA256 4e1cf658c5915e1add1219ac8f1c03911008aea592dc06d53cff9ef99239f4dc files/digest-gftp-2.0.18-r6 241
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.18-r4 b/net-ftp/gftp/files/digest-gftp-2.0.18-r4
new file mode 100644
index 000000000000..a5e7dd4f3967
--- /dev/null
+++ b/net-ftp/gftp/files/digest-gftp-2.0.18-r4
@@ -0,0 +1,3 @@
+MD5 44b19442d06f6dc68c7211d66029d826 gftp-2.0.18.tar.bz2 1374850
+RMD160 0e0daea8543ae822b25635647360193362a2648d gftp-2.0.18.tar.bz2 1374850
+SHA256 8145e18d1edf13e8cb6cd7a69bb69de5c46307086997755654488fb8282d38a2 gftp-2.0.18.tar.bz2 1374850
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.18-r5 b/net-ftp/gftp/files/digest-gftp-2.0.18-r5
new file mode 100644
index 000000000000..a5e7dd4f3967
--- /dev/null
+++ b/net-ftp/gftp/files/digest-gftp-2.0.18-r5
@@ -0,0 +1,3 @@
+MD5 44b19442d06f6dc68c7211d66029d826 gftp-2.0.18.tar.bz2 1374850
+RMD160 0e0daea8543ae822b25635647360193362a2648d gftp-2.0.18.tar.bz2 1374850
+SHA256 8145e18d1edf13e8cb6cd7a69bb69de5c46307086997755654488fb8282d38a2 gftp-2.0.18.tar.bz2 1374850
diff --git a/net-ftp/gftp/gftp-2.0.18-r4.ebuild b/net-ftp/gftp/gftp-2.0.18-r4.ebuild
new file mode 100644
index 000000000000..1d5bcf672317
--- /dev/null
+++ b/net-ftp/gftp/gftp-2.0.18-r4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 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-r4.ebuild,v 1.9 2008/01/21 19:33:43 armin76 Exp $
+
+inherit eutils
+
+DESCRIPTION="Gnome based FTP Client"
+SRC_URI="http://www.gftp.org/${P}.tar.bz2"
+HOMEPAGE="http://www.gftp.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="gtk ssl"
+
+RDEPEND=">=dev-libs/glib-2
+		 sys-devel/gettext
+		 sys-libs/ncurses
+		 sys-libs/readline
+		 gtk? ( >=x11-libs/gtk+-2 )
+		 ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.9"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# patch to allow fetching of ssh2 files
+	# that are read-only, see bug #91269 and upstream link.
+	epatch ${FILESDIR}/${P}-ssh2-read.patch
+}
+
+src_compile() {
+	econf $(use_enable gtk gtkport) $(use_enable ssl) || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+	dodoc ChangeLog README* THANKS TODO docs/USERS-GUIDE
+}
diff --git a/net-ftp/gftp/gftp-2.0.18-r5.ebuild b/net-ftp/gftp/gftp-2.0.18-r5.ebuild
new file mode 100644
index 000000000000..5ce06bd57914
--- /dev/null
+++ b/net-ftp/gftp/gftp-2.0.18-r5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 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-r5.ebuild,v 1.3 2008/01/21 19:33:43 armin76 Exp $
+
+inherit eutils
+
+DESCRIPTION="Gnome based FTP Client"
+SRC_URI="http://www.gftp.org/${P}.tar.bz2"
+HOMEPAGE="http://www.gftp.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk ssl"
+
+RDEPEND=">=dev-libs/glib-2
+		 sys-devel/gettext
+		 sys-libs/ncurses
+		 sys-libs/readline
+		 gtk? ( >=x11-libs/gtk+-2 )
+		 ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.9"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# patch to allow fetching of ssh2 files
+	# that are read-only, see bug #91269 and upstream link.
+	epatch "${FILESDIR}/${P}-ssh2-read.patch"
+	# patch to allow for wildcard SSL certificates
+	epatch "${FILESDIR}/${P}-ssl-wildcardcert.patch"
+	# patch to not crash on IPv6 enabled hosts or on IPv4 transfer with the "ignore PASV address" function
+	epatch "${FILESDIR}/${P}-ipv6.patch"
+
+}
+
+src_compile() {
+	econf $(use_enable gtk gtkport) $(use_enable ssl) || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+	dodoc ChangeLog* README* THANKS TODO docs/USERS-GUIDE
+}