Update duplicity to v0.6.24:

 - improved support for Amazon Glacier
 - removed support for Ubuntu One, which is closing shop
 - new locking mechanism to avoid concurrent execution with same cache
 - many other bugfixes and minor improvements.  See CHANGELOG.

4 files changed, 25 insertions, 64 deletions

diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index f5288088a12..77e8c036581 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2014/05/09 07:37:19 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2014/05/12 20:39:33 riz Exp $
 
-DISTNAME=		duplicity-0.6.22
+DISTNAME=		duplicity-0.6.24
 CATEGORIES=		sysutils net
 MASTER_SITES=		http://code.launchpad.net/duplicity/0.6-series/${PKGVERSION_NOREV}/+download/
 
@@ -13,6 +13,7 @@ USE_PKGLOCALEDIR=	yes
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.duplicity
 PKG_SUPPORTED_OPTIONS=	gnupg2
+DEPENDS+=	${PYPKGPREFIX}-lockfile>=0.9.1:../../devel/py-lockfile
 .include "../../mk/bsd.options.mk"
 .if !empty(PKG_OPTIONS:Mgnupg2)
 DEPENDS+=	gnupg2-[0-9]*:../../security/gnupg2
@@ -43,6 +44,6 @@ post-extract:
 
 BUILDLINK_API_DEPENDS.librsync+=	librsync>=0.9.6
 .include "../../devel/librsync/buildlink3.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/duplicity/PLIST b/sysutils/duplicity/PLIST
index 4580a0b5533..8bf8c2a9280 100644
--- a/sysutils/duplicity/PLIST
+++ b/sysutils/duplicity/PLIST
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2013/11/26 20:36:22 drochner Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/05/12 20:39:33 riz Exp $
 bin/duplicity
 bin/rdiffdir
-${PYSITELIB}/${EGG_FILE}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/duplicity/__init__.py
 ${PYSITELIB}/duplicity/__init__.pyc
 ${PYSITELIB}/duplicity/__init__.pyo
@@ -21,6 +24,12 @@ ${PYSITELIB}/duplicity/backends/_boto_multi.pyo
 ${PYSITELIB}/duplicity/backends/_boto_single.py
 ${PYSITELIB}/duplicity/backends/_boto_single.pyc
 ${PYSITELIB}/duplicity/backends/_boto_single.pyo
+${PYSITELIB}/duplicity/backends/_cf_cloudfiles.py
+${PYSITELIB}/duplicity/backends/_cf_cloudfiles.pyc
+${PYSITELIB}/duplicity/backends/_cf_cloudfiles.pyo
+${PYSITELIB}/duplicity/backends/_cf_pyrax.py
+${PYSITELIB}/duplicity/backends/_cf_pyrax.pyc
+${PYSITELIB}/duplicity/backends/_cf_pyrax.pyo
 ${PYSITELIB}/duplicity/backends/_ssh_paramiko.py
 ${PYSITELIB}/duplicity/backends/_ssh_paramiko.pyc
 ${PYSITELIB}/duplicity/backends/_ssh_paramiko.pyo
@@ -30,9 +39,9 @@ ${PYSITELIB}/duplicity/backends/_ssh_pexpect.pyo
 ${PYSITELIB}/duplicity/backends/botobackend.py
 ${PYSITELIB}/duplicity/backends/botobackend.pyc
 ${PYSITELIB}/duplicity/backends/botobackend.pyo
-${PYSITELIB}/duplicity/backends/cloudfilesbackend.py
-${PYSITELIB}/duplicity/backends/cloudfilesbackend.pyc
-${PYSITELIB}/duplicity/backends/cloudfilesbackend.pyo
+${PYSITELIB}/duplicity/backends/cfbackend.py
+${PYSITELIB}/duplicity/backends/cfbackend.pyc
+${PYSITELIB}/duplicity/backends/cfbackend.pyo
 ${PYSITELIB}/duplicity/backends/dpbxbackend.py
 ${PYSITELIB}/duplicity/backends/dpbxbackend.pyc
 ${PYSITELIB}/duplicity/backends/dpbxbackend.pyo
@@ -72,12 +81,12 @@ ${PYSITELIB}/duplicity/backends/swiftbackend.pyo
 ${PYSITELIB}/duplicity/backends/tahoebackend.py
 ${PYSITELIB}/duplicity/backends/tahoebackend.pyc
 ${PYSITELIB}/duplicity/backends/tahoebackend.pyo
