Remove old. Remove unused patches.

(Portage version: 2.2_rc33/cvs/Linux i686)

5 files changed, 5 insertions, 191 deletions

diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 8c68fc8e3d33..07e054997a0d 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.185 2009/05/06 16:38:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.186 2009/05/06 17:01:29 jer Exp $
+
+  06 May 2009; Jeroen Roovers <jer@gentoo.org> -files/3.6.1-segfault.patch,
+  -lftp-3.7.9.ebuild, -files/3.6.1-specialchars.patch, -lftp-3.7.10.ebuild:
+  Remove old. Remove unused patches.
 
   06 May 2009; Raúl Porcel <armin76@gentoo.org> lftp-3.7.11.ebuild:
   arm/ia64/s390/sparc stable wrt #267832
diff --git a/net-ftp/lftp/files/3.6.1-segfault.patch b/net-ftp/lftp/files/3.6.1-segfault.patch
deleted file mode 100644
index 52755e351ba0..000000000000
--- a/net-ftp/lftp/files/3.6.1-segfault.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/buffer.cc	10 Sep 2007 11:45:27 -0000	1.66
-+++ src/buffer.cc	3 Jan 2008 09:07:43 -0000
-@@ -155,7 +155,7 @@ void Buffer::vFormat(const char *f, va_l
-    {
-       va_list tmp;
-       VA_COPY(tmp,v);
--      int res=vsnprintf(GetSpace(size), size, f, v);
-+      int res=vsnprintf(GetSpace(size), size, f, tmp);
-       va_end(tmp);
-       if(res>=0 && res<size)
-       {
diff --git a/net-ftp/lftp/files/3.6.1-specialchars.patch b/net-ftp/lftp/files/3.6.1-specialchars.patch
deleted file mode 100644
index 5057d2dedbf6..000000000000
--- a/net-ftp/lftp/files/3.6.1-specialchars.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- src/GetJob.cc	23 Apr 2007 07:11:45 -0000	1.28
-+++ src/GetJob.cc	28 Dec 2007 11:12:35 -0000
-@@ -99,33 +99,44 @@ bool GetJob::IsRemoteNonURL(const Parsed
-    // store & put || !store & get
-    return (!url.proto && (mode==FA::STORE ^ !reverse));
- }
-+bool GetJob::IsLocalNonURL(const ParsedURL &url,FA::open_mode mode)
-+{
-+   // store & get || !store & put
-+   return (!url.proto && (mode==FA::STORE ^ reverse));
-+}
- bool GetJob::IsLocal(const ParsedURL &url)
- {
-    return !url.proto || !strcasecmp(url.proto,"file");
- }
-+// create copy peer from a cloned session
- FileCopyPeer *GetJob::CreateCopyPeer(FileAccess *session,const char *path,FA::open_mode mode)
- {
-    ParsedURL url(path,true);
-    if(IsRemoteNonURL(url,mode))
-       return new FileCopyPeerFA(session,path,mode);
-    Delete(session);	// delete cloned session.
--   return CreateCopyPeer(url,mode);
-+   return CreateCopyPeer(url,path,mode);
- }
-+// create copy peer using a session reference
- FileCopyPeer *GetJob::CreateCopyPeer(const FileAccessRef& session,const char *path,FA::open_mode mode)
- {
-    ParsedURL url(path,true);
-    if(IsRemoteNonURL(url,mode))
-       return new FileCopyPeerFA(session,path,mode);
--   return CreateCopyPeer(url,mode);
-+   return CreateCopyPeer(url,path,mode);
- }
--FileCopyPeer *GetJob::CreateCopyPeer(const ParsedURL &url,FA::open_mode mode)
-+FileCopyPeer *GetJob::CreateCopyPeer(const ParsedURL &url,const char *path,FA::open_mode mode)
- {
-+   if(IsLocalNonURL(url,mode))
-+      return CreateCopyPeer(path,mode);
-    if(IsLocal(url))
--      return (mode==FA::STORE)
--	 ? DstLocal(url.path)
--	 : SrcLocal(url.path);
-+      return CreateCopyPeer(url.path,mode);
-    return new FileCopyPeerFA(&url,mode);
- }
-+FileCopyPeer *GetJob::CreateCopyPeer(const char *path,FA::open_mode mode)
-+{
-+   return mode==FA::STORE ? DstLocal(path) : SrcLocal(path);
-+}
- 
- void GetJob::NextFile()
- {
---- src/GetJob.h	23 Apr 2007 07:11:46 -0000	1.15
-+++ src/GetJob.h	28 Dec 2007 11:10:07 -0000
-@@ -29,8 +29,10 @@ class GetJob : public CopyJobEnv
- {
-    FileCopyPeer *SrcLocal(const char *src);
-    FileCopyPeer *DstLocal(const char *dst);
--   FileCopyPeer *CreateCopyPeer(const ParsedURL &url,FA::open_mode mode);
-+   FileCopyPeer *CreateCopyPeer(const ParsedURL &url,const char *path,FA::open_mode mode);
-+   FileCopyPeer *CreateCopyPeer(const char *path,FA::open_mode mode);
-    bool IsRemoteNonURL(const ParsedURL &url,FA::open_mode mode);
-+   bool IsLocalNonURL(const ParsedURL &url,FA::open_mode mode);
-    static bool IsLocal(const ParsedURL &url);
- 
- protected:
diff --git a/net-ftp/lftp/lftp-3.7.10.ebuild b/net-ftp/lftp/lftp-3.7.10.ebuild
deleted file mode 100644
index ba59eb5a3be5..000000000000
--- a/net-ftp/lftp/lftp-3.7.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.7.10.ebuild,v 1.1 2009/03/20 09:45:41 jer Exp $
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="http://ftp.yars.free.net/pub/source/lftp/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="ssl gnutls socks5 nls"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-		socks5? (
-			>=net-proxy/dante-1.1.12
-			virtual/pam )
-		ssl? (
-			gnutls? ( >=net-libs/gnutls-1.2.3 )
-			!gnutls? ( >=dev-libs/openssl-0.9.6 )
-		)
-		virtual/libc
-		>=sys-libs/readline-5.1"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-lang/perl"
-
-src_compile() {
-	local myconf="$(use_enable nls) --enable-packager-mode"
-
-	if use ssl && use gnutls ; then
-		myconf="${myconf} --without-openssl"
-	elif use ssl && ! use gnutls ; then
-		myconf="${myconf} --without-gnutls --with-openssl=/usr"
-	else
-		myconf="${myconf} --without-gnutls --without-openssl"
-	fi
-
-	use socks5 && myconf="${myconf} --with-socksdante=/usr" \
-		|| myconf="${myconf} --without-socksdante"
-
-	econf \
-		--sysconfdir=/etc/lftp \
-		--with-modules \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	dodoc BUGS ChangeLog FAQ FEATURES MIRRORS \
-			NEWS README* THANKS TODO
-}
diff --git a/net-ftp/lftp/lftp-3.7.9.ebuild b/net-ftp/lftp/lftp-3.7.9.ebuild
deleted file mode 100644
index ba30e63e5f44..000000000000
--- a/net-ftp/lftp/lftp-3.7.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-3.7.9.ebuild,v 1.7 2009/04/12 18:17:45 ranger Exp $
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="http://ftp.yars.free.net/pub/source/lftp/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="ssl gnutls socks5 nls"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-		socks5? (
-			>=net-proxy/dante-1.1.12
-			virtual/pam )
-		ssl? (
-			gnutls? ( >=net-libs/gnutls-1.2.3 )
-			!gnutls? ( >=dev-libs/openssl-0.9.6 )
-		)
-		virtual/libc
-		>=sys-libs/readline-5.1"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-lang/perl"
-
-src_compile() {
-	local myconf="$(use_enable nls) --enable-packager-mode"
-
-	if use ssl && use gnutls ; then
-		myconf="${myconf} --without-openssl"
-	elif use ssl && ! use gnutls ; then
-		myconf="${myconf} --without-gnutls --with-openssl=/usr"
-	else
-		myconf="${myconf} --without-gnutls --without-openssl"
-	fi
-
-	use socks5 && myconf="${myconf} --with-socksdante=/usr" \
-		|| myconf="${myconf} --without-socksdante"
-
-	econf \
-		--sysconfdir=/etc/lftp \
-		--with-modules \
-		${myconf} || die "econf failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	dodoc BUGS ChangeLog FAQ FEATURES MIRRORS \
-			NEWS README* THANKS TODO
-}