3 files changed, 88 insertions, 17 deletions

diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index f7358a9ec68b..05268d42d9c5 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	duplicity
-PORTVERSION=	0.6.23
-PORTREVISION=	1
+PORTVERSION=	0.6.24
 CATEGORIES=	sysutils
 MASTER_SITES=	http://launchpad.net/duplicity/0.6-series/${PORTVERSION}/+download/
 
@@ -19,7 +18,7 @@ USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	NLS DOCS SSH FTP FTPS S3 GDOCS CLOUDFILES GIO U1
+OPTIONS_DEFINE=	NLS DOCS SSH FTP FTPS S3 GDOCS CLOUDFILES GIO
 OPTIONS_DEFAULT=SSH FTP FTPS S3
 CLOUDFILES_DESC=Install CloudFiles backend
 FTP_DESC=	Install FTP backend
@@ -28,7 +27,6 @@ GDOCS_DESC=	Install Google Docs backend
 GIO_DESC=	Install GIO backend
 S3_DESC=	Install Amazon S3 backend
 SSH_DESC=	Install SSH/SCP/SFTP backend
-U1_DESC=	Install Ubuntu One backend
 
 PORTDOCS=	COPYING README README-REPO README-LOG tarfile-LICENSE \
 			tarfile-CHANGES CHANGELOG
@@ -42,14 +40,12 @@ GDOCS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:${PORTSDIR}/devel/py-gdata
 CLOUDFILES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cloudfiles>0:${PORTSDIR}/net/py-cloudfiles
 GIO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject>0:${PORTSDIR}/devel/py-gobject \
 					dbus>0:${PORTSDIR}/devel/dbus
-U1_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2 \
-					${PYTHON_PKGNAMEPREFIX}oauthlib>0:${PORTSDIR}/security/py-oauthlib
 
 .include <bsd.port.options.mk>
 
 post-patch:
 .if empty(PORT_OPTIONS:MNLS)
-	@${REINPLACE_CMD} -e '54,62d' \
+	@${REINPLACE_CMD} -e '56,67d' \
 		${WRKSRC}/setup.py
 .endif
 .if empty(PORT_OPTIONS:MSSH)
@@ -81,9 +77,6 @@ post-patch:
 .if empty(PORT_OPTIONS:MGIO)
 	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/giobackend.py
 .endif
-.if empty(PORT_OPTIONS:MU1)
-	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/u1backend.py
-.endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo
index 26faf31d6412..40f7c3b9ac7b 100644
--- a/sysutils/duplicity/distinfo
+++ b/sysutils/duplicity/distinfo
@@ -1,2 +1,2 @@
-SHA256 (duplicity-0.6.23.tar.gz) = 7a17f1e10395dedcf3204bc53925bb9dcbbf2a7552c9b096ebe727eceb9c0c60
-SIZE (duplicity-0.6.23.tar.gz) = 1260261
+SHA256 (duplicity-0.6.24.tar.gz) = 1d41d756638f55106f9501c3db94ccbc6568aa856ba531e07ed2cfb760b62450
+SIZE (duplicity-0.6.24.tar.gz) = 1268175
diff --git a/sysutils/duplicity/files/patch-setup.py b/sysutils/duplicity/files/patch-setup.py
index 3a86163122d2..cdcf2ce84ce9 100644
--- a/sysutils/duplicity/files/patch-setup.py
+++ b/sysutils/duplicity/files/patch-setup.py
@@ -1,6 +1,14 @@
---- setup.py.orig	2011-11-25 23:58:57.147597966 +0000
-+++ setup.py	2011-11-26 00:00:43.169721395 +0000
-@@ -31,6 +31,10 @@
+--- setup.py.orig	2014-05-18 14:37:42.190089675 +0100
++++ setup.py	2014-05-18 14:41:15.084751008 +0100
+@@ -22,7 +22,6 @@
+ 
+ import sys, os
+ from setuptools import setup, Extension
+-from setuptools.command.test import test
+ from setuptools.command.install import install
+ from setuptools.command.sdist import sdist
+ 
+@@ -34,6 +33,10 @@
  
  incdir_list = libdir_list = None
  
@@ -11,7 +19,7 @@
  if os.name == 'posix':
      LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')
      args = sys.argv[:]
-@@ -42,17 +46,9 @@
+@@ -45,17 +48,9 @@
          incdir_list = [os.path.join(LIBRSYNC_DIR, 'include')]
          libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')]
  
@@ -29,4 +37,74 @@
 -                'CHANGELOG']),
                ]
  
- assert os.path.exists("po"), "Missing 'po' directory."
+ top_dir = os.path.dirname(os.path.abspath(__file__))
+@@ -70,45 +65,8 @@
+                  ["po/%s/duplicity.mo" % lang]))
+ 
+ 
+-class TestCommand(test):
+-    def run(self):
+-        # Make sure all modules are ready
+-        build_cmd = self.get_finalized_command("build_py")
+-        build_cmd.run()
+-        # And make sure our scripts are ready
+-        build_scripts_cmd = self.get_finalized_command("build_scripts")
+-        build_scripts_cmd.run()
+-
+-        # make symlinks for test data
+-        if build_cmd.build_lib != top_dir:
+-            for path in ['testfiles.tar.gz', 'testtar.tar', 'gnupg']:
+-                src = os.path.join(top_dir, 'testing', path)
+-                target = os.path.join(build_cmd.build_lib, 'testing', path)
+-                try:
+-                    os.symlink(src, target)
+-                except Exception:
+-                    pass
+-
+-        os.environ['PATH'] = "%s:%s" % (
+-            os.path.abspath(build_scripts_cmd.build_dir),
+-            os.environ.get('PATH'))
+-
+-        test.run(self)
+-
+-
+ class InstallCommand(install):
+     def run(self):
+-        # Normally, install will call build().  But we want to delete the
+-        # testing dir between building and installing.  So we manually build
+-        # and mark ourselves to skip building when we run() for real.
+-        self.run_command('build')
+-        self.skip_build = True
+-
+-        # This should always be true, but just to make sure!
+-        if self.build_lib != top_dir:
+-            testing_dir = os.path.join(self.build_lib, 'testing')
+-            os.system("rm -rf %s" % testing_dir)
+-
+         install.run(self)
+ 
+ 
+@@ -133,11 +91,7 @@
+       maintainer_email="kenneth@loafman.com",
+       url="http://duplicity.nongnu.org/index.html",
+       packages = ['duplicity',
+-                  'duplicity.backends',
+-                  'testing',
+-                  'testing.functional',
+-                  'testing.overrides',
+-                  'testing.unit'],
++                  'duplicity.backends'],
+       package_dir = {"duplicity" : "duplicity",
+                      "duplicity.backends" : "duplicity/backends",},
+       ext_modules = [Extension("duplicity._librsync",
+@@ -147,9 +101,6 @@
+                                libraries=["rsync"])],
+       scripts = ['bin/rdiffdir', 'bin/duplicity'],
+       data_files = data_files,
+-      tests_require = ['lockfile', 'mock'],
+-      test_suite = 'testing',
+-      cmdclass={'test': TestCommand,
+-                'install': InstallCommand,
++      cmdclass={'install': InstallCommand,
+                 'sdist': SDistCommand},
+       )