Version bump and remove old (bug #482846).

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

4 files changed, 9 insertions, 81 deletions

diff --git a/app-backup/duplicity/ChangeLog b/app-backup/duplicity/ChangeLog
index 8dcaa7f3198b..a00dc82e4548 100644
--- a/app-backup/duplicity/ChangeLog
+++ b/app-backup/duplicity/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-backup/duplicity
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/ChangeLog,v 1.84 2013/06/25 18:01:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/ChangeLog,v 1.85 2013/08/29 02:40:39 radhermit Exp $
+
+*duplicity-0.6.22 (29 Aug 2013)
+
+  29 Aug 2013; Tim Harder <radhermit@gentoo.org> -duplicity-0.6.19.ebuild,
+  -duplicity-0.6.21-r1.ebuild, +duplicity-0.6.22.ebuild,
+  -files/duplicity-0.6.21-paramiko-delete.patch:
+  Version bump and remove old (bug #482846).
 
   25 Jun 2013; Tim Harder <radhermit@gentoo.org> -duplicity-0.6.21.ebuild:
   Remove old.
diff --git a/app-backup/duplicity/duplicity-0.6.19.ebuild b/app-backup/duplicity/duplicity-0.6.19.ebuild
deleted file mode 100644
index b67d16a4edb1..000000000000
--- a/app-backup/duplicity/duplicity-0.6.19.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.19.ebuild,v 1.5 2013/03/03 09:22:21 mgorny Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="http://www.nongnu.org/duplicity/"
-SRC_URI="http://code.launchpad.net/${PN}/0.6-series/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="s3"
-
-DEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-"
-RDEPEND="${DEPEND}
-	dev-python/paramiko
-	>=dev-python/pexpect-2.1
-	s3? ( dev-python/boto )
-"
-
-src_prepare() {
-	distutils_src_prepare
-	sed -i -r "s/'COPYING',//" setup.py || die "Couldn't remove unnecessary COPYING file."
-}
diff --git a/app-backup/duplicity/duplicity-0.6.21-r1.ebuild b/app-backup/duplicity/duplicity-0.6.22.ebuild
index 2bdd28c2447a..d7d842e4aefd 100644
--- a/app-backup/duplicity/duplicity-0.6.21-r1.ebuild
+++ b/app-backup/duplicity/duplicity-0.6.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.21-r1.ebuild,v 1.1 2013/06/17 22:16:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.22.ebuild,v 1.1 2013/08/29 02:40:39 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -26,7 +26,6 @@ RDEPEND="${DEPEND}
 "
 
 python_prepare_all() {
-	local PATCHES=( "${FILESDIR}"/${PN}-0.6.21-paramiko-delete.patch )
 	distutils-r1_python_prepare_all
 
 	sed -i "s/'COPYING',//" setup.py || die "Couldn't remove unnecessary COPYING file."
diff --git a/app-backup/duplicity/files/duplicity-0.6.21-paramiko-delete.patch b/app-backup/duplicity/files/duplicity-0.6.21-paramiko-delete.patch
deleted file mode 100644
index 5a9f2b7e7093..000000000000
--- a/app-backup/duplicity/files/duplicity-0.6.21-paramiko-delete.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix the delete function of the paramiko backend (bug #466734).
-
---- duplicity/backends/_ssh_paramiko.py
-+++ duplicity/backends/_ssh_paramiko.py
-@@ -363,12 +363,10 @@
-     def delete(self, filename_list):
-         """deletes all files in the list on the remote side. In scp mode unavoidable quoting issues
-         will cause failures if filenames containing single quotes are encountered."""
--        for n in range(1, globals.num_retries+1):
--            if n > 1:
--                # sleep before retry
--                time.sleep(self.retry_delay)
--            try:
--                for fn in filename_list:
-+        for fn in filename_list:
-+            # Try to delete each file several times before giving up completely.
-+            for n in range(1, globals.num_retries+1):
-+                try:
-                     if (globals.use_scp):
-                         self.runremote("rm '%s/%s'" % (self.remote_dir,fn),False,"scp rm ")
-                     else:
-@@ -376,11 +374,15 @@
-                             self.sftp.remove(fn)
-                         except Exception, e:
-                             raise BackendException("sftp rm %s failed: %s" % (fn,e))
--            except Exception, e:
--                if n == globals.num_retries:
--                    log.FatalError(str(e), log.ErrorCode.backend_error)
--                else:
--                    log.Warn("%s (Try %d of %d) Will retry in %d seconds." % (e,n,globals.num_retries,self.retry_delay))
-+
-+                    # If we get here, we deleted this file successfully. Move on to the next one.
-+                    break
-+                except Exception, e:
-+                    if n == globals.num_retries:
-+                        log.FatalError(str(e), log.ErrorCode.backend_error)
-+                    else:
-+                        log.Warn("%s (Try %d of %d) Will retry in %d seconds." % (e,n,globals.num_retries,self.retry_delay))
-+                        time.sleep(self.retry_delay)
- 
-     def runremote(self,cmd,ignoreexitcode=False,errorprefix=""):
-         """small convenience function that opens a shell channel, runs remote command and returns
-