-${PYSITELIB}/duplicity/backends/u1backend.py
-${PYSITELIB}/duplicity/backends/u1backend.pyc
-${PYSITELIB}/duplicity/backends/u1backend.pyo
 ${PYSITELIB}/duplicity/backends/webdavbackend.py
 ${PYSITELIB}/duplicity/backends/webdavbackend.pyc
 ${PYSITELIB}/duplicity/backends/webdavbackend.pyo
+${PYSITELIB}/duplicity/backends/~par2wrapperbackend.py
+${PYSITELIB}/duplicity/backends/~par2wrapperbackend.pyc
+${PYSITELIB}/duplicity/backends/~par2wrapperbackend.pyo
 ${PYSITELIB}/duplicity/cached_ops.py
 ${PYSITELIB}/duplicity/cached_ops.pyc
 ${PYSITELIB}/duplicity/cached_ops.pyo
@@ -132,9 +141,6 @@ ${PYSITELIB}/duplicity/log.pyo
 ${PYSITELIB}/duplicity/manifest.py
 ${PYSITELIB}/duplicity/manifest.pyc
 ${PYSITELIB}/duplicity/manifest.pyo
-${PYSITELIB}/duplicity/misc.py
-${PYSITELIB}/duplicity/misc.pyc
-${PYSITELIB}/duplicity/misc.pyo
 ${PYSITELIB}/duplicity/patchdir.py
 ${PYSITELIB}/duplicity/patchdir.pyc
 ${PYSITELIB}/duplicity/patchdir.pyo
diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo
index f73e25817e0..dea507f6d47 100644
--- a/sysutils/duplicity/distinfo
+++ b/sysutils/duplicity/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.15 2013/11/26 20:36:22 drochner Exp $
+$NetBSD: distinfo,v 1.16 2014/05/12 20:39:33 riz Exp $
 
-SHA1 (duplicity-0.6.22.tar.gz) = afa144f444148b67d7649b32b80170d917743783
-RMD160 (duplicity-0.6.22.tar.gz) = b34bc75120a3a744383153d51a179042f82b216b
-Size (duplicity-0.6.22.tar.gz) = 1257082 bytes
+SHA1 (duplicity-0.6.24.tar.gz) = 1d0bab80cb9465080179307d969e292c7145c714
+RMD160 (duplicity-0.6.24.tar.gz) = ff6c6dc84d609a390e7bb3d018a4f31030c8b826
+Size (duplicity-0.6.24.tar.gz) = 1268175 bytes
 SHA1 (patch-aa) = f1210f703dccf759f234846a3139ce98063011cb
-SHA1 (patch-ab) = f9b9a21d77ae5146b1890e462130609b307a89ef
diff --git a/sysutils/duplicity/patches/patch-ab b/sysutils/duplicity/patches/patch-ab
deleted file mode 100644
index e35e3f0c85f..00000000000
--- a/sysutils/duplicity/patches/patch-ab
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2013/11/26 20:36:22 drochner Exp $
-
-avoid noise if dropbox-api is not installed
-
---- duplicity/backends/dpbxbackend.py.orig	2013-08-22 13:30:08.000000000 +0000
-+++ duplicity/backends/dpbxbackend.py
-@@ -41,7 +41,11 @@ from duplicity import tempdir
- from duplicity.backend import retry_fatal
- 
- 
--from dropbox import client, rest, session
-+try:
-+        from dropbox.session import DropboxSession
-+except:
-+        class DropboxSession:
-+                pass
- 
- # This application key is registered in my name (jno at pisem dot net).
- # You can register your own developer account with Dropbox and
-@@ -100,6 +104,7 @@ def command(login_required=True):
- class DPBXBackend(duplicity.backend.Backend):
-     """Connect to remote store using Dr*pB*x service"""
-     def __init__(self, parsed_url):
-+        from dropbox import client, rest
-         duplicity.backend.Backend.__init__(self, parsed_url)
- 
-         self.sess = StoredSession(etacsufbo(APP_KEY)
-@@ -213,7 +218,7 @@ class DPBXBackend(duplicity.backend.Back
-         resp = self.api_client.file_create_folder(path)
-         log.Debug('dpbx._mkdir(%s): %s'%(path,resp))
- 
--class StoredSession(session.DropboxSession):
-+class StoredSession(DropboxSession):
-     """a wrapper around DropboxSession that stores a token to a file on disk"""
-     TOKEN_FILE = _TOKEN_CACHE_FILE
- 
-@@ -254,7 +259,7 @@ class StoredSession(session.DropboxSessi
- 
-     def unlink(self):
-         self.delete_creds()
--        session.DropboxSession.unlink(self)
-+        DropboxSession.unlink(self)
- 
- def etacsufbo(s):
-   return ''.join(reduce(lambda x,y:(x and len(x[-1])==1)and(x.append(y+