Updated duplicity to 0.7.08.

From Frédéric Fauberteau in PR 51316.

New in v0.7.08 (2016/07/01)
---------------------------
* Merged in lp:~noizyland/duplicity/fix_azurebackend_typo
  - Fix typo in error handling code
* Merged in lp:~ghoz/duplicity/swift-prefix
  - adds the abiliy to use path in the swift backend, in order to have multiple
    backups to the same container neatly organized.
* Fixed bug #1573957 with patches from Dmitry Nezhevenko
  - upload last chunk with files_upload_session_finish to avoid extra request
  - upload small files using non-chunked api
* Fixed bug #1586934 with patches from Dmitry Nezhevenko
  - fixes error handling in wrapper
* Fixed bug #1586992 with patches from Dmitry Nezhevenko
  - Patch adds _delete_list to Par2Backend. And _delete_list fallbacks to
    _delete calls if wrapped backend has no _delete_list.
* Fixed bug #1589038 with patches from Malte Schröder
  - Added ignore_case option to selection functions
* Merged in lp:~mstoll-de/duplicity/b2-reauth
  - Fixes bug #1588503 b2: large uploads fail due to expired auth token
* Merged in lp:~aaron-whitehouse/duplicity/fix_pep8
  - Fix PEP8 error in onedrivebackend.py (space before bracket)
* Fixed bug #822697 ssh-options not passed in rsync over ssh
  - Added globals.ssh_options to rsync command line
* Increased default volume size to 200M, was 25M
* Fixed README-REPO to no longer mention 0.6-series
* Merged in lp:~aaron-whitehouse/duplicity/fix_stat_errors
  - Only give an error about not being able to access possibly locked file if
    that file is supposed to be included or scanned (i.e. not excluded).
    Fixes Bug #1089131
* Fixed bug #1594780 with patches from B. Reitsma
  - Use re.finditer() to speed processing
* Merged in lp:~aaron-whitehouse/duplicity/PEP8_W503_fixes
  - Fix PEP8 W503 errors (line break before binary operator) and enable the
    PEP8 test for this in test_code.CodeTest.
* Merged in lp:~aaron-whitehouse/duplicity/PEP8_line_length
  - Set line length error length to 120 (matching tox.ini) for PEP8 and
    fixed E501(line too long) errors.
* Merged in lp:~duplicity-team/duplicity/po-updates

4 files changed, 20 insertions, 18 deletions

diff --git a/sysutils/duplicity/MESSAGE b/sysutils/duplicity/MESSAGE
deleted file mode 100644
index 0c2eceb8c04..00000000000
--- a/sysutils/duplicity/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2015/04/09 10:16:35 hiramatsu Exp $
-Depending on the storage backend used, additional packages might 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.
-===========================================================================
diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 838d3de2491..72eaf1a1fb0 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2016/05/24 19:10:46 bsiegert Exp $
+# $NetBSD: Makefile,v 1.35 2016/07/07 08:35:46 wiz Exp $
 
-DISTNAME=	duplicity-0.7.07.1
+DISTNAME=	duplicity-0.7.08
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://code.launchpad.net/duplicity/0.7-series/${PKGVERSION_NOREV}/+download/
 
@@ -14,11 +14,12 @@ USE_PKGLOCALEDIR=	yes
 .include "options.mk"
 
 DEPENDS+=	${PYPKGPREFIX}-lockfile>=0.9.1:../../devel/py-lockfile
+DEPENDS+=	${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko
 
 REPLACE_PYTHON+=	bin/duplicity \
 			bin/rdiffdir
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # not yet ported as of 0.6.22
-EGG_NAME=			${DISTNAME:S/07/7/}
+EGG_NAME=			${DISTNAME:S/08/8/}
 
 SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		pre-configure
diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo
index e7c3987e8cc..ef30db1b0d6 100644
--- a/sysutils/duplicity/distinfo
+++ b/sysutils/duplicity/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2016/05/24 19:10:46 bsiegert Exp $
+$NetBSD: distinfo,v 1.22 2016/07/07 08:35:46 wiz Exp $
 
-SHA1 (duplicity-0.7.07.1.tar.gz) = 2aa0bea171a02cb074d86145dcf9c9328867e7c8
-RMD160 (duplicity-0.7.07.1.tar.gz) = 31fa6c10928376729dc413ed3d677c76bc6997d9
-SHA512 (duplicity-0.7.07.1.tar.gz) = 363266232763791bac9e84a9e345dda6ffa278a89597a094540088e12e47b56cb2459f72073c0020b77504514149b1ccb9bed7a67e516443a674975954f49129
-Size (duplicity-0.7.07.1.tar.gz) = 1539310 bytes
+SHA1 (duplicity-0.7.08.tar.gz) = 191d7a4bdf1cbd9ce24c52f294f6a615f9805514
+RMD160 (duplicity-0.7.08.tar.gz) = d7ae400613309c0fb89278a692079d88981e0262
+SHA512 (duplicity-0.7.08.tar.gz) = 62018013077e6de654d0b09439e2d654b7dea27e554797f6c9dfb76389d3badbbba2cfcd129f23bdf4606b1454b2cf912b2ce5ef720dbf6af2d6efd49f21cf9d
+Size (duplicity-0.7.08.tar.gz) = 1541904 bytes
 SHA1 (patch-aa) = f1210f703dccf759f234846a3139ce98063011cb
diff --git a/sysutils/duplicity/options.mk b/sysutils/duplicity/options.mk
index be0f48ce836..1a43d9b14b8 100644
--- a/sysutils/duplicity/options.mk
+++ b/sysutils/duplicity/options.mk
@@ -1,10 +1,19 @@
-# $NetBSD: options.mk,v 1.2 2016/05/24 19:10:46 bsiegert Exp $
+# $NetBSD: options.mk,v 1.3 2016/07/07 08:35:46 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.duplicity
-PKG_SUPPORTED_OPTIONS=	gnupg2
+PKG_SUPPORTED_OPTIONS=	duplicity-amazons3 duplicity-dropbox gnupg2
+PKG_SUGGESTED_OPTIONS=	duplicity-amazons3 duplicity-dropbox
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mduplicity-amazons3)
+DEPENDS+=	${PYPKGPREFIX}-boto-[0-9]*:../../net/py-boto
+.endif
+
+.if !empty(PKG_OPTIONS:Mduplicity-dropbox)
+DEPENDS+=	${PYPKGPREFIX}-dropbox-[0-9]*:../../net/py-dropbox
+.endif
+
 .if !empty(PKG_OPTIONS:Mgnupg2)
 DEPENDS+=	gnupg2-[0-9]*:../../security/gnupg2
 GPGPATH=	${PREFIX}/bin/gpg2