Import of pkgsrc-2014Q1

sysutils/duplicity/MESSAGE

@@ -1,7 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2013/04/11 16:27:45 drochner Exp $
+$NetBSD: MESSAGE,v 1.2 2013/11/26 20:36:22 drochner Exp $
 Depending on the storage backend used, additional packages micht be needed:
 -Amazon S3 needs pkgsrc/net/py-boto.
+-Dropbox needs pkgsrc/net/py-dropbox
 -For ssh/scp, pkgsrc/security/py-paramiko is recommended.
 -For more options, see the manpage.
 ===========================================================================

sysutils/duplicity/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2013/04/11 16:27:45 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:21 wiz Exp $
 
-DISTNAME=		duplicity-0.6.21
+DISTNAME=		duplicity-0.6.22
 CATEGORIES=		sysutils net
 MASTER_SITES=		http://code.launchpad.net/duplicity/0.6-series/${PKGVERSION_NOREV}/+download/
 
@@ -23,6 +23,7 @@ GPGPATH=	${LOCALBASE}/bin/gpg
 .endif
 
 REPLACE_PYTHON+=	bin/*
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.6.22
 
 SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		pre-configure

sysutils/duplicity/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2013/04/11 16:27:45 drochner Exp $
+@comment $NetBSD: PLIST,v 1.12 2013/11/26 20:36:22 drochner Exp $
 bin/duplicity
 bin/rdiffdir
 ${PYSITELIB}/${EGG_FILE}
@@ -33,6 +33,9 @@ ${PYSITELIB}/duplicity/backends/botobackend.pyo
 ${PYSITELIB}/duplicity/backends/cloudfilesbackend.py
 ${PYSITELIB}/duplicity/backends/cloudfilesbackend.pyc
 ${PYSITELIB}/duplicity/backends/cloudfilesbackend.pyo
+${PYSITELIB}/duplicity/backends/dpbxbackend.py
+${PYSITELIB}/duplicity/backends/dpbxbackend.pyc
+${PYSITELIB}/duplicity/backends/dpbxbackend.pyo
 ${PYSITELIB}/duplicity/backends/ftpbackend.py
 ${PYSITELIB}/duplicity/backends/ftpbackend.pyc
 ${PYSITELIB}/duplicity/backends/ftpbackend.pyo
@@ -54,12 +57,18 @@ ${PYSITELIB}/duplicity/backends/imapbackend.pyo
 ${PYSITELIB}/duplicity/backends/localbackend.py
 ${PYSITELIB}/duplicity/backends/localbackend.pyc
 ${PYSITELIB}/duplicity/backends/localbackend.pyo
+${PYSITELIB}/duplicity/backends/megabackend.py
+${PYSITELIB}/duplicity/backends/megabackend.pyc
+${PYSITELIB}/duplicity/backends/megabackend.pyo
 ${PYSITELIB}/duplicity/backends/rsyncbackend.py
 ${PYSITELIB}/duplicity/backends/rsyncbackend.pyc
 ${PYSITELIB}/duplicity/backends/rsyncbackend.pyo
 ${PYSITELIB}/duplicity/backends/sshbackend.py
 ${PYSITELIB}/duplicity/backends/sshbackend.pyc
 ${PYSITELIB}/duplicity/backends/sshbackend.pyo
+${PYSITELIB}/duplicity/backends/swiftbackend.py
+${PYSITELIB}/duplicity/backends/swiftbackend.pyc
+${PYSITELIB}/duplicity/backends/swiftbackend.pyo
 ${PYSITELIB}/duplicity/backends/tahoebackend.py
 ${PYSITELIB}/duplicity/backends/tahoebackend.pyc
 ${PYSITELIB}/duplicity/backends/tahoebackend.pyo
@@ -135,6 +144,9 @@ ${PYSITELIB}/duplicity/path.pyo
 ${PYSITELIB}/duplicity/pexpect.py
 ${PYSITELIB}/duplicity/pexpect.pyc
 ${PYSITELIB}/duplicity/pexpect.pyo
+${PYSITELIB}/duplicity/progress.py
+${PYSITELIB}/duplicity/progress.pyc
+${PYSITELIB}/duplicity/progress.pyo
 ${PYSITELIB}/duplicity/robust.py
 ${PYSITELIB}/duplicity/robust.pyc
 ${PYSITELIB}/duplicity/robust.pyo

sysutils/duplicity/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.14 2013/04/11 16:27:45 drochner Exp $
+$NetBSD: distinfo,v 1.15 2013/11/26 20:36:22 drochner Exp $
 
-SHA1 (duplicity-0.6.21.tar.gz) = 8594666f5312a7b367ab80b979d70a5c45f1145b
-RMD160 (duplicity-0.6.21.tar.gz) = 1d359227905e4bf37768b4053f52b8afbf0686a6
-Size (duplicity-0.6.21.tar.gz) = 1235340 bytes
+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 (patch-aa) = f1210f703dccf759f234846a3139ce98063011cb
+SHA1 (patch-ab) = f9b9a21d77ae5146b1890e462130609b307a89ef

sysutils/duplicity/patches/patch-ab

@@ -0,0 +1,45 @@
+$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+